Revbump N. 2 for all testing versions of Python wrt bug #374579 and linux-3

Package-Manager: portage-2.2.0_alpha41/cvs/Linux i686

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 07d24bd18daf5670e1e627aff89c96292ffda2b1..f6dda82f5b9228d4d392525272ac3675f8ddec43 100644 (file)
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,17 @@
 # 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.539 2011/07/23 00:53:21 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.540 2011/07/24 15:06:30 neurogeek Exp $
+
+*python-3.2-r2 (24 Jul 2011)
+*python-3.1.4-r2 (24 Jul 2011)
+*python-2.7.2-r2 (24 Jul 2011)
+*python-2.6.7-r2 (24 Jul 2011)
+
+  24 Jul 2011; Jesus Rivero <neurogeek@gentoo.org> -python-2.6.7-r1.ebuild,
+  +python-2.6.7-r2.ebuild, -python-2.7.2-r1.ebuild, +python-2.7.2-r2.ebuild,
+  -python-3.1.4-r1.ebuild, +python-3.1.4-r2.ebuild, -python-3.2-r1.ebuild,
+  +python-3.2-r2.ebuild:
+  Revbump N. 2 for all testing versions of Python wrt bug #374579 and linux-3
 
 *python-3.2-r1 (22 Jul 2011)
 *python-3.1.4-r1 (22 Jul 2011)

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index b5c162fc7a3a62fd123e9255d26468e1d8f0e67a..e91165bbfe496847f0ed4b6f48c2fb11677a4f06 100644 (file)
--- 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-r1.ebuild 11612 RMD160 9b3ba4158a0197ef77a151267cf837ab0c16a1fc SHA1 aa6d7555b27ed9968d7bdd4c302368bf47112e90 SHA256 b766b6173732f7e875a63593b379ee3d73a6e2510254f870af212907b336f293
+EBUILD python-2.6.7-r2.ebuild 11890 RMD160 f417dc9bde2c5b51a8be13e178aa2fa6ce8d24da SHA1 a60144501cb9dde6e2953e04347e5013bccb9427 SHA256 4f2f7be51638ecc87be75a90f008b2fb4fa242cfdaa7bc6bba6d20e7c40cc4a1
 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-r1.ebuild 11945 RMD160 1795c17e721b3a6772bc869aaca169bedb651582 SHA1 0d5d355a2ce635a1daa6ae808748db76db8cf896 SHA256 81728ae0202ad74bc326d846f9eab162ad2a84c3020b1de5a19a985958dcf0c6
+EBUILD python-2.7.2-r2.ebuild 12144 RMD160 c591d24acfbc2f581362a7b2247c5896798c3110 SHA1 c466ea40dab5c02b3527e3c0fe5831913a54e2e1 SHA256 985d91aefe900a2be5bc4af58d57b61a30c515533069b24bd8912719564ee789
 EBUILD python-3.1.3-r1.ebuild 9798 RMD160 20b97be4899f2adba70e79d24134d11e31d1c513 SHA1 b61c32e968662d7c2984221ea48146b020d56498 SHA256 a2680419e5280a2e354a4491bd8a95094675473cf31ae8a7c07f6847fcb16703
