Revbump. Bump to EAPI 2 and some minor fixes. Drop old.

Package-Manager: portage--svn/cvs/Linux 2.6.26-gentoo x86_64

3 files changed, 29 insertions, 34 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 45cdd86b961a..2f780c1003d2 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.348 2008/10/06 12:15:23 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.349 2008/10/07 23:04:02 hawking Exp $
+
+*python-2.6-r2 (07 Oct 2008)
+
+  07 Oct 2008; Ali Polatel <hawking@gentoo.org> -python-2.6-r1.ebuild,
+  +python-2.6-r2.ebuild:
+  Revbump. Bump to EAPI 2 and some minor fixes. Drop old.
 
 *python-2.6-r1 (06 Oct 2008)
 
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index a1f508193502..e3001a475fec 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -29,13 +29,13 @@ EBUILD python-2.4.4-r5.ebuild 10353 RMD160 2e84fa53221be1417bcbfac063fadb8177f79
 EBUILD python-2.4.4-r6.ebuild 10354 RMD160 4237041263cf6516bb1d62b070d92d47dc53fd87 SHA1 392f2af04382fe8db2ea674d54f40a3e5703c48d SHA256 dfae0111133299b0ad1665aeeb9d1b59ef72ad0ba38c1242b600cf709cbea9b6
 EBUILD python-2.5.2-r7.ebuild 10394 RMD160 51d68b1aeeb6708a5ee6806d6dc826a8d905d5be SHA1 cc08331d6e7a376aea74ac13f3b0d93c53de80d9 SHA256 af0fb9858660a2cb6bbaa42b785b7400832e5a4aa76e25f9453f98254e84c673
 EBUILD python-2.5.2-r8.ebuild 10387 RMD160 499b986533d9487dcff8c362ad5784df69cbaf29 SHA1 fb2f0250e7887f9d9331ec358daea791b871b350 SHA256 696b6fc1b31d491d76a14450af4f91e0124379704a8670a9d62ccdd757a69809
-EBUILD python-2.6-r1.ebuild 8446 RMD160 294cf712829873414fafc8f48fd7a0d60055796b SHA1 e6661d3c53056f6f48473f168cf7633b3f645cf1 SHA256 6c7bdcb0a1dcb4a52c6d1cba8a8867cab92342048c50837da4fe50ea6bd919c7
-MISC ChangeLog 61353 RMD160 9425f0dbaec6a738f257a813239a376812e735b8 SHA1 7b928dcf2ef7c466f7fd3b09e8d0b24d98845168 SHA256 664f7761763926ec26da8f5d396c7e7e823491c40e326bf74fe1d7628432072f
+EBUILD python-2.6-r2.ebuild 8292 RMD160 5837a354814576bf12918f77eddc430a7688fc4b SHA1 5e345e31e4d275e49e7aecae029dba42decde850 SHA256 7243b3d3cc20c9ef87924ef4be1cd163a0f15daad3cdc28d8be9f28e5acf1ad5
+MISC ChangeLog 61538 RMD160 4ef858144ef05756dfb831a87894728d7ba24e0e SHA1 309148f70aa2d78d16c90d69814bb6e48e339e23 SHA256 dfd34409209744e7d1c0fe9aca630b7990094d7db6ca58cc975ce5c66f66573a
 MISC metadata.xml 490 RMD160 b919b92704616b974d1da46bfea1f03c7ea50330 SHA1 d1901bc18d0aa431b05fccfe13f2f87ab2aa9e18 SHA256 765be0142679faeeaf01cfa489424c3af08ad38ed627e6a7246b4a6f96f2dffa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjqAWYACgkQQU4yORhF8iAG+gCeIzCaR4RQLWQI+0coua7tu78Z
