Fixing build against >=net-libs/gnutls-2.7.1 bug #271989. Fixing broken pkg-config file, bug #271994. Both patches thanks to Robert Marmorstein <rmmarm@sdf.lonestar.org> and Priit Laes <plaes@plaes.org>

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 45 insertions, 4 deletions

diff --git a/net-libs/net6/ChangeLog b/net-libs/net6/ChangeLog
index 9ebaa907fe24..a7a6c6a803a7 100644
--- a/net-libs/net6/ChangeLog
+++ b/net-libs/net6/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/net6
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/net6/ChangeLog,v 1.31 2009/10/28 20:37:08 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/net6/ChangeLog,v 1.32 2009/10/28 20:59:46 vostorga Exp $
+
+  28 Oct 2009; Víctor Ostorga <vostorga@gentoo.org> net6-1.3.9.ebuild,
+  +files/net6-1.3.9-libgnutls.patch:
+  Fixing build against >=net-libs/gnutls-2.7.1 bug #271989.
+  Fixing broken pkg-config file, bug #271994
+  Both patches thanks to Robert Marmorstein <rmmarm@sdf.lonestar.org> and
+  Priit
+  Laes <plaes@plaes.org> .
 
 *net6-1.3.10 (28 Oct 2009)
 
diff --git a/net-libs/net6/Manifest b/net-libs/net6/Manifest
index 45098028348b..0dc94435d8a3 100644
--- a/net-libs/net6/Manifest
+++ b/net-libs/net6/Manifest
@@ -1,3 +1,4 @@
+AUX net6-1.3.9-libgnutls.patch 738 RMD160 61adf918c10596cd66b3d75a950b190eeb76f71e SHA1 3b35519e3ff2cd2bddfb45fbf945bfafa35e116b SHA256 984b603d8b0e3e2ca2a5e62316dcc7a246e3f9d2346a592b9b82cb6f3e888cc5
 DIST net6-1.3.10.tar.gz 454813 RMD160 9607fe1665aab0ed0354607f82ba4e3fe8733244 SHA1 880e00518296395705041dc7e64c2c82f7c53ddd SHA256 361b99ca872ce6e6e32d6c9e2ca372eefbb3be9b9ab1d62495a43055ce618d99
 DIST net6-1.3.5.tar.gz 439188 RMD160 eeaa04bc6975424b5b602220f84a6368e731f825 SHA1 62807f3e2d932c087c99d1a10e9d0e515903e0ba SHA256 735ccbfd8d69201efd30cf874f728a2dfbdadf0fd0d8d91c7884e90d40176c62
 DIST net6-1.3.8.tar.gz 449238 RMD160 7deca8047bf371b4c7f35d64c6ba84513592c1f2 SHA1 7f164ab80da90ee416d199c89b378962e5cf113b SHA256 389dd984058482e8834ab1adcd0e2a8f559d37c6fb5e5f32d01755c5c434e3f1
@@ -5,6 +6,6 @@ DIST net6-1.3.9.tar.gz 449368 RMD160 178c0093edfc9edc3f11afed06c4743ef86052e8 SH
 EBUILD net6-1.3.10.ebuild 750 RMD160 f8539e4c7ec259eb7fd97c0f6b08f416ea385b8e SHA1 face0b4f1d65a1efc98223bca9bba2bc4aad4d63 SHA256 220a266f033bf468e16fb0f67c9133bb3a55f115f7f8b1863c6519865d0ca399
 EBUILD net6-1.3.5.ebuild 657 RMD160 4724118f3d414fb5279cdd3f1d0f01667cffcd78 SHA1 dfceee314e249631d0cb5fbf633f836b16664861 SHA256 3f400637f019b101735bf87238a675ab31e17015f6f8b8b5efe047c9a194e05c
 EBUILD net6-1.3.8.ebuild 796 RMD160 4b02ae7edfed293817d4e5329e9c8a3c0f6bd3c9 SHA1 6bcc6953649836f639b5950d134a4786727ac76b SHA256 d1871502cc632326d72c6d3c6e123f6eaa37c151e47d7e449258d67b3203a46b
