renamed patches to have short names and version numbers to indicate when they were introduced. patches tarballs are now generated from gentoo-svn. cleaned up older unstable versions of python leaving the latest version for each major release. fixed some installed file collisions between the two version.

(Portage version: 2.1-r2)

7 files changed, 60 insertions, 51 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index e0bfb5c0b4e7..fe773ff4c57e 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.205 2006/07/20 17:25:17 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.206 2006/08/22 22:26:50 liquidx Exp $
+
+  22 Aug 2006; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r6.ebuild,
+  python-2.3.5-r2.ebuild, -python-2.4.2.ebuild, -python-2.4.2-r1.ebuild,
+  -python-2.4.2-r2.ebuild, -python-2.4.3.ebuild, python-2.4.3-r1.ebuild:
+  renamed patches to have short names and version numbers to indicate when
+  they were introduced. patches tarballs are now generated from gentoo-svn.
+  cleaned up older unstable versions of python leaving the latest version for
+  each major release. fixed some installed file collisions between the two
+  version.
 
   20 Jul 2006; Simon Stelling <blubb@gentoo.org> python-2.4.3-r1.ebuild:
   stable on amd64
diff --git a/dev-lang/python/files/digest-python-2.2.3-r6 b/dev-lang/python/files/digest-python-2.2.3-r6
index 85f8d3845c77..d68a92546c72 100644
--- a/dev-lang/python/files/digest-python-2.2.3-r6
+++ b/dev-lang/python/files/digest-python-2.2.3-r6
@@ -1,6 +1,6 @@
 MD5 169f89f318e252dac0c54dd1b165d229 Python-2.2.3.tgz 6709556
 RMD160 3590f813582d65194b467f4ab450e360e35eb40e Python-2.2.3.tgz 6709556
 SHA256 a8f92e6b89d47359fff0d1fbfe47f104afc77fd1cd5143e7332758b7bc100188 Python-2.2.3.tgz 6709556
-MD5 3eb0b1cabb5ac881f333ccd62d1ec062 python-2.2-patches-1.tar.bz2 3127
-RMD160 2874de5568776a0b195c6694e4af6769e08fc028 python-2.2-patches-1.tar.bz2 3127
-SHA256 1c638792add80a832d5b65c1473ccb056f3ebe2fe99d29a65e1a730ed8ab6218 python-2.2-patches-1.tar.bz2 3127
+MD5 e65c2bc4d45ecca1f5f18908263ac32e python-gentoo-patches-2.2.3.tar.bz2 3138
+RMD160 0160617413b2ee4165eb0a7ceb68e95cb36e0f25 python-gentoo-patches-2.2.3.tar.bz2 3138
+SHA256 e85f6afba9d2cd23f39c46ed5e50d48b971615cd5dc5bc7af766b201a03b3893 python-gentoo-patches-2.2.3.tar.bz2 3138
diff --git a/dev-lang/python/files/digest-python-2.3.5-r2 b/dev-lang/python/files/digest-python-2.3.5-r2
index 8d7944d852f7..30973387e8be 100644
--- a/dev-lang/python/files/digest-python-2.3.5-r2
+++ b/dev-lang/python/files/digest-python-2.3.5-r2
@@ -1,6 +1,6 @@
 MD5 c12b57c6e0cf8bc676fd9444d71c9e18 Python-2.3.5.tar.bz2 7230000
 RMD160 2b1fa90393f517fe02d546c037996754f65f8c89 Python-2.3.5.tar.bz2 7230000
 SHA256 1b81787c3dcae3752cadaa6be80c24e247c239ba93d91538af39b4b717e29bf4 Python-2.3.5.tar.bz2 7230000
