Don't duplicate code.

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

5 files changed, 32 insertions, 40 deletions

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 10f96c4f8761..3ca136eb7692 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -14,10 +14,10 @@ DIST python-gentoo-patches-2.5.4-r2.tar.bz2 20722 RMD160 86c25ad3647b7a3ca44c8e7
 DIST python-gentoo-patches-2.6.2-r4.tar.bz2 11802 RMD160 d04d80d3ed2ead001dbdbe24a89e8cfe5e6e56c7 SHA1 eca475efb4dd47f688fa49d510ae8f53afe3dff0 SHA256 a0b881c332991aafd885a337432c9ef3c4a29d41ed50898e12261801aad6f83a
 DIST python-gentoo-patches-2.6.2-r5.tar.bz2 12206 RMD160 43f321ac4df2b4c6ccb5777d3627c089d46b9024 SHA1 2e35f77a7216b61a9aac9508eac2ddce882c993a SHA256 f3e1593911130ed4bb5879c13e5afa4edd0a873682e1e8609184ec24cae244e1
 DIST python-gentoo-patches-3.1.1-r2.tar.bz2 8929 RMD160 26afbdbbec3bf0e394cb3082d77abd75d4c75a6b SHA1 e7e775954777a336eff8e9c6c2600d053338fdb2 SHA256 d72acfbf1adeb0ab19da4833bf4663acc9ba4518c614ca92e990dde088d9a07c
-EBUILD python-2.4.6.ebuild 9505 RMD160 c89b3bc8e0e7f4107c57b50df3f3aeb94e49cdb6 SHA1 899c37bc564a5e9d84d56099e27a223f6d09dfcb SHA256 dbb13b83c049ac74c97a914ab302f225d4afd405af713c8ef2cf75bedd214618
-EBUILD python-2.5.4-r3.ebuild 9807 RMD160 6ebb19dbadb0cc8a0620419a6bedbe2fa656328d SHA1 015f9b67b3aabde8138f9f75c86024313c2cc5eb SHA256 d03b517d82d74bd0c66a076454499ad2052d849d95f34e511b52c1f444870225
+EBUILD python-2.4.6.ebuild 9290 RMD160 9936d5aeae82cfbac503fb690c6331dbc3ec098c SHA1 e0ba19cfeeb44b8a2a52b3d741c886ccd350cdbf SHA256 959b06b64af88afd770d4e745eaeb5642ae1eea7cd70794540e8b67dad910e4c
+EBUILD python-2.5.4-r3.ebuild 9592 RMD160 5628ac37c6fd98c5f56719fd4b7bf8636854f5fb SHA1 aff25d48b53b914d3d4357f90d30d899ec0cb145 SHA256 bbb3ef7213a0f8f4dce6f12d7cc785d7cc4257a4fef679014131c1bec9fe3006
 EBUILD python-2.6.2-r1.ebuild 9993 RMD160 2643d6d116e2f05e3d28f55293d8314f0a72d875 SHA1 4d778dbf57131881df1b82f2d9117b84661273ba SHA256 0268cbeec142b0579314898ed74f2a2fe7eea5e7a3d67561b3c90f47aa658955
