Bump version to 2.3.3 and trim older ebuilds

- Fix bug reported by Matthew S. Moore in email; escape the backticks
  in --help output
- Fix bug reported by Herbie Ong in email; set pidf, cshpidf and lockf
  variables after parsing command-line to honor --dir setting
- Fix bug reported by Stephan Stahl in email; make spaces in filenames
  work throughout keychain, even in pure Bourne shell
- Fix operation on HP-UX with older OpenSSH by interpreting output of
  ssh-add as well as the error status

7 files changed, 23 insertions, 35 deletions

diff --git a/net-misc/keychain/ChangeLog b/net-misc/keychain/ChangeLog
index 39345f677b63..60acc83e71bd 100644
--- a/net-misc/keychain/ChangeLog
+++ b/net-misc/keychain/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for net-misc/keychain
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/ChangeLog,v 1.26 2004/06/25 03:13:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/ChangeLog,v 1.27 2004/07/01 04:17:06 agriffis Exp $
+
+*keychain-2.3.3 (01 Jul 2004)
+
+  01 Jul 2004; Aron Griffis <agriffis@gentoo.org> -keychain-2.2.2.ebuild,
+  -keychain-2.3.0.ebuild, +keychain-2.3.3.ebuild:
+  Bump version to 2.3.3 and trim older ebuilds
+  - Fix bug reported by Matthew S. Moore in email; escape the backticks
+    in --help output
+  - Fix bug reported by Herbie Ong in email; set pidf, cshpidf and lockf
+    variables after parsing command-line to honor --dir setting
+  - Fix bug reported by Stephan Stahl in email; make spaces in filenames
+    work throughout keychain, even in pure Bourne shell
+  - Fix operation on HP-UX with older OpenSSH by interpreting output of
+    ssh-add as well as the error status
 
   18 Jun 2004; Aron Griffis <agriffis@gentoo.org> -keychain-2.3.1.ebuild,
   keychain-2.3.2.ebuild:
diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest
index d401370ae2b6..87643eb8b448 100644
--- a/net-misc/keychain/Manifest
+++ b/net-misc/keychain/Manifest
@@ -1,8 +1,6 @@
-MD5 d8bf3eebb05714e4e38f5403689b688b keychain-2.2.2.ebuild 729
-MD5 90a7e742da7b3aff2fac5354daf43647 keychain-2.3.0.ebuild 729
+MD5 2942592d2834d37addafc910f6649066 keychain-2.3.3.ebuild 769
 MD5 4a1fbf7567a2595dff6c4ab8e7f6a09e keychain-2.3.2.ebuild 758
 MD5 2f46c2f1fda0fdad6c5eee30f543bea7 ChangeLog 3726
 MD5 ec488c2827fab65ef67f47709c1c7de0 metadata.xml 253
-MD5 6faab688061bee4e50aae758fd9b537d files/digest-keychain-2.2.2 66
-MD5 60bad96f7626fef7b620afe969a375f5 files/digest-keychain-2.3.0 66
 MD5 4655e4860cc168919d0504fb5beb4eac files/digest-keychain-2.3.2 66
+MD5 6ce8ca1a16f56f424a7c8c2d4b56c5a9 files/digest-keychain-2.3.3 66
diff --git a/net-misc/keychain/files/digest-keychain-2.2.2 b/net-misc/keychain/files/digest-keychain-2.2.2
deleted file mode 100644
index 7bba98dabade..000000000000
--- a/net-misc/keychain/files/digest-keychain-2.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a5380def36905961e69a14b578c8ae42 keychain-2.2.2.tar.bz2 21916
diff --git a/net-misc/keychain/files/digest-keychain-2.3.0 b/net-misc/keychain/files/digest-keychain-2.3.0
deleted file mode 100644
index 2b86a4c6a135..000000000000
--- a/net-misc/keychain/files/digest-keychain-2.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cc788105584351511e6202f97b8e1b2a keychain-2.3.0.tar.bz2 23397
diff --git a/net-misc/keychain/files/digest-keychain-2.3.3 b/net-misc/keychain/files/digest-keychain-2.3.3
new file mode 100644
index 000000000000..0c49f0454aba
--- /dev/null
+++ b/net-misc/keychain/files/digest-keychain-2.3.3
@@ -0,0 +1 @@
+MD5 ccd9b8cc278696ac0ae8f8ebedbe23d9 keychain-2.3.3.tar.bz2 24342
diff --git a/net-misc/keychain/keychain-2.3.0.ebuild b/net-misc/keychain/keychain-2.3.0.ebuild
deleted file mode 100644
index 5d157c877c7b..000000000000
--- a/net-misc/keychain/keychain-2.3.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/keychain-2.3.0.ebuild,v 1.3 2004/06/25 03:13:08 agriffis Exp $
-
-DESCRIPTION="ssh-agent manager"
-HOMEPAGE="http://www.gentoo.org/proj/en/keychain.xml"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 s390 sparc x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="virtual/glibc"
-RDEPEND="${DEPEND}
-	app-shells/bash
-	sys-apps/coreutils
-	|| ( net-misc/openssh net-misc/ssh )"
-
-src_install() {
-	dobin keychain || die "dobin failed"
-	dodoc ChangeLog COPYING keychain.pod README || die "dodoc failed"
-	doman keychain.1 || die "doman failed"
-}
diff --git a/net-misc/keychain/keychain-2.2.2.ebuild b/net-misc/keychain/keychain-2.3.3.ebuild
index c5fcad27c69b..3a9d0cf8a4f2 100644
--- a/net-misc/keychain/keychain-2.2.2.ebuild
+++ b/net-misc/keychain/keychain-2.3.3.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/keychain-2.2.2.ebuild,v 1.3 2004/06/25 03:13:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/keychain-2.3.3.ebuild,v 1.1 2004/07/01 04:17:06 agriffis Exp $
 
 DESCRIPTION="ssh-agent manager"
 HOMEPAGE="http://www.gentoo.org/proj/en/keychain.xml"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	http://dev.gentoo.org/~agriffis/keychain/${P}.tar.bz2"
 
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 s390 sparc x86"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 DEPEND="virtual/glibc"
@@ -19,6 +20,6 @@ RDEPEND="${DEPEND}
 
 src_install() {
 	dobin keychain || die "dobin failed"
-	dodoc ChangeLog COPYING keychain.pod README || die "dodoc failed"
+	dodoc ChangeLog keychain.pod README
 	doman keychain.1 || die "doman failed"
 }