Add patch to fix bugs #226195 and #220765

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.24-gentoo-r8 i686

5 files changed, 47 insertions, 4 deletions

diff --git a/net-p2p/gnunet/ChangeLog b/net-p2p/gnunet/ChangeLog
index 2086b0514210..d4dbdbc75b0a 100644
--- a/net-p2p/gnunet/ChangeLog
+++ b/net-p2p/gnunet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/gnunet
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/ChangeLog,v 1.63 2008/02/25 14:11:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/ChangeLog,v 1.64 2008/06/30 16:09:45 armin76 Exp $
+
+  30 Jun 2008; Raúl Porcel <armin76@gentoo.org>
+  +files/0.7.3-configure.patch, +files/0.7.3-libtool.patch,
+  gnunet-0.7.3-r1.ebuild:
+  Add patch to fix bugs #226195 and #220765
 
   25 Feb 2008; Raúl Porcel <armin76@gentoo.org> -gnunet-0.7.2c-r1.ebuild,
   gnunet-0.7.3-r1.ebuild:
diff --git a/net-p2p/gnunet/Manifest b/net-p2p/gnunet/Manifest
index d5687dd0120e..03e9dbf9c4ed 100644
--- a/net-p2p/gnunet/Manifest
+++ b/net-p2p/gnunet/Manifest
@@ -1,5 +1,7 @@
+AUX 0.7.3-configure.patch 520 RMD160 2153ddc2a34ff30350706b1c9ce29d3f382ec438 SHA1 60d9da70e741e54c9ed9012e44c407ac5cadfa39 SHA256 86182530281e5a9c2ec0b96f2f1e608141205525ec80fbac92402f876d822f65
+AUX 0.7.3-libtool.patch 422 RMD160 a2d989a6b89d33cf023179be5725be22e80c9885 SHA1 b34499932830bdcf711d95c7312dce3ddc818699 SHA256 14909ee0d964c62d3ea102db37100dd22f8dcdba9d70c8610380ef879a26fc52
 AUX gnunet.initd 643 RMD160 434eb6752143fbb600f96a58ed7c5ba1a47e654d SHA1 de7f208ce286a05310551a35345b2f02f5712831 SHA256 c6748f137d7c808685a741617e1449024bcb37dcfc11e883d859f5e0134744a6
 DIST GNUnet-0.7.3.tar.bz2 1687898 RMD160 df986c0f4dccf5ae64a65e54fc0837d77f7f9387 SHA1 4ceffe6126caeeb478f18a1e29110fa852e3826f SHA256 378ea16fdd8b43d0c002a9c2bd4bcb878b60b61608838cd329821d5ffded25b7
-EBUILD gnunet-0.7.3-r1.ebuild 2738 RMD160 3f05e1afdf0c91c945bab73f5f2f1832e899aca7 SHA1 7d7cc92047be6728eac91fcd04f48d766f627d4c SHA256 2574ebf6ae3d241b7c5c801fe8386ed659ac49931534f1f5d7873b36b3de8d16
-MISC ChangeLog 10183 RMD160 3be5ea7f398602594012e33290cc689610beaf7b SHA1 37fbe2d4781a7826a024e9d4c0addd22b9f72f7d SHA256 e62bdbcd11c03587a6131454882e3b44484c321beebb7b58053371c855579a9d
+EBUILD gnunet-0.7.3-r1.ebuild 2825 RMD160 4626f728c1ac5d35bd67622cb8a1e58d5383e922 SHA1 82500554919a17fbe37e053e1876af7718c1aced SHA256 40e820ae4ba9488d6c638b8ca3601192a06c3ec14fe2cbed1aeec7fedc751eb7
+MISC ChangeLog 10363 RMD160 359e95c9d4b2ffbb4708eb827a21bfde872f554f SHA1 4f5456f364ef289f1f373f22d46c37222c653e45 SHA256 dff73f36e18bf9485540ce572f4b99d7a03b1a0180259e5a8576d79499c0295f
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
diff --git a/net-p2p/gnunet/files/0.7.3-configure.patch b/net-p2p/gnunet/files/0.7.3-configure.patch
new file mode 100644
index 000000000000..5bb36443b15e
--- /dev/null
+++ b/net-p2p/gnunet/files/0.7.3-configure.patch
@@ -0,0 +1,18 @@
+svn diff -r7052:7110 https://gnunet.org/svn/GNUnet/configure.ac
+r7110 | amatus | 2008-06-09 18:34:31 +0200 (Mo, 09 Jun 2008) | 2 lines
+Added AC_PROG_CXX to make configure work in archlinux.
+
+See also https://bugs.gentoo.org/show_bug.cgi?id=226195
+
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 7052)
++++ configure.ac	(revision 7110)
+@@ -31,6 +31,7 @@
+ AC_PROG_AWK
+ AC_PROG_CC
+ AC_PROG_CPP
++AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
diff --git a/net-p2p/gnunet/files/0.7.3-libtool.patch b/net-p2p/gnunet/files/0.7.3-libtool.patch
new file mode 100644
index 000000000000..078fc9072a90
--- /dev/null
+++ b/net-p2p/gnunet/files/0.7.3-libtool.patch
@@ -0,0 +1,15 @@
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 6742)
++++ configure.ac	(revision 6836)
+@@ -39,9 +39,9 @@
+ AC_LIBTOOL_WIN32_DLL
+ AC_LIBLTDL_INSTALLABLE
+ AC_PROG_LIBTOOL
+-AC_CONFIG_SUBDIRS(libltdl)
+ AC_CANONICAL_HOST
+ AC_LIB_LTDL
++m4_ifdef([_AC_SEEN_TAG(libltdl)], [], [AC_CONFIG_SUBDIRS(libltdl)])
+ AC_SUBST(LTDLINCL)
+ AC_SUBST(LIBLTDL)
+ AC_SUBST(MKDIR_P)
diff --git a/net-p2p/gnunet/gnunet-0.7.3-r1.ebuild b/net-p2p/gnunet/gnunet-0.7.3-r1.ebuild
index 0fcfeb173dc7..24ad72c7a46b 100644
--- a/net-p2p/gnunet/gnunet-0.7.3-r1.ebuild
+++ b/net-p2p/gnunet/gnunet-0.7.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.7.3-r1.ebuild,v 1.3 2008/02/25 14:11:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.7.3-r1.ebuild,v 1.4 2008/06/30 16:09:45 armin76 Exp $
 
 inherit eutils autotools
 
@@ -60,6 +60,9 @@ src_unpack() {
 		sed -i "s:AC_DEFINE_UNQUOTED..HAVE_GTK.*:true:" configure.ac
 	fi
 
+	epatch "${FILESDIR}"/${PV}-libtool.patch
+	epatch "${FILESDIR}"/${PV}-configure.patch
+
 	AT_M4DIR="${S}/m4" eautoreconf
 }