Fix autogen problems (bug 355733).

Package-Manager: portage-2.1.10.39/cvs/Linux x86_64

5 files changed, 21 insertions, 14 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 845e412a0926..e853cc0a25fb 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.559 2011/12/01 11:19:00 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.560 2011/12/01 13:58:42 djc Exp $
+
+  01 Dec 2011; Dirkjan Ochtman <djc@gentoo.org> python-2.7.2-r3.ebuild,
+  python-3.1.4-r3.ebuild, python-3.2.2.ebuild:
+  Fix autogen problems (bug 355733).
 
   01 Dec 2011; Dirkjan Ochtman <djc@gentoo.org> -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 7ec2e56bc053..88a9cc219a3a 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -33,16 +33,16 @@ EBUILD python-2.5.4-r4.ebuild 9761 RMD160 abd16725421330ef8a312b435d84afe6caa426
 EBUILD python-2.6.6-r2.ebuild 10643 RMD160 05d2ccb6c2190fd8670e4746813661402492d228 SHA1 e9593163f531cb8bcebf65e510671fc762fbaefa SHA256 4c662ef2238e60fe0007566b2ac19869edfef18c2b3b965eb94606ae525ac45c
 EBUILD python-2.6.7-r2.ebuild 11713 RMD160 8ae1389d4475f4257684f2bfebbe07a1989123bd SHA1 d7040fbeb217975d4d109795052e10763757f9e2 SHA256 2ca0e45d147cefe8114015d0756425de97ecea8f241c1ac4881aa53bb40653c7
 EBUILD python-2.7.1-r1.ebuild 11217 RMD160 c26e835583ee4797dfc0e5ae51932fd8e9303777 SHA1 62830059f58bff5c6e05b53d3e9bf2da733a752c SHA256 316d43bb68f55203cfee8029262e39c594af822f8d8b536fc19a89d5da698769
-EBUILD python-2.7.2-r3.ebuild 11990 RMD160 a456c556c4725415453da7207ec5a96362dad860 SHA1 ebd81188225b3032e6e191da9af94149b086bc7d SHA256 6d37770550b16c433d025c464df62c354b3b35e322ab205a65009f9ba8e7f7b2
+EBUILD python-2.7.2-r3.ebuild 11997 RMD160 425059fd1d381a08f53df8ac8f9b229b34040c48 SHA1 0d736c8ec246032ba7e97485a69714845aad045b SHA256 e113b08aa78cf20fb5ca27de9fad65973b174fd5c60e82b500b3517a38d33f7b
 EBUILD python-3.1.3-r1.ebuild 9894 RMD160 edd846b9fe5c472e4e99dfa95395708afa71ed13 SHA1 2807dad1ee84148cb2ddd466f047e5610e7c668b SHA256 ff762195045158c7cf2719a7ebfdb8317b4aa7fcf089db52afa9559a36ed01bc
-EBUILD python-3.1.4-r3.ebuild 10490 RMD160 88dd6a6b04ecb4391943b0694ccc522667de767c SHA1 6351f3bb4c7e39393d9f6d628c9f15a1cae778b4 SHA256 fdd34a955ed1e7544a3894f7ccef90a22f6a03f326dccfc5c8f55a503120c95d
-EBUILD python-3.2.2.ebuild 10716 RMD160 eaf7fd123e8f20d13d5b1ba2a6f1b60e62be780b SHA1 e27ab698ad9092c2246cf0960cfb8d74eeaf7e79 SHA256 bc35f6e26996c6b177f20af619e127ea3fb3b64237fcf6c003c5f98203087d44
-MISC ChangeLog 100034 RMD160 bd49811b996ecd593b74bd74a3768c8f76ab4a66 SHA1 c779533fd82eb70aa180bcc7aa32cf857b56320a SHA256 f737258a5261d11f562551dea42a613e492bd81394de03975226be332053b48b
+EBUILD python-3.1.4-r3.ebuild 10497 RMD160 b6e737a8eeee28b66c92fe19df31d3bda80b2f20 SHA1 97b5df3896f924d8e1203eb6d6319ead6c7ad228 SHA256 f364881588d07d2eba7a1c897caa071c2378ef8c3f5ddd3ae9df3b919b3238e9
+EBUILD python-3.2.2.ebuild 10724 RMD160 c9459967f31d9af9bfd4aa2d75a2a7947b89d36b SHA1 297ef250605a004c0cd799d7f3b4b915cb6a6e61 SHA256 13405863b383495be23f3b6b5975da571abf6385f34c91a17aea61efc04194d7
+MISC ChangeLog 100191 RMD160 27f0b946cbf0916933d86964dac61e92a3c4436f SHA1 b7afa7f92e720780bc2253a4373d250b16dd7397 SHA256 2ac72a7c13b0072d6aa39aad3c036d0225adf605af3565129aa0b30dab382d62
 MISC metadata.xml 661 RMD160 54831d16b8807086bfabdbb3df9d33336b5d42a0 SHA1 9867c337fe9e6f4e967004fc9409763e0fedf43b SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk7XYqwACgkQxeMuLWsGW/tF8gCfcIgY9fJuW1AXdp7T2Yon0Rn/
