Revbump. Use use_with for threads, remove die from econf, use emake instead of make, remove redundant python_mod_{cleanup,optimize}. Drop old.

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

3 files changed, 22 insertions, 25 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index b06810ad3c69..45cdd86b961a 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,13 @@
 # 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.347 2008/10/05 00:55:31 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.348 2008/10/06 12:15:23 hawking Exp $
+
+*python-2.6-r1 (06 Oct 2008)
+
+  06 Oct 2008; Ali Polatel <hawking@gentoo.org> -python-2.6.ebuild,
+  +python-2.6-r1.ebuild:
+  Revbump. Use use_with for threads, remove die from econf, use emake
+  instead of make, remove redundant python_mod_{cleanup,optimize}. Drop old.
 
 *python-2.6 (05 Oct 2008)
 
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 8095ac398368..a1f508193502 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.ebuild 8761 RMD160 84f8a849de5a835e1f6b2b0476ee438c36ffc84c SHA1 d9169b5a0c6b6f6aef840f03c13ce279805b6c25 SHA256 eae6cd55d497e65e89f927c28fe7b66fb176ee6dabf77a3157873b0e0065fcef
-MISC ChangeLog 61082 RMD160 bdf4b04b311d9cd0f19819316a789a3f762d7b60 SHA1 b0e8b59cbb6deae101ed8625d3a70ac6d5a40822 SHA256 333ba78314f5a313c69f53a52492bcc649fca168b9d6be00138d34bf57b9e7c2
+EBUILD python-2.6-r1.ebuild 8446 RMD160 294cf712829873414fafc8f48fd7a0d60055796b SHA1 e6661d3c53056f6f48473f168cf7633b3f645cf1 SHA256 6c7bdcb0a1dcb4a52c6d1cba8a8867cab92342048c50837da4fe50ea6bd919c7
+MISC ChangeLog 61353 RMD160 9425f0dbaec6a738f257a813239a376812e735b8 SHA1 7b928dcf2ef7c466f7fd3b09e8d0b24d98845168 SHA256 664f7761763926ec26da8f5d396c7e7e823491c40e326bf74fe1d7628432072f
 MISC metadata.xml 490 RMD160 b919b92704616b974d1da46bfea1f03c7ea50330 SHA1 d1901bc18d0aa431b05fccfe13f2f87ab2aa9e18 SHA256 765be0142679faeeaf01cfa489424c3af08ad38ed627e6a7246b4a6f96f2dffa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjoEI0ACgkQQU4yORhF8iAeFwCgkWByBBuXjBopm4/trX43fbi4
-h2AAniybKvZK2lIzv0vupDvYqIGvn+UB
-=3NyQ
+iEYEARECAAYFAkjqAWYACgkQQU4yORhF8iAG+gCeIzCaR4RQLWQI+0coua7tu78Z
+isAAn3BSrP00CfWkGTEtAJLwxdsFXcK0
+=GDvc
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/python/python-2.6.ebuild b/dev-lang/python/python-2.6-r1.ebuild
index 306000b1198e..b2692b794c30 100644
--- a/dev-lang/python/python-2.6.ebuild
+++ b/dev-lang/python/python-2.6-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.1 2008/10/05 00:55:31 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6-r1.ebuild,v 1.1 2008/10/06 12:15:23 hawking Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -132,10 +132,6 @@ src_compile() {
 		&& myconf="${myconf} --enable-unicode=ucs2" \
 		|| myconf="${myconf} --enable-unicode=ucs4"
 
-	use threads \
-		&& myconf="${myconf} --with-threads" \
-		|| myconf="${myconf} --without-threads"
-
 	src_configure
 
 	if tc-is-cross-compiler ; then
@@ -162,18 +158,19 @@ src_compile() {
 	econf \
 		--with-fpectl \
 		--enable-shared \
-		`use_enable ipv6` \
+		$(use_enable ipv6) \
+		$(use_with threads) \
 		--infodir='${prefix}'/share/info \
 		--mandir='${prefix}'/share/man \
 		--with-libc='' \
-		${myconf} || die
+		${myconf}
 	emake || die "Parallel make failed"
 }
 
 src_install() {
 	dodir /usr
 	src_configure
-	make DESTDIR="${D}" altinstall maninstall || die
+	emake DESTDIR="${D}" altinstall maninstall || die
 
 	mv "${D}"/usr/bin/python${PYVER}-config "${D}"/usr/bin/python-config-${PYVER}
 
@@ -210,8 +207,8 @@ src_install() {
 	doins "${S}"/Makefile.pre.in
 
 	if use examples ; then
-		mkdir -p "${D}"/usr/share/doc/${P}/examples
-		cp -r "${S}"/Tools "${D}"/usr/share/doc/${P}/examples
+		insinto /usr/share/doc/${PF}/examples
+		doins -r "${S}"/Tools || die "doins failed"
 	fi
 
 	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
@@ -220,10 +217,7 @@ src_install() {
 
 pkg_postrm() {
 	eselect python update --ignore 3.0
-
-	python_mod_cleanup /usr/lib/python${PYVER}
-	[[ "$(get_libdir)" == "lib" ]] || \
-		python_mod_cleanup /usr/$(get_libdir)/python${PYVER}
+	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}
 }
 
 pkg_postinst() {
@@ -233,12 +227,8 @@ pkg_postinst() {
 	eselect python update --ignore 3.0
 	python_version
 
-	python_mod_optimize
 	python_mod_optimize -x "(site-packages|test)" \
-						/usr/lib/python${PYVER}
-	[[ "$(get_libdir)" == "lib" ]] || \
-		python_mod_optimize -x "(site-packages|test)" \
-							/usr/$(get_libdir)/python${PYVER}
+						/usr/$(get_libdir)/python${PYVER}
 }
 
 src_test() {