fixed selflink patch thanks to Alon Bar-Lev in bug #147800

(Portage version: 2.1.2_pre1)

4 files changed, 90 insertions, 16 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 09b6688486ba..4ca1cc726c0e 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,13 @@
 # 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.103 2006/09/17 21:27:34 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.104 2006/09/19 20:30:16 dragonheart Exp $
+
+*gnutls-1.4.4-r1 (19 Sep 2006)
+
+  19 Sep 2006; Daniel Black <dragonheart@gentoo.org>
+  files/gnutls-1.4.4-selflink.patch, -gnutls-1.4.4.ebuild,
+  +gnutls-1.4.4-r1.ebuild:
+  fixed selflink patch thanks to Alon Bar-Lev in bug #147800
 
   17 Sep 2006; Daniel Black <dragonheart@gentoo.org> gnutls-1.4.4.ebuild:
   Temporarily added sys-devel/autoconf-2.60 dependency as per bug #147970
diff --git a/net-libs/gnutls/files/digest-gnutls-1.4.4-r1 b/net-libs/gnutls/files/digest-gnutls-1.4.4-r1
new file mode 100644
index 000000000000..d15ca93b66b4
--- /dev/null
+++ b/net-libs/gnutls/files/digest-gnutls-1.4.4-r1
@@ -0,0 +1,3 @@
+MD5 de5e060eeb2da36654e9e8af6b8b012a gnutls-1.4.4.tar.bz2 4048916
+RMD160 a31dfe33934ddf2500ae0e6c67aa265cd5b9ede4 gnutls-1.4.4.tar.bz2 4048916
+SHA256 dfcdcd622b80b00d28ee40881ee56fec771213110b7fc07048bce07df7cec035 gnutls-1.4.4.tar.bz2 4048916
diff --git a/net-libs/gnutls/files/gnutls-1.4.4-selflink.patch b/net-libs/gnutls/files/gnutls-1.4.4-selflink.patch
index 5a33a1fa40c1..297f988dc8db 100644
--- a/net-libs/gnutls/files/gnutls-1.4.4-selflink.patch
+++ b/net-libs/gnutls/files/gnutls-1.4.4-selflink.patch
@@ -1,19 +1,21 @@
---- 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
+diff -urNp gnutls-1.4.4.org/libextra/Makefile.am gnutls-1.4.4/libextra/Makefile.am
+--- gnutls-1.4.4.org/libextra/Makefile.am	2006-03-08 12:48:08.000000000 +0200
++++ gnutls-1.4.4/libextra/Makefile.am	2006-09-19 18:14:58.000000000 +0300
+@@ -59,7 +59,7 @@ lib_LTLIBRARIES = libgnutls-extra.la
  
--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_la_SOURCES = gnutls_extra.c
  
--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)
+-libgnutls_openssl_la_LDFLAGS = -no-undefined
++libgnutls_openssl_la_LDFLAGS = -no-undefined -L../lib/.libs
  
+ # OpenSSL
  
+@@ -83,7 +83,7 @@ endif
+ # OpenPGP
+ 
+ libgnutls_extra_la_LIBADD =
+-libgnutls_extra_la_LDFLAGS = -no-undefined
++libgnutls_extra_la_LDFLAGS = -no-undefined -L../lib/.libs
+ if ENABLE_OPENPGP
+ libgnutls_extra_la_SOURCES += gnutls_openpgp.c
+ libgnutls_extra_la_LIBADD += openpgp/libgnutls_openpgp.la
diff --git a/net-libs/gnutls/gnutls-1.4.4-r1.ebuild b/net-libs/gnutls/gnutls-1.4.4-r1.ebuild
new file mode 100644
index 000000000000..a1ba86883039
--- /dev/null
+++ b/net-libs/gnutls/gnutls-1.4.4-r1.ebuild
@@ -0,0 +1,62 @@
+# 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-r1.ebuild,v 1.1 2006/09/19 20:30:16 dragonheart Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+SRC_URI="http://josefsson.org/gnutls/releases/${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 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="zlib doc"
+
+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
+	sys-devel/gettext"
+#>=sys-devel/gettext-0.14.5" autoconf indicates this version but it works
+# without it
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	doc? ( dev-util/gtk-doc )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-selflink.patch
+	elibtoolize
+	eautomake
+}
+
+src_compile() {
+	local myconf=""
+
+	econf  \
+		$(use_with zlib) \
+		--without-included-minilzo \
+		--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
+}