dont install nettle #56156

5 files changed, 49 insertions, 5 deletions

diff --git a/dev-libs/lsh/ChangeLog b/dev-libs/lsh/ChangeLog
index 5bf13f5c0b11..a88c717b29d3 100644
--- a/dev-libs/lsh/ChangeLog
+++ b/dev-libs/lsh/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/lsh
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/lsh/ChangeLog,v 1.4 2004/06/24 23:26:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/lsh/ChangeLog,v 1.5 2004/07/11 21:46:44 vapier Exp $
+
+*lsh-1.4.3-r1 (11 Jul 2004)
+
+  11 Jul 2004; Mike Frysinger <vapier@gentoo.org> +files/1.4.3-gcc34.patch,
+  +lsh-1.4.3-r1.ebuild, -lsh-1.4.3.ebuild:
+  Make sure we dont install the bundled nettle library since it is tracked with
+  dev-libs/nettle #56156 by Rainer Groesslinger.
 
   29 Dec 2003; Jason Wever <weeve@gentoo.org> lsh-1.4.3.ebuild:
   And on the 7th day, the ~sparc keyword appeared. And the insane Gentoo/SPARC
diff --git a/dev-libs/lsh/Manifest b/dev-libs/lsh/Manifest
index 73f137f10b3e..45a47f1eda7c 100644
--- a/dev-libs/lsh/Manifest
+++ b/dev-libs/lsh/Manifest
@@ -1,3 +1,14 @@
-MD5 20853dd8b2e8e1b7bc654b8132d6085b lsh-1.4.3.ebuild 1159
-MD5 27e61c5c3c51d45b5a45f32514cdb2b7 ChangeLog 554
-MD5 12d8d84a70281a27cccb14cc8e2c83e2 files/digest-lsh-1.4.3 62
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 fa306d9e01faf8d4feed32ea106fd341 ChangeLog 830
+MD5 7e780e330e69b26783e4c8e9185f0dd1 lsh-1.4.3-r1.ebuild 1342
+MD5 ff304a4da3f1a19a3da4d5c1d1382303 files/1.4.3-gcc34.patch 389
+MD5 12d8d84a70281a27cccb14cc8e2c83e2 files/digest-lsh-1.4.3-r1 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.8 (GNU/Linux)
+
+iD8DBQFA8bVcHTu7gpaalycRArF3AKDh4v6P3BmwK9tyNv9rxYXkdsP98wCfdxH9
+BD1KcjqKDNVtsBVelQ+7vM0=
+=3Li8
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/lsh/files/1.4.3-gcc34.patch b/dev-libs/lsh/files/1.4.3-gcc34.patch
new file mode 100644
index 000000000000..302bb4db7471
--- /dev/null
+++ b/dev-libs/lsh/files/1.4.3-gcc34.patch
@@ -0,0 +1,14 @@
+--- lsh-1.4.3/src/sftp/sftp_c.c.orig	2004-07-11 16:33:04.488647128 -0400
++++ lsh-1.4.3/src/sftp/sftp_c.c	2004-07-11 16:33:29.583832080 -0400
+@@ -1096,9 +1096,10 @@
+   int ret;
+   int write_needed = 0;
+   UINT32 i;
++  struct sftp_callback *pos = state;
+ 
+   /* FIXME: state is const */
+-  state->mem.used = 0;
++  pos->mem.used = 0;
+ 
+   sftp_get_mem_main(next, msg, id, in, out, state );
+ 
diff --git a/dev-libs/lsh/files/digest-lsh-1.4.3 b/dev-libs/lsh/files/digest-lsh-1.4.3-r1
index 4c17d38c7892..4c17d38c7892 100644
--- a/dev-libs/lsh/files/digest-lsh-1.4.3
+++ b/dev-libs/lsh/files/digest-lsh-1.4.3-r1
diff --git a/dev-libs/lsh/lsh-1.4.3.ebuild b/dev-libs/lsh/lsh-1.4.3-r1.ebuild
index e35efc021953..3cc4b982108b 100644
--- a/dev-libs/lsh/lsh-1.4.3.ebuild
+++ b/dev-libs/lsh/lsh-1.4.3-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/lsh/lsh-1.4.3.ebuild,v 1.4 2004/06/24 23:26:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/lsh/lsh-1.4.3-r1.ebuild,v 1.1 2004/07/11 21:46:44 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="A GNU implementation of the Secure Shell protocols"
 HOMEPAGE="http://www.lysator.liu.se/~nisse/lsh/"
@@ -20,6 +22,12 @@ DEPEND="dev-libs/gmp
 	pam? ( sys-libs/pam )"
 #	kerberos? ( virtual/krb5 )
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-gcc34.patch
+}
+
 src_compile() {
 	# configure script checks /dev/ptmx in order to enable
 	# proper unix pty support ... so lets fake that it works :)
@@ -39,4 +47,8 @@ src_compile() {
 src_install() {
 	emake install DESTDIR=${D} || die
 	dodoc ANNOUNCE AUTHORS ChangeLog FAQ NEWS README
+
+	# remove bundled crap #56156
+	cd ${D}/usr
+	rm -rf lib include share/info/nettle.info*
 }