* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-2.1.11.60.ebuild portage-2.2.0_alpha171.ebuild portage-9999.ebuild ChangeLog
@ 2013-04-04 17:45 Zac Medico (zmedico)
0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2013-04-04 17:45 UTC (permalink / raw
To: gentoo-commits
zmedico 13/04/04 17:45:27
Modified: portage-2.1.11.60.ebuild
portage-2.2.0_alpha171.ebuild portage-9999.ebuild
ChangeLog
Log:
Tolerate --nodeps at beginning of stage1 for catalyst.
(Portage version: 2.2.0_alpha171/cvs/Linux i686, signed Manifest commit with key 0xFDE8EF85AE5719A3)
Revision Changes Path
1.2 sys-apps/portage/portage-2.1.11.60.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.11.60.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.11.60.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.11.60.ebuild?r1=1.1&r2=1.2
Index: portage-2.1.11.60.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.60.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- portage-2.1.11.60.ebuild 1 Apr 2013 18:54:33 -0000 1.1
+++ portage-2.1.11.60.ebuild 4 Apr 2013 17:45:27 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.60.ebuild,v 1.1 2013/04/01 18:54:33 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.60.ebuild,v 1.2 2013/04/04 17:45:27 zmedico Exp $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
@@ -324,6 +324,12 @@
local impl files mod_dir dest_mod_dir python relative_path x
for impl in "${PYTHON_COMPAT[@]}" ; do
use "python_targets_${impl}" || continue
+ if use build && [[ ${ROOT} == / &&
+ ! -x /usr/bin/$(get_python_interpreter ${impl}) ]] ; then
+ # Tolerate --nodeps at beginning of stage1 for catalyst
+ ewarn "skipping python_targets_${impl}, interpreter not found"
+ continue
+ fi
while read -r mod_dir ; do
cd "${D}/usr/lib/portage/pym/${mod_dir}" || die
files=$(echo *.py)
1.2 sys-apps/portage/portage-2.2.0_alpha171.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha171.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha171.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha171.ebuild?r1=1.1&r2=1.2
Index: portage-2.2.0_alpha171.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha171.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- portage-2.2.0_alpha171.ebuild 1 Apr 2013 18:56:46 -0000 1.1
+++ portage-2.2.0_alpha171.ebuild 4 Apr 2013 17:45:27 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha171.ebuild,v 1.1 2013/04/01 18:56:46 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha171.ebuild,v 1.2 2013/04/04 17:45:27 zmedico Exp $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
@@ -357,6 +357,12 @@
local impl files mod_dir dest_mod_dir python relative_path x
for impl in "${PYTHON_COMPAT[@]}" ; do
use "python_targets_${impl}" || continue
+ if use build && [[ ${ROOT} == / &&
+ ! -x ${EPREFIX}/usr/bin/$(get_python_interpreter ${impl}) ]] ; then
+ # Tolerate --nodeps at beginning of stage1 for catalyst
+ ewarn "skipping python_targets_${impl}, interpreter not found"
+ continue
+ fi
while read -r mod_dir ; do
cd "${ED}/usr/lib/portage/pym/${mod_dir}" || die
files=$(echo *.py)
1.74 sys-apps/portage/portage-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.74&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.74&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.73&r2=1.74
Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- portage-9999.ebuild 26 Mar 2013 05:17:45 -0000 1.73
+++ portage-9999.ebuild 4 Apr 2013 17:45:27 -0000 1.74
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.73 2013/03/26 05:17:45 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.74 2013/04/04 17:45:27 zmedico Exp $
EAPI=3
PYTHON_COMPAT=(
@@ -335,6 +335,12 @@
local impl files mod_dir dest_mod_dir python relative_path x
for impl in "${PYTHON_COMPAT[@]}" ; do
use "python_targets_${impl}" || continue
+ if use build && [[ ${ROOT} == / &&
+ ! -x ${EPREFIX}/usr/bin/$(get_python_interpreter ${impl}) ]] ; then
+ # Tolerate --nodeps at beginning of stage1 for catalyst
+ ewarn "skipping python_targets_${impl}, interpreter not found"
+ continue
+ fi
while read -r mod_dir ; do
cd "${ED}/usr/lib/portage/pym/${mod_dir}" || die
files=$(echo *.py)
1.1245 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1245&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1245&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1244&r2=1.1245
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.1244
retrieving revision 1.1245
diff -u -r1.1244 -r1.1245
--- ChangeLog 4 Apr 2013 00:12:57 -0000 1.1244
+++ ChangeLog 4 Apr 2013 17:45:27 -0000 1.1245
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1244 2013/04/04 00:12:57 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1245 2013/04/04 17:45:27 zmedico Exp $
+
+ 04 Apr 2013; Zac Medico <zmedico@gentoo.org> portage-2.1.11.60.ebuild,
+ portage-2.2.0_alpha171.ebuild, portage-9999.ebuild:
+ Tolerate --nodeps at beginning of stage1 for catalyst.
04 Apr 2013; Zac Medico <zmedico@gentoo.org> -portage-2.1.11.59.ebuild,
-portage-2.2.0_alpha170.ebuild:
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-04-04 17:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-04 17:45 [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-2.1.11.60.ebuild portage-2.2.0_alpha171.ebuild portage-9999.ebuild ChangeLog Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox