Fix building with -Wl,--as-needed wrt #276928 by Diego E. Pettenò.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 36 insertions, 25 deletions

diff --git a/net-p2p/dbhub/ChangeLog b/net-p2p/dbhub/ChangeLog
index 3281bad47e74..5b0d66848050 100644
--- a/net-p2p/dbhub/ChangeLog
+++ b/net-p2p/dbhub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/dbhub
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/dbhub/ChangeLog,v 1.28 2008/06/30 12:52:45 corsair Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/dbhub/ChangeLog,v 1.29 2010/06/29 19:53:52 ssuominen Exp $
+
+  29 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> dbhub-0.451.ebuild,
+  files/dbhub-gentoo.patch:
+  Fix building with -Wl,--as-needed wrt #276928 by Diego E. Pettenò.
 
   30 Jun 2008; Markus Rothe <corsair@gentoo.org> dbhub-0.451.ebuild:
   Added ~ppc
diff --git a/net-p2p/dbhub/Manifest b/net-p2p/dbhub/Manifest
index 067c39c9560f..646211e77afe 100644
--- a/net-p2p/dbhub/Manifest
+++ b/net-p2p/dbhub/Manifest
@@ -1,5 +1,5 @@
-AUX dbhub-gentoo.patch 363 RMD160 e26ec8e4e5a725db62d894e3cfce466828fa4e7f SHA1 1cf60ec6eb1ab1b5513745f134c5d2783dd4b3fa SHA256 5ba3ba11cece34184cea91401dc64ced2c13840b43d27e235ebe1bbb8b768231
+AUX dbhub-gentoo.patch 769 RMD160 9ad6cb093dde48b846fd1e1cf89a4b73f4941f67 SHA1 24c430c33ec8a176b0fafbcb280f137f304f7dcb SHA256 f66e623953bd0e8e73e184ae8054ec6412b0d89074497b6bdbcd27c9f24686b2
 DIST dbhub-0.451.tbz2 239911 RMD160 be9af96966785f1f598f7fbeef1f73facb2d1017 SHA1 62303e6d45704d390983d39f38aba7aaded1b7b9 SHA256 941b384d11c181ed270d546f0867dc517693d05fdcdacb14b0b7c682022663b8
-EBUILD dbhub-0.451.ebuild 884 RMD160 41d08e37d0ad5431392477d70a4b963405cd14c3 SHA1 d226bae60339195264f85e153e2cacd0758adf7b SHA256 7bd93e97cdf81ca852777909a6d99dfd82f8c5cb26974549d08986a6fdc7c989
-MISC ChangeLog 4249 RMD160 a2339e1c87ee91882f6e7e4f8d925ed73ae48720 SHA1 bf2f2de0c317052bd8f3220cc09ae595cc39c668 SHA256 8ec4c6dc2eb0085bf75366dbb5f5792dab2c7721fbceb1dad1fd37e7df91e8a1
+EBUILD dbhub-0.451.ebuild 814 RMD160 c70c1edfc774bd3de5e050a37e956f2e4ae9a6d1 SHA1 e2b9a06155d52b558e26f8e1674ad53ff7d15c7f SHA256 241df0da61fc0a8588c1eb9e9240533048bac7f1e1e5000657194c833e90d24f
+MISC ChangeLog 4424 RMD160 cc75bc9010a1e5f63619dd8acadae73fc663d71a SHA1 b3feb1f91b91e2f36dd16423edda2f1c55b80f41 SHA256 0119235fd0ace43e4433be318fd647ec58f04230af2139cbebe249b5cb710d61
 MISC metadata.xml 249 RMD160 2dbc9f130b2b097c763a3b414eae5501891c925b SHA1 ee9a3ab1cae5c9bb9eb52f7d8a7b906e548c403d SHA256 dfda50c6d7240674c24c2d1c65977dbfe39d6b69fa540de0c1086e4a718bd8db
diff --git a/net-p2p/dbhub/dbhub-0.451.ebuild b/net-p2p/dbhub/dbhub-0.451.ebuild
index 8fb50a759b3f..c750b62d26d8 100644
--- a/net-p2p/dbhub/dbhub-0.451.ebuild
+++ b/net-p2p/dbhub/dbhub-0.451.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/dbhub/dbhub-0.451.ebuild,v 1.2 2008/06/30 12:52:45 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/dbhub/dbhub-0.451.ebuild,v 1.3 2010/06/29 19:53:52 ssuominen Exp $
 
-inherit eutils
+EAPI=2
+inherit autotools eutils
 
 DESCRIPTION="Hub software for Direct Connect, fork of opendchub"
 HOMEPAGE="http://www.dbhub.org"
@@ -14,25 +15,21 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug perl nls switch_user"
 
 DEPEND="perl? ( dev-lang/perl )
-		switch_user? ( sys-libs/libcap )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+	switch_user? ( sys-libs/libcap )"
 
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-gentoo.patch
+	eautoreconf
 }
 
-src_compile() {
-	econf  \
+src_configure() {
+	econf \
 		$(use_enable nls) \
 		$(use_enable perl) \
 		$(use_enable switch_user) \
-		$(use_enable debug) \
-		|| die "econf failed"
-	emake || die "emake failed"
+		$(use_enable debug)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install || die
 }
diff --git a/net-p2p/dbhub/files/dbhub-gentoo.patch b/net-p2p/dbhub/files/dbhub-gentoo.patch
index 3ac532ffef6b..6e992cdb0129 100644
--- a/net-p2p/dbhub/files/dbhub-gentoo.patch
+++ b/net-p2p/dbhub/files/dbhub-gentoo.patch
@@ -1,15 +1,25 @@
---- configure.orig	2008-02-25 15:28:29.000000000 +0100
-+++ configure	2008-02-25 15:28:52.000000000 +0100
-@@ -4926,12 +4926,6 @@
- fi
+--- configure.ac
++++ configure.ac
+@@ -115,7 +115,7 @@
+ 		AC_MSG_CHECKING([Perl LD Objs])
+ 		AC_MSG_RESULT([$perl_ldd])
+ 		CPPFLAGS="$CPPFLAGS $perl_ccflags"
+-		LDFLAGS="$LDFLAGS $perl_ld"
++		LIBS="$LIBS $perl_ld"
+ 		MISSING_PERL_HEADERS=""
+ 		AC_CHECK_HEADERS([EXTERN.h perl.h],,HAVE_PERL="false"; MISSING_PERL_HEADERS="$ac_header $MISSING_PERL_HEADERS",[[#if HAVE_EXTERN_H
+ 		#include <EXTERN.h>
+@@ -141,13 +141,6 @@
  
+ AM_CONDITIONAL([BNLS],[test "$want_nls" = "yes"])
  
+-dnl Check if config directory exists.
 -if test ! -d $HOME/.dbhub; then
 -   echo "creating config directory: $HOME/.dbhub"
 -   mkdir $HOME/.dbhub
 -   chmod 700 $HOME/.dbhub;
 -fi
 -
- ac_config_files="$ac_config_files Makefile src/Makefile"
+ AC_OUTPUT(Makefile src/Makefile)
  
- cat >confcache <<\_ACEOF
+ echo -e  "\n\e@<:@1m-------------------------------------------------\e@<:@0m"