fix mistake introduced in 2.4.3-r2 where system zlib was used that caused problems on certain machines (#145242)

Package-Manager: portage-2.1-r2

4 files changed, 348 insertions, 8 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index a244f750cac9..9b5b6882856d 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,12 @@
 # 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.207 2006/08/26 10:11:53 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.208 2006/08/28 18:37:54 liquidx Exp $
+
+*python-2.4.3-r3 (28 Aug 2006)
+
+  28 Aug 2006; Alastair Tse <liquidx@gentoo.org> +python-2.4.3-r3.ebuild:
+  fix mistake introduced in 2.4.3-r2 where system zlib was used that caused
+  problems on certain machines (#145242)
 
 *python-2.4.3-r2 (26 Aug 2006)
 
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 42bedfa9e4c1..72ad3c4e88f1 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -56,6 +56,7 @@ DIST Python-2.4.3.tar.bz2 8005915 RMD160 c86247554975e6c44f91d05e44e68e280d5244d
 DIST python-gentoo-patches-2.2.3.tar.bz2 3138 RMD160 0160617413b2ee4165eb0a7ceb68e95cb36e0f25 SHA1 19401f7f0e14ddd8c9f7f5f8e9e6acf0d1826027 SHA256 e85f6afba9d2cd23f39c46ed5e50d48b971615cd5dc5bc7af766b201a03b3893
 DIST python-gentoo-patches-2.3.5.tar.bz2 8489 RMD160 aa2860d06e0aa387c91419ed1a2bb33de14fd393 SHA1 32349bd5e0f6c3859414b4a03643dd89538792f9 SHA256 f144c5488a55599a0d0614f7c687e43106f8b6da51738296aadcec374d567237
 DIST python-gentoo-patches-2.4.3-r1.tar.bz2 8594 RMD160 0a93e8b315eefa832db92398b3f5e8da83fe3ea3 SHA1 7f20fffc6ec4273b898cda394c87929ddd939419 SHA256 295d8131b1f6c0622d92133f6e612821c2af6e1ebefe527aec8d42de49b0b1e9
+DIST python-gentoo-patches-2.4.3-r2.tar.bz2 8596 RMD160 30b67d5dff65bbfbadd20a618e64e18b4d02abfe SHA1 56cc14224ca836c7c2bbd092ca1cebadd9361357 SHA256 b985d49cf09538183ea2e00dd85da583bd6b9f841983483548b580d63b0d35bb
 DIST python-gentoo-patches-2.4.3.tar.bz2 8594 RMD160 0a93e8b315eefa832db92398b3f5e8da83fe3ea3 SHA1 7f20fffc6ec4273b898cda394c87929ddd939419 SHA256 295d8131b1f6c0622d92133f6e612821c2af6e1ebefe527aec8d42de49b0b1e9
 EBUILD python-2.1.3-r1.ebuild 2287 RMD160 8de40c8c4dcf46ab91458318eb347eb7a683062b SHA1 20928a32586d5aeac1b1c163a61b320c46c133ee SHA256 84381bce78263edac5a361f292ac6eca52c39752483a49beb40b033a0f9d322b
 MD5 0da2c091fdb69c2fc31c6ce46011e0f0 python-2.1.3-r1.ebuild 2287
@@ -77,10 +78,14 @@ EBUILD python-2.4.3-r2.ebuild 10385 RMD160 849340b60d9b4a268b7a50d640b55938687c6
 MD5 9521d6ac4654678e6cd9f66d9e61c896 python-2.4.3-r2.ebuild 10385
 RMD160 849340b60d9b4a268b7a50d640b55938687c677e python-2.4.3-r2.ebuild 10385
 SHA256 0353d300e4fd6b6da81df893aaf2ad12739857ded9d4771f79d0162537ab6362 python-2.4.3-r2.ebuild 10385
-MISC ChangeLog 35457 RMD160 5398602cf54ab4aedb128813a7551a6610663faf SHA1 a1ae3be029bc58b497125f75a1138693a3d84e20 SHA256 1d6e47cc7e2f48201cd970b013b963c33ff1928cda3b2e0bc8acfed1a6dd2bbf
-MD5 d985574020ff18d06ee720133ba6206b ChangeLog 35457
-RMD160 5398602cf54ab4aedb128813a7551a6610663faf ChangeLog 35457
-SHA256 1d6e47cc7e2f48201cd970b013b963c33ff1928cda3b2e0bc8acfed1a6dd2bbf ChangeLog 35457
+EBUILD python-2.4.3-r3.ebuild 10388 RMD160 a7de6d09558e51811cbdcb233716b318cdbbbfeb SHA1 0ad66b99f23dd117921620f4e164f5ac0866f82c SHA256 e476264e242028cf7073b9607ecbc4c6e05abd66e279b056cdb9343b59844bca
+MD5 e6e2527f65e25ec09adec997396cd370 python-2.4.3-r3.ebuild 10388
+RMD160 a7de6d09558e51811cbdcb233716b318cdbbbfeb python-2.4.3-r3.ebuild 10388
+SHA256 e476264e242028cf7073b9607ecbc4c6e05abd66e279b056cdb9343b59844bca python-2.4.3-r3.ebuild 10388
+MISC ChangeLog 35681 RMD160 5842f5cfb5de808b5ce19c56cb7c0fdb2adc1194 SHA1 93ed3148e88df9b7e01d5306ac691ef2bca9604c SHA256 71f1dee4d78e0eaf68c3e487484de6530f78043073512c2f86ed5691a59721c3
+MD5 88118c41760c690a12833357cf036d8e ChangeLog 35681
+RMD160 5842f5cfb5de808b5ce19c56cb7c0fdb2adc1194 ChangeLog 35681
+SHA256 71f1dee4d78e0eaf68c3e487484de6530f78043073512c2f86ed5691a59721c3 ChangeLog 35681
 MISC metadata.xml 221 RMD160 dd50f32b16d6c15330ae1ee711d8a6cf8f6e3bed SHA1 85903c4affc3a23dd37e4910eb9b198cd02b242e SHA256 c14b93d19008cbeeb3312ec60b97513eef18ccfe82b8e2303cb44977ca13e3bd
 MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221
 RMD160 dd50f32b16d6c15330ae1ee711d8a6cf8f6e3bed metadata.xml 221
@@ -100,10 +105,13 @@ SHA256 accb145bcb3a651a5d68653dc2becc523343c152d45d66622a3ff6f62c1b26a8 files/di
 MD5 8c67e3dc31e279c3861bfe5b9b64fd25 files/digest-python-2.4.3-r2 524
 RMD160 fc79008caa9c6a3eab8653d55c7a6c486501c609 files/digest-python-2.4.3-r2 524
 SHA256 91c714d348e6f64740fba084bb39b5bc55dfedf51c490b59b8c73fe4d499bbfe files/digest-python-2.4.3-r2 524
+MD5 4a9be526f58df49b3ae08c7ceef43ec5 files/digest-python-2.4.3-r3 533
+RMD160 8862a23e28c03eee3f70a81ab965ded027216a5e files/digest-python-2.4.3-r3 533
+SHA256 5d035e55a4a83d7a4a7a1fc43cee5790fee0a0229de20856893e75e395a15c64 files/digest-python-2.4.3-r3 533
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFE8B56uB6ZT1m7QRERAlS9AJ9c1AwWH8ecAtkkCX9QAffyBly+DQCdE9Dd
-ZtCRerdfObSbErr3Jp9QqMw=
-=+IQ7
+iD8DBQFE8zgWuB6ZT1m7QRERApiIAJ9EQtwOBeDVg72r0ZIAxvL3VB8Y2QCfSXQW
+ikw329S13+uAMXUSd/l/Sj4=
+=Hteb
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/python/files/digest-python-2.4.3-r3 b/dev-lang/python/files/digest-python-2.4.3-r3
new file mode 100644
index 000000000000..57db69b4803d
--- /dev/null
+++ b/dev-lang/python/files/digest-python-2.4.3-r3
@@ -0,0 +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 d7f626f4fbe220ca3d48de0568cf5e55 python-gentoo-patches-2.4.3-r2.tar.bz2 8596
+RMD160 30b67d5dff65bbfbadd20a618e64e18b4d02abfe python-gentoo-patches-2.4.3-r2.tar.bz2 8596
+SHA256 b985d49cf09538183ea2e00dd85da583bd6b9f841983483548b580d63b0d35bb python-gentoo-patches-2.4.3-r2.tar.bz2 8596
diff --git a/dev-lang/python/python-2.4.3-r3.ebuild b/dev-lang/python/python-2.4.3-r3.ebuild
new file mode 100644
index 000000000000..56b23b36a225
--- /dev/null
+++ b/dev-lang/python/python-2.4.3-r3.ebuild
@@ -0,0 +1,320 @@
+# 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-r3.ebuild,v 1.1 2006/08/28 18:37:54 liquidx 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 eutils flag-o-matic python multilib versionator toolchain-funcs alternatives
+
+# we need this so that we don't depends on python.eclass
+PYVER_MAJOR=$(get_major_version)
+PYVER_MINOR=$(get_version_component_range 2)
+PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
+
+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/python-gentoo-patches-${PV}-r2.tar.bz2"
+
+LICENSE="PSF-2.2"
+SLOT="2.4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ncurses gdbm ssl readline tk berkdb bootstrap ipv6 build ucs2 doc nocxx"
+
+DEPEND=">=sys-libs/zlib-1.1.3
+	!dev-python/cjkcodecs
+	!build? (
+		tk? ( >=dev-lang/tk-8.0 )
+		ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) )
+		berkdb? ( >=sys-libs/db-3.1 )
+		gdbm? ( sys-libs/gdbm )
+		ssl? ( dev-libs/openssl )
+		doc? ( =dev-python/python-docs-${PV}* )
+		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"
+
+PROVIDE="virtual/python"
+
+# confcache breaks a dlopen check, causing python to not support
+# loading .so files - marienz
+RESTRICT="confcache"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# unnecessary termcap dep in readline (#79013)
+	epatch ${WORKDIR}/${PV}/2.4.2-readline.patch
+	# db4.2 support
+	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}/${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}/${PV}/2.4-add_portage_search_path.patch
+
+	epatch ${WORKDIR}/${PV}/2.4.3-libdir.patch
+	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
+
+	# add support for struct stat st_flags attribute (bug 94637)
+	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)
+	# 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}/${PV}/2.4.1-crosscompile.patch
+	fi
+
+	# fix gentoo/obsd problems (bug 117261)
+	epatch ${WORKDIR}/${PV}/2.4.3-gentoo_obsd.patch
+}
+
+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
+		use gdbm \
+			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} gdbm"
+		use berkdb \
+			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} dbm 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
+
+	# 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}"
+
+	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"
+
+	src_configure
+
+	if tc-is-cross-compiler ; then
+		OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
+		./configure --with-cxx=no || die "cross-configure failed"
+		emake python Parser/pgen || die "cross-make failed"
+		mv python hostpython
+		mv Parser/pgen Parser/hostpgen
+		make distclean
+		sed -i \
+			-e '/^HOSTPYTHON/s:=.*:=./hostpython:' \
+			-e '/^HOSTPGEN/s:=.*:=./Parser/hostpgen:' \
+			Makefile.pre.in || die
+	fi
+
+	# export CXX so it ends up in /usr/lib/python2.x/config/Makefile
+	tc-export CXX
+	# set LINKCC to prevent python from being linked to libstdc++.so
+	export LINKCC="\$(PURIFY) \$(CC)"
+	econf \
+		--with-fpectl \
+		--enable-shared \
+		`use_enable ipv6` \
+		--infodir='${prefix}'/share/info \
+		--mandir='${prefix}'/share/man \
+		--with-threads \
+		--with-libc='' \
+		${myconf} || die
+	emake || die "Parallel make failed"
+}
+
+src_install() {
+	dodir /usr
+	src_configure
+	make DESTDIR="${D}" altinstall maninstall || die
+
+	# install our own custom python-config
+	exeinto /usr/bin
+	doexe ${FILESDIR}/python-config-${PYVER}
+
+	# Use correct libdir in python-config
+	dosed "s:/usr/lib/:/usr/$(get_libdir)/:" /usr/bin/python-config-${PYVER}
+
+	# install python-updater in /usr/sbin
+	newsbin ${FILESDIR}/python-updater-r1 python-updater
+
+	if use build ; then
+		rm -rf ${D}/usr/$(get_libdir)/python${PYVER}/{test,encodings,email,lib-tk,bsddb/test}
+	else
+		use elibc_uclibc && rm -rf ${D}/usr/$(get_libdir)/python${PYVER}/{test,bsddb/test}
+		use berkdb || rm -rf ${D}/usr/$(get_libdir)/python${PYVER}/bsddb
+		use tk || rm -rf ${D}/usr/$(get_libdir)/python${PYVER}/lib-tk
+	fi
+
+	# Fix slotted collisions
+	mv ${D}/usr/bin/pydoc ${D}/usr/bin/pydoc${PYVER}
+	mv ${D}/usr/bin/idle ${D}/usr/bin/idle${PYVER}
+	mv ${D}/usr/share/man/man1/python.1 \
+		${D}/usr/share/man/man1/python${PYVER}.1
+	rm -f ${D}/usr/bin/smtpd.py
+
+	prep_ml_includes usr/include/python${PYVER}
+
+
+	# 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
+
+}
+
+pkg_postrm() {
+	python_makesym
+	alternatives_auto_makesym "/usr/bin/idle" "idle[0-9].[0-9]"	
+	alternatives_auto_makesym "/usr/bin/pydoc" "pydoc[0-9].[0-9]"	
+	alternatives_auto_makesym "/usr/bin/python-config" \
+								"python-config-[0-9].[0-9]"
+	alternatives_auto_makesym "/usr/share/man/man1/python.1.gz" \
+								"python[0-9].[0-9].1.gz"
+
+	python_mod_cleanup /usr/lib/python${PYVER}
+	[[ "$(get_libdir)" == "lib" ]] || \
+		python_mod_cleanup /usr/$(get_libdir)/python${PYVER}
+}
+
+pkg_postinst() {
+	local myroot
+	myroot=$(echo $ROOT | sed 's:/$::')
+
+	python_makesym
+	alternatives_auto_makesym "/usr/bin/idle" "idle[0-9].[0-9]"	
+	alternatives_auto_makesym "/usr/bin/pydoc" "pydoc[0-9].[0-9]"	
+	alternatives_auto_makesym "/usr/bin/python-config" \
+								"python-config-[0-9].[0-9]"
+	alternatives_auto_makesym "/usr/share/man/man1/python.1.gz" \
+								"python[0-9].[0-9].1.gz"
+
+	python_mod_optimize
+	python_mod_optimize -x site-packages \
+						-x test ${myroot}/usr/lib/python${PYVER}
+	[[ "$(get_libdir)" == "lib" ]] || \
+		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.3/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.4/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="distutils global mimetools minidom mmap strptime subprocess syntax tcl time urllib urllib2"
+
+	for test in ${skip_tests} ; do
+		mv ${S}/Lib/test/test_${test}.py ${T}
+	done
+
+	# rerun failed tests in verbose mode (regrtest -w)
+	EXTRATESTOPTS="-w" make test || die "make test failed"
+
+	for test in ${skip_tests} ; do
+		mv ${T}/test_${test}.py ${S}/Lib/test/test_${test}.py
+	done
+
+	einfo "Portage skipped the following tests which aren't able to run from emerge:"
+	for test in ${skip_tests} ; do
+		einfo "test_${test}.py"
+	done
+
+	einfo "If you'd like to run them, you may:"
+	einfo "cd /usr/lib/python${PYVER}/test"
+	einfo "and run the tests separately."
+}