-MD5 4dfa05d6f0b4473f2e6a6f489b9ea0ff python-2.3-patches-1.tar.bz2 8482
-RMD160 a2fa53c2246864e0f7240132d7d9394dd630ff26 python-2.3-patches-1.tar.bz2 8482
-SHA256 c3b766299b4a9363a63bc27983e7e82f19daa430a5f11d2ce29012a63229bf89 python-2.3-patches-1.tar.bz2 8482
+MD5 0b8dfdb2fd3285ecad3690a0d585a474 python-gentoo-patches-2.3.5.tar.bz2 8489
+RMD160 aa2860d06e0aa387c91419ed1a2bb33de14fd393 python-gentoo-patches-2.3.5.tar.bz2 8489
+SHA256 f144c5488a55599a0d0614f7c687e43106f8b6da51738296aadcec374d567237 python-gentoo-patches-2.3.5.tar.bz2 8489
diff --git a/dev-lang/python/files/digest-python-2.4.3-r1 b/dev-lang/python/files/digest-python-2.4.3-r1
index 3a51751627fb..1e604a181101 100644
--- a/dev-lang/python/files/digest-python-2.4.3-r1
+++ b/dev-lang/python/files/digest-python-2.4.3-r1
@@ -1,6 +1,6 @@
 MD5 141c683447d5e76be1d2bd4829574f02 Python-2.4.3.tar.bz2 8005915
 RMD160 c86247554975e6c44f91d05e44e68e280d5244dc Python-2.4.3.tar.bz2 8005915
 SHA256 c9b3bbc52fa18c6dba7a8c3481fa7de98187c9978749241395305f252134ba2c Python-2.4.3.tar.bz2 8005915
-MD5 c98f93a5700138836154d7c8009f1fbf python-2.4-patches-2.tar.bz2 9219
-RMD160 bd4c3502b42f4f9a10f423c434f31ad370d9da4b python-2.4-patches-2.tar.bz2 9219
-SHA256 e66ee41328999e89bea833ff3dc58b4691a6d16ada029e88a8ba9df35979352a python-2.4-patches-2.tar.bz2 9219
+MD5 4745ce5bb5c512a28e09d43a146bbe08 python-gentoo-patches-2.4.3-r1.tar.bz2 8594
+RMD160 0a93e8b315eefa832db92398b3f5e8da83fe3ea3 python-gentoo-patches-2.4.3-r1.tar.bz2 8594
+SHA256 295d8131b1f6c0622d92133f6e612821c2af6e1ebefe527aec8d42de49b0b1e9 python-gentoo-patches-2.4.3-r1.tar.bz2 8594
diff --git a/dev-lang/python/python-2.2.3-r6.ebuild b/dev-lang/python/python-2.2.3-r6.ebuild
index 36224dce4e45..9c0b83c428c6 100644
--- a/dev-lang/python/python-2.2.3-r6.ebuild
+++ b/dev-lang/python/python-2.2.3-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.2.3-r6.ebuild,v 1.6 2006/07/08 19:13:37 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.2.3-r6.ebuild,v 1.7 2006/08/22 22:26:50 liquidx Exp $
 
 inherit flag-o-matic eutils python versionator
 
@@ -8,13 +8,11 @@ PYVER_MAJOR=$(get_major_version)
 PYVER_MINOR=$(get_version_component_range 2)
 PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
 
-PATCHTAR="${PN}-${PYVER}-patches-1"
-
 S="${WORKDIR}/Python-${PV}"
 DESCRIPTION="A really great language"
 HOMEPAGE="http://www.python.org"
 SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${PV}.tgz
-	mirror://gentoo/${PATCHTAR}.tar.bz2"
+	mirror://gentoo/python-gentoo-patches-${PV}.tar.bz2"
 
 LICENSE="PSF-2.2"
 SLOT="2.2"
@@ -40,14 +38,15 @@ PROVIDE="virtual/python"
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
 	#Fixes security vulnerability in XML-RPC server - pythonhead (06 Feb 05)
 	#http://www.python.org/security/PSF-2005-001/
