Update install-xatrr deps

(Portage version: 2.2.11/cvs/Linux x86_64, signed Manifest commit with key 0x65E309F2189DB0B8)

3 files changed, 21 insertions, 17 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index f17d6d3bf973..a1f5b80f2aa6 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1400 2014/08/04 16:10:11 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1401 2014/08/04 16:58:23 dolsen Exp $
+
+*portage-2.2.11-r1 (04 Aug 2014)
+
+  04 Aug 2014; Brian Dolbec <dolsen@gentoo.org> -portage-2.2.11.ebuild,
+  +portage-2.2.11-r1.ebuild, portage-9999.ebuild:
+  Fix the missed new sys-apps/install-xattr dep, remove python-2.6 dep in
+  2.2.11.
 
   04 Aug 2014; Rick Farina <zerochaos@gentoo.org> portage-2.2.11.ebuild,
   portage-9999.ebuild:
diff --git a/sys-apps/portage/portage-2.2.11.ebuild b/sys-apps/portage/portage-2.2.11-r1.ebuild
index ec4a6b2f9f48..231f29bb97e3 100644
--- a/sys-apps/portage/portage-2.2.11.ebuild
+++ b/sys-apps/portage/portage-2.2.11-r1.ebuild
@@ -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/sys-apps/portage/portage-2.2.11.ebuild,v 1.2 2014/08/04 16:10:11 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.11-r1.ebuild,v 1.1 2014/08/04 16:58:23 dolsen Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -8,7 +8,7 @@ EAPI=2
 PYTHON_COMPAT=(
 	pypy
 	python3_2 python3_3 python3_4
-	python2_6 python2_7
+	python2_7
 )
 inherit eutils multilib
 
@@ -24,21 +24,18 @@ for _pyimpl in ${PYTHON_COMPAT[@]} ; do
 done
 unset _pyimpl
 
-# Import of the io module in python-2.6 raises ImportError for the
-# thread module if threading is disabled.
 python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
 	!pypy? ( !python2? ( !python3? (
-		|| ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
+		>=dev-lang/python-2.7[ssl]
 	) ) )
 	pypy? ( !python2? ( !python3? ( virtual/pypy:0[bzip2] ) ) )
-	python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )"
+	python2? ( !python3? ( dev-lang/python:2.7[ssl] ) )"
 python_dep="${python_dep_ssl//\[ssl\]}"
 python_dep="${python_dep//,ssl}"
 python_dep="${python_dep//ssl,}"
 
 python_dep="${python_dep}
 	python_targets_pypy? ( virtual/pypy:0 )
-	python_targets_python2_6? ( dev-lang/python:2.6 )
 	python_targets_python2_7? ( dev-lang/python:2.7 )
 	python_targets_python3_2? ( dev-lang/python:3.2 )
 	python_targets_python3_3? ( dev-lang/python:3.3 )
@@ -71,10 +68,10 @@ RDEPEND="${python_dep}
 	>=app-misc/pax-utils-0.1.17
 	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
 	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(for python_impl in python{2_6,2_7,3_2} pypy; do
-			echo "python_targets_${python_impl}? ( dev-python/pyxattr[python_targets_${python_impl}] )"
-		done) ) )
+		|| ( >=sys-apps/install-xattr-0.3
+			$(for python_impl in python{2_7,3_2} pypy; do
+				echo "python_targets_${python_impl}? ( dev-python/pyxattr[python_targets_${python_impl}] )"
+			done) ) ) )
 	!<app-shells/bash-3.2_p17
 	!<app-admin/logrotate-3.8.0"
 PDEPEND="
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 0b17ac3b3cf1..7adfcf510ff6 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -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/sys-apps/portage/portage-9999.ebuild,v 1.97 2014/08/04 16:10:11 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.98 2014/08/04 16:58:23 dolsen Exp $
 
 EAPI=3
 PYTHON_COMPAT=(
@@ -65,10 +65,10 @@ RDEPEND="${python_dep}
 	>=app-misc/pax-utils-0.1.17
 	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
 	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(for python_impl in python{2_7,3_2} pypy; do
-			echo "python_targets_${python_impl}? ( dev-python/pyxattr[python_targets_${python_impl}] )"
-		done) ) )
+		|| ( >=sys-apps/install-xattr-0.3
+			$(for python_impl in python{2_7,3_2} pypy; do
+				echo "python_targets_${python_impl}? ( dev-python/pyxattr[python_targets_${python_impl}] )"
+			done) ) ) )
 	!<app-shells/bash-3.2_p17
 	!<app-admin/logrotate-3.8.0"
 PDEPEND="