From 69befdf487c5d87099ba9432ab7a7d0ecd266f63 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 27 Jan 2015 12:06:41 +0300 Subject: [PATCH] Sync with portage [Tue Jan 27 12:06:40 MSK 2015]. --- .../xstow/files/xstow-1.0.1-ncurses.patch | 27 + app-admin/xstow/xstow-1.0.1.ebuild | 11 +- app-arch/pigz/Manifest | 1 + app-arch/pigz/files/pigz-2.3.3-ldflags.patch | 34 + app-arch/pigz/pigz-2.3.3.ebuild | 43 + app-crypt/gkeys-gen/gkeys-gen-9999.ebuild | 3 +- app-editors/gvim/Manifest | 1 + app-editors/gvim/gvim-7.4.591.ebuild | 414 ++++++ app-editors/vim-core/Manifest | 1 + app-editors/vim-core/vim-core-7.4.591.ebuild | 230 +++ app-editors/vim-core/vim-core-9999.ebuild | 4 +- app-editors/vim/Manifest | 1 + app-editors/vim/vim-7.4.591.ebuild | 388 +++++ app-misc/reptyr/Manifest | 1 + app-misc/reptyr/reptyr-0.6.1.ebuild | 32 + app-portage/eix/metadata.xml | 1 - .../elogviewer/elogviewer-2.1-r1.ebuild | 4 +- .../elogviewer/elogviewer-2.1-r2.ebuild | 49 + app-portage/etc-proposals/Manifest | 1 - .../etc-proposals-1.4.3-r3.ebuild | 11 +- ....2.2-Update-for-ssl-fetch-api-change.patch | 24 + .../mirrorselect/mirrorselect-2.2.2-r1.ebuild | 38 + .../mirrorselect/mirrorselect-2.2.2.ebuild | 5 +- app-text/restview/Manifest | 1 + app-text/restview/restview-2.3.0.ebuild | 33 + dev-games/mercator/Manifest | 1 - dev-games/mercator/mercator-0.3.2.ebuild | 33 - dev-games/mercator/mercator-0.3.3.ebuild | 6 +- dev-games/newton/Manifest | 3 - dev-games/newton/files/newton-1.53-glut.patch | 12 - dev-games/newton/newton-1.53.ebuild | 71 - dev-games/newton/newton-2.00.ebuild | 39 - dev-games/ogre/ogre-1.9.0.ebuild | 94 -- dev-haskell/blaze-html/Manifest | 4 - .../blaze-html/blaze-html-0.5.1.3.ebuild | 39 - .../blaze-html/blaze-html-0.6.1.1.ebuild | 37 - .../blaze-html/blaze-html-0.7.0.1.ebuild | 33 - .../blaze-html/blaze-html-0.7.0.2.ebuild | 36 - dev-haskell/bzlib/Manifest | 2 +- ...ib-0.5.0.3.ebuild => bzlib-0.5.0.5.ebuild} | 18 +- dev-python/astng/Manifest | 1 - dev-python/astng/astng-0.21.1.ebuild | 75 - .../astng/files/astng-0.23.1-file-open.patch | 19 - dev-python/astroid/Manifest | 1 + dev-python/astroid/astroid-1.3.4.ebuild | 44 + dev-python/bitstring/Manifest | 1 - dev-python/bitstring/bitstring-3.1.0.ebuild | 28 - dev-python/bleach/Manifest | 1 + dev-python/bleach/bleach-1.4.1.ebuild | 30 + dev-python/bleach/metadata.xml | 9 + dev-python/iniparse/iniparse-0.4.ebuild | 31 - dev-python/ipaddr/Manifest | 1 - dev-python/ipaddr/ipaddr-2.1.10.ebuild | 42 - dev-python/ipaddr/ipaddr-2.1.9.ebuild | 42 - dev-python/logilab-common/Manifest | 1 + .../logilab-common-0.63.2.ebuild | 93 ++ dev-python/miniupnpc/Manifest | 3 - .../miniupnpc/miniupnpc-1.6.20120509.ebuild | 30 - dev-python/miniupnpc/miniupnpc-1.6.ebuild | 37 - dev-python/miniupnpc/miniupnpc-1.7-r1.ebuild | 25 - dev-python/pivy/pivy-0.5_alpha20110303.ebuild | 27 - dev-python/pybluez/pybluez-0.18.ebuild | 37 - dev-python/pychart/pychart-1.39.ebuild | 40 - dev-python/readme/Manifest | 1 + dev-python/readme/metadata.xml | 9 + dev-python/readme/readme-0.4.1.ebuild | 41 + dev-python/setuptools/Manifest | 1 + .../setuptools/setuptools-12.0.5.ebuild | 50 + dev-ruby/allison/allison-2.0.3-r3.ebuild | 6 +- dev-ruby/arel/arel-4.0.2.ebuild | 6 +- dev-ruby/atomic/Manifest | 1 + dev-ruby/atomic/atomic-1.1.99.ebuild | 34 + .../htmlentities/htmlentities-4.3.3.ebuild | 6 +- dev-ruby/journey/journey-1.0.4-r1.ebuild | 8 +- dev-ruby/jwt/Manifest | 2 +- .../{jwt-1.0.0.ebuild => jwt-1.2.1.ebuild} | 9 +- dev-ruby/listen/Manifest | 1 - dev-ruby/listen/listen-0.7.3.ebuild | 27 - dev-ruby/listen/listen-2.7.5.ebuild | 33 - dev-ruby/listen/listen-2.8.5.ebuild | 5 +- .../permutation/permutation-0.1.8-r1.ebuild | 6 +- .../ruby-progressbar-1.4.2.ebuild | 4 +- dev-ruby/shorturl/shorturl-1.0.0-r1.ebuild | 6 +- dev-ruby/timecop/timecop-0.7.1.ebuild | 4 +- dev-ruby/wirble/wirble-0.1.3-r3.ebuild | 6 +- dev-util/jenkins-bin/Manifest | 2 +- ...-1.595.ebuild => jenkins-bin-1.598.ebuild} | 4 +- dev-util/trace-cmd/Manifest | 1 + .../files/trace-cmd-2.5.1-makefile.patch | 34 + dev-util/trace-cmd/metadata.xml | 11 + dev-util/trace-cmd/trace-cmd-2.5.1.ebuild | 72 + dev-vcs/git-flow/Manifest | 2 + .../git-flow-1.8.0-unbundle-shflags.patch | 25 + dev-vcs/git-flow/git-flow-1.8.0.ebuild | 51 + dev-vcs/git-flow/metadata.xml | 2 +- games-action/d1x-rebirth/Manifest | 1 + .../d1x-rebirth/d1x-rebirth-0.58.1.ebuild | 108 ++ .../files/d1x-rebirth-0.58.1-flags.patch | 11 + games-action/hotline-miami/Manifest | 1 - .../hotline-miami/hotline-miami-1.0.9a.ebuild | 95 -- games-action/lugaru/lugaru-1.0c.ebuild | 51 - games-action/minetest/minetest-0.4.10.ebuild | 145 -- games-action/openclonk/openclonk-5.3.3.ebuild | 113 -- games-arcade/commandergenius/Manifest | 2 - .../commandergenius-1.7.2.0.ebuild | 82 -- .../commandergenius-1.7.3.0.ebuild | 82 -- games-arcade/diameter/diameter-0.4.0.3.ebuild | 54 - .../dynamitejack/dynamitejack-1.0.23.ebuild | 77 - .../watermelons/watermelons-1.1.1.ebuild | 55 - games-board/xboard/Manifest | 1 - .../xboard/files/xboard-4.7.3-Xaw3d.patch | 21 - .../xboard-4.7.3-configure-switches.patch | 35 - .../xboard/files/xboard-4.7.3-gettext.patch | 20 - .../files/xboard-4.7.3-gnuchess-default.patch | 45 - .../xboard/files/xboard-4.7.3-paths.patch | 145 -- games-board/xboard/xboard-4.7.3.ebuild | 93 -- games-emulation/hatari/Manifest | 1 - .../files/hatari-1.7.0-gentoo-docdir.patch | 13 - .../hatari/files/hatari-1.7.0-gentoo.patch | 112 -- games-emulation/hatari/hatari-1.7.0.ebuild | 85 -- games-engines/odamex/Manifest | 2 - .../odamex/files/odamex-0.6.2-build.patch | 204 --- .../odamex/files/odamex-0.6.2-libagar.patch | 15 - .../odamex/files/odamex-0.6.3-build.patch | 198 --- games-engines/odamex/odamex-0.6.2.ebuild | 99 -- games-engines/odamex/odamex-0.6.3.ebuild | 100 -- games-engines/residualvm/Manifest | 2 +- .../files/residualvm-0.1.0-EE.patch | 33 - games-engines/residualvm/metadata.xml | 1 - ...m-0.1.0.ebuild => residualvm-0.2.1.ebuild} | 10 +- games-engines/solarus/Manifest | 2 - .../solarus/files/solarus-1.2.1-paths.patch | 15 - games-engines/solarus/solarus-1.2.1.ebuild | 52 - games-engines/solarus/solarus-1.3.0.ebuild | 56 - games-fps/doomsday/Manifest | 1 - games-fps/doomsday/doomsday-1.9.8.ebuild | 131 -- games-fps/eduke32/Manifest | 2 - .../eduke32/eduke32-20130317.3572-r1.ebuild | 216 --- .../eduke32/eduke32-20130627.3905.ebuild | 216 --- .../files/eduke32-20130317.3572-QA.patch | 163 --- .../eduke32-20130317.3572-libpng-1.6.patch | 40 - .../files/eduke32-20130627.3905-QA.patch | 160 -- games-fps/etqw-demo/etqw-demo-2.0_p1.ebuild | 59 - games-fps/quake3-excessiveplus/Manifest | 1 - .../quake3-excessiveplus-1.03.ebuild | 24 - .../soldieroffortune-demo-0.57.ebuild | 60 - games-fps/urbanterror/Manifest | 3 - .../files/urbanterror-4.1.1-build.patch | 25 - .../files/urbanterror-4.1.1-minizip.patch | 40 - .../urbanterror/urbanterror-4.1.1.ebuild | 131 -- games-fps/ut2004-crossfire/Manifest | 3 +- .../ut2004-crossfire-1.93.ebuild | 33 - games-misc/dont-starve/Manifest | 2 - games-misc/dont-starve/dont-starve-1.ebuild | 62 - games-misc/katawa-shoujo/Manifest | 2 - .../katawa-shoujo/katawa-shoujo-1.0-r1.ebuild | 69 - .../katawa-shoujo/katawa-shoujo-1.1-r1.ebuild | 77 - .../katawa-shoujo/katawa-shoujo-1.2.ebuild | 79 - games-misc/lolcat/Manifest | 1 - games-misc/lolcat/lolcat-42.0.99-r1.ebuild | 22 - games-misc/opengfx/Manifest | 1 - .../opengfx/files/opengfx-0.4.7-gcc48.patch | 16 - games-misc/opengfx/opengfx-0.4.7.ebuild | 38 - games-puzzle/angrydd/angrydd-1.0.1.ebuild | 46 - games-puzzle/jools/jools-0.20-r1.ebuild | 63 - games-rpg/dragonhunt/dragonhunt-3.56.ebuild | 86 -- games-rpg/freedink/Manifest | 1 - games-rpg/freedink/freedink-108.2.ebuild | 56 - games-rpg/mana/Manifest | 1 - games-rpg/mana/files/mana-0.5.3-gentoo.patch | 31 - games-rpg/mana/mana-0.5.3.ebuild | 64 - games-rpg/manaplus/Manifest | 1 - games-rpg/manaplus/manaplus-1.3.6.9.ebuild | 68 - games-rpg/tmw/Manifest | 1 - games-rpg/tmw/files/tmw-branding-gentoo.patch | 19 - games-rpg/tmw/tmw-20120727.ebuild | 60 - games-rpg/zsdx/Manifest | 1 - games-rpg/zsdx/files/zsdx-1.8.0-paths.patch | 40 - games-rpg/zsdx/zsdx-1.8.0-r1.ebuild | 67 - games-rpg/zsxd/Manifest | 1 - games-rpg/zsxd/zsxd-1.8.0-r1.ebuild | 63 - games-server/cyphesis/Manifest | 1 - games-server/cyphesis/cyphesis-0.6.0.ebuild | 60 - .../files/cyphesis-0.6.0-gentoo.patch | 32 - .../files/cyphesis-0.6.0-makefile.patch | 21 - games-server/monopd/Manifest | 1 - games-server/monopd/files/monopd | 20 - .../monopd/files/monopd-0.9.3-dosfix.patch | 36 - .../monopd/files/monopd-0.9.3-gcc43.patch | 68 - games-server/monopd/monopd-0.9.3-r1.ebuild | 36 - games-simulation/openttd/Manifest | 1 - .../openttd/files/openttd-1.4.2-cflags.patch | 37 - games-simulation/openttd/openttd-1.4.2.ebuild | 176 --- games-sports/dustrac/Manifest | 1 - games-sports/dustrac/dustrac-1.7.2.ebuild | 68 - games-sports/dustrac/dustrac-1.7.3.ebuild | 10 +- .../dustrac/files/dustrac-1.6.3-cmake.patch | 79 - ....patch => dustrac-1.7.3-desktopfile.patch} | 0 .../lightyears/lightyears-1.4.ebuild | 57 - games-strategy/liquidwar6/Manifest | 4 - .../liquidwar6-0.0.13_beta-ldconfig.patch | 18 - .../liquidwar6-0.0.13_beta-libpng-1.6.patch | 43 - .../files/liquidwar6-0.0.13_beta-paths.patch | 56 - ...tch => liquidwar6-0.4.3681-ldconfig.patch} | 2 - ....patch => liquidwar6-0.4.3681-paths.patch} | 4 - .../liquidwar6/liquidwar6-0.0.13_beta.ebuild | 101 -- .../liquidwar6/liquidwar6-0.2.3551.ebuild | 111 -- .../liquidwar6/liquidwar6-0.4.3681.ebuild | 9 +- games-strategy/wesnoth/Manifest | 1 - .../wesnoth/files/wesnoth-1.12-cmake.patch | 22 - games-strategy/wesnoth/wesnoth-1.12.ebuild | 121 -- games-util/grfcodec/Manifest | 1 - games-util/grfcodec/grfcodec-6.0.0.ebuild | 47 - mail-client/roundcube/Manifest | 1 + mail-client/roundcube/roundcube-1.0.5.ebuild | 72 + .../ax25-apps/ax25-apps-0.0.8_rc4.ebuild | 7 +- media-sound/nted/nted-1.10.18-r3.ebuild | 6 +- metadata/dtd/timestamp.chk | 2 +- metadata/glsa/timestamp.chk | 2 +- metadata/md5-cache/app-admin/xstow-1.0.1 | 8 +- metadata/md5-cache/app-arch/pigz-2.3.3 | 13 + metadata/md5-cache/app-crypt/gkeys-gen-9999 | 2 +- metadata/md5-cache/app-editors/gvim-7.4.591 | 14 + metadata/md5-cache/app-editors/vim-7.4.591 | 14 + .../md5-cache/app-editors/vim-core-7.4.591 | 13 + metadata/md5-cache/app-editors/vim-core-9999 | 2 +- metadata/md5-cache/app-misc/reptyr-0.6.1 | 11 + .../md5-cache/app-portage/elogviewer-2.1-r1 | 2 +- .../md5-cache/app-portage/elogviewer-2.1-r2 | 14 + .../app-portage/etc-proposals-1.4.3-r3 | 4 +- .../md5-cache/app-portage/mirrorselect-2.2.2 | 4 +- .../app-portage/mirrorselect-2.2.2-r1 | 14 + metadata/md5-cache/app-text/restview-2.3.0 | 14 + metadata/md5-cache/dev-games/mercator-0.3.2 | 13 - metadata/md5-cache/dev-games/mercator-0.3.3 | 4 +- metadata/md5-cache/dev-games/newton-1.53 | 13 - metadata/md5-cache/dev-games/newton-2.00 | 12 - metadata/md5-cache/dev-games/ogre-1.9.0 | 15 - .../md5-cache/dev-haskell/blaze-html-0.5.1.3 | 13 - .../md5-cache/dev-haskell/blaze-html-0.6.1.1 | 13 - .../md5-cache/dev-haskell/blaze-html-0.7.0.1 | 13 - .../md5-cache/dev-haskell/blaze-html-0.7.0.2 | 13 - .../{bzlib-0.5.0.3 => bzlib-0.5.0.5} | 12 +- metadata/md5-cache/dev-python/astng-0.21.1 | 13 - metadata/md5-cache/dev-python/astroid-1.3.4 | 15 + metadata/md5-cache/dev-python/bitstring-3.1.0 | 12 - metadata/md5-cache/dev-python/bleach-1.4.1 | 14 + metadata/md5-cache/dev-python/iniparse-0.4 | 12 - metadata/md5-cache/dev-python/ipaddr-2.1.10 | 12 - metadata/md5-cache/dev-python/ipaddr-2.1.9 | 12 - .../dev-python/logilab-common-0.63.2 | 14 + metadata/md5-cache/dev-python/miniupnpc-1.6 | 12 - .../dev-python/miniupnpc-1.6.20120509 | 12 - .../md5-cache/dev-python/miniupnpc-1.7-r1 | 14 - .../dev-python/pivy-0.5_alpha20110303 | 12 - metadata/md5-cache/dev-python/pybluez-0.18 | 13 - metadata/md5-cache/dev-python/pychart-1.39 | 13 - metadata/md5-cache/dev-python/readme-0.4.1 | 14 + .../md5-cache/dev-python/setuptools-12.0.5 | 14 + metadata/md5-cache/dev-ruby/allison-2.0.3-r3 | 10 +- metadata/md5-cache/dev-ruby/arel-4.0.2 | 10 +- metadata/md5-cache/dev-ruby/atomic-1.1.99 | 14 + .../md5-cache/dev-ruby/htmlentities-4.3.3 | 10 +- metadata/md5-cache/dev-ruby/journey-1.0.4-r1 | 10 +- metadata/md5-cache/dev-ruby/jwt-1.0.0 | 14 - metadata/md5-cache/dev-ruby/jwt-1.2.1 | 14 + metadata/md5-cache/dev-ruby/listen-0.7.3 | 14 - metadata/md5-cache/dev-ruby/listen-2.7.5 | 14 - metadata/md5-cache/dev-ruby/listen-2.8.5 | 4 +- .../md5-cache/dev-ruby/permutation-0.1.8-r1 | 10 +- .../md5-cache/dev-ruby/ruby-progressbar-1.4.2 | 4 +- metadata/md5-cache/dev-ruby/shorturl-1.0.0-r1 | 10 +- metadata/md5-cache/dev-ruby/timecop-0.7.1 | 4 +- metadata/md5-cache/dev-ruby/wirble-0.1.3-r3 | 10 +- .../{jenkins-bin-1.595 => jenkins-bin-1.598} | 4 +- metadata/md5-cache/dev-util/trace-cmd-2.5.1 | 13 + metadata/md5-cache/dev-vcs/git-flow-1.8.0 | 11 + .../md5-cache/games-action/d1x-rebirth-0.58.1 | 16 + .../games-action/hotline-miami-1.0.9a | 13 - metadata/md5-cache/games-action/lugaru-1.0c | 12 - .../md5-cache/games-action/minetest-0.4.10 | 13 - .../md5-cache/games-action/openclonk-5.3.3 | 13 - .../games-arcade/commandergenius-1.7.2.0 | 13 - .../games-arcade/commandergenius-1.7.3.0 | 13 - .../md5-cache/games-arcade/diameter-0.4.0.3 | 12 - .../games-arcade/dynamitejack-1.0.23 | 12 - .../md5-cache/games-arcade/watermelons-1.1.1 | 12 - metadata/md5-cache/games-board/xboard-4.7.3 | 14 - .../md5-cache/games-emulation/hatari-1.7.0 | 14 - metadata/md5-cache/games-engines/odamex-0.6.2 | 13 - metadata/md5-cache/games-engines/odamex-0.6.3 | 13 - .../{residualvm-0.1.0 => residualvm-0.2.1} | 4 +- .../md5-cache/games-engines/solarus-1.2.1 | 13 - .../md5-cache/games-engines/solarus-1.3.0 | 13 - metadata/md5-cache/games-fps/doomsday-1.9.8 | 15 - .../games-fps/eduke32-20130317.3572-r1 | 15 - .../md5-cache/games-fps/eduke32-20130627.3905 | 15 - metadata/md5-cache/games-fps/etqw-demo-2.0_p1 | 12 - .../games-fps/quake3-excessiveplus-1.03 | 14 - .../games-fps/soldieroffortune-demo-0.57 | 13 - .../md5-cache/games-fps/urbanterror-4.1.1 | 14 - .../md5-cache/games-fps/ut2004-crossfire-1.93 | 14 - metadata/md5-cache/games-misc/dont-starve-1 | 12 - .../md5-cache/games-misc/katawa-shoujo-1.0-r1 | 13 - .../md5-cache/games-misc/katawa-shoujo-1.1-r1 | 13 - .../md5-cache/games-misc/katawa-shoujo-1.2 | 13 - .../md5-cache/games-misc/lolcat-42.0.99-r1 | 14 - metadata/md5-cache/games-misc/opengfx-0.4.7 | 13 - metadata/md5-cache/games-puzzle/angrydd-1.0.1 | 12 - metadata/md5-cache/games-puzzle/jools-0.20-r1 | 12 - metadata/md5-cache/games-rpg/dragonhunt-3.56 | 12 - metadata/md5-cache/games-rpg/freedink-108.2 | 13 - metadata/md5-cache/games-rpg/mana-0.5.3 | 13 - metadata/md5-cache/games-rpg/manaplus-1.3.6.9 | 13 - metadata/md5-cache/games-rpg/tmw-20120727 | 12 - metadata/md5-cache/games-rpg/zsdx-1.8.0-r1 | 13 - metadata/md5-cache/games-rpg/zsxd-1.8.0-r1 | 13 - .../md5-cache/games-server/cyphesis-0.6.0 | 13 - .../md5-cache/games-server/monopd-0.9.3-r1 | 12 - .../md5-cache/games-simulation/openttd-1.4.2 | 15 - metadata/md5-cache/games-sports/dustrac-1.7.2 | 12 - metadata/md5-cache/games-sports/dustrac-1.7.3 | 2 +- .../md5-cache/games-strategy/lightyears-1.4 | 12 - .../games-strategy/liquidwar6-0.0.13_beta | 13 - .../games-strategy/liquidwar6-0.2.3551 | 13 - .../games-strategy/liquidwar6-0.4.3681 | 2 +- .../md5-cache/games-strategy/wesnoth-1.12 | 13 - metadata/md5-cache/games-util/grfcodec-6.0.0 | 11 - .../md5-cache/mail-client/roundcube-1.0.5 | 13 + .../md5-cache/media-radio/ax25-apps-0.0.8_rc4 | 4 +- .../md5-cache/media-sound/nted-1.10.18-r3 | 6 +- metadata/md5-cache/net-im/choqok-1.5 | 13 + metadata/md5-cache/net-irc/weechat-1.1.1 | 13 + metadata/md5-cache/net-libs/iojs-1.0.4 | 14 + metadata/md5-cache/net-libs/webkit-gtk-2.6.5 | 14 + metadata/md5-cache/net-mail/isync-1.1.2 | 12 + metadata/md5-cache/net-proxy/privoxy-3.0.23 | 14 + .../md5-cache/sys-apps/roccat-tools-1.0.0 | 14 - .../md5-cache/sys-apps/roccat-tools-1.1.0 | 14 - .../md5-cache/sys-apps/roccat-tools-1.4.0 | 14 - .../md5-cache/sys-apps/roccat-tools-1.4.1 | 14 - ...{roccat-tools-1.6.0 => roccat-tools-2.4.0} | 11 +- .../md5-cache/sys-devel/binutils-apple-5.1 | 13 + .../md5-cache/sys-devel/binutils-apple-6.1 | 13 + metadata/md5-cache/sys-fs/mtd-utils-1.5.1 | 13 + .../md5-cache/sys-kernel/git-sources-3.19_rc1 | 4 +- .../md5-cache/sys-kernel/git-sources-3.19_rc2 | 4 +- .../md5-cache/sys-kernel/git-sources-3.19_rc3 | 4 +- .../md5-cache/sys-kernel/git-sources-3.19_rc4 | 4 +- .../md5-cache/sys-kernel/git-sources-3.19_rc5 | 4 +- .../md5-cache/sys-kernel/git-sources-3.19_rc6 | 4 +- .../sys-kernel/tuxonice-sources-3.10.65 | 15 + .../sys-kernel/tuxonice-sources-3.14.29 | 15 + ...{opera-26.0.1656.32 => opera-27.0.1689.54} | 4 +- metadata/md5-cache/x11-apps/amlc-0.5.1 | 9 +- .../md5-cache/x11-terms/gnome-terminal-3.14.2 | 13 - ...nal-3.14.2-r1 => gnome-terminal-3.14.2-r2} | 4 +- metadata/md5-cache/x11-wm/fluxbox-1.3.5-r1 | 2 +- metadata/md5-cache/x11-wm/fluxbox-1.3.6-r1 | 2 +- metadata/news/timestamp.chk | 2 +- metadata/timestamp | 2 +- metadata/timestamp.chk | 2 +- metadata/timestamp.x | 2 +- net-im/choqok/Manifest | 1 + net-im/choqok/choqok-1.5.ebuild | 48 + net-im/choqok/metadata.xml | 3 + net-irc/weechat/Manifest | 1 + net-irc/weechat/weechat-1.1.1.ebuild | 127 ++ net-libs/iojs/Manifest | 1 + net-libs/iojs/iojs-1.0.4.ebuild | 117 ++ net-libs/iojs/metadata.xml | 17 + net-libs/webkit-gtk/Manifest | 1 + net-libs/webkit-gtk/webkit-gtk-2.6.5.ebuild | 220 +++ net-mail/isync/Manifest | 1 + net-mail/isync/isync-1.1.2.ebuild | 24 + net-proxy/privoxy/Manifest | 1 + net-proxy/privoxy/privoxy-3.0.23.ebuild | 81 ++ profiles/arch/powerpc/package.use.mask | 3 +- profiles/desc/input_devices.desc | 3 +- profiles/package.mask | 7 +- profiles/use.local.desc | 5 +- sys-apps/roccat-tools/Manifest | 6 +- .../roccat-tools/roccat-tools-1.0.0.ebuild | 75 - .../roccat-tools/roccat-tools-1.1.0.ebuild | 75 - .../roccat-tools/roccat-tools-1.4.0.ebuild | 75 - .../roccat-tools/roccat-tools-1.4.1.ebuild | 75 - ...1.6.0.ebuild => roccat-tools-2.4.0.ebuild} | 10 +- sys-devel/binutils-apple/Manifest | 6 + .../binutils-apple/binutils-apple-5.1.ebuild | 356 +++++ .../binutils-apple/binutils-apple-6.1.ebuild | 354 +++++ .../files/binutils-apple-4.5-as.patch | 100 ++ .../files/binutils-apple-5.1-as-dir.patch | 47 + .../binutils-apple-5.1-constant-types.patch | 26 + ...nutils-apple-5.1-extraneous-includes.patch | 31 + .../files/binutils-apple-5.1-nolto.patch | 43 + .../files/binutils-apple-5.1-otool-stdc.patch | 23 + .../files/binutils-apple-5.1-ranlib.patch | 15 + .../files/binutils-apple-5.1-strnlen.patch | 45 + .../files/cctools-839-intel-retf.patch | 14 + .../files/cctools-839-lto.patch | 42 + .../binutils-apple/files/ld64-136-Makefile | 48 + .../files/ld64-136-compile_stubs.h | 53 + .../binutils-apple/files/ld64-236.3-Makefile | 51 + .../files/ld64-236.3-arm64-fixup.patch | 17 + .../files/ld64-236.3-constant-types.patch | 61 + .../files/ld64-236.3-crashreporter.patch | 23 + .../binutils-apple/files/ld64-236.3-gcc.patch | 1038 +++++++++++++ .../files/ld64-236.3-missing-cputypes.patch | 10 + .../files/ld64-236.3-noarm.patch | 1236 ++++++++++++++++ .../files/ld64-236.3-nolto.patch | 219 +++ .../files/ld64-236.3-noppc.patch | 26 + .../files/ld64-236.3-nosnapshots.patch | 644 +++++++++ .../files/ld64-241.9-arm64-cputype.patch | 17 + .../files/ld64-241.9-atomic-volatile.patch | 27 + .../files/ld64-241.9-cc_md5.patch | 24 + .../ld64-241.9-extraneous-includes.patch | 13 + .../binutils-apple/files/ld64-241.9-gcc.patch | 1029 +++++++++++++ .../files/ld64-241.9-get-comm-align.patch | 30 + .../files/ld64-241.9-noarm.patch | 1288 +++++++++++++++++ .../files/ld64-241.9-nosnapshots.patch | 644 +++++++++ .../files/ld64-241.9-register-names.patch | 50 + sys-fs/mtd-utils/Manifest | 1 + sys-fs/mtd-utils/mtd-utils-1.5.1.ebuild | 62 + .../git-sources/git-sources-3.19_rc1.ebuild | 6 +- .../git-sources/git-sources-3.19_rc2.ebuild | 6 +- .../git-sources/git-sources-3.19_rc3.ebuild | 4 +- .../git-sources/git-sources-3.19_rc4.ebuild | 4 +- .../git-sources/git-sources-3.19_rc5.ebuild | 4 +- .../git-sources/git-sources-3.19_rc6.ebuild | 4 +- sys-kernel/tuxonice-sources/Manifest | 6 + .../tuxonice-sources-3.10.65.ebuild | 35 + .../tuxonice-sources-3.14.29.ebuild | 35 + www-client/opera/Manifest | 2 +- ...56.32.ebuild => opera-27.0.1689.54.ebuild} | 4 +- x11-apps/amlc/Manifest | 2 +- x11-apps/amlc/amlc-0.5.1.ebuild | 14 +- .../gnome-terminal-3.14.2-fix-crash.patch | 26 + .../gnome-terminal-3.14.2-title-option.patch | 166 +++ ...ebuild => gnome-terminal-3.14.2-r2.ebuild} | 13 +- .../gnome-terminal-3.14.2.ebuild | 69 - x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild | 3 +- x11-wm/fluxbox/fluxbox-1.3.6-r1.ebuild | 3 +- 442 files changed, 11319 insertions(+), 8145 deletions(-) create mode 100644 app-admin/xstow/files/xstow-1.0.1-ncurses.patch create mode 100644 app-arch/pigz/files/pigz-2.3.3-ldflags.patch create mode 100644 app-arch/pigz/pigz-2.3.3.ebuild create mode 100644 app-editors/gvim/gvim-7.4.591.ebuild create mode 100644 app-editors/vim-core/vim-core-7.4.591.ebuild create mode 100644 app-editors/vim/vim-7.4.591.ebuild create mode 100644 app-misc/reptyr/reptyr-0.6.1.ebuild create mode 100644 app-portage/elogviewer/elogviewer-2.1-r2.ebuild create mode 100644 app-portage/mirrorselect/files/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch create mode 100644 app-portage/mirrorselect/mirrorselect-2.2.2-r1.ebuild create mode 100644 app-text/restview/restview-2.3.0.ebuild delete mode 100644 dev-games/mercator/mercator-0.3.2.ebuild delete mode 100644 dev-games/newton/files/newton-1.53-glut.patch delete mode 100644 dev-games/newton/newton-1.53.ebuild delete mode 100644 dev-games/newton/newton-2.00.ebuild delete mode 100644 dev-games/ogre/ogre-1.9.0.ebuild delete mode 100644 dev-haskell/blaze-html/blaze-html-0.5.1.3.ebuild delete mode 100644 dev-haskell/blaze-html/blaze-html-0.6.1.1.ebuild delete mode 100644 dev-haskell/blaze-html/blaze-html-0.7.0.1.ebuild delete mode 100644 dev-haskell/blaze-html/blaze-html-0.7.0.2.ebuild rename dev-haskell/bzlib/{bzlib-0.5.0.3.ebuild => bzlib-0.5.0.5.ebuild} (67%) delete mode 100644 dev-python/astng/astng-0.21.1.ebuild delete mode 100644 dev-python/astng/files/astng-0.23.1-file-open.patch create mode 100644 dev-python/astroid/astroid-1.3.4.ebuild delete mode 100644 dev-python/bitstring/bitstring-3.1.0.ebuild create mode 100644 dev-python/bleach/Manifest create mode 100644 dev-python/bleach/bleach-1.4.1.ebuild create mode 100644 dev-python/bleach/metadata.xml delete mode 100644 dev-python/iniparse/iniparse-0.4.ebuild delete mode 100644 dev-python/ipaddr/ipaddr-2.1.10.ebuild delete mode 100644 dev-python/ipaddr/ipaddr-2.1.9.ebuild create mode 100644 dev-python/logilab-common/logilab-common-0.63.2.ebuild delete mode 100644 dev-python/miniupnpc/miniupnpc-1.6.20120509.ebuild delete mode 100644 dev-python/miniupnpc/miniupnpc-1.6.ebuild delete mode 100644 dev-python/miniupnpc/miniupnpc-1.7-r1.ebuild delete mode 100644 dev-python/pivy/pivy-0.5_alpha20110303.ebuild delete mode 100644 dev-python/pybluez/pybluez-0.18.ebuild delete mode 100644 dev-python/pychart/pychart-1.39.ebuild create mode 100644 dev-python/readme/Manifest create mode 100644 dev-python/readme/metadata.xml create mode 100644 dev-python/readme/readme-0.4.1.ebuild create mode 100644 dev-python/setuptools/setuptools-12.0.5.ebuild create mode 100644 dev-ruby/atomic/atomic-1.1.99.ebuild rename dev-ruby/jwt/{jwt-1.0.0.ebuild => jwt-1.2.1.ebuild} (56%) delete mode 100644 dev-ruby/listen/listen-0.7.3.ebuild delete mode 100644 dev-ruby/listen/listen-2.7.5.ebuild rename dev-util/jenkins-bin/{jenkins-bin-1.595.ebuild => jenkins-bin-1.598.ebuild} (91%) create mode 100644 dev-util/trace-cmd/Manifest create mode 100644 dev-util/trace-cmd/files/trace-cmd-2.5.1-makefile.patch create mode 100644 dev-util/trace-cmd/metadata.xml create mode 100644 dev-util/trace-cmd/trace-cmd-2.5.1.ebuild create mode 100644 dev-vcs/git-flow/files/git-flow-1.8.0-unbundle-shflags.patch create mode 100644 dev-vcs/git-flow/git-flow-1.8.0.ebuild create mode 100644 games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild create mode 100644 games-action/d1x-rebirth/files/d1x-rebirth-0.58.1-flags.patch delete mode 100644 games-action/hotline-miami/hotline-miami-1.0.9a.ebuild delete mode 100644 games-action/lugaru/lugaru-1.0c.ebuild delete mode 100644 games-action/minetest/minetest-0.4.10.ebuild delete mode 100644 games-action/openclonk/openclonk-5.3.3.ebuild delete mode 100644 games-arcade/commandergenius/commandergenius-1.7.2.0.ebuild delete mode 100644 games-arcade/commandergenius/commandergenius-1.7.3.0.ebuild delete mode 100644 games-arcade/diameter/diameter-0.4.0.3.ebuild delete mode 100644 games-arcade/dynamitejack/dynamitejack-1.0.23.ebuild delete mode 100644 games-arcade/watermelons/watermelons-1.1.1.ebuild delete mode 100644 games-board/xboard/files/xboard-4.7.3-Xaw3d.patch delete mode 100644 games-board/xboard/files/xboard-4.7.3-configure-switches.patch delete mode 100644 games-board/xboard/files/xboard-4.7.3-gettext.patch delete mode 100644 games-board/xboard/files/xboard-4.7.3-gnuchess-default.patch delete mode 100644 games-board/xboard/files/xboard-4.7.3-paths.patch delete mode 100644 games-board/xboard/xboard-4.7.3.ebuild delete mode 100644 games-emulation/hatari/files/hatari-1.7.0-gentoo-docdir.patch delete mode 100644 games-emulation/hatari/files/hatari-1.7.0-gentoo.patch delete mode 100644 games-emulation/hatari/hatari-1.7.0.ebuild delete mode 100644 games-engines/odamex/files/odamex-0.6.2-build.patch delete mode 100644 games-engines/odamex/files/odamex-0.6.2-libagar.patch delete mode 100644 games-engines/odamex/files/odamex-0.6.3-build.patch delete mode 100644 games-engines/odamex/odamex-0.6.2.ebuild delete mode 100644 games-engines/odamex/odamex-0.6.3.ebuild delete mode 100644 games-engines/residualvm/files/residualvm-0.1.0-EE.patch rename games-engines/residualvm/{residualvm-0.1.0.ebuild => residualvm-0.2.1.ebuild} (91%) delete mode 100644 games-engines/solarus/files/solarus-1.2.1-paths.patch delete mode 100644 games-engines/solarus/solarus-1.2.1.ebuild delete mode 100644 games-engines/solarus/solarus-1.3.0.ebuild delete mode 100644 games-fps/doomsday/doomsday-1.9.8.ebuild delete mode 100644 games-fps/eduke32/eduke32-20130317.3572-r1.ebuild delete mode 100644 games-fps/eduke32/eduke32-20130627.3905.ebuild delete mode 100644 games-fps/eduke32/files/eduke32-20130317.3572-QA.patch delete mode 100644 games-fps/eduke32/files/eduke32-20130317.3572-libpng-1.6.patch delete mode 100644 games-fps/eduke32/files/eduke32-20130627.3905-QA.patch delete mode 100644 games-fps/etqw-demo/etqw-demo-2.0_p1.ebuild delete mode 100644 games-fps/quake3-excessiveplus/quake3-excessiveplus-1.03.ebuild delete mode 100644 games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57.ebuild delete mode 100644 games-fps/urbanterror/files/urbanterror-4.1.1-build.patch delete mode 100644 games-fps/urbanterror/files/urbanterror-4.1.1-minizip.patch delete mode 100644 games-fps/urbanterror/urbanterror-4.1.1.ebuild delete mode 100644 games-fps/ut2004-crossfire/ut2004-crossfire-1.93.ebuild delete mode 100644 games-misc/dont-starve/dont-starve-1.ebuild delete mode 100644 games-misc/katawa-shoujo/katawa-shoujo-1.0-r1.ebuild delete mode 100644 games-misc/katawa-shoujo/katawa-shoujo-1.1-r1.ebuild delete mode 100644 games-misc/katawa-shoujo/katawa-shoujo-1.2.ebuild delete mode 100644 games-misc/lolcat/lolcat-42.0.99-r1.ebuild delete mode 100644 games-misc/opengfx/files/opengfx-0.4.7-gcc48.patch delete mode 100644 games-misc/opengfx/opengfx-0.4.7.ebuild delete mode 100644 games-puzzle/angrydd/angrydd-1.0.1.ebuild delete mode 100644 games-puzzle/jools/jools-0.20-r1.ebuild delete mode 100644 games-rpg/dragonhunt/dragonhunt-3.56.ebuild delete mode 100644 games-rpg/freedink/freedink-108.2.ebuild delete mode 100644 games-rpg/mana/files/mana-0.5.3-gentoo.patch delete mode 100644 games-rpg/mana/mana-0.5.3.ebuild delete mode 100644 games-rpg/manaplus/manaplus-1.3.6.9.ebuild delete mode 100644 games-rpg/tmw/files/tmw-branding-gentoo.patch delete mode 100644 games-rpg/tmw/tmw-20120727.ebuild delete mode 100644 games-rpg/zsdx/files/zsdx-1.8.0-paths.patch delete mode 100644 games-rpg/zsdx/zsdx-1.8.0-r1.ebuild delete mode 100644 games-rpg/zsxd/zsxd-1.8.0-r1.ebuild delete mode 100644 games-server/cyphesis/cyphesis-0.6.0.ebuild delete mode 100644 games-server/cyphesis/files/cyphesis-0.6.0-gentoo.patch delete mode 100644 games-server/cyphesis/files/cyphesis-0.6.0-makefile.patch delete mode 100644 games-server/monopd/files/monopd delete mode 100644 games-server/monopd/files/monopd-0.9.3-dosfix.patch delete mode 100644 games-server/monopd/files/monopd-0.9.3-gcc43.patch delete mode 100644 games-server/monopd/monopd-0.9.3-r1.ebuild delete mode 100644 games-simulation/openttd/files/openttd-1.4.2-cflags.patch delete mode 100644 games-simulation/openttd/openttd-1.4.2.ebuild delete mode 100644 games-sports/dustrac/dustrac-1.7.2.ebuild delete mode 100644 games-sports/dustrac/files/dustrac-1.6.3-cmake.patch rename games-sports/dustrac/files/{dustrac-1.6.3-desktopfile.patch => dustrac-1.7.3-desktopfile.patch} (100%) delete mode 100644 games-strategy/lightyears/lightyears-1.4.ebuild delete mode 100644 games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-ldconfig.patch delete mode 100644 games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-libpng-1.6.patch delete mode 100644 games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-paths.patch rename games-strategy/liquidwar6/files/{liquidwar6-0.2.3551-ldconfig.patch => liquidwar6-0.4.3681-ldconfig.patch} (90%) rename games-strategy/liquidwar6/files/{liquidwar6-0.2.3551-paths.patch => liquidwar6-0.4.3681-paths.patch} (82%) delete mode 100644 games-strategy/liquidwar6/liquidwar6-0.0.13_beta.ebuild delete mode 100644 games-strategy/liquidwar6/liquidwar6-0.2.3551.ebuild delete mode 100644 games-strategy/wesnoth/files/wesnoth-1.12-cmake.patch delete mode 100644 games-strategy/wesnoth/wesnoth-1.12.ebuild delete mode 100644 games-util/grfcodec/grfcodec-6.0.0.ebuild create mode 100644 mail-client/roundcube/roundcube-1.0.5.ebuild create mode 100644 metadata/md5-cache/app-arch/pigz-2.3.3 create mode 100644 metadata/md5-cache/app-editors/gvim-7.4.591 create mode 100644 metadata/md5-cache/app-editors/vim-7.4.591 create mode 100644 metadata/md5-cache/app-editors/vim-core-7.4.591 create mode 100644 metadata/md5-cache/app-misc/reptyr-0.6.1 create mode 100644 metadata/md5-cache/app-portage/elogviewer-2.1-r2 create mode 100644 metadata/md5-cache/app-portage/mirrorselect-2.2.2-r1 create mode 100644 metadata/md5-cache/app-text/restview-2.3.0 delete mode 100644 metadata/md5-cache/dev-games/mercator-0.3.2 delete mode 100644 metadata/md5-cache/dev-games/newton-1.53 delete mode 100644 metadata/md5-cache/dev-games/newton-2.00 delete mode 100644 metadata/md5-cache/dev-games/ogre-1.9.0 delete mode 100644 metadata/md5-cache/dev-haskell/blaze-html-0.5.1.3 delete mode 100644 metadata/md5-cache/dev-haskell/blaze-html-0.6.1.1 delete mode 100644 metadata/md5-cache/dev-haskell/blaze-html-0.7.0.1 delete mode 100644 metadata/md5-cache/dev-haskell/blaze-html-0.7.0.2 rename metadata/md5-cache/dev-haskell/{bzlib-0.5.0.3 => bzlib-0.5.0.5} (62%) delete mode 100644 metadata/md5-cache/dev-python/astng-0.21.1 create mode 100644 metadata/md5-cache/dev-python/astroid-1.3.4 delete mode 100644 metadata/md5-cache/dev-python/bitstring-3.1.0 create mode 100644 metadata/md5-cache/dev-python/bleach-1.4.1 delete mode 100644 metadata/md5-cache/dev-python/iniparse-0.4 delete mode 100644 metadata/md5-cache/dev-python/ipaddr-2.1.10 delete mode 100644 metadata/md5-cache/dev-python/ipaddr-2.1.9 create mode 100644 metadata/md5-cache/dev-python/logilab-common-0.63.2 delete mode 100644 metadata/md5-cache/dev-python/miniupnpc-1.6 delete mode 100644 metadata/md5-cache/dev-python/miniupnpc-1.6.20120509 delete mode 100644 metadata/md5-cache/dev-python/miniupnpc-1.7-r1 delete mode 100644 metadata/md5-cache/dev-python/pivy-0.5_alpha20110303 delete mode 100644 metadata/md5-cache/dev-python/pybluez-0.18 delete mode 100644 metadata/md5-cache/dev-python/pychart-1.39 create mode 100644 metadata/md5-cache/dev-python/readme-0.4.1 create mode 100644 metadata/md5-cache/dev-python/setuptools-12.0.5 create mode 100644 metadata/md5-cache/dev-ruby/atomic-1.1.99 delete mode 100644 metadata/md5-cache/dev-ruby/jwt-1.0.0 create mode 100644 metadata/md5-cache/dev-ruby/jwt-1.2.1 delete mode 100644 metadata/md5-cache/dev-ruby/listen-0.7.3 delete mode 100644 metadata/md5-cache/dev-ruby/listen-2.7.5 rename metadata/md5-cache/dev-util/{jenkins-bin-1.595 => jenkins-bin-1.598} (71%) create mode 100644 metadata/md5-cache/dev-util/trace-cmd-2.5.1 create mode 100644 metadata/md5-cache/dev-vcs/git-flow-1.8.0 create mode 100644 metadata/md5-cache/games-action/d1x-rebirth-0.58.1 delete mode 100644 metadata/md5-cache/games-action/hotline-miami-1.0.9a delete mode 100644 metadata/md5-cache/games-action/lugaru-1.0c delete mode 100644 metadata/md5-cache/games-action/minetest-0.4.10 delete mode 100644 metadata/md5-cache/games-action/openclonk-5.3.3 delete mode 100644 metadata/md5-cache/games-arcade/commandergenius-1.7.2.0 delete mode 100644 metadata/md5-cache/games-arcade/commandergenius-1.7.3.0 delete mode 100644 metadata/md5-cache/games-arcade/diameter-0.4.0.3 delete mode 100644 metadata/md5-cache/games-arcade/dynamitejack-1.0.23 delete mode 100644 metadata/md5-cache/games-arcade/watermelons-1.1.1 delete mode 100644 metadata/md5-cache/games-board/xboard-4.7.3 delete mode 100644 metadata/md5-cache/games-emulation/hatari-1.7.0 delete mode 100644 metadata/md5-cache/games-engines/odamex-0.6.2 delete mode 100644 metadata/md5-cache/games-engines/odamex-0.6.3 rename metadata/md5-cache/games-engines/{residualvm-0.1.0 => residualvm-0.2.1} (89%) delete mode 100644 metadata/md5-cache/games-engines/solarus-1.2.1 delete mode 100644 metadata/md5-cache/games-engines/solarus-1.3.0 delete mode 100644 metadata/md5-cache/games-fps/doomsday-1.9.8 delete mode 100644 metadata/md5-cache/games-fps/eduke32-20130317.3572-r1 delete mode 100644 metadata/md5-cache/games-fps/eduke32-20130627.3905 delete mode 100644 metadata/md5-cache/games-fps/etqw-demo-2.0_p1 delete mode 100644 metadata/md5-cache/games-fps/quake3-excessiveplus-1.03 delete mode 100644 metadata/md5-cache/games-fps/soldieroffortune-demo-0.57 delete mode 100644 metadata/md5-cache/games-fps/urbanterror-4.1.1 delete mode 100644 metadata/md5-cache/games-fps/ut2004-crossfire-1.93 delete mode 100644 metadata/md5-cache/games-misc/dont-starve-1 delete mode 100644 metadata/md5-cache/games-misc/katawa-shoujo-1.0-r1 delete mode 100644 metadata/md5-cache/games-misc/katawa-shoujo-1.1-r1 delete mode 100644 metadata/md5-cache/games-misc/katawa-shoujo-1.2 delete mode 100644 metadata/md5-cache/games-misc/lolcat-42.0.99-r1 delete mode 100644 metadata/md5-cache/games-misc/opengfx-0.4.7 delete mode 100644 metadata/md5-cache/games-puzzle/angrydd-1.0.1 delete mode 100644 metadata/md5-cache/games-puzzle/jools-0.20-r1 delete mode 100644 metadata/md5-cache/games-rpg/dragonhunt-3.56 delete mode 100644 metadata/md5-cache/games-rpg/freedink-108.2 delete mode 100644 metadata/md5-cache/games-rpg/mana-0.5.3 delete mode 100644 metadata/md5-cache/games-rpg/manaplus-1.3.6.9 delete mode 100644 metadata/md5-cache/games-rpg/tmw-20120727 delete mode 100644 metadata/md5-cache/games-rpg/zsdx-1.8.0-r1 delete mode 100644 metadata/md5-cache/games-rpg/zsxd-1.8.0-r1 delete mode 100644 metadata/md5-cache/games-server/cyphesis-0.6.0 delete mode 100644 metadata/md5-cache/games-server/monopd-0.9.3-r1 delete mode 100644 metadata/md5-cache/games-simulation/openttd-1.4.2 delete mode 100644 metadata/md5-cache/games-sports/dustrac-1.7.2 delete mode 100644 metadata/md5-cache/games-strategy/lightyears-1.4 delete mode 100644 metadata/md5-cache/games-strategy/liquidwar6-0.0.13_beta delete mode 100644 metadata/md5-cache/games-strategy/liquidwar6-0.2.3551 delete mode 100644 metadata/md5-cache/games-strategy/wesnoth-1.12 delete mode 100644 metadata/md5-cache/games-util/grfcodec-6.0.0 create mode 100644 metadata/md5-cache/mail-client/roundcube-1.0.5 create mode 100644 metadata/md5-cache/net-im/choqok-1.5 create mode 100644 metadata/md5-cache/net-irc/weechat-1.1.1 create mode 100644 metadata/md5-cache/net-libs/iojs-1.0.4 create mode 100644 metadata/md5-cache/net-libs/webkit-gtk-2.6.5 create mode 100644 metadata/md5-cache/net-mail/isync-1.1.2 create mode 100644 metadata/md5-cache/net-proxy/privoxy-3.0.23 delete mode 100644 metadata/md5-cache/sys-apps/roccat-tools-1.0.0 delete mode 100644 metadata/md5-cache/sys-apps/roccat-tools-1.1.0 delete mode 100644 metadata/md5-cache/sys-apps/roccat-tools-1.4.0 delete mode 100644 metadata/md5-cache/sys-apps/roccat-tools-1.4.1 rename metadata/md5-cache/sys-apps/{roccat-tools-1.6.0 => roccat-tools-2.4.0} (54%) create mode 100644 metadata/md5-cache/sys-devel/binutils-apple-5.1 create mode 100644 metadata/md5-cache/sys-devel/binutils-apple-6.1 create mode 100644 metadata/md5-cache/sys-fs/mtd-utils-1.5.1 create mode 100644 metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.65 create mode 100644 metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.29 rename metadata/md5-cache/www-client/{opera-26.0.1656.32 => opera-27.0.1689.54} (92%) delete mode 100644 metadata/md5-cache/x11-terms/gnome-terminal-3.14.2 rename metadata/md5-cache/x11-terms/{gnome-terminal-3.14.2-r1 => gnome-terminal-3.14.2-r2} (86%) create mode 100644 net-im/choqok/choqok-1.5.ebuild create mode 100644 net-irc/weechat/weechat-1.1.1.ebuild create mode 100644 net-libs/iojs/Manifest create mode 100644 net-libs/iojs/iojs-1.0.4.ebuild create mode 100644 net-libs/iojs/metadata.xml create mode 100644 net-libs/webkit-gtk/webkit-gtk-2.6.5.ebuild create mode 100644 net-mail/isync/isync-1.1.2.ebuild create mode 100644 net-proxy/privoxy/privoxy-3.0.23.ebuild delete mode 100644 sys-apps/roccat-tools/roccat-tools-1.0.0.ebuild delete mode 100644 sys-apps/roccat-tools/roccat-tools-1.1.0.ebuild delete mode 100644 sys-apps/roccat-tools/roccat-tools-1.4.0.ebuild delete mode 100644 sys-apps/roccat-tools/roccat-tools-1.4.1.ebuild rename sys-apps/roccat-tools/{roccat-tools-1.6.0.ebuild => roccat-tools-2.4.0.ebuild} (88%) create mode 100644 sys-devel/binutils-apple/binutils-apple-5.1.ebuild create mode 100644 sys-devel/binutils-apple/binutils-apple-6.1.ebuild create mode 100644 sys-devel/binutils-apple/files/binutils-apple-4.5-as.patch create mode 100644 sys-devel/binutils-apple/files/binutils-apple-5.1-as-dir.patch create mode 100644 sys-devel/binutils-apple/files/binutils-apple-5.1-constant-types.patch create mode 100644 sys-devel/binutils-apple/files/binutils-apple-5.1-extraneous-includes.patch create mode 100644 sys-devel/binutils-apple/files/binutils-apple-5.1-nolto.patch create mode 100644 sys-devel/binutils-apple/files/binutils-apple-5.1-otool-stdc.patch create mode 100644 sys-devel/binutils-apple/files/binutils-apple-5.1-ranlib.patch create mode 100644 sys-devel/binutils-apple/files/binutils-apple-5.1-strnlen.patch create mode 100644 sys-devel/binutils-apple/files/cctools-839-intel-retf.patch create mode 100644 sys-devel/binutils-apple/files/cctools-839-lto.patch create mode 100644 sys-devel/binutils-apple/files/ld64-136-Makefile create mode 100644 sys-devel/binutils-apple/files/ld64-136-compile_stubs.h create mode 100644 sys-devel/binutils-apple/files/ld64-236.3-Makefile create mode 100644 sys-devel/binutils-apple/files/ld64-236.3-arm64-fixup.patch create mode 100644 sys-devel/binutils-apple/files/ld64-236.3-constant-types.patch create mode 100644 sys-devel/binutils-apple/files/ld64-236.3-crashreporter.patch create mode 100644 sys-devel/binutils-apple/files/ld64-236.3-gcc.patch create mode 100644 sys-devel/binutils-apple/files/ld64-236.3-missing-cputypes.patch create mode 100644 sys-devel/binutils-apple/files/ld64-236.3-noarm.patch create mode 100644 sys-devel/binutils-apple/files/ld64-236.3-nolto.patch create mode 100644 sys-devel/binutils-apple/files/ld64-236.3-noppc.patch create mode 100644 sys-devel/binutils-apple/files/ld64-236.3-nosnapshots.patch create mode 100644 sys-devel/binutils-apple/files/ld64-241.9-arm64-cputype.patch create mode 100644 sys-devel/binutils-apple/files/ld64-241.9-atomic-volatile.patch create mode 100644 sys-devel/binutils-apple/files/ld64-241.9-cc_md5.patch create mode 100644 sys-devel/binutils-apple/files/ld64-241.9-extraneous-includes.patch create mode 100644 sys-devel/binutils-apple/files/ld64-241.9-gcc.patch create mode 100644 sys-devel/binutils-apple/files/ld64-241.9-get-comm-align.patch create mode 100644 sys-devel/binutils-apple/files/ld64-241.9-noarm.patch create mode 100644 sys-devel/binutils-apple/files/ld64-241.9-nosnapshots.patch create mode 100644 sys-devel/binutils-apple/files/ld64-241.9-register-names.patch create mode 100644 sys-fs/mtd-utils/mtd-utils-1.5.1.ebuild create mode 100644 sys-kernel/tuxonice-sources/tuxonice-sources-3.10.65.ebuild create mode 100644 sys-kernel/tuxonice-sources/tuxonice-sources-3.14.29.ebuild rename www-client/opera/{opera-26.0.1656.32.ebuild => opera-27.0.1689.54.ebuild} (92%) create mode 100644 x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-fix-crash.patch create mode 100644 x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-title-option.patch rename x11-terms/gnome-terminal/{gnome-terminal-3.14.2-r1.ebuild => gnome-terminal-3.14.2-r2.ebuild} (83%) delete mode 100644 x11-terms/gnome-terminal/gnome-terminal-3.14.2.ebuild diff --git a/app-admin/xstow/files/xstow-1.0.1-ncurses.patch b/app-admin/xstow/files/xstow-1.0.1-ncurses.patch new file mode 100644 index 000000000000..a3f0becfd287 --- /dev/null +++ b/app-admin/xstow/files/xstow-1.0.1-ncurses.patch @@ -0,0 +1,27 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -91,11 +91,12 @@ + AC_MSG_RESULT(disabled) + support_curses=0 + else ++ AC_MSG_RESULT(enabled) + support_curses=1 + fi + ], +- [ +- AC_MSG_RESULT(enabled) ++ []) ++if test $support_curses -eq 1; then + AC_CHECK_HEADER([curses.h], + [ + # test which libraray to use +@@ -154,8 +155,7 @@ + [ + support_curses=0 + ]) +- ]) +- ++fi + + NO_STL_SSTREAM=0 + NO_STL_STRSTREAM=0 diff --git a/app-admin/xstow/xstow-1.0.1.ebuild b/app-admin/xstow/xstow-1.0.1.ebuild index 07bbe0f9e7f1..5440022f77f9 100644 --- a/app-admin/xstow/xstow-1.0.1.ebuild +++ b/app-admin/xstow/xstow-1.0.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/xstow/xstow-1.0.1.ebuild,v 1.2 2014/06/27 08:39:09 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/xstow/xstow-1.0.1.ebuild,v 1.3 2015/01/26 18:20:44 jer Exp $ EAPI=5 -inherit eutils +inherit autotools eutils DESCRIPTION="replacement for GNU stow with extensions" HOMEPAGE="http://xstow.sourceforge.net/" @@ -18,6 +18,11 @@ IUSE="ncurses" DEPEND="ncurses? ( sys-libs/ncurses )" RDEPEND="${DEPEND}" +src_prepare() { + epatch "${FILESDIR}"/${P}-ncurses.patch + eautoreconf +} + src_configure() { econf $(use_with ncurses curses) } diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest index 059936d846a3..756d069cebfb 100644 --- a/app-arch/pigz/Manifest +++ b/app-arch/pigz/Manifest @@ -1 +1,2 @@ DIST pigz-2.3.1.tar.gz 86651 SHA256 629b0ce5422a3978f31742bf8275d0be2f84987140d18f390f1e3b4e46e0af54 SHA512 7cb00ab87802352c817d9b2f745948199a7e571181aec3ef161305c1d8b828790bc2fb0083d6068ba5aead5d8b8c7f53ec25ab641ae2e98eda9adf14f195dbc6 WHIRLPOOL 242e38d05215269c3c9b6602191cc6e02fd9e781b0425738c3907ccf60da9a4a36ebcda866c9c0e949ad5988dad6b468f97102352d2ed13adb7e890688c221f7 +DIST pigz-2.3.3.tar.gz 92787 SHA256 4e8b67b432ce7907575a549f3e1cac4709781ba0f6b48afea9f59369846b509c SHA512 6fa5ee1c03b4a8dc4b191acaa337b6f30132503ff413300214e1e6b27dd70590b53334be3fa880916f6ea4498beb8cf7c411a5954fdf188475882c44618c663c WHIRLPOOL 1eb3ea11a0bbb0bd837a1ed12a63b3d57d8ae9c127e8407f9b82b1aad8a41820abf1d429c513f4df3f56fdc3c842caab07a5c904207b2244e4215a6654ef5392 diff --git a/app-arch/pigz/files/pigz-2.3.3-ldflags.patch b/app-arch/pigz/files/pigz-2.3.3-ldflags.patch new file mode 100644 index 000000000000..51c2b81c1fc7 --- /dev/null +++ b/app-arch/pigz/files/pigz-2.3.3-ldflags.patch @@ -0,0 +1,34 @@ +--- pigz-2.3.3/Makefile ++++ pigz-2.3.3/Makefile +@@ -1,11 +1,11 @@ + CC=cc + CFLAGS=-O3 -Wall -Wextra +-LDFLAGS=-lz ++LIBS=-lm -lz + ZOPFLI=zopfli/src/zopfli/ + # use gcc and gmake on Solaris + + pigz: pigz.o yarn.o try.o ${ZOPFLI}deflate.o ${ZOPFLI}blocksplitter.o ${ZOPFLI}tree.o ${ZOPFLI}lz77.o ${ZOPFLI}cache.o ${ZOPFLI}hash.o ${ZOPFLI}util.o ${ZOPFLI}squeeze.o ${ZOPFLI}katajainen.o +- $(CC) $(LDFLAGS) -o pigz $^ -lpthread -lm ++ $(CC) $(LDFLAGS) -o pigz $^ -lpthread $(LIBS) + ln -f pigz unpigz + + pigz.o: pigz.c yarn.h try.h ${ZOPFLI}deflate.h ${ZOPFLI}util.h +@@ -35,7 +35,7 @@ + dev: pigz pigzt pigzn + + pigzt: pigzt.o yarnt.o try.o ${ZOPFLI}deflate.o ${ZOPFLI}blocksplitter.o ${ZOPFLI}tree.o ${ZOPFLI}lz77.o ${ZOPFLI}cache.o ${ZOPFLI}hash.o ${ZOPFLI}util.o ${ZOPFLI}squeeze.o ${ZOPFLI}katajainen.o +- $(CC) $(LDFLAGS) -o pigzt $^ -lpthread -lm ++ $(CC) $(LDFLAGS) -o pigzt $^ -lpthread $(LIBS) + + pigzt.o: pigz.c yarn.h try.h + $(CC) $(CFLAGS) -DDEBUG -g -c -o pigzt.o pigz.c +@@ -44,7 +44,7 @@ + $(CC) $(CFLAGS) -DDEBUG -g -c -o yarnt.o yarn.c + + pigzn: pigzn.o tryn.o ${ZOPFLI}deflate.o ${ZOPFLI}blocksplitter.o ${ZOPFLI}tree.o ${ZOPFLI}lz77.o ${ZOPFLI}cache.o ${ZOPFLI}hash.o ${ZOPFLI}util.o ${ZOPFLI}squeeze.o ${ZOPFLI}katajainen.o +- $(CC) $(LDFLAGS) -o pigzn $^ -lm ++ $(CC) $(LDFLAGS) -o pigzn $^ $(LIBS) + + pigzn.o: pigz.c try.h + $(CC) $(CFLAGS) -DDEBUG -DNOTHREAD -g -c -o pigzn.o pigz.c diff --git a/app-arch/pigz/pigz-2.3.3.ebuild b/app-arch/pigz/pigz-2.3.3.ebuild new file mode 100644 index 000000000000..da43b34e0f80 --- /dev/null +++ b/app-arch/pigz/pigz-2.3.3.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/pigz/pigz-2.3.3.ebuild,v 1.1 2015/01/27 04:33:36 radhermit Exp $ + +EAPI=5 + +inherit toolchain-funcs flag-o-matic eutils + +DESCRIPTION="A parallel implementation of gzip" +HOMEPAGE="http://www.zlib.net/pigz/" +SRC_URI="http://www.zlib.net/pigz/${P}.tar.gz" + +LICENSE="ZLIB" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86 ~amd64-linux ~sparc64-solaris" +IUSE="static symlink test" + +LIB_DEPEND="sys-libs/zlib[static-libs(+)]" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} ) + test? ( app-arch/ncompress )" + +src_prepare() { + epatch "${FILESDIR}"/${P}-ldflags.patch +} + +src_compile() { + use static && append-ldflags -static + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" +} + +src_install() { + dobin ${PN} + dosym ${PN} /usr/bin/un${PN} + dodoc README + doman ${PN}.1 + + if use symlink; then + dosym ${PN} /usr/bin/gzip + dosym un${PN} /usr/bin/gunzip + fi +} diff --git a/app-crypt/gkeys-gen/gkeys-gen-9999.ebuild b/app-crypt/gkeys-gen/gkeys-gen-9999.ebuild index 8b4bb793b1c3..798a292cf1f5 100644 --- a/app-crypt/gkeys-gen/gkeys-gen-9999.ebuild +++ b/app-crypt/gkeys-gen/gkeys-gen-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gkeys-gen/gkeys-gen-9999.ebuild,v 1.4 2015/01/09 22:35:13 dolsen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gkeys-gen/gkeys-gen-9999.ebuild,v 1.5 2015/01/27 01:47:20 dolsen Exp $ EAPI="5" @@ -39,6 +39,7 @@ python_prepare_all() { # copy these 2 into our subdir from the master level cp ../LICENSE ./ || die "cp LICENSE failed" cp ../README.md ./ || die "cp README.me failed" + cp -R ../py2man ./ || die "cp-R py2man failed" } pkg_postinst() { diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest index bc4b2fc237c9..06332c696e89 100644 --- a/app-editors/gvim/Manifest +++ b/app-editors/gvim/Manifest @@ -1,6 +1,7 @@ DIST vim-7.4-gentoo-patches.tar.bz2 3314 SHA256 704e2ef7fc3a9f3e721b4c9cbc619a47e5bec8b9ddbb9d3cdc3123b10d53e373 SHA512 ed22f899b93e06515512c92d8a840f84c56f5f7a02541687c07cfdce5dbab89cdd68301bef15d7b18f1149292edd592a0a1ac5b0bccfe478c56ccfd2a760f890 WHIRLPOOL a240183a7e90227916aed3a198a9408f2c35056bdf6d93a879f88f620845bd287e8d3887dfeec91e187681d9ef669ea96cc790efacf7714ae8e1213113f4ca34 DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2 DIST vim-7.4.560.patch.xz 741936 SHA256 e67cb9ba8772c72c3ebed0727e6dd57fc8eaeb1c8087cab7b9b8fe52f9063e04 SHA512 6748efa85883cbe811f4997192f5c0c11ac4825b40a3ef81a9a457eab26d86868aea6f62c8ced7018b3a7758242bd6c8e789fdfb8ce111f4b468f6563bc146fd WHIRLPOOL 45864fdabb133551c66768a4c075588744b99fc823f555ae19a440b2486054e1336c64c50f0bd7e3c1c0c88a0e345595a4bd384cd7dde312ff1465351db869e1 +DIST vim-7.4.591.patch.xz 805892 SHA256 6556595e75666b35cce58dcd585605e3d8910477761cee0fb34317d8969e0344 SHA512 fd98fa6e84fb1b6dc3c80f1e68694ee3711678e66234953962c6bad1aaf045c053c3824d25dd3df9842951e9c5e3ca630b65fafedc30fa6c31313822e3518968 WHIRLPOOL 47f5a75d2faec35460ee0af565437da275b2cd18259645456a76ba79d289d7b8f7392cde95d6cb5da5e2b4657043c11f5f363e99d1cb8457f83dfa884f5ab238 DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4 DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f1db4394ff5655520719f6338ff29e89ca SHA512 029a5cef758e4b201eabbc82458f3e1c3674582715a8c78a7270f3ecd57980b1cef66a0152526fd3505685c27c07f6e6742da48da9ad9546e3cfc2a5e7c11164 WHIRLPOOL 305322e991e9640b80147dd5ceac9dd6dae93a07610f807bbf01c0fdf37cba67ea41a1b2720c8a43da0161c57e0a522086f135efc712fb0106497a21288a872a DIST vim-patches-7.4.488.patch.bz2 755739 SHA256 831bd6338a5169d90b82c313ea73256a70325ad8b721e2b7052d9d5ec5ff2fde SHA512 53a1041e2baa6477b179fd7879ca76867a8fff9cc21a7e843519fb96c3f880f6053760a7465d68c84ee4d7f6cb42cc2017152789a4b57db7953d20bbfa7dd4aa WHIRLPOOL 0bfc8d839e1d886ac8339edf01bb84e46f8c1d3754791d565d3b4050ebf678b548792c8d94b1c8f09824ebbee52fb1df9c65670b63fa860032278b318b89db66 diff --git a/app-editors/gvim/gvim-7.4.591.ebuild b/app-editors/gvim/gvim-7.4.591.ebuild new file mode 100644 index 000000000000..b34939f92fd2 --- /dev/null +++ b/app-editors/gvim/gvim-7.4.591.ebuild @@ -0,0 +1,414 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.591.ebuild,v 1.1 2015/01/26 23:27:38 radhermit Exp $ + +EAPI=5 +VIM_VERSION="7.4" +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +PYTHON_REQ_USE=threads +inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 prefix python-single-r1 + +if [[ ${PV} == 9999* ]] ; then + inherit mercurial + EHG_REPO_URI="https://vim.googlecode.com/hg/" + EHG_PROJECT="vim" +else + VIM_ORG_PATCH="vim-${PV}.patch.xz" + SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2 + http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH} + http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +fi + +DESCRIPTION="GUI version of the Vim text editor" +HOMEPAGE="http://www.vim.org/" + +SLOT="0" +LICENSE="vim" +IUSE="acl aqua cscope debug gnome gtk lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl" +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + luajit? ( lua ) +" + +RDEPEND=" + ~app-editors/vim-core-${PV} + >=app-admin/eselect-vi-1.1 + >=sys-libs/ncurses-5.2-r2 + x11-libs/libXext + x11-libs/libXt + acl? ( kernel_linux? ( sys-apps/acl ) ) + !aqua? ( + gtk? ( + >=x11-libs/gtk+-2.6:2 + x11-libs/libXft + gnome? ( >=gnome-base/libgnomeui-2.6 ) + ) + !gtk? ( + motif? ( >=x11-libs/motif-2.3:0 ) + !motif? ( + neXt? ( x11-libs/neXtaw ) + !neXt? ( x11-libs/libXaw ) + ) + ) + ) + cscope? ( dev-util/cscope ) + lua? ( + luajit? ( dev-lang/luajit ) + !luajit? ( dev-lang/lua[deprecated] ) + ) + nls? ( virtual/libintl ) + perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} ) + racket? ( dev-scheme/racket ) + ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) + selinux? ( sys-libs/libselinux ) + session? ( x11-libs/libSM ) + tcl? ( dev-lang/tcl ) +" +DEPEND="${RDEPEND} + dev-util/ctags + sys-devel/autoconf + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +S=${WORKDIR}/vim${VIM_VERSION/.} + +pkg_setup() { + # people with broken alphabets run into trouble. bug 82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + # Gnome sandbox silliness. bug #114475. + mkdir -p "${T}"/home + export HOME="${T}"/home + + use python && python-single-r1_pkg_setup +} + +src_prepare() { + if [[ ${PV} != 9999* ]] ; then + if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then + # Apply any patches available from vim.org for this version + epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz} + fi + + if [[ -d "${WORKDIR}"/patches/ ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \ + epatch "${WORKDIR}"/patches/ + fi + fi + + # Fixup a script to use awk instead of nawk + sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \ + || die "mve.awk sed failed" + + # Read vimrc and gvimrc from /etc/vim + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug 29398 (27 Sep 2003 agriffis) + sed -i 's/\> "$c" ; done + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]] ; then + sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile + fi + + if version_is_at_least 7.3.122 ; then + cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk + fi + + # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 + if version_is_at_least 7.3 ; then + sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' + fi + + epatch_user +} + +src_configure() { + local myconf=() + + # Fix bug 37354: Disallow -funroll-all-loops on amd64 + # Bug 57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + + # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for + # everyone since previous flag filtering bugs have turned out to affect + # multiple archs... + replace-flags -O3 -O2 + + # Fix bug 18245: Prevent "make" from the following chain: + # (1) Notice configure.in is newer than auto/configure + # (2) Rebuild auto/configure + # (3) Notice auto/configure is newer than auto/config.mk + # (4) Run ./configure (with wrong args) to remake auto/config.mk + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + rm -f src/auto/configure + emake -j1 -C src autoconf + + # This should fix a sandbox violation (see bug 24447). The hvc + # things are for ppc64, see bug 86433. + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do + [[ -e ${file} ]] && addwrite $file + done + + use debug && append-flags "-DDEBUG" + + myconf=( + --with-features=huge + --disable-gpm + --enable-multibyte + $(use_enable acl) + $(use_enable cscope) + $(use_enable lua luainterp) + $(use_with luajit) + $(use_enable netbeans) + $(use_enable nls) + $(use_enable perl perlinterp) + $(use_enable racket mzschemeinterp) + $(use_enable ruby rubyinterp) + $(use_enable selinux) + $(use_enable session xsmp) + $(use_enable tcl tclinterp) + ) + + if use python ; then + if [[ ${EPYTHON} == python3* ]] ; then + myconf+=( --enable-python3interp ) + export vi_cv_path_python3="${PYTHON}" + else + myconf+=( --enable-pythoninterp ) + export vi_cv_path_python="${PYTHON}" + fi + else + myconf+=( + --disable-pythoninterp + --disable-python3interp + ) + fi + + # --with-features=huge forces on cscope even if we --disable it. We need + # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) + if ! use cscope ; then + sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \ + die "couldn't disable cscope" + fi + + # gvim's GUI preference order is as follows: + # aqua CARBON (not tested) + # -aqua gtk gnome GNOME2 + # -aqua gtk -gnome GTK2 + # -aqua -gtk motif MOTIF + # -aqua -gtk -motif neXt NEXTAW + # -aqua -gtk -motif -neXt ATHENA + echo ; echo + if use aqua ; then + einfo "Building gvim with the Carbon GUI" + myconf+=( + --enable-darwin + --enable-gui=carbon + ) + elif use gtk ; then + myconf+=( --enable-gtk2-check ) + if use gnome ; then + einfo "Building gvim with the Gnome 2 GUI" + myconf+=( --enable-gui=gnome2 ) + else + einfo "Building gvim with the gtk+-2 GUI" + myconf+=( --enable-gui=gtk2 ) + fi + elif use motif ; then + einfo "Building gvim with the MOTIF GUI" + myconf+=( --enable-gui=motif ) + elif use neXt ; then + einfo "Building gvim with the neXtaw GUI" + myconf+=( --enable-gui=nextaw ) + else + einfo "Building gvim with the Athena GUI" + myconf+=( --enable-gui=athena ) + fi + echo ; echo + + # Let Portage do the stripping. Some people like that. + export ac_cv_prog_STRIP="$(type -P true ) faking strip" + + # Keep Gentoo Prefix env contained within the EPREFIX + use prefix && myconf+=( --without-local-dir ) + + if [[ ${CHOST} == *-interix* ]]; then + # avoid finding of this function, to avoid having to patch either + # configure or the source, which would be much more hackish. + # after all vim does it right, only interix is badly broken (again) + export ac_cv_func_sigaction=no + fi + + econf \ + --with-modified-by=Gentoo-${PVR} \ + --with-vim-name=gvim \ + --with-x \ + "${myconf[@]}" +} + +src_compile() { + # The following allows emake to be used + emake -j1 -C src auto/osdef.h objects + + emake +} + +src_test() { + echo + einfo "Starting vim tests. Several error messages will be shown" + einfo "while the tests run. This is normal behaviour and does not" + einfo "indicate a fault." + echo + ewarn "If the tests fail, your terminal may be left in a strange" + ewarn "state. Usually, running 'reset' will fix this." + echo + + # Don't let vim talk to X + unset DISPLAY + + # We've got to call make test from within testdir, since the Makefiles + # don't pass through our VIMPROG argument + cd "${S}"/src/testdir + + # Test 49 won't work inside a portage environment + einfo "Test 49 isn't sandbox-friendly, so it will be skipped." + sed -i 's~test49.out~~g' Makefile + + # We don't want to rebuild vim before running the tests + sed -i 's,: \$(VIMPROG),: ,' Makefile + + # Make gvim not try to connect to X. See :help gui-x11-start + # in vim for how this evil trickery works. + ln -s "${S}"/src/gvim "${S}"/src/testvim + + # Don't try to do the additional GUI test + emake -j1 VIMPROG=../testvim nongui +} + +# Make convenience symlinks, hopefully without stepping on toes. Some +# of these links are "owned" by the vim ebuild when it is installed, +# but they might be good for gvim as well (see bug 45828) +update_vim_symlinks() { + local f syms + syms="vimdiff rvim rview" + einfo "Calling eselect vi update..." + # Call this with --if-unset to respect user's choice (bug 187449) + eselect vi update --if-unset + + # Make or remove convenience symlink, vim -> gvim + if [[ -f "${EROOT}"/usr/bin/gvim ]]; then + ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null + elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then + rm "${EROOT}"/usr/bin/vim + fi + + # Make or remove convenience symlinks to vim + if [[ -f "${EROOT}"/usr/bin/vim ]]; then + for f in ${syms}; do + ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null + done + else + for f in ${syms}; do + if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then + rm -f "${EROOT}"/usr/bin/${f} + fi + done + fi + + # This will still break if you merge then remove the vi package, + # but there's only so much you can do, eh? Unfortunately we don't + # have triggers like are done in rpm-land. +} + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + dobin src/gvim + dosym gvim /usr/bin/gvimdiff + dosym gvim /usr/bin/evim + dosym gvim /usr/bin/eview + dosym gvim /usr/bin/gview + dosym gvim /usr/bin/rgvim + dosym gvim /usr/bin/rgview + + dodir /usr/share/man/man1 + echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 + echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 + echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 + + insinto /etc/vim + newins "${FILESDIR}"/gvimrc-r1 gvimrc + eprefixify "${ED}"/etc/vim/gvimrc + + newmenu "${FILESDIR}"/gvim.desktop-r2 gvim.desktop + doicon "${FILESDIR}"/gvim.xpm + + # bash completion script, bug #79018. + newbashcomp "${FILESDIR}"/${PN}-completion ${PN} + + # We shouldn't be installing the ex or view man page symlinks, as they + # are managed by eselect-vi + rm -f "${ED}"/usr/share/man/man1/{ex,view}.1 +} + +pkg_postinst() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Update fdo mime stuff, bug #78394 + fdo-mime_mime_database_update + + if [[ -z ${REPLACING_VERSIONS} ]] ; then + echo + elog "Vim 7 includes an integrated spell checker. You need to install" + elog "word list files before you can use it. There are ebuilds for" + elog "some of these named app-vim/vim-spell-*. If your language of" + elog "choice is not included, please consult vim-spell.eclass for" + elog "instructions on how to make a package." + echo + ewarn "Note that the English word lists are no longer installed by" + ewarn "default." + echo + fi + + # Make convenience symlinks + update_vim_symlinks +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Update fdo mime stuff, bug #78394 + fdo-mime_mime_database_update + + # Make convenience symlinks + update_vim_symlinks +} diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest index a71b278475a5..80a821ebac2c 100644 --- a/app-editors/vim-core/Manifest +++ b/app-editors/vim-core/Manifest @@ -1,6 +1,7 @@ DIST vim-7.4-gentoo-patches.tar.bz2 3314 SHA256 704e2ef7fc3a9f3e721b4c9cbc619a47e5bec8b9ddbb9d3cdc3123b10d53e373 SHA512 ed22f899b93e06515512c92d8a840f84c56f5f7a02541687c07cfdce5dbab89cdd68301bef15d7b18f1149292edd592a0a1ac5b0bccfe478c56ccfd2a760f890 WHIRLPOOL a240183a7e90227916aed3a198a9408f2c35056bdf6d93a879f88f620845bd287e8d3887dfeec91e187681d9ef669ea96cc790efacf7714ae8e1213113f4ca34 DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2 DIST vim-7.4.560.patch.xz 741936 SHA256 e67cb9ba8772c72c3ebed0727e6dd57fc8eaeb1c8087cab7b9b8fe52f9063e04 SHA512 6748efa85883cbe811f4997192f5c0c11ac4825b40a3ef81a9a457eab26d86868aea6f62c8ced7018b3a7758242bd6c8e789fdfb8ce111f4b468f6563bc146fd WHIRLPOOL 45864fdabb133551c66768a4c075588744b99fc823f555ae19a440b2486054e1336c64c50f0bd7e3c1c0c88a0e345595a4bd384cd7dde312ff1465351db869e1 +DIST vim-7.4.591.patch.xz 805892 SHA256 6556595e75666b35cce58dcd585605e3d8910477761cee0fb34317d8969e0344 SHA512 fd98fa6e84fb1b6dc3c80f1e68694ee3711678e66234953962c6bad1aaf045c053c3824d25dd3df9842951e9c5e3ca630b65fafedc30fa6c31313822e3518968 WHIRLPOOL 47f5a75d2faec35460ee0af565437da275b2cd18259645456a76ba79d289d7b8f7392cde95d6cb5da5e2b4657043c11f5f363e99d1cb8457f83dfa884f5ab238 DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4 DIST vim-core-7.3-gentoo-patches-r4.tar.bz2 3015 SHA256 a4f61e4d0cd1848812f603e7f6b8a5304d13ac199f4e3061264cd3bec75a17c5 SHA512 0ba7a20dfdc2c24a92a4af5a6fe49a94d5d5c5e9111c42c4812d0cd52c26cc567acd2d7e74f66730afd3c4bc9f1667b0ad9c1f82f93d2844d8309b143f293676 WHIRLPOOL cec628c0f19971077677e667cc8903ea0a56041799a43907d47acc218fd9e0a6ea2a2a30999c74512fb36d233c6ac6d436f033684290155ff6ae70be5277bdbf DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f1db4394ff5655520719f6338ff29e89ca SHA512 029a5cef758e4b201eabbc82458f3e1c3674582715a8c78a7270f3ecd57980b1cef66a0152526fd3505685c27c07f6e6742da48da9ad9546e3cfc2a5e7c11164 WHIRLPOOL 305322e991e9640b80147dd5ceac9dd6dae93a07610f807bbf01c0fdf37cba67ea41a1b2720c8a43da0161c57e0a522086f135efc712fb0106497a21288a872a diff --git a/app-editors/vim-core/vim-core-7.4.591.ebuild b/app-editors/vim-core/vim-core-7.4.591.ebuild new file mode 100644 index 000000000000..bb19f9752168 --- /dev/null +++ b/app-editors/vim-core/vim-core-7.4.591.ebuild @@ -0,0 +1,230 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.4.591.ebuild,v 1.1 2015/01/26 23:25:08 radhermit Exp $ + +EAPI=5 +VIM_VERSION="7.4" +inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix + +if [[ ${PV} == 9999* ]] ; then + inherit mercurial + EHG_REPO_URI="https://vim.googlecode.com/hg/" + EHG_PROJECT="vim" +else + VIM_ORG_PATCH="vim-${PV}.patch.xz" + SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2 + http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH} + http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="vim and gvim shared files" +HOMEPAGE="http://www.vim.org/" + +SLOT="0" +LICENSE="vim" +IUSE="nls acl minimal" + +DEPEND="sys-devel/autoconf" +PDEPEND="!minimal? ( app-vim/gentoo-syntax )" + +S=${WORKDIR}/vim${VIM_VERSION/.} + +pkg_setup() { + # people with broken alphabets run into trouble. bug 82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + # Gnome sandbox silliness. bug #114475. + mkdir -p "${T}"/home + export HOME="${T}"/home +} + +src_prepare() { + if [[ ${PV} != 9999* ]] ; then + if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then + # Apply any patches available from vim.org for this version + epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz} + fi + + if [[ -d "${WORKDIR}"/patches/ ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \ + epatch "${WORKDIR}"/patches/ + fi + fi + + # Fixup a script to use awk instead of nawk + sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \ + || die "mve.awk sed failed" + + # Read vimrc and gvimrc from /etc/vim + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug 29398 (27 Sep 2003 agriffis) + sed -i 's/\> "$c" ; done + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]] ; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile + fi + + if version_is_at_least 7.3.122 ; then + cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk + fi + + # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 + if version_is_at_least 7.3 ; then + sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' + fi + + epatch_user +} + +src_configure() { + local myconf + + # Fix bug 37354: Disallow -funroll-all-loops on amd64 + # Bug 57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + + # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for + # everyone since previous flag filtering bugs have turned out to affect + # multiple archs... + replace-flags -O3 -O2 + + # Fix bug 18245: Prevent "make" from the following chain: + # (1) Notice configure.in is newer than auto/configure + # (2) Rebuild auto/configure + # (3) Notice auto/configure is newer than auto/config.mk + # (4) Run ./configure (with wrong args) to remake auto/config.mk + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + rm -f src/auto/configure + emake -j1 -C src autoconf + + # This should fix a sandbox violation (see bug 24447). The hvc + # things are for ppc64, see bug 86433. + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do + [[ -e ${file} ]] && addwrite $file + done + + # Let Portage do the stripping. Some people like that. + export ac_cv_prog_STRIP="$(type -P true ) faking strip" + + # Keep Gentoo Prefix env contained within the EPREFIX + use prefix && myconf+=" --without-local-dir" + + econf \ + --with-modified-by=Gentoo-${PVR} \ + --enable-gui=no \ + --without-x \ + --disable-darwin \ + --disable-perlinterp \ + --disable-pythoninterp \ + --disable-rubyinterp \ + --disable-gpm \ + --disable-selinux \ + $(use_enable nls) \ + $(use_enable acl) \ + ${myconf} +} + +src_compile() { + # The following allows emake to be used + emake -j1 -C src auto/osdef.h objects + + emake tools +} + +src_test() { :; } + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + dodir /usr/{bin,share/{man/man1,vim}} + cd src || die "cd src failed" + emake \ + installruntime \ + installmanlinks \ + installmacros \ + installtutor \ + installtutorbin \ + installtools \ + install-languages \ + install-icons \ + DESTDIR="${D}" \ + BINDIR="${EPREFIX}"/usr/bin \ + MANDIR="${EPREFIX}"/usr/share/man \ + DATADIR="${EPREFIX}"/usr/share + + keepdir ${vimfiles}/keymap + + # default vimrc is installed by vim-core since it applies to + # both vim and gvim + insinto /etc/vim/ + newins "${FILESDIR}"/vimrc-r4 vimrc + eprefixify "${ED}"/etc/vim/vimrc + + if use minimal ; then + # To save space, install only a subset of the files. + # Helps minimalize the livecd, bug 65144. + eshopts_push -s extglob + + rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} + rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor} + rm "${ED}"/usr/bin/vimtutor + + local keep_colors="default" + ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) + + local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig" + # tinkering with the next line might make bad things happen ... + keep_syntax="${keep_syntax}|syntax|nosyntax|synload" + ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) + + eshopts_pop + fi + + # These files might have slight security issues, so we won't + # install them. See bug #77841. We don't mind if these don't + # exist. + rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null + + newbashcomp "${FILESDIR}"/xxd-completion xxd + + # We shouldn't be installing the ex or view man page symlinks, as they + # are managed by eselect-vi + rm -f "${ED}"/usr/share/man/man1/{ex,view}.1 +} + +pkg_postinst() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags +} diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild index 4f0c5109d8cd..a787142c0b44 100644 --- a/app-editors/vim-core/vim-core-9999.ebuild +++ b/app-editors/vim-core/vim-core-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild,v 1.13 2015/01/04 05:45:17 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild,v 1.14 2015/01/26 23:25:08 radhermit Exp $ EAPI=5 VIM_VERSION="7.4" @@ -15,7 +15,7 @@ else SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2 http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH} http://dev.gentoo.org/~radhermit/vim/vim-${PV}-gentoo-patches.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="vim and gvim shared files" diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest index bc4b2fc237c9..06332c696e89 100644 --- a/app-editors/vim/Manifest +++ b/app-editors/vim/Manifest @@ -1,6 +1,7 @@ DIST vim-7.4-gentoo-patches.tar.bz2 3314 SHA256 704e2ef7fc3a9f3e721b4c9cbc619a47e5bec8b9ddbb9d3cdc3123b10d53e373 SHA512 ed22f899b93e06515512c92d8a840f84c56f5f7a02541687c07cfdce5dbab89cdd68301bef15d7b18f1149292edd592a0a1ac5b0bccfe478c56ccfd2a760f890 WHIRLPOOL a240183a7e90227916aed3a198a9408f2c35056bdf6d93a879f88f620845bd287e8d3887dfeec91e187681d9ef669ea96cc790efacf7714ae8e1213113f4ca34 DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2 DIST vim-7.4.560.patch.xz 741936 SHA256 e67cb9ba8772c72c3ebed0727e6dd57fc8eaeb1c8087cab7b9b8fe52f9063e04 SHA512 6748efa85883cbe811f4997192f5c0c11ac4825b40a3ef81a9a457eab26d86868aea6f62c8ced7018b3a7758242bd6c8e789fdfb8ce111f4b468f6563bc146fd WHIRLPOOL 45864fdabb133551c66768a4c075588744b99fc823f555ae19a440b2486054e1336c64c50f0bd7e3c1c0c88a0e345595a4bd384cd7dde312ff1465351db869e1 +DIST vim-7.4.591.patch.xz 805892 SHA256 6556595e75666b35cce58dcd585605e3d8910477761cee0fb34317d8969e0344 SHA512 fd98fa6e84fb1b6dc3c80f1e68694ee3711678e66234953962c6bad1aaf045c053c3824d25dd3df9842951e9c5e3ca630b65fafedc30fa6c31313822e3518968 WHIRLPOOL 47f5a75d2faec35460ee0af565437da275b2cd18259645456a76ba79d289d7b8f7392cde95d6cb5da5e2b4657043c11f5f363e99d1cb8457f83dfa884f5ab238 DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4 DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f1db4394ff5655520719f6338ff29e89ca SHA512 029a5cef758e4b201eabbc82458f3e1c3674582715a8c78a7270f3ecd57980b1cef66a0152526fd3505685c27c07f6e6742da48da9ad9546e3cfc2a5e7c11164 WHIRLPOOL 305322e991e9640b80147dd5ceac9dd6dae93a07610f807bbf01c0fdf37cba67ea41a1b2720c8a43da0161c57e0a522086f135efc712fb0106497a21288a872a DIST vim-patches-7.4.488.patch.bz2 755739 SHA256 831bd6338a5169d90b82c313ea73256a70325ad8b721e2b7052d9d5ec5ff2fde SHA512 53a1041e2baa6477b179fd7879ca76867a8fff9cc21a7e843519fb96c3f880f6053760a7465d68c84ee4d7f6cb42cc2017152789a4b57db7953d20bbfa7dd4aa WHIRLPOOL 0bfc8d839e1d886ac8339edf01bb84e46f8c1d3754791d565d3b4050ebf678b548792c8d94b1c8f09824ebbee52fb1df9c65670b63fa860032278b318b89db66 diff --git a/app-editors/vim/vim-7.4.591.ebuild b/app-editors/vim/vim-7.4.591.ebuild new file mode 100644 index 000000000000..ecd75c43eac6 --- /dev/null +++ b/app-editors/vim/vim-7.4.591.ebuild @@ -0,0 +1,388 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.4.591.ebuild,v 1.1 2015/01/26 23:26:21 radhermit Exp $ + +EAPI=5 +VIM_VERSION="7.4" +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +PYTHON_REQ_USE=threads +inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-single-r1 + +if [[ ${PV} == 9999* ]] ; then + inherit mercurial + EHG_REPO_URI="https://vim.googlecode.com/hg/" + EHG_PROJECT="vim" +else + VIM_ORG_PATCH="vim-${PV}.patch.xz" + SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2 + http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH} + http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="Vim, an improved vi-style text editor" +HOMEPAGE="http://www.vim.org/" + +SLOT="0" +LICENSE="vim" +IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager" +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + luajit? ( lua ) +" + +RDEPEND=" + >=app-admin/eselect-vi-1.1 + >=sys-libs/ncurses-5.2-r2 + nls? ( virtual/libintl ) + acl? ( kernel_linux? ( sys-apps/acl ) ) + cscope? ( dev-util/cscope ) + gpm? ( >=sys-libs/gpm-1.19.3 ) + lua? ( + luajit? ( dev-lang/luajit ) + !luajit? ( dev-lang/lua[deprecated] ) + ) + !minimal? ( + ~app-editors/vim-core-${PV} + dev-util/ctags + ) + perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} ) + racket? ( dev-scheme/racket ) + ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) + selinux? ( sys-libs/libselinux ) + tcl? ( dev-lang/tcl ) + X? ( x11-libs/libXt ) +" +DEPEND="${RDEPEND} + sys-devel/autoconf + nls? ( sys-devel/gettext ) +" + +S=${WORKDIR}/vim${VIM_VERSION/.} + +pkg_setup() { + # people with broken alphabets run into trouble. bug 82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + # Gnome sandbox silliness. bug #114475. + mkdir -p "${T}"/home + export HOME="${T}"/home + + use python && python-single-r1_pkg_setup +} + +src_prepare() { + if [[ ${PV} != 9999* ]] ; then + if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then + # Apply any patches available from vim.org for this version + epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz} + fi + + if [[ -d "${WORKDIR}"/patches/ ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \ + epatch "${WORKDIR}"/patches/ + fi + fi + + # Fixup a script to use awk instead of nawk + sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \ + || die "mve.awk sed failed" + + # Read vimrc and gvimrc from /etc/vim + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug 29398 (27 Sep 2003 agriffis) + sed -i 's/\> "$c" ; done + + # conditionally make the manpager.sh script + if use vim-pager ; then + cat <<-END > "${S}"/runtime/macros/manpager.sh + #!/bin/sh + sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\ + vim \\ + -c 'let no_plugin_maps = 1' \\ + -c 'set nolist nomod ft=man' \\ + -c 'let g:showmarks_enable=0' \\ + -c 'runtime! macros/less.vim' - + END + fi + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]] ; then + sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile + fi + + if version_is_at_least 7.3.122 ; then + cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk + fi + + # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 + if version_is_at_least 7.3 ; then + sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' + fi + + epatch_user +} + +src_configure() { + local myconf=() + + # Fix bug 37354: Disallow -funroll-all-loops on amd64 + # Bug 57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + + # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for + # everyone since previous flag filtering bugs have turned out to affect + # multiple archs... + replace-flags -O3 -O2 + + # Fix bug 18245: Prevent "make" from the following chain: + # (1) Notice configure.in is newer than auto/configure + # (2) Rebuild auto/configure + # (3) Notice auto/configure is newer than auto/config.mk + # (4) Run ./configure (with wrong args) to remake auto/config.mk + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + rm -f src/auto/configure + emake -j1 -C src autoconf + + # This should fix a sandbox violation (see bug 24447). The hvc + # things are for ppc64, see bug 86433. + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do + [[ -e ${file} ]] && addwrite $file + done + + if use minimal ; then + myconf=( + --with-features=tiny + --disable-nls + --disable-multibyte + --disable-acl + --enable-gui=no + --without-x + --disable-darwin + --disable-luainterp + --disable-perlinterp + --disable-pythoninterp + --disable-mzschemeinterp + --disable-rubyinterp + --disable-selinux + --disable-tclinterp + --disable-gpm + ) + else + use debug && append-flags "-DDEBUG" + + myconf=( + --with-features=huge + --enable-multibyte + $(use_enable acl) + $(use_enable cscope) + $(use_enable gpm) + $(use_enable lua luainterp) + $(usex lua "--with-lua-prefix=${EPREFIX}/usr" "") + $(use_with luajit) + $(use_enable nls) + $(use_enable perl perlinterp) + $(use_enable racket mzschemeinterp) + $(use_enable ruby rubyinterp) + $(use_enable selinux) + $(use_enable tcl tclinterp) + ) + + if use python ; then + if [[ ${EPYTHON} == python3* ]] ; then + myconf+=( --enable-python3interp ) + export vi_cv_path_python3="${PYTHON}" + else + myconf+=( --enable-pythoninterp ) + export vi_cv_path_python="${PYTHON}" + fi + else + myconf+=( + --disable-pythoninterp + --disable-python3interp + ) + fi + + # --with-features=huge forces on cscope even if we --disable it. We need + # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) + if ! use cscope ; then + sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \ + die "couldn't disable cscope" + fi + + # don't test USE=X here ... see bug #19115 + # but need to provide a way to link against X ... see bug #20093 + myconf+=( + --enable-gui=no + --disable-darwin + $(use_with X x) + ) + fi + + # Let Portage do the stripping. Some people like that. + export ac_cv_prog_STRIP="$(type -P true ) faking strip" + + # Keep Gentoo Prefix env contained within the EPREFIX + use prefix && myconf+=( --without-local-dir ) + + econf \ + --with-modified-by=Gentoo-${PVR} \ + "${myconf[@]}" +} + +src_compile() { + # The following allows emake to be used + emake -j1 -C src auto/osdef.h objects + + emake +} + +src_test() { + echo + einfo "Starting vim tests. Several error messages will be shown" + einfo "while the tests run. This is normal behaviour and does not" + einfo "indicate a fault." + echo + ewarn "If the tests fail, your terminal may be left in a strange" + ewarn "state. Usually, running 'reset' will fix this." + echo + + # Don't let vim talk to X + unset DISPLAY + + # We've got to call make test from within testdir, since the Makefiles + # don't pass through our VIMPROG argument + cd "${S}"/src/testdir + + # Test 49 won't work inside a portage environment + einfo "Test 49 isn't sandbox-friendly, so it will be skipped." + sed -i 's~test49.out~~g' Makefile + + # We don't want to rebuild vim before running the tests + sed -i 's,: \$(VIMPROG),: ,' Makefile + + # Don't try to do the additional GUI test + emake -j1 VIMPROG=../vim nongui +} + +# Make convenience symlinks, hopefully without stepping on toes. Some +# of these links are "owned" by the vim ebuild when it is installed, +# but they might be good for gvim as well (see bug 45828) +update_vim_symlinks() { + local f syms + syms="vimdiff rvim rview" + einfo "Calling eselect vi update..." + # Call this with --if-unset to respect user's choice (bug 187449) + eselect vi update --if-unset + + # Make or remove convenience symlink, vim -> gvim + if [[ -f "${EROOT}"/usr/bin/gvim ]]; then + ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null + elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then + rm "${EROOT}"/usr/bin/vim + fi + + # Make or remove convenience symlinks to vim + if [[ -f "${EROOT}"/usr/bin/vim ]]; then + for f in ${syms}; do + ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null + done + else + for f in ${syms}; do + if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then + rm -f "${EROOT}"/usr/bin/${f} + fi + done + fi + + # This will still break if you merge then remove the vi package, + # but there's only so much you can do, eh? Unfortunately we don't + # have triggers like are done in rpm-land. +} + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are + # managed by eselect-vi + dobin src/vim + dosym vim /usr/bin/vimdiff + dosym vim /usr/bin/rvim + dosym vim /usr/bin/rview + if use vim-pager ; then + dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager + dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager + insinto ${vimfiles}/macros + doins runtime/macros/manpager.sh + fperms a+x ${vimfiles}/macros/manpager.sh + fi + + newbashcomp "${FILESDIR}"/${PN}-completion ${PN} + # keep in sync with 'complete ... -F' list + bashcomp_alias vim ex vi view rvim rview vimdiff + + # We shouldn't be installing the ex or view man page symlinks, as they + # are managed by eselect-vi + rm -f "${ED}"/usr/share/man/man1/{ex,view}.1 +} + +pkg_postinst() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + if [[ -z ${REPLACING_VERSIONS} ]] ; then + if use X ; then + echo + elog "The 'X' USE flag enables vim <-> X communication, like" + elog "updating the xterm titlebar. It does not install a GUI." + fi + echo + elog "To install a GUI version of vim, use the app-editors/gvim" + elog "package." + echo + elog "Vim 7 includes an integrated spell checker. You need to install" + elog "word list files before you can use it. There are ebuilds for" + elog "some of these named app-vim/vim-spell-*. If your language of" + elog "choice is not included, please consult vim-spell.eclass for" + elog "instructions on how to make a package." + echo + ewarn "Note that the English word lists are no longer installed by" + ewarn "default." + fi + + # Make convenience symlinks + update_vim_symlinks +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Make convenience symlinks + update_vim_symlinks +} diff --git a/app-misc/reptyr/Manifest b/app-misc/reptyr/Manifest index ad04546e5467..434ef1a4cf1c 100644 --- a/app-misc/reptyr/Manifest +++ b/app-misc/reptyr/Manifest @@ -1,2 +1,3 @@ DIST reptyr-0.5.tar.gz 16150 SHA256 b58bff5e06096ce4409983cce85fabc1280ed4115c478c0fec968ce2a4dcec1c SHA512 d38d5986b38c643a2c04429e23d5af0cbd7280ed709c441cf0e217f4fe0e4fd19d7ecb76817aedcf9a2092a8041e22aa77828c07e0cea010478192085b1d8f4b WHIRLPOOL 19fdb5f35b05c2f03ab5af1cc2e2b1510733f1b54d6af6bb14db31185f432df5ff7515b1b36207b976ca5beb2649ca7a1c51d52cb0827280e62bedd05e965726 +DIST reptyr-0.6.1.tar.gz 27865 SHA256 9255c83c8b3544a7974b92dcfa4cced2749635f5f99e045b1dd54dfdefd1a00f SHA512 880f2fdc1bb7cab1f880bb49148bfdee10d7af7b9dac47a5ca7414ab10bf53f561e6092a005ce46544d732200d73687dcf893216010b04ed6c2260ea9a8db2dd WHIRLPOOL ee89917cce87d2708dd06ffcfb0273d44ecdc0baed8fe0fa4942b6918e524fdcf58afd0d4d72f54e2343782aa4b8b1ab04015e1259fdd87f3fd007393c1ba2ab DIST reptyr-0.6.tar.gz 27802 SHA256 71a4f87da228807e540d688b1446d9ba28556e02a9a63175981f66bb39f1049b SHA512 f862644dc2008b7b39f3ef3eca26abc5651d32c9dfb8d2d3b7b9e2f310ebf481a82a95f00417ab87d52f475aea03bdcebeb00e0499e9a0ec89f1f816b96a7f9d WHIRLPOOL 58b995f3799a650a88a44a813356dee4ce6267f314cd5ce797c4452e70e60549756d7b846b5c16ad4007ad09252ac80c6fdde442c5d43dc76bca3cc145dc6107 diff --git a/app-misc/reptyr/reptyr-0.6.1.ebuild b/app-misc/reptyr/reptyr-0.6.1.ebuild new file mode 100644 index 000000000000..3ec3723dfa09 --- /dev/null +++ b/app-misc/reptyr/reptyr-0.6.1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/reptyr/reptyr-0.6.1.ebuild,v 1.1 2015/01/27 04:21:51 radhermit Exp $ + +EAPI=5 + +inherit toolchain-funcs flag-o-matic vcs-snapshot + +DESCRIPTION="A utility to attach a running program to a new terminal" +HOMEPAGE="https://github.com/nelhage/reptyr" +SRC_URI="https://github.com/nelhage/${PN}/archive/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" + +RESTRICT="test" + +src_prepare() { + # respect CFLAGS + sed -i '/^override/d' Makefile || die +} + +src_compile() { + append-cppflags -D_GNU_SOURCE + emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install + dodoc ChangeLog NOTES README.md +} diff --git a/app-portage/eix/metadata.xml b/app-portage/eix/metadata.xml index 32191ca7bf4c..26df056c1611 100644 --- a/app-portage/eix/metadata.xml +++ b/app-portage/eix/metadata.xml @@ -15,7 +15,6 @@ Michael Weber - Use sys-devel/clang for building Build with upstream's CXXFLAGS/LDFLAGS for debugging support; not recommended for normal use. Make DEP=true the default which enables support for {,R,P}DEPEND but requires roughly double disk and memory. Create description of the eix cache file additionally in html format diff --git a/app-portage/elogviewer/elogviewer-2.1-r1.ebuild b/app-portage/elogviewer/elogviewer-2.1-r1.ebuild index 58fe416ea60b..ed06f89014c2 100644 --- a/app-portage/elogviewer/elogviewer-2.1-r1.ebuild +++ b/app-portage/elogviewer/elogviewer-2.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/elogviewer/elogviewer-2.1-r1.ebuild,v 1.4 2014/07/13 10:54:45 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/elogviewer/elogviewer-2.1-r1.ebuild,v 1.5 2015/01/27 06:08:33 dolsen Exp $ EAPI="5" PYTHON_COMPAT=(python{2_6,2_7,3_1,3_2,3_3}) diff --git a/app-portage/elogviewer/elogviewer-2.1-r2.ebuild b/app-portage/elogviewer/elogviewer-2.1-r2.ebuild new file mode 100644 index 000000000000..271fb93d3a7b --- /dev/null +++ b/app-portage/elogviewer/elogviewer-2.1-r2.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-portage/elogviewer/elogviewer-2.1-r2.ebuild,v 1.1 2015/01/27 06:08:33 dolsen Exp $ + +EAPI="5" +PYTHON_COMPAT=(python{2_6,2_7,3_1,3_2,3_3,3_4}) + +inherit distutils-r1 + +DESCRIPTION="Elog viewer for Gentoo" +HOMEPAGE="https://sourceforge.net/projects/elogviewer" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ppc ~sparc ~x86 ~x86-fbsd" +IUSE="" + +RDEPEND=" + || ( dev-python/PyQt4[${PYTHON_USEDEP},X] + dev-python/pyside[${PYTHON_USEDEP},X] ) + >=sys-apps/portage-2.1 + " +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" + +src_install() { + mv elogviewer.py elogviewer + dobin elogviewer + doman elogviewer.1 + dodoc LICENSE.TXT +} + +pkg_postinst() { + elog + elog "In order to use this software, you need to activate" + elog "Portage's elog features. Required is" + elog " PORTAGE_ELOG_SYSTEM=\"save\" " + elog "and at least one of " + elog " PORTAGE_ELOG_CLASSES=\"warn error info log qa\"" + elog "More information on the elog system can be found" + elog "in /etc/make.conf.example" + elog + elog "To operate properly this software needs the directory" + elog "${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage." + elog "To start the software as a user, add yourself to the portage" + elog "group." + elog +} diff --git a/app-portage/etc-proposals/Manifest b/app-portage/etc-proposals/Manifest index 9b7c5607fb90..ab3862929468 100644 --- a/app-portage/etc-proposals/Manifest +++ b/app-portage/etc-proposals/Manifest @@ -1,2 +1 @@ -DIST download 53696 SHA256 42c2b117e141d0e69a8717e98e9ddc9dffd2ed27533c6296e87e810c631e71c7 SHA512 9de117b96908bbde87e8ee9c326525961547ba779ae571071c57571d039f3e01f9d0ec6be5eefc1ea40abdfe73631b4c750964dc94dbb6348119b83afbc556a1 WHIRLPOOL 6fb095554bc8a98cf51d1426252ed3afe620c1cb9308e66315d1456f6a99d1e75fbd4513ce947cd5ab4aa1cc1d9dd680f29fb7fada06ef93dc28fbb5800fe539 DIST etc-proposals-1.4.3.tar.gz 53696 SHA256 42c2b117e141d0e69a8717e98e9ddc9dffd2ed27533c6296e87e810c631e71c7 SHA512 9de117b96908bbde87e8ee9c326525961547ba779ae571071c57571d039f3e01f9d0ec6be5eefc1ea40abdfe73631b4c750964dc94dbb6348119b83afbc556a1 WHIRLPOOL 6fb095554bc8a98cf51d1426252ed3afe620c1cb9308e66315d1456f6a99d1e75fbd4513ce947cd5ab4aa1cc1d9dd680f29fb7fada06ef93dc28fbb5800fe539 diff --git a/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild b/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild index 8a7ea08d96fb..c55aa97e9c47 100644 --- a/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild +++ b/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild,v 1.1 2015/01/26 07:40:55 dolsen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild,v 1.2 2015/01/27 01:39:05 dolsen Exp $ EAPI="5" PYTHON_COMPAT=(python2_7) @@ -9,7 +9,7 @@ inherit distutils-r1 DESCRIPTION="a set of tools for updating gentoo config files" HOMEPAGE="http://sourceforge.net/projects/etc-proposals.berlios/" -SRC_URI="http://sourceforge.net/projects/${PN}.berlios/files/${P}.tar.gz/download" +SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.gz" IUSE="gtk qt4" LICENSE="GPL-2" @@ -22,8 +22,11 @@ RDEPEND="${DEPEND}" python_install_all() { distutils-r1_python_install_all - dosbin "${D}"/usr/bin/etc-proposals - rm -rf "${D}"/usr/bin + + dodir /usr/sbin + einfo "Moving /usr/bin/etc-proposals to /usr/sbin/etc-proposals" + mv "${ED%/}/usr/bin/etc-proposals" "${ED%/}/usr/sbin/etc-proposals" || die + rmdir "${ED%/}/usr/bin" || die # Bug 308725: Filter out the "PreferedFrontends" based on USE Flags: use qt4 || sed -i -e '/^PreferedFrontends=/ s/qt4,//' "${D}"/etc/etc-proposals.conf diff --git a/app-portage/mirrorselect/files/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch b/app-portage/mirrorselect/files/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch new file mode 100644 index 000000000000..2e5fd93c09cb --- /dev/null +++ b/app-portage/mirrorselect/files/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch @@ -0,0 +1,24 @@ +From 9ec1e9649c980d32d23aab40eff3cac5e8f6f555 Mon Sep 17 00:00:00 2001 +From: Brian Dolbec +Date: Mon, 26 Jan 2015 18:23:05 -0800 +Subject: [PATCH] Update for ssl-fetch api change + +--- + mirrorselect/extractor.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mirrorselect/extractor.py b/mirrorselect/extractor.py +index ec5f299..59efad1 100644 +--- a/mirrorselect/extractor.py ++++ b/mirrorselect/extractor.py +@@ -109,6 +109,7 @@ class Extractor(object): + 'info':self.output.write, + 'error': self.output.print_err, + 'kwargs-info': {'level': 2}, ++ 'kwargs-debug': {'level':2}, + 'kwargs-error': {'level':0}, + } + +-- +2.2.2 + diff --git a/app-portage/mirrorselect/mirrorselect-2.2.2-r1.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.2-r1.ebuild new file mode 100644 index 000000000000..8b6e3cc44d73 --- /dev/null +++ b/app-portage/mirrorselect/mirrorselect-2.2.2-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/mirrorselect-2.2.2-r1.ebuild,v 1.1 2015/01/27 04:24:32 dolsen Exp $ + +EAPI="5" + +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +PYTHON_REQ_USE="xml" + +inherit eutils distutils-r1 prefix + +DESCRIPTION="Tool to help select distfiles mirrors for Gentoo" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Mirrorselect" +SRC_URI="http://dev.gentoo.org/~dolsen/releases/mirrorselect/${P}.tar.gz + http://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test + " + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" + +RDEPEND=" + dev-util/dialog + net-analyzer/netselect + >=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}] + " + +PATCHES=( "${FILESDIR}/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch" ) + +python_prepare_all() { + python_setup + eprefixify setup.py mirrorselect/main.py + echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version + VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed" + distutils-r1_python_prepare_all +} diff --git a/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild index 87f5fd57f5a9..7fd01dde0389 100644 --- a/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild +++ b/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild,v 1.13 2014/09/24 09:33:24 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild,v 1.14 2015/01/27 04:24:32 dolsen Exp $ EAPI="5" @@ -25,6 +25,7 @@ RDEPEND=" dev-util/dialog net-analyzer/netselect >=dev-python/ssl-fetch-0.2[${PYTHON_USEDEP}] + - #else -- #include -+ #include - #endif - #include - #endif diff --git a/dev-games/newton/newton-1.53.ebuild b/dev-games/newton/newton-1.53.ebuild deleted file mode 100644 index db8aa152e25c..000000000000 --- a/dev-games/newton/newton-1.53.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/newton/newton-1.53.ebuild,v 1.7 2014/05/12 13:20:15 kensington Exp $ - -EAPI=2 -inherit eutils - -DESCRIPTION="an integrated solution for real time simulation of physics environments" -HOMEPAGE="http://newtondynamics.com/" -SRC_URI="http://www.newtondynamics.com/downloads/${PN}Linux-${PV}.tar.gz" - -LICENSE="newton" -SLOT="0" -KEYWORDS="~x86" -IUSE="doc" - -DEPEND="doc? ( - virtual/opengl - media-libs/freeglut - )" - -S=${WORKDIR}/newtonSDK - -src_prepare() { - if use doc; then - cd samples - rm -rf gl - sed -i \ - -e "s:-I ../gl:-I /usr/include/GL:" \ - tutorial_05_UsingJoints/makefile \ - tutorial_09_SimpleVehicle/makefile \ - tutorial_04_IntroductionToMaterials/makefile \ - tutorial_10_CustomJoints/makefile \ - tutorial_01_GettingStarted/makefile \ - tutorial_02_UsingCallbacks/makefile \ - tutorial_08_HeightFieldCollision/makefile \ - tutorial_07_CharaterController/makefile \ - tutorial_06_UtilityFuntionality/makefile \ - tutorial_03_UsingCollisionTree/makefile \ - || die "failed fixing sample makefiles" - sed -i \ - -e "/^FLAGS =/s:-g -O0:${CFLAGS}:" \ - makefile \ - || die "sed makefile failed" - epatch "${FILESDIR}"/${P}-glut.patch - fi -} - -src_compile() { - if use doc; then - cd samples - emake || die "emake samples failed" - rm -f */*.elf */*.o - fi -} - -src_install() { - dolib.a sdk/libNewton.a || die "dolib.a failed" - insinto /usr/include - doins sdk/Newton.h || die "doins failed" - - if use doc; then - insinto /usr/share/${PN} - doins -r samples/* || die "doins samples failed" - - exeinto /usr/share/${PN}/bin - doexe samples/bin/tutorial_* || die "doexe failed" - fi - - dodoc doc/* -} diff --git a/dev-games/newton/newton-2.00.ebuild b/dev-games/newton/newton-2.00.ebuild deleted file mode 100644 index 2f99ca9edf04..000000000000 --- a/dev-games/newton/newton-2.00.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/newton/newton-2.00.ebuild,v 1.3 2010/09/17 11:01:42 scarabeus Exp $ - -inherit eutils multilib - -DESCRIPTION="an integrated solution for real time simulation of physics environments" -HOMEPAGE="http://www.physicsengine.com/" -SRC_URI="amd64? ( - http://www.newtondynamics.com/downloads/${PN}Linux-64-${PV}.tar.gz - ) - x86? ( - http://www.newtondynamics.com/downloads/${PN}Linux-32-${PV}.tar.gz - )" - -LICENSE="newton" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" -QA_TEXTRELS="usr/$(get_libdir)/libNewton.so.2.0.0" - -DEPEND="doc? ( - virtual/opengl - media-libs/freeglut - )" - -S=${WORKDIR}/newtonSDK - -src_install() { - dolib.a sdk/libNewton.a || die "dolib.a failed" - mv sdk/libNewton.so sdk/libNewton.so.2.0.0 || die - dolib sdk/libNewton.so.2.0.0 || die - dosym libNewton.so.2.0.0 /usr/$(get_libdir)/libNewton.so.2 - dosym libNewton.so.2.0.0 /usr/$(get_libdir)/libNewton.so - insinto /usr/include - doins sdk/Newton.h || die "doins failed" - - dodoc doc/* -} diff --git a/dev-games/ogre/ogre-1.9.0.ebuild b/dev-games/ogre/ogre-1.9.0.ebuild deleted file mode 100644 index df15b05e16cc..000000000000 --- a/dev-games/ogre/ogre-1.9.0.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.9.0.ebuild,v 1.3 2014/03/08 23:22:37 hasufell Exp $ - -EAPI=5 -CMAKE_REMOVE_MODULES="yes" -CMAKE_REMOVE_MODULES_LIST="FindFreetype" -inherit eutils cmake-utils vcs-snapshot - -DESCRIPTION="Object-oriented Graphics Rendering Engine" -HOMEPAGE="http://www.ogre3d.org/" -SRC_URI="https://bitbucket.org/sinbad/ogre/get/v${PV//./-}.tar.bz2 -> ${P}.tar.bz2" - -LICENSE="MIT public-domain" -SLOT="0/1.9.0" -KEYWORDS="~amd64 ~x86" -IUSE="+boost cg doc double-precision examples +freeimage gles2 ois +opengl poco profile tbb threads tools +zip" -REQUIRED_USE="threads? ( ^^ ( boost poco tbb ) ) - poco? ( threads ) - tbb? ( threads )" -RESTRICT="test" #139905 - -RDEPEND=" - dev-libs/tinyxml - media-libs/freetype:2 - virtual/opengl - virtual/glu - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXrandr - x11-libs/libXt - boost? ( dev-libs/boost ) - cg? ( media-gfx/nvidia-cg-toolkit ) - freeimage? ( media-libs/freeimage ) - gles2? ( >=media-libs/mesa-8.0.0[gles2] ) - ois? ( dev-games/ois ) - threads? ( - poco? ( dev-libs/poco ) - tbb? ( dev-cpp/tbb ) - ) - zip? ( sys-libs/zlib dev-libs/zziplib )" -# gles1 currently broken wrt bug #418201 -DEPEND="${RDEPEND} - x11-proto/xf86vidmodeproto - virtual/pkgconfig - doc? ( app-doc/doxygen )" - -src_prepare() { - sed -i \ - -e "s:share/OGRE/docs:share/doc/${PF}:" \ - Docs/CMakeLists.txt || die - # Stupid build system hardcodes release names - sed -i \ - -e '/CONFIGURATIONS/s:CONFIGURATIONS Release.*::' \ - CMake/Utils/OgreConfigTargets.cmake || die -} - -src_configure() { - local mycmakeargs=( - -DOGRE_FULL_RPATH=NO - $(cmake-utils_use boost OGRE_USE_BOOST) - $(cmake-utils_use cg OGRE_BUILD_PLUGIN_CG) - $(cmake-utils_use doc OGRE_INSTALL_DOCS) - $(cmake-utils_use double-precision OGRE_CONFIG_DOUBLE) - $(cmake-utils_use examples OGRE_INSTALL_SAMPLES) - $(cmake-utils_use freeimage OGRE_CONFIG_ENABLE_FREEIMAGE) - $(cmake-utils_use opengl OGRE_BUILD_RENDERSYSTEM_GL) - -DOGRE_BUILD_RENDERSYSTEM_GLES=OFF - $(cmake-utils_use gles2 OGRE_BUILD_RENDERSYSTEM_GLES2) - $(cmake-utils_use profile OGRE_PROFILING) - $(cmake-utils_use examples OGRE_BUILD_SAMPLES) - -DOGRE_BUILD_TESTS=FALSE - $(usex threads "-DOGRE_CONFIG_THREADS=2" "-DOGRE_CONFIG_THREADS=0") - $(cmake-utils_use tools OGRE_BUILD_TOOLS) - $(cmake-utils_use zip OGRE_CONFIG_ENABLE_ZIP) - ) - - if use threads ; then - local f - for f in boost poco tbb ; do - use ${f} || continue - mycmakeargs+=( -DOGRE_CONFIG_THREAD_PROVIDER=${f} ) - break - done - fi - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - docinto examples - dodoc "${CMAKE_BUILD_DIR}"/bin/*.cfg -} diff --git a/dev-haskell/blaze-html/Manifest b/dev-haskell/blaze-html/Manifest index 086732fef1d7..4b0af30e1f5c 100644 --- a/dev-haskell/blaze-html/Manifest +++ b/dev-haskell/blaze-html/Manifest @@ -1,7 +1,3 @@ -DIST blaze-html-0.5.1.3.tar.gz 77446 SHA256 3c40a8a1169207baea6267ce2b657f9d0d136e023815c48931875143c6bc4745 SHA512 e7085f2ad7ea23d80f56a5f076e0a690f7cd565b9a16dcac8875dcb99ee5aa243f33d8fce0b28e63159710d3dc12387b6a34d312f54efb5b6c318d5938f7bf8b WHIRLPOOL cfb93e3701e469ed863c46910f70886651ac06eadec9f98d38b949dded5d743595fb89e66b6f30863e708596d2af092fa017166735075f59c486f924cfaa9169 -DIST blaze-html-0.6.1.1.tar.gz 77759 SHA256 2cafc98ccbb3b9dc9c444ae306337b2aa7fd0be54b650bf208a656a8f6acee23 SHA512 c39447567c5e4788b209bcd94db302c367324ac541b96bd57bb6cfe7b4f2f8bcf7afcf5c168bcfbe1408f4658f1436798ac47decc46d8bb51b3a4609c7ee6a1a WHIRLPOOL 640555c3a797ac4f6e1247145cc8c4dc18b7dc0ee8836ef8f58a2a38f4c28d8e3ecf9f3a021a3eb4fe64299f7c51a4cb5c66193f25bcb3b22c86457ed4797953 DIST blaze-html-0.6.1.2.tar.gz 75673 SHA256 f57ce483c0082fc5091b744e52914a66c8e2622927e635cca9310c0fc87d4925 SHA512 15b655ce35adc8e9a139780788a2b615ed095468bcb0be3074f0d90bcfe4966ea4705d088b9c9426a469e279c2a0da8081298c4f356194d5c8d7c4046d8e7f19 WHIRLPOOL 96e83764ae7cbb8ea1c58cd3ad814eff814a83c4977a93b12552d2521a09baaf82b00831217b4ab9ccf5541fa37f36e7dd94248a0eb97a78882e98a8124e33c9 DIST blaze-html-0.6.1.3.tar.gz 75658 SHA256 58154cc9daeccfb487dcd8d93951e6f5cc1d4052374af758e4e01cb1e3885e42 SHA512 2edfff6880d860201cc6de57c07ddee7875bdaca4e2a0a7a9373e080b15e2f6ad0dee1abd37eabce0ecc827bb3a0140358630497684760d636600c55bbf935ac WHIRLPOOL d296b033fc1c7c4cc1160a2bd3aabae406f380c085265c2ab1dfe58c04e767ba01f3f1f1d37109ea11e67a2d0e8558d27a613c1af9c8a9a327227cd45e92dfb6 -DIST blaze-html-0.7.0.1.tar.gz 75687 SHA256 f0296f5af812ebf4597ee2307c76d4dfdfa3446cb73736bf5aa6b844ba51e017 SHA512 323e97ccdb515e524eff1d540cb831d5f1cdba059ec7b80eb3abc08f674420a445296babe560cd48ff6e564df673b84dcff1963fbaffdf8f5a66dad325139fab WHIRLPOOL aa467af52ad1db1f85e92e7c70eb1b6de3af5258f27a441c9ef8f9d637c0c7635080c95afdde348749b59b32c5a6d20c253929a3ea77916cc63491bd8105b14f -DIST blaze-html-0.7.0.2.tar.gz 75815 SHA256 5b74f65b9201b1ac81b58f6c7350a2ab493e7777eb429c3ec5a0fb9c6da90f7b SHA512 2436e226dfae46983159cdb3c73bf818b9cc78e27bafab03b20bd09475126c9657f193dd67a38aaaf6081e8b4384fb9cd237b9f73a81574f5c834c1fbbbeaee4 WHIRLPOOL d032fa0a6d69c3e1ff7e922686ddd95a476afaf1224d5d829d2c19705f5b79adb337bc44384fe16caaeb253da8a9273f333b3dde91f6cbf471f8f5313c6456fd DIST blaze-html-0.7.0.3.tar.gz 75845 SHA256 7d1bba5fac7c129538c567291d5e37663034a9bce6e8efcbea2e8ed5f3dec3ca SHA512 bbcc7acce5aed410cbc4c3fbf8641a92100459c6340c0ff9d616cbd3d11eb1e8f6769d90ce8db6b197ab408c2ff926a6c0475f6c50eee1da3a49274c2fdd4833 WHIRLPOOL f6331446467a636e05e7de03b42b530b786fb0da413e8f2cf2e5b677603d206508855de84fb5ae8e8b00b3acde279437d8f24ee62a75afa9524af0253dce9a66 diff --git a/dev-haskell/blaze-html/blaze-html-0.5.1.3.ebuild b/dev-haskell/blaze-html/blaze-html-0.5.1.3.ebuild deleted file mode 100644 index 9dded4edd8f0..000000000000 --- a/dev-haskell/blaze-html/blaze-html-0.5.1.3.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/blaze-html/blaze-html-0.5.1.3.ebuild,v 1.1 2012/12/22 21:12:12 slyfox Exp $ - -EAPI=5 - -# ebuild generated by hackport 0.3.1.9999 - -CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" -inherit haskell-cabal - -DESCRIPTION="A blazingly fast HTML combinator library for Haskell" -HOMEPAGE="http://jaspervdj.be/blaze" -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?] - =dev-haskell/blaze-markup-0.5.1:=[profile?] - =dev-haskell/text-0.10:=[profile?] - =dev-lang/ghc-6.10.4:=" -DEPEND="${RDEPEND} - test? ( =dev-haskell/hunit-1.2* - >=dev-haskell/quickcheck-2.4 - =dev-haskell/test-framework-0.4 - =dev-haskell/test-framework-hunit-0.2 - =dev-haskell/test-framework-quickcheck2-0.2 - =dev-haskell/cabal-1.8" diff --git a/dev-haskell/blaze-html/blaze-html-0.6.1.1.ebuild b/dev-haskell/blaze-html/blaze-html-0.6.1.1.ebuild deleted file mode 100644 index faa62fbea4b0..000000000000 --- a/dev-haskell/blaze-html/blaze-html-0.6.1.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/blaze-html/blaze-html-0.6.1.1.ebuild,v 1.3 2013/11/24 19:32:50 ago Exp $ - -EAPI=5 - -# ebuild generated by hackport 0.3.2.9999 - -CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" -inherit haskell-cabal - -DESCRIPTION="A blazingly fast HTML combinator library for Haskell" -HOMEPAGE="http://jaspervdj.be/blaze" -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?] - =dev-haskell/blaze-markup-0.5.1:=[profile?] - =dev-haskell/text-0.10:=[profile?] - =dev-lang/ghc-6.10.4:=" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.8 - test? ( =dev-haskell/hunit-1.2* - >=dev-haskell/quickcheck-2.4 - =dev-haskell/test-framework-0.4 - =dev-haskell/cabal-1.6 +" diff --git a/dev-python/astng/Manifest b/dev-python/astng/Manifest index ea14d7d3b4a5..6abde44e32c1 100644 --- a/dev-python/astng/Manifest +++ b/dev-python/astng/Manifest @@ -1,2 +1 @@ -DIST logilab-astng-0.21.1.tar.gz 99399 SHA256 7bb3000f670ce473c3060081661894942c8bdb38ba9f0d599bf257357e14c7db SHA512 d78a07607eecf62dfca5574abdf3ddc9e62819572f5eab177fc2c4a6b6c70a83581de0fe73c66dc4ca068367a6cf712a0b9cf04b6b32e3531685c14de64b59d6 WHIRLPOOL 2c915d29695a0b833f8691a66bc81184c37c6a5ebb433aa74c5454a23f83e1c985e68af05e2885d5ed4c1daa48035106fcfdaa2c395f42933d9b6d688fa392e9 DIST logilab-astng-0.24.3.tar.gz 106660 SHA256 e08fba39689e5a4dfa175749874811e516f019656544874defe05154073f69d4 SHA512 fb1e46ebf7111d727cd9d187968cb349dc23dfba0d4d8c6c793a8c081d4506f11e488074cc51b632c525aa264cfa50279dda90f0cf35dc2120ebbf4714902525 WHIRLPOOL 75941724a2c4448a27b37750a83dbc04e4a02540233418b0eab364a3ddfdc3a5e03efacc58422d7fb6f68609f126e269c662aa17dbc395067b45182155559589 diff --git a/dev-python/astng/astng-0.21.1.ebuild b/dev-python/astng/astng-0.21.1.ebuild deleted file mode 100644 index a7d7aadc67d9..000000000000 --- a/dev-python/astng/astng-0.21.1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/astng/astng-0.21.1.ebuild,v 1.5 2012/08/27 15:20:01 floppym Exp $ - -EAPI="3" -SUPPORT_PYTHON_ABIS="1" - -inherit distutils - -DESCRIPTION="Abstract Syntax Tree New Generation for logilab packages" -HOMEPAGE="http://www.logilab.org/project/logilab-astng http://pypi.python.org/pypi/logilab-astng" -SRC_URI="ftp://ftp.logilab.org/pub/astng/logilab-${P}.tar.gz mirror://pypi/l/logilab-astng/logilab-${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~ia64 ppc ~ppc64 ~sparc x86 ~x64-macos ~x86-macos" -IUSE="test" - -# Version specified in __pkginfo__.py. -RDEPEND=">=dev-python/logilab-common-0.53.0" -DEPEND="${RDEPEND} - dev-python/setuptools - test? ( >=dev-python/egenix-mx-base-3.0.0 )" - -S="${WORKDIR}/logilab-${P}" - -DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1" - -PYTHON_MODNAME="logilab/astng" - -src_prepare() { - distutils_src_prepare - - conversion() { - [[ "${PYTHON_ABI}" == 2.* ]] && return - find -name "*.py" ! -name "setup.py" -print | xargs 2to3-${PYTHON_ABI} -nw --no-diffs - } - python_execute_function -s conversion -} - -src_test() { - testing() { - local tpath="${T}/test-${PYTHON_ABI}" - local spath="${tpath}$(python_get_sitedir)" - - mkdir -p "${spath}/logilab" || return 1 - cp -r "$(python_get_sitedir)/logilab/common" "${spath}/logilab" || return 1 - - "$(PYTHON)" setup.py install --root="${tpath}" || die "Installation for tests failed with $(python_get_implementation) $(python_get_version)" - - # pytest uses tests placed relatively to the current directory. - pushd "${spath}/logilab/astng" > /dev/null || return 1 - if [[ "${PYTHON_ABI}" == 3.* ]]; then - # Support for Python 3 is experimental. Some tests are known to fail. - PYTHONPATH="${spath}" pytest -v - else - PYTHONPATH="${spath}" pytest -v || return 1 - fi - popd > /dev/null || return 1 - } - python_execute_function -s testing -} - -src_install() { - distutils_src_install - - deletion_of_unneeded_files() { - # Avoid collision with dev-python/logilab-common. - rm -f "${ED}$(python_get_sitedir)/logilab/__init__.py" || return 1 - - # Don't install tests. - rm -fr "${ED}$(python_get_sitedir)/logilab/astng/test" || return 1 - } - python_execute_function -q deletion_of_unneeded_files -} diff --git a/dev-python/astng/files/astng-0.23.1-file-open.patch b/dev-python/astng/files/astng-0.23.1-file-open.patch deleted file mode 100644 index 90decf12c646..000000000000 --- a/dev-python/astng/files/astng-0.23.1-file-open.patch +++ /dev/null @@ -1,19 +0,0 @@ -# HG changeset patch -# User Sylvain Thénault -# Date 1326988959 -3600 -# Node ID 0272006bdfbee3a0a1447315633bbfeb2f5920e8 -# Parent b763bb212ddd6df802ec09338f69abfd96917698 -use open rather than file as 2to3 miss it (probably because of the file class attribute) - -diff -r b763bb212ddd -r 0272006bdfbe scoped_nodes.py ---- a/scoped_nodes.py Thu Dec 08 17:37:40 2011 +0100 -+++ b/scoped_nodes.py Thu Jan 19 17:02:39 2012 +0100 -@@ -246,7 +246,7 @@ - @property - def file_stream(self): - if self.file is not None: -- return file(self.file) -+ return open(self.file) - return None - - def block_range(self, lineno): diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest index 15cc1753cf70..e0e59a93e95f 100644 --- a/dev-python/astroid/Manifest +++ b/dev-python/astroid/Manifest @@ -3,3 +3,4 @@ DIST astroid-1.1.1.tar.gz 119539 SHA256 780735cb451f5ae982bfa8a6b80866305e3eb9cb DIST astroid-1.2.0.tar.gz 127194 SHA256 589e738d2e94bac938bd88e2b7331188c550c04b41ff516ca3ace5b143c71d75 SHA512 21e2eb97789a1e2d9b4e76742ad0a7e22553397df912f18b37e76eff2e2b21036a90ed9682b4eb208ca45fd75e8bcdbfa6a343b54fa0adec0dfb66f9eb14c627 WHIRLPOOL b286a7bf3b500b287b54d805d28fb5715935573e8b88fcbe09dcf27fcd0f2304c79bc954919216718bb8b354bd9d4a981d0f87e9a003782464bb98febec1f00a DIST astroid-1.2.1.zip 169131 SHA256 9021b44cae60f38c3a7ecccc458bd92b9d73244699ffc41750ef848d62514f64 SHA512 b3b39d621fb54271dd49bb8afd6d60113ca891826666a1efca07b890f7ddfb8a94fc0984dd9c8e0e2523db3daa4e54121da04fdbc904b5d53a43033a55aa86e9 WHIRLPOOL 1f84d6506f93891806fce601aa81e1081eb7f96089d0c71cedc2ebcee9ac67ae2a6d633ded88197be74a41a140feb67dd8c8d52d898175dea0e86f618dd535f2 DIST astroid-1.3.2.tar.gz 138458 SHA256 9d1f1803958238e93f2c17e1b38cecfa5bcca40c1bbb99aea80fe10c596f45c1 SHA512 ac9dbe14d384e24e21569c5e1a00bb885e2d93519eed5e8e008186a00b4cd70cadca9e07dd6521d6f945a777a4a8421dcb24a4f851e2f23c98b75058c4d7ebee WHIRLPOOL ed59d35640a406179f99eeccb586239603a313960e61723d97d1dd83c656ec48b23a037b4a91a2e4f3bad6512159d776e05c75dfc6a97940c38c5c13b09536b3 +DIST astroid-1.3.4.tar.gz 146809 SHA256 0b453eaa4f48aaa25a007ede7165aa424d83d4a14fd3bd636dc9c77f83e8e9bb SHA512 cdb75480402e46e4a18557fcacf320ee79a2b5f37f02a6a0d878ca9406fa598cd9a3eea4b3be16c9d9ff0ac279cf7138b2ebaf71fb256ac52006f09117c3ad30 WHIRLPOOL 909ecefb8ed8fd1ac7b6f543f801d78ea490f15fe2434c58ea6d9b943dd511cc9fc381b72263b81f7e19bfaffad100cfe8014f63fe93f2cff69a51531464269a diff --git a/dev-python/astroid/astroid-1.3.4.ebuild b/dev-python/astroid/astroid-1.3.4.ebuild new file mode 100644 index 000000000000..e2d98a7438d8 --- /dev/null +++ b/dev-python/astroid/astroid-1.3.4.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/astroid/astroid-1.3.4.ebuild,v 1.1 2015/01/26 16:59:12 vapier Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) +RESTRICT="test" # False is not True ;) + +inherit distutils-r1 + +DESCRIPTION="Abstract Syntax Tree for logilab packages" +HOMEPAGE="http://bitbucket.org/logilab/astroid http://pypi.python.org/pypi/astroid" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos" +IUSE="test" + +# Version specified in __pkginfo__.py. +RDEPEND=">=dev-python/logilab-common-0.60.0[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}]" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + app-arch/unzip + test? ( ${RDEPEND} + >=dev-python/pylint-1.4.0[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' python2_7) )" +# Required for tests +DISTUTILS_IN_SOURCE_BUILD=1 + +# Restrict to test phase, required because suite fails horribly without it +src_test() { + local DISTUTILS_NO_PARALLEL_BUILD=1 + distutils-r1_src_test +} + +python_test() { + "${PYTHON}" setup.py build + + pushd build/lib > /dev/null + PYTHONPATH=. pytest || die "Tests fail with ${EPYTHON}" + popd > /dev/null +} diff --git a/dev-python/bitstring/Manifest b/dev-python/bitstring/Manifest index e5b7ac53cd31..9f9fb2dc2d74 100644 --- a/dev-python/bitstring/Manifest +++ b/dev-python/bitstring/Manifest @@ -1,2 +1 @@ -DIST bitstring-3.1.0.zip 620245 SHA256 a85b382481985e1382de09e9e00fc4e31ef7c2f36c2f0724c4d008a9a0691c3f SHA512 23e4b7584acce15e452900d7354284dc75cccddee3bbedfcfd53c955af3ae701ee2f089dd6f019e3960b9b86f22b80b92786b2e85ededa48ad33bb02c3ff797b WHIRLPOOL a9fa999d832c12d9f29297e1937cea482f2af9841b950dca3ebff906085e4543770292cf1b9b62f50b27b41b1ef1de8d2f8cc80051ae3483414dff861afbd73b DIST bitstring-3.1.1.zip 620317 SHA256 52de6257e95f923284d4c1fdce8287df65a2c677f26d73d288ed06188586ab6f SHA512 856fca0d16929e1fd6e78e9b5fe63fbbabe35bd0c49ef188b24ee0585feea36a485506a2fb8d87e1515ed4162d83c70faa5af59abfe95cef212c6ebaf9fa90d2 WHIRLPOOL 305521c110601f1145344d2423bd91f901c58f08759b4a7c0865cc342d12d9dc4f633e81fc260032e3c41aa73472aa452de476dd418cdb5051957908c7078d47 diff --git a/dev-python/bitstring/bitstring-3.1.0.ebuild b/dev-python/bitstring/bitstring-3.1.0.ebuild deleted file mode 100644 index e897d864e20a..000000000000 --- a/dev-python/bitstring/bitstring-3.1.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/bitstring/bitstring-3.1.0.ebuild,v 1.2 2013/05/10 03:44:18 patrick Exp $ - -EAPI=3 -SUPPORT_PYTHON_ABIS=1 -RESTRICT_PYTHON_ABIS="2.5" -inherit distutils - -DESCRIPTION="A pure Python module for creation and analysis of binary data" -HOMEPAGE="http://python-bitstring.googlecode.com/" -SRC_URI="http://python-bitstring.googlecode.com/files/${P}.zip" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -DEPEND="app-arch/unzip" -RDEPEND="" - -src_test() { - testing() { - PYTHONPATH="../build-${PYTHON_ABI}/lib" "$(PYTHON)" test_${PN}.py - } - pushd test > /dev/null - python_execute_function testing - popd > /dev/null -} diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest new file mode 100644 index 000000000000..065bab110d8a --- /dev/null +++ b/dev-python/bleach/Manifest @@ -0,0 +1 @@ +DIST bleach-1.4.1.tar.gz 17449 SHA256 152af29d4580b112fc52966864492791c951e6382b56070e95e128c6b614833b SHA512 247dd02e3123149f8c0dd72e91e3942055d560be791f275ce52ce0250406033b2adfb47e257cb6af2dfd3dfc167ed6434c4cf4b906303e2cd96359d77b55482c WHIRLPOOL 015b4fb0d825201cc59188caf8d94e3d3b1af336ee3f0c787e07d8a73ec32f727c6640828e694b21e2dd255253416e25e11e44d8932bbbca5571494096b75020 diff --git a/dev-python/bleach/bleach-1.4.1.ebuild b/dev-python/bleach/bleach-1.4.1.ebuild new file mode 100644 index 000000000000..926ea835bb4e --- /dev/null +++ b/dev-python/bleach/bleach-1.4.1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/bleach/bleach-1.4.1.ebuild,v 1.1 2015/01/27 05:23:18 radhermit Exp $ + +EAPI=5 +PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) + +inherit distutils-r1 + +DESCRIPTION="an easy whitelist-based HTML-sanitizing tool" +HOMEPAGE="https://github.com/jsocol/bleach https://pypi.python.org/pypi/bleach" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RDEPEND=" + >=dev-python/html5lib-0.999[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( >=dev-python/nose-1.3[${PYTHON_USEDEP}] ) +" + +python_test() { + esetup.py test +} diff --git a/dev-python/bleach/metadata.xml b/dev-python/bleach/metadata.xml new file mode 100644 index 000000000000..9300f12fbb80 --- /dev/null +++ b/dev-python/bleach/metadata.xml @@ -0,0 +1,9 @@ + + + + python + + radhermit@gentoo.org + Tim Harder + + diff --git a/dev-python/iniparse/iniparse-0.4.ebuild b/dev-python/iniparse/iniparse-0.4.ebuild deleted file mode 100644 index 01800dd4a0ad..000000000000 --- a/dev-python/iniparse/iniparse-0.4.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/iniparse/iniparse-0.4.ebuild,v 1.4 2012/05/24 12:53:50 johu Exp $ - -EAPI=3 - -SUPPORT_PYTHON_ABIS="1" -PYTHON_DEPEND="2" -RESTRICT_PYTHON_ABIS="3.*" -PYTHON_TESTS_FAILURES_TOLERANT_ABIS="*-jython" - -inherit distutils - -DESCRIPTION="Better INI parser for Python" -HOMEPAGE="http://code.google.com/p/iniparse http://pypi.python.org/pypi/iniparse" -SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz" - -LICENSE="MIT PSF-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="" -RDEPEND="" - -src_test() { - testing() { - PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" runtests.py - } - python_execute_function testing -} diff --git a/dev-python/ipaddr/Manifest b/dev-python/ipaddr/Manifest index 359f6bdb55bc..8ecc361a89f2 100644 --- a/dev-python/ipaddr/Manifest +++ b/dev-python/ipaddr/Manifest @@ -1,3 +1,2 @@ DIST ipaddr-2.1.10.tar.gz 29004 SHA256 d2c3bfd45147e5773108d2c8d3c65102ff234f06e2f1049a0febfa31dde4cca3 SHA512 5ad38ffe54e5322bd7d3c643c216647457fd797882549c40a9dad2cadf489aa1ce724e2272af9f8aa4a28eabf60f2ef99d6d730b78c7cb86a1f0cc901dde0eb7 WHIRLPOOL 0bc5a8116d4df2e35e342c9adc2563db963802256461eeb3a8187310d6d1a7a06e567a53953899122242488a366fb759ea091630a3e315de2a7acd749a945c1d DIST ipaddr-2.1.11.tar.gz 29046 SHA256 1b555b8a8800134fdafe32b7d0cb52f5bdbfdd093707c3dd484c5ea59f1d98b7 SHA512 a97b0f760f0d7fac549e5edf17b644c966a8858c145b8f9472ddc8bf4805c9d537f6f8755e3716d78b729b87e84149f8b73c7f98c0deee4fbf266ccb7a206bc6 WHIRLPOOL ba34b892828098e00c78df4ecfb8b79b58a6884ca5592336a96c17bbb351f65baa9c0287acc65ed166c60ce5c9317322964dd27bfe6de33a54c3bb3b08b638cb -DIST ipaddr-2.1.9.tar.gz 28092 SHA256 a0193fb61f59ff4c5d030eb2e24ef5550438693e5f388d526d473cac1859fc99 SHA512 1b93a0f76fe9724df8c654a26013c950f04fbe6322fb473551a2a909ddc71f1c87198836426d6105e577726b79922e21822c8534cd48902108b9ad9c07897cca WHIRLPOOL f3c2732f7498bc9f87c15887632dc0e236ddd0e3102ba1caf54b292b88213c4107660c6aafbda7bfba99598f4e15569f00c91e9353b63d384788c713de6fad29 diff --git a/dev-python/ipaddr/ipaddr-2.1.10.ebuild b/dev-python/ipaddr/ipaddr-2.1.10.ebuild deleted file mode 100644 index 378774accb9f..000000000000 --- a/dev-python/ipaddr/ipaddr-2.1.10.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/ipaddr/ipaddr-2.1.10.ebuild,v 1.1 2012/03/07 21:32:28 maksbotan Exp $ - -EAPI="4" -SUPPORT_PYTHON_ABIS="1" - -inherit distutils - -DESCRIPTION="Python IP address manipulation library" -HOMEPAGE="http://code.google.com/p/ipaddr-py/ http://pypi.python.org/pypi/ipaddr" -SRC_URI="http://ipaddr-py.googlecode.com/files/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="" - -DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1" -DOCS="README RELEASENOTES" -PYTHON_MODNAME="ipaddr.py" - -src_prepare() { - distutils_src_prepare - - preparation() { - if [[ "$(python_get_version -l --major)" == "3" ]]; then - 2to3-${PYTHON_ABI} -nw --no-diffs ipaddr.py ipaddr_test.py - fi - } - python_execute_function -s preparation -} - -src_test() { - testing() { - PYTHONPATH="build/lib" "$(PYTHON)" ipaddr_test.py - } - python_execute_function -s testing -} diff --git a/dev-python/ipaddr/ipaddr-2.1.9.ebuild b/dev-python/ipaddr/ipaddr-2.1.9.ebuild deleted file mode 100644 index 344ce5e09a53..000000000000 --- a/dev-python/ipaddr/ipaddr-2.1.9.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/ipaddr/ipaddr-2.1.9.ebuild,v 1.2 2011/11/06 08:49:29 maksbotan Exp $ - -EAPI="3" -SUPPORT_PYTHON_ABIS="1" - -inherit distutils - -DESCRIPTION="Python IP address manipulation library" -HOMEPAGE="http://code.google.com/p/ipaddr-py/ http://pypi.python.org/pypi/ipaddr" -SRC_URI="http://ipaddr-py.googlecode.com/files/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="" - -DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1" -DOCS="README RELEASENOTES" -PYTHON_MODNAME="ipaddr.py" - -src_prepare() { - distutils_src_prepare - - preparation() { - if [[ "$(python_get_version -l --major)" == "3" ]]; then - 2to3-${PYTHON_ABI} -nw --no-diffs ipaddr.py ipaddr_test.py - fi - } - python_execute_function -s preparation -} - -src_test() { - testing() { - PYTHONPATH="build/lib" "$(PYTHON)" ipaddr_test.py - } - python_execute_function -s testing -} diff --git a/dev-python/logilab-common/Manifest b/dev-python/logilab-common/Manifest index 52c32ecc3dbf..3a5a2c3eeb9b 100644 --- a/dev-python/logilab-common/Manifest +++ b/dev-python/logilab-common/Manifest @@ -1,2 +1,3 @@ DIST logilab-common-0.61.0.tar.gz 199322 SHA256 80fba5ba4908983580a0003fee0c12c270b379e2a21038b609ce8eda4dd3cee7 SHA512 2229fcc8549e9adc87a7d6a47b3e966a16b61ae78a2253ea314d72d180a0cc7eae0fc444aefb3bf00995ead902eecf9fcabb7f494dafbdde9c7fdded3c4f35b1 WHIRLPOOL 942e1d2216ba9b09371fc77fd9e6f4463da260d174d2e0a0fd083adf4181ee9ce5a77845468b60aa85a869b90755b6668afe3a1274c21a77f0b40d0188d3ff5e DIST logilab-common-0.62.1.tar.gz 199594 SHA256 02745f8416faabba65b5cb188f849ef48ea787a1e62c7af16d4db4f361fb67a9 SHA512 56b2777a186c64bea9135a2aa85b158b60bf3d5be6cdd89e4449bd0b31bca4766ac678c080f36a4d0710a933ea02f946b8dac728c85da9a5319f96011462e443 WHIRLPOOL 88605edb80105453003c767417f7619a33410a565024808691a9164cc9298cc2880c04a498b0a7d639f5524e27546dd9ac8fea661c4761bfbf5742da29e670cd +DIST logilab-common-0.63.2.tar.gz 196789 SHA256 603ba00c9bb09219a3bd2906c214d9455481110dacc472f450b53d5ae90f28e7 SHA512 e4b089387ab7d5d039ec719e736711f54af8d722be4ea0a933014375fe353045528c3c74c3feb6868aefe4a867223c483985fb1415aabe25dba1d333d1afbdb9 WHIRLPOOL d937ebb1f20c2bb040552bf32afc767f4238c21cb995583f9f19404c9a22bec634889a684a9fecfb70b2a17803cd4df6507dc5a74b6ae9ee4d04759d724bb687 diff --git a/dev-python/logilab-common/logilab-common-0.63.2.ebuild b/dev-python/logilab-common/logilab-common-0.63.2.ebuild new file mode 100644 index 000000000000..617f8025f8ad --- /dev/null +++ b/dev-python/logilab-common/logilab-common-0.63.2.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.63.2.ebuild,v 1.1 2015/01/26 17:00:30 vapier Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy ) + +inherit distutils-r1 eutils + +DESCRIPTION="Useful miscellaneous modules used by Logilab projects" +HOMEPAGE="http://www.logilab.org/project/logilab-common http://pypi.python.org/pypi/logilab-common" +SRC_URI="ftp://ftp.logilab.org/pub/common/${P}.tar.gz mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="test doc" + +RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" + +# Tests using dev-python/psycopg are skipped when dev-python/psycopg isn't installed. +# egenix-mx-base tests are optional and supports python2 only. +DEPEND="${RDEPEND} + test? ( + $(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' python2_7) + dev-python/pytz[${PYTHON_USEDEP}] + !dev-python/psycopg[-mxdatetime] + ) + doc? ( $(python_gen_cond_dep 'dev-python/epydoc[${PYTHON_USEDEP}]' python2_7) )" + +PATCHES=( + # Make sure setuptools does not create a zip file in python_test; + # this is buggy and causes tests to fail. + "${FILESDIR}/${PN}-0.59.1-zipsafe.patch" +) +# Req'd for impl specific failures in the testsuite +DISTUTILS_IN_SOURCE_BUILD=1 + +python_prepare_all() { + sed -e 's:(CURDIR):{S}/${P}:' -i doc/makefile || die + distutils-r1_python_prepare_all +} + +python_compile_all() { + if use doc; then + # Based on the doc build in Arfrever's ebuild. It works + pushd doc > /dev/null + mkdir -p apidoc || die + epydoc --parse-only -o apidoc --html -v --no-private --exclude=__pkginfo__ --exclude=setup --exclude=test \ + -n "Logilab's common library" "$(ls -d ../build/lib/logilab/common/)" build \ + || die "Generation of documentation failed" + fi +} + +python_test() { + distutils_install_for_testing + + # https://www.logilab.org/ticket/149345 + # Prevent timezone related failure. + export TZ=UTC + + # Make sure that the tests use correct modules. + pushd "${TEST_DIR}"/lib > /dev/null || die + + if python_is_python3; then + # http://www.logilab.org/ticket/241813, 241807 + # The suite can be made to pass under py3.4 by disabling the class MxDateTC in unittest_date.py + # These are covered by issue 241813. Any and all methods to disable them temporarily + # (assuming they will ever be fixed) are simply cumbersome in the extreme, thus impractical. + # The failures are specific to py3.4's unittest's parameters in _addSkip and not the package itself. + if [[ "${EPYTHON}" == "python3.4" ]]; then + sed -e 's:test_any:_&:' \ + -i $(find . -name unittest_compat.py) || die + sed -e 's:test_add_days_worked:_&:' \ + -i $(find . -name unittest_date.py) || die + fi + # Still one related failure under py3.4 + # Returns a clean run under py3.3, though leaving fails exposed in this bump of 0.62.1 + # https://www.logilab.org/ticket/269904 + # Also unittest_date.py known to fail related to absence of installed egenix-mx-base + # rm $(find . -name unittest_umessage.py) || die + fi + "${TEST_DIR}"/scripts/pytest || die "Tests fail with ${EPYTHON}" + popd > /dev/null || die +} + +python_install_all() { + distutils-r1_python_install_all + + doman doc/pytest.1 + use doc && dohtml -r doc/apidoc/. +} diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest index 95ac6426f31b..5cf930000730 100644 --- a/dev-python/miniupnpc/Manifest +++ b/dev-python/miniupnpc/Manifest @@ -1,4 +1 @@ -DIST miniupnpc-1.6.20120509.tar.gz 68205 SHA256 cd023862ae3882246102594fda7dc5efd4feb2531bf7903abc62aa02e76193d8 SHA512 7d6a73676c1ed7e9c54ea1cd1214adb27da432b92a7fa102f1e9c10cf78d30d9a0a7b96dca30de36fce7ca7e66890170d9af78550df220c7d233c69e44917e8d WHIRLPOOL 5a998f2b143ce7deeaba58efe678a8386babc8b58ee5a83e5ba4f5767e7077ac0a741b9b4a685de8d0ed16b6579ea3e706fb12255ee8f989dfd738ee305c73ab -DIST miniupnpc-1.6.tar.gz 66454 SHA256 bbd6b756e6af44b5a5b0f9b93eada3fb8922ed1d6451b7d6f184d0ae0c813994 SHA512 c635057e40aa2826fb07db51c474a335cbcecbf7bba09773826b1aff4a01024dced8a6122e2b90db544540ae499b687006392d6041f7605467b73111ccb368a8 WHIRLPOOL 13b01fd4afcb05bd3f046e00b9d86c1c1655a262dcce5c50865ad93bae4028de8e16417ee5d3219971979ec2128c71bec03d8efc350157f2fb4744ca2757a597 -DIST miniupnpc-1.7.tar.gz 68327 SHA256 16dd2456be9b4bf290667c00eeb38c77ad47eb2107569b2dadcfcee8c9af6337 SHA512 ad2a689e91da068f2e291336cced9933963c2adc619b5e82dbb684e496d3683adba6a4634dd17265bf8dcc9d8f6c783b66aee1803ce63383997c27de3c16b194 WHIRLPOOL e9c7eed931fa1247ecfa8d9064d6890f6acca7ff41d79ec32716568f78317d972e14ecdee005a61e2a01914c984d0e18c63607ef9e79fef5a3974a8ca7586909 DIST miniupnpc-1.8.tar.gz 70624 SHA256 bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c SHA512 8eedac9ad473fc952ca8896fe534d6da6b1b234e8b6f35f721394d4c71aca84ed287ca6c4f0455b50d97a45e4cd34e27d99a6813386e0864781364aa607e13d4 WHIRLPOOL 5b76ccbb5ed7daa9bb0d481b424b7c31a5f6dc85c5c812ba10175a29aefc0d3924f3db2aa8c3529d1241be59d67d1d4c702d27aad2de8c8a07fecf3857d73169 diff --git a/dev-python/miniupnpc/miniupnpc-1.6.20120509.ebuild b/dev-python/miniupnpc/miniupnpc-1.6.20120509.ebuild deleted file mode 100644 index dcce0cfde0a7..000000000000 --- a/dev-python/miniupnpc/miniupnpc-1.6.20120509.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/miniupnpc/miniupnpc-1.6.20120509.ebuild,v 1.1 2012/05/24 01:11:52 ssuominen Exp $ - -EAPI=4 - -SUPPORT_PYTHON_ABIS=1 -PYTHON_DEPEND="2:2.6" -RESTRICT_PYTHON_ABIS="2.5 3.* *-jython" - -inherit distutils eutils - -DESCRIPTION="UPnP client library and a simple UPnP client" -HOMEPAGE="http://miniupnp.free.fr/" -SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="" - -RDEPEND=">=net-libs/miniupnpc-${PV}" -DEPEND="${RDEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/0001-Link-Python-module-against-the-shared-library.patch - rm -f Changelog.txt README # Installed by net-libs/miniupnpc - - distutils_src_prepare -} diff --git a/dev-python/miniupnpc/miniupnpc-1.6.ebuild b/dev-python/miniupnpc/miniupnpc-1.6.ebuild deleted file mode 100644 index 57847c9c3454..000000000000 --- a/dev-python/miniupnpc/miniupnpc-1.6.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/miniupnpc/miniupnpc-1.6.ebuild,v 1.2 2012/02/21 08:29:34 patrick Exp $ - -EAPI=3 -SUPPORT_PYTHON_ABIS=1 -PYTHON_DEPEND=2 -RESTRICT_PYTHON_ABIS="3.* *-jython" - -inherit base distutils - -DESCRIPTION="UPnP client library and a simple UPnP client" -HOMEPAGE="http://miniupnp.free.fr/" -SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="|| ( >=net-libs/miniupnpc-1.6-r1 - net-libs/miniupnpc[-python] ) - !net-libs/miniupnpc[python]" -DEPEND="${RDEPEND}" - -src_prepare() { - local PATCHES=( - "${FILESDIR}"/0001-Link-Python-module-against-the-shared-library.patch - ) - - base_src_prepare - distutils_src_prepare - - # these will conflict with base miniupnpc ebuild - # and distutils.eclass is stupid enough to force installing them - rm -f Changelog.txt README || die -} diff --git a/dev-python/miniupnpc/miniupnpc-1.7-r1.ebuild b/dev-python/miniupnpc/miniupnpc-1.7-r1.ebuild deleted file mode 100644 index ade73fbfd13b..000000000000 --- a/dev-python/miniupnpc/miniupnpc-1.7-r1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/miniupnpc/miniupnpc-1.7-r1.ebuild,v 1.5 2013/09/05 18:46:09 mgorny Exp $ - -EAPI=5 - -PYTHON_COMPAT=(python2_6 python2_7) - -inherit distutils-r1 - -DESCRIPTION="Python bindings for UPnP client library" -HOMEPAGE="http://miniupnp.free.fr/" -SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="" - -RDEPEND=">=net-libs/miniupnpc-${PV}" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/0001-Link-Python-module-against-the-shared-library.patch -) diff --git a/dev-python/pivy/pivy-0.5_alpha20110303.ebuild b/dev-python/pivy/pivy-0.5_alpha20110303.ebuild deleted file mode 100644 index 9e0ab3aa7d47..000000000000 --- a/dev-python/pivy/pivy-0.5_alpha20110303.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pivy/pivy-0.5_alpha20110303.ebuild,v 1.8 2013/04/27 12:02:32 xmw Exp $ - -EAPI="3" - -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-* *-jython" - -inherit distutils - -DESCRIPTION="Coin3d binding for Python" -HOMEPAGE="http://pivy.coin3d.org/" -SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz" -#identical to latest debian tarball at -# http://ftp.de.debian.org/debian/pool/main/p/pivy/pivy_0.5.0~v609hg.orig.tar.bz2 - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - media-libs/coin - >=media-libs/SoQt-1.5.0" -DEPEND="${RDEPEND} - dev-lang/swig" diff --git a/dev-python/pybluez/pybluez-0.18.ebuild b/dev-python/pybluez/pybluez-0.18.ebuild deleted file mode 100644 index 7ee760713ce4..000000000000 --- a/dev-python/pybluez/pybluez-0.18.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pybluez/pybluez-0.18.ebuild,v 1.5 2010/07/18 12:37:21 nixnut Exp $ - -EAPI="3" -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" - -inherit distutils - -MY_P="PyBluez-${PV}" - -DESCRIPTION="Python bindings for Bluez Bluetooth Stack" -HOMEPAGE="http://code.google.com/p/pybluez/" -SRC_URI="http://pybluez.googlecode.com/files/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="examples" - -DEPEND="net-wireless/bluez" -RDEPEND="${DEPEND}" -RESTRICT_PYTHON_ABIS="3.*" - -S="${WORKDIR}/${MY_P}" - -PYTHON_MODNAME="bluetooth" - -src_install() { - distutils_src_install - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins -r examples/* || die "doins failed" - fi -} diff --git a/dev-python/pychart/pychart-1.39.ebuild b/dev-python/pychart/pychart-1.39.ebuild deleted file mode 100644 index 81297bd543e1..000000000000 --- a/dev-python/pychart/pychart-1.39.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pychart/pychart-1.39.ebuild,v 1.9 2010/04/07 17:53:15 hwoarang Exp $ - -EAPI="3" -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" - -inherit distutils - -MY_P=PyChart-${PV} - -DESCRIPTION="Python library for creating charts" -HOMEPAGE="http://home.gna.org/pychart/" -SRC_URI="http://download.gna.org/pychart/${MY_P}.tar.gz - doc? ( http://download.gna.org/pychart/${PN}-doc.tar.gz )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ia64 ~ppc x86" -IUSE="doc examples" - -DEPEND="app-text/ghostscript-gpl" -RDEPEND="${DEPEND}" -RESTRICT_PYTHON_ABIS="3.*" - -S="${WORKDIR}/${MY_P}" - -src_install() { - distutils_src_install - - if use doc; then - dohtml -r "${WORKDIR}/${PN}/"* || die "dohtml failed" - fi - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins demos/* - fi -} diff --git a/dev-python/readme/Manifest b/dev-python/readme/Manifest new file mode 100644 index 000000000000..4bcf39762669 --- /dev/null +++ b/dev-python/readme/Manifest @@ -0,0 +1 @@ +DIST readme-0.4.1.tar.gz 9318 SHA256 baf79dc0312ee4cf49291412916a120051b1b0977b5b7f883c550fb426a6a690 SHA512 937610e49fe2b94d8a5e924c02e99194bfe453bf73c03f73514dbd30412f556b81af2fa6ddfc5352f8eccc3706065f7e8302403d6060a6dc6719a7fabd1251ee WHIRLPOOL 405dc4a3b71ef7da42a333a63cb0ecc7dad3cb8d3ff9bc1fecd60d001700c1676e0f2ca4d7b9a08bb38c957cce5bb99cdba997f14d2c30fe5bee4f7ffc2a803d diff --git a/dev-python/readme/metadata.xml b/dev-python/readme/metadata.xml new file mode 100644 index 000000000000..9300f12fbb80 --- /dev/null +++ b/dev-python/readme/metadata.xml @@ -0,0 +1,9 @@ + + + + python + + radhermit@gentoo.org + Tim Harder + + diff --git a/dev-python/readme/readme-0.4.1.ebuild b/dev-python/readme/readme-0.4.1.ebuild new file mode 100644 index 000000000000..16184a748376 --- /dev/null +++ b/dev-python/readme/readme-0.4.1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/readme/readme-0.4.1.ebuild,v 1.1 2015/01/27 05:25:22 radhermit Exp $ + +EAPI=5 +PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) + +inherit distutils-r1 + +DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse" +HOMEPAGE="https://github.com/pypa/readme https://pypi.python.org/pypi/readme" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RDEPEND=" + dev-python/bleach[${PYTHON_USEDEP}] + dev-python/docutils[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( dev-python/pytest[${PYTHON_USEDEP}] ) +" + +DOCS=( README.rst ) + +python_prepare_all() { + # remove failing test for now + rm tests/fixtures/test_rst_008* || die + + distutils-r1_python_prepare_all +} + +python_test() { + py.test -v || die "Tests failed under ${EPYTHON}" +} diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest index 2aeb2e1291a6..f6695c2fe473 100644 --- a/dev-python/setuptools/Manifest +++ b/dev-python/setuptools/Manifest @@ -1,5 +1,6 @@ DIST setuptools-12.0.1.tar.gz 626735 SHA256 35c3d6db79c662f1fc1c5105bc7cd3983d44071ebf5f9e00453792ea1335d5ab SHA512 fd7ce2f50b38e53cfbaa3c7d493f1cb50c7153009221b4b9cf1222ffac784f1c47b3d5da02395b2e5385f62f14c0ce6b6265f538edfe7ff38559f2905f0dc86b WHIRLPOOL 7180885fa3fada912e253c16eb28da6aac607cb1b6a67434888f6e8962eaf7d7e935176f3362182560f4f47547f1acbb7b65e5031ef7851357886d8fc3991069 DIST setuptools-12.0.3.tar.gz 626842 SHA256 aa995fc91d203d02630bf54f9d898b7b337cbefb3f8d05d33de2b0d64a601ef8 SHA512 5a6e3d9ed6e6a184c40ad850435818157fff76d900300dfe5c5e96ba31f67d9f23098e61b357f76c235b1eec11676038cbbb90e65ba6b0194753acb340eb7e46 WHIRLPOOL bc03b6d8bc6c05568923dcc3498012d8e0f09562b37e7df73d6a48927dbcea3f88046483f47c13be12bb9c82440f73bfa55cb5688f99fda67bb7ee086fe5eb08 +DIST setuptools-12.0.5.tar.gz 626973 SHA256 bda326cad34921060a45004b0dd81f828d471695346e303f4ca53b8ba6f4547f SHA512 d4d3a0decc9e77abf12ee5121df0cbf9863f9f8cf680a728bf581484587bbd1f1abc523a8ce3b35ab0ffce08d8de8728b450aee8738b67d2046460da4122fb7e WHIRLPOOL aa5997fa8360bf23ff2b3f49c376adf4580958dfe5bbfffcfbc107d8fddd2974be1ccddf8e8c3753a36c5ef3202bffa31876836e14ecbcd6b071a1782d23e22a DIST setuptools-2.2.tar.gz 786831 SHA256 6fb1f21dea64e323e7ad2531a6795eeb6f5e17a85189dee61a86baca60b18984 SHA512 b5472e20f13c62ddc06513a964d8d85230a6cb8f4b0a6bc05c57d42aa3e682a850418246b5c1d769dba0cea18d7b262817f743b49a73383157a6b76d5637c296 WHIRLPOOL 6377efcf56082fdbea79cba7ae7c7d125d2368ea2309c9d655e4a568d40c8a6c9673dc1db63a2cb1f143436da411e664281ba239a058b5dff91b99cd2b5b332d DIST setuptools-7.0.tar.gz 793737 SHA256 dd9c1a2a0fdf37a7b142626700e0a0b7a3a0657b735c50d367fca932803be061 SHA512 0c52bf2d22f7bbd7560e8bb3184406426cf759980add0e60a864f15d9bcf10f01a2bfe0eb598c8c965b2e89df8c4159c2b43028b560f04192bba47e67d9cda18 WHIRLPOOL 70c0076960af3c00d49f79d5a0c3e3ec47a0b5009a20377cb7eca1e0747d6249d433ae14a0b86e5ac1f3bcc1efd99b68e48bd741458389c27ea05406af64e55f DIST setuptools-8.0.1.tar.gz 801353 SHA256 ab8eb279ca9062efc7e70f74a35f3dd9315835139ecaf3ae5bfdf4a7dc768e30 SHA512 c86a2c6ae5ed8205b9b37911002a8f551f2607ecab8b74b9eae6a7b92713c0d0a3d6aa54c4428df48765c1a2c9e21f53128bb1f138f7753e1f45188b0e357ff2 WHIRLPOOL 0ee70ee0a00118cb41005f77614bade6d5198a9164718bd7bb595b5cea0456ff829ac48cc8113c91d2f7830c4b4e9f4bd73245393621ae87e581b1e9b497f95d diff --git a/dev-python/setuptools/setuptools-12.0.5.ebuild b/dev-python/setuptools/setuptools-12.0.5.ebuild new file mode 100644 index 000000000000..2ed817f9d26d --- /dev/null +++ b/dev-python/setuptools/setuptools-12.0.5.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-12.0.5.ebuild,v 1.1 2015/01/27 04:41:06 radhermit Exp $ + +EAPI="5" +PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="a collection of extensions to Distutils" +HOMEPAGE="http://pypi.python.org/pypi/setuptools" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="PSF-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="test" + +DEPEND=" + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy) + ) +" + +# Force in-source build because build system modifies sources. +DISTUTILS_IN_SOURCE_BUILD=1 + +DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} ) + +python_prepare_all() { + # disable tests requiring a network connection + rm setuptools/tests/test_packageindex.py || die + + # don't run integration tests + rm setuptools/tests/test_integration.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg + # It tries to sandbox the test in a tempdir + HOME="${PWD}" py.test ${PN} || die "Tests failed under ${EPYTHON}" +} + +python_install() { + export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 + distutils-r1_python_install +} diff --git a/dev-ruby/allison/allison-2.0.3-r3.ebuild b/dev-ruby/allison/allison-2.0.3-r3.ebuild index 4cae6f4b5cb1..252c691b8efd 100644 --- a/dev-ruby/allison/allison-2.0.3-r3.ebuild +++ b/dev-ruby/allison/allison-2.0.3-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/allison/allison-2.0.3-r3.ebuild,v 1.4 2014/11/11 11:09:41 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/allison/allison-2.0.3-r3.ebuild,v 1.5 2015/01/26 18:19:42 mrueg Exp $ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21" +USE_RUBY="ruby19 ruby20 ruby21 ruby22" RUBY_FAKEGEM_TASK_TEST="" RUBY_FAKEGEM_TASK_DOC="" diff --git a/dev-ruby/arel/arel-4.0.2.ebuild b/dev-ruby/arel/arel-4.0.2.ebuild index d6180127fdb7..62cae6655a6b 100644 --- a/dev-ruby/arel/arel-4.0.2.ebuild +++ b/dev-ruby/arel/arel-4.0.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/arel/arel-4.0.2.ebuild,v 1.3 2014/08/12 18:44:35 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/arel/arel-4.0.2.ebuild,v 1.4 2015/01/26 18:23:05 mrueg Exp $ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21" +USE_RUBY="ruby19 ruby20 ruby21 ruby22" RUBY_FAKEGEM_RECIPE_DOC="rdoc" RUBY_FAKEGEM_DOCDIR="doc" diff --git a/dev-ruby/atomic/Manifest b/dev-ruby/atomic/Manifest index 8f12c6ba01c8..41379eab2b0d 100644 --- a/dev-ruby/atomic/Manifest +++ b/dev-ruby/atomic/Manifest @@ -1 +1,2 @@ DIST atomic-1.1.16.gem 16896 SHA256 56748e82ab4a29bb76e4f73843587a322666ed15d90e1925119afaa12b38dfc4 SHA512 d8c3acb5eebbd5a9d22b783860eb036893f03580c70480c3226dbdf22e081aabdd7edb96eb830688e342e42286586c57a29141332ccc0e59d8df2dff7dcd9c70 WHIRLPOOL f179763300d9c0e6d43b5231d6ec6bfb468dec4c937e16d41a6c731b66b4d96b780f9b006016fecbc738e77b9afe430083943e04dd73fc89bc61272316df4f8d +DIST atomic-1.1.99.gem 17920 SHA256 093fa4d0522bfac61b4793b00c8e14dae846d5c1d28fa9dd6ab6112be1ce09ce SHA512 9c7762f6c32d11b2c5b45be68954ca12c753d2b4683167158a037ce791d72b13d940beef5bf6dd445c8b12e358c62d2a9f43a609fb3b7c7357fea4f66316063c WHIRLPOOL 72970b2f8a503eb29fe2aa2702b8a91f796c5f0382d2ff3f3f809a5eb39db5252e1732bfc919021f77e7a308a0ce05dc4d2cd1c9027412942077dac95804cf0d diff --git a/dev-ruby/atomic/atomic-1.1.99.ebuild b/dev-ruby/atomic/atomic-1.1.99.ebuild new file mode 100644 index 000000000000..5e66b43e5e05 --- /dev/null +++ b/dev-ruby/atomic/atomic-1.1.99.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/atomic/atomic-1.1.99.ebuild,v 1.1 2015/01/27 06:42:12 graaff Exp $ + +EAPI=5 + +USE_RUBY="ruby19 ruby20 ruby21 ruby22" + +RUBY_FAKEGEM_TASK_DOC="" + +inherit multilib ruby-fakegem + +DESCRIPTION="An atomic reference implementation for JRuby, Rubinius, and MRI" +HOMEPAGE="https://github.com/headius/ruby-atomic" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" +IUSE="" + +all_ruby_prepare() { + # Avoid compilation dependencies since we compile directly. + sed -i -e '/:test => :compile/ s:^:#:' \ + -e '/extensiontask/,/end/ s:^:#:' Rakefile || die +} + +each_ruby_configure() { + ${RUBY} -Cext extconf.rb || die +} + +each_ruby_compile() { + emake V=1 -Cext + cp ext/atomic_reference$(get_modname) lib/ || die +} diff --git a/dev-ruby/htmlentities/htmlentities-4.3.3.ebuild b/dev-ruby/htmlentities/htmlentities-4.3.3.ebuild index a3c30b41f96c..c835ea0a51da 100644 --- a/dev-ruby/htmlentities/htmlentities-4.3.3.ebuild +++ b/dev-ruby/htmlentities/htmlentities-4.3.3.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/htmlentities/htmlentities-4.3.3.ebuild,v 1.1 2014/12/26 06:42:33 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/htmlentities/htmlentities-4.3.3.ebuild,v 1.2 2015/01/26 18:26:35 mrueg Exp $ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21" +USE_RUBY="ruby19 ruby20 ruby21 ruby22" RUBY_FAKEGEM_TASK_TEST="" RUBY_FAKEGEM_TASK_DOC="" diff --git a/dev-ruby/journey/journey-1.0.4-r1.ebuild b/dev-ruby/journey/journey-1.0.4-r1.ebuild index 2343a4b9a2cb..18edc77bf543 100644 --- a/dev-ruby/journey/journey-1.0.4-r1.ebuild +++ b/dev-ruby/journey/journey-1.0.4-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/journey/journey-1.0.4-r1.ebuild,v 1.3 2014/08/12 18:53:02 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/journey/journey-1.0.4-r1.ebuild,v 1.4 2015/01/26 18:24:13 mrueg Exp $ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21" +USE_RUBY="ruby19 ruby20 ruby21 ruby22" RUBY_FAKEGEM_TASK_DOC="docs" RUBY_FAKEGEM_DOCDIR="doc" @@ -12,7 +12,7 @@ RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc" inherit ruby-fakegem versionator -DESCRIPTION="Journey is a router. It routes requests" +DESCRIPTION="Journey is a router. It routes requests" HOMEPAGE="https://github.com/rails/journey" LICENSE="MIT" diff --git a/dev-ruby/jwt/Manifest b/dev-ruby/jwt/Manifest index fc32d519eaf9..4da0de88de74 100644 --- a/dev-ruby/jwt/Manifest +++ b/dev-ruby/jwt/Manifest @@ -1,2 +1,2 @@ -DIST jwt-1.0.0.gem 8192 SHA256 da0fdc68fb206dcbec915230be1a514dd17d58c27dc749b4324492cf683be349 SHA512 27677b505ca46f07774d6d306c950662e8dc44632e7c4708c4fe7f4ccec34b38f5faf6c01d0a3507fbae1cdbaea09418977d3bab7c80d704687ef6a823d0a094 WHIRLPOOL 688d382369c11a1bc5225494a124e46df3e806a4aa1ae3b48c094cd45ff072e93d124d92af29a043e3156716e7e1a3a2ee7fa5b636ab1d6dc98e3d9085e482df DIST jwt-1.2.0.gem 9216 SHA256 018f594f6f319b160ed7181ebcbd7759241a8154a4f4aa92df2fdabfd4126a02 SHA512 c38462bc98cc08993ea660bbdf557e70d68ff9d0fabafe05534e9dcabded706ad39208e7495514d488945d7eb44609256664bfbbd4b427d0d42d03e0e44b851b WHIRLPOOL b102ce2bb5209ceee4b08a9d3a9ba00c1fa3c2bc246a5b068ca63d4a848f279331e29f28cafb5979394bc7b1fbb2702c3acca0e41662a27078fe9f04b173e898 +DIST jwt-1.2.1.gem 9216 SHA256 b0cfc9e85b2f851aa49931a4c07156127888fbf003e7ef971d4d6c2e91f98661 SHA512 d9d53b2b7766c9315de9dad3b63f85bbbbc2c8d980098ae5c570ba4890f87dfa1aad21132580210bc622e78172f5ed6fea0a8de4049cc5da5e910620abdfa4a6 WHIRLPOOL f63f18cb18d30b57b8549a5367b0319ad7dc9c8a58e34ba3022662dad6951b9cdbe26da14df6c133c68b2b2df2f75614fb5e2e984e5e9869a28ea2363b78cfc5 diff --git a/dev-ruby/jwt/jwt-1.0.0.ebuild b/dev-ruby/jwt/jwt-1.2.1.ebuild similarity index 56% rename from dev-ruby/jwt/jwt-1.0.0.ebuild rename to dev-ruby/jwt/jwt-1.2.1.ebuild index fa3266b8eacd..aaaa8969f7eb 100644 --- a/dev-ruby/jwt/jwt-1.0.0.ebuild +++ b/dev-ruby/jwt/jwt-1.2.1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jwt/jwt-1.0.0.ebuild,v 1.3 2014/08/15 14:11:10 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jwt/jwt-1.2.1.ebuild,v 1.1 2015/01/26 19:58:01 graaff Exp $ EAPI=5 USE_RUBY="ruby19 ruby20 ruby21" RUBY_FAKEGEM_RECIPE_TEST="rspec" -RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_RECIPE_DOC="rdoc" inherit ruby-fakegem @@ -18,6 +18,3 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="" - -ruby_add_bdepend "test? ( dev-ruby/echoe )" -ruby_add_rdepend ">=dev-ruby/multi_json-1.5.1" diff --git a/dev-ruby/listen/Manifest b/dev-ruby/listen/Manifest index ac720b26b586..2203d66c4db9 100644 --- a/dev-ruby/listen/Manifest +++ b/dev-ruby/listen/Manifest @@ -1,4 +1,3 @@ DIST listen-0.7.3-git.tgz 34831 SHA256 e6e1b8b45251e5bdcb397a9774dea57918ab091b6358ae42654a99bda280686b SHA512 9d4297f24b63449f3293f750d903170793b31c2a7d0a87c16bc4c3b741b993e0cc06ec5408d7a2c706505641fa3cd3f070cc09e7a7a5d358d8f18f26b41fb408 WHIRLPOOL da8c416f3e2757f146c6bdc83f7c527b8c566ac7716b52408788abd3407c2ac823d5f1cb94dd3df92ce75e5510705aa7bb65f9833974c3be20c18a470d9e5659 DIST listen-1.3.1-git.tgz 35521 SHA256 36676ee96fac67e46f52227ce8590a7532b0861ad1d0fa865d8783b635c56749 SHA512 4676d030a3e676249a221cf4a136ce69651009ce5855821924be184460e404e4f33026627c9d524156a89344c826b48a690a249f1059493d7d214b922381bdd0 WHIRLPOOL ecaf0e8dca01fba1d75c5c8bfc5bf6a3c5d371d5ca8c38bb92aba9a95cda6c1fb39b5e9927524581ef54f4ff2faf2e739f0dbf61b3a016c8943858f785e06ad2 -DIST listen-2.7.5.gem 35840 SHA256 272236876c782cb3b8a6ff8da1bac77e44b0f59dbb791a379665cfbe78f6251e SHA512 755ba588cf90410902fe83b739f350f56a5b9d44be3828697b694109518c122b0b7ec5b258a5556e5389ec4846bc02f2adc53efa5dda74f5d6443461a13bf43a WHIRLPOOL 8d106f982aa70005cc774dc9088b792d0bdfdac1f5a05b9b8d8797910254a51b66c779a677e57a462494baf973872a727c20a3d462565abe8b1adaa7c3d23a35 DIST listen-2.8.5.tar.gz 44835 SHA256 6d251965b6c9309d4609c47880a025d53538a77bee355e74fd667fb3738980d2 SHA512 e784f8e90299aac0b0ed5ce20c08c5cfd821f325fbee4328d9af521782637a46aff8fb25ab37d44710204fbd74fc0c09aca92e61ee6a158c3238f9816220288a WHIRLPOOL 321d98e5b34b936767351dd73ca467b7f84b1621a0f8ff06ca25021acb674c6cf52644b6e1db90f418e4b9aca77f5830cc3d2d672e04f290247d2f70cf0025b6 diff --git a/dev-ruby/listen/listen-0.7.3.ebuild b/dev-ruby/listen/listen-0.7.3.ebuild deleted file mode 100644 index 6e70dfd7e891..000000000000 --- a/dev-ruby/listen/listen-0.7.3.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/listen/listen-0.7.3.ebuild,v 1.6 2014/11/11 11:04:34 mrueg Exp $ - -EAPI=5 - -USE_RUBY="ruby19" - -RUBY_FAKEGEM_RECIPE_TEST="rspec" - -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" - -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" - -inherit ruby-fakegem - -DESCRIPTION="Listens to file modifications and notifies you about the changes" -HOMEPAGE="https://github.com/guard/listen" -SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}-git.tgz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x64-macos" -IUSE="" - -ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.0" diff --git a/dev-ruby/listen/listen-2.7.5.ebuild b/dev-ruby/listen/listen-2.7.5.ebuild deleted file mode 100644 index d9ef65fba17b..000000000000 --- a/dev-ruby/listen/listen-2.7.5.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/listen/listen-2.7.5.ebuild,v 1.6 2014/11/03 10:39:19 mrueg Exp $ - -EAPI=5 - -USE_RUBY="ruby19 ruby20 ruby21" - -RUBY_FAKEGEM_RECIPE_TEST="rspec" - -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" - -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" - -inherit ruby-fakegem - -DESCRIPTION="Listens to file modifications and notifies you about the changes" -HOMEPAGE="https://github.com/guard/listen" - -LICENSE="MIT" -SLOT="2" -KEYWORDS="~amd64 ~ppc ~ppc64" -IUSE="" - -ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.0 - >=dev-ruby/celluloid-0.15.2" -ruby_add_bdepend "test? ( dev-ruby/celluloid-io )" - -all_ruby_prepare() { - sed -i -e "/git/d" -e "/rb-fsevent/d" -e "/bundler/d" -e "/rspec-retry/d" ${PN}.gemspec || die - sed -i -e "/retry/d" spec/spec_helper.rb || die -} diff --git a/dev-ruby/listen/listen-2.8.5.ebuild b/dev-ruby/listen/listen-2.8.5.ebuild index 3cca9ebe51f4..22720e0bfeb6 100644 --- a/dev-ruby/listen/listen-2.8.5.ebuild +++ b/dev-ruby/listen/listen-2.8.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/listen/listen-2.8.5.ebuild,v 1.1 2015/01/18 03:15:58 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/listen/listen-2.8.5.ebuild,v 1.2 2015/01/26 19:41:22 graaff Exp $ EAPI=5 @@ -24,6 +24,9 @@ SLOT="2" KEYWORDS="~amd64 ~ppc ~ppc64" IUSE="" +# Block on other packages trying to install a /usr/bin/listen +RDEPEND+="!!media-sound/listen !!media-radio/ax25" + ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.0 >=dev-ruby/celluloid-0.15.2" ruby_add_bdepend "test? ( dev-ruby/celluloid-io )" diff --git a/dev-ruby/permutation/permutation-0.1.8-r1.ebuild b/dev-ruby/permutation/permutation-0.1.8-r1.ebuild index 2be408687390..d7818e0f99da 100644 --- a/dev-ruby/permutation/permutation-0.1.8-r1.ebuild +++ b/dev-ruby/permutation/permutation-0.1.8-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/permutation/permutation-0.1.8-r1.ebuild,v 1.1 2014/10/26 13:55:11 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/permutation/permutation-0.1.8-r1.ebuild,v 1.2 2015/01/26 18:30:25 mrueg Exp $ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21" +USE_RUBY="ruby19 ruby20 ruby21 ruby22" RUBY_FAKEGEM_RECIPE_DOC="rdoc" diff --git a/dev-ruby/ruby-progressbar/ruby-progressbar-1.4.2.ebuild b/dev-ruby/ruby-progressbar/ruby-progressbar-1.4.2.ebuild index 7ec6f7767dca..7bc8822cbb1c 100644 --- a/dev-ruby/ruby-progressbar/ruby-progressbar-1.4.2.ebuild +++ b/dev-ruby/ruby-progressbar/ruby-progressbar-1.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-progressbar/ruby-progressbar-1.4.2.ebuild,v 1.4 2015/01/02 10:12:11 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-progressbar/ruby-progressbar-1.4.2.ebuild,v 1.5 2015/01/27 07:42:14 jer Exp $ EAPI=5 @@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/jfelchner/ruby-progressbar" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd" +KEYWORDS="~amd64 hppa ~ppc ~ppc64 ~x86 ~x86-fbsd" IUSE="test" diff --git a/dev-ruby/shorturl/shorturl-1.0.0-r1.ebuild b/dev-ruby/shorturl/shorturl-1.0.0-r1.ebuild index aa43c05bfefd..3729ef61d460 100644 --- a/dev-ruby/shorturl/shorturl-1.0.0-r1.ebuild +++ b/dev-ruby/shorturl/shorturl-1.0.0-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shorturl/shorturl-1.0.0-r1.ebuild,v 1.6 2014/11/26 02:22:32 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shorturl/shorturl-1.0.0-r1.ebuild,v 1.7 2015/01/26 18:24:20 mrueg Exp $ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21" +USE_RUBY="ruby19 ruby20 ruby21 ruby22" RUBY_FAKEGEM_TASK_TEST="" RUBY_FAKEGEM_TASK_DOC="" diff --git a/dev-ruby/timecop/timecop-0.7.1.ebuild b/dev-ruby/timecop/timecop-0.7.1.ebuild index 7c773a33dab8..3a609d21a45a 100644 --- a/dev-ruby/timecop/timecop-0.7.1.ebuild +++ b/dev-ruby/timecop/timecop-0.7.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/timecop/timecop-0.7.1.ebuild,v 1.2 2015/01/02 10:14:04 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/timecop/timecop-0.7.1.ebuild,v 1.3 2015/01/27 07:42:13 jer Exp $ EAPI=5 @@ -19,7 +19,7 @@ HOMEPAGE="http://github.com/jtrupiano/timecop" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd" +KEYWORDS="~amd64 ~arm hppa ~ppc ~ppc64 ~x86 ~x86-fbsd" IUSE="" ruby_add_bdepend "test? ( dev-ruby/mocha )" diff --git a/dev-ruby/wirble/wirble-0.1.3-r3.ebuild b/dev-ruby/wirble/wirble-0.1.3-r3.ebuild index 22dbbc6dd4b9..2541d08c73ca 100644 --- a/dev-ruby/wirble/wirble-0.1.3-r3.ebuild +++ b/dev-ruby/wirble/wirble-0.1.3-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/wirble/wirble-0.1.3-r3.ebuild,v 1.2 2014/08/05 16:01:01 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/wirble/wirble-0.1.3-r3.ebuild,v 1.3 2015/01/26 18:29:08 mrueg Exp $ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21" +USE_RUBY="ruby19 ruby20 ruby21 ruby22" RUBY_FAKEGEM_RECIPE_DOC="rdoc" RUBY_FAKEGEM_EXTRADOC="README ChangeLog" diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest index af1530e1d2fd..99f7bcbb7b3c 100644 --- a/dev-util/jenkins-bin/Manifest +++ b/dev-util/jenkins-bin/Manifest @@ -1,3 +1,3 @@ DIST jenkins-bin-1.580.2.war 68035763 SHA256 e41321fdcc4803ff6b1d0b8c68a247527791949338beabbc2eb13586ef7b6fab SHA512 c9371b80ff21986d485e63b0d9f957c18ee4babbe625fa0f4fb9fcd3dfb70d04c86302da37c4670ead1c115deffac88107df43af2541b16ac78a032994ecbbc6 WHIRLPOOL 240833e2aaa84e2f87114a2ef2a0fc858471f0096bfd096010b62ab1177088b8432d76388040b4ebe5c958a40557f951f223cc598ae8b3cf1754a9960577b7f1 -DIST jenkins-bin-1.595.war 68215690 SHA256 2424e6316ec45d524d132203438e8d767a5e9bed747b2c583047ff944f2e2935 SHA512 0511d064a9b38910f9a65a5a04622d78cd4dda594b239521035f30aad907c9c5ca26ed00cc3643d0a73f6120f372fa577a53f73957869bfe5d56032c817528af WHIRLPOOL e7cb7b20135752633c4747ee7af79ffd168d7724ade6d9aec660caceb899393d978fc08c9bb10572656ea00887443f7d441b6b5f2f80d715e19b7465c5f8ba1c DIST jenkins-bin-1.597.war 68210489 SHA256 938857fc3f836cabcbba27924ed6cb02267bb22d51324f884d8757d018c3e807 SHA512 7d4349f5f6861c2f9f3a86c5bbb0629d431bc43f5c223a02c0e98c8c01f6a27990905d08e2e6aaa20eb8ac7845e062eff98885f0211ca0d3d5d0f77c31bea643 WHIRLPOOL 7d9f5c3cdc8c1659acaf5e89c3b09cf849dfd31201c20eddaf7b162f0498a4daa76be82c577a69839443f9acb9ebe7cec6d2f05cd17d0fbca55c538be99d6367 +DIST jenkins-bin-1.598.war 67619385 SHA256 c7c431cf1e305fb19cd47065eaf980d3667df4d587b370508a55403167556e3d SHA512 b059869971dc14db0398fa1727df8ed1446fa21b0ed25697c1eef8fe9044ca720b61cfa3b4a38ba8e3101bb0c34f82ec8cb18516f80c9c2359a7e04fe040cfe2 WHIRLPOOL 9a41684a2cee178ec810d9688b75b077004a5e7e6f859f06418b5e3a0b0b2ab7bac58edb95de5d8d7de09b9fcac9ef53ab5556cda10abdeb8e58868e20b5a814 diff --git a/dev-util/jenkins-bin/jenkins-bin-1.595.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.598.ebuild similarity index 91% rename from dev-util/jenkins-bin/jenkins-bin-1.595.ebuild rename to dev-util/jenkins-bin/jenkins-bin-1.598.ebuild index 16c18ef96a0e..5717bf2cb571 100644 --- a/dev-util/jenkins-bin/jenkins-bin-1.595.ebuild +++ b/dev-util/jenkins-bin/jenkins-bin-1.598.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/jenkins-bin-1.595.ebuild,v 1.1 2014/12/27 15:38:02 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/jenkins-bin-1.598.ebuild,v 1.1 2015/01/27 02:26:49 mrueg Exp $ EAPI=5 diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest new file mode 100644 index 000000000000..77bc3103eb96 --- /dev/null +++ b/dev-util/trace-cmd/Manifest @@ -0,0 +1 @@ +DIST trace-cmd-2.5.1.tar.xz 1577148 SHA256 591aa00ff90a60fa2bce8637392126623511fd7629a771c7e3276137b31b3966 SHA512 2280eefa130a3914c34798f8bd4097a55f7f4fa4632b3d26ee1317bba54625d259ac61c6576dd3051fb2be48fb593fa54a4203d1828b7fec5fd196de00491ea2 WHIRLPOOL 4185a05c96204fb5ec8256620af53ec4c4bb2e0f7e2f268c7a6814ed788b1ce256f2dba429eef80dcf2b2409b3cd1ff11bed9bae43da558de9f6d3bb2c7c654c diff --git a/dev-util/trace-cmd/files/trace-cmd-2.5.1-makefile.patch b/dev-util/trace-cmd/files/trace-cmd-2.5.1-makefile.patch new file mode 100644 index 000000000000..ec9fb1774a3a --- /dev/null +++ b/dev-util/trace-cmd/files/trace-cmd-2.5.1-makefile.patch @@ -0,0 +1,34 @@ +diff --git a/Makefile b/Makefile +index 186e245..9127f23 100644 +--- a/Makefile ++++ b/Makefile +@@ -58,7 +58,7 @@ plugin_dir = $(HOME)/.trace-cmd/plugins + python_dir = $(HOME)/.trace-cmd/python + else + plugin_dir = $(prefix)/$(libdir)/trace-cmd/plugins +-python_dir = $(prefix)/$(libdir)/trace-cmd/python ++python_dir ?= $(prefix)/$(libdir)/trace-cmd/python + PLUGIN_DIR = -DPLUGIN_DIR="$(plugin_dir)" + PYTHON_DIR = -DPYTHON_DIR="$(python_dir)" + PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))' +@@ -98,8 +98,11 @@ endif # NO_PYTHON + test-build = $(if $(shell sh -c 'echo "$(1)" | \ + $(CC) -o /dev/null -c -x c - > /dev/null 2>&1 && echo y'), $2) + ++ifndef NO_UDIS86 + # have udis86 disassembler library? +-udis86-flags := $(call test-build,\#include ,-DHAVE_UDIS86 -ludis86) ++udis86-flags := -DHAVE_UDIS86 ++udis86-ldflags := -ludis86 ++endif # NO_UDIS86 + + define BLK_TC_FLUSH_SOURCE + #include +@@ -242,6 +245,7 @@ endif + # Append required CFLAGS + override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ) + override CFLAGS += $(udis86-flags) $(blk-flags) ++override LDFLAGS += $(udis86-ldflags) + + ifeq ($(VERBOSE),1) + Q = diff --git a/dev-util/trace-cmd/metadata.xml b/dev-util/trace-cmd/metadata.xml new file mode 100644 index 000000000000..2bd7dc23471b --- /dev/null +++ b/dev-util/trace-cmd/metadata.xml @@ -0,0 +1,11 @@ + + + + + chutzpah@gentoo.org + Patrick McLean + + + Enable support for dev-libs/udis86 disassembler library + + diff --git a/dev-util/trace-cmd/trace-cmd-2.5.1.ebuild b/dev-util/trace-cmd/trace-cmd-2.5.1.ebuild new file mode 100644 index 000000000000..2f93691a832d --- /dev/null +++ b/dev-util/trace-cmd/trace-cmd-2.5.1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/trace-cmd/trace-cmd-2.5.1.ebuild,v 1.2 2015/01/27 03:13:47 chutzpah Exp $ + +EAPI=5 +PYTHON_COMPAT=(python2_7) + +inherit eutils toolchain-funcs linux-info python-single-r1 + +DESCRIPTION="User-space front-end for Ftrace" +HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git" +SRC_URI="mirror://gentoo/${P}.tar.xz" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc gtk python udis86" + +RDEPEND="python? ( ${PYTHON_DEPS} ) + udis86? ( dev-libs/udis86 ) + gtk? ( + ${PYTHON_DEPS} + dev-python/pygtk:2[${PYTHON_USEDEP}] + )" +DEPEND="${RDEPEND} + sys-kernel/linux-headers + python? ( + virtual/pkgconfig + dev-lang/swig + ) + gtk? ( virtual/pkgconfig ) + doc? ( app-text/asciidoc )" + +CONFIG_CHECK=" + ~TRACING + ~FTRACE + ~BLK_DEV_IO_TRACE" + +pkg_setup() { + linux-info_pkg_setup + python-single-r1_pkg_setup +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-makefile.patch + epatch_user +} + +src_configure() { + MAKEOPTS+=" prefix=/usr libdir=$(get_libdir) CC=$(tc-getCC) AR=$(tc-getAR)" + + if use python; then + MAKEOPTS+=" PYTHON_VERS=${EPYTHON//python/python-}" + MAKEOPTS+=" python_dir=$(python_get_sitedir)/${PN}" + else + MAKEOPTS+=" NO_PYTHON=1" + fi + + use udis86 || MAKEOPTS+=" NO_UDIS86=1" +} + +src_compile() { + emake all_cmd + use doc && emake doc + use gtk && emake -j1 gui +} + +src_install() { + emake DESTDIR="${D}" install + use doc && emake DESTDIR="${D}" install_doc + use gtk && emake DESTDIR="${D}" install_gui +} diff --git a/dev-vcs/git-flow/Manifest b/dev-vcs/git-flow/Manifest index 16e9584db08e..8e83d604b8bd 100644 --- a/dev-vcs/git-flow/Manifest +++ b/dev-vcs/git-flow/Manifest @@ -1,2 +1,4 @@ DIST git-flow-0.4.1.tar.gz 16732 SHA256 c1271b0ba2c6655e4ad4d79562f6a910c3b884f3d4e16985e227e67f8d95c180 SHA512 f86edb2867ed55127a34c711f5e6b11daeb6a738e92005fe27879c9ede40cb4130ff1de35e9f69560c4c845e063a8d2c1a76ad52eb5eacb7312a087f77d2698b WHIRLPOOL 9ad859237cab91209acfa87ddcc70f975af1b5816e202f8b867de903e05a755174803e286a5e8d595edb1612b7b321f7fe21b405fb388b8bef155ece82cb4ccf +DIST git-flow-1.8.0.tar.gz 56304 SHA256 8239131b8dac160d7e929eab376fa14de44a55cbd5c5545e0ad4464d3a57adef SHA512 677bfb0c379eb91bfaf8ef676593d39a8306ff063251e1e638166c7101c24ce2eac59490bab85d0c76b712c1905f15d3a14a3ecc020df376848d3b1ea5ee7b0a WHIRLPOOL 6bf654329b941989a8b646ab8218c072b7bf455b0ec6a8441d43de10b9b480a5619bca931606acdd743b0f3f86e9b67f119ff07957eaa106fd17f5cddc96a328 DIST git-flow-completion-0.4.2.2.tar.gz 5421 SHA256 1e82d039596c0e73bfc8c59d945ded34e4fce777d9b9bb45c3586ee539048ab9 SHA512 609653b6eaedabc4f31bb19d93b50bc48746876a2c351f139b79b48599104d49ba281400e8708a83411610cf57ce08a9ae941b0611216c11d80f8c01e0fa8409 WHIRLPOOL 9d2f4ec100932c2e349924620a4dbe3a98e9b6d93fcfbeb0ee065e13873da74af8e059dae5acf158088c541bfdb3aa49446ee789576aab5532e8322ab9530c15 +DIST git-flow-completion-0.5.1.tar.gz 6916 SHA256 5c8547a549dc623a8d57cfc22c3fa88588f5630da9dc6de9638e5b69da9d47d0 SHA512 c1fc0000889faff8189cd985b077cb64b81ae13e17f02c9df27675f428c6edf8f00627effdf6ebdae7a7f0641ec4ac621a9ecd0a53f14be7d95ec7e124ab8c1b WHIRLPOOL fd59f799d944752eab06b35f05c1f1309ef589014a0378f292e4dde206578f0c0aeb3685e16ea8d2f810e93b77abb7a2bc42c3c335ef9057b9c3ee1dd6df9982 diff --git a/dev-vcs/git-flow/files/git-flow-1.8.0-unbundle-shflags.patch b/dev-vcs/git-flow/files/git-flow-1.8.0-unbundle-shflags.patch new file mode 100644 index 000000000000..6e96d541d411 --- /dev/null +++ b/dev-vcs/git-flow/files/git-flow-1.8.0-unbundle-shflags.patch @@ -0,0 +1,25 @@ +diff --git a/Makefile b/Makefile +index 0718bbb..f488922 100644 +--- a/Makefile ++++ b/Makefile +@@ -43,7 +43,6 @@ SCRIPT_FILES+=git-flow-version + SCRIPT_FILES+=git-flow-log + SCRIPT_FILES+=git-flow-config + SCRIPT_FILES+=gitflow-common +-SCRIPT_FILES+=gitflow-shFlags + + # Hook files + HOOK_FILES=$(wildcard hooks/*) +diff --git a/git-flow b/git-flow +index 7a962d2..2ba70ba 100755 +--- a/git-flow ++++ b/git-flow +@@ -111,7 +111,7 @@ main() { + fi + + # Use the shFlags project to parse the command line arguments +- . "$GITFLOW_DIR/gitflow-shFlags" ++ . /usr/share/misc/shflags + FLAGS_PARENT="git flow" + + # Load common functionality diff --git a/dev-vcs/git-flow/git-flow-1.8.0.ebuild b/dev-vcs/git-flow/git-flow-1.8.0.ebuild new file mode 100644 index 000000000000..c2e896fdaf05 --- /dev/null +++ b/dev-vcs/git-flow/git-flow-1.8.0.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-flow/git-flow-1.8.0.ebuild,v 1.1 2015/01/26 21:06:09 johu Exp $ + +EAPI=5 + +MY_PN="${PN/-/}" +COMP_PN="${PN}-completion" +COMP_PV="0.5.1" +COMP_P="${COMP_PN}-${COMP_PV}" +inherit eutils bash-completion-r1 + +DESCRIPTION="Git extensions to provide high-level repository operations for Vincent Driessen's branching model" +HOMEPAGE="https://github.com/petervanderdoes/gitflow" +SRC_URI="https://github.com/petervanderdoes/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz +https://github.com/petervanderdoes/${COMP_PN}/archive/${COMP_PV}.tar.gz -> ${COMP_P}.tar.gz" + +LICENSE="BSD MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND} + dev-util/shflags + dev-vcs/git +" + +DOCS=( AUTHORS Changes.mdown README.mdown ) + +PATCHES=( "${FILESDIR}/${P}-unbundle-shflags.patch" ) + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare() { + [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" + debug-print "$FUNCNAME: applying user patches" + epatch_user +} + +src_compile() { + true +} + +src_install() { + emake prefix="${D}/usr" install + + [[ ${DOCS[@]} ]] && dodoc "${DOCS[@]}" + + newbashcomp "${WORKDIR}/${COMP_P}/${COMP_PN}.bash" ${PN} +} diff --git a/dev-vcs/git-flow/metadata.xml b/dev-vcs/git-flow/metadata.xml index 4f5a42ecea3d..b0bdac33b655 100644 --- a/dev-vcs/git-flow/metadata.xml +++ b/dev-vcs/git-flow/metadata.xml @@ -6,6 +6,6 @@ Johannes Huber - nvie/gitflow + petervanderdoes/gitflow diff --git a/games-action/d1x-rebirth/Manifest b/games-action/d1x-rebirth/Manifest index 500d3bee8836..a383fb8023d9 100644 --- a/games-action/d1x-rebirth/Manifest +++ b/games-action/d1x-rebirth/Manifest @@ -3,6 +3,7 @@ DIST d1x-rebirth_hires-briefings.zip 893529 SHA256 497043a5b11dcfd7f192ade3b20ec DIST d1x-rebirth_hires-fonts.zip 29503 SHA256 59d8f8c11861cfbc48239ed55c678aee92f3df2a922a3648f51d8fe8047f4aa4 SHA512 96ad48407a5749a09d84007515f017d7c8f3e8fcaf2b41cbf04dc0edd103fa5ee9f5d6fde9f17aca646f5b93284fb2cabd58ca99d7b2fecfc1ff3e1a92239bfb WHIRLPOOL 80b83cb0612cde254a10158e47017b395bd552e2c1b9fba086557a3288e50b2c974da0a6ac8140286cc71b55843e706fecd3e9bb38b8eefd7a380ca57171a259 DIST d1x-rebirth_v0.50-src-20061025.tar.gz 1336642 SHA256 742249021633fed2b07ef2d5ab040a66ae72cc5b122330521578bc2952895078 SHA512 6bfd6da2e5b7eddcd77d056913ffd4cf03b8c08114c465d43291b83fb412ecd247da0474954609e707725a038ff69c942f6189f45bed04b1bd35877336f2c83f WHIRLPOOL 34ad43eb131ac31bd9fbd76038f1d1ac994910f13f7b46e69fa945539cd98bfa2b89d0f751babe2517657fe24ca5761f6382e11462d00e6beb01f12a822af601 DIST d1x-rebirth_v0.57.3-src.tar.gz 1221678 SHA256 ea073e9307a24a882ef348f57829ac6f040b7b594d01ad74fb4c5357d497ab1d SHA512 778d97ffc52872de013b569ce3780d672a3e243ada8cbf3da2c912fa7da30ce9613b9ff2e5a1c3f470bc9936f6b9cfb6ee955bbd92b4ec3ae48fa5fad11955e1 WHIRLPOOL bbed5185f1bae891e1c1cff3320d85946844a6fa297d030950d55eefa4c13b938aff64567eee8dded54ec12c50933dd66086df4ac4a2ec2207c86c1b6b90693d +DIST d1x-rebirth_v0.58.1-src.tar.gz 1247599 SHA256 5befc8a2ab1159fdb4d4141ba9f0e229450592d5ada209e832101da5b0b3e38e SHA512 d1bdaeee07c5ac34b2e6839fea1449344d206f76f1eb2ba3fd4fa7cbe6acd82c2e8d7140b2d6297add3d5e8fb7fe4ca2b1c22c900def94603c218f6660644c80 WHIRLPOOL d379e3bf408fc51c9e2caea0d774272ce00a4dc52f460daa0b373ae6d08f305fe067e2e86a0164e7bb8c9f51f797cb29c8b38248555a5d3fd394ff88d6d170cd DIST d1xr-briefings-ger.zip 16798 SHA256 38f8b9dd5fcab8b675a5112290e4dda771d4bc7a613292a589f6535a8c53861a SHA512 956a3ef1fe7379b71d5f651fdcb1f26b786883a35193a0a22009204e885a12fceb3a69c6accbeb2bd20be65afe087d23532d7ef3439edd97cc8904968bf519e3 WHIRLPOOL 0c4e7934eac399b6fed216648ba35ba100234f73a802112b900064584b4fb471bafc9e377af735a4d05fa65105a40ee4db781a1e07310a1e6b5feb4a9a10a29d DIST d1xr-opl3-music.zip 81503503 SHA256 8fe8fede12ca735cac28133e4a581c4026ed22845ab016814a745b2c10b81603 SHA512 4ac82c4bc2ddb02e2941746921443e38b698c6e54cfcab317fc9108f84ada7b868ec2ee3c70b28c1dfe9f41e2aadab4124c8daa65a409905cba5d674f0aab8a8 WHIRLPOOL a7fab740a6cf885984b93f1eb2512362d7c3b05eb65e5f1eecf4c374bf6ba9e04e6d91130d8ff14d113fa9639501cba768a9d7344af291975b095a6604066735 DIST d1xr-sc55-music.zip 72803408 SHA256 b27f7b9dc5f9c2744402c56c9499dfd9503c17e73a2a5223e745529d7867962f SHA512 3cdce5b6535e28397b3216cc9ca05cccf7194349c62d64c54300f02f39248b98598d170599e5c61b6900d780e4917f905c3c31eb814fbb8429221c804cbd8bf9 WHIRLPOOL d248894b95d5a1d2d8d375cf231fbfde114548e328addf3ae71c90eb436c628b6feb7d207877fd59f815d4b4f00ea76b6e2c23c4a12cd8e2e228967beb91b693 diff --git a/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild b/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild new file mode 100644 index 000000000000..f85ab0da8d25 --- /dev/null +++ b/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild,v 1.1 2015/01/27 07:45:13 mr_bones_ Exp $ + +EAPI=5 +CDROM_OPTIONAL="yes" +inherit eutils cdrom scons-utils games + +DV=1 +MY_P=${PN}_v${PV}-src +DESCRIPTION="Descent Rebirth - enhanced Descent ${DV} engine" +HOMEPAGE="http://www.dxx-rebirth.com/" +SRC_URI="http://www.dxx-rebirth.com/download/dxx/${MY_P}.tar.gz + http://www.dxx-rebirth.com/download/dxx/res/d1xrdata.zip + http://www.dxx-rebirth.com/download/dxx/res/dxx-rebirth_icons.zip + opl3-musicpack? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-opl3-music.zip ) + sc55-musicpack? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-sc55-music.zip ) cdinstall? ( http://www.dxx-rebirth.com/download/dxx/res/d1datapt.zip ) + linguas_de? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-briefings-ger.zip )" + +LICENSE="D1X GPL-2 public-domain" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cdinstall debug demo ipv6 linguas_de +music opengl opl3-musicpack sc55-musicpack" +REQUIRED_USE="?? ( cdinstall demo ) + ?? ( opl3-musicpack sc55-musicpack ) + opl3-musicpack? ( music ) + sc55-musicpack? ( music )" + +RDEPEND="dev-games/physfs[hog,zip] + media-libs/libsdl[X,sound,joystick,opengl?,video] + cdinstall? ( !games-action/descent1-demodata ) + music? ( + media-libs/sdl-mixer[timidity] + ) + opengl? ( + virtual/opengl + virtual/glu + )" +DEPEND="${RDEPEND} + app-arch/unzip" +PDEPEND="demo? ( games-action/descent1-demodata )" + +S=${WORKDIR}/${MY_P} + +src_unpack() { + unpack ${MY_P}.tar.gz dxx-rebirth_icons.zip + if use cdinstall ; then + unpack d1datapt.zip + cdrom_get_cds descent/descent.hog + mkdir "${S}"/Data + cp \ + ${CDROM_ROOT}/descent/descent.{hog,pig} \ + ${CDROM_ROOT}/descent/chaos.{hog,msn} \ + "${S}"/Data || die + fi +} + +src_prepare() { + if use cdinstall ; then + cd Data + patch -p0 < "${WORKDIR}"/d1datapt/descent.hog.diff descent.hog + patch -p0 < "${WORKDIR}"/d1datapt/descent.pig.diff descent.pig + fi + epatch "${FILESDIR}"/${P}-flags.patch +} + +src_compile() { + escons \ + verbosebuild=1 \ + sharepath="${GAMES_DATADIR}/d${DV}x" \ + $(use_scons ipv6) \ + $(use_scons music sdlmixer) \ + $(use_scons debug) \ + $(use_scons opengl) || die +} + +src_install() { + dodoc {CHANGELOG,INSTALL,README,RELEASE-NOTES}.txt + + insinto "${GAMES_DATADIR}/d${DV}x" + doins "${DISTDIR}"/d1xrdata.zip + # None of the following zip files need to be extracted. + use linguas_de && doins "${DISTDIR}"/d${DV}xr-briefings-ger.zip + use opl3-musicpack && doins "${DISTDIR}"/d${DV}xr-opl3-music.zip + use sc55-musicpack && doins "${DISTDIR}"/d${DV}xr-sc55-music.zip + + if use cdinstall ; then + doins Data/descent.{hog,pig} + insinto "${GAMES_DATADIR}"/d${DV}x/missions + doins Data/chaos.{hog,msn} + fi + doicon "${WORKDIR}/${PN}.xpm" + + dogamesbin d${DV}x-rebirth + make_desktop_entry d${DV}x-rebirth "Descent ${DV} Rebirth" + prepgamesdirs +} + +pkg_postinst() { + games_pkg_postinst + if ! use cdinstall ; then + echo + elog "To play the full game enable USE=\"cdinstall\" or manually " + elog "copy the files to ${GAMES_DATADIR}/d${DV}x." + elog "See /usr/share/doc/${PF}/INSTALL.txt for details." + echo + fi +} diff --git a/games-action/d1x-rebirth/files/d1x-rebirth-0.58.1-flags.patch b/games-action/d1x-rebirth/files/d1x-rebirth-0.58.1-flags.patch new file mode 100644 index 000000000000..51723ffb137b --- /dev/null +++ b/games-action/d1x-rebirth/files/d1x-rebirth-0.58.1-flags.patch @@ -0,0 +1,11 @@ +diff -ru d1x-rebirth_v0.58.1-src.orig/SConstruct d1x-rebirth_v0.58.1-src/SConstruct +--- d1x-rebirth_v0.58.1-src.orig/SConstruct 2013-08-03 08:13:39.000000000 -0400 ++++ d1x-rebirth_v0.58.1-src/SConstruct 2015-01-27 02:38:03.847800615 -0500 +@@ -218,7 +218,6 @@ + env.Append(CPPFLAGS = ['-g']) + else: + env.Append(CPPDEFINES = ['NDEBUG', 'RELEASE']) +- env.Append(CPPFLAGS = ['-O2']) + + # profiler? + if (self.user_settings.profiler == 1): diff --git a/games-action/hotline-miami/Manifest b/games-action/hotline-miami/Manifest index 8798a012eb43..3118e19dc6ea 100644 --- a/games-action/hotline-miami/Manifest +++ b/games-action/hotline-miami/Manifest @@ -1,2 +1 @@ DIST HotlineMiami_linux_1392944501.tar.gz 207632875 SHA256 338268eecbd63ab5cf168d85ef6c7b36f2a6999adb359222b5372651b08ba805 SHA512 d1c1b7cbb910969ae120a12d982ed2ba7c935912bdc4e72e3a42b7aeb468b33c6536f4e43f97942155656be705e060d6fe9da37b04040c6aebf81ca80300d546 WHIRLPOOL 2bd29ad11c4cecab02e0936a7a531d4eb2a5f55cbec80cc0699a3ae493c934fb1a175e1474f46dc5b2cddcb5f824cefb661b9e09e94ac6cf61474f50191a6459 -DIST hotlinemiami_v1.0.9a-Linux_28-05-2013.tar.gz 190790687 SHA256 070300558ba52f75455d1645bba6dd956f460ada0d3839f8b3c3ac712ba957da SHA512 db9c6b11ac11933879e0f328c0fe1d4727d8d894716c0de457b4b948d4c11e901ffc6d83b140c83a82dc8ac82a8736976aecb3a2b90619dd904a54361c9510e9 WHIRLPOOL de1467ac72055bb9698435c91433798f86ee571534afc6311f764ba11fba827090fa4f10c3dde163deda1fe109430129385e0778972ba6ecdca144a99d36b3a3 diff --git a/games-action/hotline-miami/hotline-miami-1.0.9a.ebuild b/games-action/hotline-miami/hotline-miami-1.0.9a.ebuild deleted file mode 100644 index 7e43a1d62108..000000000000 --- a/games-action/hotline-miami/hotline-miami-1.0.9a.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/hotline-miami/hotline-miami-1.0.9a.ebuild,v 1.2 2014/06/18 19:19:54 mgorny Exp $ - -# TODO: unbundle Qt5 -# remove emul-linux-x86* deps (bug 484060) - -EAPI=5 - -inherit eutils games - -DESCRIPTION="High-octane action game overflowing with raw brutality" -HOMEPAGE="http://www.devolverdigital.com/games/view/hotline-miami" -SRC_URI="hotlinemiami_v${PV}-Linux_28-05-2013.tar.gz" - -LICENSE="all-rights-reserved" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="bundled-libs +launcher" -RESTRICT="bindist fetch splitdebug" - -MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN} -QA_PREBUILT="${MYGAMEDIR#/}/lib/* - ${MYGAMEDIR#/}/Hotline - ${MYGAMEDIR#/}/hotline_launcher" - -RDEPEND=" - amd64? ( - || ( >=x11-libs/libX11-1.6.2[abi_x86_32] app-emulation/emul-linux-x86-xlibs ) - !bundled-libs? ( - media-gfx/nvidia-cg-toolkit[multilib] - || ( - ( app-emulation/emul-linux-x86-soundlibs ) - ( >=media-libs/libogg-1.3.0[abi_x86_32] - >=media-libs/libvorbis-1.3.3-r1[abi_x86_32] - >=media-libs/openal-1.15.1[abi_x86_32] ) - ) - ) - launcher? ( - || ( - ( app-emulation/emul-linux-x86-xlibs ) - ( >=media-libs/freetype-2.5.0.1[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXrender-0.9.8[abi_x86_32] - >=x11-libs/libxcb-1.9.1[abi_x86_32] ) - ) - ) - ) - x86? ( - x11-libs/libX11 - !bundled-libs? ( - media-gfx/nvidia-cg-toolkit - media-libs/libogg - media-libs/libvorbis - media-libs/openal - ) - launcher? ( - media-libs/freetype - x11-libs/libXext - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libxcb - ) - )" - -S=${WORKDIR} - -pkg_nofetch() { - einfo "Please buy & download ${SRC_URI} from:" - einfo " https://www.humblebundle.com/store" - einfo "and move it to ${DISTDIR}" -} - -src_install() { - insinto "${MYGAMEDIR}" - doins HotlineMiami_GL.wad - - exeinto "${MYGAMEDIR}" - doexe Hotline - use launcher && doexe hotline_launcher - - exeinto "${MYGAMEDIR}/lib" - use launcher && doexe lib/libQt5* - use bundled-libs && doexe libCg* libopenal* - - games_make_wrapper ${PN} "./Hotline" "${MYGAMEDIR}" "${MYGAMEDIR}/lib" - make_desktop_entry ${PN} - if use launcher ; then - games_make_wrapper ${PN}-launcher "./hotline_launcher" "${MYGAMEDIR}" "${MYGAMEDIR}/lib" - make_desktop_entry ${PN}-launcher "${PN} (launcher)" - fi - - prepgamesdirs -} diff --git a/games-action/lugaru/lugaru-1.0c.ebuild b/games-action/lugaru/lugaru-1.0c.ebuild deleted file mode 100644 index e390f7da389d..000000000000 --- a/games-action/lugaru/lugaru-1.0c.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/lugaru/lugaru-1.0c.ebuild,v 1.4 2014/04/26 18:04:46 ulm Exp $ - -inherit eutils unpacker games - -DESCRIPTION="3D arcade with unique fighting system and anthropomorphic characters" -HOMEPAGE="http://www.wolfire.com/lugaru" -SRC_URI="${PN}-full-linux-x86-${PV}.bin" - -LICENSE="GPL-2 free-noncomm" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="" -RESTRICT="fetch strip" - -DEPEND="app-arch/unzip" -RDEPEND="sys-libs/glibc - amd64? ( app-emulation/emul-linux-x86-xlibs ) - x86? ( - x11-libs/libX11 - x11-libs/libXext - )" - -S=${WORKDIR}/data - -src_unpack() { - # self unpacking zip archive; unzip warns about the exe stuff - unpack_zip ${A} - - # Duplicate file and can't be handled by portage, bug #14983 - rm -f "${S}/Data/Textures/Quit.png " -} - -src_install() { - local dir=${GAMES_PREFIX_OPT}/lugaru - - insinto "${dir}" - doins -r Data || die "doins failed" - - dodoc *.txt - - exeinto "${dir}" - doexe ${PN} || die "doexe failed" - games_make_wrapper ${PN} ./${PN} "${dir}" "${dir}" - - doicon ${PN}.png - make_desktop_entry ${PN} Lugaru ${PN} - - prepgamesdirs -} diff --git a/games-action/minetest/minetest-0.4.10.ebuild b/games-action/minetest/minetest-0.4.10.ebuild deleted file mode 100644 index bbd0ca04e332..000000000000 --- a/games-action/minetest/minetest-0.4.10.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/minetest/minetest-0.4.10.ebuild,v 1.1 2014/07/07 13:35:56 hasufell Exp $ - -EAPI=5 -inherit eutils cmake-utils gnome2-utils vcs-snapshot user games - -DESCRIPTION="An InfiniMiner/Minecraft inspired game" -HOMEPAGE="http://minetest.net/" -SRC_URI="http://github.com/minetest/minetest/tarball/${PV} -> ${P}.tar.gz" - -LICENSE="LGPL-2.1+ CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+curl dedicated leveldb luajit nls redis +server +sound +truetype" - -RDEPEND="dev-db/sqlite:3 - >=dev-games/irrlicht-1.8-r2 - sys-libs/zlib - curl? ( net-misc/curl ) - !dedicated? ( - app-arch/bzip2 - media-libs/libpng:0 - virtual/jpeg - virtual/opengl - x11-libs/libX11 - x11-libs/libXxf86vm - sound? ( - media-libs/libogg - media-libs/libvorbis - media-libs/openal - ) - truetype? ( media-libs/freetype:2 ) - ) - leveldb? ( dev-libs/leveldb ) - luajit? ( dev-lang/luajit:2 ) - !luajit? ( >=dev-lang/lua-5.1.4[deprecated] ) - nls? ( virtual/libintl ) - redis? ( dev-libs/hiredis )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -pkg_setup() { - games_pkg_setup - - if use server || use dedicated ; then - enewuser ${PN} -1 -1 /var/lib/${PN} ${GAMES_GROUP} - fi -} - -src_unpack() { - vcs-snapshot_src_unpack -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-shared-irrlicht.patch \ - "${FILESDIR}"/${P}-as-needed.patch \ - "${FILESDIR}"/${P}-system-lua.patch - - # correct gettext behavior - if [[ -n "${LINGUAS+x}" ]] ; then - for i in $(cd po ; echo *) ; do - if ! has ${i} ${LINGUAS} ; then - rm -r po/${i} || die - fi - done - fi - - # jthread is modified - # json is modified - rm -r src/{lua,sqlite} || die - - # set paths - sed \ - -e "s#@BINDIR@#${GAMES_BINDIR}#g" \ - -e "s#@GROUP@#${GAMES_GROUP}#g" \ - "${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die -} - -src_configure() { - local mycmakeargs=( - $(usex dedicated "-DBUILD_SERVER=ON -DBUILD_CLIENT=OFF" "$(cmake-utils_use_build server SERVER) -DBUILD_CLIENT=ON") - -DCUSTOM_BINDIR="${GAMES_BINDIR}" - -DCUSTOM_DOCDIR="/usr/share/doc/${PF}" - -DCUSTOM_LOCALEDIR="/usr/share/locale" - -DCUSTOM_SHAREDIR="${GAMES_DATADIR}/${PN}" - $(cmake-utils_use_enable curl CURL) - $(cmake-utils_use_enable truetype FREETYPE) - $(cmake-utils_use_enable nls GETTEXT) - -DENABLE_GLES=0 - $(cmake-utils_use_enable leveldb LEVELDB) - $(cmake-utils_use_enable redis REDIS) - $(cmake-utils_use_enable sound SOUND) - $(cmake-utils_use !luajit DISABLE_LUAJIT) - -DRUN_IN_PLACE=0 - -DWITH_BUNDLED_LUA=0 - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - - if use server || use dedicated ; then - newinitd "${FILESDIR}"/minetestserver.initd minetest-server - newconfd "${T}"/minetestserver.confd minetest-server - fi - - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - gnome2_icon_cache_update - - if ! use dedicated ; then - elog - elog "optional dependencies:" - elog " games-action/minetest_game (official mod)" - elog - fi - - if use server || use dedicated ; then - elog - elog "Configure your server via /etc/conf.d/minetest-server" - elog "The user \"minetest\" is created with /var/lib/${PN} homedir." - elog "Default logfile is ~/minetest-server.log" - elog - fi -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-action/openclonk/openclonk-5.3.3.ebuild b/games-action/openclonk/openclonk-5.3.3.ebuild deleted file mode 100644 index af821690336e..000000000000 --- a/games-action/openclonk/openclonk-5.3.3.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/openclonk/openclonk-5.3.3.ebuild,v 1.6 2014/05/15 16:23:59 ulm Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python2_6 python2_7 ) -inherit autotools eutils flag-o-matic gnome2-utils python-any-r1 toolchain-funcs games - -MY_P=${PN}-release-${PV}-src - -DESCRIPTION="A free multiplayer action game where you control clonks" -HOMEPAGE="http://openclonk.org/" -SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz - http://${PN}.org/homepage/icon.png -> ${PN}.png" - -LICENSE="BSD ISC CLONK-trademark LGPL-2.1 POSTGRESQL" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="dedicated doc mp3 sound upnp" - -RDEPEND=" - media-libs/libpng:0 - sys-libs/zlib - virtual/jpeg - !dedicated? ( - media-libs/freetype:2 - media-libs/glew - media-libs/libsdl[X,opengl,video] - virtual/opengl - virtual/glu - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - x11-libs/libXrandr - x11-libs/libX11 - sound? ( - media-libs/libsdl[sound] - media-libs/sdl-mixer[mp3?,vorbis,wav] - ) - ) - dedicated? ( sys-libs/readline:0 ) - upnp? ( net-libs/libupnp )" -DEPEND="${RDEPEND} - >=dev-libs/boost-1.40 - virtual/pkgconfig - doc? ( - ${PYTHON_DEPS} - dev-libs/libxml2[python] - sys-devel/gettext - )" - -pkg_setup() { - games_pkg_setup - use doc && python-any-r1_pkg_setup -} - -src_prepare() { - # remove license files - sed \ - -e '/dist_doc_DATA/s#planet/COPYING ##' \ - -e '/dist_doc_DATA/s#licenses/LGPL.txt ##' \ - -i Makefile.am || die - - eautoreconf -} - -src_configure() { - egamesconf \ - --docdir=/usr/share/doc/${PF} \ - $(use_enable dedicated console) \ - $(use_enable sound) \ - $(use_enable mp3) \ - $(usex dedicated "--with-gtk=no" "--with-gtk=3.0") \ - $(use_with upnp) \ - --without-openal \ - --disable-autoupdate -} - -src_compile() { - emake AR=$(tc-getAR) - - if use doc ; then - emake -C docs - fi -} - -src_install() { - emake DESTDIR="${D}" install - - if ! use dedicated; then - newgamesbin "${FILESDIR}"/${PN}-wrapper-script.sh ${PN} - doicon -s 64 "${DISTDIR}"/${PN}.png - make_desktop_entry ${PN} - fi - use doc && dohtml -r docs/online/* - - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-arcade/commandergenius/Manifest b/games-arcade/commandergenius/Manifest index 902010f3ac84..70a4935277f5 100644 --- a/games-arcade/commandergenius/Manifest +++ b/games-arcade/commandergenius/Manifest @@ -1,3 +1 @@ -DIST CGenius-1.7.2.0-Release-src.tar.gz 1886316 SHA256 68de07c1108def89136ac87e800c2eaf69068a4d67b7ffbfaba501c9755b01e2 SHA512 39f7df00345591a7de07c660912728fc37118c0f8443ad44c16181b79e1dfab445a12254182b8fe6cc56f4d8e18c1f74b411c9750e43c538736489946582679c WHIRLPOOL fafc549074cf8713a64d86bff76665b5d38811306468806270c5c705c50f3958efc5f928a9f65f0204933936f548e1c12b9368eaf6aaed30119c647479e8ec13 -DIST CGenius-1.7.3.0-Release-src.tar.gz 1550730 SHA256 22b8bd6dd88089256a7aea16ff2b5a33e04f633663175ded612fe18eacfec429 SHA512 26f9b44542ca030f0a91fbe62e1b2541d94db52be669bdc113c6c009f22f4ea5f23dc741197d66284be705ed303f97846005a3d95a28c4954b2685232593c465 WHIRLPOOL c1e6d07b99df3619a9f78c745ef51d7ed14611f9b48cbc34b21334adcedc99433f244cca6efb4ad09c8e62168936564b5df0b89cf2fdd6864421146810a4b0b1 DIST CGenius-1.7.4.0-Release-src.tar.gz 17876189 SHA256 2d35a19028a9a06fcf860a22332732a00183b5cc53f4f41ecc8bc836b8f100e8 SHA512 1c7c1305c6d4ef6dd8ce575f8decfcddd155853b988dc2bdbb167caa46b6ffca09f045dc9985478bdf464ea8fa9d73772b7cb5798bd738cd3409812d51748261 WHIRLPOOL dac9c12b66c720addc460f8d3e463c853df2d6f439e7a59b5b397e23fb47f805cdb8f7c6c068078547566193598c48bb8c52c74bcd19ed9ae5bf3b865170f195 diff --git a/games-arcade/commandergenius/commandergenius-1.7.2.0.ebuild b/games-arcade/commandergenius/commandergenius-1.7.2.0.ebuild deleted file mode 100644 index 731fd072bc3d..000000000000 --- a/games-arcade/commandergenius/commandergenius-1.7.2.0.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/commandergenius/commandergenius-1.7.2.0.ebuild,v 1.2 2014/05/15 12:35:12 ulm Exp $ - -EAPI=5 - -CMAKE_IN_SOURCE_BUILD=1 -inherit cmake-utils eutils games - -MY_P=CGenius-${PV}-Release-src -DESCRIPTION="Open Source Commander Keen clone (needs original game files)" -HOMEPAGE="http://clonekeenplus.sourceforge.net" -SRC_URI="mirror://sourceforge/clonekeenplus/CGenius/V${PV:0:3}/${MY_P}.tar.gz" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="opengl tremor" - -RDEPEND="media-libs/libsdl2[X,opengl?,sound,video] - media-libs/sdl2-image - opengl? ( virtual/opengl ) - tremor? ( media-libs/tremor ) - !tremor? ( media-libs/libvorbis )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/CGenius-${PV}-Release-Source - -src_prepare() { - cat <<-EOF > version.h - #ifndef __CG__VERSION_H__ - #define __CG__VERSION_H__ - - #define CGVERSION "1.7.2.0-Release" - - #endif - EOF - - sed -i \ - -e '/INCLUDE(package.cmake)/d' \ - CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DAPPDIR="${GAMES_BINDIR}" - -DSHAREDIR="/usr/share" - -DGAMES_SHAREDIR="${GAMES_DATADIR}" - -DDOCDIR="/usr/share/doc/${PF}" - -DBUILD_TARGET="LINUX" - $(cmake-utils_use opengl OPENGL) - $(cmake-utils_use tremor TREMOR) - $(cmake-utils_use !tremor OGG) - -DUSE_SDL2=1 - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - newicon CGLogo.png ${PN}.png - newgamesbin "${FILESDIR}"/commandergenius-wrapper commandergenius - make_desktop_entry commandergenius - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - elog "Check your settings in ~/.CommanderGenius/cgenius.cfg" - elog "after you have started the game for the first time." - use opengl && elog "You may also want to set \"OpenGL = true\"" - elog - elog "Run the game via:" - elog " 'commandergenius [path-to-keen-data]'" - elog "or add your keen data dir to the search paths in cgenius.cfg" -} diff --git a/games-arcade/commandergenius/commandergenius-1.7.3.0.ebuild b/games-arcade/commandergenius/commandergenius-1.7.3.0.ebuild deleted file mode 100644 index 24736ccf6569..000000000000 --- a/games-arcade/commandergenius/commandergenius-1.7.3.0.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/commandergenius/commandergenius-1.7.3.0.ebuild,v 1.2 2014/05/15 12:35:12 ulm Exp $ - -EAPI=5 - -CMAKE_IN_SOURCE_BUILD=1 -inherit cmake-utils eutils games - -MY_P=CGenius-${PV}-Release-src -DESCRIPTION="Open Source Commander Keen clone (needs original game files)" -HOMEPAGE="http://clonekeenplus.sourceforge.net" -SRC_URI="mirror://sourceforge/clonekeenplus/CGenius/V${PV:0:3}/${MY_P}.tar.gz" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="opengl tremor" - -RDEPEND="media-libs/libsdl2[X,opengl?,sound,video] - media-libs/sdl2-image - opengl? ( virtual/opengl ) - tremor? ( media-libs/tremor ) - !tremor? ( media-libs/libvorbis )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/CGenius-${PV}-Release-Source - -src_prepare() { - cat <<-EOF > version.h - #ifndef __CG__VERSION_H__ - #define __CG__VERSION_H__ - - #define CGVERSION "1.7.3.0-Release" - - #endif - EOF - - sed -i \ - -e '/INCLUDE(package.cmake)/d' \ - CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DAPPDIR="${GAMES_BINDIR}" - -DSHAREDIR="/usr/share" - -DGAMES_SHAREDIR="${GAMES_DATADIR}" - -DDOCDIR="/usr/share/doc/${PF}" - -DBUILD_TARGET="LINUX" - $(cmake-utils_use opengl OPENGL) - $(cmake-utils_use tremor TREMOR) - $(cmake-utils_use !tremor OGG) - -DUSE_SDL2=1 - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - newicon CGLogo.png ${PN}.png - newgamesbin "${FILESDIR}"/commandergenius-wrapper commandergenius - make_desktop_entry commandergenius - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - elog "Check your settings in ~/.CommanderGenius/cgenius.cfg" - elog "after you have started the game for the first time." - use opengl && elog "You may also want to set \"OpenGL = true\"" - elog - elog "Run the game via:" - elog " 'commandergenius [path-to-keen-data]'" - elog "or add your keen data dir to the search paths in cgenius.cfg" -} diff --git a/games-arcade/diameter/diameter-0.4.0.3.ebuild b/games-arcade/diameter/diameter-0.4.0.3.ebuild deleted file mode 100644 index 15c5f8060a37..000000000000 --- a/games-arcade/diameter/diameter-0.4.0.3.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/diameter/diameter-0.4.0.3.ebuild,v 1.7 2012/05/04 04:22:28 jdhore Exp $ - -EAPI=2 -PYTHON_DEPEND="2" -inherit python eutils autotools games - -DESCRIPTION="Arcade game with elements of economy and adventure" -HOMEPAGE="http://gamediameter.sourceforge.net/" -SRC_URI="mirror://sourceforge/gamediameter/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=">=dev-games/guichan-0.8[opengl,sdl] - media-libs/libpng - virtual/opengl - virtual/glu - media-libs/libsdl[video] - media-libs/sdl-image[gif,jpeg,png] - media-libs/sdl-mixer" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/gamediameter - -pkg_setup() { - python_set_active_version 2 - games_pkg_setup -} - -src_prepare() { - sed -i \ - -e "s:gamediameter:diameter:" \ - configure.in \ - || die - # bug #336812 - sed -i \ - -e '/gui nebular3.gif/s/gui//' \ - data/texture/Makefile.am \ - || die - eautoreconf -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - newicon data/texture/gui/eng/main/logo.png ${PN}.png - make_desktop_entry ${PN} Diameter - dodoc README - prepgamesdirs -} diff --git a/games-arcade/dynamitejack/dynamitejack-1.0.23.ebuild b/games-arcade/dynamitejack/dynamitejack-1.0.23.ebuild deleted file mode 100644 index 446566096f81..000000000000 --- a/games-arcade/dynamitejack/dynamitejack-1.0.23.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/dynamitejack/dynamitejack-1.0.23.ebuild,v 1.6 2014/05/15 16:27:45 ulm Exp $ - -# TODO: icon - -EAPI=5 - -inherit eutils games - -DESCRIPTION="A stealth game with bombs in glorious 2D" -HOMEPAGE="http://www.galcon.com/dynamitejack/" -SRC_URI="${P}.tgz" - -LICENSE="all-rights-reserved" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="" -RESTRICT="bindist fetch splitdebug" - -MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN} -QA_PREBUILT="${MYGAMEDIR#/}/bin/*" - -# linked to pulseaudio -RDEPEND=" - virtual/opengl - amd64? ( - app-emulation/emul-linux-x86-opengl - app-emulation/emul-linux-x86-sdl - app-emulation/emul-linux-x86-soundlibs[alsa] - app-emulation/emul-linux-x86-xlibs - ) - x86? ( - media-libs/alsa-lib - media-libs/flac - media-libs/libogg - media-libs/libsdl[X,sound,joystick,opengl,video] - media-libs/libsndfile - media-libs/libvorbis - media-sound/pulseaudio - virtual/glu - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libxcb - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXi - x11-libs/libXtst - )" - -S=${WORKDIR}/${PN} - -pkg_nofetch() { - einfo "Please buy & download ${SRC_URI} from:" - einfo " ${HOMEPAGE}" - einfo "and move it to ${DISTDIR}" -} - -src_prepare() { - rm run_me || die - mv LINUX.txt "${T}"/ || die -} - -src_install() { - dodoc "${T}"/LINUX.txt - - insinto "${MYGAMEDIR}" - doins -r * - - games_make_wrapper ${PN} "./main" "${MYGAMEDIR}/bin" - make_desktop_entry ${PN} - - fperms +x "${MYGAMEDIR}"/bin/main - prepgamesdirs -} diff --git a/games-arcade/watermelons/watermelons-1.1.1.ebuild b/games-arcade/watermelons/watermelons-1.1.1.ebuild deleted file mode 100644 index 82a2c8064920..000000000000 --- a/games-arcade/watermelons/watermelons-1.1.1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/watermelons/watermelons-1.1.1.ebuild,v 1.7 2014/08/10 21:23:05 slyfox Exp $ - -EAPI=2 -PYTHON_DEPEND="2" -inherit eutils python games - -MY_PN="melons" -DESCRIPTION="A thrilling watermelon bouncing game" -HOMEPAGE="http://www.imitationpickles.org/melons/index.html" -SRC_URI="mirror://gentoo/${MY_PN}-${PV}.tgz" -# No version upstream -#SRC_URI="http://www.imitationpickles.org/${MY_PN}/${MY_PN}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86 ~x86-fbsd" -IUSE="" - -RDEPEND="dev-python/pygame" - -S=${WORKDIR}/${MY_PN} - -pkg_setup() { - python_set_active_version 2 - games_pkg_setup -} - -src_prepare() { - sed -i \ - -e "s:melons.hs:${GAMES_STATEDIR}/${PN}/&:" \ - main.py \ - || die "sed failed" - - cat <<-EOF > "${PN}" - #!/bin/bash - cd "${GAMES_DATADIR}/${PN}" - exec $(PYTHON) main.py -EOF -} - -src_install() { - dogamesbin ${PN} || die "dogamesbin failed" - insinto "${GAMES_DATADIR}/${PN}" - doins -r data pgu const.py game.py main.py melon.py melons.py menu.py trampoline.py \ - || die "doins failed" - dodoc *.txt - dodir "${GAMES_STATEDIR}/${PN}" - touch "${D}${GAMES_STATEDIR}"/${PN}/melons.hs - fperms 664 "${GAMES_STATEDIR}"/${PN}/melons.hs - newicon data/mellon0013.png "${PN}.png" || die "newicon failed" - make_desktop_entry ${PN} Watermelons - prepgamesdirs -} diff --git a/games-board/xboard/Manifest b/games-board/xboard/Manifest index e009dcccbdd8..25be574674a9 100644 --- a/games-board/xboard/Manifest +++ b/games-board/xboard/Manifest @@ -1,2 +1 @@ -DIST xboard-4.7.3.tar.gz 3424771 SHA256 7fd0b03f53dad57c587bc3438459612e2455534f715cfb0e637b6290f34cbeaa SHA512 e9da88e48329f88c39ecea0623849706013dedfdd67022d9ff0f7277e339932c8b3890933db0189d80ed552e7ea42f98d2406795f17712a604ecffde2760e6cb WHIRLPOOL 3ac83d327107f565bc8e8e08fc1e1c4df64c5eb07db29e2164f432159722a0ffa62bf80d5029cdb03ff7b0267bae850d1286f6d8a3a730b1c61609975e76c029 DIST xboard-4.8.0.tar.gz 3691531 SHA256 c88f48fc7fe067be0a13b8d121c38551145f889719c212717884e5e82d902d17 SHA512 fc3231f170baacdf97df5d08488f5a1fb9a144810f7b0eb72e3e95d345ce47aa2ff67a586ef45b6a9e45932300babc59c161a29e055dd0d19b133ba986985c81 WHIRLPOOL 8f5d66720072846fbed06b004a6cb27510500d2c768c6b923e5dfe7444218b2e59a0bf823b953ccf5ecc41f464f51d4e3303932a947071e5581b783883afd1a6 diff --git a/games-board/xboard/files/xboard-4.7.3-Xaw3d.patch b/games-board/xboard/files/xboard-4.7.3-Xaw3d.patch deleted file mode 100644 index 4427f5b10af4..000000000000 --- a/games-board/xboard/files/xboard-4.7.3-Xaw3d.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 7bc79645d4e404d00fee43b5a6cee4e3b6bf7a35 -Author: hasufell -Date: Sat Sep 7 12:48:58 2013 +0200 - - BUILD: fix withXaw conditional - - Listing both one after another leads to withXaw being false - if you pass "--with-Xaw3d --without-Xaw". - ---- a/configure.ac -+++ b/configure.ac -@@ -248,8 +248,7 @@ fi - - dnl | make results available in Makefile.am - AM_CONDITIONAL([withGTK], [test x"$with_GTK" = x"yes"]) --AM_CONDITIONAL([withXaw], [test x"$with_Xaw3d" = x"yes"]) --AM_CONDITIONAL([withXaw], [test x"$with_Xaw" = x"yes"]) -+AM_CONDITIONAL([withXaw], [test x"$with_Xaw3d" = x"yes" || test x"$with_Xaw" = x"yes"]) - - - AC_SUBST(FRONTEND_CFLAGS) diff --git a/games-board/xboard/files/xboard-4.7.3-configure-switches.patch b/games-board/xboard/files/xboard-4.7.3-configure-switches.patch deleted file mode 100644 index 7646f1babe02..000000000000 --- a/games-board/xboard/files/xboard-4.7.3-configure-switches.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit adcbc6072fa0d1a9bf84e018f04b1c18dfedab5c -Author: hasufell -Date: Fri Sep 6 16:56:15 2013 +0200 - - BUILD: fix configure switches - - https://savannah.gnu.org/bugs/?39971 - ---- a/configure.ac -+++ b/configure.ac -@@ -138,18 +138,18 @@ FRONTEND_LIBS="" - - AC_ARG_WITH([gtk], - [AS_HELP_STRING([--with-gtk],[use GTK front-end (experimental)])], -- [with_GTK=yes], -- [with_GTK=no]) -+ [with_GTK=$withval], -+ [with_GTK="no"]) - - AC_ARG_WITH([Xaw3d], - [AS_HELP_STRING([--with-Xaw3d],[use Xaw3d front-end (not fully supported anymore)])], -- [with_Xaw3d=yes], -- [with_Xaw3d=no]) -+ [with_Xaw3d="$withval"], -+ [with_Xaw3d="no"]) - - AC_ARG_WITH([Xaw], - [AS_HELP_STRING([--with-Xaw],[use Xaw front-end (default)])], -- [with_Xaw=yes], -- [with_Xaw=no]) -+ [with_Xaw="$withval"], -+ [with_Xaw="no"]) - - AC_ARG_WITH([iconsdir], - [AS_HELP_STRING([--with-iconsdir=DIR], diff --git a/games-board/xboard/files/xboard-4.7.3-gettext.patch b/games-board/xboard/files/xboard-4.7.3-gettext.patch deleted file mode 100644 index a50009a70efa..000000000000 --- a/games-board/xboard/files/xboard-4.7.3-gettext.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit 7688073f2967bb3438d1a2d8ccffc53f697219fb -Author: hasufell -Date: Fri Sep 6 16:37:22 2013 +0200 - - BUILD: fix gettext version - - https://bugs.gentoo.org/show_bug.cgi?id=418267 - https://savannah.gnu.org/bugs/index.php?39970 - ---- a/configure.ac -+++ b/configure.ac -@@ -76,7 +76,7 @@ AC_ISC_POSIX - AC_PROG_INSTALL - - dnl| add gettext support --AM_GNU_GETTEXT_VERSION(0.17) -+AM_GNU_GETTEXT_VERSION(0.18) - AM_GNU_GETTEXT([external]) - - AC_CHECK_PROGS(RSH, remsh rsh, rsh) diff --git a/games-board/xboard/files/xboard-4.7.3-gnuchess-default.patch b/games-board/xboard/files/xboard-4.7.3-gnuchess-default.patch deleted file mode 100644 index 9b55fe01cc98..000000000000 --- a/games-board/xboard/files/xboard-4.7.3-gnuchess-default.patch +++ /dev/null @@ -1,45 +0,0 @@ -commit 0b6d8acf55b4d8721e854cfba025e621f61ff5c2 -Author: hasufell -Date: Fri Sep 6 18:15:38 2013 +0200 - - set gnuchess as default engine - ---- a/gtk/xboard.h -+++ b/gtk/xboard.h -@@ -118,8 +118,8 @@ typedef struct { - - #define BORDER_X_OFFSET 3 - #define BORDER_Y_OFFSET 27 --#define FIRST_CHESS_PROGRAM "fairymax" --#define SECOND_CHESS_PROGRAM "fairymax" -+#define FIRST_CHESS_PROGRAM "gnuchess" -+#define SECOND_CHESS_PROGRAM "gnuchess" - #define FIRST_DIRECTORY "." - #define SECOND_DIRECTORY "." - #define SOUND_BELL "" ---- a/xaw/xboard.h -+++ b/xaw/xboard.h -@@ -118,8 +118,8 @@ typedef struct { - - #define BORDER_X_OFFSET 3 - #define BORDER_Y_OFFSET 27 --#define FIRST_CHESS_PROGRAM "fairymax" --#define SECOND_CHESS_PROGRAM "fairymax" -+#define FIRST_CHESS_PROGRAM "gnuchess" -+#define SECOND_CHESS_PROGRAM "gnuchess" - #define FIRST_DIRECTORY "." - #define SECOND_DIRECTORY "." - #define SOUND_BELL "" ---- a/xboard.conf.in -+++ b/xboard.conf.in -@@ -67,8 +67,8 @@ - ; - ; Engines & adjudicatons in engine-engine games - ; ---firstChessProgram fairymax ---secondChessProgram fairymax -+-firstChessProgram gnuchess -+-secondChessProgram gnuchess - -firstChessProgramNames {fairymax - "Fruit 2.1" -fcp fruit -fUCI - "Crafty" -fcp crafty diff --git a/games-board/xboard/files/xboard-4.7.3-paths.patch b/games-board/xboard/files/xboard-4.7.3-paths.patch deleted file mode 100644 index d97d57e15ead..000000000000 --- a/games-board/xboard/files/xboard-4.7.3-paths.patch +++ /dev/null @@ -1,145 +0,0 @@ -commit 3c112927b309889c14f8164a58020d1ddefd58d6 -Author: hasufell -Date: Fri Sep 6 16:35:03 2013 +0200 - - BUILD: make paths modifiable - - This can help with setups where games are installed in their - own location, but system data files like desktopfiles - should still go to /usr/share. - - https://savannah.gnu.org/bugs/index.php?39969 - ---- a/Makefile.am -+++ b/Makefile.am -@@ -84,24 +84,26 @@ sysconf_DATA = xboard.conf - - ### icon files - --icondir = $(datadir)/icons/hicolor/48x48/apps -+icondir = @ICONSDIR@ - dist_icon_DATA = xboard.png --svgicondir = $(datadir)/icons/hicolor/scalable/apps -+svgicondir = @SVGICONSDIR@ - dist_svgicon_DATA = xboard.svg - - - ### desktop files for KDE and gnome - --Applicationsdir = $(datadir)/applications -+Applicationsdir = @DESKTOPDIR@ - Applications_DATA = xboard.desktop xboard-fen-viewer.desktop xboard-pgn-viewer.desktop xboard-tourney.desktop xboard-config.desktop - - ### mime file --mimedir = $(datadir)/mime/packages -+mimedir = @MIMEDIR@ - mime_DATA = xboard.xml - -+gamedatadir = @GAMEDATADIR@ -+ - ### directory and files for svgs - --svgdir = $(datadir)/games/xboard/themes/default -+svgdir = $(gamedatadir)/themes/default - dist_svg_DATA = svg/icon_white.svg svg/icon_black.svg \ - svg/BlackAdvisor.svg svg/WhiteAdvisor.svg \ - svg/BlackArchbishop.svg svg/WhiteArchbishop.svg \ -@@ -134,7 +136,7 @@ dist_svg_DATA = svg/icon_white.svg svg/icon_black.svg \ - svg/eo_Thinking.svg svg/eo_Unknown.svg \ - svg/eo_White.svg - --shogidir = $(datadir)/games/xboard/themes/shogi -+shogidir = $(gamedatadir)/themes/shogi - dist_shogi_DATA = \ - themes/shogi/WhiteGold.svg themes/shogi/WhiteCrownedBishop.svg\ - themes/shogi/WhiteBishop.svg themes/shogi/WhiteKing.svg\ -@@ -151,7 +153,7 @@ dist_shogi_DATA = \ - themes/shogi/BlackRook.svg themes/shogi/BlackCrownedRook.svg\ - themes/shogi/BlackAdvisor.svg themes/shogi/BlackGoldSilver.svg - --xiangqidir = $(datadir)/games/xboard/themes/xiangqi -+xiangqidir = $(gamedatadir)/themes/xiangqi - dist_xiangqi_DATA = themes/xiangqi/BlackAdvisor.svg themes/xiangqi/WhiteAdvisor.svg \ - themes/xiangqi/BlackCanon.svg themes/xiangqi/WhiteCanon.svg \ - themes/xiangqi/BlackElephant.svg themes/xiangqi/WhiteElephant.svg \ -@@ -162,17 +164,17 @@ dist_xiangqi_DATA = themes/xiangqi/BlackAdvisor.svg themes/xiangqi/WhiteAdvisor - - ### directory and files for pixmaps - --pixmapsdir = $(datadir)/games/xboard/pixmaps/textures -+pixmapsdir = $(gamedatadir)/pixmaps/textures - dist_pixmaps_DATA = pixmaps/cross32.xpm pixmaps/cross48.xpm pixmaps/board32.xpm pixmaps/board48.xpm pixmaps/ini32.xpm pixmaps/ini48.xpm - - ### directory and files for pngs - --pngdir = $(datadir)/games/xboard/themes/textures -+pngdir = $(gamedatadir)/themes/textures - dist_png_DATA = png/hatch.png png/wood_d.png png/wood_l.png png/xqboard.png - - ### directory and files for sound files - --soundsdir = $(datadir)/games/xboard/sounds -+soundsdir = $(gamedatadir)/sounds - dist_sounds_DATA = \ - sounds/cymbal.wav sounds/pop2.wav sounds/slap.wav sounds/ding1.wav sounds/laser.wav \ - sounds/woodthunk.wav sounds/gong.wav sounds/penalty.wav sounds/honkhonk.wav sounds/phone.wav ---- a/configure.ac -+++ b/configure.ac -@@ -151,6 +151,42 @@ - [with_Xaw="$withval"], - [with_Xaw="no"]) - -+AC_ARG_WITH([iconsdir], -+ [AS_HELP_STRING([--with-iconsdir=DIR], -+ [path where icons get installed (default: $datadir/icons/hicolor/48x48/apps)])], -+ [ICONSDIR="$withval"], -+ [ICONSDIR='$(datadir)/icons/hicolor/48x48/apps']) -+ -+AC_ARG_WITH([svgiconsdir], -+ [AS_HELP_STRING([--with-svgiconsdir=DIR], -+ [path where svg icons get installed (default: $datadir/icons/hicolor/scalable/apps)])], -+ [SVGICONSDIR="$withval"], -+ [SVGICONSDIR='$(datadir)/icons/hicolor/scalable/apps']) -+ -+AC_ARG_WITH([desktopdir], -+ [AS_HELP_STRING([--with-desktopdir=DIR], -+ [path where desktop files get installed (default: $datadir/applications)])], -+ [DESKTOPDIR="$withval"], -+ [DESKTOPDIR='$(datadir)/applications']) -+ -+AC_ARG_WITH([mimedir], -+ [AS_HELP_STRING([--with-mimedir=DIR], -+ [path where mime files get installed (default: $datadir/mime/packages)])], -+ [MIMEDIR="$withval"], -+ [MIMEDIR='$(datadir)/mime/packages']) -+ -+AC_ARG_WITH([gamedatadir], -+ [AS_HELP_STRING([--with-gamedatadir=DIR], -+ [path where game data files get installed (default: $datadir/games/xboard)])], -+ [GAMEDATADIR="$withval"], -+ [GAMEDATADIR='$(datadir)/games/xboard']) -+ -+AC_SUBST(ICONSDIR) -+AC_SUBST(SVGICONSDIR) -+AC_SUBST(DESKTOPDIR) -+AC_SUBST(MIMEDIR) -+AC_SUBST(GAMEDATADIR) -+ - dnl | check for libraries - if test x"$with_GTK" = x"yes" ; then - PKG_CHECK_MODULES([GTK], [ gtk+-2.0 >= 2.16.0 gmodule-2.0 ]) -@@ -515,8 +551,12 @@ - echo "" - echo " prefix: $prefix " - echo " datarootdir: $datarootdir " --echo " datadir: $datadir (icons will go in \$datadir/icons/hicolor/...)" --echo " (bitmaps will go in \$datadir/games/xboard/...)" -+echo " datadir: $datadir " -+echo " gamedatadir: $GAMEDATADIR " -+echo " desktopdir: $DESKTOPDIR " -+echo " mimedir: $MIMEDIR " -+echo " iconsdir: $ICONSDIR " -+echo " svgiconsdir: $SVGICONSDIR " - echo " infodir: $infodir (info files will go here)" - echo " sysconfdir: $sysconfdir (xboard.conf will go here)" - echo "" diff --git a/games-board/xboard/xboard-4.7.3.ebuild b/games-board/xboard/xboard-4.7.3.ebuild deleted file mode 100644 index afdf9d88b7f9..000000000000 --- a/games-board/xboard/xboard-4.7.3.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/xboard-4.7.3.ebuild,v 1.4 2014/11/03 09:38:18 ago Exp $ - -EAPI=5 -inherit autotools eutils fdo-mime gnome2-utils games - -DESCRIPTION="GUI for gnuchess and for internet chess servers" -HOMEPAGE="http://www.gnu.org/software/xboard/" -SRC_URI="mirror://gnu/xboard/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86" -IUSE="Xaw3d +default-font gtk nls zippy" -RESTRICT="test" #124112 - -RDEPEND=" - dev-libs/glib:2 - gnome-base/librsvg:2 - virtual/libintl - x11-libs/cairo[X] - x11-libs/libXpm - default-font? ( - media-fonts/font-adobe-100dpi[nls?] - media-fonts/font-misc-misc[nls?] - ) - !gtk? ( - x11-libs/libX11 - x11-libs/libXt - x11-libs/libXmu - Xaw3d? ( x11-libs/libXaw3d ) - !Xaw3d? ( x11-libs/libXaw ) - ) - gtk? ( x11-libs/gtk+:2 )" -DEPEND="${RDEPEND} - x11-proto/xproto - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-paths.patch \ - "${FILESDIR}"/${P}-gettext.patch \ - "${FILESDIR}"/${P}-configure-switches.patch \ - "${FILESDIR}"/${P}-gnuchess-default.patch \ - "${FILESDIR}"/${P}-Xaw3d.patch - eautoreconf -} - -src_configure() { - egamesconf \ - --datadir=/usr/share \ - $(use_enable nls) \ - $(use_enable zippy) \ - --disable-update-mimedb \ - $(use_with gtk) \ - $(use_with Xaw3d) \ - $(usex gtk "--without-Xaw" "$(use_with !Xaw3d Xaw)") \ - --with-gamedatadir="${GAMES_DATADIR}"/${PN} -} - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS COPYRIGHT ChangeLog NEWS README TODO ics-parsing.txt - use zippy && dodoc zippy.README - dohtml FAQ.html - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - fdo-mime_mime_database_update - fdo-mime_desktop_database_update - gnome2_icon_cache_update - elog "No chess engines are emerged by default! If you want a chess engine" - elog "to play with, you can emerge gnuchess or crafty." - elog "Read xboard FAQ for information." - if ! use default-font ; then - ewarn "Read the xboard(6) man page for specifying the font for xboard to use." - fi -} - -pkg_postrm() { - fdo-mime_mime_database_update - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} diff --git a/games-emulation/hatari/Manifest b/games-emulation/hatari/Manifest index 5dc7099338a7..c76bb86b2430 100644 --- a/games-emulation/hatari/Manifest +++ b/games-emulation/hatari/Manifest @@ -1,3 +1,2 @@ DIST hatari-1.6.2.tar.bz2 1739570 SHA256 20de0430eb8950d206e9df4d8088fa759625e23390e7604484e351d030761b3f SHA512 b6486f0f29fd63458a9b8a040ba26d4902754186e00bfd296d3ddb47b9ff58073f9afb450248ecb715f0d00f754895ba14fc9c8867bb1ddb0cc15d9efa8d4827 WHIRLPOOL 27298778609295ade265e36f7536d4ce9b7b88fd51f47f9288c1c05b6f2ab6c604ced225b709de73278724f71f70a7d6ed145590df5cd9e0f420a7839ae5b85d -DIST hatari-1.7.0.tar.bz2 2254241 SHA256 2056d12807cb827585f337912238492f8b66b7ff3d9d0628090e58209a519e4d SHA512 bb142e4c2264752e465d9916ab7569db0179e4ac42d6bd197421e434bd58cc8c6ce82285b9d4983b648c3e79f1f39e7ade8f1b7a598664063f812dc6941d898c WHIRLPOOL c2941ea31d042622fc6f19d495595ce4d61efa6089cc6d536fef2cbc710ddbb6c259989838590bc9ac711cdf08be392553534b27a799e31eebaccbae3ba76d2f DIST hatari-1.8.0.tar.bz2 1985358 SHA256 7ecf486ba578e3b4d7a3d3e86ef3e879d5e5611b39c2504e38ccafdaacb5ffeb SHA512 498a6636eef78e85a4715e9df169d928ce97c0548145a95b41aa3aae28817b8e843de1d1390893863be05e4e9981c89236571ab2eb9239faad23b711542e4fa0 WHIRLPOOL 9e62bdf08247da20e451e032355849cbb0c4b683711ed5cea29f03a52cb5b276e996b9ea4fe5c38ecc09456248bd099eb8b1f35d93e6cba5d00b93a456329a01 diff --git a/games-emulation/hatari/files/hatari-1.7.0-gentoo-docdir.patch b/games-emulation/hatari/files/hatari-1.7.0-gentoo-docdir.patch deleted file mode 100644 index 715fb189143f..000000000000 --- a/games-emulation/hatari/files/hatari-1.7.0-gentoo-docdir.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- hatari-1.6.1/python-ui/uihelpers.py -+++ hatari-1.6.1/python-ui/uihelpers.py -@@ -97,9 +97,7 @@ - # first try whether there are local Hatari docs in standard place - # for this Hatari/UI version - sep = os.sep -- path = self.get_binary_path("hatari") -- path = sep.join(path.split(sep)[:-2]) # remove "bin/hatari" -- path = path + sep + "share" + sep + "doc" + sep + "hatari" + sep -+ path = "@DOCDIR@" - if os.path.exists(path + "manual.html"): - return path - # if not, point to latest Hatari HG version docs diff --git a/games-emulation/hatari/files/hatari-1.7.0-gentoo.patch b/games-emulation/hatari/files/hatari-1.7.0-gentoo.patch deleted file mode 100644 index 4f10d6d9e3ce..000000000000 --- a/games-emulation/hatari/files/hatari-1.7.0-gentoo.patch +++ /dev/null @@ -1,112 +0,0 @@ ---- hatari-1.4.0.orig/src/paths.c -+++ hatari-1.4.0/src/paths.c -@@ -109,71 +109,6 @@ - free(pTmpName); - } - -- --/** -- * Locate the directory where the hatari executable resides -- */ --static char *Paths_InitExecDir(const char *argv0) --{ -- char *psExecDir; /* Path string where the hatari executable can be found */ -- -- /* Allocate memory for storing the path string of the executable */ -- psExecDir = malloc(FILENAME_MAX); -- if (!psExecDir) -- { -- fprintf(stderr, "Out of memory (Paths_Init)\n"); -- exit(-1); -- } -- -- /* Determine the bindir... -- * Start with empty string, then try to use OS specific functions, -- * and finally analyze the PATH variable if it has not been found yet. */ -- psExecDir[0] = '\0'; -- --#if defined(__linux__) -- { -- int i; -- /* On Linux, we can analyze the symlink /proc/self/exe */ -- i = readlink("/proc/self/exe", psExecDir, FILENAME_MAX); -- if (i > 0) -- { -- char *p; -- psExecDir[i] = '\0'; -- p = strrchr(psExecDir, '/'); /* Search last slash */ -- if (p) -- *p = 0; /* Strip file name from path */ -- } -- } --//#elif defined(WIN32) || defined(__CEGCC__) --// /* On Windows we can use GetModuleFileName for getting the exe path */ --// GetModuleFileName(NULL, psExecDir, FILENAME_MAX); --#endif -- -- /* If we do not have the execdir yet, analyze argv[0] and the PATH: */ -- if (psExecDir[0] == 0) -- { -- if (strchr(argv0, PATHSEP) == 0) -- { -- /* No separator in argv[0], we have to explore PATH... */ -- Paths_GetExecDirFromPATH(argv0, psExecDir, FILENAME_MAX); -- } -- else -- { -- /* There was a path separator in argv[0], so let's assume a -- * relative or absolute path to the current directory in argv[0] */ -- char *p; -- strncpy(psExecDir, argv0, FILENAME_MAX); -- psExecDir[FILENAME_MAX-1] = 0; -- p = strrchr(psExecDir, PATHSEP); /* Search last slash */ -- if (p) -- *p = 0; /* Strip file name from path */ -- } -- } -- -- return psExecDir; --} -- -- - /** - * Initialize the users home directory string - * and Hatari's home directory (~/.hatari) -@@ -226,8 +161,6 @@ - */ - void Paths_Init(const char *argv0) - { -- char *psExecDir; /* Path string where the hatari executable can be found */ -- - /* Init working directory string */ - if (getcwd(sWorkingDir, FILENAME_MAX) == NULL) - { -@@ -238,27 +171,11 @@ - /* Init the user's home directory string */ - Paths_InitHomeDirs(); - -- /* Get the directory where the executable resides */ -- psExecDir = Paths_InitExecDir(argv0); -- -- /* Now create the datadir path name from the bindir path name: */ -- if (psExecDir && strlen(psExecDir) > 0) -- { -- snprintf(sDataDir, sizeof(sDataDir), "%s%c%s", -- psExecDir, PATHSEP, BIN2DATADIR); -- } -- else -- { -- /* bindir could not be determined, let's assume datadir is relative -- * to current working directory... */ -- strcpy(sDataDir, BIN2DATADIR); -- } -+ strcpy(sDataDir, BIN2DATADIR); - - /* And finally make a proper absolute path out of datadir: */ - File_MakeAbsoluteName(sDataDir); - -- free(psExecDir); -- - /* fprintf(stderr, " WorkingDir = %s\n DataDir = %s\n UserHomeDir = %s\n HatariHomeDir = %s\n", - sWorkingDir, sDataDir, sUserHomeDir, sHatariHomeDir); */ - } diff --git a/games-emulation/hatari/hatari-1.7.0.ebuild b/games-emulation/hatari/hatari-1.7.0.ebuild deleted file mode 100644 index b2ffd566ef74..000000000000 --- a/games-emulation/hatari/hatari-1.7.0.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/hatari/hatari-1.7.0.ebuild,v 1.1 2014/07/16 02:48:29 mr_bones_ Exp $ - -EAPI=5 -PYTHON_COMPAT=( python2_6 python2_7 ) -inherit eutils toolchain-funcs cmake-utils python-single-r1 games - -DESCRIPTION="Atari ST emulator" -HOMEPAGE="http://hatari.tuxfamily.org/" -SRC_URI="http://download.tuxfamily.org/hatari/${PV}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - media-libs/libsdl[X,sound,video] - sys-libs/readline - media-libs/libpng - sys-libs/zlib" -DEPEND="${RDEPEND} - virtual/pkgconfig" -RDEPEND="${RDEPEND} - dev-python/pygtk[${PYTHON_USEDEP}] - games-emulation/emutos" - -pkg_setup() { - games_pkg_setup - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch \ - "${FILESDIR}"/${P}-gentoo-docdir.patch - # build with newer zlib (bug #387829) - sed -i -e '1i#define OF(x) x' src/includes/unzip.h || die - sed -i -e '/Encoding/d' ./python-ui/hatariui.desktop || die - sed -i -e "s/python/${EPYTHON}/" tools/atari-hd-image.sh || die - sed -i \ - -e "s%conf=.*$%conf=\"${GAMES_SYSCONFDIR}\"%" \ - -e "s%path=.*$%path=\"${GAMES_DATADIR}/${PN}/hatariui\"%" \ - python-ui/hatariui || die - sed -i -e "s#@DOCDIR@#/usr/share/doc/${PF}/html/#" python-ui/uihelpers.py || die - rm -f doc/CMakeLists.txt -} - -src_configure() { - mycmakeargs=( - "-DCMAKE_VERBOSE_MAKEFILE=TRUE" - "-DCMAKE_BUILD_TYPE:STRING=Release" - "-DDATADIR=${GAMES_DATADIR}/${PN}" - "-DBIN2DATADIR=${GAMES_DATADIR}/${PN}" - "-DBINDIR=${GAMES_BINDIR}" - "-DICONDIR=/usr/share/pixmaps" - "-DDESKTOPDIR=/usr/share/applications" - "-DMANDIR=/usr/share/man/man1" - "-DDOCDIR=/usr/share/doc/${PF}" - ) - cmake-utils_src_configure -} - -src_install() { - DOCS="readme.txt doc/*.txt" cmake-utils_src_install - dohtml -r doc/ - python_fix_shebang "${ED%/}"/usr/share/games/hatari/{hatariui,hconsole}/ - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - echo - elog "You need a TOS ROM to run hatari. EmuTOS, a free TOS implementation," - elog "has been installed in $(games_get_libdir) with a .img extension (there" - elog "are several from which to choose)." - elog - elog "Another option is to go to http://www.atari.st/ and get a real TOS:" - elog " http://www.atari.st/" - elog - elog "The first time you run hatari, you should configure it to find the" - elog "TOS you prefer to use. Be sure to save your settings." - echo -} diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest index 351f9b058492..4bca1797b131 100644 --- a/games-engines/odamex/Manifest +++ b/games-engines/odamex/Manifest @@ -1,4 +1,2 @@ -DIST odamex-src-0.6.2.tar.bz2 8451290 SHA256 70534ee0b88f759269b807190f347acacc1a0ff4f9e9e90edeab9aa99d4f316e SHA512 83bdb7b850a6a6c3670fa9eeeccca6501ea90f26bcef2437e5530a43d40c9cdd408de15183d4fe991becc13f58666c86586660522d102680148df4c12dd27104 WHIRLPOOL d024220bc2b743fd6512981ce3d58fa8562e9cfc3712158e308172ba1c3b1a2de076969015601a418d14be25af5ebe366e6353bb66f523837a29ad5c56af1c64 -DIST odamex-src-0.6.3.tar.bz2 8439487 SHA256 ad0d2a1d86288e26438cb012fd8898d5b3b4cc1d466250105b4b740013d940da SHA512 86a57f359b1bfb1cf84c674aa71c7c91e2aabbe07e9f77de7914031a6584b547a11c7f59ea422756ea41dcfc1d50b7dfd74be764812a0e1ce1c69969403b1990 WHIRLPOOL 272a89b5941cb48af861e198e9c8de5b78a4edb0ea1e830ad33610c2147fab232dcff02bdd0db0b6b460cca8573b56cbbb83bc7cc98d80af0d8780beb0add7ed DIST odamex-src-0.6.4.tar.bz2 8449818 SHA256 7832fed1e0cca992c746fd0f7e876b090c0f244f2d1d5230ffa3df8b33ce0f6a SHA512 0a917568cfc4bd4d9921cb82185cbbc318bce493bc66e489093e45401ec4c7596148778648e5078f13c50824470a040a995aa50c7956e2446c90920254c8129f WHIRLPOOL 9d95a9422ab382ccd5f4fc7d89f0558e30c604e18a33eec3bb074ae446258f030ec67d4738e1c517d89c9a4e09aea6e3a84651d7c8b1df9a88a26077c1b319b4 DIST odamex-src-0.7.0.tar.bz2 8435860 SHA256 d0306ddca3d5534672e6f0c547092d8f3f6f815686e4f6b21d6521afae1fd73b SHA512 410f3c2588e4d57006e5bb50eaa0f6c1a83cf197ce40daabb958667483eb6c85138206ac74b8aee64c4208c4360415ad16d1698534be5c7abec1493a0f91aa8b WHIRLPOOL 91ca8f658435f4503df8a2d5f52b1ef1cf34229373c4e1c3918b7eb919ae54e3a416618ce184d54c6ebc25bdfe6fea96f8933f98d859562b4972f89bd5c320ff diff --git a/games-engines/odamex/files/odamex-0.6.2-build.patch b/games-engines/odamex/files/odamex-0.6.2-build.patch deleted file mode 100644 index f5a7905e3788..000000000000 --- a/games-engines/odamex/files/odamex-0.6.2-build.patch +++ /dev/null @@ -1,204 +0,0 @@ -From: Julian Ospald -Date: Sun Jul 15 10:08:51 UTC 2012 -Subject: build system - -a. add install rules and make paths modifiable -b. add odamex.wad install destination to wad search path -c. add various cmake options -d. use CMAKE_BINDIR as default bin patch in odalauncher - ---- odamex-src-0.6.2/CMakeLists.txt -+++ odamex-src-0.6.2/CMakeLists.txt -@@ -2,6 +2,26 @@ - project(Odamex) - cmake_minimum_required(VERSION 2.8) - -+# cmake modules -+include( CMakeDependentOption ) -+include( GNUInstallDirs ) -+ -+# options -+option(BUILD_CLIENT "Build client target" 1) -+option(BUILD_SERVER "Build server target" 1) -+option(BUILD_MASTER "Build master server target" 1) -+cmake_dependent_option( BUILD_ODALAUNCH "Build odalaunch target" 1 BUILD_CLIENT 0 ) -+cmake_dependent_option( ENABLE_PORTMIDI "Enable portmidi support" 1 BUILD_CLIENT 0 ) -+ -+configure_file ( -+ "${PROJECT_SOURCE_DIR}/config.h.in" -+ "${PROJECT_BINARY_DIR}/config.h" -+ ) -+ -+include_directories( -+ ${PROJECT_BINARY_DIR} -+) -+ - set(PROJECT_VERSION 0.6.2) - set(PROJECT_COPYRIGHT "2006-2012") - -@@ -40,13 +60,31 @@ - set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) - - # Subdirectories for individual projects --add_subdirectory(client) --add_subdirectory(server) --add_subdirectory(master) --add_subdirectory(odalaunch) -+if(BUILD_CLIENT) -+ add_subdirectory(client) -+endif() -+if(BUILD_SERVER) -+ add_subdirectory(server) -+endif() -+if(BUILD_MASTER) -+ add_subdirectory(master) -+endif() -+if(BUILD_ODALAUNCH) -+ add_subdirectory(odalaunch) -+endif() -+ -+if(NOT BUILD_CLIENT AND NOT BUILD_SERVER AND NOT BUILD_MASTER) -+ message(FATAL_ERROR "No target chosen, doing nothing.") -+endif() -+ - - # Disable the ag-odalaunch target completely: -DNO_AG-ODALAUNCH_TARGET - # This is only really useful when setting up a universal build. - if(NOT NO_AG-ODALAUNCH_TARGET) - add_subdirectory(ag-odalaunch) - endif() -+ -+# global install rules -+if(UNIX) -+ install(FILES odamex.wad DESTINATION ${CMAKE_INSTALL_DATADIR}) -+endif() ---- odamex-src-0.6.2/client/CMakeLists.txt -+++ odamex-src-0.6.2/client/CMakeLists.txt -@@ -55,11 +55,11 @@ - "Path to PortMIDI base directory. Only necessary if you get errors about PortMIDI not being found, or if you want to use a different installation of PortMIDI.") - set(ENV{PORTMIDI_DIR} ${PORTMIDI_DIR}) - find_package(PortMidi) --if(PORTMIDI_FOUND) -+if(PORTMIDI_FOUND AND ENABLE_PORTMIDI) - include_directories(${PORTMIDI_INCLUDE_DIR}) - add_definitions(-DPORTMIDI) - else() -- message(WARNING "PortMidi not found, client will not be built with PortMidi support.") -+ message(WARNING "PortMidi not found or disabled, client will not be built with PortMidi support.") - endif() - - # Find Mac frameworks -@@ -79,7 +79,7 @@ - ${CLIENT_SOURCES} ${CLIENT_HEADERS} ${CLIENT_WIN32_RESOURCES} - ${CLIENT_MAC_OBJC_SOURCES}) - target_link_libraries(odamex ${SDL_LIBRARY} ${SDLMIXER_LIBRARY}) -- if(PORTMIDI_FOUND) -+ if(PORTMIDI_FOUND AND ENABLE_PORTMIDI) - target_link_libraries(odamex ${PORTMIDI_LIBRARIES}) - endif() - if(WIN32) -@@ -146,6 +146,8 @@ - ${CMAKE_CURRENT_BINARY_DIR}/odamex.app/Contents/MacOS/odamex) - " ) - endif() -- -+ # UNIX install rules -+ elseif(UNIX) -+ install( TARGETS odamex DESTINATION ${CMAKE_INSTALL_BINDIR} ) - endif() - endif() ---- odamex-src-0.6.2/master/CMakeLists.txt -+++ odamex-src-0.6.2/master/CMakeLists.txt -@@ -12,3 +12,9 @@ - elseif(SOLARIS) - target_link_libraries(odamast socket nsl) - endif() -+ -+# install rules -+if(UNIX) -+ install( TARGETS odamast DESTINATION ${CMAKE_INSTALL_BINDIR} ) -+endif() -+ ---- odamex-src-0.6.2/odalaunch/CMakeLists.txt -+++ odamex-src-0.6.2/odalaunch/CMakeLists.txt -@@ -61,3 +61,9 @@ - ) - endif() - endif() -+ -+# install rules -+if(UNIX) -+ install( TARGETS odalaunch DESTINATION ${CMAKE_INSTALL_BINDIR} ) -+endif() -+ ---- odamex-src-0.6.2/server/CMakeLists.txt -+++ odamex-src-0.6.2/server/CMakeLists.txt -@@ -50,3 +50,8 @@ - target_link_libraries(odasrv socket nsl) - endif() - #endif() -+ -+# install rules -+if(UNIX) -+ install( TARGETS odasrv DESTINATION ${CMAKE_INSTALL_BINDIR} ) -+endif() ---- /dev/null -+++ odamex-src-0.6.2/config.h.in -@@ -0,0 +1,7 @@ -+#ifndef CONFIG_H -+#define CONFIG_H -+ -+#define CMAKE_WADDIR "@CMAKE_INSTALL_DATADIR@" -+#define CMAKE_BINDIR "@CMAKE_INSTALL_BINDIR@" -+ -+#endif ---- odamex-src-0.6.2/common/d_main.cpp -+++ odamex-src-0.6.2/common/d_main.cpp -@@ -23,6 +23,7 @@ - //----------------------------------------------------------------------------- - - #include "version.h" -+#include "config.h" - - #include - #include -@@ -493,6 +494,7 @@ - D_AddSearchDir(dirs, getenv("DOOMWADDIR"), separator); - D_AddSearchDir(dirs, getenv("DOOMWADPATH"), separator); - D_AddSearchDir(dirs, getenv("HOME"), separator); -+ D_AddSearchDir(dirs, CMAKE_WADDIR, separator); - - // [AM] Search additional paths based on platform - D_AddPlatformSearchDirs(dirs); ---- odamex-src-0.6.2/odalaunch/src/dlg_main.cpp -+++ odamex-src-0.6.2/odalaunch/src/dlg_main.cpp -@@ -27,6 +27,7 @@ - #include "str_utils.h" - - #include "md5.h" -+#include "config.h" - - #include - #include -@@ -42,6 +43,7 @@ - #include - #include - #include -+#include - - #ifdef __WXMSW__ - #include -@@ -190,10 +192,12 @@ - } - #endif - -+ const char *cmake_bindir_str = CMAKE_BINDIR; -+ wxString cmake_bindir = wxString::FromAscii(cmake_bindir_str); - launchercfg_s.get_list_on_start = 1; - launchercfg_s.show_blocked_servers = 0; - launchercfg_s.wad_paths = wxGetCwd(); -- launchercfg_s.odamex_directory = wxGetCwd(); -+ launchercfg_s.odamex_directory = cmake_bindir; - - m_LstCtrlServers = XRCCTRL(*this, "Id_LstCtrlServers", LstOdaServerList); - m_LstCtrlPlayers = XRCCTRL(*this, "Id_LstCtrlPlayers", LstOdaPlayerList); diff --git a/games-engines/odamex/files/odamex-0.6.2-libagar.patch b/games-engines/odamex/files/odamex-0.6.2-libagar.patch deleted file mode 100644 index 5f367aff1d6e..000000000000 --- a/games-engines/odamex/files/odamex-0.6.2-libagar.patch +++ /dev/null @@ -1,15 +0,0 @@ -http://odamex.net/svn/revision.php?rev=3691 - -Index: ag-odalaunch/src/main.cpp -=================================================================== ---- ag-odalaunch/src/main.cpp (revision 3668) -+++ ag-odalaunch/src/main.cpp (working copy) -@@ -52,7 +52,7 @@ - { - AG_Window *win; - -- if((win = AG_GuiDebugger(agWindowFocused)) != NULL) -+ if((win = (AG_Window*)AG_GuiDebugger(agWindowFocused)) != NULL) - { - AG_WindowShow(win); - } diff --git a/games-engines/odamex/files/odamex-0.6.3-build.patch b/games-engines/odamex/files/odamex-0.6.3-build.patch deleted file mode 100644 index 2683617871e6..000000000000 --- a/games-engines/odamex/files/odamex-0.6.3-build.patch +++ /dev/null @@ -1,198 +0,0 @@ -From: Julian Ospald -Date: Sun Jul 15 10:08:51 UTC 2012 -Subject: build system - -a. add install rules and make paths modifiable -b. add odamex.wad install destination to wad search path -c. add various cmake options -d. use CMAKE_BINDIR as default bin patch in odalauncher - ---- odamex-src-0.6.3/CMakeLists.txt -+++ odamex-src-0.6.3/CMakeLists.txt -@@ -2,6 +2,26 @@ - project(Odamex) - cmake_minimum_required(VERSION 2.8) - -+# cmake modules -+include( CMakeDependentOption ) -+include( GNUInstallDirs ) -+ -+# options -+option(BUILD_CLIENT "Build client target" 1) -+option(BUILD_SERVER "Build server target" 1) -+option(BUILD_MASTER "Build master server target" 1) -+cmake_dependent_option( BUILD_ODALAUNCH "Build odalaunch target" 1 BUILD_CLIENT 0 ) -+cmake_dependent_option( ENABLE_PORTMIDI "Enable portmidi support" 1 BUILD_CLIENT 0 ) -+ -+configure_file ( -+ "${PROJECT_SOURCE_DIR}/config.h.in" -+ "${PROJECT_BINARY_DIR}/config.h" -+ ) -+ -+include_directories( -+ ${PROJECT_BINARY_DIR} -+) -+ - set(PROJECT_VERSION 0.6.3) - set(PROJECT_COPYRIGHT "2006-2013") - -@@ -54,13 +74,30 @@ - set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) - - # Subdirectories for individual projects --add_subdirectory(client) --add_subdirectory(server) --add_subdirectory(master) --add_subdirectory(odalaunch) -+if(BUILD_CLIENT) -+ add_subdirectory(client) -+endif() -+if(BUILD_SERVER) -+ add_subdirectory(server) -+endif() -+if(BUILD_MASTER) -+ add_subdirectory(master) -+endif() -+if(BUILD_ODALAUNCH) -+ add_subdirectory(odalaunch) -+endif() -+ -+if(NOT BUILD_CLIENT AND NOT BUILD_SERVER AND NOT BUILD_MASTER) -+ message(FATAL_ERROR "No target chosen, doing nothing.") -+endif() - - # Disable the ag-odalaunch target completely: -DNO_AG-ODALAUNCH_TARGET - # This is only really useful when setting up a universal build. - if(NOT NO_AG-ODALAUNCH_TARGET) - add_subdirectory(ag-odalaunch) - endif() -+ -+# global install rules -+if(UNIX) -+ install(FILES odamex.wad DESTINATION ${CMAKE_INSTALL_DATADIR}) -+endif() ---- odamex-src-0.6.3/client/CMakeLists.txt -+++ odamex-src-0.6.3/client/CMakeLists.txt -@@ -48,7 +48,7 @@ - - # PortMidi configuration - find_package(PortMidi) --if(PORTMIDI_FOUND) -+if(PORTMIDI_FOUND AND ENABLE_PORTMIDI) - include_directories(${PORTMIDI_INCLUDE_DIR}) - add_definitions(-DPORTMIDI) - else() -@@ -95,7 +95,7 @@ - target_link_libraries(odamex ${SDL_LIBRARY}) - target_link_libraries(odamex ${SDLMIXER_LIBRARY}) - -- if(PORTMIDI_FOUND) -+ if(PORTMIDI_FOUND AND ENABLE_PORTMIDI) - target_link_libraries(odamex ${PORTMIDI_LIBRARIES}) - endif() - -@@ -164,5 +164,8 @@ - " ) - endif() - -+ # UNIX install rules -+ elseif(UNIX) -+ install( TARGETS odamex DESTINATION ${CMAKE_INSTALL_BINDIR} ) - endif() - endif() ---- odamex-src-0.6.3/master/CMakeLists.txt -+++ odamex-src-0.6.3/master/CMakeLists.txt -@@ -12,3 +12,9 @@ - elseif(SOLARIS) - target_link_libraries(odamast socket nsl) - endif() -+ -+# install rules -+if(UNIX) -+ install( TARGETS odamast DESTINATION ${CMAKE_INSTALL_BINDIR} ) -+endif() -+ ---- odamex-src-0.6.3/odalaunch/CMakeLists.txt -+++ odamex-src-0.6.3/odalaunch/CMakeLists.txt -@@ -61,3 +61,9 @@ - ) - endif() - endif() -+ -+# install rules -+if(UNIX) -+ install( TARGETS odalaunch DESTINATION ${CMAKE_INSTALL_BINDIR} ) -+endif() -+ ---- odamex-src-0.6.3/server/CMakeLists.txt -+++ odamex-src-0.6.3/server/CMakeLists.txt -@@ -56,3 +56,9 @@ - elseif(SOLARIS) - target_link_libraries(odasrv socket nsl) - endif() -+ -+# install rules -+if(UNIX) -+ install( TARGETS odasrv DESTINATION ${CMAKE_INSTALL_BINDIR} ) -+endif() -+ ---- /dev/null -+++ odamex-src-0.6.3/config.h.in -@@ -0,0 +1,7 @@ -+#ifndef CONFIG_H -+#define CONFIG_H -+ -+#define CMAKE_WADDIR "@CMAKE_INSTALL_DATADIR@" -+#define CMAKE_BINDIR "@CMAKE_INSTALL_BINDIR@" -+ -+#endif ---- odamex-src-0.6.3/common/d_main.cpp -+++ odamex-src-0.6.3/common/d_main.cpp -@@ -23,6 +23,7 @@ - //----------------------------------------------------------------------------- - - #include "version.h" -+#include "config.h" - - #include - #include -@@ -494,6 +495,7 @@ - D_AddSearchDir(dirs, getenv("DOOMWADDIR"), separator); - D_AddSearchDir(dirs, getenv("DOOMWADPATH"), separator); - D_AddSearchDir(dirs, getenv("HOME"), separator); -+ D_AddSearchDir(dirs, CMAKE_WADDIR, separator); - - // [AM] Search additional paths based on platform - D_AddPlatformSearchDirs(dirs); ---- odamex-src-0.6.3/odalaunch/src/dlg_main.cpp -+++ odamex-src-0.6.3/odalaunch/src/dlg_main.cpp -@@ -27,6 +27,7 @@ - #include "str_utils.h" - - #include "md5.h" -+#include "config.h" - - #include - #include -@@ -42,6 +43,7 @@ - #include - #include - #include -+#include - - #ifdef __WXMSW__ - #include -@@ -190,10 +192,12 @@ - } - #endif - -+ const char *cmake_bindir_str = CMAKE_BINDIR; -+ wxString cmake_bindir = wxString::FromAscii(cmake_bindir_str); - launchercfg_s.get_list_on_start = 1; - launchercfg_s.show_blocked_servers = 0; - launchercfg_s.wad_paths = wxGetCwd(); -- launchercfg_s.odamex_directory = wxGetCwd(); -+ launchercfg_s.odamex_directory = cmake_bindir; - - m_LstCtrlServers = XRCCTRL(*this, "Id_LstCtrlServers", LstOdaServerList); - m_LstCtrlPlayers = XRCCTRL(*this, "Id_LstCtrlPlayers", LstOdaPlayerList); diff --git a/games-engines/odamex/odamex-0.6.2.ebuild b/games-engines/odamex/odamex-0.6.2.ebuild deleted file mode 100644 index a0bcd5599343..000000000000 --- a/games-engines/odamex/odamex-0.6.2.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/odamex/odamex-0.6.2.ebuild,v 1.5 2014/05/15 16:42:25 ulm Exp $ - -EAPI=5 -WX_GTK_VER="2.8" -inherit cmake-utils eutils gnome2-utils wxwidgets games - -MY_P=${PN}-src-${PV} -DESCRIPTION="An online multiplayer, free software engine for Doom and Doom II" -HOMEPAGE="http://odamex.net/" -SRC_URI="mirror://sourceforge/${PN}/Odamex/${PV}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="dedicated +odalaunch master portmidi server" - -RDEPEND=" - !dedicated? ( - >=media-libs/libsdl-1.2.9[X,sound,joystick,video] - >=media-libs/sdl-mixer-1.2.6 - odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) - portmidi? ( media-libs/portmidi ) - )" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch "${FILESDIR}"/${P}-build.patch \ - "${FILESDIR}"/${P}-libagar.patch - - epatch_user -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_BINDIR="${GAMES_BINDIR}" - -DCMAKE_INSTALL_DATADIR="${GAMES_DATADIR}"/${PN} - $(cmake-utils_use_build master MASTER) - ) - - if use dedicated ; then - mycmakeargs+=( - -DBUILD_CLIENT=OFF - -DBUILD_ODALAUNCH=OFF - -DBUILD_SERVER=ON - -DENABLE_PORTMIDI=OFF - ) - else - mycmakeargs+=( - -DBUILD_CLIENT=ON - $(cmake-utils_use_build odalaunch ODALAUNCH) - $(cmake-utils_use_build server SERVER) - $(cmake-utils_use_enable portmidi PORTMIDI) - ) - fi - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - - if ! use dedicated ; then - newicon -s 128 "${S}/media/icon_${PN}_128.png" "${PN}.png" - make_desktop_entry ${PN} - - if use odalaunch ; then - newicon -s 128 "${S}/media/icon_odalaunch_128.png" "odalaunch.png" - make_desktop_entry odalaunch "Odamex Launcher" odalaunch - fi - fi - - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - einfo - elog "This is just the engine, you will need doom resource files in order to play." - elog "Check: http://odamex.net/wiki/FAQ#What_data_files_are_required.3F" - einfo - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-engines/odamex/odamex-0.6.3.ebuild b/games-engines/odamex/odamex-0.6.3.ebuild deleted file mode 100644 index 426b755c5ec9..000000000000 --- a/games-engines/odamex/odamex-0.6.3.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/odamex/odamex-0.6.3.ebuild,v 1.4 2014/05/15 16:42:25 ulm Exp $ - -EAPI=5 -WX_GTK_VER="2.8" -inherit cmake-utils eutils gnome2-utils wxwidgets games - -MY_P=${PN}-src-${PV} -DESCRIPTION="An online multiplayer, free software engine for Doom and Doom II" -HOMEPAGE="http://odamex.net/" -SRC_URI="mirror://sourceforge/${PN}/Odamex/${PV}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="dedicated +odalaunch master portmidi server" - -RDEPEND=" - dedicated? ( >=net-libs/miniupnpc-1.8 ) - !dedicated? ( - >=media-libs/libsdl-1.2.9[X,sound,joystick,video] - >=media-libs/sdl-mixer-1.2.6 - odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) - portmidi? ( media-libs/portmidi ) - server? ( >=net-libs/miniupnpc-1.8 ) - )" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch "${FILESDIR}"/${P}-build.patch - - epatch_user -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_BINDIR="${GAMES_BINDIR}" - -DCMAKE_INSTALL_DATADIR="${GAMES_DATADIR}"/${PN} - $(cmake-utils_use_build master MASTER) - ) - - if use dedicated ; then - mycmakeargs+=( - -DBUILD_CLIENT=OFF - -DBUILD_ODALAUNCH=OFF - -DBUILD_SERVER=ON - -DENABLE_PORTMIDI=OFF - ) - else - mycmakeargs+=( - -DBUILD_CLIENT=ON - $(cmake-utils_use_build odalaunch ODALAUNCH) - $(cmake-utils_use_build server SERVER) - $(cmake-utils_use_enable portmidi PORTMIDI) - ) - fi - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - - if ! use dedicated ; then - newicon -s 128 "${S}/media/icon_${PN}_128.png" "${PN}.png" - make_desktop_entry ${PN} - - if use odalaunch ; then - newicon -s 128 "${S}/media/icon_odalaunch_128.png" "odalaunch.png" - make_desktop_entry odalaunch "Odamex Launcher" odalaunch - fi - fi - - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - einfo - elog "This is just the engine, you will need doom resource files in order to play." - elog "Check: http://odamex.net/wiki/FAQ#What_data_files_are_required.3F" - einfo - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-engines/residualvm/Manifest b/games-engines/residualvm/Manifest index 061a2c9aad2e..bd0da05489e8 100644 --- a/games-engines/residualvm/Manifest +++ b/games-engines/residualvm/Manifest @@ -1,2 +1,2 @@ -DIST residualvm-0.1.0-sources.tar.bz2 4704016 SHA256 faace790d974da08133277c2bf22e0cc36a69e0bf70e3cfcd252be745b42fa83 SHA512 acb477e11f0fa230e52f6b961ef421514a98811f43dd25b4d8653af94b72c764f815f3806928b50526499053875fe4d06e3a69c8faf6ec57eca97b4bf7b860fd WHIRLPOOL e838ac4d0de9079f37d806e03428581339b6718dac9add5e4e03a8678598ed2c85e71a377f7bca8af223615873ffc8f0d116fe7b1097158142a3c38094ef4198 DIST residualvm-0.1.1-sources.tar.bz2 4734395 SHA256 99c419b13885a49bdfc10a50a3a6000fd1ba9504f6aae04c74b840ec6f57a963 SHA512 6fec148222727d9b949826dc7c2e8af2c7515a0cd73f553c64a4c994d25d4911cbe6b0dbf23dac69b8caa5dbf184916831d39899a1553c47978208b45fa81937 WHIRLPOOL 336151c24bb76cf7a8cce83c19873e271bccc8d78ea92236de260e3692361d9a8d9b9ec1931b4fbc21998d8a5e33d974f30f40b267d8800dcb268aab7dcd96bd +DIST residualvm-0.2.1-sources.tar.bz2 5533814 SHA256 cd2748a665f80b8c527c6dd35f8435e718d2e10440dca10e7765574c7402d924 SHA512 9eed93770ef1ad828934c32e937b861c93f1ebbb0d936f3f56668e654588f734dc88e29446f0a69f8f26475e96b8ce7ca85318758b99aabc9586756692c721da WHIRLPOOL fd055dc5f85ae653f38f6de6a4d80aad32aa77164ab997fb2cc64cd23284b1af7531d9a1076cdd903e6edc8bf48b6e455c42f0adb997ea7eeda660d958e3319b diff --git a/games-engines/residualvm/files/residualvm-0.1.0-EE.patch b/games-engines/residualvm/files/residualvm-0.1.0-EE.patch deleted file mode 100644 index 376fb0994abb..000000000000 --- a/games-engines/residualvm/files/residualvm-0.1.0-EE.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b65365e0d314bff91f5fb3c4fbdd3da7944ea7a2 Mon Sep 17 00:00:00 2001 -From: hasufell -Date: Fri, 1 Feb 2013 19:31:15 +0100 -Subject: [PATCH] CONFIGURE: Fix build under et_EE locale - -Freetype-config reports a broken include dir -when et_EE locale is used. We set LC_ALL -and LANGUAGE to "C" explicitly like autoconf -does to force consistent behavior. ---- - configure | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure b/configure -index 91364eb..3b8b845 100755 ---- a/configure -+++ b/configure -@@ -21,6 +21,12 @@ - # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - # - -+# NLS nuisances. -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE -+ - # Save the current environment variables for next runs - SAVED_CONFIGFLAGS=$@ - SAVED_LDFLAGS=$LDFLAGS --- -1.7.10 - diff --git a/games-engines/residualvm/metadata.xml b/games-engines/residualvm/metadata.xml index 01a746edb196..cad5a2aa1773 100644 --- a/games-engines/residualvm/metadata.xml +++ b/games-engines/residualvm/metadata.xml @@ -3,4 +3,3 @@ games - diff --git a/games-engines/residualvm/residualvm-0.1.0.ebuild b/games-engines/residualvm/residualvm-0.2.1.ebuild similarity index 91% rename from games-engines/residualvm/residualvm-0.1.0.ebuild rename to games-engines/residualvm/residualvm-0.2.1.ebuild index 570a0da81846..633af02756f7 100644 --- a/games-engines/residualvm/residualvm-0.1.0.ebuild +++ b/games-engines/residualvm/residualvm-0.2.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/residualvm/residualvm-0.1.0.ebuild,v 1.3 2014/05/15 16:43:06 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/residualvm/residualvm-0.2.1.ebuild,v 1.1 2015/01/27 07:19:03 mr_bones_ Exp $ EAPI=5 inherit eutils toolchain-funcs gnome2-utils games @@ -25,10 +25,6 @@ RDEPEND=" virtual/opengl" DEPEND="${RDEPEND}" -src_prepare() { - epatch "${FILESDIR}"/${P}-EE.patch -} - src_configure() { # not an autotools script # most configure options currently do nothing, recheck on version bump !!! @@ -73,7 +69,7 @@ src_install() { domenu dists/${PN}.desktop doman dists/${PN}.6 - dodoc AUTHORS README KNOWN_BUGS TODO + dodoc AUTHORS README.md KNOWN_BUGS TODO prepgamesdirs } diff --git a/games-engines/solarus/Manifest b/games-engines/solarus/Manifest index d69784ad03e4..1b7df4f3f9e2 100644 --- a/games-engines/solarus/Manifest +++ b/games-engines/solarus/Manifest @@ -1,4 +1,2 @@ DIST solarus-1.1.1-src.tar.gz 2394595 SHA256 5355e95edbd5234f57a8748d1417ca346468e5804e44293d2523b57367eb5615 SHA512 64cfc098143c6126f08aa8d8914480609d29bbfe3bf7f7895418df2c5672a2d61b356767bdb6c955e41a0b98c6a7faba9b59737904528f901225ffc3f549c9db WHIRLPOOL d0f871bc13f4450c222f4d60ad8f25fa1ee3d52c8d17698b9433a6857130abdc667d871c283972bd5dc1bd94daf2f569d678f6a94398651665537661ed6b7caa -DIST solarus-1.2.1-src.tar.gz 2421802 SHA256 169e97f5d15e312bca043f5938bccade75924d5fdea8aff5572fd79c6f4c3af7 SHA512 4f1de87449414014f21ccb2a1b902895200161f7a252d874b1c80e015195c1b74bf0a2f4a587e0dca197bb41c73295a106d3f4e10d6f93452ab13fafcdd29b3f WHIRLPOOL 8397377158554d9c398fc91e32663c806ba6c98c1032ff93928c92b069afec3e40c9f6d1030d70f99242138dfb8c2e8f887ccae49afa7ca6d93d90039c16cd5d -DIST solarus-1.3.0-src.tar.gz 2449710 SHA256 d295ebd9c13d7a72a08dd35d76502e1ed5410996d110fc69c070ff67925aaf26 SHA512 0e7a0c62eda9c6002d3058c59dc187bcb232b062ab5c16e858fdc44a0821511368fc59d3666d2a4f8f5541f613b97cb45699540a695c4d6bd59326d610fa911b WHIRLPOOL 915d26be09e6f538abdd5bb2be3023d15311e021253f9b2e1fe8cf07275ea035c319459bc0d39203132d1de7cf51ef66879f12dbabbd6ce6aba2ae083fe4dce4 DIST solarus-1.3.1-src.tar.gz 2450599 SHA256 bfdbd909b817722985393869b1e8c18f18081fd0c68b4c3189c50ef0bbc8f55c SHA512 f52a46add1432a98931db8d26496371b5ff843151c8ac0fdaf1e774be37399d9be6c401f263a65aa08b96f3eebda367b4ccb07ef6cb9740b3112b01e4763556b WHIRLPOOL 67b92a03d2d0a69376f63b9aae3367b97d7d34d40ce3e14d835c34333dc0ec9600bb6ff39f19f31b2861f0b3f790bdb2234bbd7df4b04cca443bb2695a7bcdf6 diff --git a/games-engines/solarus/files/solarus-1.2.1-paths.patch b/games-engines/solarus/files/solarus-1.2.1-paths.patch deleted file mode 100644 index 23b7635a1d0c..000000000000 --- a/games-engines/solarus/files/solarus-1.2.1-paths.patch +++ /dev/null @@ -1,15 +0,0 @@ -From: Julian Ospald -Date: Wed Jan 29 02:31:24 UTC 2014 -Subject: make paths modifiable - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,7 +6,7 @@ - endif() - - set(CMAKE_MODULE_PATH "${SOLARUS_ENGINE_SOURCE_DIR}/cmake/modules/") --set(SOLARUS_INSTALL_DESTINATION "bin") -+set(SOLARUS_INSTALL_DESTINATION "bin" CACHE PATH "binary install destination") - - option(SOLARUS_USE_LUAJIT "Use LuaJIT instead of default Lua (recommended)" ON) - diff --git a/games-engines/solarus/solarus-1.2.1.ebuild b/games-engines/solarus/solarus-1.2.1.ebuild deleted file mode 100644 index 77c68d9ab643..000000000000 --- a/games-engines/solarus/solarus-1.2.1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/solarus/solarus-1.2.1.ebuild,v 1.1 2014/08/07 21:01:19 hasufell Exp $ - -EAPI=5 - -inherit cmake-utils games - -DESCRIPTION="An open-source Zelda-like 2D game engine" -HOMEPAGE="http://www.solarus-games.org/" -SRC_URI="http://www.zelda-solarus.com/downloads/${PN}/${P}-src.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="luajit" - -RDEPEND=" - dev-games/physfs - media-libs/libmodplug - >=media-libs/libsdl2-2.0.1[X,joystick,video] - media-libs/libvorbis - media-libs/openal - media-libs/sdl2-image[png] - >=media-libs/sdl2-ttf-2.0.12 - luajit? ( dev-lang/luajit:2 ) - !luajit? ( dev-lang/lua )" -DEPEND="${RDEPEND}" - -DOCS=( ChangeLog readme.txt ) -PATCHES=( "${FILESDIR}"/${P}-paths.patch ) - -src_prepare() { - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DSOLARUS_INSTALL_DESTINATION="${GAMES_BINDIR}" - $(cmake-utils_use luajit SOLARUS_USE_LUAJIT) - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - prepgamesdirs -} diff --git a/games-engines/solarus/solarus-1.3.0.ebuild b/games-engines/solarus/solarus-1.3.0.ebuild deleted file mode 100644 index a7c8f2f8364a..000000000000 --- a/games-engines/solarus/solarus-1.3.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/solarus/solarus-1.3.0.ebuild,v 1.1 2014/08/24 15:44:26 hasufell Exp $ - -EAPI=5 - -inherit cmake-utils games - -DESCRIPTION="An open-source Zelda-like 2D game engine" -HOMEPAGE="http://www.solarus-games.org/" -SRC_URI="http://www.zelda-solarus.com/downloads/${PN}/${P}-src.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc luajit" - -RDEPEND=" - dev-games/physfs - media-libs/libmodplug - >=media-libs/libsdl2-2.0.1[X,joystick,video] - media-libs/libvorbis - media-libs/openal - media-libs/sdl2-image[png] - >=media-libs/sdl2-ttf-2.0.12 - luajit? ( dev-lang/luajit:2 ) - !luajit? ( dev-lang/lua )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" - -src_prepare() { - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DSOLARUS_INSTALL_DESTINATION="${GAMES_BINDIR}" - $(cmake-utils_use luajit SOLARUS_USE_LUAJIT) - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - if use doc ; then - cd doc || die - doxygen || die - fi -} - -src_install() { - cmake-utils_src_install - doman solarus.6 - use doc && dohtml -r doc/${PV%.*}/html/* - prepgamesdirs -} diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest index 8ab01833a7fb..1b4911213588 100644 --- a/games-fps/doomsday/Manifest +++ b/games-fps/doomsday/Manifest @@ -1,2 +1 @@ DIST doomsday-1.14.5.tar.gz 14081857 SHA256 019cd0cf89e69d80cd8f6fbbd3e3fd57b8ae4d0bcdf4285e8a71caad9f46417e SHA512 f8ecf7d213ab57081858226ab4078fcf8f250271be19a3ce5883c01e53c43b5c0e7afc16085703fe19c0cbccb795c7fd1b651e3efb8a8e854160131c6374cd9a WHIRLPOOL 2351129c6dba951ca4975e6f6e92d78c75ad3e8f9648e9129a9f5a3a22c295b25c4fdb87d5208b2d3fe9c0af94c4ff968730929fbc645da9171018a672cfc60e -DIST doomsday-1.9.8.tar.gz 7048039 SHA256 5401e5d58d197c287f7bc1318ee8429f27a76792ae6f2471c12d10281a569474 SHA512 e264d75e939c501290ae33cd69f4c408c83f57b33bc3c17eba4f7b334b1846d830717395b140a986817ea61dbc2918992b66be9e564b2d04d5eb5046fc3f5a65 WHIRLPOOL 66150a95d1e242b6612f39501d0a699eb194d519223b176fd647a250edf6d28478e0d3d52929f659a6e60a8928b227e38339e12323f48e791001be4e6754f638 diff --git a/games-fps/doomsday/doomsday-1.9.8.ebuild b/games-fps/doomsday/doomsday-1.9.8.ebuild deleted file mode 100644 index 4d82c5a83c6f..000000000000 --- a/games-fps/doomsday/doomsday-1.9.8.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.9.8.ebuild,v 1.9 2014/05/15 16:44:21 ulm Exp $ - -EAPI=4 - -PYTHON_DEPEND="snowberry? 2" - -inherit python confutils eutils qt4-r2 games - -DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen" -HOMEPAGE="http://www.dengine.net/" -SRC_URI="mirror://sourceforge/deng/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="openal snowberry +doom demo freedoom heretic hexen resources" - -DEPEND=" - virtual/opengl - virtual/glu - media-libs/libsdl[joystick,sound] - media-libs/sdl-mixer - media-libs/libpng - dev-qt/qtopengl:4 - dev-qt/qtgui:4 - net-misc/curl - openal? ( media-libs/openal )" -RDEPEND="${DEPEND} - snowberry? ( dev-python/wxpython )" -PDEPEND=" - demo? ( games-fps/doom-data ) - freedoom? ( games-fps/freedoom ) - resources? ( games-fps/doomsday-resources )" - -S=${S}/${PN} - -REQUIRED_USE="demo? ( doom ) freedoom? ( doom ) resources? ( doom )" -PATCHES=( - "${FILESDIR}"/${P}-2to3.patch - "${FILESDIR}"/${P}-openal-64bit-fix.patch -) - -pkg_setup(){ - python_pkg_setup - games_pkg_setup -} - -src_prepare() { - sed -i -e "/^DENG_BASE_DIR =/s:\$\$PREFIX/share:${GAMES_DATADIR}:" config_unix.pri - echo "CONFIG += nostrip" > config_user.pri - echo "PREFIX=/usr/games" >> config_user.pri - use snowberry && \ - echo "CONFIG += deng_snowberry" >> config_user.pri || \ - echo "CONFIG += deng_nosnowberry" >> config_user.pri - - if use openal; then - echo "CONFIG += deng_openal" >> config_user.pri - sed -i 's:\# Generic Unix.:LIBS += -lopenal:' dep_openal.pri || die - epatch "${FILESDIR}"/${P}-openal-link.patch - fi - - qt4-r2_src_prepare -} - -#Usage: doom_make_wrapper [args] -doom_make_wrapper() { - local name=$1 game=$2 icon=$3 de_title=$4 - shift 4 - games_make_wrapper $name \ - "doomsday -game ${game} $@" - make_desktop_entry $name "${de_title}" ${icon} -} - -src_configure() { - qt4-r2_src_configure -} - -src_install() { - qt4-r2_src_install - - mv "${D}/${GAMES_DATADIR}"/{${PN}/data/jdoom,doom-data} || die - dosym "${GAMES_DATADIR}"/doom-data "${GAMES_DATADIR}"/${PN}/data/jdoom || die - - if use snowberry; then - doicon ../snowberry/graphics/snowberry.png - python_convert_shebangs 2 "${D}"/"${GAMES_BINDIR}"/launch-doomsday - make_desktop_entry launch-doomsday "Snowberry DoomsDay" snowberry - fi - - if use doom; then - local res_arg - if use resources; then - res_arg="-def \"${GAMES_DATADIR}\"/${PN}/defs/jdoom/jDRP.ded" - fi - - doicon ../snowberry/graphics/orb-doom.png - doom_make_wrapper jdoom doom1 orb-doom "DoomsDay Engine: Doom 1" "${res_arg}" - elog "Created jdoom launcher. To play Doom place your doom.wad to" - elog "\"${GAMES_DATADIR}\"/doom-data" - elog - - if use demo; then - doom_make_wrapper jdoom-demo doom1-share orb-doom "DoomsDay Engine: Doom 1 Demo" \ - "-iwad \"${GAMES_DATADIR}\"/doom-data/doom1.wad ${res_arg}" - fi - if use freedoom; then - doom_make_wrapper jdoom-freedoom doom1-share orb-doom "DoomsDay Engine: FreeDoom" \ - "-iwad \"${GAMES_DATADIR}\"/doom-data/freedoom/doom1.wad" - fi - fi - if use hexen; then - doicon ../snowberry/graphics/orb-hexen.png - doom_make_wrapper jhexen hexen orb-hexen "DoomsDay Engine: Hexen" - - elog "Created jhexen launcher. To play Hexen place your hexen.wad to" - elog "\"${GAMES_DATADIR}\"/${PN}/data/jhexen" - elog - fi - if use heretic; then - doicon ../snowberry/graphics/orb-heretic.png - doom_make_wrapper jheretic heretic orb-heretic "DoomsDay Engine: Heretic" - - elog "Created jheretic launcher. To play Heretic place your heretic.wad to" - elog "\"${GAMES_DATADIR}\"/${PN}/data/jheretic" - elog - fi - - prepgamesdirs -} diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest index 75f389cd0dde..8a9e76b48018 100644 --- a/games-fps/eduke32/Manifest +++ b/games-fps/eduke32/Manifest @@ -3,6 +3,4 @@ DIST duke3d_mus_3.0.zip 129992841 SHA256 6dc9eb70ee1850519b55e547a399e3f7f03ddf6 DIST duke3d_musopl_2.0.zip 266444907 SHA256 4f0afc46bfb5f38b1a1417a6145c0c548355cf4c4438e0330a9de704b139f1c3 SHA512 e9ae69727f84ff71bf9abffa283fda1fcaf56fd6ae6b865d12f138d64b0fca0d36fd9695b1e60a64716154055373eecd6499ebd8801a4ecb55ddc4722208eff7 WHIRLPOOL b69b76050f97785b54a1693b3f9eeb124b208cb785719c9c37a499a7af8f9cdd2362a7ce0cab81b17a3ab7f80744eadd0a286b45844dee6bf37e0f320d61148a DIST duke3d_xxx_1.33.zip 26586453 SHA256 c31713e6400a175a1bfa3bd369d132f8a8abce8915c113549f98262b9a84b534 SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf WHIRLPOOL 1e7c8a06fd8ff558a8f5a5cc37093fe055555bdfd296194935c986978b4630c225a1f5da7d54e274bd8a5258a4b518ffc2456c79f515185bfb6e403488cad125 DIST eduke32-icons.tar 102400 SHA256 efce5cddd9a55f07824f5739831b79cff2ea6e508f0b17b996316533af925842 SHA512 797f76cfc0e253ce3364e80f70b616fc004811c08519020727871addc90c7780b475ee7769398e13859f93893ccbb916bd4229a39f4c119169a69231e6fd411c WHIRLPOOL 9815abce63dcf8e865c61610f1b04915ced9b29c65cd831022f5b6f261bd55efc700b6fd5ee2741332023b85682b08d3a327998c57be33846dffdcb60eb1339b -DIST eduke32_src_20130317-3572.tar.bz2 10591673 SHA256 082b0676f184ad6fe574925f9be95e31318b9eff38a7117c9d094fb64b57967d SHA512 911c282918ae6173ced1bca3461da69ecb7c5893023dfe9a4d1261fd47b64aba1fcde9514746ae38daabf8ece7739f8e1c9257e68d929ef607bbcff030179e60 WHIRLPOOL 1642facdedd1a8824ac1d453278b3ac6d61d0dfd72210511cf1855bede570bc3111b972f7f6fe984f9aba039f28967e4e546d7e8f53be7e592ce1a8b1f19cef5 -DIST eduke32_src_20130627-3905.tar.bz2 11047453 SHA256 de177c7f064c8fb44b78d31cc4ba35c35b29525bfecee628fe3b171fe7b104c4 SHA512 16ceaf3c6949078a3fcbd66d1e0d5bf9be4ef1c1595fe93b00b7fc7de8c2f329e7f2981976aad8f417d1d6977b30f6176d5f399714771499aeae229db390f483 WHIRLPOOL b83504536ad6dfc70588116b7b91102a0623d149d47b7747dcd5b8b15aa0782a7f28fd757bb63a7a4dd5f2a9468f631b8242f9ec41b637d098aba24019a52a23 DIST eduke32_src_20131119-4169.tar.xz 12228040 SHA256 1aaeadb7b8ac68d6a7e3b0cc568875df6a2b319cc7626c6a4d38cb69fa5f162e SHA512 6ab7babc18c80e111603b9b731f37963f3bfe2ee753a2e383d58a21e77ad5a561cf95f5392adcf76259e6ded2dcd5eb5d0fc484edf65ec6887a746c4f422f292 WHIRLPOOL 576e0f0e73b383fe221ef5db8b54889bf3e8271e361a0af41fd1a914d8a9be3711a9b536d668790013f8fcd0ea3c11b31b47bf333e685bbf853f48152e2fc194 diff --git a/games-fps/eduke32/eduke32-20130317.3572-r1.ebuild b/games-fps/eduke32/eduke32-20130317.3572-r1.ebuild deleted file mode 100644 index 97858cb44aca..000000000000 --- a/games-fps/eduke32/eduke32-20130317.3572-r1.ebuild +++ /dev/null @@ -1,216 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/eduke32/eduke32-20130317.3572-r1.ebuild,v 1.3 2013/04/11 14:16:54 hasufell Exp $ - -# TODO/FIXME: -# lunatic broken -# lunatic? ( >=dev-lang/luajit-2.0.0_beta10:2 ) -# $(usex lunatic "LUNATIC=1" "LUNATIC=0") -# -# extras? ( games-fps/${PN}-extras ) - -EAPI=5 - -inherit eutils gnome2-utils games - -MY_PV=${PV%.*} -MY_BUILD=${PV#*.} - -# extensions -MY_HRP=5.2 -MY_SC55=3.0 -MY_OPL=2.0 -MY_XXX=1.33 - -DESCRIPTION="Port of Duke Nukem 3D for SDL" -HOMEPAGE="http://www.eduke32.com/ http://hrp.duke4.net/" -SRC_URI="http://dukeworld.duke4.net/eduke32/synthesis/${MY_PV}-${MY_BUILD}/${PN}_src_${MY_PV}-${MY_BUILD}.tar.bz2 - http://dev.gentoo.org/~hasufell/distfiles/eduke32-icons.tar - textures? ( http://www.duke4.org/files/nightfright/duke3d_hrp.zip -> duke3d_hrp_${MY_HRP}.zip ) - sc55-musicpack? ( http://www.duke4.org/files/nightfright/music/duke3d_mus.zip -> duke3d_mus_${MY_SC55}.zip ) - opl-musicpack? ( http://www.duke4.org/files/nightfright/music/duke3d_musopl.zip -> duke3d_musopl_${MY_OPL}.zip ) - offensive? ( http://www.duke4.org/files/nightfright/duke3d_xxx.zip -> duke3d_xxx_${MY_XXX}.zip )" - -LICENSE="GPL-2 BUILDLIC textures? ( hrp_art )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cdinstall debug demo gtk offensive +opengl opl-musicpack +png samples sc55-musicpack +server textures tools +vpx" -REQUIRED_USE="vpx? ( opengl ) - textures? ( opengl ) - offensive? ( textures ) - ?? ( opl-musicpack sc55-musicpack )" - -RDEPEND="media-libs/flac - media-libs/libogg - media-libs/libsdl[X,joystick,opengl?,video] - media-libs/libvorbis - media-libs/sdl-mixer[timidity] - sys-libs/zlib - gtk? ( x11-libs/gtk+:2 ) - opengl? ( virtual/glu - virtual/opengl ) - png? ( media-libs/libpng:0= - sys-libs/zlib ) - vpx? ( media-libs/libvpx )" -DEPEND="${RDEPEND} - app-arch/unzip - x86? ( dev-lang/nasm )" -PDEPEND="cdinstall? ( games-fps/duke3d-data ) - demo? ( games-fps/duke3d-demodata )" - -S=${WORKDIR}/${PN}_${MY_PV}-${MY_BUILD} - -src_unpack() { - unpack ${PN}_src_${MY_PV}-${MY_BUILD}.tar.bz2 eduke32-icons.tar - - if use textures; then - unzip -q "${DISTDIR}"/duke3d_hrp_${MY_HRP}.zip "hrp_readme.txt" \ - || die "unzip hrp readme" - if use offensive; then - unzip -q "${DISTDIR}"/duke3d_xxx_${MY_XXX}.zip "xxx_readme.txt" \ - || die "unzip xxx readme" - fi - fi - if use opl-musicpack; then - unzip -q "${DISTDIR}"/duke3d_musopl_${MY_OPL}.zip "readme.txt" \ - || die "unzip musopl readme" - mv readme.txt musopl_readme.txt || die "mv musopl_readme" - elif use sc55-musicpack; then - unzip -q "${DISTDIR}"/duke3d_mus_${MY_SC55}.zip "music_readme.txt" \ - || die "unzip mus readme" - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-QA.patch \ - "${FILESDIR}"/${P}-libpng-1.6.patch - - # Point eduke32 to data files in shared duke3d folder. - # Multiple search paths can be defined, so that with the default configuration as of - # the 20130128 release, this adds /usr/share/games/duke3d in ADDITION to - # /usr/share/games/eduke32 so that eduke32 and duke3d's base data can be kept separate. - # also redirect log file so it's not always written in $PWD - sed -i \ - -e "s;/usr/local/share/games/${PN};${GAMES_DATADIR}/duke3d;" \ - -e "s;mapster32.log;${GAMES_LOGDIR}/mapster32.log;" \ - source/astub.c || die "sed astub.c path update failed" - sed -i \ - -e "s;/usr/local/share/games/${PN};${GAMES_DATADIR}/duke3d;" \ - -e "s;${PN}.log;${GAMES_LOGDIR}/${PN}.log;" \ - source/game.c || die "sed game.c path update failed" -} - -src_compile() { - local MY_OPTS=( - AS=$(type -P nasm) - ARCH= - SYSARCH= - LTO=0 - PRETTY_OUTPUT=0 - RELEASE=1 - LUNATIC=0 - STRIP=touch - LINKED_GTK=1 - CPLUSPLUS=0 - $(usex gtk "WITHOUT_GTK=0" "WITHOUT_GTK=1") - $(usex debug "DEBUGANYWAY=1" "DEBUGANYWAY=0") - $(usex x86 "NOASM=0" "NOASM=1") - $(usex server "NETCODE=1" "NETCODE=0") - $(usex opengl "USE_OPENGL=1 POLYMER=1" "USE_OPENGL=0 POLYMER=0") - $(usex png "USE_LIBPNG=1" "USE_LIBPNG=0") - $(usex vpx "USE_LIBVPX=1" "USE_LIBVPX=0") - ) - - emake ${MY_OPTS[@]} - - if use tools; then - emake -C build ${MY_OPTS[@]} - fi -} - -src_install() { - local ARGS - - newgamesbin ${PN} ${PN}.bin - dogamesbin mapster32 - - if use tools; then - dobin build/{arttool,bsuite,cacheinfo,generateicon,givedepth,kextract,kgroup,kmd2tool,md2tool,mkpalette,transpal,unpackssi,wad2art,wad2map} - dodoc build/doc/*.txt - fi - - insinto "${GAMES_DATADIR}/${PN}" - # Install optional components - if use textures; then - newins "${DISTDIR}"/duke3d_hrp_${MY_HRP}.zip duke3d_hrp.zip - dodoc "${WORKDIR}"/hrp_readme.txt - ARGS+=" -g duke3d_hrp.zip" - - if use offensive; then - newins "${DISTDIR}"/duke3d_xxx_${MY_XXX}.zip duke3d_xxx.zip - dodoc "${WORKDIR}"/xxx_readme.txt - ARGS+=" -g duke3d_xxx.zip" - fi - fi - - if use opl-musicpack; then - newins "${DISTDIR}"/duke3d_musopl_${MY_OPL}.zip duke3d_musopl.zip - dodoc "${WORKDIR}"/musopl_readme.txt - ARGS+=" -g duke3d_musopl.zip" - elif use sc55-musicpack; then - newins "${DISTDIR}"/duke3d_mus_${MY_SC55}.zip duke3d_mus.zip - dodoc "${WORKDIR}"/music_readme.txt - ARGS+=" -g duke3d_mus.zip" - fi - - # Install game data - doins package/{SEHELP.HLP,STHELP.HLP,m32help.hlp,names.h,tiles.cfg} - use samples && doins -r package/samples - - local i - for i in 16 32 128 256 ; do - newicon -s ${i} "${WORKDIR}"/${PN}_${i}x${i}x32.png ${PN}.png - newicon -s ${i} "${WORKDIR}"/mapster32_${i}x${i}x32.png mapster32.png - done - - games_make_wrapper "${PN}" "${GAMES_BINDIR}/${PN}.bin ${ARGS}" - make_desktop_entry ${PN} EDuke32 ${PN} - make_desktop_entry mapster32 Mapster32 mapster32 - - dodoc build/buildlic.txt - - dodir "${GAMES_LOGDIR}" - - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - gnome2_icon_cache_update - - use cdinstall || use demo || { - elog "Note: You must also install the game data files, either manually or with" - elog "games-fps/duke3d-demodata or games-fps/duke3d-data before playing." - } - - einfo - elog "${PN} reads data files from ${GAMES_DATADIR}/duke3d" - einfo - - [[ -e ${ROOT}/${GAMES_LOGDIR} ]] || mkdir -p "${ROOT}/${GAMES_LOGDIR}" - touch "${ROOT}/${GAMES_LOGDIR}"/${PN}.log - touch "${ROOT}/${GAMES_LOGDIR}"/mapster32.log - chown ${GAMES_USER}:${GAMES_GROUP} "${ROOT}/${GAMES_LOGDIR}"/${PN}.log - chown ${GAMES_USER}:${GAMES_GROUP} "${ROOT}/${GAMES_LOGDIR}"/mapster32.log - chmod g+w "${ROOT}/${GAMES_LOGDIR}"/${PN}.log - chmod g+w "${ROOT}/${GAMES_LOGDIR}"/mapster32.log -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-fps/eduke32/eduke32-20130627.3905.ebuild b/games-fps/eduke32/eduke32-20130627.3905.ebuild deleted file mode 100644 index 25645339d2d0..000000000000 --- a/games-fps/eduke32/eduke32-20130627.3905.ebuild +++ /dev/null @@ -1,216 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/eduke32/eduke32-20130627.3905.ebuild,v 1.1 2013/06/28 00:07:21 hasufell Exp $ - -# TODO/FIXME: -# lunatic broken -# lunatic? ( >=dev-lang/luajit-2.0.0_beta10:2 ) -# $(usex lunatic "LUNATIC=1" "LUNATIC=0") -# -# extras? ( games-fps/${PN}-extras ) - -EAPI=5 - -inherit eutils gnome2-utils games - -MY_PV=${PV%.*} -MY_BUILD=${PV#*.} - -# extensions -MY_HRP=5.2 -MY_SC55=3.0 -MY_OPL=2.0 -MY_XXX=1.33 - -DESCRIPTION="Port of Duke Nukem 3D for SDL" -HOMEPAGE="http://www.eduke32.com/ http://hrp.duke4.net/" -SRC_URI="http://dukeworld.duke4.net/eduke32/synthesis/${MY_PV}-${MY_BUILD}/${PN}_src_${MY_PV}-${MY_BUILD}.tar.bz2 - http://dev.gentoo.org/~hasufell/distfiles/eduke32-icons.tar - textures? ( http://www.duke4.org/files/nightfright/duke3d_hrp.zip -> duke3d_hrp_${MY_HRP}.zip ) - sc55-musicpack? ( http://www.duke4.org/files/nightfright/music/duke3d_mus.zip -> duke3d_mus_${MY_SC55}.zip ) - opl-musicpack? ( http://www.duke4.org/files/nightfright/music/duke3d_musopl.zip -> duke3d_musopl_${MY_OPL}.zip ) - offensive? ( http://www.duke4.org/files/nightfright/duke3d_xxx.zip -> duke3d_xxx_${MY_XXX}.zip )" - -LICENSE="GPL-2 BUILDLIC textures? ( hrp_art )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cdinstall debug demo gtk offensive +opengl opl-musicpack +png samples sc55-musicpack +server textures tools +vpx" -REQUIRED_USE="vpx? ( opengl ) - textures? ( opengl ) - offensive? ( textures ) - ?? ( opl-musicpack sc55-musicpack )" - -RDEPEND="media-libs/flac - media-libs/libogg - media-libs/libsdl[X,joystick,opengl?,video] - media-libs/libvorbis - media-libs/sdl-mixer[timidity] - sys-libs/zlib - gtk? ( x11-libs/gtk+:2 ) - opengl? ( virtual/glu - virtual/opengl ) - png? ( media-libs/libpng:0= - sys-libs/zlib ) - vpx? ( media-libs/libvpx )" -DEPEND="${RDEPEND} - app-arch/unzip - x86? ( dev-lang/nasm )" -PDEPEND="cdinstall? ( games-fps/duke3d-data ) - demo? ( games-fps/duke3d-demodata )" - -S=${WORKDIR}/${PN}_${MY_PV}-${MY_BUILD} - -src_unpack() { - unpack ${PN}_src_${MY_PV}-${MY_BUILD}.tar.bz2 eduke32-icons.tar - - if use textures; then - unzip -q "${DISTDIR}"/duke3d_hrp_${MY_HRP}.zip "hrp_readme.txt" \ - || die "unzip hrp readme" - if use offensive; then - unzip -q "${DISTDIR}"/duke3d_xxx_${MY_XXX}.zip "xxx_readme.txt" \ - || die "unzip xxx readme" - fi - fi - if use opl-musicpack; then - unzip -q "${DISTDIR}"/duke3d_musopl_${MY_OPL}.zip "readme.txt" \ - || die "unzip musopl readme" - mv readme.txt musopl_readme.txt || die "mv musopl_readme" - elif use sc55-musicpack; then - unzip -q "${DISTDIR}"/duke3d_mus_${MY_SC55}.zip "music_readme.txt" \ - || die "unzip mus readme" - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-QA.patch - - # Point eduke32 to data files in shared duke3d folder. - # Multiple search paths can be defined, so that with the default configuration as of - # the 20130128 release, this adds /usr/share/games/duke3d in ADDITION to - # /usr/share/games/eduke32 so that eduke32 and duke3d's base data can be kept separate. - # also redirect log file so it's not always written in $PWD - sed -i \ - -e "s;/usr/local/share/games/${PN};${GAMES_DATADIR}/duke3d;" \ - source/common.c || die "sed common.c path update failed" - sed -i \ - -e "/OSD_SetLogFile/s;mapster32.log;${GAMES_LOGDIR}/mapster32.log;" \ - source/astub.c || die "sed astub.c path update failed" - sed -i \ - -e "/OSD_SetLogFile/s;${PN}.log;${GAMES_LOGDIR}/${PN}.log;" \ - source/game.c || die "sed game.c path update failed" -} - -src_compile() { - local MY_OPTS=( - AS=$(type -P nasm) - ARCH= - SYSARCH= - LTO=0 - PRETTY_OUTPUT=0 - RELEASE=1 - LUNATIC=0 - STRIP=touch - LINKED_GTK=1 - CPLUSPLUS=0 - $(usex gtk "WITHOUT_GTK=0" "WITHOUT_GTK=1") - $(usex debug "DEBUGANYWAY=1" "DEBUGANYWAY=0") - $(usex x86 "NOASM=0" "NOASM=1") - $(usex server "NETCODE=1" "NETCODE=0") - $(usex opengl "USE_OPENGL=1 POLYMER=1" "USE_OPENGL=0 POLYMER=0") - $(usex png "USE_LIBPNG=1" "USE_LIBPNG=0") - $(usex vpx "USE_LIBVPX=1" "USE_LIBVPX=0") - ) - - emake ${MY_OPTS[@]} - - if use tools; then - emake -C build ${MY_OPTS[@]} - fi -} - -src_install() { - local ARGS - - newgamesbin ${PN} ${PN}.bin - dogamesbin mapster32 - - if use tools; then - dobin build/{arttool,bsuite,cacheinfo,generateicon,givedepth,kextract,kgroup,kmd2tool,md2tool,mkpalette,transpal,unpackssi,wad2art,wad2map} - dodoc build/doc/*.txt - fi - - insinto "${GAMES_DATADIR}/${PN}" - # Install optional components - if use textures; then - newins "${DISTDIR}"/duke3d_hrp_${MY_HRP}.zip duke3d_hrp.zip - dodoc "${WORKDIR}"/hrp_readme.txt - ARGS+=" -g duke3d_hrp.zip" - - if use offensive; then - newins "${DISTDIR}"/duke3d_xxx_${MY_XXX}.zip duke3d_xxx.zip - dodoc "${WORKDIR}"/xxx_readme.txt - ARGS+=" -g duke3d_xxx.zip" - fi - fi - - if use opl-musicpack; then - newins "${DISTDIR}"/duke3d_musopl_${MY_OPL}.zip duke3d_musopl.zip - dodoc "${WORKDIR}"/musopl_readme.txt - ARGS+=" -g duke3d_musopl.zip" - elif use sc55-musicpack; then - newins "${DISTDIR}"/duke3d_mus_${MY_SC55}.zip duke3d_mus.zip - dodoc "${WORKDIR}"/music_readme.txt - ARGS+=" -g duke3d_mus.zip" - fi - - # Install game data - doins package/{SEHELP.HLP,STHELP.HLP,m32help.hlp,names.h,tiles.cfg} - use samples && doins -r package/samples - - local i - for i in 16 32 128 256 ; do - newicon -s ${i} "${WORKDIR}"/${PN}_${i}x${i}x32.png ${PN}.png - newicon -s ${i} "${WORKDIR}"/mapster32_${i}x${i}x32.png mapster32.png - done - - games_make_wrapper "${PN}" "${GAMES_BINDIR}/${PN}.bin ${ARGS}" - make_desktop_entry ${PN} EDuke32 ${PN} - make_desktop_entry mapster32 Mapster32 mapster32 - - dodoc build/buildlic.txt - - dodir "${GAMES_LOGDIR}" - - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - gnome2_icon_cache_update - - use cdinstall || use demo || { - elog "Note: You must also install the game data files, either manually or with" - elog "games-fps/duke3d-demodata or games-fps/duke3d-data before playing." - } - - einfo - elog "${PN} reads data files from ${GAMES_DATADIR}/duke3d" - einfo - - [[ -e ${ROOT}/${GAMES_LOGDIR} ]] || mkdir -p "${ROOT}/${GAMES_LOGDIR}" - touch "${ROOT}/${GAMES_LOGDIR}"/${PN}.log - touch "${ROOT}/${GAMES_LOGDIR}"/mapster32.log - chown ${GAMES_USER}:${GAMES_GROUP} "${ROOT}/${GAMES_LOGDIR}"/${PN}.log - chown ${GAMES_USER}:${GAMES_GROUP} "${ROOT}/${GAMES_LOGDIR}"/mapster32.log - chmod g+w "${ROOT}/${GAMES_LOGDIR}"/${PN}.log - chmod g+w "${ROOT}/${GAMES_LOGDIR}"/mapster32.log -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-fps/eduke32/files/eduke32-20130317.3572-QA.patch b/games-fps/eduke32/files/eduke32-20130317.3572-QA.patch deleted file mode 100644 index 06f8b87fdc4f..000000000000 --- a/games-fps/eduke32/files/eduke32-20130317.3572-QA.patch +++ /dev/null @@ -1,163 +0,0 @@ -From: Julian Ospald -Date: Sat Feb 2 01:16:21 UTC 2013 -Subject: build system - - respect CC/CXX etc and CFLAGS/CXXFLAGS/LDFLAGS - ---- eduke32_20130201-3453/Makefile -+++ eduke32_20130201-3453/Makefile -@@ -308,10 +308,10 @@ - endif - - COMPILER=$(CC) $(OURCONLYFLAGS) --LINKER=$(L_CC) -+LINKER=$(L_CC) $(OURCFLAGS) $(OURCONLYFLAGS) - ifneq ($(CPLUSPLUS),0) - COMPILER=$(CXX) $(OURCXXFLAGS) -- LINKER=$(L_CXX) -+ LINKER=$(L_CXX) $(OURCXXFLAGS) - endif - - ifeq ($(PRETTY_OUTPUT),1) ---- eduke32_20130201-3453/Makefile.common -+++ eduke32_20130201-3453/Makefile.common -@@ -8,13 +8,14 @@ - PRETTY_OUTPUT ?= 1 - - # Tools --CC=gcc --CXX=g++ --AS=nasm --AR=ar --RC=windres --RANLIB=ranlib --STRIP=strip -+CC ?= gcc -+CXX ?= g++ -+AS ?= nasm -+AR ?= ar -+RC ?= windres -+RANLIB ?= ranlib -+STRIP ?= strip -+PKG_CONFIG ?= pkgconfig - - L_CC=$(CC) - L_CXX=$(CXX) -@@ -152,7 +153,6 @@ - # FORCEWARNINGS - 1 = do not disable any compiler warnings within the source - # KRANDDEBUG - 1 = include logging of krand() calls for debugging the demo system - # EFENCE - 1 = compile with Electric Fence for malloc() debugging --# OPTLEVEL - 0..3 = GCC optimization strategy - # LTO - 1 = enable link-time optimization, for GCC 4.5 and up - # - CPLUSPLUS?=0 -@@ -163,7 +163,6 @@ - FORCEWARNINGS?=0 - EFENCE?=0 - DMALLOC?=0 --OPTLEVEL?=2 - PROFILER?=0 - MUDFLAP?=0 - -@@ -269,11 +268,9 @@ - - # compiler flags etc. - BASECFLAGS= --BASECONLYFLAGS=-Wimplicit -Wdeclaration-after-statement --BASECXXFLAGS= -fno-exceptions -fno-rtti -fpermissive -Wno-write-strings -Wno-narrowing --BASEASFLAGS=-s #-g --BASELDFLAGS= -- -+BASECONLYFLAGS = $(CFLAGS) -std=gnu89 -Wimplicit -Wdeclaration-after-statement -+BASECXXFLAGS = $(CXXFLAGS) -fno-exceptions -fno-rtti -fpermissive -Wno-write-strings -Wno-narrowing -+BASELDFLAGS = $(LDFLAGS) - - ifeq (1,$(strip $(shell expr $(GCC_MAJOR) \>= 4))) - ifeq (1,$(strip $(shell expr $(GCC_MINOR) \>= 1))) -@@ -293,20 +290,8 @@ - endif - - --ifneq ($(RELEASE)$(DEBUGANYWAY),10) -- # debug build or DEBUGANYWAY=1 --> -g flag -- ifneq (0,$(CLANG)) -- debug=-g -- else ifeq ($(PLATFORM), WII) -- debug=-g -- else -- debug=-ggdb -- endif --endif -- - ifneq (0,$(RELEASE)) - # Debugging disabled -- debug+= -O$(OPTLEVEL) - ifeq (0,$(CLANG)) - debug+= -funswitch-loops - ifeq (1,$(strip $(shell expr $(GCC_MAJOR) \< 4))) -@@ -328,9 +313,6 @@ - debug+= -DUSING_LTO -flto - endif - else -- # Debugging enabled -- debug+= -O0 -- - ifeq (0,$(DEBUGANYWAY)) - debug+= -DDEBUGGINGAIDS - else -@@ -411,7 +393,7 @@ - - #### Lunatic development, do not touch! - LUNATIC=0 --LUAJIT=luajit -+LUAJIT=$(shell command -v luajit || command -v luajit-2 || command -v luajit-2.0) - - # for LJ headers: - LUAJIT_WIN_SRC:= g:/mod/luajit-2.0/src -@@ -424,7 +406,7 @@ - ifeq ($(PLATFORM),WINDOWS) - BASECOMMONFLAGS+= -I$(LUAJIT_WIN_SRC) - else -- BASECOMMONFLAGS+= -I/usr/local/include/luajit-2.0 -+ BASECOMMONFLAGS+= $(shell $(PKG_CONFIG) --cflags luajit 2>/dev/null || $(PKG_CONFIG) --cflags luajit-2.0) - endif - BASECOMMONFLAGS+= -I$(SRC)/lunatic -DLUNATIC - -@@ -436,7 +418,7 @@ - ifeq ($(PLATFORM),WINDOWS) - BASELIBS+= -lluajit - else -- BASELIBS+= -lluajit-5.1 -+ BASELIBS+= $(shell $(PKG_CONFIG) --libs luajit 2>/dev/null || $(PKG_CONFIG) --libs luajit-2.0) - endif - endif - ---- eduke32_20130201-3453/build/Makefile -+++ eduke32_20130201-3453/build/Makefile -@@ -166,13 +166,15 @@ - OURCOMMONFLAGS+= $(BUILDCOMMONFLAGS) - - COMPILER=$(CC) $(OURCONLYFLAGS) --LINKER=$(L_CC) -+LINKER=$(L_CC) $(OURCFLAGS) $(OURCONLYFLAGS) - ifneq ($(CPLUSPLUS),0) - COMPILER=$(CXX) $(OURCXXFLAGS) -- LINKER=$(L_CXX) -+ LINKER=$(L_CXX) $(OURCXXFLAGS) - endif - -+ifeq ($(PRETTY_OUTPUT),1) - .SILENT: -+endif - .PHONY: clean cleanutils veryclean all utils dxutils sdlutils printutils printsdlutils printdxutils enginelib editorlib - - # TARGETS -@@ -265,7 +267,7 @@ - if $(LINKER) -o $@ $^ $(OURLDFLAGS) $(UTILLIBS) -I$(SDLROOT)/include -I$(SDLROOT)/include/SDL; then $(ONESTEP_OK); else $(ONESTEP_FAILED); fi - arttool$(EXESUFFIX): $(OBJ)/arttool.$o $(UTILADDOBJS) - $(ONESTEP_STATUS) -- if $(L_CXX) -o $@ $^ $(OURLDFLAGS) $(STATICSTDCPP) $(STDCPPLIB) $(UTILLIBS); then $(ONESTEP_OK); else $(ONESTEP_FAILED); fi -+ if $(L_CXX) $(OURCXXFLAGS) -o $@ $^ $(OURLDFLAGS) $(STATICSTDCPP) $(STDCPPLIB) $(UTILLIBS); then $(ONESTEP_OK); else $(ONESTEP_FAILED); fi - givedepth$(EXESUFFIX): $(OBJ)/givedepth.$o $(UTILADDOBJS) - $(ONESTEP_STATUS) - if $(LINKER) -o $@ $^ $(OURLDFLAGS) $(UTILLIBS); then $(ONESTEP_OK); else $(ONESTEP_FAILED); fi diff --git a/games-fps/eduke32/files/eduke32-20130317.3572-libpng-1.6.patch b/games-fps/eduke32/files/eduke32-20130317.3572-libpng-1.6.patch deleted file mode 100644 index c9eb6448fa38..000000000000 --- a/games-fps/eduke32/files/eduke32-20130317.3572-libpng-1.6.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Julian Ospald -Date: Thu Apr 11 13:31:20 UTC 2013 -Subject: fix compatibility with libpng-1.6 - ---- eduke32_20130317-3572/build/src/engine.c -+++ eduke32_20130317-3572/build/src/engine.c -@@ -8,6 +8,9 @@ - - #define ENGINE - -+#if (PNG_LIBPNG_VER > 10599) -+# include -+#endif - #include "compat.h" - #include "build.h" - #include "pragmas.h" -@@ -16112,7 +16115,11 @@ static int32_t screencapture_png(const c - png_set_filter(png_ptr, PNG_FILTER_TYPE_BASE, PNG_FILTER_VALUE_NONE); - - if (!HICOLOR) -+ #if (PNG_LIBPNG_VER > 10599) -+ palette = (png_colorp)png_malloc(png_ptr, 256*sizeof(png_color)); -+ #else - palette = (png_colorp)png_malloc(png_ptr, 256*png_sizeof(png_color)); -+ #endif - - if (palette) - { -@@ -16129,7 +16136,11 @@ static int32_t screencapture_png(const c - // png_set_gAMA(png_ptr, info_ptr, vid_gamma); // 1.0/vid_gamma ? - // png_set_sRGB(png_ptr, info_ptr, PNG_sRGB_INTENT_SATURATION); // hm... - -+ #if (PNG_LIBPNG_VER > 10599) -+ text = (png_textp)png_malloc(png_ptr, 2*sizeof(png_text)); -+ #else - text = (png_textp)png_malloc(png_ptr, 2*png_sizeof(png_text)); -+ #endif - text[0].compression = PNG_TEXT_COMPRESSION_NONE; - text[0].key = "Title"; - text[0].text = (png_charp)(editstatus ? "Mapster32 screenshot" : "EDuke32 screenshot"); diff --git a/games-fps/eduke32/files/eduke32-20130627.3905-QA.patch b/games-fps/eduke32/files/eduke32-20130627.3905-QA.patch deleted file mode 100644 index 1c73fb63b33a..000000000000 --- a/games-fps/eduke32/files/eduke32-20130627.3905-QA.patch +++ /dev/null @@ -1,160 +0,0 @@ -From: Julian Ospald -Date: Sat Feb 2 01:16:21 UTC 2013 -Subject: build system - - respect CC/CXX etc and CFLAGS/CXXFLAGS/LDFLAGS - ---- eduke32_20130201-3453/Makefile -+++ eduke32_20130201-3453/Makefile -@@ -311,10 +311,10 @@ - endif - - COMPILER=$(CC) $(OURCONLYFLAGS) --LINKER=$(L_CC) -+LINKER=$(L_CC) $(OURCFLAGS) $(OURCONLYFLAGS) - ifneq ($(CPLUSPLUS),0) - COMPILER=$(CXX) $(OURCXXFLAGS) -- LINKER=$(L_CXX) -+ LINKER=$(L_CXX) $(OURCXXFLAGS) - endif - - ifeq ($(PRETTY_OUTPUT),1) ---- eduke32_20130201-3453/Makefile.common -+++ eduke32_20130201-3453/Makefile.common -@@ -8,13 +8,14 @@ - PRETTY_OUTPUT ?= 1 - - # Tools --CC=gcc --CXX=g++ --AS=nasm --AR=ar --RC=windres --RANLIB=ranlib --STRIP=strip -+CC ?= gcc -+CXX ?= g++ -+AS ?= nasm -+AR ?= ar -+RC ?= windres -+RANLIB ?= ranlib -+STRIP ?= strip -+PKG_CONFIG ?= pkgconfig - - L_CC=$(CC) - L_CXX=$(CXX) -@@ -152,7 +153,6 @@ - # FORCEWARNINGS - 1 = do not disable any compiler warnings within the source - # KRANDDEBUG - 1 = include logging of krand() calls for debugging the demo system - # EFENCE - 1 = compile with Electric Fence for malloc() debugging --# OPTLEVEL - 0..3 = GCC optimization strategy - # LTO - 1 = enable link-time optimization, for GCC 4.5 and up - # - CPLUSPLUS?=0 -@@ -166,13 +166,6 @@ - PROFILER?=0 - MUDFLAP?=0 - --# Select the default optimization level for release and debug builds. --ifeq ($(RELEASE),0) -- OPTLEVEL?=0 --else -- OPTLEVEL?=2 --endif -- - ifeq ($(RELEASE),0) - override STRIP= - endif -@@ -275,11 +268,9 @@ - - # compiler flags etc. - BASECFLAGS= --BASECONLYFLAGS=-Wimplicit -Wdeclaration-after-statement --BASECXXFLAGS= -fno-exceptions -fno-rtti -fpermissive -Wno-write-strings --BASEASFLAGS=-s #-g --BASELDFLAGS= -- -+BASECONLYFLAGS = $(CFLAGS) -std=gnu89 -Wimplicit -Wdeclaration-after-statement -+BASECXXFLAGS = $(CXXFLAGS) -fno-exceptions -fno-rtti -fpermissive -Wno-write-strings -Wno-narrowing -+BASELDFLAGS = $(LDFLAGS) - - ifeq (1,$(strip $(shell expr $(GCC_MAJOR) \>= 4))) - ifeq (1,$(strip $(shell expr $(GCC_MINOR) \>= 1))) -@@ -305,20 +296,6 @@ - BASELIBS+= -lvpx - endif - -- --ifneq ($(RELEASE)$(DEBUGANYWAY),10) -- # debug build or DEBUGANYWAY=1 --> -g flag -- ifneq (0,$(CLANG)) -- debug=-g -- else ifeq ($(PLATFORM), WII) -- debug=-g -- else -- debug=-ggdb -- endif --endif -- --debug+= -O$(OPTLEVEL) -- - ifneq (0,$(RELEASE)) - # Debugging disabled - ifeq (0,$(CLANG)) -@@ -424,7 +401,7 @@ - - #### Lunatic development, do not touch! - LUNATIC=0 --LUAJIT=luajit -+LUAJIT=$(shell command -v luajit || command -v luajit-2 || command -v luajit-2.0) - - # for LJ headers: - LUAJIT_WIN_SRC:= g:/mod/luajit-2.0/src -@@ -437,7 +414,7 @@ - ifeq ($(PLATFORM),WINDOWS) - BASECOMMONFLAGS+= -I$(LUAJIT_WIN_SRC) - else -- BASECOMMONFLAGS+= -I/usr/local/include/luajit-2.0 -+ BASECOMMONFLAGS+= $(shell $(PKG_CONFIG) --cflags luajit 2>/dev/null || $(PKG_CONFIG) --cflags luajit-2.0) - endif - BASECOMMONFLAGS+= -I$(SRC)/lunatic -DLUNATIC - -@@ -453,7 +430,7 @@ - ifeq ($(PLATFORM),WINDOWS) - BASELIBS+= -lluajit - else -- BASELIBS+= -lluajit-5.1 -+ BASELIBS+= $(shell $(PKG_CONFIG) --libs luajit 2>/dev/null || $(PKG_CONFIG) --libs luajit-2.0) - endif - endif - ---- eduke32_20130201-3453/build/Makefile -+++ eduke32_20130201-3453/build/Makefile -@@ -167,13 +167,15 @@ - OURCOMMONFLAGS+= $(BUILDCOMMONFLAGS) - - COMPILER=$(CC) $(OURCONLYFLAGS) --LINKER=$(L_CC) -+LINKER=$(L_CC) $(OURCFLAGS) $(OURCONLYFLAGS) - ifneq ($(CPLUSPLUS),0) - COMPILER=$(CXX) $(OURCXXFLAGS) -- LINKER=$(L_CXX) -+ LINKER=$(L_CXX) $(OURCXXFLAGS) - endif - --.SILENT: -+ifeq ($(PRETTY_OUTPUT),1) -+ .SILENT: -+endif - .PHONY: clean cleanutils veryclean all utils dxutils sdlutils printutils printsdlutils printdxutils enginelib editorlib - - # TARGETS -@@ -266,7 +268,7 @@ - if $(LINKER) -o $@ $^ $(OURLDFLAGS) $(UTILLIBS) -I$(SDLROOT)/include -I$(SDLROOT)/include/SDL; then $(ONESTEP_OK); else $(ONESTEP_FAILED); fi - arttool$(EXESUFFIX): $(OBJ)/arttool.$o $(UTILADDOBJS) - $(ONESTEP_STATUS) -- if $(L_CXX) -o $@ $^ $(OURLDFLAGS) $(STATICSTDCPP) $(STDCPPLIB) $(UTILLIBS); then $(ONESTEP_OK); else $(ONESTEP_FAILED); fi -+ if $(L_CXX) $(OURCXXFLAGS) -o $@ $^ $(OURLDFLAGS) $(STATICSTDCPP) $(STDCPPLIB) $(UTILLIBS); then $(ONESTEP_OK); else $(ONESTEP_FAILED); fi - givedepth$(EXESUFFIX): $(OBJ)/givedepth.$o $(UTILADDOBJS) - $(ONESTEP_STATUS) - if $(LINKER) -o $@ $^ $(OURLDFLAGS) $(UTILLIBS); then $(ONESTEP_OK); else $(ONESTEP_FAILED); fi diff --git a/games-fps/etqw-demo/etqw-demo-2.0_p1.ebuild b/games-fps/etqw-demo/etqw-demo-2.0_p1.ebuild deleted file mode 100644 index 401b6ed1a979..000000000000 --- a/games-fps/etqw-demo/etqw-demo-2.0_p1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/etqw-demo/etqw-demo-2.0_p1.ebuild,v 1.5 2013/03/29 16:08:35 hasufell Exp $ - -inherit unpacker eutils versionator games - -MY_MAJOR=$(get_major_version) -MY_REV=$(get_version_component_range 3) -MY_BODY="ETQW-demo${MY_MAJOR}-client-full.r${MY_REV/p/}.x86" - -DESCRIPTION="Enemy Territory: Quake Wars demo" -HOMEPAGE="http://zerowing.idsoftware.com/linux/etqw/" -SRC_URI="mirror://idsoftware/etqw/${MY_BODY}.run" - -# See copyrights.txt -LICENSE="ETQW" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RESTRICT="strip mirror" - -DEPEND="app-arch/unzip" -RDEPEND="virtual/opengl - x86? ( - media-libs/libsdl - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext ) - amd64? ( >=app-emulation/emul-linux-x86-sdl-20071114 )" - -S=${WORKDIR} -dir=${GAMES_PREFIX_OPT}/${PN} - -QA_PREBUILT="${dir:1}/guis/libmojosetupgui_ncurses.so - ${dir:1}/data/* - ${dir:1}/data/pb/*.so" - -src_unpack() { - # exit status of 1 should just be warnings, not corrupt archive - unpack_zip ${A} -} - -src_install() { - insinto "${dir}" - doins -r * || die "doins" - - cd data - exeinto "${dir}"/data - doexe etqw *.x86 etqw-* lib* *.sh || die "doexe" - - games_make_wrapper ${PN} ./etqw.x86 "${dir}"/data "${dir}"/data - # Matches with desktop entry for enemy-territory-truecombat - make_desktop_entry ${PN} "Enemy Territory - Quake Wars (Demo)" - - games_make_wrapper ${PN}-ded ./etqwded.x86 "${dir}"/data "${dir}"/data - - prepgamesdirs -} diff --git a/games-fps/quake3-excessiveplus/Manifest b/games-fps/quake3-excessiveplus/Manifest index 20649921168a..676ed7098986 100644 --- a/games-fps/quake3-excessiveplus/Manifest +++ b/games-fps/quake3-excessiveplus/Manifest @@ -1,2 +1 @@ -DIST xp-1.03-full.zip 13903822 SHA256 a0e40e6151ba22cdacc551571a1ccb2dc494e41252e850423507d4b75967ee65 SHA512 66c14ae7d65822b0eb2fa6402cc28bb2d9a83f86d8efc996f01634042f7c08d75fd62019c4c64621e4e86cd6a342a34b1157fc99b3015a60462f0ef9574b2b43 WHIRLPOOL 023cd0eb8507fe65f80ae03618cc59f036c89fd1c42c05df1c97917642a850dc0946eafa1a5135adb4333e7922ca8e02462647e7dea330770941327482f94b1f DIST xp-2.2b.zip 19810680 SHA256 4a041f4b84dae4b50707f9069eb0c59b4af00e53bcecd7d0f01087398a165b55 SHA512 b7f702b5ce0b0c39ae0db9414ae54aaec7cf0a80cc39604e8ebd14eae56a982f438196488d1c1cc559c6d36c36c8c0e1b695658f974c196c95bba2274063f343 WHIRLPOOL 377c08cde0d52e8272811c93e3fd00abf531adae20340a811aa8bb376694ea6363f370eba1d94f2d2b342041394eebbe86b8bd7c06381d7ebe1ee88ce8200c5d diff --git a/games-fps/quake3-excessiveplus/quake3-excessiveplus-1.03.ebuild b/games-fps/quake3-excessiveplus/quake3-excessiveplus-1.03.ebuild deleted file mode 100644 index 66ac71087172..000000000000 --- a/games-fps/quake3-excessiveplus/quake3-excessiveplus-1.03.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-excessiveplus/quake3-excessiveplus-1.03.ebuild,v 1.4 2014/04/18 07:08:54 ulm Exp $ - -EAPI=2 - -MOD_DESC="modification making the weapons much faster and stronger" -MOD_NAME="Excessive Plus" -MOD_DIR="excessiveplus" -MOD_ICON="excessiveplus.ico" - -inherit games games-mods - -HOMEPAGE="http://www.excessiveplus.net/" -SRC_URI="http://www.excessiveplus.net/downloads/xp-${PV}-full.zip" - -LICENSE="all-rights-reserved" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="dedicated opengl" - -src_prepare() { - rm -f *.bat - rm -rf ${MOD_DIR}/tools -} diff --git a/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57.ebuild b/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57.ebuild deleted file mode 100644 index b19d08fb3aa7..000000000000 --- a/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57.ebuild,v 1.10 2012/12/28 20:28:30 tupone Exp $ -EAPI=5 -inherit eutils unpacker games - -MY_PN=${PN/soldieroffortune/sof} - -DESCRIPTION="First-person shooter based on the mercenary trade" -HOMEPAGE="http://www.lokigames.com/products/sof/" -SRC_URI="mirror://lokigames/loki_demos/${MY_PN}.run" - -LICENSE="LOKI-EULA" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RESTRICT="strip" - -DEPEND="games-util/loki_patch" -RDEPEND="virtual/opengl - x86? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXau - x11-libs/libXdmcp - media-libs/libvorbis - media-libs/libogg - media-libs/smpeg ) - amd64? ( - app-emulation/emul-linux-x86-baselibs - app-emulation/emul-linux-x86-xlibs - app-emulation/emul-linux-x86-sdl - app-emulation/emul-linux-x86-soundlibs )" - -S=${WORKDIR} - -dir=${GAMES_PREFIX_OPT}/${PN} -Ddir=${D}/${dir} -QA_PREBUILT="${dir:1}/* ${dir:1}/base/*so" - -src_install() { - local demo="data/demos/sof_demo" - local exe="sof-bin.x86" - - loki_patch patch.dat data/ || die "loki patch failed" - - insinto "${dir}" - exeinto "${dir}" - doins -r "${demo}"/* - doexe "${demo}/${exe}" - - # Replace bad library - dosym /usr/$(use amd64 && echo lib32 || echo lib)/libSDL.so "${dir}"/libSDL-1.1.so.0 - - games_make_wrapper ${PN} "./${exe}" "${dir}" "${dir}" - newicon "${demo}"/launch/box.png ${PN}.png - make_desktop_entry ${PN} "Soldier of Fortune (Demo)" - - prepgamesdirs -} diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest index 17e4659eeb94..6f5325146f1f 100644 --- a/games-fps/urbanterror/Manifest +++ b/games-fps/urbanterror/Manifest @@ -3,9 +3,6 @@ DIST UrbanTerror-4.2.018-to-4.2.019.zip 220929569 SHA256 79f1bd49cc7c84fc7d24d72 DIST UrbanTerror-4.2.019-to-4.2.020.zip 11159789 SHA256 fef6c8d096912d79aee4bf8fb5d68db0c7a39c97df112190aa68e8f0ce8c5e27 SHA512 59efb23b92926b5649c324d2b4a203b4caf1b77e4d40816a49abcbc9ae92d0206123034676470bc0eab1bea62e7d384dfa566b699e9e9ffacedad0fd3900e4e8 WHIRLPOOL f7b679fca1ed15628f1cdf9d3632ffb8f37b09f1b3e095598ee3d49e119964157836650c9eaacbae7b9bc95e570556a983efee180172a1e714c9121579ccbc11 DIST UrbanTerror-4.2.020-to-4.2.021.zip 11984899 SHA256 054437b0da8e71bbaa2d964627dd41837add365116708a29a1ae481284df17f7 SHA512 9c8774d7e6e0317f8381130870a69aecefcd9d929525d0029ed9c5dc93d19fe3f85857d0c7bc9be64e936a061b2f30a242b685df27961175670eb29a0b3b6370 WHIRLPOOL a9fee3c0fda7f688c8c5664c82e6e2a4542d1496c72ff8cd572d238fa0af63fc398b9005de54093e07781abacc678c3df4cf725b348d01d1fca59fdb4f0fcb58 DIST UrbanTerror42_full017.zip 1701599483 SHA256 d7849509c91c11e986ef6d47f51e7711ec53100ff42bef44095c32d91c65d7c2 SHA512 5363a21d6e21090a823eb21b82ac089640602151292f2985b6d26fc061e891e3bcadc5b0d4751f829cf6b9fe664bc619706e0e008210734bc1ef6afea3d46f96 WHIRLPOOL ee7553949f882c795eadc36dba57c923d3c49bc768aac128bfaae999bf9466c551df71946a9e8856210e5dea42c32887cb96d30f1339bba117bf9ee0c35c7edd -DIST UrbanTerror_41_FULL.zip 754307397 SHA256 5706957783d0e4e77fcc4bbbc2df83aefc0f9a6388f6a63b60947e84f9ed265f SHA512 4ff729df5472b9bd3138e62fe2e03c794dd9293ba08106c026a120d6c9971ea2420c3e81abb99e2b2ae8a082a07e96468154958b36a770cce0e931f9a499e623 WHIRLPOOL 4752ff4455d2c69fcc732ee4035b097aed852e55bf1077c59e650297f69b87ea59ff53573b653f22843ffe7fe35e524eb66f1033049dcc364ca554bf875dad18 -DIST ioq3-1807-urt-251210-git-nobumpy.tar.xz 276824 SHA256 9f14d629f2a9c8fe0a593b5a08d1ceadec6a22c387806d9e5f50e22a537c2b74 SHA512 e190f60d9c3275d285c75ba2947734cf9f555d373618a37f3b38464d10fa85a4af6460918676b18a96885fe7280c856f6c9877175dbbe82929f5f7c1704fc6a3 WHIRLPOOL 104960ca4066726cdd5dbd0d4d93998e6fc648c4e969109b3a1634232f6d4e3556c3107dd0f78860444ed3635bd3f4a979cb67d90a650b1dd8f51175b9b8e10d -DIST ioquake3-1807.tar.bz2 7054317 SHA256 10d3fcee3cf41a063e686048740417c8d58496f3dff5745f897a8803318850c2 SHA512 5fe54b628c66bd8becab259d133825e762a0814c7060c8d1f48e2b662f07f80e50fba8c7ae0677b02e231eae59eba65e143eb802baa79a7de89a7a612ae9682d WHIRLPOOL 03ed102b386b33ceff1588966409f1d4c6be1d980b40cac0eda1d2a7e763e45b3cd21a9817f77d60157cf741f4d7479926aac118f5972bb7d5fd6bc72517faa8 DIST urbanterror-4.2.018.tar.gz 10752968 SHA256 c1fb3eb3a1e526247352b1c6abb5432b8a9b8730731ef917e4e5d21a152fb494 SHA512 b6d306cbfeedefcc85e70a50c04e92cb509fb7e0d9b9c32dd77e287c916daa686eae3a6da8e4a9b9ad1b65b5268799ef8beb4f987b687bb5fcc05ef348872dfb WHIRLPOOL 3635c54c0e7a401d1685e6b65b2fd5afa00f3bdc86fc587b25b78be72715a318d2d2f28fe6e92b67f98b352296f5c5f79cc54688e5fd17d0ff0e3efb3f685cd0 DIST urbanterror-4.2.021.tar.gz 12634447 SHA256 47f37bd6c98b1771be204484a93705f22e3f085aa81c63f6269953d092b88236 SHA512 914cd7020b8914ca8b62a9d121dd7895dfaa733ff6acdca93f0737a2c8e1ddb73f9ac47935af67416e32ad9ca68095819b9d84e1a6014abc7331e85c99dc79ed WHIRLPOOL 2c465c676c2c10019468cee75b7cd69803c9b1dbbabe186f762d3471f3d3d4c31d43fd1ff4e30214a8dd4044f339727222af04ab0b8d811f2c5af52cbf6f029c DIST urbanterror.svg 1592 SHA256 0d7eb12a8fe8380e0d89199621414dd56ecdfe8a8b99eec5b95d925294521de9 SHA512 ff789b35d9b1a2282485495b0d1918c7169906aeac094e7a33c7d77cd51d4787733400e1b9851ce19b38e886508d5fdd09f6cfc96b37a5b41bd0cf403e456b98 WHIRLPOOL 281413cfeb881466c2d8b882d0aa4dcf19013630a462775345c69e78a0cb86c7efed14f5d22b453c89648da682ab5e98e3579a1c975994a8e90b9fb22c37892c diff --git a/games-fps/urbanterror/files/urbanterror-4.1.1-build.patch b/games-fps/urbanterror/files/urbanterror-4.1.1-build.patch deleted file mode 100644 index 266e341d44ec..000000000000 --- a/games-fps/urbanterror/files/urbanterror-4.1.1-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -applied on top of ioq3-1807-urt-251210-git-nobumpy.patch - ---- Makefile -+++ Makefile -@@ -242,7 +242,7 @@ - CURL_LIBS=$(shell pkg-config --silence-errors --libs libcurl) - OPENAL_CFLAGS=$(shell pkg-config --silence-errors --cflags openal) - OPENAL_LIBS=$(shell pkg-config --silence-errors --libs openal) -- SDL_CFLAGS=$(shell pkg-config --silence-errors --cflags sdl|sed 's/-Dmain=SDL_main//') -+ SDL_CFLAGS=$(shell pkg-config --silence-errors --cflags freetype2 sdl|sed 's/-Dmain=SDL_main//') - SDL_LIBS=$(shell pkg-config --silence-errors --libs sdl) - endif - # Use sdl-config if all else fails -@@ -305,9 +305,9 @@ - endif - - BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ -- -pipe -DUSE_ICON -+ -DUSE_ICON - CLIENT_CFLAGS = $(SDL_CFLAGS) -- SERVER_CFLAGS = -+ SERVER_CFLAGS = $(shell pkg-config --silence-errors --cflags sdl|sed 's/-Dmain=SDL_main//') - - ifeq ($(USE_OPENAL),1) - CLIENT_CFLAGS += -DUSE_OPENAL diff --git a/games-fps/urbanterror/files/urbanterror-4.1.1-minizip.patch b/games-fps/urbanterror/files/urbanterror-4.1.1-minizip.patch deleted file mode 100644 index 14a5fe3efb50..000000000000 --- a/games-fps/urbanterror/files/urbanterror-4.1.1-minizip.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- code/qcommon/files.c -+++ code/qcommon/files.c -@@ -31,7 +31,7 @@ - - #include "q_shared.h" - #include "qcommon.h" --#include "unzip.h" -+#include - - extern cvar_t *com_quiet; - ---- Makefile -+++ Makefile -@@ -1001,7 +1001,7 @@ - else - LIBS += -lz - endif -- -+LIBS += -lz -lminizip - ifdef DEFAULT_BASEDIR - BASE_CFLAGS += -DDEFAULT_BASEDIR=\\\"$(DEFAULT_BASEDIR)\\\" - endif -@@ -1498,8 +1498,6 @@ - $(B)/client/q_math.o \ - $(B)/client/q_shared.o \ - \ -- $(B)/client/unzip.o \ -- $(B)/client/ioapi.o \ - $(B)/client/puff.o \ - $(B)/client/vm.o \ - $(B)/client/vm_interpreted.o \ -@@ -1790,8 +1778,6 @@ - $(B)/ded/q_math.o \ - $(B)/ded/q_shared.o \ - \ -- $(B)/ded/unzip.o \ -- $(B)/ded/ioapi.o \ - $(B)/ded/vm.o \ - $(B)/ded/vm_interpreted.o \ - \ diff --git a/games-fps/urbanterror/urbanterror-4.1.1.ebuild b/games-fps/urbanterror/urbanterror-4.1.1.ebuild deleted file mode 100644 index b261f048d4be..000000000000 --- a/games-fps/urbanterror/urbanterror-4.1.1.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.1.1.ebuild,v 1.9 2013/09/01 21:16:44 hasufell Exp $ - -EAPI=4 - -inherit eutils gnome2-utils games - -MY_PV=${PV//./} -IOQ3_SVN=1807 -IOQ3_PATCH=ioq3-${IOQ3_SVN}-urt-251210-git-nobumpy - -DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine" -HOMEPAGE="http://www.urbanterror.info/home/" -SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/ioquake3-${IOQ3_SVN}.tar.bz2 - http://dev.gentoo.org/~hasufell/distfiles/${IOQ3_PATCH}.tar.xz - ftp://ftp.snt.utwente.nl/pub/games/${PN}/old/UrbanTerror_${MY_PV:0:2}_FULL.zip - http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> ${PN}.svg" - -LICENSE="GPL-2 Q3AEULA-20000111 urbanterror-4.1-maps" -SLOT="0" -KEYWORDS="-* amd64 x86" -IUSE="+curl dedicated openal server speex vorbis" -RESTRICT="mirror" - -RDEPEND=" - sys-libs/zlib[minizip] - !dedicated? ( - media-libs/ftgl - media-libs/freetype - media-libs/libsdl[X,opengl] - virtual/opengl - curl? ( net-misc/curl ) - openal? ( media-libs/openal ) - speex? ( media-libs/speex ) - vorbis? ( media-libs/libogg media-libs/libvorbis ) - )" -# server target needs libsdl and some -# other headers for build-time -# added them for dedicated useflag -DEPEND="${RDEPEND} - app-arch/unzip - virtual/pkgconfig - dedicated? ( - media-libs/libsdl - curl? ( net-misc/curl ) - speex? ( media-libs/speex ) - )" - -S=${WORKDIR}/ioquake3 - -src_prepare() { - epatch "${FILESDIR}"/${P}-minizip.patch \ - "${WORKDIR}"/${IOQ3_PATCH}.patch \ - "${FILESDIR}"/${P}-build.patch - - # unbundle - rm -r code/zlib || die - rm code/qcommon/unzip.{c,h} || die - rm code/qcommon/ioapi.{c,h} || die - rm -r code/{FTGL,FT2,SDL12,libs/win32} || die - - # set svn version - sed \ - -e 's/SVN_REV=$(shell LANG=C svnversion .)/SVN_REV='${IOQ3_SVN}'M/' \ - -i Makefile || die "setting svn version failed" - - # fix case sensitivity - mv "${WORKDIR}/UrbanTerror/q3ut4/demos/tutorial.dm_68" \ - "${WORKDIR}/UrbanTerror/q3ut4/demos/TUTORIAL.dm_68" || die -} - -src_compile() { - buildit() { use $1 && echo 1 || echo 0 ; } - nobuildit() { use $1 && echo 0 || echo 1 ; } - - emake \ - ARCH=$(usex amd64 "x86_64" "i386") \ - DEFAULT_BASEDIR="${GAMES_DATADIR}/${PN}" \ - BUILD_CLIENT=$(nobuildit dedicated) \ - BUILD_CLIENT_SMP=$(nobuildit dedicated) \ - BUILD_SERVER=$(usex dedicated "1" "$(buildit server)") \ - USE_CODEC_VORBIS=$(buildit vorbis) \ - USE_VOIP=$(buildit speex) \ - USE_OPENAL=$(buildit openal) \ - USE_CURL=$(buildit curl) \ - USE_INTERNAL_SPEEX=0 \ - USE_INTERNAL_ZLIB=0 \ - USE_LOCAL_HEADERS=0 \ - OPTIMIZEVM="" \ - Q="" \ - release -} - -src_install() { - local my_arch=$(usex amd64 "x86_64" "i386") - - doicon -s scalable "${DISTDIR}"/${PN}.svg - - dodoc ChangeLog NOTTODO README TODO {md4,voip}-readme.txt - - insinto "${GAMES_DATADIR}"/${PN}/q3ut4 - doins -r "${WORKDIR}"/UrbanTerror/q3ut4/{*.pk3,demos/,description.txt} - - if use !dedicated ; then - newgamesbin build/release-linux-${my_arch}/ioquake3-smp.${my_arch} ${PN} - make_desktop_entry ${PN} "UrbanTerror" - fi - - if use dedicated || use server ; then - newgamesbin build/release-linux-${my_arch}/ioq3ded.${my_arch} ${PN}-dedicated - newins "${WORKDIR}"/UrbanTerror/q3ut4/mapcycle.txt mapcycle.txt.example - newins "${WORKDIR}"/UrbanTerror/q3ut4/server.cfg q3config_server.cfg.example - fi - - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-fps/ut2004-crossfire/Manifest b/games-fps/ut2004-crossfire/Manifest index 915ce7db6587..c64cc1897055 100644 --- a/games-fps/ut2004-crossfire/Manifest +++ b/games-fps/ut2004-crossfire/Manifest @@ -1,2 +1 @@ -DIST TOCrossfire_beta_1.93_full.zip 1001223106 RMD160 d7a74165295870d0ea8f3a4031581ac8c4d3caf9 SHA1 dfea2107b642769fed85ba84d4b73e09b2fdb8ba SHA256 8d0f9f890155cc88b40f4f7a2578bbe35d6fd7783cf4e9bd1dad176dfd6636ab -DIST TOCrossfire_beta_1.95_full.zip 1243833907 RMD160 ed3313b4677dff5536d9883fbed5cd3dceb2436c SHA1 349a6ea37eb358b62fc55d3ecb40949777ebf231 SHA256 67d9ec864d0ff2303edb003a6eeebf015143d61999640074c4bd5b205f216d3c +DIST TOCrossfire_beta_1.95_full.zip 1243833907 SHA256 67d9ec864d0ff2303edb003a6eeebf015143d61999640074c4bd5b205f216d3c diff --git a/games-fps/ut2004-crossfire/ut2004-crossfire-1.93.ebuild b/games-fps/ut2004-crossfire/ut2004-crossfire-1.93.ebuild deleted file mode 100644 index bfcc63148d4d..000000000000 --- a/games-fps/ut2004-crossfire/ut2004-crossfire-1.93.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-crossfire/ut2004-crossfire-1.93.ebuild,v 1.2 2009/10/10 02:21:18 nyhm Exp $ - -EAPI=2 - -MOD_NAME="Crossfire" -MOD_DESC="Special Forces vs Terrorists" -MOD_DIR="TOCrossfire" -MOD_ICON="Help/icons/TOC_TERROR2.png" - -inherit games games-mods - -HOMEPAGE="http://www.to-crossfire.net/" -SRC_URI="ftp://to-crossfire.speicherland.com/TOC/client/TOCrossfire_beta_${PV}_full.zip - http://www.to-crossfire.org/mirrors/client/TOCrossfire_beta_${PV}_full.zip" - -# See Help/EULA.txt -LICENSE="free-noncomm" -KEYWORDS="~amd64 ~x86" -IUSE="dedicated opengl" - -src_unpack() { - unpack ${A} - unpack ./TOCinstall.tgz -} - -src_prepare() { - rm -f *.{exe,reg,sh,tgz,txt} - rm -rf TOCInstaller.app stuff - cd ${MOD_DIR} || die - rm -f *.{bat,exe} Help/*.{exe,zip} -} diff --git a/games-misc/dont-starve/Manifest b/games-misc/dont-starve/Manifest index 51014baabf74..6291cef40b65 100644 --- a/games-misc/dont-starve/Manifest +++ b/games-misc/dont-starve/Manifest @@ -1,4 +1,2 @@ -DIST dontstarve_x32_1383879308.tar.gz 169762365 SHA256 2347ec3b1d13b41f2718363e4ef9dca93b9072a3b17b077f5f44a1f78eda3ee5 SHA512 1781eed2f4e0d4f68540caf2fc7393afae314b7a36168bb97f5fcc773b57814f16066fba92a7bc71acdc6d5b3bcc3907044bccbcb3bf9e71d64fcce921b798f5 WHIRLPOOL a18be28fe415c16ab5b12b5ce12a0fcd0de4f6e4bbe0e8b27485cdf865d1c5f30c2ff522832d90ed4e9b1cf75bfb9beecd36c67c0db16f66c1ec4697c59a3f27 DIST dontstarve_x32_july21.tar.gz 174752315 SHA256 b1eb38a7cb7179b8db7d81c5070737a4acbaf1a9473912cb1bcb5c2ec784304b SHA512 d508989e6c2fe0fceb4706250c8f222acdf5a52492fa2dafa8baab25f98a029658631789cce5164f43c6e5ed529f2cf490fea321635e4077f54f09907071e921 WHIRLPOOL 18f8ee5a44c2984db86ae60bd99fc61ad87cc99890629a36c5d15a046bbd557854c1f9591b936b8bf9fc9d2248132439b8e236ded60e359a599d8cdac0770677 -DIST dontstarve_x64_1383879308.tar.gz 170340937 SHA256 257c02143d6c43a128cd4f2d28ee66fd9ea7206dc616a2185af218d35fe6cb0f SHA512 d9032495ec1b8769c9e7e0cd148c8f721772e5957add763d4f3b7fa42ac5d7c946e5f2e4234862f562a5e80fe5c3f98c9d64addc36ba389473f3269bcb98a40f WHIRLPOOL 897fcaf6e63283dbb045b3e39322cb85f26ceaacd73ade1c50c5f4f34e821b9152f82fffb9728bd9f6404d4ccf6ab8fb8a0050792424397761aedb7e5640da57 DIST dontstarve_x64_july21.tar.gz 175302157 SHA256 3a3297ca6bada9c55bafe568085e75a9790f796aa7711726346d571ac40e25e6 SHA512 ef10acd493544f064fcd12868a47e650cd09f66318d57eaa994c4866c808ede4504f9e55933be66f7fad7783e72c91043c4b884970e7b80f8ea45f814828c752 WHIRLPOOL fe19306b8e220f6680d1ffaf089eb8a643f789a0e165979cf0d1f93e111f7c1e6675ffb4340496fe5ca35c263bce5af87b467cf5c2fe35d1ad64755ae311b469 diff --git a/games-misc/dont-starve/dont-starve-1.ebuild b/games-misc/dont-starve/dont-starve-1.ebuild deleted file mode 100644 index da8a8fe1b85d..000000000000 --- a/games-misc/dont-starve/dont-starve-1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-misc/dont-starve/dont-starve-1.ebuild,v 1.2 2013/12/01 23:08:40 hasufell Exp $ - -EAPI=5 - -inherit eutils games - -DESCRIPTION="Wilderness survival game full of science and magic" -HOMEPAGE="http://www.dontstarvegame.com/" -SRC_URI="amd64? ( dontstarve_x64_1383879308.tar.gz ) - x86? ( dontstarve_x32_1383879308.tar.gz )" - -LICENSE="all-rights-reserved" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RESTRICT="fetch bindist splitdebug" - -MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN} -QA_PREBUILT="${MYGAMEDIR#/}/bin/dontstarve" -if [[ $ARCH == amd64 ]] ; then - QA_PREBUILT="${QA_PREBUILT} - ${MYGAMEDIR#/}/bin/lib64/*" -elif [[ ${ARCH} == x86 ]] ; then - QA_PREBUILT="${QA_PREBUILT} - ${MYGAMEDIR#/}/bin/lib32/*" -fi - -RDEPEND="net-misc/curl - virtual/opengl" - -S=${WORKDIR}/dontstarve - -pkg_nofetch() { - einfo - einfo "Please buy & download \"${SRC_URI}\" from:" - einfo " ${HOMEPAGE}" - einfo "and move/link it to \"${DISTDIR}\"" - einfo -} - -src_install() { - local libdir=lib$(usex amd64 "64" "32") - - insinto "${MYGAMEDIR}" - doins -r data mods - - exeinto "${MYGAMEDIR}"/bin - doexe bin/dontstarve - exeinto "${MYGAMEDIR}"/bin/${libdir} - doexe bin/${libdir}/libfmod* - # unbundling libsdl2 breaks the menu, so you cannot start the game - doexe bin/${libdir}/libSDL2* - - games_make_wrapper ${PN} "./dontstarve" "${MYGAMEDIR}/bin" "${MYGAMEDIR}/bin/${libdir}" - make_desktop_entry ${PN} - - doicon dontstarve.xpm - - prepgamesdirs -} diff --git a/games-misc/katawa-shoujo/Manifest b/games-misc/katawa-shoujo/Manifest index 2937f4f37667..5565ef158d17 100644 --- a/games-misc/katawa-shoujo/Manifest +++ b/games-misc/katawa-shoujo/Manifest @@ -1,5 +1,3 @@ -DIST katawa-shoujo-1.0.tar.bz2 476084998 SHA256 7c39ff74fd47f235bf9c9ad3440b3c5c45e63f8d7aa8069ae49dd3acdfd7477a SHA512 737d5ccffe5977c6d7dddc6b4f3cac2e059b39cb8c981239c4c64046f0d718b5f58964a7ba277968d4857db2e4ab67c3ac8b1befa5c1ca560ade6fdce8fea857 WHIRLPOOL 84df55dfbe12792ea9d7a6890e5de56d8765b9c21410ae64374560623a410d18f1d8ecc55fed4bcd5b619613a6f08ca5be3741559584ffd883bccd2ed83a04d1 -DIST katawa-shoujo-1.1.tar.bz2 478871887 SHA256 3770e778892302e1ba19930b48481981492f4cac6d18acbb736b8d58444b0585 SHA512 86ad48d7943ddf9dd4e7fde9ffaaf26dddc98793f6e4234789da3f94b986cc3bcc8b60a73c95fce4310c7c1399fd7c896b82a8501d39721f048d7e8dcce4b1db WHIRLPOOL 3b4ec3430d7eb742ebb20ec72347cc2ccf0aa030eb8d9a3f57156d2f093fe2d29b1f2b2a8b2e281dca1fd503f21109373c0640e1409a3c1f02dd4ccc6d187b1d DIST katawa-shoujo-1.2.tar.bz2 483215826 SHA256 558b74ab6b69cc61ac98905a9ca38695303963210ad846108963c6334a9205ae SHA512 1d490ca8f953340091b16ccd39e9d198b34d7163a9af977d84e64a4ccb1bc941b91196b749e1a68594b4a8e0a6ac32aa28ad1faeed3a05374475ff32bc93f05d WHIRLPOOL cea12934a5a7f9e8419302150f89cbca0aff98982c0ce19bdd032aff5c76b2441fee654328f2255cf942b11123ce22bec2c47a7348ce7a3ff5f97752e1ea5451 DIST katawa-shoujo-256.png 59803 SHA256 8130b39af5341b0e1c85cbd6ef5be229de2877d696e5b372e1aacf176778df45 SHA512 7d920c24f4182ba72d5b3d641d7d373c166ca4c7d0b6a396f5e3b9281cb43f7e6e8e761f2f181ff061705118b3080807866fcd290d2b471e98c3a584d5fa8e0e WHIRLPOOL d2b06b26d2ea5bae5292fc5e6f3f4571fa82a4f70155e38a3c8a21778caabc37b2a13b2cb7637a0fb05a55243a63e23c96d0538bbcbc631810f15c069d26f590 DIST katawa-shoujo-48.png 3621 SHA256 a366a52fd9dd241182d163e28a37f537fa71d5d46f1fc899da08b492c371a0fd SHA512 ad24156cf446ffe92068baaa6d512e6bab90587db5ce01b3c18e6c42bb9b8c91f7eae3e9547099d3f8f0a5d3f144676c3499c0a38d9af845abf79e153b543bef WHIRLPOOL b62253218dbb981f32007e22cdd36decac8948e4dff416ca60de3daaab8cfad9773622e194b885c0145a499008751c5a09184b7f0a0dc3b9153d751dd0d1b584 diff --git a/games-misc/katawa-shoujo/katawa-shoujo-1.0-r1.ebuild b/games-misc/katawa-shoujo/katawa-shoujo-1.0-r1.ebuild deleted file mode 100644 index 8cf282d9e429..000000000000 --- a/games-misc/katawa-shoujo/katawa-shoujo-1.0-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-misc/katawa-shoujo/katawa-shoujo-1.0-r1.ebuild,v 1.2 2013/05/23 14:24:43 pinkbyte Exp $ - -EAPI=5 - -inherit eutils gnome2-utils games - -DESCRIPTION="Bishoujo-style visual novel set in the fictional Yamaku High School for disabled children" -HOMEPAGE="http://katawa-shoujo.com/" -SRC_URI="http://dl.katawa-shoujo.com/gold/%5b4ls%5d_katawa_shoujo_%5blinux-x86%5d%5bEA1DFB30%5d.tar.bz2 -> ${P}.tar.bz2 - http://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-48.png - http://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-256.png" - -LICENSE="CC-BY-NC-ND-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc system-renpy" - -# make system-renpy optional due to #459742 :( -RDEPEND="system-renpy? ( games-engines/renpy )" - -QA_PREBUILT="${GAMES_PREFIX_OPT}/${PN}/lib/*" - -S="${WORKDIR}/Katawa Shoujo-linux-x86" - -src_install() { - if use system-renpy ; then - insinto "${GAMES_DATADIR}/${PN}" - doins -r game/. - games_make_wrapper ${PN} "renpy '${GAMES_DATADIR}/${PN}'" - else - insinto "${GAMES_PREFIX_OPT}"/${PN} - doins -r common game lib renpy "Katawa Shoujo.py" "Katawa Shoujo.sh" - games_make_wrapper ${PN} "./Katawa\ Shoujo.sh" "${GAMES_PREFIX_OPT}/${PN}" - fperms +x "${GAMES_PREFIX_OPT}/${PN}"/lib/{python,linux-x86/python.real} \ - "${GAMES_PREFIX_OPT}/${PN}/Katawa Shoujo.sh" \ - "${GAMES_PREFIX_OPT}/${PN}/Katawa Shoujo.py" - fi - - local i - for i in 48 256; do - newicon -s ${i} "${DISTDIR}"/${PN}-${i}.png ${PN}.png - done - - make_desktop_entry ${PN} "Katawa Shoujo" - - if use doc ; then - newdoc "Game Manual.pdf" manual.pdf - fi - - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - elog "Savegames from system-renpy and the bundled version are incompatible" - - games_pkg_postinst - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-misc/katawa-shoujo/katawa-shoujo-1.1-r1.ebuild b/games-misc/katawa-shoujo/katawa-shoujo-1.1-r1.ebuild deleted file mode 100644 index 17523d839a91..000000000000 --- a/games-misc/katawa-shoujo/katawa-shoujo-1.1-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-misc/katawa-shoujo/katawa-shoujo-1.1-r1.ebuild,v 1.2 2014/06/18 19:20:22 mgorny Exp $ - -EAPI=5 - -inherit eutils gnome2-utils games - -DESCRIPTION="Bishoujo-style visual novel set in the fictional Yamaku High School for disabled children" -HOMEPAGE="http://katawa-shoujo.com/" -SRC_URI="http://dl.katawa-shoujo.com/gold_1.1/%5B4ls%5D_katawa_shoujo_1.1-%5Blinux-x86%5D%5BB5C707D5%5D.tar.bz2 -> ${P}.tar.bz2 - http://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-48.png - http://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-256.png" - -LICENSE="CC-BY-NC-ND-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc system-renpy" - -# make system-renpy optional due to #459742 :( -RDEPEND="system-renpy? ( games-engines/renpy ) - !system-renpy? ( - amd64? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32] ) - x86? ( sys-libs/zlib ) - )" #495270 - -QA_PREBUILT="${GAMES_PREFIX_OPT}/${PN}/lib/*" - -S="${WORKDIR}/Katawa Shoujo-linux-x86" - -src_install() { - if use system-renpy ; then - insinto "${GAMES_DATADIR}/${PN}" - doins -r game/. - games_make_wrapper ${PN} "renpy '${GAMES_DATADIR}/${PN}'" - else - insinto "${GAMES_PREFIX_OPT}"/${PN} - doins -r common game lib renpy "Katawa Shoujo.py" "Katawa Shoujo.sh" - games_make_wrapper ${PN} "./Katawa\ Shoujo.sh" "${GAMES_PREFIX_OPT}/${PN}" - fperms +x "${GAMES_PREFIX_OPT}/${PN}"/lib/{python,linux-x86/python.real} \ - "${GAMES_PREFIX_OPT}/${PN}/Katawa Shoujo.sh" \ - "${GAMES_PREFIX_OPT}/${PN}/Katawa Shoujo.py" - fi - - local i - for i in 48 256; do - newicon -s ${i} "${DISTDIR}"/${PN}-${i}.png ${PN}.png - done - - make_desktop_entry ${PN} "Katawa Shoujo" - - if use doc ; then - newdoc "Game Manual.pdf" manual.pdf - fi - - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - elog "Savegames from system-renpy and the bundled version are incompatible" - - if use system-renpy; then - ewarn "system-renpy is unstable and not supported upstream" - fi - - games_pkg_postinst - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-misc/katawa-shoujo/katawa-shoujo-1.2.ebuild b/games-misc/katawa-shoujo/katawa-shoujo-1.2.ebuild deleted file mode 100644 index 584ba547e86c..000000000000 --- a/games-misc/katawa-shoujo/katawa-shoujo-1.2.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-misc/katawa-shoujo/katawa-shoujo-1.2.ebuild,v 1.1 2014/07/28 22:36:17 hasufell Exp $ - -EAPI=5 - -inherit eutils gnome2-utils games - -DESCRIPTION="Bishoujo-style visual novel set in the fictional Yamaku High School for disabled children" -HOMEPAGE="http://katawa-shoujo.com/" -SRC_URI="http://dl.katawa-shoujo.com/gold_1.2/%5b4ls%5d_katawa_shoujo_1.2-%5blinux-x86%5d%5b8F3BA490%5d.tar.bz2 -> ${P}.tar.bz2 - http://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-48.png - http://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-256.png" - -LICENSE="CC-BY-NC-ND-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc system-renpy" - -# make system-renpy optional due to #459742 :( -RDEPEND="system-renpy? ( games-engines/renpy ) - !system-renpy? ( - || ( - >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] - app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - ) - )" #495270 - -QA_PREBUILT="${GAMES_PREFIX_OPT}/${PN}/lib/*" - -S="${WORKDIR}/Katawa Shoujo-linux-x86" - -src_install() { - if use system-renpy ; then - insinto "${GAMES_DATADIR}/${PN}" - doins -r game/. - games_make_wrapper ${PN} "renpy '${GAMES_DATADIR}/${PN}'" - else - insinto "${GAMES_PREFIX_OPT}"/${PN} - doins -r common game lib renpy "Katawa Shoujo.py" "Katawa Shoujo.sh" - games_make_wrapper ${PN} "./Katawa\ Shoujo.sh" "${GAMES_PREFIX_OPT}/${PN}" - fperms +x "${GAMES_PREFIX_OPT}/${PN}"/lib/{python,linux-x86/python.real} \ - "${GAMES_PREFIX_OPT}/${PN}/Katawa Shoujo.sh" \ - "${GAMES_PREFIX_OPT}/${PN}/Katawa Shoujo.py" - fi - - local i - for i in 48 256; do - newicon -s ${i} "${DISTDIR}"/${PN}-${i}.png ${PN}.png - done - - make_desktop_entry ${PN} "Katawa Shoujo" - - if use doc ; then - newdoc "Game Manual.pdf" manual.pdf - fi - - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - elog "Savegames from system-renpy and the bundled version are incompatible" - - if use system-renpy; then - ewarn "system-renpy is unstable and not supported upstream" - fi - - games_pkg_postinst - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-misc/lolcat/Manifest b/games-misc/lolcat/Manifest index 92478c77e06e..03513c32181c 100644 --- a/games-misc/lolcat/Manifest +++ b/games-misc/lolcat/Manifest @@ -1,2 +1 @@ -DIST lolcat-42.0.99.gem 204288 SHA256 cafd788a6b3e0177a20a9e44dfbb144ea0b6b62c9c9fb413c5223778cdd92558 SHA512 fe5a1b77634c430dd699372f026b9947b53aa6def822dc1292b7bf9f5575747abef03c6625eee76e1d26c2b01fdae06409b79bc5286ef85a6c28be0af4429e50 WHIRLPOOL 79e54ea2054dc70d1629020144efbb6e60fef1c43834e5412c32b9e040b27627de9e8bae6a4c771c98b72aaffcb0c43e3397ab2a6f34d7b2c718b468afad781f DIST lolcat-42.1.0.gem 205312 SHA256 ecf19c507f1e4df8436678b3ba1fdd24d686b23d1a87da1238afa192e679e0ca SHA512 b0c8f7122317b31efbf81a2023dded8a6c27ad17539b88c882af99983d377c308862d7ee4be85e891c2aca0bee25ac6d2ef3bf536b88d7db18d11176d3245b83 WHIRLPOOL 070e94fa38ced5b554a103b166f9694c75afe2dfa5ffe7a65f3bb62895638cb5c7a825290f2ca99a59e57a1017df79441cb24c2e23373ee90abbae6c0e8dc9a1 diff --git a/games-misc/lolcat/lolcat-42.0.99-r1.ebuild b/games-misc/lolcat/lolcat-42.0.99-r1.ebuild deleted file mode 100644 index 2fd76b3de8dc..000000000000 --- a/games-misc/lolcat/lolcat-42.0.99-r1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-misc/lolcat/lolcat-42.0.99-r1.ebuild,v 1.4 2014/08/14 13:57:55 mrueg Exp $ - -EAPI=5 -USE_RUBY="ruby19 ruby20" - -RUBY_FAKEGEM_TASK_TEST="" -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_EXTRADOC="README.md" - -inherit ruby-fakegem - -DESCRIPTION="Rainbows and unicorns!" -HOMEPAGE="https://github.com/busyloop/lolcat" - -LICENSE="WTFPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -ruby_add_rdepend ">=dev-ruby/trollop-1.16.2-r3:0 - dev-ruby/paint" diff --git a/games-misc/opengfx/Manifest b/games-misc/opengfx/Manifest index 9889892ead3d..824cbba91748 100644 --- a/games-misc/opengfx/Manifest +++ b/games-misc/opengfx/Manifest @@ -1,2 +1 @@ -DIST opengfx-0.4.7-source.tar.gz 11775510 SHA256 252d10ed8b33b715ec6766e61e136ee36b5bf67f846840159bb536dfca3a8606 SHA512 04dd2a8d3e76b43c0996ac45361ad946480797c7491147867063c2d02334138aeb1f0a48891a2df6f781f37cc22a9a3027247cfa946ee895f1451cebccca6a9e WHIRLPOOL 5ecbd1453075d9dd26f5f9baf979565c5b57d139f74d9e72f8df15c5e84a736fa8b8c6c4562e8a282844a1606d9686667b98c371dbefa0f108f045036550945a DIST opengfx-0.5.1-source.tar.xz 9553608 SHA256 5737760de04034504dbf552f75a45d713a59659dca4bfbdd4e215429c148d7a9 SHA512 30dee5ae2065d76205d21c911b875777878fc66c3df159ca49d8745db843bc8c00f9d022670ceb872f20bc8b64d41fbe3f12cb8ce3b3eb0e8b9c30a6e5bfde04 WHIRLPOOL f387e474ad8d1fa6b43adfce00df64a388702d5f21350ad60a76d25577aba18af798ba7cc4cb8a0ab06d49f76c48f7f59757cdb384e3630d5ff7d63b9a47da4b diff --git a/games-misc/opengfx/files/opengfx-0.4.7-gcc48.patch b/games-misc/opengfx/files/opengfx-0.4.7-gcc48.patch deleted file mode 100644 index 78b512e71cec..000000000000 --- a/games-misc/opengfx/files/opengfx-0.4.7-gcc48.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- scripts/Makefile.nml.old 2013-05-09 20:09:52.992038666 +0200 -+++ scripts/Makefile.nml 2013-05-09 20:10:36.942970903 +0200 -@@ -14,11 +14,11 @@ - - %.src.dep: $(SRC_DIR)/%.pnml - $(_E) "[DEP] $@" -- $(_V) $(CC) -C -M -MF $@ -E -MT $(patsubst %.src.dep,%.nml,$@) - < $< -+ $(_V) $(CC) -P -C -M -MF $@ -E -MT $(patsubst %.src.dep,%.nml,$@) - < $< - - %.nml: $(SRC_DIR)/%.pnml $(TAG_FILENAME) - $(_E) "[CPP] $@" -- $(_V) $(CC) -D REPO_REVISION=$(REPO_REVISION) $(CC_FLAGS) $< > $@ -+ $(_V) $(CC) -P -D REPO_REVISION=$(REPO_REVISION) $(CC_FLAGS) $< > $@ - - %.gfx.dep: %.nml - $(_E) "[DEP] $@" diff --git a/games-misc/opengfx/opengfx-0.4.7.ebuild b/games-misc/opengfx/opengfx-0.4.7.ebuild deleted file mode 100644 index adda2cea3b63..000000000000 --- a/games-misc/opengfx/opengfx-0.4.7.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-misc/opengfx/opengfx-0.4.7.ebuild,v 1.3 2013/12/24 12:43:28 ago Exp $ - -EAPI=5 -inherit eutils games - -DESCRIPTION="OpenGFX data files for OpenTTD" -HOMEPAGE="http://bundles.openttdcoop.org/opengfx/" -SRC_URI="http://bundles.openttdcoop.org/opengfx/releases/${PV}/${P}-source.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~ppc x86" -IUSE="" -RESTRICT="test" # nml version affects the checksums that the test uses (bug #451444) - -DEPEND=">=games-util/nml-0.2.4" -RDEPEND="" - -S=${WORKDIR}/${P}-source - -src_prepare() { - epatch "${FILESDIR}"/${P}-gcc48.patch -} - -src_compile() { - # ensure that we will not use gimp to regenerate the pngs - # causes sandbox violations and not worth the effort anyway - GIMP='' emake bundle -} - -src_install() { - insinto "${GAMES_DATADIR}/openttd/data/" - doins *.grf opengfx.obg - dodoc docs/{changelog.txt,readme.txt} - prepgamesdirs -} diff --git a/games-puzzle/angrydd/angrydd-1.0.1.ebuild b/games-puzzle/angrydd/angrydd-1.0.1.ebuild deleted file mode 100644 index e1ef0697c4f9..000000000000 --- a/games-puzzle/angrydd/angrydd-1.0.1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/angrydd/angrydd-1.0.1.ebuild,v 1.7 2010/09/09 16:43:17 mr_bones_ Exp $ - -EAPI=2 -PYTHON_DEPEND="2" -inherit eutils python games - -DESCRIPTION="Angry, Drunken Dwarves, a falling blocks game similar to Puzzle Fighter" -HOMEPAGE="http://www.sacredchao.net/~piman/angrydd/" -SRC_URI="http://www.sacredchao.net/~piman/angrydd/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc x86" -IUSE="" - -DEPEND=">=dev-python/pygame-1.6.2 - >=dev-lang/python-2.3" - -pkg_setup() { - python_set_active_version 2 - games_pkg_setup -} - -src_prepare() { - python_convert_shebangs -r 2 . -} - -src_install() { - emake \ - DESTDIR="${D}" \ - PREFIX="${GAMES_DATADIR}" \ - TO="${PN}" \ - install || die - rm -rf "${D}${GAMES_DATADIR}/games" "${D}${GAMES_DATADIR}/share" - dodir "${GAMES_BINDIR}" - dosym "${GAMES_DATADIR}/${PN}/angrydd.py" "${GAMES_BINDIR}/${PN}" - doman angrydd.6 - dodoc README TODO HACKING - - doicon angrydd.png - make_desktop_entry angrydd "Angry, Drunken Dwarves" - - prepgamesdirs -} diff --git a/games-puzzle/jools/jools-0.20-r1.ebuild b/games-puzzle/jools/jools-0.20-r1.ebuild deleted file mode 100644 index bb93d7a24363..000000000000 --- a/games-puzzle/jools/jools-0.20-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/jools/jools-0.20-r1.ebuild,v 1.11 2012/04/13 19:20:20 ulm Exp $ - -EAPI=3 -PYTHON_DEPEND="2" - -inherit eutils python games - -MUS_P=${PN}-musicpack-1.0 -DESCRIPTION="clone of Bejeweled, a popular pattern-matching game" -HOMEPAGE="http://pessimization.com/software/jools/" -SRC_URI="http://pessimization.com/software/jools/${P}.tar.gz - http://pessimization.com/software/jools/${MUS_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="" - -RDEPEND="dev-python/pygame" -DEPEND="" - -S=${WORKDIR}/${P}/jools - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup - games_pkg_setup -} - -src_unpack() { - unpack ${P}.tar.gz - cd "${S}"/music - unpack ${MUS_P}.tar.gz -} - -src_prepare() { - echo "MEDIAROOT = \"${GAMES_DATADIR}/${PN}\"" > config.py - python_convert_shebangs -r 2 . -} - -src_install() { - games_make_wrapper ${PN} "$(PYTHON) ./__init__.py" "$(games_get_libdir)"/${PN} - insinto "$(games_get_libdir)"/${PN} - doins *.py || die "doins py failed" - insinto "${GAMES_DATADIR}"/${PN} - doins -r fonts images music sounds || die "doins data failed" - newicon images/ruby/0001.png ${PN}.png - make_desktop_entry ${PN} Jools - dodoc ../{ChangeLog,doc/{POINTS,TODO}} - dohtml ../doc/manual.html - prepgamesdirs -} - -pkg_postinst() { - python_mod_optimize "$(games_get_libdir)"/${PN} - games_pkg_postinst -} - -pkg_postrm() { - python_mod_cleanup "$(games_get_libdir)"/${PN} -} diff --git a/games-rpg/dragonhunt/dragonhunt-3.56.ebuild b/games-rpg/dragonhunt/dragonhunt-3.56.ebuild deleted file mode 100644 index 3fa2018d6358..000000000000 --- a/games-rpg/dragonhunt/dragonhunt-3.56.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/dragonhunt/dragonhunt-3.56.ebuild,v 1.6 2013/02/07 22:12:52 ulm Exp $ - -EAPI=2 -PYTHON_DEPEND="2" -inherit eutils python games - -MY_P="Dragon_Hunt-${PV}" -DESCRIPTION="A simple graphical RPG" -HOMEPAGE="http://emhsoft.com/dh.html" -SRC_URI="http://emhsoft.com/dh/${MY_P}.tar.gz" - -LICENSE="GPL-2 CC-SA-1.0" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="dev-python/pygame" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - python_set_active_version 2 - games_pkg_setup -} - -src_prepare() { - # Where to look for modules to load. - sed -i "s:\.\./modules/:${GAMES_DATADIR}/${PN}/:" \ - code/g.py \ - code/map_editor.py \ - code/rpg.py \ - || die "Could not change module path." - - # Where to look for keybinding - sed -i "s:\.\./settings:${GAMES_SYSCONFDIR}/${PN}/settings:" \ - code/g.py \ - || die "Could not change settings.txt directory" - - # Save games in ~/.${PN}/. - sed -i \ - -e "s:^\(from os import.*\):\1\, environ:" \ - -e "s:g.mod_dir.*\"/saves/\?\":environ[\"HOME\"] + \"/.${PN}/\":" \ - code/g.py code/loadgame.py \ - || die "Could not change savegames location." - - # Save maps in ~/. - sed -i \ - -e "s:^\(from os import.*\):\1\, environ:" \ - -e "s:g.mod_dir.*\"map\.txt\":environ[\"HOME\"]\ +\ \"/dh_map.txt\":" \ - code/map_editor.py \ - || die "Could not change map location." -} - -src_install() { - insinto "${GAMES_DATADIR}"/${PN} - doins -r modules/* || die "doins modules failed" - - insinto "${GAMES_SYSCONFDIR}"/${PN} - doins settings.txt || die "doins settings.txt failed" - - insinto "$(games_get_libdir)"/${PN} - doins code/*.py || die "doins code failed" - - games_make_wrapper ${PN} "$(PYTHON) ./rpg.py" "$(games_get_libdir)"/${PN} - games_make_wrapper ${PN}-mapeditor "$(PYTHON) ./map_editor.py" \ - "$(games_get_libdir)"/${PN} - - newicon modules/default/images/buttons/icon.png ${PN}.png - make_desktop_entry ${PN} "Dragon Hunt" - make_desktop_entry ${PN}-mapeditor "Dragon Hunt - Editor" - - dodoc README.txt docs/{Changelog,Items.txt,example_map.txt,tiles.txt} - dohtml docs/*.html - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - echo - elog "If you use the map editor then note that maps will be saved as" - elog "~/dh_map.txt and must be move to the correct module directory" - elog "(within ${GAMES_DATADIR}/${PN}) by hand." - echo -} diff --git a/games-rpg/freedink/Manifest b/games-rpg/freedink/Manifest index d24e894d407e..44d968782a3b 100644 --- a/games-rpg/freedink/Manifest +++ b/games-rpg/freedink/Manifest @@ -1,3 +1,2 @@ DIST freedink-1.08.20121209.tar.gz 1853822 SHA256 196bfcc7b874c2fb9ac94d663f14fb759e644cc2400f77f734a098ca568dbda7 SHA512 40d1322908e429f59a97c79bbcc6d39b51c58fc36f36d612ec189add1aa586b01e929b59ada0da62ca418db6fa81131d282c03aa10d1b69de8224cceba9b0747 WHIRLPOOL 43fccb628bcd788621927d409b38635875ab47202ce9fdf2c3d3706bac87f2939fdcb5ef362109e3bbbdd90f58648da5db3d6ea7629b407c6ffd4059307d8a59 -DIST freedink-108.2.tar.gz 1882677 SHA256 ecfbe2c534a85daa6651d975704a39e5af9c911ad2639bc728d536a80c46c9a4 SHA512 ece9cbe9a6186ddc05d993912bae42bc343a93e67d57d376893b6642d32c7328970b87e73c62c538f603119d73bb0e76b50ba6043e2d4831fe7a164bad12cd43 WHIRLPOOL d94876ea2517f949cd45d21958f6c2479f16269e3a5f318f9f6ee131d8242a1f33e04092d3a1cabe0a8b975cbd38d8f82f363ec0149f62193864a7846a4b2709 DIST freedink-108.4.tar.gz 1897701 SHA256 82cfb2e019e78b6849395dc4750662b67087d14f406d004f6d9e39e96a0c8521 SHA512 1496b6a7826bf694a2919add22a8b4b08a4967d8a7fdebf2d599bd99c7a7ce67de6c2b11124423c7aa1f0feb2e7c03ce1cf00252070182936e7481791dafee61 WHIRLPOOL 487f82adc1c36631220f23c6ac6aebaaafb3788bfdfbbf8a4e30d0c77d2a1ff97a9c43d5017fa5d50bfc7c3c36042521f3f7e194c4faa77f836ad45cff845d75 diff --git a/games-rpg/freedink/freedink-108.2.ebuild b/games-rpg/freedink/freedink-108.2.ebuild deleted file mode 100644 index 76e82e857aea..000000000000 --- a/games-rpg/freedink/freedink-108.2.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedink/freedink-108.2.ebuild,v 1.1 2014/05/29 20:47:34 hasufell Exp $ - -EAPI=5 - -inherit games - -DESCRIPTION="Dink Smallwood is an adventure/role-playing game, similar to Zelda (2D top view)" -HOMEPAGE="http://www.freedink.org/" -SRC_URI="mirror://gnu/freedink/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="nls" - -DEPEND=" - >=media-libs/fontconfig-2.4 - >=media-libs/libsdl-1.2[X,sound,joystick,video] - >=media-libs/sdl-gfx-2.0 - >=media-libs/sdl-image-1.2 - >=media-libs/sdl-mixer-1.2[midi,vorbis,wav] - >=media-libs/sdl-ttf-2.0.9" -RDEPEND="${DEPEND} - ~games-rpg/freedink-data-1.08.20121209" -DEPEND="${DEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -src_prepare() { - sed -i \ - -e 's#^datarootdir =.*$#datarootdir = /usr/share#' \ - share/Makefile.in || die -} - -src_configure() { - egamesconf \ - --disable-embedded-resources \ - --localedir="/usr/share/locale" \ - $(use_enable nls) -} - -src_install() { - default - dodoc TROUBLESHOOTING - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - einfo - elog "optional dependencies:" - elog " games-util/dfarc (dmod installer and frontend)" - einfo -} diff --git a/games-rpg/mana/Manifest b/games-rpg/mana/Manifest index 53b49e921bdc..ef297da0c0b4 100644 --- a/games-rpg/mana/Manifest +++ b/games-rpg/mana/Manifest @@ -1,3 +1,2 @@ -DIST mana-0.5.3.tar.gz 2473239 SHA256 3b9781cc2aa89fb0723d76df7407f4b89d1305e42166b2f4c850f3acd61022d5 DIST mana-0.6.0.tar.gz 4621532 SHA256 d83d6c3ee7f527175a5db3ed25c95b8417006c3fef273c68d13352ec57d93474 SHA512 7418f018ef53e9487f1c3d14cdcfe6fe5fcb925d162f2011651f651634f6f12107d8b5023e3e37f8b0792b7e1c32c45b8dda0bb61140cb66767c278064df8eb0 WHIRLPOOL 590a7595e9980a65290d8753f6e6fde385f0a5ca5200f2bf6a08e0bb5f140b3c88c7d6ae51e4b79d1ef684ba70138647fce85684069306adef23fa60821de7a4 DIST mana-0.6.1.tar.gz 4651447 SHA256 b945cd3e32489dfa5b8e82d571cc11e0e5308576307fca4d8dd7cf3cf6ed8c55 SHA512 d3cd66409f6eca274ee24c9d6f6355d2406b3f29fb6efdce82ef99dcc9a6945ff6dca39d3f4cbe031b8684d8e46c8d5c89937ed2e9eebfb2831f2ed8d02a6919 WHIRLPOOL 5b812dc7a2ff63ab3ace820f13fdea0df44685e9bfa0ed4a6aaefaea8c3889cda8b79678369a70e1f1fe855f0de973455cb37b1bbea7fc589a8741f3ae19d2bc diff --git a/games-rpg/mana/files/mana-0.5.3-gentoo.patch b/games-rpg/mana/files/mana-0.5.3-gentoo.patch deleted file mode 100644 index b5f90cb6658c..000000000000 --- a/games-rpg/mana/files/mana-0.5.3-gentoo.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- CMakeLists.txt.old 2011-08-02 08:28:51.211645468 +0200 -+++ CMakeLists.txt 2011-08-02 08:29:26.912641230 +0200 -@@ -41,9 +41,9 @@ - IF (NOT OSX) - OPTION(USE_X11 "Use X11 Clipboard functionality" ON) - ENDIF () -- SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/mana) -+ SET(PKG_DATADIR @GENTOO_DATADIR@) - SET(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale) -- SET(PKG_BINDIR ${CMAKE_INSTALL_PREFIX}/bin) -+ SET(PKG_BINDIR @GENTOO_BINDIR@) - ENDIF (WIN32) - - ADD_SUBDIRECTORY(data) ---- mana.desktop.old 2011-08-02 11:31:56.049341650 +0200 -+++ mana.desktop 2011-08-02 11:32:05.312340549 +0200 -@@ -13,4 +13,4 @@ - Terminal=false - Type=Application - Icon=mana --Categories=Application;Game; -+Categories=Game; ---- data/CMakeLists.txt.old 2011-08-02 12:15:38.520030381 +0200 -+++ data/CMakeLists.txt 2011-08-02 12:15:44.971029615 +0200 -@@ -1,6 +1,5 @@ - SET(DATA_DIR ${PKG_DATADIR}/data) - --ADD_SUBDIRECTORY(fonts) - ADD_SUBDIRECTORY(graphics) - ADD_SUBDIRECTORY(help) - ADD_SUBDIRECTORY(icons) diff --git a/games-rpg/mana/mana-0.5.3.ebuild b/games-rpg/mana/mana-0.5.3.ebuild deleted file mode 100644 index 2980b3feab75..000000000000 --- a/games-rpg/mana/mana-0.5.3.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/mana/mana-0.5.3.ebuild,v 1.5 2012/05/02 21:10:33 jdhore Exp $ - -EAPI=2 -inherit eutils cmake-utils games - -DESCRIPTION="A fully free and open source MMORPG game client" -HOMEPAGE="http://manasource.org/" -SRC_URI="http://manasource.org/files/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="nls opengl" - -RDEPEND="!=games-rpg/tmw-0.5.2 - >=dev-games/physfs-1.0.0 - dev-libs/libxml2 - media-libs/sdl-mixer[vorbis] - media-libs/sdl-image[png] - media-libs/sdl-net - media-libs/sdl-ttf - net-misc/curl - sys-libs/zlib - media-libs/libpng - media-fonts/dejavu - >=dev-games/guichan-0.8.1[sdl] - media-libs/libsdl[opengl?,video] - media-libs/sdl-gfx - x11-libs/libX11 - nls? ( virtual/libintl ) - opengl? ( virtual/opengl )" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -DOCS=( AUTHORS ChangeLog NEWS README ) -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - -src_prepare() { - base_src_prepare - sed -i \ - -e "s:@GENTOO_BINDIR@:${GAMES_BINDIR}:" \ - -e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \ - CMakeLists.txt \ - || die "sed failed" -} - -src_configure() { - mycmakeargs=( - $(cmake-utils_use_with opengl) - $(cmake-utils_use_enable nls) - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans-bold.ttf - dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans.ttf - insinto "${GAMES_DATADIR}"/${PN}/data - prepgamesdirs -} diff --git a/games-rpg/manaplus/Manifest b/games-rpg/manaplus/Manifest index 3a2680747ac3..d346e3e8eb63 100644 --- a/games-rpg/manaplus/Manifest +++ b/games-rpg/manaplus/Manifest @@ -1,2 +1 @@ -DIST manaplus-1.3.6.9.tar.xz 6920400 SHA256 2f4e8a859bcec82ff1ee9403a225b6f71db2b9d027a864009b418b055e608730 SHA512 11472d14a17325241c9eb11bffbf49c0c8d1200f8f932b38e5a30ddb06d5f236af20fde94ed636ed7f37be31b79e93c92bec5055c3916b27ac81b441c99ab0c5 WHIRLPOOL 553c9fe3686e60a240569147a7e1fe28c8b46f479261e8fe038bb894ebbee094d989bda32a38818ed572d0b345b1a52955363949f83bfd868293afa25be8340a DIST manaplus-1.3.9.29.tar.xz 7206052 SHA256 adf3bbd3761086d66d1d5cf22369dfadcf5839f382c564bd7d6337ad1e3933c3 SHA512 4ae13254b9ee5d06fc8e2f287fa3cde5076a55bcac0f57398acffc70a5d0b3820d712771def6b8f8ce1ef8f48d1ad8ffc222c8821ec43920aff071a24c4a3a6e WHIRLPOOL db33166b184f9ae018a675b6a3d76b8e296530e02550b9dd6803b3249d8b454a1475a5f8020d976ef3153a68532b86f408f5f3af2ca0f9ea34386db8586abb7c diff --git a/games-rpg/manaplus/manaplus-1.3.6.9.ebuild b/games-rpg/manaplus/manaplus-1.3.6.9.ebuild deleted file mode 100644 index 7433cf506806..000000000000 --- a/games-rpg/manaplus/manaplus-1.3.6.9.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/manaplus/manaplus-1.3.6.9.ebuild,v 1.4 2013/10/07 14:04:27 hasufell Exp $ - -EAPI=5 - -inherit games - -DESCRIPTION="OpenSource 2D MMORPG client for Evol Online and The Mana World" -HOMEPAGE="http://manaplus.evolonline.org" -SRC_URI="http://download.evolonline.org/manaplus/download/${PV}/manaplus-${PV}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="nls opengl" - -RDEPEND=" - >=dev-games/physfs-1.0.0 - dev-libs/libxml2 - media-libs/sdl-mixer[vorbis] - media-libs/sdl-image[png] - media-libs/sdl-net - media-libs/sdl-ttf - net-misc/curl - sys-libs/zlib - media-libs/libpng:0 - media-fonts/dejavu - >=dev-games/guichan-0.8.1[sdl] - media-libs/libsdl[X,opengl?,video] - media-libs/sdl-gfx - x11-apps/xmessage - x11-libs/libX11 - x11-misc/xdg-utils - x11-misc/xsel - nls? ( virtual/libintl ) - opengl? ( virtual/opengl )" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -src_prepare() { - sed -i \ - -e '/^SUBDIRS/s/fonts//' \ - data/Makefile.in || die - - rm -r src/guichan || die -} - -src_configure() { - egamesconf \ - --without-internalguichan \ - --localedir=/usr/share/locale \ - --disable-manaserv \ - --disable-eathena \ - $(use_with opengl) \ - $(use_enable nls) -} - -src_install() { - default - - dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans-bold.ttf - dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans.ttf - dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans-mono.ttf - - prepgamesdirs -} diff --git a/games-rpg/tmw/Manifest b/games-rpg/tmw/Manifest index 056897bf738d..7d2e81d92d37 100644 --- a/games-rpg/tmw/Manifest +++ b/games-rpg/tmw/Manifest @@ -1,2 +1 @@ -DIST tmw-branding-20120727.tar.gz 1146204 SHA256 09ad85cb5df2c7d18493403ff283f6c9ff4340ea41940a53bb173bd8f5521675 SHA512 848b890ccf54b5484def193d82e012ed2be0b7bc7ae9601760aba63233b86ea61bc53a0cb91ce3f71af87fc2b63f3626c9ade117beddd2d76886ae5f061321b7 WHIRLPOOL 0483df949bf399e1dd949a06e378e266fe8a09c19200177830d10e502a5f636ce908617cc0f3b5e7b9285c285b0c7c0eccc02945976a11d78131e5a9bb47a741 DIST tmw-branding-20130201.tar.gz 1146207 SHA256 251692f120c54fba4323191239a4a2022aa58a5de220531e06b634fc25097c69 SHA512 65ff615ef8a715192416b80393341d76423a8b2a27609e9388fcdec0b4e3552398857b33585690de5fded9f792c5dbfceb631cf834e68dcc8906d48097a21a99 WHIRLPOOL 87af806a49f2017149e8e84ad8c682a6ed72c5fd87ad8f0fa5c9ebc407ddc0400b89a9a0cc40ca33716a7a1e82daaec102007764848302a8c94d5c17182d2018 diff --git a/games-rpg/tmw/files/tmw-branding-gentoo.patch b/games-rpg/tmw/files/tmw-branding-gentoo.patch deleted file mode 100644 index fea920640e7f..000000000000 --- a/games-rpg/tmw/files/tmw-branding-gentoo.patch +++ /dev/null @@ -1,19 +0,0 @@ -respect games paths - ---- tmw -+++ tmw -@@ -1,2 +1,2 @@ - #!/bin/sh --exec mana /usr/share/tmw/tmw.mana "$@" -+exec mana @GENTOO_DATADIR@/tmw.mana "$@" ---- tmw.desktop -+++ tmw.desktop -@@ -8,7 +8,7 @@ Comment[de]=ein Online Fantasy Spiel - Comment[it]=Un gioco fantasy online - Comment[nl]=Een online role playing game - Comment[sv]=Ett fantasyrollspel online --Exec=mana /usr/share/tmw/tmw.mana -+Exec=mana @GENTOO_DATADIR@/tmw.mana - StartupNotify=false - Terminal=false - Type=Application diff --git a/games-rpg/tmw/tmw-20120727.ebuild b/games-rpg/tmw/tmw-20120727.ebuild deleted file mode 100644 index 96c9be6372ff..000000000000 --- a/games-rpg/tmw/tmw-20120727.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/tmw/tmw-20120727.ebuild,v 1.3 2012/10/17 03:55:13 phajdan.jr Exp $ - -EAPI=4 -inherit eutils gnome2-utils games - -MY_PN=${PN}-branding -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Branding for the Mana client for server.themanaworld.org" -HOMEPAGE="http://themanaworld.org/" -SRC_URI="mirror://sourceforge/themanaworld/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="games-rpg/mana" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch "${FILESDIR}"/${MY_PN}-gentoo.patch - - sed -i \ - -e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \ - ${PN} ${PN}.desktop \ - || die "sed failed" -} - -src_install() { - dogamesbin ${PN} - - insinto "${GAMES_DATADIR}/${PN}/" - doins ${PN}.mana - doins -r data/ - - domenu ${PN}.desktop - - doicon -s 32 data/icons/${PN}.xpm - doicon data/icons/${PN}.png - - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-rpg/zsdx/Manifest b/games-rpg/zsdx/Manifest index 870af17fbf9f..73056308d559 100644 --- a/games-rpg/zsdx/Manifest +++ b/games-rpg/zsdx/Manifest @@ -1,3 +1,2 @@ DIST zsdx-1.7.1.tar.gz 23006478 SHA256 772c7275989d37487e5eb11807ec8f1e8fb679f611efc203f9082aabc41c0ee2 SHA512 b1c02c3c947cb4e09cf082b0016a37c740a7eceefaa0e68511bbc51934d21b7fae9595d88318d529c95bc71a075435dd24cbce0cd548141201357fba16a5b800 WHIRLPOOL ee29bc2d9aa331331700aecb6ce795417c79a1268533e5bcda91b5d726622c7c41a4829613d0a061c8a60a0b1388aa5fed012995301112ebb8226c50e6b17a11 -DIST zsdx-1.8.0.tar.gz 23129445 SHA256 9344d95d971aa7c6e61f0ed3f626b3a4f5343452a4be6b52b58c3b3e981a31b6 SHA512 17f498b1a2a914450769a0cceb3eb1b844d65e5b658fad40d59d78f21cf3e4dfe10e30b7adf94fdad398b203e4be095e78ae231d2c892e381fa56415a4ef2bde WHIRLPOOL 5adcacf90f4907f8335bb8dbb6f710d3b985519d6e232adcb13249be1b349070d584f7b3bf81fd9fdd3ba8c428f241174eee92fc82a8f246df8ad97d820cfe91 DIST zsdx-1.9.0.tar.gz 20757184 SHA256 140fb9b7de4937fdac6ff14d8339cc4314c7d4607339340fd17b520c4e87ae08 SHA512 2fc540d19856734050674945dd4903f254b325cab08ae0199722ae014447523ad9e979b54ddfd59d5cbc290b783481c79d5e155115c90f24feab5587d52804ee WHIRLPOOL 976c4b1c20480359383876054c5d3bebb94a13391bff02d6e81366e0bfddbe640678f738c8653999fa9db59d007bba1b5e7a27fca281df41c1547eebda67d084 diff --git a/games-rpg/zsdx/files/zsdx-1.8.0-paths.patch b/games-rpg/zsdx/files/zsdx-1.8.0-paths.patch deleted file mode 100644 index 2b3a0554d89c..000000000000 --- a/games-rpg/zsdx/files/zsdx-1.8.0-paths.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Julian Ospald -Date: Wed Jan 29 02:35:52 UTC 2014 -Subject: make paths modifiable - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,6 +3,10 @@ - - set(quest_name "zsdx") - -+set(DATAROOTDIR "share" CACHE PATH "dataroot dir") -+set(DATADIR "${DATAROOTDIR}/solarus" CACHE PATH "data dir") -+set(BINDIR "bin" CACHE PATH "bin dir") -+ - # data files list - file(GLOB_RECURSE data_files - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/data -@@ -47,7 +51,7 @@ - add_custom_command( - OUTPUT ${quest_name} - COMMAND echo '\#!/bin/sh' > ${quest_name} -- COMMAND echo 'solarus ${CMAKE_INSTALL_PREFIX}/share/solarus/${quest_name} $*' >> ${quest_name} -+ COMMAND echo 'solarus ${DATADIR}/${quest_name} $*' >> ${quest_name} - ) - add_custom_target(${quest_name}_command - ALL -@@ -56,11 +60,11 @@ - - # install the data archive - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/data.solarus -- DESTINATION share/solarus/${quest_name} -+ DESTINATION ${DATADIR}/${quest_name} - ) - - # install the script - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${quest_name} -- DESTINATION bin -+ DESTINATION ${BINDIR} - ) - diff --git a/games-rpg/zsdx/zsdx-1.8.0-r1.ebuild b/games-rpg/zsdx/zsdx-1.8.0-r1.ebuild deleted file mode 100644 index d17ebf4a6991..000000000000 --- a/games-rpg/zsdx/zsdx-1.8.0-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/zsdx/zsdx-1.8.0-r1.ebuild,v 1.1 2014/08/24 16:01:48 hasufell Exp $ - -EAPI=5 - -inherit cmake-utils gnome2-utils games - -DESCRIPTION="A free 2D Zelda fangame" -HOMEPAGE="http://www.solarus-games.org/" -SRC_URI="http://www.zelda-solarus.com/downloads/${PN}/${P}.tar.gz" - -LICENSE="all-rights-reserved CC-BY-SA-3.0 GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RESTRICT="mirror" - -RDEPEND=">=games-engines/solarus-1.2.0 - setProperty("image", data+2, this); -+ pInput->setProperty("image", data2.substr(2, 32), this); - return; - } - break; -@@ -1132,7 +1132,7 @@ - switch(data[1]) - { - case 'd': -- setGameDescription(pInput, data2.substr(2)); -+ setGameDescription(pInput, data2.substr(2, 64)); - return; - case 'c': - game->editConfiguration( pInput, data+2 ); diff --git a/games-server/monopd/files/monopd-0.9.3-gcc43.patch b/games-server/monopd/files/monopd-0.9.3-gcc43.patch deleted file mode 100644 index 553e17c81870..000000000000 --- a/games-server/monopd/files/monopd-0.9.3-gcc43.patch +++ /dev/null @@ -1,68 +0,0 @@ -http://bugs.gentoo.org/218833 - -fix building with gcc-4.3 - ---- monopd-0.9.3/src/cardgroup.cpp -+++ monopd-0.9.3/src/cardgroup.cpp -@@ -14,7 +14,7 @@ - // the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - // Boston, MA 02111-1307, USA. - --#include -+#include - - #include "card.h" - #include "cardgroup.h" ---- monopd-0.9.3/src/estategroup.cpp -+++ monopd-0.9.3/src/estategroup.cpp -@@ -14,6 +14,7 @@ - // the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - // Boston, MA 02111-1307, USA. - -+#include - #include - - #include ---- monopd-0.9.3/src/game.cpp -+++ monopd-0.9.3/src/game.cpp -@@ -20,7 +20,8 @@ - #include - #include - #include --#include // libstdc++ from the gcc 2.95 has no #include yet :( -+#include -+#include // libstdc++ from the gcc 2.95 has no #include yet :( - - #include - #include ---- monopd-0.9.3/src/main.cpp -+++ monopd-0.9.3/src/main.cpp -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - - #include - #include ---- monopd-0.9.3/src/player.cpp -+++ monopd-0.9.3/src/player.cpp -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - - #include - ---- monopd-0.9.3/src/server.cpp -+++ monopd-0.9.3/src/server.cpp -@@ -25,6 +25,8 @@ - #include - #include - #include -+#include -+#include - - #include - diff --git a/games-server/monopd/monopd-0.9.3-r1.ebuild b/games-server/monopd/monopd-0.9.3-r1.ebuild deleted file mode 100644 index 6a8624803c22..000000000000 --- a/games-server/monopd/monopd-0.9.3-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-server/monopd/monopd-0.9.3-r1.ebuild,v 1.5 2011/12/15 17:53:14 mr_bones_ Exp $ - -EAPI=2 -inherit eutils games - -DESCRIPTION="server for atlantik games" -HOMEPAGE="http://unixcode.org/monopd/" -SRC_URI="http://unixcode.org/downloads/monopd/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc x86" -IUSE="" - -RDEPEND=">=net-libs/libcapsinetwork-0.3.0" -DEPEND="${RDEPEND} - >=sys-libs/libmath++-0.0.3" - -src_prepare() { - epatch "${FILESDIR}"/${P}-gcc43.patch #218833 - epatch "${FILESDIR}"/${P}-dosfix.patch - # make the example config better (bug #206740) - sed -i \ - -e '/gatorhost/s/=.*/=monopd-gator.kde.org/' \ - conf/monopd.conf-dist \ - || die "sed failed" -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc doc/api/gameboard API AUTHORS ChangeLog NEWS README* TODO - doinitd "${FILESDIR}"/monopd || die - prepgamesdirs -} diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest index 328aa8577163..b35c0073f4e6 100644 --- a/games-simulation/openttd/Manifest +++ b/games-simulation/openttd/Manifest @@ -1,3 +1,2 @@ DIST openttd-1.3.3-source.tar.gz 9643325 SHA256 a21f9f5321ac70ffd2c0dbbb52021f00d4a55f66951e148e08fdcde4475c2d5c SHA512 d82d1f2b7653082a374c6a87cfef162dbf22032ff7e37fa2ab63c0cb1b570ee1a1bd01eec651459a38f79cc044cfb002c51180ebc7f859c6588746f9c80644a7 WHIRLPOOL 60b5be8eed979f01a490f739b36ae1198c0105c19cfc4ed76e79e8e6dd3d726b0d598a931b877f673244bf5c5a43510035c900821fffa18ed557d628b07b5c92 -DIST openttd-1.4.2-source.tar.gz 10066038 SHA256 3dcdbf6d4368bbbc3caeb1d0f06a26231580ebcdf3ac8abc6923be6043bb5e35 SHA512 9a356b3c1f56589a48cb80fdb0cfb9170d996a8301f3f541bc743a484315f71736ebf8354fc5576c3e02e6d7a724fe90cfb4811aeac0e67462ae02e805c0f9da WHIRLPOOL 7de171aef7d63a4340076f47647d8915969348d126031ebf7ef506161814eb15be69eeb962e58e264439a88012b3b5b30c6c47983633dcbd8c296aba010abb50 DIST openttd-1.4.4-source.tar.gz 9726516 SHA256 e5b6b72e37b796ae8b532cd8c96bd27cb6c6b58ecc0e9a5a17a0a80442b5c36d SHA512 52ff5f52b511c3e222a0231c902b0763611f64d5c003c99e1c50af951688458c5c56bdc002ddd1e3c936ed920f64054e68074994fd273d2f3614a3779bad66e1 WHIRLPOOL dd7ac08a337df4554683f0f9275bb50cca169206b38f7ebfa20b6ec8a62125c8c38d444c78bd6a6230095a65e6e02b477fe8734d8b0e6ee9025008ed8058bbd8 diff --git a/games-simulation/openttd/files/openttd-1.4.2-cflags.patch b/games-simulation/openttd/files/openttd-1.4.2-cflags.patch deleted file mode 100644 index 4a4503eb72e0..000000000000 --- a/games-simulation/openttd/files/openttd-1.4.2-cflags.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- config.lib.orig 2014-09-03 23:16:49.535086210 -0400 -+++ config.lib 2014-09-03 23:18:12.922857589 -0400 -@@ -1450,7 +1450,6 @@ - LDFLAGS="$LDFLAGS -noixemul" - fi - -- CFLAGS="-O2 -fomit-frame-pointer $CFLAGS" - else - OBJS_SUBDIR="debug" - -@@ -1461,14 +1460,6 @@ - CFLAGS="$CFLAGS -G0" - fi - fi -- if [ $enable_debug -ge 2 ]; then -- CFLAGS="$CFLAGS -fno-inline" -- fi -- if [ $enable_debug -ge 3 ]; then -- CFLAGS="$CFLAGS -O0" -- else -- CFLAGS="$CFLAGS -O2" -- fi - fi - - if [ $enable_debug -le 2 ]; then -@@ -1493,11 +1484,6 @@ - CFLAGS="$CFLAGS -fno-expensive-optimizations" - fi - -- if [ "$enable_profiling" != "0" ]; then -- CFLAGS="$CFLAGS -p" -- LDFLAGS="$LDFLAGS -pg" -- fi -- - if [ "$with_threads" = "0" ]; then - CFLAGS="$CFLAGS -DNO_THREADS" - fi diff --git a/games-simulation/openttd/openttd-1.4.2.ebuild b/games-simulation/openttd/openttd-1.4.2.ebuild deleted file mode 100644 index 33431e660a33..000000000000 --- a/games-simulation/openttd/openttd-1.4.2.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.4.2.ebuild,v 1.1 2014/09/04 08:06:53 mr_bones_ Exp $ - -EAPI=5 -inherit eutils gnome2-utils games - -DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe" -HOMEPAGE="http://www.openttd.org/" -SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png sse +timidity +truetype zlib" -RESTRICT="test" # needs a graphics set in order to test - -DEPEND="!dedicated? ( - media-libs/libsdl[sound,X,video] - icu? ( dev-libs/icu:= ) - truetype? ( - media-libs/fontconfig - media-libs/freetype:2 - sys-libs/zlib - ) - ) - lzo? ( dev-libs/lzo:2 ) - iconv? ( virtual/libiconv ) - png? ( media-libs/libpng ) - zlib? ( sys-libs/zlib )" -RDEPEND="${DEPEND}" -PDEPEND=" - !dedicated? ( - openmedia? ( - games-misc/openmsx - games-misc/opensfx - ) - aplaymidi? ( media-sound/alsa-utils ) - !aplaymidi? ( timidity? ( media-sound/timidity++ ) ) - ) - openmedia? ( >=games-misc/opengfx-0.4.7 )" - -src_prepare() { - epatch "${FILESDIR}"/${P}-cflags.patch - sed -i \ - -e '/Keywords/s/$/;/' \ - media/openttd.desktop.in || die -} - -src_configure() { - # there is an allegro interface available as well as sdl, but - # the configure for it looks broken so the sdl interface is - # always built instead. - local myopts=" --without-allegro" - - # libtimidity not needed except for some embedded platform - # nevertheless, it will be automagically linked if it is - # installed. Hence, we disable it. - myopts+=" --without-libtimidity" - - use debug && myopts+=" --enable-debug=3" - - if use dedicated ; then - myopts+=" --enable-dedicated" - else - use aplaymidi && myopts+=" --with-midi='/usr/bin/aplaymidi'" - myopts+=" - $(use_with truetype freetype) - $(use_with icu) - --with-sdl" - fi - if use png || { use !dedicated && use truetype; } || use zlib ; then - myopts+=" --with-zlib" - else - myopts+=" --without-zlib" - fi - - # configure is a hand-written bash-script, so econf will not work. - # It's all built as C++, upstream uses CFLAGS internally. - CFLAGS="" ./configure \ - --disable-strip \ - --prefix-dir="${EPREFIX}" \ - --binary-dir="${GAMES_BINDIR}" \ - --data-dir="${GAMES_DATADIR}/${PN}" \ - --install-dir="${D}" \ - --icon-dir=/usr/share/pixmaps \ - --menu-dir=/usr/share/applications \ - --icon-theme-dir=/usr/share/icons/hicolor \ - --man-dir=/usr/share/man/man6 \ - --doc-dir=/usr/share/doc/${PF} \ - --menu-group="Game;Simulation;" \ - ${myopts} \ - $(use_with iconv) \ - $(use_with png) \ - $(use_with sse) \ - $(use_with lzo liblzo2) \ - || die -} - -src_compile() { - emake VERBOSE=1 -} - -src_install() { - emake DESTDIR="${D}" install - if use dedicated ; then - newinitd "${FILESDIR}"/${PN}.initd ${PN} - rm -rf "${ED}"/usr/share/{applications,icons,pixmaps} - fi - rm -f "${ED}"/usr/share/doc/${PF}/COPYING - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - games_pkg_postinst - - if ! use lzo ; then - elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not" - elog "required, disabling it does mean that loading old savegames" - elog "or scenarios from ancient versions (~0.2) will fail." - elog - fi - - if use dedicated ; then - ewarn "Warning: The init script will kill all running openttd" - ewarn "processes when triggered, including any running client sessions!" - else - if use aplaymidi ; then - elog "You have emerged with 'aplaymidi' for playing MIDI." - elog "This option is for those with a hardware midi device," - elog "or who have set up ALSA to handle midi ports." - elog "You must set the environment variable ALSA_OUTPUT_PORTS." - elog "Available ports can be listed by using 'aplaymidi -l'." - else - if ! use timidity ; then - elog "OpenTTD was built with neither 'aplaymidi' nor 'timidity'" - elog "in USE. Music may or may not work in-game. If you happen" - elog "to have timidity++ installed, music will work so long" - elog "as it remains installed, but OpenTTD will not depend on it." - fi - fi - if ! use openmedia ; then - elog - elog "OpenTTD was compiled without the 'openmedia' USE flag." - elog - elog "In order to play, you must at least install:" - elog "games-misc/opengfx, and games-misc/opensfx, or copy the " - elog "following 6 files from a version of Transport Tycoon Deluxe" - elog "(windows or DOS) to ~/.openttd/data/ or" - elog "${GAMES_DATADIR}/${PN}/data/." - elog - elog "From the WINDOWS version you need: " - elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf" - elog "OR from the DOS version you need: " - elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF" - elog - elog "File names are case sensitive, but should work either with" - elog "all upper or all lower case names" - elog - elog "In addition, in-game music will be unavailable: for music," - elog "install games-misc/openmsx, or use the in-game download" - elog "functionality to get a music set" - elog - fi - fi -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-sports/dustrac/Manifest b/games-sports/dustrac/Manifest index e333fbbdee51..a07981b47c2d 100644 --- a/games-sports/dustrac/Manifest +++ b/games-sports/dustrac/Manifest @@ -1,2 +1 @@ -DIST dustrac-1.7.2.tar.gz 25825142 SHA256 368b03d1264e336d6dd6e84a1b60d9a149711cd08d93938bf059acc5ef15af7f SHA512 60fafec447cf7b68dfd67fc68a5f92a62d3a4ff553e03f1f685ecad251a47995a4cf84ef6ffa9dd821601f432a07999d3b8b97bb73f6861100846d6238003acd WHIRLPOOL f49dea4072b389e403392d2479d23118c4e6617b40858a57d21ac321c883d595625f385b64ae888db32afe04e2605ca05799bda58e3f810f4c652216aa7f19f9 DIST dustrac-1.7.3.tar.gz 25824731 SHA256 1ab0f2575d85be68bdb4463346a6815b60c7e2c055a6759dd1025a7333ee722d SHA512 daade9e0cd3501167da5a0fddf51a6d352665fd6348ba4931640e7bbbdeda3a43e25c93bc9ba569a5e0388097c342bd6c9aaafc39d9ab1b328e6db1672657c06 WHIRLPOOL ccfa9e12300323e302b73e073f4b52ccee285697cd7725b5440bcdc4d96cdc95d610816a9cb0b4532472a3268ddd59625936daba4badc6d43519dd5bec01519b diff --git a/games-sports/dustrac/dustrac-1.7.2.ebuild b/games-sports/dustrac/dustrac-1.7.2.ebuild deleted file mode 100644 index e840a28e8fab..000000000000 --- a/games-sports/dustrac/dustrac-1.7.2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-sports/dustrac/dustrac-1.7.2.ebuild,v 1.1 2014/07/28 17:59:51 hasufell Exp $ - -EAPI=5 - -inherit eutils gnome2-utils cmake-utils games - -DESCRIPTION="Tile-based, cross-platform 2D racing game" -HOMEPAGE="http://dustrac.sourceforge.net/" -SRC_URI="mirror://sourceforge/dustrac/${P}.tar.gz" - -LICENSE="GPL-3 CC-BY-NC-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qtopengl:4 - media-libs/libvorbis - media-libs/openal - media-libs/mesa[gles2]" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.6.3-cmake.patch \ - "${FILESDIR}"/${PN}-1.6.3-desktopfile.patch -} - -src_configure() { - # build failure without gles 2.0 - local mycmakeargs=( - -DGLES=ON - -DGL30=ON - -DReleaseBuild=ON - -DDATA_PATH="${GAMES_DATADIR}/${PN}" - -DBIN_PATH="${GAMES_BINDIR}" - -DDOC_PATH=/usr/share/doc/${PF} - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-sports/dustrac/dustrac-1.7.3.ebuild b/games-sports/dustrac/dustrac-1.7.3.ebuild index b3e3743dd3f8..5b0a32fc120c 100644 --- a/games-sports/dustrac/dustrac-1.7.3.ebuild +++ b/games-sports/dustrac/dustrac-1.7.3.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-sports/dustrac/dustrac-1.7.3.ebuild,v 1.1 2014/08/24 16:24:11 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-sports/dustrac/dustrac-1.7.3.ebuild,v 1.2 2015/01/26 22:10:14 mr_bones_ Exp $ EAPI=5 - inherit eutils gnome2-utils cmake-utils games DESCRIPTION="Tile-based, cross-platform 2D racing game" @@ -26,8 +25,9 @@ DEPEND="${RDEPEND} virtual/pkgconfig" src_prepare() { - epatch "${FILESDIR}"/${P}-cmake.patch \ - "${FILESDIR}"/${PN}-1.6.3-desktopfile.patch + epatch \ + "${FILESDIR}"/${P}-cmake.patch \ + "${FILESDIR}"/${P}-desktopfile.patch } src_configure() { diff --git a/games-sports/dustrac/files/dustrac-1.6.3-cmake.patch b/games-sports/dustrac/files/dustrac-1.6.3-cmake.patch deleted file mode 100644 index 335fd46accf6..000000000000 --- a/games-sports/dustrac/files/dustrac-1.6.3-cmake.patch +++ /dev/null @@ -1,79 +0,0 @@ -From: Julian Ospald -Date: Wed Dec 25 22:55:09 UTC 2013 -Subject: respect flags, fix installation - ---- dustrac-1.6.2/CMakeLists.txt -+++ dustrac-1.6.2/CMakeLists.txt -@@ -43,7 +43,7 @@ - endif() - - set(CMAKE_VERBOSE_MAKEFILE OFF) --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -W -Wall -O3 -pedantic") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -W -Wall") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fomit-frame-pointer -finline-functions -ffast-math") - - set(GAME_BINARY_NAME "dustrac-game") ---- dustrac-1.6.2/src/game/CMakeLists.txt -+++ dustrac-1.6.2/src/game/CMakeLists.txt -@@ -128,16 +128,11 @@ - - # Copy desktop file - if(ReleaseBuild AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux") -- set(DesktopFileSourcePath) - if(USC) -- set(DesktopFileSourcePath ${CMAKE_SOURCE_DIR}/src/dustrac-game.desktop.opt.in) -+ configure_file(${CMAKE_SOURCE_DIR}/src/dustrac-game.desktop.opt.in ${CMAKE_BINARY_DIR}/src/dustrac-game.desktop) - else() -- set(DesktopFileSourcePath ${CMAKE_SOURCE_DIR}/src/dustrac-game.desktop.in) -+ configure_file(${CMAKE_SOURCE_DIR}/src/dustrac-game.desktop.in ${CMAKE_BINARY_DIR}/src/dustrac-game.desktop) - endif() -- add_custom_target(desktop-file-game ALL -- COMMAND cmake -E copy ${DesktopFileSourcePath} -- ${CMAKE_BINARY_DIR}/dustrac-game.desktop -- DEPENDS ${GAME_BINARY_NAME}) - endif() - - # Resource compilation for MinGW ---- dustrac-1.6.2/src/editor/CMakeLists.txt -+++ dustrac-1.6.2/src/editor/CMakeLists.txt -@@ -76,16 +76,11 @@ - - # Copy desktop file - if(ReleaseBuild AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux") -- set(DesktopFileSourcePath) - if(USC) -- set(DesktopFileSourcePath ${CMAKE_SOURCE_DIR}/src/dustrac-editor.desktop.opt.in) -+ configure_file(${CMAKE_SOURCE_DIR}/src/dustrac-editor.desktop.opt.in ${CMAKE_BINARY_DIR}/src/dustrac-editor.desktop) - else() -- set(DesktopFileSourcePath ${CMAKE_SOURCE_DIR}/src/dustrac-editor.desktop.in) -+ configure_file(${CMAKE_SOURCE_DIR}/src/dustrac-editor.desktop.in ${CMAKE_BINARY_DIR}/src/dustrac-editor.desktop) - endif() -- add_custom_target(desktop-file-editor ALL -- COMMAND cmake -E copy ${DesktopFileSourcePath} -- ${CMAKE_BINARY_DIR}/dustrac-editor.desktop -- DEPENDS ${EDITOR_BINARY_NAME}) - endif() - - # Add the executable ---- dustrac-1.6.2/InstallLinux.cmake -+++ dustrac-1.6.2/InstallLinux.cmake -@@ -58,7 +58,7 @@ - install(FILES data/fonts.conf DESTINATION ${DATA_PATH}) - install(FILES data/meshes.conf DESTINATION ${DATA_PATH}) - install(FILES data/textures.conf DESTINATION ${DATA_PATH}) -- install(FILES AUTHORS CHANGELOG COPYING README DESTINATION ${DOC_PATH}) -+ install(FILES AUTHORS CHANGELOG README DESTINATION ${DOC_PATH}) - install(DIRECTORY data/images DESTINATION ${DATA_PATH} FILES_MATCHING PATTERN "*.jpg") - install(DIRECTORY data/images DESTINATION ${DATA_PATH} FILES_MATCHING PATTERN "*.png") - install(DIRECTORY data/levels DESTINATION ${DATA_PATH} FILES_MATCHING PATTERN "*.trk") -@@ -69,8 +69,8 @@ - - if(ReleaseBuild) - # Install .desktop files -- install(FILES dustrac-game.desktop DESTINATION share/applications) -- install(FILES dustrac-editor.desktop DESTINATION share/applications) -+ install(FILES ${CMAKE_BINARY_DIR}/src/dustrac-game.desktop DESTINATION share/applications) -+ install(FILES ${CMAKE_BINARY_DIR}/src/dustrac-editor.desktop DESTINATION share/applications) - - # Install icons - install(FILES data/icons/dustrac-game.png DESTINATION share/pixmaps) diff --git a/games-sports/dustrac/files/dustrac-1.6.3-desktopfile.patch b/games-sports/dustrac/files/dustrac-1.7.3-desktopfile.patch similarity index 100% rename from games-sports/dustrac/files/dustrac-1.6.3-desktopfile.patch rename to games-sports/dustrac/files/dustrac-1.7.3-desktopfile.patch diff --git a/games-strategy/lightyears/lightyears-1.4.ebuild b/games-strategy/lightyears/lightyears-1.4.ebuild deleted file mode 100644 index 7830844daddb..000000000000 --- a/games-strategy/lightyears/lightyears-1.4.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/lightyears/lightyears-1.4.ebuild,v 1.3 2012/01/21 16:11:10 phajdan.jr Exp $ - -EAPI=3 -PYTHON_DEPEND="2" -inherit eutils python games - -DESCRIPTION="a single-player game with a science-fiction theme" -HOMEPAGE="http://www.jwhitham.org.uk/20kly/" -SRC_URI="http://www.jwhitham.org.uk/20kly/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="dev-python/pygame" - -src_prepare() { - epatch "${FILESDIR}/${P}"-gentoo.patch - sed -i \ - -e "s:@GENTOO_LIBDIR@:$(games_get_libdir)/${PN}:" \ - -e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \ - ${PN} || die "Changing library path failed" - python_convert_shebangs -r 2 . -} - -src_install() { - dogamesbin ${PN} || die "dogamesbin failed" - - insinto "$(games_get_libdir)/${PN}" - doins code/*.py || die "doins code failed" - - dodoc README.txt - - insinto "${GAMES_DATADIR}/${PN}" - doins -r audio data manual || die "doins data failed" - - newicon data/32.png ${PN}.png - make_desktop_entry ${PN} "Light Years Into Space" - prepgamesdirs -} - -pkg_setup() { - python_set_active_version 2 - games_pkg_setup -} - -pkg_postinst() { - python_mod_optimize "$(games_get_libdir)/${PN}" - games_pkg_postinst -} - -pkg_postrm() { - python_mod_cleanup "$(games_get_libdir)/${PN}" -} diff --git a/games-strategy/liquidwar6/Manifest b/games-strategy/liquidwar6/Manifest index ce0014e62a51..d0b5f1a76c85 100644 --- a/games-strategy/liquidwar6/Manifest +++ b/games-strategy/liquidwar6/Manifest @@ -1,6 +1,2 @@ -DIST liquidwar6-0.0.13beta.tar.gz 25544158 SHA256 a27332c451460617e2833aaeaf81ed153a7270f87b1c322814c049b43e3f4eca SHA512 505067665fc48d5044f887a7a95a449569bb8c112f9ac975623d22ede8692afa6fc949b15395175a39395161616fedb0b429d737aa4d115e3b392d3e2b51eff6 WHIRLPOOL 341a4544a215a11322bbb478ace8a6844882340b1c8a3c0a0d6ab43b03766897e29a2d00dce14dd9a1f32b39a3178052526bb934789a4848170aa60264c769b6 -DIST liquidwar6-0.2.3551.tar.gz 26483549 SHA256 7f0dc9cba9fff4c2a2896108bda97fd055edef51e48779d2bb1fc268361692d9 SHA512 9ad976a6b2f2c31eada755f3d5740ca2f31ee91136ce52b57118eee607e65ec171d9cd60a84e6ffa7325e9d0a26c168c339f063007bcb707e365c955ed7a48dd WHIRLPOOL 26fe36cc87ce5efc022159a288b5e17bf9252688eedfb451071fe6702bdce621c35014752582cf8ad0798c60a589018855551271bd8f1cc9dab884468949cac5 DIST liquidwar6-0.4.3681.tar.gz 26531646 SHA256 942f5547199462fea521717b94517d6415d90573d948e94922f7b15271a4a8e0 SHA512 4154c8d3c2ceb128cf2d27a4682c89a30d3610f695b2e05f8d4e33c13fb54aaab3bb4a2b5c6dbcc43ff5d24991ea57a521716c94e15d8dd05dc384c22a37f52a WHIRLPOOL 4f502f572082c89469126eb97cfb181c28980783203f73b51a577c9a9e6cd28936f76c50892757320cb8dbee8b44319790a5ca7715d7cf096664043233fd5647 -DIST liquidwar6-extra-maps-0.0.13beta.tar.gz 16066532 SHA256 f6bab8b5746f02f50ef2800a94a86eedb6e9cbf919d60921e62a1f965511d2dd SHA512 0f3b742e498c3f2e8354fb53f057d0fed0af3b1edfef41a7688ce7871c229908b2c1ca2f06556a803e7ecb491a6592282ed6291a1b271263a9dc3e634d481fa2 WHIRLPOOL dd7b655dde9066a2d16072140f132e34d58d3fc444cd2f31355af5e335a84d95805f879dae2fc6f8c7624a409de7e31be4c3bd80695e5a1aa70f4cf9cfb87b02 -DIST liquidwar6-extra-maps-0.2.3551.tar.gz 16183550 SHA256 1acb398907d2c89e26f0f7baae11e88024968be52fa0c6534ce8305b32271f6b SHA512 da2bb6dae319a7a0b430467166395d5e433cca112cd867a93f02eee5472412831118a9e2a7657430c4c7296065d91df2264f69a41ae1f6b75807fa9be67d5338 WHIRLPOOL bd6aef458f3ee96be08f01c81bbe38d93ade67076daf34780d03a9ab342030cef072a84d48e3752ef5f67939d2cae658d93dc14d875c0204f234c6f549ca4b29 DIST liquidwar6-extra-maps-0.4.3681.tar.gz 16191302 SHA256 32ffe94781aade93ca26919220b434a26dbde9260655bf6733f19d5df41abc65 SHA512 e767adc4402f803824145fd12f79eb2cbf9b34aea12065123a558dfb6704bd7ab1861b453e794f7a612d4fa75d0f6024ef410b2700eea08a279d6857b9dc2ba7 WHIRLPOOL d53b3e28b4a26aba780e35a825c1fa7f33ea00bf4884b44685a550cf6c04d0a2cf296dd29ecf5d7884ca91a8f560988dce7b4ae1c819a92bbaa5cc59900e154b diff --git a/games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-ldconfig.patch b/games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-ldconfig.patch deleted file mode 100644 index a9cbff467097..000000000000 --- a/games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-ldconfig.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit b69515e24f9ea066a7e393fa7b364e0701a8f58c -Author: hasufell -Date: Mon Sep 30 00:11:04 2013 +0200 - - don't run ldconfig - -diff --git a/src/Makefile.am b/src/Makefile.am -index da78107..a0961b8 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -55,7 +55,6 @@ EXTRA_DIST = scriptpo.c indent.sh scriptpo-update.sh stamp.sh clean.sh dtou.sh u - SUBDIRS = lib - - install-exec-local: -- if which id && which ldconfig && test `id -u` -eq 0 && test "$(prefix)" != "/usr"; then ldconfig; fi # Run ldconfig automatically if we're root - if test -x $(DESTDIR)$(bindir)/liquidwar6; then mv $(DESTDIR)$(bindir)/liquidwar6 $(DESTDIR)$(bindir)/@PACKAGE_TARNAME@-@PACKAGE_VERSION@; ln -s @PACKAGE_TARNAME@-@PACKAGE_VERSION@ $(DESTDIR)$(bindir)/liquidwar6; fi - - uninstall-local: diff --git a/games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-libpng-1.6.patch b/games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-libpng-1.6.patch deleted file mode 100644 index e5dec5d87610..000000000000 --- a/games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-libpng-1.6.patch +++ /dev/null @@ -1,43 +0,0 @@ -commit 0246d8e24c49e2ed12c183f0cde08d2e16b4c299 -Author: hasufell -Date: Mon Sep 30 00:10:54 2013 +0200 - - allow building with libpng-1.6 - -diff --git a/configure.ac b/configure.ac -index 2a8cba9..334b96e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -47,7 +47,7 @@ LW6_CODENAME="Blackbeard" - AC_SUBST(LW6_CODENAME) - - dnl Headers, some are optional --AC_CHECK_HEADERS(arpa/inet.h ctype.h dirent.h errno.h execinfo.h expat.h fcntl.h gmp.h GL/gl.h GL/glu.h iconv.h ifaddrs.h jpeglib.h langinfo.h libintl.h libpng12/png.h libpng13/png.h libpng14/png.h libpng15/png.h lmcons.h limits.h locale.h ltdl.h mach/vm_statistics.h mach/mach_types.h mach/mach_init.h mach/mach_host.h math.h netdb.h netinet/in.h omp.h pthread.h readline/history.h readline/readline.h SDL/SDL.h SDL/SDL_image.h SDL/SDL_mixer.h SDL/SDL_ttf.h signal.h stdarg.h stdio.h stdlib.h string.h syslog.h sys/select.h sys/signal.h sys/socket.h sys/stat.h sys/sysinfo.h sys/time.h sys/types.h sys/utsname.h time.h unistd.h winbase.h windows.h winsock2.h) -+AC_CHECK_HEADERS(arpa/inet.h ctype.h dirent.h errno.h execinfo.h expat.h fcntl.h gmp.h GL/gl.h GL/glu.h iconv.h ifaddrs.h jpeglib.h langinfo.h libintl.h libpng12/png.h libpng13/png.h libpng14/png.h libpng15/png.h libpng16/png.h lmcons.h limits.h locale.h ltdl.h mach/vm_statistics.h mach/mach_types.h mach/mach_init.h mach/mach_host.h math.h netdb.h netinet/in.h omp.h pthread.h readline/history.h readline/readline.h SDL/SDL.h SDL/SDL_image.h SDL/SDL_mixer.h SDL/SDL_ttf.h signal.h stdarg.h stdio.h stdlib.h string.h syslog.h sys/select.h sys/signal.h sys/socket.h sys/stat.h sys/sysinfo.h sys/time.h sys/types.h sys/utsname.h time.h unistd.h winbase.h windows.h winsock2.h) - - AM_MISSING_PROG(PERL, perl, ${missing_dir}) - AM_MISSING_PROG(AWK, awk, ${missing_dir}) -@@ -319,7 +319,8 @@ AC_CHECK_HEADER(libpng12/png.h, HAVE_LIBPNG12_PNG_H=1) - AC_CHECK_HEADER(libpng13/png.h, HAVE_LIBPNG13_PNG_H=1) - AC_CHECK_HEADER(libpng14/png.h, HAVE_LIBPNG14_PNG_H=1) - AC_CHECK_HEADER(libpng15/png.h, HAVE_LIBPNG15_PNG_H=1) --if test x${HAVE_LIBPNG12_PNG_H} = x1 || test x${HAVE_LIBPNG13_PNG_H} = x1 || test x${HAVE_LIBPNG14_PNG_H} = x1 || test x${HAVE_LIBPNG15_PNG_H} = x1; then -+AC_CHECK_HEADER(libpng16/png.h, HAVE_LIBPNG16_PNG_H=1) -+if test x${HAVE_LIBPNG12_PNG_H} = x1 || test x${HAVE_LIBPNG13_PNG_H} = x1 || test x${HAVE_LIBPNG14_PNG_H} = x1 || test x${HAVE_LIBPNG15_PNG_H} = x1 || test x${HAVE_LIBPNG16_PNG_H} = x1; then - if test x${HAVE_LIBPNG12_PNG_H} = x1; then - LIBPNG_1X_H=libpng12/png.h - fi -@@ -332,9 +333,12 @@ if test x${HAVE_LIBPNG12_PNG_H} = x1 || test x${HAVE_LIBPNG13_PNG_H} = x1 || tes - if test x${HAVE_LIBPNG15_PNG_H} = x1; then - LIBPNG_1X_H=libpng15/png.h - fi -+ if test x${HAVE_LIBPNG16_PNG_H} = x1; then -+ LIBPNG_1X_H=libpng16/png.h -+ fi - else - AC_MSG_ERROR([ --*** Liquid War 6 needs libpng 1.2 1.3 1.4 or 1.5 (http://www.libpng.org/pub/png/libpng.html) -+*** Liquid War 6 needs libpng 1.2 1.3 1.4 1.5 or 1.6 (http://www.libpng.org/pub/png/libpng.html) - ]) - fi - AC_SUBST(LIBPNG_1X_H) diff --git a/games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-paths.patch b/games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-paths.patch deleted file mode 100644 index 2ae15b80dfb4..000000000000 --- a/games-strategy/liquidwar6/files/liquidwar6-0.0.13_beta-paths.patch +++ /dev/null @@ -1,56 +0,0 @@ -commit e204ce228f5aafc7efd2c09fb4b0bfefe9708dfe -Author: hasufell -Date: Mon Sep 30 00:19:48 2013 +0200 - - make paths modifiable - -diff --git a/configure.ac b/configure.ac -index 334b96e..d846210 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -698,6 +698,20 @@ else - fi - AC_SUBST(VALGRIND_CFLAGS) - -+AC_ARG_WITH([iconsdir], -+ [AS_HELP_STRING([--with-iconsdir=DIR], -+ [path where icons get installed (default: $datadir/icons/hicolor/48x48/apps)])], -+ [ICONSDIR="$withval"], -+ [ICONSDIR='$(datadir)/pixmaps']) -+AC_SUBST(ICONSDIR) -+ -+AC_ARG_WITH([desktopdir], -+ [AS_HELP_STRING([--with-desktopdir=DIR], -+ [path where desktop files get installed (default: $datadir/applications)])], -+ [DESKTOPDIR="$withval"], -+ [DESKTOPDIR='$(datadir)/applications']) -+AC_SUBST(DESKTOPDIR) -+ - if test x${USE_INCLUDED_LIBINTL} = xyes ; then - LW6_LIBINTL_LDFLAGS= - LW6_LIBINTL_LDADD=${LTLIBINTL} -diff --git a/data/icon/Makefile.am b/data/icon/Makefile.am -index b4d5ae4..f9b738c 100644 ---- a/data/icon/Makefile.am -+++ b/data/icon/Makefile.am -@@ -19,6 +19,6 @@ - # Contact author : ufoot@ufoot.org - - pkgdata_DATA = liquidwar6.png liquidwar6.xpm --pkgdatadir = $(datadir)/pixmaps -+pkgdatadir = $(ICONSDIR) - EXTRA_DIST = $(pkgdata_DATA) liquidwar6.ico liquidwar6.icns - -diff --git a/pkg/Makefile.am b/pkg/Makefile.am -index 37f73ee..1980369 100644 ---- a/pkg/Makefile.am -+++ b/pkg/Makefile.am -@@ -19,7 +19,7 @@ - # Contact author : ufoot@ufoot.org - - pkgdata_DATA = liquidwar6.desktop --pkgdatadir = $(datadir)/applications -+pkgdatadir = $(DESKTOPDIR) - EXTRA_DIST = $(pkgdata_DATA) liquidwar6.spec liquidwar6d - - distclean-local: diff --git a/games-strategy/liquidwar6/files/liquidwar6-0.2.3551-ldconfig.patch b/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-ldconfig.patch similarity index 90% rename from games-strategy/liquidwar6/files/liquidwar6-0.2.3551-ldconfig.patch rename to games-strategy/liquidwar6/files/liquidwar6-0.4.3681-ldconfig.patch index d1a6685ca606..dd5e702b6144 100644 --- a/games-strategy/liquidwar6/files/liquidwar6-0.2.3551-ldconfig.patch +++ b/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-ldconfig.patch @@ -4,8 +4,6 @@ Date: Wed Jan 8 17:21:09 2014 +0100 don't run ldconfig -diff --git a/src/Makefile.am b/src/Makefile.am -index f319a74..47463c1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -65,7 +65,6 @@ EXTRA_DIST = scriptpo.c indent.sh scriptpo-update.sh stamp.sh clean.sh dtou.sh u diff --git a/games-strategy/liquidwar6/files/liquidwar6-0.2.3551-paths.patch b/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-paths.patch similarity index 82% rename from games-strategy/liquidwar6/files/liquidwar6-0.2.3551-paths.patch rename to games-strategy/liquidwar6/files/liquidwar6-0.4.3681-paths.patch index c77251d3f999..3ac69032471e 100644 --- a/games-strategy/liquidwar6/files/liquidwar6-0.2.3551-paths.patch +++ b/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-paths.patch @@ -4,8 +4,6 @@ Date: Wed Jan 8 17:23:56 2014 +0100 respect datarootdir -diff --git a/data/icon/Makefile.am b/data/icon/Makefile.am -index 0bca199..ae5cf79 100644 --- a/data/icon/Makefile.am +++ b/data/icon/Makefile.am @@ -19,6 +19,6 @@ @@ -16,8 +14,6 @@ index 0bca199..ae5cf79 100644 +pkgdatadir = $(datarootdir)/pixmaps EXTRA_DIST = $(pkgdata_DATA) liquidwar6.ico liquidwar6.icns -diff --git a/pkg/Makefile.am b/pkg/Makefile.am -index 6fc2957..ac86bb8 100644 --- a/pkg/Makefile.am +++ b/pkg/Makefile.am @@ -19,7 +19,7 @@ diff --git a/games-strategy/liquidwar6/liquidwar6-0.0.13_beta.ebuild b/games-strategy/liquidwar6/liquidwar6-0.0.13_beta.ebuild deleted file mode 100644 index 774e3a48f4a0..000000000000 --- a/games-strategy/liquidwar6/liquidwar6-0.0.13_beta.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar6/liquidwar6-0.0.13_beta.ebuild,v 1.3 2014/05/15 17:05:28 ulm Exp $ - -EAPI=5 - -inherit autotools eutils toolchain-funcs games - -MY_PV=${PV/_beta/beta} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Unique multiplayer wargame between liquids" -HOMEPAGE="http://www.gnu.org/software/liquidwar6/" -SRC_URI="http://www.ufoot.org/download/liquidwar/v6/${MY_PV}/${MY_P}.tar.gz - maps? ( http://www.ufoot.org/download/liquidwar/v6/${MY_PV}/${PN}-extra-maps-${MY_PV}.tar.gz )" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc gtk +maps nls +ogg openmp readline" - -RDEPEND="dev-db/sqlite:3 - dev-libs/expat - dev-scheme/guile - media-libs/freetype:2 - media-libs/libpng:0 - media-libs/libsdl[X,opengl,video] - media-libs/sdl-image[jpeg,png] - media-libs/sdl-ttf - net-misc/curl - sys-libs/zlib - virtual/glu - virtual/jpeg - virtual/opengl - gtk? ( x11-libs/gtk+:2 ) - nls? ( virtual/libintl - virtual/libiconv ) - ogg? ( - media-libs/libsdl[X,sound,opengl,video] - media-libs/sdl-mixer[vorbis] - ) - readline? ( sys-libs/ncurses - sys-libs/readline )" -DEPEND="${RDEPEND} - dev-lang/perl - nls? ( sys-devel/gettext )" - -S=${WORKDIR}/${MY_P} -S_MAPS=${WORKDIR}/${PN}-extra-maps-${MY_PV} - -pkg_setup() { - if use openmp; then - if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp ; then - ewarn "OpenMP is not available in your current selected gcc" - die "need openmp capable gcc" - fi - fi - games_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-libpng-1.6.patch \ - "${FILESDIR}"/${P}-ldconfig.patch \ - "${FILESDIR}"/${P}-paths.patch - eautoreconf -} - -src_configure() { - egamesconf \ - $(use_enable nls) \ - --enable-mod-gl \ - $(use_enable gtk) \ - $(use_enable openmp) \ - $(use_enable ogg mod-ogg) \ - $(use_enable !ogg silent) \ - $(use_enable readline console) \ - --disable-static \ - --mandir=/usr/share/man \ - --docdir=/usr/share/doc/${PF} \ - --htmldir=/usr/share/doc/${PF}/html \ - --with-iconsdir=/usr/share/pixmaps \ - --with-desktopdir=/usr/share/applications - - if use maps; then - cd "${S_MAPS}" || die - egamesconf - fi -} - -src_compile() { - default - use doc && emake html - use maps && emake -C "${S_MAPS}" -} - -src_install() { - emake DESTDIR="${D}" install - use maps && emake -C "${S_MAPS}" DESTDIR="${D}" install - prune_libtool_files --all - prepgamesdirs -} diff --git a/games-strategy/liquidwar6/liquidwar6-0.2.3551.ebuild b/games-strategy/liquidwar6/liquidwar6-0.2.3551.ebuild deleted file mode 100644 index b68594307b03..000000000000 --- a/games-strategy/liquidwar6/liquidwar6-0.2.3551.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar6/liquidwar6-0.2.3551.ebuild,v 1.3 2014/11/06 05:55:34 vapier Exp $ - -EAPI=5 - -inherit autotools eutils toolchain-funcs games - -MY_PV=${PV/_beta/beta} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Unique multiplayer wargame between liquids" -HOMEPAGE="http://www.gnu.org/software/liquidwar6/" -SRC_URI="http://www.ufoot.org/download/liquidwar/v6/${MY_PV}/${MY_P}.tar.gz - maps? ( http://www.ufoot.org/download/liquidwar/v6/${MY_PV}/${PN}-extra-maps-${MY_PV}.tar.gz )" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc gles2 gtk libcaca +maps nls +ogg openmp readline test" - -# yes, cunit is rdep -RDEPEND="dev-db/sqlite:3 - dev-libs/expat - dev-scheme/guile - dev-util/cunit - media-libs/freetype:2 - media-libs/libpng:0 - media-libs/libsdl[X,opengl,video] - media-libs/sdl-image[jpeg,png] - media-libs/sdl-ttf - net-misc/curl - dev-libs/libltdl:0 - sys-libs/zlib - virtual/glu - virtual/jpeg - virtual/opengl - libcaca? ( media-libs/libcaca ) - gles2? ( media-libs/mesa[gles2] ) - gtk? ( x11-libs/gtk+:2 ) - nls? ( virtual/libintl - virtual/libiconv ) - ogg? ( - media-libs/libsdl[X,sound,opengl,video] - media-libs/sdl-mixer[vorbis] - ) - readline? ( sys-libs/ncurses - sys-libs/readline )" -DEPEND="${RDEPEND} - dev-lang/perl - nls? ( sys-devel/gettext )" - -S=${WORKDIR}/${MY_P} -S_MAPS=${WORKDIR}/${PN}-extra-maps-${MY_PV} - -pkg_setup() { - if use openmp; then - if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp ; then - ewarn "OpenMP is not available in your current selected gcc" - die "need openmp capable gcc" - fi - fi - games_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-{ldconfig,paths}.patch - - sed -i \ - -e 's/-Werror//' \ - configure.ac || die - eautoreconf -} - -src_configure() { - # configure fails with cunit disabled - egamesconf \ - $(use_enable nls) \ - --enable-cunit \ - $(use_enable gtk) \ - --enable-mod-gl1 \ - $(use_enable gles2 mod-gles2) \ - $(use_enable libcaca mod-caca) \ - $(use_enable openmp) \ - $(use_enable ogg mod-ogg) \ - $(use_enable !ogg silent) \ - $(use_enable readline console) \ - --disable-static \ - --datarootdir=/usr/share \ - --mandir=/usr/share/man \ - --docdir=/usr/share/doc/${PF} \ - --htmldir=/usr/share/doc/${PF}/html - - if use maps; then - cd "${S_MAPS}" || die - egamesconf - fi -} - -src_compile() { - default - use doc && emake html - use maps && emake -C "${S_MAPS}" -} - -src_install() { - emake DESTDIR="${D}" install - use maps && emake -C "${S_MAPS}" DESTDIR="${D}" install - prune_libtool_files --all - prepgamesdirs -} diff --git a/games-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild b/games-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild index 33ade918ca23..8b7d35ac7069 100644 --- a/games-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild +++ b/games-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild,v 1.6 2014/11/06 05:55:34 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild,v 1.7 2015/01/26 17:41:27 mr_bones_ Exp $ EAPI=5 @@ -65,8 +65,9 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}"/${PN}-0.2.3551-{ldconfig,paths}.patch \ - "${FILESDIR}"/${PN}-0.4.3681-check-headers.patch + epatch \ + "${FILESDIR}"/${P}-{ldconfig,paths}.patch \ + "${FILESDIR}"/${P}-check-headers.patch sed -i \ -e 's/-Werror//' \ diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest index 605f440df978..ac8c49c95319 100644 --- a/games-strategy/wesnoth/Manifest +++ b/games-strategy/wesnoth/Manifest @@ -1,3 +1,2 @@ DIST wesnoth-1.10.7.tar.bz2 347431490 SHA256 8a3b5a3409a57b646536e547094e1bb8bcd87797e00cd63184152222e377253e SHA512 3df710bfc9d5737b651dc7520d9692a6a12f8c5c41db518d36c45dfda072f42073059c2d31dc8a835b1b6d4956921ae75484750c51d9175266c96dc2297d2b8d WHIRLPOOL a190a1cae2fdb885a3ff7908a21646306eb5bca22eb4417b258cf7640fab67fb01582f8c5afac2ee9f496443686f9a9e0d1d28aaad8de30722d2669a9dcddb21 DIST wesnoth-1.12.1.tar.bz2 384386961 SHA256 70404764370db05e496a4e033e09c26cdc47fa6558271d803a44c4ebb7b6efe8 SHA512 6b0904c90414dbd90d3916f129611ed2630940dd47cd217c929c5a93afd04e6bd9e16b7e3e8185888ae2347f5994acbcc31622a29403e932161f3f8c86223589 WHIRLPOOL 99e7c301c354b545f5c6fa7c28f39465e2806c3b09074b4ecf50aa027f47c491605944519236d0557d24af4facb1b08520b46edbfdab1bbd670b687a4bd0ec5c -DIST wesnoth-1.12.tar.bz2 385428948 SHA256 9e2b15cf6196ae7059fc48b5483aa6973473688602958dd64211b1775b513e0a SHA512 6b39b8a27e4d86b1055bd69a8baad247acbf4c50f2b80ab4681e47e9d8e5095e9ad55d9c3fc18f8dc649ee3e72554c084d005e61799bcfc258dd5573bd07fe4e WHIRLPOOL c35abaf2346e0d3f135f8e0e7894786f30c36f5671f328043a04b507da618f7d0789451631db9ad0e5ad538adb222ffcfdc81447b278f77d7c37c3406a8bb401 diff --git a/games-strategy/wesnoth/files/wesnoth-1.12-cmake.patch b/games-strategy/wesnoth/files/wesnoth-1.12-cmake.patch deleted file mode 100644 index 767dd6c8a3ae..000000000000 --- a/games-strategy/wesnoth/files/wesnoth-1.12-cmake.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- CMakeLists.txt.orig 2015-01-19 18:46:51.019420318 -0500 -+++ CMakeLists.txt 2015-01-19 18:47:15.977567447 -0500 -@@ -590,13 +590,14 @@ - endif(LIBDBUS_FOUND) - endif(ENABLE_NOTIFICATIONS) - -- if(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA) -- find_package( Boost 1.44 REQUIRED COMPONENTS filesystem ) -- find_package( Boost 1.48 REQUIRED COMPONENTS locale ) -- endif(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA) -- - endif(ENABLE_GAME) - -+if(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA) -+ find_package( Boost 1.44 REQUIRED COMPONENTS filesystem ) -+ find_package( Boost 1.48 REQUIRED COMPONENTS locale ) -+endif(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA) -+ -+ - if(ENABLE_POT_UPDATE_TARGET) - find_package(TranslationTools REQUIRED) - endif(ENABLE_POT_UPDATE_TARGET) diff --git a/games-strategy/wesnoth/wesnoth-1.12.ebuild b/games-strategy/wesnoth/wesnoth-1.12.ebuild deleted file mode 100644 index 8891d825fc64..000000000000 --- a/games-strategy/wesnoth/wesnoth-1.12.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.12.ebuild,v 1.2 2015/01/20 01:25:36 mr_bones_ Exp $ - -EAPI=5 -inherit cmake-utils eutils multilib toolchain-funcs flag-o-matic games - -DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game" -HOMEPAGE="http://www.wesnoth.org/" -SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="dbus dedicated doc fribidi nls server" - -RDEPEND=">=media-libs/libsdl-1.2.7:0[joystick,video,X] - media-libs/sdl-net - !dedicated? ( - >=media-libs/sdl-ttf-2.0.8 - >=media-libs/sdl-mixer-1.2[vorbis] - >=media-libs/sdl-image-1.2[jpeg,png] - fribidi? ( dev-libs/fribidi ) - dbus? ( sys-apps/dbus ) - sys-libs/zlib - x11-libs/pango - dev-lang/lua - media-libs/fontconfig - ) - >=dev-libs/boost-1.48[nls,threads] - virtual/libintl" -DEPEND="${RDEPEND} - virtual/pkgconfig - sys-devel/gettext" - -S=${WORKDIR}/${P}.0 - -src_prepare() { - if use dedicated || use server ; then - sed \ - -e "s:GAMES_BINDIR:${GAMES_BINDIR}:" \ - -e "s:GAMES_STATEDIR:${GAMES_STATEDIR}:" \ - -e "s/GAMES_USER_DED/${GAMES_USER_DED}/" \ - -e "s/GAMES_GROUP/${GAMES_GROUP}/" "${FILESDIR}"/wesnothd.rc \ - > "${T}"/wesnothd || die - fi - if ! use doc ; then - sed -i \ - -e '/manual/d' \ - doc/CMakeLists.txt || die - fi - # bug #472994 - mv icons/wesnoth-icon-Mac.png icons/wesnoth-icon.png || die - mv icons/map-editor-icon-Mac.png icons/wesnoth_editor-icon.png || die - - # respect LINGUAS (bug #483316) - if [[ ${LINGUAS+set} ]] ; then - local langs - for lang in $(cat po/LINGUAS) - do - has $lang $LINGUAS && langs+="$lang " - done - echo "$langs" > po/LINGUAS || die - fi - epatch "${FILESDIR}/${P}-cmake.patch" -} - -src_configure() { - filter-flags -ftracer -fomit-frame-pointer - if [[ $(gcc-major-version) -eq 3 ]] ; then - filter-flags -fstack-protector - append-flags -fno-stack-protector - fi - # Work around eclass - append-flags -UNDEBUG - if use dedicated || use server ; then - mycmakeargs=( - "-DENABLE_CAMPAIGN_SERVER=TRUE" - "-DENABLE_SERVER=TRUE" - "-DSERVER_UID=${GAMES_USER_DED}" - "-DSERVER_GID=${GAMES_GROUP}" - "-DFIFO_DIR=${GAMES_STATEDIR}/run/wesnothd" - ) - else - mycmakeargs=( - $(cmake-utils_use_enable fribidi FRIBIDI) - "-DENABLE_CAMPAIGN_SERVER=FALSE" - "-DENABLE_SERVER=FALSE" - ) - fi - mycmakeargs+=( - $(cmake-utils_use_enable !dedicated GAME) - $(cmake-utils_use_enable !dedicated ENABLE_DESKTOP_ENTRY) - $(cmake-utils_use_enable nls NLS) - $(cmake-utils_use_enable dbus NOTIFICATIONS) - "-DCMAKE_VERBOSE_MAKEFILE=TRUE" - "-DENABLE_STRICT_COMPILATION=FALSE" - "-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}" - "-DDATAROOTDIR=${GAMES_DATADIR}" - "-DBINDIR=${GAMES_BINDIR}" - "-DICONDIR=/usr/share/pixmaps" - "-DDESKTOPDIR=/usr/share/applications" - "-DLOCALEDIR=/usr/share/locale" - "-DMANDIR=/usr/share/man" - "-DDOCDIR=/usr/share/doc/${PF}" - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - DOCS="README changelog players_changelog" cmake-utils_src_install - if use dedicated || use server; then - keepdir "${GAMES_STATEDIR}/run/wesnothd" - doinitd "${T}"/wesnothd || die - fi - prepgamesdirs -} diff --git a/games-util/grfcodec/Manifest b/games-util/grfcodec/Manifest index 9d1ff12e1380..0f672607b824 100644 --- a/games-util/grfcodec/Manifest +++ b/games-util/grfcodec/Manifest @@ -1,2 +1 @@ -DIST grfcodec-6.0.0-source.tar.xz 174004 SHA256 ab25a673a75a78c334d6722b6fb2b22ff5273938e9522cecc7b9bcef10f9dd34 SHA512 53a7a2b927e29bfcdc5600c62967d0794bbda096ee48b7d16c35b84652c11d4d3a02892fbdfce194f35139689c97418c6d81303d296c8bfdc51fb5dc5015fe94 WHIRLPOOL 13ca9551a240f8aec2b5a03e4cd07909de4ee75444478a3abccc0d4b29fb036f8b71cca376062156c102513f4a1c3d9c89219bccaa437dedf19bd585d818414b DIST grfcodec-6.0.4-source.tar.xz 165756 SHA256 7ec1f903cc48b73be9192a23f3fa14dc2a024d8edc4d2dfafa245e700e650cdb SHA512 cfbbd1cfae7f2d2ba08ca32d8af68f6885c15dddb6ab941bed32d6c15bf9581e0b4ba19a16a5e48e6d6e070438732df232d3f3f008d42baad77a93f931ad0331 WHIRLPOOL 6cbd33a2aa503c858b1b5eeabd8d201e54d68ea618369b464de05f262236303e4f5960119ba86ed792c076c354ce757c804f01a6e1f90d552be276f26004028d diff --git a/games-util/grfcodec/grfcodec-6.0.0.ebuild b/games-util/grfcodec/grfcodec-6.0.0.ebuild deleted file mode 100644 index 31b06b807894..000000000000 --- a/games-util/grfcodec/grfcodec-6.0.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-util/grfcodec/grfcodec-6.0.0.ebuild,v 1.5 2012/06/07 21:08:33 ranger Exp $ - -EAPI=4 - -if [ "${PV%9999}" != "${PV}" ] ; then - SCM=mercurial - EHG_REPO_URI="http://hg.openttdcoop.org/${PN}" -fi - -inherit toolchain-funcs ${SCM} - -DESCRIPTION="A suite of programs to modify openttd/Transport Tycoon Deluxe's GRF files" -HOMEPAGE="http://dev.openttdcoop.org/projects/grfcodec" -[[ -z ${SCM} ]] && SRC_URI="http://binaries.openttd.org/extra/${PN}/${PV}/${P}-source.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ppc ppc64 x86" -IUSE="" - -[[ -n ${SCM} ]] && S=${WORKDIR}/${PN} - -DEPEND="!games-util/nforenum - dev-lang/perl - dev-libs/boost - media-libs/libpng" -RDEPEND="" - -src_prepare() { -# Set up Makefile.local so that we respect CXXFLAGS/LDFLAGS -cat > Makefile.local <<-__EOF__ - CXX = $(tc-getCXX) - CXXFLAGS = ${CXXFLAGS} - LDOPT = ${LDFLAGS} - UPX = - V = 1 - FLAGS= - __EOF__ -} - -src_install() { - dobin ${PN} grf{diff,id,merge} nforenum - doman docs/*.1 - dodoc changelog.txt docs/*.txt -} diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest index 24625cd2e662..79b5d610ac4d 100644 --- a/mail-client/roundcube/Manifest +++ b/mail-client/roundcube/Manifest @@ -1,3 +1,4 @@ DIST roundcubemail-1.0.2.tar.gz 3980298 SHA256 1c1560a7a56e6884b45c49f52961dbbb3f6bacbc7e7c755440750a1ab027171c SHA512 4076be3846f3c39c481c5546d7d2f8843cd87f1dde868aa06c9432db4a8786269e4297975802c841a0476ae4462cb7dbcc40e375bdafb6ea0a74b9c5ba9bb780 WHIRLPOOL 773b9f687dc82fdc2a879187d40bd79936d3103427a28e35b602eb7648ea397be5afeb412ff9523ff59653d50a7c3ac9ea4f14eec605e41e88158fc2f628d426 DIST roundcubemail-1.0.3.tar.gz 3984245 SHA256 8840bb6c1b08d35eeb35dff5e8d40f7771d19bae8cb65d13753f71a538f9a9ca SHA512 164f095a93f6b6216f3344072ffe90727a328838fcc58d69eb6f1ca3fd17138fd8256520d3e22f6cbfe03c99246abdce2dddb58c22f2b96798e1607f0e02c4db WHIRLPOOL 3e557e8bd79afbd5263b11b9b0ca2483d6445e2dcf668e9629f809ce1e49f9e1a7f15ff026dfc9ab6b4666dc9b402ac94d6ddf997df63f27bed84b9a3e170610 DIST roundcubemail-1.0.4.tar.gz 4055848 SHA256 ef890de63cadaad2a75435c22345c589362c8e82b0986eb4d980d3f657275226 SHA512 eb434d9eca19e000f5b10ba3339aaf64318003a43918b5465512eeb66651011b45ec0e361ee060b3f77beb09d5c3717559e5e512b8819ead9019d79feb39409d WHIRLPOOL 1e24b57fcae46530c0d4b5eadb861ab23af1cffc55df7834ce7fa7109976f83e5a57d2c789f40bd594a2055e069bbd3614ace79d324787ee73c062bd9ef8c7f0 +DIST roundcubemail-1.0.5.tar.gz 4056852 SHA256 22af84480f2c543884b17c9b0196ed105d2ea7f429bfcc34a6fb7c96dd712792 SHA512 28016a8b05bdf4777486c63d95a91a22022006252e61e4e93320d81448cbc630ed5a04a1388d8576a40617d8e0630b90290341fcd3fed4f5080ab250fb568c6c WHIRLPOOL f0e48173e0fe07a8f3a00a49ad1091c33f76dbeb153941e32c35684f4eb41e04f805f63ec9623e3664c165c6e88407db3665f1e60a01c2076a3c60bc96c4a122 diff --git a/mail-client/roundcube/roundcube-1.0.5.ebuild b/mail-client/roundcube/roundcube-1.0.5.ebuild new file mode 100644 index 000000000000..9efb3018c032 --- /dev/null +++ b/mail-client/roundcube/roundcube-1.0.5.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/roundcube-1.0.5.ebuild,v 1.1 2015/01/27 04:24:42 radhermit Exp $ + +EAPI=5 + +inherit webapp + +MY_PN=${PN}mail +MY_P=${MY_PN}-${PV/_/-} + +DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface" +HOMEPAGE="http://roundcube.net" +SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz" + +# roundcube is GPL-licensed, the rest of the licenses here are +# for bundled PEAR components, googiespell and utf8.class.php +LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="ldap +mysql postgres sqlite ssl spell" + +# this function only sets DEPEND so we need to include that in RDEPEND +need_httpd_cgi + +RDEPEND=" + ${DEPEND} + >=dev-lang/php-5.3[crypt,filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,ssl?,unicode,xml] + >=dev-php/PEAR-Auth_SASL-1.0.3 + >=dev-php/PEAR-Crypt_GPG-1.3.2 + >=dev-php/PEAR-Mail_Mime-1.8.1 + >=dev-php/PEAR-Net_IDNA2-0.1.1 + >=dev-php/PEAR-Net_SMTP-1.4.2 + >=dev-php/PEAR-Net_Sieve-1.3.2 + >=dev-php/PEAR-Net_Socket-1.0.14 + mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) + spell? ( dev-lang/php[curl,spell] ) + sqlite? ( dev-lang/php[sqlite] ) + virtual/httpd-php +" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + # Remove bundled PEAR packages + rm -r program/lib/{Auth,Crypt,Mail,Net,PEAR*} || die +} + +src_install() { + webapp_src_preinst + dodoc CHANGELOG INSTALL README.md UPGRADING + + insinto "${MY_HTDOCSDIR}" + doins -r [[:lower:]]* SQL + doins .htaccess + + webapp_serverowned "${MY_HTDOCSDIR}"/logs + webapp_serverowned "${MY_HTDOCSDIR}"/temp + + webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php + webapp_postupgrade_txt en UPGRADING + webapp_src_install +} + +pkg_postinst() { + ewarn "When upgrading from <= 0.9, note that the old configuration files" + ewarn "named main.inc.php and db.inc.php are deprecated and should be" + ewarn "replaced with one single config.inc.php file." + ewarn "Run the ./bin/update.sh script to convert those" + ewarn "or manually merge the files." + ewarn "The new config.inc.php should only contain options that" + ewarn "differ from the ones listed in defaults.inc.php." +} diff --git a/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild b/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild index d6f9806d2a26..cb166d78cab7 100644 --- a/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild +++ b/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild,v 1.6 2014/12/19 07:27:44 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild,v 1.7 2015/01/26 20:06:53 tomjbe Exp $ EAPI=5 inherit autotools eutils @@ -20,7 +20,8 @@ RDEPEND=">=dev-libs/libax25-0.0.12_rc2 sys-libs/ncurses" DEPEND="${RDEPEND} virtual/pkgconfig - !media-sound/listen" + !media-sound/listen + !dev-ruby/listen" S=${WORKDIR}/${MY_P} diff --git a/media-sound/nted/nted-1.10.18-r3.ebuild b/media-sound/nted/nted-1.10.18-r3.ebuild index b77f6aed5851..fd342ebab19e 100644 --- a/media-sound/nted/nted-1.10.18-r3.ebuild +++ b/media-sound/nted/nted-1.10.18-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/nted/nted-1.10.18-r3.ebuild,v 1.5 2014/07/04 19:52:27 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/nted/nted-1.10.18-r3.ebuild,v 1.6 2015/01/26 21:13:02 pacho Exp $ EAPI=5 AUTOTOOLS_IN_SOURCE_BUILD=1 @@ -20,7 +20,7 @@ IUSE="doc debug nls" RDEPEND=" >=dev-libs/glib-2:2 media-libs/alsa-lib - >=media-libs/freetype-2 + >=media-libs/freetype-2.5.1 x11-libs/cairo >=x11-libs/gdk-pixbuf-2 x11-libs/gtk+:2 diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk index 51f29fe2802e..bc6387380a0e 100644 --- a/metadata/dtd/timestamp.chk +++ b/metadata/dtd/timestamp.chk @@ -1 +1 @@ -Mon, 26 Jan 2015 16:06:52 +0000 +Tue, 27 Jan 2015 08:36:52 +0000 diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk index 2c1bad924f0b..bc6387380a0e 100644 --- a/metadata/glsa/timestamp.chk +++ b/metadata/glsa/timestamp.chk @@ -1 +1 @@ -Mon, 26 Jan 2015 16:06:53 +0000 +Tue, 27 Jan 2015 08:36:52 +0000 diff --git a/metadata/md5-cache/app-admin/xstow-1.0.1 b/metadata/md5-cache/app-admin/xstow-1.0.1 index a3920a59fff4..3e3fa188ecf5 100644 --- a/metadata/md5-cache/app-admin/xstow-1.0.1 +++ b/metadata/md5-cache/app-admin/xstow-1.0.1 @@ -1,5 +1,5 @@ -DEFINED_PHASES=configure install postinst -DEPEND=ncurses? ( sys-libs/ncurses ) +DEFINED_PHASES=configure install postinst prepare +DEPEND=ncurses? ( sys-libs/ncurses ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 DESCRIPTION=replacement for GNU stow with extensions EAPI=5 HOMEPAGE=http://xstow.sourceforge.net/ @@ -9,5 +9,5 @@ LICENSE=GPL-2 RDEPEND=ncurses? ( sys-libs/ncurses ) SLOT=0 SRC_URI=mirror://sourceforge/xstow/xstow-1.0.1.tar.bz2 -_eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=a36365a89ab3f5b0fe872f706fb239c8 +_eclasses_=autotools 8fc2dd333ef9346c906ffd9a523d8211 eutils 998e5931fb95b10a6a11ec796ada2759 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac +_md5_=d8defb18462729ad528a2acac841ef0a diff --git a/metadata/md5-cache/app-arch/pigz-2.3.3 b/metadata/md5-cache/app-arch/pigz-2.3.3 new file mode 100644 index 000000000000..e0dd5d9ec0e8 --- /dev/null +++ b/metadata/md5-cache/app-arch/pigz-2.3.3 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install prepare +DEPEND=!static? ( sys-libs/zlib ) static? ( sys-libs/zlib[static-libs(+)] ) test? ( app-arch/ncompress ) +DESCRIPTION=A parallel implementation of gzip +EAPI=5 +HOMEPAGE=http://www.zlib.net/pigz/ +IUSE=static symlink test +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86 ~amd64-linux ~sparc64-solaris +LICENSE=ZLIB +RDEPEND=!static? ( sys-libs/zlib ) +SLOT=0 +SRC_URI=http://www.zlib.net/pigz/pigz-2.3.3.tar.gz +_eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac +_md5_=541afed9ddf3101923b1d9d53f85bd7a diff --git a/metadata/md5-cache/app-crypt/gkeys-gen-9999 b/metadata/md5-cache/app-crypt/gkeys-gen-9999 index 6dc7bee88685..9008bd23a9d2 100644 --- a/metadata/md5-cache/app-crypt/gkeys-gen-9999 +++ b/metadata/md5-cache/app-crypt/gkeys-gen-9999 @@ -9,4 +9,4 @@ RDEPEND=app-crypt/gnupg dev-python/snakeoil[python_targets_python2_7(-)?,python_ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) SLOT=0 _eclasses_=distutils-r1 5cf77567a87c3a6f59d6a51848ebde98 eutils 998e5931fb95b10a6a11ec796ada2759 git-r3 6ebae45064cb04482f3c702632dd9528 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 236a8d81f730332749bd484d8b53ee91 python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=8723dd6a5ca4f1b9fac68775d616213f +_md5_=8f419ccb86bd29c648acf4db554359c0 diff --git a/metadata/md5-cache/app-editors/gvim-7.4.591 b/metadata/md5-cache/app-editors/gvim-7.4.591 new file mode 100644 index 000000000000..530d11a48538 --- /dev/null +++ b/metadata/md5-cache/app-editors/gvim-7.4.591 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test +DEPEND=~app-editors/vim-core-7.4.591 >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit ) !luajit? ( dev-lang/lua[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl ) dev-util/ctags sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext ) +DESCRIPTION=GUI version of the Vim text editor +EAPI=5 +HOMEPAGE=http://www.vim.org/ +IUSE=acl aqua cscope debug gnome gtk lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris +LICENSE=vim +RDEPEND=~app-editors/vim-core-7.4.591 >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit ) !luajit? ( dev-lang/lua[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl ) +REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) luajit? ( lua ) +SLOT=0 +SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-7.4.591.patch.xz http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2 +_eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 eutils 998e5931fb95b10a6a11ec796ada2759 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c263990f1b677b0f0be0a3299f179762 multilib 3bf24e6abb9b76d9f6c20600f0b716bf prefix 21058c21ca48453d771df15500873ede python-single-r1 ed2ee20dc74a34be60f5b1b500e92a5b python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f vim-doc 1c18baeec98cec3287524cbf2fee2bd2 +_md5_=d1ba13822c0ebe41ad098adade21367e diff --git a/metadata/md5-cache/app-editors/vim-7.4.591 b/metadata/md5-cache/app-editors/vim-7.4.591 new file mode 100644 index 000000000000..c0023a964216 --- /dev/null +++ b/metadata/md5-cache/app-editors/vim-7.4.591 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test +DEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit ) !luajit? ( dev-lang/lua[deprecated] ) ) !minimal? ( ~app-editors/vim-core-7.4.591 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext ) +DESCRIPTION=Vim, an improved vi-style text editor +EAPI=5 +HOMEPAGE=http://www.vim.org/ +IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=vim +RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit ) !luajit? ( dev-lang/lua[deprecated] ) ) !minimal? ( ~app-editors/vim-core-7.4.591 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl ) X? ( x11-libs/libXt ) +REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) luajit? ( lua ) +SLOT=0 +SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-7.4.591.patch.xz http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2 +_eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 eutils 998e5931fb95b10a6a11ec796ada2759 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c263990f1b677b0f0be0a3299f179762 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-single-r1 ed2ee20dc74a34be60f5b1b500e92a5b python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f vim-doc 1c18baeec98cec3287524cbf2fee2bd2 +_md5_=4868040300ff09b32bb7e79c03961afd diff --git a/metadata/md5-cache/app-editors/vim-core-7.4.591 b/metadata/md5-cache/app-editors/vim-core-7.4.591 new file mode 100644 index 000000000000..af87cf7e7538 --- /dev/null +++ b/metadata/md5-cache/app-editors/vim-core-7.4.591 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test +DEPEND=sys-devel/autoconf +DESCRIPTION=vim and gvim shared files +EAPI=5 +HOMEPAGE=http://www.vim.org/ +IUSE=nls acl minimal +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=vim +PDEPEND=!minimal? ( app-vim/gentoo-syntax ) +SLOT=0 +SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-7.4.591.patch.xz http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2 +_eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 multilib 3bf24e6abb9b76d9f6c20600f0b716bf prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f vim-doc 1c18baeec98cec3287524cbf2fee2bd2 +_md5_=60cbc2735faed89809df9a4186eb6f71 diff --git a/metadata/md5-cache/app-editors/vim-core-9999 b/metadata/md5-cache/app-editors/vim-core-9999 index 43899d2a5d2e..404630c4d82a 100644 --- a/metadata/md5-cache/app-editors/vim-core-9999 +++ b/metadata/md5-cache/app-editors/vim-core-9999 @@ -8,4 +8,4 @@ LICENSE=vim PDEPEND=!minimal? ( app-vim/gentoo-syntax ) SLOT=0 _eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 mercurial 2fbda5894dda6392b71334ee9a92de0b multilib 3bf24e6abb9b76d9f6c20600f0b716bf prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f vim-doc 1c18baeec98cec3287524cbf2fee2bd2 -_md5_=12d42cc74ebd25a25b261b82e5bd9120 +_md5_=dfe95df91fa05a234aa13919fa239d9e diff --git a/metadata/md5-cache/app-misc/reptyr-0.6.1 b/metadata/md5-cache/app-misc/reptyr-0.6.1 new file mode 100644 index 000000000000..d3db869cc12e --- /dev/null +++ b/metadata/md5-cache/app-misc/reptyr-0.6.1 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile install prepare unpack +DESCRIPTION=A utility to attach a running program to a new terminal +EAPI=5 +HOMEPAGE=https://github.com/nelhage/reptyr +KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux +LICENSE=MIT +RESTRICT=test +SLOT=0 +SRC_URI=https://github.com/nelhage/reptyr/archive/reptyr-0.6.1.tar.gz +_eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac vcs-snapshot 58b766562c9fbfb3268b04e33cdf2f66 +_md5_=a68b5bceb04dac4d71944c191db60f87 diff --git a/metadata/md5-cache/app-portage/elogviewer-2.1-r1 b/metadata/md5-cache/app-portage/elogviewer-2.1-r1 index a9d186e0c84f..feb755adf9bf 100644 --- a/metadata/md5-cache/app-portage/elogviewer-2.1-r1 +++ b/metadata/md5-cache/app-portage/elogviewer-2.1-r1 @@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 ) SLOT=0 SRC_URI=mirror://sourceforge/elogviewer/elogviewer-2.1.tar.gz _eclasses_=distutils-r1 5cf77567a87c3a6f59d6a51848ebde98 eutils 998e5931fb95b10a6a11ec796ada2759 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 236a8d81f730332749bd484d8b53ee91 python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=394524379fafbed540e3e573ae7487fa +_md5_=d2e24a2d3bd5cf97a488f4f6fe5c15fd diff --git a/metadata/md5-cache/app-portage/elogviewer-2.1-r2 b/metadata/md5-cache/app-portage/elogviewer-2.1-r2 new file mode 100644 index 000000000000..13a2f13fccf0 --- /dev/null +++ b/metadata/md5-cache/app-portage/elogviewer-2.1-r2 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst prepare test +DEPEND=|| ( dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),X] dev-python/pyside[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),X] ) >=sys-apps/portage-2.1 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] +DESCRIPTION=Elog viewer for Gentoo +EAPI=5 +HOMEPAGE=https://sourceforge.net/projects/elogviewer +IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 +KEYWORDS=amd64 ~ppc ~sparc ~x86 ~x86-fbsd +LICENSE=GPL-2 +RDEPEND=|| ( dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),X] dev-python/pyside[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),X] ) >=sys-apps/portage-2.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] +REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) +SLOT=0 +SRC_URI=mirror://sourceforge/elogviewer/elogviewer-2.1.tar.gz +_eclasses_=distutils-r1 5cf77567a87c3a6f59d6a51848ebde98 eutils 998e5931fb95b10a6a11ec796ada2759 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 236a8d81f730332749bd484d8b53ee91 python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac +_md5_=cfc8619f40e3fbc1ed3817d2b6fa5cce diff --git a/metadata/md5-cache/app-portage/etc-proposals-1.4.3-r3 b/metadata/md5-cache/app-portage/etc-proposals-1.4.3-r3 index 5d1fea14f62c..8568452a3f23 100644 --- a/metadata/md5-cache/app-portage/etc-proposals-1.4.3-r3 +++ b/metadata/md5-cache/app-portage/etc-proposals-1.4.3-r3 @@ -9,6 +9,6 @@ LICENSE=GPL-2 RDEPEND=gtk? ( >=dev-python/pygtk-2.10 ) qt4? ( >=dev-python/PyQt4-4.1.1[X] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] REQUIRED_USE=|| ( python_targets_python2_7 ) SLOT=0 -SRC_URI=http://sourceforge.net/projects/etc-proposals.berlios/files/etc-proposals-1.4.3.tar.gz/download +SRC_URI=mirror://sourceforge/etc-proposals.berlios/etc-proposals-1.4.3.tar.gz _eclasses_=distutils-r1 5cf77567a87c3a6f59d6a51848ebde98 eutils 998e5931fb95b10a6a11ec796ada2759 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 236a8d81f730332749bd484d8b53ee91 python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=8ba35791bf4c0508d8ae6a82269c986e +_md5_=e23779d8d705f7fcb39a475399d723ea diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.2 b/metadata/md5-cache/app-portage/mirrorselect-2.2.2 index 5e9d15e0cf8f..33550c5e7b93 100644 --- a/metadata/md5-cache/app-portage/mirrorselect-2.2.2 +++ b/metadata/md5-cache/app-portage/mirrorselect-2.2.2 @@ -6,9 +6,9 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Mirrorselect IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd LICENSE=GPL-2 -RDEPEND=dev-util/dialog net-analyzer/netselect >=dev-python/ssl-fetch-0.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] +RDEPEND=dev-util/dialog net-analyzer/netselect >=dev-python/ssl-fetch-0.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] =dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) SLOT=0 SRC_URI=http://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-2.2.2.tar.gz http://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test _eclasses_=distutils-r1 5cf77567a87c3a6f59d6a51848ebde98 eutils 998e5931fb95b10a6a11ec796ada2759 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 prefix 21058c21ca48453d771df15500873ede python-r1 236a8d81f730332749bd484d8b53ee91 python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=148374adb8eb6e225debb9d0e2a9a0c5 +_md5_=3b02fa790b7c7386fd10cba61524446d diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.2-r1 b/metadata/md5-cache/app-portage/mirrorselect-2.2.2-r1 new file mode 100644 index 000000000000..3eb42611cf76 --- /dev/null +++ b/metadata/md5-cache/app-portage/mirrorselect-2.2.2-r1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] +DESCRIPTION=Tool to help select distfiles mirrors for Gentoo +EAPI=5 +HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Mirrorselect +IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd +LICENSE=GPL-2 +RDEPEND=dev-util/dialog net-analyzer/netselect >=dev-python/ssl-fetch-0.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] +REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) +SLOT=0 +SRC_URI=http://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-2.2.2.tar.gz http://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test +_eclasses_=distutils-r1 5cf77567a87c3a6f59d6a51848ebde98 eutils 998e5931fb95b10a6a11ec796ada2759 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 prefix 21058c21ca48453d771df15500873ede python-r1 236a8d81f730332749bd484d8b53ee91 python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac +_md5_=ae6b498beb34d0b01ef12fab0cf2f5b2 diff --git a/metadata/md5-cache/app-text/restview-2.3.0 b/metadata/md5-cache/app-text/restview-2.3.0 new file mode 100644 index 000000000000..1c9c06d8c9d9 --- /dev/null +++ b/metadata/md5-cache/app-text/restview-2.3.0 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/readme[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] +DESCRIPTION=reStructuredText viewer +EAPI=5 +HOMEPAGE=https://mg.pov.lt/restview/ +IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-3 +RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/readme[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] +REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy ) +SLOT=0 +SRC_URI=mirror://pypi/r/restview/restview-2.3.0.tar.gz +_eclasses_=distutils-r1 5cf77567a87c3a6f59d6a51848ebde98 eutils 998e5931fb95b10a6a11ec796ada2759 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 236a8d81f730332749bd484d8b53ee91 python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac +_md5_=d2b26642d4394d68e45abf278e4da8c5 diff --git a/metadata/md5-cache/dev-games/mercator-0.3.2 b/metadata/md5-cache/dev-games/mercator-0.3.2 deleted file mode 100644 index ade18f0e965c..000000000000 --- a/metadata/md5-cache/dev-games/mercator-0.3.2 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare unpack -DEPEND=>=dev-games/wfmath-1 doc? ( app-doc/doxygen ) virtual/pkgconfig -DESCRIPTION=WorldForge library primarily aimed at terrain -EAPI=2 -HOMEPAGE=http://www.worldforge.org/dev/eng/libraries/mercator -IUSE=doc -KEYWORDS=amd64 x86 -LICENSE=GPL-2 -RDEPEND=>=dev-games/wfmath-1 -SLOT=0 -SRC_URI=mirror://sourceforge/worldforge/mercator-0.3.2.tar.gz -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=9e0613ce9ac8aa8917e8e17d992d998a diff --git a/metadata/md5-cache/dev-games/mercator-0.3.3 b/metadata/md5-cache/dev-games/mercator-0.3.3 index acf9e5ed974e..8df8f4e65f98 100644 --- a/metadata/md5-cache/dev-games/mercator-0.3.3 +++ b/metadata/md5-cache/dev-games/mercator-0.3.3 @@ -2,7 +2,7 @@ DEFINED_PHASES=compile install DEPEND=>=dev-games/wfmath-1 doc? ( app-doc/doxygen ) virtual/pkgconfig DESCRIPTION=WorldForge library primarily aimed at terrain EAPI=5 -HOMEPAGE=http://www.worldforge.org/dev/eng/libraries/mercator +HOMEPAGE=http://www.worldforge.org/index.php/components/mercator/ IUSE=doc KEYWORDS=amd64 x86 LICENSE=GPL-2 @@ -10,4 +10,4 @@ RDEPEND=>=dev-games/wfmath-1 SLOT=0 SRC_URI=mirror://sourceforge/worldforge/mercator-0.3.3.tar.gz _eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=eeb7120b77ecf47e36cee7c1e346f039 +_md5_=ecc214580743a0acf6d0eccd69cd3fa6 diff --git a/metadata/md5-cache/dev-games/newton-1.53 b/metadata/md5-cache/dev-games/newton-1.53 deleted file mode 100644 index d3dbdda8f790..000000000000 --- a/metadata/md5-cache/dev-games/newton-1.53 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install prepare -DEPEND=doc? ( virtual/opengl media-libs/freeglut ) -DESCRIPTION=an integrated solution for real time simulation of physics environments -EAPI=2 -HOMEPAGE=http://newtondynamics.com/ -IUSE=doc -KEYWORDS=~x86 -LICENSE=newton -RDEPEND=doc? ( virtual/opengl media-libs/freeglut ) -SLOT=0 -SRC_URI=http://www.newtondynamics.com/downloads/newtonLinux-1.53.tar.gz -_eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=f908cfe61c376709af3f47c5472eec92 diff --git a/metadata/md5-cache/dev-games/newton-2.00 b/metadata/md5-cache/dev-games/newton-2.00 deleted file mode 100644 index b7097ae227b6..000000000000 --- a/metadata/md5-cache/dev-games/newton-2.00 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=install -DEPEND=doc? ( virtual/opengl media-libs/freeglut ) -DESCRIPTION=an integrated solution for real time simulation of physics environments -HOMEPAGE=http://www.physicsengine.com/ -IUSE=doc -KEYWORDS=~amd64 ~x86 -LICENSE=newton -RDEPEND=doc? ( virtual/opengl media-libs/freeglut ) -SLOT=0 -SRC_URI=amd64? ( http://www.newtondynamics.com/downloads/newtonLinux-64-2.00.tar.gz ) x86? ( http://www.newtondynamics.com/downloads/newtonLinux-32-2.00.tar.gz ) -_eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=41f1edc79f1f5a0077643628612d8c1b diff --git a/metadata/md5-cache/dev-games/ogre-1.9.0 b/metadata/md5-cache/dev-games/ogre-1.9.0 deleted file mode 100644 index 5dfce95595d0..000000000000 --- a/metadata/md5-cache/dev-games/ogre-1.9.0 +++ /dev/null @@ -1,15 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test unpack -DEPEND=dev-libs/tinyxml media-libs/freetype:2 virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXaw x11-libs/libXrandr x11-libs/libXt boost? ( dev-libs/boost ) cg? ( media-gfx/nvidia-cg-toolkit ) freeimage? ( media-libs/freeimage ) gles2? ( >=media-libs/mesa-8.0.0[gles2] ) ois? ( dev-games/ois ) threads? ( poco? ( dev-libs/poco ) tbb? ( dev-cpp/tbb ) ) zip? ( sys-libs/zlib dev-libs/zziplib ) x11-proto/xf86vidmodeproto virtual/pkgconfig doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) -DESCRIPTION=Object-oriented Graphics Rendering Engine -EAPI=5 -HOMEPAGE=http://www.ogre3d.org/ -IUSE=+boost cg doc double-precision examples +freeimage gles2 ois +opengl poco profile tbb threads tools +zip -KEYWORDS=~amd64 ~x86 -LICENSE=MIT public-domain -RDEPEND=dev-libs/tinyxml media-libs/freetype:2 virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXaw x11-libs/libXrandr x11-libs/libXt boost? ( dev-libs/boost ) cg? ( media-gfx/nvidia-cg-toolkit ) freeimage? ( media-libs/freeimage ) gles2? ( >=media-libs/mesa-8.0.0[gles2] ) ois? ( dev-games/ois ) threads? ( poco? ( dev-libs/poco ) tbb? ( dev-cpp/tbb ) ) zip? ( sys-libs/zlib dev-libs/zziplib ) -REQUIRED_USE=threads? ( ^^ ( boost poco tbb ) ) poco? ( threads ) tbb? ( threads ) -RESTRICT=test -SLOT=0/1.9.0 -SRC_URI=https://bitbucket.org/sinbad/ogre/get/v1-9-0.tar.bz2 -> ogre-1.9.0.tar.bz2 -_eclasses_=cmake-utils 0e29eadbd656185bce30d2449ab48035 eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac vcs-snapshot 58b766562c9fbfb3268b04e33cdf2f66 -_md5_=2c790fa9bd2a056f77a654de1fa79a66 diff --git a/metadata/md5-cache/dev-haskell/blaze-html-0.5.1.3 b/metadata/md5-cache/dev-haskell/blaze-html-0.5.1.3 deleted file mode 100644 index 2a08fcb63100..000000000000 --- a/metadata/md5-cache/dev-haskell/blaze-html-0.5.1.3 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm setup test -DEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] =dev-haskell/blaze-markup-0.5.1:=[profile?] =dev-haskell/text-0.10:=[profile?] =dev-lang/ghc-6.10.4:= test? ( =dev-haskell/hunit-1.2* >=dev-haskell/quickcheck-2.4 =dev-haskell/test-framework-0.4 =dev-haskell/test-framework-hunit-0.2 =dev-haskell/test-framework-quickcheck2-0.2 =dev-haskell/cabal-1.8 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4 -DESCRIPTION=A blazingly fast HTML combinator library for Haskell -EAPI=5 -HOMEPAGE=http://jaspervdj.be/blaze -IUSE=doc hscolour profile test -KEYWORDS=~amd64 ~x86 -LICENSE=BSD -RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] =dev-haskell/blaze-markup-0.5.1:=[profile?] =dev-haskell/text-0.10:=[profile?] =dev-lang/ghc-6.10.4:= -SLOT=0/0.5.1.3 -SRC_URI=mirror://hackage/packages/archive/blaze-html/0.5.1.3/blaze-html-0.5.1.3.tar.gz -_eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 ghc-package 29f14cf665461bc19b8724d1842b0b3a haskell-cabal f398638b447d3821846f2e2abbc33c1b multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=69c6aefc6dd406669792ae0df65e26bb diff --git a/metadata/md5-cache/dev-haskell/blaze-html-0.6.1.1 b/metadata/md5-cache/dev-haskell/blaze-html-0.6.1.1 deleted file mode 100644 index 574425078be3..000000000000 --- a/metadata/md5-cache/dev-haskell/blaze-html-0.6.1.1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm setup test -DEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] =dev-haskell/blaze-markup-0.5.1:=[profile?] =dev-haskell/text-0.10:=[profile?] =dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( =dev-haskell/hunit-1.2* >=dev-haskell/quickcheck-2.4 =dev-haskell/test-framework-0.4 =dev-haskell/cabal-1.1.4 -DESCRIPTION=A blazingly fast HTML combinator library for Haskell -EAPI=5 -HOMEPAGE=http://jaspervdj.be/blaze -IUSE=doc hscolour profile test -KEYWORDS=amd64 x86 -LICENSE=BSD -RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] =dev-haskell/blaze-markup-0.5.1:=[profile?] =dev-haskell/text-0.10:=[profile?] =dev-lang/ghc-6.10.4:= -SLOT=0/0.6.1.1 -SRC_URI=mirror://hackage/packages/archive/blaze-html/0.6.1.1/blaze-html-0.6.1.1.tar.gz -_eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 ghc-package 29f14cf665461bc19b8724d1842b0b3a haskell-cabal f398638b447d3821846f2e2abbc33c1b multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=1d42f65e08b3d126e2f3ec4552fe3f5c diff --git a/metadata/md5-cache/dev-haskell/blaze-html-0.7.0.1 b/metadata/md5-cache/dev-haskell/blaze-html-0.7.0.1 deleted file mode 100644 index fc2e193e3888..000000000000 --- a/metadata/md5-cache/dev-haskell/blaze-html-0.7.0.1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm setup test -DEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] =dev-haskell/blaze-markup-0.6:=[profile?] =dev-haskell/text-0.10:=[profile?] =dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 =dev-haskell/quickcheck-2.4 =dev-haskell/test-framework-0.4 =dev-haskell/test-framework-hunit-0.3 =dev-haskell/test-framework-quickcheck2-0.3 =dev-haskell/cabal-1.1.4 -DESCRIPTION=A blazingly fast HTML combinator library for Haskell -EAPI=5 -HOMEPAGE=http://jaspervdj.be/blaze -IUSE=doc hscolour profile test -KEYWORDS=~amd64 ~x86 -LICENSE=BSD -RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] =dev-haskell/blaze-markup-0.6:=[profile?] =dev-haskell/text-0.10:=[profile?] =dev-lang/ghc-6.10.4:= -SLOT=0/0.7.0.1 -SRC_URI=mirror://hackage/packages/archive/blaze-html/0.7.0.1/blaze-html-0.7.0.1.tar.gz -_eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 ghc-package 29f14cf665461bc19b8724d1842b0b3a haskell-cabal f398638b447d3821846f2e2abbc33c1b multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=b48c8709a1bfebc0434c522167b03dfc diff --git a/metadata/md5-cache/dev-haskell/blaze-html-0.7.0.2 b/metadata/md5-cache/dev-haskell/blaze-html-0.7.0.2 deleted file mode 100644 index 23f546e77531..000000000000 --- a/metadata/md5-cache/dev-haskell/blaze-html-0.7.0.2 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm setup test -DEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] =dev-haskell/blaze-markup-0.6:=[profile?] =dev-haskell/text-0.10:=[profile?] =dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/blaze-builder-0.2 =dev-haskell/blaze-markup-0.6 =dev-haskell/hunit-1.2 =dev-haskell/quickcheck-2.4 =dev-haskell/test-framework-0.4 =dev-haskell/test-framework-hunit-0.3 =dev-haskell/test-framework-quickcheck2-0.3 =dev-haskell/text-0.10 =dev-haskell/cabal-1.1.4 -DESCRIPTION=A blazingly fast HTML combinator library for Haskell -EAPI=5 -HOMEPAGE=http://jaspervdj.be/blaze -IUSE=doc hscolour profile test -KEYWORDS=~amd64 ~x86 -LICENSE=BSD -RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] =dev-haskell/blaze-markup-0.6:=[profile?] =dev-haskell/text-0.10:=[profile?] =dev-lang/ghc-7.4.1:= -SLOT=0/0.7.0.2 -SRC_URI=mirror://hackage/packages/archive/blaze-html/0.7.0.2/blaze-html-0.7.0.2.tar.gz -_eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 ghc-package 29f14cf665461bc19b8724d1842b0b3a haskell-cabal f398638b447d3821846f2e2abbc33c1b multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=643cc57fc22e3b3fe9bdb1334c5c41f0 diff --git a/metadata/md5-cache/dev-haskell/bzlib-0.5.0.3 b/metadata/md5-cache/dev-haskell/bzlib-0.5.0.5 similarity index 62% rename from metadata/md5-cache/dev-haskell/bzlib-0.5.0.3 rename to metadata/md5-cache/dev-haskell/bzlib-0.5.0.5 index 32e4eebda777..97e4fe4b1ec4 100644 --- a/metadata/md5-cache/dev-haskell/bzlib-0.5.0.3 +++ b/metadata/md5-cache/dev-haskell/bzlib-0.5.0.5 @@ -1,13 +1,13 @@ DEFINED_PHASES=compile configure install postinst postrm setup test -DEPEND=>=dev-lang/ghc-6.8.2 >=app-arch/bzip2-1.0 >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4 +DEPEND=app-arch/bzip2 >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4 DESCRIPTION=Compression and decompression in the bzip2 format -EAPI=4 +EAPI=5 HOMEPAGE=http://hackage.haskell.org/package/bzlib IUSE=doc hscolour profile KEYWORDS=~amd64 ~sparc ~x86 LICENSE=BSD -RDEPEND=>=dev-lang/ghc-6.8.2 >=app-arch/bzip2-1.0 -SLOT=0 -SRC_URI=mirror://hackage/packages/archive/bzlib/0.5.0.3/bzlib-0.5.0.3.tar.gz +RDEPEND=app-arch/bzip2 >=dev-lang/ghc-7.4.1:= +SLOT=0/0.5.0.5 +SRC_URI=mirror://hackage/packages/archive/bzlib/0.5.0.5/bzlib-0.5.0.5.tar.gz _eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 ghc-package 29f14cf665461bc19b8724d1842b0b3a haskell-cabal f398638b447d3821846f2e2abbc33c1b multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=c12bb1d2426327ef1095d706778ab546 +_md5_=8fe59b3b7b44d3711e50d943c2b76a1b diff --git a/metadata/md5-cache/dev-python/astng-0.21.1 b/metadata/md5-cache/dev-python/astng-0.21.1 deleted file mode 100644 index 2dd465d512c1..000000000000 --- a/metadata/md5-cache/dev-python/astng-0.21.1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm prepare test -DEPEND=>=dev-python/logilab-common-0.53.0 dev-python/setuptools test? ( >=dev-python/egenix-mx-base-3.0.0 ) dev-lang/python -DESCRIPTION=Abstract Syntax Tree New Generation for logilab packages -EAPI=3 -HOMEPAGE=http://www.logilab.org/project/logilab-astng http://pypi.python.org/pypi/logilab-astng -IUSE=test -KEYWORDS=amd64 ~ia64 ppc ~ppc64 ~sparc x86 ~x64-macos ~x86-macos -LICENSE=LGPL-2.1 -RDEPEND=>=dev-python/logilab-common-0.53.0 dev-lang/python -SLOT=0 -SRC_URI=ftp://ftp.logilab.org/pub/astng/logilab-astng-0.21.1.tar.gz mirror://pypi/l/logilab-astng/logilab-astng-0.21.1.tar.gz -_eclasses_=distutils 92e738ea29389cb3f34778d7a349ac71 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python cd022f89fef846d083fc994b9e3d8c04 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=ea0ebdb5926ebb4de36969dbadf3761b diff --git a/metadata/md5-cache/dev-python/astroid-1.3.4 b/metadata/md5-cache/dev-python/astroid-1.3.4 new file mode 100644 index 000000000000..d597d375fefd --- /dev/null +++ b/metadata/md5-cache/dev-python/astroid-1.3.4 @@ -0,0 +1,15 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] app-arch/unzip test? ( >=dev-python/logilab-common-0.60.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] >=dev-python/pylint-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( dev-python/egenix-mx-base[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] +DESCRIPTION=Abstract Syntax Tree for logilab packages +EAPI=5 +HOMEPAGE=http://bitbucket.org/logilab/astroid http://pypi.python.org/pypi/astroid +IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy +KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos +LICENSE=LGPL-2.1 +RDEPEND=>=dev-python/logilab-common-0.60.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] +REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy ) +RESTRICT=test +SLOT=0 +SRC_URI=mirror://pypi/a/astroid/astroid-1.3.4.tar.gz +_eclasses_=distutils-r1 5cf77567a87c3a6f59d6a51848ebde98 eutils 998e5931fb95b10a6a11ec796ada2759 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 236a8d81f730332749bd484d8b53ee91 python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac +_md5_=4739f95d0a65f95b3e30783a25687611 diff --git a/metadata/md5-cache/dev-python/bitstring-3.1.0 b/metadata/md5-cache/dev-python/bitstring-3.1.0 deleted file mode 100644 index 9472f7c2e14a..000000000000 --- a/metadata/md5-cache/dev-python/bitstring-3.1.0 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm prepare test -DEPEND=app-arch/unzip dev-lang/python -DESCRIPTION=A pure Python module for creation and analysis of binary data -EAPI=3 -HOMEPAGE=http://python-bitstring.googlecode.com/ -KEYWORDS=~amd64 ~x86 -LICENSE=MIT -RDEPEND=dev-lang/python -SLOT=0 -SRC_URI=http://python-bitstring.googlecode.com/files/bitstring-3.1.0.zip -_eclasses_=distutils 92e738ea29389cb3f34778d7a349ac71 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python cd022f89fef846d083fc994b9e3d8c04 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=0db0c1941e4da117b928b345f20a404f diff --git a/metadata/md5-cache/dev-python/bleach-1.4.1 b/metadata/md5-cache/dev-python/bleach-1.4.1 new file mode 100644 index 000000000000..373e49a98b95 --- /dev/null +++ b/metadata/md5-cache/dev-python/bleach-1.4.1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=>=dev-python/html5lib-0.999[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] test? ( >=dev-python/nose-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] +DESCRIPTION=an easy whitelist-based HTML-sanitizing tool +EAPI=5 +HOMEPAGE=https://github.com/jsocol/bleach https://pypi.python.org/pypi/bleach +IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy +KEYWORDS=~amd64 ~x86 +LICENSE=Apache-2.0 +RDEPEND=>=dev-python/html5lib-0.999[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] +REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy ) +SLOT=0 +SRC_URI=mirror://pypi/b/bleach/bleach-1.4.1.tar.gz +_eclasses_=distutils-r1 5cf77567a87c3a6f59d6a51848ebde98 eutils 998e5931fb95b10a6a11ec796ada2759 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 236a8d81f730332749bd484d8b53ee91 python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac +_md5_=f13dee919e5492775b565fc87eec41d0 diff --git a/metadata/md5-cache/dev-python/iniparse-0.4 b/metadata/md5-cache/dev-python/iniparse-0.4 deleted file mode 100644 index 5054f2e876a3..000000000000 --- a/metadata/md5-cache/dev-python/iniparse-0.4 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm prepare test -DEPEND==dev-lang/python-2* -DESCRIPTION=Better INI parser for Python -EAPI=3 -HOMEPAGE=http://code.google.com/p/iniparse http://pypi.python.org/pypi/iniparse -KEYWORDS=amd64 x86 -LICENSE=MIT PSF-2 -RDEPEND==dev-lang/python-2* -SLOT=0 -SRC_URI=http://iniparse.googlecode.com/files/iniparse-0.4.tar.gz -_eclasses_=distutils 92e738ea29389cb3f34778d7a349ac71 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python cd022f89fef846d083fc994b9e3d8c04 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=3c5ddb17be35f611b4da1607082309db diff --git a/metadata/md5-cache/dev-python/ipaddr-2.1.10 b/metadata/md5-cache/dev-python/ipaddr-2.1.10 deleted file mode 100644 index f357aa38415e..000000000000 --- a/metadata/md5-cache/dev-python/ipaddr-2.1.10 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm prepare setup test -DEPEND=dev-lang/python -DESCRIPTION=Python IP address manipulation library -EAPI=4 -HOMEPAGE=http://code.google.com/p/ipaddr-py/ http://pypi.python.org/pypi/ipaddr -KEYWORDS=~amd64 ~x86 -LICENSE=Apache-2.0 -RDEPEND=dev-lang/python -SLOT=0 -SRC_URI=http://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz -_eclasses_=distutils 92e738ea29389cb3f34778d7a349ac71 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python cd022f89fef846d083fc994b9e3d8c04 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=fbb5d4fa2836d866a8653b38cddc7ad2 diff --git a/metadata/md5-cache/dev-python/ipaddr-2.1.9 b/metadata/md5-cache/dev-python/ipaddr-2.1.9 deleted file mode 100644 index f59c41eadb9c..000000000000 --- a/metadata/md5-cache/dev-python/ipaddr-2.1.9 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm prepare test -DEPEND=dev-lang/python -DESCRIPTION=Python IP address manipulation library -EAPI=3 -HOMEPAGE=http://code.google.com/p/ipaddr-py/ http://pypi.python.org/pypi/ipaddr -KEYWORDS=~amd64 ~x86 -LICENSE=Apache-2.0 -RDEPEND=dev-lang/python -SLOT=0 -SRC_URI=http://ipaddr-py.googlecode.com/files/ipaddr-2.1.9.tar.gz -_eclasses_=distutils 92e738ea29389cb3f34778d7a349ac71 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python cd022f89fef846d083fc994b9e3d8c04 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=a10c412914cfcb0dbdacd75df92dc516 diff --git a/metadata/md5-cache/dev-python/logilab-common-0.63.2 b/metadata/md5-cache/dev-python/logilab-common-0.63.2 new file mode 100644 index 000000000000..749ed3e18b97 --- /dev/null +++ b/metadata/md5-cache/dev-python/logilab-common-0.63.2 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] test? ( python_targets_python2_7? ( dev-python/egenix-mx-base[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] !dev-python/psycopg[-mxdatetime] ) doc? ( python_targets_python2_7? ( dev-python/epydoc[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] +DESCRIPTION=Useful miscellaneous modules used by Logilab projects +EAPI=5 +HOMEPAGE=http://www.logilab.org/project/logilab-common http://pypi.python.org/pypi/logilab-common +IUSE=test doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy +KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos +LICENSE=LGPL-2.1 +RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] +REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy ) +SLOT=0 +SRC_URI=ftp://ftp.logilab.org/pub/common/logilab-common-0.63.2.tar.gz mirror://pypi/l/logilab-common/logilab-common-0.63.2.tar.gz +_eclasses_=distutils-r1 5cf77567a87c3a6f59d6a51848ebde98 eutils 998e5931fb95b10a6a11ec796ada2759 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 236a8d81f730332749bd484d8b53ee91 python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac +_md5_=48b2318daf899f6d5603fa924d7176aa diff --git a/metadata/md5-cache/dev-python/miniupnpc-1.6 b/metadata/md5-cache/dev-python/miniupnpc-1.6 deleted file mode 100644 index 75abc2db9e2f..000000000000 --- a/metadata/md5-cache/dev-python/miniupnpc-1.6 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare unpack -DEPEND=|| ( >=net-libs/miniupnpc-1.6-r1 net-libs/miniupnpc[-python] ) !net-libs/miniupnpc[python] =dev-lang/python-2* -DESCRIPTION=UPnP client library and a simple UPnP client -EAPI=3 -HOMEPAGE=http://miniupnp.free.fr/ -KEYWORDS=~amd64 ~x86 -LICENSE=BSD -RDEPEND=|| ( >=net-libs/miniupnpc-1.6-r1 net-libs/miniupnpc[-python] ) !net-libs/miniupnpc[python] =dev-lang/python-2* -SLOT=0 -SRC_URI=http://miniupnp.free.fr/files/miniupnpc-1.6.tar.gz -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 distutils 92e738ea29389cb3f34778d7a349ac71 eutils 998e5931fb95b10a6a11ec796ada2759 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python cd022f89fef846d083fc994b9e3d8c04 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=9040fc1198a79ec619e47ba7e487742e diff --git a/metadata/md5-cache/dev-python/miniupnpc-1.6.20120509 b/metadata/md5-cache/dev-python/miniupnpc-1.6.20120509 deleted file mode 100644 index 53100a88e3a3..000000000000 --- a/metadata/md5-cache/dev-python/miniupnpc-1.6.20120509 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm prepare setup -DEPEND=>=net-libs/miniupnpc-1.6.20120509 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) -DESCRIPTION=UPnP client library and a simple UPnP client -EAPI=4 -HOMEPAGE=http://miniupnp.free.fr/ -KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 -LICENSE=BSD -RDEPEND=>=net-libs/miniupnpc-1.6.20120509 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) -SLOT=0 -SRC_URI=http://miniupnp.free.fr/files/miniupnpc-1.6.20120509.tar.gz -_eclasses_=distutils 92e738ea29389cb3f34778d7a349ac71 eutils 998e5931fb95b10a6a11ec796ada2759 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python cd022f89fef846d083fc994b9e3d8c04 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=4edcf1cc7e962d0d404fcbea7727211e diff --git a/metadata/md5-cache/dev-python/miniupnpc-1.7-r1 b/metadata/md5-cache/dev-python/miniupnpc-1.7-r1 deleted file mode 100644 index db118ff7b284..000000000000 --- a/metadata/md5-cache/dev-python/miniupnpc-1.7-r1 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=>=net-libs/miniupnpc-1.7 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] -DESCRIPTION=Python bindings for UPnP client library -EAPI=5 -HOMEPAGE=http://miniupnp.free.fr/ -IUSE=python_targets_python2_7 -KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 -LICENSE=BSD -RDEPEND=>=net-libs/miniupnpc-1.7 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] -REQUIRED_USE=|| ( python_targets_python2_7 ) -SLOT=0 -SRC_URI=http://miniupnp.free.fr/files/miniupnpc-1.7.tar.gz -_eclasses_=distutils-r1 5cf77567a87c3a6f59d6a51848ebde98 eutils 998e5931fb95b10a6a11ec796ada2759 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 236a8d81f730332749bd484d8b53ee91 python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=a69a837a4bb26963ffe53c2911d2fb06 diff --git a/metadata/md5-cache/dev-python/pivy-0.5_alpha20110303 b/metadata/md5-cache/dev-python/pivy-0.5_alpha20110303 deleted file mode 100644 index 95ad658ceaed..000000000000 --- a/metadata/md5-cache/dev-python/pivy-0.5_alpha20110303 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm prepare -DEPEND=media-libs/coin >=media-libs/SoQt-1.5.0 dev-lang/swig dev-lang/python -DESCRIPTION=Coin3d binding for Python -EAPI=3 -HOMEPAGE=http://pivy.coin3d.org/ -KEYWORDS=~amd64 ~x86 -LICENSE=ISC -RDEPEND=media-libs/coin >=media-libs/SoQt-1.5.0 dev-lang/python -SLOT=0 -SRC_URI=http://dev.gentoo.org/~dilfridge/distfiles/pivy-0.5_alpha20110303.tar.xz -_eclasses_=distutils 92e738ea29389cb3f34778d7a349ac71 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python cd022f89fef846d083fc994b9e3d8c04 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=b98b2f5698958535e27404212bfcb7ae diff --git a/metadata/md5-cache/dev-python/pybluez-0.18 b/metadata/md5-cache/dev-python/pybluez-0.18 deleted file mode 100644 index 6b52dc365571..000000000000 --- a/metadata/md5-cache/dev-python/pybluez-0.18 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm prepare -DEPEND=net-wireless/bluez =dev-lang/python-2* -DESCRIPTION=Python bindings for Bluez Bluetooth Stack -EAPI=3 -HOMEPAGE=http://code.google.com/p/pybluez/ -IUSE=examples -KEYWORDS=amd64 ppc x86 -LICENSE=GPL-2 -RDEPEND=net-wireless/bluez =dev-lang/python-2* -SLOT=0 -SRC_URI=http://pybluez.googlecode.com/files/PyBluez-0.18.tar.gz -_eclasses_=distutils 92e738ea29389cb3f34778d7a349ac71 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python cd022f89fef846d083fc994b9e3d8c04 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=1ab9dbce244759fd3cf217af3e2d9c35 diff --git a/metadata/md5-cache/dev-python/pychart-1.39 b/metadata/md5-cache/dev-python/pychart-1.39 deleted file mode 100644 index e895fcfae0d6..000000000000 --- a/metadata/md5-cache/dev-python/pychart-1.39 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm prepare -DEPEND=app-text/ghostscript-gpl =dev-lang/python-2* -DESCRIPTION=Python library for creating charts -EAPI=3 -HOMEPAGE=http://home.gna.org/pychart/ -IUSE=doc examples -KEYWORDS=amd64 ~ia64 ~ppc x86 -LICENSE=GPL-2 -RDEPEND=app-text/ghostscript-gpl =dev-lang/python-2* -SLOT=0 -SRC_URI=http://download.gna.org/pychart/PyChart-1.39.tar.gz doc? ( http://download.gna.org/pychart/pychart-doc.tar.gz ) -_eclasses_=distutils 92e738ea29389cb3f34778d7a349ac71 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python cd022f89fef846d083fc994b9e3d8c04 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=570ecaabc478512ded02ecc5650068be diff --git a/metadata/md5-cache/dev-python/readme-0.4.1 b/metadata/md5-cache/dev-python/readme-0.4.1 new file mode 100644 index 000000000000..4277eb2b9c38 --- /dev/null +++ b/metadata/md5-cache/dev-python/readme-0.4.1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=dev-python/bleach[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] +DESCRIPTION=a library for rendering "readme" descriptions for Warehouse +EAPI=5 +HOMEPAGE=https://github.com/pypa/readme https://pypi.python.org/pypi/readme +IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy +KEYWORDS=~amd64 ~x86 +LICENSE=Apache-2.0 +RDEPEND=dev-python/bleach[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] +REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy ) +SLOT=0 +SRC_URI=mirror://pypi/r/readme/readme-0.4.1.tar.gz +_eclasses_=distutils-r1 5cf77567a87c3a6f59d6a51848ebde98 eutils 998e5931fb95b10a6a11ec796ada2759 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 236a8d81f730332749bd484d8b53ee91 python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac +_md5_=98746ac57f645919a36a9a31b15fedc8 diff --git a/metadata/md5-cache/dev-python/setuptools-12.0.5 b/metadata/md5-cache/dev-python/setuptools-12.0.5 new file mode 100644 index 000000000000..e00f29170dfe --- /dev/null +++ b/metadata/md5-cache/dev-python/setuptools-12.0.5 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] ) python_targets_pypy? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] +DESCRIPTION=a collection of extensions to Distutils +EAPI=5 +HOMEPAGE=http://pypi.python.org/pypi/setuptools +IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=PSF-2 +RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] +REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 ) +SLOT=0 +SRC_URI=mirror://pypi/s/setuptools/setuptools-12.0.5.tar.gz +_eclasses_=distutils-r1 5cf77567a87c3a6f59d6a51848ebde98 eutils 998e5931fb95b10a6a11ec796ada2759 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 236a8d81f730332749bd484d8b53ee91 python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac +_md5_=92111516c05682bf2660497bb9a62dd0 diff --git a/metadata/md5-cache/dev-ruby/allison-2.0.3-r3 b/metadata/md5-cache/dev-ruby/allison-2.0.3-r3 index a231d5539130..725f92e5810d 100644 --- a/metadata/md5-cache/dev-ruby/allison-2.0.3-r3 +++ b/metadata/md5-cache/dev-ruby/allison-2.0.3-r3 @@ -1,14 +1,14 @@ DEFINED_PHASES=compile configure install prepare setup test unpack -DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ) +DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) DESCRIPTION=A modern, pretty RDoc template EAPI=5 HOMEPAGE=http://fauna.github.com/fauna/allison/files/README.html -IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test +IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-solaris LICENSE=AFL-3.0 -RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) -REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ) +RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) +REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ) SLOT=0 SRC_URI=mirror://rubygems/allison-2.0.3.gem _eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem d4f8591e9b20b106327e9d143eb13da5 ruby-ng c79a9fd7644eefe8009be02a82648e1f toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=a25dd86ecd272250422e110f74739de4 +_md5_=5c91e3cb20c1a16f5dcf2bd0c4307d27 diff --git a/metadata/md5-cache/dev-ruby/arel-4.0.2 b/metadata/md5-cache/dev-ruby/arel-4.0.2 index 78aa36265f71..3d2469711881 100644 --- a/metadata/md5-cache/dev-ruby/arel-4.0.2 +++ b/metadata/md5-cache/dev-ruby/arel-4.0.2 @@ -1,14 +1,14 @@ DEFINED_PHASES=compile configure install prepare setup test unpack -DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/minitest-5.2:5[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/minitest-5.2:5[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5.2:5[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ) +DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/minitest-5.2:5[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/minitest-5.2:5[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5.2:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.2:5[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) DESCRIPTION=Arel is a Relational Algebra for Ruby EAPI=5 HOMEPAGE=http://github.com/rails/arel -IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test +IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=MIT -RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) -REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ) +RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) +REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ) SLOT=4.0 SRC_URI=mirror://rubygems/arel-4.0.2.gem _eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem d4f8591e9b20b106327e9d143eb13da5 ruby-ng c79a9fd7644eefe8009be02a82648e1f toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=dcc197e2febe813d8d41a406e6c515f8 +_md5_=a5e76ed4537f157e559c7eeb0bab7d7c diff --git a/metadata/md5-cache/dev-ruby/atomic-1.1.99 b/metadata/md5-cache/dev-ruby/atomic-1.1.99 new file mode 100644 index 000000000000..18e8ec9dec29 --- /dev/null +++ b/metadata/md5-cache/dev-ruby/atomic-1.1.99 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install prepare setup test unpack +DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) +DESCRIPTION=An atomic reference implementation for JRuby, Rubinius, and MRI +EAPI=5 +HOMEPAGE=https://github.com/headius/ruby-atomic +IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 +LICENSE=Apache-2.0 +RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) +REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ) +SLOT=0 +SRC_URI=mirror://rubygems/atomic-1.1.99.gem +_eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem d4f8591e9b20b106327e9d143eb13da5 ruby-ng c79a9fd7644eefe8009be02a82648e1f toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f +_md5_=2a0869a5c18d8200b588c76bdb5ee9c8 diff --git a/metadata/md5-cache/dev-ruby/htmlentities-4.3.3 b/metadata/md5-cache/dev-ruby/htmlentities-4.3.3 index 86aac3263e8b..62c41bd0e22e 100644 --- a/metadata/md5-cache/dev-ruby/htmlentities-4.3.3 +++ b/metadata/md5-cache/dev-ruby/htmlentities-4.3.3 @@ -1,14 +1,14 @@ DEFINED_PHASES=compile configure install prepare setup test unpack -DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ) +DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) DESCRIPTION=A simple library for encoding/decoding entities in (X)HTML documents EAPI=5 HOMEPAGE=http://htmlentities.rubyforge.org/ -IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test +IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test KEYWORDS=~amd64 ~x86 ~x86-macos LICENSE=MIT -RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) -REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ) +RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) +REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ) SLOT=0 SRC_URI=mirror://rubygems/htmlentities-4.3.3.gem _eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem d4f8591e9b20b106327e9d143eb13da5 ruby-ng c79a9fd7644eefe8009be02a82648e1f toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=16ff70e9b14b50b0737385fe39739144 +_md5_=40243fe04b16587e0fe01f58f2d8d387 diff --git a/metadata/md5-cache/dev-ruby/journey-1.0.4-r1 b/metadata/md5-cache/dev-ruby/journey-1.0.4-r1 index 3460f6da4bf5..818ef472e525 100644 --- a/metadata/md5-cache/dev-ruby/journey-1.0.4-r1 +++ b/metadata/md5-cache/dev-ruby/journey-1.0.4-r1 @@ -1,14 +1,14 @@ DEFINED_PHASES=compile configure install prepare setup test unpack -DEPEND=ruby_targets_ruby19? ( doc? ( dev-ruby/hoe[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/hoe[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/hoe[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/hoe[ruby_targets_ruby19] dev-ruby/json[ruby_targets_ruby19] dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/hoe[ruby_targets_ruby20] dev-ruby/json[ruby_targets_ruby20] dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/hoe[ruby_targets_ruby21] dev-ruby/json[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ) +DEPEND=ruby_targets_ruby19? ( doc? ( dev-ruby/hoe[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/hoe[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/hoe[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/hoe[ruby_targets_ruby19] dev-ruby/json[ruby_targets_ruby19] dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/hoe[ruby_targets_ruby20] dev-ruby/json[ruby_targets_ruby20] dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/hoe[ruby_targets_ruby21] dev-ruby/json[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/json[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) DESCRIPTION=Journey is a router. It routes requests EAPI=5 HOMEPAGE=https://github.com/rails/journey -IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test +IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos ~x86-solaris LICENSE=MIT -RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) -REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ) +RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) +REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ) SLOT=1.0 SRC_URI=mirror://rubygems/journey-1.0.4.gem _eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem d4f8591e9b20b106327e9d143eb13da5 ruby-ng c79a9fd7644eefe8009be02a82648e1f toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=03e25c978c15c53dfe81a34ee237d21c +_md5_=dede849223338c4d79aa4df20a09678a diff --git a/metadata/md5-cache/dev-ruby/jwt-1.0.0 b/metadata/md5-cache/dev-ruby/jwt-1.0.0 deleted file mode 100644 index 15e4105e994c..000000000000 --- a/metadata/md5-cache/dev-ruby/jwt-1.0.0 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare setup test unpack -DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/echoe[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/echoe[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/echoe[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ) -DESCRIPTION=A Ruby implementation of JSON Web Token draft 06 -EAPI=5 -HOMEPAGE=https://github.com/progrium/ruby-jwt -IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test -KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 -LICENSE=MIT -RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.5.1[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) -REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ) -SLOT=0 -SRC_URI=mirror://rubygems/jwt-1.0.0.gem -_eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem d4f8591e9b20b106327e9d143eb13da5 ruby-ng c79a9fd7644eefe8009be02a82648e1f toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=c648433523ed91a0ea7e33fb5827f7ee diff --git a/metadata/md5-cache/dev-ruby/jwt-1.2.1 b/metadata/md5-cache/dev-ruby/jwt-1.2.1 new file mode 100644 index 000000000000..c30cc11fbb08 --- /dev/null +++ b/metadata/md5-cache/dev-ruby/jwt-1.2.1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install prepare setup test unpack +DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ) +DESCRIPTION=A Ruby implementation of JSON Web Token draft 06 +EAPI=5 +HOMEPAGE=https://github.com/progrium/ruby-jwt +IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test +KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 +LICENSE=MIT +RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) +REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ) +SLOT=0 +SRC_URI=mirror://rubygems/jwt-1.2.1.gem +_eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem d4f8591e9b20b106327e9d143eb13da5 ruby-ng c79a9fd7644eefe8009be02a82648e1f toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f +_md5_=05e0a15f95ee42878bdcc66efbe0b4a1 diff --git a/metadata/md5-cache/dev-ruby/listen-0.7.3 b/metadata/md5-cache/dev-ruby/listen-0.7.3 deleted file mode 100644 index 3f1001893092..000000000000 --- a/metadata/md5-cache/dev-ruby/listen-0.7.3 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare setup test unpack -DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ) -DESCRIPTION=Listens to file modifications and notifies you about the changes -EAPI=5 -HOMEPAGE=https://github.com/guard/listen -IUSE=test elibc_FreeBSD ruby_targets_ruby19 test test -KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~x64-macos -LICENSE=MIT -RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) -REQUIRED_USE=|| ( ruby_targets_ruby19 ) -SLOT=0 -SRC_URI=https://github.com/guard/listen/archive/v0.7.3.tar.gz -> listen-0.7.3-git.tgz -_eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem d4f8591e9b20b106327e9d143eb13da5 ruby-ng c79a9fd7644eefe8009be02a82648e1f toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=a57906546ebd9966468cf8e0b1a3e4c6 diff --git a/metadata/md5-cache/dev-ruby/listen-2.7.5 b/metadata/md5-cache/dev-ruby/listen-2.7.5 deleted file mode 100644 index 29d0d356365c..000000000000 --- a/metadata/md5-cache/dev-ruby/listen-2.7.5 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare setup test unpack -DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19] >=dev-ruby/celluloid-0.15.2[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby20] >=dev-ruby/celluloid-0.15.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby21] >=dev-ruby/celluloid-0.15.2[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/celluloid-io[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/celluloid-io[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/celluloid-io[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ) -DESCRIPTION=Listens to file modifications and notifies you about the changes -EAPI=5 -HOMEPAGE=https://github.com/guard/listen -IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test -KEYWORDS=~amd64 ~ppc ~ppc64 -LICENSE=MIT -RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19] >=dev-ruby/celluloid-0.15.2[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby20] >=dev-ruby/celluloid-0.15.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby21] >=dev-ruby/celluloid-0.15.2[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) -REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ) -SLOT=2 -SRC_URI=mirror://rubygems/listen-2.7.5.gem -_eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem d4f8591e9b20b106327e9d143eb13da5 ruby-ng c79a9fd7644eefe8009be02a82648e1f toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=a45b6bacccf95e6c265aad0d4747bc05 diff --git a/metadata/md5-cache/dev-ruby/listen-2.8.5 b/metadata/md5-cache/dev-ruby/listen-2.8.5 index 5d85556da952..a6057bb77fa0 100644 --- a/metadata/md5-cache/dev-ruby/listen-2.8.5 +++ b/metadata/md5-cache/dev-ruby/listen-2.8.5 @@ -6,9 +6,9 @@ HOMEPAGE=https://github.com/guard/listen IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test KEYWORDS=~amd64 ~ppc ~ppc64 LICENSE=MIT -RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19] >=dev-ruby/celluloid-0.15.2[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby20] >=dev-ruby/celluloid-0.15.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby21] >=dev-ruby/celluloid-0.15.2[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) +RDEPEND=!!media-sound/listen !!media-radio/ax25 ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19] >=dev-ruby/celluloid-0.15.2[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby20] >=dev-ruby/celluloid-0.15.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby21] >=dev-ruby/celluloid-0.15.2[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ) SLOT=2 SRC_URI=https://github.com/guard/listen/archive/v2.8.5.tar.gz -> listen-2.8.5.tar.gz _eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem d4f8591e9b20b106327e9d143eb13da5 ruby-ng c79a9fd7644eefe8009be02a82648e1f toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=6000463b1b0f4a602cd6fd4c12ffda02 +_md5_=9a067bc7c8d2ec69bfa6fd8895002797 diff --git a/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1 b/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1 index 058792c701d4..36d1c676c93e 100644 --- a/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1 +++ b/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1 @@ -1,14 +1,14 @@ DEFINED_PHASES=compile configure install prepare setup test unpack -DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ) +DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) DESCRIPTION=Library to perform different operations with permutations of sequences (strings, arrays, etc.) EAPI=5 HOMEPAGE=http://flori.github.com/permutation -IUSE=doc elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test +IUSE=doc elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test KEYWORDS=~amd64 LICENSE=|| ( Ruby-BSD BSD-2 ) -RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) -REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ) +RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) +REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ) SLOT=0 SRC_URI=mirror://rubygems/permutation-0.1.8.gem _eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem d4f8591e9b20b106327e9d143eb13da5 ruby-ng c79a9fd7644eefe8009be02a82648e1f toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=c2fb63de9123ed6884c86f0e7c3b1896 +_md5_=8234955e5023ac239ff7203dffbf36ea diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2 index 6b9390b8d95d..5fc423949705 100644 --- a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2 +++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2 @@ -4,11 +4,11 @@ DESCRIPTION=A Text Progress Bar Library for Ruby EAPI=5 HOMEPAGE=https://github.com/jfelchner/ruby-progressbar IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test -KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd +KEYWORDS=~amd64 hppa ~ppc ~ppc64 ~x86 ~x86-fbsd LICENSE=MIT RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ) SLOT=0 SRC_URI=mirror://rubygems/ruby-progressbar-1.4.2.gem _eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem d4f8591e9b20b106327e9d143eb13da5 ruby-ng c79a9fd7644eefe8009be02a82648e1f toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=4f2042c19820e27875adb62ce318b593 +_md5_=87429cd9b7b091ddc149abeed9e15adb diff --git a/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r1 b/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r1 index 58ed184eecef..85693704edeb 100644 --- a/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r1 +++ b/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r1 @@ -1,15 +1,15 @@ DEFINED_PHASES=compile configure install prepare setup test unpack -DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ) +DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) DESCRIPTION=A very simple library to use URL shortening services such as TinyURL or RubyURL EAPI=5 HOMEPAGE=http://shorturl.rubyforge.org/ -IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test +IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos LICENSE=MIT -RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) -REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ) +RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) +REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ) RESTRICT=test SLOT=0 SRC_URI=mirror://rubygems/shorturl-1.0.0.gem _eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem d4f8591e9b20b106327e9d143eb13da5 ruby-ng c79a9fd7644eefe8009be02a82648e1f toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=b8da1759c967356af361087b7f685831 +_md5_=2a35378c32ffd252a16c25cf283ec464 diff --git a/metadata/md5-cache/dev-ruby/timecop-0.7.1 b/metadata/md5-cache/dev-ruby/timecop-0.7.1 index de8f35388453..a9364d5c8806 100644 --- a/metadata/md5-cache/dev-ruby/timecop-0.7.1 +++ b/metadata/md5-cache/dev-ruby/timecop-0.7.1 @@ -4,11 +4,11 @@ DESCRIPTION=A gem providing 'time travel' and 'time freezing' capabilities EAPI=5 HOMEPAGE=http://github.com/jtrupiano/timecop IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test -KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd +KEYWORDS=~amd64 ~arm hppa ~ppc ~ppc64 ~x86 ~x86-fbsd LICENSE=MIT RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ) SLOT=0 SRC_URI=mirror://rubygems/timecop-0.7.1.gem _eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem d4f8591e9b20b106327e9d143eb13da5 ruby-ng c79a9fd7644eefe8009be02a82648e1f toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=c0f79076d92b0d2268ebf0f5ffd29de2 +_md5_=84fe60a49ae37db66789436efc1a9cca diff --git a/metadata/md5-cache/dev-ruby/wirble-0.1.3-r3 b/metadata/md5-cache/dev-ruby/wirble-0.1.3-r3 index 9804596496b5..add71b291787 100644 --- a/metadata/md5-cache/dev-ruby/wirble-0.1.3-r3 +++ b/metadata/md5-cache/dev-ruby/wirble-0.1.3-r3 @@ -1,14 +1,14 @@ DEFINED_PHASES=compile configure install postinst prepare setup test unpack -DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ) +DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) DESCRIPTION=Wirble is a set of enhancements for Irb EAPI=5 HOMEPAGE=http://pablotron.org/software/wirble/ -IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test +IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test KEYWORDS=~amd64 ~ppc ~x86 LICENSE=Ruby -RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) -REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ) +RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) +REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ) SLOT=0 SRC_URI=mirror://rubygems/wirble-0.1.3.gem _eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem d4f8591e9b20b106327e9d143eb13da5 ruby-ng c79a9fd7644eefe8009be02a82648e1f toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=5cb1797dae6bc1c8a552201e221b8231 +_md5_=f3ceb0ad85ed363084e0aeb9afb1f6b6 diff --git a/metadata/md5-cache/dev-util/jenkins-bin-1.595 b/metadata/md5-cache/dev-util/jenkins-bin-1.598 similarity index 71% rename from metadata/md5-cache/dev-util/jenkins-bin-1.595 rename to metadata/md5-cache/dev-util/jenkins-bin-1.598 index 658987f041df..a9e4427ed3c6 100644 --- a/metadata/md5-cache/dev-util/jenkins-bin-1.595 +++ b/metadata/md5-cache/dev-util/jenkins-bin-1.598 @@ -8,6 +8,6 @@ LICENSE=MIT RDEPEND=media-fonts/dejavu !dev-util/jenkins-bin:lts virtual/jre RESTRICT=mirror SLOT=0 -SRC_URI=http://mirrors.jenkins-ci.org/war/1.595/jenkins.war -> jenkins-bin-1.595.war +SRC_URI=http://mirrors.jenkins-ci.org/war/1.598/jenkins.war -> jenkins-bin-1.598.war _eclasses_=user f54e098dd38ba1c0847a13e685b87747 -_md5_=a69ffd7b3b846991c1421deaa6656c7f +_md5_=5118ead2c12e82dacc789a77f9b03704 diff --git a/metadata/md5-cache/dev-util/trace-cmd-2.5.1 b/metadata/md5-cache/dev-util/trace-cmd-2.5.1 new file mode 100644 index 000000000000..e0f861007a13 --- /dev/null +++ b/metadata/md5-cache/dev-util/trace-cmd-2.5.1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare setup +DEPEND=python? ( >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) udis86? ( dev-libs/udis86 ) gtk? ( >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) sys-kernel/linux-headers python? ( virtual/pkgconfig dev-lang/swig ) gtk? ( virtual/pkgconfig ) doc? ( app-text/asciidoc ) +DESCRIPTION=User-space front-end for Ftrace +EAPI=5 +HOMEPAGE=https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git +IUSE=doc gtk python udis86 python_targets_python2_7 +KEYWORDS=~amd64 +LICENSE=GPL-2 LGPL-2.1 +RDEPEND=python? ( >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) udis86? ( dev-libs/udis86 ) gtk? ( >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) +SLOT=0 +SRC_URI=mirror://gentoo/trace-cmd-2.5.1.tar.xz +_eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 linux-info 2b8c53f6065bdee2d757472215a3088f multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-single-r1 ed2ee20dc74a34be60f5b1b500e92a5b python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f +_md5_=20d27e659eed4918bda84cf023bf5e6e diff --git a/metadata/md5-cache/dev-vcs/git-flow-1.8.0 b/metadata/md5-cache/dev-vcs/git-flow-1.8.0 new file mode 100644 index 000000000000..1c13f4e0695d --- /dev/null +++ b/metadata/md5-cache/dev-vcs/git-flow-1.8.0 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile install prepare +DESCRIPTION=Git extensions to provide high-level repository operations for Vincent Driessen's branching model +EAPI=5 +HOMEPAGE=https://github.com/petervanderdoes/gitflow +KEYWORDS=~amd64 ~x86 +LICENSE=BSD MIT +RDEPEND=dev-util/shflags dev-vcs/git +SLOT=0 +SRC_URI=https://github.com/petervanderdoes/gitflow/archive/1.8.0.tar.gz -> git-flow-1.8.0.tar.gz https://github.com/petervanderdoes/git-flow-completion/archive/0.5.1.tar.gz -> git-flow-completion-0.5.1.tar.gz +_eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 eutils 998e5931fb95b10a6a11ec796ada2759 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac +_md5_=7fcb62013debcc5ef85e73ca20a0dd96 diff --git a/metadata/md5-cache/games-action/d1x-rebirth-0.58.1 b/metadata/md5-cache/games-action/d1x-rebirth-0.58.1 new file mode 100644 index 000000000000..defd84e379fb --- /dev/null +++ b/metadata/md5-cache/games-action/d1x-rebirth-0.58.1 @@ -0,0 +1,16 @@ +DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack +DEPEND=dev-games/physfs[hog,zip] media-libs/libsdl[X,sound,joystick,opengl?,video] cdinstall? ( !games-action/descent1-demodata ) music? ( media-libs/sdl-mixer[timidity] ) opengl? ( virtual/opengl virtual/glu ) app-arch/unzip dev-util/scons +DESCRIPTION=Descent Rebirth - enhanced Descent 1 engine +EAPI=5 +HOMEPAGE=http://www.dxx-rebirth.com/ +IUSE=cdinstall debug demo ipv6 linguas_de +music opengl opl3-musicpack sc55-musicpack cdinstall +KEYWORDS=~amd64 ~x86 +LICENSE=D1X GPL-2 public-domain +PDEPEND=demo? ( games-action/descent1-demodata ) +PROPERTIES=cdinstall? ( interactive ) +RDEPEND=dev-games/physfs[hog,zip] media-libs/libsdl[X,sound,joystick,opengl?,video] cdinstall? ( !games-action/descent1-demodata ) music? ( media-libs/sdl-mixer[timidity] ) opengl? ( virtual/opengl virtual/glu ) games-misc/games-envd +REQUIRED_USE=?? ( cdinstall demo ) ?? ( opl3-musicpack sc55-musicpack ) opl3-musicpack? ( music ) sc55-musicpack? ( music ) +SLOT=0 +SRC_URI=http://www.dxx-rebirth.com/download/dxx/d1x-rebirth_v0.58.1-src.tar.gz http://www.dxx-rebirth.com/download/dxx/res/d1xrdata.zip http://www.dxx-rebirth.com/download/dxx/res/dxx-rebirth_icons.zip opl3-musicpack? ( http://www.dxx-rebirth.com/download/dxx/res/d1xr-opl3-music.zip ) sc55-musicpack? ( http://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.zip ) cdinstall? ( http://www.dxx-rebirth.com/download/dxx/res/d1datapt.zip ) linguas_de? ( http://www.dxx-rebirth.com/download/dxx/res/d1xr-briefings-ger.zip ) +_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 cdrom 49b4b952fb5c83fac6c616b532723e60 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f multilib 3bf24e6abb9b76d9f6c20600f0b716bf portability a45c088f246ef5091e029f6285d7ce42 scons-utils 988e24b9e2e4642189b4e97c03e5ae71 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 +_md5_=31bb934ca3cbe7a2492a3765139b321b diff --git a/metadata/md5-cache/games-action/hotline-miami-1.0.9a b/metadata/md5-cache/games-action/hotline-miami-1.0.9a deleted file mode 100644 index 4017c3c1b7a6..000000000000 --- a/metadata/md5-cache/games-action/hotline-miami-1.0.9a +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack -DESCRIPTION=High-octane action game overflowing with raw brutality -EAPI=5 -HOMEPAGE=http://www.devolverdigital.com/games/view/hotline-miami -IUSE=bundled-libs +launcher -KEYWORDS=~amd64 ~x86 -LICENSE=all-rights-reserved -RDEPEND=amd64? ( || ( >=x11-libs/libX11-1.6.2[abi_x86_32] app-emulation/emul-linux-x86-xlibs ) !bundled-libs? ( media-gfx/nvidia-cg-toolkit[multilib] || ( ( app-emulation/emul-linux-x86-soundlibs ) ( >=media-libs/libogg-1.3.0[abi_x86_32] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32] >=media-libs/openal-1.15.1[abi_x86_32] ) ) ) launcher? ( || ( ( app-emulation/emul-linux-x86-xlibs ) ( >=media-libs/freetype-2.5.0.1[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXrandr-1.4.2[abi_x86_32] >=x11-libs/libXrender-0.9.8[abi_x86_32] >=x11-libs/libxcb-1.9.1[abi_x86_32] ) ) ) ) x86? ( x11-libs/libX11 !bundled-libs? ( media-gfx/nvidia-cg-toolkit media-libs/libogg media-libs/libvorbis media-libs/openal ) launcher? ( media-libs/freetype x11-libs/libXext x11-libs/libXrandr x11-libs/libXrender x11-libs/libxcb ) ) games-misc/games-envd -RESTRICT=bindist fetch splitdebug -SLOT=0 -SRC_URI=hotlinemiami_v1.0.9a-Linux_28-05-2013.tar.gz -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=6814594dec58b8dd1f520148b7f302c9 diff --git a/metadata/md5-cache/games-action/lugaru-1.0c b/metadata/md5-cache/games-action/lugaru-1.0c deleted file mode 100644 index 0986ca4c801b..000000000000 --- a/metadata/md5-cache/games-action/lugaru-1.0c +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile install postinst preinst setup unpack -DEPEND=app-arch/unzip -DESCRIPTION=3D arcade with unique fighting system and anthropomorphic characters -HOMEPAGE=http://www.wolfire.com/lugaru -KEYWORDS=-* ~amd64 ~x86 -LICENSE=GPL-2 free-noncomm -RDEPEND=sys-libs/glibc amd64? ( app-emulation/emul-linux-x86-xlibs ) x86? ( x11-libs/libX11 x11-libs/libXext ) games-misc/games-envd -RESTRICT=fetch strip -SLOT=0 -SRC_URI=lugaru-full-linux-x86-1.0c.bin -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac unpacker f300a7ca9131b1024a79762e8edd3c52 user f54e098dd38ba1c0847a13e685b87747 -_md5_=5303c26f92be9dc60d5a54610745701f diff --git a/metadata/md5-cache/games-action/minetest-0.4.10 b/metadata/md5-cache/games-action/minetest-0.4.10 deleted file mode 100644 index d0a433b7aea9..000000000000 --- a/metadata/md5-cache/games-action/minetest-0.4.10 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack -DEPEND=dev-db/sqlite:3 >=dev-games/irrlicht-1.8-r2 sys-libs/zlib curl? ( net-misc/curl ) !dedicated? ( app-arch/bzip2 media-libs/libpng:0 virtual/jpeg virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm sound? ( media-libs/libogg media-libs/libvorbis media-libs/openal ) truetype? ( media-libs/freetype:2 ) ) leveldb? ( dev-libs/leveldb ) luajit? ( dev-lang/luajit:2 ) !luajit? ( >=dev-lang/lua-5.1.4[deprecated] ) nls? ( virtual/libintl ) redis? ( dev-libs/hiredis ) nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4 -DESCRIPTION=An InfiniMiner/Minecraft inspired game -EAPI=5 -HOMEPAGE=http://minetest.net/ -IUSE=+curl dedicated leveldb luajit nls redis +server +sound +truetype -KEYWORDS=~amd64 ~x86 -LICENSE=LGPL-2.1+ CC-BY-SA-3.0 -RDEPEND=dev-db/sqlite:3 >=dev-games/irrlicht-1.8-r2 sys-libs/zlib curl? ( net-misc/curl ) !dedicated? ( app-arch/bzip2 media-libs/libpng:0 virtual/jpeg virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm sound? ( media-libs/libogg media-libs/libvorbis media-libs/openal ) truetype? ( media-libs/freetype:2 ) ) leveldb? ( dev-libs/leveldb ) luajit? ( dev-lang/luajit:2 ) !luajit? ( >=dev-lang/lua-5.1.4[deprecated] ) nls? ( virtual/libintl ) redis? ( dev-libs/hiredis ) games-misc/games-envd -SLOT=0 -SRC_URI=http://github.com/minetest/minetest/tarball/0.4.10 -> minetest-0.4.10.tar.gz -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 cmake-utils 0e29eadbd656185bce30d2449ab48035 eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 games bc8839608d26ccd57ca4f2f01c67460f gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 vcs-snapshot 58b766562c9fbfb3268b04e33cdf2f66 -_md5_=52fe026f06d81535a49627e3a0a9ba12 diff --git a/metadata/md5-cache/games-action/openclonk-5.3.3 b/metadata/md5-cache/games-action/openclonk-5.3.3 deleted file mode 100644 index 7c5469d22964..000000000000 --- a/metadata/md5-cache/games-action/openclonk-5.3.3 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack -DEPEND=media-libs/libpng:0 sys-libs/zlib virtual/jpeg !dedicated? ( media-libs/freetype:2 media-libs/glew media-libs/libsdl[X,opengl,video] virtual/opengl virtual/glu x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libXrandr x11-libs/libX11 sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[mp3?,vorbis,wav] ) ) dedicated? ( sys-libs/readline:0 ) upnp? ( net-libs/libupnp ) >=dev-libs/boost-1.40 virtual/pkgconfig doc? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-libs/libxml2[python] sys-devel/gettext ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 -DESCRIPTION=A free multiplayer action game where you control clonks -EAPI=5 -HOMEPAGE=http://openclonk.org/ -IUSE=dedicated doc mp3 sound upnp -KEYWORDS=amd64 x86 -LICENSE=BSD ISC CLONK-trademark LGPL-2.1 POSTGRESQL -RDEPEND=media-libs/libpng:0 sys-libs/zlib virtual/jpeg !dedicated? ( media-libs/freetype:2 media-libs/glew media-libs/libsdl[X,opengl,video] virtual/opengl virtual/glu x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libXrandr x11-libs/libX11 sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[mp3?,vorbis,wav] ) ) dedicated? ( sys-libs/readline:0 ) upnp? ( net-libs/libupnp ) games-misc/games-envd -SLOT=0 -SRC_URI=http://dev.gentoo.org/~hasufell/distfiles/openclonk-5.3.3.tar.xz http://openclonk.org/homepage/icon.png -> openclonk.png -_eclasses_=autotools 8fc2dd333ef9346c906ffd9a523d8211 base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 games bc8839608d26ccd57ca4f2f01c67460f gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-any-r1 da352ea9da8eb9bf158d56cca65d6c82 python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=349baae0657f9a1d2abf3aff201e3f2e diff --git a/metadata/md5-cache/games-arcade/commandergenius-1.7.2.0 b/metadata/md5-cache/games-arcade/commandergenius-1.7.2.0 deleted file mode 100644 index e01a056b718a..000000000000 --- a/metadata/md5-cache/games-arcade/commandergenius-1.7.2.0 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack -DEPEND=media-libs/libsdl2[X,opengl?,sound,video] media-libs/sdl2-image opengl? ( virtual/opengl ) tremor? ( media-libs/tremor ) !tremor? ( media-libs/libvorbis ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) -DESCRIPTION=Open Source Commander Keen clone (needs original game files) -EAPI=5 -HOMEPAGE=http://clonekeenplus.sourceforge.net -IUSE=opengl tremor -KEYWORDS=~amd64 ~x86 -LICENSE=GPL-2 LGPL-2 -RDEPEND=media-libs/libsdl2[X,opengl?,sound,video] media-libs/sdl2-image opengl? ( virtual/opengl ) tremor? ( media-libs/tremor ) !tremor? ( media-libs/libvorbis ) games-misc/games-envd -SLOT=0 -SRC_URI=mirror://sourceforge/clonekeenplus/CGenius/V1.7/CGenius-1.7.2.0-Release-src.tar.gz -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 cmake-utils 0e29eadbd656185bce30d2449ab48035 eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 games bc8839608d26ccd57ca4f2f01c67460f multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=c4e03fe602b516227ad403ef36bcb018 diff --git a/metadata/md5-cache/games-arcade/commandergenius-1.7.3.0 b/metadata/md5-cache/games-arcade/commandergenius-1.7.3.0 deleted file mode 100644 index d45003e70954..000000000000 --- a/metadata/md5-cache/games-arcade/commandergenius-1.7.3.0 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack -DEPEND=media-libs/libsdl2[X,opengl?,sound,video] media-libs/sdl2-image opengl? ( virtual/opengl ) tremor? ( media-libs/tremor ) !tremor? ( media-libs/libvorbis ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) -DESCRIPTION=Open Source Commander Keen clone (needs original game files) -EAPI=5 -HOMEPAGE=http://clonekeenplus.sourceforge.net -IUSE=opengl tremor -KEYWORDS=~amd64 ~x86 -LICENSE=GPL-2 LGPL-2 -RDEPEND=media-libs/libsdl2[X,opengl?,sound,video] media-libs/sdl2-image opengl? ( virtual/opengl ) tremor? ( media-libs/tremor ) !tremor? ( media-libs/libvorbis ) games-misc/games-envd -SLOT=0 -SRC_URI=mirror://sourceforge/clonekeenplus/CGenius/V1.7/CGenius-1.7.3.0-Release-src.tar.gz -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 cmake-utils 0e29eadbd656185bce30d2449ab48035 eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 games bc8839608d26ccd57ca4f2f01c67460f multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=f6f414b6ffafd6e89c7058dca4b40c91 diff --git a/metadata/md5-cache/games-arcade/diameter-0.4.0.3 b/metadata/md5-cache/games-arcade/diameter-0.4.0.3 deleted file mode 100644 index 7a91e6018a7f..000000000000 --- a/metadata/md5-cache/games-arcade/diameter-0.4.0.3 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack -DEPEND=>=dev-games/guichan-0.8[opengl,sdl] media-libs/libpng virtual/opengl virtual/glu media-libs/libsdl[video] media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-mixer virtual/pkgconfig =dev-lang/python-2* !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=Arcade game with elements of economy and adventure -EAPI=2 -HOMEPAGE=http://gamediameter.sourceforge.net/ -KEYWORDS=amd64 x86 -LICENSE=GPL-2 -RDEPEND=>=dev-games/guichan-0.8[opengl,sdl] media-libs/libpng virtual/opengl virtual/glu media-libs/libsdl[video] media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-mixer =dev-lang/python-2* games-misc/games-envd -SLOT=0 -SRC_URI=mirror://sourceforge/gamediameter/diameter-0.4.0.3.tar.bz2 -_eclasses_=autotools 8fc2dd333ef9346c906ffd9a523d8211 base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python cd022f89fef846d083fc994b9e3d8c04 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=afdcadb0997db5444b36bcba3ae22de5 diff --git a/metadata/md5-cache/games-arcade/dynamitejack-1.0.23 b/metadata/md5-cache/games-arcade/dynamitejack-1.0.23 deleted file mode 100644 index 8a21a30f162d..000000000000 --- a/metadata/md5-cache/games-arcade/dynamitejack-1.0.23 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack -DESCRIPTION=A stealth game with bombs in glorious 2D -EAPI=5 -HOMEPAGE=http://www.galcon.com/dynamitejack/ -KEYWORDS=-* ~amd64 ~x86 -LICENSE=all-rights-reserved -RDEPEND=virtual/opengl amd64? ( app-emulation/emul-linux-x86-opengl app-emulation/emul-linux-x86-sdl app-emulation/emul-linux-x86-soundlibs[alsa] app-emulation/emul-linux-x86-xlibs ) x86? ( media-libs/alsa-lib media-libs/flac media-libs/libogg media-libs/libsdl[X,sound,joystick,opengl,video] media-libs/libsndfile media-libs/libvorbis media-sound/pulseaudio virtual/glu x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXdmcp x11-libs/libXext x11-libs/libXi x11-libs/libXtst ) games-misc/games-envd -RESTRICT=bindist fetch splitdebug -SLOT=0 -SRC_URI=dynamitejack-1.0.23.tgz -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=e600bbd36bcb76e0ebfd6a80b19b0134 diff --git a/metadata/md5-cache/games-arcade/watermelons-1.1.1 b/metadata/md5-cache/games-arcade/watermelons-1.1.1 deleted file mode 100644 index 5261af81e3bd..000000000000 --- a/metadata/md5-cache/games-arcade/watermelons-1.1.1 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack -DEPEND==dev-lang/python-2* -DESCRIPTION=A thrilling watermelon bouncing game -EAPI=2 -HOMEPAGE=http://www.imitationpickles.org/melons/index.html -KEYWORDS=amd64 x86 ~x86-fbsd -LICENSE=GPL-2 -RDEPEND=dev-python/pygame =dev-lang/python-2* games-misc/games-envd -SLOT=0 -SRC_URI=mirror://gentoo/melons-1.1.1.tgz -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f multilib 3bf24e6abb9b76d9f6c20600f0b716bf python cd022f89fef846d083fc994b9e3d8c04 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=729072b262543875d3c1ac64cbad5711 diff --git a/metadata/md5-cache/games-board/xboard-4.7.3 b/metadata/md5-cache/games-board/xboard-4.7.3 deleted file mode 100644 index aab01f108114..000000000000 --- a/metadata/md5-cache/games-board/xboard-4.7.3 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack -DEPEND=dev-libs/glib:2 gnome-base/librsvg:2 virtual/libintl x11-libs/cairo[X] x11-libs/libXpm default-font? ( media-fonts/font-adobe-100dpi[nls?] media-fonts/font-misc-misc[nls?] ) !gtk? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXmu Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) gtk? ( x11-libs/gtk+:2 ) x11-proto/xproto virtual/pkgconfig nls? ( sys-devel/gettext ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 -DESCRIPTION=GUI for gnuchess and for internet chess servers -EAPI=5 -HOMEPAGE=http://www.gnu.org/software/xboard/ -IUSE=Xaw3d +default-font gtk nls zippy -KEYWORDS=amd64 ~ppc ~ppc64 x86 -LICENSE=GPL-3 -RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 virtual/libintl x11-libs/cairo[X] x11-libs/libXpm default-font? ( media-fonts/font-adobe-100dpi[nls?] media-fonts/font-misc-misc[nls?] ) !gtk? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXmu Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) gtk? ( x11-libs/gtk+:2 ) games-misc/games-envd -RESTRICT=test -SLOT=0 -SRC_URI=mirror://gnu/xboard/xboard-4.7.3.tar.gz -_eclasses_=autotools 8fc2dd333ef9346c906ffd9a523d8211 base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa games bc8839608d26ccd57ca4f2f01c67460f gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=380fd86bd66588fa84985dd18d8b9f35 diff --git a/metadata/md5-cache/games-emulation/hatari-1.7.0 b/metadata/md5-cache/games-emulation/hatari-1.7.0 deleted file mode 100644 index 2cbb1c3cda85..000000000000 --- a/metadata/md5-cache/games-emulation/hatari-1.7.0 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack -DEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] media-libs/libsdl[X,sound,video] sys-libs/readline media-libs/libpng sys-libs/zlib virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) -DESCRIPTION=Atari ST emulator -EAPI=5 -HOMEPAGE=http://hatari.tuxfamily.org/ -IUSE=python_targets_python2_7 -KEYWORDS=~amd64 ~ppc ~x86 -LICENSE=GPL-2 -RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] media-libs/libsdl[X,sound,video] sys-libs/readline media-libs/libpng sys-libs/zlib dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] games-emulation/emutos games-misc/games-envd -REQUIRED_USE=python_targets_python2_7 -SLOT=0 -SRC_URI=http://download.tuxfamily.org/hatari/1.7.0/hatari-1.7.0.tar.bz2 -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 cmake-utils 0e29eadbd656185bce30d2449ab48035 eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 games bc8839608d26ccd57ca4f2f01c67460f multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-single-r1 ed2ee20dc74a34be60f5b1b500e92a5b python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=a954b3ffb2a851cb82ec08aeea8497d2 diff --git a/metadata/md5-cache/games-engines/odamex-0.6.2 b/metadata/md5-cache/games-engines/odamex-0.6.2 deleted file mode 100644 index 0536f9d36688..000000000000 --- a/metadata/md5-cache/games-engines/odamex-0.6.2 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack -DEPEND=!dedicated? ( >=media-libs/libsdl-1.2.9[X,sound,joystick,video] >=media-libs/sdl-mixer-1.2.6 odalaunch? ( x11-libs/wxGTK:2.8[X] ) portmidi? ( media-libs/portmidi ) ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4 -DESCRIPTION=An online multiplayer, free software engine for Doom and Doom II -EAPI=5 -HOMEPAGE=http://odamex.net/ -IUSE=dedicated +odalaunch master portmidi server -KEYWORDS=amd64 x86 -LICENSE=GPL-2 -RDEPEND=!dedicated? ( >=media-libs/libsdl-1.2.9[X,sound,joystick,video] >=media-libs/sdl-mixer-1.2.6 odalaunch? ( x11-libs/wxGTK:2.8[X] ) portmidi? ( media-libs/portmidi ) ) games-misc/games-envd -SLOT=0 -SRC_URI=mirror://sourceforge/odamex/Odamex/0.6.2/odamex-src-0.6.2.tar.bz2 -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 cmake-utils 0e29eadbd656185bce30d2449ab48035 eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 games bc8839608d26ccd57ca4f2f01c67460f gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 wxwidgets 6d6eec2685256d35511e7b6d5461bec9 -_md5_=9a536afa036d56b3e235763698a63e70 diff --git a/metadata/md5-cache/games-engines/odamex-0.6.3 b/metadata/md5-cache/games-engines/odamex-0.6.3 deleted file mode 100644 index e0ae8b9f40d0..000000000000 --- a/metadata/md5-cache/games-engines/odamex-0.6.3 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack -DEPEND=dedicated? ( >=net-libs/miniupnpc-1.8 ) !dedicated? ( >=media-libs/libsdl-1.2.9[X,sound,joystick,video] >=media-libs/sdl-mixer-1.2.6 odalaunch? ( x11-libs/wxGTK:2.8[X] ) portmidi? ( media-libs/portmidi ) server? ( >=net-libs/miniupnpc-1.8 ) ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4 -DESCRIPTION=An online multiplayer, free software engine for Doom and Doom II -EAPI=5 -HOMEPAGE=http://odamex.net/ -IUSE=dedicated +odalaunch master portmidi server -KEYWORDS=amd64 x86 -LICENSE=GPL-2 -RDEPEND=dedicated? ( >=net-libs/miniupnpc-1.8 ) !dedicated? ( >=media-libs/libsdl-1.2.9[X,sound,joystick,video] >=media-libs/sdl-mixer-1.2.6 odalaunch? ( x11-libs/wxGTK:2.8[X] ) portmidi? ( media-libs/portmidi ) server? ( >=net-libs/miniupnpc-1.8 ) ) games-misc/games-envd -SLOT=0 -SRC_URI=mirror://sourceforge/odamex/Odamex/0.6.3/odamex-src-0.6.3.tar.bz2 -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 cmake-utils 0e29eadbd656185bce30d2449ab48035 eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 games bc8839608d26ccd57ca4f2f01c67460f gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 wxwidgets 6d6eec2685256d35511e7b6d5461bec9 -_md5_=2fc05fef1069e639dd236d96ada355ed diff --git a/metadata/md5-cache/games-engines/residualvm-0.1.0 b/metadata/md5-cache/games-engines/residualvm-0.2.1 similarity index 89% rename from metadata/md5-cache/games-engines/residualvm-0.1.0 rename to metadata/md5-cache/games-engines/residualvm-0.2.1 index 2b4f43b1fbf7..d9eb83191094 100644 --- a/metadata/md5-cache/games-engines/residualvm-0.1.0 +++ b/metadata/md5-cache/games-engines/residualvm-0.2.1 @@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~x86 LICENSE=GPL-2 LGPL-2.1 RDEPEND=media-libs/alsa-lib media-libs/freetype:2 media-libs/libsdl[X,sound,alsa,joystick,opengl,video] sys-libs/zlib virtual/glu virtual/opengl games-misc/games-envd SLOT=0 -SRC_URI=mirror://sourceforge/residualvm/residualvm-0.1.0-sources.tar.bz2 +SRC_URI=mirror://sourceforge/residualvm/residualvm-0.2.1-sources.tar.bz2 _eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=c153c241db27e8672ee8e18c79785ed7 +_md5_=9cb3a77f9b37c45723d593ffaf6c5f5f diff --git a/metadata/md5-cache/games-engines/solarus-1.2.1 b/metadata/md5-cache/games-engines/solarus-1.2.1 deleted file mode 100644 index 61be870c50eb..000000000000 --- a/metadata/md5-cache/games-engines/solarus-1.2.1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack -DEPEND=dev-games/physfs media-libs/libmodplug >=media-libs/libsdl2-2.0.1[X,joystick,video] media-libs/libvorbis media-libs/openal media-libs/sdl2-image[png] >=media-libs/sdl2-ttf-2.0.12 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) -DESCRIPTION=An open-source Zelda-like 2D game engine -EAPI=5 -HOMEPAGE=http://www.solarus-games.org/ -IUSE=luajit -KEYWORDS=~amd64 ~x86 -LICENSE=GPL-3 -RDEPEND=dev-games/physfs media-libs/libmodplug >=media-libs/libsdl2-2.0.1[X,joystick,video] media-libs/libvorbis media-libs/openal media-libs/sdl2-image[png] >=media-libs/sdl2-ttf-2.0.12 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua ) games-misc/games-envd -SLOT=0 -SRC_URI=http://www.zelda-solarus.com/downloads/solarus/solarus-1.2.1-src.tar.gz -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 cmake-utils 0e29eadbd656185bce30d2449ab48035 eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 games bc8839608d26ccd57ca4f2f01c67460f multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=f5be35b0d48a3ce083e3676cfde33848 diff --git a/metadata/md5-cache/games-engines/solarus-1.3.0 b/metadata/md5-cache/games-engines/solarus-1.3.0 deleted file mode 100644 index 0e0edccdf9a0..000000000000 --- a/metadata/md5-cache/games-engines/solarus-1.3.0 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack -DEPEND=dev-games/physfs media-libs/libmodplug >=media-libs/libsdl2-2.0.1[X,joystick,video] media-libs/libvorbis media-libs/openal media-libs/sdl2-image[png] >=media-libs/sdl2-ttf-2.0.12 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) -DESCRIPTION=An open-source Zelda-like 2D game engine -EAPI=5 -HOMEPAGE=http://www.solarus-games.org/ -IUSE=doc luajit -KEYWORDS=~amd64 ~x86 -LICENSE=GPL-3 -RDEPEND=dev-games/physfs media-libs/libmodplug >=media-libs/libsdl2-2.0.1[X,joystick,video] media-libs/libvorbis media-libs/openal media-libs/sdl2-image[png] >=media-libs/sdl2-ttf-2.0.12 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua ) games-misc/games-envd -SLOT=0 -SRC_URI=http://www.zelda-solarus.com/downloads/solarus/solarus-1.3.0-src.tar.gz -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 cmake-utils 0e29eadbd656185bce30d2449ab48035 eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 games bc8839608d26ccd57ca4f2f01c67460f multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=c500fc2e61ab881b5bd2567c6668959e diff --git a/metadata/md5-cache/games-fps/doomsday-1.9.8 b/metadata/md5-cache/games-fps/doomsday-1.9.8 deleted file mode 100644 index 2783baf35846..000000000000 --- a/metadata/md5-cache/games-fps/doomsday-1.9.8 +++ /dev/null @@ -1,15 +0,0 @@ -DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack -DEPEND=virtual/opengl virtual/glu media-libs/libsdl[joystick,sound] media-libs/sdl-mixer media-libs/libpng dev-qt/qtopengl:4 dev-qt/qtgui:4 net-misc/curl openal? ( media-libs/openal ) snowberry? ( =dev-lang/python-2* ) -DESCRIPTION=A modern gaming engine for Doom, Heretic, and Hexen -EAPI=4 -HOMEPAGE=http://www.dengine.net/ -IUSE=openal snowberry +doom demo freedoom heretic hexen resources -KEYWORDS=amd64 x86 -LICENSE=GPL-2 -PDEPEND=demo? ( games-fps/doom-data ) freedoom? ( games-fps/freedoom ) resources? ( games-fps/doomsday-resources ) -RDEPEND=virtual/opengl virtual/glu media-libs/libsdl[joystick,sound] media-libs/sdl-mixer media-libs/libpng dev-qt/qtopengl:4 dev-qt/qtgui:4 net-misc/curl openal? ( media-libs/openal ) snowberry? ( dev-python/wxpython ) snowberry? ( =dev-lang/python-2* ) games-misc/games-envd -REQUIRED_USE=demo? ( doom ) freedoom? ( doom ) resources? ( doom ) -SLOT=0 -SRC_URI=mirror://sourceforge/deng/doomsday-1.9.8.tar.gz -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 confutils 2ab69b52fa6ea0c0669a47fb94b354b4 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f multilib 3bf24e6abb9b76d9f6c20600f0b716bf python cd022f89fef846d083fc994b9e3d8c04 qmake-utils 9e0174de733aecba0a7e66b2b01841d2 qt4-r2 7199e3db5b5908325487d379c6f67cf0 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=96db15bde637cfe5beccb1a709bc478c diff --git a/metadata/md5-cache/games-fps/eduke32-20130317.3572-r1 b/metadata/md5-cache/games-fps/eduke32-20130317.3572-r1 deleted file mode 100644 index c4fdee82b87e..000000000000 --- a/metadata/md5-cache/games-fps/eduke32-20130317.3572-r1 +++ /dev/null @@ -1,15 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack -DEPEND=media-libs/flac media-libs/libogg media-libs/libsdl[X,joystick,opengl?,video] media-libs/libvorbis media-libs/sdl-mixer[timidity] sys-libs/zlib gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= sys-libs/zlib ) vpx? ( media-libs/libvpx ) app-arch/unzip x86? ( dev-lang/nasm ) >=sys-apps/sed-4 -DESCRIPTION=Port of Duke Nukem 3D for SDL -EAPI=5 -HOMEPAGE=http://www.eduke32.com/ http://hrp.duke4.net/ -IUSE=cdinstall debug demo gtk offensive +opengl opl-musicpack +png samples sc55-musicpack +server textures tools +vpx -KEYWORDS=~amd64 ~x86 -LICENSE=GPL-2 BUILDLIC textures? ( hrp_art ) -PDEPEND=cdinstall? ( games-fps/duke3d-data ) demo? ( games-fps/duke3d-demodata ) -RDEPEND=media-libs/flac media-libs/libogg media-libs/libsdl[X,joystick,opengl?,video] media-libs/libvorbis media-libs/sdl-mixer[timidity] sys-libs/zlib gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= sys-libs/zlib ) vpx? ( media-libs/libvpx ) games-misc/games-envd -REQUIRED_USE=vpx? ( opengl ) textures? ( opengl ) offensive? ( textures ) ?? ( opl-musicpack sc55-musicpack ) -SLOT=0 -SRC_URI=http://dukeworld.duke4.net/eduke32/synthesis/20130317-3572/eduke32_src_20130317-3572.tar.bz2 http://dev.gentoo.org/~hasufell/distfiles/eduke32-icons.tar textures? ( http://www.duke4.org/files/nightfright/duke3d_hrp.zip -> duke3d_hrp_5.2.zip ) sc55-musicpack? ( http://www.duke4.org/files/nightfright/music/duke3d_mus.zip -> duke3d_mus_3.0.zip ) opl-musicpack? ( http://www.duke4.org/files/nightfright/music/duke3d_musopl.zip -> duke3d_musopl_2.0.zip ) offensive? ( http://www.duke4.org/files/nightfright/duke3d_xxx.zip -> duke3d_xxx_1.33.zip ) -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=e3d5e336e78728d2a7457173aedf89b8 diff --git a/metadata/md5-cache/games-fps/eduke32-20130627.3905 b/metadata/md5-cache/games-fps/eduke32-20130627.3905 deleted file mode 100644 index a303d969c4eb..000000000000 --- a/metadata/md5-cache/games-fps/eduke32-20130627.3905 +++ /dev/null @@ -1,15 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack -DEPEND=media-libs/flac media-libs/libogg media-libs/libsdl[X,joystick,opengl?,video] media-libs/libvorbis media-libs/sdl-mixer[timidity] sys-libs/zlib gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= sys-libs/zlib ) vpx? ( media-libs/libvpx ) app-arch/unzip x86? ( dev-lang/nasm ) >=sys-apps/sed-4 -DESCRIPTION=Port of Duke Nukem 3D for SDL -EAPI=5 -HOMEPAGE=http://www.eduke32.com/ http://hrp.duke4.net/ -IUSE=cdinstall debug demo gtk offensive +opengl opl-musicpack +png samples sc55-musicpack +server textures tools +vpx -KEYWORDS=~amd64 ~x86 -LICENSE=GPL-2 BUILDLIC textures? ( hrp_art ) -PDEPEND=cdinstall? ( games-fps/duke3d-data ) demo? ( games-fps/duke3d-demodata ) -RDEPEND=media-libs/flac media-libs/libogg media-libs/libsdl[X,joystick,opengl?,video] media-libs/libvorbis media-libs/sdl-mixer[timidity] sys-libs/zlib gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= sys-libs/zlib ) vpx? ( media-libs/libvpx ) games-misc/games-envd -REQUIRED_USE=vpx? ( opengl ) textures? ( opengl ) offensive? ( textures ) ?? ( opl-musicpack sc55-musicpack ) -SLOT=0 -SRC_URI=http://dukeworld.duke4.net/eduke32/synthesis/20130627-3905/eduke32_src_20130627-3905.tar.bz2 http://dev.gentoo.org/~hasufell/distfiles/eduke32-icons.tar textures? ( http://www.duke4.org/files/nightfright/duke3d_hrp.zip -> duke3d_hrp_5.2.zip ) sc55-musicpack? ( http://www.duke4.org/files/nightfright/music/duke3d_mus.zip -> duke3d_mus_3.0.zip ) opl-musicpack? ( http://www.duke4.org/files/nightfright/music/duke3d_musopl.zip -> duke3d_musopl_2.0.zip ) offensive? ( http://www.duke4.org/files/nightfright/duke3d_xxx.zip -> duke3d_xxx_1.33.zip ) -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=681d6371e21edbc6835c459fa1b07300 diff --git a/metadata/md5-cache/games-fps/etqw-demo-2.0_p1 b/metadata/md5-cache/games-fps/etqw-demo-2.0_p1 deleted file mode 100644 index def098cb0d11..000000000000 --- a/metadata/md5-cache/games-fps/etqw-demo-2.0_p1 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile install postinst preinst setup unpack -DEPEND=app-arch/unzip -DESCRIPTION=Enemy Territory: Quake Wars demo -HOMEPAGE=http://zerowing.idsoftware.com/linux/etqw/ -KEYWORDS=~amd64 ~x86 -LICENSE=ETQW -RDEPEND=virtual/opengl x86? ( media-libs/libsdl x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext ) amd64? ( >=app-emulation/emul-linux-x86-sdl-20071114 ) games-misc/games-envd -RESTRICT=strip mirror -SLOT=0 -SRC_URI=mirror://idsoftware/etqw/ETQW-demo2-client-full.r1.x86.run -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac unpacker f300a7ca9131b1024a79762e8edd3c52 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=687573270ba902b5f41b9e413432521b diff --git a/metadata/md5-cache/games-fps/quake3-excessiveplus-1.03 b/metadata/md5-cache/games-fps/quake3-excessiveplus-1.03 deleted file mode 100644 index 974afa306d01..000000000000 --- a/metadata/md5-cache/games-fps/quake3-excessiveplus-1.03 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack -DEPEND=app-arch/unzip -DESCRIPTION=Quake III Excessive Plus - modification making the weapons much faster and stronger -EAPI=2 -HOMEPAGE=http://www.excessiveplus.net/ -IUSE=dedicated opengl dedicated opengl -KEYWORDS=~amd64 ~ppc ~x86 -LICENSE=all-rights-reserved -RDEPEND=games-misc/games-envd dedicated? ( || ( games-fps/quake3[dedicated] games-fps/quake3-bin[dedicated] ) ) opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) !dedicated? ( !opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) ) -RESTRICT=mirror strip -SLOT=0 -SRC_URI=http://www.excessiveplus.net/downloads/xp-1.03-full.zip -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f games-mods 9d44c6f45289592ca9cf29d77424a048 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=dbdea29004a7792963d20c5f62dcca70 diff --git a/metadata/md5-cache/games-fps/soldieroffortune-demo-0.57 b/metadata/md5-cache/games-fps/soldieroffortune-demo-0.57 deleted file mode 100644 index 6ab799f71a08..000000000000 --- a/metadata/md5-cache/games-fps/soldieroffortune-demo-0.57 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack -DEPEND=games-util/loki_patch -DESCRIPTION=First-person shooter based on the mercenary trade -EAPI=5 -HOMEPAGE=http://www.lokigames.com/products/sof/ -KEYWORDS=~amd64 ~x86 -LICENSE=LOKI-EULA -RDEPEND=virtual/opengl x86? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp media-libs/libvorbis media-libs/libogg media-libs/smpeg ) amd64? ( app-emulation/emul-linux-x86-baselibs app-emulation/emul-linux-x86-xlibs app-emulation/emul-linux-x86-sdl app-emulation/emul-linux-x86-soundlibs ) games-misc/games-envd -RESTRICT=strip -SLOT=0 -SRC_URI=mirror://lokigames/loki_demos/sof-demo.run -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac unpacker f300a7ca9131b1024a79762e8edd3c52 user f54e098dd38ba1c0847a13e685b87747 -_md5_=6b5f474bb7f9bec5aa34de05d188c3a4 diff --git a/metadata/md5-cache/games-fps/urbanterror-4.1.1 b/metadata/md5-cache/games-fps/urbanterror-4.1.1 deleted file mode 100644 index 6a63bab2cd0f..000000000000 --- a/metadata/md5-cache/games-fps/urbanterror-4.1.1 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack -DEPEND=sys-libs/zlib[minizip] !dedicated? ( media-libs/ftgl media-libs/freetype media-libs/libsdl[X,opengl] virtual/opengl curl? ( net-misc/curl ) openal? ( media-libs/openal ) speex? ( media-libs/speex ) vorbis? ( media-libs/libogg media-libs/libvorbis ) ) app-arch/unzip virtual/pkgconfig dedicated? ( media-libs/libsdl curl? ( net-misc/curl ) speex? ( media-libs/speex ) ) >=sys-apps/sed-4 -DESCRIPTION=Hollywood tactical shooter based on the ioquake3 engine -EAPI=4 -HOMEPAGE=http://www.urbanterror.info/home/ -IUSE=+curl dedicated openal server speex vorbis -KEYWORDS=-* amd64 x86 -LICENSE=GPL-2 Q3AEULA-20000111 urbanterror-4.1-maps -RDEPEND=sys-libs/zlib[minizip] !dedicated? ( media-libs/ftgl media-libs/freetype media-libs/libsdl[X,opengl] virtual/opengl curl? ( net-misc/curl ) openal? ( media-libs/openal ) speex? ( media-libs/speex ) vorbis? ( media-libs/libogg media-libs/libvorbis ) ) games-misc/games-envd -RESTRICT=mirror -SLOT=0 -SRC_URI=http://dev.gentoo.org/~hasufell/distfiles/ioquake3-1807.tar.bz2 http://dev.gentoo.org/~hasufell/distfiles/ioq3-1807-urt-251210-git-nobumpy.tar.xz ftp://ftp.snt.utwente.nl/pub/games/urbanterror/old/UrbanTerror_41_FULL.zip http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> urbanterror.svg -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=c39a21bc50e2cd7d4f5af60364b707ec diff --git a/metadata/md5-cache/games-fps/ut2004-crossfire-1.93 b/metadata/md5-cache/games-fps/ut2004-crossfire-1.93 deleted file mode 100644 index 87229cf03d48..000000000000 --- a/metadata/md5-cache/games-fps/ut2004-crossfire-1.93 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack -DEPEND=app-arch/unzip -DESCRIPTION=UT2004 Crossfire - Special Forces vs Terrorists -EAPI=2 -HOMEPAGE=http://www.to-crossfire.net/ -IUSE=dedicated opengl dedicated opengl -KEYWORDS=~amd64 ~x86 -LICENSE=free-noncomm -RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) ) -RESTRICT=mirror strip -SLOT=0 -SRC_URI=ftp://to-crossfire.speicherland.com/TOC/client/TOCrossfire_beta_1.93_full.zip http://www.to-crossfire.org/mirrors/client/TOCrossfire_beta_1.93_full.zip -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f games-mods 9d44c6f45289592ca9cf29d77424a048 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=5f78efbb91cf403c7c4e2bd84833e053 diff --git a/metadata/md5-cache/games-misc/dont-starve-1 b/metadata/md5-cache/games-misc/dont-starve-1 deleted file mode 100644 index 08dead8e3e4d..000000000000 --- a/metadata/md5-cache/games-misc/dont-starve-1 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack -DESCRIPTION=Wilderness survival game full of science and magic -EAPI=5 -HOMEPAGE=http://www.dontstarvegame.com/ -KEYWORDS=~amd64 ~x86 -LICENSE=all-rights-reserved -RDEPEND=net-misc/curl virtual/opengl games-misc/games-envd -RESTRICT=fetch bindist splitdebug -SLOT=0 -SRC_URI=amd64? ( dontstarve_x64_1383879308.tar.gz ) x86? ( dontstarve_x32_1383879308.tar.gz ) -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=2de7fa6f0e4086e308ce69a8493ea93b diff --git a/metadata/md5-cache/games-misc/katawa-shoujo-1.0-r1 b/metadata/md5-cache/games-misc/katawa-shoujo-1.0-r1 deleted file mode 100644 index 3612d823673d..000000000000 --- a/metadata/md5-cache/games-misc/katawa-shoujo-1.0-r1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack -DEPEND=>=sys-apps/sed-4 -DESCRIPTION=Bishoujo-style visual novel set in the fictional Yamaku High School for disabled children -EAPI=5 -HOMEPAGE=http://katawa-shoujo.com/ -IUSE=doc system-renpy -KEYWORDS=~amd64 ~x86 -LICENSE=CC-BY-NC-ND-3.0 -RDEPEND=system-renpy? ( games-engines/renpy ) games-misc/games-envd -SLOT=0 -SRC_URI=http://dl.katawa-shoujo.com/gold/%5b4ls%5d_katawa_shoujo_%5blinux-x86%5d%5bEA1DFB30%5d.tar.bz2 -> katawa-shoujo-1.0.tar.bz2 http://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-48.png http://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-256.png -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=6c61573ca333c164a070c315b1679f92 diff --git a/metadata/md5-cache/games-misc/katawa-shoujo-1.1-r1 b/metadata/md5-cache/games-misc/katawa-shoujo-1.1-r1 deleted file mode 100644 index 05ffa61abecb..000000000000 --- a/metadata/md5-cache/games-misc/katawa-shoujo-1.1-r1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack -DEPEND=>=sys-apps/sed-4 -DESCRIPTION=Bishoujo-style visual novel set in the fictional Yamaku High School for disabled children -EAPI=5 -HOMEPAGE=http://katawa-shoujo.com/ -IUSE=doc system-renpy -KEYWORDS=~amd64 ~x86 -LICENSE=CC-BY-NC-ND-3.0 -RDEPEND=system-renpy? ( games-engines/renpy ) !system-renpy? ( amd64? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32] ) x86? ( sys-libs/zlib ) ) games-misc/games-envd -SLOT=0 -SRC_URI=http://dl.katawa-shoujo.com/gold_1.1/%5B4ls%5D_katawa_shoujo_1.1-%5Blinux-x86%5D%5BB5C707D5%5D.tar.bz2 -> katawa-shoujo-1.1.tar.bz2 http://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-48.png http://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-256.png -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=97eddbb81e0e8a3b4f79007bc92fb613 diff --git a/metadata/md5-cache/games-misc/katawa-shoujo-1.2 b/metadata/md5-cache/games-misc/katawa-shoujo-1.2 deleted file mode 100644 index 24136eb2e2cf..000000000000 --- a/metadata/md5-cache/games-misc/katawa-shoujo-1.2 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack -DEPEND=>=sys-apps/sed-4 -DESCRIPTION=Bishoujo-style visual novel set in the fictional Yamaku High School for disabled children -EAPI=5 -HOMEPAGE=http://katawa-shoujo.com/ -IUSE=doc system-renpy -KEYWORDS=~amd64 ~x86 -LICENSE=CC-BY-NC-ND-3.0 -RDEPEND=system-renpy? ( games-engines/renpy ) !system-renpy? ( || ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) ) games-misc/games-envd -SLOT=0 -SRC_URI=http://dl.katawa-shoujo.com/gold_1.2/%5b4ls%5d_katawa_shoujo_1.2-%5blinux-x86%5d%5b8F3BA490%5d.tar.bz2 -> katawa-shoujo-1.2.tar.bz2 http://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-48.png http://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-256.png -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=2ceae1ad0f7123a21e4bbdd283e0f340 diff --git a/metadata/md5-cache/games-misc/lolcat-42.0.99-r1 b/metadata/md5-cache/games-misc/lolcat-42.0.99-r1 deleted file mode 100644 index a83161026e14..000000000000 --- a/metadata/md5-cache/games-misc/lolcat-42.0.99-r1 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare setup test unpack -DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/trollop-1.16.2-r3:0[ruby_targets_ruby19] dev-ruby/paint[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/trollop-1.16.2-r3:0[ruby_targets_ruby20] dev-ruby/paint[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ) -DESCRIPTION=Rainbows and unicorns! -EAPI=5 -HOMEPAGE=https://github.com/busyloop/lolcat -IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test -KEYWORDS=~amd64 ~x86 -LICENSE=WTFPL-2 -RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/trollop-1.16.2-r3:0[ruby_targets_ruby19] dev-ruby/paint[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/trollop-1.16.2-r3:0[ruby_targets_ruby20] dev-ruby/paint[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) -REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ) -SLOT=0 -SRC_URI=mirror://rubygems/lolcat-42.0.99.gem -_eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem d4f8591e9b20b106327e9d143eb13da5 ruby-ng c79a9fd7644eefe8009be02a82648e1f toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=14d1344eeb54cd2a5bf5cae7cfa07349 diff --git a/metadata/md5-cache/games-misc/opengfx-0.4.7 b/metadata/md5-cache/games-misc/opengfx-0.4.7 deleted file mode 100644 index eab4c2fcf1f9..000000000000 --- a/metadata/md5-cache/games-misc/opengfx-0.4.7 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack -DEPEND=>=games-util/nml-0.2.4 -DESCRIPTION=OpenGFX data files for OpenTTD -EAPI=5 -HOMEPAGE=http://bundles.openttdcoop.org/opengfx/ -KEYWORDS=amd64 ~arm ~ppc x86 -LICENSE=GPL-2 -RDEPEND=games-misc/games-envd -RESTRICT=test -SLOT=0 -SRC_URI=http://bundles.openttdcoop.org/opengfx/releases/0.4.7/opengfx-0.4.7-source.tar.gz -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=d2fa1cd19a2c2ee7d0763d552a71a398 diff --git a/metadata/md5-cache/games-puzzle/angrydd-1.0.1 b/metadata/md5-cache/games-puzzle/angrydd-1.0.1 deleted file mode 100644 index ce50a527ddf7..000000000000 --- a/metadata/md5-cache/games-puzzle/angrydd-1.0.1 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack -DEPEND=>=dev-python/pygame-1.6.2 >=dev-lang/python-2.3 =dev-lang/python-2* -DESCRIPTION=Angry, Drunken Dwarves, a falling blocks game similar to Puzzle Fighter -EAPI=2 -HOMEPAGE=http://www.sacredchao.net/~piman/angrydd/ -KEYWORDS=~amd64 ~ppc x86 -LICENSE=GPL-2 -RDEPEND=>=dev-python/pygame-1.6.2 >=dev-lang/python-2.3 =dev-lang/python-2* games-misc/games-envd -SLOT=0 -SRC_URI=http://www.sacredchao.net/~piman/angrydd/angrydd-1.0.1.tar.gz -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f multilib 3bf24e6abb9b76d9f6c20600f0b716bf python cd022f89fef846d083fc994b9e3d8c04 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=5259cd75a16a439d5f1541822955dd3c diff --git a/metadata/md5-cache/games-puzzle/jools-0.20-r1 b/metadata/md5-cache/games-puzzle/jools-0.20-r1 deleted file mode 100644 index 1789d59a347c..000000000000 --- a/metadata/md5-cache/games-puzzle/jools-0.20-r1 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack -DEPEND==dev-lang/python-2* -DESCRIPTION=clone of Bejeweled, a popular pattern-matching game -EAPI=3 -HOMEPAGE=http://pessimization.com/software/jools/ -KEYWORDS=amd64 ~ppc x86 -LICENSE=GPL-2 -RDEPEND=dev-python/pygame =dev-lang/python-2* games-misc/games-envd -SLOT=0 -SRC_URI=http://pessimization.com/software/jools/jools-0.20.tar.gz http://pessimization.com/software/jools/jools-musicpack-1.0.tar.gz -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f multilib 3bf24e6abb9b76d9f6c20600f0b716bf python cd022f89fef846d083fc994b9e3d8c04 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=8659aaed475c9d8109742e2a65ab4f9f diff --git a/metadata/md5-cache/games-rpg/dragonhunt-3.56 b/metadata/md5-cache/games-rpg/dragonhunt-3.56 deleted file mode 100644 index 13af053f31f1..000000000000 --- a/metadata/md5-cache/games-rpg/dragonhunt-3.56 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack -DEPEND==dev-lang/python-2* -DESCRIPTION=A simple graphical RPG -EAPI=2 -HOMEPAGE=http://emhsoft.com/dh.html -KEYWORDS=amd64 x86 -LICENSE=GPL-2 CC-SA-1.0 -RDEPEND=dev-python/pygame =dev-lang/python-2* games-misc/games-envd -SLOT=0 -SRC_URI=http://emhsoft.com/dh/Dragon_Hunt-3.56.tar.gz -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f multilib 3bf24e6abb9b76d9f6c20600f0b716bf python cd022f89fef846d083fc994b9e3d8c04 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=d551ab88b0b3ad5e9aff804a761af8a3 diff --git a/metadata/md5-cache/games-rpg/freedink-108.2 b/metadata/md5-cache/games-rpg/freedink-108.2 deleted file mode 100644 index 2cd905ffd166..000000000000 --- a/metadata/md5-cache/games-rpg/freedink-108.2 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack -DEPEND=>=media-libs/fontconfig-2.4 >=media-libs/libsdl-1.2[X,sound,joystick,video] >=media-libs/sdl-gfx-2.0 >=media-libs/sdl-image-1.2 >=media-libs/sdl-mixer-1.2[midi,vorbis,wav] >=media-libs/sdl-ttf-2.0.9 virtual/pkgconfig nls? ( sys-devel/gettext ) -DESCRIPTION=Dink Smallwood is an adventure/role-playing game, similar to Zelda (2D top view) -EAPI=5 -HOMEPAGE=http://www.freedink.org/ -IUSE=nls -KEYWORDS=~amd64 ~x86 -LICENSE=GPL-3 -RDEPEND=>=media-libs/fontconfig-2.4 >=media-libs/libsdl-1.2[X,sound,joystick,video] >=media-libs/sdl-gfx-2.0 >=media-libs/sdl-image-1.2 >=media-libs/sdl-mixer-1.2[midi,vorbis,wav] >=media-libs/sdl-ttf-2.0.9 ~games-rpg/freedink-data-1.08.20121209 games-misc/games-envd -SLOT=0 -SRC_URI=mirror://gnu/freedink/freedink-108.2.tar.gz -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=9c2f7e4218fff1b51321392fb40e421d diff --git a/metadata/md5-cache/games-rpg/mana-0.5.3 b/metadata/md5-cache/games-rpg/mana-0.5.3 deleted file mode 100644 index 2803e36e50c6..000000000000 --- a/metadata/md5-cache/games-rpg/mana-0.5.3 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack -DEPEND=!=games-rpg/tmw-0.5.2 >=dev-games/physfs-1.0.0 dev-libs/libxml2 media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png] media-libs/sdl-net media-libs/sdl-ttf net-misc/curl sys-libs/zlib media-libs/libpng media-fonts/dejavu >=dev-games/guichan-0.8.1[sdl] media-libs/libsdl[opengl?,video] media-libs/sdl-gfx x11-libs/libX11 nls? ( virtual/libintl ) opengl? ( virtual/opengl ) virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) -DESCRIPTION=A fully free and open source MMORPG game client -EAPI=2 -HOMEPAGE=http://manasource.org/ -IUSE=nls opengl -KEYWORDS=amd64 ppc x86 -LICENSE=GPL-2 -RDEPEND=!=games-rpg/tmw-0.5.2 >=dev-games/physfs-1.0.0 dev-libs/libxml2 media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png] media-libs/sdl-net media-libs/sdl-ttf net-misc/curl sys-libs/zlib media-libs/libpng media-fonts/dejavu >=dev-games/guichan-0.8.1[sdl] media-libs/libsdl[opengl?,video] media-libs/sdl-gfx x11-libs/libX11 nls? ( virtual/libintl ) opengl? ( virtual/opengl ) games-misc/games-envd -SLOT=0 -SRC_URI=http://manasource.org/files/mana-0.5.3.tar.gz -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 cmake-utils 0e29eadbd656185bce30d2449ab48035 eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 games bc8839608d26ccd57ca4f2f01c67460f multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=b37ee48553322d85da8985bb9a32694a diff --git a/metadata/md5-cache/games-rpg/manaplus-1.3.6.9 b/metadata/md5-cache/games-rpg/manaplus-1.3.6.9 deleted file mode 100644 index 8bf5c4929a26..000000000000 --- a/metadata/md5-cache/games-rpg/manaplus-1.3.6.9 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack -DEPEND=>=dev-games/physfs-1.0.0 dev-libs/libxml2 media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png] media-libs/sdl-net media-libs/sdl-ttf net-misc/curl sys-libs/zlib media-libs/libpng:0 media-fonts/dejavu >=dev-games/guichan-0.8.1[sdl] media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils x11-misc/xsel nls? ( virtual/libintl ) opengl? ( virtual/opengl ) virtual/pkgconfig nls? ( sys-devel/gettext ) -DESCRIPTION=OpenSource 2D MMORPG client for Evol Online and The Mana World -EAPI=5 -HOMEPAGE=http://manaplus.evolonline.org -IUSE=nls opengl -KEYWORDS=amd64 x86 -LICENSE=GPL-2 -RDEPEND=>=dev-games/physfs-1.0.0 dev-libs/libxml2 media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png] media-libs/sdl-net media-libs/sdl-ttf net-misc/curl sys-libs/zlib media-libs/libpng:0 media-fonts/dejavu >=dev-games/guichan-0.8.1[sdl] media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils x11-misc/xsel nls? ( virtual/libintl ) opengl? ( virtual/opengl ) games-misc/games-envd -SLOT=0 -SRC_URI=http://download.evolonline.org/manaplus/download/1.3.6.9/manaplus-1.3.6.9.tar.xz -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=dcd294d653ab1f409d72e1ad6e371152 diff --git a/metadata/md5-cache/games-rpg/tmw-20120727 b/metadata/md5-cache/games-rpg/tmw-20120727 deleted file mode 100644 index f7b08c2b5e68..000000000000 --- a/metadata/md5-cache/games-rpg/tmw-20120727 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack -DEPEND=>=sys-apps/sed-4 -DESCRIPTION=Branding for the Mana client for server.themanaworld.org -EAPI=4 -HOMEPAGE=http://themanaworld.org/ -KEYWORDS=amd64 x86 -LICENSE=GPL-2 -RDEPEND=games-rpg/mana games-misc/games-envd -SLOT=0 -SRC_URI=mirror://sourceforge/themanaworld/tmw-branding-20120727.tar.gz -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=243ff7364098244f76d3b3c0c2ea4b1c diff --git a/metadata/md5-cache/games-rpg/zsdx-1.8.0-r1 b/metadata/md5-cache/games-rpg/zsdx-1.8.0-r1 deleted file mode 100644 index a04aebad9cb6..000000000000 --- a/metadata/md5-cache/games-rpg/zsdx-1.8.0-r1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack -DEPEND=app-arch/zip sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4 -DESCRIPTION=A free 2D Zelda fangame -EAPI=5 -HOMEPAGE=http://www.solarus-games.org/ -KEYWORDS=~amd64 ~x86 -LICENSE=all-rights-reserved CC-BY-SA-3.0 GPL-3 -RDEPEND=>=games-engines/solarus-1.2.0 =sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) -DESCRIPTION=A free 2D Zelda fangame parody -EAPI=5 -HOMEPAGE=http://www.solarus-games.org/ -KEYWORDS=~amd64 ~x86 -LICENSE=all-rights-reserved CC-BY-SA-3.0 GPL-3 -RDEPEND=>=games-engines/solarus-1.2.0 =media-libs/skstream-0.3.9 >=dev-games/wfmath-1.0.1 >=dev-games/mercator-0.3.1 dev-libs/libgcrypt:0 dev-libs/libsigc++:2 sys-libs/ncurses sys-libs/readline =media-libs/atlas-c++-0.6* >=media-libs/varconf-0.6.4 dev-db/postgresql >=dev-libs/boost-1.40 dev-libs/libxml2 virtual/pkgconfig !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 =dev-lang/python-2* -DESCRIPTION=WorldForge server running small games -EAPI=5 -HOMEPAGE=http://worldforge.org/dev/eng/servers/cyphesis -KEYWORDS=amd64 x86 -LICENSE=GPL-2 -RDEPEND=>=media-libs/skstream-0.3.9 >=dev-games/wfmath-1.0.1 >=dev-games/mercator-0.3.1 dev-libs/libgcrypt:0 dev-libs/libsigc++:2 sys-libs/ncurses sys-libs/readline =media-libs/atlas-c++-0.6* >=media-libs/varconf-0.6.4 dev-db/postgresql =dev-lang/python-2* games-misc/games-envd -RESTRICT=test -SLOT=0 -SRC_URI=mirror://sourceforge/worldforge/cyphesis-0.6.0.tar.bz2 -_eclasses_=autotools 8fc2dd333ef9346c906ffd9a523d8211 base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python cd022f89fef846d083fc994b9e3d8c04 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=8c4098a1aad32ec7dd3f09970424e92c diff --git a/metadata/md5-cache/games-server/monopd-0.9.3-r1 b/metadata/md5-cache/games-server/monopd-0.9.3-r1 deleted file mode 100644 index 5c744dc8d55e..000000000000 --- a/metadata/md5-cache/games-server/monopd-0.9.3-r1 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack -DEPEND=>=net-libs/libcapsinetwork-0.3.0 >=sys-libs/libmath++-0.0.3 -DESCRIPTION=server for atlantik games -EAPI=2 -HOMEPAGE=http://unixcode.org/monopd/ -KEYWORDS=~amd64 ~ppc x86 -LICENSE=GPL-2 -RDEPEND=>=net-libs/libcapsinetwork-0.3.0 games-misc/games-envd -SLOT=0 -SRC_URI=http://unixcode.org/downloads/monopd/monopd-0.9.3.tar.bz2 -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=ef95c2bca982b02ca8f4ad91293164ef diff --git a/metadata/md5-cache/games-simulation/openttd-1.4.2 b/metadata/md5-cache/games-simulation/openttd-1.4.2 deleted file mode 100644 index b696b967ada6..000000000000 --- a/metadata/md5-cache/games-simulation/openttd-1.4.2 +++ /dev/null @@ -1,15 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack -DEPEND=!dedicated? ( media-libs/libsdl[sound,X,video] icu? ( dev-libs/icu:= ) truetype? ( media-libs/fontconfig media-libs/freetype:2 sys-libs/zlib ) ) lzo? ( dev-libs/lzo:2 ) iconv? ( virtual/libiconv ) png? ( media-libs/libpng ) zlib? ( sys-libs/zlib ) >=sys-apps/sed-4 -DESCRIPTION=OpenTTD is a clone of Transport Tycoon Deluxe -EAPI=5 -HOMEPAGE=http://www.openttd.org/ -IUSE=aplaymidi debug dedicated iconv icu lzo +openmedia +png sse +timidity +truetype zlib -KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 -LICENSE=GPL-2 -PDEPEND=!dedicated? ( openmedia? ( games-misc/openmsx games-misc/opensfx ) aplaymidi? ( media-sound/alsa-utils ) !aplaymidi? ( timidity? ( media-sound/timidity++ ) ) ) openmedia? ( >=games-misc/opengfx-0.4.7 ) -RDEPEND=!dedicated? ( media-libs/libsdl[sound,X,video] icu? ( dev-libs/icu:= ) truetype? ( media-libs/fontconfig media-libs/freetype:2 sys-libs/zlib ) ) lzo? ( dev-libs/lzo:2 ) iconv? ( virtual/libiconv ) png? ( media-libs/libpng ) zlib? ( sys-libs/zlib ) games-misc/games-envd -RESTRICT=test -SLOT=0 -SRC_URI=http://binaries.openttd.org/releases/1.4.2/openttd-1.4.2-source.tar.gz -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=898e66e12381ef04e369bdb363c53fc2 diff --git a/metadata/md5-cache/games-sports/dustrac-1.7.2 b/metadata/md5-cache/games-sports/dustrac-1.7.2 deleted file mode 100644 index 429282398532..000000000000 --- a/metadata/md5-cache/games-sports/dustrac-1.7.2 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack -DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 media-libs/libvorbis media-libs/openal media-libs/mesa[gles2] virtual/pkgconfig >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) -DESCRIPTION=Tile-based, cross-platform 2D racing game -EAPI=5 -HOMEPAGE=http://dustrac.sourceforge.net/ -KEYWORDS=~amd64 ~x86 -LICENSE=GPL-3 CC-BY-NC-3.0 -RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 media-libs/libvorbis media-libs/openal media-libs/mesa[gles2] games-misc/games-envd -SLOT=0 -SRC_URI=mirror://sourceforge/dustrac/dustrac-1.7.2.tar.gz -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 cmake-utils 0e29eadbd656185bce30d2449ab48035 eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 games bc8839608d26ccd57ca4f2f01c67460f gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=0b95891550b7731a2a6b40cb6bf122f9 diff --git a/metadata/md5-cache/games-sports/dustrac-1.7.3 b/metadata/md5-cache/games-sports/dustrac-1.7.3 index d825fa2327d6..a2469dda940d 100644 --- a/metadata/md5-cache/games-sports/dustrac-1.7.3 +++ b/metadata/md5-cache/games-sports/dustrac-1.7.3 @@ -9,4 +9,4 @@ RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 media-libs/libvorbis me SLOT=0 SRC_URI=mirror://sourceforge/dustrac/dustrac-1.7.3.tar.gz _eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 cmake-utils 0e29eadbd656185bce30d2449ab48035 eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 games bc8839608d26ccd57ca4f2f01c67460f gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=42c3c130b4c36d7bae9f6f979ce08c0f +_md5_=e92b68dbba8c839682116990e470cd5b diff --git a/metadata/md5-cache/games-strategy/lightyears-1.4 b/metadata/md5-cache/games-strategy/lightyears-1.4 deleted file mode 100644 index 9dc97d529e35..000000000000 --- a/metadata/md5-cache/games-strategy/lightyears-1.4 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack -DEPEND=dev-python/pygame =dev-lang/python-2* -DESCRIPTION=a single-player game with a science-fiction theme -EAPI=3 -HOMEPAGE=http://www.jwhitham.org.uk/20kly/ -KEYWORDS=amd64 x86 -LICENSE=GPL-2 -RDEPEND=dev-python/pygame =dev-lang/python-2* games-misc/games-envd -SLOT=0 -SRC_URI=http://www.jwhitham.org.uk/20kly/lightyears-1.4.tar.bz2 -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f multilib 3bf24e6abb9b76d9f6c20600f0b716bf python cd022f89fef846d083fc994b9e3d8c04 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=51ee91543e4d983547ff728042fee304 diff --git a/metadata/md5-cache/games-strategy/liquidwar6-0.0.13_beta b/metadata/md5-cache/games-strategy/liquidwar6-0.0.13_beta deleted file mode 100644 index db9d81bca06d..000000000000 --- a/metadata/md5-cache/games-strategy/liquidwar6-0.0.13_beta +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack -DEPEND=dev-db/sqlite:3 dev-libs/expat dev-scheme/guile media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl[X,opengl,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf net-misc/curl sys-libs/zlib virtual/glu virtual/jpeg virtual/opengl gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl virtual/libiconv ) ogg? ( media-libs/libsdl[X,sound,opengl,video] media-libs/sdl-mixer[vorbis] ) readline? ( sys-libs/ncurses sys-libs/readline ) dev-lang/perl nls? ( sys-devel/gettext ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=Unique multiplayer wargame between liquids -EAPI=5 -HOMEPAGE=http://www.gnu.org/software/liquidwar6/ -IUSE=doc gtk +maps nls +ogg openmp readline -KEYWORDS=~amd64 ~x86 -LICENSE=GPL-3+ -RDEPEND=dev-db/sqlite:3 dev-libs/expat dev-scheme/guile media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl[X,opengl,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf net-misc/curl sys-libs/zlib virtual/glu virtual/jpeg virtual/opengl gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl virtual/libiconv ) ogg? ( media-libs/libsdl[X,sound,opengl,video] media-libs/sdl-mixer[vorbis] ) readline? ( sys-libs/ncurses sys-libs/readline ) games-misc/games-envd -SLOT=0 -SRC_URI=http://www.ufoot.org/download/liquidwar/v6/0.0.13beta/liquidwar6-0.0.13beta.tar.gz maps? ( http://www.ufoot.org/download/liquidwar/v6/0.0.13beta/liquidwar6-extra-maps-0.0.13beta.tar.gz ) -_eclasses_=autotools 8fc2dd333ef9346c906ffd9a523d8211 base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=64734700dc622b0f6cc35971df5ad518 diff --git a/metadata/md5-cache/games-strategy/liquidwar6-0.2.3551 b/metadata/md5-cache/games-strategy/liquidwar6-0.2.3551 deleted file mode 100644 index 52c4d3378e08..000000000000 --- a/metadata/md5-cache/games-strategy/liquidwar6-0.2.3551 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack -DEPEND=dev-db/sqlite:3 dev-libs/expat dev-scheme/guile dev-util/cunit media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl[X,opengl,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf net-misc/curl dev-libs/libltdl:0 sys-libs/zlib virtual/glu virtual/jpeg virtual/opengl libcaca? ( media-libs/libcaca ) gles2? ( media-libs/mesa[gles2] ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl virtual/libiconv ) ogg? ( media-libs/libsdl[X,sound,opengl,video] media-libs/sdl-mixer[vorbis] ) readline? ( sys-libs/ncurses sys-libs/readline ) dev-lang/perl nls? ( sys-devel/gettext ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=Unique multiplayer wargame between liquids -EAPI=5 -HOMEPAGE=http://www.gnu.org/software/liquidwar6/ -IUSE=doc gles2 gtk libcaca +maps nls +ogg openmp readline test -KEYWORDS=~amd64 ~x86 -LICENSE=GPL-3+ -RDEPEND=dev-db/sqlite:3 dev-libs/expat dev-scheme/guile dev-util/cunit media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl[X,opengl,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf net-misc/curl dev-libs/libltdl:0 sys-libs/zlib virtual/glu virtual/jpeg virtual/opengl libcaca? ( media-libs/libcaca ) gles2? ( media-libs/mesa[gles2] ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl virtual/libiconv ) ogg? ( media-libs/libsdl[X,sound,opengl,video] media-libs/sdl-mixer[vorbis] ) readline? ( sys-libs/ncurses sys-libs/readline ) games-misc/games-envd -SLOT=0 -SRC_URI=http://www.ufoot.org/download/liquidwar/v6/0.2.3551/liquidwar6-0.2.3551.tar.gz maps? ( http://www.ufoot.org/download/liquidwar/v6/0.2.3551/liquidwar6-extra-maps-0.2.3551.tar.gz ) -_eclasses_=autotools 8fc2dd333ef9346c906ffd9a523d8211 base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=0f382e18c3324dbf347b393288f93d76 diff --git a/metadata/md5-cache/games-strategy/liquidwar6-0.4.3681 b/metadata/md5-cache/games-strategy/liquidwar6-0.4.3681 index 6510c5b3267a..50ee312f1268 100644 --- a/metadata/md5-cache/games-strategy/liquidwar6-0.4.3681 +++ b/metadata/md5-cache/games-strategy/liquidwar6-0.4.3681 @@ -10,4 +10,4 @@ RDEPEND=dev-db/sqlite:3 dev-libs/expat dev-scheme/guile dev-util/cunit media-lib SLOT=0 SRC_URI=http://www.ufoot.org/download/liquidwar/v6/0.4.3681/liquidwar6-0.4.3681.tar.gz maps? ( http://www.ufoot.org/download/liquidwar/v6/0.4.3681/liquidwar6-extra-maps-0.4.3681.tar.gz ) _eclasses_=autotools 8fc2dd333ef9346c906ffd9a523d8211 base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 998e5931fb95b10a6a11ec796ada2759 games bc8839608d26ccd57ca4f2f01c67460f libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=6a7c234188af8e46a290c8008c11c9f9 +_md5_=f7e821984d0969f4f8418858a5256ea5 diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.12 b/metadata/md5-cache/games-strategy/wesnoth-1.12 deleted file mode 100644 index 7f7f8809353f..000000000000 --- a/metadata/md5-cache/games-strategy/wesnoth-1.12 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack -DEPEND=>=media-libs/libsdl-1.2.7:0[joystick,video,X] media-libs/sdl-net !dedicated? ( >=media-libs/sdl-ttf-2.0.8 >=media-libs/sdl-mixer-1.2[vorbis] >=media-libs/sdl-image-1.2[jpeg,png] fribidi? ( dev-libs/fribidi ) dbus? ( sys-apps/dbus ) sys-libs/zlib x11-libs/pango dev-lang/lua media-libs/fontconfig ) >=dev-libs/boost-1.48[nls,threads] virtual/libintl virtual/pkgconfig sys-devel/gettext sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) -DESCRIPTION=Battle for Wesnoth - A fantasy turn-based strategy game -EAPI=5 -HOMEPAGE=http://www.wesnoth.org/ -IUSE=dbus dedicated doc fribidi nls server -KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd -LICENSE=GPL-2 -RDEPEND=>=media-libs/libsdl-1.2.7:0[joystick,video,X] media-libs/sdl-net !dedicated? ( >=media-libs/sdl-ttf-2.0.8 >=media-libs/sdl-mixer-1.2[vorbis] >=media-libs/sdl-image-1.2[jpeg,png] fribidi? ( dev-libs/fribidi ) dbus? ( sys-apps/dbus ) sys-libs/zlib x11-libs/pango dev-lang/lua media-libs/fontconfig ) >=dev-libs/boost-1.48[nls,threads] virtual/libintl games-misc/games-envd -SLOT=0 -SRC_URI=mirror://sourceforge/wesnoth/wesnoth-1.12.tar.bz2 -_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 cmake-utils 0e29eadbd656185bce30d2449ab48035 eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 games bc8839608d26ccd57ca4f2f01c67460f multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 -_md5_=f02e81509194042a1488cf4c691fe3eb diff --git a/metadata/md5-cache/games-util/grfcodec-6.0.0 b/metadata/md5-cache/games-util/grfcodec-6.0.0 deleted file mode 100644 index 61541ff64c3c..000000000000 --- a/metadata/md5-cache/games-util/grfcodec-6.0.0 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=install prepare -DEPEND=!games-util/nforenum dev-lang/perl dev-libs/boost media-libs/libpng -DESCRIPTION=A suite of programs to modify openttd/Transport Tycoon Deluxe's GRF files -EAPI=4 -HOMEPAGE=http://dev.openttdcoop.org/projects/grfcodec -KEYWORDS=amd64 ~arm ppc ppc64 x86 -LICENSE=GPL-2 -SLOT=0 -SRC_URI=http://binaries.openttd.org/extra/grfcodec/6.0.0/grfcodec-6.0.0-source.tar.xz -_eclasses_=multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=659d4e78967ecbb54cec7e22ff246f53 diff --git a/metadata/md5-cache/mail-client/roundcube-1.0.5 b/metadata/md5-cache/mail-client/roundcube-1.0.5 new file mode 100644 index 000000000000..5d78172e5f98 --- /dev/null +++ b/metadata/md5-cache/mail-client/roundcube-1.0.5 @@ -0,0 +1,13 @@ +DEFINED_PHASES=install postinst prepare prerm setup +DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15 +DESCRIPTION=A browser-based multilingual IMAP client with an application-like user interface +EAPI=5 +HOMEPAGE=http://roundcube.net +IUSE=ldap +mysql postgres sqlite ssl spell vhosts +KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 +LICENSE=GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain +RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-5.3[crypt,filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,ssl?,unicode,xml] >=dev-php/PEAR-Auth_SASL-1.0.3 >=dev-php/PEAR-Crypt_GPG-1.3.2 >=dev-php/PEAR-Mail_Mime-1.8.1 >=dev-php/PEAR-Net_IDNA2-0.1.1 >=dev-php/PEAR-Net_SMTP-1.4.2 >=dev-php/PEAR-Net_Sieve-1.3.2 >=dev-php/PEAR-Net_Socket-1.0.14 mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) sqlite? ( dev-lang/php[sqlite] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15 +SLOT=1.0.5 +SRC_URI=mirror://sourceforge/roundcubemail/roundcubemail-1.0.5.tar.gz +_eclasses_=webapp 25b9b1696f5e698711f47d45c3d45e3e +_md5_=8b1a00d457018753ae1dbf76897e5621 diff --git a/metadata/md5-cache/media-radio/ax25-apps-0.0.8_rc4 b/metadata/md5-cache/media-radio/ax25-apps-0.0.8_rc4 index 63dcaf861002..1ab1742aa280 100644 --- a/metadata/md5-cache/media-radio/ax25-apps-0.0.8_rc4 +++ b/metadata/md5-cache/media-radio/ax25-apps-0.0.8_rc4 @@ -1,5 +1,5 @@ DEFINED_PHASES=install prepare -DEPEND=>=dev-libs/libax25-0.0.12_rc2 sys-libs/ncurses virtual/pkgconfig !media-sound/listen !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DEPEND=>=dev-libs/libax25-0.0.12_rc2 sys-libs/ncurses virtual/pkgconfig !media-sound/listen !dev-ruby/listen !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 DESCRIPTION=Basic AX.25 (Amateur Radio) user tools, additional daemons EAPI=5 HOMEPAGE=http://www.linux-ax25.org @@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/libax25-0.0.12_rc2 sys-libs/ncurses SLOT=0 SRC_URI=http://www.linux-ax25.org/pub/ax25-apps/ax25-apps-0.0.8-rc4.tar.gz _eclasses_=autotools 8fc2dd333ef9346c906ffd9a523d8211 eutils 998e5931fb95b10a6a11ec796ada2759 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=9036c0dc2100797577d53e4cacdc9ea0 +_md5_=17cb68c2380569cdc570d2d8bb7b5b1e diff --git a/metadata/md5-cache/media-sound/nted-1.10.18-r3 b/metadata/md5-cache/media-sound/nted-1.10.18-r3 index 2a573f4ff3d7..3d280da217ac 100644 --- a/metadata/md5-cache/media-sound/nted-1.10.18-r3 +++ b/metadata/md5-cache/media-sound/nted-1.10.18-r3 @@ -1,13 +1,13 @@ DEFINED_PHASES=compile configure install prepare test -DEPEND=>=dev-libs/glib-2:2 media-libs/alsa-lib >=media-libs/freetype-2 x11-libs/cairo >=x11-libs/gdk-pixbuf-2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango virtual/pkgconfig doc? ( app-text/xmlto ) nls? ( sys-devel/gettext ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DEPEND=>=dev-libs/glib-2:2 media-libs/alsa-lib >=media-libs/freetype-2.5.1 x11-libs/cairo >=x11-libs/gdk-pixbuf-2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango virtual/pkgconfig doc? ( app-text/xmlto ) nls? ( sys-devel/gettext ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 DESCRIPTION=WYSIWYG score editor for GTK+ EAPI=5 HOMEPAGE=http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml IUSE=doc debug nls KEYWORDS=amd64 x86 LICENSE=GPL-2 FDL-1.2 NTED_FONT -RDEPEND=>=dev-libs/glib-2:2 media-libs/alsa-lib >=media-libs/freetype-2 x11-libs/cairo >=x11-libs/gdk-pixbuf-2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango +RDEPEND=>=dev-libs/glib-2:2 media-libs/alsa-lib >=media-libs/freetype-2.5.1 x11-libs/cairo >=x11-libs/gdk-pixbuf-2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango SLOT=0 SRC_URI=http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/sources/nted-1.10.18.tar.gz _eclasses_=autotools 8fc2dd333ef9346c906ffd9a523d8211 autotools-utils 3727db64c7b960903d5033280f108080 eutils 998e5931fb95b10a6a11ec796ada2759 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=765e55dc8a1c45a2d0b3579d23208892 +_md5_=89ce7977d611b8da5426b214ab2a5734 diff --git a/metadata/md5-cache/net-im/choqok-1.5 b/metadata/md5-cache/net-im/choqok-1.5 new file mode 100644 index 000000000000..d8f087288439 --- /dev/null +++ b/metadata/md5-cache/net-im/choqok-1.5 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack +DEPEND=dev-libs/libattica dev-libs/qjson >=dev-libs/qoauth-1.0.1 ayatana? ( dev-libs/libindicate-qt ) telepathy? ( net-libs/telepathy-qt[qt4] ) app-arch/xz-utils sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=] +DESCRIPTION=Free/Open Source micro-blogging client for KDE +EAPI=5 +HOMEPAGE=http://choqok.gnufolks.org/ +IUSE=ayatana debug telepathy linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_lt linguas_mr linguas_ms linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sq linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua +KEYWORDS=~amd64 ~ppc ~x86 +LICENSE=GPL-2+ +RDEPEND=dev-libs/libattica dev-libs/qjson >=dev-libs/qoauth-1.0.1 ayatana? ( dev-libs/libindicate-qt ) telepathy? ( net-libs/telepathy-qt[qt4] ) || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.4:4[aqua=] ) linguas_bg? ( || ( kde-apps/kde-l10n[linguas_bg(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) ) linguas_bs? ( || ( kde-apps/kde-l10n[linguas_bs(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) ) linguas_ca? ( || ( kde-apps/kde-l10n[linguas_ca(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) ) linguas_ca@valencia? ( || ( kde-apps/kde-l10n[linguas_ca@valencia(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) ) linguas_cs? ( || ( kde-apps/kde-l10n[linguas_cs(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) ) linguas_da? ( || ( kde-apps/kde-l10n[linguas_da(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) ) linguas_de? ( || ( kde-apps/kde-l10n[linguas_de(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) ) linguas_el? ( || ( kde-apps/kde-l10n[linguas_el(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) ) linguas_en_GB? ( || ( kde-apps/kde-l10n[linguas_en_GB(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) ) linguas_eo? ( || ( kde-apps/kde-l10n[linguas_eo(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) ) linguas_es? ( || ( kde-apps/kde-l10n[linguas_es(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) ) linguas_et? ( || ( kde-apps/kde-l10n[linguas_et(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) ) linguas_fa? ( || ( kde-apps/kde-l10n[linguas_fa(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fa(+)] ) ) linguas_fi? ( || ( kde-apps/kde-l10n[linguas_fi(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) ) linguas_fr? ( || ( kde-apps/kde-l10n[linguas_fr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) ) linguas_ga? ( || ( kde-apps/kde-l10n[linguas_ga(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) ) linguas_gl? ( || ( kde-apps/kde-l10n[linguas_gl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) ) linguas_hr? ( || ( kde-apps/kde-l10n[linguas_hr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) ) linguas_hu? ( || ( kde-apps/kde-l10n[linguas_hu(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) ) linguas_is? ( || ( kde-apps/kde-l10n[linguas_is(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) ) linguas_it? ( || ( kde-apps/kde-l10n[linguas_it(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) ) linguas_ja? ( || ( kde-apps/kde-l10n[linguas_ja(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) ) linguas_km? ( || ( kde-apps/kde-l10n[linguas_km(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) ) linguas_lt? ( || ( kde-apps/kde-l10n[linguas_lt(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) ) linguas_mr? ( || ( kde-apps/kde-l10n[linguas_mr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mr(+)] ) ) linguas_ms? ( || ( kde-apps/kde-l10n[linguas_ms(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ms(+)] ) ) linguas_nb? ( || ( kde-apps/kde-l10n[linguas_nb(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) ) linguas_nds? ( || ( kde-apps/kde-l10n[linguas_nds(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) ) linguas_nl? ( || ( kde-apps/kde-l10n[linguas_nl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) ) linguas_pa? ( || ( kde-apps/kde-l10n[linguas_pa(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) ) linguas_pl? ( || ( kde-apps/kde-l10n[linguas_pl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) ) linguas_pt? ( || ( kde-apps/kde-l10n[linguas_pt(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) ) linguas_pt_BR? ( || ( kde-apps/kde-l10n[linguas_pt_BR(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) ) linguas_ro? ( || ( kde-apps/kde-l10n[linguas_ro(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) ) linguas_ru? ( || ( kde-apps/kde-l10n[linguas_ru(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) ) linguas_sk? ( || ( kde-apps/kde-l10n[linguas_sk(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) ) linguas_sl? ( || ( kde-apps/kde-l10n[linguas_sl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) ) linguas_sq? ( || ( kde-apps/kde-l10n[linguas_sq(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sq(+)] ) ) linguas_sv? ( || ( kde-apps/kde-l10n[linguas_sv(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) ) linguas_tr? ( || ( kde-apps/kde-l10n[linguas_tr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) ) linguas_ug? ( || ( kde-apps/kde-l10n[linguas_ug(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) ) linguas_uk? ( || ( kde-apps/kde-l10n[linguas_uk(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) ) linguas_zh_CN? ( || ( kde-apps/kde-l10n[linguas_zh_CN(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) ) linguas_zh_TW? ( || ( kde-apps/kde-l10n[linguas_zh_TW(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=] +SLOT=4 +SRC_URI=mirror://sourceforge/choqok/choqok-1.5.tar.xz +_eclasses_=cmake-utils 0e29eadbd656185bce30d2449ab48035 eutils 998e5931fb95b10a6a11ec796ada2759 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c263990f1b677b0f0be0a3299f179762 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base deaaf624bd641762a3432753e86f1a6a kde4-functions 492237eb2823bdc02bc769530501f0ea multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86 +_md5_=6cc335be992368b843764db91619cd8b diff --git a/metadata/md5-cache/net-irc/weechat-1.1.1 b/metadata/md5-cache/net-irc/weechat-1.1.1 new file mode 100644 index 000000000000..9108f918ea93 --- /dev/null +++ b/metadata/md5-cache/net-irc/weechat-1.1.1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare setup test +DEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses sys-libs/zlib charset? ( virtual/libiconv ) guile? ( dev-scheme/guile ) lua? ( dev-lang/lua[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) ruby? ( >=dev-lang/ruby-1.9 ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15 ) doc? ( app-text/asciidoc dev-util/source-highlight ) nls? ( >=sys-devel/gettext-0.15 ) test? ( dev-util/cpputest ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) +DESCRIPTION=Portable and multi-interface IRC client +EAPI=5 +HOMEPAGE=http://weechat.org/ +IUSE=doc nls +ssl test linguas_cs linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_pl linguas_pt_BR linguas_ru linguas_tr guile lua +perl +python ruby tcl +alias +charset +exec +fifo +logger +relay +scripts +spell +trigger +xfer +irc python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-3 +RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses sys-libs/zlib charset? ( virtual/libiconv ) guile? ( dev-scheme/guile ) lua? ( dev-lang/lua[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) ruby? ( >=dev-lang/ruby-1.9 ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15 ) +SLOT=0 +SRC_URI=http://weechat.org/files/src/weechat-1.1.1.tar.bz2 +_eclasses_=cmake-utils 0e29eadbd656185bce30d2449ab48035 eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-single-r1 ed2ee20dc74a34be60f5b1b500e92a5b python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac +_md5_=0215350a368129d9649648e8f90b0b41 diff --git a/metadata/md5-cache/net-libs/iojs-1.0.4 b/metadata/md5-cache/net-libs/iojs-1.0.4 new file mode 100644 index 000000000000..a9bebd14e27f --- /dev/null +++ b/metadata/md5-cache/net-libs/iojs-1.0.4 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install prepare pretend setup test +DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) !!net-libs/nodejs >=dev-libs/openssl-1.0.1j icu? ( dev-libs/icu ) >=net-libs/http-parser-2.4.1 >=dev-libs/libuv-1.2.1 +DESCRIPTION=An npm compatible platform originally based on node.js +EAPI=5 +HOMEPAGE=http://iojs.org/ +IUSE=icu +npm snapshot +KEYWORDS=~amd64 ~arm ~x86 ~x64-macos +LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT +RDEPEND=!!net-libs/nodejs >=dev-libs/openssl-1.0.1j +RESTRICT=test +SLOT=0 +SRC_URI=http://iojs.org/dist/v1.0.4/iojs-v1.0.4.tar.xz +_eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 multilib 3bf24e6abb9b76d9f6c20600f0b716bf pax-utils dfe060cb70d89757fde5c1ff8405e950 python-any-r1 da352ea9da8eb9bf158d56cca65d6c82 python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac +_md5_=15bbf1e337147a7c1a596433fa9ccbbd diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.6.5 b/metadata/md5-cache/net-libs/webkit-gtk-2.6.5 new file mode 100644 index 000000000000..1d950a4e3b93 --- /dev/null +++ b/metadata/md5-cache/net-libs/webkit-gtk-2.6.5 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack +DEPEND=>=dev-libs/glib-2.36.0:2 >=dev-libs/libxml2-2.8:2 >=dev-libs/libxslt-1.1.7 virtual/jpeg:0= >=media-libs/harfbuzz-0.9.18:=[icu(+)] >=media-libs/libpng-1.4:0= media-libs/libwebp:= >=dev-libs/icu-3.8.1-r1:= >=media-libs/fontconfig-2.8:1.0 >=media-libs/freetype-2.4.2:2 >=net-libs/libsoup-2.42:2.4[introspection?] >=x11-libs/cairo-1.10.2:=[X] >=x11-libs/gtk+-3.6.0:3[X,introspection?] dev-db/sqlite:3= >=x11-libs/pango-1.30.0.0 x11-libs/libXrender x11-libs/libXt >=x11-libs/gtk+-2.24.10:2 egl? ( media-libs/mesa[egl] ) geoloc? ( >=app-misc/geoclue-2.1.5:2.0 ) gstreamer? ( >=media-libs/gstreamer-1.2:1.0 >=media-libs/gst-plugins-base-1.2:1.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0 ) libsecret? ( app-crypt/libsecret ) opengl? ( virtual/opengl ) spell? ( >=app-text/enchant-0.22:= ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/perl-5.10 || ( virtual/rubygems[ruby_targets_ruby20] virtual/rubygems[ruby_targets_ruby21] virtual/rubygems[ruby_targets_ruby19] ) >=app-accessibility/at-spi2-core-2.5.3 >=dev-libs/atk-2.8.0 >=dev-util/gtk-doc-am-1.10 >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 >=sys-devel/flex-2.5.34 || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 ) sys-devel/gettext virtual/pkgconfig doc? ( >=dev-util/gtk-doc-am-1.10 ) geoloc? ( dev-util/gdbus-codegen ) introspection? ( jit? ( sys-apps/paxctl ) ) test? ( dev-lang/python:2.7 dev-python/pygobject:3[python_targets_python2_7] x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) +DESCRIPTION=Open source web browser engine +EAPI=5 +HOMEPAGE=http://www.webkitgtk.org/ +IUSE=coverage doc +egl +geoloc +gstreamer +introspection +jit libsecret +opengl spell +webgl test +KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos +LICENSE=LGPL-2+ BSD +RDEPEND=>=dev-libs/glib-2.36.0:2 >=dev-libs/libxml2-2.8:2 >=dev-libs/libxslt-1.1.7 virtual/jpeg:0= >=media-libs/harfbuzz-0.9.18:=[icu(+)] >=media-libs/libpng-1.4:0= media-libs/libwebp:= >=dev-libs/icu-3.8.1-r1:= >=media-libs/fontconfig-2.8:1.0 >=media-libs/freetype-2.4.2:2 >=net-libs/libsoup-2.42:2.4[introspection?] >=x11-libs/cairo-1.10.2:=[X] >=x11-libs/gtk+-3.6.0:3[X,introspection?] dev-db/sqlite:3= >=x11-libs/pango-1.30.0.0 x11-libs/libXrender x11-libs/libXt >=x11-libs/gtk+-2.24.10:2 egl? ( media-libs/mesa[egl] ) geoloc? ( >=app-misc/geoclue-2.1.5:2.0 ) gstreamer? ( >=media-libs/gstreamer-1.2:1.0 >=media-libs/gst-plugins-base-1.2:1.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0 ) libsecret? ( app-crypt/libsecret ) opengl? ( virtual/opengl ) spell? ( >=app-text/enchant-0.22:= ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage ) +REQUIRED_USE=geoloc? ( introspection ) introspection? ( gstreamer ) +SLOT=4/37 +SRC_URI=http://www.webkitgtk.org/releases/webkitgtk-2.6.5.tar.xz +_eclasses_=check-reqs a7f404bfb16e0a996700c5d3ac4edad3 cmake-utils 0e29eadbd656185bce30d2449ab48035 eutils 998e5931fb95b10a6a11ec796ada2759 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c263990f1b677b0f0be0a3299f179762 gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 29582087e5f16ca16b1c6815c2ae2b65 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf pax-utils dfe060cb70d89757fde5c1ff8405e950 python-any-r1 da352ea9da8eb9bf158d56cca65d6c82 python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86 +_md5_=b3b9e184d49043ce66488e8adf16ce49 diff --git a/metadata/md5-cache/net-mail/isync-1.1.2 b/metadata/md5-cache/net-mail/isync-1.1.2 new file mode 100644 index 000000000000..649d6404abcc --- /dev/null +++ b/metadata/md5-cache/net-mail/isync-1.1.2 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure +DEPEND=>=sys-libs/db-4.2 ssl? ( >=dev-libs/openssl-0.9.6 ) +DESCRIPTION=MailDir mailbox synchronizer +EAPI=5 +HOMEPAGE=http://isync.sourceforge.net/ +IUSE=ssl +KEYWORDS=~amd64 ~ppc ~x86 +LICENSE=GPL-2 +RDEPEND=>=sys-libs/db-4.2 ssl? ( >=dev-libs/openssl-0.9.6 ) +SLOT=0 +SRC_URI=mirror://sourceforge/isync/isync-1.1.2.tar.gz +_md5_=a0e6e7d92ea31ab93a56cd5ea4fb8a51 diff --git a/metadata/md5-cache/net-proxy/privoxy-3.0.23 b/metadata/md5-cache/net-proxy/privoxy-3.0.23 new file mode 100644 index 000000000000..b1b522a2ec70 --- /dev/null +++ b/metadata/md5-cache/net-proxy/privoxy-3.0.23 @@ -0,0 +1,14 @@ +DEFINED_PHASES=configure install prepare setup +DEPEND=dev-libs/libpcre zlib? ( sys-libs/zlib ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig +DESCRIPTION=A web proxy with advanced filtering capabilities for protecting privacy against Internet junk +EAPI=5 +HOMEPAGE=http://www.privoxy.org http://sourceforge.net/projects/ijbswa/ +IUSE=+acl editor external-filters +fast-redirects +force graceful-termination +image-blocking ipv6 lfs png-images selinux +stats +threads toggle whitelists +zlib +KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd +LICENSE=GPL-2 +RDEPEND=dev-libs/libpcre zlib? ( sys-libs/zlib ) selinux? ( sec-policy/selinux-privoxy ) +REQUIRED_USE=toggle? ( editor ) +SLOT=0 +SRC_URI=mirror://sourceforge/ijbswa/privoxy-3.0.23-stable-src.tar.gz +_eclasses_=autotools 8fc2dd333ef9346c906ffd9a523d8211 eutils 998e5931fb95b10a6a11ec796ada2759 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac user f54e098dd38ba1c0847a13e685b87747 +_md5_=730715a269b25539077d467f8a2c78cb diff --git a/metadata/md5-cache/sys-apps/roccat-tools-1.0.0 b/metadata/md5-cache/sys-apps/roccat-tools-1.0.0 deleted file mode 100644 index 84f4fad88bde..000000000000 --- a/metadata/md5-cache/sys-apps/roccat-tools-1.0.0 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test -DEPEND=x11-libs/gtk+:2 x11-libs/libnotify media-libs/libcanberra virtual/libusb:1 dev-libs/dbus-glib virtual/libgudev:= sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4 virtual/pkgconfig -DESCRIPTION=Utility for advanced configuration of Roccat devices -EAPI=5 -HOMEPAGE=http://roccat.sourceforge.net/ -IUSE=input_devices_roccat_arvo input_devices_roccat_isku input_devices_roccat_iskufx input_devices_roccat_kone input_devices_roccat_koneplus input_devices_roccat_konepure input_devices_roccat_konepureoptical input_devices_roccat_konextd input_devices_roccat_kovaplus input_devices_roccat_lua input_devices_roccat_pyra input_devices_roccat_savu input_devices_roccat_ryos -KEYWORDS=~amd64 ~x86 -LICENSE=GPL-2 -RDEPEND=x11-libs/gtk+:2 x11-libs/libnotify media-libs/libcanberra virtual/libusb:1 dev-libs/dbus-glib virtual/libgudev:= -REQUIRED_USE=input_devices_roccat_konextd? ( input_devices_roccat_koneplus ) -SLOT=0 -SRC_URI=mirror://sourceforge/roccat/roccat-tools-1.0.0.tar.bz2 -_eclasses_=cmake-utils 0e29eadbd656185bce30d2449ab48035 eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 multilib 3bf24e6abb9b76d9f6c20600f0b716bf readme.gentoo 106edea5533517715013de909a333abd toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac udev da001465a2e939c93f7ae16947ce3438 user f54e098dd38ba1c0847a13e685b87747 -_md5_=53af391c9576a4a901b6e7c9dc7c1f55 diff --git a/metadata/md5-cache/sys-apps/roccat-tools-1.1.0 b/metadata/md5-cache/sys-apps/roccat-tools-1.1.0 deleted file mode 100644 index 5f725bd75083..000000000000 --- a/metadata/md5-cache/sys-apps/roccat-tools-1.1.0 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test -DEPEND=x11-libs/gtk+:2 x11-libs/libnotify media-libs/libcanberra virtual/libusb:1 dev-libs/dbus-glib virtual/libgudev:= sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4 virtual/pkgconfig -DESCRIPTION=Utility for advanced configuration of Roccat devices -EAPI=5 -HOMEPAGE=http://roccat.sourceforge.net/ -IUSE=input_devices_roccat_arvo input_devices_roccat_isku input_devices_roccat_iskufx input_devices_roccat_kone input_devices_roccat_koneplus input_devices_roccat_konepure input_devices_roccat_konepureoptical input_devices_roccat_konextd input_devices_roccat_kovaplus input_devices_roccat_lua input_devices_roccat_pyra input_devices_roccat_savu input_devices_roccat_ryos -KEYWORDS=~amd64 ~x86 -LICENSE=GPL-2 -RDEPEND=x11-libs/gtk+:2 x11-libs/libnotify media-libs/libcanberra virtual/libusb:1 dev-libs/dbus-glib virtual/libgudev:= -REQUIRED_USE=input_devices_roccat_konextd? ( input_devices_roccat_koneplus ) -SLOT=0 -SRC_URI=mirror://sourceforge/roccat/roccat-tools-1.1.0.tar.bz2 -_eclasses_=cmake-utils 0e29eadbd656185bce30d2449ab48035 eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 multilib 3bf24e6abb9b76d9f6c20600f0b716bf readme.gentoo 106edea5533517715013de909a333abd toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac udev da001465a2e939c93f7ae16947ce3438 user f54e098dd38ba1c0847a13e685b87747 -_md5_=4ea1a8d80e82f951ca86db4b6a58a921 diff --git a/metadata/md5-cache/sys-apps/roccat-tools-1.4.0 b/metadata/md5-cache/sys-apps/roccat-tools-1.4.0 deleted file mode 100644 index 8806abedfd30..000000000000 --- a/metadata/md5-cache/sys-apps/roccat-tools-1.4.0 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test -DEPEND=x11-libs/gtk+:2 x11-libs/libnotify media-libs/libcanberra virtual/libusb:1 dev-libs/dbus-glib virtual/libgudev:= sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4 virtual/pkgconfig -DESCRIPTION=Utility for advanced configuration of Roccat devices -EAPI=5 -HOMEPAGE=http://roccat.sourceforge.net/ -IUSE=input_devices_roccat_arvo input_devices_roccat_isku input_devices_roccat_iskufx input_devices_roccat_kone input_devices_roccat_koneplus input_devices_roccat_konepure input_devices_roccat_konepureoptical input_devices_roccat_konextd input_devices_roccat_kovaplus input_devices_roccat_lua input_devices_roccat_pyra input_devices_roccat_savu input_devices_roccat_ryos -KEYWORDS=~amd64 ~x86 -LICENSE=GPL-2 -RDEPEND=x11-libs/gtk+:2 x11-libs/libnotify media-libs/libcanberra virtual/libusb:1 dev-libs/dbus-glib virtual/libgudev:= -REQUIRED_USE=input_devices_roccat_konextd? ( input_devices_roccat_koneplus ) -SLOT=0 -SRC_URI=mirror://sourceforge/roccat/roccat-tools-1.4.0.tar.bz2 -_eclasses_=cmake-utils 0e29eadbd656185bce30d2449ab48035 eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 multilib 3bf24e6abb9b76d9f6c20600f0b716bf readme.gentoo 106edea5533517715013de909a333abd toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac udev da001465a2e939c93f7ae16947ce3438 user f54e098dd38ba1c0847a13e685b87747 -_md5_=17e1c95f666de0f74ee7c685ed6d456b diff --git a/metadata/md5-cache/sys-apps/roccat-tools-1.4.1 b/metadata/md5-cache/sys-apps/roccat-tools-1.4.1 deleted file mode 100644 index 5d562c6ecccf..000000000000 --- a/metadata/md5-cache/sys-apps/roccat-tools-1.4.1 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test -DEPEND=x11-libs/gtk+:2 x11-libs/libnotify media-libs/libcanberra virtual/libusb:1 dev-libs/dbus-glib virtual/libgudev:= sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4 virtual/pkgconfig -DESCRIPTION=Utility for advanced configuration of Roccat devices -EAPI=5 -HOMEPAGE=http://roccat.sourceforge.net/ -IUSE=input_devices_roccat_arvo input_devices_roccat_isku input_devices_roccat_iskufx input_devices_roccat_kone input_devices_roccat_koneplus input_devices_roccat_konepure input_devices_roccat_konepureoptical input_devices_roccat_konextd input_devices_roccat_kovaplus input_devices_roccat_lua input_devices_roccat_pyra input_devices_roccat_savu input_devices_roccat_ryos -KEYWORDS=~amd64 ~x86 -LICENSE=GPL-2 -RDEPEND=x11-libs/gtk+:2 x11-libs/libnotify media-libs/libcanberra virtual/libusb:1 dev-libs/dbus-glib virtual/libgudev:= -REQUIRED_USE=input_devices_roccat_konextd? ( input_devices_roccat_koneplus ) -SLOT=0 -SRC_URI=mirror://sourceforge/roccat/roccat-tools-1.4.1.tar.bz2 -_eclasses_=cmake-utils 0e29eadbd656185bce30d2449ab48035 eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 multilib 3bf24e6abb9b76d9f6c20600f0b716bf readme.gentoo 106edea5533517715013de909a333abd toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac udev da001465a2e939c93f7ae16947ce3438 user f54e098dd38ba1c0847a13e685b87747 -_md5_=2733d30727460e834f8af9b688f133e5 diff --git a/metadata/md5-cache/sys-apps/roccat-tools-1.6.0 b/metadata/md5-cache/sys-apps/roccat-tools-2.4.0 similarity index 54% rename from metadata/md5-cache/sys-apps/roccat-tools-1.6.0 rename to metadata/md5-cache/sys-apps/roccat-tools-2.4.0 index 7db09e6a0aaf..973ac045e8f3 100644 --- a/metadata/md5-cache/sys-apps/roccat-tools-1.6.0 +++ b/metadata/md5-cache/sys-apps/roccat-tools-2.4.0 @@ -1,14 +1,13 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test -DEPEND=dev-libs/libgaminggear x11-libs/gtk+:2 x11-libs/libnotify media-libs/libcanberra virtual/libusb:1 dev-libs/dbus-glib virtual/libgudev:= sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4 virtual/pkgconfig +DEPEND=>=dev-libs/libgaminggear-0.5 x11-libs/gtk+:2 x11-libs/libnotify media-libs/libcanberra virtual/libusb:1 dev-libs/dbus-glib virtual/libgudev:= sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4 virtual/pkgconfig DESCRIPTION=Utility for advanced configuration of Roccat devices EAPI=5 HOMEPAGE=http://roccat.sourceforge.net/ -IUSE=input_devices_roccat_arvo input_devices_roccat_isku input_devices_roccat_iskufx input_devices_roccat_kone input_devices_roccat_koneplus input_devices_roccat_konepure input_devices_roccat_konepuremilitary input_devices_roccat_konepureoptical input_devices_roccat_konextd input_devices_roccat_kovaplus input_devices_roccat_lua input_devices_roccat_pyra input_devices_roccat_savu input_devices_roccat_ryos +IUSE=input_devices_roccat_arvo input_devices_roccat_isku input_devices_roccat_iskufx input_devices_roccat_kone input_devices_roccat_koneplus input_devices_roccat_konepure input_devices_roccat_konepuremilitary input_devices_roccat_konepureoptical input_devices_roccat_konextd input_devices_roccat_konextdoptical input_devices_roccat_kovaplus input_devices_roccat_lua input_devices_roccat_pyra input_devices_roccat_savu input_devices_roccat_ryos input_devices_roccat_tyon KEYWORDS=~amd64 ~x86 LICENSE=GPL-2 -RDEPEND=dev-libs/libgaminggear x11-libs/gtk+:2 x11-libs/libnotify media-libs/libcanberra virtual/libusb:1 dev-libs/dbus-glib virtual/libgudev:= -REQUIRED_USE=input_devices_roccat_konextd? ( input_devices_roccat_koneplus ) +RDEPEND=>=dev-libs/libgaminggear-0.5 x11-libs/gtk+:2 x11-libs/libnotify media-libs/libcanberra virtual/libusb:1 dev-libs/dbus-glib virtual/libgudev:= SLOT=0 -SRC_URI=mirror://sourceforge/roccat/roccat-tools-1.6.0.tar.bz2 +SRC_URI=mirror://sourceforge/roccat/roccat-tools-2.4.0.tar.bz2 _eclasses_=cmake-utils 0e29eadbd656185bce30d2449ab48035 eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 multilib 3bf24e6abb9b76d9f6c20600f0b716bf readme.gentoo 106edea5533517715013de909a333abd toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac udev da001465a2e939c93f7ae16947ce3438 user f54e098dd38ba1c0847a13e685b87747 -_md5_=3331251117209e093a9d5764a2720eaa +_md5_=b27fe77d787434a8d4df68bb4f0a0789 diff --git a/metadata/md5-cache/sys-devel/binutils-apple-5.1 b/metadata/md5-cache/sys-devel/binutils-apple-5.1 new file mode 100644 index 000000000000..376fc66b8ebb --- /dev/null +++ b/metadata/md5-cache/sys-devel/binutils-apple-5.1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst prepare test +DEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm ) test? ( >=dev-lang/perl-5.8.8 ) libcxx? ( sys-libs/libcxx-apple ) || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm ) libcxx? ( sys-devel/llvm ) +DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 5.1 +EAPI=3 +HOMEPAGE=http://www.opensource.apple.com/darwinsource/ +IUSE=lto test libcxx +KEYWORDS=~x64-macos ~x86-macos +LICENSE=APSL-2 +RDEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm ) test? ( >=dev-lang/perl-5.8.8 ) libcxx? ( sys-libs/libcxx-apple ) +SLOT=5 +SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-236.3.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-855.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-353.2.1.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz +_eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac +_md5_=0df312a697d7871fe9fb9ccd02076dc6 diff --git a/metadata/md5-cache/sys-devel/binutils-apple-6.1 b/metadata/md5-cache/sys-devel/binutils-apple-6.1 new file mode 100644 index 000000000000..a79645151ad6 --- /dev/null +++ b/metadata/md5-cache/sys-devel/binutils-apple-6.1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst prepare test +DEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm ) test? ( >=dev-lang/perl-5.8.8 ) libcxx? ( sys-libs/libcxx-apple ) || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm ) libcxx? ( sys-devel/llvm ) +DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 6.1 +EAPI=3 +HOMEPAGE=http://www.opensource.apple.com/darwinsource/ +IUSE=lto test libcxx +KEYWORDS=~x64-macos ~x86-macos +LICENSE=APSL-2 +RDEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm ) test? ( >=dev-lang/perl-5.8.8 ) libcxx? ( sys-libs/libcxx-apple ) +SLOT=6 +SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-241.9.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-862.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-353.2.1.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz +_eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac +_md5_=0486442edf3ce3e5bba98ebfbb6cef33 diff --git a/metadata/md5-cache/sys-fs/mtd-utils-1.5.1 b/metadata/md5-cache/sys-fs/mtd-utils-1.5.1 new file mode 100644 index 000000000000..5ae0d5516eac --- /dev/null +++ b/metadata/md5-cache/sys-fs/mtd-utils-1.5.1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install unpack +DEPEND=!sys-fs/mtd dev-libs/lzo sys-libs/zlib >=sys-apps/util-linux-2.16 xattr? ( sys-apps/acl ) +DESCRIPTION=MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI) +EAPI=4 +HOMEPAGE=http://git.infradead.org/?p=mtd-utils.git;a=summary +IUSE=xattr +KEYWORDS=~amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux +LICENSE=GPL-2 +RDEPEND=!sys-fs/mtd dev-libs/lzo sys-libs/zlib >=sys-apps/util-linux-2.16 +SLOT=0 +SRC_URI=http://git.infradead.org/mtd-utils.git/snapshot/v1.5.1.tar.gz -> mtd-utils-1.5.1.tar.gz +_eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac vcs-snapshot 58b766562c9fbfb3268b04e33cdf2f66 +_md5_=7ae7474a6641100a2dcea7ac047d5ed2 diff --git a/metadata/md5-cache/sys-kernel/git-sources-3.19_rc1 b/metadata/md5-cache/sys-kernel/git-sources-3.19_rc1 index d1f1565a98c6..527b76cdb430 100644 --- a/metadata/md5-cache/sys-kernel/git-sources-3.19_rc1 +++ b/metadata/md5-cache/sys-kernel/git-sources-3.19_rc1 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile install postinst postrm preinst setup test unpack -DEPEND=>=sys-devel/patch-2.7.1-r3 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) +DEPEND=>=sys-devel/patch-2.7.1-r3 =sys-devel/binutils-2.11.90.0.31 ) DESCRIPTION=The very latest -git version of the Linux kernel EAPI=5 HOMEPAGE=http://www.kernel.org @@ -12,4 +12,4 @@ RESTRICT=binchecks strip SLOT=3.19_rc1 SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.19-rc1.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz _eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 kernel-2 e0363401e3e385deca89bb9a22b528bb multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-any-r1 da352ea9da8eb9bf158d56cca65d6c82 python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=03fcd193127a778d2009873cee760030 +_md5_=f49fab68d072690729f99689243c3541 diff --git a/metadata/md5-cache/sys-kernel/git-sources-3.19_rc2 b/metadata/md5-cache/sys-kernel/git-sources-3.19_rc2 index b484fb260f87..d06e874f90e6 100644 --- a/metadata/md5-cache/sys-kernel/git-sources-3.19_rc2 +++ b/metadata/md5-cache/sys-kernel/git-sources-3.19_rc2 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile install postinst postrm preinst setup test unpack -DEPEND=>=sys-devel/patch-2.7.1-r3 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) +DEPEND=>=sys-devel/patch-2.7.1-r3 =sys-devel/binutils-2.11.90.0.31 ) DESCRIPTION=The very latest -git version of the Linux kernel EAPI=5 HOMEPAGE=http://www.kernel.org @@ -12,4 +12,4 @@ RESTRICT=binchecks strip SLOT=3.19_rc2 SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.19-rc2.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz _eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 kernel-2 e0363401e3e385deca89bb9a22b528bb multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-any-r1 da352ea9da8eb9bf158d56cca65d6c82 python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=6157f865fca5881b21877246efa3a834 +_md5_=0c6f3c04f44eeec036ffee18aea2e653 diff --git a/metadata/md5-cache/sys-kernel/git-sources-3.19_rc3 b/metadata/md5-cache/sys-kernel/git-sources-3.19_rc3 index 58602734acef..476e4108dee0 100644 --- a/metadata/md5-cache/sys-kernel/git-sources-3.19_rc3 +++ b/metadata/md5-cache/sys-kernel/git-sources-3.19_rc3 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile install postinst postrm preinst setup test unpack -DEPEND=>=sys-devel/patch-2.7.1-r3 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) +DEPEND=>=sys-devel/patch-2.7.1-r3 =sys-devel/binutils-2.11.90.0.31 ) DESCRIPTION=The very latest -git version of the Linux kernel EAPI=5 HOMEPAGE=http://www.kernel.org @@ -12,4 +12,4 @@ RESTRICT=binchecks strip SLOT=3.19_rc3 SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.19-rc3.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz _eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 kernel-2 e0363401e3e385deca89bb9a22b528bb multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-any-r1 da352ea9da8eb9bf158d56cca65d6c82 python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=ac8a883b3f3f35a230f6872dfe099b1d +_md5_=c45919d211e232c1b1c7b4e6bfdce295 diff --git a/metadata/md5-cache/sys-kernel/git-sources-3.19_rc4 b/metadata/md5-cache/sys-kernel/git-sources-3.19_rc4 index 83330ec17988..9ddc6f91d722 100644 --- a/metadata/md5-cache/sys-kernel/git-sources-3.19_rc4 +++ b/metadata/md5-cache/sys-kernel/git-sources-3.19_rc4 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile install postinst postrm preinst setup test unpack -DEPEND=>=sys-devel/patch-2.7.1-r3 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) +DEPEND=>=sys-devel/patch-2.7.1-r3 =sys-devel/binutils-2.11.90.0.31 ) DESCRIPTION=The very latest -git version of the Linux kernel EAPI=5 HOMEPAGE=http://www.kernel.org @@ -12,4 +12,4 @@ RESTRICT=binchecks strip SLOT=3.19_rc4 SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.19-rc4.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz _eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 kernel-2 e0363401e3e385deca89bb9a22b528bb multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-any-r1 da352ea9da8eb9bf158d56cca65d6c82 python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=2d23c8e595d1dacb4c249e02e3ddad29 +_md5_=9ad0bdfc811445dbb2cc73ca0623b0d8 diff --git a/metadata/md5-cache/sys-kernel/git-sources-3.19_rc5 b/metadata/md5-cache/sys-kernel/git-sources-3.19_rc5 index d4c807ab342c..bdea2e77ca9c 100644 --- a/metadata/md5-cache/sys-kernel/git-sources-3.19_rc5 +++ b/metadata/md5-cache/sys-kernel/git-sources-3.19_rc5 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile install postinst postrm preinst setup test unpack -DEPEND=>=sys-devel/patch-2.7.1-r3 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) +DEPEND=>=sys-devel/patch-2.7.1-r3 =sys-devel/binutils-2.11.90.0.31 ) DESCRIPTION=The very latest -git version of the Linux kernel EAPI=5 HOMEPAGE=http://www.kernel.org @@ -12,4 +12,4 @@ RESTRICT=binchecks strip SLOT=3.19_rc5 SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.19-rc5.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz _eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 kernel-2 e0363401e3e385deca89bb9a22b528bb multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-any-r1 da352ea9da8eb9bf158d56cca65d6c82 python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=78f1007a8f39fcc04d17349d9d2b5ff3 +_md5_=228a3bfb1d5f9c062a4d104efba82654 diff --git a/metadata/md5-cache/sys-kernel/git-sources-3.19_rc6 b/metadata/md5-cache/sys-kernel/git-sources-3.19_rc6 index 698af28b0d9d..2aab7f49ba57 100644 --- a/metadata/md5-cache/sys-kernel/git-sources-3.19_rc6 +++ b/metadata/md5-cache/sys-kernel/git-sources-3.19_rc6 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile install postinst postrm preinst setup test unpack -DEPEND=>=sys-devel/patch-2.7.1-r3 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) +DEPEND=>=sys-devel/patch-2.7.1-r3 =sys-devel/binutils-2.11.90.0.31 ) DESCRIPTION=The very latest -git version of the Linux kernel EAPI=5 HOMEPAGE=http://www.kernel.org @@ -12,4 +12,4 @@ RESTRICT=binchecks strip SLOT=3.19_rc6 SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.19-rc6.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz _eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 kernel-2 e0363401e3e385deca89bb9a22b528bb multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-any-r1 da352ea9da8eb9bf158d56cca65d6c82 python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=b676a950e8412cfedd2e1f5acdfa87a2 +_md5_=b6e6be347d717a030b08fed3c0da4716 diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.65 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.65 new file mode 100644 index 000000000000..bec6ade545b7 --- /dev/null +++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.65 @@ -0,0 +1,15 @@ +DEFINED_PHASES=compile install postinst postrm preinst setup test unpack +DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) +DESCRIPTION=TuxOnIce + Gentoo patchset sources +EAPI=5 +HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel +IUSE=experimental symlink build +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2 freedist +PDEPEND=!build? ( virtual/dev-manager ) +RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc ) +RESTRICT=binchecks strip +SLOT=3.10.65 +SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz mirror://gentoo/genpatches-3.10-73.base.tar.xz mirror://gentoo/genpatches-3.10-73.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-73.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.10.51-2014-08-07.patch.bz2 +_eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 kernel-2 e0363401e3e385deca89bb9a22b528bb multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-any-r1 da352ea9da8eb9bf158d56cca65d6c82 python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f +_md5_=4e58dfb846b792c448f0e805b1439c44 diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.29 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.29 new file mode 100644 index 000000000000..dfe96b5aa92a --- /dev/null +++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.29 @@ -0,0 +1,15 @@ +DEFINED_PHASES=compile install postinst postrm preinst setup test unpack +DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) +DESCRIPTION=TuxOnIce + Gentoo patchset sources +EAPI=5 +HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel +IUSE=experimental symlink build +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2 freedist +PDEPEND=!build? ( virtual/dev-manager ) +RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc ) +RESTRICT=binchecks strip +SLOT=3.14.29 +SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz mirror://gentoo/genpatches-3.14-34.base.tar.xz mirror://gentoo/genpatches-3.14-34.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-34.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.14.15-2014-08-07.patch.bz2 +_eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 kernel-2 e0363401e3e385deca89bb9a22b528bb multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-any-r1 da352ea9da8eb9bf158d56cca65d6c82 python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f +_md5_=ca2f0f71349ff42beeeb4e92b6a02cd5 diff --git a/metadata/md5-cache/www-client/opera-26.0.1656.32 b/metadata/md5-cache/www-client/opera-27.0.1689.54 similarity index 92% rename from metadata/md5-cache/www-client/opera-26.0.1656.32 rename to metadata/md5-cache/www-client/opera-27.0.1689.54 index 1d534d55f99f..d165c12d8757 100644 --- a/metadata/md5-cache/www-client/opera-26.0.1656.32 +++ b/metadata/md5-cache/www-client/opera-27.0.1689.54 @@ -8,6 +8,6 @@ KEYWORDS=~amd64 LICENSE=OPERA-2014 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss >=dev-libs/openssl-1.0.1:0 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap virtual/libudev x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] SLOT=0 -SRC_URI=amd64? ( http://get.geo.opera.com/pub/opera/desktop/26.0.1656.32/linux/opera-stable_26.0.1656.32_amd64.deb ) +SRC_URI=amd64? ( http://get.geo.opera.com/pub/opera/desktop/27.0.1689.54/linux/opera-stable_27.0.1689.54_amd64.deb ) _eclasses_=chromium 4a9f555199b35aa57f60b0e9b9627d2a eutils 998e5931fb95b10a6a11ec796ada2759 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 linux-info 2b8c53f6065bdee2d757472215a3088f multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac unpacker f300a7ca9131b1024a79762e8edd3c52 versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=de01aca03dd99c271676891a6de670a7 +_md5_=f36b48af1af8e7ec04b16bb68c333dcb diff --git a/metadata/md5-cache/x11-apps/amlc-0.5.1 b/metadata/md5-cache/x11-apps/amlc-0.5.1 index 142b70b6b1f0..8573361b791b 100644 --- a/metadata/md5-cache/x11-apps/amlc-0.5.1 +++ b/metadata/md5-cache/x11-apps/amlc-0.5.1 @@ -1,9 +1,10 @@ -DEFINED_PHASES=compile install unpack +DEFINED_PHASES=compile install prepare DESCRIPTION=Another Modeline Calculator, generates quality X11 display configs easily -HOMEPAGE=http://amlc.berlios.de +EAPI=5 +HOMEPAGE=http://sourceforge.net/projects/amlc.berlios/ KEYWORDS=amd64 x86 LICENSE=GPL-2 SLOT=0 -SRC_URI=http://amlc.berlios.de/src/amlc-0.5.1.cpp +SRC_URI=https://dev.gentoo.org/~jer/amlc-0.5.1.cpp _eclasses_=multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=d737c5e55a7635be51165e19a3c96f31 +_md5_=100accb73fbc37fc7b02818098047127 diff --git a/metadata/md5-cache/x11-terms/gnome-terminal-3.14.2 b/metadata/md5-cache/x11-terms/gnome-terminal-3.14.2 deleted file mode 100644 index 1c354d5d40b8..000000000000 --- a/metadata/md5-cache/x11-terms/gnome-terminal-3.14.2 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack -DEPEND=>=dev-libs/glib-2.40:2 >=x11-libs/gtk+-3.10:3[X] >=x11-libs/vte-0.38:2.91 >=gnome-base/dconf-0.14 >=gnome-base/gconf-2.31.3 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux x11-libs/libSM x11-libs/libICE gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-3 ) app-text/yelp-tools dev-util/appdata-tools || ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 ) >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 -DESCRIPTION=The Gnome Terminal -EAPI=5 -HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/ -IUSE=debug +gnome-shell +nautilus -KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux -LICENSE=GPL-3+ -RDEPEND=>=dev-libs/glib-2.40:2 >=x11-libs/gtk+-3.10:3[X] >=x11-libs/vte-0.38:2.91 >=gnome-base/dconf-0.14 >=gnome-base/gconf-2.31.3 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux x11-libs/libSM x11-libs/libICE gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-3 ) -SLOT=0 -SRC_URI=mirror://gnome/sources/gnome-terminal/3.14/gnome-terminal-3.14.2.tar.xz -_eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 29582087e5f16ca16b1c6815c2ae2b65 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf readme.gentoo 106edea5533517715013de909a333abd toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=d251d77c3250131fa788213a6d4395be diff --git a/metadata/md5-cache/x11-terms/gnome-terminal-3.14.2-r1 b/metadata/md5-cache/x11-terms/gnome-terminal-3.14.2-r2 similarity index 86% rename from metadata/md5-cache/x11-terms/gnome-terminal-3.14.2-r1 rename to metadata/md5-cache/x11-terms/gnome-terminal-3.14.2-r2 index c526d82a0bf7..a6358db3b81f 100644 --- a/metadata/md5-cache/x11-terms/gnome-terminal-3.14.2-r1 +++ b/metadata/md5-cache/x11-terms/gnome-terminal-3.14.2-r2 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack -DEPEND=>=dev-libs/glib-2.40:2[dbus] >=x11-libs/gtk+-3.10:3[X] >=x11-libs/vte-0.38:2.91 >=gnome-base/dconf-0.14 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux x11-libs/libSM x11-libs/libICE gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-3 ) app-text/yelp-tools dev-util/appdata-tools || ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 ) >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 +DEPEND=>=dev-libs/glib-2.40:2[dbus] >=x11-libs/gtk+-3.10:3[X] >=x11-libs/vte-0.38:2.91 >=gnome-base/dconf-0.14 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux x11-libs/libSM x11-libs/libICE gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-3 ) app-text/yelp-tools dev-util/appdata-tools dev-util/gdbus-codegen || ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 ) >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 DESCRIPTION=The Gnome Terminal EAPI=5 HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/ @@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.40:2[dbus] >=x11-libs/gtk+-3.10:3[X] >=x11-libs/vte-0. SLOT=0 SRC_URI=mirror://gnome/sources/gnome-terminal/3.14/gnome-terminal-3.14.2.tar.xz _eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 29582087e5f16ca16b1c6815c2ae2b65 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf readme.gentoo 106edea5533517715013de909a333abd toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=a356e84a8603072d6d115553944af315 +_md5_=833f95e7f19d5277f53d3a605ed5d0ca diff --git a/metadata/md5-cache/x11-wm/fluxbox-1.3.5-r1 b/metadata/md5-cache/x11-wm/fluxbox-1.3.5-r1 index df3f0fe647d5..87920f8f8dd7 100644 --- a/metadata/md5-cache/x11-wm/fluxbox-1.3.5-r1 +++ b/metadata/md5-cache/x11-wm/fluxbox-1.3.5-r1 @@ -10,4 +10,4 @@ RDEPEND=!!<=x11-misc/fbdesk-1.2.1 !!<=x11-misc/fluxconf-0.9.9 !! kde + + Enable support for the real-time communication framework telepathy + diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest index b0f3e8e3dcd4..5bf5fd57b37a 100644 --- a/net-irc/weechat/Manifest +++ b/net-irc/weechat/Manifest @@ -1,3 +1,4 @@ DIST weechat-0.4.3.tar.bz2 2089701 SHA256 a8ec847d331a1201de975530a22f1813c260db420c68675b2ecaa7bf3c7c3ff8 SHA512 0d049626e6a5fb44bc368d732c395d7135ad8869d9368cb95487662c4c738c9a44052db6e40a7fa08db9798916de0c466c24531f94993e91b7b19519b1d7cfc2 WHIRLPOOL 1e8f045be496d70c39ffdc63aaa1a4862c68e52549ca378c14e3295de20a9d882c144c1acee49c3dca94db31c0495c39c70087e388f316a9f07beed7e246a58c DIST weechat-1.0.1.tar.bz2 2277780 SHA256 b9285ae5124798dee8e3d77cf4ec1e913699b1df1587b5cee6760ed518072ca8 SHA512 e8b38d28db820471bb2a50288545598590eaf9e473fbe98fdaea54a3fd043ee6625f4ec273ab5fc266efcfd01e39e051771ae6e6acebc693d3dd54179be73dea WHIRLPOOL 95206fd64bff598bfa26c8d2b9d41abe5f0825c5b254e5b68ea47ae4301d0a6c5bc693f1e26e6a3bdf11dbbb27af105af0873c39f1b773ce0700c3246534b8b6 +DIST weechat-1.1.1.tar.bz2 2305377 SHA256 810bf0584fd5888246797fc7f1bbc4facb064a4d1c5d91627a9c8c01cbce97b5 SHA512 710cb8badeb2734cbe6430e1c5f7fc91d8ec5c9ef85d2c6cc2206ffdf915fab083027a04d25ba23a17515e767d3b482f85b3b3e8fc445cbf1d05db941ca13dfd WHIRLPOOL d445db9a42e6ac8a58bf17a6a905bc769ea3da005d29f4c8dd703c859ae475dea0302ba471662ae52ff7c4961f35b09942757ccf657d1d419edc50416dde6002 DIST weechat-1.1.tar.bz2 2305548 SHA256 d06f15d8b945a76fc6b0ecfad358dfe4ae812b6fc998e0e221e8c2f75e3fca2d SHA512 2f7f44092603de5cf3321941599e4629caccf21bb65a6185ce4404abbae37beaa8eb447b328775c2404a1fc5227aea44623edfcdf86fe5927b4a3a1437f3e0b4 WHIRLPOOL 648c8a30875ba786812db6d97735404f3b070d020a0a402c9c04e4e9452515d616a8a1d6b721365f683945ec284bc705973f697c38d92c61baeecf5b6f759bf4 diff --git a/net-irc/weechat/weechat-1.1.1.ebuild b/net-irc/weechat/weechat-1.1.1.ebuild new file mode 100644 index 000000000000..0f5dab9874a6 --- /dev/null +++ b/net-irc/weechat/weechat-1.1.1.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-1.1.1.ebuild,v 1.1 2015/01/26 20:02:33 radhermit Exp $ + +EAPI=5 +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +inherit python-single-r1 multilib cmake-utils + +if [[ ${PV} == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/weechat/weechat.git" +else + SRC_URI="http://${PN}.org/files/src/${P}.tar.bz2" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Portable and multi-interface IRC client" +HOMEPAGE="http://weechat.org/" + +LICENSE="GPL-3" +SLOT="0" + +NETWORKS="+irc" +PLUGINS="+alias +charset +exec +fifo +logger +relay +scripts +spell +trigger +xfer" +#INTERFACES="+ncurses gtk" +SCRIPT_LANGS="guile lua +perl +python ruby tcl" +LANGS=" cs de es fr hu it ja pl pt_BR ru tr" +IUSE="doc nls +ssl test ${LANGS// / linguas_} ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}" +#REQUIRED_USE=" || ( ncurses gtk )" + +RDEPEND=" + dev-libs/libgcrypt:0= + net-misc/curl[ssl] + sys-libs/ncurses + sys-libs/zlib + charset? ( virtual/libiconv ) + guile? ( dev-scheme/guile ) + lua? ( dev-lang/lua[deprecated] ) + nls? ( virtual/libintl ) + perl? ( dev-lang/perl ) + python? ( ${PYTHON_DEPS} ) + ruby? ( >=dev-lang/ruby-1.9 ) + ssl? ( net-libs/gnutls ) + spell? ( app-text/aspell ) + tcl? ( >=dev-lang/tcl-8.4.15 ) +" +# ncurses? ( sys-libs/ncurses ) +# gtk? ( x11-libs/gtk+:2 ) +DEPEND="${RDEPEND} + doc? ( + app-text/asciidoc + dev-util/source-highlight + ) + nls? ( >=sys-devel/gettext-0.15 ) + test? ( dev-util/cpputest ) +" + +DOCS="AUTHORS.asciidoc ChangeLog.asciidoc ReleaseNotes.asciidoc README.asciidoc" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + local i + + # fix libdir placement + sed -i \ + -e "s:lib/:$(get_libdir)/:g" \ + -e "s:lib\":$(get_libdir)\":g" \ + CMakeLists.txt || die "sed failed" + + # install only required translations + for i in ${LANGS} ; do + if ! use linguas_${i} ; then + sed -i \ + -e "/${i}.po/d" \ + po/CMakeLists.txt || die + fi + done + + # install only required documentation ; en always + for i in `grep ADD_SUBDIRECTORY doc/CMakeLists.txt \ + | sed -e 's/.*ADD_SUBDIRECTORY( \(..\) ).*/\1/' -e '/en/d'`; do + if ! use linguas_${i} ; then + sed -i \ + -e '/ADD_SUBDIRECTORY( '${i}' )/d' \ + doc/CMakeLists.txt || die + fi + done +} + +src_configure() { + # $(cmake-utils_use_enable gtk) + # $(cmake-utils_use_enable ncurses) + local mycmakeargs=( + "-DENABLE_NCURSES=ON" + "-DENABLE_LARGEFILE=ON" + "-DENABLE_DEMO=OFF" + "-DENABLE_GTK=OFF" + "-DPYTHON_EXECUTABLE=${PYTHON}" + $(cmake-utils_use_enable alias) + $(cmake-utils_use_enable doc) + $(cmake-utils_use_enable charset) + $(cmake-utils_use_enable exec) + $(cmake-utils_use_enable fifo) + $(cmake-utils_use_enable guile) + $(cmake-utils_use_enable irc) + $(cmake-utils_use_enable logger) + $(cmake-utils_use_enable lua) + $(cmake-utils_use_enable nls) + $(cmake-utils_use_enable perl) + $(cmake-utils_use_enable python) + $(cmake-utils_use_enable relay) + $(cmake-utils_use_enable ruby) + $(cmake-utils_use_enable scripts) + $(cmake-utils_use_enable scripts script) + $(cmake-utils_use_enable spell ASPELL) + $(cmake-utils_use_enable ssl GNUTLS) + $(cmake-utils_use_enable tcl) + $(cmake-utils_use_enable test TESTS) + $(cmake-utils_use_enable trigger) + $(cmake-utils_use_enable xfer) + ) + + cmake-utils_src_configure +} diff --git a/net-libs/iojs/Manifest b/net-libs/iojs/Manifest new file mode 100644 index 000000000000..a30a3f146756 --- /dev/null +++ b/net-libs/iojs/Manifest @@ -0,0 +1 @@ +DIST iojs-v1.0.4.tar.xz 12284732 SHA256 c902f5abbd59c56346680f0b4a71056c51610847b9576acf83a9c210bf664e98 SHA512 0e3d4f66fc7f64e09f999b1fdb7bbbfe80a5cfd0396ec718bf166ae44bcb27eebf5b59c3cd4a74f050b59ee529678b1bdef1c3b9d71534c8ac0ab8caf8472021 WHIRLPOOL cfd766a513877f6ccfddc4e1eb4e0be4fa987dbac7c7c8159f70556b72a01b26fdd7d92be3fcb7efc37691b6808c8d570199741f01f95df77dd9aa95312bac9e diff --git a/net-libs/iojs/iojs-1.0.4.ebuild b/net-libs/iojs/iojs-1.0.4.ebuild new file mode 100644 index 000000000000..197da738a49c --- /dev/null +++ b/net-libs/iojs/iojs-1.0.4.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/iojs/iojs-1.0.4.ebuild,v 1.1 2015/01/27 03:01:33 patrick Exp $ + +EAPI=5 + +# Sigh, this can't work ... silly upstream +RESTRICT="test" + +PYTHON_COMPAT=( python2_7 ) + +MY_PV="v${PV}" +MY_P="${PN}-${MY_PV}" + +inherit python-any-r1 pax-utils toolchain-funcs flag-o-matic + +DESCRIPTION="An npm compatible platform originally based on node.js" +HOMEPAGE="http://iojs.org/" +SRC_URI="http://iojs.org/dist/${MY_PV}/${MY_P}.tar.xz" + +LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86 ~x64-macos" +IUSE="icu +npm snapshot" + +RDEPEND="!!net-libs/nodejs + >=dev-libs/openssl-1.0.1j" +DEPEND="${PYTHON_DEPS} + ${RDEPEND} + icu? ( dev-libs/icu ) + >=net-libs/http-parser-2.4.1 + >=dev-libs/libuv-1.2.1" + +S="${WORKDIR}/${MY_P}" + +pkg_pretend() { + if ! test-flag-CXX -std=c++11 ; then + die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer." + fi +} + +src_prepare() { + # fix compilation on Darwin + # http://code.google.com/p/gyp/issues/detail?id=260 + sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die + + # make sure we use python2.* while using gyp + sed -i -e "s/python/python2/" deps/npm/node_modules/node-gyp/gyp/gyp || die + sed -i -e "s/|| 'python'/|| 'python2'/" deps/npm/node_modules/node-gyp/lib/configure.js || die + + # less verbose install output (stating the same as portage, basically) + sed -i -e "/print/d" tools/install.py || die + + # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 + local LIBDIR=$(get_libdir) + sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die + sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die + sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die + + tc-export CC CXX +} + +src_configure() { + local myconf="" + local myarch="" + ! use npm && myconf="--without-npm" + use icu && myconf+=" --with-intl=system-icu" + use snapshot && myconf+=" --with-snapshot" + + case ${CHOST} in + i?86-*) + myarch="ia32" + myconf+=" -Dv8_target_arch=ia32" ;; + x86_64-*) + if [[ $ABI = x86 ]]; then + myarch="ia32" + elif [[ $ABI = x32 ]]; then + myarch="x32" + else + myarch="x64" + fi ;; + arm*-*) + myarch="arm" + ;; + *) die "Unrecognized CHOST: ${CHOST}" + esac + + "${PYTHON}" configure --prefix="${EPREFIX}"/usr \ + --shared-openssl \ + --shared-libuv \ + --shared-http-parser \ + --shared-zlib \ + --dest-cpu=${myarch} \ + --without-dtrace ${myconf} || die +} + +src_compile() { + export PYTHON="${PYTHON}" + export V=1 + default +} + +src_install() { + local LIBDIR="${ED}/usr/$(get_libdir)" + emake install DESTDIR="${D}" + + use npm && dohtml -r "${LIBDIR}"/node_modules/npm/html/* + rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} + rm -rf "${LIBDIR}"/dtrace + find "${LIBDIR}"/node_modules -type f -name "LICENSE" -delete + + pax-mark -m "${ED}"/usr/bin/iojs +} + +src_test() { + emake test || die +} diff --git a/net-libs/iojs/metadata.xml b/net-libs/iojs/metadata.xml new file mode 100644 index 000000000000..4dbbc90e24fd --- /dev/null +++ b/net-libs/iojs/metadata.xml @@ -0,0 +1,17 @@ + + + + proxy-maintainers + + bugs@bergstroem.nu + Johan Bergstroem + + + patrick@gentoo.org + Patrick Lauer + + + Enable NPM package manager + Enable snapshot creation for faster startup + + diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index f0c92e17838c..762da908f520 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -1,2 +1,3 @@ DIST webkitgtk-2.4.8.tar.xz 9827632 SHA256 68f11559cb178679ca92acc9e3a3d7febede7acb7b98afd7fb761875bbc6bd23 SHA512 31b8b87142730aa27e5bd4fe85b0de2116fd492ef469592512c185d60df428a9913d6c2738ce57439bf9db10864ed9c121ddbc2a4da2f715818a70885c81c0de WHIRLPOOL 851e3973c00096dd3a98e64bfa9f9f0f278c3513656af9a9aa72442cd6c594119adefafa6c06d05e431ec77bf6e9f1e10432e9b6895d777adfe2952843602ef2 DIST webkitgtk-2.6.4.tar.xz 9996524 SHA256 beef5e24edd9b9cade22d80bf373c74d236f996fe30f49f8697a70f267772e9b SHA512 242ab90ceff5b83978dd5bb8f0b8e05a7daa1fbbe87657ef0404facb17b873f3d703aed838f364bc042f2848b8cca300f1126f4d6979fed34235efa40e44d5d8 WHIRLPOOL 12f74b6e7188a92a2c5b656720e99937ac0c3f941ff83bdde5cf1cf671c61b8dc248d45a216dd1d821c684364bda0a43b38964efc3c0cb16ce2a1674963d95ee +DIST webkitgtk-2.6.5.tar.xz 10000124 SHA256 b1658017cea7cc545b9e01f22af585986e21e4242825e215bc5f8e0c0dc67593 SHA512 b8097e16ccfe10c75e43d81a965a14bde19dcefa6f1ac6ef52c075afeb4c603289c3e7cad05b02af053728df16b5681aafa248e5974319849a0967364bca1f19 WHIRLPOOL 60b0cfccefef0f90ba66f3e89819239574f06e42d2508055843addcf20292747d82d258332bb95ae2730a3c11a2acd74ca595f3f2a3cd54230013e4320a6b6d8 diff --git a/net-libs/webkit-gtk/webkit-gtk-2.6.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.6.5.ebuild new file mode 100644 index 000000000000..cba3ade86ad1 --- /dev/null +++ b/net-libs/webkit-gtk/webkit-gtk-2.6.5.ebuild @@ -0,0 +1,220 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.6.5.ebuild,v 1.1 2015/01/26 20:42:35 pacho Exp $ + +EAPI="5" +GCONF_DEBUG="no" +PYTHON_COMPAT=( python2_7 ) + +inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs versionator virtualx + +MY_P="webkitgtk-${PV}" +DESCRIPTION="Open source web browser engine" +HOMEPAGE="http://www.webkitgtk.org/" +SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz" + +LICENSE="LGPL-2+ BSD" +SLOT="4/37" # soname version of libwebkit2gtk-4.0 +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" + +IUSE="coverage doc +egl +geoloc +gstreamer +introspection +jit libsecret +opengl spell +webgl" +# gles2 wayland X +# bugs 372493, 416331 +REQUIRED_USE=" + geoloc? ( introspection ) + introspection? ( gstreamer ) +" +# gles2? ( egl ) +# webgl? ( ^^ ( gles2 opengl ) ) +# !webgl? ( ?? ( gles2 opengl ) ) +# || ( wayland X ) + +# use sqlite, svg by default +# Aqua support in gtk3 is untested +# gtk2 is needed for plugin process support, should we add a USE flag to configure this? +# gtk3-3.10 required for wayland +RDEPEND=" + >=dev-libs/glib-2.36.0:2 + >=dev-libs/libxml2-2.8:2 + >=dev-libs/libxslt-1.1.7 + virtual/jpeg:0= + >=media-libs/harfbuzz-0.9.18:=[icu(+)] + >=media-libs/libpng-1.4:0= + media-libs/libwebp:= + >=dev-libs/icu-3.8.1-r1:= + >=media-libs/fontconfig-2.8:1.0 + >=media-libs/freetype-2.4.2:2 + >=net-libs/libsoup-2.42:2.4[introspection?] + >=x11-libs/cairo-1.10.2:=[X] + >=x11-libs/gtk+-3.6.0:3[X,introspection?] + dev-db/sqlite:3= + >=x11-libs/pango-1.30.0.0 + x11-libs/libXrender + x11-libs/libXt + + >=x11-libs/gtk+-2.24.10:2 + + egl? ( media-libs/mesa[egl] ) + geoloc? ( >=app-misc/geoclue-2.1.5:2.0 ) + gstreamer? ( + >=media-libs/gstreamer-1.2:1.0 + >=media-libs/gst-plugins-base-1.2:1.0 ) + introspection? ( >=dev-libs/gobject-introspection-1.32.0 ) + libsecret? ( app-crypt/libsecret ) + opengl? ( virtual/opengl ) + spell? ( >=app-text/enchant-0.22:= ) + webgl? ( + x11-libs/cairo[opengl] + x11-libs/libXcomposite + x11-libs/libXdamage ) +" +# gles2? ( media-libs/mesa[gles2] ) +# wayland? ( >=x11-libs/gtk+-3.12:3[wayland] ) + +# paxctl needed for bug #407085 +# Need real bison, not yacc +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + >=dev-lang/perl-5.10 + || ( + virtual/rubygems[ruby_targets_ruby20] + virtual/rubygems[ruby_targets_ruby21] + virtual/rubygems[ruby_targets_ruby19] + ) + >=app-accessibility/at-spi2-core-2.5.3 + >=dev-libs/atk-2.8.0 + >=dev-util/gtk-doc-am-1.10 + >=dev-util/gperf-3.0.1 + >=sys-devel/bison-2.4.3 + >=sys-devel/flex-2.5.34 + || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 ) + sys-devel/gettext + virtual/pkgconfig + + doc? ( >=dev-util/gtk-doc-am-1.10 ) + geoloc? ( dev-util/gdbus-codegen ) + introspection? ( jit? ( sys-apps/paxctl ) ) + test? ( + dev-lang/python:2.7 + dev-python/pygobject:3[python_targets_python2_7] + x11-themes/hicolor-icon-theme + jit? ( sys-apps/paxctl ) ) +" + +S="${WORKDIR}/${MY_P}" + +CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 + +pkg_pretend() { + if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then + einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" + check-reqs_pkg_pretend + fi + + if ! test-flag-CXX -std=c++11; then + die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags" + fi +} + +pkg_setup() { + if [[ ${MERGE_TYPE} != "binary" ]] ; then + check-reqs_pkg_setup + fi + + [[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup +} + +src_prepare() { + # Debian patches to fix support for some arches + # https://bugs.webkit.org/show_bug.cgi?id=129540 + epatch "${FILESDIR}"/${PN}-2.6.0-{hppa,ia64}-platform.patch + # https://bugs.webkit.org/show_bug.cgi?id=129542 + epatch "${FILESDIR}"/${PN}-2.6.0-ia64-malloc.patch + + gnome2_src_prepare +} + +src_configure() { + # Respect CC, otherwise fails on prefix #395875 + tc-export CC + + # Arches without JIT support also need this to really disable it in all places + use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0 + + # It doesn't compile on alpha without this in LDFLAGS + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761 + use alpha && append-ldflags "-Wl,--no-relax" + + # Sigbuses on SPARC with mcpu and co., bug #??? + use sparc && filter-flags "-mvis" + + # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634 + use ppc64 && append-flags "-mminimal-toc" + + # Try to use less memory, bug #469942 (see Fedora .spec for reference) + # --no-keep-memory doesn't work on ia64, bug #502492 + if ! use ia64; then + append-ldflags "-Wl,--no-keep-memory" + fi + if ! $(tc-getLD) --version | grep -q "GNU gold"; then + append-ldflags "-Wl,--reduce-memory-overheads" + fi + + local ruby_interpreter="" + + if has_version "virtual/rubygems[ruby_targets_ruby21]"; then + ruby_interpreter="RUBY=$(type -P ruby21)" + elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then + ruby_interpreter="RUBY=$(type -P ruby20)" + else + ruby_interpreter="RUBY=$(type -P ruby19)" + fi + + # TODO: Check Web Audio support + # should somehow let user select between them? + # + # FTL_JIT requires llvm + libcxxabi + # $(cmake-utils_use_enable wayland WAYLAND_TARGET) + # $(cmake-utils_use_enable X X11_TARGET) + # $(cmake-utils_use_find_package gles2 OpenGLES2) + local mycmakeargs=( + $(cmake-utils_use_enable test API_TESTS) + $(cmake-utils_use_enable doc GTKDOC) + $(cmake-utils_use_enable geoloc GEOLOCATION) + $(cmake-utils_use_enable gstreamer VIDEO) + $(cmake-utils_use_enable gstreamer WEB_AUDIO) + $(cmake-utils_use_enable introspection) + $(cmake-utils_use_enable jit) + $(cmake-utils_use_enable libsecret CREDENTIAL_STORAGE) + $(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK) + $(cmake-utils_use_enable webgl WEBGL) + $(cmake-utils_use_find_package egl EGL) + $(cmake-utils_use_find_package opengl OpenGL) + -DCMAKE_BUILD_TYPE=Release + -DENABLE_X11_TARGET=ON + -DPORT=GTK + -DENABLE_PLUGIN_PROCESS_GTK2=ON + ${ruby_interpreter} + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +src_test() { + # Prevents test failures on PaX systems + use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test* + + cmake-utils_src_test +} + +src_install() { + cmake-utils_src_install + + # Prevents crashes on PaX systems, bug #522808 + use jit && pax-mark m "${ED}usr/bin/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess" + pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"{,2} +} diff --git a/net-mail/isync/Manifest b/net-mail/isync/Manifest index 6e3f19e76e4a..01bdeb321fea 100644 --- a/net-mail/isync/Manifest +++ b/net-mail/isync/Manifest @@ -1,3 +1,4 @@ DIST isync-1.0.6.tar.gz 188572 SHA256 e543767a5e36574256e8c25ba43acd6666df060fdf5f6a7029b127560d87632f SHA512 d22d45445396742f34b249837f46e61caa6d55933b0dd1ae74272d6baea5cce520adaed59ed3b34be5ca43b8793e0002b8db43b64cf47698abca1194db4da5d3 WHIRLPOOL a3533275f5fb2b1a16ccc8929d505f1a93b0884629d8b9653b5b486564986779e811b641399aca4c0144ff247dfef9039ce02f660051fbaac571ccbca488d7f9 DIST isync-1.1.0.tar.gz 249374 SHA256 51f5618c239013fb770f98ae269f24ee417214efaaf7e22821b4a27cf9a9213c SHA512 6503c1d8ba412274a09f468994a54dd2d13af2601da3dbfe1ba3f8aefc33cb2a5effd2ca66fcff1c5224ce80ffb11c42d8f362f7cc6409760c32e4031ea87744 WHIRLPOOL 8d2af42cfc430eda29aff54628195df5fca8d0129747418e403b44174f9797b4b21f07adadf49a1064e340f640aba7307bb4bfa50d342ad2fa71b91c76e3cca9 DIST isync-1.1.1.tar.gz 256217 SHA256 c3a5fdcde1f4627137a0cbb66bebbb12bde4873deb872442be0b1d7a617f7491 SHA512 afd66319febebcf7a7857d78013c7137f48222478f6a9465409e4a85c18e899bcf08bcf5baac2a5fcc95b8a0af1877983159b5e3bd20d679fdcca32e77471ca7 WHIRLPOOL 28a4f34ecb5df6ee115d1906c28eeb8522392755dffc973e29db9c146fbbc7473b8bb562388b427baec13bc655fc0e975f71fac62bdd9b4ee09f9b267f531c93 +DIST isync-1.1.2.tar.gz 260177 SHA256 a225b5d5915b6e0f9da303caa6b4db1ee06241e98c1ad0a662e5dcea0654c0a4 SHA512 e71a52d9244564ff14e22cc28e0914055d47b2dcfaf5054ffa9964829dcb7a599b656217576fedd5d37e611552db57da2129ce1b5a89c0881453304970321074 WHIRLPOOL 7fd9cebe22194ec8ae018c1952272b0f1c6667ceb6cff99cb2a3c56653f17202a133e61cde0aeab862c14185f03de2a188b1fbee812b82e8a2c203985a833216 diff --git a/net-mail/isync/isync-1.1.2.ebuild b/net-mail/isync/isync-1.1.2.ebuild new file mode 100644 index 000000000000..fff7eb51f3a2 --- /dev/null +++ b/net-mail/isync/isync-1.1.2.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-mail/isync/isync-1.1.2.ebuild,v 1.1 2015/01/26 23:50:05 radhermit Exp $ + +EAPI=5 + +DESCRIPTION="MailDir mailbox synchronizer" +HOMEPAGE="http://isync.sourceforge.net/" +SRC_URI="mirror://sourceforge/isync/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="ssl" + +DEPEND=">=sys-libs/db-4.2 + ssl? ( >=dev-libs/openssl-0.9.6 )" +RDEPEND="${DEPEND}" + +src_configure() { + econf \ + --docdir="/usr/share/doc/${PF}" \ + $(use_with ssl) +} diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest index 268b21e64324..044685426edd 100644 --- a/net-proxy/privoxy/Manifest +++ b/net-proxy/privoxy/Manifest @@ -1,2 +1,3 @@ DIST privoxy-3.0.21-stable-src.tar.gz 1733120 SHA256 5ec7e601948d2bd0ebf0ebe90eed7d49e7663c395ce16d0403e91ea2d459ddb8 SHA512 b7f0d6865bce32445442f3af290e1a43538e4f76c22cb0d0ff9d5a1752f8c019dabb70f023ae370ee59015bd0f6795db97f064f7621efb62265d5e196d2e0e41 WHIRLPOOL 204c860071b958f50d32010d6a7dce70e24f25116514b0999da8ad10862a7ea1889f0d4ff87e34bc8b08ce89c5f3bdf5c87b89c48c5f4c534e0c46be7f557593 DIST privoxy-3.0.22-stable-src.tar.gz 1737251 SHA256 1a214fec1f3616ea7ff42f1ecdb67ce82690199ec403de9d34b99d0896efcc41 SHA512 40e893ac25d69575c3a2c28bcc5882d91093f8eb6194a54d5b5298ad4023563e586c9aa2a793bbafe2fe3aeef7aa9094aa01e72861a51f0e569d1e5c74f974b2 WHIRLPOOL 229123d2c8acdf258f5baeb36300cec32c730580f11bc2c0bbf7e4c17bfeee800938b2680f0bd1f7ee0346ac55500f4a34945e3a68a1f9791c96a5768aac5a69 +DIST privoxy-3.0.23-stable-src.tar.gz 1715099 SHA256 80b1a172d0518a9f95cde83d18dc62b9c7f117b9ada77bdcd3d310107f28f964 SHA512 487513f4f6f8c868b537132599d0f573384a0b7ed2b3c6778b163d61f94a419e1594d4e0bff286051902bfca292d68c5eeef215955f072c1744bef50db279c25 WHIRLPOOL 68f3ce6dd86a95bb515af2dfe4f166263800f8ff71fb266cb7d8630888f30c93194634b74c5d491a5687afc5842428bd23811ef71ee9358f1cd7ec5ad1ce11a4 diff --git a/net-proxy/privoxy/privoxy-3.0.23.ebuild b/net-proxy/privoxy/privoxy-3.0.23.ebuild new file mode 100644 index 000000000000..1ba75b47815f --- /dev/null +++ b/net-proxy/privoxy/privoxy-3.0.23.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/privoxy-3.0.23.ebuild,v 1.1 2015/01/26 21:09:43 bircoph Exp $ + +EAPI="5" + +inherit eutils toolchain-funcs autotools systemd user + +[ "${PV##*_}" = "beta" ] && + PRIVOXY_STATUS="beta" || + PRIVOXY_STATUS="stable" + +HOMEPAGE="http://www.privoxy.org http://sourceforge.net/projects/ijbswa/" +DESCRIPTION="A web proxy with advanced filtering capabilities for protecting privacy against Internet junk" +SRC_URI="mirror://sourceforge/ijbswa/${P%_*}-${PRIVOXY_STATUS}-src.tar.gz" + +IUSE="+acl editor external-filters +fast-redirects +force graceful-termination ++image-blocking ipv6 lfs png-images selinux +stats +threads toggle +whitelists +zlib" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +LICENSE="GPL-2" + +DEPEND="dev-libs/libpcre + zlib? ( sys-libs/zlib )" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-privoxy )" + +REQUIRED_USE="toggle? ( editor )" + +S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}" + +pkg_setup() { + enewgroup privoxy + enewuser privoxy -1 -1 /etc/privoxy privoxy +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-3.0.19-gentoo.patch + # autoreconf needs to be called even if we don't modify any autotools source files + # See main makefile + eautoreconf +} + +src_configure() { + + econf \ + $(use_enable acl acl-support) \ + $(use_enable editor) \ + $(use_enable fast-redirects) \ + $(use_enable force) \ + $(use_enable graceful-termination) \ + $(use_enable image-blocking) \ + $(use_enable ipv6 ipv6-support) \ + $(use_enable lfs large-file-support) \ + $(use_enable png-images no-gifs) \ + $(use_enable stats) \ + $(use_enable threads pthread) \ + $(use_enable toggle) \ + $(use_enable whitelists trust-files) \ + $(use_enable zlib) \ + $(usex zlib --enable-compression "") \ + --enable-dynamic-pcre \ + --with-user=privoxy \ + --with-group=privoxy \ + --sysconfdir=/etc/privoxy \ + --docdir=/usr/share/doc/${PF} +} + +src_install () { + default + + newinitd "${FILESDIR}/privoxy.initd" privoxy + systemd_dounit "${FILESDIR}"/${PN}.service + + insinto /etc/logrotate.d + newins "${FILESDIR}/privoxy.logrotate" privoxy + + diropts -m 0750 -g privoxy -o privoxy + keepdir /var/log/privoxy +} diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask index 8a6b089afef8..e43b0dc6c8cf 100644 --- a/profiles/arch/powerpc/package.use.mask +++ b/profiles/arch/powerpc/package.use.mask @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/package.use.mask,v 1.228 2015/01/25 15:42:06 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/package.use.mask,v 1.229 2015/01/26 19:14:24 johu Exp $ # Gilles Dartiguelongue (23 Dec 2014) # New dependencies for wayland support in Gnome 3.14 @@ -172,6 +172,7 @@ app-emulation/qemu seccomp # Mask telepathy, no stable net-libs/telepathy-qt, bug #441456 kde-base/krdc telepathy kde-base/krfb telepathy +net-im/choqok telepathy # Robin H Johnson (01 Nov 2012) # MySQL 5.5 wants systemtap, tcmalloc & jemalloc diff --git a/profiles/desc/input_devices.desc b/profiles/desc/input_devices.desc index 28d3239fd132..ce389ca1028a 100644 --- a/profiles/desc/input_devices.desc +++ b/profiles/desc/input_devices.desc @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/desc/input_devices.desc,v 1.10 2014/06/08 14:43:11 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/desc/input_devices.desc,v 1.11 2015/01/27 01:00:04 idella4 Exp $ # This file contains descriptions of INPUT_DEVICES USE_EXPAND flags. @@ -44,6 +44,7 @@ roccat_lua - INPUT_DEVICES setting to build driver for Roccat Lua input devices roccat_pyra - INPUT_DEVICES setting to build driver for Roccat Pyra input devices roccat_savu - INPUT_DEVICES setting to build driver for Roccat Savu input devices roccat_ryos - INPUT_DEVICES setting to build driver for Roccat Ryos input devices +roccat_tyon - INPUT_DEVICES setting to build driver for Roccat Tyon input devices spaceorb - INPUT_DEVICES setting to build driver for spaceorb input devices summa - INPUT_DEVICES setting to build driver for summa input devices synaptics - INPUT_DEVICES setting to build driver for synaptics input devices diff --git a/profiles/package.mask b/profiles/package.mask index 52462a8d098f..978ba7aef27b 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16300 2015/01/26 15:46:07 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16301 2015/01/26 19:38:23 johu Exp $ # # When you add an entry to the top of this file, add your name, the date, and # an explanation of why something is getting masked. Please be extremely @@ -30,6 +30,11 @@ #--- END OF EXAMPLES --- +# Johannes Huber (26 Jan 2015) +# Masked for removal in 30 days, bug #537746. +# Superseded by kde-base/kdebase-kioslaves ages ago. +kde-misc/kio-ftps + # Mike Gilbert (26 Jan 2015) # Dev channel releases are only for people who are developers or want more # experimental features and accept a more unstable release. diff --git a/profiles/use.local.desc b/profiles/use.local.desc index a3bdc448f79b..13d8fe27ef30 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -1061,7 +1061,6 @@ app-pda/libsyncml:http - Enable http transports app-pda/libsyncml:obex - Enable obex transports app-pda/synce-sync-engine:opensync - Enable OpenSync (app-pda/libopensync) python plug-in app-portage/conf-update:colordiff - Use colors when displaying diffs (app-misc/colordiff) -app-portage/eix:clang - Use sys-devel/clang for building app-portage/eix:debug - Build with upstream's CXXFLAGS/LDFLAGS for debugging support; not recommended for normal use. app-portage/eix:dep - Make DEP=true the default which enables support for {,R,P}DEPEND but requires roughly double disk and memory. app-portage/eix:doc - Create description of the eix cache file additionally in html format @@ -2602,6 +2601,7 @@ dev-util/squashmerge:lz4 - Enable support for LZ4 compression using app-arch/lz4 dev-util/strace:aio - Enable dev-libs/libaio support for tracing Asynchronous I/O operations dev-util/suse-build:symlink - Provide compatibility symlinks with original openSUSE package (might clash with other packages) dev-util/sysdig:modules - Build kernel modules needed for tracing local events. Disable this only if you intend to use sysdig purely to work with dumpfiles. +dev-util/trace-cmd:udis86 - Enable support for dev-libs/udis86 disassembler library dev-util/universalindentgui:html - Add support for HTML files dev-vcs/bzr:sftp - Enable sftp support dev-vcs/bzr-gtk:gpg - Support signing with GnuPG. @@ -5064,6 +5064,7 @@ net-im/centerim:gadu - Enable support for the Gadu-Gadu protocol net-im/centerim:irc - Enable support for the IRC protocol net-im/centerim:lj - Enable support for the LiveJournal weblog system net-im/centerim:otr - Enable encrypted conversations +net-im/choqok:telepathy - Enable support for the real-time communication framework telepathy net-im/climm:otr - Enable encrypted conversations net-im/corebird:glade - Install glade catalogs for corebird net-im/ejabberd:captcha - Support for CAPTCHA Forms (XEP-158) @@ -5334,6 +5335,8 @@ net-libs/h323plus:aec - Enable acoustic echo cancellation net-libs/h323plus:sound - Enable audio codecs net-libs/h323plus:video - Enable video codecs net-libs/iax:snomhack - Use slower memset for SNOM phoneem +net-libs/iojs:npm - Enable NPM package manager +net-libs/iojs:snapshot - Enable snapshot creation for faster startup net-libs/ldns:dane - Enable DNS-based Authentication of Named Entities (DANE) support net-libs/ldns:ecdsa - Enable ECDSA support net-libs/ldns:gost - Enable GOST support diff --git a/sys-apps/roccat-tools/Manifest b/sys-apps/roccat-tools/Manifest index 14faa2667a6d..0bb03020054e 100644 --- a/sys-apps/roccat-tools/Manifest +++ b/sys-apps/roccat-tools/Manifest @@ -1,8 +1,4 @@ -DIST roccat-tools-1.0.0.tar.bz2 2407914 SHA256 1cac701b19ffb5ed791dee18f4ee6d2f64a9900bfb21f450b16d4c6f90708b46 SHA512 009f1dbae677f6a7f0cb2eab8edfc33b57ccf312633fb6b5529ead181a5ce833c7d0c5badf5876ab5ddee9381387b87cc2b7f8432689aead48822fc0dd721aec WHIRLPOOL e2bd61fcf88e2ce8d8d7ef97b195673fc9796a0fb223009f286686a6f4d8cb4e0460632ebf5e1fb2935a53865477ebd7b3b6a75268d820b3a7c3cb757b1c588b -DIST roccat-tools-1.1.0.tar.bz2 2408372 SHA256 eb5e694ece66636715fc20f83dd8a1f8912d6a6c2bf315b19654a96dfd03ac74 SHA512 9d2515cd154faea044a99fcea2fbe718caa869184bf38796bd58d807373b8f03211b1e429d26e683269f702d493e0d3d954c54b4f31d12495e1bc6bb727f7550 WHIRLPOOL 37c55a0421d2a59dcf3f9c3ceab8f02af7c32d7d27e0f68a4854d01772d1a93b9d7f69f05a22efc5e30307dd101caf68c2dd6be023eea18dd08e3af33c4e1dd1 -DIST roccat-tools-1.4.0.tar.bz2 2405876 SHA256 3ac79a84868d248cb84ee9c10a6531a2f436c3e6b46d2cda0a6f53723ab9a5e4 SHA512 2c6466c3885265fdc6a9cfe6a30072cfa14fd96f8bfe5e1deb60e604769cdfac3b11a42b91d6cdd4db06078ff760a100db98e1841f23638b06e806bfb8c904f8 WHIRLPOOL 90dd15e922ac5d1b12619962998e35a71add6acc1ce49dcb713eeb231bb8e37fde2011a0bd07072c1341cfb589aca534e9edb0ec9eb132ff4cc38a32f6018035 -DIST roccat-tools-1.4.1.tar.bz2 2406558 SHA256 a962453a5b455e845627aeee8b6b07389865f33d730afda2f94a537a91b488b9 SHA512 0024589070ed57e6bbc29db94ba7f3090efd266d10519df6346dfa98ac4e1232de51c70e558eb8f29610e57fe4b442d0132843f6112706797b9d998781ac81b6 WHIRLPOOL e79ff8c578428ecdfbdc219322d0e271e436f3d8885f4c5266d5a9e9ec184d29cc5ca0d48828b4d34e4d0dc006c565e217467ef19daa8668b80d79ba1c6707f2 -DIST roccat-tools-1.6.0.tar.bz2 2397245 SHA256 76083ec61b2dc207fa2220da4ff7249d16897e2521f2de622b5447f727249c03 SHA512 e193908b705a60c8c9b44d847daf763b27e758b26108e0be558e3ecf809df01df14b6a299568824f0a23d982f05ececf914ed47b1a62bb3f9064fce1b6f10eea WHIRLPOOL fb7e85ba40c15568877ded0f696db0cc3779dd7740233bab5b646305d63904d9b8e3de5e7e29a307f52b13dc8b77cb3e0967be9889e1c59fb357ed57e01219f4 DIST roccat-tools-2.0.0.tar.bz2 2387612 SHA256 cabc2aeb594c3bc21ff1ce7385709b0f041b6f02d6959ac4869b38865398174d SHA512 8e1095d7843c82e93872c4d68f8780180761a5b62ccbba05a7a0278f96c894963808bbfbee7a1f22267b4708df3657d5e29464b654f85cad0d4537ea6ec4d024 WHIRLPOOL b8a69831def6dad9872955c6d067f3d1aed727abe3416d14e492e564244d64fcebf4b8dbca604feb789f84c2ba911457c35784db3537f51d4aa7353c76a1c196 DIST roccat-tools-2.1.0.tar.bz2 2389234 SHA256 21a9b8ddcc9ee31148e7461bf54c2bdea1f9d9a2478a5afce0345d34a9259f3b SHA512 1970f6fa7b24a459010961bc46d6ec88ef2e433955d7e058e7a365391c72b578bd7c122be54568da4b79768bf93977324280dc1be7b31343746c7113aac404af WHIRLPOOL 4b8a96849bfdef5ab6ecde4d54c82e98d1104ffa4469d2e83ca7d27a8bf3f54d98db21c326b24695d0a2db65c13183976f47f61ee821d9b5e14748ae115f138f DIST roccat-tools-2.2.0.tar.bz2 2438531 SHA256 21a473926327716cfd1796234b05168d837d10ddcffd214a7bcc97422519c312 SHA512 918ffd39c02a0da7deecc0d547df7909dbcc631b3c482ef1c7cebb661ef9ecbe69882a82c76e3c3f22d89a57ee9ed7a39e927f675fef6f909a3cdd5f0a63d5cc WHIRLPOOL d200cdd1b064af2b8826ad3c0cc59ee1f4af5cc311a5f05993637703f01543ba1116693f631b163b5cfa5e86ee44e5a56db9d52a644c960ea7527905f9aa485b +DIST roccat-tools-2.4.0.tar.bz2 2439378 SHA256 e3198f6fc5a35e583d1f3d2d3a59e36bb76b6f68556046bd063db14148904552 SHA512 7612d75805fdfe50f8cdc7f8bcd39dd9816067f607102402394de40084b831a5fdfff92d4737248089bd4386be1dd74f8c99c0518d1c5c029c591fc47cb933ec WHIRLPOOL a59e393ac0f56ea00c15bd5492ca483e4622de821762ef5a21fe74db08ff4c66a67af1b81f29d687ba8f6cb1221b7a5d2b482b25e233f736824e2ead69090364 diff --git a/sys-apps/roccat-tools/roccat-tools-1.0.0.ebuild b/sys-apps/roccat-tools/roccat-tools-1.0.0.ebuild deleted file mode 100644 index a9ea38071f0b..000000000000 --- a/sys-apps/roccat-tools/roccat-tools-1.0.0.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/roccat-tools/roccat-tools-1.0.0.ebuild,v 1.4 2014/07/24 17:46:58 axs Exp $ - -EAPI=5 - -inherit readme.gentoo cmake-utils gnome2-utils udev user - -DESCRIPTION="Utility for advanced configuration of Roccat devices" - -HOMEPAGE="http://roccat.sourceforge.net/" -SRC_URI="mirror://sourceforge/roccat/${P}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE_INPUT_DEVICES=" - input_devices_roccat_arvo - input_devices_roccat_isku - input_devices_roccat_iskufx - input_devices_roccat_kone - input_devices_roccat_koneplus - input_devices_roccat_konepure - input_devices_roccat_konepureoptical - input_devices_roccat_konextd - input_devices_roccat_kovaplus - input_devices_roccat_lua - input_devices_roccat_pyra - input_devices_roccat_savu - input_devices_roccat_ryos -" -IUSE="${IUSE_INPUT_DEVICES}" - -REQUIRED_USE="input_devices_roccat_konextd? ( input_devices_roccat_koneplus )" - -RDEPEND=" - x11-libs/gtk+:2 - x11-libs/libnotify - media-libs/libcanberra - virtual/libusb:1 - dev-libs/dbus-glib - virtual/libgudev:= -" - -DEPEND="${RDEPEND}" - -pkg_setup() { - enewgroup roccat -} - -src_configure() { - local UDEVDIR="$(get_udevdir)"/rules.d - local MODELS=${INPUT_DEVICES//roccat_/} - mycmakeargs=( -DDEVICES=${MODELS// /;} \ - -DUDEVDIR="${UDEVDIR/"//"//}" ) - cmake-utils_src_configure -} -src_install() { - cmake-utils_src_install - local stat_dir=/var/lib/roccat - keepdir $stat_dir - fowners root:roccat $stat_dir - fperms 2770 $stat_dir - readme.gentoo_src_install -} -pkg_preinst() { - gnome2_icon_savelist -} -pkg_postinst() { - gnome2_icon_cache_update - readme.gentoo_print_elog -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/sys-apps/roccat-tools/roccat-tools-1.1.0.ebuild b/sys-apps/roccat-tools/roccat-tools-1.1.0.ebuild deleted file mode 100644 index 3ec583e90734..000000000000 --- a/sys-apps/roccat-tools/roccat-tools-1.1.0.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/roccat-tools/roccat-tools-1.1.0.ebuild,v 1.4 2014/07/24 17:46:58 axs Exp $ - -EAPI=5 - -inherit readme.gentoo cmake-utils gnome2-utils udev user - -DESCRIPTION="Utility for advanced configuration of Roccat devices" - -HOMEPAGE="http://roccat.sourceforge.net/" -SRC_URI="mirror://sourceforge/roccat/${P}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE_INPUT_DEVICES=" - input_devices_roccat_arvo - input_devices_roccat_isku - input_devices_roccat_iskufx - input_devices_roccat_kone - input_devices_roccat_koneplus - input_devices_roccat_konepure - input_devices_roccat_konepureoptical - input_devices_roccat_konextd - input_devices_roccat_kovaplus - input_devices_roccat_lua - input_devices_roccat_pyra - input_devices_roccat_savu - input_devices_roccat_ryos -" -IUSE="${IUSE_INPUT_DEVICES}" - -REQUIRED_USE="input_devices_roccat_konextd? ( input_devices_roccat_koneplus )" - -RDEPEND=" - x11-libs/gtk+:2 - x11-libs/libnotify - media-libs/libcanberra - virtual/libusb:1 - dev-libs/dbus-glib - virtual/libgudev:= -" - -DEPEND="${RDEPEND}" - -pkg_setup() { - enewgroup roccat -} - -src_configure() { - local UDEVDIR="$(get_udevdir)"/rules.d - local MODELS=${INPUT_DEVICES//roccat_/} - mycmakeargs=( -DDEVICES=${MODELS// /;} \ - -DUDEVDIR="${UDEVDIR/"//"//}" ) - cmake-utils_src_configure -} -src_install() { - cmake-utils_src_install - local stat_dir=/var/lib/roccat - keepdir $stat_dir - fowners root:roccat $stat_dir - fperms 2770 $stat_dir - readme.gentoo_src_install -} -pkg_preinst() { - gnome2_icon_savelist -} -pkg_postinst() { - gnome2_icon_cache_update - readme.gentoo_print_elog -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/sys-apps/roccat-tools/roccat-tools-1.4.0.ebuild b/sys-apps/roccat-tools/roccat-tools-1.4.0.ebuild deleted file mode 100644 index 6ef57af4b96a..000000000000 --- a/sys-apps/roccat-tools/roccat-tools-1.4.0.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/roccat-tools/roccat-tools-1.4.0.ebuild,v 1.2 2014/07/24 17:46:58 axs Exp $ - -EAPI=5 - -inherit readme.gentoo cmake-utils gnome2-utils udev user - -DESCRIPTION="Utility for advanced configuration of Roccat devices" - -HOMEPAGE="http://roccat.sourceforge.net/" -SRC_URI="mirror://sourceforge/roccat/${P}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE_INPUT_DEVICES=" - input_devices_roccat_arvo - input_devices_roccat_isku - input_devices_roccat_iskufx - input_devices_roccat_kone - input_devices_roccat_koneplus - input_devices_roccat_konepure - input_devices_roccat_konepureoptical - input_devices_roccat_konextd - input_devices_roccat_kovaplus - input_devices_roccat_lua - input_devices_roccat_pyra - input_devices_roccat_savu - input_devices_roccat_ryos -" -IUSE="${IUSE_INPUT_DEVICES}" - -REQUIRED_USE="input_devices_roccat_konextd? ( input_devices_roccat_koneplus )" - -RDEPEND=" - x11-libs/gtk+:2 - x11-libs/libnotify - media-libs/libcanberra - virtual/libusb:1 - dev-libs/dbus-glib - virtual/libgudev:= -" - -DEPEND="${RDEPEND}" - -pkg_setup() { - enewgroup roccat -} - -src_configure() { - local UDEVDIR="$(get_udevdir)"/rules.d - local MODELS=${INPUT_DEVICES//roccat_/} - mycmakeargs=( -DDEVICES=${MODELS// /;} \ - -DUDEVDIR="${UDEVDIR/"//"//}" ) - cmake-utils_src_configure -} -src_install() { - cmake-utils_src_install - local stat_dir=/var/lib/roccat - keepdir $stat_dir - fowners root:roccat $stat_dir - fperms 2770 $stat_dir - readme.gentoo_src_install -} -pkg_preinst() { - gnome2_icon_savelist -} -pkg_postinst() { - gnome2_icon_cache_update - readme.gentoo_print_elog -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/sys-apps/roccat-tools/roccat-tools-1.4.1.ebuild b/sys-apps/roccat-tools/roccat-tools-1.4.1.ebuild deleted file mode 100644 index f5b1475e9f0f..000000000000 --- a/sys-apps/roccat-tools/roccat-tools-1.4.1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/roccat-tools/roccat-tools-1.4.1.ebuild,v 1.2 2014/07/24 17:46:58 axs Exp $ - -EAPI=5 - -inherit readme.gentoo cmake-utils gnome2-utils udev user - -DESCRIPTION="Utility for advanced configuration of Roccat devices" - -HOMEPAGE="http://roccat.sourceforge.net/" -SRC_URI="mirror://sourceforge/roccat/${P}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE_INPUT_DEVICES=" - input_devices_roccat_arvo - input_devices_roccat_isku - input_devices_roccat_iskufx - input_devices_roccat_kone - input_devices_roccat_koneplus - input_devices_roccat_konepure - input_devices_roccat_konepureoptical - input_devices_roccat_konextd - input_devices_roccat_kovaplus - input_devices_roccat_lua - input_devices_roccat_pyra - input_devices_roccat_savu - input_devices_roccat_ryos -" -IUSE="${IUSE_INPUT_DEVICES}" - -REQUIRED_USE="input_devices_roccat_konextd? ( input_devices_roccat_koneplus )" - -RDEPEND=" - x11-libs/gtk+:2 - x11-libs/libnotify - media-libs/libcanberra - virtual/libusb:1 - dev-libs/dbus-glib - virtual/libgudev:= -" - -DEPEND="${RDEPEND}" - -pkg_setup() { - enewgroup roccat -} - -src_configure() { - local UDEVDIR="$(get_udevdir)"/rules.d - local MODELS=${INPUT_DEVICES//roccat_/} - mycmakeargs=( -DDEVICES=${MODELS// /;} \ - -DUDEVDIR="${UDEVDIR/"//"//}" ) - cmake-utils_src_configure -} -src_install() { - cmake-utils_src_install - local stat_dir=/var/lib/roccat - keepdir $stat_dir - fowners root:roccat $stat_dir - fperms 2770 $stat_dir - readme.gentoo_src_install -} -pkg_preinst() { - gnome2_icon_savelist -} -pkg_postinst() { - gnome2_icon_cache_update - readme.gentoo_print_elog -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/sys-apps/roccat-tools/roccat-tools-1.6.0.ebuild b/sys-apps/roccat-tools/roccat-tools-2.4.0.ebuild similarity index 88% rename from sys-apps/roccat-tools/roccat-tools-1.6.0.ebuild rename to sys-apps/roccat-tools/roccat-tools-2.4.0.ebuild index 3dcb9ea4767c..6dec4c98784c 100644 --- a/sys-apps/roccat-tools/roccat-tools-1.6.0.ebuild +++ b/sys-apps/roccat-tools/roccat-tools-2.4.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/roccat-tools/roccat-tools-1.6.0.ebuild,v 1.2 2014/07/24 17:46:58 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/roccat-tools/roccat-tools-2.4.0.ebuild,v 1.1 2015/01/27 01:14:23 idella4 Exp $ EAPI=5 @@ -23,18 +23,18 @@ IUSE_INPUT_DEVICES=" input_devices_roccat_konepuremilitary input_devices_roccat_konepureoptical input_devices_roccat_konextd + input_devices_roccat_konextdoptical input_devices_roccat_kovaplus input_devices_roccat_lua input_devices_roccat_pyra input_devices_roccat_savu input_devices_roccat_ryos + input_devices_roccat_tyon " IUSE="${IUSE_INPUT_DEVICES}" -REQUIRED_USE="input_devices_roccat_konextd? ( input_devices_roccat_koneplus )" - RDEPEND=" - dev-libs/libgaminggear + >=dev-libs/libgaminggear-0.5 x11-libs/gtk+:2 x11-libs/libnotify media-libs/libcanberra diff --git a/sys-devel/binutils-apple/Manifest b/sys-devel/binutils-apple/Manifest index 131089917e98..9c32c170d0ad 100644 --- a/sys-devel/binutils-apple/Manifest +++ b/sys-devel/binutils-apple/Manifest @@ -5,11 +5,17 @@ DIST cctools-750.tar.gz 1947953 SHA256 188855640da114e37e4ddd4824ff6cdc1ea89dfb6 DIST cctools-795.tar.gz 1993795 SHA256 7fab7044b648e92a9fefd493a1bb6daa4246f24c5838d8b5c913a446e6bbd2ef SHA512 5a34a73dc71d3574a357f6b0f26a48a99dd0995d62695b309cdfe85c4960934b410455b1ba6bdbc9a4e32106bb45b35555604975d2a80ad1be21f5d4eac69254 WHIRLPOOL 2bd074ac8ef8542c2c3df5fae91a0bece2e1c31d6c6c771c55e7c7a3d90929f9a7cd420760dcb5ecffb9dd279abed4ba5ebf840c9e9bb983a806707d735cd735 DIST cctools-809.tar.gz 2014410 SHA256 03ba62749b843b131c7304a044a98c6ffacd65b1399b921d69add0375f79d8ad SHA512 1349b3e6b3b48d9fa88dade187c05c80f161c3895fc6451a530880a256eb82dc93376b3cfd0f4d65e83f5fe00dc2baab386c5f78ce5b096f2c69fe53e1a55e24 WHIRLPOOL bd06ed88a7ab0bca173c0ee03c39cf60c719b9e0f03d21df9189e3e4a62e4fb452be46b0b0b05eafc70aed88bccc0a621d9165a1df63ea0eb071f9e5dda43c25 DIST cctools-822.tar.gz 2024412 SHA256 dfaa9bdbd023524d47429674f64d2d5ea393123dabf90868be0aa17f61f45289 SHA512 8b02cc837d5e0520f35da445f25ba86b5042d5caa27b49a599e829ed89428cf78dbd1831bcf6c18301f941fbfb31ac2114e248041d98008a466e1574f4fe1586 WHIRLPOOL 81191ab46e8a9e47e4267146f978438ff64314b0363296b973a02f361918a5cd69057753a1b40766b93d3d4a3ed10585a27f6da2953992a406be61d1dcc1d06c +DIST cctools-855.tar.gz 1699635 SHA256 751748ddf32c8ea84c175f32792721fa44424dad6acbf163f84f41e9617dbc58 SHA512 50f5d015ce807aa5ca274dd2deea810b8b375110e60b5e334ca4b2170526b738ea5f86a5436caebbdb748badc3b89601d0f450f5b867d8393c89e336a3db4b3f WHIRLPOOL fa493a29e32583f60c3553794bbb6d01a7b5ef797d8e8ba8161c9cbf237906ebbfaff560366da2d5b852bfcbdd55e874c00edf5b3169b16b357a54fcf3c07c4c +DIST cctools-862.tar.gz 1702345 SHA256 1bf29f620b91c901ad3116b47738ab5076c1aed75d13869cd3bc7f067b4aaadb SHA512 faa401c1dc55bfb9cd2a9a9cc7bc9d473ee63b019607967c8b0da325514d6a1f7b1f52404370bcc018e86d30d75a4b01183f49b793f577110663efe43871360a WHIRLPOOL 371307f3264361f5e2e48d83177aff1a8f435cf2bdc1f4998cc5780c5b3760048a29a7620d2390db8f0c9378cd2f3b2f130b6aca9d402e3d428c4f4d353db097 DIST dyld-195.5.tar.gz 411615 SHA256 2cf0484c87cf79b606b351a7055a247dae84093ae92c747a74e0cde2c8c8f83c SHA512 f316d32f3e417cf0898a8e231df66572d3424765831375863799d3ff30f8e28342ca692426d0ece7a8d069b341a3b9ca79c625edc322d90e3f26f528ea555324 WHIRLPOOL e0e231653ad37ad8fdb7d5fbd372fe1dc34b80e41f7dafa8bb46f4c8fa4f5acb4574f4cd346304dfaca1f074667f381931ca5ff7a7efddaea770fb35d30539dc DIST dyld-195.6.tar.gz 412518 SHA256 69296e9b4192bdac778ea899fffc18b02be62b51b5e8474b4cf85ae5f2b08aa4 SHA512 58a9ea27efc02e66f9d99bfa250af1d90326385385431e5279386bbd9ab53366bf7e8236543296908b7214c33523c8f60098a6298a7393b3180e2a6bce18e7c5 WHIRLPOOL e37b11d3996559f8a1843577a5fa42f96e4d42419f205276600f0ed79fcd2490da1f8a77eecf29f111b3db62a65e8e9cd77a154e3b389d633a7ac1525273b9b5 +DIST dyld-353.2.1.tar.gz 510036 SHA256 051089e284c5a4d671b21b73866abd01d54e5ea1912cadf3a9b916890fb31540 SHA512 a9488620499f682e245b55b7e0e4ec02fc0bcf03bd8a70d4a4ee0ba762067ade2f41c188990c101727476d41c19368b4cc89cccf2df40231da1c777742c7391f WHIRLPOOL 3164746ed8c866df993f08e405e7e329db427af8eeded681d5fb88031ef2c025363d5bfb647e9315738024adf9f48efacf49226f86f27def584ec7f538da292e DIST ld64-127.2.tar.gz 496975 SHA256 97b75547b2bd761306ab3e15ae297f01e7ab9760b922bc657f4ef72e4e052142 SHA512 a87181eca9307518aa21fc52a4d665c11ad51106c318c229d7f08650228f771484fd0b8c01c63639d577503aa9bc86d0792a3524643dc18cff19c3754aed9fc8 WHIRLPOOL 94f58da977da3d2d0c5a907a7d2c02e4a0d8323d04b8429d133e377b8495b0d344eec93dd1baaf369aa0a1517c7666cbef1d98d3cc6e8fd5d51c9622a2edcdf1 DIST ld64-128.2.tar.gz 494361 SHA256 96a912464e2d4d3d7cdaab0744003b0fa93d139f203c82867f659ee94b4ae9f7 SHA512 f50a3c396e6f4fddc685bb3f59f9a260bd2f47060535d24259b2b411e4f759e48daa35819da682ad9bceaa1b9a1981eb34716387d988cdc4b7eec9ab2169726e WHIRLPOOL 78dec40124ae11c80483b362860b01c833fcaff67bae6b6cb3b72371daffdf3be809186f5daca4bb6ace77441cb43168939eb60eedf9f8c05ae3ec644c2a0502 +DIST ld64-236.3.tar.gz 624400 SHA256 8ef36729b643201081ab45ebd8586ede8f9968bc17614b679a940faa82875ca6 SHA512 e103fc5efd4d4161c7dc55b1ad53aebd455cfcd72de7873ebfdf5ba896b7b0da9c9aeb12e1e1a76425768ac1dc85d864a4ce33b5b841ba115eeab96a2e2965aa WHIRLPOOL d122e325518860c810b9efde7016ebecb6b59c56bb40ae1f041a840be764a5d9b90c7db1922fd9037c18f4caae7ace0d395591ffb3db704c87b92837ef997a17 +DIST ld64-241.9.tar.gz 639944 SHA256 3594e87c626c3b5abab6470cac6f27b367f1efcee60eb3d0f6b6d4ecf9b24230 SHA512 6958e7064f4fd8b47501225fc4cbc6292e5da63d7f4103ad79add177ef7382c8de3c732f14d19a9c11356b8070f578392383caccc3795e2ab8ef7b7ddbde88da WHIRLPOOL 5b07a336efde52b00b2601866907513517593a113583f05a9c45b98b4d6f394d87add887a7e44a95f462b6c2b5617ce497376b94a523e5cdf0f69d4d10ef3407 DIST ld64-85.2.1.tar.gz 598524 SHA256 4bcbcbdfd62efdc46c51700b8f5dae2cbd1638e9e50f649d5c7f242d32fca804 SHA512 b5ffaffc43e74f22688fecd9fb3023a59160cf051f9412f34e6b0acf1c4f9d43ba641e199d8d6b1c6cf3bbbbf117645988fd879ded1fec8be056b6941fe79999 WHIRLPOOL 7c50f462eb41808b57ea06b82bdf576460bddb4150abe7a678af541aa0b179105d994a2b6fd10152481aa28acc903265160945b4aae9dcfce0a1a1cfe4b9460a DIST ld64-97.17.tar.gz 421947 SHA256 02bd46af0809eaa415d096d7d41c3e8e7d80f7d8d181840866fb87f036b4e089 SHA512 841774a1a7c0e2f661ac7e66703f7578d8f11274897ffa15f8c49daf290a23465763f264a4dae99f15754891f44c425c0d327652112007b499bc8f755a7fc9d6 WHIRLPOOL 7225b44d845b13c6b6d1a685170f2b6e15b81c48320fa3b570771938ed457a59452e80873996a4b2712a8f6813486063afd73acf979a97d823afb3d510d74678 DIST libunwind-30.tar.gz 82811 SHA256 6ac97d18cc2b05e6de1269bf5af03b81948bd2200dae827527f3dc618b82bd41 SHA512 57106eafa1516791b4e0db2de6c6336bc0c1cbd8bf098a6d3a809fafa457802c95a7aeae9137f4ca5922a3018dfd8f597907ea4187b0afbbf267500eae00041f WHIRLPOOL c3caf5ba593cffa2f0a9cdb256f518524e9500eaf0a013c4973dc9881b16efa0c388e70407bbed1fd331f100af2da01ddeee12d33b3afc1213d69c32ab5e1d0b +DIST libunwind-35.3.tar.gz 90002 SHA256 2bcc95553a44fa3edca41993ccfac65ba267830cb37c85dca760b34094722e56 SHA512 b7d9a86ef24f1fe9ca14517471e03a910219a229af9f0d4cf94435115971360640451107ba20c93fb1aab788f8b6eb5ed580ee08fdaa990b9fa43e9ae360c6b4 WHIRLPOOL 838912e46031b3a6796bfe854f0244991ce5bc3b59b95855224c9e84639e57b69f541b7993658360721423533dca75037248ea90f5e274b332f27319fdd85a9a DIST libunwind-llvm-115426.tar.bz2 74622 SHA256 e77a42c04eda5e3db61fc8b5bc98a55c6a015a9b02a74aab0f35d551fc38272f SHA512 01d78852632072ae48e95cfcf893dbb5325d4a3f4535a3cd3bc2afd5388c5f76995454219c8c6c2c2767abb2edc23bfe0212508c57b1d6db1c4a5d80cc5d4f9a WHIRLPOOL 0c7c8b8493b83e9c1337ab323697cfc255d1ef3e9ae2042df3a4f7480948a25fd571eb88a49e33168587d0994ec2d1371f2ef4d7834d7b41f77722d9693e8d55 diff --git a/sys-devel/binutils-apple/binutils-apple-5.1.ebuild b/sys-devel/binutils-apple/binutils-apple-5.1.ebuild new file mode 100644 index 000000000000..bf7cbead012c --- /dev/null +++ b/sys-devel/binutils-apple/binutils-apple-5.1.ebuild @@ -0,0 +1,356 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-5.1.ebuild,v 1.1 2015/01/27 06:59:53 grobian Exp $ + +EAPI="3" + +inherit eutils flag-o-matic toolchain-funcs + +LD64=ld64-236.3 +CCTOOLS_VERSION=855 +CCTOOLS=cctools-${CCTOOLS_VERSION} +LIBUNWIND=libunwind-35.3 +DYLD=dyld-353.2.1 + +DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools ${PV}" +HOMEPAGE="http://www.opensource.apple.com/darwinsource/" +SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz + http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz + http://www.opensource.apple.com/tarballs/dyld/${DYLD}.tar.gz + http://www.opensource.apple.com/tarballs/libunwind/${LIBUNWIND}.tar.gz" + +LICENSE="APSL-2" +KEYWORDS="~x64-macos ~x86-macos" +IUSE="lto test libcxx" + +RDEPEND="sys-devel/binutils-config + lto? ( sys-devel/llvm ) + test? ( >=dev-lang/perl-5.8.8 ) + libcxx? ( sys-libs/libcxx-apple )" +DEPEND="${RDEPEND} + || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm ) + libcxx? ( sys-devel/llvm )" + +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then + export CTARGET=${CATEGORY/cross-} + fi +fi +is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } + +if is_cross ; then + SLOT="${CTARGET}-5" +else + SLOT="5" +fi + +LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV} +INCPATH=${LIBPATH}/include +DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV} +if is_cross ; then + BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV} +else + BINPATH=/usr/${CTARGET}/binutils-bin/${PV} +fi + +S=${WORKDIR} + +src_prepare() { + cd "${S}"/${LD64}/src + cp "${FILESDIR}"/ld64-136-compile_stubs.h ld/compile_stubs.h + cp "${FILESDIR}"/ld64-236.3-Makefile Makefile + + epatch "${FILESDIR}"/ld64-236.3-nolto.patch + epatch "${FILESDIR}"/ld64-241.9-extraneous-includes.patch + epatch "${FILESDIR}"/ld64-241.9-atomic-volatile.patch + epatch "${FILESDIR}"/ld64-236.3-arm64-fixup.patch + epatch "${FILESDIR}"/ld64-241.9-arm64-cputype.patch + epatch "${FILESDIR}"/ld64-236.3-crashreporter.patch + epatch "${FILESDIR}"/ld64-236.3-gcc.patch + epatch "${FILESDIR}"/ld64-236.3-constant-types.patch + epatch "${FILESDIR}"/ld64-236.3-nosnapshots.patch + epatch "${FILESDIR}"/ld64-236.3-noppc.patch + epatch "${FILESDIR}"/ld64-236.3-noarm.patch + epatch "${FILESDIR}"/ld64-241.9-register-names.patch + epatch "${FILESDIR}"/ld64-241.9-get-comm-align.patch + epatch "${FILESDIR}"/ld64-241.9-cc_md5.patch + + # We used to use our own copy of lto.h, which doesn't require llvm + # build-env. Current versions of llvm provide + # $EPREFIX/usr/include/llvm-c/lto.h as well as + # $EPREFIX/usr/lib/libLTO.{so,dylib}, so we just use these. + + # provide missing headers from libunwind and dyld + mkdir -p include/{mach,mach-o/arm} || die + # never present because it's private + cp ../../${DYLD}/include/mach-o/dyld_priv.h include/mach-o || die + # missing on <= 10.5 + cp ../../${LIBUNWIND}/include/libunwind.h include/ || die + cp ../../${LIBUNWIND}/include/mach-o/compact_unwind_encoding.h include/mach-o || die + # missing on <= 10.4 + cp ../../${DYLD}/include/mach-o/dyld_images.h include/mach-o || die + cp ../../${CCTOOLS}/include/mach-o/loader.h include/mach-o || die + # use copies from cctools because they're otherwise hidden in some SDK + cp ../../${CCTOOLS}/include/mach-o/arm/reloc.h include/mach-o/arm || die + # provide all required CPU_TYPEs on all platforms + cp ../../${CCTOOLS}/include/mach/machine.h include/mach/machine.h + # add alias for newer identifiers, because ld64 uses both but cctools + # header only defines the older + epatch "${FILESDIR}"/ld64-236.3-missing-cputypes.patch + + # mimic OS X Leopard-style Availability.h macros for libunwind.h on + # older systems + [[ ${CHOST#*-darwin} -le 8 ]] && \ + echo "#define __OSX_AVAILABLE_STARTING(x,y) " > include/Availability.h + + local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\"" + echo "char ldVersionString[] = ${VER_STR};" > version.cpp + + epatch "${FILESDIR}"/ld64-123.2-debug-backtrace.patch + + cd "${S}"/${CCTOOLS} + epatch "${FILESDIR}"/${PN}-4.5-as.patch + epatch "${FILESDIR}"/${PN}-5.1-as-dir.patch + epatch "${FILESDIR}"/${PN}-5.1-ranlib.patch + epatch "${FILESDIR}"/${PN}-3.1.1-libtool-ranlib.patch + epatch "${FILESDIR}"/${PN}-3.1.1-no-headers.patch + epatch "${FILESDIR}"/${PN}-4.0-no-oss-dir.patch + epatch "${FILESDIR}"/${PN}-5.1-nolto.patch + epatch "${FILESDIR}"/cctools-839-intel-retf.patch + epatch "${FILESDIR}"/${PN}-5.1-extraneous-includes.patch + epatch "${FILESDIR}"/${PN}-5.1-otool-stdc.patch + epatch "${FILESDIR}"/${PN}-5.1-constant-types.patch + epatch "${FILESDIR}"/${PN}-5.1-strnlen.patch + cp ../${LD64}/src/other/prune_trie.h include/mach-o/ || die + + # do not build profileable libstuff to save compile time + sed -i -e "/^all:/s, profile , ," libstuff/Makefile + + # cctools version is provided to make via RC_ProjectSourceVersion which + # generates and compiles it as apple_version[] into libstuff. From + # there it's picked up by the individual tools. Since + # RC_ProjectSourceVersion is also used as library version, we can't + # just append our local version info. So we hack the libstuff Makefile + # to include our Gentoo version. + sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (Gentoo ${PN}-${PVR})," \ + libstuff/Makefile + + # clean up test suite + cd "${S}"/${LD64}/unit-tests/test-cases + local c + + # we don't have llvm + ((++c)); rm -rf llvm-integration; + + # we don't have dtrace + ((++c)); rm -rf dtrace-static-probes-coalescing; + ((++c)); rm -rf dtrace-static-probes; + + # a file is missing + ((++c)); rm -rf eh-coalescing-r + + # we don't do universal binaries + ((++c)); rm -rf blank-stubs; + + # looks like a problem with apple's result-filter.pl + ((++c)); rm -rf implicit-common3; + ((++c)); rm -rf order_file-ans; + + # TODO no idea what goes wrong here + ((++c)); rm -rf dwarf-debug-notes; + + einfo "Deleted $c tests that were bound to fail" + + cd "${S}" + ebegin "cleaning Makefiles from unwanted CFLAGS" + find . -name "Makefile" -print0 | xargs -0 sed \ + -i \ + -e 's/ -g / /g' \ + -e 's/^G =.*$/G =/' \ + -e 's/^OFLAG =.*$/OFLAG =/' \ + -e 's/install -c -s/install/g' + eend $? +} + +src_configure() { + CCTOOLS_LTO= + LD64_LTO=0 + if use lto ; then + CCTOOLS_LTO="-DLTO_SUPPORT" + LD64_LTO=1 + fi + + if [ "${CXX/*clang*/yes}" = "yes" ] ; then + if use libcxx ; then + append-cxxflags -stdlib=libc++ + CXXLIB=-stdlib=libc++ + else + # force libstdc++ for systems where libc++ is default (OS X 10.9+?) + append-cxxflags -stdlib=libstdc++ + CXXLIB=-stdlib=libstdc++ + fi + else + use libcxx && \ + ewarn "libcxx only available with clang and your C++ compiler ($CXX) does not seem to be clang" + fi + + # CPPFLAGS only affects ld64, cctools don't use 'em (which currently is + # what we want) + append-cppflags -DNDEBUG + + # Block API and thus snapshots supported on >= 10.6 + [ ${CHOST#*-darwin} -ge 10 ] && \ + append-cppflags -DSUPPORT_SNAPSHOTS + + CCTOOLS_OFLAG= + if [ ${CHOST#*-darwin} -le 8 ] ; then + # cctools expect to use UNIX03 struct member names. + # This is default on > 10.4. Activate it on <= 10.4 by defining + # __DARWIN_UNIX03 explicitly. + CCTOOLS_OFLAG="-D__DARWIN_UNIX03=1" + fi + + # Create configure.h for ld64 with SUPPORT_ARCH_ defines in it. + # RC_SUPPORTED_ARCHS="i386 x86_64 x86_64h armv6 ..." can be used to + # override architectures (there are more arms to add) but we configure + # with the default to be in line with Xcode's ld. + DERIVED_FILE_DIR=${LD64}/src \ + RC_SUPPORTED_ARCHS="" \ + ${LD64}/src/create_configure +} + +compile_ld64() { + einfo "building ${LD64}" + cd "${S}"/${LD64}/src + emake \ + LTO=${LD64_LTO} \ + || die "emake failed for ld64" + use test && emake build_test +} + +compile_cctools() { + einfo "building ${CCTOOLS}" + cd "${S}"/${CCTOOLS} + # -j1 because it fails too often with weird errors + # Suppress running dsymutil because it will warn about missing debug + # info which is expected when compiling without -g as we normally do. + # This might need some more thought if anyone ever wanted to build us + # for debugging with Apple's tools. + emake \ + LIB_PRUNETRIE="-L../../${LD64}/src -lprunetrie" \ + EFITOOLS= \ + LTO="${CCTOOLS_LTO}" \ + COMMON_SUBDIRS='libstuff ar misc otool' \ + SUBDIRS_32= \ + LEGACY= \ + RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ + RC_CFLAGS="${CFLAGS}" \ + OFLAG="${CCTOOLS_OFLAG}" \ + CXXLIB="${CXXLIB}" \ + DSYMUTIL=": disabled: dsymutil" \ + -j1 \ + || die "emake failed for the cctools" + cd "${S}"/${CCTOOLS}/as + emake \ + BUILD_OBSOLETE_ARCH= \ + RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ + RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \ + OFLAG="${CCTOOLS_OFLAG}" \ + DSYMUTIL=": disabled: dsymutil" \ + || die "emake failed for as" +} + +src_compile() { + compile_ld64 + compile_cctools +} + +install_ld64() { + exeinto ${BINPATH} + doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump} + dosym ld64 ${BINPATH}/ld + insinto ${DATAPATH}/man/man1 + doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1 +} + +install_cctools() { + cd "${S}"/${CCTOOLS} + emake install_all_but_headers \ + EFITOOLS= \ + COMMON_SUBDIRS='ar misc otool' \ + SUBDIRS_32= \ + DSTROOT=\"${D}\" \ + BINDIR=\"${EPREFIX}\"${BINPATH} \ + LOCBINDIR=\"${EPREFIX}\"${BINPATH} \ + USRBINDIR=\"${EPREFIX}\"${BINPATH} \ + LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \ + MANDIR=\"${EPREFIX}\"${DATAPATH}/man/ + cd "${S}"/${CCTOOLS}/as + emake install \ + BUILD_OBSOLETE_ARCH= \ + DSTROOT=\"${D}\" \ + USRBINDIR=\"${EPREFIX}\"${BINPATH} \ + LIBDIR=\"${EPREFIX}\"${LIBPATH} \ + LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} + + cd "${ED}"${BINPATH} + insinto ${DATAPATH}/man/man1 + local skips manpage + # ar brings an up-to-date manpage with it + skips=( ar ) + for bin in *; do + for skip in ${skips[@]}; do + if [[ ${bin} == ${skip} ]]; then + continue 2; + fi + done + manpage=${S}/${CCTOOLS}/man/${bin}.1 + if [[ -f "${manpage}" ]]; then + doins "${manpage}" + fi + done + insinto ${DATAPATH}/man/man5 + doins "${S}"/${CCTOOLS}/man/*.5 +} + +src_test() { + if ! [ "${EPREFIX}"/usr/bin/clang ] ; then + einfo "Test suite only works properly with clang - please install" + return + fi + + einfo "Running unit tests" + cd "${S}"/${LD64}/unit-tests/test-cases + # provide the new ld as a symlink to clang so that -ccc-install-dir + # will pick it up + ln -sfn ../../src/ld64 ld + # use our arch command because the System's will report i386 even for an + # x86_64 prefix + perl ../bin/make-recursive.pl \ + BUILT_PRODUCTS_DIR="${S}"/${LD64}/src \ + ARCH="$(arch)" \ + LD="${S}"/${LD64}/src/ld64 \ + CC="clang -ccc-install-dir $PWD" \ + CXX="clang++ -ccc-install-dir $PWD" \ + OTOOL="${S}"/${CCTOOLS}/otool/otool.NEW \ + | perl ../bin/result-filter.pl +} + +src_install() { + install_ld64 + install_cctools + + cd "${S}" + insinto /etc/env.d/binutils + cat <<-EOF > env.d + TARGET="${CHOST}" + VER="${PV}" + FAKE_TARGETS="${CHOST}" + EOF + newins env.d ${CHOST}-${PV} +} + +pkg_postinst() { + binutils-config ${CHOST}-${PV} +} diff --git a/sys-devel/binutils-apple/binutils-apple-6.1.ebuild b/sys-devel/binutils-apple/binutils-apple-6.1.ebuild new file mode 100644 index 000000000000..8d0156799c54 --- /dev/null +++ b/sys-devel/binutils-apple/binutils-apple-6.1.ebuild @@ -0,0 +1,354 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-6.1.ebuild,v 1.1 2015/01/27 06:59:53 grobian Exp $ + +EAPI="3" + +inherit eutils flag-o-matic toolchain-funcs + +LD64=ld64-241.9 +CCTOOLS_VERSION=862 +CCTOOLS=cctools-${CCTOOLS_VERSION} +LIBUNWIND=libunwind-35.3 +DYLD=dyld-353.2.1 + +DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools ${PV}" +HOMEPAGE="http://www.opensource.apple.com/darwinsource/" +SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz + http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz + http://www.opensource.apple.com/tarballs/dyld/${DYLD}.tar.gz + http://www.opensource.apple.com/tarballs/libunwind/${LIBUNWIND}.tar.gz" + +LICENSE="APSL-2" +KEYWORDS="~x64-macos ~x86-macos" +IUSE="lto test libcxx" + +RDEPEND="sys-devel/binutils-config + lto? ( sys-devel/llvm ) + test? ( >=dev-lang/perl-5.8.8 ) + libcxx? ( sys-libs/libcxx-apple )" +DEPEND="${RDEPEND} + || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm ) + libcxx? ( sys-devel/llvm )" + +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then + export CTARGET=${CATEGORY/cross-} + fi +fi +is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } + +if is_cross ; then + SLOT="${CTARGET}-6" +else + SLOT="6" +fi + +LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV} +INCPATH=${LIBPATH}/include +DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV} +if is_cross ; then + BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV} +else + BINPATH=/usr/${CTARGET}/binutils-bin/${PV} +fi + +S=${WORKDIR} + +src_prepare() { + cd "${S}"/${LD64}/src + cp "${FILESDIR}"/ld64-136-compile_stubs.h ld/compile_stubs.h + cp "${FILESDIR}"/ld64-236.3-Makefile Makefile + + epatch "${FILESDIR}"/ld64-236.3-nolto.patch + epatch "${FILESDIR}"/ld64-241.9-extraneous-includes.patch + epatch "${FILESDIR}"/ld64-241.9-atomic-volatile.patch + epatch "${FILESDIR}"/ld64-241.9-arm64-cputype.patch + epatch "${FILESDIR}"/ld64-236.3-crashreporter.patch + epatch "${FILESDIR}"/ld64-241.9-gcc.patch + epatch "${FILESDIR}"/ld64-236.3-constant-types.patch + epatch "${FILESDIR}"/ld64-241.9-nosnapshots.patch + epatch "${FILESDIR}"/ld64-241.9-noarm.patch + epatch "${FILESDIR}"/ld64-241.9-register-names.patch + epatch "${FILESDIR}"/ld64-241.9-get-comm-align.patch + epatch "${FILESDIR}"/ld64-241.9-cc_md5.patch + + # We used to use our own copy of lto.h, which doesn't require llvm + # build-env. Current versions of llvm provide + # $EPREFIX/usr/include/llvm-c/lto.h as well as + # $EPREFIX/usr/lib/libLTO.{so,dylib}, so we just use these. + + # provide missing headers from libunwind and dyld + mkdir -p include/{mach,mach-o/arm} || die + # never present because it's private + cp ../../${DYLD}/include/mach-o/dyld_priv.h include/mach-o || die + # missing on <= 10.5 + cp ../../${LIBUNWIND}/include/libunwind.h include/ || die + cp ../../${LIBUNWIND}/include/mach-o/compact_unwind_encoding.h include/mach-o || die + # missing on <= 10.4 + cp ../../${DYLD}/include/mach-o/dyld_images.h include/mach-o || die + cp ../../${CCTOOLS}/include/mach-o/loader.h include/mach-o || die + # use copies from cctools because they're otherwise hidden in some SDK + cp ../../${CCTOOLS}/include/mach-o/arm/reloc.h include/mach-o/arm || die + # provide all required CPU_TYPEs on all platforms + cp ../../${CCTOOLS}/include/mach/machine.h include/mach/machine.h + # add alias for newer identifiers, because ld64 uses both but cctools + # header only defines the older + epatch "${FILESDIR}"/ld64-236.3-missing-cputypes.patch + + # mimic OS X Leopard-style Availability.h macros for libunwind.h on + # older systems + [[ ${CHOST#*-darwin} -le 8 ]] && \ + echo "#define __OSX_AVAILABLE_STARTING(x,y) " > include/Availability.h + + local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\"" + echo "char ldVersionString[] = ${VER_STR};" > version.cpp + + epatch "${FILESDIR}"/ld64-123.2-debug-backtrace.patch + + cd "${S}"/${CCTOOLS} + epatch "${FILESDIR}"/${PN}-4.5-as.patch + epatch "${FILESDIR}"/${PN}-5.1-as-dir.patch + epatch "${FILESDIR}"/${PN}-5.1-ranlib.patch + epatch "${FILESDIR}"/${PN}-3.1.1-libtool-ranlib.patch + epatch "${FILESDIR}"/${PN}-3.1.1-no-headers.patch + epatch "${FILESDIR}"/${PN}-4.0-no-oss-dir.patch + epatch "${FILESDIR}"/${PN}-5.1-nolto.patch + epatch "${FILESDIR}"/cctools-839-intel-retf.patch + epatch "${FILESDIR}"/${PN}-5.1-extraneous-includes.patch + epatch "${FILESDIR}"/${PN}-5.1-otool-stdc.patch + epatch "${FILESDIR}"/${PN}-5.1-constant-types.patch + epatch "${FILESDIR}"/${PN}-5.1-strnlen.patch + cp ../${LD64}/src/other/prune_trie.h include/mach-o/ || die + + # do not build profileable libstuff to save compile time + sed -i -e "/^all:/s, profile , ," libstuff/Makefile + + # cctools version is provided to make via RC_ProjectSourceVersion which + # generates and compiles it as apple_version[] into libstuff. From + # there it's picked up by the individual tools. Since + # RC_ProjectSourceVersion is also used as library version, we can't + # just append our local version info. So we hack the libstuff Makefile + # to include our Gentoo version. + sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (Gentoo ${PN}-${PVR})," \ + libstuff/Makefile + + # clean up test suite + cd "${S}"/${LD64}/unit-tests/test-cases + local c + + # we don't have llvm + ((++c)); rm -rf llvm-integration; + + # we don't have dtrace + ((++c)); rm -rf dtrace-static-probes-coalescing; + ((++c)); rm -rf dtrace-static-probes; + + # a file is missing + ((++c)); rm -rf eh-coalescing-r + + # we don't do universal binaries + ((++c)); rm -rf blank-stubs; + + # looks like a problem with apple's result-filter.pl + ((++c)); rm -rf implicit-common3; + ((++c)); rm -rf order_file-ans; + + # TODO no idea what goes wrong here + ((++c)); rm -rf dwarf-debug-notes; + + einfo "Deleted $c tests that were bound to fail" + + cd "${S}" + ebegin "cleaning Makefiles from unwanted CFLAGS" + find . -name "Makefile" -print0 | xargs -0 sed \ + -i \ + -e 's/ -g / /g' \ + -e 's/^G =.*$/G =/' \ + -e 's/^OFLAG =.*$/OFLAG =/' \ + -e 's/install -c -s/install/g' + eend $? +} + +src_configure() { + CCTOOLS_LTO= + LD64_LTO=0 + if use lto ; then + CCTOOLS_LTO="-DLTO_SUPPORT" + LD64_LTO=1 + fi + + if [ "${CXX/*clang*/yes}" = "yes" ] ; then + if use libcxx ; then + append-cxxflags -stdlib=libc++ + CXXLIB=-stdlib=libc++ + else + # force libstdc++ for systems where libc++ is default (OS X 10.9+?) + append-cxxflags -stdlib=libstdc++ + CXXLIB=-stdlib=libstdc++ + fi + else + use libcxx && \ + ewarn "libcxx only available with clang and your C++ compiler ($CXX) does not seem to be clang" + fi + + # CPPFLAGS only affects ld64, cctools don't use 'em (which currently is + # what we want) + append-cppflags -DNDEBUG + + # Block API and thus snapshots supported on >= 10.6 + [ ${CHOST#*-darwin} -ge 10 ] && \ + append-cppflags -DSUPPORT_SNAPSHOTS + + CCTOOLS_OFLAG= + if [ ${CHOST#*-darwin} -le 8 ] ; then + # cctools expect to use UNIX03 struct member names. + # This is default on > 10.4. Activate it on <= 10.4 by defining + # __DARWIN_UNIX03 explicitly. + CCTOOLS_OFLAG="-D__DARWIN_UNIX03=1" + fi + + # Create configure.h for ld64 with SUPPORT_ARCH_ defines in it. + # RC_SUPPORTED_ARCHS="i386 x86_64 x86_64h armv6 ..." can be used to + # override architectures (there are more arms to add) but we configure + # with the default to be in line with Xcode's ld. + DERIVED_FILE_DIR=${LD64}/src \ + RC_SUPPORTED_ARCHS="" \ + ${LD64}/src/create_configure +} + +compile_ld64() { + einfo "building ${LD64}" + cd "${S}"/${LD64}/src + emake \ + LTO=${LD64_LTO} \ + || die "emake failed for ld64" + use test && emake build_test +} + +compile_cctools() { + einfo "building ${CCTOOLS}" + cd "${S}"/${CCTOOLS} + # -j1 because it fails too often with weird errors + # Suppress running dsymutil because it will warn about missing debug + # info which is expected when compiling without -g as we normally do. + # This might need some more thought if anyone ever wanted to build us + # for debugging with Apple's tools. + emake \ + LIB_PRUNETRIE="-L../../${LD64}/src -lprunetrie" \ + EFITOOLS= \ + LTO="${CCTOOLS_LTO}" \ + COMMON_SUBDIRS='libstuff ar misc otool' \ + SUBDIRS_32= \ + LEGACY= \ + RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ + RC_CFLAGS="${CFLAGS}" \ + OFLAG="${CCTOOLS_OFLAG}" \ + CXXLIB="${CXXLIB}" \ + DSYMUTIL=": disabled: dsymutil" \ + -j1 \ + || die "emake failed for the cctools" + cd "${S}"/${CCTOOLS}/as + emake \ + BUILD_OBSOLETE_ARCH= \ + RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ + RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \ + OFLAG="${CCTOOLS_OFLAG}" \ + DSYMUTIL=": disabled: dsymutil" \ + || die "emake failed for as" +} + +src_compile() { + compile_ld64 + compile_cctools +} + +install_ld64() { + exeinto ${BINPATH} + doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump} + dosym ld64 ${BINPATH}/ld + insinto ${DATAPATH}/man/man1 + doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1 +} + +install_cctools() { + cd "${S}"/${CCTOOLS} + emake install_all_but_headers \ + EFITOOLS= \ + COMMON_SUBDIRS='ar misc otool' \ + SUBDIRS_32= \ + DSTROOT=\"${D}\" \ + BINDIR=\"${EPREFIX}\"${BINPATH} \ + LOCBINDIR=\"${EPREFIX}\"${BINPATH} \ + USRBINDIR=\"${EPREFIX}\"${BINPATH} \ + LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \ + MANDIR=\"${EPREFIX}\"${DATAPATH}/man/ + cd "${S}"/${CCTOOLS}/as + emake install \ + BUILD_OBSOLETE_ARCH= \ + DSTROOT=\"${D}\" \ + USRBINDIR=\"${EPREFIX}\"${BINPATH} \ + LIBDIR=\"${EPREFIX}\"${LIBPATH} \ + LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} + + cd "${ED}"${BINPATH} + insinto ${DATAPATH}/man/man1 + local skips manpage + # ar brings an up-to-date manpage with it + skips=( ar ) + for bin in *; do + for skip in ${skips[@]}; do + if [[ ${bin} == ${skip} ]]; then + continue 2; + fi + done + manpage=${S}/${CCTOOLS}/man/${bin}.1 + if [[ -f "${manpage}" ]]; then + doins "${manpage}" + fi + done + insinto ${DATAPATH}/man/man5 + doins "${S}"/${CCTOOLS}/man/*.5 +} + +src_test() { + if ! [ "${EPREFIX}"/usr/bin/clang ] ; then + einfo "Test suite only works properly with clang - please install" + return + fi + + einfo "Running unit tests" + cd "${S}"/${LD64}/unit-tests/test-cases + # provide the new ld as a symlink to clang so that -ccc-install-dir + # will pick it up + ln -sfn ../../src/ld64 ld + # use our arch command because the System's will report i386 even for an + # x86_64 prefix + perl ../bin/make-recursive.pl \ + BUILT_PRODUCTS_DIR="${S}"/${LD64}/src \ + ARCH="$(arch)" \ + LD="${S}"/${LD64}/src/ld64 \ + CC="clang -ccc-install-dir $PWD" \ + CXX="clang++ -ccc-install-dir $PWD" \ + OTOOL="${S}"/${CCTOOLS}/otool/otool.NEW \ + | perl ../bin/result-filter.pl +} + +src_install() { + install_ld64 + install_cctools + + cd "${S}" + insinto /etc/env.d/binutils + cat <<-EOF > env.d + TARGET="${CHOST}" + VER="${PV}" + FAKE_TARGETS="${CHOST}" + EOF + newins env.d ${CHOST}-${PV} +} + +pkg_postinst() { + binutils-config ${CHOST}-${PV} +} diff --git a/sys-devel/binutils-apple/files/binutils-apple-4.5-as.patch b/sys-devel/binutils-apple/files/binutils-apple-4.5-as.patch new file mode 100644 index 000000000000..0769016c5682 --- /dev/null +++ b/sys-devel/binutils-apple/files/binutils-apple-4.5-as.patch @@ -0,0 +1,100 @@ +Allow to disable build of as backends for obsolete architectures. + +diff --git a/as/Makefile b/as/Makefile +index a4b016e..9e8bcc3 100644 +--- a/as/Makefile ++++ b/as/Makefile +@@ -1,3 +1,4 @@ ++BUILD_OBSOLETE_ARCH = yes + export USE_APPLE_PB_SUPPORT = all + + ifneq "" "$(SDKROOT)" +@@ -20,28 +21,36 @@ SRCROOT = . + SYMROOT = . + OBJROOT = . + SYM_DIRS = $(SYMROOT)/driver_dir \ +- $(SYMROOT)/a68_dir \ +- $(SYMROOT)/a88_dir \ + $(SYMROOT)/a386_dir \ + $(SYMROOT)/ax86_64_dir \ + $(SYMROOT)/appc_dir \ + $(SYMROOT)/appc64_dir \ ++ $(SYMROOT)/aarm_dir ++ ++ifeq "yes" "$(BUILD_OBSOLETE_ARCH)" ++SYM_DIRS += \ ++ $(SYMROOT)/a68_dir \ ++ $(SYMROOT)/a88_dir \ + $(SYMROOT)/a860_dir \ + $(SYMROOT)/ahppa_dir \ +- $(SYMROOT)/asparc_dir \ +- $(SYMROOT)/aarm_dir ++ $(SYMROOT)/asparc_dir ++endif + + OFILE_DIRS = $(OBJROOT)/driver_dir \ +- $(OBJROOT)/a68_dir \ +- $(OBJROOT)/a88_dir \ + $(OBJROOT)/a386_dir \ + $(OBJROOT)/ax86_64_dir \ + $(OBJROOT)/appc_dir \ + $(OBJROOT)/appc64_dir \ ++ $(OBJROOT)/aarm_dir ++ ++ifeq "yes" "$(BUILD_OBSOLETE_ARCH)" ++OFILE_DIRS += \ ++ $(OBJROOT)/a68_dir \ ++ $(OBJROOT)/a88_dir \ + $(OBJROOT)/a860_dir \ + $(OBJROOT)/ahppa_dir \ +- $(OBJROOT)/asparc_dir \ +- $(OBJROOT)/aarm_dir ++ $(OBJROOT)/asparc_dir ++endif + + BINDIR = /bin + USRBINDIR = /usr/bin +@@ -88,9 +97,13 @@ OBJS_hppa = $(CFILES_hppa:.c=.o) + OBJS_sparc = $(CFILES_sparc:.c=.o) + OBJS_arm = $(CFILES_arm:.c=.o) + +-all: $(OFILE_DIRS) $(SYM_DIRS) driver_build a68_build a88_build a386_build \ +- ax86_64_build a860_build appc_build appc64_build ahppa_build \ +- aarm_build asparc_build ++all: $(OFILE_DIRS) $(SYM_DIRS) driver_build a386_build \ ++ ax86_64_build appc_build appc64_build aarm_build ++ ++ifeq "yes" "$(BUILD_OBSOLETE_ARCH)" ++all: a68_build a88_build a860_build ahppa_build asparc_build ++endif ++ + + all_test: a68_test a88_test a860_test a386_test appc_test ahppa_test + +@@ -406,15 +419,18 @@ install: all + $(MKDIRS) $(DSTROOT)$(LOCLIBDIR)/ppc64 + install -c -s -m 555 $(SYMROOT)/appc64_dir/as \ + $(DSTROOT)$(LOCLIBDIR)/ppc64/as ++ifeq "yes" "$(BUILD_OBSOLETE_ARCH)" + $(MKDIRS) $(DSTROOT)$(LOCLIBDIR)/m68k + install -c -s -m 555 $(SYMROOT)/a68_dir/as \ + $(DSTROOT)$(LOCLIBDIR)/m68k/as + $(MKDIRS) $(DSTROOT)$(LOCLIBDIR)/sparc + install -c -s -m 555 $(SYMROOT)/asparc_dir/as \ + $(DSTROOT)$(LOCLIBDIR)/sparc/as ++endif + $(MKDIRS) $(DSTROOT)$(LIBDIR)/arm + install -c -s -m 555 $(SYMROOT)/aarm_dir/as \ + $(DSTROOT)$(LIBDIR)/arm/as ++ifeq "yes" "$(BUILD_OBSOLETE_ARCH)" + $(MKDIRS) $(DSTROOT)$(LOCLIBDIR)/m88k + install -c -s -m 555 $(SYMROOT)/a88_dir/as \ + $(DSTROOT)$(LOCLIBDIR)/m88k/as +@@ -424,6 +440,7 @@ install: all + $(MKDIRS) $(DSTROOT)$(LOCLIBDIR)/i860 + install -s -m 555 $(SYMROOT)/a860_dir/as \ + $(DSTROOT)$(LOCLIBDIR)/i860/as ++endif + + $(OFILE_DIRS) $(SYM_DIRS): + $(MKDIRS) $@ diff --git a/sys-devel/binutils-apple/files/binutils-apple-5.1-as-dir.patch b/sys-devel/binutils-apple/files/binutils-apple-5.1-as-dir.patch new file mode 100644 index 000000000000..1c7c6360a6a8 --- /dev/null +++ b/sys-devel/binutils-apple/files/binutils-apple-5.1-as-dir.patch @@ -0,0 +1,47 @@ +Allow to set directory for as backends from the outside. + +--- cctools-855/as/driver.c.orig 2014-04-05 00:42:22.000000000 +0200 ++++ cctools-855/as/driver.c 2014-11-13 13:07:09.000000000 +0100 +@@ -365,7 +365,11 @@ + /* + * If this assembler exist try to run it else print an error message. + */ ++#ifndef ASLIBEXECDIR + as = makestr(prefix, LIB, arch_name, AS, NULL); ++#else ++ as = makestr(ASLIBEXECDIR, arch_name, AS, NULL); ++#endif + new_argv = allocate((argc + 1) * sizeof(char *)); + new_argv[0] = as; + j = 1; +@@ -387,6 +391,9 @@ + else + exit(1); + } ++#ifdef ASLIBEXECDIR ++ as_local = ""; ++#else + as_local = makestr(prefix, LOCALLIB, arch_name, AS, NULL); + new_argv[0] = as_local; + if(access(as_local, F_OK) == 0){ +@@ -396,10 +403,12 @@ + else + exit(1); + } ++#endif + printf("%s: assembler (%s or %s) for architecture %s not installed\n", + progname, as, as_local, arch_name); + arch_flags = get_arch_flags(); + count = 0; ++#ifndef ASLIBEXECDIR + for(i = 0; arch_flags[i].name != NULL; i++){ + as = makestr(prefix, LIB, arch_flags[i].name, AS, NULL); + if(access(as, F_OK) == 0){ +@@ -420,6 +429,7 @@ + } + } + } ++#endif + if(count == 0) + printf("%s: no assemblers installed\n", progname); + exit(1); diff --git a/sys-devel/binutils-apple/files/binutils-apple-5.1-constant-types.patch b/sys-devel/binutils-apple/files/binutils-apple-5.1-constant-types.patch new file mode 100644 index 000000000000..066ce57a6f59 --- /dev/null +++ b/sys-devel/binutils-apple/files/binutils-apple-5.1-constant-types.patch @@ -0,0 +1,26 @@ +Avoid error with gcc on 32bit platforms: +ld/LinkEdit.hpp:1329: error: integer constant is too large for 'long' type + +--- cctools-855/include/llvm-c/Disassembler.h.orig 2015-01-14 18:36:22.000000000 +0100 ++++ cctools-855/include/llvm-c/Disassembler.h 2015-01-14 18:36:39.000000000 +0100 +@@ -133,15 +133,15 @@ + #define LLVMDisassembler_ReferenceType_In_PCrel_Load 2 + + /* The input reference is from an ARM64::ADRP instruction. */ +-#define LLVMDisassembler_ReferenceType_In_ARM64_ADRP 0x100000001 ++#define LLVMDisassembler_ReferenceType_In_ARM64_ADRP 0x100000001ULL + /* The input reference is from an ARM64::ADDXri instruction. */ +-#define LLVMDisassembler_ReferenceType_In_ARM64_ADDXri 0x100000002 ++#define LLVMDisassembler_ReferenceType_In_ARM64_ADDXri 0x100000002ULL + /* The input reference is from an ARM64::LDRXui instruction. */ +-#define LLVMDisassembler_ReferenceType_In_ARM64_LDRXui 0x100000003 ++#define LLVMDisassembler_ReferenceType_In_ARM64_LDRXui 0x100000003ULL + /* The input reference is from an ARM64::LDRXl instruction. */ +-#define LLVMDisassembler_ReferenceType_In_ARM64_LDRXl 0x100000004 ++#define LLVMDisassembler_ReferenceType_In_ARM64_LDRXl 0x100000004ULL + /* The input reference is from an ARM64::ADR instruction. */ +-#define LLVMDisassembler_ReferenceType_In_ARM64_ADR 0x100000005 ++#define LLVMDisassembler_ReferenceType_In_ARM64_ADR 0x100000005ULL + + /* The output reference is to as symbol stub. */ + #define LLVMDisassembler_ReferenceType_Out_SymbolStub 1 diff --git a/sys-devel/binutils-apple/files/binutils-apple-5.1-extraneous-includes.patch b/sys-devel/binutils-apple/files/binutils-apple-5.1-extraneous-includes.patch new file mode 100644 index 000000000000..2e0a109223f9 --- /dev/null +++ b/sys-devel/binutils-apple/files/binutils-apple-5.1-extraneous-includes.patch @@ -0,0 +1,31 @@ +Remove extraneous includes that contain clang language extensions on Mac OS X +10.10 (xpc/base.h - __has_extension). + +--- ./cctools-855/as/messages.c.orig 2015-01-12 18:49:02.000000000 +0100 ++++ ./cctools-855/as/messages.c 2015-01-12 18:49:06.000000000 +0100 +@@ -23,11 +23,6 @@ + #include + #include + #include +-#if defined(__OPENSTEP__) || defined(__GONZO_BUNSEN_BEAKER__) +-#include +-#else +-#include +-#endif + #include "as.h" + #include "input-scrub.h" + #include "messages.h" +--- ./cctools-855/misc/libtool.c.orig 2015-01-12 18:48:29.000000000 +0100 ++++ ./cctools-855/misc/libtool.c 2015-01-12 18:48:40.000000000 +0100 +@@ -53,11 +53,6 @@ + #endif /* LTO_SUPPORT */ + + #include +-#if defined(__OPENSTEP__) || defined(__GONZO_BUNSEN_BEAKER__) +-#include +-#else +-#include +-#endif + + /* + * This is used internally to build the table of contents. diff --git a/sys-devel/binutils-apple/files/binutils-apple-5.1-nolto.patch b/sys-devel/binutils-apple/files/binutils-apple-5.1-nolto.patch new file mode 100644 index 000000000000..62490ef8ce46 --- /dev/null +++ b/sys-devel/binutils-apple/files/binutils-apple-5.1-nolto.patch @@ -0,0 +1,43 @@ +Allow to fully disable LTO. + +diff --git a/libstuff/lto.c b/libstuff/lto.c +index 6f5758d..5ba7996 100644 +--- a/libstuff/lto.c ++++ b/libstuff/lto.c +@@ -381,4 +381,18 @@ void *mod) + lto_dispose(mod); + } + ++#else ++ ++#include ++#include "stuff/ofile.h" ++ ++__private_extern__ ++int ++is_llvm_bitcode( ++ struct ofile *ofile, ++ char *addr, ++ size_t size) ++{ ++ return 0; ++} + #endif /* LTO_SUPPORT */ +diff --git a/misc/libtool.c b/misc/libtool.c +index f9c7557..ff829cc 100644 +--- a/misc/libtool.c ++++ b/misc/libtool.c +@@ -1370,8 +1370,11 @@ void) + } + } + } +- else if(ofiles[i].arch_type == OFILE_Mach_O || +- ofiles[i].arch_type == OFILE_LLVM_BITCODE){ ++ else if(ofiles[i].arch_type == OFILE_Mach_O ++#ifdef LTO_SUPPORT ++ || ofiles[i].arch_type == OFILE_LLVM_BITCODE ++#endif ++ ){ + if(cmd_flags.ranlib == TRUE){ + error("for architecture: %s file: %s is not an " + "archive (no processing done on this file)", diff --git a/sys-devel/binutils-apple/files/binutils-apple-5.1-otool-stdc.patch b/sys-devel/binutils-apple/files/binutils-apple-5.1-otool-stdc.patch new file mode 100644 index 000000000000..ca02e643a45e --- /dev/null +++ b/sys-devel/binutils-apple/files/binutils-apple-5.1-otool-stdc.patch @@ -0,0 +1,23 @@ +Do not use C++/C11(?) style local variable declaration. + +--- cctools-855/otool/dyld_bind_info.c.orig 2015-01-12 18:55:04.000000000 +0100 ++++ cctools-855/otool/dyld_bind_info.c 2015-01-12 18:56:35.000000000 +0100 +@@ -353,7 +353,9 @@ + skip = read_uleb128(&p, end); + sectName = sectionName(segIndex, segStartAddr + segOffset, + segs, nsegs, segs64, nsegs64); +- for (uint32_t i=0; i < count; ++i) { ++ { ++ uint32_t i; ++ for (i=0; i < count; ++i) { + if(pass == 2){ + (*dbi)[n].segname = segName; + (*dbi)[n].sectname = sectName; +@@ -367,6 +369,7 @@ + n++; + segOffset += skip + sizeof_pointer; + } ++ } + break; + default: + return; /* throwf("bad bind opcode %d", *p); */ diff --git a/sys-devel/binutils-apple/files/binutils-apple-5.1-ranlib.patch b/sys-devel/binutils-apple/files/binutils-apple-5.1-ranlib.patch new file mode 100644 index 000000000000..1930dfc82d27 --- /dev/null +++ b/sys-devel/binutils-apple/files/binutils-apple-5.1-ranlib.patch @@ -0,0 +1,15 @@ +Run ranlib before installation of the libary. + +--- ./cctools-855/cbtlibs/Makefile.ranlib 2014-04-05 00:42:22.000000000 +0200 ++++ ./cctools-855/cbtlibs/Makefile 2014-08-29 14:49:41.000000000 +0200 +@@ -61,9 +61,9 @@ + + lib_ofiles_install: lib_ofiles + $(MKDIRS) $(DSTROOT)$(LOCLIBDIR) ++ $(RANLIB) $(SYMROOT)/libsyminfo.a + install -p -c -m 444 $(SYMROOT)/libsyminfo.a \ + $(DSTROOT)$(LOCLIBDIR)/libsyminfo.a +- $(RANLIB) $(DSTROOT)$(LOCLIBDIR)/libsyminfo.a + + $(OFILE_DIR) $(SYMROOT): + $(MKDIRS) $@ diff --git a/sys-devel/binutils-apple/files/binutils-apple-5.1-strnlen.patch b/sys-devel/binutils-apple/files/binutils-apple-5.1-strnlen.patch new file mode 100644 index 000000000000..887e15628b31 --- /dev/null +++ b/sys-devel/binutils-apple/files/binutils-apple-5.1-strnlen.patch @@ -0,0 +1,45 @@ +Provide strnlen on platforms where it's missing. + +--- cctools-855/otool/ofile_print.c.orig 2015-01-14 18:33:14.000000000 +0100 ++++ cctools-855/otool/ofile_print.c 2015-01-14 18:34:03.000000000 +0100 +@@ -3647,6 +3647,40 @@ + printf(" pad %u\n", ec->pad); + } + ++/* borrowed from gnulib */ ++#include ++ ++#if MAC_OS_X_VERSION_MIN_REQUIRED < 1070 ++/* Find the length of STRING, but scan at most MAXLEN characters. ++ * Copyright (C) 2005-2007, 2009-2015 Free Software Foundation, Inc. ++ * Written by Simon Josefsson. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2, or (at your option) ++ * any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, see . */ ++ ++#include ++ ++/* Find the length of STRING, but scan at most MAXLEN characters. ++ * If no '\0' terminator is found in that many characters, return MAXLEN. */ ++ ++size_t ++strnlen (const char *string, size_t maxlen) ++{ ++ const char *end = memchr (string, '\0', maxlen); ++ return end ? (size_t) (end - string) : maxlen; ++} ++#endif ++ + /* + * print an LC_LINKER_OPTION command. The linker_option_command structure + * specified must be aligned correctly and in the host byte sex. The lc is diff --git a/sys-devel/binutils-apple/files/cctools-839-intel-retf.patch b/sys-devel/binutils-apple/files/cctools-839-intel-retf.patch new file mode 100644 index 000000000000..d9bd9a8425b9 --- /dev/null +++ b/sys-devel/binutils-apple/files/cctools-839-intel-retf.patch @@ -0,0 +1,14 @@ +diff --git a/as/i386-opcode.h b/as/i386-opcode.h +index 4ba397f..862449a 100644 +--- a/as/i386-opcode.h ++++ b/as/i386-opcode.h +@@ -415,6 +415,9 @@ static const template i386_optab[] = + {"ret", 1, 0xc2, X, Cpu64, wq_Suf|DefaultSize|NoRex64,{ Imm16, 0, 0} }, + {"lret", 0, 0xcb, X, 0, wlq_Suf|DefaultSize, { 0, 0, 0} }, + {"lret", 1, 0xca, X, 0, wlq_Suf|DefaultSize, { Imm16, 0, 0} }, ++// intel syntax ++{"retf", 0, 0xcb, X, 0, wlq_Suf|DefaultSize, { 0, 0, 0} }, ++{"retf", 1, 0xca, X, 0, wlq_Suf|DefaultSize, { Imm16, 0, 0} }, + {"enter", 2, 0xc8, X, Cpu186|CpuNo64, wl_Suf|DefaultSize, { Imm16, Imm8, 0} }, + {"enter", 2, 0xc8, X, Cpu64, wq_Suf|DefaultSize|NoRex64, { Imm16, Imm8, 0} }, + {"leave", 0, 0xc9, X, Cpu186|CpuNo64, wl_Suf|DefaultSize, { 0, 0, 0} }, diff --git a/sys-devel/binutils-apple/files/cctools-839-lto.patch b/sys-devel/binutils-apple/files/cctools-839-lto.patch new file mode 100644 index 000000000000..4c3522fce924 --- /dev/null +++ b/sys-devel/binutils-apple/files/cctools-839-lto.patch @@ -0,0 +1,42 @@ +Allow to fully disable LTO. + +diff --git a/libstuff/lto.c b/libstuff/lto.c +index 6f5758d..5ba7996 100644 +--- a/libstuff/lto.c ++++ b/libstuff/lto.c +@@ -381,4 +381,17 @@ void *mod) + lto_dispose(mod); + } + ++#else ++ ++#include ++ ++__private_extern__ ++int ++is_llvm_bitcode( ++ struct ofile *ofile, ++ char *addr, ++ size_t size) ++{ ++ return 0; ++} + #endif /* LTO_SUPPORT */ +diff --git a/misc/libtool.c b/misc/libtool.c +index f9c7557..ff829cc 100644 +--- a/misc/libtool.c ++++ b/misc/libtool.c +@@ -1370,8 +1370,11 @@ void) + } + } + } +- else if(ofiles[i].arch_type == OFILE_Mach_O || +- ofiles[i].arch_type == OFILE_LLVM_BITCODE){ ++ else if(ofiles[i].arch_type == OFILE_Mach_O ++#ifdef LTO_SUPPORT ++ || ofiles[i].arch_type == OFILE_LLVM_BITCODE ++#endif ++ ){ + if(cmd_flags.ranlib == TRUE){ + error("for architecture: %s file: %s is not an " + "archive (no processing done on this file)", diff --git a/sys-devel/binutils-apple/files/ld64-136-Makefile b/sys-devel/binutils-apple/files/ld64-136-Makefile new file mode 100644 index 000000000000..948c705503ae --- /dev/null +++ b/sys-devel/binutils-apple/files/ld64-136-Makefile @@ -0,0 +1,48 @@ +CPPFLAGS += "-DCPU_SUBTYPE_X86_ALL=((cpu_subtype_t)3)" -Iinclude -Iabstraction -Ild -Ild/parsers -Iother -I. + +# dropped machocheck due to compilation failures +all: rebase unwinddump dyldinfo ld64 ObjectDump + +libprunetrie.a: other/PruneTrie.o other/prune_trie.h + $(AR) -s -r -c libprunetrie.a other/PruneTrie.o + +LD64LIBS=ld/parsers/archive_file.o ld/parsers/macho_relocatable_file.o \ + ld/parsers/opaque_section_file.o \ + ld/parsers/macho_dylib_file.o \ + ld/passes/branch_island.o ld/passes/dylibs.o ld/passes/order.o \ + ld/passes/branch_shim.o ld/passes/got.o ld/passes/tlvp.o \ + ld/passes/compact_unwind.o ld/passes/huge.o \ + ld/passes/dtrace_dof.o ld/passes/objc.o \ + ld/passes/stubs/stubs.o \ + ld/InputFiles.o ld/OutputFile.o ld/SymbolTable.o \ + ld/Snapshot.o \ + ld/Options.o ld/Resolver.o ld/debugline.o ld/ld.o + +ifeq ($(LTO),1) +CPPFLAGS += "-DLTO" +LTO_OBJ = ld/parsers/lto_file.o +LIBLTO = -lLTO +else +CPPFLAGS += "-ULTO" +LTO_OBJ = +LIBLTO = +endif + +ld64: libprunetrie.a version.o $(LD64LIBS) $(LTO_OBJ) + $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LIBLTO) -o $@ $^ + +rebase: other/rebase.o + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ + +dyldinfo: other/dyldinfo.o + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ + +unwinddump: other/unwinddump.o + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ + +ObjectDump: other/ObjectDump.o ld/debugline.o ld/parsers/macho_relocatable_file.o $(LTO_OBJ) + $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LIBLTO) -o $@ $^ + +machocheck: other/machochecker.o + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ + diff --git a/sys-devel/binutils-apple/files/ld64-136-compile_stubs.h b/sys-devel/binutils-apple/files/ld64-136-compile_stubs.h new file mode 100644 index 000000000000..8cd430adb9eb --- /dev/null +++ b/sys-devel/binutils-apple/files/ld64-136-compile_stubs.h @@ -0,0 +1,53 @@ +static const char *compile_stubs = +"#!/bin/csh\n" +"\n" +"# Attempt to find the architecture.\n" +"# First look through the command line args.\n" +"set arch=unknown\n" +"set link_cmd=(`cat link_command`)\n" +"while ( $#link_cmd > 0 )\n" +" if ( \"$link_cmd[1]\" == \"-arch\" ) then\n" +" set arch=$link_cmd[2]\n" +" endif\n" +" shift link_cmd\n" +"end\n" +"\n" +"# look for an explicit arch file\n" +"if ( \"$arch\" == \"unknown\" ) then\n" +" if ( -e arch ) then\n" +" set arch=`cat arch`\n" +" endif\n" +"endif\n" +"\n" +"if ( \"$arch\" == \"unknown\" ) then\n" +"echo \"***** Unable to determine architecture.\"\n" +"exit 1\n" +"endif \n" +"\n" +"# Create .dylibs for each file in the dylib_stubs directory.\n" +"if ( -e dylib_stubs ) then\n" +" set files=`cd dylib_stubs ; echo *`\n" +" mkdir -p dylibs\n" +" foreach file ($files)\n" +" if ( ! -e dylibs/$file ) then\n" +" clang -arch $arch -c -fno-builtin -o tmp_object.o -x c dylib_stubs/$file\n" +" ld -arch $arch -dylib -macosx_version_min 10.1 -no_version_load_command -o dylibs/$file tmp_object.o\n" +" endif\n" +" end\n" +"endif\n" +"\n" +"# Create .frameworks for each file in the framework_stubs directory.\n" +"if ( -e framework_stubs ) then\n" +" set files=`cd framework_stubs ; echo *`\n" +" foreach file ($files)\n" +" if ( ! -e frameworks/$file.framework ) then\n" +" clang -arch $arch -c -fno-builtin -o tmp_object.o -x c framework_stubs/$file\n" +" mkdir -p frameworks/$file.framework\n" +" ld -arch $arch -dylib -macosx_version_min 10.1 -no_version_load_command -o frameworks/$file.framework/$file tmp_object.o\n" +" endif\n" +" end\n" +"endif\n" +"\n" +"# Clean up.\n" +"rm -f tmp_object.o\n" +; diff --git a/sys-devel/binutils-apple/files/ld64-236.3-Makefile b/sys-devel/binutils-apple/files/ld64-236.3-Makefile new file mode 100644 index 000000000000..1f35c8ff9f39 --- /dev/null +++ b/sys-devel/binutils-apple/files/ld64-236.3-Makefile @@ -0,0 +1,51 @@ +CPPFLAGS += -Iinclude -Iabstraction -Ild -Ild/parsers -Iother -I. + +# some files generate warnings about applying offsetof to a non-POD type. +# Upstream seems aware of that and ignores by setting +# GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO in the xcode project. +CXXFLAGS += -Wno-invalid-offsetof + +all: rebase unwinddump dyldinfo ld64 ObjectDump machocheck + +libprunetrie.a: other/PruneTrie.o other/prune_trie.h + $(AR) -s -r -c libprunetrie.a other/PruneTrie.o + +LD64LIBS=ld/parsers/archive_file.o ld/parsers/macho_relocatable_file.o \ + ld/parsers/opaque_section_file.o \ + ld/parsers/macho_dylib_file.o \ + ld/passes/branch_island.o ld/passes/dylibs.o ld/passes/order.o \ + ld/passes/branch_shim.o ld/passes/got.o ld/passes/tlvp.o \ + ld/passes/compact_unwind.o ld/passes/huge.o \ + ld/passes/dtrace_dof.o ld/passes/objc.o \ + ld/passes/stubs/stubs.o \ + ld/InputFiles.o ld/OutputFile.o ld/SymbolTable.o \ + ld/Snapshot.o \ + ld/Options.o ld/Resolver.o ld/debugline.o ld/ld.o + +ifeq ($(LTO),1) +CPPFLAGS += -DLTO +LTO_OBJ = ld/parsers/lto_file.o +LIBLTO = -lLTO +else +LTO_OBJ = +LIBLTO = +endif + +ld64: libprunetrie.a version.o $(LD64LIBS) $(LTO_OBJ) + $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LIBLTO) -o $@ $^ + +rebase: other/rebase.o + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ + +dyldinfo: other/dyldinfo.o + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ + +unwinddump: other/unwinddump.o + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ + +ObjectDump: other/ObjectDump.o ld/debugline.o ld/parsers/macho_relocatable_file.o $(LTO_OBJ) + $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LIBLTO) -o $@ $^ + +machocheck: other/machochecker.o + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ + diff --git a/sys-devel/binutils-apple/files/ld64-236.3-arm64-fixup.patch b/sys-devel/binutils-apple/files/ld64-236.3-arm64-fixup.patch new file mode 100644 index 000000000000..b64e52906f4f --- /dev/null +++ b/sys-devel/binutils-apple/files/ld64-236.3-arm64-fixup.patch @@ -0,0 +1,17 @@ +Use correct enum values (backport from 241.9). + +--- ld64-236.3/src/other/ObjectDump.cpp.orig 2014-11-12 21:17:01.000000000 +0100 ++++ ld64-236.3/src/other/ObjectDump.cpp 2014-11-12 21:17:44.000000000 +0100 +@@ -995,10 +995,10 @@ + case ld::Fixup::kindStoreTargetAddressARM64PageOff12: + printf("ARM64 store 12-bit page offset of %s", referenceTargetAtomName(ref)); + break; +- case ld::Fixup::kindStoreTargetAddressARM64TLVPage21: ++ case ld::Fixup::kindStoreTargetAddressARM64TLVPLoadPage21: + printf("ARM64 store 21-bit pcrel ADRP to TLV for %s", referenceTargetAtomName(ref)); + break; +- case ld::Fixup::kindStoreTargetAddressARM64TLVPageOff12: ++ case ld::Fixup::kindStoreTargetAddressARM64TLVPLoadPageOff12: + printf("ARM64 store 12-bit page offset of TLV of %s", referenceTargetAtomName(ref)); + break; + case ld::Fixup::kindStoreTargetAddressARM64GOTLoadPage21: diff --git a/sys-devel/binutils-apple/files/ld64-236.3-constant-types.patch b/sys-devel/binutils-apple/files/ld64-236.3-constant-types.patch new file mode 100644 index 000000000000..c4c5e0d113c8 --- /dev/null +++ b/sys-devel/binutils-apple/files/ld64-236.3-constant-types.patch @@ -0,0 +1,61 @@ +Avoid error with gcc on 32bit platforms: +ld/LinkEdit.hpp:1329: error: integer constant is too large for 'long' type + +--- ./ld64-236.3/src/ld/LinkEdit.hpp.orig 2015-01-14 18:00:49.000000000 +0100 ++++ ./ld64-236.3/src/ld/LinkEdit.hpp 2015-01-14 18:02:23.000000000 +0100 +@@ -1326,7 +1326,7 @@ + void FunctionStartsAtom::encode() const + { + this->_encodedData.reserve(8192); +- const uint64_t badAddress = 0xFFFFFFFFFFFFFFFF; ++ const uint64_t badAddress = 0xFFFFFFFFFFFFFFFFULL; + uint64_t addr = badAddress; + // delta compress all function addresses + for (std::vector::iterator it = this->_state.sections.begin(); it != this->_state.sections.end(); ++it) { +--- ./ld64-236.3/src/ld/Options.cpp.orig 2015-01-14 18:01:12.000000000 +0100 ++++ ./ld64-236.3/src/ld/Options.cpp 2015-01-14 18:02:09.000000000 +0100 +@@ -4173,7 +4173,7 @@ + switch (fArchitecture) { + case CPU_TYPE_I386: + case CPU_TYPE_ARM: +- if ( fStackAddr > 0xFFFFFFFF ) ++ if ( fStackAddr > 0xFFFFFFFFULL ) + throw "-stack_addr must be < 4G for 32-bit processes"; + break; + case CPU_TYPE_X86_64: +@@ -4193,29 +4193,29 @@ + if ( fStackSize > 0xFFFFFFFF ) + throw "-stack_size must be < 4G for 32-bit processes"; + if ( fStackAddr == 0 ) { +- fStackAddr = 0xC0000000; ++ fStackAddr = 0xC0000000ULL; + } +- if ( (fStackAddr > 0xB0000000) && ((fStackAddr-fStackSize) < 0xB0000000) ) ++ if ( (fStackAddr > 0xB0000000ULL) && ((fStackAddr-fStackSize) < 0xB0000000ULL) ) + warning("custom stack placement overlaps and will disable shared region"); + break; + case CPU_TYPE_ARM: + if ( fStackSize > 0x2F000000 ) + throw "-stack_size must be < 752MB"; + if ( fStackAddr == 0 ) +- fStackAddr = 0x2F000000; +- if ( fStackAddr > 0x30000000) ++ fStackAddr = 0x2F000000ULL; ++ if ( fStackAddr > 0x30000000ULL) + throw "-stack_addr must be < 0x30000000 for arm"; + break; + case CPU_TYPE_X86_64: + if ( fStackAddr == 0 ) { +- fStackAddr = 0x00007FFF5C000000LL; ++ fStackAddr = 0x00007FFF5C000000ULL; + } + break; + case CPU_TYPE_ARM64: + if ( fStackSize > 0x20000000 ) + throw "-stack_size must be < 512MB"; + if ( fStackAddr == 0 ) { +- fStackAddr = 0x120000000; ++ fStackAddr = 0x120000000ULL; + } + break; + } diff --git a/sys-devel/binutils-apple/files/ld64-236.3-crashreporter.patch b/sys-devel/binutils-apple/files/ld64-236.3-crashreporter.patch new file mode 100644 index 000000000000..f8b42b459b6f --- /dev/null +++ b/sys-devel/binutils-apple/files/ld64-236.3-crashreporter.patch @@ -0,0 +1,23 @@ +Allow to disable crash reporter + +diff -ur ld64-236.3/src/ld/Options.cpp ld64-236.3/src/ld/Options.cpp +--- ld64-236.3/src/ld/Options.cpp 2014-08-29 16:40:18.000000000 +0200 ++++ ld64-236.3/src/ld/Options.cpp 2014-08-29 16:35:36.000000000 +0200 +@@ -54,7 +54,7 @@ + // magic to place command line in crash reports + const int crashreporterBufferSize = 2000; + static char crashreporterBuffer[crashreporterBufferSize]; +-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 ++#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 && defined(SUPPORT_CRASHREPORTER) + #include + // hack until ld does not need to build on 10.6 anymore + struct crashreporter_annotations_t gCRAnnotations +@@ -4564,7 +4564,7 @@ + bool newLinker = false; + + // build command line buffer in case ld crashes +-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 ++#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 && defined(SUPPORT_CRASHREPORTER) + CRSetCrashLogMessage(crashreporterBuffer); + #endif + const char* srcRoot = getenv("SRCROOT"); diff --git a/sys-devel/binutils-apple/files/ld64-236.3-gcc.patch b/sys-devel/binutils-apple/files/ld64-236.3-gcc.patch new file mode 100644 index 000000000000..1e1f578ca354 --- /dev/null +++ b/sys-devel/binutils-apple/files/ld64-236.3-gcc.patch @@ -0,0 +1,1038 @@ +Provide c++11 headers from tr1 include directory and namespace. + +Work around weird namespacing bug in gcc-4.2.1 where class ld::Section +conflicts with template mach_o::relocatable::Section by renaming the latter to +MRFSection (could possibly be done using sed from ebuild or avoided by figuring +out, what's actually going on with those namespaces). + +diff -ur ld64-236.3.orig/src/ld/InputFiles.h ld64-236.3/src/ld/InputFiles.h +--- ld64-236.3.orig/src/ld/InputFiles.h 2014-04-05 00:42:29.000000000 +0200 ++++ ld64-236.3/src/ld/InputFiles.h 2015-01-11 22:43:08.000000000 +0100 +@@ -46,6 +46,14 @@ + #include + #endif + ++#ifdef __GLIBCXX__ ++#include ++#define UNORDERED_MAP tr1::unordered_map ++#else ++#include ++#define UNORDERED_MAP unordered_map ++#endif ++ + #include + + #include "Options.h" +@@ -107,7 +115,7 @@ + static void parseWorkerThread(InputFiles *inputFiles); + void startThread(void (*threadFunc)(InputFiles *)) const; + +- typedef std::unordered_map InstallNameToDylib; ++ typedef std::UNORDERED_MAP InstallNameToDylib; + + const Options& _options; + std::vector _inputFiles; +diff -ur ld64-236.3.orig/src/ld/LinkEditClassic.hpp ld64-236.3/src/ld/LinkEditClassic.hpp +--- ld64-236.3.orig/src/ld/LinkEditClassic.hpp 2014-04-05 00:42:29.000000000 +0200 ++++ ld64-236.3/src/ld/LinkEditClassic.hpp 2015-01-11 22:44:04.000000000 +0100 +@@ -31,8 +31,13 @@ + #include + #include + +-#include ++#ifdef __GLIBCXX__ ++#include ++#define UNORDERED_MAP tr1::unordered_map ++#else + #include ++#define UNORDERED_MAP unordered_map ++#endif + + #include "Options.h" + #include "ld.hpp" +@@ -92,7 +97,7 @@ + + private: + enum { kBufferSize = 0x01000000 }; +- typedef std::unordered_map StringToOffset; ++ typedef std::UNORDERED_MAP StringToOffset; + + const uint32_t _pointerSize; + std::vector _fullBuffers; +diff -ur ld64-236.3.orig/src/ld/Options.cpp ld64-236.3/src/ld/Options.cpp +--- ld64-236.3.orig/src/ld/Options.cpp 2015-01-11 17:35:08.000000000 +0100 ++++ ld64-236.3/src/ld/Options.cpp 2015-01-11 22:47:34.000000000 +0100 +@@ -4335,7 +4335,7 @@ + + // make sure all required exported symbols exist + std::vector impliedExports; +- for (NameSet::iterator it=fExportSymbols.regularBegin(); it != fExportSymbols.regularEnd(); ++it) { ++ for (NameSet::const_iterator it=fExportSymbols.regularBegin(); it != fExportSymbols.regularEnd(); ++it) { + const char* name = *it; + const int len = strlen(name); + if ( (strcmp(&name[len-3], ".eh") == 0) || (strncmp(name, ".objc_category_name_", 20) == 0) ) { +@@ -4367,7 +4367,7 @@ + } + + // make sure all required re-exported symbols exist +- for (NameSet::iterator it=fReExportSymbols.regularBegin(); it != fReExportSymbols.regularEnd(); ++it) { ++ for (NameSet::const_iterator it=fReExportSymbols.regularBegin(); it != fReExportSymbols.regularEnd(); ++it) { + fInitialUndefines.push_back(*it); + } + +diff -ur ld64-236.3.orig/src/ld/Options.h ld64-236.3/src/ld/Options.h +--- ld64-236.3.orig/src/ld/Options.h 2014-04-05 00:42:29.000000000 +0200 ++++ ld64-236.3/src/ld/Options.h 2015-01-11 22:44:00.000000000 +0100 +@@ -30,8 +30,17 @@ + #include + + #include ++#ifdef __GLIBCXX__ ++#include ++#include ++#define UNORDERED_MAP tr1::unordered_map ++#define UNORDERED_SET tr1::unordered_set ++#else + #include + #include ++#define UNORDERED_MAP unordered_map ++#define UNORDERED_SET unordered_set ++#endif + + #include "ld.hpp" + #include "Snapshot.h" +@@ -376,8 +385,8 @@ + const std::vector& sectionRenames() const { return fSectionRenames; } + + private: +- typedef std::unordered_map NameToOrder; +- typedef std::unordered_set NameSet; ++ typedef std::UNORDERED_MAP NameToOrder; ++ typedef std::UNORDERED_SET NameSet; + enum ExportMode { kExportDefault, kExportSome, kDontExportSome }; + enum LibrarySearchMode { kSearchDylibAndArchiveInEachDir, kSearchAllDirsForDylibsThenAllDirsForArchives }; + enum InterposeMode { kInterposeNone, kInterposeAllExternal, kInterposeSome }; +@@ -389,8 +398,8 @@ + bool containsNonWildcard(const char*) const; + bool empty() const { return fRegular.empty() && fWildCard.empty(); } + bool hasWildCards() const { return !fWildCard.empty(); } +- NameSet::iterator regularBegin() const { return fRegular.begin(); } +- NameSet::iterator regularEnd() const { return fRegular.end(); } ++ NameSet::const_iterator regularBegin() const { return fRegular.begin(); } ++ NameSet::const_iterator regularEnd() const { return fRegular.end(); } + void remove(const NameSet&); + private: + static bool hasWildCards(const char*); +diff -ur ld64-236.3.orig/src/ld/OutputFile.cpp ld64-236.3/src/ld/OutputFile.cpp +--- ld64-236.3.orig/src/ld/OutputFile.cpp 2015-01-11 17:35:08.000000000 +0100 ++++ ld64-236.3/src/ld/OutputFile.cpp 2015-01-12 00:24:43.000000000 +0100 +@@ -50,7 +50,13 @@ + #include + #include + #include ++#ifdef __GLIBCXX__ ++#include ++#define UNORDERED_SET tr1::unordered_set ++#else + #include ++#define UNORDERED_SET unordered_set ++#endif + + #include + #include +@@ -4699,7 +4705,7 @@ + const char* filename = NULL; + bool wroteStartSO = false; + state.stabs.reserve(atomsNeedingDebugNotes.size()*4); +- std::unordered_set seenFiles; ++ std::UNORDERED_SET seenFiles; + for (std::vector::iterator it=atomsNeedingDebugNotes.begin(); it != atomsNeedingDebugNotes.end(); it++) { + const ld::Atom* atom = *it; + const ld::File* atomFile = atom->file(); +diff -ur ld64-236.3.orig/src/ld/Resolver.h ld64-236.3/src/ld/Resolver.h +--- ld64-236.3.orig/src/ld/Resolver.h 2014-04-05 00:42:29.000000000 +0200 ++++ ld64-236.3/src/ld/Resolver.h 2015-01-11 22:49:14.000000000 +0100 +@@ -42,7 +42,13 @@ + #include + + #include ++#ifdef __GLIBCXX__ ++#include ++#define UNORDERED_SET tr1::unordered_set ++#else + #include ++#define UNORDERED_SET unordered_set ++#endif + + #include "Options.h" + #include "ld.hpp" +@@ -103,7 +109,7 @@ + void doLinkerOption(const std::vector& linkerOption, const char* fileName); + void dumpAtoms(); + +- typedef std::unordered_set StringSet; ++ typedef std::UNORDERED_SET StringSet; + + class NotLive { + public: +diff -ur ld64-236.3.orig/src/ld/SymbolTable.h ld64-236.3/src/ld/SymbolTable.h +--- ld64-236.3.orig/src/ld/SymbolTable.h 2014-04-05 00:42:29.000000000 +0200 ++++ ld64-236.3/src/ld/SymbolTable.h 2015-01-11 22:46:19.000000000 +0100 +@@ -42,7 +42,13 @@ + #include + + #include ++#ifdef __GLIBCXX__ ++#include ++#define UNORDERED_MAP tr1::unordered_map ++#else + #include ++#define UNORDERED_MAP unordered_map ++#endif + + #include "Options.h" + #include "ld.hpp" +@@ -57,38 +63,38 @@ + typedef uint32_t IndirectBindingSlot; + + private: +- typedef std::unordered_map NameToSlot; ++ typedef std::UNORDERED_MAP NameToSlot; + + class ContentFuncs { + public: + size_t operator()(const ld::Atom*) const; + bool operator()(const ld::Atom* left, const ld::Atom* right) const; + }; +- typedef std::unordered_map ContentToSlot; ++ typedef std::UNORDERED_MAP ContentToSlot; + + class ReferencesHashFuncs { + public: + size_t operator()(const ld::Atom*) const; + bool operator()(const ld::Atom* left, const ld::Atom* right) const; + }; +- typedef std::unordered_map ReferencesToSlot; ++ typedef std::UNORDERED_MAP ReferencesToSlot; + + class CStringHashFuncs { + public: + size_t operator()(const ld::Atom*) const; + bool operator()(const ld::Atom* left, const ld::Atom* right) const; + }; +- typedef std::unordered_map CStringToSlot; ++ typedef std::UNORDERED_MAP CStringToSlot; + + class UTF16StringHashFuncs { + public: + size_t operator()(const ld::Atom*) const; + bool operator()(const ld::Atom* left, const ld::Atom* right) const; + }; +- typedef std::unordered_map UTF16StringToSlot; ++ typedef std::UNORDERED_MAP UTF16StringToSlot; + + typedef std::map SlotToName; +- typedef std::unordered_map NameToMap; ++ typedef std::UNORDERED_MAP NameToMap; + + typedef std::vector DuplicatedSymbolAtomList; + typedef std::map DuplicateSymbols; +diff -ur ld64-236.3.orig/src/ld/ld.cpp ld64-236.3/src/ld/ld.cpp +--- ld64-236.3.orig/src/ld/ld.cpp 2015-01-11 17:35:08.000000000 +0100 ++++ ld64-236.3/src/ld/ld.cpp 2015-01-11 22:42:58.000000000 +0100 +@@ -54,7 +54,13 @@ + #include + #include + #include ++#ifdef __GLIBCXX__ ++#include ++#define UNORDERED_MAP tr1::unordered_map ++#else + #include ++#define UNORDERED_MAP unordered_map ++#endif + #include + + #include "Options.h" +@@ -150,7 +156,7 @@ + struct SectionEquals { + bool operator()(const ld::Section* left, const ld::Section* right) const; + }; +- typedef std::unordered_map SectionInToOut; ++ typedef std::UNORDERED_MAP SectionInToOut; + + + SectionInToOut _sectionInToFinalMap; +diff -ur ld64-236.3.orig/src/ld/ld.hpp ld64-236.3/src/ld/ld.hpp +--- ld64-236.3.orig/src/ld/ld.hpp 2014-04-05 00:42:29.000000000 +0200 ++++ ld64-236.3/src/ld/ld.hpp 2015-01-11 22:42:46.000000000 +0100 +@@ -32,7 +32,13 @@ + #include + + #include ++#ifdef __GLIBCXX__ ++#include ++#define UNORDERED_SET tr1::unordered_set ++#else + #include ++#define UNORDERED_SET unordered_set ++#endif + + #include "configure.h" + +@@ -821,7 +827,7 @@ + bool operator()(const char* left, const char* right) const { return (strcmp(left, right) == 0); } + }; + +-typedef std::unordered_set CStringSet; ++typedef std::UNORDERED_SET CStringSet; + + class Internal + { +diff -ur ld64-236.3.orig/src/ld/parsers/archive_file.cpp ld64-236.3/src/ld/parsers/archive_file.cpp +--- ld64-236.3.orig/src/ld/parsers/archive_file.cpp 2015-01-11 17:35:08.000000000 +0100 ++++ ld64-236.3/src/ld/parsers/archive_file.cpp 2015-01-11 22:41:37.000000000 +0100 +@@ -33,7 +33,13 @@ + #include + #include + #include ++#ifdef __GLIBCXX__ ++#include ++#define UNORDERED_MAP tr1::unordered_map ++#else + #include ++#define UNORDERED_MAP unordered_map ++#endif + + #include "MachOFileAbstraction.hpp" + #include "Architectures.hpp" +@@ -116,7 +122,7 @@ + struct MemberState { ld::relocatable::File* file; const Entry *entry; bool logged; bool loaded; uint32_t index;}; + bool loadMember(MemberState& state, ld::File::AtomHandler& handler, const char *format, ...) const; + +- typedef std::unordered_map NameToEntryMap; ++ typedef std::UNORDERED_MAP NameToEntryMap; + + typedef typename A::P P; + typedef typename A::P::E E; +diff -ur ld64-236.3.orig/src/ld/parsers/lto_file.cpp ld64-236.3/src/ld/parsers/lto_file.cpp +--- ld64-236.3.orig/src/ld/parsers/lto_file.cpp 2014-04-05 00:42:29.000000000 +0200 ++++ ld64-236.3/src/ld/parsers/lto_file.cpp 2015-01-11 22:44:48.000000000 +0100 +@@ -33,8 +33,17 @@ + #include + #include + #include ++#ifdef __GLIBCXX__ ++#include ++#include ++#define UNORDERED_MAP tr1::unordered_map ++#define UNORDERED_SET tr1::unordered_set ++#else + #include + #include ++#define UNORDERED_MAP unordered_map ++#define UNORDERED_SET unordered_set ++#endif + + #include "MachOFileAbstraction.hpp" + #include "Architectures.hpp" +@@ -217,8 +226,8 @@ + static void ltoDiagnosticHandler(lto_codegen_diagnostic_severity_t, const char*, void*); + #endif + +- typedef std::unordered_set CStringSet; +- typedef std::unordered_map CStringToAtom; ++ typedef std::UNORDERED_SET CStringSet; ++ typedef std::UNORDERED_MAP CStringToAtom; + + class AtomSyncer : public ld::File::AtomHandler { + public: +diff -ur ld64-236.3.orig/src/ld/parsers/macho_dylib_file.cpp ld64-236.3/src/ld/parsers/macho_dylib_file.cpp +--- ld64-236.3.orig/src/ld/parsers/macho_dylib_file.cpp 2015-01-11 17:35:08.000000000 +0100 ++++ ld64-236.3/src/ld/parsers/macho_dylib_file.cpp 2015-01-11 22:45:17.000000000 +0100 +@@ -34,8 +34,17 @@ + #include + #include + #include +-#include ++#ifdef __GLIBCXX__ ++#include ++#include ++#define UNORDERED_MAP tr1::unordered_map ++#define UNORDERED_SET tr1::unordered_set ++#else + #include ++#include ++#define UNORDERED_MAP unordered_map ++#define UNORDERED_SET unordered_set ++#endif + + #include "Architectures.hpp" + #include "MachOFileAbstraction.hpp" +@@ -189,8 +198,8 @@ + }; + }; + struct AtomAndWeak { ld::Atom* atom; bool weakDef; bool tlv; pint_t address; }; +- typedef std::unordered_map NameToAtomMap; +- typedef std::unordered_set NameSet; ++ typedef std::UNORDERED_MAP NameToAtomMap; ++ typedef std::UNORDERED_SET NameSet; + + struct Dependent { const char* path; File* dylib; bool reExport; }; + +@@ -548,14 +557,18 @@ + if ( _s_logHashtable ) fprintf(stderr, "ld: building hashtable of %u toc entries for %s\n", dynamicInfo->nextdefsym(), this->path()); + const macho_nlist

* start = &symbolTable[dynamicInfo->iextdefsym()]; + const macho_nlist

* end = &start[dynamicInfo->nextdefsym()]; ++#ifndef __GLIBCXX__ + _atoms.reserve(dynamicInfo->nextdefsym()); // set initial bucket count ++#endif + for (const macho_nlist

* sym=start; sym < end; ++sym) { + this->addSymbol(&strings[sym->n_strx()], (sym->n_desc() & N_WEAK_DEF) != 0, false, sym->n_value()); + } + } + else { + int32_t count = dynamicInfo->ntoc(); ++#ifndef __GLIBCXX__ + _atoms.reserve(count); // set initial bucket count ++#endif + if ( _s_logHashtable ) fprintf(stderr, "ld: building hashtable of %u entries for %s\n", count, this->path()); + const struct dylib_table_of_contents* toc = (dylib_table_of_contents*)(fileContent + dynamicInfo->tocoff()); + for (int32_t i = 0; i < count; ++i) { +diff -ur ld64-236.3.orig/src/ld/parsers/macho_relocatable_file.cpp ld64-236.3/src/ld/parsers/macho_relocatable_file.cpp +--- ld64-236.3.orig/src/ld/parsers/macho_relocatable_file.cpp 2014-04-05 00:42:29.000000000 +0200 ++++ ld64-236.3/src/ld/parsers/macho_relocatable_file.cpp 2015-01-11 23:08:13.000000000 +0100 +@@ -62,7 +62,7 @@ + // forward reference + template class Parser; + template class Atom; +-template class Section; ++template class MRFSection; + template class CFISection; + template class CUSection; + +@@ -100,14 +100,14 @@ + const uint8_t* fileContent() { return _fileContent; } + private: + friend class Atom; +- friend class Section; ++ friend class MRFSection; + friend class Parser; + friend class CFISection::OAS; + + typedef typename A::P P; + + const uint8_t* _fileContent; +- Section** _sectionsArray; ++ MRFSection** _sectionsArray; + uint8_t* _atomsArray; + uint32_t _sectionsArrayCount; + uint32_t _atomsArrayCount; +@@ -129,14 +129,14 @@ + + + template +-class Section : public ld::Section ++class MRFSection : public ld::Section + { + public: + typedef typename A::P::uint_t pint_t; + typedef typename A::P P; + typedef typename A::P::E E; + +- virtual ~Section() { } ++ virtual ~MRFSection() { } + class File& file() const { return _file; } + const macho_section

* machoSection() const { return _machOSection; } + uint32_t sectionNum(class Parser&) const; +@@ -160,10 +160,10 @@ + static const char* makeSectionName(const macho_section* s); + + protected: +- Section(File& f, const macho_section* s) ++ MRFSection(File& f, const macho_section* s) + : ld::Section(makeSegmentName(s), makeSectionName(s), sectionType(s)), + _file(f), _machOSection(s), _beginAtoms(NULL), _endAtoms(NULL), _hasAliases(false) { } +- Section(File& f, const char* segName, const char* sectName, ld::Section::Type t, bool hidden=false) ++ MRFSection(File& f, const char* segName, const char* sectName, ld::Section::Type t, bool hidden=false) + : ld::Section(segName, sectName, t, hidden), _file(f), _machOSection(NULL), + _beginAtoms(NULL), _endAtoms(NULL), _hasAliases(false) { } + +@@ -186,11 +186,11 @@ + + + template +-class CFISection : public Section ++class CFISection : public MRFSection + { + public: + CFISection(Parser& parser, File& f, const macho_section* s) +- : Section(f, s) { } ++ : MRFSection(f, s) { } + uint32_t cfiCount(); + + virtual ld::Atom::ContentType contentType() { return ld::Atom::typeCFI; } +@@ -250,11 +250,11 @@ + + + template +-class CUSection : public Section ++class CUSection : public MRFSection + { + public: + CUSection(Parser& parser, File& f, const macho_section* s) +- : Section(f, s) { } ++ : MRFSection(f, s) { } + + typedef typename A::P::uint_t pint_t; + typedef typename A::P P; +@@ -291,11 +291,11 @@ + + + template +-class TentativeDefinitionSection : public Section ++class TentativeDefinitionSection : public MRFSection + { + public: + TentativeDefinitionSection(Parser& parser, File& f) +- : Section(f, "__DATA", "__comm/tent", ld::Section::typeTentativeDefs) {} ++ : MRFSection(f, "__DATA", "__comm/tent", ld::Section::typeTentativeDefs) {} + + virtual ld::Atom::ContentType contentType() { return ld::Atom::typeZeroFill; } + virtual bool addFollowOnFixups() const { return false; } +@@ -313,11 +313,11 @@ + + + template +-class AbsoluteSymbolSection : public Section ++class AbsoluteSymbolSection : public MRFSection + { + public: + AbsoluteSymbolSection(Parser& parser, File& f) +- : Section(f, "__DATA", "__abs", ld::Section::typeAbsoluteSymbols, true) {} ++ : MRFSection(f, "__DATA", "__abs", ld::Section::typeAbsoluteSymbols, true) {} + + virtual ld::Atom::ContentType contentType() { return ld::Atom::typeUnclassified; } + virtual bool dontDeadStrip() { return false; } +@@ -339,7 +339,7 @@ + + + template +-class SymboledSection : public Section ++class SymboledSection : public MRFSection + { + public: + SymboledSection(Parser& parser, File& f, const macho_section* s); +@@ -371,11 +371,11 @@ + + + template +-class ImplicitSizeSection : public Section ++class ImplicitSizeSection : public MRFSection + { + public: + ImplicitSizeSection(Parser& parser, File& f, const macho_section* s) +- : Section(f, s) { } ++ : MRFSection(f, s) { } + virtual uint32_t computeAtomCount(class Parser& parser, struct Parser::LabelAndCFIBreakIterator& it, const struct Parser::CFI_CU_InfoArrays&); + virtual uint32_t appendAtoms(class Parser& parser, uint8_t* buffer, struct Parser::LabelAndCFIBreakIterator& it, const struct Parser::CFI_CU_InfoArrays&); + protected: +@@ -709,8 +709,8 @@ + + public: + // methods for all atoms from mach-o object file +- Section& sect() const { return (Section&)section(); } +- File& machofile() const { return ((Section*)(this->_section))->file(); } ++ MRFSection& sect() const { return (MRFSection&)section(); } ++ File& machofile() const { return ((MRFSection*)(this->_section))->file(); } + void setFixupsRange(uint32_t s, uint32_t c); + void setUnwindInfoRange(uint32_t s, uint32_t c); + void extendUnwindInfoRange(); +@@ -727,7 +727,7 @@ + typedef typename A::P::E E; + typedef typename A::P::uint_t pint_t; + // constuct via all attributes +- Atom(Section& sct, const char* nm, pint_t addr, uint64_t sz, ++ Atom(MRFSection& sct, const char* nm, pint_t addr, uint64_t sz, + ld::Atom::Definition d, ld::Atom::Combine c, ld::Atom::Scope s, + ld::Atom::ContentType ct, ld::Atom::SymbolTableInclusion i, + bool dds, bool thumb, bool al, ld::Atom::Alignment a) +@@ -737,7 +737,7 @@ + _unwindInfoStartIndex(0), _fixupsCount(0), + _lineInfoCount(0), _unwindInfoCount(0) { } + // construct via symbol table entry +- Atom(Section& sct, Parser& parser, const macho_nlist

& sym, ++ Atom(MRFSection& sct, Parser& parser, const macho_nlist

& sym, + uint64_t sz, bool alias=false) + : ld::Atom((ld::Section&)sct, parser.definitionFromSymbol(sym), + parser.combineFromSymbol(sym), parser.scopeFromSymbol(sym), +@@ -760,7 +760,7 @@ + + private: + friend class Parser; +- friend class Section; ++ friend class MRFSection; + friend class CStringSection; + friend class AbsoluteSymbolSection; + +@@ -991,8 +991,8 @@ + uint32_t undefinedStartIndex() { return _undefinedStartIndex; } + uint32_t undefinedEndIndex() { return _undefinedEndIndex; } + void addFixup(FixupInAtom f) { _allFixups.push_back(f); } +- Section* sectionForNum(unsigned int sectNum); +- Section* sectionForAddress(pint_t addr); ++ MRFSection* sectionForNum(unsigned int sectNum); ++ MRFSection* sectionForAddress(pint_t addr); + Atom* findAtomByAddress(pint_t addr); + Atom* findAtomByAddressOrNullIfStub(pint_t addr); + Atom* findAtomByAddressOrLocalTargetOfStub(pint_t addr, uint32_t* offsetInAtom); +@@ -1034,7 +1034,7 @@ + : sortedSymbolIndexes(ssa), sortedSymbolCount(ssc), cfiStartsArray(cfisa), + cfiStartsCount(cfisc), fileHasOverlappingSymbols(ols), + newSection(false), cfiIndex(0), symIndex(0) {} +- bool next(Parser& parser, const Section& sect, uint32_t sectNum, pint_t startAddr, pint_t endAddr, ++ bool next(Parser& parser, const MRFSection& sect, uint32_t sectNum, pint_t startAddr, pint_t endAddr, + pint_t* addr, pint_t* size, const macho_nlist

** sym); + pint_t peek(Parser& parser, pint_t startAddr, pint_t endAddr); + void beginSection() { newSection = true; symIndex = 0; } +@@ -1063,7 +1063,7 @@ + + + private: +- friend class Section; ++ friend class MRFSection; + + enum SectionType { sectionTypeIgnore, sectionTypeLiteral4, sectionTypeLiteral8, sectionTypeLiteral16, + sectionTypeNonLazy, sectionTypeCFI, sectionTypeCString, sectionTypeCStringPointer, +@@ -1404,7 +1404,7 @@ + // was becuase of a label, the symbol). Returns false when no more chunks. + // + template +-bool Parser::LabelAndCFIBreakIterator::next(Parser& parser, const Section& sect, uint32_t sectNum, pint_t startAddr, pint_t endAddr, ++bool Parser::LabelAndCFIBreakIterator::next(Parser& parser, const MRFSection& sect, uint32_t sectNum, pint_t startAddr, pint_t endAddr, + pint_t* addr, pint_t* size, const macho_nlist

** symbol) + { + // may not be a label on start of section, but need atom demarcation there +@@ -1590,7 +1590,7 @@ + uint32_t sortedSymbolIndexes[_symbolsInSections]; + this->makeSortedSymbolsArray(sortedSymbolIndexes, sortedSectionIndexes); + +- // allocate Section object for each mach-o section ++ // allocate MRFSection object for each mach-o section + makeSections(); + + // if it exists, do special early parsing of __compact_unwind section +@@ -1687,7 +1687,7 @@ + #endif + } + +- Section** sections = _file->_sectionsArray; ++ MRFSection** sections = _file->_sectionsArray; + uint32_t sectionsCount = _file->_sectionsArrayCount; + + // figure out how many atoms will be allocated and allocate +@@ -2208,11 +2208,11 @@ + _file->_objConstraint = ld::File::objcConstraintRetainRelease; + if ( sect->size() > 8 ) { + warning("section %s/%s has unexpectedly large size %llu in %s", +- sect->segname(), Section::makeSectionName(sect), sect->size(), _file->path()); ++ sect->segname(), MRFSection::makeSectionName(sect), sect->size(), _file->path()); + } + } + else { +- warning("can't parse %s/%s section in %s", sect->segname(), Section::makeSectionName(sect), _file->path()); ++ warning("can't parse %s/%s section in %s", sect->segname(), MRFSection::makeSectionName(sect), _file->path()); + } + continue; + } +@@ -2308,24 +2308,24 @@ + // sort by address (mach-o object files don't aways have sections sorted) + ::qsort(machOSects, count, sizeof(MachOSectionAndSectionClass

), MachOSectionAndSectionClass

::sorter); + +- // we will synthesize a dummy Section object for tentative definitions ++ // we will synthesize a dummy MRFSection object for tentative definitions + if ( _tentativeDefinitionCount > 0 ) { + totalSectionsSize += sizeof(TentativeDefinitionSection); + machOSects[count++].type = sectionTypeTentativeDefinitions; + } + +- // we will synthesize a dummy Section object for Absolute symbols ++ // we will synthesize a dummy MRFSection object for Absolute symbols + if ( _absoluteSymbolCount > 0 ) { + totalSectionsSize += sizeof(AbsoluteSymbolSection); + machOSects[count++].type = sectionTypeAbsoluteSymbols; + } + + // allocate one block for all Section objects as well as pointers to each +- uint8_t* space = new uint8_t[totalSectionsSize+count*sizeof(Section*)]; +- _file->_sectionsArray = (Section**)space; ++ uint8_t* space = new uint8_t[totalSectionsSize+count*sizeof(MRFSection*)]; ++ _file->_sectionsArray = (MRFSection**)space; + _file->_sectionsArrayCount = count; +- Section** objects = _file->_sectionsArray; +- space += count*sizeof(Section*); ++ MRFSection** objects = _file->_sectionsArray; ++ space += count*sizeof(MRFSection*); + for (uint32_t i=0; i < count; ++i) { + switch ( machOSects[i].type ) { + case sectionTypeIgnore: +@@ -2413,7 +2413,7 @@ + + + template +-Section* Parser::sectionForAddress(typename A::P::uint_t addr) ++MRFSection* Parser::sectionForAddress(typename A::P::uint_t addr) + { + for (uint32_t i=0; i < _file->_sectionsArrayCount; ++i ) { + const macho_section* sect = _file->_sectionsArray[i]->machoSection(); +@@ -2440,7 +2440,7 @@ + } + + template +-Section* Parser::sectionForNum(unsigned int num) ++MRFSection* Parser::sectionForNum(unsigned int num) + { + for (uint32_t i=0; i < _file->_sectionsArrayCount; ++i ) { + const macho_section* sect = _file->_sectionsArray[i]->machoSection(); +@@ -2456,7 +2456,7 @@ + template + Atom* Parser::findAtomByAddress(pint_t addr) + { +- Section* section = this->sectionForAddress(addr); ++ MRFSection* section = this->sectionForAddress(addr); + return section->findAtomByAddress(addr); + } + +@@ -2513,7 +2513,7 @@ + target.addend = 0; + return; + } +- Section* section = this->sectionForAddress(addr); ++ MRFSection* section = this->sectionForAddress(addr); + target.atom = section->findAtomByAddress(addr); + target.addend = addr - target.atom->_objAddress; + target.weakImport = false; +@@ -2561,7 +2561,7 @@ + } + return; + } +- Section* section = this->sectionForNum(sectNum); ++ MRFSection* section = this->sectionForNum(sectNum); + target.atom = section->findAtomByAddress(addr); + if ( target.atom == NULL ) { + typedef typename A::P::sint_t sint_t; +@@ -3723,7 +3723,7 @@ + } + + template +-const char* Section::makeSegmentName(const macho_section* sect) ++const char* MRFSection::makeSegmentName(const macho_section* sect) + { + // mach-o section record only has room for 16-byte seg/sect names + // so a 16-byte name has no trailing zero +@@ -3736,7 +3736,7 @@ + } + + template +-const char* Section::makeSectionName(const macho_section* sect) ++const char* MRFSection::makeSectionName(const macho_section* sect) + { + const char* name = sect->sectname(); + if ( strlen(name) < 16 ) +@@ -3770,13 +3770,13 @@ + } + + template +-bool Section::readable(const macho_section* sect) ++bool MRFSection::readable(const macho_section* sect) + { + return true; + } + + template +-bool Section::writable(const macho_section* sect) ++bool MRFSection::writable(const macho_section* sect) + { + // mach-o .o files do not contain segment permissions + // we just know TEXT is special +@@ -3784,7 +3784,7 @@ + } + + template +-bool Section::exectuable(const macho_section* sect) ++bool MRFSection::exectuable(const macho_section* sect) + { + // mach-o .o files do not contain segment permissions + // we just know TEXT is special +@@ -3793,7 +3793,7 @@ + + + template +-ld::Section::Type Section::sectionType(const macho_section* sect) ++ld::Section::Type MRFSection::sectionType(const macho_section* sect) + { + switch ( sect->flags() & SECTION_TYPE ) { + case S_ZEROFILL: +@@ -3871,7 +3871,7 @@ + + + template +-Atom* Section::findContentAtomByAddress(pint_t addr, class Atom* start, class Atom* end) ++Atom* MRFSection::findContentAtomByAddress(pint_t addr, class Atom* start, class Atom* end) + { + // do a binary search of atom array + uint32_t atomCount = end - start; +@@ -3903,7 +3903,7 @@ + } + + template +-ld::Atom::Alignment Section::alignmentForAddress(pint_t addr) ++ld::Atom::Alignment MRFSection::alignmentForAddress(pint_t addr) + { + const uint32_t sectionAlignment = this->_machOSection->align(); + uint32_t modulus = (addr % (1 << sectionAlignment)); +@@ -3913,7 +3913,7 @@ + } + + template +-uint32_t Section::sectionNum(class Parser& parser) const ++uint32_t MRFSection::sectionNum(class Parser& parser) const + { + if ( _machOSection == NULL ) + return 0; +@@ -4481,7 +4481,7 @@ + else { + const pint_t* content = (pint_t*)(this->file().fileContent() + this->_machOSection->offset() + reloc->r_address()); + pint_t personalityAddr = *content; +- Section* personalitySection = parser.sectionForAddress(personalityAddr); ++ MRFSection* personalitySection = parser.sectionForAddress(personalityAddr); + assert((personalitySection->type() == ld::Section::typeCode) && "personality column in __compact_unwind section is not pointer to function"); + // atoms may not be constructed yet, so scan symbol table for labels + const char* name = parser.scanSymbolTableForAddress(personalityAddr); +@@ -4501,7 +4501,7 @@ + // support __LD, __compact_unwind personality entries which are pointer to personality non-lazy pointer + const pint_t* content = (pint_t*)(this->file().fileContent() + this->_machOSection->offset() + reloc->r_address()); + pint_t nlPointerAddr = *content; +- Section* nlSection = parser.sectionForAddress(nlPointerAddr); ++ MRFSection* nlSection = parser.sectionForAddress(nlPointerAddr); + if ( nlSection->type() == ld::Section::typeCode ) { + // personality function is defined in this .o file, so this is a direct reference to it + // atoms may not be constructed yet, so scan symbol table for labels +@@ -4528,7 +4528,7 @@ + else { + const pint_t* content = (pint_t*)(this->file().fileContent() + this->_machOSection->offset() + reloc->r_address()); + pint_t personalityAddr = *content; +- Section* personalitySection = parser.sectionForAddress(personalityAddr); ++ MRFSection* personalitySection = parser.sectionForAddress(personalityAddr); + assert((personalitySection->type() == ld::Section::typeCode) && "personality column in __compact_unwind section is not pointer to function"); + // atoms may not be constructed yet, so scan symbol table for labels + const char* name = parser.scanSymbolTableForAddress(personalityAddr); +@@ -4681,7 +4681,7 @@ + + template + SymboledSection::SymboledSection(Parser& parser, File& f, const macho_section* s) +- : Section(f, s), _type(ld::Atom::typeUnclassified) ++ : MRFSection(f, s), _type(ld::Atom::typeUnclassified) + { + switch ( s->flags() & SECTION_TYPE ) { + case S_ZEROFILL: +@@ -4727,7 +4727,7 @@ + if ( ! this->_file.canScatterAtoms() ) + return true; + // call inherited +- return Section::dontDeadStrip(); ++ return MRFSection::dontDeadStrip(); + } + return false; + } +@@ -5572,7 +5572,7 @@ + + + template <> +-uint32_t Section::x86_64PcRelOffset(uint8_t r_type) ++uint32_t MRFSection::x86_64PcRelOffset(uint8_t r_type) + { + switch ( r_type ) { + case X86_64_RELOC_SIGNED: +@@ -5589,7 +5589,7 @@ + + + template <> +-bool Section::addRelocFixup(class Parser& parser, const macho_relocation_info

* reloc) ++bool MRFSection::addRelocFixup(class Parser& parser, const macho_relocation_info

* reloc) + { + const macho_section

* sect = this->machoSection(); + uint64_t srcAddr = sect->addr() + reloc->r_address(); +@@ -5796,7 +5796,7 @@ + + + template <> +-bool Section::addRelocFixup(class Parser& parser, const macho_relocation_info

* reloc) ++bool MRFSection::addRelocFixup(class Parser& parser, const macho_relocation_info

* reloc) + { + const macho_section

* sect = this->machoSection(); + uint32_t srcAddr; +@@ -6037,7 +6037,7 @@ + + #if SUPPORT_ARCH_arm_any + template <> +-bool Section::addRelocFixup(class Parser& parser, const macho_relocation_info

* reloc) ++bool MRFSection::addRelocFixup(class Parser& parser, const macho_relocation_info

* reloc) + { + const macho_section

* sect = this->machoSection(); + bool result = false; +@@ -6495,7 +6495,7 @@ + + #if SUPPORT_ARCH_arm64 + template <> +-bool Section::addRelocFixup(class Parser& parser, const macho_relocation_info

* reloc) ++bool MRFSection::addRelocFixup(class Parser& parser, const macho_relocation_info

* reloc) + { + bool result = false; + Parser::SourceLocation src; +@@ -6893,7 +6893,7 @@ + + #if SUPPORT_ARCH_arm64 + template <> +-void Section::addLOH(class Parser& parser, int kind, int count, const uint64_t addrs[]) { ++void MRFSection::addLOH(class Parser& parser, int kind, int count, const uint64_t addrs[]) { + switch (kind) { + case LOH_ARM64_ADRP_ADRP: + case LOH_ARM64_ADRP_LDR: +@@ -6948,18 +6948,18 @@ + extra.info.delta2 = (count > 1) ? ((addrs[1] - lowestAddress) >> 2) : 0; + extra.info.delta3 = (count > 2) ? ((addrs[2] - lowestAddress) >> 2) : 0; + extra.info.delta4 = (count > 3) ? ((addrs[3] - lowestAddress) >> 2) : 0; +- typename Parser::SourceLocation src(inAtom, lowestAddress- inAtom->objectAddress()); ++ Parser::SourceLocation src(inAtom, lowestAddress- inAtom->objectAddress()); + parser.addFixup(src, ld::Fixup::k1of1, ld::Fixup::kindLinkerOptimizationHint, extra.addend); + } + #endif + + template +-void Section::addLOH(class Parser& parser, int kind, int count, const uint64_t addrs[]) { ++void MRFSection::addLOH(class Parser& parser, int kind, int count, const uint64_t addrs[]) { + + } + + template +-void Section::makeFixups(class Parser& parser, const struct Parser::CFI_CU_InfoArrays&) ++void MRFSection::makeFixups(class Parser& parser, const struct Parser::CFI_CU_InfoArrays&) + { + const macho_section

* sect = this->machoSection(); + const macho_relocation_info

* relocs = (macho_relocation_info

*)(file().fileContent() + sect->reloff()); +@@ -6970,7 +6970,7 @@ + ++r; // skip next + } + catch (const char* msg) { +- throwf("in section %s,%s reloc %u: %s", sect->segname(), Section::makeSectionName(sect), r, msg); ++ throwf("in section %s,%s reloc %u: %s", sect->segname(), MRFSection::makeSectionName(sect), r, msg); + } + } + +diff -ur ld64-236.3.orig/src/ld/passes/dtrace_dof.cpp ld64-236.3/src/ld/passes/dtrace_dof.cpp +--- ld64-236.3.orig/src/ld/passes/dtrace_dof.cpp 2014-04-05 00:42:29.000000000 +0200 ++++ ld64-236.3/src/ld/passes/dtrace_dof.cpp 2015-01-12 00:27:58.000000000 +0100 +@@ -30,8 +30,17 @@ + + #include + #include ++#ifdef __GLIBCXX__ ++#include ++#include ++#define UNORDERED_MAP tr1::unordered_map ++#define UNORDERED_SET tr1::unordered_set ++#else + #include + #include ++#define UNORDERED_MAP unordered_map ++#define UNORDERED_SET unordered_set ++#endif + + #include "ld.hpp" + #include "MachOFileAbstraction.hpp" +@@ -111,8 +120,8 @@ + uint32_t offset; + const char* probeName; + }; +-typedef std::unordered_map, CStringHash, CStringEquals> ProviderToProbes; +-typedef std::unordered_set CStringSet; ++typedef std::UNORDERED_MAP, CStringHash, CStringEquals> ProviderToProbes; ++typedef std::UNORDERED_SET CStringSet; + + + +diff -ur ld64-236.3.orig/src/ld/passes/order.cpp ld64-236.3/src/ld/passes/order.cpp +--- ld64-236.3.orig/src/ld/passes/order.cpp 2014-04-05 00:42:29.000000000 +0200 ++++ ld64-236.3/src/ld/passes/order.cpp 2015-01-11 22:45:57.000000000 +0100 +@@ -32,7 +32,13 @@ + #include + #include + #include ++#ifdef __GLIBCXX__ ++#include ++#define UNORDERED_MAP tr1::unordered_map ++#else + #include ++#define UNORDERED_MAP unordered_map ++#endif + + #include "ld.hpp" + #include "order.h" +@@ -84,7 +90,7 @@ + const Layout& _layout; + }; + +- typedef std::unordered_map NameToAtom; ++ typedef std::UNORDERED_MAP NameToAtom; + + typedef std::map AtomToAtom; + +diff -ur ld64-236.3.orig/src/other/dyldinfo.cpp ld64-236.3/src/other/dyldinfo.cpp +--- ld64-236.3.orig/src/other/dyldinfo.cpp 2014-04-05 00:42:29.000000000 +0200 ++++ ld64-236.3/src/other/dyldinfo.cpp 2015-01-12 00:27:33.000000000 +0100 +@@ -33,7 +33,6 @@ + + #include + #include +-#include + + #include "configure.h" + #include "MachOFileAbstraction.hpp" +diff -ur ld64-236.3.orig/src/other/machochecker.cpp ld64-236.3/src/other/machochecker.cpp +--- ld64-236.3.orig/src/other/machochecker.cpp 2014-04-05 00:42:29.000000000 +0200 ++++ ld64-236.3/src/other/machochecker.cpp 2015-01-11 22:46:37.000000000 +0100 +@@ -33,7 +33,13 @@ + + #include + #include ++#ifdef __GLIBCXX__ ++#include ++#define UNORDERED_SET tr1::unordered_set ++#else + #include ++#define UNORDERED_SET unordered_set ++#endif + + #include "configure.h" + +@@ -124,7 +130,7 @@ + bool operator()(const char* left, const char* right) const { return (strcmp(left, right) == 0); } + }; + +- typedef std::unordered_set StringSet; ++ typedef std::UNORDERED_SET StringSet; + + MachOChecker(const uint8_t* fileContent, uint32_t fileLength, const char* path); + void checkMachHeader(); +diff -ur ld64-236.3.orig/src/other/unwinddump.cpp ld64-236.3/src/other/unwinddump.cpp +--- ld64-236.3.orig/src/other/unwinddump.cpp 2014-04-05 00:42:29.000000000 +0200 ++++ ld64-236.3/src/other/unwinddump.cpp 2015-01-11 23:58:00.000000000 +0100 +@@ -33,7 +33,6 @@ + + #include + #include +-#include + + #include "configure.h" + #include "MachOFileAbstraction.hpp" diff --git a/sys-devel/binutils-apple/files/ld64-236.3-missing-cputypes.patch b/sys-devel/binutils-apple/files/ld64-236.3-missing-cputypes.patch new file mode 100644 index 000000000000..29b50f628122 --- /dev/null +++ b/sys-devel/binutils-apple/files/ld64-236.3-missing-cputypes.patch @@ -0,0 +1,10 @@ +--- ld64-236.3/src/include/mach/machine.h.orig 2015-01-24 13:22:36.000000000 +0100 ++++ ld64-236.3/src/include/mach/machine.h 2015-01-24 13:22:51.000000000 +0100 +@@ -233,6 +233,7 @@ + */ + + #define CPU_SUBTYPE_I386_ALL ((cpu_subtype_t) 3) ++#define CPU_SUBTYPE_X86_ALL CPU_SUBTYPE_I386_ALL + #define CPU_SUBTYPE_X86_64_ALL CPU_SUBTYPE_I386_ALL + #define CPU_SUBTYPE_386 ((cpu_subtype_t) 3) + #define CPU_SUBTYPE_486 ((cpu_subtype_t) 4) diff --git a/sys-devel/binutils-apple/files/ld64-236.3-noarm.patch b/sys-devel/binutils-apple/files/ld64-236.3-noarm.patch new file mode 100644 index 000000000000..5a235ec85e32 --- /dev/null +++ b/sys-devel/binutils-apple/files/ld64-236.3-noarm.patch @@ -0,0 +1,1236 @@ +Fully conditionalise arm support so it can be disabled on 10.4. + +--- ld64-236.3/src/ld/HeaderAndLoadCommands.hpp.orig 2015-01-23 06:55:36.000000000 +0100 ++++ ld64-236.3/src/ld/HeaderAndLoadCommands.hpp 2015-01-23 06:56:04.000000000 +0100 +@@ -605,8 +605,12 @@ + + template <> uint32_t HeaderAndLoadCommandsAtom::cpuType() const { return CPU_TYPE_I386; } + template <> uint32_t HeaderAndLoadCommandsAtom::cpuType() const { return CPU_TYPE_X86_64; } ++#if SUPPORT_ARCH_arm_any + template <> uint32_t HeaderAndLoadCommandsAtom::cpuType() const { return CPU_TYPE_ARM; } ++#endif ++#if SUPPORT_ARCH_arm64 + template <> uint32_t HeaderAndLoadCommandsAtom::cpuType() const { return CPU_TYPE_ARM64; } ++#endif + + + +@@ -625,17 +629,21 @@ + return _state.cpuSubType; + } + ++#if SUPPORT_ARCH_arm_any + template <> + uint32_t HeaderAndLoadCommandsAtom::cpuSubType() const + { + return _state.cpuSubType; + } ++#endif + ++#if SUPPORT_ARCH_arm64 + template <> + uint32_t HeaderAndLoadCommandsAtom::cpuSubType() const + { + return CPU_SUBTYPE_ARM64_ALL; + } ++#endif + + + +--- ld64-236.3/src/ld/LinkEdit.hpp.orig 2015-01-23 06:55:36.000000000 +0100 ++++ ld64-236.3/src/ld/LinkEdit.hpp 2015-01-23 06:56:04.000000000 +0100 +@@ -1595,6 +1595,7 @@ + for (ld::Fixup::iterator fit = atom->fixupsBegin(); fit != atom->fixupsEnd(); ++fit) { + if ( fit->kind != ld::Fixup::kindLinkerOptimizationHint) + continue; ++#if SUPPORT_ARCH_arm64 + ld::Fixup::LOH_arm64 extra; + extra.addend = fit->u.addend; + _encodedData.append_uleb128(extra.info.kind); +@@ -1606,6 +1607,7 @@ + _encodedData.append_uleb128((extra.info.delta3 << 2) + fit->offsetInAtom + address); + if ( extra.info.count > 2 ) + _encodedData.append_uleb128((extra.info.delta4 << 2) + fit->offsetInAtom + address); ++#endif + } + } + } +--- ld64-236.3/src/ld/Options.cpp.orig 2015-01-23 06:55:36.000000000 +0100 ++++ ld64-236.3/src/ld/Options.cpp 2015-01-23 07:05:43.000000000 +0100 +@@ -567,8 +567,13 @@ + #endif + } + break; ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: ++#endif ++#if SUPPORT_ARCH_arm64 + case CPU_TYPE_ARM64: ++#endif ++#if SUPPORT_ARCH_arm_any || SUPPORT_ARCH_arm64 + if ( (fMacVersionMin == ld::macVersionUnset) && (fIOSVersionMin == ld::iOSVersionUnset) && (fOutputKind != Options::kObjectFile) ) { + #if defined(DEFAULT_IPHONEOS_MIN_VERSION) + warning("-ios_version_min not specified, assuming " DEFAULT_IPHONEOS_MIN_VERSION); +@@ -579,6 +584,7 @@ + #endif + } + break; ++#endif + } + #ifdef SUPPORT_SNAPSHOTS + fLinkSnapshot.recordArch(fArchitectureName); +@@ -1649,9 +1655,11 @@ + symbolStart = NULL; + } + else if ( strncmp(symbolStart, "arm:", 4) == 0 ) { ++#if SUPPORT_ARCH_arm_any + if ( fArchitecture == CPU_TYPE_ARM ) + symbolStart = &symbolStart[4]; + else ++#endif + symbolStart = NULL; + } + if ( symbolStart != NULL ) { +@@ -3483,6 +3491,7 @@ + #endif + } + break; ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + if ( (fOutputKind != Options::kObjectFile) && (fOutputKind != Options::kPreload) ) { + #if defined(DEFAULT_IPHONEOS_MIN_VERSION) +@@ -3494,6 +3503,7 @@ + #endif + } + break; ++#endif + default: + // architecture will be infered later by examining .o files + break; +@@ -3516,12 +3526,14 @@ + fMacVersionMin = ld::mac10_4; + } + break; ++#if SUPPORT_ARCH_arm64 + case CPU_TYPE_ARM64: + if ( fIOSVersionMin < ld::iOS_7_0 ) { + //warning("-mios_version_min should be 7.0 or later for arm64"); + fIOSVersionMin = ld::iOS_7_0; + } + break; ++#endif + } + + // default to adding functions start for dynamic code, static code must opt-in +@@ -3561,6 +3573,7 @@ + fAllowTextRelocs = true; + fUndefinedTreatment = kUndefinedDynamicLookup; + break; ++#if SUPPORT_ARCH_arm64 + case CPU_TYPE_ARM64: + // arm64 uses new MH_KEXT_BUNDLE type + fMakeCompressedDyldInfo = false; +@@ -3569,6 +3582,8 @@ + fKextsUseStubs = true; + fUndefinedTreatment = kUndefinedDynamicLookup; + break; ++#endif ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + if ( fIOSVersionMin >= ld::iOS_5_0 ) { + // iOS 5.0 and later use new MH_KEXT_BUNDLE type +@@ -3580,6 +3595,7 @@ + fUndefinedTreatment = kUndefinedDynamicLookup; + break; + } ++#endif + // else use object file + case CPU_TYPE_I386: + // use .o files +@@ -3632,6 +3648,7 @@ + if ( fSplitSegs && (fBaseWritableAddress-fBaseAddress != 0x10000000) ) + fBaseWritableAddress = fBaseAddress + 0x10000000; + break; ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + if ( fOutputKind != Options::kDynamicLibrary ) { + fSplitSegs = false; +@@ -3642,6 +3659,7 @@ + fBaseWritableAddress = fBaseAddress + 0x08000000; + } + break; ++#endif + default: + fSplitSegs = false; + fBaseAddress = 0; +@@ -3656,6 +3674,7 @@ + break; + case CPU_TYPE_X86_64: + break; ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + switch ( fOutputKind ) { + case Options::kDynamicExecutable: +@@ -3678,6 +3697,7 @@ + fBaseAddress = 0; + } + break; ++#endif + } + + // -r implies no prebinding for all architectures +@@ -3723,6 +3743,7 @@ + case CPU_TYPE_X86_64: + fPrebind = false; + break; ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + switch ( fOutputKind ) { + case Options::kDynamicExecutable: +@@ -3740,6 +3761,7 @@ + break; + } + break; ++#endif + } + } + +@@ -3766,10 +3788,12 @@ + case CPU_TYPE_I386: + if ( fIOSVersionMin != ld::iOSVersionUnset ) // simulator never needs modules + break; ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + if ( fPrebind ) + fNeedsModuleTable = true; // redo_prebinding requires a module table + break; ++#endif + } + } + +@@ -3993,7 +3993,9 @@ + switch ( fArchitecture ) { + case CPU_TYPE_I386: + case CPU_TYPE_X86_64: ++#if SUPPORT_ARCH_arm64 + case CPU_TYPE_ARM64: ++#endif + switch ( fOutputKind ) { + case Options::kObjectFile: + case Options::kStaticExecutable: +@@ -4010,10 +4012,12 @@ + break; + } + break; ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + fAddCompactUnwindEncoding = false; + fRemoveDwarfUnwindIfCompactExists = false; + break; ++#endif + case 0: + // if -arch is missing, assume we don't want compact unwind info + fAddCompactUnwindEncoding = false; +@@ -3815,7 +3843,15 @@ + // only iOS main executables should be encrypted + if ( fOutputKind != Options::kDynamicExecutable ) + fEncryptable = false; +- if ( (fArchitecture != CPU_TYPE_ARM) && (fArchitecture != CPU_TYPE_ARM64) ) ++ if ( ++#if SUPPORT_ARCH_arm_any ++ (fArchitecture != CPU_TYPE_ARM) && ++#endif ++#if SUPPORT_ARCH_arm64 ++ (fArchitecture != CPU_TYPE_ARM64) && ++#endif ++ 1 ++ ) + fEncryptable = false; + + // don't move inits in dyld because dyld wants certain +@@ -3867,11 +3903,15 @@ + + // only ARM and x86_64 enforces that cpu-sub-types must match + switch ( fArchitecture ) { ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: ++#endif + case CPU_TYPE_X86_64: + break; + case CPU_TYPE_I386: ++#if SUPPORT_ARCH_arm64 + case CPU_TYPE_ARM64: ++#endif + fAllowCpuSubtypeMismatches = true; + break; + } +@@ -3917,6 +3957,7 @@ + fPositionIndependentExecutable = true; + } + ++#if SUPPORT_ARCH_arm_any + // armv7 for iOS4.3 defaults to PIE + if ( (fArchitecture == CPU_TYPE_ARM) + && fArchSupportsThumb2 +@@ -3924,15 +3965,18 @@ + && (fIOSVersionMin >= ld::iOS_4_3) ) { + fPositionIndependentExecutable = true; + } ++#endif + + // -no_pie anywhere on command line disable PIE + if ( fDisablePositionIndependentExecutable ) + fPositionIndependentExecutable = false; + ++#if SUPPORT_ARCH_arm64 + // arm64 is always PIE + if ( (fArchitecture == CPU_TYPE_ARM64) && (fOutputKind == kDynamicExecutable) ) { + fPositionIndependentExecutable = true; + } ++#endif + + // set fOutputSlidable + switch ( fOutputKind ) { +@@ -3958,9 +4002,11 @@ + if ( fMacVersionMin >= ld::mac10_7 ) { + fTLVSupport = true; + } ++#if SUPPORT_ARCH_arm64 + else if ( (fArchitecture == CPU_TYPE_ARM64) && (fIOSVersionMin >= 0x00080000) ) { + fTLVSupport = true; + } ++#endif + + // default to adding version load command for dynamic code, static code must opt-in + switch ( fOutputKind ) { +@@ -4149,6 +4195,7 @@ + } + + // ARM64 needs 16KB page size for user land code ++#if SUPPORT_ARCH_arm64 + if ( fArchitecture == CPU_TYPE_ARM64 ) { + if ( fSegmentAlignment == 4096 ) { + switch ( fOutputKind ) { +@@ -4166,6 +4213,7 @@ + } + } + } ++#endif + + // linker should not convert dwarf unwind if .o file has compact unwind section + switch ( fOutputKind ) { +@@ -4267,12 +4315,16 @@ + if ( fStackAddr != 0 ) { + switch (fArchitecture) { + case CPU_TYPE_I386: ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: ++#endif + if ( fStackAddr > 0xFFFFFFFFULL ) + throw "-stack_addr must be < 4G for 32-bit processes"; + break; + case CPU_TYPE_X86_64: ++#if SUPPORT_ARCH_arm64 + case CPU_TYPE_ARM64: ++#endif + break; + } + if ( (fStackAddr & -4096) != fStackAddr ) +@@ -4293,6 +4345,7 @@ + if ( (fStackAddr > 0xB0000000ULL) && ((fStackAddr-fStackSize) < 0xB0000000ULL) ) + warning("custom stack placement overlaps and will disable shared region"); + break; ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + if ( fStackSize > 0x2F000000 ) + throw "-stack_size must be < 752MB"; +@@ -4301,11 +4354,13 @@ + if ( fStackAddr > 0x30000000ULL) + throw "-stack_addr must be < 0x30000000 for arm"; + break; ++#endif + case CPU_TYPE_X86_64: + if ( fStackAddr == 0 ) { + fStackAddr = 0x00007FFF5C000000ULL; + } + break; ++#if SUPPORT_ARCH_arm64 + case CPU_TYPE_ARM64: + if ( fStackSize > 0x20000000 ) + throw "-stack_size must be < 512MB"; +@@ -4313,6 +4368,7 @@ + fStackAddr = 0x120000000ULL; + } + break; ++#endif + } + if ( (fStackSize & -4096) != fStackSize ) + throw "-stack_size must be multiples of 4K"; +@@ -4422,8 +4478,12 @@ + alterObjC1ClassNamesToObjC2 = true; + break; + case CPU_TYPE_X86_64: ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: ++#endif ++#if SUPPORT_ARCH_arm64 + case CPU_TYPE_ARM64: ++#endif + alterObjC1ClassNamesToObjC2 = true; + break; + } +@@ -4799,11 +4799,15 @@ + // zero page size not specified on command line, set default + switch (fArchitecture) { + case CPU_TYPE_I386: ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: ++#endif + // first 4KB for 32-bit architectures + fZeroPageSize = 0x1000; + break; ++#if SUPPORT_ARCH_arm64 + case CPU_TYPE_ARM64: ++#endif + case CPU_TYPE_X86_64: + // first 4GB for x86_64 on all OS's + fZeroPageSize = 0x100000000ULL; +@@ -4621,9 +4685,11 @@ + + // -force_cpusubtype_ALL is not supported for ARM + if ( fForceSubtypeAll ) { ++#if SUPPORT_ARCH_arm_any + if ( fArchitecture == CPU_TYPE_ARM ) { + warning("-force_cpusubtype_ALL will become unsupported for ARM architectures"); + } ++#endif + } + + // -reexported_symbols_list can only be used with -dynamiclib +--- ld64-236.3/src/ld/OutputFile.cpp.orig 2015-01-23 06:55:36.000000000 +0100 ++++ ld64-236.3/src/ld/OutputFile.cpp 2015-01-23 06:56:04.000000000 +0100 +@@ -629,7 +629,12 @@ + // is encoded in mach-o the same as: + // .long _foo + 0x40000000 + // so if _foo lays out to 0xC0000100, the first is ok, but the second is not. +- if ( (_options.architecture() == CPU_TYPE_ARM) || (_options.architecture() == CPU_TYPE_I386) ) { ++ if ( ++#if SUPPORT_ARCH_arm_any ++ (_options.architecture() == CPU_TYPE_ARM) || ++#endif ++ (_options.architecture() == CPU_TYPE_I386) || ++ 0) { + // Unlikely userland code does funky stuff like this, so warn for them, but not warn for -preload or -static + if ( (_options.outputKind() != Options::kPreload) && (_options.outputKind() != Options::kStaticExecutable) ) { + warning("32-bit absolute address out of range (0x%08llX max is 4GB): from %s + 0x%08X (0x%08llX) to 0x%08llX", +@@ -1229,22 +1234,26 @@ + return false; + const ld::Fixup* f; + switch ( fixup->kind ) { ++#if SUPPORT_ARCH_arm64 + case ld::Fixup::kindStoreTargetAddressARM64Page21: + return !mustBeGOT; + case ld::Fixup::kindStoreTargetAddressARM64GOTLoadPage21: + case ld::Fixup::kindStoreTargetAddressARM64GOTLeaPage21: + return true; ++#endif + case ld::Fixup::kindSetTargetAddress: + f = fixup; + do { + ++f; + } while ( ! f->lastInCluster() ); + switch (f->kind ) { ++#if SUPPORT_ARCH_arm64 + case ld::Fixup::kindStoreARM64Page21: + return !mustBeGOT; + case ld::Fixup::kindStoreARM64GOTLoadPage21: + case ld::Fixup::kindStoreARM64GOTLeaPage21: + return true; ++#endif + default: + break; + } +@@ -1261,22 +1270,26 @@ + return false; + const ld::Fixup* f; + switch ( fixup->kind ) { ++#if SUPPORT_ARCH_arm64 + case ld::Fixup::kindStoreTargetAddressARM64PageOff12: + return !mustBeGOT; + case ld::Fixup::kindStoreTargetAddressARM64GOTLoadPageOff12: + case ld::Fixup::kindStoreTargetAddressARM64GOTLeaPageOff12: + return true; ++#endif + case ld::Fixup::kindSetTargetAddress: + f = fixup; + do { + ++f; + } while ( ! f->lastInCluster() ); + switch (f->kind ) { ++#if SUPPORT_ARCH_arm64 + case ld::Fixup::kindStoreARM64PageOff12: + return !mustBeGOT; + case ld::Fixup::kindStoreARM64GOTLoadPageOff12: + case ld::Fixup::kindStoreARM64GOTLeaPageOff12: + return true; ++#endif + default: + break; + } +@@ -1311,7 +1324,9 @@ + std::map usedByHints; + for (ld::Fixup::iterator fit = atom->fixupsBegin(), end=atom->fixupsEnd(); fit != end; ++fit) { + uint8_t* fixUpLocation = &buffer[fit->offsetInAtom]; ++#if SUPPORT_ARCH_arm64 + ld::Fixup::LOH_arm64 lohExtra; ++#endif + switch ( (ld::Fixup::Kind)(fit->kind) ) { + case ld::Fixup::kindNone: + case ld::Fixup::kindNoneFollowOn: +@@ -1570,6 +1585,7 @@ + break; + case ld::Fixup::kindLinkerOptimizationHint: + // expand table of address/offsets used by hints ++#if SUPPORT_ARCH_arm64 + lohExtra.addend = fit->u.addend; + usedByHints[fit->offsetInAtom + (lohExtra.info.delta1 << 2)] = NULL; + if ( lohExtra.info.count > 0 ) +@@ -1578,6 +1594,7 @@ + usedByHints[fit->offsetInAtom + (lohExtra.info.delta3 << 2)] = NULL; + if ( lohExtra.info.count > 2 ) + usedByHints[fit->offsetInAtom + (lohExtra.info.delta4 << 2)] = NULL; ++#endif + break; + case ld::Fixup::kindStoreTargetAddressLittleEndian32: + accumulator = addressOf(state, fit, &toTarget); +@@ -2057,6 +2074,7 @@ + //uint8_t loadSize, destReg; + //uint32_t scaledOffset; + //uint32_t imm12; ++#if SUPPORT_ARCH_arm64 + ld::Fixup::LOH_arm64 alt; + alt.addend = fit->u.addend; + setInfo(state, atom, buffer, usedByHints, fit->offsetInAtom, (alt.info.delta1 << 2), &infoA); +@@ -2415,6 +2433,7 @@ + fprintf(stderr, "unknown hint kind %d alt.info.kind at 0x%08llX\n", alt.info.kind, infoA.instructionAddress); + break; + } ++#endif + } + // apply hints pass 2 + for (ld::Fixup::iterator fit = atom->fixupsBegin(), end=atom->fixupsEnd(); fit != end; ++fit) { +@@ -2422,6 +2441,7 @@ + continue; + InstructionInfo infoA; + InstructionInfo infoB; ++#if SUPPORT_ARCH_arm64 + ld::Fixup::LOH_arm64 alt; + alt.addend = fit->u.addend; + setInfo(state, atom, buffer, usedByHints, fit->offsetInAtom, (alt.info.delta1 << 2), &infoA); +@@ -2453,6 +2473,7 @@ + } + break; + } ++#endif + } + } + +@@ -2469,6 +2490,7 @@ + for (uint8_t* p=from; p < to; ++p) + *p = 0x90; + break; ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + if ( thumb ) { + for (uint8_t* p=from; p < to; p += 2) +@@ -2479,6 +2501,7 @@ + OSWriteLittleInt32((uint32_t*)p, 0, 0xe1a00000); + } + break; ++#endif + default: + for (uint8_t* p=from; p < to; ++p) + *p = 0x00; +@@ -2807,7 +2830,11 @@ + + // in -r mode, clarify symbolTableNotInFinalLinkedImages + if ( _options.outputKind() == Options::kObjectFile ) { +- if ( (_options.architecture() == CPU_TYPE_X86_64) || (_options.architecture() == CPU_TYPE_ARM64) ) { ++ if ( (_options.architecture() == CPU_TYPE_X86_64) || ++#if SUPPORT_ARCH_arm64 ++ (_options.architecture() == CPU_TYPE_ARM64) || ++#endif ++ 0 ) { + // x86_64 .o files need labels on anonymous literal strings + if ( (sect->type() == ld::Section::typeCString) && (atom->combine() == ld::Atom::combineByNameAndContent) ) { + (const_cast(atom))->setSymbolTableInclusion(ld::Atom::symbolTableIn); +@@ -4030,8 +4057,10 @@ + if ( _options.sharedRegionEligible() ) { + // when range checking, ignore high byte of arm64 addends + uint64_t checkAddend = addend; ++#if SUPPORT_ARCH_arm64 + if ( _options.architecture() == CPU_TYPE_ARM64 ) + checkAddend &= 0x0FFFFFFFFFFFFFFFULL; ++#endif + if ( checkAddend != 0 ) { + // make sure the addend does not cause the pointer to point outside the target's segment + // if it does, update_dyld_shared_cache will not be able to put this dylib into the shared cache +@@ -4238,12 +4267,17 @@ + + bool OutputFile::useExternalSectionReloc(const ld::Atom* atom, const ld::Atom* target, ld::Fixup* fixupWithTarget) + { +- if ( (_options.architecture() == CPU_TYPE_X86_64) || (_options.architecture() == CPU_TYPE_ARM64) ) { ++ if ( (_options.architecture() == CPU_TYPE_X86_64) || ++#if SUPPORT_ARCH_arm64 ++ (_options.architecture() == CPU_TYPE_ARM64) || ++#endif ++ 0) { + // x86_64 and ARM64 use external relocations for everthing that has a symbol + return ( target->symbolTableInclusion() != ld::Atom::symbolTableNotIn ); + } + + // support arm branch interworking in -r mode ++#if SUPPORT_ARCH_arm_any + if ( (_options.architecture() == CPU_TYPE_ARM) && (_options.outputKind() == Options::kObjectFile) ) { + if ( atom->isThumb() != target->isThumb() ) { + switch ( fixupWithTarget->kind ) { +@@ -4257,6 +4291,7 @@ + } + } + } ++#endif + + if ( (_options.architecture() == CPU_TYPE_I386) && (_options.outputKind() == Options::kObjectFile) ) { + if ( target->contentType() == ld::Atom::typeTLV ) +@@ -4324,7 +4359,11 @@ + bool minusTargetUsesExternalReloc = (minusTarget != NULL) && this->useExternalSectionReloc(atom, minusTarget, fixupWithMinusTarget); + + // in x86_64 and arm64 .o files an external reloc means the content contains just the addend +- if ( (_options.architecture() == CPU_TYPE_X86_64) ||(_options.architecture() == CPU_TYPE_ARM64) ) { ++ if ( (_options.architecture() == CPU_TYPE_X86_64) || ++#if SUPPORT_ARCH_arm64 ++ (_options.architecture() == CPU_TYPE_ARM64) || ++#endif ++ 0 ) { + if ( targetUsesExternalReloc ) { + fixupWithTarget->contentAddendOnly = true; + fixupWithStore->contentAddendOnly = true; +--- ld64-236.3/src/ld/parsers/archive_file.cpp.orig 2015-01-23 06:55:36.000000000 +0100 ++++ ld64-236.3/src/ld/parsers/archive_file.cpp 2015-01-23 06:56:04.000000000 +0100 +@@ -232,8 +232,12 @@ + + template <> cpu_type_t File::architecture() { return CPU_TYPE_I386; } + template <> cpu_type_t File::architecture() { return CPU_TYPE_X86_64; } ++#if SUPPORT_ARCH_arm_any + template <> cpu_type_t File::architecture() { return CPU_TYPE_ARM; } ++#endif ++#if SUPPORT_ARCH_arm64 + template <> cpu_type_t File::architecture() { return CPU_TYPE_ARM64; } ++#endif + + + template +--- ld64-236.3/src/ld/parsers/macho_dylib_file.cpp.orig 2015-01-23 06:55:36.000000000 +0100 ++++ ld64-236.3/src/ld/parsers/macho_dylib_file.cpp 2015-01-23 07:01:27.000000000 +0100 +@@ -250,11 +250,15 @@ + bool File::_s_logHashtable = false; + + template <> const char* File::objCInfoSegmentName() { return "__DATA"; } ++#if SUPPORT_ARCH_arm_any + template <> const char* File::objCInfoSegmentName() { return "__DATA"; } ++#endif + template const char* File::objCInfoSegmentName() { return "__OBJC"; } + + template <> const char* File::objCInfoSectionName() { return "__objc_imageinfo"; } ++#if SUPPORT_ARCH_arm_any + template <> const char* File::objCInfoSectionName() { return "__objc_imageinfo"; } ++#endif + template const char* File::objCInfoSectionName() { return "__image_info"; } + + template +@@ -1006,6 +1010,7 @@ + } + } + ++#if SUPPORT_ARCH_arm_any + template <> + bool Parser::validFile(const uint8_t* fileContent, bool executableOrDyliborBundle) + { +@@ -1032,9 +1037,11 @@ + return false; + } + } ++#endif + + + ++#if SUPPORT_ARCH_arm64 + template <> + bool Parser::validFile(const uint8_t* fileContent, bool executableOrDyliborBundle) + { +@@ -1061,6 +1068,7 @@ + return false; + } + } ++#endif + + + bool isDylibFile(const uint8_t* fileContent, cpu_type_t* result, cpu_subtype_t* subResult) +@@ -1084,17 +1084,21 @@ + *subResult = CPU_SUBTYPE_X86_ALL; + return true; + } ++#if SUPPORT_ARCH_arm_any + if ( Parser::validFile(fileContent, false) ) { + *result = CPU_TYPE_ARM; + const macho_header >* header = (const macho_header >*)fileContent; + *subResult = header->cpusubtype(); + return true; + } ++#endif ++#if SUPPORT_ARCH_arm64 + if ( Parser::validFile(fileContent, false) ) { + *result = CPU_TYPE_ARM64; + *subResult = CPU_SUBTYPE_ARM64_ALL; + return true; + } ++#endif + #ifdef SUPPORT_ARCH_ppc + if ( Parser::validFile(fileContent, false) ) { + *result = CPU_TYPE_POWERPC; +@@ -1123,6 +1135,7 @@ + return "x86_64"; + } + ++#if SUPPORT_ARCH_arm_any + template <> + const char* Parser::fileKind(const uint8_t* fileContent) + { +@@ -1138,6 +1151,7 @@ + } + return "arm???"; + } ++#endif + + #if SUPPORT_ARCH_arm64 + template <> +@@ -1163,9 +1177,11 @@ + if ( Parser::validFile(fileContent, true) ) { + return Parser::fileKind(fileContent); + } ++#if SUPPORT_ARCH_arm_any + if ( Parser::validFile(fileContent, true) ) { + return Parser::fileKind(fileContent); + } ++#endif + #if SUPPORT_ARCH_arm64 + if ( Parser::validFile(fileContent, false) ) { + return Parser::fileKind(fileContent); +--- ld64-236.3/src/ld/parsers/macho_relocatable_file.cpp.orig 2015-01-23 06:55:36.000000000 +0100 ++++ ld64-236.3/src/ld/parsers/macho_relocatable_file.cpp 2015-01-23 07:02:23.000000000 +0100 +@@ -861,6 +861,7 @@ + } + } + ++#if SUPPORT_ARCH_arm_any + template <> + void Atom::verifyAlignment(const macho_section

&) const + { +@@ -869,6 +870,7 @@ + warning("ARM function not 4-byte aligned: %s from %s", this->name(), this->file()->path()); + } + } ++#endif + + #if SUPPORT_ARCH_arm64 + template <> +@@ -1218,6 +1220,7 @@ + return true; + } + ++#if SUPPORT_ARCH_arm_any + template <> + bool Parser::validFile(const uint8_t* fileContent, bool subtypeMustMatch, cpu_subtype_t subtype) + { +@@ -1238,8 +1241,10 @@ + } + return true; + } ++#endif + + ++#if SUPPORT_ARCH_arm64 + template <> + bool Parser::validFile(const uint8_t* fileContent, bool subtypeMustMatch, cpu_subtype_t subtype) + { +@@ -1252,6 +1257,7 @@ + return false; + return true; + } ++#endif + + + template <> +@@ -1276,6 +1282,7 @@ + return "x86_64"; + } + ++#if SUPPORT_ARCH_arm_any + template <> + const char* Parser::fileKind(const uint8_t* fileContent) + { +@@ -1291,6 +1298,7 @@ + } + return "arm???"; + } ++#endif + + #if SUPPORT_ARCH_arm64 + template <> +@@ -1802,8 +1810,12 @@ + + template <> uint8_t Parser::loadCommandSizeMask() { return 0x03; } + template <> uint8_t Parser::loadCommandSizeMask() { return 0x07; } ++#if SUPPORT_ARCH_arm_any + template <> uint8_t Parser::loadCommandSizeMask() { return 0x03; } ++#endif ++#if SUPPORT_ARCH_arm64 + template <> uint8_t Parser::loadCommandSizeMask() { return 0x07; } ++#endif + + template + bool Parser::parseLoadCommands() +@@ -3921,8 +3933,10 @@ + return 1 + (this->_machOSection - parser.firstMachOSection()); + } + ++#if SUPPORT_ARCH_arm_any + // arm does not have zero cost exceptions + template <> uint32_t CFISection::cfiCount() { return 0; } ++#endif + + template + uint32_t CFISection::cfiCount() +@@ -4050,6 +4064,7 @@ + + + ++#if SUPPORT_ARCH_arm_any + template <> + void CFISection::cfiParse(class Parser& parser, uint8_t* buffer, + libunwind::CFI_Atom_Info::OAS>::CFI_Atom_Info cfiArray[], +@@ -4058,6 +4073,7 @@ + // arm does not use zero cost exceptions + assert(count == 0); + } ++#endif + + template <> + void CFISection::cfiParse(class Parser& parser, uint8_t* buffer, +@@ -4159,8 +4175,12 @@ + + template <> bool CFISection::bigEndian() { return false; } + template <> bool CFISection::bigEndian() { return false; } ++#if SUPPORT_ARCH_arm_any + template <> bool CFISection::bigEndian() { return false; } ++#endif ++#if SUPPORT_ARCH_arm64 + template <> bool CFISection::bigEndian() { return false; } ++#endif + + + template <> +@@ -5077,11 +5097,13 @@ + return ld::Fixup::kindStoreLittleEndian32; + } + ++#if SUPPORT_ARCH_arm_any + template <> + ld::Fixup::Kind NonLazyPointerSection::fixupKind() + { + return ld::Fixup::kindStoreLittleEndian32; + } ++#endif + + template <> + ld::Fixup::Kind NonLazyPointerSection::fixupKind() +@@ -7170,10 +7192,14 @@ + return ( mach_o::relocatable::Parser::validFile(fileContent) ); + case CPU_TYPE_I386: + return ( mach_o::relocatable::Parser::validFile(fileContent) ); ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + return ( mach_o::relocatable::Parser::validFile(fileContent, opts.objSubtypeMustMatch, opts.subType) ); ++#endif ++#if SUPPORT_ARCH_arm64 + case CPU_TYPE_ARM64: + return ( mach_o::relocatable::Parser::validFile(fileContent, opts.objSubtypeMustMatch, opts.subType) ); ++#endif + } + return false; + } +@@ -7194,17 +7220,21 @@ + *subResult = CPU_SUBTYPE_X86_ALL; + return true; + } ++#if SUPPORT_ARCH_arm_any + if ( mach_o::relocatable::Parser::validFile(fileContent, false, 0) ) { + *result = CPU_TYPE_ARM; + const macho_header >* header = (const macho_header >*)fileContent; + *subResult = header->cpusubtype(); + return true; + } ++#endif ++#if SUPPORT_ARCH_arm_any + if ( mach_o::relocatable::Parser::validFile(fileContent, false, 0) ) { + *result = CPU_TYPE_ARM64; + *subResult = CPU_SUBTYPE_ARM64_ALL; + return true; + } ++#endif + return false; + } + +@@ -7219,9 +7249,11 @@ + if ( mach_o::relocatable::Parser::validFile(fileContent) ) { + return mach_o::relocatable::Parser::fileKind(fileContent); + } ++#if SUPPORT_ARCH_arm_any + if ( mach_o::relocatable::Parser::validFile(fileContent, false, 0) ) { + return mach_o::relocatable::Parser::fileKind(fileContent); + } ++#endif + return NULL; + } + +@@ -7233,9 +7265,11 @@ + if ( mach_o::relocatable::Parser::validFile(fileContent) ) { + return mach_o::relocatable::Parser::hasObjC2Categories(fileContent); + } ++#if SUPPORT_ARCH_arm_any + else if ( mach_o::relocatable::Parser::validFile(fileContent, false, 0) ) { + return mach_o::relocatable::Parser::hasObjC2Categories(fileContent); + } ++#endif + else if ( mach_o::relocatable::Parser::validFile(fileContent, false, 0) ) { + return mach_o::relocatable::Parser::hasObjC2Categories(fileContent); + } +--- ld64-236.3/src/ld/passes/branch_island.cpp.orig 2015-01-23 06:55:36.000000000 +0100 ++++ ld64-236.3/src/ld/passes/branch_island.cpp 2015-01-23 06:56:04.000000000 +0100 +@@ -284,6 +284,7 @@ + static uint64_t textSizeWhenMightNeedBranchIslands(const Options& opts, bool seenThumbBranch) + { + switch ( opts.architecture() ) { ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + if ( ! seenThumbBranch ) + return 32000000; // ARM can branch +/- 32MB +@@ -292,6 +293,7 @@ + else + return 4000000; // thumb1 can branch +/- 4MB + break; ++#endif + } + assert(0 && "unexpected architecture"); + return 0x100000000LL; +@@ -301,6 +303,7 @@ + static uint64_t maxDistanceBetweenIslands(const Options& opts, bool seenThumbBranch) + { + switch ( opts.architecture() ) { ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + if ( ! seenThumbBranch ) + return 30*1024*1024; // 2MB of branch islands per 32MB +@@ -309,6 +312,7 @@ + else + return 3500000; // 0.5MB of branch islands per 4MB + break; ++#endif + } + assert(0 && "unexpected architecture"); + return 0x100000000LL; +@@ -653,8 +657,10 @@ + + // only ARM needs branch islands + switch ( opts.architecture() ) { ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + break; ++#endif + default: + return; + } +--- ld64-236.3/src/ld/passes/branch_shim.cpp.orig 2015-01-23 06:55:36.000000000 +0100 ++++ ld64-236.3/src/ld/passes/branch_shim.cpp 2015-01-23 06:56:04.000000000 +0100 +@@ -276,6 +276,9 @@ + // + void doPass(const Options& opts, ld::Internal& state) + { ++#if !SUPPORT_ARCH_arm_any ++ return; ++#else + // only make branch shims in final linked images + if ( opts.outputKind() == Options::kObjectFile ) + return; +@@ -386,6 +389,7 @@ + // append all new shims to end of __text + sect->atoms.insert(sect->atoms.end(), shims.begin(), shims.end()); + } ++#endif + } + + +--- ld64-236.3/src/ld/passes/dtrace_dof.cpp.orig 2015-01-23 06:55:36.000000000 +0100 ++++ ld64-236.3/src/ld/passes/dtrace_dof.cpp 2015-01-23 06:56:04.000000000 +0100 +@@ -179,8 +179,12 @@ + switch ( opts.architecture() ) { + case CPU_TYPE_I386: + case CPU_TYPE_X86_64: ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: ++#endif ++#if SUPPORT_ARCH_arm64 + case CPU_TYPE_ARM64: ++#endif + storeKind = ld::Fixup::kindStoreLittleEndian32; + break; + default: +--- ld64-236.3/src/ld/passes/stubs/stubs.cpp.orig 2015-01-23 06:55:36.000000000 +0100 ++++ ld64-236.3/src/ld/passes/stubs/stubs.cpp 2015-01-23 06:56:04.000000000 +0100 +@@ -324,9 +324,11 @@ + if ( _options.outputKind() != Options::kDynamicLibrary ) + throwf("resolver functions (%s) can only be used in dylibs", atom->name()); + if ( !_options.makeCompressedDyldInfo() ) { ++#if SUPPORT_ARCH_arm_any + if ( _options.architecture() == CPU_TYPE_ARM ) + throwf("resolver functions (%s) can only be used when targeting iOS 4.2 or later", atom->name()); + else ++#endif + throwf("resolver functions (%s) can only be used when targeting Mac OS X 10.6 or later", atom->name()); + } + stubFor[atom] = NULL; +@@ -354,6 +356,7 @@ + throw "symbol dyld_stub_binding_helper not found, normally in crt1.o/dylib1.o/bundle1.o"; + + // disable arm close stubs in some cases ++#if SUPPORT_ARCH_arm_any + if ( _architecture == CPU_TYPE_ARM ) { + if ( codeSize > 4*1024*1024 ) + _largeText = true; +@@ -377,6 +380,7 @@ + } + } + } ++#endif + + // make stub atoms + for (std::map::iterator it = stubFor.begin(); it != stubFor.end(); ++it) { +--- ld64-236.3/src/ld/Resolver.cpp.orig 2015-01-23 06:55:36.000000000 +0100 ++++ ld64-236.3/src/ld/Resolver.cpp 2015-01-23 06:56:04.000000000 +0100 +@@ -396,6 +396,7 @@ + // update cpu-sub-type + cpu_subtype_t nextObjectSubType = file.cpuSubType(); + switch ( _options.architecture() ) { ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + if ( _options.subArchitecture() != nextObjectSubType ) { + if ( (_options.subArchitecture() == CPU_SUBTYPE_ARM_ALL) && _options.forceCpuSubtypeAll() ) { +@@ -414,6 +415,7 @@ + } + } + break; ++#endif + + case CPU_TYPE_I386: + _internal.cpuSubType = CPU_SUBTYPE_I386_ALL; +--- ld64-236.3/src/other/machochecker.cpp.orig 2015-01-23 06:55:36.000000000 +0100 ++++ ld64-236.3/src/other/machochecker.cpp 2015-01-23 06:56:04.000000000 +0100 +@@ -252,6 +252,7 @@ + return false; + } + ++#if SUPPORT_ARCH_arm_any + template <> + bool MachOChecker::validFile(const uint8_t* fileContent) + { +@@ -269,6 +270,7 @@ + } + return false; + } ++#endif + + #if SUPPORT_ARCH_arm64 + template <> +@@ -294,7 +296,9 @@ + template <> uint8_t MachOChecker::loadCommandSizeMask() { return 0x07; } + template <> uint8_t MachOChecker::loadCommandSizeMask() { return 0x03; } + template <> uint8_t MachOChecker::loadCommandSizeMask() { return 0x07; } ++#if SUPPORT_ARCH_arm_any + template <> uint8_t MachOChecker::loadCommandSizeMask() { return 0x03; } ++#endif + #if SUPPORT_ARCH_arm64 + template <> uint8_t MachOChecker::loadCommandSizeMask() { return 0x07; } + #endif +@@ -324,11 +328,13 @@ + return threadInfo->thread_register(7); + } + ++#if SUPPORT_ARCH_arm_any + template <> + arm::P::uint_t MachOChecker::getInitialStackPointer(const macho_thread_command* threadInfo) + { + return threadInfo->thread_register(13); + } ++#endif + + #if SUPPORT_ARCH_arm64 + template <> +@@ -362,11 +368,13 @@ + return threadInfo->thread_register(16); + } + ++#if SUPPORT_ARCH_arm_any + template <> + arm::P::uint_t MachOChecker::getEntryPoint(const macho_thread_command* threadInfo) + { + return threadInfo->thread_register(15); + } ++#endif + + #if SUPPORT_ARCH_arm64 + template <> +@@ -1025,6 +1033,7 @@ + return fFirstWritableSegment->vmaddr(); + } + ++#if SUPPORT_ARCH_arm_any + template <> + arm::P::uint_t MachOChecker::relocBase() + { +@@ -1033,6 +1042,7 @@ + else + return fFirstSegment->vmaddr(); + } ++#endif + + #if SUPPORT_ARCH_arm64 + template <> +--- ld64-236.3/src/other/ObjectDump.cpp.orig 2015-01-23 06:55:36.000000000 +0100 ++++ ld64-236.3/src/other/ObjectDump.cpp 2015-01-23 06:56:04.000000000 +0100 +@@ -806,6 +806,7 @@ + case ld::Fixup::kindStoreThumbHigh16: + printf(", then store high-16 in Thumb movt"); + break; ++#if SUPPORT_ARCH_arm64 + case ld::Fixup::kindStoreARM64Branch26: + printf(", then store as ARM64 26-bit pcrel branch"); + break; +@@ -839,6 +840,7 @@ + case ld::Fixup::kindStoreARM64PCRelToGOT: + printf(", then store as 32-bit delta to GOT entry"); + break; ++#endif + case ld::Fixup::kindDtraceExtra: + printf("dtrace static probe extra info"); + break; +@@ -983,6 +985,7 @@ + case ld::Fixup::kindSetTargetTLVTemplateOffsetLittleEndian64: + printf("tlv template offset of %s", referenceTargetAtomName(ref)); + break; ++#if SUPPORT_ARCH_arm64 + case ld::Fixup::kindStoreTargetAddressARM64Branch26: + printf("ARM64 store 26-bit pcrel branch to %s", referenceTargetAtomName(ref)); + break; +@@ -1010,6 +1013,7 @@ + case ld::Fixup::kindStoreTargetAddressARM64GOTLeaPageOff12: + printf("ARM64 store 12-bit page offset of lea of %s", referenceTargetAtomName(ref)); + break; ++#endif + //default: + // printf("unknown fixup"); + // break; +--- ld64-236.3/src/other/rebase.cpp.orig 2015-01-23 06:55:36.000000000 +0100 ++++ ld64-236.3/src/other/rebase.cpp 2015-01-23 06:56:04.000000000 +0100 +@@ -160,9 +160,11 @@ + case CPU_TYPE_X86_64: + fRebasers.push_back(new Rebaser(&p[fileOffset])); + break; ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + fRebasers.push_back(new Rebaser(&p[fileOffset])); + break; ++#endif + default: + throw "unknown file format"; + } +@@ -186,9 +188,11 @@ + else if ( (OSSwapLittleToHostInt32(mh->magic) == MH_MAGIC_64) && (OSSwapLittleToHostInt32(mh->cputype) == CPU_TYPE_X86_64)) { + fRebasers.push_back(new Rebaser(mh)); + } ++#if SUPPORT_ARCH_arm_any + else if ( (OSSwapLittleToHostInt32(mh->magic) == MH_MAGIC) && (OSSwapLittleToHostInt32(mh->cputype) == CPU_TYPE_ARM)) { + fRebasers.push_back(new Rebaser(mh)); + } ++#endif + else { + throw "unknown file format"; + } +@@ -236,7 +240,9 @@ + template <> cpu_type_t Rebaser::getArchitecture() const { return CPU_TYPE_POWERPC64; } + template <> cpu_type_t Rebaser::getArchitecture() const { return CPU_TYPE_I386; } + template <> cpu_type_t Rebaser::getArchitecture() const { return CPU_TYPE_X86_64; } ++#if SUPPORT_ARCH_arm_any + template <> cpu_type_t Rebaser::getArchitecture() const { return CPU_TYPE_ARM; } ++#endif + + template + uint64_t Rebaser::getBaseAddress() const +@@ -875,8 +881,10 @@ + return "i386"; + case CPU_TYPE_X86_64: + return "x86_64"; ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + return "arm"; ++#endif + } + return "unknown"; + } +@@ -969,6 +977,7 @@ + else if ( arch == CPU_TYPE_X86_64 ) { + return 0x200000000ULL; + } ++#if SUPPORT_ARCH_arm_any + else if ( arch == CPU_TYPE_ARM ) { + // place dylibs below dyld + uint64_t topAddr = 0x2FE00000; +@@ -977,6 +986,7 @@ + throwf("total size of images (0x%X) does not fit below 0x2FE00000", totalSize); + return topAddr - totalSize; + } ++#endif + else + throw "unknown architecture"; + } +@@ -1043,7 +1053,9 @@ + onlyArchs.insert(CPU_TYPE_POWERPC64); + onlyArchs.insert(CPU_TYPE_I386); + onlyArchs.insert(CPU_TYPE_X86_64); ++#if SUPPORT_ARCH_arm_any + onlyArchs.insert(CPU_TYPE_ARM); ++#endif + } + + // scan files and collect sizes +--- ld64-236.3/src/other/unwinddump.cpp.orig 2015-01-23 06:55:36.000000000 +0100 ++++ ld64-236.3/src/other/unwinddump.cpp 2015-01-23 07:03:16.000000000 +0100 +@@ -97,7 +97,9 @@ + + template <> const char* UnwindPrinter::archName() { return "i386"; } + template <> const char* UnwindPrinter::archName() { return "x86_64"; } ++#if SUPPORT_ARCH_arm_any + template <> const char* UnwindPrinter::archName() { return "arm"; } ++#endif + #if SUPPORT_ARCH_arm64 + template <> const char* UnwindPrinter::archName() { return "arm64"; } + #endif diff --git a/sys-devel/binutils-apple/files/ld64-236.3-nolto.patch b/sys-devel/binutils-apple/files/ld64-236.3-nolto.patch new file mode 100644 index 000000000000..5d68c377ea0e --- /dev/null +++ b/sys-devel/binutils-apple/files/ld64-236.3-nolto.patch @@ -0,0 +1,219 @@ +Allow to fully disable LTO + +--- ld64-236.3/src/ld/InputFiles.cpp ++++ ld64-236.3/src/ld/InputFiles.cpp +@@ -59,7 +59,9 @@ + #include "macho_relocatable_file.h" + #include "macho_dylib_file.h" + #include "archive_file.h" ++#ifdef LTO + #include "lto_file.h" ++#endif + #include "opaque_section_file.h" + #include "MachOFileAbstraction.hpp" + #include "Snapshot.h" +@@ -187,9 +189,11 @@ + if ( result != NULL ) + return result; + ++#ifdef LTO + result = lto::archName(p, len); + if ( result != NULL ) + return result; ++#endif + + if ( strncmp((const char*)p, "!\n", 8) == 0 ) + return "archive"; +@@ -292,6 +296,7 @@ + return objResult; + } + ++#ifdef LTO + // see if it is an llvm object file + objResult = lto::parse(p, len, info.path, info.modTime, info.ordinal, _options.architecture(), _options.subArchitecture(), _options.logAllFiles(), _options.verboseOptimizationHints()); + if ( objResult != NULL ) { +@@ -299,6 +304,7 @@ + OSAtomicIncrement32(&_totalObjectLoaded); + return objResult; + } ++#endif + + // see if it is a dynamic library + ld::dylib::File* dylibResult = mach_o::dylib::parse(p, len, info.path, info.modTime, _options, info.ordinal, info.options.fBundleLoader, indirectDylib); +@@ -322,6 +328,7 @@ + return archiveResult; + } + ++#ifdef LTO + // does not seem to be any valid linker input file, check LTO misconfiguration problems + if ( lto::archName((uint8_t*)p, len) != NULL ) { + if ( lto::libLTOisLoaded() ) { +@@ -349,6 +356,7 @@ + throwf("could not process llvm bitcode object file, because %s could not be loaded", libLTO); + } + } ++#endif + + // error handling + if ( ((fat_header*)p)->magic == OSSwapBigToHostInt32(FAT_MAGIC) ) { +--- ld64-236.3/src/ld/ld.cpp ++++ ld64-236.3/src/ld/ld.cpp +@@ -91,7 +91,9 @@ + #include "parsers/archive_file.h" + #include "parsers/macho_relocatable_file.h" + #include "parsers/macho_dylib_file.h" ++#ifdef LTO + #include "parsers/lto_file.h" ++#endif + #include "parsers/opaque_section_file.h" + + +--- ld64-236.3/src/ld/Options.cpp ++++ ld64-236.3/src/ld/Options.cpp +@@ -41,10 +41,13 @@ + #include "MachOFileAbstraction.hpp" + #include "Snapshot.h" + ++ ++#ifdef LTO + // upward dependency on lto::version() + namespace lto { + extern const char* version(); + } ++#endif + + // magic to place command line in crash reports + const int crashreporterBufferSize = 2000; +@@ -3179,9 +3182,11 @@ + fprintf(stderr, "configured to support archs: %s\n", ALL_SUPPORTED_ARCHS); + // if only -v specified, exit cleanly + if ( argc == 2 ) { ++#ifdef LTO + const char* ltoVers = lto::version(); + if ( ltoVers != NULL ) + fprintf(stderr, "LTO support using: %s\n", ltoVers); ++#endif + exit(0); + } + } +--- ld64-236.3/src/ld/parsers/archive_file.cpp ++++ ld64-236.3/src/ld/parsers/archive_file.cpp +@@ -45,7 +45,9 @@ + #include "Architectures.hpp" + + #include "macho_relocatable_file.h" ++#ifdef LTO + #include "lto_file.h" ++#endif + #include "archive_file.h" + + +@@ -97,8 +99,10 @@ + private: + static bool validMachOFile(const uint8_t* fileContent, uint64_t fileLength, + const mach_o::relocatable::ParserOptions& opts); ++#ifdef LTO + static bool validLTOFile(const uint8_t* fileContent, uint64_t fileLength, + const mach_o::relocatable::ParserOptions& opts); ++#endif + static cpu_type_t architecture(); + + class Entry : ar_hdr +@@ -242,11 +246,13 @@ + return mach_o::relocatable::isObjectFile(fileContent, fileLength, opts); + } + ++#ifdef LTO + template + bool File::validLTOFile(const uint8_t* fileContent, uint64_t fileLength, const mach_o::relocatable::ParserOptions& opts) + { + return lto::isObjectFile(fileContent, fileLength, opts.architecture, opts.subType); + } ++#endif + + + +@@ -267,7 +273,11 @@ + if ( (p==start) && ((strcmp(memberName, SYMDEF_SORTED) == 0) || (strcmp(memberName, SYMDEF) == 0)) ) + continue; + // archive is valid if first .o file is valid +- return (validMachOFile(p->content(), p->contentSize(), opts) || validLTOFile(p->content(), p->contentSize(), opts)); ++ return (validMachOFile(p->content(), p->contentSize(), opts) ++#ifdef LTO ++ || validLTOFile(p->content(), p->contentSize(), opts) ++#endif ++ ); + } + // empty archive + return true; +@@ -388,6 +398,7 @@ + _instantiatedEntries[member] = state; + return _instantiatedEntries[member]; + } ++#ifdef LTO + // see if member is llvm bitcode file + result = lto::parse(member->content(), member->contentSize(), + mPath, member->modificationTime(), ordinal, +@@ -397,6 +408,7 @@ + _instantiatedEntries[member] = state; + return _instantiatedEntries[member]; + } ++#endif + + throwf("archive member '%s' with length %d is not mach-o or llvm bitcode", memberName, member->contentSize()); + } +--- ld64-236.3/src/ld/Resolver.cpp ++++ ld64-236.3/src/ld/Resolver.cpp +@@ -56,7 +56,9 @@ + #include "InputFiles.h" + #include "SymbolTable.h" + #include "Resolver.h" ++#ifdef LTO + #include "parsers/lto_file.h" ++#endif + + + namespace ld { +@@ -1438,6 +1440,7 @@ + + void Resolver::linkTimeOptimize() + { ++#ifdef LTO + // only do work here if some llvm obj files where loaded + if ( ! _haveLLVMObjs ) + return; +@@ -1535,6 +1538,9 @@ + // check new code does not override some dylib + this->checkDylibSymbolCollisions(); + } ++#else ++ return; ++#endif + } + + +--- ld64-236.3/src/other/ObjectDump.cpp ++++ ld64-236.3/src/other/ObjectDump.cpp +@@ -33,7 +33,9 @@ + + #include "MachOFileAbstraction.hpp" + #include "parsers/macho_relocatable_file.h" ++#ifdef LTO + #include "parsers/lto_file.h" ++#endif + + static bool sDumpContent= true; + static bool sDumpStabs = false; +@@ -1249,10 +1251,12 @@ + if ( objResult != NULL ) + return objResult; + ++#ifdef LTO + // see if it is an llvm object file + objResult = lto::parse(p, fileLen, path, stat_buf.st_mtime, ld::File::Ordinal::NullOrdinal(), sPreferredArch, sPreferredSubArch, false, true); + if ( objResult != NULL ) + return objResult; ++#endif + + throwf("not a mach-o object file: %s", path); + #else diff --git a/sys-devel/binutils-apple/files/ld64-236.3-noppc.patch b/sys-devel/binutils-apple/files/ld64-236.3-noppc.patch new file mode 100644 index 000000000000..85e9d94b35e1 --- /dev/null +++ b/sys-devel/binutils-apple/files/ld64-236.3-noppc.patch @@ -0,0 +1,26 @@ +Allow to fully disable powerpc. + +--- ld64-236.3/src/ld/parsers/macho_dylib_file.cpp.orig 2015-01-23 17:59:55.000000000 +0100 ++++ ld64-236.3/src/ld/parsers/macho_dylib_file.cpp 2015-01-23 18:00:04.000000000 +0100 +@@ -1095,17 +1095,21 @@ + *subResult = CPU_SUBTYPE_ARM64_ALL; + return true; + } ++#ifdef SUPPORT_ARCH_ppc + if ( Parser::validFile(fileContent, false) ) { + *result = CPU_TYPE_POWERPC; + const macho_header >* header = (const macho_header >*)fileContent; + *subResult = header->cpusubtype(); + return true; + } ++#endif ++#ifdef SUPPORT_ARCH_ppc64 + if ( Parser::validFile(fileContent, false) ) { + *result = CPU_TYPE_POWERPC64; + *subResult = CPU_SUBTYPE_POWERPC_ALL; + return true; + } ++#endif + return false; + } + diff --git a/sys-devel/binutils-apple/files/ld64-236.3-nosnapshots.patch b/sys-devel/binutils-apple/files/ld64-236.3-nosnapshots.patch new file mode 100644 index 000000000000..aa75a03cbf74 --- /dev/null +++ b/sys-devel/binutils-apple/files/ld64-236.3-nosnapshots.patch @@ -0,0 +1,644 @@ +Allow to disable snapshot support because of missing Block API on OS X < 10.6. + +--- ld64-236.3/src/ld/ld.cpp.orig 2015-01-16 14:49:49.000000000 -0800 ++++ ld64-236.3/src/ld/ld.cpp 2015-01-16 14:50:42.000000000 -0800 +@@ -1072,11 +1072,13 @@ + // implement assert() function to print out a backtrace before aborting + void __assert_rtn(const char* func, const char* file, int line, const char* failedexpr) + { ++#ifdef SUPPORT_SNAPSHOTS + Snapshot *snapshot = Snapshot::globalSnapshot; + + snapshot->setSnapshotMode(Snapshot::SNAPSHOT_DEBUG); + snapshot->createSnapshot(); + snapshot->recordAssertionMessage("Assertion failed: (%s), function %s, file %s, line %d.\n", failedexpr, func, file, line); ++#endif + + void* callStack[128]; + int depth = ::backtrace(callStack, 128); +@@ -1094,9 +1096,13 @@ + } + long offset = (uintptr_t)callStack[i] - (uintptr_t)info.dli_saddr; + fprintf(stderr, "%d %p %s + %ld\n", i, callStack[i], symboName, offset); ++#ifdef SUPPORT_SNAPSHOTS + snapshot->recordAssertionMessage("%d %p %s + %ld\n", i, callStack[i], symboName, offset); ++#endif + } ++#ifdef SUPPORT_SNAPSHOTS + fprintf(stderr, "A linker snapshot was created at:\n\t%s\n", snapshot->rootDir()); ++#endif + fprintf(stderr, "ld: Assertion failed: (%s), function %s, file %s, line %d.\n", failedexpr, func, file, line); + exit(1); + } +--- ld64-236.3/src/ld/Options.cpp.orig 2015-01-16 14:49:49.000000000 -0800 ++++ ld64-236.3/src/ld/Options.cpp 2015-01-16 14:50:42.000000000 -0800 +@@ -182,7 +182,11 @@ + fGenerateDtraceDOF(true), fAllowBranchIslands(true), + fDebugInfoStripping(kDebugInfoMinimal), fTraceOutputFile(NULL), + fMacVersionMin(ld::macVersionUnset), fIOSVersionMin(ld::iOSVersionUnset), +- fSaveTempFiles(false), fSnapshotRequested(false), fPipelineFifo(NULL), ++ fSaveTempFiles(false), ++#ifdef SUPPORT_SNAPSHOTS ++ fSnapshotRequested(false), ++#endif ++ fPipelineFifo(NULL), + fDependencyInfoPath(NULL), fDependencyFileDescriptor(-1) + { + this->checkForClassic(argc, argv); +@@ -577,7 +581,9 @@ + } + break; + } ++#ifdef SUPPORT_SNAPSHOTS + fLinkSnapshot.recordArch(fArchitectureName); ++#endif + // only use compressed LINKEDIT for: + // Mac OS X 10.6 or later + // iOS 3.1 or later +@@ -1822,8 +1828,10 @@ + // + void Options::parse(int argc, const char* argv[]) + { ++#ifdef SUPPORT_SNAPSHOTS + // Store the original args in the link snapshot. + fLinkSnapshot.recordRawArgs(argc, argv); ++#endif + + // pass one builds search list from -L and -F options + this->buildSearchPaths(argc, argv); +@@ -1836,17 +1844,21 @@ + const char* arg = argv[i]; + + if ( arg[0] == '-' ) { ++#ifdef SUPPORT_SNAPSHOTS + // by default, copy one arg to the snapshot link command, and do no file copying + int snapshotArgIndex = i; + int snapshotArgCount = -1; // -1 means compute count based on change in index + int snapshotFileArgIndex = -1; // -1 means no data file parameter to arg ++#endif + + // Since we don't care about the files passed, just the option names, we do this here. + if (fPrintOptions) + fprintf (stderr, "[Logging ld64 options]\t%s\n", arg); + + if ( (arg[1] == 'L') || (arg[1] == 'F') ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotArgCount = 0; // stripped out of link snapshot ++#endif + if (arg[2] == '\0') + ++i; + // previously handled by buildSearchPaths() +@@ -1893,12 +1905,16 @@ + fOutputKind = kKextBundle; + } + else if ( strcmp(arg, "-o") == 0 ) { +- snapshotArgCount = 0; + fOutputFile = argv[++i]; ++#ifdef SUPPORT_SNAPSHOTS ++ snapshotArgCount = 0; + fLinkSnapshot.setSnapshotName(fOutputFile); ++#endif + } + else if ( strncmp(arg, "-lazy-l", 7) == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotArgCount = 0; ++#endif + FileInfo info = findLibrary(&arg[7], true); + info.options.fLazyLoad = true; + info.ordinal = ld::File::Ordinal::makeArgOrdinal((uint16_t)i); +@@ -1906,13 +1922,17 @@ + fUsingLazyDylibLinking = true; + } + else if ( strcmp(arg, "-lto_library") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + fOverridePathlibLTO = argv[++i]; + if ( fOverridePathlibLTO == NULL ) + throw "missing argument to -lto_library"; + } + else if ( (arg[1] == 'l') && (strncmp(arg,"-lazy_",6) !=0) ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotArgCount = 0; ++#endif + FileInfo info = findLibrary(&arg[2]); + info.ordinal = ld::File::Ordinal::makeArgOrdinal((uint16_t)i); + addLibrary(info); +@@ -1920,8 +1940,10 @@ + // This causes a dylib to be weakly bound at + // link time. This corresponds to weak_import. + else if ( strncmp(arg, "-weak-l", 7) == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + // SNAPSHOT FIXME: what should we do for link snapshots? (ignore for now) + snapshotArgCount = 0; ++#endif + FileInfo info = findLibrary(&arg[7]); + info.options.fWeakImport = true; + info.ordinal = ld::File::Ordinal::makeArgOrdinal((uint16_t)i); +@@ -1979,12 +2001,16 @@ + else if ( strcmp(arg, "-sectorder") == 0 ) { + if ( (argv[i+1]==NULL) || (argv[i+2]==NULL) || (argv[i+3]==NULL) ) + throw "-sectorder missing

"; ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 3; ++#endif + parseSectionOrderFile(argv[i+1], argv[i+2], argv[i+3]); + i += 3; + } + else if ( strcmp(arg, "-order_file") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + parseOrderFile(argv[++i], false); + } + else if ( strcmp(arg, "-order_file_statistics") == 0 ) { +@@ -1995,7 +2021,9 @@ + else if ( (strcmp(arg, "-sectcreate") == 0) || (strcmp(arg, "-segcreate") == 0) ) { + if ( (argv[i+1]==NULL) || (argv[i+2]==NULL) || (argv[i+3]==NULL) ) + throw "-sectcreate missing
"; ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 3; ++#endif + addSection(argv[i+1], argv[i+2], argv[i+3]); + i += 3; + } +@@ -2024,7 +2052,9 @@ + } + // Same as -@ from the FSF linker. + else if ( strcmp(arg, "-filelist") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotArgCount = 0; ++#endif + const char* path = argv[++i]; + if ( (path == NULL) || (path[0] == '-') ) + throw "-filelist missing "; +@@ -2051,7 +2081,9 @@ + } + } + else if ( strcmp(arg, "-interposable_list") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + fInterposeMode = kInterposeSome; + loadExportFile(argv[++i], "-interposable_list", fInterposeList); + } +@@ -2060,14 +2092,18 @@ + fInterposeMode = kInterposeNone; + } + else if ( strcmp(arg, "-exported_symbols_list") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + if ( fExportMode == kDontExportSome ) + throw "can't use -exported_symbols_list and -unexported_symbols_list"; + fExportMode = kExportSome; + loadExportFile(argv[++i], "-exported_symbols_list", fExportSymbols); + } + else if ( strcmp(arg, "-unexported_symbols_list") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + if ( fExportMode == kExportSome ) + throw "can't use -unexported_symbols_list and -exported_symbols_list"; + fExportMode = kDontExportSome; +@@ -2086,14 +2122,18 @@ + fDontExportSymbols.insert(argv[++i]); + } + else if ( strcmp(arg, "-non_global_symbols_no_strip_list") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + if ( fLocalSymbolHandling == kLocalSymbolsSelectiveExclude ) + throw "can't use -non_global_symbols_no_strip_list and -non_global_symbols_strip_list"; + fLocalSymbolHandling = kLocalSymbolsSelectiveInclude; + loadExportFile(argv[++i], "-non_global_symbols_no_strip_list", fLocalSymbolsIncluded); + } + else if ( strcmp(arg, "-non_global_symbols_strip_list") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + if ( fLocalSymbolHandling == kLocalSymbolsSelectiveInclude ) + throw "can't use -non_global_symbols_no_strip_list and -non_global_symbols_strip_list"; + fLocalSymbolHandling = kLocalSymbolsSelectiveExclude; +@@ -2109,16 +2149,20 @@ + } + // Similar to -weak-l but uses the absolute path name to the library. + else if ( strcmp(arg, "-weak_library") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + // SNAPSHOT FIXME: what should we do for link snapshots? (ignore for now) + snapshotArgCount = 0; ++#endif + FileInfo info = findFile(argv[++i]); + info.options.fWeakImport = true; + info.ordinal = ld::File::Ordinal::makeArgOrdinal((uint16_t)i); + addLibrary(info); + } + else if ( strcmp(arg, "-lazy_library") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + // SNAPSHOT FIXME: what should we do for link snapshots? (ignore for now) + snapshotArgCount = 0; ++#endif + FileInfo info = findFile(argv[++i]); + info.options.fLazyLoad = true; + info.ordinal = ld::File::Ordinal::makeArgOrdinal((uint16_t)i); +@@ -2126,22 +2170,28 @@ + fUsingLazyDylibLinking = true; + } + else if ( strcmp(arg, "-framework") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotArgCount = 0; ++#endif + FileInfo info = findFramework(argv[++i]); + info.ordinal = ld::File::Ordinal::makeArgOrdinal((uint16_t)i); + addLibrary(info); + } + else if ( strcmp(arg, "-weak_framework") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + // SNAPSHOT FIXME: what should we do for link snapshots? (ignore for now) + snapshotArgCount = 0; ++#endif + FileInfo info = findFramework(argv[++i]); + info.options.fWeakImport = true; + info.ordinal = ld::File::Ordinal::makeArgOrdinal((uint16_t)i); + addLibrary(info); + } + else if ( strcmp(arg, "-lazy_framework") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + // SNAPSHOT FIXME: what should we do for link snapshots? (ignore for now) + snapshotArgCount = 0; ++#endif + FileInfo info = findFramework(argv[++i]); + info.options.fLazyLoad = true; + info.ordinal = ld::File::Ordinal::makeArgOrdinal((uint16_t)i); +@@ -2219,8 +2269,10 @@ + // This should probably be deprecated when we respect -L and -F + // when searching for libraries. + else if ( strcmp(arg, "-dylib_file") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + // ignore for snapshot because a stub dylib will be created in the snapshot + snapshotArgCount = 0; ++#endif + addDylibOverride(argv[++i]); + } + // What to expand @executable_path to if found in dependent dylibs +@@ -2277,7 +2329,9 @@ + } + // ??? Deprecate when we get rid of basing at build time. + else if ( strcmp(arg, "-seg_addr_table") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + const char* name = argv[++i]; + if ( name == NULL ) + throw "-seg_addr_table missing argument"; +@@ -2341,7 +2395,9 @@ + i += 2; + } + else if ( strcmp(arg, "-bundle_loader") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + fBundleLoader = argv[++i]; + if ( (fBundleLoader == NULL) || (fBundleLoader[0] == '-') ) + throw "-bundle_loader missing "; +@@ -2573,7 +2629,9 @@ + // previously handled by buildSearchPaths() + } + else if ( strcmp(arg, "-syslibroot") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotArgCount = 0; ++#endif + ++i; + // previously handled by buildSearchPaths() + } +@@ -2584,7 +2642,9 @@ + fUUIDMode = kUUIDRandom; + } + else if ( strcmp(arg, "-dtrace") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + const char* name = argv[++i]; + if ( name == NULL ) + throw "-dtrace missing argument"; +@@ -2607,7 +2667,9 @@ + fAliases.push_back(pair); + } + else if ( strcmp(arg, "-alias_list") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + parseAliasFile(argv[++i]); + } + else if ( strcmp(arg, "-save-temps") == 0 ) { +@@ -2638,48 +2700,60 @@ + fDisablePositionIndependentExecutable = true; + } + else if ( strncmp(arg, "-reexport-l", 11) == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + // SNAPSHOT FIXME: what should we do for link snapshots? (ignore for now) + snapshotArgCount = 0; ++#endif + FileInfo info = findLibrary(&arg[11], true); + info.options.fReExport = true; + info.ordinal = ld::File::Ordinal::makeArgOrdinal((uint16_t)i); + addLibrary(info); + } + else if ( strcmp(arg, "-reexport_library") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + // SNAPSHOT FIXME: what should we do for link snapshots? (ignore for now) + snapshotArgCount = 0; ++#endif + FileInfo info = findFile(argv[++i]); + info.options.fReExport = true; + info.ordinal = ld::File::Ordinal::makeArgOrdinal((uint16_t)i); + addLibrary(info); + } + else if ( strcmp(arg, "-reexport_framework") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + // SNAPSHOT FIXME: what should we do for link snapshots? (ignore for now) + snapshotArgCount = 0; ++#endif + FileInfo info = findFramework(argv[++i]); + info.options.fReExport = true; + info.ordinal = ld::File::Ordinal::makeArgOrdinal((uint16_t)i); + addLibrary(info); + } + else if ( strncmp(arg, "-upward-l", 9) == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + // SNAPSHOT FIXME: what should we do for link snapshots? (ignore for now) + snapshotArgCount = 0; ++#endif + FileInfo info = findLibrary(&arg[9], true); + info.options.fUpward = true; + info.ordinal = ld::File::Ordinal::makeArgOrdinal((uint16_t)i); + addLibrary(info); + } + else if ( strcmp(arg, "-upward_library") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + // SNAPSHOT FIXME: what should we do for link snapshots? (ignore for now) + snapshotArgCount = 0; ++#endif + FileInfo info = findFile(argv[++i]); + info.options.fUpward = true; + info.ordinal = ld::File::Ordinal::makeArgOrdinal((uint16_t)i); + addLibrary(info); + } + else if ( strcmp(arg, "-upward_framework") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + // SNAPSHOT FIXME: what should we do for link snapshots? (ignore for now) + snapshotArgCount = 0; ++#endif + FileInfo info = findFramework(argv[++i]); + info.options.fUpward = true; + info.ordinal = ld::File::Ordinal::makeArgOrdinal((uint16_t)i); +@@ -2733,7 +2807,9 @@ + fMarkDeadStrippableDylib = true; + } + else if ( strcmp(arg, "-exported_symbols_order") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + loadSymbolOrderFile(argv[++i], fExportSymbolsOrder); + } + else if ( strcmp(arg, "-no_compact_linkedit") == 0 ) { +@@ -2825,11 +2901,15 @@ + fObjcCategoryMerging = false; + } + else if ( strcmp(arg, "-force_symbols_weak_list") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + loadExportFile(argv[++i], "-force_symbols_weak_list", fForceWeakSymbols); + } + else if ( strcmp(arg, "-force_symbols_not_weak_list") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + loadExportFile(argv[++i], "-force_symbols_not_weak_list", fForceNotWeakSymbols); + } + else if ( strcmp(arg, "-force_symbol_weak") == 0 ) { +@@ -2845,7 +2925,9 @@ + fForceNotWeakSymbols.insert(symbol); + } + else if ( strcmp(arg, "-reexported_symbols_list") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + if ( fExportMode == kExportSome ) + throw "can't use -exported_symbols_list and -reexported_symbols_list"; + loadExportFile(argv[++i], "-reexported_symbols_list", fReExportSymbols); +@@ -2861,6 +2943,7 @@ + else if ( strcmp(arg, "-page_align_data_atoms") == 0 ) { + fPageAlignDataAtoms = true; + } ++#ifdef SUPPORT_SNAPSHOTS + else if (strcmp(arg, "-debug_snapshot") == 0) { + fLinkSnapshot.setSnapshotMode(Snapshot::SNAPSHOT_DEBUG); + fSnapshotRequested = true; +@@ -2873,6 +2956,7 @@ + fLinkSnapshot.setSnapshotPath(path); + fSnapshotRequested = true; + } ++#endif + else if ( strcmp(arg, "-new_main") == 0 ) { + fEntryPointLoadCommandForceOn = true; + } +@@ -2914,7 +2998,9 @@ + fExportDynamic = true; + } + else if ( strcmp(arg, "-force_symbols_coalesce_list") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + loadExportFile(argv[++i], "-force_symbols_coalesce_list", fForceCoalesceSymbols); + } + else if ( strcmp(arg, "-add_linker_option") == 0 ) { +@@ -2984,10 +3070,12 @@ + throwf("unknown option: %s", arg); + } + ++#ifdef SUPPORT_SNAPSHOTS + if (snapshotArgCount == -1) + snapshotArgCount = i-snapshotArgIndex+1; + if (snapshotArgCount > 0) + fLinkSnapshot.addSnapshotLinkArg(snapshotArgIndex, snapshotArgCount, snapshotFileArgIndex); ++#endif + } + else { + FileInfo info = findFile(arg); +@@ -3006,8 +3096,10 @@ + addLibrary(info); + } + ++#ifdef SUPPORT_SNAPSHOTS + if (fSnapshotRequested) + fLinkSnapshot.createSnapshot(); ++#endif + } + + +@@ -3270,6 +3362,7 @@ + if ( customDyldPath != NULL ) + fDyldInstallPath = customDyldPath; + ++#ifdef SUPPORT_SNAPSHOTS + const char* debugArchivePath = getenv("LD_DEBUG_SNAPSHOT"); + if (debugArchivePath != NULL) { + fLinkSnapshot.setSnapshotMode(Snapshot::SNAPSHOT_DEBUG); +@@ -3277,6 +3370,7 @@ + fLinkSnapshot.setSnapshotPath(debugArchivePath); + fSnapshotRequested = true; + } ++#endif + + const char* pipeFdString = getenv("LD_PIPELINE_FIFO"); + if (pipeFdString != NULL) { +@@ -4133,7 +4227,9 @@ + if ( strcmp(&lastSlash[1], subUmbrella) == 0 ) { + info.options.fReExport = true; + found = true; ++#ifdef SUPPORT_SNAPSHOTS + fLinkSnapshot.recordSubUmbrella(info.path); ++#endif + break; + } + } +@@ -4156,7 +4252,9 @@ + if ( strncmp(&lastSlash[1], subLibrary, dot-lastSlash-1) == 0 ) { + info.options.fReExport = true; + found = true; ++#ifdef SUPPORT_SNAPSHOTS + fLinkSnapshot.recordSubLibrary(info.path); ++#endif + break; + } + } +--- ld64-236.3/src/ld/Options.h.orig 2015-01-16 14:49:49.000000000 -0800 ++++ ld64-236.3/src/ld/Options.h 2015-01-16 14:50:42.000000000 -0800 +@@ -48,7 +48,9 @@ + extern void throwf (const char* format, ...) __attribute__ ((noreturn,format(printf, 1, 2))); + extern void warning(const char* format, ...) __attribute__((format(printf, 1, 2))); + ++#ifdef SUPPORT_SNAPSHOTS + class Snapshot; ++#endif + + class LibraryOptions + { +@@ -362,7 +364,9 @@ + bool forceWeakNonWildCard(const char* symbolName) const; + bool forceNotWeakNonWildcard(const char* symbolName) const; + bool forceCoalesce(const char* symbolName) const; ++#ifdef SUPPORT_SNAPSHOTS + Snapshot& snapshot() const { return fLinkSnapshot; } ++#endif + bool errorBecauseOfWarnings() const; + bool needsThreadLoadCommand() const { return fNeedsThreadLoadCommand; } + bool needsEntryPointLoadCommand() const { return fEntryPointLoadCommand; } +@@ -640,8 +644,10 @@ + std::vector< std::vector > fLinkerOptions; + std::vector fSectionRenames; + bool fSaveTempFiles; ++#ifdef SUPPORT_SNAPSHOTS + mutable Snapshot fLinkSnapshot; + bool fSnapshotRequested; ++#endif + const char* fPipelineFifo; + const char* fDependencyInfoPath; + mutable int fDependencyFileDescriptor; +--- ld64-236.3/src/ld/Snapshot.cpp.orig 2015-01-16 14:51:58.000000000 -0800 ++++ ld64-236.3/src/ld/Snapshot.cpp 2015-01-16 14:50:42.000000000 -0800 +@@ -6,6 +6,9 @@ + // Copyright (c) 2011 Apple Inc. All rights reserved. + // + ++#include "Snapshot.h" ++ ++#ifdef SUPPORT_SNAPSHOTS + #include + #include + #include +@@ -17,7 +20,6 @@ + #include + #include + +-#include "Snapshot.h" + #include "Options.h" + + #include "compile_stubs.h" +@@ -538,3 +538,5 @@ + } + } + } ++ ++#endif /* SUPPORT_SNAPSHOT */ +--- ld64-236.3/src/ld/Snapshot.h.orig 2015-01-23 07:59:55.000000000 +0100 ++++ ld64-236.3/src/ld/Snapshot.h 2015-01-23 07:58:14.000000000 +0100 +@@ -8,6 +8,8 @@ + + #ifndef ld64_Snapshot_h + #define ld64_Snapshot_h ++ ++#ifdef SUPPORT_SNAPSHOTS + #include + #include + #include +@@ -151,3 +153,5 @@ + }; + + #endif ++ ++#endif +--- ld64-236.3/src/ld/InputFiles.cpp.orig 2015-01-16 14:54:33.000000000 -0800 ++++ ld64-236.3/src/ld/InputFiles.cpp 2015-01-16 14:55:37.000000000 -0800 +@@ -1101,7 +1101,9 @@ + case ld::File::Reloc: + { + ld::relocatable::File* reloc = (ld::relocatable::File*)file; ++#ifdef SUPPORT_SNAPSHOTS + _options.snapshot().recordObjectFile(reloc->path()); ++#endif + if ( _options.dumpDependencyInfo() ) + _options.dumpDependency(Options::depObjectFile, reloc->path()); + } +@@ -1201,7 +1203,9 @@ + if ( dylibFile->justInTimeforEachAtom(name, handler) ) { + // we found a definition in this dylib + // done, unless it is a weak definition in which case we keep searching ++#ifdef SUPPORT_SNAPSHOTS + _options.snapshot().recordDylibSymbol(dylibFile, name); ++#endif + if ( !dylibFile->hasWeakExternals() || !dylibFile->hasWeakDefinition(name)) { + return true; + } +@@ -1215,7 +1219,9 @@ + if ( archiveFile->justInTimeDataOnlyforEachAtom(name, handler) ) { + if ( _options.traceArchives() ) + logArchive(archiveFile); ++#ifdef SUPPORT_SNAPSHOTS + _options.snapshot().recordArchive(archiveFile->path()); ++#endif + // found data definition in static library, done + return true; + } +@@ -1224,7 +1230,9 @@ + if ( archiveFile->justInTimeforEachAtom(name, handler) ) { + if ( _options.traceArchives() ) + logArchive(archiveFile); ++#ifdef SUPPORT_SNAPSHOTS + _options.snapshot().recordArchive(archiveFile->path()); ++#endif + // found definition in static library, done + return true; + } +@@ -1251,7 +1259,9 @@ + if ( dylibFile->justInTimeforEachAtom(name, handler) ) { + // we found a definition in this dylib + // done, unless it is a weak definition in which case we keep searching ++#ifdef SUPPORT_SNAPSHOTS + _options.snapshot().recordDylibSymbol(dylibFile, name); ++#endif + if ( !dylibFile->hasWeakExternals() || !dylibFile->hasWeakDefinition(name)) { + return true; + } diff --git a/sys-devel/binutils-apple/files/ld64-241.9-arm64-cputype.patch b/sys-devel/binutils-apple/files/ld64-241.9-arm64-cputype.patch new file mode 100644 index 000000000000..dd0a6f22bc0b --- /dev/null +++ b/sys-devel/binutils-apple/files/ld64-241.9-arm64-cputype.patch @@ -0,0 +1,17 @@ +Remove redefinitions of CPU types that cause warnings and mask that some +platform isn't actually supported on a host version. + +diff -ur ld64-241.9/src/abstraction/MachOFileAbstraction.hpp work/ld64-241.9/src/abstraction/MachOFileAbstraction.hpp +--- ld64-241.9/src/abstraction/MachOFileAbstraction.hpp 2014-11-04 00:30:51.000000000 +0100 ++++ ld64-241.9/src/abstraction/MachOFileAbstraction.hpp 2015-01-22 21:31:58.000000000 +0100 +@@ -253,10 +253,6 @@ + + + +-// hack until arm64 headers are worked out +-#define CPU_TYPE_ARM64 (CPU_TYPE_ARM | CPU_ARCH_ABI64) +-#define CPU_SUBTYPE_ARM64_ALL 0 +-#define CPU_SUBTYPE_ARM64_V8 1 + + #define ARM64_RELOC_UNSIGNED 0 // for pointers + #define ARM64_RELOC_SUBTRACTOR 1 // must be followed by a ARM64_RELOC_UNSIGNED diff --git a/sys-devel/binutils-apple/files/ld64-241.9-atomic-volatile.patch b/sys-devel/binutils-apple/files/ld64-241.9-atomic-volatile.patch new file mode 100644 index 000000000000..294b05fb88b4 --- /dev/null +++ b/sys-devel/binutils-apple/files/ld64-241.9-atomic-volatile.patch @@ -0,0 +1,27 @@ +OSAtmicAdd and friends don't expect volatile parameters on OS X < 10.5. + +diff -ur ld64-241.9/src/ld/InputFiles.h ld64-241.9/src/ld/InputFiles.h +--- ld64-241.9/src/ld/InputFiles.h 2015-01-22 20:59:47.000000000 +0100 ++++ ld64-241.9/src/ld/InputFiles.h 2015-01-22 20:19:51.000000000 +0100 +@@ -86,11 +86,16 @@ + void createIndirectDylibs(); + + // for -print_statistics +- volatile int64_t _totalObjectSize; +- volatile int64_t _totalArchiveSize; +- volatile int32_t _totalObjectLoaded; +- volatile int32_t _totalArchivesLoaded; +- volatile int32_t _totalDylibsLoaded; ++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 ++#define LD_ATOMIC_VOLATILE volatile ++#else ++#define LD_ATOMIC_VOLATILE ++#endif ++ LD_ATOMIC_VOLATILE int64_t _totalObjectSize; ++ LD_ATOMIC_VOLATILE int64_t _totalArchiveSize; ++ LD_ATOMIC_VOLATILE int32_t _totalObjectLoaded; ++ LD_ATOMIC_VOLATILE int32_t _totalArchivesLoaded; ++ LD_ATOMIC_VOLATILE int32_t _totalDylibsLoaded; + + + private: diff --git a/sys-devel/binutils-apple/files/ld64-241.9-cc_md5.patch b/sys-devel/binutils-apple/files/ld64-241.9-cc_md5.patch new file mode 100644 index 000000000000..833fec2b66e9 --- /dev/null +++ b/sys-devel/binutils-apple/files/ld64-241.9-cc_md5.patch @@ -0,0 +1,24 @@ +Provide CC_MD5 on OS X < 10.5. + +--- ld64-241.9/src/ld/OutputFile.cpp 2015-01-22 23:20:33.000000000 +0100 ++++ ld64-241.9/src/ld/OutputFile.cpp 2015-01-22 23:26:02.000000000 +0100 +@@ -71,6 +71,19 @@ + #include "LinkEdit.hpp" + #include "LinkEditClassic.hpp" + ++#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050 ++/* CC_MD5 missing on < 10.5 - provide replacement */ ++unsigned char *CC_MD5(const void *data, CC_LONG len, unsigned char *md) { ++ CC_MD5_CTX ctx; ++ if(md == NULL) ++ return NULL; ++ ++ CC_MD5_Init(&ctx); ++ CC_MD5_Update(&ctx, data, len); ++ CC_MD5_Final(md, &ctx); ++ return md; ++} ++#endif + + namespace ld { + namespace tool { diff --git a/sys-devel/binutils-apple/files/ld64-241.9-extraneous-includes.patch b/sys-devel/binutils-apple/files/ld64-241.9-extraneous-includes.patch new file mode 100644 index 000000000000..f1fbbd82ec37 --- /dev/null +++ b/sys-devel/binutils-apple/files/ld64-241.9-extraneous-includes.patch @@ -0,0 +1,13 @@ +Remove unneeded and sometimes missing headers. + +diff -ur ld64-241.9/src/ld/Options.cpp work/ld64-241.9/src/ld/Options.cpp +--- ld64-241.9/src/ld/Options.cpp 2015-01-22 21:42:04.000000000 +0100 ++++ ld64-241.9/src/ld/Options.cpp 2015-01-22 21:45:15.000000000 +0100 +@@ -31,7 +31,6 @@ + #include + #include + #include +-#include + #include + #include + diff --git a/sys-devel/binutils-apple/files/ld64-241.9-gcc.patch b/sys-devel/binutils-apple/files/ld64-241.9-gcc.patch new file mode 100644 index 000000000000..06b735b242a5 --- /dev/null +++ b/sys-devel/binutils-apple/files/ld64-241.9-gcc.patch @@ -0,0 +1,1029 @@ +Provide c++11 headers from tr1 include directory and namespace. + +Work around weird namespacing bug in gcc-4.2.1 where class ld::Section +conflicts with template mach_o::relocatable::Section by renaming the latter to +MRFSection (could possibly be done using sed from ebuild or avoided by figuring +out, what's actually going on with those namespaces). + +--- ./ld64-241.9/src/ld/InputFiles.h.gcc 2014-09-11 00:24:46.000000000 +0200 ++++ ./ld64-241.9/src/ld/InputFiles.h 2015-01-12 22:12:18.000000000 +0100 +@@ -46,6 +46,14 @@ + #include + #endif + ++#ifdef __GLIBCXX__ ++#include ++#define UNORDERED_MAP tr1::unordered_map ++#else ++#include ++#define UNORDERED_MAP unordered_map ++#endif ++ + #include + + #include "Options.h" +@@ -107,7 +115,7 @@ + static void parseWorkerThread(InputFiles *inputFiles); + void startThread(void (*threadFunc)(InputFiles *)) const; + +- typedef std::unordered_map InstallNameToDylib; ++ typedef std::UNORDERED_MAP InstallNameToDylib; + + const Options& _options; + std::vector _inputFiles; +--- ./ld64-241.9/src/ld/ld.cpp.gcc 2014-09-11 00:24:46.000000000 +0200 ++++ ./ld64-241.9/src/ld/ld.cpp 2015-01-12 22:12:18.000000000 +0100 +@@ -54,7 +54,13 @@ + #include + #include + #include ++#ifdef __GLIBCXX__ ++#include ++#define UNORDERED_MAP tr1::unordered_map ++#else + #include ++#define UNORDERED_MAP unordered_map ++#endif + #include + + #include "Options.h" +@@ -149,7 +155,7 @@ + struct SectionEquals { + bool operator()(const ld::Section* left, const ld::Section* right) const; + }; +- typedef std::unordered_map SectionInToOut; ++ typedef std::UNORDERED_MAP SectionInToOut; + + + SectionInToOut _sectionInToFinalMap; +--- ./ld64-241.9/src/ld/ld.hpp.gcc 2014-09-11 00:24:46.000000000 +0200 ++++ ./ld64-241.9/src/ld/ld.hpp 2015-01-12 22:12:18.000000000 +0100 +@@ -32,7 +32,13 @@ + #include + + #include ++#ifdef __GLIBCXX__ ++#include ++#define UNORDERED_SET tr1::unordered_set ++#else + #include ++#define UNORDERED_SET unordered_set ++#endif + + #include "configure.h" + +@@ -822,7 +828,7 @@ + bool operator()(const char* left, const char* right) const { return (strcmp(left, right) == 0); } + }; + +-typedef std::unordered_set CStringSet; ++typedef std::UNORDERED_SET CStringSet; + + class Internal + { +--- ./ld64-241.9/src/ld/LinkEditClassic.hpp.gcc 2014-09-11 00:24:46.000000000 +0200 ++++ ./ld64-241.9/src/ld/LinkEditClassic.hpp 2015-01-12 22:12:18.000000000 +0100 +@@ -31,8 +31,13 @@ + #include + #include + +-#include ++#ifdef __GLIBCXX__ ++#include ++#define UNORDERED_MAP tr1::unordered_map ++#else + #include ++#define UNORDERED_MAP unordered_map ++#endif + + #include "Options.h" + #include "ld.hpp" +@@ -92,7 +97,7 @@ + + private: + enum { kBufferSize = 0x01000000 }; +- typedef std::unordered_map StringToOffset; ++ typedef std::UNORDERED_MAP StringToOffset; + + const uint32_t _pointerSize; + std::vector _fullBuffers; +--- ./ld64-241.9/src/ld/Options.cpp.gcc 2014-11-04 00:25:08.000000000 +0100 ++++ ./ld64-241.9/src/ld/Options.cpp 2015-01-12 22:12:18.000000000 +0100 +@@ -4548,7 +4548,7 @@ + + // make sure all required exported symbols exist + std::vector impliedExports; +- for (NameSet::iterator it=fExportSymbols.regularBegin(); it != fExportSymbols.regularEnd(); ++it) { ++ for (NameSet::const_iterator it=fExportSymbols.regularBegin(); it != fExportSymbols.regularEnd(); ++it) { + const char* name = *it; + const int len = strlen(name); + if ( (strcmp(&name[len-3], ".eh") == 0) || (strncmp(name, ".objc_category_name_", 20) == 0) ) { +@@ -4580,7 +4580,7 @@ + } + + // make sure all required re-exported symbols exist +- for (NameSet::iterator it=fReExportSymbols.regularBegin(); it != fReExportSymbols.regularEnd(); ++it) { ++ for (NameSet::const_iterator it=fReExportSymbols.regularBegin(); it != fReExportSymbols.regularEnd(); ++it) { + fInitialUndefines.push_back(*it); + } + +--- ./ld64-241.9/src/ld/Options.h.gcc 2014-11-04 00:29:32.000000000 +0100 ++++ ./ld64-241.9/src/ld/Options.h 2015-01-12 22:12:18.000000000 +0100 +@@ -30,8 +30,17 @@ + #include + + #include ++#ifdef __GLIBCXX__ ++#include ++#include ++#define UNORDERED_MAP tr1::unordered_map ++#define UNORDERED_SET tr1::unordered_set ++#else + #include + #include ++#define UNORDERED_MAP unordered_map ++#define UNORDERED_SET unordered_set ++#endif + + #include "ld.hpp" + #include "Snapshot.h" +@@ -396,8 +405,8 @@ + bool moveRwSymbol(const char* symName, const char* filePath, const char*& seg, bool& wildCardMatch) const; + + private: +- typedef std::unordered_map NameToOrder; +- typedef std::unordered_set NameSet; ++ typedef std::UNORDERED_MAP NameToOrder; ++ typedef std::UNORDERED_SET NameSet; + enum ExportMode { kExportDefault, kExportSome, kDontExportSome }; + enum LibrarySearchMode { kSearchDylibAndArchiveInEachDir, kSearchAllDirsForDylibsThenAllDirsForArchives }; + enum InterposeMode { kInterposeNone, kInterposeAllExternal, kInterposeSome }; +@@ -410,8 +419,8 @@ + bool containsNonWildcard(const char*) const; + bool empty() const { return fRegular.empty() && fWildCard.empty(); } + bool hasWildCards() const { return !fWildCard.empty(); } +- NameSet::iterator regularBegin() const { return fRegular.begin(); } +- NameSet::iterator regularEnd() const { return fRegular.end(); } ++ NameSet::const_iterator regularBegin() const { return fRegular.begin(); } ++ NameSet::const_iterator regularEnd() const { return fRegular.end(); } + void remove(const NameSet&); + private: + static bool hasWildCards(const char*); +--- ./ld64-241.9/src/ld/OutputFile.cpp.gcc 2014-09-11 00:24:46.000000000 +0200 ++++ ./ld64-241.9/src/ld/OutputFile.cpp 2015-01-12 22:12:18.000000000 +0100 +@@ -50,7 +50,13 @@ + #include + #include + #include ++#ifdef __GLIBCXX__ ++#include ++#define UNORDERED_SET tr1::unordered_set ++#else + #include ++#define UNORDERED_SET unordered_set ++#endif + + #include + #include +@@ -4748,7 +4754,7 @@ + const char* filename = NULL; + bool wroteStartSO = false; + state.stabs.reserve(atomsNeedingDebugNotes.size()*4); +- std::unordered_set seenFiles; ++ std::UNORDERED_SET seenFiles; + for (std::vector::iterator it=atomsNeedingDebugNotes.begin(); it != atomsNeedingDebugNotes.end(); it++) { + const ld::Atom* atom = *it; + const ld::File* atomFile = atom->file(); +--- ./ld64-241.9/src/ld/parsers/archive_file.cpp.gcc 2014-09-11 00:24:46.000000000 +0200 ++++ ./ld64-241.9/src/ld/parsers/archive_file.cpp 2015-01-12 22:12:18.000000000 +0100 +@@ -33,7 +33,13 @@ + #include + #include + #include ++#ifdef __GLIBCXX__ ++#include ++#define UNORDERED_MAP tr1::unordered_map ++#else + #include ++#define UNORDERED_MAP unordered_map ++#endif + + #include "MachOFileAbstraction.hpp" + #include "Architectures.hpp" +@@ -112,7 +118,7 @@ + struct MemberState { ld::relocatable::File* file; const Entry *entry; bool logged; bool loaded; uint32_t index;}; + bool loadMember(MemberState& state, ld::File::AtomHandler& handler, const char *format, ...) const; + +- typedef std::unordered_map NameToEntryMap; ++ typedef std::UNORDERED_MAP NameToEntryMap; + + typedef typename A::P P; + typedef typename A::P::E E; +--- ./ld64-241.9/src/ld/parsers/lto_file.cpp.gcc 2014-11-04 00:59:51.000000000 +0100 ++++ ./ld64-241.9/src/ld/parsers/lto_file.cpp 2015-01-12 22:12:18.000000000 +0100 +@@ -33,8 +33,17 @@ + #include + #include + #include ++#ifdef __GLIBCXX__ ++#include ++#include ++#define UNORDERED_MAP tr1::unordered_map ++#define UNORDERED_SET tr1::unordered_set ++#else + #include + #include ++#define UNORDERED_MAP unordered_map ++#define UNORDERED_SET unordered_set ++#endif + + #include "MachOFileAbstraction.hpp" + #include "Architectures.hpp" +@@ -218,8 +227,8 @@ + static void ltoDiagnosticHandler(lto_codegen_diagnostic_severity_t, const char*, void*); + #endif + +- typedef std::unordered_set CStringSet; +- typedef std::unordered_map CStringToAtom; ++ typedef std::UNORDERED_SET CStringSet; ++ typedef std::UNORDERED_MAP CStringToAtom; + + class AtomSyncer : public ld::File::AtomHandler { + public: +--- ./ld64-241.9/src/ld/parsers/macho_dylib_file.cpp.gcc 2014-09-11 00:24:46.000000000 +0200 ++++ ./ld64-241.9/src/ld/parsers/macho_dylib_file.cpp 2015-01-12 22:12:18.000000000 +0100 +@@ -34,8 +34,17 @@ + #include + #include + #include +-#include ++#ifdef __GLIBCXX__ ++#include ++#include ++#define UNORDERED_MAP tr1::unordered_map ++#define UNORDERED_SET tr1::unordered_set ++#else + #include ++#include ++#define UNORDERED_MAP unordered_map ++#define UNORDERED_SET unordered_set ++#endif + + #include "Architectures.hpp" + #include "MachOFileAbstraction.hpp" +@@ -193,8 +202,8 @@ + }; + }; + struct AtomAndWeak { ld::Atom* atom; bool weakDef; bool tlv; pint_t address; }; +- typedef std::unordered_map NameToAtomMap; +- typedef std::unordered_set NameSet; ++ typedef std::UNORDERED_MAP NameToAtomMap; ++ typedef std::UNORDERED_SET NameSet; + + struct Dependent { const char* path; File* dylib; bool reExport; }; + +@@ -562,14 +571,18 @@ + if ( _s_logHashtable ) fprintf(stderr, "ld: building hashtable of %u toc entries for %s\n", dynamicInfo->nextdefsym(), this->path()); + const macho_nlist

* start = &symbolTable[dynamicInfo->iextdefsym()]; + const macho_nlist

* end = &start[dynamicInfo->nextdefsym()]; ++#ifndef __GLIBCXX__ + _atoms.reserve(dynamicInfo->nextdefsym()); // set initial bucket count ++#endif + for (const macho_nlist

* sym=start; sym < end; ++sym) { + this->addSymbol(&strings[sym->n_strx()], (sym->n_desc() & N_WEAK_DEF) != 0, false, sym->n_value()); + } + } + else { + int32_t count = dynamicInfo->ntoc(); ++#ifndef __GLIBCXX__ + _atoms.reserve(count); // set initial bucket count ++#endif + if ( _s_logHashtable ) fprintf(stderr, "ld: building hashtable of %u entries for %s\n", count, this->path()); + const struct dylib_table_of_contents* toc = (dylib_table_of_contents*)(fileContent + dynamicInfo->tocoff()); + for (int32_t i = 0; i < count; ++i) { +--- ./ld64-241.9/src/ld/parsers/macho_relocatable_file.cpp.gcc 2014-11-04 00:57:10.000000000 +0100 ++++ ./ld64-241.9/src/ld/parsers/macho_relocatable_file.cpp 2015-01-12 22:22:53.000000000 +0100 +@@ -62,7 +62,7 @@ + // forward reference + template class Parser; + template class Atom; +-template class Section; ++template class MRFSection; + template class CFISection; + template class CUSection; + +@@ -102,14 +102,14 @@ + const uint8_t* fileContent() { return _fileContent; } + private: + friend class Atom; +- friend class Section; ++ friend class MRFSection; + friend class Parser; + friend class CFISection::OAS; + + typedef typename A::P P; + + const uint8_t* _fileContent; +- Section** _sectionsArray; ++ MRFSection** _sectionsArray; + uint8_t* _atomsArray; + uint8_t* _aliasAtomsArray; + uint32_t _sectionsArrayCount; +@@ -134,14 +134,14 @@ + + + template +-class Section : public ld::Section ++class MRFSection : public ld::Section + { + public: + typedef typename A::P::uint_t pint_t; + typedef typename A::P P; + typedef typename A::P::E E; + +- virtual ~Section() { } ++ virtual ~MRFSection() { } + class File& file() const { return _file; } + const macho_section

* machoSection() const { return _machOSection; } + uint32_t sectionNum(class Parser&) const; +@@ -165,10 +165,10 @@ + static const char* makeSectionName(const macho_section* s); + + protected: +- Section(File& f, const macho_section* s) ++ MRFSection(File& f, const macho_section* s) + : ld::Section(makeSegmentName(s), makeSectionName(s), sectionType(s)), + _file(f), _machOSection(s), _beginAtoms(NULL), _endAtoms(NULL), _hasAliases(false) { } +- Section(File& f, const char* segName, const char* sectName, ld::Section::Type t, bool hidden=false) ++ MRFSection(File& f, const char* segName, const char* sectName, ld::Section::Type t, bool hidden=false) + : ld::Section(segName, sectName, t, hidden), _file(f), _machOSection(NULL), + _beginAtoms(NULL), _endAtoms(NULL), _hasAliases(false) { } + +@@ -192,11 +192,11 @@ + + + template +-class CFISection : public Section ++class CFISection : public MRFSection + { + public: + CFISection(Parser& parser, File& f, const macho_section* s) +- : Section(f, s) { } ++ : MRFSection(f, s) { } + uint32_t cfiCount(Parser& parser); + + virtual ld::Atom::ContentType contentType() { return ld::Atom::typeCFI; } +@@ -256,11 +256,11 @@ + + + template +-class CUSection : public Section ++class CUSection : public MRFSection + { + public: + CUSection(Parser& parser, File& f, const macho_section* s) +- : Section(f, s) { } ++ : MRFSection(f, s) { } + + typedef typename A::P::uint_t pint_t; + typedef typename A::P P; +@@ -297,11 +297,11 @@ + + + template +-class TentativeDefinitionSection : public Section ++class TentativeDefinitionSection : public MRFSection + { + public: + TentativeDefinitionSection(Parser& parser, File& f) +- : Section(f, "__DATA", "__comm/tent", ld::Section::typeTentativeDefs) {} ++ : MRFSection(f, "__DATA", "__comm/tent", ld::Section::typeTentativeDefs) {} + + virtual ld::Atom::ContentType contentType() { return ld::Atom::typeZeroFill; } + virtual bool addFollowOnFixups() const { return false; } +@@ -319,11 +319,11 @@ + + + template +-class AbsoluteSymbolSection : public Section ++class AbsoluteSymbolSection : public MRFSection + { + public: + AbsoluteSymbolSection(Parser& parser, File& f) +- : Section(f, "__DATA", "__abs", ld::Section::typeAbsoluteSymbols, true) {} ++ : MRFSection(f, "__DATA", "__abs", ld::Section::typeAbsoluteSymbols, true) {} + + virtual ld::Atom::ContentType contentType() { return ld::Atom::typeUnclassified; } + virtual bool dontDeadStrip() { return false; } +@@ -345,7 +345,7 @@ + + + template +-class SymboledSection : public Section ++class SymboledSection : public MRFSection + { + public: + SymboledSection(Parser& parser, File& f, const macho_section* s); +@@ -377,11 +377,11 @@ + + + template +-class ImplicitSizeSection : public Section ++class ImplicitSizeSection : public MRFSection + { + public: + ImplicitSizeSection(Parser& parser, File& f, const macho_section* s) +- : Section(f, s) { } ++ : MRFSection(f, s) { } + virtual uint32_t computeAtomCount(class Parser& parser, struct Parser::LabelAndCFIBreakIterator& it, const struct Parser::CFI_CU_InfoArrays&); + virtual uint32_t appendAtoms(class Parser& parser, uint8_t* buffer, struct Parser::LabelAndCFIBreakIterator& it, const struct Parser::CFI_CU_InfoArrays&); + protected: +@@ -715,8 +715,8 @@ + + public: + // methods for all atoms from mach-o object file +- Section& sect() const { return (Section&)section(); } +- File& machofile() const { return ((Section*)(this->_section))->file(); } ++ MRFSection& sect() const { return (MRFSection&)section(); } ++ File& machofile() const { return ((MRFSection*)(this->_section))->file(); } + void setFixupsRange(uint32_t s, uint32_t c); + void setUnwindInfoRange(uint32_t s, uint32_t c); + void extendUnwindInfoRange(); +@@ -733,7 +733,7 @@ + typedef typename A::P::E E; + typedef typename A::P::uint_t pint_t; + // constuct via all attributes +- Atom(Section& sct, const char* nm, pint_t addr, uint64_t sz, ++ Atom(MRFSection& sct, const char* nm, pint_t addr, uint64_t sz, + ld::Atom::Definition d, ld::Atom::Combine c, ld::Atom::Scope s, + ld::Atom::ContentType ct, ld::Atom::SymbolTableInclusion i, + bool dds, bool thumb, bool al, ld::Atom::Alignment a) +@@ -743,7 +743,7 @@ + _unwindInfoStartIndex(0), _fixupsCount(0), + _lineInfoCount(0), _unwindInfoCount(0) { } + // construct via symbol table entry +- Atom(Section& sct, Parser& parser, const macho_nlist

& sym, ++ Atom(MRFSection& sct, Parser& parser, const macho_nlist

& sym, + uint64_t sz, bool alias=false) + : ld::Atom((ld::Section&)sct, parser.definitionFromSymbol(sym), + parser.combineFromSymbol(sym), parser.scopeFromSymbol(sym), +@@ -766,7 +766,7 @@ + + private: + friend class Parser; +- friend class Section; ++ friend class MRFSection; + friend class CStringSection; + friend class AbsoluteSymbolSection; + +@@ -1031,8 +1031,8 @@ + uint32_t undefinedStartIndex() { return _undefinedStartIndex; } + uint32_t undefinedEndIndex() { return _undefinedEndIndex; } + void addFixup(FixupInAtom f) { _allFixups.push_back(f); } +- Section* sectionForNum(unsigned int sectNum); +- Section* sectionForAddress(pint_t addr); ++ MRFSection* sectionForNum(unsigned int sectNum); ++ MRFSection* sectionForAddress(pint_t addr); + Atom* findAtomByAddress(pint_t addr); + Atom* findAtomByAddressOrNullIfStub(pint_t addr); + Atom* findAtomByAddressOrLocalTargetOfStub(pint_t addr, uint32_t* offsetInAtom); +@@ -1074,7 +1074,7 @@ + : sortedSymbolIndexes(ssa), sortedSymbolCount(ssc), cfiStartsArray(cfisa), + cfiStartsCount(cfisc), fileHasOverlappingSymbols(ols), + newSection(false), cfiIndex(0), symIndex(0) {} +- bool next(Parser& parser, const Section& sect, uint32_t sectNum, pint_t startAddr, pint_t endAddr, ++ bool next(Parser& parser, const MRFSection& sect, uint32_t sectNum, pint_t startAddr, pint_t endAddr, + pint_t* addr, pint_t* size, const macho_nlist

** sym); + pint_t peek(Parser& parser, pint_t startAddr, pint_t endAddr); + void beginSection() { newSection = true; symIndex = 0; } +@@ -1103,7 +1103,7 @@ + + + private: +- friend class Section; ++ friend class MRFSection; + + enum SectionType { sectionTypeIgnore, sectionTypeLiteral4, sectionTypeLiteral8, sectionTypeLiteral16, + sectionTypeNonLazy, sectionTypeCFI, sectionTypeCString, sectionTypeCStringPointer, +@@ -1448,7 +1448,7 @@ + // was becuase of a label, the symbol). Returns false when no more chunks. + // + template +-bool Parser::LabelAndCFIBreakIterator::next(Parser& parser, const Section& sect, uint32_t sectNum, pint_t startAddr, pint_t endAddr, ++bool Parser::LabelAndCFIBreakIterator::next(Parser& parser, const MRFSection& sect, uint32_t sectNum, pint_t startAddr, pint_t endAddr, + pint_t* addr, pint_t* size, const macho_nlist

** symbol) + { + // may not be a label on start of section, but need atom demarcation there +@@ -1600,7 +1600,7 @@ + } + + template <> +-typename arm::P::uint_t Parser::realAddr(typename arm::P::uint_t addr) ++arm::P::uint_t Parser::realAddr(arm::P::uint_t addr) + { + return addr & (-2); + } +@@ -1646,7 +1646,7 @@ + uint32_t sortedSymbolIndexes[_symbolsInSections]; + this->makeSortedSymbolsArray(sortedSymbolIndexes, sortedSectionIndexes); + +- // allocate Section object for each mach-o section ++ // allocate MRFSection object for each mach-o section + makeSections(); + + // if it exists, do special early parsing of __compact_unwind section +@@ -1743,7 +1743,7 @@ + #endif + } + +- Section** sections = _file->_sectionsArray; ++ MRFSection** sections = _file->_sectionsArray; + uint32_t sectionsCount = _file->_sectionsArrayCount; + + // figure out how many atoms will be allocated and allocate +@@ -2306,11 +2306,11 @@ + _file->_swiftVersion = ((flags >> 8) & 0xFF); + if ( sect->size() > 8 ) { + warning("section %s/%s has unexpectedly large size %llu in %s", +- sect->segname(), Section::makeSectionName(sect), sect->size(), _file->path()); ++ sect->segname(), MRFSection::makeSectionName(sect), sect->size(), _file->path()); + } + } + else { +- warning("can't parse %s/%s section in %s", sect->segname(), Section::makeSectionName(sect), _file->path()); ++ warning("can't parse %s/%s section in %s", sect->segname(), MRFSection::makeSectionName(sect), _file->path()); + } + continue; + } +@@ -2406,24 +2406,24 @@ + // sort by address (mach-o object files don't aways have sections sorted) + ::qsort(machOSects, count, sizeof(MachOSectionAndSectionClass

), MachOSectionAndSectionClass

::sorter); + +- // we will synthesize a dummy Section object for tentative definitions ++ // we will synthesize a dummy MRFSection object for tentative definitions + if ( _tentativeDefinitionCount > 0 ) { + totalSectionsSize += sizeof(TentativeDefinitionSection); + machOSects[count++].type = sectionTypeTentativeDefinitions; + } + +- // we will synthesize a dummy Section object for Absolute symbols ++ // we will synthesize a dummy MRFSection object for Absolute symbols + if ( _absoluteSymbolCount > 0 ) { + totalSectionsSize += sizeof(AbsoluteSymbolSection); + machOSects[count++].type = sectionTypeAbsoluteSymbols; + } + + // allocate one block for all Section objects as well as pointers to each +- uint8_t* space = new uint8_t[totalSectionsSize+count*sizeof(Section*)]; +- _file->_sectionsArray = (Section**)space; ++ uint8_t* space = new uint8_t[totalSectionsSize+count*sizeof(MRFSection*)]; ++ _file->_sectionsArray = (MRFSection**)space; + _file->_sectionsArrayCount = count; +- Section** objects = _file->_sectionsArray; +- space += count*sizeof(Section*); ++ MRFSection** objects = _file->_sectionsArray; ++ space += count*sizeof(MRFSection*); + for (uint32_t i=0; i < count; ++i) { + switch ( machOSects[i].type ) { + case sectionTypeIgnore: +@@ -2511,7 +2511,7 @@ + + + template +-Section* Parser::sectionForAddress(typename A::P::uint_t addr) ++MRFSection* Parser::sectionForAddress(typename A::P::uint_t addr) + { + for (uint32_t i=0; i < _file->_sectionsArrayCount; ++i ) { + const macho_section* sect = _file->_sectionsArray[i]->machoSection(); +@@ -2538,7 +2538,7 @@ + } + + template +-Section* Parser::sectionForNum(unsigned int num) ++MRFSection* Parser::sectionForNum(unsigned int num) + { + for (uint32_t i=0; i < _file->_sectionsArrayCount; ++i ) { + const macho_section* sect = _file->_sectionsArray[i]->machoSection(); +@@ -2554,7 +2554,7 @@ + template + Atom* Parser::findAtomByAddress(pint_t addr) + { +- Section* section = this->sectionForAddress(addr); ++ MRFSection* section = this->sectionForAddress(addr); + return section->findAtomByAddress(addr); + } + +@@ -2611,7 +2611,7 @@ + target.addend = 0; + return; + } +- Section* section = this->sectionForAddress(addr); ++ MRFSection* section = this->sectionForAddress(addr); + target.atom = section->findAtomByAddress(addr); + target.addend = addr - target.atom->_objAddress; + target.weakImport = false; +@@ -2659,7 +2659,7 @@ + } + return; + } +- Section* section = this->sectionForNum(sectNum); ++ MRFSection* section = this->sectionForNum(sectNum); + target.atom = section->findAtomByAddress(addr); + if ( target.atom == NULL ) { + typedef typename A::P::sint_t sint_t; +@@ -3867,7 +3867,7 @@ + } + + template +-const char* Section::makeSegmentName(const macho_section* sect) ++const char* MRFSection::makeSegmentName(const macho_section* sect) + { + // mach-o section record only has room for 16-byte seg/sect names + // so a 16-byte name has no trailing zero +@@ -3880,7 +3880,7 @@ + } + + template +-const char* Section::makeSectionName(const macho_section* sect) ++const char* MRFSection::makeSectionName(const macho_section* sect) + { + const char* name = sect->sectname(); + if ( strlen(name) < 16 ) +@@ -3914,13 +3914,13 @@ + } + + template +-bool Section::readable(const macho_section* sect) ++bool MRFSection::readable(const macho_section* sect) + { + return true; + } + + template +-bool Section::writable(const macho_section* sect) ++bool MRFSection::writable(const macho_section* sect) + { + // mach-o .o files do not contain segment permissions + // we just know TEXT is special +@@ -3928,7 +3928,7 @@ + } + + template +-bool Section::exectuable(const macho_section* sect) ++bool MRFSection::exectuable(const macho_section* sect) + { + // mach-o .o files do not contain segment permissions + // we just know TEXT is special +@@ -3937,7 +3937,7 @@ + + + template +-ld::Section::Type Section::sectionType(const macho_section* sect) ++ld::Section::Type MRFSection::sectionType(const macho_section* sect) + { + switch ( sect->flags() & SECTION_TYPE ) { + case S_ZEROFILL: +@@ -4015,7 +4015,7 @@ + + + template +-Atom* Section::findContentAtomByAddress(pint_t addr, class Atom* start, class Atom* end) ++Atom* MRFSection::findContentAtomByAddress(pint_t addr, class Atom* start, class Atom* end) + { + // do a binary search of atom array + uint32_t atomCount = end - start; +@@ -4047,7 +4047,7 @@ + } + + template +-ld::Atom::Alignment Section::alignmentForAddress(pint_t addr) ++ld::Atom::Alignment MRFSection::alignmentForAddress(pint_t addr) + { + const uint32_t sectionAlignment = this->_machOSection->align(); + uint32_t modulus = (addr % (1 << sectionAlignment)); +@@ -4057,7 +4057,7 @@ + } + + template +-uint32_t Section::sectionNum(class Parser& parser) const ++uint32_t MRFSection::sectionNum(class Parser& parser) const + { + if ( _machOSection == NULL ) + return 0; +@@ -4650,7 +4650,7 @@ + // support __LD, __compact_unwind personality entries which are pointer to personality non-lazy pointer + const pint_t* content = (pint_t*)(this->file().fileContent() + this->_machOSection->offset() + reloc->r_address()); + pint_t nlPointerAddr = *content; +- Section* nlSection = parser.sectionForAddress(nlPointerAddr); ++ MRFSection* nlSection = parser.sectionForAddress(nlPointerAddr); + if ( nlSection->type() == ld::Section::typeCode ) { + // personality function is defined in this .o file, so this is a direct reference to it + // atoms may not be constructed yet, so scan symbol table for labels +@@ -4677,7 +4677,7 @@ + else { + const pint_t* content = (pint_t*)(this->file().fileContent() + this->_machOSection->offset() + reloc->r_address()); + pint_t personalityAddr = *content; +- Section* personalitySection = parser.sectionForAddress(personalityAddr); ++ MRFSection* personalitySection = parser.sectionForAddress(personalityAddr); + assert((personalitySection->type() == ld::Section::typeCode) && "personality column in __compact_unwind section is not pointer to function"); + // atoms may not be constructed yet, so scan symbol table for labels + const char* name = parser.scanSymbolTableForAddress(personalityAddr); +@@ -4831,7 +4831,7 @@ + + template + SymboledSection::SymboledSection(Parser& parser, File& f, const macho_section* s) +- : Section(f, s), _type(ld::Atom::typeUnclassified) ++ : MRFSection(f, s), _type(ld::Atom::typeUnclassified) + { + switch ( s->flags() & SECTION_TYPE ) { + case S_ZEROFILL: +@@ -4877,7 +4877,7 @@ + if ( ! this->_file.canScatterAtoms() ) + return true; + // call inherited +- return Section::dontDeadStrip(); ++ return MRFSection::dontDeadStrip(); + } + return false; + } +@@ -5724,7 +5724,7 @@ + + + template <> +-uint32_t Section::x86_64PcRelOffset(uint8_t r_type) ++uint32_t MRFSection::x86_64PcRelOffset(uint8_t r_type) + { + switch ( r_type ) { + case X86_64_RELOC_SIGNED: +@@ -5741,7 +5741,7 @@ + + + template <> +-bool Section::addRelocFixup(class Parser& parser, const macho_relocation_info

* reloc) ++bool MRFSection::addRelocFixup(class Parser& parser, const macho_relocation_info

* reloc) + { + const macho_section

* sect = this->machoSection(); + uint64_t srcAddr = sect->addr() + reloc->r_address(); +@@ -5948,7 +5948,7 @@ + + + template <> +-bool Section::addRelocFixup(class Parser& parser, const macho_relocation_info

* reloc) ++bool MRFSection::addRelocFixup(class Parser& parser, const macho_relocation_info

* reloc) + { + const macho_section

* sect = this->machoSection(); + uint32_t srcAddr; +@@ -6189,7 +6189,7 @@ + + #if SUPPORT_ARCH_arm_any + template <> +-bool Section::addRelocFixup(class Parser& parser, const macho_relocation_info

* reloc) ++bool MRFSection::addRelocFixup(class Parser& parser, const macho_relocation_info

* reloc) + { + const macho_section

* sect = this->machoSection(); + bool result = false; +@@ -6656,7 +6656,7 @@ + + #if SUPPORT_ARCH_arm64 + template <> +-bool Section::addRelocFixup(class Parser& parser, const macho_relocation_info

* reloc) ++bool MRFSection::addRelocFixup(class Parser& parser, const macho_relocation_info

* reloc) + { + bool result = false; + Parser::SourceLocation src; +@@ -7054,7 +7054,7 @@ + + #if SUPPORT_ARCH_arm64 + template <> +-void Section::addLOH(class Parser& parser, int kind, int count, const uint64_t addrs[]) { ++void MRFSection::addLOH(class Parser& parser, int kind, int count, const uint64_t addrs[]) { + switch (kind) { + case LOH_ARM64_ADRP_ADRP: + case LOH_ARM64_ADRP_LDR: +@@ -7109,18 +7109,18 @@ + extra.info.delta2 = (count > 1) ? ((addrs[1] - lowestAddress) >> 2) : 0; + extra.info.delta3 = (count > 2) ? ((addrs[2] - lowestAddress) >> 2) : 0; + extra.info.delta4 = (count > 3) ? ((addrs[3] - lowestAddress) >> 2) : 0; +- typename Parser::SourceLocation src(inAtom, lowestAddress- inAtom->objectAddress()); ++ Parser::SourceLocation src(inAtom, lowestAddress- inAtom->objectAddress()); + parser.addFixup(src, ld::Fixup::k1of1, ld::Fixup::kindLinkerOptimizationHint, extra.addend); + } + #endif + + template +-void Section::addLOH(class Parser& parser, int kind, int count, const uint64_t addrs[]) { ++void MRFSection::addLOH(class Parser& parser, int kind, int count, const uint64_t addrs[]) { + + } + + template +-void Section::makeFixups(class Parser& parser, const struct Parser::CFI_CU_InfoArrays&) ++void MRFSection::makeFixups(class Parser& parser, const struct Parser::CFI_CU_InfoArrays&) + { + const macho_section

* sect = this->machoSection(); + const macho_relocation_info

* relocs = (macho_relocation_info

*)(file().fileContent() + sect->reloff()); +@@ -7131,7 +7131,7 @@ + ++r; // skip next + } + catch (const char* msg) { +- throwf("in section %s,%s reloc %u: %s", sect->segname(), Section::makeSectionName(sect), r, msg); ++ throwf("in section %s,%s reloc %u: %s", sect->segname(), MRFSection::makeSectionName(sect), r, msg); + } + } + +@@ -7157,7 +7157,7 @@ + } + if ( !this->_altEntries.empty() && !this->addFollowOnFixups() ) { + if ( _altEntries.count(_beginAtoms) != 0 ) +- warning("N_ALT_ENTRY bit set on first atom in section %s/%s", sect->segname(), Section::makeSectionName(sect)); ++ warning("N_ALT_ENTRY bit set on first atom in section %s/%s", sect->segname(), MRFSection::makeSectionName(sect)); + + Atom* end = &_endAtoms[-1]; + for(Atom* p = _beginAtoms; p < end; ++p) { +--- ./ld64-241.9/src/ld/passes/dtrace_dof.cpp.gcc 2014-09-11 00:24:46.000000000 +0200 ++++ ./ld64-241.9/src/ld/passes/dtrace_dof.cpp 2015-01-12 22:12:18.000000000 +0100 +@@ -30,8 +30,17 @@ + + #include + #include ++#ifdef __GLIBCXX__ ++#include ++#include ++#define UNORDERED_MAP tr1::unordered_map ++#define UNORDERED_SET tr1::unordered_set ++#else + #include + #include ++#define UNORDERED_MAP unordered_map ++#define UNORDERED_SET unordered_set ++#endif + + #include "ld.hpp" + #include "MachOFileAbstraction.hpp" +@@ -111,8 +120,8 @@ + uint32_t offset; + const char* probeName; + }; +-typedef std::unordered_map, CStringHash, CStringEquals> ProviderToProbes; +-typedef std::unordered_set CStringSet; ++typedef std::UNORDERED_MAP, CStringHash, CStringEquals> ProviderToProbes; ++typedef std::UNORDERED_SET CStringSet; + + + +--- ./ld64-241.9/src/ld/passes/order.cpp.gcc 2014-09-11 00:24:46.000000000 +0200 ++++ ./ld64-241.9/src/ld/passes/order.cpp 2015-01-12 22:12:18.000000000 +0100 +@@ -32,7 +32,13 @@ + #include + #include + #include ++#ifdef __GLIBCXX__ ++#include ++#define UNORDERED_MAP tr1::unordered_map ++#else + #include ++#define UNORDERED_MAP unordered_map ++#endif + + #include "ld.hpp" + #include "order.h" +@@ -85,7 +91,7 @@ + ld::Internal& _state; + }; + +- typedef std::unordered_map NameToAtom; ++ typedef std::UNORDERED_MAP NameToAtom; + + typedef std::map AtomToAtom; + +--- ./ld64-241.9/src/ld/Resolver.h.gcc 2014-09-11 00:24:46.000000000 +0200 ++++ ./ld64-241.9/src/ld/Resolver.h 2015-01-12 22:12:18.000000000 +0100 +@@ -42,7 +42,13 @@ + #include + + #include ++#ifdef __GLIBCXX__ ++#include ++#define UNORDERED_SET tr1::unordered_set ++#else + #include ++#define UNORDERED_SET unordered_set ++#endif + + #include "Options.h" + #include "ld.hpp" +@@ -105,7 +111,7 @@ + void doLinkerOption(const std::vector& linkerOption, const char* fileName); + void dumpAtoms(); + +- typedef std::unordered_set StringSet; ++ typedef std::UNORDERED_SET StringSet; + + class NotLive { + public: +--- ./ld64-241.9/src/ld/SymbolTable.h.gcc 2014-09-11 00:24:46.000000000 +0200 ++++ ./ld64-241.9/src/ld/SymbolTable.h 2015-01-12 22:12:18.000000000 +0100 +@@ -42,7 +42,13 @@ + #include + + #include ++#ifdef __GLIBCXX__ ++#include ++#define UNORDERED_MAP tr1::unordered_map ++#else + #include ++#define UNORDERED_MAP unordered_map ++#endif + + #include "Options.h" + #include "ld.hpp" +@@ -57,38 +63,38 @@ + typedef uint32_t IndirectBindingSlot; + + private: +- typedef std::unordered_map NameToSlot; ++ typedef std::UNORDERED_MAP NameToSlot; + + class ContentFuncs { + public: + size_t operator()(const ld::Atom*) const; + bool operator()(const ld::Atom* left, const ld::Atom* right) const; + }; +- typedef std::unordered_map ContentToSlot; ++ typedef std::UNORDERED_MAP ContentToSlot; + + class ReferencesHashFuncs { + public: + size_t operator()(const ld::Atom*) const; + bool operator()(const ld::Atom* left, const ld::Atom* right) const; + }; +- typedef std::unordered_map ReferencesToSlot; ++ typedef std::UNORDERED_MAP ReferencesToSlot; + + class CStringHashFuncs { + public: + size_t operator()(const ld::Atom*) const; + bool operator()(const ld::Atom* left, const ld::Atom* right) const; + }; +- typedef std::unordered_map CStringToSlot; ++ typedef std::UNORDERED_MAP CStringToSlot; + + class UTF16StringHashFuncs { + public: + size_t operator()(const ld::Atom*) const; + bool operator()(const ld::Atom* left, const ld::Atom* right) const; + }; +- typedef std::unordered_map UTF16StringToSlot; ++ typedef std::UNORDERED_MAP UTF16StringToSlot; + + typedef std::map SlotToName; +- typedef std::unordered_map NameToMap; ++ typedef std::UNORDERED_MAP NameToMap; + + typedef std::vector DuplicatedSymbolAtomList; + typedef std::map DuplicateSymbols; +--- ./ld64-241.9/src/other/dyldinfo.cpp.gcc 2014-09-11 00:24:46.000000000 +0200 ++++ ./ld64-241.9/src/other/dyldinfo.cpp 2015-01-12 22:12:18.000000000 +0100 +@@ -33,7 +33,6 @@ + + #include + #include +-#include + + #include "configure.h" + #include "MachOFileAbstraction.hpp" +--- ./ld64-241.9/src/other/machochecker.cpp.gcc 2014-09-11 00:24:46.000000000 +0200 ++++ ./ld64-241.9/src/other/machochecker.cpp 2015-01-12 22:12:18.000000000 +0100 +@@ -33,7 +33,13 @@ + + #include + #include ++#ifdef __GLIBCXX__ ++#include ++#define UNORDERED_SET tr1::unordered_set ++#else + #include ++#define UNORDERED_SET unordered_set ++#endif + + #include "configure.h" + +@@ -124,7 +130,7 @@ + bool operator()(const char* left, const char* right) const { return (strcmp(left, right) == 0); } + }; + +- typedef std::unordered_set StringSet; ++ typedef std::UNORDERED_SET StringSet; + + MachOChecker(const uint8_t* fileContent, uint32_t fileLength, const char* path); + void checkMachHeader(); +--- ./ld64-241.9/src/other/unwinddump.cpp.gcc 2014-11-04 00:56:18.000000000 +0100 ++++ ./ld64-241.9/src/other/unwinddump.cpp 2015-01-12 22:12:18.000000000 +0100 +@@ -33,7 +33,6 @@ + + #include + #include +-#include + + #include "configure.h" + #include "MachOFileAbstraction.hpp" diff --git a/sys-devel/binutils-apple/files/ld64-241.9-get-comm-align.patch b/sys-devel/binutils-apple/files/ld64-241.9-get-comm-align.patch new file mode 100644 index 000000000000..58579f007de7 --- /dev/null +++ b/sys-devel/binutils-apple/files/ld64-241.9-get-comm-align.patch @@ -0,0 +1,30 @@ +Provide macros [GS]ET_COMM_ALIGN if it's missing (<= 10.4). + +--- ld64-241.9/src/ld/parsers/macho_relocatable_file.cpp 2015-01-22 22:23:11.000000000 +0100 ++++ ld64-241.9/src/ld/parsers/macho_relocatable_file.cpp 2015-01-22 22:28:03.000000000 +0100 +@@ -51,6 +51,10 @@ + #include "macho_relocatable_file.h" + + ++/* missing on < 10.5 */ ++#if !defined(GET_COMM_ALIGN) ++#define GET_COMM_ALIGN(n_desc) (((n_desc) >> 8) & 0x0f) ++#endif + + extern void throwf(const char* format, ...) __attribute__ ((noreturn,format(printf, 1, 2))); + extern void warning(const char* format, ...) __attribute__((format(printf, 1, 2))); +--- Gentoo/tmp/var/tmp/portage/sys-devel/binutils-apple-6.1/work/ld64-241.9/src/ld/LinkEditClassic.hpp 2015-01-22 22:29:14.000000000 +0100 ++++ ld64-241.9/src/ld/LinkEditClassic.hpp 2015-01-22 22:31:23.000000000 +0100 +@@ -39,6 +39,12 @@ + #define UNORDERED_MAP unordered_map + #endif + ++#if !defined(SET_COMM_ALIGN) ++/* missing on < 10.5 */ ++#define SET_COMM_ALIGN(n_desc,align) \ ++ (n_desc) = (((n_desc) & 0xf0ff) | (((align) & 0x0f) << 8)) ++#endif ++ + #include "Options.h" + #include "ld.hpp" + #include "Architectures.hpp" diff --git a/sys-devel/binutils-apple/files/ld64-241.9-noarm.patch b/sys-devel/binutils-apple/files/ld64-241.9-noarm.patch new file mode 100644 index 000000000000..24d288467433 --- /dev/null +++ b/sys-devel/binutils-apple/files/ld64-241.9-noarm.patch @@ -0,0 +1,1288 @@ +Fully conditionalise arm support so it can be disabled on 10.4. + +diff -ur ld64-241.9/src/abstraction/MachOFileAbstraction.hpp ld64-241.9/src/abstraction/MachOFileAbstraction.hpp +--- ld64-241.9/src/abstraction/MachOFileAbstraction.hpp 2014-11-04 00:30:51.000000000 +0100 ++++ ld64-241.9/src/abstraction/MachOFileAbstraction.hpp 2015-01-22 05:53:13.000000000 +0100 +diff -ur ld64-241.9/src/ld/HeaderAndLoadCommands.hpp ld64-241.9/src/ld/HeaderAndLoadCommands.hpp +--- ld64-241.9/src/ld/HeaderAndLoadCommands.hpp 2014-09-11 00:24:46.000000000 +0200 ++++ ld64-241.9/src/ld/HeaderAndLoadCommands.hpp 2015-01-22 06:46:10.000000000 +0100 +@@ -607,8 +607,12 @@ + + template <> uint32_t HeaderAndLoadCommandsAtom::cpuType() const { return CPU_TYPE_I386; } + template <> uint32_t HeaderAndLoadCommandsAtom::cpuType() const { return CPU_TYPE_X86_64; } ++#if SUPPORT_ARCH_arm_any + template <> uint32_t HeaderAndLoadCommandsAtom::cpuType() const { return CPU_TYPE_ARM; } ++#endif ++#if SUPPORT_ARCH_arm64 + template <> uint32_t HeaderAndLoadCommandsAtom::cpuType() const { return CPU_TYPE_ARM64; } ++#endif + + + +@@ -627,17 +631,21 @@ + return _state.cpuSubType; + } + ++#if SUPPORT_ARCH_arm_any + template <> + uint32_t HeaderAndLoadCommandsAtom::cpuSubType() const + { + return _state.cpuSubType; + } ++#endif + ++#if SUPPORT_ARCH_arm64 + template <> + uint32_t HeaderAndLoadCommandsAtom::cpuSubType() const + { + return CPU_SUBTYPE_ARM64_ALL; + } ++#endif + + + +diff -ur ld64-241.9/src/ld/LinkEdit.hpp ld64-241.9/src/ld/LinkEdit.hpp +--- ld64-241.9/src/ld/LinkEdit.hpp 2015-01-22 20:59:47.000000000 +0100 ++++ ld64-241.9/src/ld/LinkEdit.hpp 2015-01-22 05:32:47.000000000 +0100 +@@ -1595,6 +1595,7 @@ + for (ld::Fixup::iterator fit = atom->fixupsBegin(); fit != atom->fixupsEnd(); ++fit) { + if ( fit->kind != ld::Fixup::kindLinkerOptimizationHint) + continue; ++#if SUPPORT_ARCH_arm64 + ld::Fixup::LOH_arm64 extra; + extra.addend = fit->u.addend; + _encodedData.append_uleb128(extra.info.kind); +@@ -1606,6 +1607,7 @@ + _encodedData.append_uleb128((extra.info.delta3 << 2) + fit->offsetInAtom + address); + if ( extra.info.count > 2 ) + _encodedData.append_uleb128((extra.info.delta4 << 2) + fit->offsetInAtom + address); ++#endif + } + } + } +diff -ur ld64-241.9/src/ld/Options.cpp ld64-241.9/src/ld/Options.cpp +--- ld64-241.9/src/ld/Options.cpp 2015-01-22 20:59:48.000000000 +0100 ++++ ld64-241.9/src/ld/Options.cpp 2015-01-22 20:52:17.000000000 +0100 +@@ -580,8 +580,13 @@ + #endif + } + break; ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: ++#endif ++#if SUPPORT_ARCH_arm64 + case CPU_TYPE_ARM64: ++#endif ++#if SUPPORT_ARCH_arm_any || SUPPORT_ARCH_arm64 + if ( (fMacVersionMin == ld::macVersionUnset) && (fIOSVersionMin == ld::iOSVersionUnset) && (fOutputKind != Options::kObjectFile) ) { + #if defined(DEFAULT_IPHONEOS_MIN_VERSION) + warning("-ios_version_min not specified, assuming " DEFAULT_IPHONEOS_MIN_VERSION); +@@ -592,6 +597,7 @@ + #endif + } + break; ++#endif + } + #ifdef SUPPORT_SNAPSHOTS + fLinkSnapshot.recordArch(fArchitectureName); +@@ -1683,9 +1689,11 @@ + symbolStart = NULL; + } + else if ( strncmp(symbolStart, "arm:", 4) == 0 ) { ++#if SUPPORT_ARCH_arm_any + if ( fArchitecture == CPU_TYPE_ARM ) + symbolStart = &symbolStart[4]; + else ++#endif + symbolStart = NULL; + } + if ( symbolStart != NULL ) { +@@ -3668,6 +3676,7 @@ + #endif + } + break; ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + if ( (fOutputKind != Options::kObjectFile) && (fOutputKind != Options::kPreload) ) { + #if defined(DEFAULT_IPHONEOS_MIN_VERSION) +@@ -3679,6 +3688,7 @@ + #endif + } + break; ++#endif + default: + // architecture will be infered later by examining .o files + break; +@@ -3701,12 +3711,14 @@ + fMacVersionMin = ld::mac10_4; + } + break; ++#if SUPPORT_ARCH_arm64 + case CPU_TYPE_ARM64: + if ( fIOSVersionMin < ld::iOS_7_0 ) { + //warning("-mios_version_min should be 7.0 or later for arm64"); + fIOSVersionMin = ld::iOS_7_0; + } + break; ++#endif + } + + // default to adding functions start for dynamic code, static code must opt-in +@@ -3746,6 +3758,7 @@ + fAllowTextRelocs = true; + fUndefinedTreatment = kUndefinedDynamicLookup; + break; ++#if SUPPORT_ARCH_arm64 + case CPU_TYPE_ARM64: + // arm64 uses new MH_KEXT_BUNDLE type + fMakeCompressedDyldInfo = false; +@@ -3754,6 +3767,8 @@ + fKextsUseStubs = true; + fUndefinedTreatment = kUndefinedDynamicLookup; + break; ++#endif ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + if ( fIOSVersionMin >= ld::iOS_5_0 ) { + // iOS 5.0 and later use new MH_KEXT_BUNDLE type +@@ -3765,6 +3780,7 @@ + fUndefinedTreatment = kUndefinedDynamicLookup; + break; + } ++#endif + // else use object file + case CPU_TYPE_I386: + // use .o files +@@ -3817,6 +3833,7 @@ + if ( fSplitSegs && (fBaseWritableAddress-fBaseAddress != 0x10000000) ) + fBaseWritableAddress = fBaseAddress + 0x10000000; + break; ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + if ( fOutputKind != Options::kDynamicLibrary ) { + fSplitSegs = false; +@@ -3827,6 +3844,7 @@ + fBaseWritableAddress = fBaseAddress + 0x08000000; + } + break; ++#endif + default: + fSplitSegs = false; + fBaseAddress = 0; +@@ -3841,6 +3859,7 @@ + break; + case CPU_TYPE_X86_64: + break; ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + switch ( fOutputKind ) { + case Options::kDynamicExecutable: +@@ -3863,6 +3882,7 @@ + fBaseAddress = 0; + } + break; ++#endif + } + + // -r implies no prebinding for all architectures +@@ -3908,6 +3928,7 @@ + case CPU_TYPE_X86_64: + fPrebind = false; + break; ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + switch ( fOutputKind ) { + case Options::kDynamicExecutable: +@@ -3925,6 +3946,7 @@ + break; + } + break; ++#endif + } + } + +@@ -3951,10 +3973,12 @@ + case CPU_TYPE_I386: + if ( fIOSVersionMin != ld::iOSVersionUnset ) // simulator never needs modules + break; ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + if ( fPrebind ) + fNeedsModuleTable = true; // redo_prebinding requires a module table + break; ++#endif + } + } + +@@ -3993,7 +3993,9 @@ + switch ( fArchitecture ) { + case CPU_TYPE_I386: + case CPU_TYPE_X86_64: ++#if SUPPORT_ARCH_arm64 + case CPU_TYPE_ARM64: ++#endif + switch ( fOutputKind ) { + case Options::kObjectFile: + case Options::kStaticExecutable: +@@ -4010,10 +4012,12 @@ + break; + } + break; ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + fAddCompactUnwindEncoding = false; + fRemoveDwarfUnwindIfCompactExists = false; + break; ++#endif + case 0: + // if -arch is missing, assume we don't want compact unwind info + fAddCompactUnwindEncoding = false; +@@ -4015,7 +4043,15 @@ + fEncryptable = false; + break; + } +- if ( (fArchitecture != CPU_TYPE_ARM) && (fArchitecture != CPU_TYPE_ARM64) ) ++ if ( ++#if SUPPORT_ARCH_arm_any ++ (fArchitecture != CPU_TYPE_ARM) && ++#endif ++#if SUPPORT_ARCH_arm64 ++ (fArchitecture != CPU_TYPE_ARM64) && ++#endif ++ 1 ++ ) + fEncryptable = false; + + // don't move inits in dyld because dyld wants certain +@@ -4067,11 +4103,15 @@ + + // only ARM and x86_64 enforces that cpu-sub-types must match + switch ( fArchitecture ) { ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: ++#endif + case CPU_TYPE_X86_64: + break; + case CPU_TYPE_I386: ++#if SUPPORT_ARCH_arm64 + case CPU_TYPE_ARM64: ++#endif + fAllowCpuSubtypeMismatches = true; + break; + } +@@ -4117,6 +4157,7 @@ + fPositionIndependentExecutable = true; + } + ++#if SUPPORT_ARCH_arm_any + // armv7 for iOS4.3 defaults to PIE + if ( (fArchitecture == CPU_TYPE_ARM) + && fArchSupportsThumb2 +@@ -4124,6 +4165,7 @@ + && (fIOSVersionMin >= ld::iOS_4_3) ) { + fPositionIndependentExecutable = true; + } ++#endif + + // Simulator defaults to PIE + if ( fTargetIOSSimulator && (fOutputKind == kDynamicExecutable) ) +@@ -4133,10 +4175,12 @@ + if ( fDisablePositionIndependentExecutable ) + fPositionIndependentExecutable = false; + ++#if SUPPORT_ARCH_arm64 + // arm64 is always PIE + if ( (fArchitecture == CPU_TYPE_ARM64) && (fOutputKind == kDynamicExecutable) ) { + fPositionIndependentExecutable = true; + } ++#endif + + // set fOutputSlidable + switch ( fOutputKind ) { +@@ -4162,9 +4206,11 @@ + if ( fMacVersionMin >= ld::mac10_7 ) { + fTLVSupport = true; + } ++#if SUPPORT_ARCH_arm64 + else if ( (fArchitecture == CPU_TYPE_ARM64) && (fIOSVersionMin >= ld::iOS_8_0) ) { + fTLVSupport = true; + } ++#endif + + // default to adding version load command for dynamic code, static code must opt-in + switch ( fOutputKind ) { +@@ -4369,9 +4415,15 @@ + // ARM64 needs 16KB page size for user land code + // make armv7[s] use 16KB pages in user land code for iOS 8 or later + if ( fSegmentAlignment == 4096 ) { +- if ( (fArchitecture == CPU_TYPE_ARM64) +- || ((fArchitecture == CPU_TYPE_ARM) && (fIOSVersionMin >= ld::iOS_8_0) && +- ((fSubArchitecture == CPU_SUBTYPE_ARM_V7S) || (fSubArchitecture == CPU_SUBTYPE_ARM_V7))) ) { ++ if ( ++#if SUPPORT_ARCH_arm64 ++ (fArchitecture == CPU_TYPE_ARM64) || ++#endif ++#if SUPPORT_ARCH_arm_any ++ ((fArchitecture == CPU_TYPE_ARM) && (fIOSVersionMin >= ld::iOS_8_0) && ++ ((fSubArchitecture == CPU_SUBTYPE_ARM_V7S) || (fSubArchitecture == CPU_SUBTYPE_ARM_V7))) || ++#endif ++ 0) { + switch ( fOutputKind ) { + case Options::kDynamicExecutable: + case Options::kDynamicLibrary: +@@ -4488,12 +4540,16 @@ + if ( fStackAddr != 0 ) { + switch (fArchitecture) { + case CPU_TYPE_I386: ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: ++#endif + if ( fStackAddr > 0xFFFFFFFFULL ) + throw "-stack_addr must be < 4G for 32-bit processes"; + break; + case CPU_TYPE_X86_64: ++#if SUPPORT_ARCH_arm64 + case CPU_TYPE_ARM64: ++#endif + break; + } + if ( (fStackAddr & -4096) != fStackAddr ) +@@ -4514,6 +4570,7 @@ + if ( (fStackAddr > 0xB0000000ULL) && ((fStackAddr-fStackSize) < 0xB0000000ULL) ) + warning("custom stack placement overlaps and will disable shared region"); + break; ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + if ( fStackSize > 0x2F000000 ) + throw "-stack_size must be < 752MB"; +@@ -4522,11 +4579,13 @@ + if ( fStackAddr > 0x30000000ULL) + throw "-stack_addr must be < 0x30000000 for arm"; + break; ++#endif + case CPU_TYPE_X86_64: + if ( fStackAddr == 0 ) { + fStackAddr = 0x00007FFF5C000000ULL; + } + break; ++#if SUPPORT_ARCH_arm64 + case CPU_TYPE_ARM64: + if ( fStackSize > 0x20000000 ) + throw "-stack_size must be < 512MB"; +@@ -4534,6 +4593,7 @@ + fStackAddr = 0x120000000ULL; + } + break; ++#endif + } + if ( (fStackSize & -4096) != fStackSize ) + throw "-stack_size must be multiples of 4K"; +@@ -4643,8 +4703,12 @@ + alterObjC1ClassNamesToObjC2 = true; + break; + case CPU_TYPE_X86_64: ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: ++#endif ++#if SUPPORT_ARCH_arm64 + case CPU_TYPE_ARM64: ++#endif + alterObjC1ClassNamesToObjC2 = true; + break; + } +@@ -4799,11 +4799,15 @@ + // zero page size not specified on command line, set default + switch (fArchitecture) { + case CPU_TYPE_I386: ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: ++#endif + // first 4KB for 32-bit architectures + fZeroPageSize = 0x1000; + break; ++#if SUPPORT_ARCH_arm64 + case CPU_TYPE_ARM64: ++#endif + case CPU_TYPE_X86_64: + // first 4GB for x86_64 on all OS's + fZeroPageSize = 0x100000000ULL; +@@ -4842,9 +4910,11 @@ + + // -force_cpusubtype_ALL is not supported for ARM + if ( fForceSubtypeAll ) { ++#if SUPPORT_ARCH_arm_any + if ( fArchitecture == CPU_TYPE_ARM ) { + warning("-force_cpusubtype_ALL will become unsupported for ARM architectures"); + } ++#endif + } + + // -reexported_symbols_list can only be used with -dynamiclib +diff -ur ld64-241.9/src/ld/OutputFile.cpp ld64-241.9/src/ld/OutputFile.cpp +--- ld64-241.9/src/ld/OutputFile.cpp 2015-01-22 20:59:47.000000000 +0100 ++++ ld64-241.9/src/ld/OutputFile.cpp 2015-01-22 20:16:24.000000000 +0100 +@@ -631,7 +631,12 @@ + // is encoded in mach-o the same as: + // .long _foo + 0x40000000 + // so if _foo lays out to 0xC0000100, the first is ok, but the second is not. +- if ( (_options.architecture() == CPU_TYPE_ARM) || (_options.architecture() == CPU_TYPE_I386) ) { ++ if ( ++#if SUPPORT_ARCH_arm_any ++ (_options.architecture() == CPU_TYPE_ARM) || ++#endif ++ (_options.architecture() == CPU_TYPE_I386) || ++ 0) { + // Unlikely userland code does funky stuff like this, so warn for them, but not warn for -preload or -static + if ( (_options.outputKind() != Options::kPreload) && (_options.outputKind() != Options::kStaticExecutable) ) { + warning("32-bit absolute address out of range (0x%08llX max is 4GB): from %s + 0x%08X (0x%08llX) to 0x%08llX", +@@ -1235,22 +1240,26 @@ + return false; + const ld::Fixup* f; + switch ( fixup->kind ) { ++#if SUPPORT_ARCH_arm64 + case ld::Fixup::kindStoreTargetAddressARM64Page21: + return !mustBeGOT; + case ld::Fixup::kindStoreTargetAddressARM64GOTLoadPage21: + case ld::Fixup::kindStoreTargetAddressARM64GOTLeaPage21: + return true; ++#endif + case ld::Fixup::kindSetTargetAddress: + f = fixup; + do { + ++f; + } while ( ! f->lastInCluster() ); + switch (f->kind ) { ++#if SUPPORT_ARCH_arm64 + case ld::Fixup::kindStoreARM64Page21: + return !mustBeGOT; + case ld::Fixup::kindStoreARM64GOTLoadPage21: + case ld::Fixup::kindStoreARM64GOTLeaPage21: + return true; ++#endif + default: + break; + } +@@ -1267,22 +1276,26 @@ + return false; + const ld::Fixup* f; + switch ( fixup->kind ) { ++#if SUPPORT_ARCH_arm64 + case ld::Fixup::kindStoreTargetAddressARM64PageOff12: + return !mustBeGOT; + case ld::Fixup::kindStoreTargetAddressARM64GOTLoadPageOff12: + case ld::Fixup::kindStoreTargetAddressARM64GOTLeaPageOff12: + return true; ++#endif + case ld::Fixup::kindSetTargetAddress: + f = fixup; + do { + ++f; + } while ( ! f->lastInCluster() ); + switch (f->kind ) { ++#if SUPPORT_ARCH_arm64 + case ld::Fixup::kindStoreARM64PageOff12: + return !mustBeGOT; + case ld::Fixup::kindStoreARM64GOTLoadPageOff12: + case ld::Fixup::kindStoreARM64GOTLeaPageOff12: + return true; ++#endif + default: + break; + } +@@ -1318,7 +1331,9 @@ + std::map usedByHints; + for (ld::Fixup::iterator fit = atom->fixupsBegin(), end=atom->fixupsEnd(); fit != end; ++fit) { + uint8_t* fixUpLocation = &buffer[fit->offsetInAtom]; ++#if SUPPORT_ARCH_arm64 + ld::Fixup::LOH_arm64 lohExtra; ++#endif + switch ( (ld::Fixup::Kind)(fit->kind) ) { + case ld::Fixup::kindNone: + case ld::Fixup::kindNoneFollowOn: +@@ -1580,6 +1595,7 @@ + break; + case ld::Fixup::kindLinkerOptimizationHint: + // expand table of address/offsets used by hints ++#if SUPPORT_ARCH_arm64 + lohExtra.addend = fit->u.addend; + usedByHints[fit->offsetInAtom + (lohExtra.info.delta1 << 2)] = NULL; + if ( lohExtra.info.count > 0 ) +@@ -1588,6 +1604,7 @@ + usedByHints[fit->offsetInAtom + (lohExtra.info.delta3 << 2)] = NULL; + if ( lohExtra.info.count > 2 ) + usedByHints[fit->offsetInAtom + (lohExtra.info.delta4 << 2)] = NULL; ++#endif + break; + case ld::Fixup::kindStoreTargetAddressLittleEndian32: + accumulator = addressOf(state, fit, &toTarget); +@@ -2095,6 +2112,7 @@ + //uint8_t loadSize, destReg; + //uint32_t scaledOffset; + //uint32_t imm12; ++#if SUPPORT_ARCH_arm64 + ld::Fixup::LOH_arm64 alt; + alt.addend = fit->u.addend; + setInfo(state, atom, buffer, usedByHints, fit->offsetInAtom, (alt.info.delta1 << 2), &infoA); +@@ -2453,6 +2471,7 @@ + fprintf(stderr, "unknown hint kind %d alt.info.kind at 0x%08llX\n", alt.info.kind, infoA.instructionAddress); + break; + } ++#endif + } + // apply hints pass 2 + for (ld::Fixup::iterator fit = atom->fixupsBegin(), end=atom->fixupsEnd(); fit != end; ++fit) { +@@ -2460,6 +2479,7 @@ + continue; + InstructionInfo infoA; + InstructionInfo infoB; ++#if SUPPORT_ARCH_arm64 + ld::Fixup::LOH_arm64 alt; + alt.addend = fit->u.addend; + setInfo(state, atom, buffer, usedByHints, fit->offsetInAtom, (alt.info.delta1 << 2), &infoA); +@@ -2491,6 +2511,7 @@ + } + break; + } ++#endif + } + } + #endif // SUPPORT_ARCH_arm64 +@@ -2505,6 +2526,7 @@ + for (uint8_t* p=from; p < to; ++p) + *p = 0x90; + break; ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + if ( thumb ) { + for (uint8_t* p=from; p < to; p += 2) +@@ -2515,6 +2537,7 @@ + OSWriteLittleInt32((uint32_t*)p, 0, 0xe1a00000); + } + break; ++#endif + default: + for (uint8_t* p=from; p < to; ++p) + *p = 0x00; +@@ -2843,7 +2866,11 @@ + + // in -r mode, clarify symbolTableNotInFinalLinkedImages + if ( _options.outputKind() == Options::kObjectFile ) { +- if ( (_options.architecture() == CPU_TYPE_X86_64) || (_options.architecture() == CPU_TYPE_ARM64) ) { ++ if ( (_options.architecture() == CPU_TYPE_X86_64) || ++#if SUPPORT_ARCH_arm64 ++ (_options.architecture() == CPU_TYPE_ARM64) || ++#endif ++ 0 ) { + // x86_64 .o files need labels on anonymous literal strings + if ( (sect->type() == ld::Section::typeCString) && (atom->combine() == ld::Atom::combineByNameAndContent) ) { + (const_cast(atom))->setSymbolTableInclusion(ld::Atom::symbolTableIn); +@@ -4071,8 +4098,10 @@ + if ( _options.sharedRegionEligible() ) { + // when range checking, ignore high byte of arm64 addends + uint64_t checkAddend = addend; ++#if SUPPORT_ARCH_arm64 + if ( _options.architecture() == CPU_TYPE_ARM64 ) + checkAddend &= 0x0FFFFFFFFFFFFFFFULL; ++#endif + if ( checkAddend != 0 ) { + // make sure the addend does not cause the pointer to point outside the target's segment + // if it does, update_dyld_shared_cache will not be able to put this dylib into the shared cache +@@ -4279,12 +4308,17 @@ + + bool OutputFile::useExternalSectionReloc(const ld::Atom* atom, const ld::Atom* target, ld::Fixup* fixupWithTarget) + { +- if ( (_options.architecture() == CPU_TYPE_X86_64) || (_options.architecture() == CPU_TYPE_ARM64) ) { ++ if ( (_options.architecture() == CPU_TYPE_X86_64) || ++#if SUPPORT_ARCH_arm64 ++ (_options.architecture() == CPU_TYPE_ARM64) || ++#endif ++ 0) { + // x86_64 and ARM64 use external relocations for everthing that has a symbol + return ( target->symbolTableInclusion() != ld::Atom::symbolTableNotIn ); + } + + // support arm branch interworking in -r mode ++#if SUPPORT_ARCH_arm_any + if ( (_options.architecture() == CPU_TYPE_ARM) && (_options.outputKind() == Options::kObjectFile) ) { + if ( atom->isThumb() != target->isThumb() ) { + switch ( fixupWithTarget->kind ) { +@@ -4298,6 +4332,7 @@ + } + } + } ++#endif + + if ( (_options.architecture() == CPU_TYPE_I386) && (_options.outputKind() == Options::kObjectFile) ) { + if ( target->contentType() == ld::Atom::typeTLV ) +@@ -4365,7 +4400,11 @@ + bool minusTargetUsesExternalReloc = (minusTarget != NULL) && this->useExternalSectionReloc(atom, minusTarget, fixupWithMinusTarget); + + // in x86_64 and arm64 .o files an external reloc means the content contains just the addend +- if ( (_options.architecture() == CPU_TYPE_X86_64) ||(_options.architecture() == CPU_TYPE_ARM64) ) { ++ if ( (_options.architecture() == CPU_TYPE_X86_64) || ++#if SUPPORT_ARCH_arm64 ++ (_options.architecture() == CPU_TYPE_ARM64) || ++#endif ++ 0 ) { + if ( targetUsesExternalReloc ) { + fixupWithTarget->contentAddendOnly = true; + fixupWithStore->contentAddendOnly = true; +Only in ld64-241.9/src/ld: OutputFile.o +diff -ur ld64-241.9/src/ld/Resolver.cpp ld64-241.9/src/ld/Resolver.cpp +--- ld64-241.9/src/ld/Resolver.cpp 2015-01-22 20:59:47.000000000 +0100 ++++ ld64-241.9/src/ld/Resolver.cpp 2015-01-22 20:30:28.000000000 +0100 +@@ -431,6 +431,7 @@ + // update cpu-sub-type + cpu_subtype_t nextObjectSubType = file.cpuSubType(); + switch ( _options.architecture() ) { ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + if ( _options.subArchitecture() != nextObjectSubType ) { + if ( (_options.subArchitecture() == CPU_SUBTYPE_ARM_ALL) && _options.forceCpuSubtypeAll() ) { +@@ -449,6 +450,7 @@ + } + } + break; ++#endif + + case CPU_TYPE_I386: + _internal.cpuSubType = CPU_SUBTYPE_I386_ALL; +diff -ur ld64-241.9/src/ld/parsers/archive_file.cpp ld64-241.9/src/ld/parsers/archive_file.cpp +--- ld64-241.9/src/ld/parsers/archive_file.cpp 2015-01-22 20:59:47.000000000 +0100 ++++ ld64-241.9/src/ld/parsers/archive_file.cpp 2015-01-22 05:57:03.000000000 +0100 +@@ -232,8 +232,12 @@ + + template <> cpu_type_t File::architecture() { return CPU_TYPE_I386; } + template <> cpu_type_t File::architecture() { return CPU_TYPE_X86_64; } ++#if SUPPORT_ARCH_arm_any + template <> cpu_type_t File::architecture() { return CPU_TYPE_ARM; } ++#endif ++#if SUPPORT_ARCH_arm64 + template <> cpu_type_t File::architecture() { return CPU_TYPE_ARM64; } ++#endif + + + template +diff -ur ld64-241.9/src/ld/parsers/macho_dylib_file.cpp ld64-241.9/src/ld/parsers/macho_dylib_file.cpp +--- ld64-241.9/src/ld/parsers/macho_dylib_file.cpp 2015-01-22 20:59:47.000000000 +0100 ++++ ld64-241.9/src/ld/parsers/macho_dylib_file.cpp 2015-01-22 06:07:53.000000000 +0100 +@@ -258,11 +258,15 @@ + bool File::_s_logHashtable = false; + + template <> const char* File::objCInfoSegmentName() { return "__DATA"; } ++#if SUPPORT_ARCH_arm_any + template <> const char* File::objCInfoSegmentName() { return "__DATA"; } ++#endif + template const char* File::objCInfoSegmentName() { return "__OBJC"; } + + template <> const char* File::objCInfoSectionName() { return "__objc_imageinfo"; } ++#if SUPPORT_ARCH_arm_any + template <> const char* File::objCInfoSectionName() { return "__objc_imageinfo"; } ++#endif + template const char* File::objCInfoSectionName() { return "__image_info"; } + + template +@@ -1020,6 +1024,7 @@ + } + } + ++#if SUPPORT_ARCH_arm_any + template <> + bool Parser::validFile(const uint8_t* fileContent, bool executableOrDyliborBundle) + { +@@ -1046,9 +1051,11 @@ + return false; + } + } ++#endif + + + ++#if SUPPORT_ARCH_arm64 + template <> + bool Parser::validFile(const uint8_t* fileContent, bool executableOrDyliborBundle) + { +@@ -1075,6 +1082,7 @@ + return false; + } + } ++#endif + + + bool isDylibFile(const uint8_t* fileContent, cpu_type_t* result, cpu_subtype_t* subResult) +@@ -1090,17 +1098,21 @@ + *subResult = CPU_SUBTYPE_X86_ALL; + return true; + } ++#if SUPPORT_ARCH_arm_any + if ( Parser::validFile(fileContent, false) ) { + *result = CPU_TYPE_ARM; + const macho_header >* header = (const macho_header >*)fileContent; + *subResult = header->cpusubtype(); + return true; + } ++#endif ++#if SUPPORT_ARCH_arm64 + if ( Parser::validFile(fileContent, false) ) { + *result = CPU_TYPE_ARM64; + *subResult = CPU_SUBTYPE_ARM64_ALL; + return true; + } ++#endif + return false; + } + +@@ -1126,6 +1138,7 @@ + return "x86_64"; + } + ++#if SUPPORT_ARCH_arm_any + template <> + const char* Parser::fileKind(const uint8_t* fileContent) + { +@@ -1141,6 +1154,7 @@ + } + return "arm???"; + } ++#endif + + #if SUPPORT_ARCH_arm64 + template <> +@@ -1166,9 +1180,11 @@ + if ( Parser::validFile(fileContent, true) ) { + return Parser::fileKind(fileContent); + } ++#if SUPPORT_ARCH_arm_any + if ( Parser::validFile(fileContent, true) ) { + return Parser::fileKind(fileContent); + } ++#endif + #if SUPPORT_ARCH_arm64 + if ( Parser::validFile(fileContent, false) ) { + return Parser::fileKind(fileContent); +diff -ur ld64-241.9/src/ld/parsers/macho_relocatable_file.cpp ld64-241.9/src/ld/parsers/macho_relocatable_file.cpp +--- ld64-241.9/src/ld/parsers/macho_relocatable_file.cpp 2015-01-22 20:59:47.000000000 +0100 ++++ ld64-241.9/src/ld/parsers/macho_relocatable_file.cpp 2015-01-22 20:38:57.000000000 +0100 +@@ -867,6 +867,7 @@ + } + } + ++#if SUPPORT_ARCH_arm_any + template <> + void Atom::verifyAlignment(const macho_section

&) const + { +@@ -875,6 +876,7 @@ + warning("ARM function not 4-byte aligned: %s from %s", this->name(), this->file()->path()); + } + } ++#endif + + #if SUPPORT_ARCH_arm64 + template <> +@@ -1262,6 +1264,7 @@ + return true; + } + ++#if SUPPORT_ARCH_arm_any + template <> + bool Parser::validFile(const uint8_t* fileContent, bool subtypeMustMatch, cpu_subtype_t subtype) + { +@@ -1282,8 +1285,10 @@ + } + return true; + } ++#endif + + ++#if SUPPORT_ARCH_arm64 + template <> + bool Parser::validFile(const uint8_t* fileContent, bool subtypeMustMatch, cpu_subtype_t subtype) + { +@@ -1296,6 +1301,7 @@ + return false; + return true; + } ++#endif + + + template <> +@@ -1320,6 +1326,7 @@ + return "x86_64"; + } + ++#if SUPPORT_ARCH_arm_any + template <> + const char* Parser::fileKind(const uint8_t* fileContent) + { +@@ -1335,6 +1342,7 @@ + } + return "arm???"; + } ++#endif + + #if SUPPORT_ARCH_arm64 + template <> +@@ -1599,11 +1607,13 @@ + return false; + } + ++#if SUPPORT_ARCH_arm_any + template <> + arm::P::uint_t Parser::realAddr(arm::P::uint_t addr) + { + return addr & (-2); + } ++#endif + + template + typename A::P::uint_t Parser::realAddr(typename A::P::uint_t addr) +@@ -1867,8 +1877,12 @@ + + template <> uint8_t Parser::loadCommandSizeMask() { return 0x03; } + template <> uint8_t Parser::loadCommandSizeMask() { return 0x07; } ++#if SUPPORT_ARCH_arm_any + template <> uint8_t Parser::loadCommandSizeMask() { return 0x03; } ++#endif ++#if SUPPORT_ARCH_arm64 + template <> uint8_t Parser::loadCommandSizeMask() { return 0x07; } ++#endif + + template + bool Parser::parseLoadCommands() +@@ -4065,12 +4079,14 @@ + return 1 + (this->_machOSection - parser.firstMachOSection()); + } + ++#if SUPPORT_ARCH_arm_any + // arm does not have zero cost exceptions + template <> + uint32_t CFISection::cfiCount(Parser& parser) + { + return 0; + } ++#endif + + template + uint32_t CFISection::cfiCount(Parser& parser) +@@ -4198,6 +4214,7 @@ + + + ++#if SUPPORT_ARCH_arm_any + template <> + void CFISection::cfiParse(class Parser& parser, uint8_t* buffer, + libunwind::CFI_Atom_Info::OAS>::CFI_Atom_Info cfiArray[], +@@ -4206,6 +4223,7 @@ + // arm does not use zero cost exceptions + assert(count == 0); + } ++#endif + + + +@@ -4310,8 +4328,12 @@ + + template <> bool CFISection::bigEndian() { return false; } + template <> bool CFISection::bigEndian() { return false; } ++#if SUPPORT_ARCH_arm_any + template <> bool CFISection::bigEndian() { return false; } ++#endif ++#if SUPPORT_ARCH_arm64 + template <> bool CFISection::bigEndian() { return false; } ++#endif + + + template <> +@@ -5229,11 +5251,13 @@ + return ld::Fixup::kindStoreLittleEndian32; + } + ++#if SUPPORT_ARCH_arm_any + template <> + ld::Fixup::Kind NonLazyPointerSection::fixupKind() + { + return ld::Fixup::kindStoreLittleEndian32; + } ++#endif + + template <> + ld::Fixup::Kind NonLazyPointerSection::fixupKind() +@@ -7346,10 +7370,14 @@ + return ( mach_o::relocatable::Parser::validFile(fileContent) ); + case CPU_TYPE_I386: + return ( mach_o::relocatable::Parser::validFile(fileContent) ); ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + return ( mach_o::relocatable::Parser::validFile(fileContent, opts.objSubtypeMustMatch, opts.subType) ); ++#endif ++#if SUPPORT_ARCH_arm64 + case CPU_TYPE_ARM64: + return ( mach_o::relocatable::Parser::validFile(fileContent, opts.objSubtypeMustMatch, opts.subType) ); ++#endif + } + return false; + } +@@ -7370,17 +7398,21 @@ + *subResult = CPU_SUBTYPE_X86_ALL; + return true; + } ++#if SUPPORT_ARCH_arm_any + if ( mach_o::relocatable::Parser::validFile(fileContent, false, 0) ) { + *result = CPU_TYPE_ARM; + const macho_header >* header = (const macho_header >*)fileContent; + *subResult = header->cpusubtype(); + return true; + } ++#endif ++#if SUPPORT_ARCH_arm_any + if ( mach_o::relocatable::Parser::validFile(fileContent, false, 0) ) { + *result = CPU_TYPE_ARM64; + *subResult = CPU_SUBTYPE_ARM64_ALL; + return true; + } ++#endif + return false; + } + +@@ -7395,9 +7427,11 @@ + if ( mach_o::relocatable::Parser::validFile(fileContent) ) { + return mach_o::relocatable::Parser::fileKind(fileContent); + } ++#if SUPPORT_ARCH_arm_any + if ( mach_o::relocatable::Parser::validFile(fileContent, false, 0) ) { + return mach_o::relocatable::Parser::fileKind(fileContent); + } ++#endif + return NULL; + } + +@@ -7409,9 +7443,11 @@ + if ( mach_o::relocatable::Parser::validFile(fileContent) ) { + return mach_o::relocatable::Parser::hasObjC2Categories(fileContent); + } ++#if SUPPORT_ARCH_arm_any + else if ( mach_o::relocatable::Parser::validFile(fileContent, false, 0) ) { + return mach_o::relocatable::Parser::hasObjC2Categories(fileContent); + } ++#endif + else if ( mach_o::relocatable::Parser::validFile(fileContent, false, 0) ) { + return mach_o::relocatable::Parser::hasObjC2Categories(fileContent); + } +diff -ur ld64-241.9/src/ld/passes/branch_island.cpp ld64-241.9/src/ld/passes/branch_island.cpp +--- ld64-241.9/src/ld/passes/branch_island.cpp 2014-09-11 00:24:46.000000000 +0200 ++++ ld64-241.9/src/ld/passes/branch_island.cpp 2015-01-22 06:23:52.000000000 +0100 +@@ -285,6 +285,7 @@ + static uint64_t textSizeWhenMightNeedBranchIslands(const Options& opts, bool seenThumbBranch) + { + switch ( opts.architecture() ) { ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + if ( ! seenThumbBranch ) + return 32000000; // ARM can branch +/- 32MB +@@ -293,6 +294,7 @@ + else + return 4000000; // thumb1 can branch +/- 4MB + break; ++#endif + } + assert(0 && "unexpected architecture"); + return 0x100000000LL; +@@ -302,6 +304,7 @@ + static uint64_t maxDistanceBetweenIslands(const Options& opts, bool seenThumbBranch) + { + switch ( opts.architecture() ) { ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + if ( ! seenThumbBranch ) + return 30*1024*1024; // 2MB of branch islands per 32MB +@@ -310,6 +313,7 @@ + else + return 3500000; // 0.5MB of branch islands per 4MB + break; ++#endif + } + assert(0 && "unexpected architecture"); + return 0x100000000LL; +@@ -654,8 +658,10 @@ + + // only ARM needs branch islands + switch ( opts.architecture() ) { ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + break; ++#endif + default: + return; + } +diff -ur ld64-241.9/src/ld/passes/branch_shim.cpp ld64-241.9/src/ld/passes/branch_shim.cpp +--- ld64-241.9/src/ld/passes/branch_shim.cpp 2014-09-11 00:24:46.000000000 +0200 ++++ ld64-241.9/src/ld/passes/branch_shim.cpp 2015-01-22 06:33:01.000000000 +0100 +@@ -276,6 +276,9 @@ + // + void doPass(const Options& opts, ld::Internal& state) + { ++#if !SUPPORT_ARCH_arm_any ++ return; ++#else + // only make branch shims in final linked images + if ( opts.outputKind() == Options::kObjectFile ) + return; +@@ -386,6 +389,7 @@ + // append all new shims to end of __text + sect->atoms.insert(sect->atoms.end(), shims.begin(), shims.end()); + } ++#endif + } + + +diff -ur ld64-241.9/src/ld/passes/dtrace_dof.cpp ld64-241.9/src/ld/passes/dtrace_dof.cpp +--- ld64-241.9/src/ld/passes/dtrace_dof.cpp 2015-01-22 20:59:47.000000000 +0100 ++++ ld64-241.9/src/ld/passes/dtrace_dof.cpp 2015-01-22 06:33:51.000000000 +0100 +@@ -179,8 +179,12 @@ + switch ( opts.architecture() ) { + case CPU_TYPE_I386: + case CPU_TYPE_X86_64: ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: ++#endif ++#if SUPPORT_ARCH_arm64 + case CPU_TYPE_ARM64: ++#endif + storeKind = ld::Fixup::kindStoreLittleEndian32; + break; + default: +diff -ur ld64-241.9/src/ld/passes/stubs/stubs.cpp ld64-241.9/src/ld/passes/stubs/stubs.cpp +--- ld64-241.9/src/ld/passes/stubs/stubs.cpp 2014-09-11 00:24:46.000000000 +0200 ++++ ld64-241.9/src/ld/passes/stubs/stubs.cpp 2015-01-22 06:34:56.000000000 +0100 +@@ -324,9 +324,11 @@ + if ( _options.outputKind() != Options::kDynamicLibrary ) + throwf("resolver functions (%s) can only be used in dylibs", atom->name()); + if ( !_options.makeCompressedDyldInfo() ) { ++#if SUPPORT_ARCH_arm_any + if ( _options.architecture() == CPU_TYPE_ARM ) + throwf("resolver functions (%s) can only be used when targeting iOS 4.2 or later", atom->name()); + else ++#endif + throwf("resolver functions (%s) can only be used when targeting Mac OS X 10.6 or later", atom->name()); + } + stubFor[atom] = NULL; +@@ -354,6 +356,7 @@ + throw "symbol dyld_stub_binding_helper not found, normally in crt1.o/dylib1.o/bundle1.o"; + + // disable arm close stubs in some cases ++#if SUPPORT_ARCH_arm_any + if ( _architecture == CPU_TYPE_ARM ) { + if ( codeSize > 4*1024*1024 ) + _largeText = true; +@@ -377,6 +380,7 @@ + } + } + } ++#endif + + // make stub atoms + for (std::map::iterator it = stubFor.begin(); it != stubFor.end(); ++it) { +diff -ur ld64-241.9/src/other/ObjectDump.cpp ld64-241.9/src/other/ObjectDump.cpp +--- ld64-241.9/src/other/ObjectDump.cpp 2015-01-22 20:59:47.000000000 +0100 ++++ ld64-241.9/src/other/ObjectDump.cpp 2015-01-22 05:32:46.000000000 +0100 +@@ -806,6 +806,7 @@ + case ld::Fixup::kindStoreThumbHigh16: + printf(", then store high-16 in Thumb movt"); + break; ++#if SUPPORT_ARCH_arm64 + case ld::Fixup::kindStoreARM64Branch26: + printf(", then store as ARM64 26-bit pcrel branch"); + break; +@@ -845,6 +846,7 @@ + case ld::Fixup::kindStoreARM64PCRelToGOT: + printf(", then store as 32-bit delta to GOT entry"); + break; ++#endif + case ld::Fixup::kindDtraceExtra: + printf("dtrace static probe extra info"); + break; +@@ -989,6 +991,7 @@ + case ld::Fixup::kindSetTargetTLVTemplateOffsetLittleEndian64: + printf("tlv template offset of %s", referenceTargetAtomName(ref)); + break; ++#if SUPPORT_ARCH_arm64 + case ld::Fixup::kindStoreTargetAddressARM64Branch26: + printf("ARM64 store 26-bit pcrel branch to %s", referenceTargetAtomName(ref)); + break; +@@ -1022,6 +1025,7 @@ + case ld::Fixup::kindStoreTargetAddressARM64TLVPLoadNowLeaPageOff12: + printf("ARM64 store 12-bit page offset of lea for TLV of %s", referenceTargetAtomName(ref)); + break; ++#endif + //default: + // printf("unknown fixup"); + // break; +diff -ur ld64-241.9/src/other/rebase.cpp ld64-241.9/src/other/rebase.cpp +--- ld64-241.9/src/other/rebase.cpp 2014-09-11 00:24:46.000000000 +0200 ++++ ld64-241.9/src/other/rebase.cpp 2015-01-22 05:46:29.000000000 +0100 +@@ -160,9 +160,11 @@ + case CPU_TYPE_X86_64: + fRebasers.push_back(new Rebaser(&p[fileOffset])); + break; ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + fRebasers.push_back(new Rebaser(&p[fileOffset])); + break; ++#endif + default: + throw "unknown file format"; + } +@@ -186,9 +188,11 @@ + else if ( (OSSwapLittleToHostInt32(mh->magic) == MH_MAGIC_64) && (OSSwapLittleToHostInt32(mh->cputype) == CPU_TYPE_X86_64)) { + fRebasers.push_back(new Rebaser(mh)); + } ++#if SUPPORT_ARCH_arm_any + else if ( (OSSwapLittleToHostInt32(mh->magic) == MH_MAGIC) && (OSSwapLittleToHostInt32(mh->cputype) == CPU_TYPE_ARM)) { + fRebasers.push_back(new Rebaser(mh)); + } ++#endif + else { + throw "unknown file format"; + } +@@ -236,7 +240,9 @@ + template <> cpu_type_t Rebaser::getArchitecture() const { return CPU_TYPE_POWERPC64; } + template <> cpu_type_t Rebaser::getArchitecture() const { return CPU_TYPE_I386; } + template <> cpu_type_t Rebaser::getArchitecture() const { return CPU_TYPE_X86_64; } ++#if SUPPORT_ARCH_arm_any + template <> cpu_type_t Rebaser::getArchitecture() const { return CPU_TYPE_ARM; } ++#endif + + template + uint64_t Rebaser::getBaseAddress() const +@@ -875,8 +881,10 @@ + return "i386"; + case CPU_TYPE_X86_64: + return "x86_64"; ++#if SUPPORT_ARCH_arm_any + case CPU_TYPE_ARM: + return "arm"; ++#endif + } + return "unknown"; + } +@@ -969,6 +977,7 @@ + else if ( arch == CPU_TYPE_X86_64 ) { + return 0x200000000ULL; + } ++#if SUPPORT_ARCH_arm_any + else if ( arch == CPU_TYPE_ARM ) { + // place dylibs below dyld + uint64_t topAddr = 0x2FE00000; +@@ -977,6 +986,7 @@ + throwf("total size of images (0x%X) does not fit below 0x2FE00000", totalSize); + return topAddr - totalSize; + } ++#endif + else + throw "unknown architecture"; + } +@@ -1043,7 +1053,9 @@ + onlyArchs.insert(CPU_TYPE_POWERPC64); + onlyArchs.insert(CPU_TYPE_I386); + onlyArchs.insert(CPU_TYPE_X86_64); ++#if SUPPORT_ARCH_arm_any + onlyArchs.insert(CPU_TYPE_ARM); ++#endif + } + + // scan files and collect sizes +diff -ur ld64-241.9/src/other/unwinddump.cpp ld64-241.9/src/other/unwinddump.cpp +--- ld64-241.9/src/other/unwinddump.cpp 2015-01-22 20:59:47.000000000 +0100 ++++ ld64-241.9/src/other/unwinddump.cpp 2015-01-22 05:45:28.000000000 +0100 +@@ -97,7 +97,9 @@ + + template <> const char* UnwindPrinter::archName() { return "i386"; } + template <> const char* UnwindPrinter::archName() { return "x86_64"; } ++#if SUPPORT_ARCH_arm_any + template <> const char* UnwindPrinter::archName() { return "arm"; } ++#endif + #if SUPPORT_ARCH_arm64 + template <> const char* UnwindPrinter::archName() { return "arm64"; } + #endif +@@ -1072,7 +1074,9 @@ + #if SUPPORT_ARCH_arm64 + onlyArchs.insert(CPU_TYPE_ARM64); + #endif ++#if SUPPORT_ARCH_arm_any + onlyArchs.insert(CPU_TYPE_ARM); ++#endif + } + + // process each file +--- ld64-241.9/src/other/machochecker.cpp 2015-01-23 01:54:12.000000000 +0100 ++++ ld64-241.9/src/other/machochecker.cpp 2015-01-23 01:57:11.000000000 +0100 +@@ -252,6 +252,7 @@ + return false; + } + ++#if SUPPORT_ARCH_arm_any + template <> + bool MachOChecker::validFile(const uint8_t* fileContent) + { +@@ -269,6 +270,7 @@ + } + return false; + } ++#endif + + #if SUPPORT_ARCH_arm64 + template <> +@@ -294,7 +296,9 @@ + template <> uint8_t MachOChecker::loadCommandSizeMask() { return 0x07; } + template <> uint8_t MachOChecker::loadCommandSizeMask() { return 0x03; } + template <> uint8_t MachOChecker::loadCommandSizeMask() { return 0x07; } ++#if SUPPORT_ARCH_arm_any + template <> uint8_t MachOChecker::loadCommandSizeMask() { return 0x03; } ++#endif + #if SUPPORT_ARCH_arm64 + template <> uint8_t MachOChecker::loadCommandSizeMask() { return 0x07; } + #endif +@@ -324,11 +328,13 @@ + return threadInfo->thread_register(7); + } + ++#if SUPPORT_ARCH_arm_any + template <> + arm::P::uint_t MachOChecker::getInitialStackPointer(const macho_thread_command* threadInfo) + { + return threadInfo->thread_register(13); + } ++#endif + + #if SUPPORT_ARCH_arm64 + template <> +@@ -362,11 +368,13 @@ + return threadInfo->thread_register(16); + } + ++#if SUPPORT_ARCH_arm_any + template <> + arm::P::uint_t MachOChecker::getEntryPoint(const macho_thread_command* threadInfo) + { + return threadInfo->thread_register(15); + } ++#endif + + #if SUPPORT_ARCH_arm64 + template <> +@@ -1025,6 +1033,7 @@ + return fFirstWritableSegment->vmaddr(); + } + ++#if SUPPORT_ARCH_arm_any + template <> + arm::P::uint_t MachOChecker::relocBase() + { +@@ -1033,6 +1042,7 @@ + else + return fFirstSegment->vmaddr(); + } ++#endif + + #if SUPPORT_ARCH_arm64 + template <> diff --git a/sys-devel/binutils-apple/files/ld64-241.9-nosnapshots.patch b/sys-devel/binutils-apple/files/ld64-241.9-nosnapshots.patch new file mode 100644 index 000000000000..f484111ab34b --- /dev/null +++ b/sys-devel/binutils-apple/files/ld64-241.9-nosnapshots.patch @@ -0,0 +1,644 @@ +Allow to disable snapshot support because of missing Block API on OS X < 10.6. + +--- ld64-241.9/src/ld/InputFiles.cpp.orig 2015-01-16 15:26:31.000000000 -0800 ++++ ld64-241.9/src/ld/InputFiles.cpp 2015-01-16 15:26:54.000000000 -0800 +@@ -1144,7 +1144,9 @@ + case ld::File::Reloc: + { + ld::relocatable::File* reloc = (ld::relocatable::File*)file; ++#ifdef SUPPORT_SNAPSHOTS + _options.snapshot().recordObjectFile(reloc->path()); ++#endif + if ( _options.dumpDependencyInfo() ) + _options.dumpDependency(Options::depObjectFile, reloc->path()); + } +@@ -1244,7 +1246,9 @@ + if ( dylibFile->justInTimeforEachAtom(name, handler) ) { + // we found a definition in this dylib + // done, unless it is a weak definition in which case we keep searching ++#ifdef SUPPORT_SNAPSHOTS + _options.snapshot().recordDylibSymbol(dylibFile, name); ++#endif + if ( !dylibFile->hasWeakExternals() || !dylibFile->hasWeakDefinition(name)) { + return true; + } +@@ -1258,7 +1262,9 @@ + if ( archiveFile->justInTimeDataOnlyforEachAtom(name, handler) ) { + if ( _options.traceArchives() ) + logArchive(archiveFile); ++#ifdef SUPPORT_SNAPSHOTS + _options.snapshot().recordArchive(archiveFile->path()); ++#endif + // found data definition in static library, done + return true; + } +@@ -1267,7 +1273,9 @@ + if ( archiveFile->justInTimeforEachAtom(name, handler) ) { + if ( _options.traceArchives() ) + logArchive(archiveFile); ++#ifdef SUPPORT_SNAPSHOTS + _options.snapshot().recordArchive(archiveFile->path()); ++#endif + // found definition in static library, done + return true; + } +@@ -1294,7 +1302,9 @@ + if ( dylibFile->justInTimeforEachAtom(name, handler) ) { + // we found a definition in this dylib + // done, unless it is a weak definition in which case we keep searching ++#ifdef SUPPORT_SNAPSHOTS + _options.snapshot().recordDylibSymbol(dylibFile, name); ++#endif + if ( !dylibFile->hasWeakExternals() || !dylibFile->hasWeakDefinition(name)) { + return true; + } +--- ld64-241.9/src/ld/ld.cpp.orig 2015-01-16 15:26:32.000000000 -0800 ++++ ld64-241.9/src/ld/ld.cpp 2015-01-16 15:26:54.000000000 -0800 +@@ -1180,11 +1180,13 @@ + // implement assert() function to print out a backtrace before aborting + void __assert_rtn(const char* func, const char* file, int line, const char* failedexpr) + { ++#ifdef SUPPORT_SNAPSHOTS + Snapshot *snapshot = Snapshot::globalSnapshot; + + snapshot->setSnapshotMode(Snapshot::SNAPSHOT_DEBUG); + snapshot->createSnapshot(); + snapshot->recordAssertionMessage("Assertion failed: (%s), function %s, file %s, line %d.\n", failedexpr, func, file, line); ++#endif + + void* callStack[128]; + int depth = ::backtrace(callStack, 128); +@@ -1202,9 +1204,13 @@ + } + long offset = (uintptr_t)callStack[i] - (uintptr_t)info.dli_saddr; + fprintf(stderr, "%d %p %s + %ld\n", i, callStack[i], symboName, offset); ++#ifdef SUPPORT_SNAPSHOTS + snapshot->recordAssertionMessage("%d %p %s + %ld\n", i, callStack[i], symboName, offset); ++#endif + } ++#ifdef SUPPORT_SNAPSHOTS + fprintf(stderr, "A linker snapshot was created at:\n\t%s\n", snapshot->rootDir()); ++#endif + fprintf(stderr, "ld: Assertion failed: (%s), function %s, file %s, line %d.\n", failedexpr, func, file, line); + exit(1); + } +--- ld64-241.9/src/ld/Options.cpp.orig 2015-01-16 15:26:32.000000000 -0800 ++++ ld64-241.9/src/ld/Options.cpp 2015-01-16 15:27:26.000000000 -0800 +@@ -183,7 +183,11 @@ + fMarkAppExtensionSafe(false), fCheckAppExtensionSafe(false), fForceLoadSwiftLibs(false), + fDebugInfoStripping(kDebugInfoMinimal), fTraceOutputFile(NULL), + fMacVersionMin(ld::macVersionUnset), fIOSVersionMin(ld::iOSVersionUnset), +- fSaveTempFiles(false), fSnapshotRequested(false), fPipelineFifo(NULL), ++ fSaveTempFiles(false), ++#ifdef SUPPORT_SNAPSHOTS ++ fSnapshotRequested(false), ++#endif ++ fPipelineFifo(NULL), + fDependencyInfoPath(NULL), fDependencyFileDescriptor(-1) + { + this->checkForClassic(argc, argv); +@@ -589,7 +593,9 @@ + } + break; + } ++#ifdef SUPPORT_SNAPSHOTS + fLinkSnapshot.recordArch(fArchitectureName); ++#endif + // only use compressed LINKEDIT for: + // Mac OS X 10.6 or later + // iOS 3.1 or later +@@ -1908,8 +1914,10 @@ + // + void Options::parse(int argc, const char* argv[]) + { ++#ifdef SUPPORT_SNAPSHOTS + // Store the original args in the link snapshot. + fLinkSnapshot.recordRawArgs(argc, argv); ++#endif + + // pass one builds search list from -L and -F options + this->buildSearchPaths(argc, argv); +@@ -1922,17 +1930,21 @@ + const char* arg = argv[i]; + + if ( arg[0] == '-' ) { ++#ifdef SUPPORT_SNAPSHOTS + // by default, copy one arg to the snapshot link command, and do no file copying + int snapshotArgIndex = i; + int snapshotArgCount = -1; // -1 means compute count based on change in index + int snapshotFileArgIndex = -1; // -1 means no data file parameter to arg ++#endif + + // Since we don't care about the files passed, just the option names, we do this here. + if (fPrintOptions) + fprintf (stderr, "[Logging ld64 options]\t%s\n", arg); + + if ( (arg[1] == 'L') || (arg[1] == 'F') ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotArgCount = 0; // stripped out of link snapshot ++#endif + if (arg[2] == '\0') + ++i; + // previously handled by buildSearchPaths() +@@ -1979,12 +1991,16 @@ + fOutputKind = kKextBundle; + } + else if ( strcmp(arg, "-o") == 0 ) { +- snapshotArgCount = 0; + fOutputFile = argv[++i]; ++#ifdef SUPPORT_SNAPSHOTS ++ snapshotArgCount = 0; + fLinkSnapshot.setSnapshotName(fOutputFile); ++#endif + } + else if ( strncmp(arg, "-lazy-l", 7) == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotArgCount = 0; ++#endif + FileInfo info = findLibrary(&arg[7], true); + info.options.fLazyLoad = true; + info.ordinal = ld::File::Ordinal::makeArgOrdinal((uint16_t)i); +@@ -1992,13 +2008,17 @@ + fUsingLazyDylibLinking = true; + } + else if ( strcmp(arg, "-lto_library") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + fOverridePathlibLTO = argv[++i]; + if ( fOverridePathlibLTO == NULL ) + throw "missing argument to -lto_library"; + } + else if ( (arg[1] == 'l') && (strncmp(arg,"-lazy_",6) !=0) ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotArgCount = 0; ++#endif + FileInfo info = findLibrary(&arg[2]); + info.ordinal = ld::File::Ordinal::makeArgOrdinal((uint16_t)i); + addLibrary(info); +@@ -2006,8 +2026,10 @@ + // This causes a dylib to be weakly bound at + // link time. This corresponds to weak_import. + else if ( strncmp(arg, "-weak-l", 7) == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + // SNAPSHOT FIXME: what should we do for link snapshots? (ignore for now) + snapshotArgCount = 0; ++#endif + FileInfo info = findLibrary(&arg[7]); + info.options.fWeakImport = true; + info.ordinal = ld::File::Ordinal::makeArgOrdinal((uint16_t)i); +@@ -2065,12 +2087,16 @@ + else if ( strcmp(arg, "-sectorder") == 0 ) { + if ( (argv[i+1]==NULL) || (argv[i+2]==NULL) || (argv[i+3]==NULL) ) + throw "-sectorder missing

"; ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 3; ++#endif + parseSectionOrderFile(argv[i+1], argv[i+2], argv[i+3]); + i += 3; + } + else if ( strcmp(arg, "-order_file") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + parseOrderFile(argv[++i], false); + } + else if ( strcmp(arg, "-order_file_statistics") == 0 ) { +@@ -2081,7 +2107,9 @@ + else if ( (strcmp(arg, "-sectcreate") == 0) || (strcmp(arg, "-segcreate") == 0) ) { + if ( (argv[i+1]==NULL) || (argv[i+2]==NULL) || (argv[i+3]==NULL) ) + throw "-sectcreate missing
"; ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 3; ++#endif + addSection(argv[i+1], argv[i+2], argv[i+3]); + i += 3; + } +@@ -2110,7 +2138,9 @@ + } + // Same as -@ from the FSF linker. + else if ( strcmp(arg, "-filelist") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotArgCount = 0; ++#endif + const char* path = argv[++i]; + if ( (path == NULL) || (path[0] == '-') ) + throw "-filelist missing "; +@@ -2137,7 +2167,9 @@ + } + } + else if ( strcmp(arg, "-interposable_list") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + fInterposeMode = kInterposeSome; + loadExportFile(argv[++i], "-interposable_list", fInterposeList); + } +@@ -2146,14 +2178,18 @@ + fInterposeMode = kInterposeNone; + } + else if ( strcmp(arg, "-exported_symbols_list") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + if ( fExportMode == kDontExportSome ) + throw "can't use -exported_symbols_list and -unexported_symbols_list"; + fExportMode = kExportSome; + loadExportFile(argv[++i], "-exported_symbols_list", fExportSymbols); + } + else if ( strcmp(arg, "-unexported_symbols_list") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + if ( fExportMode == kExportSome ) + throw "can't use -unexported_symbols_list and -exported_symbols_list"; + fExportMode = kDontExportSome; +@@ -2172,14 +2208,18 @@ + fDontExportSymbols.insert(argv[++i]); + } + else if ( strcmp(arg, "-non_global_symbols_no_strip_list") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + if ( fLocalSymbolHandling == kLocalSymbolsSelectiveExclude ) + throw "can't use -non_global_symbols_no_strip_list and -non_global_symbols_strip_list"; + fLocalSymbolHandling = kLocalSymbolsSelectiveInclude; + loadExportFile(argv[++i], "-non_global_symbols_no_strip_list", fLocalSymbolsIncluded); + } + else if ( strcmp(arg, "-non_global_symbols_strip_list") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + if ( fLocalSymbolHandling == kLocalSymbolsSelectiveInclude ) + throw "can't use -non_global_symbols_no_strip_list and -non_global_symbols_strip_list"; + fLocalSymbolHandling = kLocalSymbolsSelectiveExclude; +@@ -2195,16 +2235,20 @@ + } + // Similar to -weak-l but uses the absolute path name to the library. + else if ( strcmp(arg, "-weak_library") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + // SNAPSHOT FIXME: what should we do for link snapshots? (ignore for now) + snapshotArgCount = 0; ++#endif + FileInfo info = findFile(argv[++i]); + info.options.fWeakImport = true; + info.ordinal = ld::File::Ordinal::makeArgOrdinal((uint16_t)i); + addLibrary(info); + } + else if ( strcmp(arg, "-lazy_library") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + // SNAPSHOT FIXME: what should we do for link snapshots? (ignore for now) + snapshotArgCount = 0; ++#endif + FileInfo info = findFile(argv[++i]); + info.options.fLazyLoad = true; + info.ordinal = ld::File::Ordinal::makeArgOrdinal((uint16_t)i); +@@ -2212,22 +2256,28 @@ + fUsingLazyDylibLinking = true; + } + else if ( strcmp(arg, "-framework") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotArgCount = 0; ++#endif + FileInfo info = findFramework(argv[++i]); + info.ordinal = ld::File::Ordinal::makeArgOrdinal((uint16_t)i); + addLibrary(info); + } + else if ( strcmp(arg, "-weak_framework") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + // SNAPSHOT FIXME: what should we do for link snapshots? (ignore for now) + snapshotArgCount = 0; ++#endif + FileInfo info = findFramework(argv[++i]); + info.options.fWeakImport = true; + info.ordinal = ld::File::Ordinal::makeArgOrdinal((uint16_t)i); + addLibrary(info); + } + else if ( strcmp(arg, "-lazy_framework") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + // SNAPSHOT FIXME: what should we do for link snapshots? (ignore for now) + snapshotArgCount = 0; ++#endif + FileInfo info = findFramework(argv[++i]); + info.options.fLazyLoad = true; + info.ordinal = ld::File::Ordinal::makeArgOrdinal((uint16_t)i); +@@ -2305,8 +2355,10 @@ + // This should probably be deprecated when we respect -L and -F + // when searching for libraries. + else if ( strcmp(arg, "-dylib_file") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + // ignore for snapshot because a stub dylib will be created in the snapshot + snapshotArgCount = 0; ++#endif + addDylibOverride(argv[++i]); + } + // What to expand @executable_path to if found in dependent dylibs +@@ -2363,7 +2415,9 @@ + } + // ??? Deprecate when we get rid of basing at build time. + else if ( strcmp(arg, "-seg_addr_table") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + const char* name = argv[++i]; + if ( name == NULL ) + throw "-seg_addr_table missing argument"; +@@ -2427,7 +2481,9 @@ + i += 2; + } + else if ( strcmp(arg, "-bundle_loader") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + fBundleLoader = argv[++i]; + if ( (fBundleLoader == NULL) || (fBundleLoader[0] == '-') ) + throw "-bundle_loader missing "; +@@ -2659,7 +2715,9 @@ + // previously handled by buildSearchPaths() + } + else if ( strcmp(arg, "-syslibroot") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotArgCount = 0; ++#endif + ++i; + // previously handled by buildSearchPaths() + } +@@ -2670,7 +2728,9 @@ + fUUIDMode = kUUIDRandom; + } + else if ( strcmp(arg, "-dtrace") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + const char* name = argv[++i]; + if ( name == NULL ) + throw "-dtrace missing argument"; +@@ -2693,7 +2753,9 @@ + fAliases.push_back(pair); + } + else if ( strcmp(arg, "-alias_list") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + parseAliasFile(argv[++i]); + } + else if ( strcmp(arg, "-save-temps") == 0 ) { +@@ -2724,48 +2786,60 @@ + fDisablePositionIndependentExecutable = true; + } + else if ( strncmp(arg, "-reexport-l", 11) == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + // SNAPSHOT FIXME: what should we do for link snapshots? (ignore for now) + snapshotArgCount = 0; ++#endif + FileInfo info = findLibrary(&arg[11], true); + info.options.fReExport = true; + info.ordinal = ld::File::Ordinal::makeArgOrdinal((uint16_t)i); + addLibrary(info); + } + else if ( strcmp(arg, "-reexport_library") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + // SNAPSHOT FIXME: what should we do for link snapshots? (ignore for now) + snapshotArgCount = 0; ++#endif + FileInfo info = findFile(argv[++i]); + info.options.fReExport = true; + info.ordinal = ld::File::Ordinal::makeArgOrdinal((uint16_t)i); + addLibrary(info); + } + else if ( strcmp(arg, "-reexport_framework") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + // SNAPSHOT FIXME: what should we do for link snapshots? (ignore for now) + snapshotArgCount = 0; ++#endif + FileInfo info = findFramework(argv[++i]); + info.options.fReExport = true; + info.ordinal = ld::File::Ordinal::makeArgOrdinal((uint16_t)i); + addLibrary(info); + } + else if ( strncmp(arg, "-upward-l", 9) == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + // SNAPSHOT FIXME: what should we do for link snapshots? (ignore for now) + snapshotArgCount = 0; ++#endif + FileInfo info = findLibrary(&arg[9], true); + info.options.fUpward = true; + info.ordinal = ld::File::Ordinal::makeArgOrdinal((uint16_t)i); + addLibrary(info); + } + else if ( strcmp(arg, "-upward_library") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + // SNAPSHOT FIXME: what should we do for link snapshots? (ignore for now) + snapshotArgCount = 0; ++#endif + FileInfo info = findFile(argv[++i]); + info.options.fUpward = true; + info.ordinal = ld::File::Ordinal::makeArgOrdinal((uint16_t)i); + addLibrary(info); + } + else if ( strcmp(arg, "-upward_framework") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + // SNAPSHOT FIXME: what should we do for link snapshots? (ignore for now) + snapshotArgCount = 0; ++#endif + FileInfo info = findFramework(argv[++i]); + info.options.fUpward = true; + info.ordinal = ld::File::Ordinal::makeArgOrdinal((uint16_t)i); +@@ -2819,7 +2893,9 @@ + fMarkDeadStrippableDylib = true; + } + else if ( strcmp(arg, "-exported_symbols_order") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + loadSymbolOrderFile(argv[++i], fExportSymbolsOrder); + } + else if ( strcmp(arg, "-no_compact_linkedit") == 0 ) { +@@ -2911,11 +2987,15 @@ + fObjcCategoryMerging = false; + } + else if ( strcmp(arg, "-force_symbols_weak_list") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + loadExportFile(argv[++i], "-force_symbols_weak_list", fForceWeakSymbols); + } + else if ( strcmp(arg, "-force_symbols_not_weak_list") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + loadExportFile(argv[++i], "-force_symbols_not_weak_list", fForceNotWeakSymbols); + } + else if ( strcmp(arg, "-force_symbol_weak") == 0 ) { +@@ -2931,7 +3011,9 @@ + fForceNotWeakSymbols.insert(symbol); + } + else if ( strcmp(arg, "-reexported_symbols_list") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + if ( fExportMode == kExportSome ) + throw "can't use -exported_symbols_list and -reexported_symbols_list"; + loadExportFile(argv[++i], "-reexported_symbols_list", fReExportSymbols); +@@ -2947,6 +3029,7 @@ + else if ( strcmp(arg, "-page_align_data_atoms") == 0 ) { + fPageAlignDataAtoms = true; + } ++#ifdef SUPPORT_SNAPSHOTS + else if (strcmp(arg, "-debug_snapshot") == 0) { + fLinkSnapshot.setSnapshotMode(Snapshot::SNAPSHOT_DEBUG); + fSnapshotRequested = true; +@@ -2959,6 +3042,7 @@ + fLinkSnapshot.setSnapshotPath(path); + fSnapshotRequested = true; + } ++#endif + else if ( strcmp(arg, "-new_main") == 0 ) { + fEntryPointLoadCommandForceOn = true; + } +@@ -2993,7 +3077,9 @@ + fKextsUseStubs = true; + } + else if ( strcmp(argv[i], "-dependency_info") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotArgCount = 0; ++#endif + ++i; + // previously handled by buildSearchPaths() + } +@@ -3001,7 +3087,9 @@ + fExportDynamic = true; + } + else if ( strcmp(arg, "-force_symbols_coalesce_list") == 0 ) { ++#ifdef SUPPORT_SNAPSHOTS + snapshotFileArgIndex = 1; ++#endif + loadExportFile(argv[++i], "-force_symbols_coalesce_list", fForceCoalesceSymbols); + } + else if ( strcmp(arg, "-add_linker_option") == 0 ) { +@@ -3158,10 +3246,12 @@ + throwf("unknown option: %s", arg); + } + ++#ifdef SUPPORT_SNAPSHOTS + if (snapshotArgCount == -1) + snapshotArgCount = i-snapshotArgIndex+1; + if (snapshotArgCount > 0) + fLinkSnapshot.addSnapshotLinkArg(snapshotArgIndex, snapshotArgCount, snapshotFileArgIndex); ++#endif + } + else { + FileInfo info = findFile(arg); +@@ -3180,8 +3270,10 @@ + addLibrary(info); + } + ++#ifdef SUPPORT_SNAPSHOTS + if (fSnapshotRequested) + fLinkSnapshot.createSnapshot(); ++#endif + } + + +@@ -3452,6 +3544,7 @@ + if ( customDyldPath != NULL ) + fDyldInstallPath = customDyldPath; + ++#ifdef SUPPORT_SNAPSHOTS + const char* debugArchivePath = getenv("LD_DEBUG_SNAPSHOT"); + if (debugArchivePath != NULL) { + fLinkSnapshot.setSnapshotMode(Snapshot::SNAPSHOT_DEBUG); +@@ -3459,6 +3552,7 @@ + fLinkSnapshot.setSnapshotPath(debugArchivePath); + fSnapshotRequested = true; + } ++#endif + + const char* pipeFdString = getenv("LD_PIPELINE_FIFO"); + if (pipeFdString != NULL) { +@@ -4351,7 +4445,9 @@ + if ( strcmp(&lastSlash[1], subUmbrella) == 0 ) { + info.options.fReExport = true; + found = true; ++#ifdef SUPPORT_SNAPSHOTS + fLinkSnapshot.recordSubUmbrella(info.path); ++#endif + break; + } + } +@@ -4374,7 +4470,9 @@ + if ( strncmp(&lastSlash[1], subLibrary, dot-lastSlash-1) == 0 ) { + info.options.fReExport = true; + found = true; ++#ifdef SUPPORT_SNAPSHOTS + fLinkSnapshot.recordSubLibrary(info.path); ++#endif + break; + } + } +--- ld64-241.9/src/ld/Options.h.orig 2015-01-16 15:26:32.000000000 -0800 ++++ ld64-241.9/src/ld/Options.h 2015-01-16 15:26:54.000000000 -0800 +@@ -48,7 +48,9 @@ + extern void throwf (const char* format, ...) __attribute__ ((noreturn,format(printf, 1, 2))); + extern void warning(const char* format, ...) __attribute__((format(printf, 1, 2))); + ++#ifdef SUPPORT_SNAPSHOTS + class Snapshot; ++#endif + + class LibraryOptions + { +@@ -379,7 +381,9 @@ + bool forceWeakNonWildCard(const char* symbolName) const; + bool forceNotWeakNonWildcard(const char* symbolName) const; + bool forceCoalesce(const char* symbolName) const; ++#ifdef SUPPORT_SNAPSHOTS + Snapshot& snapshot() const { return fLinkSnapshot; } ++#endif + bool errorBecauseOfWarnings() const; + bool needsThreadLoadCommand() const { return fNeedsThreadLoadCommand; } + bool needsEntryPointLoadCommand() const { return fEntryPointLoadCommand; } +@@ -677,8 +681,10 @@ + std::vector fSymbolsMovesCode; + std::vector fSymbolsMovesZeroFill; + bool fSaveTempFiles; ++#ifdef SUPPORT_SNAPSHOTS + mutable Snapshot fLinkSnapshot; + bool fSnapshotRequested; ++#endif + const char* fPipelineFifo; + const char* fDependencyInfoPath; + mutable int fDependencyFileDescriptor; +--- ld64-241.9/src/ld/Snapshot.cpp.orig 2014-09-10 15:24:46.000000000 -0700 ++++ ld64-241.9/src/ld/Snapshot.cpp 2015-01-16 15:26:54.000000000 -0800 +@@ -6,6 +6,7 @@ + // Copyright (c) 2011 Apple Inc. All rights reserved. + // + ++#ifdef SUPPORT_SNAPSHOTS + #include + #include + #include +@@ -536,3 +538,5 @@ + } + } + } ++ ++#endif /* SUPPORT_SNAPSHOTS */ +--- ld64-236.3/src/ld/Snapshot.h.orig 2015-01-23 07:59:55.000000000 +0100 ++++ ld64-236.3/src/ld/Snapshot.h 2015-01-23 07:58:14.000000000 +0100 +@@ -8,6 +8,8 @@ + + #ifndef ld64_Snapshot_h + #define ld64_Snapshot_h ++ ++#ifdef SUPPORT_SNAPSHOTS + #include + #include + #include +@@ -151,3 +153,5 @@ + }; + + #endif ++ ++#endif diff --git a/sys-devel/binutils-apple/files/ld64-241.9-register-names.patch b/sys-devel/binutils-apple/files/ld64-241.9-register-names.patch new file mode 100644 index 000000000000..6b855e5883bd --- /dev/null +++ b/sys-devel/binutils-apple/files/ld64-241.9-register-names.patch @@ -0,0 +1,50 @@ +Force use of old register names on old OS X (< 10.5). + +diff -ur ld64-241.9/src/ld/parsers/libunwind/Registers.hpp ld64-241.9/src/ld/parsers/libunwind/Registers.hpp +--- ld64-241.9/src/ld/parsers/libunwind/Registers.hpp 2014-09-11 00:24:46.000000000 +0200 ++++ ld64-241.9/src/ld/parsers/libunwind/Registers.hpp 2015-01-22 22:16:23.000000000 +0100 +@@ -40,6 +40,44 @@ + #include "libunwind.h" + #include "InternalMacros.h" + ++#include ++ ++#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050 ++/* member names of i386_thread_state and x86_thread_state64 have changed and ++ * default of __DARWIN_UNIX03 activating those new names as well. Instead of ++ * defining __DARWIN_UNIX03 with all its unknown consequences, we use defines ++ * to make our source use the old names on an old system. */ ++ ++#define __esp esp ++#define __eip eip ++#define __ebp ebp ++#define __ebx ebx ++#define __ecx ecx ++#define __edx edx ++#define __esi esi ++#define __edi edi ++#define __esp esp ++#define __eax eax ++#define __rip rip ++#define __rsp rsp ++#define __rax rax ++#define __rdx rdx ++#define __rcx rcx ++#define __rbx rbx ++#define __rsi rsi ++#define __rdi rdi ++#define __rbp rbp ++#define __rsp rsp ++#define __r8 r8 ++#define __r9 r9 ++#define __r10 r10 ++#define __r11 r11 ++#define __r12 r12 ++#define __r13 r13 ++#define __r14 r14 ++#define __r15 r15 ++#endif ++ + namespace libunwind { + + diff --git a/sys-fs/mtd-utils/Manifest b/sys-fs/mtd-utils/Manifest index 5d58d0b3608d..b08ae6410e3d 100644 --- a/sys-fs/mtd-utils/Manifest +++ b/sys-fs/mtd-utils/Manifest @@ -2,3 +2,4 @@ DIST mtd-utils-1.4.5.tar.gz 337279 SHA256 b30d9e262f7d8ede7ad4a3bc13803d4661e36c DIST mtd-utils-1.4.6.tar.gz 337429 SHA256 fde4698120fbedfe0bbdcb79a99c31c16686d2dddf5801716a83cbe68c38ef09 SHA512 9547a263fd9cb3e4f2dbb6911cc7395192104f9afca5da671f8679d54fa23488914f6dfa609f8dac96d90964b855167af3d25ecb72373785e49a65bd06637ec9 WHIRLPOOL 3a17ac320fa6fb6414ce40b2d92c93dd2957e8035bb4096157fb86966bd7e9f6ca151b65d6afb6221a4e824e595f0977f63bc038520ae1c55acb00c14ad6680c DIST mtd-utils-1.4.8.tar.gz 335568 SHA256 c8d291ec979824996df905f41801507aec2e6d4625bc62bc0a71411849a5d642 SHA512 7cf082e1784c8bc34f9bc82c0c2fd46ef4ee5edf5f472f8a144acd29005bfaeeefb8e71da50cefb167cd3f90cdfc2b2a89275f97167d217e64a63d293fc5567c WHIRLPOOL 45b95cde58645279ed3e58a96a864609486a7d2717f07c158b5d7e1e9e7f6856783f4d6976ac660f6738db78aa37651f93192259fb6585bf3383880d16b6ba25 DIST mtd-utils-1.5.0.tar.gz 336791 SHA256 37c660830010910c75baf4bb92697b99bdef1a63be31630882f9ebdb9347c420 SHA512 d5be5fdf4e34b553b37486c36c786e1eb8f472660c35a6adfd1305045530a270388aae4da8df34d65138469ccb576d72f2791234a4c00d1fdbacdf680d361c5a WHIRLPOOL 0c66f31baa4e54b0e1430632270425ecba0da9a0e61ff09a90a8c2a668a9194c71ab2e775da29b597aac398d6e6e1069d13524f05d121c8a480184cc7687ec11 +DIST mtd-utils-1.5.1.tar.gz 341326 SHA256 c3c5765c9f8d2a0b505f4114264c70214984dcda60b0887f480bd9ed5a9d8015 SHA512 7b11dabec26db1187ce9a39f5187998bce9a2ae4e3b99c6ce230dee826cb7576f69885f2125c7e833b229ab7feb0ef18d19ce4bf63dad48c0126586b121183ab WHIRLPOOL 3c79c8d441f2cd872e36897fe641e427c4bdacd2d16396e87ecb2ef95732b1ea903a003f15ab224343002ba99c5e87ce05978a2136070c3aa8e9d2168a90915b diff --git a/sys-fs/mtd-utils/mtd-utils-1.5.1.ebuild b/sys-fs/mtd-utils/mtd-utils-1.5.1.ebuild new file mode 100644 index 000000000000..17954ea66519 --- /dev/null +++ b/sys-fs/mtd-utils/mtd-utils-1.5.1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/mtd-utils-1.5.1.ebuild,v 1.1 2015/01/27 04:48:51 vapier Exp $ + +EAPI="4" + +inherit eutils vcs-snapshot + +if [[ ${PV} == "99999999" ]] ; then + EGIT_REPO_URI="git://git.infradead.org/mtd-utils.git" + + inherit git-2 + SRC_URI="" + #KEYWORDS="" +else + if [[ ${PV} == *.*.* ]] ; then + MY_PV="${PV}-*" + SRC_URI="http://git.infradead.org/mtd-utils.git/snapshot/v${PV}.tar.gz -> ${P}.tar.gz" + else + MY_PV="${PV}-02ae0aac87576d07202a62d11294ea55b56f450b" + SRC_URI="mirror://gentoo/${PN}-snapshot-${MY_PV}.tar.xz" + fi + KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux" +fi + +DESCRIPTION="MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)" +HOMEPAGE="http://git.infradead.org/?p=mtd-utils.git;a=summary" + +LICENSE="GPL-2" +SLOT="0" +IUSE="xattr" + +# We need libuuid +RDEPEND="!sys-fs/mtd + dev-libs/lzo + sys-libs/zlib + >=sys-apps/util-linux-2.16" +# ACL is only required for the header file to build mkfs.jffs2 +# And ACL brings in Attr as well. +DEPEND="${RDEPEND} + xattr? ( sys-apps/acl )" + +makeopts() { + # These affect build output, so keep it common between compile & install. + echo CROSS=${CHOST}- V=1 + use xattr || echo WITHOUT_XATTR=1 +} + +src_compile() { + tc-export AR CC RANLIB + local compileopts=( + AR="${AR}" CC="${CC}" RANLIB="${RANLIB}" + ) + emake $(makeopts) "${compileopts[@]}" +} + +src_install() { + emake $(makeopts) install DESTDIR="${ED}" + dodoc *.txt + newdoc mkfs.ubifs/README README.mkfs.ubifs + # TODO: check ubi-utils for docs+scripts +} diff --git a/sys-kernel/git-sources/git-sources-3.19_rc1.ebuild b/sys-kernel/git-sources/git-sources-3.19_rc1.ebuild index 12d9da76b892..b5e90b2c0d69 100644 --- a/sys-kernel/git-sources/git-sources-3.19_rc1.ebuild +++ b/sys-kernel/git-sources/git-sources-3.19_rc1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/git-sources/git-sources-3.19_rc1.ebuild,v 1.1 2014/12/21 11:45:23 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/git-sources/git-sources-3.19_rc1.ebuild,v 1.2 2015/01/26 18:32:56 mpagano Exp $ EAPI="5" UNIPATCH_STRICTORDER="yes" @@ -32,7 +32,7 @@ report the problem so it can be fixed in time for the next kernel release." RDEPEND="" DEPEND="${RDEPEND} - >=sys-devel/patch-2.7.1-r3" + >=sys-devel/patch-2.7.1-r3 =sys-devel/patch-2.7.1-r3 =sys-devel/patch-2.7.1-r3 =sys-devel/patch-2.7.1-r3 =sys-devel/patch-2.7.1-r3 =sys-devel/patch-2.7.1-r3 +Date: Thu, 8 Jan 2015 14:33:13 +0100 +Subject: screen: Fix crash with empty child process command line + +https://bugzilla.gnome.org/show_bug.cgi?id=742560 +(cherry picked from commit 1c7ed77b003f14bb94527c8fe548c6c414c0da9e) + +diff --git a/src/terminal-screen.c b/src/terminal-screen.c +index ad78388..9f63239 100644 +--- a/src/terminal-screen.c ++++ b/src/terminal-screen.c +@@ -1904,7 +1904,9 @@ terminal_screen_has_foreground_process (TerminalScreen *screen, + if (process_name) + gs_transfer_out_value (process_name, &name); + +- for (i = 0; i < len - 1; i++) ++ if (len > 0 && data[len - 1] == '\0') ++ len--; ++ for (i = 0; i < len; i++) + { + if (data[i] == '\0') + data[i] = ' '; +-- +cgit v0.10.1 + diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-title-option.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-title-option.patch new file mode 100644 index 000000000000..1e3ddd3d94b4 --- /dev/null +++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-title-option.patch @@ -0,0 +1,166 @@ +From c730504aa3893978cdb667d7fcf1357d2951841e Mon Sep 17 00:00:00 2001 +From: Christian Persch +Date: Sat, 15 Nov 2014 21:11:08 +0100 +Subject: client: Hide obsolete --title option + +Accept it for compatibility, but ignore it. + +https://bugzilla.gnome.org/show_bug.cgi?id=740188 +(cherry picked from commit 0033eca2909ddccf3358c1f089bce05d3473b123) + +diff --git a/src/gterminal.vala b/src/gterminal.vala +index cf1ffae..7e55678 100644 +--- a/src/gterminal.vala ++++ b/src/gterminal.vala +@@ -233,7 +233,6 @@ namespace GTerminal + + public static string? working_directory = null; + public static string? profile = null; +- public static string? title = null; + public static double zoom = 1.0; + + private static bool option_profile (string option_name, +@@ -269,8 +268,6 @@ namespace GTerminal + { "profile", 0, 0, OptionArg.CALLBACK, (void*) option_profile, + N_("Use the given profile instead of the default profile"), + N_("UUID") }, +- { "title", 0, 0, OptionArg.STRING, ref title, +- N_("Set the terminal title"), N_("TITLE") }, + { "cwd", 0, 0, OptionArg.FILENAME, ref working_directory, + N_("Set the working directory"), N_("DIRNAME") }, + { "zoom", 0, 0, OptionArg.CALLBACK, (void*) option_zoom, +@@ -418,7 +415,7 @@ namespace GTerminal + OpenOptions.geometry, + OpenOptions.role, + OpenOptions.profile, +- OpenOptions.title, ++ null /* title */, + OpenOptions.maximise, + OpenOptions.fullscreen); + if (OpenOptions.show_menubar_set) +diff --git a/src/terminal-options.c b/src/terminal-options.c +index 75fc64d..0280f11 100644 +--- a/src/terminal-options.c ++++ b/src/terminal-options.c +@@ -96,7 +96,6 @@ initial_tab_new (char *profile /* adopts */) + + it->profile = profile; + it->exec_argv = NULL; +- it->title = NULL; + it->working_dir = NULL; + it->zoom = 1.0; + it->zoom_set = FALSE; +@@ -110,7 +109,6 @@ initial_tab_free (InitialTab *it) + { + g_free (it->profile); + g_strfreev (it->exec_argv); +- g_free (it->title); + g_free (it->working_dir); + g_slice_free (InitialTab, it); + } +@@ -596,30 +594,6 @@ option_load_config_cb (const gchar *option_name, + } + + static gboolean +-option_title_callback (const gchar *option_name, +- const gchar *value, +- gpointer data, +- GError **error) +-{ +- TerminalOptions *options = data; +- +- if (options->initial_windows) +- { +- InitialTab *it = ensure_top_tab (options); +- +- g_free (it->title); +- it->title = g_strdup (value); +- } +- else +- { +- g_free (options->default_title); +- options->default_title = g_strdup (value); +- } +- +- return TRUE; +-} +- +-static gboolean + option_working_directory_callback (const gchar *option_name, + const gchar *value, + gpointer data, +@@ -789,7 +763,6 @@ terminal_options_parse (const char *working_directory, + options->initial_windows = NULL; + options->default_role = NULL; + options->default_geometry = NULL; +- options->default_title = NULL; + options->zoom = 1.0; + options->zoom_set = FALSE; + +@@ -928,7 +901,6 @@ terminal_options_merge_config (TerminalOptions *options, + /* it->width = g_key_file_get_integer (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_WIDTH, NULL); + it->height = g_key_file_get_integer (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_HEIGHT, NULL);*/ + it->working_dir = terminal_util_key_file_get_string_unescape (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_WORKING_DIRECTORY, NULL); +- it->title = g_key_file_get_string (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_TITLE, NULL); + + if (g_key_file_has_key (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_COMMAND, NULL) && + !(it->exec_argv = terminal_util_key_file_get_argv (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_COMMAND, NULL, error))) +@@ -985,7 +957,6 @@ terminal_options_free (TerminalOptions *options) + g_free (options->default_role); + g_free (options->default_geometry); + g_free (options->default_working_dir); +- g_free (options->default_title); + g_free (options->default_profile); + + g_strfreev (options->exec_argv); +@@ -1156,11 +1127,10 @@ get_goption_context (TerminalOptions *options) + { + "title", + 't', +- 0, ++ G_OPTION_FLAG_HIDDEN, + G_OPTION_ARG_CALLBACK, +- option_title_callback, +- N_("Set the terminal title"), +- N_("TITLE") ++ unsupported_option_callback, ++ NULL, NULL + }, + { + "working-directory", +diff --git a/src/terminal-options.h b/src/terminal-options.h +index a1e645b..17f42b4 100644 +--- a/src/terminal-options.h ++++ b/src/terminal-options.h +@@ -75,7 +75,6 @@ typedef struct + char *default_role; + char *default_geometry; + char *default_working_dir; +- char *default_title; + char **exec_argv; + char *default_profile; + gboolean default_profile_is_id; +@@ -95,7 +94,6 @@ typedef struct + char *profile; + gboolean profile_is_id; + char **exec_argv; +- char *title; + char *working_dir; + double zoom; + guint zoom_set : 1; +diff --git a/src/terminal.c b/src/terminal.c +index 2dd5a6d..b6a6f5e 100644 +--- a/src/terminal.c ++++ b/src/terminal.c +@@ -102,7 +102,7 @@ handle_options (TerminalFactory *factory, + iw->geometry, + iw->role, + it->profile ? it->profile : options->default_profile, +- it->title ? it->title : options->default_title, ++ NULL /* title */, + iw->start_maximized, + iw->start_fullscreen); + +-- +cgit v0.10.1 + diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild similarity index 83% rename from x11-terms/gnome-terminal/gnome-terminal-3.14.2-r1.ebuild rename to x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild index 54aac5ca1987..f444ef361f53 100644 --- a/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r1.ebuild +++ b/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r1.ebuild,v 1.1 2015/01/23 09:35:41 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild,v 1.1 2015/01/26 17:47:05 pacho Exp $ EAPI="5" GCONF_DEBUG="no" @@ -33,6 +33,7 @@ RDEPEND=" DEPEND="${RDEPEND} app-text/yelp-tools dev-util/appdata-tools + dev-util/gdbus-codegen || ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 ) >=dev-util/intltool-0.50 sys-devel/gettext @@ -43,6 +44,16 @@ DOC_CONTENTS="To get previous working directory inherited in new opened tab you will need to add the following line to your ~/.bashrc:\n . /etc/profile.d/vte.sh" +src_prepare() { + # client: Hide obsolete --title option (from '3.14') + epatch "${FILESDIR}/${P}-title-option.patch" + + # screen: Fix crash with empty child process command line (from '3.14') + epatch "${FILESDIR}/${P}-fix-crash.patch" + + gnome2_src_prepare +} + src_configure() { gnome2_src_configure \ --disable-static \ diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.14.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.14.2.ebuild deleted file mode 100644 index 99455f428dbd..000000000000 --- a/x11-terms/gnome-terminal/gnome-terminal-3.14.2.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.14.2.ebuild,v 1.1 2014/12/23 23:31:46 eva Exp $ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit gnome2 readme.gentoo - -DESCRIPTION="The Gnome Terminal" -HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/" - -LICENSE="GPL-3+" -SLOT="0" -IUSE="debug +gnome-shell +nautilus" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux" - -# FIXME: automagic dependency on gtk+[X] -RDEPEND=" - >=dev-libs/glib-2.40:2 - >=x11-libs/gtk+-3.10:3[X] - >=x11-libs/vte-0.38:2.91 - >=gnome-base/dconf-0.14 - >=gnome-base/gconf-2.31.3 - >=gnome-base/gsettings-desktop-schemas-0.1.0 - sys-apps/util-linux - x11-libs/libSM - x11-libs/libICE - gnome-shell? ( gnome-base/gnome-shell ) - nautilus? ( >=gnome-base/nautilus-3 ) -" -# gtk+:2 needed for gtk-builder-convert, bug 356239 -DEPEND="${RDEPEND} - app-text/yelp-tools - dev-util/appdata-tools - || ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 ) - >=dev-util/intltool-0.50 - sys-devel/gettext - virtual/pkgconfig -" - -DOC_CONTENTS="To get previous working directory inherited in new opened - tab you will need to add the following line to your ~/.bashrc:\n - . /etc/profile.d/vte.sh" - -src_configure() { - gnome2_src_configure \ - --disable-static \ - --enable-migration \ - $(use_enable debug) \ - $(use_enable gnome-shell search-provider) \ - $(use_with nautilus nautilus-extension) \ - VALAC=$(type -P true) - # Docs are broken in this release. - #ITSTOOL=$(type -P true) \ - #XMLLINT=$(type -P true) -} - -src_install() { - DOCS="AUTHORS ChangeLog HACKING NEWS" - gnome2_src_install - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - readme.gentoo_print_elog -} diff --git a/x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild b/x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild index 70f98a0a7d68..1a6b7d56abb0 100644 --- a/x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild +++ b/x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild,v 1.2 2015/01/26 12:31:03 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild,v 1.3 2015/01/27 00:13:50 idella4 Exp $ EAPI=5 inherit eutils flag-o-matic toolchain-funcs prefix @@ -69,6 +69,7 @@ src_configure() { $(use_enable imlib imlib2) \ $(use_enable nls) \ $(use_enable slit ) \ + $(use_enable toolbar ) \ $(use_enable toolbar systray ) \ $(use_enable truetype xft) \ $(use_enable xinerama) \ diff --git a/x11-wm/fluxbox/fluxbox-1.3.6-r1.ebuild b/x11-wm/fluxbox/fluxbox-1.3.6-r1.ebuild index a52f81b25aec..b9c6ef092b72 100644 --- a/x11-wm/fluxbox/fluxbox-1.3.6-r1.ebuild +++ b/x11-wm/fluxbox/fluxbox-1.3.6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.6-r1.ebuild,v 1.2 2015/01/26 05:00:18 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.6-r1.ebuild,v 1.3 2015/01/27 00:13:50 idella4 Exp $ EAPI=5 inherit eutils flag-o-matic toolchain-funcs prefix @@ -69,6 +69,7 @@ src_configure() { $(use_enable imlib imlib2) \ $(use_enable nls) \ $(use_enable slit ) \ + $(use_enable toolbar ) \ $(use_enable toolbar systray ) \ $(use_enable truetype xft) \ $(use_enable xinerama) \