fix for selftest with LDFLAGS="-Wl,--as-needed" as per bug #142353 thanks to Brant Gurganus. Version bump to 1.4.1 as well

(Portage version: 2.1.1_pre4)

8 files changed, 275 insertions, 2 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 3c605f942db2..daee3e258a07 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,15 @@
 # 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.97 2006/07/15 19:24:28 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.98 2006/08/01 04:13:46 dragonheart Exp $
+
+*gnutls-1.4.1 (01 Aug 2006)
+*gnutls-1.2.11 (01 Aug 2006)
+
+  01 Aug 2006; Daniel Black <dragonheart@gentoo.org>
+  +files/gnutls-1.2.10-as-needed.patch, +files/gnutls-1.4.1-as-needed.patch,
+  gnutls-1.2.10-r1.ebuild, +gnutls-1.2.11.ebuild, +gnutls-1.4.1.ebuild:
+  fix for selftest with LDFLAGS="-Wl,--as-needed" as per bug #142353 thanks to
+  Brant Gurganus. Version bump to 1.4.1 as well
 
   15 Jul 2006; Marcelo Goes <vanquirius@gentoo.org> -gnutls-1.2.3.ebuild,
   -gnutls-1.2.4.ebuild, -gnutls-1.2.9.ebuild, -gnutls-1.2.9-r1.ebuild:
