Fixing parallel build and --as-needed issues wrt bug 313165. Thanks Diego for reporting.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/net-p2p/gnunet/ChangeLog b/net-p2p/gnunet/ChangeLog
index a46935f21c314527aaa3a86893d035165580346b..954f9a38b6c7c95e668c28cfebffeb87dfbd8021 100644 (file)
--- a/net-p2p/gnunet/ChangeLog
+++ b/net-p2p/gnunet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/gnunet
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/ChangeLog,v 1.67 2010/01/28 11:48:07 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/ChangeLog,v 1.68 2010/06/20 13:56:46 xarthisius Exp $
+
+  20 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/0.8.1-asneeded.patch, gnunet-0.8.1.ebuild,
+  +files/0.8.1-parallel-build.patch:
+  Fixing parallel build and --as-needed issues wrt bug 313165. Thanks Diego
+  for reporting.
 
 *gnunet-0.8.1 (28 Jan 2010)
 

diff --git a/net-p2p/gnunet/Manifest b/net-p2p/gnunet/Manifest
index f1aefe8c0d574143c28edee17b21a95b3d841f6b..11bffe33ea8679cef994b6a305d9e8aa476d69d0 100644 (file)
--- a/net-p2p/gnunet/Manifest
+++ b/net-p2p/gnunet/Manifest
@@ -1,11 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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 0.8.1-asneeded.patch 1357 RMD160 76b9cb7ee017ee664831c4ec995f9098d3998307 SHA1 56c4045726e5f4436c7f07c223a684d4cdb32aeb SHA256 bc340fa816b7fa56631909929ac936c5b70965d6286eca8d581aad4907721b80
+AUX 0.8.1-parallel-build.patch 8322 RMD160 2d053d760dd647eee2130e08fafecdcd58a529aa SHA1 6aa5306d1e23a9c57435a469e58e5bdecacba9e4 SHA256 cb126d515996428e4546803073150b34ddde9e2026135a700ced689ecedba26a
 AUX gnunet.initd 643 RMD160 434eb6752143fbb600f96a58ed7c5ba1a47e654d SHA1 de7f208ce286a05310551a35345b2f02f5712831 SHA256 c6748f137d7c808685a741617e1449024bcb37dcfc11e883d859f5e0134744a6
 DIST GNUnet-0.7.3.tar.bz2 1687898 RMD160 df986c0f4dccf5ae64a65e54fc0837d77f7f9387 SHA1 4ceffe6126caeeb478f18a1e29110fa852e3826f SHA256 378ea16fdd8b43d0c002a9c2bd4bcb878b60b61608838cd329821d5ffded25b7
 DIST GNUnet-0.8.0.tar.bz2 1689291 RMD160 7e83e0ab94b341b28435bc740eb7d962d99d266c SHA1 870658b4032e513ff5abe236b5c4a825535a87af SHA256 14a05df11ee8dafb7623592cf703cc4b89d8df362b57a7a5c039a542cd9d504d
 DIST GNUnet-0.8.1.tar.gz 2339085 RMD160 42bf5a846ba07dfbaa7207b7cfb9524ee0729f11 SHA1 679157dd8673ac912ac158b6ec65fdbe9f91605b SHA256 84da584f2b60f2026a19e38d4264c794420135323644f7b0785d67ed44815355
 EBUILD gnunet-0.7.3-r1.ebuild 2750 RMD160 f9b697cad34a90bcdfcd74f0ec3d3249af58b810 SHA1 3dfe64810858c9c27be425db4a01bb0946fcdde9 SHA256 0911db0a6b488d34a0c014239ac3df662dbb632b9c616ac673f2fba2ff72b5a9
 EBUILD gnunet-0.8.0.ebuild 2661 RMD160 84b9b35fe8e65daff10782783ac94ed816bed530 SHA1 ac617920689ff7843f6b438cad0a8d901a807f2f SHA256 e143f699e6c857159dfdd290c6641eca2ddd2e4dd5a17a3b2072d7618500c174
