Move more linux3 compat hack into kernel_linux check. Bug #374579

Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64

6 files changed, 50 insertions, 38 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 8967eba7444d..badee20503a6 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.541 2011/08/05 11:39:01 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.542 2011/08/07 09:58:09 naota Exp $
+
+  07 Aug 2011; Naohiro Aota <naota@gentoo.org> python-2.6.7-r2.ebuild,
+  python-2.7.2-r2.ebuild, python-3.1.4-r2.ebuild, python-3.2-r2.ebuild:
+  Move more linux3 compat hack into kernel_linux check. Bug #374579
 
   05 Aug 2011; Naohiro Aota <naota@gentoo.org> python-2.6.7-r2.ebuild,
   python-2.7.2-r2.ebuild, python-3.1.4-r2.ebuild, python-3.2-r2.ebuild:
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 6155975a5976..55f47efd9cb0 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -33,19 +33,19 @@ EBUILD python-2.4.6.ebuild 9314 RMD160 de356959ee97e81f345a595066d6400c7a505461
 EBUILD python-2.5.4-r4.ebuild 9664 RMD160 6da8e6907b3c0675a560952cc45372ec56f419fd SHA1 7d43770dbeabbd0a19bc006bd2bf5187bf84ca68 SHA256 fda530914fba4f8bb4010e6b84c3feee3bf9d5654a808e66c7541038c1d972a2
 EBUILD python-2.6.5-r3.ebuild 9460 RMD160 97f44070c60fb4ca097ece0132adc845616f4595 SHA1 7ccce712ce3c94ced869d84cafe30adbbce4c6aa SHA256 5612199d7112e2d7e59f00981dbdf038d57d8abda2b373ca56aa158bf14e6f1b
 EBUILD python-2.6.6-r2.ebuild 10546 RMD160 48acd2266821d2475a87e60ceb327910f55c3637 SHA1 31bd4e799a77eee7d27f9ce2bad8f7a2656f8021 SHA256 806e1514641dc2a60ce3e0a959bf126501bb763895873c01f8f51494326b9a6c
-EBUILD python-2.6.7-r2.ebuild 11918 RMD160 05432b0e6a11c6ab797a32682aa0b3f49dc2a9a5 SHA1 1a309b2a700ba84cd579338e0677cdd758541d92 SHA256 7aae26e852e85ef6ef929902eaa3cae0b2e8b9c13919c2fb1471026525f54680
+EBUILD python-2.6.7-r2.ebuild 11956 RMD160 d0182a06afa3529f2b4cfd11046e81bf9389424c SHA1 099e0b39cdf64dade2bea8e08fdc7d139726abde SHA256 845828a12e4da9a2f987162de8afd7082710fcd9d5cf34adfac41c43293d6e5c
 EBUILD python-2.7.1-r1.ebuild 11120 RMD160 31a17a4a78201fc4991453d4790acb90e0ffe7b2 SHA1 83aeceed035031758547a668ca9543e94d1cc2f5 SHA256 097372f26e0410438e1f511b6c13678ed16ae68b3d0779a1f848630813ca2dcf
 EBUILD python-2.7.1-r2.ebuild 11588 RMD160 39548918ba1768e74d18331f3de63d8868607760 SHA1 edd5f2f36627596afec09ff9586bcbb1b4df1a93 SHA256 7e4cc811e03062e871fb2ad12d242cec599a60f568dfa658845d716d69be22a9
-EBUILD python-2.7.2-r2.ebuild 12172 RMD160 462672620e39e0c1abcd698e9965f5121d608ab7 SHA1 ede0a42785ecba2ba26f98855eee71350bda5249 SHA256 57e1bba583f08a10862a8edcb712b642d7fb97d643b9a21cdf6f8d80d3d12d2f
+EBUILD python-2.7.2-r2.ebuild 12210 RMD160 9d7ec19ee3372fd9f1b441f8789a38d6e54ac896 SHA1 017be68bdf8951ace65785ac09272cc30c1c6a5e SHA256 bd8a4e0e5c88f84106a074bb65f99373aaf184889afae192b71c5b7088b51979
 EBUILD python-3.1.3-r1.ebuild 9798 RMD160 20b97be4899f2adba70e79d24134d11e31d1c513 SHA1 b61c32e968662d7c2984221ea48146b020d56498 SHA256 a2680419e5280a2e354a4491bd8a95094675473cf31ae8a7c07f6847fcb16703