-	EPATCH_OPTS="-d ${S}" epatch ${PATCHTAR}/${PN}-2.2.3-xmlrpc.patch
-	EPATCH_OPTS="-d ${S}" epatch ${PATCHTAR}/${P}-db4.patch
-	EPATCH_OPTS="-d ${S}" epatch ${PATCHTAR}/${P}-disable_modules_and_ssl.patch
-	EPATCH_OPTS="-d ${S}" epatch ${PATCHTAR}/${PN}-2.3-add_portage_search_path.patch
-	epatch ${PATCHTAR}/${PN}-2.2.3-gentoo_py_dontcompile.patch
-	EPATCH_OPTS="-d ${S}" epatch ${PATCHTAR}/${P}-fPIC.patch
+	epatch ${WORKDIR}/${PV}/2.2.3-xmlrpc.patch
+	epatch ${WORKDIR}/${PV}/2.2.3-db4.patch
+	epatch ${WORKDIR}/${PV}/2.2.3-disable_modules_and_ssl.patch
+	epatch ${WORKDIR}/${PV}/2.3-add_portage_search_path.patch
+	epatch ${WORKDIR}/${PV}/2.2.3-gentoo_py_dontcompile.patch
+	epatch ${WORKDIR}/${PV}/2.2.3-fPIC.patch
 }
 
 src_configure() {
diff --git a/dev-lang/python/python-2.3.5-r2.ebuild b/dev-lang/python/python-2.3.5-r2.ebuild
index 1668a092a826..1894c1e0e5f9 100644
--- a/dev-lang/python/python-2.3.5-r2.ebuild
+++ b/dev-lang/python/python-2.3.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.5-r2.ebuild,v 1.13 2006/07/08 19:13:37 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.5-r2.ebuild,v 1.14 2006/08/22 22:26:50 liquidx Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -13,13 +13,11 @@ PYVER_MAJOR=$(get_major_version)
 PYVER_MINOR=$(get_version_component_range 2)
 PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
 
-PATCHTAR="${PN}-${PYVER}-patches-1"
-
 S="${WORKDIR}/Python-${PV}"
 DESCRIPTION="A really great language"
 HOMEPAGE="http://www.python.org/"
 SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${PV}.tar.bz2
-	mirror://gentoo/${PATCHTAR}.tar.bz2"
+	mirror://gentoo/python-gentoo-patches-${PV}.tar.bz2"
 
 LICENSE="PSF-2.2"
 SLOT="2.3"
@@ -60,29 +58,32 @@ src_unpack() {
 	cd ${S}
 
 	# fix readline detection problems due to missing termcap (#79013)
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-2.3-readline.patch
+	epatch ${WORKDIR}/${PV}/2.3-readline.patch
 
 	sed -ie 's/OpenBSD\/3.\[01234/OpenBSD\/3.\[012345/' configure || die "OpenBSD sed failed"
 	# adds /usr/lib/portage/pym to sys.path - liquidx (08 Oct 03)
 	# prepends /usr/lib/portage/pym to sys.path - liquidx (12 Apr 04)
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-2.3-add_portage_search_path_take_2.patch
+	epatch ${WORKDIR}/${PV}/2.3-add_portage_search_path.patch
 	# adds support for PYTHON_DONTCOMPILE shell environment to
 	# supress automatic generation of .pyc and .pyo files - liquidx (08 Oct 03)
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-2.3-gentoo_py_dontcompile.patch
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-2.3.2-disable_modules_and_ssl.patch
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-2.3-mimetypes_apache.patch
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-2.3-db4.2.patch
+	epatch ${WORKDIR}/${PV}/2.4-gentoo_py_dontcompile.patch
+	epatch ${WORKDIR}/${PV}/2.4-disable_modules_and_ssl.patch
+	epatch ${WORKDIR}/${PV}/2.4-mimetypes_apache.patch
+	epatch ${WORKDIR}/${PV}/2.3-db4.2.patch
 
 	# installs to lib64
-	[ "$(get_libdir)" == "lib64" ] && epatch ${WORKDIR}/${PATCHTAR}/python-2.3.4-lib64.patch
-	# fix os.utime() on hppa. utimes it not supported but unfortunately reported as working - gmsoft (22 May 04)
+	[ "$(get_libdir)" == "lib64" ] && \
+		epatch ${WORKDIR}/${PV}/2.3.4-lib64.patch
+
+	# fix os.utime() on hppa. utimes it not supported but unfortunately 
+	# reported as working - gmsoft (22 May 04)
 	[ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i ${S}/configure
 
 	# add support for struct stat st_flags attribute (bug 94637)
-	epatch ${WORKDIR}/${PATCHTAR}/python-2.3.5-st_flags.patch
+	epatch ${WORKDIR}/${PV}/2.3.5-st_flags.patch
 
 	# Fix pcre security bug (bug 104009)
-	epatch ${WORKDIR}/${PATCHTAR}/python-2.3-pcre.patch
+	epatch ${WORKDIR}/${PV}/2.3-pcre.patch
 }
 
 src_configure() {
diff --git a/dev-lang/python/python-2.4.3-r1.ebuild b/dev-lang/python/python-2.4.3-r1.ebuild
index 96901ab2dbfc..cdd6661cb27c 100644
--- a/dev-lang/python/python-2.4.3-r1.ebuild
+++ b/dev-lang/python/python-2.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.3-r1.ebuild,v 1.12 2006/07/20 17:25:17 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.3-r1.ebuild,v 1.13 2006/08/22 22:26:50 liquidx Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -14,14 +14,12 @@ PYVER_MAJOR=$(get_major_version)
 PYVER_MINOR=$(get_version_component_range 2)
 PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
 
-PATCHTAR="${PN}-${PYVER}-patches-2"
-
 MY_P="Python-${PV}"
 S="${WORKDIR}/${MY_P}"
 DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language."
 HOMEPAGE="http://www.python.org/"
 SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2
-	mirror://gentoo/${PATCHTAR}.tar.bz2"
+	mirror://gentoo/python-gentoo-patches-${PV}-r1.tar.bz2"
 
 LICENSE="PSF-2.2"
 SLOT="2.4"
@@ -59,23 +57,23 @@ RESTRICT="confcache"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# unnecessary termcap dep in readline (#79013)
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-2.4.2-readline.patch
+	epatch ${WORKDIR}/${PV}/2.4.2-readline.patch
 	# db4.2 support
-	epatch ${FILESDIR}/${P}-db4.patch
+	epatch ${WORKDIR}/${PV}/2.4.3-db4.patch
 
 	# adds support for PYTHON_DONTCOMPILE shell environment to
 	# supress automatic generation of .pyc and .pyo files - liquidx (08 Oct 03)
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-${PYVER}-gentoo_py_dontcompile.patch
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-${PYVER}-disable_modules_and_ssl.patch
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-${PYVER}-mimetypes_apache.patch
+	epatch ${WORKDIR}/${PV}/2.4-gentoo_py_dontcompile.patch
+	epatch ${WORKDIR}/${PV}/2.4-disable_modules_and_ssl.patch
+	epatch ${WORKDIR}/${PV}/2.4-mimetypes_apache.patch
 
 	# prepends /usr/lib/portage/pym to sys.path
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-${PYVER}-add_portage_search_path.patch
+	epatch ${WORKDIR}/${PV}/2.4-add_portage_search_path.patch
 
-	epatch ${WORKDIR}/${PATCHTAR}/${PN}-2.4.1-libdir.patch
+	epatch ${WORKDIR}/${PV}/2.4.1-libdir.patch
 	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
 		Lib/distutils/command/install.py \
 		Lib/distutils/sysconfig.py \
@@ -86,18 +84,19 @@ src_unpack() {
 		setup.py || die
 
 	# add support for struct stat st_flags attribute (bug 94637)
-	epatch ${WORKDIR}/${PATCHTAR}/python-2.4.1-st_flags.patch
+	epatch ${WORKDIR}/${PV}/2.4.1-st_flags.patch
 
-	# fix os.utime() on hppa. utimes it not supported but unfortunately reported as working - gmsoft (22 May 04)
+	# 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 !!!
 	[ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i ${S}/configure
 
 	if tc-is-cross-compiler ; then
-		epatch "${WORKDIR}/${PATCHTAR}"/python-2.4.1-crosscompile.patch
+		epatch ${WORKDIR}/${PV}/2.4.1-crosscompile.patch
 	fi
 
 	# fix gentoo/obsd problems (bug 117261)
-	epatch "${FILESDIR}/python-2.4.3-gentoo_obsd-r1.patch"
+	epatch ${WORKDIR}/${PV}/2.4.3-gentoo_obsd.patch
 }
 
 src_configure() {
@@ -256,7 +255,8 @@ pkg_postinst() {
 
 	echo
 	ewarn
-	ewarn "If you have just upgraded from an older version of python you will need to run:"
+	ewarn "If you have just upgraded from an older version of python you will"
+	ewarn "need to run:"
 	ewarn
 	ewarn "/usr/sbin/python-updater"
 	ewarn