version bump, bug fix release

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 47 insertions, 33 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/Manifest b/net-misc/keychain/Manifest
index cd3b25ed3a94..300f5270f6dd 100644
--- a/net-misc/keychain/Manifest
+++ b/net-misc/keychain/Manifest
@@ -1,6 +1,6 @@
-DIST keychain-2.6.6.tar.bz2 31401 RMD160 eaa5ea277a47b8f5aeb1b9bba01ed1fc9c757806 SHA1 526db213d96d5cc36c74294501ec2d0a941ae460 SHA256 2c1abb16fc339926592addbb7ea6db58a3cb99250fcc17ea57acacfce6876083
 DIST keychain-2.6.8.tar.bz2 31531 RMD160 1e369f49286b6f325cbdad521ac025fdeb76fa92 SHA1 0c1b645b68b9fe23bfe217963df45a033d84fe9c SHA256 003709d1db934b41de86dc31717944a1fa31cdbccce50857fefd9d527c9e0fb3
-EBUILD keychain-2.6.6.ebuild 849 RMD160 6f262a55ae93b04f27637f2ffbb4b379ef2a5e26 SHA1 a9926da4fb3fa92db24189b3c6344f33af35cfbf SHA256 364fae7fecff7247c0bd0ff54cf7ac134f4764e007b108c5cc1a091a57ac82ae
+DIST keychain-2.6.9.tar.bz2 46563 RMD160 016ef7b3363def19f7af08e564c50f090552dd11 SHA1 7f40e312ecdd9f0de653a5e9d7c8a4ba0051df45 SHA256 af37ffef601e73e11dfcb9359092a7b77875159839774ea15a48a24194f312af
 EBUILD keychain-2.6.8.ebuild 857 RMD160 8d861e655c73e2c30b891830f9ece1f42c2e4f1f SHA1 8f9072a4b791c7851a4df9a7ff6494e261dcee2c SHA256 2ba34be0efa20825cb1da4c00cf9700c0a814246af5ace66a1062ef5f549f7b1
-MISC ChangeLog 13053 RMD160 8f89952e94a5dc02a3aa0f84a277deebf218fe14 SHA1 daa88076d67c2e546b818fb136a2c507f6346c44 SHA256 716c49423121c3d9a1e7a0c51ee9a85349e2ad31ee103b8b8e0670bad48f6d69
+EBUILD keychain-2.6.9.ebuild 1062 RMD160 444fc663aef53353b36fb0cbdff59a5044b6a078 SHA1 1448498f33af4bd587456db5105144f56e6aaaa7 SHA256 a478ac492af43264558a126b7d9656fc8f1cffc9c3ff64996226a98ceebb5494
+MISC ChangeLog 13217 RMD160 6ff5c6e1018a754d709e5024e1a0ee01fdbf7309 SHA1 6acf47c4d63e341282d56fff56a55ebee8a9354b SHA256 f8c63b7700e07b76426fbf421f2f7d872e40cbbd16d7fba067c8f17b32436c28
 MISC metadata.xml 227 RMD160 3e31d0e60bba22441c11bf170ea689f6dff13826 SHA1 63862d5fa88496a5de39700b864756adde6ca2c7 SHA256 8a24451f304e0560a25795ff71dbaac93eddb7e851bdc1747096591936532a39
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"
+}