Revision bump. New patchset for 2.3.6 including fixes for #198373 and #204343.

Package-Manager: portage-2.1.4

4 files changed, 277 insertions, 9 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 9427673b3982..80fd16b6dc2f 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.292 2008/01/07 17:40:51 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.293 2008/01/22 23:30:40 hawking Exp $
+
+*python-2.3.6-r4 (22 Jan 2008)
+
+  22 Jan 2008; Ali Polatel <hawking@gentoo.org> +python-2.3.6-r4.ebuild:
+  Revision bump. New patchset for 2.3.6 including fixes for #198373 and #204343.
+  Changed berkdb DEPEND, quoting.
 
 *python-2.5.1-r5 (07 Jan 2008)
 *python-2.4.4-r8 (07 Jan 2008)
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 5af44fcdbcc1..21b05a1e7b2f 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -54,6 +54,7 @@ DIST python-gentoo-patches-2.3.5.tar.bz2 8489 RMD160 aa2860d06e0aa387c91419ed1a2
 DIST python-gentoo-patches-2.3.6-r1.tar.bz2 8483 RMD160 20a7e020f4cecb849af1d611eb3b159440915de1 SHA1 bf8c2f4512aacf70f78dd1d04e6f5a19cd73cec3 SHA256 995c356c6e5481299b9cedd56a510cfed59dffe50f8932192ae8343a1ad1e416
 DIST python-gentoo-patches-2.3.6-r3.tar.bz2 8950 RMD160 a9bd4dfadf711ade1a314ace63b34bbbf0044064 SHA1 c8d11f3a05a7d92f81457303ea1ba72cc60af790 SHA256 7510efa951ccf2bf79052ec2a7ac9ac70c85143b199aeef811d0bae36b40bd0b
 DIST python-gentoo-patches-2.3.6-r4.tar.bz2 10161 RMD160 61b9f9b7f16e0d17db1a135dc3a0e9c12ceb6534 SHA1 714159683adb86e0b8cb9c16073e9bdfc399ea60 SHA256 96a235e7e23b4b2767b001738fbf66f31f16ebf5e106c18aa636857e62f1585c
+DIST python-gentoo-patches-2.3.6-r5.tar.bz2 11499 RMD160 18fca1caff4d0deac088bf9972a0aa8444ba2591 SHA1 0d0c6cdf2ffb0f378491578f28eb3d22bbc9fa64 SHA256 ca95763a170224e8de34471905330e0aaeb86fc9022b8ee8913313bd775dab17
 DIST python-gentoo-patches-2.4.4-r3.tar.bz2 8348 RMD160 e9b59a7cd1469668d43a41d396d7a275bef78270 SHA1 16373b922895d1c14ccfa9d6b39079f2d5a2bcb6 SHA256 1c81397312136625fc220db660f701d4eccbde75e74bb40a0d77015b4d5d4f9f
 DIST python-gentoo-patches-2.4.4-r4.tar.bz2 9569 RMD160 2e618e2bf8d0d9d1e722f60b6b781af8906b1750 SHA1 f2253df5b52350fdfbd06054597814d705c088c5 SHA256 a5e9783a4ad57c60f91e3f943f4ff60dcb9b2eb64aa9226598bff9658473781e
 DIST python-gentoo-patches-2.4.4-r5.tar.bz2 10105 RMD160 2489fc0fb709f862fc56d9dc17c2ba03ebd426da SHA1 0e5391fc434fbaa759964c263c2d32af81af0100 SHA256 147b74697c73788f192fea7b8034a99367a2ffc0c5cf6536a5fe5e76b8624a99
@@ -77,6 +78,10 @@ EBUILD python-2.3.6-r3.ebuild 7589 RMD160 abae838531d061431a0b1514572a66ee40e05a
 MD5 bc349a71191d971564ac89527a64e58b python-2.3.6-r3.ebuild 7589
 RMD160 abae838531d061431a0b1514572a66ee40e05a0d python-2.3.6-r3.ebuild 7589
 SHA256 071766d47f37a0fddae939d51fe9f897d9852eb0ef734842f1c9bf5c278c3bb8 python-2.3.6-r3.ebuild 7589
