Bump to 2.6.4. Postpone validity checking of SSH_AUTH_SOCK for

--inherit=any-once and --inherit=local-once, so that warning messages aren't
emitted unnecessarily. Fix --eval for fish.  Remove 2.6.3
(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 98746a4ed10e..87d98108df55 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.3.tar.bz2 30878 RMD160 53291084827d947fbbe050833f58c7cfdf9aa620 SHA1 270b6abb2d3b3cb30c83add8bb2503d9cabb43f0 SHA256 2aa39164ebf9b15b417b6f6de52555dcf9648a6be215fa0bf788206c7a4eb08e
+DIST keychain-2.6.4.tar.bz2 31090 RMD160 498dced696fb31ca092708d77d4750ca3b3008ca SHA1 45aa93dd604f651fad45c76f8d803be63fcb7e08 SHA256 b4075f21a13acfd3e82569906d169e6fbb0b4763f94f4f5a9cebba20cb1222db
 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.3.ebuild 898 RMD160 f3337b27d6be95948dd60901552a9f32018555f0 SHA1 e0d080bcfac413f935b55c26cf89c70872b3047e SHA256 14d342cf5ab779fdbc6eaf45f960e2f1f026ab4f4274f6274a52e37def374e62
-MD5 df0dec2d758b3e713c9e10c351b27c2b keychain-2.6.3.ebuild 898
-RMD160 f3337b27d6be95948dd60901552a9f32018555f0 keychain-2.6.3.ebuild 898
-SHA256 14d342cf5ab779fdbc6eaf45f960e2f1f026ab4f4274f6274a52e37def374e62 keychain-2.6.3.ebuild 898
-MISC ChangeLog 10745 RMD160 19eafe0b8978e30609535fce895765ca83a00fba SHA1 2eafb36f81fab80b523c3e63d5f668e619559641 SHA256 98a5b8b7825eede90f288ea8bbb572361f991ae3bbea8ee344dd863dde75977d
-MD5 bc1016559bd6818dd2823d2eec372b93 ChangeLog 10745
-RMD160 19eafe0b8978e30609535fce895765ca83a00fba ChangeLog 10745
-SHA256 98a5b8b7825eede90f288ea8bbb572361f991ae3bbea8ee344dd863dde75977d ChangeLog 10745
+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
 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 2231150a4f815a8b63082e9f359f2794 files/digest-keychain-2.6.3 244
-RMD160 cd0355933b900e1e5a97b84fe8890d6947dbc7d9 files/digest-keychain-2.6.3 244
-SHA256 6e0706f7ea4575d781b76f76bfb0fcafdcddab0ca40cd6978c33aa68680b1bab files/digest-keychain-2.6.3 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFFAbJfJrHF4yAQTrARAqILAKCJ8jiHtQkT8KMyLc+h6CxkrEOC1wCfWI+S
-NJkfamcTSqaUJQ3Z6rNieiA=
-=2Qcb
+iD8DBQFFAcGLJrHF4yAQTrARAl5BAKCr9d3C/QyMG24nYhuxnsZv1RPdlwCgsVzZ
+f5HcgIIFVynAi0bhBMRZA18=
+=WqG+
 -----END PGP SIGNATURE-----
diff --git a/net-misc/keychain/files/digest-keychain-2.6.3 b/net-misc/keychain/files/digest-keychain-2.6.3
deleted file mode 100644
index 094c60a29cb1..000000000000
--- a/net-misc/keychain/files/digest-keychain-2.6.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e7ffce305de50952c6e979bcf1f0c7c4 keychain-2.6.3.tar.bz2 30878
-RMD160 53291084827d947fbbe050833f58c7cfdf9aa620 keychain-2.6.3.tar.bz2 30878
-SHA256 2aa39164ebf9b15b417b6f6de52555dcf9648a6be215fa0bf788206c7a4eb08e keychain-2.6.3.tar.bz2 30878
diff --git a/net-misc/keychain/keychain-2.6.3.ebuild b/net-misc/keychain/keychain-2.6.3.ebuild
deleted file mode 100644
index 5866f4a8f071..000000000000
--- a/net-misc/keychain/keychain-2.6.3.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.3.ebuild,v 1.2 2006/09/08 18:11:32 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
-}