-EBUILD gnunet-0.8.1.ebuild 2648 RMD160 3ebbed29b8cf31723d6c4bf6189cafd22491021e SHA1 28d6ca6ba397f7a0d542f13df0ca33b2ed91f03b SHA256 e738194ca65442bbbee2a52fea999a554f3d2a02b52375318e83d936c999695a
-MISC ChangeLog 10743 RMD160 c29216db52ca0ea0298f0aff876009e80f587792 SHA1 1a0abaeaeecc2dd7025336509ee7c83876ef2c3f SHA256 088d2f6769171a76a02ed33d7e459199b1ed6a1db03be9faf07a5c1e082ddd53
+EBUILD gnunet-0.8.1.ebuild 2542 RMD160 d44367426cc74d576bf513b3900f9cb00b90e126 SHA1 bd5860674c364b996d891f91eab643b408f9c36f SHA256 28ae139d27f18644320e085b44092c021f4fc4471b651ca9fa835ac8ac83f5a6
+MISC ChangeLog 10983 RMD160 c389a5724b748a487c9a952c826c59d97f226fe9 SHA1 868617b46d6b7a3bdddb2314ec73dd4b8fd8acd7 SHA256 1d112f0d221a1a2b13b465d09e22884ba4d29a9d7cdfbd4bac1d8d60550eeb5b
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iJwEAQECAAYFAkweHigACgkQIiMqcbOVdxTWtgQAmq0CPwJIgfQqGLfKAld7bqa1
+VJGE8ywgl2fc1WKApDa043RkXRvCGpwSxoLCClOJZQLcKEnxXrz6lXb+MlOr7nPt
+24CD8QXGGATO4sK70vApkS+EVDV4uy9Asp/fJi9u61oHBF0QcdJUZ2ZdQBA3R1TC
+qV5jHQJgtdPl+sofNPE=
+=ikbq
+-----END PGP SIGNATURE-----

diff --git a/net-p2p/gnunet/files/0.8.1-asneeded.patch b/net-p2p/gnunet/files/0.8.1-asneeded.patch
new file mode 100644 (file)
index 0000000..ad7f98b
--- /dev/null
+++ b/net-p2p/gnunet/files/0.8.1-asneeded.patch
@@ -0,0 +1,47 @@
+Fixing as-needed issues
+
+http://bugs.gentoo.org/313165
+
+--- configure.ac
++++ configure.ac
+@@ -39,8 +39,8 @@
+ AC_PROG_MAKE_SET
+ LT_CONFIG_LTDL_DIR([libltdl])
+ LT_INIT([disable-static dlopen win32-dll])
+-AM_PATH_LIBLTDL([lt_dlopenext lt_dlsym], ,AC_MSG_ERROR([GNUnet needs libltdl]))
+ LT_LIB_DLLOAD
++AM_PATH_LIBLTDL([lt_dlopenext lt_dlsym], ,AC_MSG_ERROR([GNUnet needs libltdl]))
+ AC_SUBST(MKDIR_P)
+ 
+ # large file support
+--- m4/libltdl-external.m4
++++ m4/libltdl-external.m4
+@@ -19,15 +19,17 @@
+      libltdl_prefix="$withval", libltdl_prefix="")
+   ltdl_save_CPPFLAGS="$CPPFLAGS"
+   ltdl_save_LDFLAGS="$LDFLAGS"
++  ltdl_save_LIBS="$LIBS"
+   if test x$libltdl_prefix != x ; then
+-    CPPFLAGS="-I$libltdl_prefix/include $CPPFLAGS"
+-    LDFLAGS="-L$libltdl_prefix/lib -lltdl $LDFLAGS"
++    CPPFLAGS="$CPPFLAGS -I$libltdl_prefix/include"
++    LDFLAGS="$LDFLAGS -L$libltdl_prefix/lib"
++    LIBS="-lltdl $LIBS"
+   else
+     if test x"$LIBLTDL" = x ; then
+       LIBLTDL="-lltdl"
+     fi
+     CPPFLAGS="$LTDLINCL $CPPFLAGS"
+-    LDFLAGS="$LIBLTDL $LDFLAGS"
++    LIBS="$LIBLTDL $LIBS"
+   fi
+ 
+   symbols_to_check=ifelse([$1], ,"ltdl_dlopen","$1")
+@@ -59,6 +61,7 @@
+   fi
+   CPPFLAGS="$ltdl_save_CPPFLAGS"
+   LDFLAGS="$ltdl_save_LDFLAGS"
++  LIBS="$ltdl_save_LIBS"
+ 
+   AC_MSG_CHECKING(for libltdl with symbols $symbols_to_check)
+   if test $ltdl_found = yes; then