-U5sAoI2570qlzilV3xDzjqEbeSXxC9Fx
-=6XL1
+iEUEAREKAAYFAk7XiB0ACgkQxeMuLWsGW/t2IACfTc69Oel8cRD3W750vQKFNc+M
+78gAlivtDAWQfla/2c+AIGEtpBbqJFs=
+=RiL5
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/python/python-2.7.2-r3.ebuild b/dev-lang/python/python-2.7.2-r3.ebuild
index dc52ee93767e..02153d41f5ec 100644
--- a/dev-lang/python/python-2.7.2-r3.ebuild
+++ b/dev-lang/python/python-2.7.2-r3.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-r3.ebuild,v 1.8 2011/11/26 16:50:52 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.2-r3.ebuild,v 1.9 2011/12/01 13:58:42 djc Exp $
 
 EAPI="2"
 WANT_AUTOMAKE="none"
@@ -152,7 +152,8 @@ src_prepare() {
 	# Linux-3 compat. Bug #374579 (upstream issue12571)
 	cp -r "${S}/Lib/plat-linux2" "${S}/Lib/plat-linux3" || die
 
-	eautoreconf
+	eautoconf
+	eautoheader
 }
 
 src_configure() {
diff --git a/dev-lang/python/python-3.1.4-r3.ebuild b/dev-lang/python/python-3.1.4-r3.ebuild
index 5e48be1ff4b4..6cd9e833c7a2 100644
--- a/dev-lang/python/python-3.1.4-r3.ebuild
+++ b/dev-lang/python/python-3.1.4-r3.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-r3.ebuild,v 1.6 2011/11/26 16:50:52 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.4-r3.ebuild,v 1.7 2011/12/01 13:58:42 djc Exp $
 
 EAPI="3"
 WANT_AUTOMAKE="none"
@@ -127,7 +127,8 @@ src_prepare() {
 		Modules/getpath.c \
 		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
 
-	eautoreconf
+	eautoconf
+	eautoheader
 }
 
 src_configure() {
diff --git a/dev-lang/python/python-3.2.2.ebuild b/dev-lang/python/python-3.2.2.ebuild
index a18d84eb9f29..95f257112457 100644
--- a/dev-lang/python/python-3.2.2.ebuild
+++ b/dev-lang/python/python-3.2.2.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.2.ebuild,v 1.3 2011/10/31 04:02:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.2.ebuild,v 1.4 2011/12/01 13:58:42 djc Exp $
 
 EAPI="3"
 WANT_AUTOMAKE="none"
@@ -135,7 +135,8 @@ src_prepare() {
 		sed -e "s/\(-DSVNVERSION=\).*\( -o\)/\1\\\\\"${ESVN_REVISION}\\\\\"\2/" -i Makefile.pre.in || die "sed failed"
 	fi
 
-	eautoreconf
+	eautoconf
+	eautoheader
 }
 
 src_configure() {