partial fix for selflinking - bug #147800 thanks Carsten Lohrke

Package-Manager: portage-2.1.2_pre1

4 files changed, 48 insertions, 14 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 54fff205f9ec..d1ca1bb6d156 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.101 2006/09/16 01:41:19 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.102 2006/09/17 13:45:34 dragonheart Exp $
+
+  17 Sep 2006; Daniel Black <dragonheart@gentoo.org>
+  +files/gnutls-1.4.4-selflink.patch, gnutls-1.4.4.ebuild:
+  partial fix for selflinking - bug #147800 thanks Carsten Lohrke
 
 *gnutls-1.4.4 (16 Sep 2006)
 
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 371d51dc517c..4a06d94704a2 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -9,6 +9,10 @@ AUX gnutls-1.4.1-as-needed.patch 3045 RMD160 95366b846c5674769ac279a4bc69a4d8da4
 MD5 763571a9ba2b91db8e48617ab813bc46 files/gnutls-1.4.1-as-needed.patch 3045
 RMD160 95366b846c5674769ac279a4bc69a4d8da4f410f files/gnutls-1.4.1-as-needed.patch 3045
 SHA256 978f7f3e23b4f1e1fb53a49407e9adfa7b9c4d30e363631ae43731da9918c153 files/gnutls-1.4.1-as-needed.patch 3045
+AUX gnutls-1.4.4-selflink.patch 748 RMD160 e559ca398b98bdd2c5d4fb80dbcd9cc4b4314799 SHA1 7a9fbc3f6c75af8e6c303ecf8a00eeaf6c7fe2f2 SHA256 6cf9cf2b3ef8380b5408549fd7d5df24ee8fe5ba2a1f266135a931ff89aa1e5e
+MD5 06dc2607bc824d52f566e1b514b05b15 files/gnutls-1.4.4-selflink.patch 748
+RMD160 e559ca398b98bdd2c5d4fb80dbcd9cc4b4314799 files/gnutls-1.4.4-selflink.patch 748
+SHA256 6cf9cf2b3ef8380b5408549fd7d5df24ee8fe5ba2a1f266135a931ff89aa1e5e files/gnutls-1.4.4-selflink.patch 748
 DIST gnutls-1.2.10.tar.bz2 2737849 RMD160 33b0d4e5955b06611141ac2d1e8889b42675cc98 SHA1 18140bebae006e019deb77962836bcd775256aab SHA256 1b16eecc4a8bf2f4941eb7a2ebf0632f908b9c2733457e0076b13a79798dce23
 DIST gnutls-1.2.11.tar.bz2 2756620 RMD160 07b3f4b9fb875c55e981f95aa4edb6c639176331 SHA1 4d5167091c72f994ed97e1406ae886f3c2757d49 SHA256 400c118150b31f475a5d562d60ab6912ed7a52b12ef31b2ad9b30a6960ea446d
 DIST gnutls-1.4.1.tar.bz2 4046780 RMD160 1bb959a118ce8d776693f602034342c31a8737aa SHA1 25d183fef21abbcaab0afe6b5809893aa70b577d SHA256 834e0009a6bfc67c427ba652ae2139f6cce50b4a1ac38214de6249611de73def
@@ -29,14 +33,14 @@ EBUILD gnutls-1.4.1.ebuild 1468 RMD160 47af0e82fa9b128d6255f80043c95e6ce3c58474
 MD5 e1bd943b030b2733afdb1de20a8213e7 gnutls-1.4.1.ebuild 1468
 RMD160 47af0e82fa9b128d6255f80043c95e6ce3c58474 gnutls-1.4.1.ebuild 1468
 SHA256 89b0c973352da16292da172d31f5347ed3dcde7de2746859d6680b92a5d89e7e gnutls-1.4.1.ebuild 1468