diff --git a/net-p2p/gnunet/files/0.8.1-parallel-build.patch b/net-p2p/gnunet/files/0.8.1-parallel-build.patch
new file mode 100644 (file)
index 0000000..697451c
--- /dev/null
+++ b/net-p2p/gnunet/files/0.8.1-parallel-build.patch
@@ -0,0 +1,242 @@
+Fixing parallel build issues
+
+--- src/server/Makefile.am
++++ src/server/Makefile.am
+@@ -30,26 +30,25 @@
+ gnunetd_SOURCES = \
+  gnunetd.c 
+ gnunetd_LDADD = \
+- $(top_builddir)/src/server/libgnunetcore.la \
++ libgnunetcore.la \
+  $(GN_LIBINTL)
+ 
+ 
+ gnunet_update_SOURCES = \
+  gnunet-update.c 
+ gnunet_update_LDADD = \
+- $(top_builddir)/src/server/libgnunetcore.la \
++ libgnunetcore.la \
+  $(GN_LIBINTL)
+ 
+ gnunet_peer_info_SOURCES = \
+  gnunet-peer-info.c 
+ gnunet_peer_info_LDADD  = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+- $(top_builddir)/src/server/libgnunetcore.la \
++ libgnunetcore.la \
+  $(GN_LIBINTL)
+ 
+ gnunet_transport_check_SOURCES = \
+  gnunet-transport-check.c 
+ gnunet_transport_check_LDADD  = \
+- $(top_builddir)/src/server/libgnunetcore.la \
++ libgnunetcore.la \
+  $(GN_LIBINTL)
+-
+--- src/applications/stats/Makefile.am
++++ src/applications/stats/Makefile.am
+@@ -21,7 +21,7 @@
+ gnunet_stats_SOURCES = \
+  gnunet-stats.c       
+ gnunet_stats_LDADD = \
+-  $(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
++  libgnunetstatsapi.la \
+   $(top_builddir)/src/util/libgnunetutil.la \
+   $(GN_LIBINTL)
+ 
+--- src/applications/rpc/Makefile.am
++++ src/applications/rpc/Makefile.am
+@@ -16,7 +16,7 @@
+ libgnunetmodule_rpc_la_LDFLAGS = \
+   $(GN_PLUGIN_LDFLAGS)
+ libgnunetmodule_rpc_la_LIBADD = \
+-  $(top_builddir)/src/applications/rpc/libgnunetrpcutil.la \
++  libgnunetrpcutil.la \
+   $(top_builddir)/src/util/libgnunetutil.la \
+   $(GN_LIBINTL)
+ 
+--- src/applications/tracekit/Makefile.am
++++ src/applications/tracekit/Makefile.am
+@@ -18,7 +18,7 @@
+   gnunet-tracekit.c \
+   tracekit.h
+ gnunet_tracekit_LDADD = \
+-  $(top_builddir)/src/applications/tracekit/libgnunettracekitapi.la \
++  libgnunettracekitapi.la \
+   $(top_builddir)/src/util/libgnunetutil.la \
+   $(GN_LIBINTL)
+ 
+@@ -53,5 +53,5 @@
+ tracekittest_LDADD = \
+   $(top_builddir)/src/applications/testing/libgnunettestingapi.la \
+   $(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
+-  $(top_builddir)/src/applications/tracekit/libgnunettracekitapi.la \
++  libgnunettracekitapi.la \
+   $(top_builddir)/src/util/libgnunetutil.la 
+--- src/applications/testing/Makefile.am
++++ src/applications/testing/Makefile.am
+@@ -40,20 +40,20 @@
+  testingtest.c 
+ testingtest_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+- $(top_builddir)/src/applications/testing/libgnunettestingapi.la
++ libgnunettestingapi.la
+ 
+ remotetest_SOURCES = \
+  remotetest.c
+ remotetest_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+- $(top_builddir)/src/applications/testing/libgnunetremoteapi.la
++ libgnunetremoteapi.la
+ 
+ 
+ testingtest_loop_SOURCES = \
+  testingtest_loop.c 
+ testingtest_loop_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+- $(top_builddir)/src/applications/testing/libgnunettestingapi.la
++ libgnunettestingapi.la
+ 
+ 
+ pkgdata_DATA = \
+--- src/applications/fs/fsui/Makefile.am.orig  2010-04-06 15:02:21.375530243 +0000
++++ src/applications/fs/fsui/Makefile.am       2010-04-06 15:03:26.424279707 +0000
+@@ -37,7 +37,7 @@
+ fsui_loader_SOURCES = \
+  fsui-loader.c 
+ fsui_loader_LDADD = \
+- $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
++ libgnunetfsui.la \
+  $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
+  $(top_builddir)/src/util/libgnunetutil.la 
+ 
+@@ -59,14 +59,14 @@
+   basic_fsui_test.c 
+ basic_fsui_test_LDADD = \
+   $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
+-  $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
++  libgnunetfsui.la \
+   $(top_builddir)/src/util/libgnunetutil.la 
+ 
+ fsui_start_stop_test_SOURCES = \
+   fsui_start_stop_test.c 
+ fsui_start_stop_test_LDADD = \
+   $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
+-  $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
++  libgnunetfsui.la \
+   $(top_builddir)/src/util/libgnunetutil.la 
+ 
+ search_pause_resume_persistence_test_SOURCES = \
+@@ -80,42 +80,42 @@
+   search_ranking_test.c 
+ search_ranking_test_LDADD = \
+   $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
+-  $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
++  libgnunetfsui.la \
+   $(top_builddir)/src/util/libgnunetutil.la 
+ 
+ download_persistence_test_SOURCES = \
+   download_persistence_test.c 
+ download_persistence_test_LDADD = \
+   $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
+-  $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
++  libgnunetfsui.la \
+   $(top_builddir)/src/util/libgnunetutil.la 
+ 
+ recursive_download_test_SOURCES = \
+   recursive_download_test.c 
+ recursive_download_test_LDADD = \
+   $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
+-  $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
++  libgnunetfsui.la \
+   $(top_builddir)/src/util/libgnunetutil.la 
+ 
+ upload_unindex_persistence_test_SOURCES = \
+   upload_unindex_persistence_test.c 
+ upload_unindex_persistence_test_LDADD = \
+   $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
+-  $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
++  libgnunetfsui.la \
+   $(top_builddir)/src/util/libgnunetutil.la 
+ 
+ search_linked_download_persistence_test_SOURCES = \
+   search_linked_download_persistence_test.c 
+ search_linked_download_persistence_test_LDADD = \
+   $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
+-  $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
++  libgnunetfsui.la \
+   $(top_builddir)/src/util/libgnunetutil.la 
+ 
+ search_persistence_test_SOURCES = \
+   search_persistence_test.c 
+ search_persistence_test_LDADD = \
+   $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
+-  $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
++  libgnunetfsui.la \
+   $(top_builddir)/src/util/libgnunetutil.la 
+ 
+ 
+@@ -123,6 +123,6 @@
+   recursive_download_persistence_test.c 
+ recursive_download_persistence_test_LDADD = \
+   $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
+-  $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
++  libgnunetfsui.la \
+   $(top_builddir)/src/util/libgnunetutil.la 
+ 
+--- src/applications/dv_dht/tools/Makefile.am.orig     2010-04-06 15:04:16.738530159 +0000
++++ src/applications/dv_dht/tools/Makefile.am  2010-04-06 15:04:40.525280090 +0000
+@@ -24,7 +24,7 @@
+ gnunet_dvdht_query_SOURCES = \
+   dht-query.c
+ gnunet_dvdht_query_LDADD =  \
+-  $(top_builddir)/src/applications/dv_dht/tools/libgnunetdvdhtapi.la \
++  libgnunetdvdhtapi.la \
+   $(top_builddir)/src/util/libgnunetutil.la \
+   $(GN_LIBINTL)
+ 
+@@ -34,7 +34,7 @@
+   $(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
+   $(top_builddir)/src/applications/testing/libgnunettestingapi.la \
+   $(top_builddir)/src/applications/testing/libgnunetremoteapi.la \
+-  $(top_builddir)/src/applications/dv_dht/tools/libgnunetdvdhtapi.la \
++  libgnunetdvdhtapi.la \
+   $(top_builddir)/src/util/libgnunetutil.la
+ 
+ check_PROGRAMS = \
+@@ -49,7 +49,7 @@
+ dv_dht_loopback_test_LDADD = \
+   $(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
+   $(top_builddir)/src/applications/testing/libgnunettestingapi.la \
+-  $(top_builddir)/src/applications/dv_dht/tools/libgnunetdvdhtapi.la \
++  libgnunetdvdhtapi.la \
+   $(top_builddir)/src/util/libgnunetutil.la 
+ 
+ dv_dht_twopeer_test_SOURCES = \
+@@ -57,7 +57,7 @@
+ dv_dht_twopeer_test_LDADD = \
+   $(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
+   $(top_builddir)/src/applications/testing/libgnunettestingapi.la \
+-  $(top_builddir)/src/applications/dv_dht/tools/libgnunetdvdhtapi.la \
++  libgnunetdvdhtapi.la \
+   $(top_builddir)/src/util/libgnunetutil.la 
+ 
+ dv_dht_multipeer_test_SOURCES = \
+@@ -65,7 +65,7 @@
+ dv_dht_multipeer_test_LDADD = \
+   $(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
+   $(top_builddir)/src/applications/testing/libgnunettestingapi.la \
+-  $(top_builddir)/src/applications/dv_dht/tools/libgnunetdvdhtapi.la \
++  libgnunetdvdhtapi.la \
+   $(top_builddir)/src/util/libgnunetutil.la 
+   
+ dv_dht_multi_topology_test_SOURCES = \
+@@ -74,7 +74,7 @@
+   $(top_builddir)/src/applications/stats/libgnunetstatsapi.la \
+   $(top_builddir)/src/applications/testing/libgnunettestingapi.la \
+   $(top_builddir)/src/applications/testing/libgnunetremoteapi.la \
+-  $(top_builddir)/src/applications/dv_dht/tools/libgnunetdvdhtapi.la \
++  libgnunetdvdhtapi.la \
+   $(top_builddir)/src/util/libgnunetutil.la 
+ 
+ EXTRA_DIST = \

diff --git a/net-p2p/gnunet/gnunet-0.8.1.ebuild b/net-p2p/gnunet/gnunet-0.8.1.ebuild
index 57b9616911d2ff3535d556bda24442a7fd2ecdd0..8c196f120e85cac0d152d3c43bfb3349f15171c8 100644 (file)
--- a/net-p2p/gnunet/gnunet-0.8.1.ebuild
+++ b/net-p2p/gnunet/gnunet-0.8.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.8.1.ebuild,v 1.1 2010/01/28 11:48:07 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.8.1.ebuild,v 1.2 2010/06/20 13:56:46 xarthisius Exp $
 
 EAPI=2
 
-inherit eutils autotools
+inherit autotools eutils
 
 S="${WORKDIR}/GNUnet-${PV}"
 DESCRIPTION="GNUnet is an anonymous, distributed, reputation based network."
@@ -13,7 +13,7 @@ SRC_URI="http://gnunet.org/download/GNUnet-${PV}.tar.gz"
 #tests don't work
 RESTRICT="test"
 
-IUSE="ipv6 mysql +sqlite ncurses nls gtk"
+IUSE="gtk mysql nls +sqlite"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 LICENSE="GPL-2"
 SLOT="0"
@@ -27,7 +27,7 @@ DEPEND=">=dev-libs/libgcrypt-1.2.0
        gtk? ( >=x11-libs/gtk+-2.6.10 )
        sys-apps/sed
        >=dev-scheme/guile-1.8.0
-       ncurses? ( sys-libs/ncurses )
+       sys-libs/ncurses
        mysql? ( >=virtual/mysql-4.0 )
        sqlite? ( >=dev-db/sqlite-3.0.8 )
        nls? ( sys-devel/gettext )"
@@ -59,31 +59,29 @@ src_prepare() {
                sed -i "s:AC_DEFINE_UNQUOTED..HAVE_GTK.*:true:" configure.ac
        fi
 
-       AT_M4DIR="${S}/m4" eautoreconf
+       epatch "${FILESDIR}"/${PV}-asneeded.patch
+       epatch "${FILESDIR}"/${PV}-parallel-build.patch
+       eautoreconf
 }
 
-src_compile() {
+src_configure() {
        local myconf
 
        use mysql || myconf="${myconf} --without-mysql"
 
        econf \
                $(use_with sqlite) \
-               $(use_enable ipv6) \
                $(use_enable nls) \
-               $(use_enable ncurses) \
                ${myconf} || die "econf failed"
-
-       emake -j1 || die "emake failed"
 }
 
 src_install() {
-       emake DESTDIR="${D}" -j1 install || die "make install failed"
-       dodoc AUTHORS ChangeLog INSTALL NEWS PLATFORMS README README.fr UPDATING
+       emake DESTDIR="${D}" install || die "make install failed"
+       dodoc AUTHORS ChangeLog INSTALL NEWS PLATFORMS README UPDATING || die
        insinto /etc
-       newins contrib/gnunet.root gnunet.conf
+       newins contrib/gnunet.conf gnunet.conf
        docinto contrib
-       dodoc contrib/*
+       dodoc contrib/* || die
        newinitd "${FILESDIR}"/${PN}.initd gnunet
        dodir /var/lib/gnunet
        chown gnunetd:gnunetd "${D}"/var/lib/gnunet
@@ -93,7 +91,6 @@ pkg_postinst() {
        # make sure permissions are ok
        chown -R gnunetd:gnunetd "${ROOT}"/var/lib/gnunet
 
-       use ipv6 && ewarn "ipv6 support is -very- experimental and prone to bugs"
        einfo
        einfo "To configure"
        einfo "  1) Add user(s) to the gnunetd group"