summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-06-07 01:07:37 +0000
committerZac Medico <zmedico@gentoo.org>2011-06-07 01:07:37 +0000
commit0cc79347b44dc7944c940b80bc49ef44217638e3 (patch)
treec7006d2b93f9a692edc4b24b9d441633f83bc2c5 /sys-apps
parentFixes for bug #367629 (diff)
downloadhistorical-0cc79347b44dc7944c940b80bc49ef44217638e3.tar.gz
historical-0cc79347b44dc7944c940b80bc49ef44217638e3.tar.bz2
historical-0cc79347b44dc7944c940b80bc49ef44217638e3.zip
Bug #370295 - Pull in less as pager for etc-update, so --depclean doesn't remove it due to virtual/pager being satisfied by more from util-linux.
Package-Manager: portage-2.2.0_alpha38/cvs/Linux i686
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/portage/ChangeLog9
-rw-r--r--sys-apps/portage/Manifest26
-rw-r--r--sys-apps/portage/metadata.xml1
-rw-r--r--sys-apps/portage/portage-2.1.10.ebuild5
-rw-r--r--sys-apps/portage/portage-2.1.6.13.ebuild5
-rw-r--r--sys-apps/portage/portage-2.1.6.7.ebuild5
-rw-r--r--sys-apps/portage/portage-2.1.9.42.ebuild5
-rw-r--r--sys-apps/portage/portage-2.1.9.50.ebuild5
-rw-r--r--sys-apps/portage/portage-2.2.0_alpha37.ebuild5
-rw-r--r--sys-apps/portage/portage-2.2.0_alpha38.ebuild5
-rw-r--r--sys-apps/portage/portage-9999.ebuild5
11 files changed, 46 insertions, 30 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 75c6917305e6..b2daa7f5e868 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.832 2011/06/06 12:57:43 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.833 2011/06/07 01:07:37 zmedico Exp $
+
+ 07 Jun 2011; Zac Medico <zmedico@gentoo.org> portage-2.1.6.7.ebuild,
+ portage-2.1.6.13.ebuild, portage-2.1.9.42.ebuild, portage-2.1.9.50.ebuild,
+ portage-2.1.10.ebuild, portage-2.2.0_alpha37.ebuild,
+ portage-2.2.0_alpha38.ebuild, portage-9999.ebuild, metadata.xml:
+ Bug #370295 - Pull in less as pager for etc-update, so --depclean doesn't
+ remove it due to virtual/pager being satisfied by more from util-linux.
*portage-2.2.0_alpha38 (06 Jun 2011)
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index cf6d5ebe6f0e..0fec1640caf5 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -12,20 +12,20 @@ DIST portage-2.2.0_alpha34.tar.bz2 813056 RMD160 5c8e515b471faa603181dfb6cb80680
DIST portage-2.2.0_alpha37.patch.bz2 25655 RMD160 4e3cc944f72cd1834e2c6773b1d1565ca4797d86 SHA1 816c2dabf039e46700cf43a20304b67364780731 SHA256 0206bebbc51cefd3a9ece7b68c23f7d45df394c57b58ea93379df56785b5a03b
DIST portage-2.2.0_alpha38.tar.bz2 829248 RMD160 7da4f5e191ea30c7b5fff0fee7df85df4855a13a SHA1 4b8807f7d83555dd7351e030762f9318a5ac75b9 SHA256 6e06098c74b38ece93d7c12a469db57872d3dc5aa5a7a495cc9c3e9efb4474c9
DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
-EBUILD portage-2.1.10.ebuild 10252 RMD160 468f3524d29a9030571e6c56899d51aff6eaaea3 SHA1 5279063c069851bc1e85cb7d68482e3e9226e374 SHA256 eb3c873cfd1a73af7e5b5c28d222aded9e3dae89b94c96f3b63096147bfb9c86
-EBUILD portage-2.1.6.13.ebuild 9998 RMD160 536d6829c9e328726b9c78aa042cc3a6f2004157 SHA1 393a2d99780af1f8c9962f0255a41c9ce2699fc4 SHA256 fdc0a2f7595235f0378fc15b6d40b47ddae5cb8b9bbf6c4b5081d44cd3ad4b3f
-EBUILD portage-2.1.6.7.ebuild 8650 RMD160 22340c6b11a4c01a55a234810c50a2e1365de184 SHA1 b56a15fd723a1869809efda3bcd421fb497357d9 SHA256 f2fa83030914d74f104367beb910fdab665d51cc0e9087dfe967b35eee6e371c
-EBUILD portage-2.1.9.42.ebuild 10242 RMD160 0dd7a631c0a3c92b862c5f13f3ff3ee3cd4c4251 SHA1 be2275c866a3c478bae9fba7b0bca8f01dd6df00 SHA256 6af1c9d99df60746a22d8f9987b22ffa2443a462f0e1f3d73f27b4a52ef06339
-EBUILD portage-2.1.9.50.ebuild 10254 RMD160 cef0b9af6abf5dc3fd1ec6631ac33d80ff47d36b SHA1 bc3a1e198ee892b894af3f2eaea7abf1f56ff850 SHA256 0c20b8798a604025933f8b9615a3cdf27b27eb6397c34669cc56f85286332033
-EBUILD portage-2.2.0_alpha37.ebuild 12016 RMD160 608f0e65e017e09c496363abee381c2efcbc2dd7 SHA1 0801c8854cfe45c3c2a61d4bc4feac961640a285 SHA256 502a4e422a7d7d1bdc963d148907ce994179d96c8d5936f0cb2d80ac779fdad5
-EBUILD portage-2.2.0_alpha38.ebuild 12016 RMD160 50123055665675ca4088b613702128eda7d662d0 SHA1 9df6cf14e8648464920954841a7e3222169c9c50 SHA256 42d15e11f4585c7f33e44a233cd70422b117784f2504650a4c1fc96b8e9f330a
-EBUILD portage-9999.ebuild 11238 RMD160 a57615c31dd306c3dc55448f71f3da6a87af356b SHA1 1d18f22cb2da7b2deb8392f76edf001767d8655c SHA256 6dcd490cf6accead6838aa93baef113fe30ea4b165781cc02827e4d6bc4a657e
-MISC ChangeLog 31063 RMD160 38ef301c37ba209d5886b46cc296a6c07a211bff SHA1 96e6400e2be030d97df19482be9c05f2bf983de3 SHA256 7432d7a6890f300f7d83a0f074484b888ade673262991a0f68a6e62bcede395e
-MISC metadata.xml 724 RMD160 becdb078c637d12e9d7402cd9297a942c657717e SHA1 ce260048be905d15470185ad22ee57a192f561a6 SHA256 371fa80623857d4e03f85fb64bc58570a4ec030e6376ea2e8d1232b6aa3ebc44
+EBUILD portage-2.1.10.ebuild 10283 RMD160 a81d921ddbab6165efa17a7b14f8febc6a6c0f20 SHA1 ad9b340cb904f20667271b8dbc8f96875cdeb723 SHA256 36ed28f78c97d1e927509a9794b25dcf639c7b6ca87d9bf3a43b3cdaa668215d
+EBUILD portage-2.1.6.13.ebuild 10029 RMD160 026d55c5c3183ce1d0258a79aed951aa5b02e792 SHA1 e5605d9322cbea6898f8d6dd629ec70aa811408f SHA256 fe647160413bb0bb44475bc025d7fd0a057a537f9b229405499119dabb818e9c
+EBUILD portage-2.1.6.7.ebuild 8680 RMD160 923e1bf11fffd7b396a174cc9059d8a20ed281b4 SHA1 ea2ceb87bf84cf21be5eb46e96ab8522e7fa07d5 SHA256 405ee4e6935eaf5f34553ba296f3465d589599db2eaec9a70c09da3d422f5841
+EBUILD portage-2.1.9.42.ebuild 10273 RMD160 b5b465de35067df754be4e380adbfd3818c382b4 SHA1 ee7ab18b0b8b245afbb99f7df5fb8a21ab9072bd SHA256 dabb5f1d84805370df1fbe02bc308f25101095d1ad99fdbbd769eb1d762584c2
+EBUILD portage-2.1.9.50.ebuild 10285 RMD160 1fdbeacacb63afa5578a2762cc513a07679e87b3 SHA1 e189b007a32c528f27f8c67ee289b9c42271b1a1 SHA256 ab491d24d30c8c636bf970d209a624c3ba19cc132b0f5dd0c698eee59918a689
+EBUILD portage-2.2.0_alpha37.ebuild 12047 RMD160 17cdc5f30bc4773a050ac55af12924a098d82bbd SHA1 4b2d8e9f227e7483b0fec014e0737e0854da7eec SHA256 36f100ff562d497769ee72f4919b5bf7d8addf7cba324261b2350f3659024262
+EBUILD portage-2.2.0_alpha38.ebuild 12047 RMD160 c91d9cf937538fb9c75fef8898fe96ffdf6bea04 SHA1 002dc87cf898fce8de6c5b4aa80898cd10020e52 SHA256 565a5a58ba08a560ce80733d6e131a2de8f65cdc26beb0c03838b426eecaa62d
+EBUILD portage-9999.ebuild 11269 RMD160 23e62593c09baba003216b1e4c3783335d2388db SHA1 dcce6d9e58d8e8c9791944b4029690c3ddc9d7b0 SHA256 993d5263622bb623fce3e50fcac9547012cf70d022f854b8dce9baa6d5705baf
+MISC ChangeLog 31484 RMD160 473f66994b170766dc4b2b8ef839abb8c3d593ce SHA1 362902ead8e89c383e5725ad0163da3966b9fe2c SHA256 c0b8c1d64f775ca4b213b2d9047fbb2c4f145f7880b3973e4f682b8f57e8f681
+MISC metadata.xml 806 RMD160 511095d817e35ffce10ea738cc401176c9346caa SHA1 d25de76c2eaaab4a4b84191e7f33893bee81370d SHA256 cc5f451325114cd24263899ca84010c02700de03e21fe413661178a9431962d9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk3szscACgkQ/ejvha5XGaORowCdEWXW/DetPlFZTp/K4XmMNy3y
-Gv8An1g4Q6rLfjipJx8FtUa25IcelviF
-=Gg9/
+iEYEARECAAYFAk3tedsACgkQ/ejvha5XGaPglACg9MFGULIExXz66ZTNChVDf5zy
+KbsAoK0RYw//WmNheIpoHojvLHqTXV9y
+=jT86
-----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
index dbcbf61f54c5..90f50868c9a1 100644
--- a/sys-apps/portage/metadata.xml
+++ b/sys-apps/portage/metadata.xml
@@ -10,6 +10,7 @@
<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="python2">Use python2 as Python interpreter.</flag>
<flag name="python3">Use python3 as Python interpreter.</flag>
</use>
diff --git a/sys-apps/portage/portage-2.1.10.ebuild b/sys-apps/portage/portage-2.1.10.ebuild
index f8cdd1c70033..e73e1b919796 100644
--- a/sys-apps/portage/portage-2.1.10.ebuild
+++ b/sys-apps/portage/portage-2.1.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.10.ebuild,v 1.1 2011/06/06 12:57:43 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.10.ebuild,v 1.2 2011/06/07 01:07:37 zmedico Exp $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
LICENSE="GPL-2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl python2 python3 selinux"
+IUSE="build doc epydoc +ipc +less linguas_pl python2 python3 selinux"
python_dep="python3? ( =dev-lang/python-3* )
!python2? ( !python3? (
@@ -34,6 +34,7 @@ RDEPEND="${python_dep}
elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
elibc_glibc? ( >=sys-apps/sandbox-1.6 )
elibc_uclibc? ( >=sys-apps/sandbox-1.6 )
+ less? ( sys-apps/less )
>=app-misc/pax-utils-0.1.17
selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
!<app-shells/bash-3.2_p17"
diff --git a/sys-apps/portage/portage-2.1.6.13.ebuild b/sys-apps/portage/portage-2.1.6.13.ebuild
index bcb29a5e927b..a42a123158fa 100644
--- a/sys-apps/portage/portage-2.1.6.13.ebuild
+++ b/sys-apps/portage/portage-2.1.6.13.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.13.ebuild,v 1.21 2011/04/09 22:34:01 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.13.ebuild,v 1.22 2011/06/07 01:07:37 zmedico Exp $
# EAPI 1 since python-2.5 is also EAPI 1.
EAPI=1
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
LICENSE="GPL-2"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
SLOT="0"
-IUSE="build doc epydoc selinux linguas_pl"
+IUSE="build doc epydoc +less selinux linguas_pl"
python_dep="|| ( dev-lang/python:2.5 <dev-lang/python-2.6.6:2.6 )"
@@ -28,6 +28,7 @@ RDEPEND="${python_dep}
elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
elibc_glibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) )
elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) )
+ less? ( sys-apps/less )
>=app-misc/pax-utils-0.1.17
selinux? ( >=dev-python/python-selinux-2.16 )
!>=dev-util/debugedit-4.4.6-r2"
diff --git a/sys-apps/portage/portage-2.1.6.7.ebuild b/sys-apps/portage/portage-2.1.6.7.ebuild
index d0e97301eb92..0cc6b8f9fbee 100644
--- a/sys-apps/portage/portage-2.1.6.7.ebuild
+++ b/sys-apps/portage/portage-2.1.6.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.ebuild,v 1.20 2011/04/09 22:34:01 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.7.ebuild,v 1.21 2011/06/07 01:07:37 zmedico Exp $
inherit eutils multilib python
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
LICENSE="GPL-2"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
SLOT="0"
-IUSE="build doc epydoc selinux linguas_pl"
+IUSE="build doc epydoc less selinux linguas_pl"
python_dep=">=dev-lang/python-2.4 <dev-lang/python-2.6.6"
@@ -26,6 +26,7 @@ RDEPEND="${python_dep}
elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
elibc_glibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) )
elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) )
+ less? ( sys-apps/less )
>=app-misc/pax-utils-0.1.17
selinux? ( >=dev-python/python-selinux-2.16 )
!>=dev-util/debugedit-4.4.6-r2"
diff --git a/sys-apps/portage/portage-2.1.9.42.ebuild b/sys-apps/portage/portage-2.1.9.42.ebuild
index a040640bea79..e7ae58942fad 100644
--- a/sys-apps/portage/portage-2.1.9.42.ebuild
+++ b/sys-apps/portage/portage-2.1.9.42.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.9.42.ebuild,v 1.8 2011/04/09 22:34:01 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.9.42.ebuild,v 1.9 2011/06/07 01:07:37 zmedico Exp $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
LICENSE="GPL-2"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl python2 python3 selinux"
+IUSE="build doc epydoc +ipc +less linguas_pl python2 python3 selinux"
python_dep="python3? ( =dev-lang/python-3* )
!python2? ( !python3? (
@@ -34,6 +34,7 @@ RDEPEND="${python_dep}
elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
elibc_glibc? ( >=sys-apps/sandbox-1.6 )
elibc_uclibc? ( >=sys-apps/sandbox-1.6 )
+ less? ( sys-apps/less )
>=app-misc/pax-utils-0.1.17
selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
!<app-shells/bash-3.2_p17"
diff --git a/sys-apps/portage/portage-2.1.9.50.ebuild b/sys-apps/portage/portage-2.1.9.50.ebuild
index 2f056b30c79e..a85e3a87bfc6 100644
--- a/sys-apps/portage/portage-2.1.9.50.ebuild
+++ b/sys-apps/portage/portage-2.1.9.50.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.9.50.ebuild,v 1.1 2011/05/27 04:54:14 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.9.50.ebuild,v 1.2 2011/06/07 01:07:37 zmedico Exp $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
LICENSE="GPL-2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl python2 python3 selinux"
+IUSE="build doc epydoc +ipc +less linguas_pl python2 python3 selinux"
python_dep="python3? ( =dev-lang/python-3* )
!python2? ( !python3? (
@@ -34,6 +34,7 @@ RDEPEND="${python_dep}
elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
elibc_glibc? ( >=sys-apps/sandbox-1.6 )
elibc_uclibc? ( >=sys-apps/sandbox-1.6 )
+ less? ( sys-apps/less )
>=app-misc/pax-utils-0.1.17
selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
!<app-shells/bash-3.2_p17"
diff --git a/sys-apps/portage/portage-2.2.0_alpha37.ebuild b/sys-apps/portage/portage-2.2.0_alpha37.ebuild
index a7e5dc7bc270..69819578803e 100644
--- a/sys-apps/portage/portage-2.2.0_alpha37.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha37.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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_alpha37.ebuild,v 1.1 2011/05/27 04:54:14 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha37.ebuild,v 1.2 2011/06/07 01:07:37 zmedico Exp $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
LICENSE="GPL-2"
KEYWORDS="~sparc-fbsd ~x86-fbsd"
SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl python2 python3 selinux"
+IUSE="build doc epydoc +ipc +less linguas_pl python2 python3 selinux"
python_dep="python3? ( =dev-lang/python-3* )
!python2? ( !python3? (
@@ -34,6 +34,7 @@ RDEPEND="${python_dep}
elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
elibc_glibc? ( >=sys-apps/sandbox-2.2 )
elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+ less? ( sys-apps/less )
>=app-misc/pax-utils-0.1.17
selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
!<app-shells/bash-3.2_p17"
diff --git a/sys-apps/portage/portage-2.2.0_alpha38.ebuild b/sys-apps/portage/portage-2.2.0_alpha38.ebuild
index 39c0a74d49b3..46c07211392e 100644
--- a/sys-apps/portage/portage-2.2.0_alpha38.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha38.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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_alpha38.ebuild,v 1.1 2011/06/06 12:57:43 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha38.ebuild,v 1.2 2011/06/07 01:07:37 zmedico Exp $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
LICENSE="GPL-2"
KEYWORDS="~sparc-fbsd ~x86-fbsd"
SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl python2 python3 selinux"
+IUSE="build doc epydoc +ipc +less linguas_pl python2 python3 selinux"
python_dep="python3? ( =dev-lang/python-3* )
!python2? ( !python3? (
@@ -34,6 +34,7 @@ RDEPEND="${python_dep}
elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
elibc_glibc? ( >=sys-apps/sandbox-2.2 )
elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+ less? ( sys-apps/less )
>=app-misc/pax-utils-0.1.17
selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
!<app-shells/bash-3.2_p17"
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index e7458c12e5b3..2013e1458f5b 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.23 2011/05/06 04:21:51 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.24 2011/06/07 01:07:37 zmedico Exp $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
LICENSE="GPL-2"
KEYWORDS=""
SLOT="0"
-IUSE="build doc epydoc +ipc python2 python3 selinux"
+IUSE="build doc epydoc +ipc +less python2 python3 selinux"
python_dep="python3? ( =dev-lang/python-3* )
!python2? ( !python3? (
@@ -34,6 +34,7 @@ RDEPEND="${python_dep}
elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
elibc_glibc? ( >=sys-apps/sandbox-2.2 )
elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+ less? ( sys-apps/less )
>=app-misc/pax-utils-0.1.17
selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
!<app-shells/bash-3.2_p17"