-EBUILD net6-1.3.9.ebuild 743 RMD160 8440f94fa94c45d9fc6d5e069b0416763516af99 SHA1 168eebaa8a46e37740cd91beccef693195495fb0 SHA256 93b118866277d4bc4b1843b6d55c8325e660f4fa5c9b4a0bcf4107de9c3b516e
-MISC ChangeLog 4479 RMD160 4e702814f5011c4cb4b10a7cb236ae5a6a39068a SHA1 3e3e371ee86018e2616e5902ec9fb69f84e9ceed SHA256 32072ebf64c2d750179e8312bfb226a21115cc1f22b4f47fb1a56b010234db27
+EBUILD net6-1.3.9.ebuild 935 RMD160 2a7566a0eb1a74f9a96a5e18df208a7e7c8b80e3 SHA1 3f335309e30267e3a8c9e7d06ca9de8ef4f70d22 SHA256 ad63f20d6f9b617e7c52883b52df586852699f130885d35fbc04c8a4756cb045
+MISC ChangeLog 4803 RMD160 598a7eb842c59ae9a730bb2ebac9ef429230fdbb SHA1 32c603fdbfcdbcec64500a557cafb42f23d21c65 SHA256 74c96354b9b3cf611a598420a2efd9e4a56e132e7d9d8248d504cdd3d2e27c0f
 MISC metadata.xml 406 RMD160 414600c4e8b2823dcbdeee1de475b33524c18356 SHA1 e35ce64489f4d205a9a31a60d2713947ec05e88c SHA256 cff8c191160bdb9c8de4143cbf4383756291a02f715c3d1ea5b4f38349defc51
diff --git a/net-libs/net6/files/net6-1.3.9-libgnutls.patch b/net-libs/net6/files/net6-1.3.9-libgnutls.patch
new file mode 100644
index 000000000000..85143ea5e35a
--- /dev/null
+++ b/net-libs/net6/files/net6-1.3.9-libgnutls.patch
@@ -0,0 +1,22 @@
+diff -Naur net6-1.3.9.old/configure.ac net6-1.3.9/configure.ac
+--- net6-1.3.9.old/configure.ac	2009-07-18 17:19:58.000000000 -0400
++++ net6-1.3.9/configure.ac	2009-07-18 17:21:24.000000000 -0400
+@@ -73,17 +73,7 @@
+ 
+ # Checks for libraries.
+ PKG_CHECK_MODULES([libnet6], [sigc++-2.0])
+-
+-AM_PATH_LIBGNUTLS( 1.0.0,, AC_MSG_ERROR([[
+-***
+-*** libgnutls was not found. You may want to get it by using the
+-*** package manager of your distribution or by compiling the source
+-*** from ftp://ftp.gnutls.org/pub/gnutls/. This dependency is
+-*** now mandatory.
+-]]))
+-addlibs="$addlibs $LIBGNUTLS_LIBS"
+-addcflags="$LIBGNUTLS_CFLAGS"
+-AC_SUBST(addcflags)
++PKG_CHECK_MODULES([LIBGNUTLS], [gnutls])
+ 
+ # gettext / i18n
+ AM_GNU_GETTEXT([external])
diff --git a/net-libs/net6/net6-1.3.9.ebuild b/net-libs/net6/net6-1.3.9.ebuild
index fdc2e661bab1..8e4289fc2938 100644
--- a/net-libs/net6/net6-1.3.9.ebuild
+++ b/net-libs/net6/net6-1.3.9.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/net6/net6-1.3.9.ebuild,v 1.2 2009/07/02 18:17:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/net6/net6-1.3.9.ebuild,v 1.3 2009/10/28 20:59:46 vostorga Exp $
 
 EAPI="2"
 
+inherit eutils autotools
+
 DESCRIPTION="Network access framework for IPv4/IPv6 written in C++"
 HOMEPAGE="http://gobby.0x539.de/"
 SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz"
@@ -18,6 +20,14 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.20
 	nls? ( sys-devel/gettext )"
 
+src_prepare() {
+	#bug #271989
+	epatch "${FILESDIR}"/net6-1.3.9-libgnutls.patch
+	#bug #271994
+	sed -i -e 's:@addcflags@::g' net6-1.3.pc.in || die
+	eautoreconf
+}
+
 src_configure() {
 	econf $(use_enable nls)
 }