set the PYTHON_VERSION environment variable so we pick the right version, from bug #206199

Package-Manager: portage-2.1.4_rc14

3 files changed, 22 insertions, 25 deletions

diff --git a/dev-python/IcePy/ChangeLog b/dev-python/IcePy/ChangeLog
index 6bb07ab992c8..798efb7636ec 100644
--- a/dev-python/IcePy/ChangeLog
+++ b/dev-python/IcePy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/IcePy
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/IcePy/ChangeLog,v 1.10 2007/09/25 19:41:37 angelos Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/IcePy/ChangeLog,v 1.11 2008/01/17 14:08:07 caleb Exp $
+
+  17 Jan 2008; Caleb Tennis <caleb@gentoo.org> IcePy-3.2.1.ebuild:
+  set the PYTHON_VERSION environment variable so we pick the right version,
+  from bug #206199
 
   25 Sep 2007; Christoph Mende <angelos@gentoo.org> IcePy-3.2.1.ebuild:
   Stable on amd64 wrt bug #192139
diff --git a/dev-python/IcePy/IcePy-3.2.1.ebuild b/dev-python/IcePy/IcePy-3.2.1.ebuild
index 8342c0e05aac..dde07ea366b1 100644
--- a/dev-python/IcePy/IcePy-3.2.1.ebuild
+++ b/dev-python/IcePy/IcePy-3.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/IcePy/IcePy-3.2.1.ebuild,v 1.4 2007/09/25 19:41:37 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/IcePy/IcePy-3.2.1.ebuild,v 1.5 2008/01/17 14:08:07 caleb Exp $
 
 inherit eutils python multilib
 
@@ -19,9 +19,13 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	MAKE_RULES="${S}/config/Make.rules"
+	python_version
+
+	# Store the PYTHON_VERSION in a variable so the Makefile knows which one to use
+	PYTHON_VERSION="python${PYVER}"
 
-	epatch ${FILESDIR}/icepy-${PV}-makefile.patch
+	MAKE_RULES="${S}/config/Make.rules"
+	epatch "${FILESDIR}/icepy-${PV}-makefile.patch"
 
 	if use amd64; then
 		sed -i -e "s:^#LP64:LP64:g" "${MAKE_RULES}" || die "Failed to set lib64 directory"
@@ -39,7 +43,6 @@ src_unpack() {
 }
 
 src_compile() {
-	cd "${S}"
 	emake || die "Died during make"
 }
 
diff --git a/dev-python/IcePy/Manifest b/dev-python/IcePy/Manifest
index bb330376f419..dd12e3131d6d 100644
--- a/dev-python/IcePy/Manifest
+++ b/dev-python/IcePy/Manifest
@@ -1,19 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX icepy-3.2.1-makefile.patch 3415 RMD160 7d9b91288e683674a2962cd67c2954a3310b08eb SHA1 5065133e20109bd467fc6fc58721465b9cb66529 SHA256 13698cc682fa0e16b6e677fd7145980be108f82b6ef29d87cc7ad222847ad330
 MD5 d9118c877307f87b3541ca1d07ff5228 files/icepy-3.2.1-makefile.patch 3415
 RMD160 7d9b91288e683674a2962cd67c2954a3310b08eb files/icepy-3.2.1-makefile.patch 3415
 SHA256 13698cc682fa0e16b6e677fd7145980be108f82b6ef29d87cc7ad222847ad330 files/icepy-3.2.1-makefile.patch 3415
 DIST IcePy-3.2.1.tar.gz 166696 RMD160 f3bf071433d9193ff42b54d9b031c712bc55ef86 SHA1 c34a7458e64cf55d7135a8bbb8f3ccce0cff3e60 SHA256 2a9ea57a370b8c0a4f3a880cbea03092f76efb417e27061f465278d95b720701