-isAAn3BSrP00CfWkGTEtAJLwxdsFXcK0
-=GDvc
+iEYEARECAAYFAkjr6uwACgkQQU4yORhF8iDhpQCfSIuNnXIIMWDYqUHzxsXzAXS5
+pSwAmwVK6loU3shsPuNo25EWGm/4qCPL
+=1ngL
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/python/python-2.6-r1.ebuild b/dev-lang/python/python-2.6-r2.ebuild
index b2692b794c30..c33957c233b3 100644
--- a/dev-lang/python/python-2.6-r1.ebuild
+++ b/dev-lang/python/python-2.6-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6-r1.ebuild,v 1.1 2008/10/06 12:15:23 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6-r2.ebuild,v 1.1 2008/10/07 23:04:02 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
 #   in dev-lang/python. It _WILL_ stop people installing from
 #   Gentoo 1.4 images.
 
-EAPI=1
+EAPI=2
 
 inherit eutils autotools flag-o-matic python multilib versionator toolchain-funcs libtool
 
@@ -52,9 +52,8 @@ DEPEND=">=app-admin/eselect-python-20080630
 PDEPEND="${DEPEND} app-admin/python-updater"
 PROVIDE="virtual/python"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	default
 
 	if tc-is-cross-compiler ; then
 		[[ $(python -V 2>&1) != "Python ${PV}" ]] && \
@@ -72,7 +71,7 @@ src_unpack() {
 		Makefile.pre.in \
 		Modules/Setup.dist \
 		Modules/getpath.c \
-		setup.py || die
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
 
 	# fix os.utime() on hppa. utimes it not supported but unfortunately reported as working - gmsoft (22 May 04)
 	# PLEASE LEAVE THIS FIX FOR NEXT VERSIONS AS IT'S A CRITICAL FIX !!!
@@ -105,21 +104,6 @@ src_configure() {
 		use tk       || disable="${disable} _tkinter"
 		export PYTHON_DISABLE_MODULES="${disable}"
 	fi
-	einfo "Disabled modules: $PYTHON_DISABLE_MODULES"
-}
-
-src_compile() {
-	filter-flags -malign-double
-
-	# Seems to no longer be necessary
-	#[ "${ARCH}" = "amd64" ] && append-flags -fPIC
-	[ "${ARCH}" = "alpha" ] && append-flags -fPIC
-
-	# http://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flag -O3; then
-	   is-flag -fstack-protector-all && replace-flags -O3 -O2
-	   use hardened && replace-flags -O3 -O2
-	fi
 
 	export OPT="${CFLAGS}"
 
@@ -132,7 +116,17 @@ src_compile() {
 		&& myconf="${myconf} --enable-unicode=ucs2" \
 		|| myconf="${myconf} --enable-unicode=ucs4"
 
-	src_configure
+	filter-flags -malign-double
+
+	# Seems to no longer be necessary
+	#[ "${ARCH}" = "amd64" ] && append-flags -fPIC
+	[ "${ARCH}" = "alpha" ] && append-flags -fPIC
+
+	# http://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flag -O3; then
+	   is-flag -fstack-protector-all && replace-flags -O3 -O2
+	   use hardened && replace-flags -O3 -O2
+	fi
 
 	if tc-is-cross-compiler ; then
 		OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
@@ -144,7 +138,7 @@ src_compile() {
 		sed -i \
 			-e '/^HOSTPYTHON/s:=.*:=./hostpython:' \
 			-e '/^HOSTPGEN/s:=.*:=./Parser/hostpgen:' \
-			Makefile.pre.in || die
+			Makefile.pre.in || die "sed failed"
 	fi
 
 	# export CXX so it ends up in /usr/lib/python2.x/config/Makefile
@@ -164,12 +158,10 @@ src_compile() {
 		--mandir='${prefix}'/share/man \
 		--with-libc='' \
 		${myconf}
-	emake || die "Parallel make failed"
 }
 
 src_install() {
 	dodir /usr
-	src_configure
 	emake DESTDIR="${D}" altinstall maninstall || die
 
 	mv "${D}"/usr/bin/python${PYVER}-config "${D}"/usr/bin/python-config-${PYVER}
@@ -221,9 +213,6 @@ pkg_postrm() {
 }
 
 pkg_postinst() {
-	local myroot
-	myroot="$(echo "${ROOT}" | sed 's:/$::')"
-
 	eselect python update --ignore 3.0
 	python_version