version bump, bug fix release

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 44 insertions, 30 deletions

diff --git a/net-misc/keychain/ChangeLog b/net-misc/keychain/ChangeLog
index b3c25abbdaa1..d570d0df7b93 100644
--- a/net-misc/keychain/ChangeLog
+++ b/net-misc/keychain/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/keychain
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/ChangeLog,v 1.73 2009/08/02 02:50:46 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/ChangeLog,v 1.74 2009/08/02 03:47:09 darkside Exp $
+
+*keychain-2.6.9 (02 Aug 2009)
+
+  02 Aug 2009; Jeremy Olexa <darkside@gentoo.org> -keychain-2.6.6.ebuild,
+  +keychain-2.6.9.ebuild:
+  version bump, bug fix release
 
   02 Aug 2009; Jeremy Olexa <darkside@gentoo.org> metadata.xml:
   add myself as maintainer as discussed with robbat2 of the base-system herd
diff --git a/net-misc/keychain/keychain-2.6.6.ebuild b/net-misc/keychain/keychain-2.6.6.ebuild
deleted file mode 100644
index 3bb204f8a11d..000000000000
--- a/net-misc/keychain/keychain-2.6.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/keychain-2.6.6.ebuild,v 1.7 2008/03/11 17:09:10 ricmm Exp $
-
-DESCRIPTION="ssh-agent manager"
-HOMEPAGE="http://www.gentoo.org/proj/en/keychain/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	app-shells/bash
-	|| ( net-misc/openssh net-misc/ssh )"
-
-src_install() {
-	dobin keychain || die "dobin failed"
-	doman keychain.1 || die "doman failed"
-	dodoc ChangeLog keychain.pod README
-}
-
-pkg_postinst() {
-	einfo "Please see the Keychain Guide at"
-	einfo "http://www.gentoo.org/doc/en/keychain-guide.xml"
-	einfo "for help getting keychain running"
-}
diff --git a/net-misc/keychain/keychain-2.6.9.ebuild b/net-misc/keychain/keychain-2.6.9.ebuild
new file mode 100644
index 000000000000..a3a82f4398b6
--- /dev/null
+++ b/net-misc/keychain/keychain-2.6.9.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/keychain-2.6.9.ebuild,v 1.1 2009/08/02 03:47:09 darkside Exp $
+
+EAPI="2"
+
+DESCRIPTION="manage ssh and GPG keys in a convenient and secure manner. Frontend
+for ssh-agent/ssh-add"
+HOMEPAGE="http://www.funtoo.org/en/security/keychain/intro/"
+SRC_URI="http://www.funtoo.org/archive/keychain/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	app-shells/bash
+	|| ( net-misc/openssh net-misc/ssh )"
+
+src_install() {
+	dobin keychain || die "dobin failed"
+	doman keychain.1 || die "doman failed"
+	dodoc ChangeLog README.rst || die
+}
+
+src_test() {
+	# Work in progress, not all pass so we don't die yet.
+	./runtests
+}
+
+pkg_postinst() {
+	einfo "Please see the Keychain Guide at"
+	einfo "http://www.gentoo.org/doc/en/keychain-guide.xml"
+	einfo "for help getting keychain running"
+}