Fix small bug preventing tests from running, fix manpage symlinks (bug 177471) and filter as-needed in python-2.3.6-r2 (bug 177614).

Package-Manager: portage-2.1.2.7

7 files changed, 52 insertions, 360 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 95f7e2db69e1..547b85dcdadd 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.250 2007/05/14 05:01:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.251 2007/05/14 09:20:02 kloeri Exp $
+
+  14 May 2007; Bryan Østergaard <kloeri@gentoo.org> python-2.3.6-r2.ebuild,
+  python-2.4.4-r4.ebuild, -python-2.5.1-r1.ebuild, python-2.5.1-r2.ebuild:
+  Fix small bug preventing tests from running, fix manpage symlinks (bug
+  177471) and filter as-needed in python-2.3.6-r2 (bug 177614).
 
   14 May 2007; Jeroen Roovers <jer@gentoo.org> python-2.4.4-r4.ebuild:
   Stable for HPPA (bug #177804).
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 7d6eee321033..abedcf9e44d4 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX depreorder-topsort.py 1958 RMD160 4192ad9ed14064a9da42ce1faedcf28996094da3 SHA1 2c900abeb6cfcc4327f0e9418b5abd7761ce5879 SHA256 7406f639d17b8acab6a1db7e398e74379b44950d4821bc36901abd3455d63b3d
 MD5 7e423c353b08a2c05693d13f21e067d0 files/depreorder-topsort.py 1958
 RMD160 4192ad9ed14064a9da42ce1faedcf28996094da3 files/depreorder-topsort.py 1958
@@ -70,10 +73,10 @@ EBUILD python-2.3.5-r3.ebuild 8195 RMD160 cd204acdd5c7a3302101bdef2bdb1875c8a652
 MD5 9972881756e1809df8847a161ef4993d python-2.3.5-r3.ebuild 8195
 RMD160 cd204acdd5c7a3302101bdef2bdb1875c8a652e0 python-2.3.5-r3.ebuild 8195
 SHA256 bb533acbd0cc0790c32271fd84f52bde72f78362a9730e0094a2d4e6282e0d50 python-2.3.5-r3.ebuild 8195
-EBUILD python-2.3.6-r2.ebuild 7616 RMD160 dd62b9ff32f868869b2413001aa2f9b4968173ad SHA1 8ea43459174ad8f6501d407111f656460c410c3b SHA256 a528b502477a5343cec2b825311d5f1bc52508406d7585c5d9b8a18c1719366b
-MD5 2d53a911ce95d5b647564384841cf582 python-2.3.6-r2.ebuild 7616
-RMD160 dd62b9ff32f868869b2413001aa2f9b4968173ad python-2.3.6-r2.ebuild 7616
-SHA256 a528b502477a5343cec2b825311d5f1bc52508406d7585c5d9b8a18c1719366b python-2.3.6-r2.ebuild 7616
+EBUILD python-2.3.6-r2.ebuild 7659 RMD160 51d4d6ed08551bcc65cc57f43723d6d0139befee SHA1 e082a5f985d7beec09ba940844d17d75fa0dd39d SHA256 9ae6ebc6578932b395074c2fe5551142187854137d14b8ccebc4f801a38189a2
+MD5 7a8101fa13551d34a244881c696632ef python-2.3.6-r2.ebuild 7659
+RMD160 51d4d6ed08551bcc65cc57f43723d6d0139befee python-2.3.6-r2.ebuild 7659
+SHA256 9ae6ebc6578932b395074c2fe5551142187854137d14b8ccebc4f801a38189a2 python-2.3.6-r2.ebuild 7659
 EBUILD python-2.3.6.ebuild 8241 RMD160 3eb646140e285c169cad0d74c956ba9652469c6b SHA1 8ffc41fa98468bc4390a707418fb2fc88a2ea52a SHA256 3a9e3ae1b5abb71b9521a7ccfb2bb02006034c38b24523756fe16dcdc02a5b33
 MD5 7e126ecbd19ee8a5a6ac0c187244feb9 python-2.3.6.ebuild 8241
 RMD160 3eb646140e285c169cad0d74c956ba9652469c6b python-2.3.6.ebuild 8241
@@ -86,10 +89,10 @@ EBUILD python-2.4.3-r4.ebuild 10461 RMD160 83999653ed0eecd20fd187dc129699cd14472
 MD5 177d2df131d0468e5f993d2a2d992ea7 python-2.4.3-r4.ebuild 10461
 RMD160 83999653ed0eecd20fd187dc129699cd14472934 python-2.4.3-r4.ebuild 10461
 SHA256 c3def40d0d82a3db7eef795b08d35fb4d50b88387a93ceeccdd5049e205c758d python-2.4.3-r4.ebuild 10461
-EBUILD python-2.4.4-r4.ebuild 10227 RMD160 61149aa907d505ab96be08d3b00807b076a92ef0 SHA1 7a602300b701162621d1f20add3a925a385a2540 SHA256 ed2de20c32887fb8340bd7abb1e2f63fde579fb108635eda3eefa281fc590ce8
-MD5 9ae1ea64070794230afa667127d40947 python-2.4.4-r4.ebuild 10227
-RMD160 61149aa907d505ab96be08d3b00807b076a92ef0 python-2.4.4-r4.ebuild 10227
-SHA256 ed2de20c32887fb8340bd7abb1e2f63fde579fb108635eda3eefa281fc590ce8 python-2.4.4-r4.ebuild 10227
+EBUILD python-2.4.4-r4.ebuild 10165 RMD160 4aa71629fb13da7a8cec1344ab1eeda921ba946f SHA1 d5e4ae1d21fb5b878b0b402825be994b2085c2c5 SHA256 a25a636a36ad1e96bda83ef512770451918e5f7e1957400deacaf9438884aa13
+MD5 24d83261f0cae928e0e3e6b61ae16c0e python-2.4.4-r4.ebuild 10165
+RMD160 4aa71629fb13da7a8cec1344ab1eeda921ba946f python-2.4.4-r4.ebuild 10165
+SHA256 a25a636a36ad1e96bda83ef512770451918e5f7e1957400deacaf9438884aa13 python-2.4.4-r4.ebuild 10165
 EBUILD python-2.4.4.ebuild 10393 RMD160 3a036a4a1eb8662303aedbadfe56a76ca33ad943 SHA1 f17d5d1c554df54057a5e5e3bec4d3ff75520460 SHA256 032bb614e47b3afa5b456a4d2bef8436d14478abc344593ce4beadc34d9d68ab
 MD5 de6f40dad405eface55886fe943305d1 python-2.4.4.ebuild 10393
 RMD160 3a036a4a1eb8662303aedbadfe56a76ca33ad943 python-2.4.4.ebuild 10393
@@ -98,18 +101,14 @@ EBUILD python-2.5-r2.ebuild 10886 RMD160 2c41e109c17f01ecda2f473a59df9da31d2025a
 MD5 30608c72df4c33176c7378a761bc2a45 python-2.5-r2.ebuild 10886
 RMD160 2c41e109c17f01ecda2f473a59df9da31d2025ab python-2.5-r2.ebuild 10886
 SHA256 da99f22bf3b2df722ac3f2de172d251313834a9d60700d41ffca62f5c2aeafe8 python-2.5-r2.ebuild 10886
-EBUILD python-2.5.1-r1.ebuild 10274 RMD160 6e4dfa702751a47303623bc1d9a11201811c4705 SHA1 a68a6e2693f417db6c9c9383abd1eadcbb84a422 SHA256 55d6d116e0be7105ee5da8d2895596e6cc9bac9ea34015084bf89b1e360e6980
-MD5 8fea8c122c0273140f3cc649d4c59869 python-2.5.1-r1.ebuild 10274
-RMD160 6e4dfa702751a47303623bc1d9a11201811c4705 python-2.5.1-r1.ebuild 10274
-SHA256 55d6d116e0be7105ee5da8d2895596e6cc9bac9ea34015084bf89b1e360e6980 python-2.5.1-r1.ebuild 10274
-EBUILD python-2.5.1-r2.ebuild 10569 RMD160 665bc165241f8ced34cd150e06d929a9ed9e358a SHA1 0adbc31bb10a0da66fe2a86509c23f3ae198fe78 SHA256 ca1b9711c7d1f6bac906fb8510a71cd592c7245a5b2728418f2cb28f59fd54d3
-MD5 776cee45cdc0c357e0cd9dcb25b715d1 python-2.5.1-r2.ebuild 10569
-RMD160 665bc165241f8ced34cd150e06d929a9ed9e358a python-2.5.1-r2.ebuild 10569
-SHA256 ca1b9711c7d1f6bac906fb8510a71cd592c7245a5b2728418f2cb28f59fd54d3 python-2.5.1-r2.ebuild 10569
-MISC ChangeLog 43712 RMD160 caade9e85f797ad189f79dc31c5f8731f52e90e1 SHA1 b6ffe7cfe9b950f918be311d77523adfe0970416 SHA256 711d95cffeb14db542122358ce833e7004fa5ad2172077f57d59776f3e7dc14c
-MD5 5fa3413c7ab6932dfd8b105f7f2e45ba ChangeLog 43712
-RMD160 caade9e85f797ad189f79dc31c5f8731f52e90e1 ChangeLog 43712
-SHA256 711d95cffeb14db542122358ce833e7004fa5ad2172077f57d59776f3e7dc14c ChangeLog 43712
+EBUILD python-2.5.1-r2.ebuild 10474 RMD160 bfa82f22f27b035c228d602b18a86f466c23e703 SHA1 426e6697acef7ae327bd6a6815e77d67b1f094ab SHA256 adecaa2e2ab6fdefc986fcc0a9905a1f7228a157748c35610aee2ba8ea2dc1d7
+MD5 c37914e2e7fba08d541726fab2758230 python-2.5.1-r2.ebuild 10474
+RMD160 bfa82f22f27b035c228d602b18a86f466c23e703 python-2.5.1-r2.ebuild 10474
+SHA256 adecaa2e2ab6fdefc986fcc0a9905a1f7228a157748c35610aee2ba8ea2dc1d7 python-2.5.1-r2.ebuild 10474
+MISC ChangeLog 44005 RMD160 987db3b32a093c26665fe918105b7312826d60f4 SHA1 300f64426c216de5067db32f55802e83c8c149ad SHA256 2e5e8495d1ddc2c5a35b5d1b0496b85f2badf764b0de5ec2db50be346bcb41d4
+MD5 e8cb152dd7a45be845b4152f91155309 ChangeLog 44005
+RMD160 987db3b32a093c26665fe918105b7312826d60f4 ChangeLog 44005
+SHA256 2e5e8495d1ddc2c5a35b5d1b0496b85f2badf764b0de5ec2db50be346bcb41d4 ChangeLog 44005
 MISC metadata.xml 221 RMD160 dd50f32b16d6c15330ae1ee711d8a6cf8f6e3bed SHA1 85903c4affc3a23dd37e4910eb9b198cd02b242e SHA256 c14b93d19008cbeeb3312ec60b97513eef18ccfe82b8e2303cb44977ca13e3bd
 MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221
 RMD160 dd50f32b16d6c15330ae1ee711d8a6cf8f6e3bed metadata.xml 221
@@ -141,9 +140,13 @@ SHA256 7adcb37e259cb269f5000934c41ed8a355157bb5a70fbe26f8899dae8a4892a4 files/di
 MD5 f5874d66f01a305e211cd99a5b8385be files/digest-python-2.5-r2 521
 RMD160 c73e59e34c378e2100327b325fb616043f1f47fa files/digest-python-2.5-r2 521
 SHA256 8076a290b8200dcfeb1efdf3846f1daea0a4017050f32318da51a92655da4520 files/digest-python-2.5-r2 521
-MD5 324d60a42f00557119aa50958d0ee6fd files/digest-python-2.5.1-r1 524
-RMD160 d49c6128cbed41384a15cacfd1c728a1b2bc9f8d files/digest-python-2.5.1-r1 524
-SHA256 a45e1cf55eda4d760225944ed0f598d594b573174479651cfa8a78ca9ca4db3c files/digest-python-2.5.1-r1 524
 MD5 324d60a42f00557119aa50958d0ee6fd files/digest-python-2.5.1-r2 524
 RMD160 d49c6128cbed41384a15cacfd1c728a1b2bc9f8d files/digest-python-2.5.1-r2 524
 SHA256 a45e1cf55eda4d760225944ed0f598d594b573174479651cfa8a78ca9ca4db3c files/digest-python-2.5.1-r2 524
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGSCl5ugEuf3OQ0akRAnQ+AJ0fNGWEShTNnd759p+34AcUe2H/awCeLdN5
+Po4su/aT+xAABjgzomxuNDk=
+=z/P0
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/python/files/digest-python-2.5.1-r1 b/dev-lang/python/files/digest-python-2.5.1-r1
deleted file mode 100644
index 08760a3abd98..000000000000
--- a/dev-lang/python/files/digest-python-2.5.1-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 70084ffa561660f07de466c2c8c4842d Python-2.5.1.tar.bz2 9383651
-RMD160 af0e8ed93bbc07015c338ae19bbee8811da21c1c Python-2.5.1.tar.bz2 9383651
-SHA256 d0b5d4dce02c56d2eb0728db3ebd63afc3dae906d158be6532ae4480d311e167 Python-2.5.1.tar.bz2 9383651
-MD5 b0ce842816939c01d94cb75127296c0e python-gentoo-patches-2.5.1.tar.bz2 5430
-RMD160 7cdfb51c00a49ebb9027228691e10b8c4c3f574f python-gentoo-patches-2.5.1.tar.bz2 5430
-SHA256 065f31d46c3b57d99b1c3236bbaf445ca142fda33c9ef13e7e2e39be3d027499 python-gentoo-patches-2.5.1.tar.bz2 5430
diff --git a/dev-lang/python/python-2.3.6-r2.ebuild b/dev-lang/python/python-2.3.6-r2.ebuild
index 447ad6a864f3..b75b38a66dcb 100644
--- a/dev-lang/python/python-2.3.6-r2.ebuild
+++ b/dev-lang/python/python-2.3.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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-r2.ebuild,v 1.2 2007/05/12 11:45:22 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.6-r2.ebuild,v 1.3 2007/05/14 09:20:02 kloeri Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -103,6 +103,7 @@ src_configure() {
 
 src_compile() {
 	filter-flags -malign-double
+	filter-ldflags -Wl,--as-needed --as-needed
 
 	[ "${ARCH}" = "alpha" ] && append-flags -fPIC
 	[ "${ARCH}" = "amd64" ] && append-flags -fPIC
diff --git a/dev-lang/python/python-2.4.4-r4.ebuild b/dev-lang/python/python-2.4.4-r4.ebuild
index d9f7ab5fa393..ab2f257ca125 100644
--- a/dev-lang/python/python-2.4.4-r4.ebuild
+++ b/dev-lang/python/python-2.4.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r4.ebuild,v 1.7 2007/05/14 05:01:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r4.ebuild,v 1.8 2007/05/14 09:20:02 kloeri Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -220,14 +220,14 @@ src_install() {
 }
 
 pkg_postrm() {
-python_makesym
+	local mansuffix=$(ecompress --suffix)
+	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]"
-	suffix=$(echo /usr/share/man/man1/python${PYVER}.1* | sed "s/.*python${PYVER}.1//")
-	ln -s "/usr/share/man/man1/python[0-9][0-9].1${suffix}" \
-		"/usr/share/man/man1/python.1${suffix}"
+	alternatives_auto_makesym "/usr/share/man/man1/python.1${mansuffix}" \
+								"python[0-9].[0-9].1${mansuffix}"
 
 	python_mod_cleanup /usr/lib/python${PYVER}
 	[[ "$(get_libdir)" == "lib" ]] || \
@@ -237,15 +237,15 @@ python_makesym
 pkg_postinst() {
 	local myroot
 	myroot=$(echo $ROOT | sed 's:/$::')
+	local mansuffix=$(ecompress --suffix)
 
 	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]"
-	suffix=$(echo /usr/share/man/man1/python${PYVER}.1* | sed "s/.*python${PYVER}.1//")
-	ln -s "/usr/share/man/man1/python[0-9][0-9].1${suffix}" \
-		"/usr/share/man/man1/python.1${suffix}"
+	alternatives_auto_makesym "/usr/share/man/man1/python.1${mansuffix}" \
+								"python[0-9].[0-9].1${mansuffix}"
 
 	python_mod_optimize
 	python_mod_optimize -x site-packages \
diff --git a/dev-lang/python/python-2.5.1-r1.ebuild b/dev-lang/python/python-2.5.1-r1.ebuild
deleted file mode 100644
index 1af98372d727..000000000000
--- a/dev-lang/python/python-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.1-r1.ebuild,v 1.1 2007/05/10 14:01:01 kloeri 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 autotools flag-o-matic python multilib versionator toolchain-funcs alternatives libtool
-
-# 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}.tar.bz2"
-
-LICENSE="PSF-2.2"
-SLOT="2.5"
-KEYWORDS="~hppa ~ia64 ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="ncurses gdbm ssl readline tk berkdb bootstrap ipv6 build ucs2 sqlite doc nocxx nothreads examples"
-
-# NOTE: dev-python/{elementtree,celementtree,pysqlite,ctypes,cjkcodecs}
-#       do not conflict with the ones in python proper. - liquidx
-
-DEPEND=">=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-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 app-admin/python-updater"
-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}"
-
-	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
-
-	# 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
-
-	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
-		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 sqlite \
-			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _sqlite3"
-		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"
-
-	use nothreads \
-		&& myconf="${myconf} --without-threads" \
-		|| myconf="${myconf} --with-threads"
-
-	# Fix linking on non-linux platforms
-	append-ldflags "-L."
-
-	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)"
-
-	# set LDFLAGS so we link modules with -lpython2.5 correctly.
-	# Needed on FreeBSD unless python2.5 is already installed.
-	# Please query BSD team before removing this!
-	export LDFLAGS="-L."
-
-	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 maninstall || die
-
-	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
-
-	# 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)/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
-
-	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
-
-	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
-	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]"
-	suffix=$(echo /usr/share/man/man1/python${PYVER}.1* | sed "s/.*python${PYVER}.1//")
-	ln -s "${ROOT}"/usr/share/man/man1/python${PYVER}.1${suffix} \
-		"${ROOT}"/usr/share/man/man1/python.1${suffix}
-
-	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]"
-	suffix=$(echo /usr/share/man/man1/python${PYVER}.1* | sed "s/.*python${PYVER}.1//")
-	ln -s "${ROOT}"/usr/share/man/man1/python${PYVER}.1${suffix} \
-		"${ROOT}"/usr/share/man/man1/python.1${suffix}
-
-	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 will"
-	ewarn "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 posix pyexpat sax strptime subprocess syntax tcl time urllib urllib2 webbrowser xml_etree"
-
-	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
-
-	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."
-}
diff --git a/dev-lang/python/python-2.5.1-r2.ebuild b/dev-lang/python/python-2.5.1-r2.ebuild
index 4252e2848b6b..dce1c20ad8f2 100644
--- a/dev-lang/python/python-2.5.1-r2.ebuild
+++ b/dev-lang/python/python-2.5.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.1-r2.ebuild,v 1.3 2007/05/12 11:45:22 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.1-r2.ebuild,v 1.4 2007/05/14 09:20:02 kloeri Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -226,14 +226,15 @@ src_install() {
 }
 
 pkg_postrm() {
+	local mansuffix=$(ecompress --suffix)
 	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]"
