*portage-2.2.0_alpha60 (29 Sep 2011)

  29 Sep 2011; Zac Medico <zmedico@gentoo.org> +portage-2.2.0_alpha60.ebuild:
  2.2.0_alpha60 version bump. This includes all of the fixes in
  portage-2.1.10.20. Bug #210077 tracks all bugs fixed since portage-2.1.x.

*portage-2.1.10.20 (29 Sep 2011)

  29 Sep 2011; Zac Medico <zmedico@gentoo.org> +portage-2.1.10.20.ebuild:
  2.1.10.20 version bump. This fixes bug #297549 (enable --binpkg-respect-use
  automatically, unless --usepkgonly is enabled), bug #372485 (new emerge
  --autounmask-keep-masks option), bug #375573 (handle cases where
  backtracking masks become irrelevant due to the parent package getting
  masked by backtracking), bug #379333 (new emerge
  --autounmask-unrestricted-atoms option), bug #383859 (remove stray print
  statement in fetch checksum failure code), bug #384003 (new emerge
  --complete-graph-if-new-ver option), bug #384063 (fix portageq
  best-visible for multi-repo support), bug #384177 (trigger repoman error
  for obsolete no-herd value), bug #384597 (handle \r in installed
  file names), bug #384663 (PAGER variable support in etc-update and
  dispatch-conf), bug #384665 (archive-conf ImportError), and bug #384749
  (UnicodeDecodeError triggered by invalid dependency string in depgraph).
  Bug #381649 tracks all bugs fixed since portage-2.1.10.11.

  29 Sep 2011; Zac Medico <zmedico@gentoo.org> -portage-2.1.10.18.ebuild,
  -portage-2.2.0_alpha58.ebuild:
  Remove old versions.

Package-Manager: portage-2.2.0_alpha60/cvs/Linux i686

4 files changed, 43 insertions, 18 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 5d18995d2dce..981b2f1c68dd 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,34 @@
 # 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.874 2011/09/19 04:39:17 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.875 2011/09/29 18:41:41 zmedico Exp $
+
+*portage-2.2.0_alpha60 (29 Sep 2011)
+
+  29 Sep 2011; Zac Medico <zmedico@gentoo.org> +portage-2.2.0_alpha60.ebuild:
+  2.2.0_alpha60 version bump. This includes all of the fixes in
+  portage-2.1.10.20. Bug #210077 tracks all bugs fixed since portage-2.1.x.
+
+*portage-2.1.10.20 (29 Sep 2011)
+
+  29 Sep 2011; Zac Medico <zmedico@gentoo.org> +portage-2.1.10.20.ebuild:
+  2.1.10.20 version bump. This fixes bug #297549 (enable --binpkg-respect-use
+  automatically, unless --usepkgonly is enabled), bug #372485 (new emerge
+  --autounmask-keep-masks option), bug #375573 (handle cases where
+  backtracking masks become irrelevant due to the parent package getting
+  masked by backtracking), bug #379333 (new emerge
+  --autounmask-unrestricted-atoms option), bug #383859 (remove stray print
+  statement in fetch checksum failure code), bug #384003 (new emerge
+  --complete-graph-if-new-ver option), bug #384063 (fix portageq
+  best-visible for multi-repo support), bug #384177 (trigger repoman error
+  for obsolete no-herd value), bug #384597 (handle \r in installed
+  file names), bug #384663 (PAGER variable support in etc-update and
+  dispatch-conf), bug #384665 (archive-conf ImportError), and bug #384749
+  (UnicodeDecodeError triggered by invalid dependency string in depgraph).
+  Bug #381649 tracks all bugs fixed since portage-2.1.10.11.
+
+  29 Sep 2011; Zac Medico <zmedico@gentoo.org> -portage-2.1.10.18.ebuild,
+  -portage-2.2.0_alpha58.ebuild:
+  Remove old versions.
 
 *portage-2.2.0_alpha59 (19 Sep 2011)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index eb79bffec865..21838cc679e6 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8fcf81921e265f40b47644916331e0b8f18b9 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4
 DIST portage-2.1.10.11.tar.bz2 849505 RMD160 ae1fae8df7e42978a988ae7f66c3bb335bfd31b4 SHA1 a0c35facd342cc32a4e713925809e72530b98ec9 SHA256 c9d47d2211fa5feec398bc155cf64ec911fb30eb11a32a9ae7ca38dbeb9b37de
