Doesn't work with some boost versions so build/link against specific versions

Package-Manager: portage-2.1.7.17/cvs/Linux i686

diff --git a/games-strategy/wesnoth/ChangeLog b/games-strategy/wesnoth/ChangeLog
index d6bb007404e48c75827a196c238140aac9b91dc8..7b4db82061cdbd57eb2a8a15b92a44dc63f79a80 100644 (file)
--- a/games-strategy/wesnoth/ChangeLog
+++ b/games-strategy/wesnoth/ChangeLog
@@ -1,6 +1,10 @@
 # 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.172 2010/03/25 16:20:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.173 2010/03/26 06:50:00 mr_bones_ Exp $
+
+  26 Mar 2010; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-1.8.ebuild:
+  Doesn't work with some boost versions so build/link against specific
+  versions
 
 *wesnoth-1.8 (25 Mar 2010)
 

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index c7f4ec5f13f81c2503e5ae80d2f5ab9e9d466dfa..0bdb187a71b75ff211244920d7671c6c994d9c9d 100644 (file)
--- 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 2929 RMD160 9c1cc13ea102ef08fc951d773b09461e45901094 SHA1 82d3c3621416485941c4ba441343825a552a05ef SHA256 4a65a92bee5bf24ef07e3bf6ce24d4bd3abf3374eed45220db18c30c8484f469
-MISC ChangeLog 22502 RMD160 06da51bf380152acf6dea8d7ce36f48a5fe5ea91 SHA1 65474b736625de5d2e5de7f3d8d94cd32d547054 SHA256 14dd05d3dd4e6622fa032fb1b7bc9037017978327443b715bbea7554042372f6
+EBUILD wesnoth-1.8.ebuild 3362 RMD160 f987ac0d0e909b73483aca97c3420729804e3af8 SHA1 797842b0ba90af0cdb703d18a03d3920f5102491 SHA256 5daaeb49837d7a23666a8ef071a59af0ef931e8c4e106885c1a401ad7ad26042
+MISC ChangeLog 22660 RMD160 e9110021b13a63453be2366c1ce095dbeb501d6e SHA1 3f5052c2150f02e3e030819f3cb364333f8344e7 SHA256 c50ff51c78b6a55ddc4ae60e325b9e9054387dcccc3a7e9651e16626e5ec04fc
 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 69ac4036405a2ac75364a1903234d7b923182be6..2c65c63ee19a2fc0cfddcc716309ab0d287bb3ca 100644 (file)
--- 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.1 2010/03/25 16:20:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.ebuild,v 1.2 2010/03/26 06:50:00 mr_bones_ Exp $
 
 EAPI=2
 inherit cmake-utils eutils toolchain-funcs flag-o-matic games
@@ -22,7 +22,7 @@ RDEPEND=">=media-libs/libsdl-1.2.7[video,X]
        !dedicated? (
                dbus? ( sys-apps/dbus )
        )
-       >=dev-libs/boost-1.35
+       || ( dev-libs/boost:1.42 dev-libs/boost:1.41 dev-libs/boost:1.37 dev-libs/boost:1.35 )
        sys-libs/zlib
        x11-libs/pango
        dev-lang/lua
@@ -56,6 +56,15 @@ src_prepare() {
                        doc/CMakeLists.txt \
                        || die "sed failed"
        fi
+       # how do I hate boost? Let me count the ways...
+       has_version dev-libs/boost:1.35 && boost_ver=1_35
+       has_version dev-libs/boost:1.37 && boost_ver=1_37
+       has_version dev-libs/boost:1.41 && boost_ver=1_41
+       has_version dev-libs/boost:1.42 && boost_ver=1_42
+       append-cxxflags \
+               -I/usr/include/boost-${boost_ver}
+       append-ldflags \
+               -L/usr/$(get_libdir)/boost-${boost_ver}
 }
 
 src_configure() {