diff --git a/net-libs/gnutls/files/digest-gnutls-1.2.11 b/net-libs/gnutls/files/digest-gnutls-1.2.11
new file mode 100644
index 000000000000..af7b6cb4b1c5
--- /dev/null
+++ b/net-libs/gnutls/files/digest-gnutls-1.2.11
@@ -0,0 +1,3 @@
+MD5 e471ec76791929aa65311c57e0768a6f gnutls-1.2.11.tar.bz2 2756620
+RMD160 07b3f4b9fb875c55e981f95aa4edb6c639176331 gnutls-1.2.11.tar.bz2 2756620
+SHA256 400c118150b31f475a5d562d60ab6912ed7a52b12ef31b2ad9b30a6960ea446d gnutls-1.2.11.tar.bz2 2756620
diff --git a/net-libs/gnutls/files/digest-gnutls-1.4.1 b/net-libs/gnutls/files/digest-gnutls-1.4.1
new file mode 100644
index 000000000000..7f04a038be5c
--- /dev/null
+++ b/net-libs/gnutls/files/digest-gnutls-1.4.1
@@ -0,0 +1,3 @@
+MD5 1948be128e8f684da034b32988867a13 gnutls-1.4.1.tar.bz2 4046780
+RMD160 1bb959a118ce8d776693f602034342c31a8737aa gnutls-1.4.1.tar.bz2 4046780
+SHA256 834e0009a6bfc67c427ba652ae2139f6cce50b4a1ac38214de6249611de73def gnutls-1.4.1.tar.bz2 4046780
diff --git a/net-libs/gnutls/files/gnutls-1.2.10-as-needed.patch b/net-libs/gnutls/files/gnutls-1.2.10-as-needed.patch
new file mode 100644
index 000000000000..78c961a20572
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-1.2.10-as-needed.patch
@@ -0,0 +1,35 @@
+--- gnutls-1.2.10/tests/Makefile.am.orig	2006-08-01 11:00:11.000000000 +1000
++++ gnutls-1.2.10/tests/Makefile.am	2006-08-01 11:00:54.000000000 +1000
+@@ -29,6 +29,7 @@
+ EXTRA_DIST = client.p12 noclient.p12 unclient.p12
+ 
+ openssl_LDADD = $(LDADD) ../libextra/libgnutls-openssl.la
++gc_LDADD = $(LDADD) $(LIBGCRYPT_LIBS)
+ 
+ ctests = simple anonself openssl gc
+ TESTS = pkcs12_neon $(ctests)
+--- gnutls-1.2.10/tests/Makefile.in.orig	2006-08-01 11:01:54.000000000 +1000
++++ gnutls-1.2.10/tests/Makefile.in	2006-08-01 11:02:52.000000000 +1000
+@@ -122,11 +122,11 @@
+ 	libutils.la
+ gc_SOURCES = gc.c
+ gc_OBJECTS = gc.$(OBJEXT)
+-gc_LDADD = $(LDADD)
+-gc_DEPENDENCIES = ../lib/libgnutls.la ../gl/libgnu.la libutils.la
++am__DEPENDENCIES_1 = ../lib/libgnutls.la ../gl/libgnu.la libutils.la
++am__DEPENDENCIES_2 =
++gc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+ openssl_SOURCES = openssl.c
+ openssl_OBJECTS = openssl.$(OBJEXT)
+-am__DEPENDENCIES_1 = ../lib/libgnutls.la ../gl/libgnu.la libutils.la
+ openssl_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ 	../libextra/libgnutls-openssl.la
+ simple_SOURCES = simple.c
+@@ -321,6 +321,7 @@
+ libutils_la_SOURCES = utils.h utils.c
+ EXTRA_DIST = client.p12 noclient.p12 unclient.p12
+ openssl_LDADD = $(LDADD) ../libextra/libgnutls-openssl.la
++gc_LDADD = $(LDADD) $(LIBGCRYPT_LIBS)
+ ctests = simple anonself openssl gc
+ TESTS = pkcs12_neon $(ctests)
+ dist_check_SCRIPTS = pkcs12_neon
diff --git a/net-libs/gnutls/files/gnutls-1.4.1-as-needed.patch b/net-libs/gnutls/files/gnutls-1.4.1-as-needed.patch
new file mode 100644
index 000000000000..839464de6fa9
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-1.4.1-as-needed.patch
@@ -0,0 +1,92 @@
+--- gnutls-1.4.1/tests/Makefile.am.orig	2006-08-01 11:49:16.000000000 +1000
++++ gnutls-1.4.1/tests/Makefile.am	2006-08-01 11:50:12.000000000 +1000
+@@ -35,6 +35,7 @@
+ openssl_LDADD = $(LDADD) ../libextra/libgnutls-openssl.la
+ tlsia_LDADD = $(LDADD) ../libextra/libgnutls-extra.la \
+ 	../gl/libgnu.la @LTLIBREADLINE@
++gc_LDADD = $(LDADD) $(LIBGCRYPT_LIBS)
+ 
+ ctests = simple anonself pskself openssl gc dhepskself set_pkcs12_cred	\
+ 	tlsia resume certder
+--- gnutls-1.4.1/tests/Makefile.in.orig	2006-08-01 11:49:21.000000000 +1000
++++ gnutls-1.4.1/tests/Makefile.in	2006-08-01 11:50:46.000000000 +1000
+@@ -138,13 +138,12 @@
+ 	../lib/libgnutls.la libutils.la
+ gc_SOURCES = gc.c
+ gc_OBJECTS = gc.$(OBJEXT)
+-gc_LDADD = $(LDADD)
+-gc_DEPENDENCIES = ../lib/libgnutls.la ../gl/libgnu.la \
++am__DEPENDENCIES_1 = ../lib/libgnutls.la ../gl/libgnu.la \
+ 	../lib/libgnutls.la libutils.la
++am__DEPENDENCIES_2 =
++gc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+ openssl_SOURCES = openssl.c
+ openssl_OBJECTS = openssl.$(OBJEXT)
+-am__DEPENDENCIES_1 = ../lib/libgnutls.la ../gl/libgnu.la \
+-	../lib/libgnutls.la libutils.la
+ openssl_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ 	../libextra/libgnutls-openssl.la
+ pskself_SOURCES = pskself.c
+@@ -250,7 +249,6 @@
+ GL_COND_LIBTOOL_FALSE = @GL_COND_LIBTOOL_FALSE@
+ GL_COND_LIBTOOL_TRUE = @GL_COND_LIBTOOL_TRUE@
+ GMSGFMT = @GMSGFMT@
+-GREP = @GREP@
+ GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
+ GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
+ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
+@@ -347,9 +345,15 @@
+ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+ WINT_T_SUFFIX = @WINT_T_SUFFIX@
+ XGETTEXT = @XGETTEXT@
++ac_ct_AR = @ac_ct_AR@
++ac_ct_AS = @ac_ct_AS@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
++ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+ ac_ct_F77 = @ac_ct_F77@
++ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
++ac_ct_RANLIB = @ac_ct_RANLIB@
++ac_ct_STRIP = @ac_ct_STRIP@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+@@ -366,30 +370,23 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
+-datarootdir = @datarootdir@
+-docdir = @docdir@
+-dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+-htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+-pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+-psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+@@ -413,6 +410,7 @@
+ tlsia_LDADD = $(LDADD) ../libextra/libgnutls-extra.la \
+ 	../gl/libgnu.la @LTLIBREADLINE@
+ 
++gc_LDADD = $(LDADD) $(LIBGCRYPT_LIBS)
+ ctests = simple anonself pskself openssl gc dhepskself set_pkcs12_cred	\
+ 	tlsia resume certder
+ 
diff --git a/net-libs/gnutls/gnutls-1.2.10-r1.ebuild b/net-libs/gnutls/gnutls-1.2.10-r1.ebuild
index 1c27c7c16e7d..923aa43a16ce 100644
--- a/net-libs/gnutls/gnutls-1.2.10-r1.ebuild
+++ b/net-libs/gnutls/gnutls-1.2.10-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2.10-r1.ebuild,v 1.3 2006/04/23 14:00:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.2.10-r1.ebuild,v 1.4 2006/08/01 04:13:46 dragonheart Exp $
 
 inherit eutils gnuconfig libtool
 