-DIST portage-2.1.10.18.tar.bz2 868614 RMD160 874addad0a417f371bf38a6d01894f450a1bb8b8 SHA1 5dc59bc4fcd45e060440af9b595331ca9b5ebe73 SHA256 1398077b99167acaf4d167ac4ea7c9b1d1866a5b41743087cd8ec453ad5e6f7d
 DIST portage-2.1.10.19.tar.bz2 870736 RMD160 2ec72654263ac09f8d08afa475914e58f5b7b9da SHA1 19dbea89b550a3d5fa8d0ce32d6960f639377ea0 SHA256 9b9fe4cb647cc952f051611e298cd4b817440b8f1d672bec3973b6c555daa3df
+DIST portage-2.1.10.20.tar.bz2 869615 RMD160 0084ecdfde0acf4cb7bd26352ef7d8700086695a SHA1 8e7f45ef24928e2073076f898ef1ab7ea314f75f SHA256 6cc62a3c694a7eb1f165a17a9b2a12cd30f45df773b97c3abac722313380b36e
 DIST portage-2.1.10.3.tar.bz2 833210 RMD160 76a2387b32fa2d879a19cfbdf60f906193fa5066 SHA1 0edb5bfc9005c9a9b39475c84c9f13a25a814987 SHA256 713a15b43c44ebe5a0ec1a880708ceb05773aad206383b39139b21bf36e1ded3
 DIST portage-2.1.6.13.patch.bz2 177383 RMD160 ef6388ca4a55a7defb319d54c9d80625cb8e12dc SHA1 5298feb6f881c25abdbde4a353d341fd36fdee51 SHA256 2cc897b6fa43b3329ef51f6304c064237be6bc326f1f0c221a19c0f96b69cd9c
 DIST portage-2.1.6.7.patch.bz2 50118 RMD160 cc0a322570829c8dec9aa4886deb5741f0efb489 SHA1 02021be38b0f829d45b342483834652a1985a952 SHA256 5f0605b51a24d23703330b040d2f7154322284db3e0cefa7499002ff1fa733c0
@@ -13,26 +13,25 @@ DIST portage-2.1.9.42.tar.bz2 764537 RMD160 7bfef7fb167c986e36532416a0ed4b914f0a
 DIST portage-2.2.0_alpha51.tar.bz2 848918 RMD160 84c771624d4f89d7017fd90d522a008e47b68345 SHA1 b8f09497e49af0e669014332511179c305fb4782 SHA256 3b695242c4a7f69d1b0863a82220ccd17512e018e404f279e2ddba7b7d29deb5
 DIST portage-2.2.0_alpha58.tar.bz2 868950 RMD160 e9a2de39d2c7abbddcd1686e76037c83777e308f SHA1 dbaeb9752df5e096c7c1bdd865929de0b12a4987 SHA256 2bf005a36a13f3c45efe29753be797a9f21c2005db753729aeec9e4088247155
 DIST portage-2.2.0_alpha59.patch.bz2 8463 RMD160 e8b638300a127e10ca640567f647bf2d2131e4ed SHA1 51d49b2ea8277cb43418083b9a20ce406d7a9d79 SHA256 a3fbcc1f6210979dc470043061aaa5dd033ebedb15d732b7768a1a0bad457e68
+DIST portage-2.2.0_alpha60.tar.bz2 869938 RMD160 6c9c3c303c380ada7abc657bf89968932fb4d465 SHA1 90b81d0ae9b9b0cdc5aa04ac7f312a66f858e8bd SHA256 0c322ecff2c95e0faa926d74d6bdb7d607d6df88d31553bf7a66656aabebec61
 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
 EBUILD portage-2.1.10.11.ebuild 11659 RMD160 5bea6dccc7e76edd17fdcfb6892d972be28190b5 SHA1 d383d3b935d9f14d1c68c161b1a85cd7ab0f92b2 SHA256 6ecad97b28a2ea0fe7899e81308d071db92fa6e42a45f9cdf0aefa5c3d0edb09
