EAPI=2; fix building with USE=python (bug #280005)

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

4 files changed, 13 insertions, 12 deletions

diff --git a/games-board/gnubg/ChangeLog b/games-board/gnubg/ChangeLog
index 4bbf92879f50..2682b5ca6efd 100644
--- a/games-board/gnubg/ChangeLog
+++ b/games-board/gnubg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/gnubg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/ChangeLog,v 1.41 2009/02/13 11:35:28 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/ChangeLog,v 1.42 2009/08/07 21:09:58 mr_bones_ Exp $
+
+  07 Aug 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  gnubg-0.14.3-r1.ebuild, files/gnubg-0.14.3-as-needed.patch:
+  EAPI=2; fix building with USE=python (bug #280005)
 
   13 Feb 2009; Alfredo Tupone <tupone@gentoo.org> gnubg-0.14.3-r1.ebuild:
   append-ldflags removed as not needed. Bug #226895 by flameeyes@gentoo.org
diff --git a/games-board/gnubg/Manifest b/games-board/gnubg/Manifest
index f5f15cfa0eae..cefd06e6c785 100644
--- a/games-board/gnubg/Manifest
+++ b/games-board/gnubg/Manifest
@@ -1,11 +1,11 @@
 AUX gnubg-0.14.3-64bits.patch 2171 RMD160 b07cea2d81ce8508b38cbefa7ca13a152862fd2e SHA1 12a1e3fcb5d48401b6df4e9fc42ec1ffb70c0b4a SHA256 631572f633f7f86f071bb7497149dbeaf25666ae901f95d566d671286e5c0732
-AUX gnubg-0.14.3-as-needed.patch 1173 RMD160 0265a521695e9e1ae0c157beb3e58a69e4ccfd10 SHA1 73055233faf2f3d7eeaf13010d0a5f86aa14b7b4 SHA256 c9f9e9b95825f635a284f01147233c0466942128b691567c06394354c9c03c71
+AUX gnubg-0.14.3-as-needed.patch 1009 RMD160 e4e31bf624941959db1e40f2e1a81a58a5ff96d6 SHA1 4ca25f4eb9e3919021803af2a06183e5a71091e5 SHA256 dfb6131d2204804ff8f1da857f2e390c56085b3a575e9bcfcfba3fe6e85686dc
 AUX gnubg-0.14.3-blas.patch 284 RMD160 4a517b4f7984099c2deda3d9e7a45bc1b9324dc4 SHA1 d9fa2178f19fb80e470654e8be1570c709ac6a50 SHA256 1c86e885acecd617d67cd6b44ae99de1cdc23e91dcc955a5c475fa91261ed570
 AUX gnubg-0.14.3-gcc4.patch 3589 RMD160 28d8b654f837936db37f66e9df8e85e8369a82a3 SHA1 eed82ec0b1a4cb5f51468dbcb5c4f2ac80036e3d SHA256 0f3f7e08207f3d0ccbf4931127dde6c9ca95ec1cb4d12914d3dbc7932407c096
 DIST gnubg-0.14.3.tar.gz 4241526 RMD160 da7b2a3b52194ca11d505a70fba805e99f15c3ed SHA1 8a03c91d190e26fb4024cacd766464741b1dfc90 SHA256 76d18f1a7952a4ba2372e439b3c4ecf2fcd244d334c609bb22d3f501067d1d72
 DIST gnubg.weights-0.14.gz 460747 RMD160 5d588b1145f0d0489b5d70fa6cfccd9ce6738f04 SHA1 e828006193629063460b032f9a7da9761fdbc085 SHA256 6c134ded36d0875cb673a4f9fd84e2d30424935951baeffcd94852ccdb2daf70
 DIST gnubg_os0.bd.gz 906720 RMD160 83fefa3c39544ca9a51f1ba7ae5e8bd5215e631c SHA1 d038a338ee2998d8a61d90b89478eeac3ad464c8 SHA256 e84a36f133ee7ea9fa3686af6c111088b8b43906db1b6c6b3db0035c84cda809
 DIST gnubg_ts0.bd.gz 5899380 RMD160 9e0bea798a53374061014226aca9f5d2063133e8 SHA1 b7c4c18dfc2f3be6cd884444bdf523c8aef6ce41 SHA256 0934e4f2d84f5cd50c2ff4592c93c49d43f7cb89da342600736849c7362626d5
-EBUILD gnubg-0.14.3-r1.ebuild 3029 RMD160 8e0ff33f62cd6d49e6050ec241004ab2bee57b3c SHA1 f07725405c9b68daaef08feb704810a5d4197cf5 SHA256 963141e1b9d8dd66ee0eb548c803e49b6bb86709343e5c896bbff6ebc0977af8
-MISC ChangeLog 5441 RMD160 f53473ac1ec94abbd0e2d86d3a4d6adef3682ed4 SHA1 ee497a5ab2a89a3edacd68c4840b1282cc7df8b7 SHA256 9d276255293a474f78d41f2099f688f29bbea9c3d90c157669824530b0cf0e94
+EBUILD gnubg-0.14.3-r1.ebuild 2976 RMD160 9f33b67a824228a4e0525efa9ef63a22df6df417 SHA1 e241fd9c82e26fc4f8fe38714dd86a1d8fd8944d SHA256 6df2b547792c6144289f95054583d712c2a82de709ab6abca944eb1fd23ac0bf
+MISC ChangeLog 5615 RMD160 bb73420570d10f2ca69d2dd80fae7bd0e3d605d2 SHA1 320b37655d26bab92ce032d9e6d2f31a3115f1e9 SHA256 02f8d70ca486860ebd370b47f1ec649bacb460ce55d765aa191dd304bf79ee80
 MISC metadata.xml 251 RMD160 f77a8fea97ab2a02ef2d9bf1cc7b390c5c19e6cb SHA1 8134d1f2611a2e4387a89e84580a2cb5c25f5649 SHA256 34f41062e84f1e12c08550faffc97632a2432df3579520cec76dbe8b08fb9cfe
diff --git a/games-board/gnubg/files/gnubg-0.14.3-as-needed.patch b/games-board/gnubg/files/gnubg-0.14.3-as-needed.patch
index ff1be799a4c9..4ffd240c2a96 100644
--- a/games-board/gnubg/files/gnubg-0.14.3-as-needed.patch
+++ b/games-board/gnubg/files/gnubg-0.14.3-as-needed.patch
@@ -16,7 +16,7 @@
              echo "$as_me:$LINENO: checking for python libraries" >&5
  echo $ECHO_N "checking for python libraries... $ECHO_C" >&6
 -      PYTHON_LIBS=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBS'), distutils.sysconfig.get_config_var('LIBPL')+'/'+distutils.sysconfig.get_config_var('LIBRARY')"`
-+      PYTHON_LIBS=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBPL')+'/'+distutils.sysconfig.get_config_var('LIBRARY'), distutils.sysconfig.get_config_var('LIBS')"`
++      PYTHON_LIBS=`python-config --libs`
        echo "$as_me:$LINENO: result: $PYTHON_LIBS" >&5
  echo "${ECHO_T}$PYTHON_LIBS" >&6
 
diff --git a/games-board/gnubg/gnubg-0.14.3-r1.ebuild b/games-board/gnubg/gnubg-0.14.3-r1.ebuild
index 33f0aba4c506..fec6df5860d5 100644
--- a/games-board/gnubg/gnubg-0.14.3-r1.ebuild
+++ b/games-board/gnubg/gnubg-0.14.3-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/gnubg-0.14.3-r1.ebuild,v 1.13 2009/02/13 11:35:28 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/gnubg-0.14.3-r1.ebuild,v 1.14 2009/08/07 21:09:58 mr_bones_ Exp $
 
+EAPI=2
 inherit flag-o-matic eutils games
 
 WPV="0.14"
@@ -44,9 +45,7 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	mv ../${PN}.weights-${WPV} "${S}/${PN}.weights"
 	mv ../*bd .
 	sed -i 's:$(localedir):/usr/share/locale:' \
@@ -98,9 +97,7 @@ src_compile() {
 		$(use_with python) \
 		$(use_with readline) \
 		$(use_with X x) \
-		${myconf} \
-		|| die
-	emake || die "emake failed"
+		${myconf}
 }
 
 src_install() {