diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2010-04-07 19:44:58 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2010-04-07 19:44:58 +0000 |
| commit | f29ac376a9ecf9efb324b374c7349fb74d64b017 (patch) | |
| tree | fa98cd07a13c6a0b0f9743db27cdda3a93c053f3 /games-strategy | |
| parent | Fix package names in message in pkg_postinst(). (diff) | |
| download | historical-f29ac376a9ecf9efb324b374c7349fb74d64b017.tar.gz historical-f29ac376a9ecf9efb324b374c7349fb74d64b017.tar.bz2 historical-f29ac376a9ecf9efb324b374c7349fb74d64b017.zip | |
another attempt at sane boost handling
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 | 22 |
3 files changed, 17 insertions, 14 deletions
diff --git a/games-strategy/wesnoth/ChangeLog b/games-strategy/wesnoth/ChangeLog index 4733bb190575..7a5b812e1fe2 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.176 2010/04/07 03:13:41 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.177 2010/04/07 19:44:58 mr_bones_ Exp $ + + 07 Apr 2010; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-1.8.ebuild: + another attempt at sane boost handling 07 Apr 2010; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-1.8.ebuild: Expose the actual build commands to confirm proper behavior diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest index 2610f9108437..df82450d6055 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 3454 RMD160 b418e40cb9d470127590fb55c43f9de551d1f781 SHA1 0cde9aa7275b8a7541df5f484d6391ed90914ebd SHA256 2944846db9d47a989b330cf53d2d56b1fe2931ee07a790be1a05ca366946d40e -MISC ChangeLog 23054 RMD160 5d6f86203b225b93cae31317a52cf2a22e9ceb8f SHA1 f01ac5d2595f20131e96b5d5707d34a057014740 SHA256 22182ac64208a3a7d9022f8b937b865fe9aefd6161ef0f155bc66b6813c60ac8 +EBUILD wesnoth-1.8.ebuild 3451 RMD160 deee4ae73ebcb12648e21c3bff57177a05506911 SHA1 124341b53d6672b9087780f13202e818a8688a8f SHA256 eb86c99e6b85317c6cac441b088e08a69a38822e81b12d4f675eb0e9cf54407c +MISC ChangeLog 23171 RMD160 40b9e528640760940409bb7fc9ffc2f1c292dece SHA1 0d95d3cb470281d56efbee450d67a266e343e750 SHA256 45eb51d4c80c53ff2cdc8a55a4af72eaea561c35ab139fe7a7f2b3c6c32ac503 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 024b17152107..7b6308be59fe 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.7 2010/04/07 03:13:41 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.ebuild,v 1.8 2010/04/07 19:44:58 mr_bones_ Exp $ EAPI=2 inherit cmake-utils eutils multilib toolchain-funcs flag-o-matic games @@ -22,8 +22,7 @@ RDEPEND=">=media-libs/libsdl-1.2.7[video,X] !dedicated? ( dbus? ( sys-apps/dbus ) ) - amd64? ( >=dev-libs/boost-1.35:0 ) - !amd64? ( || ( dev-libs/boost:1.42 dev-libs/boost:1.41 >=dev-libs/boost-1.35:0 ) ) + >=dev-libs/boost-1.35:0 sys-libs/zlib x11-libs/pango dev-lang/lua @@ -58,18 +57,19 @@ src_prepare() { || die "sed failed" fi # how do I hate boost? Let me count the ways... - 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 + local boost_ver=$(best_version ">=dev-libs/boost-1.35") + + boost_ver=${boost_ver/*boost-/} + boost_ver=${boost_ver%.*} + boost_ver=${boost_ver/./_} + + einfo "Using boost version ${boost_ver}" append-cxxflags \ -I/usr/include/boost-${boost_ver} append-ldflags \ -L/usr/$(get_libdir)/boost-${boost_ver} + export BOOST_INCLUDEDIR="/usr/include/boost-${boost_ver}" + export BOOST_LIBRARYDIR="/usr/$(get_libdir)/boost-${boost_ver}" } src_configure() { |