Synchronize ebuilds.

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

4 files changed, 55 insertions, 45 deletions

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 7d818e90320e..87ee4843ad99 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -23,17 +23,17 @@ DIST python-gentoo-patches-3.1.2-r1.tar.bz2 11601 RMD160 af8150aa23097931c28a611
 DIST python-gentoo-patches-3.1.2-r2.tar.bz2 12239 RMD160 6fe97b9875edb8a940774bfe1f508bdbfa0d2a44 SHA1 65db74ee0462b6fad7216833baebbd82869eb42c SHA256 bf7c0fb6d5522169c9d0266554055e0b5260ab0dc216dbc5f2a63d1ba21f5fa9
 DIST python-gentoo-patches-3.1.2-r3.tar.bz2 12576 RMD160 69713fa35cbf84ad98a604e29d909a8aa0179c0e SHA1 01b15dbe60aef5f4fdce5d373338dfb2eb4833d7 SHA256 ea9b6446da6490c88ef24743e18e9033c44a72abb4e8390e31e3a6801b36a0a5
 DIST python-gentoo-patches-3.1.2-r5.tar.bz2 67359 RMD160 0ee5576b7de728a0840c6020d8403b94a883eeaa SHA1 5900a751c7e6fea512f79e045aa2f7870e378595 SHA256 fa5eabe0cc84789e9ed2fd6140dfdf08ca29de00474b117b9998b0eefc2e850a
-EBUILD python-2.4.6.ebuild 8966 RMD160 d48e302f289834896434b38113d1d98e7c0a4dbd SHA1 08004c836e1fa10401689ae2455b3790503ae0fc SHA256 f26f980b2d3697e8842dd36ca06b44f7eba921bca06b2388d8621d95065fcfc2
-EBUILD python-2.5.4-r4.ebuild 9306 RMD160 c11c7d75f4298228e5f1164b7315fb8d00294833 SHA1 36bae88672be35eb877f9b3ad0b1fd5dbf491a48 SHA256 30c8f1f29d2af9565e9b97f1ec266bf1aff283018f882ee9dbfbe02e175e48a2
+EBUILD python-2.4.6.ebuild 9219 RMD160 c9db27d2e66db495bb9ce9aaa64a934e8dd51c25 SHA1 bc66ef2e5fd4312b4850dcead59e926d2a611abc SHA256 e98cd595cdf67b8ac6131682ade1ca4a4b0549541337917bcf4a2b85d7444c86
+EBUILD python-2.5.4-r4.ebuild 9509 RMD160 ca13118bee42debccc87993147caf240f1d32d89 SHA1 a6b9872f8b8f739ee08fec46d5fce7601950243d SHA256 dac4ce97bb7bff1bc02f3ac536d028228c7154db125133a18bd9eab0b0e51bf8
 EBUILD python-2.6.4-r1.ebuild 9559 RMD160 99a85580a38955be98e2217dc65cb48d84082080 SHA1 d9620d4205f605d38d4058416b93f997b4313578 SHA256 3b968bae7990af61dc74a1c98c60f60e0fd711a444bdfbfd43dfe165688e3fc2
 EBUILD python-2.6.4.ebuild 9491 RMD160 a297ff0934fd2df2aca38db02fb21e8c8e839772 SHA1 3eaced72f6b57c5978c925223d27adb4ea82a0e4 SHA256 97ebe170095882d2dc1eb6d723b771787d2c3cabf2ec30ce3d8ae8138b4df054
 EBUILD python-2.6.5-r1.ebuild 9231 RMD160 69a339bf15f769c0c0455e25827a498747274af7 SHA1 22fb2c7d2f66c8dbfcf436f3b8c0f7e94b98fb55 SHA256 c8f45a4011f82858fdf11a72e586ee3bcc53ed577c7456afcb42a12e6a40acab
