[gentoo-commits] gentoo-x86 commit in dev-lang/python: python-2.6.2-r2.ebuild python-3.1.1-r1.ebuild python-2.5.4-r3.ebuild python-2.4.6.ebuild

[Arfrever Frehtes Taifersar Arahesis (arfrever)]

arfrever    09/09/27 18:33:38

  Modified:             python-2.6.2-r2.ebuild python-3.1.1-r1.ebuild
                        python-2.5.4-r3.ebuild python-2.4.6.ebuild
  Log:
  Don't duplicate code.
  (Portage version: 14444-svn/cvs/Linux x86_64)

Revision  Changes    Path
1.6                  dev-lang/python/python-2.6.2-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.6.2-r2.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.6.2-r2.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.6.2-r2.ebuild?r1=1.5&r2=1.6

Index: python-2.6.2-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.2-r2.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-2.6.2-r2.ebuild	27 Sep 2009 17:56:00 -0000	1.5
+++ python-2.6.2-r2.ebuild	27 Sep 2009 18:33:37 -0000	1.6
@@ -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 @@
 	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 @@
 	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_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}



1.6                  dev-lang/python/python-3.1.1-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild?r1=1.5&r2=1.6

Index: python-3.1.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-3.1.1-r1.ebuild	27 Sep 2009 17:56:00 -0000	1.5
+++ python-3.1.1-r1.ebuild	27 Sep 2009 18:33:37 -0000	1.6
@@ -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 @@
 	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 @@
 	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_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}



1.20                 dev-lang/python/python-2.5.4-r3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.5.4-r3.ebuild?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.5.4-r3.ebuild?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.5.4-r3.ebuild?r1=1.19&r2=1.20

Index: python-2.5.4-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r3.ebuild,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- python-2.5.4-r3.ebuild	27 Sep 2009 17:56:00 -0000	1.19
+++ python-2.5.4-r3.ebuild	27 Sep 2009 18:33:37 -0000	1.20
@@ -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 @@
 	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 @@
 	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_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}



1.18                 dev-lang/python/python-2.4.6.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.4.6.ebuild?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.4.6.ebuild?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.4.6.ebuild?r1=1.17&r2=1.18

Index: python-2.4.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- python-2.4.6.ebuild	27 Sep 2009 17:56:00 -0000	1.17
+++ python-2.4.6.ebuild	27 Sep 2009 18:33:37 -0000	1.18
@@ -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 @@
 	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 @@
 	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_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}