Bump to 2.6.0 (from 2.5.5). Mark 2.5.5 stable on

alpha/amd64/arm/hppa/ia64/mips/ppc/ppc-macos/ppc64/s390/sparc/x86. Remove
2.5.4.1, 2.5.3.1
Package-Manager: portage-2.0.52-r1

8 files changed, 30 insertions, 50 deletions

diff --git a/net-misc/keychain/ChangeLog b/net-misc/keychain/ChangeLog
index 92aaa599e05c..568f3b4e8e8e 100644
--- a/net-misc/keychain/ChangeLog
+++ b/net-misc/keychain/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/keychain
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/ChangeLog,v 1.47 2005/10/05 16:07:25 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/ChangeLog,v 1.48 2005/10/10 19:25:27 agriffis Exp $
+
+*keychain-2.6.0 (10 Oct 2005)
+
+  10 Oct 2005; Aron Griffis <agriffis@gentoo.org> -keychain-2.5.3.1.ebuild,
+  -keychain-2.5.4.1.ebuild, keychain-2.5.5.ebuild, +keychain-2.6.0.ebuild:
+  Bump to 2.6.0 (from 2.5.5). Mark 2.5.5 stable on
+  alpha/amd64/arm/hppa/ia64/mips/ppc/ppc-macos/ppc64/s390/sparc/x86. Remove
+  2.5.4.1, 2.5.3.1
 
   05 Oct 2005; Fabian Groffen <grobian@gentoo.org> keychain-2.5.5.ebuild:
   Marking ~ppc-macos as it seems to work fine.
diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest
index 591fe17ab717..c3c6237da271 100644
--- a/net-misc/keychain/Manifest
+++ b/net-misc/keychain/Manifest
@@ -1,8 +1,16 @@
-MD5 9506316958e49ce7f1f1d04ea0a31a05 keychain-2.5.3.1.ebuild 930
-MD5 9ac335ddde0a84362febc0db0c942f14 keychain-2.5.4.1.ebuild 930
-MD5 5e88aeaa4521f5233e98a3296d2d57da ChangeLog 8735
-MD5 41dab1d7ea24f8ee82a7838286b83eee keychain-2.5.5.ebuild 949
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 ec488c2827fab65ef67f47709c1c7de0 metadata.xml 253
-MD5 c3dbab3110dc1ad94fe2c0cdf8d23199 files/digest-keychain-2.5.3.1 68
-MD5 a60848312e251c420ec37201e5a2b3a9 files/digest-keychain-2.5.4.1 68
+MD5 edd81e19274f1d7755c61cece70f3a93 ChangeLog 9065
+MD5 8ee3c9fe4f8e709ba62b8cedd1e02890 keychain-2.6.0.ebuild 920
+MD5 c7098fa09e7d06bbfc7fb79f8a174d64 keychain-2.5.5.ebuild 908
 MD5 2a123dba1a5e3746da8d974628e8da01 files/digest-keychain-2.5.5 66
+MD5 acfcf807e8ed99c93df4fc1d12312337 files/digest-keychain-2.6.0 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDSsBCJrHF4yAQTrARAqayAJsHSn8MIxj81V7yg16f+Isb/pxhJgCeKFQ8
+BTaLrHTmQYek9ar39IwWf4I=
+=M6q0
+-----END PGP SIGNATURE-----
diff --git a/net-misc/keychain/files/digest-keychain-2.5.3.1 b/net-misc/keychain/files/digest-keychain-2.5.3.1
deleted file mode 100644
index 38500d3c230f..000000000000
--- a/net-misc/keychain/files/digest-keychain-2.5.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7eb5e5c4b1aa197e60ff9bea2e39b44a keychain-2.5.3.1.tar.bz2 30326
diff --git a/net-misc/keychain/files/digest-keychain-2.5.4.1 b/net-misc/keychain/files/digest-keychain-2.5.4.1
deleted file mode 100644
index d93256a9b78f..000000000000
--- a/net-misc/keychain/files/digest-keychain-2.5.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 93498f35f8d4cf1abb1941587e68076b keychain-2.5.4.1.tar.bz2 30987
diff --git a/net-misc/keychain/files/digest-keychain-2.6.0 b/net-misc/keychain/files/digest-keychain-2.6.0
new file mode 100644
index 000000000000..4bd0548d599a
--- /dev/null
+++ b/net-misc/keychain/files/digest-keychain-2.6.0
@@ -0,0 +1 @@
+MD5 4389fd1837ad01657f834789daae951d keychain-2.6.0.tar.bz2 30338
diff --git a/net-misc/keychain/keychain-2.5.4.1.ebuild b/net-misc/keychain/keychain-2.5.4.1.ebuild
deleted file mode 100644
index adc27fd79951..000000000000
--- a/net-misc/keychain/keychain-2.5.4.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/keychain-2.5.4.1.ebuild,v 1.2 2005/05/28 17:29:19 agriffis Exp $
-
-DESCRIPTION="ssh-agent manager"
-HOMEPAGE="http://www.gentoo.org/proj/en/keychain/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~agriffis/keychain/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND="virtual/libc"
-RDEPEND="${DEPEND}
-	app-shells/bash
-	sys-apps/coreutils
-	|| ( 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
-}
diff --git a/net-misc/keychain/keychain-2.5.5.ebuild b/net-misc/keychain/keychain-2.5.5.ebuild
index eb4160aa821e..2dbcbc6cc18e 100644
--- a/net-misc/keychain/keychain-2.5.5.ebuild
+++ b/net-misc/keychain/keychain-2.5.5.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/keychain-2.5.5.ebuild,v 1.2 2005/10/05 16:07:26 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/keychain-2.5.5.ebuild,v 1.3 2005/10/10 19:25:27 agriffis Exp $
 
 DESCRIPTION="ssh-agent manager"
 HOMEPAGE="http://www.gentoo.org/proj/en/keychain/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~agriffis/keychain/${P}.tar.bz2"
+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"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc-macos ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="virtual/libc"
diff --git a/net-misc/keychain/keychain-2.5.3.1.ebuild b/net-misc/keychain/keychain-2.6.0.ebuild
index 158e139d8c7b..f14ec8a4f796 100644
--- a/net-misc/keychain/keychain-2.5.3.1.ebuild
+++ b/net-misc/keychain/keychain-2.6.0.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/keychain-2.5.3.1.ebuild,v 1.2 2005/03/14 15:11:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/keychain-2.6.0.ebuild,v 1.1 2005/10/10 19:25:27 agriffis Exp $
 
 DESCRIPTION="ssh-agent manager"
 HOMEPAGE="http://www.gentoo.org/proj/en/keychain/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~agriffis/keychain/${P}.tar.bz2"
+SRC_URI="http://dev.gentoo.org/~agriffis/keychain/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 DEPEND="virtual/libc"