Bump to 2.6.6 (from 2.6.4). Make --lockwait -1 mean forever. Previously

0 meant forever but was undocumented #137981.
Break out of loop when empty lockfile can't be removed #127471.
Remove 2.6.4
(Portage version: 2.1.1_pre5-r1)
 (Signed Manifest commit)

3 files changed, 15 insertions, 49 deletions

diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest
index 87d98108df55..fa74d796260e 100644
--- a/net-misc/keychain/Manifest
+++ b/net-misc/keychain/Manifest
@@ -2,19 +2,19 @@
 Hash: SHA1
 
 DIST keychain-2.6.2.tar.bz2 30679 RMD160 76a5a5da1687ef683a51fdee09a1a627522750a6 SHA1 7d96029d89509a9cdb74ef8521b844fb458ebcfb SHA256 8f81f918b5a278e355e946853476bc643214bd14d53f2d1443444fe385885877
-DIST keychain-2.6.4.tar.bz2 31090 RMD160 498dced696fb31ca092708d77d4750ca3b3008ca SHA1 45aa93dd604f651fad45c76f8d803be63fcb7e08 SHA256 b4075f21a13acfd3e82569906d169e6fbb0b4763f94f4f5a9cebba20cb1222db
+DIST keychain-2.6.6.tar.bz2 31401 RMD160 eaa5ea277a47b8f5aeb1b9bba01ed1fc9c757806 SHA1 526db213d96d5cc36c74294501ec2d0a941ae460 SHA256 2c1abb16fc339926592addbb7ea6db58a3cb99250fcc17ea57acacfce6876083
 EBUILD keychain-2.6.2.ebuild 886 RMD160 b6ec89b95011789f6efe8cfca14f15e1bb99b0bc SHA1 044b6708c16ef6eff1b04220cff9e3a66c0c2a9f SHA256 40dc4253ca0a6d2d7ad66b659ca4a6a33be0788f12da5d9db3a28b79d8ddffdd
 MD5 7fe7b077db76783bf9bb7262bc6f6618 keychain-2.6.2.ebuild 886
 RMD160 b6ec89b95011789f6efe8cfca14f15e1bb99b0bc keychain-2.6.2.ebuild 886
 SHA256 40dc4253ca0a6d2d7ad66b659ca4a6a33be0788f12da5d9db3a28b79d8ddffdd keychain-2.6.2.ebuild 886
-EBUILD keychain-2.6.4.ebuild 898 RMD160 85615f2d0db56615abbfd68938af44b8f8313038 SHA1 f4d5bb13bbccf339ec00e5b40cee8d7cf4fa40aa SHA256 bf5730f4b328405e4fccc60e5989245f621da440fe62b333f62edda4591f4eea
-MD5 2d4e12280081388b075b0523a3b14035 keychain-2.6.4.ebuild 898
-RMD160 85615f2d0db56615abbfd68938af44b8f8313038 keychain-2.6.4.ebuild 898
-SHA256 bf5730f4b328405e4fccc60e5989245f621da440fe62b333f62edda4591f4eea keychain-2.6.4.ebuild 898
-MISC ChangeLog 11081 RMD160 2929e3c3ffadabe5d1e7f124b054e95423c49a20 SHA1 3e48da5e297d4e73c3418b868e3119ec3ffcdaee SHA256 68430cc87ddca9d9465389858a79e1472716ed3dee44da579ef867a195e238c6
-MD5 f6730da05122d078f0265cd56ad529fd ChangeLog 11081
-RMD160 2929e3c3ffadabe5d1e7f124b054e95423c49a20 ChangeLog 11081
-SHA256 68430cc87ddca9d9465389858a79e1472716ed3dee44da579ef867a195e238c6 ChangeLog 11081
+EBUILD keychain-2.6.6.ebuild 898 RMD160 81236431cf2d23acf43bfdc4034aca611ed612c7 SHA1 414104f53ff788ad11b26784599cf398cda67337 SHA256 af6e402d4fb7cf0f7eab217654b0a0c295d572c5e1ca0a36168a64968dbd08c7
+MD5 a29995b9fbc7dffb87b4f03af5f7cf13 keychain-2.6.6.ebuild 898
+RMD160 81236431cf2d23acf43bfdc4034aca611ed612c7 keychain-2.6.6.ebuild 898
+SHA256 af6e402d4fb7cf0f7eab217654b0a0c295d572c5e1ca0a36168a64968dbd08c7 keychain-2.6.6.ebuild 898
+MISC ChangeLog 11417 RMD160 67e9ba4537ce70fe084c58f7ab1c1964d678c338 SHA1 2db0e027a2369deabd7648b969aafc24cb4452d2 SHA256 3378b2a53eda0f45d4e98925bd23152f9ee86ba389227846928bfc5cccdd7035
+MD5 9049903c296b40aabfa948fa55e7951e ChangeLog 11417
+RMD160 67e9ba4537ce70fe084c58f7ab1c1964d678c338 ChangeLog 11417
+SHA256 3378b2a53eda0f45d4e98925bd23152f9ee86ba389227846928bfc5cccdd7035 ChangeLog 11417
 MISC metadata.xml 252 RMD160 6ee0365432e003d39675634adda53c87812f3c6c SHA1 f7b0c469e60ad5a5bf498bb3985df08742cf171d SHA256 8b648c81d1a574574a039336cbbb29330f22c121b1ca09c2a4d626e514fe512b
 MD5 a665f2675f13020037bd5fe782c1c546 metadata.xml 252
 RMD160 6ee0365432e003d39675634adda53c87812f3c6c metadata.xml 252