-EBUILD python-3.1.4-r1.ebuild 10359 RMD160 b6f0f45327c165ef4a54204f40ac3d324d8ec239 SHA1 70e1432c7f2910c76662d9a9c3473363d173c118 SHA256 b928d35fd836ce7287f475e9940e1fb1a828e24127036e474dbebbb9b7080511
-EBUILD python-3.2-r1.ebuild 10334 RMD160 1dfb50c16ca23d510cb0793019010f665c51b422 SHA1 13eb05064a7795d80e8e7eff877e03355e7c365e SHA256 15120f6e615eb008b50b0c4a212b1b02fd223631903d78f2f286d49c7485429c
-MISC ChangeLog 96429 RMD160 66e8b775fcfb550ef49f7f45302e72be96980522 SHA1 388edf18d83699c93bd1227fb1c25bb0bc9b3cd5 SHA256 0d2222bb7c0aae1557be868e68a71a89b809c57f91d7fa5ad76623203538fc51
+EBUILD python-3.1.4-r2.ebuild 10637 RMD160 58106e430476e737759a41532350073900e6f3ff SHA1 c75d4ab8df661710cdf2e8ce138bf1f385e3ff71 SHA256 fe6c1f8eb35bf78a92fa41d219980821dbc14d02e08c453ac20c99cec08dbd8c
+EBUILD python-3.2-r2.ebuild 10612 RMD160 6a0ae95281d9c18c5da7467638e1a40c77f3dcc3 SHA1 98bceef31efa0c8234e17c6178a881aa0bdaf5bc SHA256 78ad6d0c850559a000856441d4300af66a63f0327ad35babc342a6cabfcf2fc9
+MISC ChangeLog 96884 RMD160 e5c29a9942f2579db35c2005abb622dcbd20df3e SHA1 0d019d59e3ab5008c034848b8bba38816cf5e6ba SHA256 744707524925332cffbd9b4a70b43edda28d4671a4abf01855a95296f50e78bf
 MISC metadata.xml 661 RMD160 54831d16b8807086bfabdbb3df9d33336b5d42a0 SHA1 9867c337fe9e6f4e967004fc9409763e0fedf43b SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk4p4vsACgkQdIssYB9vBoMc+wCeNEy1+D2VT94ORgaLXN3RFUP8
-yugAn3vym5OxZ1opRtS0d2e54VXbMTXZ
-=1D5s
+iEYEARECAAYFAk4r/HcACgkQdIssYB9vBoNstQCePGK1SwVGYtmK7d2Z9wSmmyP7
+qsoAnjPShYcNP5W9fuZSi/bdIcL0YSpE
+=uXzB
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/python/python-2.6.7-r1.ebuild b/dev-lang/python/python-2.6.7-r2.ebuild
similarity index 96%
rename from dev-lang/python/python-2.6.7-r1.ebuild
rename to dev-lang/python/python-2.6.7-r2.ebuild
index 64956fefc688fa0f450bdb23e41eab117eef81ec..26f7191de680466bd5a5f50763e449ce73f5b365 100644 (file)
--- a/dev-lang/python/python-2.6.7-r1.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-r1.ebuild,v 1.1 2011/07/23 00:53:21 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.7-r2.ebuild,v 1.1 2011/07/24 15:06:30 neurogeek Exp $
 
 EAPI="2"
 WANT_AUTOMAKE="none"
@@ -144,6 +144,9 @@ src_prepare() {
                Modules/getpath.c \
                setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
 
+       #Linux-3 compat. Bug #374579 (upstream issue12571)
+       cp -r "${S}/Lib/plat-linux2" "${S}/Lib/plat-linux3" || die "copy plat-linux failed"
+
        eautoreconf
 }
 
