sys-apps/portage: Fix usage of python-r1.eclass

(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

11 files changed, 51 insertions, 24 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 88538fa6ab8f..9f14a6a9b468 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,13 @@
 # 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.1302 2013/06/29 04:49:27 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1303 2013/06/30 16:56:34 jlec Exp $
+
+  30 Jun 2013; Justin Lecher <jlec@gentoo.org> portage-2.1.6.7_p1.ebuild,
+  portage-2.1.11.62.ebuild, portage-2.1.12.2.ebuild, portage-2.1.12.10.ebuild,
+  portage-2.1.12.11.ebuild, portage-2.2.0_alpha177.ebuild,
+  portage-2.2.0_alpha185.ebuild, portage-2.2.0_alpha186.ebuild,
+  portage-9999.ebuild, metadata.xml:
+  Fix usage of python-r1.eclass
 
 *portage-2.2.0_alpha186 (29 Jun 2013)
 
diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
index 90e04cd81997..a41f273fa516 100644
--- a/sys-apps/portage/metadata.xml
+++ b/sys-apps/portage/metadata.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<upstream>
-		<bugs-to>mailto:dev-portage@gentoo.org</bugs-to>
-		<changelog>http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=blob_plain;f=RELEASE-NOTES</changelog>
-		<doc>http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3</doc>
-	</upstream>
-	<maintainer><email>dev-portage@gentoo.org</email></maintainer>
-	<use>
-		<flag name="epydoc">Build html API documentation with epydoc.</flag>
-		<flag name="ipc">Use inter-process communication between portage and running ebuilds.</flag>
-		<flag name="less">Pull in sys-apps/less as default pager for etc-update.</flag>
-		<flag name="pypy2_0">Use pypy-c2.0 as Python interpreter.</flag>
-		<flag name="python2">Use python2 as Python interpreter.</flag>
-		<flag name="python3">Use python3 as Python interpreter.</flag>
-	</use>
+  <upstream>
+    <bugs-to>mailto:dev-portage@gentoo.org</bugs-to>
+    <changelog>http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=blob_plain;f=RELEASE-NOTES</changelog>
+    <doc>http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3</doc>
+  </upstream>
+  <maintainer>
+    <email>dev-portage@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="epydoc">Build html API documentation with epydoc.</flag>
+    <flag name="ipc">Use inter-process communication between portage and running ebuilds.</flag>
+    <flag name="less">Pull in sys-apps/less as default pager for etc-update.</flag>
+    <flag name="pypy2_0">Use pypy-c2.0 as Python interpreter.</flag>
+    <flag name="python2">Use python2 as Python interpreter.</flag>
+    <flag name="python3">Use python3 as Python interpreter.</flag>
+  </use>
 </pkgmetadata>
diff --git a/sys-apps/portage/portage-2.1.11.62.ebuild b/sys-apps/portage/portage-2.1.11.62.ebuild
index 45f86c25b4c8..4af5969e9d0a 100644
--- a/sys-apps/portage/portage-2.1.11.62.ebuild
+++ b/sys-apps/portage/portage-2.1.11.62.ebuild
@@ -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.62.ebuild,v 1.10 2013/05/06 21:42:24 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.62.ebuild,v 1.11 2013/06/30 16:56:34 jlec Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -19,6 +19,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~spa
 SLOT="0"
 IUSE="build doc epydoc +ipc linguas_pl linguas_ru pypy2_0 python2 python3 selinux xattr"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 for _pyimpl in ${PYTHON_COMPAT[@]} ; do
 	IUSE+=" python_targets_${_pyimpl}"
 done
diff --git a/sys-apps/portage/portage-2.1.12.10.ebuild b/sys-apps/portage/portage-2.1.12.10.ebuild
index cfe7b2cd75a2..5b1c4075b9fa 100644
--- a/sys-apps/portage/portage-2.1.12.10.ebuild
+++ b/sys-apps/portage/portage-2.1.12.10.ebuild
@@ -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.12.10.ebuild,v 1.1 2013/06/24 21:46:37 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.12.10.ebuild,v 1.2 2013/06/30 16:56:34 jlec Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -19,6 +19,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 SLOT="0"
 IUSE="build doc epydoc +ipc linguas_pl linguas_ru pypy2_0 python2 python3 selinux xattr"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 for _pyimpl in ${PYTHON_COMPAT[@]} ; do
 	IUSE+=" python_targets_${_pyimpl}"
 done
diff --git a/sys-apps/portage/portage-2.1.12.11.ebuild b/sys-apps/portage/portage-2.1.12.11.ebuild
index 21a77271f8cb..48a3b0289273 100644
--- a/sys-apps/portage/portage-2.1.12.11.ebuild
+++ b/sys-apps/portage/portage-2.1.12.11.ebuild
@@ -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.12.11.ebuild,v 1.1 2013/06/29 04:47:50 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.12.11.ebuild,v 1.2 2013/06/30 16:56:33 jlec Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -19,6 +19,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 SLOT="0"
 IUSE="build doc epydoc +ipc linguas_pl linguas_ru pypy2_0 python2 python3 selinux xattr"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 for _pyimpl in ${PYTHON_COMPAT[@]} ; do
 	IUSE+=" python_targets_${_pyimpl}"
 done
diff --git a/sys-apps/portage/portage-2.1.12.2.ebuild b/sys-apps/portage/portage-2.1.12.2.ebuild
index 5cf929952494..cfd6024a5b20 100644
--- a/sys-apps/portage/portage-2.1.12.2.ebuild
+++ b/sys-apps/portage/portage-2.1.12.2.ebuild
@@ -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.12.2.ebuild,v 1.12 2013/06/07 08:29:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.12.2.ebuild,v 1.13 2013/06/30 16:56:34 jlec Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -19,6 +19,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~spa
 SLOT="0"
 IUSE="build doc epydoc +ipc linguas_pl linguas_ru pypy2_0 python2 python3 selinux xattr"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 for _pyimpl in ${PYTHON_COMPAT[@]} ; do
 	IUSE+=" python_targets_${_pyimpl}"
 done
diff --git a/sys-apps/portage/portage-2.1.6.7_p1.ebuild b/sys-apps/portage/portage-2.1.6.7_p1.ebuild
index acb6453a848f..d38dd16b5b37 100644
--- a/sys-apps/portage/portage-2.1.6.7_p1.ebuild
+++ b/sys-apps/portage/portage-2.1.6.7_p1.ebuild
@@ -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.6.7_p1.ebuild,v 1.8 2013/05/12 09:38:08 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.7_p1.ebuild,v 1.9 2013/06/30 16:56:33 jlec Exp $
 
 inherit eutils multilib
 
@@ -11,6 +11,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fb
 SLOT="0"
 IUSE="build doc epydoc less linguas_pl"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 python_dep=">=dev-lang/python-2.4 <dev-lang/python-3"
 
 DEPEND="${python_dep}
diff --git a/sys-apps/portage/portage-2.2.0_alpha177.ebuild b/sys-apps/portage/portage-2.2.0_alpha177.ebuild
index 75b3d8a7e846..772b55fb94cc 100644
--- a/sys-apps/portage/portage-2.2.0_alpha177.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha177.ebuild
@@ -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_alpha177.ebuild,v 1.1 2013/05/24 05:42:57 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha177.ebuild,v 1.2 2013/06/30 16:56:33 jlec Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -19,6 +19,8 @@ KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 SLOT="0"
 IUSE="build doc epydoc +ipc linguas_pl linguas_ru pypy2_0 python2 python3 selinux xattr"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 for _pyimpl in ${PYTHON_COMPAT[@]} ; do
 	IUSE+=" python_targets_${_pyimpl}"
 done
diff --git a/sys-apps/portage/portage-2.2.0_alpha185.ebuild b/sys-apps/portage/portage-2.2.0_alpha185.ebuild
index acf2a6564b33..06b123147e71 100644
--- a/sys-apps/portage/portage-2.2.0_alpha185.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha185.ebuild
@@ -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_alpha185.ebuild,v 1.1 2013/06/24 21:50:02 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha185.ebuild,v 1.2 2013/06/30 16:56:34 jlec Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -19,6 +19,8 @@ KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 SLOT="0"
 IUSE="build doc epydoc +ipc linguas_pl linguas_ru pypy2_0 python2 python3 selinux xattr"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 for _pyimpl in ${PYTHON_COMPAT[@]} ; do
 	IUSE+=" python_targets_${_pyimpl}"
 done
diff --git a/sys-apps/portage/portage-2.2.0_alpha186.ebuild b/sys-apps/portage/portage-2.2.0_alpha186.ebuild
index 064ae6572db0..6e429d9eb570 100644
--- a/sys-apps/portage/portage-2.2.0_alpha186.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha186.ebuild
@@ -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_alpha186.ebuild,v 1.1 2013/06/29 04:49:27 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha186.ebuild,v 1.2 2013/06/30 16:56:34 jlec Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -19,6 +19,8 @@ KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 SLOT="0"
 IUSE="build doc epydoc +ipc linguas_pl linguas_ru pypy2_0 python2 python3 selinux xattr"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 for _pyimpl in ${PYTHON_COMPAT[@]} ; do
 	IUSE+=" python_targets_${_pyimpl}"
 done
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 5d6bef30e14a..b594b4c0a17a 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -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.77 2013/05/16 13:59:27 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.78 2013/06/30 16:56:33 jlec Exp $
 
 EAPI=3
 PYTHON_COMPAT=(
@@ -17,6 +17,8 @@ KEYWORDS=""
 SLOT="0"
 IUSE="build doc epydoc +ipc linguas_ru pypy2_0 python2 python3 selinux xattr"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 for _pyimpl in ${PYTHON_COMPAT[@]} ; do
 	IUSE+=" python_targets_${_pyimpl}"
 done