Solved problems with autotools' files

Package-Manager: portage-2.0.51.22-r1

4 files changed, 86 insertions, 7 deletions

diff --git a/net-p2p/gnunet/ChangeLog b/net-p2p/gnunet/ChangeLog
index a0fad466fa31..ef23279b53df 100644
--- a/net-p2p/gnunet/ChangeLog
+++ b/net-p2p/gnunet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/gnunet
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/ChangeLog,v 1.29 2005/04/02 16:35:37 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/ChangeLog,v 1.30 2005/05/29 21:26:17 sekretarz Exp $
+
+  29 May 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  +files/gnunet-0.6.6b-autotools.patch, gnunet-0.6.6b.ebuild:
+  Solved problems with autotools' files
 
   02 Apr 2005; Sven Wegener <swegener@gentoo.org> gnunet-0.6.6b.ebuild:
   Fixed invalid atoms in *DEPEND.
diff --git a/net-p2p/gnunet/Manifest b/net-p2p/gnunet/Manifest
index 89cec1e85da8..09c7b706603b 100644
--- a/net-p2p/gnunet/Manifest
+++ b/net-p2p/gnunet/Manifest
@@ -3,19 +3,20 @@ Hash: SHA1
 
 MD5 3d78de0ed5d6b9f64a9f638fe2b94e66 gnunet-0.6.2b.ebuild 1611
 MD5 4f9226f4408ff37f868a8367513e9c56 gnunet-0.5.4-r1.ebuild 1260
-MD5 243db1f818b2dd33a3f1fd4d652db391 gnunet-0.6.6b.ebuild 2257
-MD5 5f81826281d03037ddcde80e95bdd63e ChangeLog 4720
+MD5 dd86759e7dfad2158d9ba2b965e25a58 gnunet-0.6.6b.ebuild 2431
+MD5 83b99e12c2a8027afb263e4dde532c13 ChangeLog 4878
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 MD5 d4a748c8e3536c6691b63794f7c17639 files/digest-gnunet-0.6.2b 66
 MD5 3f90482aa89d1669318f7ec7de1943a3 files/digest-gnunet-0.6.6b 67
 MD5 6ac0938893978d5f2bc22bf808bc0fe3 files/gnunet-0.6.6b 794
 MD5 6113da0c1798ff38d8d4c1fd4c9dfbb6 files/gnunet 805
 MD5 12b0bdd38d4a838fcc6d4e8b970870f5 files/digest-gnunet-0.5.4-r1 65