-EBUILD portage-2.1.10.18.ebuild 11673 RMD160 09c4a0d3bb2b5894ac501b8a3e1879a402c6b1cc SHA1 fd3a8a072d3ad9a70296a24642da8f43d8816472 SHA256 7247e70c3f749837193ab22360b39b3a624970b4fc4f57ff3bd58d8df7de3c79
 EBUILD portage-2.1.10.19.ebuild 11673 RMD160 3215b33c6b9a3fdfde369a06086f9b00f175c690 SHA1 42dd8daf0972b3197f7cdfa3c7e56b400b5bda5c SHA256 8953d802b8b7231de473cd9abdfd893aea3c55949eb10176dfacdba3651557c4
+EBUILD portage-2.1.10.20.ebuild 11641 RMD160 ca6a69b9463fd0aeba8f567a5cdc2d9798a61d4c SHA1 42418ed81d8273efd35620d9b5c22d17143b0b68 SHA256 37d3336e287ea766a9ec103bf18f3e5268cd5995868874a422e204451bcecb23
 EBUILD portage-2.1.10.3.ebuild 10221 RMD160 97396fdbcb6aff7705c2636f0fc829a83c1aa074 SHA1 eca88bafd3733c621473f03426558cf5a09ec176 SHA256 0a258d57a64921dbf2c9e21965a45212738d1758adf670b23670416d41f55888
 EBUILD portage-2.1.6.13.ebuild 10038 RMD160 a40e576c31f07f89387bda834607e62708b47e79 SHA1 ecbd0bae4ca5f340627f1dca792d137870be4d5e SHA256 c507d206aa08c39b387f464f1fe973d15b1b39baadd2a8feafc4867f8856e1a9
 EBUILD portage-2.1.6.7.ebuild 8689 RMD160 a04a6f87a6ded5b3c20413c79cc5d854f4083574 SHA1 1782ad24f77a56d2c8cbd88828d50451a1254f7e SHA256 a3f0e6639db74003108c933fcd4557bd4dccbfd913fc6fde7546dbec3987797a
 EBUILD portage-2.1.9.42.ebuild 10283 RMD160 60ac7fd535e83626095d2ef11466da8e8aa9b209 SHA1 b204bf62ad13b3c3d116fff53bc7a482eb89b7d8 SHA256 1b7968c34b0fc83aa1b388540a155340fdeb93df19de4515826af205fbcb9a3e
 EBUILD portage-2.2.0_alpha51.ebuild 12928 RMD160 72acaaa06c2d1c170b17ae9449ed9f9bceeb0735 SHA1 195fc5ef71c91f86ec3329833e56543d482c7b7d SHA256 486a6a78bae63337695a134af3f6ff6462a01613b1f1848663cd2ca79cd59292
-EBUILD portage-2.2.0_alpha58.ebuild 12938 RMD160 c6112ec63c32d19f4b12c311a473c601d76da33e SHA1 ae399a9062de3112cf074c70e3582d3a018f3669 SHA256 6c195518fd5dfa652dbae96d46f69ebf7476b952d560335ff486f8e9342a468b
 EBUILD portage-2.2.0_alpha59.ebuild 12938 RMD160 8d87427add7721bf9c7ffd3d0b12b37dc10c67d8 SHA1 b60721f7d4a92ae4b7d47430ab19106de871192a SHA256 e5422c5f3fcca58dde79447b4464f2ba6f575d0146f55fc34faf34a8f552544e
+EBUILD portage-2.2.0_alpha60.ebuild 12906 RMD160 753f4d1aa8b1d3e4c7c3bf51d3cb16a9b54fa0a9 SHA1 8c0f4d209c76f45e0819bff3271b3747e707d945 SHA256 08f610989e6591f5a62e61068c812257476114d70d94118831022733750fd128
 EBUILD portage-9999.ebuild 12214 RMD160 497e432fe756c9fda839cd2268a206e80e0ce1ca SHA1 9e9ef38845fa47767919d117c6f9e3c3b7924537 SHA256 ad0d82b6f9b62379595404695abebd73d0158fe257b2eedf117d9e49725ec8e7