-EBUILD python-2.6.2-r2.ebuild 10494 RMD160 09901da7809124301ae85fa97000ef0ba2379c78 SHA1 4b5a3f8891e5ddc3803674beadbb2e8c27c7576c SHA256 8438154afc19e9da2978dd8d9ea674f11d09e3d6064a32db7cca0ed315a36e6d
-EBUILD python-3.1.1-r1.ebuild 9665 RMD160 b11470610a282a6540467923ae95626ff468a599 SHA1 99b2bf0dbb6e9708218e745db11c6df10575f388 SHA256 57bd6943516cc580ca7b03a542b1c4882a60b54468e32d7b9110219b1e7c9244
+EBUILD python-2.6.2-r2.ebuild 10279 RMD160 389e963b4c383e388f73621378a6346f228af604 SHA1 5ebcfff0142eca1b9b6691defa90689ec82f0220 SHA256 60b8360648cab832429a43acc9276915ee6fdf98a9b3b24d056ddee84b5143c1
+EBUILD python-3.1.1-r1.ebuild 9489 RMD160 3c216c2985c08130e19c8d47929bb1bdf7ef85b3 SHA1 193cbd85c5637072201f5194530dfd5f0aba6196 SHA256 ffff894011982d89551d5804c0aa02e10d98969fe235a7f816d52db6abd9d9da
 MISC ChangeLog 73819 RMD160 9b22502837e947f7285824a164c6d7bf4679f823 SHA1 36c4749f2e85dec16026624d3e25e3d6043fca38 SHA256 460382ca727ffce23730819d4358b0514e62ea8592a3a25dc8b5d83917fa358f
 MISC metadata.xml 501 RMD160 0cc2c851a7c59ed77809c1f3ac2130710f0700e9 SHA1 59bfd447cf15419f68077913de7228f3556ce6e3 SHA256 51c09ee221463f34722a6c655db605a7d6d683069453d173947e4416a43a071c
diff --git a/dev-lang/python/python-2.4.6.ebuild b/dev-lang/python/python-2.4.6.ebuild
index 5f8968cb1231..785a33219b80 100644
--- a/dev-lang/python/python-2.4.6.ebuild
+++ b/dev-lang/python/python-2.4.6.ebuild
@@ -1,6 +1,6 @@
 # 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.4.6.ebuild,v 1.17 2009/09/27 17:56:00 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v 1.18 2009/09/27 18:33:37 arfrever Exp $
 
 EAPI="1"
 
@@ -263,7 +263,7 @@ pkg_preinst() {
 	fi
 }
 