+MD5 a38f2ed0178c5ebc09e4f5fc2c3baddd files/gnunet-0.6.6b-autotools.patch 2065
 MD5 7e0bb86547b0ad5e7744374d32c124f8 files/gnunet-download-manager.scm 13338
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCTsntI1lqEGTUzyQRAmlwAJ0eIZpXmmoPuAJfi+lCVDVT8f9KvwCdGME1
-+LafwODlPev41W8Gs/gObqM=
-=sCbv
+iD8DBQFCmk5fZ/iYVBmujdURAjT4AKD8KQoRoXqjQis3Fv+06+vaxk/9hQCgs5xD
+hIrvas7fkNOrglfkISfIcWM=
+=cgAA
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/gnunet/files/gnunet-0.6.6b-autotools.patch b/net-p2p/gnunet/files/gnunet-0.6.6b-autotools.patch
new file mode 100644
index 000000000000..7cf6a3e61a3c
--- /dev/null
+++ b/net-p2p/gnunet/files/gnunet-0.6.6b-autotools.patch
@@ -0,0 +1,64 @@
+diff -Naur GNUnet-0.6.6b.orig/configure.ac GNUnet-0.6.6b/configure.ac
+--- GNUnet-0.6.6b.orig/configure.ac	2005-02-28 04:03:38.000000000 +0100
++++ GNUnet-0.6.6b/configure.ac	2005-05-30 00:47:45.947668208 +0200
+@@ -235,7 +235,6 @@
+         CPPFLAGS="-I$with_extractor/include $CPPFLAGS"
+         AC_CHECK_HEADERS(extractor.h,
+           AC_CHECK_LIB([extractor], [EXTRACTOR_loadDefaultLibraries],
+-            EXT_LIB_PATH="-L$with_extractor/lib $EXT_LIB_PATH"
+             extractor=1))
+         ;;
+     esac
+@@ -268,7 +267,6 @@
+     CPPFLAGS="-I$with_gdbm/include $CPPFLAGS"
+     AC_CHECK_HEADERS(gdbm.h,
+      AC_CHECK_LIB(gdbm, gdbm_open,
+-      EXT_LIB_PATH="-L$with_gdbm/lib $EXT_LIB_PATH"
+       gdb=true))
+     ;;
+    esac
+@@ -291,7 +289,6 @@
+     CPPFLAGS="-I$with_tdb/include $CPPFLAGS"
+     AC_CHECK_HEADERS(tdb.h,
+      AC_CHECK_LIB(tdb, tdb_open,
+-      EXT_LIB_PATH="-L$with_tdb/lib $EXT_LIB_PATH"
+       tdb=true))
+    fi
+   ],
+@@ -313,7 +310,6 @@
+     LDFLAGS="-L$with_bdb/lib $LDFLAGS"
+     CPPFLAGS="-I$with_bdb/include $CPPFLAGS"
+     AC_CHECK_HEADERS(db.h,
+-      EXT_LIB_PATH="-L$with_bdb/lib $EXT_LIB_PATH"
+       bdb=true)
+    fi
+   ],
+@@ -358,7 +354,6 @@
+     LDFLAGS="-L$with_sqlite/lib $LDFLAGS"
+     CPPFLAGS="-I$with_sqlite/include $CPPFLAGS"
+     AC_CHECK_HEADERS(sqlite3.h,
+-     EXT_LIB_PATH="-L$with_sqlite/lib $EXT_LIB_PATH"
+      sqlite=true)
+     ;;
+    esac
+@@ -385,11 +380,9 @@
+   [AC_MSG_RESULT("$with_mysql")
+    if test "$with_mysql" != "no"
+    then
+-    LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql $LDFLAGS $ZLIBS"
+-    CPPFLAGS="-I$with_mysql/include $CPPFLAGS"
++    LDFLAGS="$LDFLAGS $ZLIBS"
+     AC_CHECK_HEADERS(mysql/mysql.h,
+      AC_CHECK_LIB(mysqlclient, mysql_init,
+-      EXT_LIB_PATH="-L$with_mysql/lib -L$with_mysql/lib/mysql $EXT_LIB_PATH"
+       mysql=true))
+    fi
+   ],
+@@ -397,7 +390,6 @@
+    LDFLAGS="-L/usr/lib/mysql $LDFLAGS $ZLIBS"
+    AC_CHECK_LIB(mysqlclient, mysql_init,
+     [AC_CHECK_HEADERS(mysql/mysql.h,
+-      EXT_LIB_PATH="-L/usr/lib/mysql $EXT_LIB_PATH"
+       mysql=true
+      )])])
+ 
diff --git a/net-p2p/gnunet/gnunet-0.6.6b.ebuild b/net-p2p/gnunet/gnunet-0.6.6b.ebuild
index 196c2f984b9e..b88b54c1e3f2 100644
--- a/net-p2p/gnunet/gnunet-0.6.6b.ebuild
+++ b/net-p2p/gnunet/gnunet-0.6.6b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.6.6b.ebuild,v 1.2 2005/04/02 16:35:37 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.6.6b.ebuild,v 1.3 2005/05/29 21:26:17 sekretarz Exp $
 
 inherit eutils libtool
 
@@ -29,6 +29,14 @@ pkg_preinst() {
 	enewuser gnunet -1 /bin/false /dev/null gnunet || die "Problem adding gnunet user"
 }
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-autotools.patch
+	libtoolize --copy --force
+}
+
 src_compile() {
 	elibtoolize
 
@@ -59,6 +67,8 @@ src_install() {
 	dodoc contrib/*
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/gnunet-0.6.6b gnunet
+	dodir /var/lib/GNUnet
+	chown gnunet:gnunet ${D}/var/lib/GNUnet
 }
 
 pkg_postinst() {