-MISC ChangeLog 50425 RMD160 917ecda57c0adee419769f377f061485ab80521b SHA1 a612ca235daf9d5780270645d96fb0a79a9c1a1f SHA256 d7d1553ca70fd8044c942dfb1f0080add3e74c2718ff81f7e3e1f42dae769225
+MISC ChangeLog 51895 RMD160 dff80d732f342e98d34d9e17d51e48100ffceb14 SHA1 d868965fc2ca2f1761cad1e866a3014921c431a1 SHA256 481f48857c47f3dfdf14013cd8b23a453077fda5144ad6444dad8fbfb98a198b
 MISC metadata.xml 784 RMD160 ed548c07d0a96be62f1854b92abb4ebc0ae2f281 SHA1 338c4eb3cbb626b8830eddb2f0ef23a48b1c9e12 SHA256 3ec8e42f1532859a3697a5870febeb90c635740da85cdf8f913c7529dfc767f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59sb4ACgkQfXuS5UK5QB08SAQAn78Jkwp8A3YlMyfvePf0kPyC
-HnfBz/5w0zW2RnVuU0VNul6lDU7T3K6DRD2hn6b3c+ge8f4rDn8aSK6qlIEz4KJu
-NWusU7VyQRprStrnBoYPv+ZAuerA3+Z7dTKHHHkzc3OfZmy9QZT/bA6u3vkq/Txf
-fAdjFG4OyBB/GbLDXvY=
-=2Mob
+iEYEARECAAYFAk6Eu+0ACgkQ/ejvha5XGaM7XwCfXpjshpClJ4+z6J37jcje/dW1
+qk8Ani8poUZqyna3hPYVE6rZp5dhi6Do
+=IMGg
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.10.18.ebuild b/sys-apps/portage/portage-2.1.10.20.ebuild
index d17ee4fa2e8d..1c1d162d8e84 100644
--- a/sys-apps/portage/portage-2.1.10.18.ebuild
+++ b/sys-apps/portage/portage-2.1.10.20.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.18.ebuild,v 1.1 2011/09/15 06:17:57 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.10.20.ebuild,v 1.1 2011/09/29 18:41:41 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 +less linguas_pl python2 python3 selinux"
+IUSE="build doc epydoc +ipc linguas_pl python2 python3 selinux"
 
 # Import of the io module in python-2.6 raises ImportError for the
 # thread module if threading is disabled.
@@ -42,7 +42,6 @@ RDEPEND="${python_dep}
 	!<app-admin/logrotate-3.8.0"
 PDEPEND="
 	!build? (
-		less? ( sys-apps/less )
 		>=net-misc/rsync-2.6.4
 		userland_GNU? ( >=sys-apps/coreutils-6.4 )
 	)"
diff --git a/sys-apps/portage/portage-2.2.0_alpha58.ebuild b/sys-apps/portage/portage-2.2.0_alpha60.ebuild
index 435af8a4ec97..61ec1b04b032 100644
--- a/sys-apps/portage/portage-2.2.0_alpha58.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha60.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_alpha58.ebuild,v 1.1 2011/09/15 06:17:57 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha60.ebuild,v 1.1 2011/09/29 18:41:41 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 +less linguas_pl python2 python3 selinux"
+IUSE="build doc epydoc +ipc linguas_pl python2 python3 selinux"
 
 # Import of the io module in python-2.6 raises ImportError for the
 # thread module if threading is disabled.
@@ -42,7 +42,6 @@ RDEPEND="${python_dep}
 	!<app-admin/logrotate-3.8.0"
 PDEPEND="
 	!build? (
-		less? ( sys-apps/less )
 		>=net-misc/rsync-2.6.4
 		userland_GNU? ( >=sys-apps/coreutils-6.4 )
 	)"
@@ -62,7 +61,7 @@ prefix_src_archives() {
 
 PV_PL="2.1.2"
 PATCHVER_PL=""
-TARBALL_PV=2.2.0_alpha58
+TARBALL_PV=2.2.0_alpha60
 SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
 	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
 	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2