+EBUILD python-2.3.6-r4.ebuild 7814 RMD160 43dd2dc20fa47e346aa6bfe76cc282a50c6c5285 SHA1 352aa2850ad1b4805f5538d86f86a852f85958fb SHA256 2076f8395f28cf7fdec10946bec72f689602f4d95982d6980322e3765a8f32d0
+MD5 9d8468f2354c8b0d7d713fe2a7b151c2 python-2.3.6-r4.ebuild 7814
+RMD160 43dd2dc20fa47e346aa6bfe76cc282a50c6c5285 python-2.3.6-r4.ebuild 7814
+SHA256 2076f8395f28cf7fdec10946bec72f689602f4d95982d6980322e3765a8f32d0 python-2.3.6-r4.ebuild 7814
 EBUILD python-2.3.6.ebuild 8136 RMD160 bd837f52252064bcc7735ac3ec709bdd24612e5e SHA1 2003e5c73d20097ea832e393296fd653937dff77 SHA256 c8ce9d36c468b7563f818e7bbd647fe7aab4690b92ed70137a68a05645b765e1
 MD5 5062d2c427f028c43dfdc05c13fb64bf python-2.3.6.ebuild 8136
 RMD160 bd837f52252064bcc7735ac3ec709bdd24612e5e python-2.3.6.ebuild 8136
@@ -117,10 +122,10 @@ EBUILD python-2.5.1-r5.ebuild 10661 RMD160 c3171b93576aec797f00aa2927c39cf93660c
 MD5 9a14cc39e516150bd9fb50e1e3557b1a python-2.5.1-r5.ebuild 10661
 RMD160 c3171b93576aec797f00aa2927c39cf93660c9cd python-2.5.1-r5.ebuild 10661
 SHA256 cdea8026c100726360e77684a551562e1575a8a1a193ba4d0bb9e40b7f90d962 python-2.5.1-r5.ebuild 10661
-MISC ChangeLog 50399 RMD160 60bbc1e24b9c28c9a581e58b991a3deed4623170 SHA1 0f100e3acc0ab8ea727b02cca1138b4de93ba1a9 SHA256 3161fc926073eeaaad223dddcd309a5ff17c321db935c028805ea1ede5b3fc2b
-MD5 8299392d124f5a95ea817cd9f44bdc54 ChangeLog 50399
-RMD160 60bbc1e24b9c28c9a581e58b991a3deed4623170 ChangeLog 50399
-SHA256 3161fc926073eeaaad223dddcd309a5ff17c321db935c028805ea1ede5b3fc2b ChangeLog 50399
+MISC ChangeLog 50620 RMD160 03b277541a992018baa82a2c6413a5b28d49f58e SHA1 1f7ef796130d37a282d7995c27781e07fd1b1be4 SHA256 ee68f54dbc1d794360042a99d941f149bfa06549ff340f17b9eca638afc8a476
+MD5 75face01e88fccb012471ff240bd30b8 ChangeLog 50620
+RMD160 03b277541a992018baa82a2c6413a5b28d49f58e ChangeLog 50620
+SHA256 ee68f54dbc1d794360042a99d941f149bfa06549ff340f17b9eca638afc8a476 ChangeLog 50620
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
@@ -140,6 +145,9 @@ SHA256 5134e788f892a5ee3c08664574a427b3289cbb02e5afc896e46e0be52f7bda83 files/di
 MD5 dbdae51e4ed8f31a4084d5b36dbc772a files/digest-python-2.3.6-r3 536
 RMD160 2a90514f3c2b5e1e6741cf9d45e68c17884fde1f files/digest-python-2.3.6-r3 536
 SHA256 7f1f2ea713d7bf600ed66ca4385bb201d8f7f37878445dd9a7620a020723f467 files/digest-python-2.3.6-r3 536
+MD5 0430c0f7619fcb0405e17e94c0c95efe files/digest-python-2.3.6-r4 536
+RMD160 8c860abdcabb9bfea54393c39a22292939806a03 files/digest-python-2.3.6-r4 536
+SHA256 ed2eac7f03092585f6b3644d2236c8694ea19993bd69abd3b9f2dcddbc6613f0 files/digest-python-2.3.6-r4 536
 MD5 bee33863e49d046cbe199a9e5d8f7dba files/digest-python-2.4.4-r4 533
 RMD160 bb38a0bcdb4e3a9849883271a58461cb3cdeaf3c files/digest-python-2.4.4-r4 533
 SHA256 7adcb37e259cb269f5000934c41ed8a355157bb5a70fbe26f8899dae8a4892a4 files/digest-python-2.4.4-r4 533
