diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2010-05-04 05:33:36 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2010-05-04 05:33:36 +0000 |
| commit | 26583548c30be49ffac7797108fa07d8ee8042e7 (patch) | |
| tree | 4553416beda90fe08e1c962917fe2fd5a9be4c84 /games-board | |
| parent | Force python2 fixing bug #312231 (diff) | |
| download | historical-26583548c30be49ffac7797108fa07d8ee8042e7.tar.gz historical-26583548c30be49ffac7797108fa07d8ee8042e7.tar.bz2 historical-26583548c30be49ffac7797108fa07d8ee8042e7.zip | |
Allow newer boost and steal boost-related code from wesnoth ebuild
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'games-board')
| -rw-r--r-- | games-board/pokerth/ChangeLog | 5 | ||||
| -rw-r--r-- | games-board/pokerth/Manifest | 4 | ||||
| -rw-r--r-- | games-board/pokerth/pokerth-0.7.1.ebuild | 15 |
3 files changed, 17 insertions, 7 deletions
diff --git a/games-board/pokerth/ChangeLog b/games-board/pokerth/ChangeLog index 21690ee14fb8..5b0eaa380ca8 100644 --- a/games-board/pokerth/ChangeLog +++ b/games-board/pokerth/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-board/pokerth # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/pokerth/ChangeLog,v 1.11 2010/04/02 15:43:56 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/pokerth/ChangeLog,v 1.12 2010/05/04 05:33:36 mr_bones_ Exp $ + + 04 May 2010; Michael Sterrett <mr_bones_@gentoo.org> pokerth-0.7.1.ebuild: + Allow newer boost and steal boost-related code from wesnoth ebuild 02 Apr 2010; Markus Meier <maekke@gentoo.org> pokerth-0.7.1.ebuild: amd64 stable diff --git a/games-board/pokerth/Manifest b/games-board/pokerth/Manifest index e0ff7abbe3cd..41f63680c6bf 100644 --- a/games-board/pokerth/Manifest +++ b/games-board/pokerth/Manifest @@ -1,4 +1,4 @@ DIST PokerTH-0.7.1-src.tar.bz2 6535050 RMD160 7aca895bb07bc83f977e9147217ad50eb7adfb8a SHA1 9c0c546355d7d248aeeee371d0354bfe90150a7b SHA256 97df0eeabd11e862b23e770e87053ceac245dd082f1516be1be9e4fcae882ece -EBUILD pokerth-0.7.1.ebuild 1579 RMD160 c34fa8f4c6a38de596f56d738d4f8ca3ed638f99 SHA1 8ad7d88ee5237f08c342c24883ac6bc66b8402ee SHA256 8f65a13a36493100931b431083b1717d362cbbff839d58df3c5f23e87e09cbef -MISC ChangeLog 1482 RMD160 04dbdc7b730649c1c4216197c765d3503b59a78c SHA1 f323547b52b44d2885a267640295706f5bcc3e0e SHA256 10bc317f339512cd0ca3b68a2b27ea21100c3d644fee59a635f405420435817b +EBUILD pokerth-0.7.1.ebuild 1768 RMD160 7bc88ce349d8fadafb068b84fc499399166f3288 SHA1 142e7c2149a8bfd80ae586849d6cb6d1e280db6f SHA256 ccef6bd58733f3f371987cd2dfc0f45587e10affd068005e2377f56df227b15a +MISC ChangeLog 1632 RMD160 5836551f5aaaea500f0386da1788dfa16249b765 SHA1 47da3e5f1550e55e1db7bc37b5ed4ff048dffacb SHA256 289d66dd9d6926614dfbe6024ee4a33f4ca4b28826ff3cf9e9a956e4e9438689 MISC metadata.xml 160 RMD160 f839c00d9f25c1f873f95ab899fb64060c1d0bf5 SHA1 08c3d180cf8dbef87e40c42a18b457516a5d7ffe SHA256 5ac0a3647e8149d52ce55d391cf1680ac52d6f0330be21c3bca4790b971b5e5d diff --git a/games-board/pokerth/pokerth-0.7.1.ebuild b/games-board/pokerth/pokerth-0.7.1.ebuild index adac4852bf3f..a5c4bec3982c 100644 --- a/games-board/pokerth/pokerth-0.7.1.ebuild +++ b/games-board/pokerth/pokerth-0.7.1.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-board/pokerth/pokerth-0.7.1.ebuild,v 1.5 2010/04/02 15:43:56 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/pokerth/pokerth-0.7.1.ebuild,v 1.6 2010/05/04 05:33:36 mr_bones_ Exp $ EAPI=2 inherit multilib flag-o-matic eutils qt4 games @@ -15,7 +15,7 @@ SLOT="0" KEYWORDS="amd64 ~ppc x86" IUSE="dedicated" -DEPEND="|| ( dev-libs/boost:1.41 dev-libs/boost:1.39 ) +DEPEND=">=dev-libs/boost-1.39 >=net-libs/gnutls-2.2.2 >=net-misc/curl-7.16 x11-libs/qt-core:4 @@ -41,12 +41,19 @@ src_prepare() { -e '/no_dead_strip_inits_and_terms/d' \ *pro \ || die 'sed failed' - has_version dev-libs/boost:1.39 && boost_ver=1_39 - has_version dev-libs/boost:1.41 && boost_ver=1_41 + local boost_ver=$(best_version ">=dev-libs/boost-1.39") + + 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() { |