diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2010-04-02 15:27:10 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2010-04-02 15:27:10 +0000 |
| commit | 1915333634d76af77553724d61295d22658bc488 (patch) | |
| tree | f0f22e19b0b77b372988a454b1a5d6cc0f6dd98d /games-strategy | |
| parent | 4.7.0.4 version bump (diff) | |
| download | historical-1915333634d76af77553724d61295d22658bc488.tar.gz historical-1915333634d76af77553724d61295d22658bc488.tar.bz2 historical-1915333634d76af77553724d61295d22658bc488.zip | |
Clamp amd64 to the one version of boost that works for them.
Package-Manager: portage-2.1.7.17/cvs/Linux i686
Diffstat (limited to 'games-strategy')
| -rw-r--r-- | games-strategy/wesnoth/ChangeLog | 5 | ||||
| -rw-r--r-- | games-strategy/wesnoth/Manifest | 4 | ||||
| -rw-r--r-- | games-strategy/wesnoth/wesnoth-1.8.ebuild | 16 |
3 files changed, 17 insertions, 8 deletions
diff --git a/games-strategy/wesnoth/ChangeLog b/games-strategy/wesnoth/ChangeLog index 078f2c4249e2..103c71da7f9e 100644 --- a/games-strategy/wesnoth/ChangeLog +++ b/games-strategy/wesnoth/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-strategy/wesnoth # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.174 2010/03/27 22:34:46 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.175 2010/04/02 15:27:10 mr_bones_ Exp $ + + 02 Apr 2010; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-1.8.ebuild: + Clamp amd64 to the one version of boost that works for them. 27 Mar 2010; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-1.8.ebuild: correct boost:0 handling (bug #311635) diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest index 67ff7d46995b..aa5d8c37c190 100644 --- a/games-strategy/wesnoth/Manifest +++ b/games-strategy/wesnoth/Manifest @@ -2,6 +2,6 @@ AUX wesnothd.rc 619 RMD160 b3d7a303f27ce3cc1886fd7791ab58f58356ac39 SHA1 8ba6dad DIST wesnoth-1.6.5.tar.bz2 230239169 RMD160 7fe957d7eeb61956252d0fc6e9ead74572be43a1 SHA1 232dac3a4327555bf52212cf4420c9ea823220e4 SHA256 7ef047ae364278a5bf9bdc69228f77d825f793f1c4d9adae8b47f0882e7f30d7 DIST wesnoth-1.8.tar.bz2 287912025 RMD160 d88a2a628353dec11b328dce42a8b790f80cefac SHA1 ff83e5c917fd03c47556165770db69f6c8a8f633 SHA256 f4defab05ccc50abf4e029b58026e9b062bd3c58c8fff2aaa23b4f3e62cf929b EBUILD wesnoth-1.6.5.ebuild 2597 RMD160 c7c79698115547087ef5a87c85337503912b2263 SHA1 3495fc361d214db98faff4a0e3adb3bce64b5c79 SHA256 d85f60c43de30810ba10ef2036996efc93016838680d3d4811d163cf108e51d4 -EBUILD wesnoth-1.8.ebuild 3295 RMD160 e799c1e6fdb53cb7f176fc3b91a6a71d1e03fa47 SHA1 b6fb36d1a3d77ca5e79533e7faf8395a431375ef SHA256 ada0d22322cd7efacdc7612db2d94d748fcf7b0ee4ba429f9644ff6135a910c6 -MISC ChangeLog 22777 RMD160 19c30d298343c2f68ba9fe1db58f3d23a36e5559 SHA1 b3f23608620b471cfff29eb2a88508d736ebfa8d SHA256 ffb04af7909b68c60910ab626cc3cc4b258dc44d9240a068a5a8549ded85e1ba +EBUILD wesnoth-1.8.ebuild 3411 RMD160 688a908ca282de11cbfdbb4bb67ad976ac922525 SHA1 2f37576ae739e3a97ccdd5820a6c24e16c596211 SHA256 522e918b3863d14a49c18ffd34cec00c50160ff3fb4338f22e9a3384c4b841eb +MISC ChangeLog 22916 RMD160 f5db43ab4157fe194dfd6a9009ef7dadc2421e1f SHA1 4835a6598b30d716a3955038f97c0f82e5fcdf5b SHA256 428516c4079decf2418f1fe157e8a1de34e92ab78f6020fe9bbdb639a7e63b62 MISC metadata.xml 330 RMD160 27f21d82f0524f02ac36acfd6116ffd979c930fd SHA1 c2ff910e780424aae4bd9d41eea083824bcdb073 SHA256 286df39ac36cc888d57c6c471a1742218ffe4b1448d410e1dba461c061841ca5 diff --git a/games-strategy/wesnoth/wesnoth-1.8.ebuild b/games-strategy/wesnoth/wesnoth-1.8.ebuild index 2410d7658ed7..5b4f87c1736b 100644 --- a/games-strategy/wesnoth/wesnoth-1.8.ebuild +++ b/games-strategy/wesnoth/wesnoth-1.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.ebuild,v 1.4 2010/03/27 22:34:46 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.ebuild,v 1.5 2010/04/02 15:27:10 mr_bones_ Exp $ EAPI=2 inherit cmake-utils eutils toolchain-funcs flag-o-matic games @@ -22,7 +22,8 @@ RDEPEND=">=media-libs/libsdl-1.2.7[video,X] !dedicated? ( dbus? ( sys-apps/dbus ) ) - || ( dev-libs/boost:1.42 dev-libs/boost:1.41 >=dev-libs/boost-1.35:0 ) + amd64? ( >=dev-libs/boost-1.35:0 ) + !amd64? ( || ( dev-libs/boost:1.42 dev-libs/boost:1.41 >=dev-libs/boost-1.35:0 ) ) sys-libs/zlib x11-libs/pango dev-lang/lua @@ -57,9 +58,14 @@ src_prepare() { || die "sed failed" fi # how do I hate boost? Let me count the ways... - has_version dev-libs/boost:0 && boost_ver=1_35 - has_version dev-libs/boost:1.41 && boost_ver=1_41 - has_version dev-libs/boost:1.42 && boost_ver=1_42 + local boost_ver + if use amd64 ; then + boost_ver=1_35 + else + has_version dev-libs/boost:0 && boost_ver=1_35 + has_version dev-libs/boost:1.41 && boost_ver=1_41 + has_version dev-libs/boost:1.42 && boost_ver=1_42 + fi append-cxxflags \ -I/usr/include/boost-${boost_ver} append-ldflags \ |