-	suffix=$(echo /usr/share/man/man1/python${PYVER}.1* | sed "s/.*python${PYVER}.1//")
-	ln -s "${ROOT}"/usr/share/man/man1/python${PYVER}.1${suffix} \
-		"${ROOT}"/usr/share/man/man1/python.1${suffix}
+
+	alternatives_auto_makesym "/usr/share/man/man1/python.1${mansuffix}" \
+								"python[0-9].[0-9].1${mansuffix}"
 
 	python_mod_cleanup /usr/lib/python${PYVER}
 	[[ "$(get_libdir)" == "lib" ]] || \
@@ -243,15 +244,16 @@ pkg_postrm() {
 pkg_postinst() {
 	local myroot
 	myroot=$(echo $ROOT | sed 's:/$::')
+	local mansuffix=$(ecompress --suffix)
 
 	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]"
-	suffix=$(echo /usr/share/man/man1/python${PYVER}.1* | sed "s/.*python${PYVER}.1//")
-	ln -s "${ROOT}"/usr/share/man/man1/python${PYVER}.1${suffix} \
-		"${ROOT}"/usr/share/man/man1/python.1${suffix}
+
+	alternatives_auto_makesym "/usr/share/man/man1/python.1${mansuffix}" \
+								"python[0-9].[0-9].1${mansuffix}"
 
 	python_mod_optimize
 	python_mod_optimize -x site-packages \
@@ -289,7 +291,7 @@ pkg_postinst() {
 
 src_test() {
 	# Tests won't work when cross compiling
-	if [[ tc-is-cross-compiler ]] ; then
+	if tc-is-cross-compiler ; then
 		elog "Disabling tests due to crosscompiling."
 		return
 	fi