@@ -308,9 +311,13 @@ src_install() {
        newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
        newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed"
 
-       #Linux-3 compat. Bug #374579 (upstream issue12571)
-       cp -r "${ED}$(python_get_libdir)/plat-linux2" \
+       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
 
        sed \
                -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \

diff --git a/dev-lang/python/python-2.7.2-r1.ebuild b/dev-lang/python/python-2.7.2-r2.ebuild
similarity index 96%
rename from dev-lang/python/python-2.7.2-r1.ebuild
rename to dev-lang/python/python-2.7.2-r2.ebuild
index ff32c440056de12a92cba636c051efa72f813f53..a1f2575e5c0df4218a30ae7076fac2912094f7da 100644 (file)
--- a/dev-lang/python/python-2.7.2-r1.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-r1.ebuild,v 1.1 2011/07/23 00:53:21 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.2-r2.ebuild,v 1.1 2011/07/24 15:06:30 neurogeek Exp $
 
 EAPI="2"
 WANT_AUTOMAKE="none"
@@ -148,6 +148,9 @@ src_prepare() {
                Modules/getpath.c \
                setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
 
+       #Linux-3 compat. Bug #374579 (upstream issue12571)
+       cp -r "${S}/Lib/plat-linux2" "${S}/Lib/plat-linux3" || die "copy plat-linux failed"
+
        eautoreconf
 }
 
@@ -324,17 +327,18 @@ src_install() {
        newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
        newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed"
 
-       #Linux-3 compat. Bug #374579 (upstream issue12571)
-       cp -r "${ED}$(python_get_libdir)/plat-linux2" \
+       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
 
        sed \
                -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
                -e "s:@PYDOC@:pydoc${SLOT}:" \
                -i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-
-       # Do not install empty directory.
-       rmdir "${ED}$(python_get_libdir)/lib-old"
 }
 
 pkg_preinst() {

diff --git a/dev-lang/python/python-3.1.4-r1.ebuild b/dev-lang/python/python-3.1.4-r2.ebuild
similarity index 96%
rename from dev-lang/python/python-3.1.4-r1.ebuild
rename to dev-lang/python/python-3.1.4-r2.ebuild
index 5e33667cc5872655c6aedbdd8cc5d6bfc0f056b6..e0742a090d6f1fc9ab84b8d862c0e94020068c38 100644 (file)
--- a/dev-lang/python/python-3.1.4-r1.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-r1.ebuild,v 1.1 2011/07/23 00:53:21 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.4-r2.ebuild,v 1.1 2011/07/24 15:06:30 neurogeek Exp $
 
 EAPI="3"
 WANT_AUTOMAKE="none"
@@ -114,6 +114,9 @@ src_prepare() {
 
        EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" epatch "${patchset_dir}"
 
+       #Linux-3 compat. Bug #374579 (upstream issue12571)
+       cp -r "${S}/Lib/plat-linux2" "${S}/Lib/plat-linux3" || die "copy plat-linux failed"
+
        sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
                Lib/distutils/command/install.py \
                Lib/distutils/sysconfig.py \
@@ -291,9 +294,13 @@ src_install() {
        newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
        newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed"
 
-       #Linux-3 compat. Bug #374579 (upstream issue12571)
-       cp -r "${ED}$(python_get_libdir)/plat-linux2" \
+       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
 
        sed \
                -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \

diff --git a/dev-lang/python/python-3.2-r1.ebuild b/dev-lang/python/python-3.2-r2.ebuild
similarity index 95%
rename from dev-lang/python/python-3.2-r1.ebuild
rename to dev-lang/python/python-3.2-r2.ebuild
index 95aae83ba60feb11fab3ca1dec0041b558740c2b..ff461aa2f72a4d1abf176609c1857879053092fc 100644 (file)
--- a/dev-lang/python/python-3.2-r1.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-r1.ebuild,v 1.1 2011/07/23 00:53:21 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2-r2.ebuild,v 1.1 2011/07/24 15:06:30 neurogeek Exp $
 
 EAPI="3"
 WANT_AUTOMAKE="none"
@@ -106,6 +106,9 @@ src_prepare() {
 
        EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" epatch "${patchset_dir}"
 
+       #Linux-3 compat. Bug #374579 (upstream issue12571)
+       cp -r "${S}/Lib/plat-linux2" "${S}/Lib/plat-linux3" || die "copy plat-linux failed"
+
        sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
                Lib/distutils/command/install.py \
                Lib/distutils/sysconfig.py \
@@ -295,9 +298,13 @@ src_install() {
        newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
        newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed"
 
-       #Linux-3 compat. Bug #374579 (upstream issue12571)
-       cp -r "${ED}$(python_get_libdir)/plat-linux2" \
+       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
 
        sed -e "s:@PYDOC@:pydoc${SLOT}:" -i "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
 }