-pkg_postinst() {
+eselect_python_update() {
 	local ignored_python_slots
 	[[ "$(eselect python show)" == "python2."* ]] && ignored_python_slots="--ignore 3.0 --ignore 3.1 --ignore 3.2"
 
@@ -271,6 +271,10 @@ pkg_postinst() {
 	eselect python update --ignore 3.0 --ignore 3.1 --ignore 3.2 > /dev/null
 
 	eselect python update ${ignored_python_slots}
+}
+
+pkg_postinst() {
+	eselect_python_update
 
 	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}
@@ -289,13 +293,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	local ignored_python_slots
-	[[ "$(eselect python show)" == "python2."* ]] && ignored_python_slots="--ignore 3.0 --ignore 3.1 --ignore 3.2"
-
-	# Create python2 symlink.
-	eselect python update --ignore 3.0 --ignore 3.1 --ignore 3.2 > /dev/null
-
-	eselect python update ${ignored_python_slots}
+	eselect_python_update
 
 	python_mod_cleanup /usr/lib/python${PYVER}
 	[[ "$(get_libdir)" != "lib" ]] && python_mod_cleanup /usr/$(get_libdir)/python${PYVER}
diff --git a/dev-lang/python/python-2.5.4-r3.ebuild b/dev-lang/python/python-2.5.4-r3.ebuild
index 4f62710d3ae2..038339dcaaac 100644
--- a/dev-lang/python/python-2.5.4-r3.ebuild
+++ b/dev-lang/python/python-2.5.4-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.19 2009/09/27 17:56:00 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r3.ebuild,v 1.20 2009/09/27 18:33:37 arfrever Exp $
 
 EAPI="1"
 
@@ -268,7 +268,7 @@ pkg_preinst() {
 	fi
 }
 
-pkg_postinst() {
+eselect_python_update() {
 	local ignored_python_slots
 	[[ "$(eselect python show)" == "python2."* ]] && ignored_python_slots="--ignore 3.0 --ignore 3.1 --ignore 3.2"
 
@@ -276,6 +276,10 @@ pkg_postinst() {
 	eselect python update --ignore 3.0 --ignore 3.1 --ignore 3.2 > /dev/null
 
 	eselect python update ${ignored_python_slots}
+}
+
+pkg_postinst() {
+	eselect_python_update
 
 	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}
@@ -294,13 +298,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	local ignored_python_slots
-	[[ "$(eselect python show)" == "python2."* ]] && ignored_python_slots="--ignore 3.0 --ignore 3.1 --ignore 3.2"
-
-	# Create python2 symlink.
-	eselect python update --ignore 3.0 --ignore 3.1 --ignore 3.2 > /dev/null
-
-	eselect python update ${ignored_python_slots}
+	eselect_python_update
 
 	python_mod_cleanup /usr/lib/python${PYVER}
 	[[ "$(get_libdir)" != "lib" ]] && python_mod_cleanup /usr/$(get_libdir)/python${PYVER}
diff --git a/dev-lang/python/python-2.6.2-r2.ebuild b/dev-lang/python/python-2.6.2-r2.ebuild
index 252fd4c90f6b..150bbb97c7ad 100644
--- a/dev-lang/python/python-2.6.2-r2.ebuild
+++ b/dev-lang/python/python-2.6.2-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.6.2-r2.ebuild,v 1.5 2009/09/27 17:56:00 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.2-r2.ebuild,v 1.6 2009/09/27 18:33:37 arfrever Exp $
 
 EAPI="2"
 
@@ -281,7 +281,7 @@ pkg_preinst() {
 	fi
 }
 
-pkg_postinst() {
+eselect_python_update() {
 	local ignored_python_slots
 	[[ "$(eselect python show)" == "python2."* ]] && ignored_python_slots="--ignore 3.0 --ignore 3.1 --ignore 3.2"
 
@@ -289,6 +289,10 @@ pkg_postinst() {
 	eselect python update --ignore 3.0 --ignore 3.1 --ignore 3.2 > /dev/null
 
 	eselect python update ${ignored_python_slots}
+}
+
+pkg_postinst() {
+	eselect_python_update
 
 	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}
@@ -307,13 +311,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	local ignored_python_slots
-	[[ "$(eselect python show)" == "python2."* ]] && ignored_python_slots="--ignore 3.0 --ignore 3.1 --ignore 3.2"
-
-	# Create python2 symlink.
-	eselect python update --ignore 3.0 --ignore 3.1 --ignore 3.2 > /dev/null
-
-	eselect python update ${ignored_python_slots}
+	eselect_python_update
 
 	python_mod_cleanup /usr/lib/python${PYVER}
 	[[ "$(get_libdir)" != "lib" ]] && python_mod_cleanup /usr/$(get_libdir)/python${PYVER}
diff --git a/dev-lang/python/python-3.1.1-r1.ebuild b/dev-lang/python/python-3.1.1-r1.ebuild
index 8c99d9bf24b5..d84afa955597 100644
--- a/dev-lang/python/python-3.1.1-r1.ebuild
+++ b/dev-lang/python/python-3.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-3.1.1-r1.ebuild,v 1.5 2009/09/27 17:56:00 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v 1.6 2009/09/27 18:33:37 arfrever Exp $
 
 EAPI="2"
 
@@ -258,7 +258,7 @@ pkg_preinst() {
 	fi
 }
 
-pkg_postinst() {
+eselect_python_update() {
 	local ignored_python_slots
 	[[ "$(eselect python show)" == "python2."* ]] && ignored_python_slots="--ignore 3.0 --ignore 3.1 --ignore 3.2"
 
@@ -266,6 +266,10 @@ pkg_postinst() {
 	eselect python update > /dev/null
 
 	eselect python update ${ignored_python_slots}
+}
+
+pkg_postinst() {
+	eselect_python_update
 
 	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}
@@ -294,13 +298,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	local ignored_python_slots
-	[[ "$(eselect python show)" == "python2."* ]] && ignored_python_slots="--ignore 3.0 --ignore 3.1 --ignore 3.2"
-
-	# Create python3 symlink.
-	eselect python update > /dev/null
-
-	eselect python update ${ignored_python_slots}
+	eselect_python_update
 
 	python_mod_cleanup /usr/lib/python${PYVER}
 	[[ "$(get_libdir)" != "lib" ]] && python_mod_cleanup /usr/$(get_libdir)/python${PYVER}