Install libpython2.5.a in /usr/lib instead of /usr/lib/python2.5/config (bug #252372). Fix building with Subversion 1.7. Use `eselect python` instead of alternatives.eclass.

Package-Manager: portage-13625-svn/cvs/Linux x86_64

3 files changed, 274 insertions, 2 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index dc6207e0badb..1ee12e718a58 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.382 2009/05/25 16:06:25 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.383 2009/05/25 17:11:18 arfrever Exp $
+
+*python-2.5.4-r3 (25 May 2009)
+
+  25 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +python-2.5.4-r3.ebuild:
+  Install libpython2.5.a in /usr/lib instead of /usr/lib/python2.5/config
+  (bug #252372). Fix building with Subversion 1.7. Use `eselect python`
+  instead of alternatives.eclass.
 
   25 May 2009; Brent Baude <ranger@gentoo.org> python-2.4.6.ebuild:
   Marking python-2.4.6 ppc64 and ppc for bug 252317
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index a4544ded07e1..5b3e943f34bc 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -29,6 +29,7 @@ DIST python-gentoo-patches-2.4.4-r4.tar.bz2 9569 RMD160 2e618e2bf8d0d9d1e722f60b
 DIST python-gentoo-patches-2.4.6.tar.bz2 10983 RMD160 c06dc76edec86d708a0c0e37126ae50f49f61bd3 SHA1 bbc04083fe74cff8c723c5c3cab70b1b814c987f SHA256 0508a66408f218c655823303833599344d2edeec1ffc683c6ada3fc33731590d
 DIST python-gentoo-patches-2.5.2-r7.tar.bz2 28160 RMD160 c2a8c71f464f1cf0cd8e3d142a3f3454de46bc55 SHA1 b64fc90f331e42ea2c364fd61d13b515300fdcbf SHA256 8afff4ed12c3c5ca4418da657617317a8c646a69ae341a3d494747659825355f
 DIST python-gentoo-patches-2.5.2-r8.tar.bz2 28376 RMD160 c4e02a5ed947b253781ec11fd9f5f26498e41c81 SHA1 92e359402e7b6751b28671e19ad7ea0736b62614 SHA256 c008abb01c40057facf3d7fa8ad3a31e792f1b7d41bba96e0084e7476e05a0e3
+DIST python-gentoo-patches-2.5.4-r1.tar.bz2 20485 RMD160 f8e2d19fe0ad7b2176795c159768c406d3a08801 SHA1 62565a95ab46e9bf8ac20318d1c662ce44230949 SHA256 0d502be02d16c2acdf82aba14909d8c1201091bb696456ec3542fc58466e8655
 DIST python-gentoo-patches-2.5.4.tar.bz2 19474 RMD160 00bb0918414db251b11b7f19a9f8a112c9e49fbd SHA1 fd4955f7da3049abecc4df0e203e783a90390cf8 SHA256 6e050dd8e8a90655bf935af99ad1ae6456bc072f075ddb9bcd532201bbb37274
 DIST python-gentoo-patches-2.6-r2.tar.bz2 7449 RMD160 f8b33f9ce9b466a6dc8409b297b5ebf774b18d96 SHA1 ba89ecf750160d1ce631bb1f32887ad949749426 SHA256 c6ea56ca00faa8d8fee6bd68ae463c16632bee2579d296219d2403ed76e52ed8
 DIST python-gentoo-patches-2.6.2.tar.bz2 8848 RMD160 e3cf700fd8966a6bd6e3e4b64534b72e56863819 SHA1 e073af86f27db77d2eb396ff78814f2b8920811b SHA256 9178be1a77893dc2c74e40073095bbc560d02e5456f1e6be6da20930470950f7
@@ -40,8 +41,9 @@ EBUILD python-2.4.6.ebuild 9920 RMD160 208648c5eecabd3435920f37864b209070f14159
 EBUILD python-2.5.2-r7.ebuild 10669 RMD160 b155d1db61f9bbf21195358d4bf924a77847e2d9 SHA1 49d5a793399e3e1164a23ca391332badd9dcc7ab SHA256 8218d47daf2414fc210063c15e32fb3c0e007f9532dfdb1f2c1cb186fe1e0411
 EBUILD python-2.5.2-r8.ebuild 10797 RMD160 8f30ee723f9371f4fe228a188248d6aa8140ab5c SHA1 b29df521b889c292f8eebcab767997f452252c7e SHA256 4949ecd970eee3531969e0d13c3c8eb2b2dfbf73e9a8e86bd7d1449ea83b99c7
 EBUILD python-2.5.4-r2.ebuild 10691 RMD160 01893e25086cbbcbac9d5aecf2fab2d887a42b2b SHA1 3a99dfdacf14dd215d3415d5174e85a82b14f1c0 SHA256 6c220c17509b37b3651000ef05e2c4513b5f0ffd78080d9963c7255c696a35df
+EBUILD python-2.5.4-r3.ebuild 8387 RMD160 b561e0fb6e56c7f2c14cbfe735482c90fa02c58e SHA1 8ddaa6d1e272b8724cd88559f6524dee2ad1b66d SHA256 2cafb62cc1fc3f61ecd1a89f4873634b958dd09083a26727e718937717c317ce
 EBUILD python-2.6-r5.ebuild 8678 RMD160 5499995f99198fd01c3066add3fae31521f63f25 SHA1 2e452754421b2024f14eb9371b4281b31e5f608e SHA256 ad55273c6bfd924c9e80d018f947361f909f6b931371a2fb10316d6bb958d32e
 EBUILD python-2.6.1-r1.ebuild 8895 RMD160 d2023c5a58e42fcfbc10971fef329ab87c1d49ab SHA1 a03a5ab2fcf9673fad55db05a626e3d374220df4 SHA256 b552836d36978d62a27168cd8f0f46c5497f1ffea1941f83bdbe69920675b1cb
 EBUILD python-2.6.2.ebuild 8434 RMD160 5316ce9620302704cbe61059a192d22e1f2ad7c5 SHA1 7be851d906745eea0c9b3dc5f86767151aea2b1a SHA256 221d09d6a988ce01158aa53d7d04ff37462f1341b8dfe0d7ad39f1a1bc64ecc5
-MISC ChangeLog 67579 RMD160 aeb9e703e37f22b4af9ba991dee30a1680ca50d7 SHA1 a07abc59793877296da81d39ad1fd6de445fd0e2 SHA256 67a6d3ff5fd1b796f0edcee5e284fe318b12b98a4c8b463c29fbe30932aac791
+MISC ChangeLog 67894 RMD160 cf562e542073c6fa40dc5e06de41be51c8d7bd68 SHA1 8cd2473174c85674ebbbee780d84fb9fbad91692 SHA256 7f087780a922fdff9ec18ed3aa3bd9f538377b0519d645fdc5dfbab96249ccfe
 MISC metadata.xml 490 RMD160 b919b92704616b974d1da46bfea1f03c7ea50330 SHA1 d1901bc18d0aa431b05fccfe13f2f87ab2aa9e18 SHA256 765be0142679faeeaf01cfa489424c3af08ad38ed627e6a7246b4a6f96f2dffa
diff --git a/dev-lang/python/python-2.5.4-r3.ebuild b/dev-lang/python/python-2.5.4-r3.ebuild
new file mode 100644
index 000000000000..e35d5f87153d
--- /dev/null
+++ b/dev-lang/python/python-2.5.4-r3.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2009 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-r3.ebuild,v 1.1 2009/05/25 17:11:18 arfrever 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.
+
+EAPI="1"
+
+inherit autotools eutils flag-o-matic libtool multilib python toolchain-funcs versionator
+
+# 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}-r1.tar.bz2"
+
+LICENSE="PSF-2.2"
+SLOT="2.5"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="berkdb build doc elibc_uclibc examples gdbm ipv6 ncurses readline sqlite ssl +threads tk ucs2 wininst +xml"
+
+# NOTE: dev-python/{elementtree,celementtree,pysqlite,ctypes,cjkcodecs}
+#       do not conflict with the ones in python proper. - liquidx
+
+DEPEND=">=app-admin/eselect-python-20080925
+		>=sys-libs/zlib-1.1.3
+		!build? (
+			sqlite? ( >=dev-db/sqlite-3 )
+			tk? ( >=dev-lang/tk-8.0 )
+			ncurses? ( >=sys-libs/ncurses-5.2
+						readline? ( >=sys-libs/readline-4.1 ) )
+			berkdb? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3
+							sys-libs/db:4.2 ) )
+			gdbm? ( sys-libs/gdbm )
+			ssl? ( dev-libs/openssl )
+			doc? ( dev-python/python-docs:${SLOT} )
+			xml? ( dev-libs/expat )
+	)"
+RDEPEND="${DEPEND}"
+PDEPEND="${DEPEND} app-admin/python-updater"
+
+PROVIDE="virtual/python"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	if tc-is-cross-compiler; then
+		epatch "${FILESDIR}"/python-2.4.4-test-cross.patch \
+			"${FILESDIR}"/python-2.5-cross-printf.patch
+	else
+		rm "${WORKDIR}/${PV}"/*_all_crosscompile.patch
+	fi
+
+	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 "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	# 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 ! use wininst; then
+		# Remove Microsoft Windows executables.
+		rm Lib/distutils/command/wininst-*.exe
+	fi
+
+	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 _sqlite3"
+		export PYTHON_DISABLE_SSL=1
+	else
+		# dbm module can link to berkdb or gdbm
+		# Defaults to gdbm when both are enabled, #204343
+		local disable
+		use berkdb   || use gdbm || disable="${disable} dbm"
+		use berkdb   || disable="${disable} bsddb"
+		use xml      || disable="${disable} pyexpat"
+		use gdbm     || disable="${disable} gdbm"
+		use ncurses  || disable="${disable} _curses _curses_panel"
+		use readline || disable="${disable} readline"
+		use sqlite   || disable="${disable} _sqlite3"
+		use ssl      || export PYTHON_DISABLE_SSL=1
+		use tk       || disable="${disable} _tkinter"
+		export PYTHON_DISABLE_MODULES="${disable}"
+	fi
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	einfo "Disabled modules: $PYTHON_DISABLE_MODULES"
+
+	export OPT="${CFLAGS}"
+
+	local myconf
+
+	# 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"
+
+	filter-flags -malign-double
+
+	[[ "${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
+
+	if tc-is-cross-compiler; then
+		OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
+		./configure --{build,host}=${CBUILD} || 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 "sed failed"
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
+	tc-export CXX
+
+	# Set LDFLAGS so we link modules with -lpython2.5 correctly.
+	# Needed on FreeBSD unless Python 2.5 is already installed.
+	# Please query BSD team before removing this!
+	append-ldflags "-L."
+
+	econf \
+		--with-fpectl \
+		--enable-shared \
+		$(use_enable ipv6) \
+		$(use_with threads) \
+		--infodir='${prefix}'/share/info \
+		--mandir='${prefix}'/share/man \
+		--with-libc='' \
+		${myconf}
+}
+
+src_compile() {
+	src_configure
+	emake || die "emake failed"
+}
+
+src_test() {
+	# Tests won't work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# Byte compiling should be enabled here.
+	# Otherwise test_import fails.
+	python_enable_pyc
+
+	# Skip all tests that fail during emerge but pass without emerge:
+	# (See bug #67970)
+	local skip_tests="distutils global mimetools minidom mmap posix pyexpat sax strptime subprocess syntax tcl time urllib urllib2 webbrowser xml_etree"
+
+	# test_pow fails on alpha.
+	# http://bugs.python.org/issue756093
+	[[ ${ARCH} == "alpha" ]] && skip_tests="${skip_tests} pow"
+
+	for test in ${skip_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# Redirect stdin from /dev/tty as a workaround for bug #248081.
+	# Rerun failed tests in verbose mode (regrtest -w).
+	EXTRATESTOPTS="-w" make test < /dev/tty || 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/$(get_libdir)/python${PYVER}/test"
+	elog "and run the tests separately."
+}
+
+src_install() {
+	emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed"
+
+	mv "${D}"/usr/bin/python${PYVER}-config "${D}"/usr/bin/python-config-${PYVER}
+
+	# 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
+
+	# 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=-DNDEBUG:" -i "${D}usr/$(get_libdir)/python${PYVER}/config/Makefile"
+
+	if use build; then
+		rm -fr "${D}"/usr/$(get_libdir)/python${PYVER}/{test,encodings,email,lib-tk,bsddb/test}
+	else
+		use elibc_uclibc && rm -fr "${D}"/usr/$(get_libdir)/python${PYVER}/{test,bsddb/test}
+		use berkdb || rm -fr "${D}"/usr/$(get_libdir)/python${PYVER}/bsddb
+		use tk || rm -fr "${D}"/usr/$(get_libdir)/python${PYVER}/lib-tk
+	fi
+
+	prep_ml_includes usr/include/python${PYVER}
+
+	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}
+}
+
+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}
+}
+
+pkg_postinst() {
+	eselect python update --ignore 3.0
+
+	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}
+}