@@ -22,13 +22,13 @@ SHA256 8b648c81d1a574574a039336cbbb29330f22c121b1ca09c2a4d626e514fe512b metadata
 MD5 960fae26d49eb2c9b7ac80daddae406f files/digest-keychain-2.6.2 244
 RMD160 910bc9fc9f3d783c09d43a41fc1929cf8309214d files/digest-keychain-2.6.2 244
 SHA256 abbb6d03ca32f25898bab54f4a0f43d618231670f7812c4466b2b27158630267 files/digest-keychain-2.6.2 244
-MD5 66b71d6a532293ea890f979a13e7e638 files/digest-keychain-2.6.4 244
-RMD160 8410297107e5e1a3f6b308bc0ae74d9a3606c538 files/digest-keychain-2.6.4 244
-SHA256 124124920b8d07448a3f68b25b6322428fad8d4a292cccb3c25c07c31ae8634a files/digest-keychain-2.6.4 244
+MD5 2cfe4dfe768970b3819ed062a52852e4 files/digest-keychain-2.6.6 244
+RMD160 1e4db634e4c4d56c50917ea78ebf6b0127f04fa5 files/digest-keychain-2.6.6 244
+SHA256 cd6cbbd3ceeedd71899e92263beedfca371cef4759fae9b564fd6c062625ce6f files/digest-keychain-2.6.6 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFFAcGLJrHF4yAQTrARAl5BAKCr9d3C/QyMG24nYhuxnsZv1RPdlwCgsVzZ
-f5HcgIIFVynAi0bhBMRZA18=
-=WqG+
+iD8DBQFFAeZYJrHF4yAQTrARArnvAJ90ohpE4xYoEPcUwVe/9rGj7AAvMQCdFWg2
+xyhGnSCsT7aTpzzfuojGAZo=
+=A4uI
 -----END PGP SIGNATURE-----
diff --git a/net-misc/keychain/files/digest-keychain-2.6.4 b/net-misc/keychain/files/digest-keychain-2.6.4
deleted file mode 100644
index 17818dfd8b2e..000000000000
--- a/net-misc/keychain/files/digest-keychain-2.6.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f25409d8e34646d4c3a6bb92420e1017 keychain-2.6.4.tar.bz2 31090
-RMD160 498dced696fb31ca092708d77d4750ca3b3008ca keychain-2.6.4.tar.bz2 31090
-SHA256 b4075f21a13acfd3e82569906d169e6fbb0b4763f94f4f5a9cebba20cb1222db keychain-2.6.4.tar.bz2 31090
diff --git a/net-misc/keychain/keychain-2.6.4.ebuild b/net-misc/keychain/keychain-2.6.4.ebuild
deleted file mode 100644
index eedddf4b2bae..000000000000
--- a/net-misc/keychain/keychain-2.6.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/keychain-2.6.4.ebuild,v 1.1 2006/09/08 19:16:21 agriffis Exp $
-
-DESCRIPTION="ssh-agent manager"
-HOMEPAGE="http://www.gentoo.org/proj/en/keychain/"
-SRC_URI="http://dev.gentoo.org/~agriffis/keychain/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	app-shells/bash
-	|| ( net-misc/openssh net-misc/ssh )"
-
-src_install() {
-	dobin keychain || die "dobin failed"
-	dodoc ChangeLog keychain.pod README
-	doman keychain.1 || die "doman failed"
-}
-
-pkg_postinst() {
-	echo
-	einfo "Please see the Keychain Guide at"
-	einfo "http://www.gentoo.org/doc/en/keychain-guide.xml"
-	einfo "for help getting keychain running"
-	echo
-}