Closing #73361

4 files changed, 37 insertions, 6 deletions

diff --git a/app-misc/tkpasman/ChangeLog b/app-misc/tkpasman/ChangeLog
index 999137e6c260..6d24f691e5a7 100644
--- a/app-misc/tkpasman/ChangeLog
+++ b/app-misc/tkpasman/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/tkpasman
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tkpasman/ChangeLog,v 1.5 2005/01/01 15:26:28 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tkpasman/ChangeLog,v 1.6 2005/01/01 19:22:47 aliz Exp $
+
+  01 Jan 2005; Daniel Ahlberg <aliz@gentoo.org> tkpasman-2.2a.ebuild,
+  files/tkpasman-2.2a-gentoo.patch:
+  Use wish and tclsh symlinks, closing #73361.
 
   02 Oct 2003; Joel Hill <hillster@gentoo.org> tkpasman-2.2a.ebuild:
   added homepage
diff --git a/app-misc/tkpasman/Manifest b/app-misc/tkpasman/Manifest
index 485a0f43487c..fb37563f2115 100644
--- a/app-misc/tkpasman/Manifest
+++ b/app-misc/tkpasman/Manifest
@@ -1,5 +1,6 @@
-MD5 bbc4bae6cdb422f6b08add7c0a0921b2 ChangeLog 620
 MD5 69deb71461dd099d79333e15f8ae2263 tkpasman-2.2.ebuild 903
-MD5 23abf879a8a84fc2e4502a7595886f66 tkpasman-2.2a.ebuild 916
-MD5 d76723adc51c452e8b35c96fb5c5eb3e files/digest-tkpasman-2.2 63
+MD5 18b884961d396387623b8f179d55c11a tkpasman-2.2a.ebuild 972
+MD5 fda0f69cdcaff54712e63d8195406939 ChangeLog 768
 MD5 ae240d49b3add0897d8625c6c9d4335c files/digest-tkpasman-2.2a 64
+MD5 d76723adc51c452e8b35c96fb5c5eb3e files/digest-tkpasman-2.2 63
+MD5 5934aa8972992bbce5694a339c6280a5 files/tkpasman-2.2a-gentoo.patch 771
diff --git a/app-misc/tkpasman/files/tkpasman-2.2a-gentoo.patch b/app-misc/tkpasman/files/tkpasman-2.2a-gentoo.patch
new file mode 100644
index 000000000000..d52d5129b7c7
--- /dev/null
+++ b/app-misc/tkpasman/files/tkpasman-2.2a-gentoo.patch
@@ -0,0 +1,22 @@
+--- build.sh	2005-01-01 19:18:44.290385166 +0000
++++ build.sh	2005-01-01 19:22:45.846161383 +0000
+@@ -44,8 +44,8 @@
+ #
+ # Try to find wish8.3, tclsh8.3 and openssl
+ #
+-WISH=`FIND "$WISH" "" wish8.4 wish8.3 wish`
+-TCLSH=`FIND "$TCLSH" "" tclsh8.4 tclsh8.3 tclsh`
++WISH=`FIND "$WISH" "" wish wish8.4 wish8.3`
++TCLSH=`FIND "$TCLSH" "" tclsh tclsh8.4 tclsh8.3`
+ OPENSSL=`FIND "$OPENSSL" "$OPENSSL_SEARCH_PATH" openssl ssl`
+ 
+ #
+@@ -88,7 +88,7 @@
+ if test "$USE_OPENSSL" = "true" -a -x "$OPENSSL"
+ then
+   echo "Found OpenSSL program: $OPENSSL"
+-  ENC=`$OPENSSL list-cipher-commands|sort|egrep "^($ENC)\$"|head -1`
++  ENC=`$OPENSSL list-cipher-commands|sort|egrep "^($ENC)\$"|head -n 1`
+   if test -z "$ENC"
+   then
+     echo "Could not find a suitable encryption algorithm."
diff --git a/app-misc/tkpasman/tkpasman-2.2a.ebuild b/app-misc/tkpasman/tkpasman-2.2a.ebuild
index 869a0856d3e5..dd7ccbfcafb5 100644
--- a/app-misc/tkpasman/tkpasman-2.2a.ebuild
+++ b/app-misc/tkpasman/tkpasman-2.2a.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tkpasman/tkpasman-2.2a.ebuild,v 1.8 2005/01/01 15:26:28 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tkpasman/tkpasman-2.2a.ebuild,v 1.9 2005/01/01 19:22:47 aliz Exp $
+
+inherit eutils
 
 MY_P="TkPasMan-${PV}"
 S=${WORKDIR}/${MY_P}
@@ -11,7 +13,7 @@ SRC_URI="http://www.xs4all.nl/~wbsoft/linux/projects/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~amd64"
 IUSE="ssl"
 
 DEPEND=">=dev-lang/tcl-8.3
@@ -25,6 +27,8 @@ RDEPEND="ssl? ( dev-libs/openssl )
 src_unpack() {
 	unpack ${A} && cd "${S}"
 
+	epatch ${FILESDIR}/${P}-gentoo.patch
+
 	use ssl || sed -i "s:^USE_OPENSSL=true:USE_OPENSSL=false:g" config
 }