-EBUILD gnutls-1.4.4.ebuild 1419 RMD160 908fc6519256ff8c062d1c07cc0043ce11111e6b SHA1 8c309b0ab3e04d51c023fbdc9ded90482b194ca3 SHA256 415b58c1a82da2443cff657819faaa807dddd24e7cb7ba9d98bc8a838e189b1c
-MD5 473f49c4ba4a3c126c21a4fb5c4542b3 gnutls-1.4.4.ebuild 1419
-RMD160 908fc6519256ff8c062d1c07cc0043ce11111e6b gnutls-1.4.4.ebuild 1419
-SHA256 415b58c1a82da2443cff657819faaa807dddd24e7cb7ba9d98bc8a838e189b1c gnutls-1.4.4.ebuild 1419
-MISC ChangeLog 15265 RMD160 df07ad9399f64eba32f316b7763e4d0778d5fd4a SHA1 d83420cf66ffc9552a5cfd8733e8b04235797ee1 SHA256 5c9ad91a32827c8811396ccad2a9ce5e3c428b75ff3fcc387a34afdaef7005ac
-MD5 506a2fdc5e9d8ab5f811d94676be0490 ChangeLog 15265
-RMD160 df07ad9399f64eba32f316b7763e4d0778d5fd4a ChangeLog 15265
-SHA256 5c9ad91a32827c8811396ccad2a9ce5e3c428b75ff3fcc387a34afdaef7005ac ChangeLog 15265
+EBUILD gnutls-1.4.4.ebuild 1579 RMD160 b81f7b9a4da7ef87c2d931ad7ee3d1d94a00663b SHA1 4a26d7abddd606af021341911c9aad7f75c686ff SHA256 da3d45664097412d0c1c63220b1694dfcdb25eacb2bfe7ae5ff95c979f01094a
+MD5 9397578986cf1c9ccfc0d3702bf80f75 gnutls-1.4.4.ebuild 1579
+RMD160 b81f7b9a4da7ef87c2d931ad7ee3d1d94a00663b gnutls-1.4.4.ebuild 1579
+SHA256 da3d45664097412d0c1c63220b1694dfcdb25eacb2bfe7ae5ff95c979f01094a gnutls-1.4.4.ebuild 1579
+MISC ChangeLog 15444 RMD160 80d1d46ca71b174b004c129aaba8b2d21e79b282 SHA1 81ed5f697573de426346bffebd0e4d3895450edf SHA256 063b673d51deb3ebc54b2317702d2c026ba9650ccb92183cf9662a358b34ccc3
+MD5 7053405e877a57a4fe6fd1e9e0353c41 ChangeLog 15444
+RMD160 80d1d46ca71b174b004c129aaba8b2d21e79b282 ChangeLog 15444
+SHA256 063b673d51deb3ebc54b2317702d2c026ba9650ccb92183cf9662a358b34ccc3 ChangeLog 15444
 MISC metadata.xml 276 RMD160 99eb13264f3656e33d5cbc95ed9319ba50a1e58c SHA1 1f70a3ead5de1eb0d62a59c084b3a06147256e2f SHA256 abd952a77edadf769a821e7210a01f38850cada9a7677a1561f6aa0ce954f480
 MD5 918a1b851dd53568897b4fc7c503912e metadata.xml 276
 RMD160 99eb13264f3656e33d5cbc95ed9319ba50a1e58c metadata.xml 276
@@ -59,7 +63,7 @@ SHA256 314e2cbd832d1f021e946afb2adbbf21fdd1946d5724eb8a623934aa0c8cd999 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFFC1epmdTrptrqvGERAgiuAKCcAjAIQw2KRWQzp5CGYhxB9zxBbACfaVZw
-jOonLGtfb8PF+gduWx556is=
-=UJoH
+iD8DBQFFDVHJmdTrptrqvGERAjEGAJ4oJpDjWh1foUZZKJ3oF1YkUluH/wCcDY/W
+M0wI/XAn6vL8GIy7Jr5k/FI=
+=OJX1
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/files/gnutls-1.4.4-selflink.patch b/net-libs/gnutls/files/gnutls-1.4.4-selflink.patch
new file mode 100644
index 000000000000..5a33a1fa40c1
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-1.4.4-selflink.patch
@@ -0,0 +1,19 @@
+--- configure.in.orig	2006-09-16 22:59:29.000000000 +0000
++++ configure.in	2006-09-16 23:00:08.000000000 +0000
+@@ -493,12 +493,12 @@
+ AC_LIBTOOL_WIN32_DLL
+ AM_PROG_LIBTOOL
+ 
+-LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBTASN1_LIBS $LIBGCRYPT_LIBS $LIBS"
++LIBGNUTLS_LIBS="-L${libdir} $LIBTASN1_LIBS $LIBGCRYPT_LIBS $LIBS"
+ LIBGNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS $LIBTASN1_CFLAGS -I${includedir}"
+ AC_SUBST(LIBGNUTLS_LIBS)
+ AC_SUBST(LIBGNUTLS_CFLAGS)
+ 
+-LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LIBOPENCDK_LIBS $LZO_LIBS $LIBGNUTLS_LIBS"
++LIBGNUTLS_EXTRA_LIBS="-L${libdir} $LIBOPENCDK_LIBS $LZO_LIBS $LIBGNUTLS_LIBS"
+ LIBGNUTLS_EXTRA_CFLAGS="$LIBOPENCDK_CFLAGS -I${includedir}"
+ AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
+ AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
+ 
+ 
diff --git a/net-libs/gnutls/gnutls-1.4.4.ebuild b/net-libs/gnutls/gnutls-1.4.4.ebuild
index 61b55c671d2b..d0f109a742f7 100644
--- a/net-libs/gnutls/gnutls-1.4.4.ebuild
+++ b/net-libs/gnutls/gnutls-1.4.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.4.4.ebuild,v 1.1 2006/09/16 01:41:19 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.4.4.ebuild,v 1.2 2006/09/17 13:45:34 dragonheart Exp $
 
-inherit eutils gnuconfig libtool
+inherit eutils autotools
 
 DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
 HOMEPAGE="http://www.gnutls.org/"
@@ -28,6 +28,13 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool
 	doc? ( dev-util/gtk-doc )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-selflink.patch
+	AT_M4DIR="${S}/m4 ${S}/gl/m4" _elibtoolize --copy --force
+	eautoconf -I m4 -I gl/m4
+}
 
 src_compile() {
 	local myconf=""