Fix underlinking issue (bug #372021) and add dependency on pkgconfig.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 53 insertions, 10 deletions

diff --git a/net-nntp/nzbget/ChangeLog b/net-nntp/nzbget/ChangeLog
index bf58753245b1..5dd2fba741d8 100644
--- a/net-nntp/nzbget/ChangeLog
+++ b/net-nntp/nzbget/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-nntp/nzbget
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/ChangeLog,v 1.34 2010/09/11 18:59:05 armin76 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/ChangeLog,v 1.35 2011/08/30 21:32:40 radhermit Exp $
+
+  30 Aug 2011; Tim Harder <radhermit@gentoo.org> nzbget-0.7.0.ebuild,
+  +files/nzbget-0.7.0-underlinking.patch:
+  Fix underlinking issue (bug #372021) and add dependency on pkgconfig.
 
   11 Sep 2010; Raúl Porcel <armin76@gentoo.org> nzbget-0.7.0.ebuild:
   alpha stable wrt #329443
diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest
index e96b77ef5790..82b1056f91d4 100644
--- a/net-nntp/nzbget/Manifest
+++ b/net-nntp/nzbget/Manifest
@@ -1,7 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX nzbget-0.7.0-openssl-1.patch 1075 RMD160 8e5b84a8e04e4328bf66949e43877ebe298b32f8 SHA1 64bb86fb38cfa71057fea4daf65b52d4d9909052 SHA256 82558aa85bdd078fec12e33fddd23df38b43a3f4f1a9270619aeac8943c48ceb
+AUX nzbget-0.7.0-underlinking.patch 621 RMD160 afee21019b87c945315a002dcc088d21e517e3a7 SHA1 fc7f39acb9223587dd0f08795c1c4e3110484d20 SHA256 d311471cc648346047681433d9d6b715e554e36979d8b6771b74eae5e5dcb9bf
 AUX nzbget.confd 337 RMD160 7f88d0274d99d880194d18b5bf4c130e450c2084 SHA1 1a0a7a54654b15853d2ba5277a9d0ce919892bff SHA256 a2a305dc1ef482d82041c5261dba235f6faae229d894785f528d87c9c0e452b8
 AUX nzbget.initd 876 RMD160 3edadcf591f5843740c483746cc4ed573f7bf75b SHA1 4258ef47ee7d27d80a354baa77579648063c59fd SHA256 bb81a944ec8a3503d8cc1c3430a29d6f4c5b3be19c89e8220e7444d0b2156447
 DIST nzbget-0.7.0.tar.gz 316059 RMD160 b8ff4d454a51f5d1a5b4246437adad57c918500c SHA1 e47cfcc37adbb756f4b449914cbfc6dcaaeebaec SHA256 b798bbcc9f6816b4e19a95f74df067440f7ad49e1c16a3f33f99bddf7916771e
-EBUILD nzbget-0.7.0.ebuild 2708 RMD160 2b98718015bfce6f1be74111ada36d0c96da6b02 SHA1 dee03218ee7045e971e2115f5cfbe52e7401e322 SHA256 884dc7a8cbaf1269983775a3b9e65c16332d0ebec6bd0c72ba7b20220104335f
-MISC ChangeLog 5690 RMD160 c071e31b5d427a8138a32d0512a68f4db3484bf0 SHA1 fa858cc1152b2e8649e09c6b1f001f273147c84c SHA256 94ed0b863952f2c27e3191619219e950761a5033f85b9629ffa7613efa631752
+EBUILD nzbget-0.7.0.ebuild 2797 RMD160 1820eacea09863fadcc1fc511eda01b49ce00ba8 SHA1 d7983f4963bfb31b1a94d335e71691fd1210eca5 SHA256 993d6eecd1324cae3a28a5a8b04371872fc91c8d70b52845004be0b0738378b3
+MISC ChangeLog 5877 RMD160 c6d93017a455e777ffc4e5f6378558fdd0f3704d SHA1 8802a2e6cec86fc880067dd12bb3d9c35f656b8e SHA256 827d15c187a607895b8a6597f04f4cdcba148e5affc7f3afffdaa4473e5aecf8
 MISC metadata.xml 444 RMD160 1f914f344681864676fc164642c0c955d080cadc SHA1 3d352cd32e117e5d78c0cbb2d3e3e5bd1f83154e SHA256 0febeca73acdd2f57fb3005d174da3741db5e70e528471ebe8816936962f9b5e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBCgAGBQJOXVcIAAoJEEqz6FtPBkyjuCAH/RXlUQtFuUY+Cj0ArGukU2fm
+Sb9V5CbARXFXZAQWKTEW/mftfdzEWt9PjiGHN4iwkeNJ/uok38iH2gZQxTixcAVl
+MuYNYPwOSXxN38OCPZ6jdkrh5nKIhiILqlO2ddUSx5mjoSU9buZbR1rzSF/YfvRR
+9yCeuC4ty8EcB9vPgAzKrNJKlwVS7JXkwEqUxFDLqXucU12QLnT3UwAVpMeowpB8
+t1XxTa7f9EuUW8k1ll03eZQRWvHHGVNTifQyzfS6cEQFRo9OoToQYl+j+S3Rruqz
+HEkhutQboRW94FjUy9fQrwjw5eNyFt4vtnHI8tjvZMzTW1o2k4aRbYQPfVIclR8=
+=cNmx
+-----END PGP SIGNATURE-----
diff --git a/net-nntp/nzbget/files/nzbget-0.7.0-underlinking.patch b/net-nntp/nzbget/files/nzbget-0.7.0-underlinking.patch
new file mode 100644
index 000000000000..1771420304db
--- /dev/null
+++ b/net-nntp/nzbget/files/nzbget-0.7.0-underlinking.patch
@@ -0,0 +1,20 @@
+--- nzbget-0.7.0/configure.ac.orig
++++ nzbget-0.7.0/configure.ac
+@@ -204,7 +204,7 @@
+ 	[LIBVAL="no"])
+ if test "$INCVAL" = "no" -o "$LIBVAL" = "no"; then
+ 	PKG_CHECK_MODULES(libxml2, libxml-2.0,
+-		[LDFLAGS="${LDFLAGS} $libxml2_LIBS"]
++		[LIBS="${LIBS} $libxml2_LIBS"]
+ 		[CPPFLAGS="${CPPFLAGS} $libxml2_CFLAGS"]
+ 		[CFLAGS="${CFLAGS} $libxml2_CFLAGS"])
+ fi
+@@ -290,7 +290,7 @@
+ 		[LIBVAL="no"])
+ 	if test "$INCVAL" = "no" -o "$LIBVAL" = "no"; then
+ 		PKG_CHECK_MODULES(libsigc, sigc++-2.0,
+-			[LDFLAGS="${LDFLAGS} $libsigc_LIBS"]
++			[LIBS="${LIBS} $libsigc_LIBS"]
+ 			[CPPFLAGS="${CPPFLAGS} $libsigc_CFLAGS"])
+ 	fi
+ 	
diff --git a/net-nntp/nzbget/nzbget-0.7.0.ebuild b/net-nntp/nzbget/nzbget-0.7.0.ebuild
index 198bd21260e6..b54dbfd3ac83 100644
--- a/net-nntp/nzbget/nzbget-0.7.0.ebuild
+++ b/net-nntp/nzbget/nzbget-0.7.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/nzbget-0.7.0.ebuild,v 1.5 2010/09/11 18:59:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/nzbget-0.7.0.ebuild,v 1.6 2011/08/30 21:32:40 radhermit Exp $
 
 EAPI="2"
 
-inherit eutils
+inherit eutils autotools
 
 MY_P="${P/_pre/-testing-r}"
 
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~ppc x86"
 IUSE="debug ssl gnutls ncurses parcheck"
 
-DEPEND="dev-libs/libxml2
+RDEPEND="dev-libs/libxml2
 	ssl? (
 		gnutls? ( net-libs/gnutls )
 		!gnutls? ( dev-libs/openssl )
@@ -27,7 +27,8 @@ DEPEND="dev-libs/libxml2
 		app-arch/libpar2
 		dev-libs/libsigc++:2
 	)"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 S="${WORKDIR}"/${P/_pre*/-testing}
 
@@ -45,7 +46,10 @@ src_prepare() {
 		"${S}"/nzbget.conf.example >"${S}"/nzbgetd.conf.example \
 		|| die "sed nzbgetd.conf.example failed"
 
-	epatch "${FILESDIR}"/${P}-openssl-1.patch
+	epatch "${FILESDIR}"/${P}-openssl-1.patch \
+		"${FILESDIR}"/${P}-underlinking.patch
+
+	eautoreconf
 }
 
 src_configure() {