@@ -34,6 +34,7 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
+	epatch "${FILESDIR}"/${P}-as-needed.patch
 	cd "${S}"
 
 	elibtoolize
diff --git a/net-libs/gnutls/gnutls-1.2.11.ebuild b/net-libs/gnutls/gnutls-1.2.11.ebuild
new file mode 100644
index 000000000000..2abf7709de2f
--- /dev/null
+++ b/net-libs/gnutls/gnutls-1.2.11.ebuild
@@ -0,0 +1,65 @@
+# 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.2.11.ebuild,v 1.1 2006/08/01 04:13:46 dragonheart Exp $
+
+inherit eutils gnuconfig libtool
+
+DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/${P}.tar.bz2"
+
+# GPL-2 for the gnutls-extras library and LGPL for the gnutls library.
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="zlib doc crypt"
+
+RDEPEND=">=dev-libs/libgcrypt-1.2.2
+	>=app-crypt/opencdk-0.5.5
+	zlib? ( >=sys-libs/zlib-1.1 )
+	virtual/libc
+	>=dev-libs/lzo-2
+	dev-libs/libgpg-error"
+#	>=dev-libs/libtasn1-0.3.4
+#	crypt? ( >=app-crypt/opencdk-0.5.5 )
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+# gnutls has its own version of these. should maybe avoid using.
+#	libtasn1
+#	opencdk
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-1.2.10-as-needed.patch
+	elibtoolize
+}
+
+src_compile() {
+	local myconf=""
+	# use crypt || myconf="${myconf} --disable-extra-pki --disable-openpgp-authentication"
+
+	econf  \
+		$(use_with zlib) \
+		--without-included-minilzo \
+		--without-included-libtasn1 \
+		--without-included-opencdk \
+		$(use_enable doc gtk-doc) \
+		${myconf} || die
+	emake || die
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog NEWS \
+		README THANKS doc/TODO
+
+	if use doc ; then
+		dodoc doc/README.autoconf doc/tex/gnutls.ps
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}
diff --git a/net-libs/gnutls/gnutls-1.4.1.ebuild b/net-libs/gnutls/gnutls-1.4.1.ebuild
new file mode 100644
index 000000000000..7b9bbbb32389
--- /dev/null
+++ b/net-libs/gnutls/gnutls-1.4.1.ebuild
@@ -0,0 +1,65 @@
+# 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.1.ebuild,v 1.1 2006/08/01 04:13:46 dragonheart Exp $
+
+inherit eutils gnuconfig libtool
+
+DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/${P}.tar.bz2"
+
+# GPL-2 for the gnutls-extras library and LGPL for the gnutls library.
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="zlib doc crypt"
+
+RDEPEND=">=dev-libs/libgcrypt-1.2.2
+	>=app-crypt/opencdk-0.5.5
+	zlib? ( >=sys-libs/zlib-1.1 )
+	virtual/libc
+	>=dev-libs/lzo-2
+	dev-libs/libgpg-error"
+#	>=dev-libs/libtasn1-0.3.4
+#	crypt? ( >=app-crypt/opencdk-0.5.5 )
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+# gnutls has its own version of these. should maybe avoid using.
+#	libtasn1
+#	opencdk
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	cd "${S}"
+
+	elibtoolize
+}
+
+src_compile() {
+	local myconf=""
+	# use crypt || myconf="${myconf} --disable-extra-pki --disable-openpgp-authentication"
+
+	econf  \
+		$(use_with zlib) \
+		--without-included-minilzo \
+		--without-included-libtasn1 \
+		--without-included-opencdk \
+		$(use_enable doc gtk-doc) \
+		${myconf} || die
+	emake || die
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog NEWS \
+		README THANKS doc/TODO
+
+	if use doc ; then
+		dodoc doc/README.autoconf doc/tex/gnutls.ps
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}