Fix building against sys-libs/ncurses[tinfo] (bug #527262).

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 33 insertions, 12 deletions

diff --git a/net-nntp/nzbget/ChangeLog b/net-nntp/nzbget/ChangeLog
index d7204b19c804..94513fe0b742 100644
--- a/net-nntp/nzbget/ChangeLog
+++ b/net-nntp/nzbget/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-nntp/nzbget
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/ChangeLog,v 1.90 2014/10/18 04:33:28 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/ChangeLog,v 1.91 2014/10/28 19:36:21 jer Exp $
+
+  28 Oct 2014; Jeroen Roovers <jer@gentoo.org>
+  +files/nzbget-14.0_pre1145-tinfo.patch, nzbget-14.0_pre1145.ebuild:
+  Fix building against sys-libs/ncurses[tinfo] (bug #527262).
 
 *nzbget-14.0_pre1145 (18 Oct 2014)
 
diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest
index 05f43813b66b..a4815c8f2a2b 100644
--- a/net-nntp/nzbget/Manifest
+++ b/net-nntp/nzbget/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX nzbget-11.0-header.patch 212 SHA256 b010708948880bbb6b178f58f7242ce269692cc1e94e399ff83a8f4d5828f8ac SHA512 2efaccfc1d3af1fe982709e81f02d1b0cf2b83dbd62f985fcfb61ff022ae4018cb0d088c24f87b0ce3047d541982ba87e77d8fda9a1a5044189f0ae35357182e WHIRLPOOL f924a5ec4637d01cbd8df005de88af00428f61686b81413db27155110c2f430ee01c00066e3abac29e0b4812ad5d79af17a758758691969d98e11a92291d737c
 AUX nzbget-13.0_pre1042-gzip-endif.patch 366 SHA256 01e7c9fc94eaba1c29ed472ef9800163d4b5edd3dc8539b7abeeaddeb0687a01 SHA512 5d86f02c1d1c9126dc3b7888e26627ddab2317d1583f0997471d6ab59bf37fe269b528e987976e31b98cab3ec0a4ae5eee276e4728415124bb3c976068bc709a WHIRLPOOL b81e91e1e07d9faf43de8d9e4d267b9d32698ba78e5e37933b3ce5f9e0737393f10c1329a02e1be09f81bf198cb06140731ff58b5237fe2f0f7c8728be2305bb
+AUX nzbget-14.0_pre1145-tinfo.patch 469 SHA256 76740e82b987fe9206fb44035aa69af41345089d2f8d33cfe1019b7940e4faae SHA512 b431fa3a620988fe69ff40f05f5c3ade970f2bf895cf0c6d3b8ac58b722627ee772e62a48270cab8243e043dcdac9ac2d2923579c73e24049db67fcdbbe65669 WHIRLPOOL 5f2ec9d9166edb6171d7c711801a29f9c3f61c13f6cf26e3b238ffb21a91a0cf86e8486bff04bc533c49389d7c25d6e8565da1124b6848df7168f835aeea2f47
 AUX nzbget-9.0_pre477-buffer-overflows.patch 1783 SHA256 687318fa04f1446abcd54c845b92febde7f6f0b790e968546a0a7daf2a2095d8 SHA512 bb9da489c0ca3d01fc2a98f3813bb4e8ab586d9bb9e0ad8e7d4e2cecf80430b03501f430fed21034bf34523987316f9dabd52a00b2edd737e2d89598939fbda5 WHIRLPOOL dc23b13d2251c6dd0d024fb35aa12c87709e9b4afdc84755b014dac4effd51a0e72793a390d05704ad7424bb8571dbc2faf1e89ef862a095fd9feffc5ba6eca9
 AUX nzbget.confd 337 SHA256 a2a305dc1ef482d82041c5261dba235f6faae229d894785f528d87c9c0e452b8 SHA512 0f9a0d62ac6ea35703ebd64ec68057596d63fd5957afa2d3bcd18b4e8db4b24e78d060dc36cf90dbd2f604b4c6f107fb8e59ff779b6865cd362e71a0666d6c56 WHIRLPOOL 220c7638c0f62f4cf4314e40b022c34c41a7124d6bf41bdf455948e2e862715413d62cc4750db63967b24f3cbf1b5d13cd3bcea4c016ee5611f5226a9f1bd750
 AUX nzbget.initd 921 SHA256 5e55313eae69b0b77f4332c2ff6e74085295f6fc8469e03f53f9a425d0d19716 SHA512 e00f04e9eea6bbcdeb8b7e3e91ca93db36fbfec2cd6e26d72648fe497b50dbb29a99a43ba143682b80fc4d37d46e9db766f0a0fd0902355dceb3f9ab93051427 WHIRLPOOL 3f726527816518cc50a94468f116874892e0cc7f94bde8349b1c29195e637ea51730ea26b0d429e0e15920f9e90d23fb68db1929c28ddeb1672d9e9f214b519f
@@ -15,17 +16,13 @@ EBUILD nzbget-10.2.ebuild 2682 SHA256 606cafd749ee2063b94b31223f43e58c40e4393be0
 EBUILD nzbget-11.0.ebuild 2669 SHA256 df2df52cd0d3860fef04d401ac2ae58af1dd7b079536fbbad100cc8f449531bf SHA512 6de685aa0dd62161152cbbb125370e448e105e0b11373f69056fad6c8c2fab00b14e823010806a63206cd7a5584b6f4dc6120e2acf9ceef13d3b8c42707a0afd WHIRLPOOL 317401ee8097ab3639c0d56d47c023a87274126a25cd8fea0531de9f1319b36358ca665dbbab221f8dd6a1eed30b23a3047b0e86a03d3fc3792f18fed011f8e0
 EBUILD nzbget-12.0-r1.ebuild 2667 SHA256 e4e0cc6a04d168823e5bbbe2558d430b49e7615ef4175bf4c5ee2a9990c9e95d SHA512 79f270750c970055232e5e29c09e862042c08a6c836c75f610a8733278c1ceff0b417a4cde02ea18b25fc2a03d5bc1458923819ed2f000d6e3c6ce5a4a35cca0 WHIRLPOOL 96d5d6c8caae258bc5adf83020e359cb245c0d36dae2c079c4e9af4f831090c15dbc44546afb9903e187c3c64c8ff08ab26f7714261625947e90f31a9528de9d
 EBUILD nzbget-13.0.ebuild 2731 SHA256 bee505271d15991e9e08f977b63a7360d35508a40bf4a1a6bb8fabfe302f6c70 SHA512 a14eb6506b26df16601f76db84ce697b2bf5abe484035e94be465411459274ec18ef963a4dadf0acaee86df14c3c644ad6aab0c21995fe356ff3ac9cdc88ad5c WHIRLPOOL e775f7e9fd8732a2d0c43a6e8b31284b997c1f44da76850d75771a8ff64296a1e5ab8b88b69f0020a832eae45a95e044a9954b68638cdc2f25b9ab78797b2012
-EBUILD nzbget-14.0_pre1145.ebuild 2643 SHA256 4ac4fef2746e491578ac635e8eec0ff08683d5a008f978dd4e9d14bd03bf66fb SHA512 ff4e47ffad3134edbae37f6d1365a4b29b1c9451fdbff1356b00bccf720d28c3afa8b54a1120600565ea7c63feb0a206bcafa6befe8f102ddb1bea5c1f6f74ee WHIRLPOOL cf2a809fcae685aaf15b4d78e561735a85a0b13e4b6bfbf2472fa2c8bfbca9c7b8db50272f1de181407dfbcf9c0cc1472f1f5be1f3f5bff9a7e4d8fb27184615
-MISC ChangeLog 13462 SHA256 75f3c9baec08876909b5f15ff0772fb476adc446196a8cad143eaec7395d3079 SHA512 f23d60fde1f3c3e04bd8a31d2a0b1eb19b54e0b9a3f168b766fadb697f827dbad93836ca388e61e9c7034889af74b699420d532fe035012ce781e2614023cc08 WHIRLPOOL 1744e0b83d57f5a78148a8c17b94e87a6fa29b473e9546a1a000141ee7275328802bc486a6f4f48bee5a720bf01104f4f39bf71b504781ca1ff6a487c7ad3403
+EBUILD nzbget-14.0_pre1145.ebuild 2677 SHA256 8a76f8e0090a12cde31c1265e644b103a3606650de0ad73702f9dc84ec07feb2 SHA512 032b58ea7cdfb911e446037d160301961f3f5248d2a7bd4d843c7244e653ca643788bc7e3d04c1de2ab8e24bb9f143569d110a7b7fb4c1ef8cf44bce8de86ba1 WHIRLPOOL f03301ed6776d9ba1aba962d1e777ed604ea91fed3742368e1f40b142dc9c75970a551c89b1898fe4f878ba7078701aacb8b779f52562de83ab961168023d641
+MISC ChangeLog 13636 SHA256 93cdb114e78f5cd14dbe74aba66a4451c3d1458456f02f3caf117b70b5fbe7ad SHA512 5297f6c38ce0ad818a6ccbfee9d0f7020ada7287c8bb12ad3d05910a05edeb22e6cda9a2ce2f30264be2f0263a2495dabe77e3d83f01189abd8db77f39dd4a52 WHIRLPOOL 32e68c92dbf30e5b85762a320a22c12a55f391b4995dc5efebb9392d6455a34bd6defe4c682eeb3fced71eb869125cd75372b5a94432e4e34b6582e700eba527
 MISC metadata.xml 539 SHA256 48f9bc14033c2a447322b31e146267269726e47b8925fed04eb763fae4655e31 SHA512 bb80f64f00b908a589e8c9aad6e7be82fe2d44507cf7cb625c2b718f28a62dd86b6e530be16e0cae1209109b5289829211d120db24b5c2249263a8227b18fd26 WHIRLPOOL adc2d684e0c54ad489401de1ab2a7a76307ccf7bccfd80b00aed81b3ba09983f933469b7bcb126372616e5eab52d4caa9564a9cd3f14e713acb84e35605fc2f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUQe2dAAoJEEqz6FtPBkyjB8MH/3VOH4RcxRLY+s8atvEVQsAm
-93UQiSISub5ke3ZoGbAxTi7qA5yaVsm+uJhwKxdx1pKFSeCuxxyk8cI4X6gXEtNK
-x8q87ByYvGenfVtvB2DvqEgwPldNh+jPCiv+RjQdVddjcjps6RYmWY0oPRjFOBVB
-+lu2X/8LlgCyUUGtlKF07gQzsB7NhyRaIN5+HuLWhF6yMdD3rHpcmwh8M4M+RFr7
-VqURenukxwWfXCM9gjt21zl5SMtfC8jdyIGp9KPBQeeemLgbRWm4xYmroSHT6Ve2
-JpmUnD6afbQ9D7ZWceL2I1Ain+dhOH6paMFgdV6iIrup7pUq7taMc3fP2jfFg2M=
-=Cnjk
+iEYEAREIAAYFAlRP8DcACgkQVWmRsqeSphMmhACfS4w0FMtPYHlqyHia5OXtbLhC
+MUQAn32vSMECxPy3yiS58qK8Hfyl5xR+
+=QOCe
 -----END PGP SIGNATURE-----
diff --git a/net-nntp/nzbget/files/nzbget-14.0_pre1145-tinfo.patch b/net-nntp/nzbget/files/nzbget-14.0_pre1145-tinfo.patch
new file mode 100644
index 000000000000..e6cd13f6ffc1
--- /dev/null
+++ b/net-nntp/nzbget/files/nzbget-14.0_pre1145-tinfo.patch
@@ -0,0 +1,18 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -46,6 +46,7 @@
+ AC_PATH_PROG(MAKE, make, $FALSE)
+ AC_PROG_INSTALL
+ 
++PKG_PROG_PKG_CONFIG()
+ 
+ dnl
+ dnl Do all tests with c++ compiler.
+@@ -291,6 +292,7 @@
+ 	if test "$FOUND" = "no"; then
+ 		AC_MSG_ERROR([Couldn't find curses headers (ncurses.h or curses.h)])
+ 	fi
++	PKG_CHECK_MODULES(ncurses,ncurses,LIBS="$LIBS $ncurses_LIBS",)
+ 	AC_SEARCH_LIBS([refresh], [ncurses curses],, 
+ 		AC_ERROR([Couldn't find curses library]))
+ else
diff --git a/net-nntp/nzbget/nzbget-14.0_pre1145.ebuild b/net-nntp/nzbget/nzbget-14.0_pre1145.ebuild
index 70180f554f83..705bcf033389 100644
--- a/net-nntp/nzbget/nzbget-14.0_pre1145.ebuild
+++ b/net-nntp/nzbget/nzbget-14.0_pre1145.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/nzbget-14.0_pre1145.ebuild,v 1.1 2014/10/18 04:33:28 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/nzbget-14.0_pre1145.ebuild,v 1.2 2014/10/28 19:36:21 jer Exp $
 
 EAPI=5
 
-inherit autotools user eutils
+inherit autotools eutils user
 
 MY_P=${P/_pre/-testing-r}
 
@@ -36,6 +36,8 @@ DOCS=( AUTHORS ChangeLog README nzbget.conf )
 S=${WORKDIR}/${P/_pre*/-testing}
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+
 	sed -i 's:^ScriptDir=.*:ScriptDir=/usr/share/nzbget/ppscripts:' nzbget.conf || die
 
 	sed \