-EBUILD python-3.1.4-r2.ebuild 10665 RMD160 acec074d65506c78bb484ef1ba5d351ae4f3236b SHA1 45d4395f78dab5cf3209ba21d036345eb213e5f8 SHA256 9509ff1a167e3a659d2c09fe1ed17634a947b436ec0245c6858313bfec0f91f6
-EBUILD python-3.2-r2.ebuild 10640 RMD160 948fc616bf95ff4e62999f9efc86404530cca5e8 SHA1 59275adaf302860dbcd33c4391cd1acc473091ba SHA256 92a2136e36f0bcdb45adbbdb7c81a1c3458f6c8cf71669d570202cdfe855d928
-MISC ChangeLog 97087 RMD160 161cb0727162764cf987b0ff582134f06caf9e5a SHA1 370ef5c0ecbb120ad3440644766d8f3d963c674b SHA256 31db4d8a904e36663833e47f498318a3dff29a959a897b1a7fb8cd03a0f97c22
+EBUILD python-3.1.4-r2.ebuild 10703 RMD160 b73fa313c117372a5a6a178e9a1fd2f7fa962af6 SHA1 fd63c7da325fd535e6521b232f2957af871e8f3d SHA256 2e8b4ba037c3616f12fc42688337a319dd2d55a6d5ab6b6f2d37be6b277e7826
+EBUILD python-3.2-r2.ebuild 10678 RMD160 2f334b54288a06c2911264a971f9d0aee06bdbee SHA1 8a2abcd9653637cf5c4e663ce7ed72a5283847f5 SHA256 bdb41a5e729779e043a4d20f073d3d6e2a3e50f8bd189726c301a491a57c5fb6
+MISC ChangeLog 97299 RMD160 7c752cbdf12e899b0c5cb3dd1ad1b8e4edbba1c1 SHA1 f8ae4c159cee1af15f25fc321f7066c3fbdf4ea0 SHA256 aaf55d90d627960888ff997b4cf79c5ff7420d456f704fc569fc84654ef5ffc2
 MISC metadata.xml 661 RMD160 54831d16b8807086bfabdbb3df9d33336b5d42a0 SHA1 9867c337fe9e6f4e967004fc9409763e0fedf43b SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (FreeBSD)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk471okACgkQGpDnPLSHuMA+3gCgjRMPDLf5b6PiMSmY4N4s5AIb
-0QkAmgJ35oSNZtBufyfC0Vss8Q4IiNEa
-=5T+i
+iEYEARECAAYFAk4+Yc0ACgkQGpDnPLSHuMCpywCePYxg3+b6CsaETdIH2xno/wMi
+piAAnRDhGldVTtrivVOP5FWcqy99647J
+=ZIPL
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/python/python-2.6.7-r2.ebuild b/dev-lang/python/python-2.6.7-r2.ebuild
index cd85d2f6d2a1..5ca7fe52724f 100644
--- a/dev-lang/python/python-2.6.7-r2.ebuild
+++ b/dev-lang/python/python-2.6.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.7-r2.ebuild,v 1.2 2011/08/05 11:39:01 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.7-r2.ebuild,v 1.3 2011/08/07 09:58:09 naota Exp $
 
 EAPI="2"
 WANT_AUTOMAKE="none"