-EBUILD IcePy-3.2.1.ebuild 1260 RMD160 96ce8a73b450b343e1dab7e43d8c625bffa76089 SHA1 65927a7997046a40a797a426ae0debf620809c1c SHA256 62d447388876e65e746db6750abd6cd9b5235b789a712a16e83905611b7caa1a
-MD5 6490fe0ae99818a4e9475d3f36ce9f0e IcePy-3.2.1.ebuild 1260
-RMD160 96ce8a73b450b343e1dab7e43d8c625bffa76089 IcePy-3.2.1.ebuild 1260
-SHA256 62d447388876e65e746db6750abd6cd9b5235b789a712a16e83905611b7caa1a IcePy-3.2.1.ebuild 1260
-MISC ChangeLog 1610 RMD160 c3758612b4560482bbda64b45d37784f598f2a14 SHA1 744cf7356852fc6ec257d0916d64978195dc85dc SHA256 9233f53ff5a088d48443ff67d957699d6ec2df44a2635c02f9136a6040fef80c
-MD5 f0e62f5983926e797be738bad9af486f ChangeLog 1610
-RMD160 c3758612b4560482bbda64b45d37784f598f2a14 ChangeLog 1610
-SHA256 9233f53ff5a088d48443ff67d957699d6ec2df44a2635c02f9136a6040fef80c ChangeLog 1610
+EBUILD IcePy-3.2.1.ebuild 1380 RMD160 226b443063321e23ee9bfd0f91b3b82e78e8f0ef SHA1 7d3dcaae79ae26f53b995fb8516bd2a2f84a54d8 SHA256 d94a8b543bcd38310f3e0a5f5ed917a4993e24f309167f543f553e912a54cc25
+MD5 657dd0293714d2c529cb4e0331d7463e IcePy-3.2.1.ebuild 1380
+RMD160 226b443063321e23ee9bfd0f91b3b82e78e8f0ef IcePy-3.2.1.ebuild 1380
+SHA256 d94a8b543bcd38310f3e0a5f5ed917a4993e24f309167f543f553e912a54cc25 IcePy-3.2.1.ebuild 1380
+MISC ChangeLog 1771 RMD160 4e037bd9d5eb2e9121a34d46a7fcdc2d12a73c50 SHA1 2231d6f12eb95a9860da3e089285af1572046a3b SHA256 4ce0d3e19be5cf81edc30d471597abdb736243b9d5929c36927b3463678fd9e3
+MD5 14c062bfd85e9db360092277075e8c5e ChangeLog 1771
+RMD160 4e037bd9d5eb2e9121a34d46a7fcdc2d12a73c50 ChangeLog 1771
+SHA256 4ce0d3e19be5cf81edc30d471597abdb736243b9d5929c36927b3463678fd9e3 ChangeLog 1771
 MISC metadata.xml 392 RMD160 ffd09293bbbb76e88cfb4754677479a4d89ce9d4 SHA1 4150acf383b5db8b739e18674c0fa82e9be32091 SHA256 5f3b5405e94149e750f7912de7a4924b4ab4fe5745d12603006684cc1b33cf23
 MD5 18c99f8118456d8c3a89e1bd1726e4eb metadata.xml 392
 RMD160 ffd09293bbbb76e88cfb4754677479a4d89ce9d4 metadata.xml 392
@@ -21,10 +18,3 @@ SHA256 5f3b5405e94149e750f7912de7a4924b4ab4fe5745d12603006684cc1b33cf23 metadata
 MD5 f52ee6dbf29973f99044fb572e8ffcf0 files/digest-IcePy-3.2.1 235
 RMD160 d7dfbc96466bd7370a107933b3bedce34de47c9a files/digest-IcePy-3.2.1 235
 SHA256 10d8880f75b21709d7f86fbd860601f737d9d1704d2dc25d501b0a59e6b68fd4 files/digest-IcePy-3.2.1 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFG+WR2KhnDs22gwa8RAqKEAKCLhGTFTqR2sVtk4huZzssDqoOreACfQ1Oe
-N9J6uzjcf3TUP0EpGDCm0iw=
-=Tm6p
------END PGP SIGNATURE-----