Closing #39290.

4 files changed, 39 insertions, 13 deletions

diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index c70d86ad3f51..d1fe5ca2ec82 100644
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-crypt/heimdal
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.16 2004/02/17 22:09:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.17 2004/02/21 22:34:20 aliz Exp $
+
+  21 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> heimdal-0.6.ebuild:
+  Change binary in rx wrappers. Closing #39290.
 
   17 Feb 2004; Aron Griffis <agriffis@gentoo.org> heimdal-0.6.ebuild:
   stable on alpha and ia64
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 7c40e0df3a12..61f78df14f62 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -1,13 +1,14 @@
-MD5 366fd102ce5d93486cf750e641678567 ChangeLog 2655
-MD5 dd300d23d5862d627c16b834f4e4b862 heimdal-0.4e-r1.ebuild 1160
-MD5 c4a2a7d5b732d94e225dd82386cceff7 heimdal-0.5.1-r1.ebuild 2240
 MD5 375d218b012ec7c0bcf3dbcd37e2ead0 heimdal-0.5.1.ebuild 1317
+MD5 c4a2a7d5b732d94e225dd82386cceff7 heimdal-0.5.1-r1.ebuild 2240
+MD5 975205af44662da768780bbf961a1457 heimdal-0.6.ebuild 2499
 MD5 8fc197c92855920e4cf399b17501f1b1 heimdal-0.5.ebuild 1307
-MD5 5d37cf41e3c3b910a64cd5617a67061a heimdal-0.6.ebuild 2468
-MD5 12c2f086658ad67e3ddaf1340cb9405a files/01heimdal 125
-MD5 4b0bf925049fd324edb977fa85fb907f files/digest-heimdal-0.4e-r1 65
+MD5 34bc2007563c480f197a03c637d45f2d ChangeLog 2768
+MD5 dd300d23d5862d627c16b834f4e4b862 heimdal-0.4e-r1.ebuild 1160
 MD5 9938c171c490847ed838372b75d29d0c files/digest-heimdal-0.5 64
-MD5 2da7cbb90cc55b12828f118553582ead files/digest-heimdal-0.5.1 66
+MD5 2f0ab643be93cf8cf0a57519bc2ee3fd files/digest-heimdal-0.6 133
+MD5 4b0bf925049fd324edb977fa85fb907f files/digest-heimdal-0.4e-r1 65
 MD5 2da7cbb90cc55b12828f118553582ead files/digest-heimdal-0.5.1-r1 66
+MD5 8eb01abfea336bcb2791c23ef05a5b24 files/heimdal-0.6-rxapps.patch 729
+MD5 2da7cbb90cc55b12828f118553582ead files/digest-heimdal-0.5.1 66
 MD5 bdcc2eedb42140afd25307f21aa5bb17 files/heimdal-0.6-gcc3.patch 466
-MD5 2f0ab643be93cf8cf0a57519bc2ee3fd files/digest-heimdal-0.6 133
+MD5 12c2f086658ad67e3ddaf1340cb9405a files/01heimdal 125
diff --git a/app-crypt/heimdal/files/heimdal-0.6-rxapps.patch b/app-crypt/heimdal/files/heimdal-0.6-rxapps.patch
new file mode 100644
index 000000000000..72339dc50fc7
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-0.6-rxapps.patch
@@ -0,0 +1,20 @@
+--- appl/kx/rxtelnet.in	2004-02-21 21:47:46.439883789 +0000
++++ appl/kx/rxtelnet.in	2004-02-21 21:47:56.392437939 +0000
+@@ -2,6 +2,6 @@
+ #
+ usage="Usage: $0 [-l username] [-k] [-f] [-t args_to_telnet] [-x args_to_xterm] [-K args_to_kx] [-w term_emulator] [-b telnet_binary] [-n] [-v] [-h | --help] [--version] host [port]"
+-binary=telnet
++binary=ktelnet
+ term=
+ kx_args=-P
+ while true
+--- appl/kx/rxterm.in	2004-02-21 21:49:23.893934354 +0000
++++ appl/kx/rxterm.in	2004-02-21 21:49:34.617299076 +0000
+@@ -2,6 +2,6 @@
+ #
+ usage="Usage: $0 [-l username] [-k] [-f] [-r rsh_args] [-x xterm_args] [-K kx_args] [-w term_emulator] [-b rsh_binary][-v] [-h | --help] [--version] host"
+-binary=rsh
++binary=krsh
+ term=xterm
+ while true
+ do
diff --git a/app-crypt/heimdal/heimdal-0.6.ebuild b/app-crypt/heimdal/heimdal-0.6.ebuild
index 8cf199f446f1..b37966153325 100644
--- a/app-crypt/heimdal/heimdal-0.6.ebuild
+++ b/app-crypt/heimdal/heimdal-0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.6.ebuild,v 1.8 2004/02/17 22:09:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.6.ebuild,v 1.9 2004/02/21 22:34:20 aliz Exp $
 
 inherit libtool
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.pdc.kth.se/heimdal/"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="x86 -sparc ppc alpha ia64"
+KEYWORDS="x86 -sparc ppc alpha ia64 ~amd64"
 IUSE="ssl ldap berkdb ipv6"
 PROVIDE="virtual/krb5"
 
@@ -24,8 +24,10 @@ DEPEND="
 	# -- Kain <kain@kain.org> 05 Dec 2002
 
 src_unpack() {
-	unpack ${A} || die
-	epatch ${FILESDIR}/heimdal-0.6-gcc3.patch || die
+	unpack ${A} ; cd ${S}
+
+	epatch ${FILESDIR}/${P}-gcc3.patch
+	epatch ${FILESDIR}/${P}-rxapps.patch
 
 	# Um, I don't think the below is doing anything since automake is
 	# run in src_compile(), but I'll leave it alone since this ebuild