-EBUILD python-2.6.5-r2.ebuild 9335 RMD160 07733cd8c55d914cd4e70a9b6e62bfc730f1154a SHA1 c928563f81ff8a95d797a21fdbbf71b687410cc8 SHA256 a8e99af7e58ba0fe4cc5d0330c362d6a785bc6182f987f37b6f69c4430589a22
+EBUILD python-2.6.5-r2.ebuild 9369 RMD160 264197151f64917810322ae03a20ffb26c00a8da SHA1 7eff5ae0960ffda3e31adc919b0235d59a986570 SHA256 8d861c1f177010c81ab77cc2411362faf88af778895dbb1b4f782db3350fdfd8
 EBUILD python-2.6.5.ebuild 9228 RMD160 47b7340932deac8dea68779629cb448d706b42e6 SHA1 0a71fb985750482e2caa8e6d11614fd59bdfb249 SHA256 6692689ef3ab26b449ed3ba43f8635c939e9e11802ed16bc9a7d5f0e38a4b3bf
 EBUILD python-3.1.1-r1.ebuild 9134 RMD160 7ff62378f1c80f92ec9ca3c8106558e2705a9987 SHA1 ddb6cfa8e905c24f85afc6efff5168187523443d SHA256 e5ab994e0a2fa74e8c801fe629773c81ec50ec2d6316eac1d899ee88c8ec71f1
 EBUILD python-3.1.2-r1.ebuild 8802 RMD160 efaacc0e401f5e8b53ce0315888a3fca35b51e68 SHA1 1a725ed73a70de4fc68821bbeba0eda87845b889 SHA256 c2fab3e279559b9fd2f00c745313973a16849e3ec771c33c48ce18e747c856cb
 EBUILD python-3.1.2-r2.ebuild 8802 RMD160 d66f3bec04cc5c2ed67112c85d47bee82ae0f3f9 SHA1 2815db9e7cdd51698b698aadd4612b47c25d54db SHA256 73166aed679d683f320d872fcd06bbabe56357953707616178e607620cc87dc7
-EBUILD python-3.1.2-r3.ebuild 8865 RMD160 073a162ad3e74d5b908e43a623552d55c5fed92e SHA1 267d772c58206d6b9bcc0546bbbc2c25ebe17a61 SHA256 0bb370d1df922b9377de3fb00f97018d8152c0c6736752038ea763b5902e935f
+EBUILD python-3.1.2-r3.ebuild 8957 RMD160 c1509c424faed071bf1736cb4a1f1cdec4823e37 SHA1 39a93a920f333b9d5a5e75c7a2f0faae70c3a35e SHA256 d89eca688f9949690da913f27fbd88c5df6d8348aa26211c6c5d023d4cab215f
 EBUILD python-3.1.2.ebuild 8799 RMD160 5e5979e2f91367805b87fc66819f1228d1b96c0c SHA1 71ca84ddb3ae055b95fffe10958a9073c1a062aa SHA256 586d1b9d6fe0b4d94139a657c2235d29788e4601079a97408c38b21df1c0ae51
-MISC ChangeLog 83014 RMD160 94c1359fde1fe04fa4d8f6596a96668db0efd6b1 SHA1 606df3d94ada3daa96aead46cc1dfb9e1f3b4b66 SHA256 8f8703abbe0d0ea0f9270038821ebcd4e61ecdbdb25061d1dffcaacfbd5e2377
+MISC ChangeLog 83149 RMD160 78697e233c8c13010b3c8785900b8fc19e2538f9 SHA1 c081fb8fd79552abcd9ad81df35a2227cfddb3ca SHA256 c49190a76c1de4b1beff5cc6a9d306dac46df7f67c58d290bec8459bdaefcac9
 MISC metadata.xml 661 RMD160 54831d16b8807086bfabdbb3df9d33336b5d42a0 SHA1 9867c337fe9e6f4e967004fc9409763e0fedf43b SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908
diff --git a/dev-lang/python/python-2.4.6.ebuild b/dev-lang/python/python-2.4.6.ebuild
index ca96aa1fddc4..6eafab158125 100644
--- a/dev-lang/python/python-2.4.6.ebuild
+++ b/dev-lang/python/python-2.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v 1.32 2010/03/20 20:33:28 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v 1.33 2010/05/02 16:41:19 arfrever Exp $
 
 EAPI="1"
 
@@ -59,6 +59,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	# Ensure that internal copy of expat is not used.
+	rm -fr Modules/expat
+
 	if tc-is-cross-compiler; then
 		epatch "${FILESDIR}/python-2.4.4-test-cross.patch"
 	else