@@ -313,12 +313,14 @@ src_install() {
 	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
 	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed"
 
-	if [ -d "${ED}$(python_get_libdir)/plat-linux2" ];then
-		cp -r "${ED}$(python_get_libdir)/plat-linux2" \
-			"${ED}$(python_get_libdir)/plat-linux3" || die "copy plat-linux failed"
-	else
-		cp -r "${ED}$(python_get_libdir)/plat-linux3" \
-			"${ED}$(python_get_libdir)/plat-linux2" || die "copy plat-linux failed"
+	if use kernel_linux; then
+		if [ -d "${ED}$(python_get_libdir)/plat-linux2" ];then
+			cp -r "${ED}$(python_get_libdir)/plat-linux2" \
+				"${ED}$(python_get_libdir)/plat-linux3" || die "copy plat-linux failed"
+		else
+			cp -r "${ED}$(python_get_libdir)/plat-linux3" \
+				"${ED}$(python_get_libdir)/plat-linux2" || die "copy plat-linux failed"
+		fi
 	fi
 
 	sed \
diff --git a/dev-lang/python/python-2.7.2-r2.ebuild b/dev-lang/python/python-2.7.2-r2.ebuild
index 75f05f0d9989..e58570a2357f 100644
--- a/dev-lang/python/python-2.7.2-r2.ebuild
+++ b/dev-lang/python/python-2.7.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.2-r2.ebuild,v 1.2 2011/08/05 11:39:01 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.2-r2.ebuild,v 1.3 2011/08/07 09:58:09 naota Exp $
 
 EAPI="2"
 WANT_AUTOMAKE="none"
@@ -329,12 +329,14 @@ src_install() {
 	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
 	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed"
 
-	if [ -d "${ED}$(python_get_libdir)/plat-linux2" ];then
-		cp -r "${ED}$(python_get_libdir)/plat-linux2" \
-			"${ED}$(python_get_libdir)/plat-linux3" || die "copy plat-linux failed"
-	else
-		cp -r "${ED}$(python_get_libdir)/plat-linux3" \
-			"${ED}$(python_get_libdir)/plat-linux2" || die "copy plat-linux failed"
+	if use kernel_linux; then
+		if [ -d "${ED}$(python_get_libdir)/plat-linux2" ];then
+			cp -r "${ED}$(python_get_libdir)/plat-linux2" \
+				"${ED}$(python_get_libdir)/plat-linux3" || die "copy plat-linux failed"
+		else
+			cp -r "${ED}$(python_get_libdir)/plat-linux3" \
+				"${ED}$(python_get_libdir)/plat-linux2" || die "copy plat-linux failed"
+		fi
 	fi
 
 	sed \
diff --git a/dev-lang/python/python-3.1.4-r2.ebuild b/dev-lang/python/python-3.1.4-r2.ebuild
index 3ff16bc42f99..fe0b31b93e27 100644
--- a/dev-lang/python/python-3.1.4-r2.ebuild
+++ b/dev-lang/python/python-3.1.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.4-r2.ebuild,v 1.2 2011/08/05 11:39:01 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.4-r2.ebuild,v 1.3 2011/08/07 09:58:09 naota Exp $
 
 EAPI="3"
 WANT_AUTOMAKE="none"
@@ -296,12 +296,14 @@ src_install() {
 	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
 	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed"
 
-	if [ -d "${ED}$(python_get_libdir)/plat-linux2" ];then
-		cp -r "${ED}$(python_get_libdir)/plat-linux2" \
-			"${ED}$(python_get_libdir)/plat-linux3" || die "copy plat-linux failed"
-	else
-		cp -r "${ED}$(python_get_libdir)/plat-linux3" \
-			"${ED}$(python_get_libdir)/plat-linux2" || die "copy plat-linux failed"
+	if use kernel_linux; then
+		if [ -d "${ED}$(python_get_libdir)/plat-linux2" ];then
+			cp -r "${ED}$(python_get_libdir)/plat-linux2" \
+				"${ED}$(python_get_libdir)/plat-linux3" || die "copy plat-linux failed"
+		else
+			cp -r "${ED}$(python_get_libdir)/plat-linux3" \
+				"${ED}$(python_get_libdir)/plat-linux2" || die "copy plat-linux failed"
+		fi
 	fi
 
 	sed \
diff --git a/dev-lang/python/python-3.2-r2.ebuild b/dev-lang/python/python-3.2-r2.ebuild
index e5c5fccbf34f..abc20268e709 100644
--- a/dev-lang/python/python-3.2-r2.ebuild
+++ b/dev-lang/python/python-3.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2-r2.ebuild,v 1.2 2011/08/05 11:39:01 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2-r2.ebuild,v 1.3 2011/08/07 09:58:09 naota Exp $
 
 EAPI="3"
 WANT_AUTOMAKE="none"
@@ -300,12 +300,14 @@ src_install() {
 	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
 	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed"
 
-	if [ -d "${ED}$(python_get_libdir)/plat-linux2" ];then
-		cp -r "${ED}$(python_get_libdir)/plat-linux2" \
-			"${ED}$(python_get_libdir)/plat-linux3" || die "copy plat-linux failed"
-	else
-		cp -r "${ED}$(python_get_libdir)/plat-linux3" \
-			"${ED}$(python_get_libdir)/plat-linux2" || die "copy plat-linux failed"
+	if use kernel_linux; then
+		if [ -d "${ED}$(python_get_libdir)/plat-linux2" ];then
+			cp -r "${ED}$(python_get_libdir)/plat-linux2" \
+				"${ED}$(python_get_libdir)/plat-linux3" || die "copy plat-linux failed"
+		else
+			cp -r "${ED}$(python_get_libdir)/plat-linux3" \
+				"${ED}$(python_get_libdir)/plat-linux2" || die "copy plat-linux failed"
+		fi
 	fi
 
 	sed -e "s:@PYDOC@:pydoc${SLOT}:" -i "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"