[gentoo-commits] gentoo-x86 commit in dev-lang/python: ChangeLog python-2.6.6-r1.ebuild

[Jorge Manuel B. S. Vicetto (jmbsvicetto)]

jmbsvicetto    11/01/01 18:24:05

  Modified:             ChangeLog python-2.6.6-r1.ebuild
  Log:
  Non-maintainer commit.
  Reverting commit that broke stage generation for python-2.6.6-r1 as it wasn't reverted before - bug 347867.
  This commit was accepted by Arfrever
  
  (Portage version: 2.2.0_alpha11/cvs/Linux x86_64)

Revision  Changes    Path
1.514                dev-lang/python/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/ChangeLog?rev=1.514&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/ChangeLog?rev=1.514&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/ChangeLog?r1=1.513&r2=1.514

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v
retrieving revision 1.513
retrieving revision 1.514
diff -u -r1.513 -r1.514
--- ChangeLog	29 Dec 2010 16:21:36 -0000	1.513
+++ ChangeLog	1 Jan 2011 18:24:05 -0000	1.514
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/python
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.513 2010/12/29 16:21:36 hwoarang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.514 2011/01/01 18:24:05 jmbsvicetto Exp $
+
+  01 Jan 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o>
+  python-2.6.6-r1.ebuild:
+  Non-maintainer commit.
+  Reverting commit that broke stage generation for python-2.6.6-r1 as it wasn't
+  reverted before - bug 347867.
+  This commit was accepted by Arfrever.
 
   29 Dec 2010; Markos Chandras <hwoarang@g.o> python-2.6.6-r1.ebuild:
   Stable on amd64 wrt bug #342927



1.12                 dev-lang/python/python-2.6.6-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.6.6-r1.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.6.6-r1.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.6.6-r1.ebuild?r1=1.11&r2=1.12

Index: python-2.6.6-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.6-r1.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- python-2.6.6-r1.ebuild	29 Dec 2010 16:21:36 -0000	1.11
+++ python-2.6.6-r1.ebuild	1 Jan 2011 18:24:05 -0000	1.12
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.6-r1.ebuild,v 1.11 2010/12/29 16:21:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.6-r1.ebuild,v 1.12 2011/01/01 18:24:05 jmbsvicetto Exp $
 
 EAPI="2"
 
@@ -272,48 +272,24 @@
 	rmdir "${ED}$(python_get_libdir)/lib-old"
 }
 
-save_active_python_version() {
-	active_python_2=$(eselect python show --python2)
-	active_python_3=$(eselect python show --python3)
-	active_python_main=$(eselect python show)
-}
-
-restore_active_python_version() {
-	if [[ -n "${active_python_2}" &&
-			"${active_python_2}" != $(eselect python show --python2) ]] ; then
-		einfo "Restoring active Python 2.x interpreter: ${active_python_2}"
-		eselect python set --python2 "${active_python_2}"
-	fi
-	if [[ -n "${active_python_3}" &&
-			"${active_python_3}" != $(eselect python show --python3) ]] ; then
-		einfo "Restoring active Python 3.x interpreter: ${active_python_3}"
-		eselect python set --python3 "${active_python_3}"
-	fi
-
-	if [[ -n "${active_python_main}" &&
-			"${active_python_main}" != $(eselect python show) ]] ; then
-		einfo "Restoring main active Python interpreter: ${active_python_main}"
-		eselect python set "${active_python_main}"
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.6" && ! has_version "${CATEGORY}/${PN}:2.7"; then
+		python_updater_warning="1"
 	fi
 }
 
-ensure_python_symlink() {
-	if [[ -z "$(eselect python show --python${PV%%.*})" ]]; then
-		eselect python update --python${PV%%.*}
-	fi
-}
+eselect_python_update() {
+	local eselect_python_options
+	[[ "$(eselect python show)" == "python2."* ]] && eselect_python_options="--python2"
 
-pkg_preinst() {
-	save_active_python_version
+	# Create python2 symlink.
+	eselect python update --python2 > /dev/null
 
-	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.6" && ! has_version "${CATEGORY}/${PN}:2.7"; then
-		python_updater_warning="1"
-	fi
+	eselect python update ${eselect_python_options}
 }
 
 pkg_postinst() {
-	restore_active_python_version
-	ensure_python_symlink
+	eselect_python_update
 
 	python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir)
 
@@ -331,7 +307,7 @@
 }
 
 pkg_postrm() {
-	ensure_python_symlink
+	eselect_python_update
 
 	python_mod_cleanup $(python_get_libdir)
-}
+}
\ No newline at end of file