@@ -175,7 +178,7 @@ src_compile() {
 }
 
 src_test() {
-	# Tests won't work when cross compiling.
+	# Tests will not work when cross compiling.
 	if tc-is-cross-compiler; then
 		elog "Disabling tests due to crosscompiling."
 		return
@@ -206,13 +209,15 @@ src_test() {
 	done
 
 	elog "If you'd like to run them, you may:"
-	elog "cd $(python_get_libdir)/test"
+	elog "cd '${EPREFIX}$(python_get_libdir)/test'"
 	elog "and run the tests separately."
 
 	python_disable_pyc
 }
 
 src_install() {
+	[[ -z "${ED}" ]] && ED="${D%/}${EPREFIX}/"
+
 	emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed"
 
 	# Install our own custom python-config
@@ -223,33 +228,35 @@ src_install() {
 	dosed "s:/usr/lib/:/usr/$(get_libdir)/:" /usr/bin/python-config-${SLOT}
 
 	# Fix collisions between different slots of Python.
-	mv "${D}usr/bin/pydoc" "${D}usr/bin/pydoc${SLOT}"
-	mv "${D}usr/bin/idle" "${D}usr/bin/idle${SLOT}"
-	mv "${D}usr/share/man/man1/python.1" "${D}usr/share/man/man1/python${SLOT}.1"
-	rm -f "${D}usr/bin/smtpd.py"
+	mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
+	mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
+	mv "${ED}usr/share/man/man1/python.1" "${ED}usr/share/man/man1/python${SLOT}.1"
+	rm -f "${ED}usr/bin/smtpd.py"
 
 	# Fix the OPT variable so that it doesn't have any flags listed in it.
 	# Prevents the problem with compiling things with conflicting flags later.
-	sed -e "s:^OPT=.*:OPT=\t\t-DNDEBUG:" -i "${D}$(python_get_libdir)/config/Makefile"
+	sed -e "s:^OPT=.*:OPT=\t\t-DNDEBUG:" -i "${ED}$(python_get_libdir)/config/Makefile"
 
 	# Python 2.4 partially doesn't respect $(get_libdir).
 	if use build; then
-		rm -fr "${D}usr/bin/idle${SLOT}" "${D}"usr/lib*/python${SLOT}/{bsddb,idlelib,lib-tk,test}
+		rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}"usr/lib*/python${SLOT}/{bsddb,idlelib,lib-tk,test}
 	else
-		use elibc_uclibc && rm -fr "${D}"usr/lib*/python${SLOT}/{bsddb/test,test}
-		use berkdb || rm -fr "${D}"usr/lib*/python${SLOT}/{bsddb,test/test_bsddb*}
-		use tk || rm -fr "${D}usr/bin/idle${SLOT}" "${D}"usr/lib*/python${SLOT}/{idlelib,lib-tk}
+		use elibc_uclibc && rm -fr "${ED}"usr/lib*/python${SLOT}/{bsddb/test,test}
+		use berkdb || rm -fr "${ED}"usr/lib*/python${SLOT}/{bsddb,test/test_bsddb*}
+		use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}"usr/lib*/python${SLOT}/{idlelib,lib-tk}
 	fi
 
 	prep_ml_includes $(python_get_includedir)
 
+	dodoc Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
+
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
 		doins -r "${S}/Tools" || die "doins failed"
 	fi
 
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed"
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
 }
 
 pkg_preinst() {
diff --git a/dev-lang/python/python-2.5.4-r4.ebuild b/dev-lang/python/python-2.5.4-r4.ebuild
index d3990f123b18..ea4a54796dd6 100644
--- a/dev-lang/python/python-2.5.4-r4.ebuild
+++ b/dev-lang/python/python-2.5.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild,v 1.15 2010/03/20 20:33:28 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild,v 1.16 2010/05/02 16:41:19 arfrever Exp $
 
 EAPI="1"
 
@@ -22,7 +22,7 @@ PYTHON_ABI="${SLOT}"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
-# NOTE: dev-python/{elementtree,celementtree,pysqlite,ctypes}
+# NOTE: dev-python/{elementtree,celementtree,pysqlite}
 #       do not conflict with the ones in python proper. - liquidx
 
 RDEPEND=">=app-admin/eselect-python-20091230
@@ -70,9 +70,10 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# Ensure that internal copies of expat and libffi aren't used.
+	# Ensure that internal copies of expat, libffi and zlib are not used.
 	rm -fr Modules/expat
 	rm -fr Modules/_ctypes/libffi*
+	rm -fr Modules/zlib
 
 	if tc-is-cross-compiler; then
 		epatch "${FILESDIR}/python-2.5-cross-printf.patch"
@@ -189,7 +190,7 @@ src_compile() {
 }
 
 src_test() {
-	# Tests won't work when cross compiling.
+	# Tests will not work when cross compiling.
 	if tc-is-cross-compiler; then
 		elog "Disabling tests due to crosscompiling."
 		return
@@ -224,45 +225,49 @@ src_test() {
 	done
 
 	elog "If you'd like to run them, you may:"
-	elog "cd $(python_get_libdir)/test"
+	elog "cd '${EPREFIX}$(python_get_libdir)/test'"
 	elog "and run the tests separately."
 
 	python_disable_pyc
 }
 
 src_install() {
+	[[ -z "${ED}" ]] && ED="${D%/}${EPREFIX}/"
+
 	emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed"
 
-	mv "${D}usr/bin/python${SLOT}-config" "${D}usr/bin/python-config-${SLOT}"
+	mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}"
 
 	# Fix collisions between different slots of Python.
-	mv "${D}usr/bin/pydoc" "${D}usr/bin/pydoc${SLOT}"
-	mv "${D}usr/bin/idle" "${D}usr/bin/idle${SLOT}"
-	mv "${D}usr/share/man/man1/python.1" "${D}usr/share/man/man1/python${SLOT}.1"
-	rm -f "${D}usr/bin/smtpd.py"
+	mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
+	mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
+	mv "${ED}usr/share/man/man1/python.1" "${ED}usr/share/man/man1/python${SLOT}.1"
+	rm -f "${ED}usr/bin/smtpd.py"
 
 	# Fix the OPT variable so that it doesn't have any flags listed in it.
 	# Prevents the problem with compiling things with conflicting flags later.
-	sed -e "s:^OPT=.*:OPT=\t\t-DNDEBUG:" -i "${D}$(python_get_libdir)/config/Makefile"
+	sed -e "s:^OPT=.*:OPT=\t\t-DNDEBUG:" -i "${ED}$(python_get_libdir)/config/Makefile"
 
 	if use build; then
-		rm -fr "${D}usr/bin/idle${SLOT}" "${D}$(python_get_libdir)/"{bsddb,idlelib,lib-tk,sqlite3,test}
+		rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{bsddb,idlelib,lib-tk,sqlite3,test}
 	else
-		use elibc_uclibc && rm -fr "${D}$(python_get_libdir)/"{bsddb/test,test}
-		use berkdb || rm -fr "${D}$(python_get_libdir)/"{bsddb,test/test_bsddb*}
-		use sqlite || rm -fr "${D}$(python_get_libdir)/"{sqlite3,test/test_sqlite*}
-		use tk || rm -fr "${D}usr/bin/idle${SLOT}" "${D}$(python_get_libdir)/"{idlelib,lib-tk}
+		use elibc_uclibc && rm -fr "${ED}$(python_get_libdir)/"{bsddb/test,test}
+		use berkdb || rm -fr "${ED}$(python_get_libdir)/"{bsddb,test/test_bsddb*}
+		use sqlite || rm -fr "${ED}$(python_get_libdir)/"{sqlite3,test/test_sqlite*}
+		use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{idlelib,lib-tk}
 	fi
 
 	prep_ml_includes $(python_get_includedir)
 
+	dodoc Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
+
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
 		doins -r "${S}/Tools" || die "doins failed"
 	fi
 
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed"
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
 }
 
 pkg_preinst() {
diff --git a/dev-lang/python/python-2.6.5-r2.ebuild b/dev-lang/python/python-2.6.5-r2.ebuild
index 08dc622ab816..5edb345f2cd0 100644
--- a/dev-lang/python/python-2.6.5-r2.ebuild
+++ b/dev-lang/python/python-2.6.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.5-r2.ebuild,v 1.2 2010/05/01 22:25:51 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.5-r2.ebuild,v 1.3 2010/05/02 16:41:19 arfrever Exp $
 
 EAPI="2"
 
@@ -180,10 +180,6 @@ src_configure() {
 		--with-system-ffi
 }
 
-src_compile() {
-	emake EXTRA_CFLAGS="${CFLAGS}" || die "emake failed"
-}
-
 src_test() {
 	# Tests will not work when cross compiling.
 	if tc-is-cross-compiler; then
@@ -219,7 +215,7 @@ src_test() {
 	done
 
 	elog "If you would like to run them, you may:"
-	elog "cd ${EPREFIX}$(python_get_libdir)/test"
+	elog "cd '${EPREFIX}$(python_get_libdir)/test'"
 	elog "and run the tests separately."
 
 	python_disable_pyc
@@ -252,13 +248,15 @@ src_install() {
 
 	prep_ml_includes $(python_get_includedir)
 
+	dodoc Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
+
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
 		doins -r "${S}/Tools" || die "doins failed"
 	fi
 
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed"
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
 
 	# Do not install empty directory.
 	rmdir "${ED}$(python_get_libdir)/lib-old"