@@ -168,9 +176,9 @@ MD5 89042197bc3116d6c2344e2ba245fc9d files/digest-python-2.5.1-r5 533
 RMD160 aea9ef7a44c6fcb48570c454c7ced5a4b2a31d37 files/digest-python-2.5.1-r5 533
 SHA256 f16b011831afaf61410a5629b185bc9ca82b2608c5a51af06ca367f516504b2e files/digest-python-2.5.1-r5 533
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkeCZDEACgkQQU4yORhF8iCBvwCeKYFugJSJ3UxIMxeyroiml7XB
-JHYAn2qU5ukuWUegi6Hccweap4mm8AHK
-=b29u
+iD8DBQFHlnyUQU4yORhF8iARAl9nAJ0btme5RUWaWmabQuYGvEmKxkzbsACeOVKz
+XhcEeWoLl2JgRBlF5buOTeU=
+=76LC
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/python/files/digest-python-2.3.6-r4 b/dev-lang/python/files/digest-python-2.3.6-r4
new file mode 100644
index 000000000000..61781904f55e
--- /dev/null
+++ b/dev-lang/python/files/digest-python-2.3.6-r4
@@ -0,0 +1,6 @@
+MD5 1bd475e69e20481c6301853eef7018f1 Python-2.3.6.tar.bz2 7350182
+RMD160 db7a2ebff31e86bc99d45062fc77e4194399cc8d Python-2.3.6.tar.bz2 7350182
+SHA256 120b6babcc29dfd0ba31ad1b1db587fbceee9705a569727c80d18292ba675da4 Python-2.3.6.tar.bz2 7350182
+MD5 daa0b7464d93c074c318eb03335f101c python-gentoo-patches-2.3.6-r5.tar.bz2 11499
+RMD160 18fca1caff4d0deac088bf9972a0aa8444ba2591 python-gentoo-patches-2.3.6-r5.tar.bz2 11499
+SHA256 ca95763a170224e8de34471905330e0aaeb86fc9022b8ee8913313bd775dab17 python-gentoo-patches-2.3.6-r5.tar.bz2 11499
diff --git a/dev-lang/python/python-2.3.6-r4.ebuild b/dev-lang/python/python-2.3.6-r4.ebuild
new file mode 100644
index 000000000000..f320589f2950
--- /dev/null
+++ b/dev-lang/python/python-2.3.6-r4.ebuild
@@ -0,0 +1,248 @@
+# 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.3.6-r4.ebuild,v 1.1 2008/01/22 23:30:40 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.
+
+inherit autotools eutils flag-o-matic python versionator
+
+PYVER_MAJOR=$(get_major_version)
+PYVER_MINOR=$(get_version_component_range 2)
+PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
+
+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/python-gentoo-patches-${PV}-r5.tar.bz2"
+
+LICENSE="PSF-2.2"
+SLOT="2.3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ncurses gdbm ssl readline tk berkdb bootstrap ipv6 build ucs2 doc nocxx nothreads examples elibc_uclibc"
+
+# INFO: 2.3.5 docs are used for python-2.3.6 as upstream writes in their release
+# notes.
+DEPEND=">=sys-libs/zlib-1.1.3
+	!build? (
+		tk? ( >=dev-lang/tk-8.0 )
+		ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) )
+		berkdb? ( =sys-libs/db-3* )
+		gdbm? ( sys-libs/gdbm )
+		ssl? ( dev-libs/openssl )
+		doc? ( =dev-python/python-docs-2.3.5* )
+		dev-libs/expat
+	)"
+
+# NOTE: The dev-python/python-fchksum RDEPEND is needed so that this python
+#       provides the functionality expected from previous pythons.
+
+# NOTE: python-fchksum is only a RDEPEND and not a DEPEND since we don't need
+#       it to compile python. We just need to ensure that when we install
+#       python, we definitely have fchksum support. - liquidx
+
+# NOTE: changed RDEPEND to PDEPEND to resolve bug 88777. - kloeri
+
+PDEPEND="${DEPEND} dev-python/python-fchksum app-admin/python-updater"
+
+PROVIDE="virtual/python"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -ie 's/OpenBSD\/3.\[01234/OpenBSD\/3.\[012345/' configure || die "OpenBSD sed failed"
+
+	# 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
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PV}"
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		Lib/distutils/command/install.py \
+		Lib/distutils/sysconfig.py \
+		Lib/site.py \
+		Makefile.pre.in \
+		Modules/Setup.dist \
+		Modules/getpath.c \
+		setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# disable extraneous modules with extra dependencies
+	if use build; then
+		export PYTHON_DISABLE_MODULES="readline pyexpat dbm gdbm bsddb _curses _curses_panel _tkinter"
+		export PYTHON_DISABLE_SSL=1
+	else
+		# dbm module can link to berkdb or gdbm -- defaults to gdbm when
+		# both are enabled, see #204343
+		use berkdb || use gdbm \
+			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} dbm"
+		use gdbm \
+			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} gdbm"
+		use berkdb \
+			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} bsddb"
+		use readline \
+			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} readline"
+		use tk \
+			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _tkinter"
+		use ncurses \
+			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _curses _curses_panel"
+		use ssl \
+			|| export PYTHON_DISABLE_SSL=1
+		export PYTHON_DISABLE_MODULES
+		echo $PYTHON_DISABLE_MODULES
+	fi
+}
+
+src_compile() {
+	filter-flags -malign-double
+	filter-ldflags -Wl,--as-needed --as-needed
+
+	[ "${ARCH}" = "alpha" ] && append-flags -fPIC
+	[ "${ARCH}" = "amd64" ] && 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}"
+
+	local myconf
+	#if we are creating a new build image, we remove the dependency on g++
+	if use build && ! use bootstrap || use nocxx ; then
+		myconf="--with-cxx=no"
+	fi
+
+	# super-secret switch. don't use this unless you know what you're
+	# doing. enabling UCS2 support will break your existing python
+	# modules
+	use ucs2 \
+		&& myconf="${myconf} --enable-unicode=ucs2" \
+		|| myconf="${myconf} --enable-unicode=ucs4"
+
+	use nothreads \
+		&& myconf="${myconf} --without-threads" \
+		|| myconf="${myconf} --with-threads"
+
+	src_configure
+
+	econf --with-fpectl \
+		--enable-shared \
+		`use_enable ipv6` \
+		--infodir='${prefix}'/share/info \
+		--mandir='${prefix}'/share/man \
+		--with-libc='' \
+		${myconf} || die
+	emake || die "Parallel make failed"
+}
+
+src_install() {
+	dodir /usr
+	src_configure
+	make DESTDIR="${D}" altinstall  || die
+
+	# install our own custom python-config
+	exeinto /usr/bin
+	newexe "${FILESDIR}"/python-config-${PYVER} python-config
+
+	# The stuff below this line extends from 2.1, and should be deprecated
+	# in 2.3, or possibly can wait till 2.4
+
+	# seems like the build do not install Makefile.pre.in anymore
+	# it probably shouldn't - use DistUtils, people!
+	insinto /usr/$(get_libdir)/python${PYVER}/config
+	doins "${S}"/Makefile.pre.in
+
+	# While we're working on the config stuff... Let's fix the OPT var
+	# so that it doesn't have any opts listed in it. Prevents the problem
+	# with compiling things with conflicting opts later.
+	dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' /usr/$(get_libdir)/python${PYVER}/config/Makefile
+
+	if use build ; then
+		rm -rf "${D}"/usr/$(get_libdir)/python2.3/{test,encodings,email,lib-tk,bsddb/test}
+	else
+		use elibc_uclibc && rm -rf "${D}"/usr/$(get_libdir)/python2.3/{test,bsddb/test}
+		use berkdb || rm -rf "${D}"/usr/$(get_libdir)/python2.3/bsddb
+		use tk || rm -rf "${D}"/usr/$(get_libdir)/python2.3/lib-tk
+	fi
+
+	if use examples ; then
+		mkdir -p "${D}"/usr/share/doc/${P}/examples
+		cp -r "${S}"/Tools "${D}"/usr/share/doc/${P}/examples
+	fi
+}
+
+pkg_postrm() {
+	python_makesym
+	python_mod_cleanup /usr/$(get_libdir)/python2.3
+}
+
+pkg_postinst() {
+	local myroot
+	myroot=$(echo $ROOT | sed 's:/$::')
+
+	python_makesym
+	python_mod_optimize
+	python_mod_optimize -x site-packages -x test ${myroot}/usr/$(get_libdir)/python${PYVER}
+
+	# workaround possible python-upgrade-breaks-portage situation
+	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
+		if [ -f ${myroot}/usr/lib/python2.2/site-packages/portage.py ]; then
+			einfo "Working around possible python-portage upgrade breakage"
+			mkdir -p ${myroot}/usr/lib/portage/pym
+			cp ${myroot}/usr/lib/python2.2/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym
+			python_mod_optimize ${myroot}/usr/lib/portage/pym
+		fi
+	fi
+
+	echo
+	ewarn
+	ewarn "If you have just upgraded from an older version of python you"
+	ewarn "will need to run:"
+	ewarn
+	ewarn "/usr/sbin/python-updater"
+	ewarn
+	ewarn "This will automatically rebuild all the python dependent modules"
+	ewarn "to run with python-${PYVER}."
+	ewarn
+	ewarn "Your original Python is still installed and can be accessed via"
+	ewarn "/usr/bin/python2.x."
+	ewarn
+	ebeep 5
+}
+
+src_test() {
+	# PYTHON_DONTCOMPILE=1 breaks test_import
+	unset PYTHON_DONTCOMPILE
+
+	#skip all tests that fail during emerge but pass without emerge:
+	#(See bug# 67970)
+	local skip_tests="global mimetools mmap strptime subprocess tcl time urllib urllib2 zipimport"
+
+	for test in ${skip_tests} ; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	make test || die "make test failed"
+
+	for test in ${skip_tests} ; do
+		mv "${T}"/test_${test}.py "${S}"/Lib/test/test_${test}.py
+	done
+
+	elog "Portage skipped the following tests which aren't able to run from emerge:"
+	for test in ${skip_tests} ; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you'd like to run them, you may:"
+	elog "cd /usr/lib/python${PYVER}/test"
+	elog "and run the tests separately."
+}