* [gentoo-commits] gentoo-x86 commit in app-admin/eselect-python: eselect-python-20140115.ebuild eselect-python-99999999.ebuild ChangeLog
@ 2014-01-19 8:52 Mike Gilbert (floppym)
0 siblings, 0 replies; only message in thread
From: Mike Gilbert (floppym) @ 2014-01-19 8:52 UTC (permalink / raw
To: gentoo-commits
floppym 14/01/19 08:52:48
Modified: eselect-python-20140115.ebuild
eselect-python-99999999.ebuild ChangeLog
Log:
Tidy up RDEPEND. Don't call eselect python update when python is not installed, bug 380567.
(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Revision Changes Path
1.2 app-admin/eselect-python/eselect-python-20140115.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-python/eselect-python-20140115.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-python/eselect-python-20140115.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-python/eselect-python-20140115.ebuild?r1=1.1&r2=1.2
Index: eselect-python-20140115.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-20140115.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eselect-python-20140115.ebuild 19 Jan 2014 01:59:20 -0000 1.1
+++ eselect-python-20140115.ebuild 19 Jan 2014 08:52:48 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-20140115.ebuild,v 1.1 2014/01/19 01:59:20 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-20140115.ebuild,v 1.2 2014/01/19 08:52:48 floppym Exp $
# Keep the EAPI low here because everything else depends on it.
# We want to make upgrading simpler.
@@ -22,12 +22,6 @@
IUSE=""
RDEPEND=">=app-admin/eselect-1.2.3"
-# Avoid autotool deps for released versions for circ dep issues.
-if [[ ${PV} == "99999999" ]] ; then
- DEPEND="sys-devel/autoconf"
-else
- DEPEND=""
-fi
src_unpack() {
if [[ ${PV} == "99999999" ]] ; then
@@ -45,9 +39,13 @@
}
pkg_postinst() {
- local ret=0
- ebegin "Running 'eselect python update'"
- eselect python update --python2 --if-unset || ret=1
- eselect python update --python3 --if-unset || ret=1
- eend ${ret}
+ if has_version 'dev-lang/python'; then
+ eselect python update --if-unset
+ fi
+ if has_version '=dev-lang/python2*'; then
+ eselect python update --python2 --if-unset
+ fi
+ if has_version '=dev-lang/python3*'; then
+ eselect python update --python3 --if-unset
+ fi
}
1.12 app-admin/eselect-python/eselect-python-99999999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-python/eselect-python-99999999.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-python/eselect-python-99999999.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-python/eselect-python-99999999.ebuild?r1=1.11&r2=1.12
Index: eselect-python-99999999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-99999999.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- eselect-python-99999999.ebuild 18 Jan 2014 05:30:07 -0000 1.11
+++ eselect-python-99999999.ebuild 19 Jan 2014 08:52:48 -0000 1.12
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-99999999.ebuild,v 1.11 2014/01/18 05:30:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-99999999.ebuild,v 1.12 2014/01/19 08:52:48 floppym Exp $
# Keep the EAPI low here because everything else depends on it.
# We want to make upgrading simpler.
@@ -22,12 +22,6 @@
IUSE=""
RDEPEND=">=app-admin/eselect-1.2.3"
-# Avoid autotool deps for released versions for circ dep issues.
-if [[ ${PV} == "99999999" ]] ; then
- DEPEND="sys-devel/autoconf"
-else
- DEPEND=""
-fi
src_unpack() {
if [[ ${PV} == "99999999" ]] ; then
@@ -45,9 +39,13 @@
}
pkg_postinst() {
- local ret=0
- ebegin "Running 'eselect python update'"
- eselect python update --python2 --if-unset || ret=1
- eselect python update --python3 --if-unset || ret=1
- eend ${ret}
+ if has_version 'dev-lang/python'; then
+ eselect python update --if-unset
+ fi
+ if has_version '=dev-lang/python2*'; then
+ eselect python update --python2 --if-unset
+ fi
+ if has_version '=dev-lang/python3*'; then
+ eselect python update --python3 --if-unset
+ fi
}
1.82 app-admin/eselect-python/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-python/ChangeLog?rev=1.82&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-python/ChangeLog?rev=1.82&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-python/ChangeLog?r1=1.81&r2=1.82
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/eselect-python/ChangeLog,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- ChangeLog 19 Jan 2014 01:59:20 -0000 1.81
+++ ChangeLog 19 Jan 2014 08:52:48 -0000 1.82
@@ -1,6 +1,11 @@
# ChangeLog for app-admin/eselect-python
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/ChangeLog,v 1.81 2014/01/19 01:59:20 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/ChangeLog,v 1.82 2014/01/19 08:52:48 floppym Exp $
+
+ 19 Jan 2014; Mike Gilbert <floppym@gentoo.org> eselect-python-20140115.ebuild,
+ eselect-python-99999999.ebuild:
+ Tidy up RDEPEND. Don't call eselect python update when python is not
+ installed, bug 380567.
*eselect-python-20140115 (19 Jan 2014)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-01-19 8:52 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-19 8:52 [gentoo-commits] gentoo-x86 commit in app-admin/eselect-python: eselect-python-20140115.ebuild eselect-python-99999999.ebuild ChangeLog Mike Gilbert (floppym)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox