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

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

3 files changed, 43 insertions, 28 deletions

diff --git a/net-news/snownews/ChangeLog b/net-news/snownews/ChangeLog
index 691b9f026e62..68d360273701 100644
--- a/net-news/snownews/ChangeLog
+++ b/net-news/snownews/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-news/snownews
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/snownews/ChangeLog,v 1.39 2013/06/01 12:24:26 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-news/snownews/ChangeLog,v 1.40 2014/10/28 23:24:31 jer Exp $
+
+  28 Oct 2014; Jeroen Roovers <jer@gentoo.org> snownews-1.5.12-r1.ebuild:
+  Fix building against sys-libs/ncurses[tinfo] (bug #526264).
 
   01 Jun 2013; Pacho Ramos <pacho@gentoo.org> -snownews-1.5.10.ebuild,
   metadata.xml:
diff --git a/net-news/snownews/Manifest b/net-news/snownews/Manifest
index 1da18e376180..a3fe535d28cf 100644
--- a/net-news/snownews/Manifest
+++ b/net-news/snownews/Manifest
@@ -3,13 +3,13 @@ Hash: SHA256
 
 AUX snownews-1.5.7-stdint.patch 405 SHA256 4f5a6b426759b6d69dc0fb716c62ed8d3296a40ee8715a054046a5abffe0bb71 SHA512 3b72823386b3a532f920caba287816dce3500fbeee3229273368d82d3f2dee6b5e3e9f20e32e55371d61c6e938a39a00f83fb2debb671b6361fef291106f6de2 WHIRLPOOL 5322010f08bc8223183e18b22838337fa6c9c5514484489a97b41a8f1f54f23e2bc698b69828ac7a7d6b4854dbe21074d070e8db2922e4578e8d68ee4bd13ba1
 DIST snownews-1.5.12.tar.gz 167944 SHA256 26dd96e9345d9cbc1c0c9470417080dd0c3eb31e7ea944f78f3302d7060ecb90 SHA512 7a7ccd5ea57f8bbb73f1429ab931a38203e858c74a383c5347e66088b84f6a7240feeee99e179687ce0a7a89c6c1406ce20d6c5d6771d25a0a0301fa5526e220 WHIRLPOOL c0a127db3700789e134720cbf77858a7c37950e9b05b4ca2f13372f774eb6f7ee97dd2f957ba1c3571c241a241993feb702dbb0d90c0c8ea03d2e6003fdf24b1
-EBUILD snownews-1.5.12-r1.ebuild 1235 SHA256 093c50793f6d588b10edfa554b2ee2c9c813d4cff4fe9a03e10248d141088836 SHA512 19ae340497370c7af861109342b19aabbeaf7a9eb441ad7598d247304a7ef556ad82f0ff795f514ce6d81ebf18dbb7322ad139938d12315bfc568f13b47eefdb WHIRLPOOL bd6f6a74756ec4d521f48df571a10ad8d04fa6bdbb2f13d21698197c3d1974c96e500f7e471d2bcc9b0819339c93f2e4ac3da176b22188141c97898e7351149b
-MISC ChangeLog 7848 SHA256 8a244138462f6348b77def80cd6f6086e2efa518acdb425f8b1f273cdec26121 SHA512 161cd91153cb06de43c8fef0233168d1ded47f1590ff42b60361db8167ec231f97f33fff58ded5ceef50533acd8f9a6250ec90d4155fb4e031dc7c84c88d1b9f WHIRLPOOL cfda5cb9d903f522363a8508b91ef51d1589387be0b090201323b80a6ff30c37fa7f3681b509c0bf8bcf70714da884f2e62a5eea7dc1ed587f25c1b4c076176e
+EBUILD snownews-1.5.12-r1.ebuild 1405 SHA256 d7a3e6f642b2694e67d078773f41c71d22653dc91a91d2ac33f51c0f12bbcdb7 SHA512 0d26678209e1759c6e494b1be1862938fc396d1fa0a098947329bccbc60a188a88ed48582f08a404885a23b4d961f3e6dcd861f3df0c28195e855c8b68f32d84 WHIRLPOOL c5df6f82dd411a022eea38fabf857d70f5e1ba4257acd707abeb1b73809912f0f474a788c114857184c8e90491c778f75ff7d71db69e48a81612fbe60788006a
+MISC ChangeLog 7983 SHA256 c08b8ad7eddbc73996c15c6fb5efd872d6fe737b781dfd1cb2ce9012eec37bdc SHA512 f8a4d74b20ebb4fbe92d3dd422345327c6d572f4f7306f5b9f704bfe713912e74bb7a5899a968c9dc7529234faa61f35a19867b9d3f96ace073112e1206a6fb2 WHIRLPOOL d495afb2bcd43a281635205a3ea5728491c7610786f6479d8bce0a2aef26a593f651c219c370f64b444daf8d48b052dc40edcd50b7d0e9edadc42bcd49864a4c
 MISC metadata.xml 211 SHA256 84ff2341253cdd21a6782e14ebc076a8bcae11428aacfe2454f4b32165504727 SHA512 a9385b7dc02a9537080a9b1bf59ae2caacd84cab2e3ef1fee15e4f10d5518ae9f71e4ce07d99104e643d18a79ca05116d74e97ec7d230d21b340656701547078 WHIRLPOOL 4309ff085fbfd1a91434c0a9dd4c23b7ad8b10b0559beedcb4d911745543745691abe91bb1e361dd88b6383678f020c95deb9359876319a6407ac0ef2dcbd221
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlGp5/wACgkQCaWpQKGI+9QWfACfVlZ3S+YljQiAo6+UvOMgAuCE
-PUYAnRIkGGVgpkAO3qanJ42GaH2+/34c
-=QrBI
+iEYEAREIAAYFAlRQJbAACgkQVWmRsqeSphPzWwCfdVhc6R9orQ/a8WIHjn3t8zKB
+dugAnRDCQ4f3a11XD0BJDPvbN7yASPSJ
+=Ofwr
 -----END PGP SIGNATURE-----
diff --git a/net-news/snownews/snownews-1.5.12-r1.ebuild b/net-news/snownews/snownews-1.5.12-r1.ebuild
index 129d6b58c634..fc072bb2237e 100644
--- a/net-news/snownews/snownews-1.5.12-r1.ebuild
+++ b/net-news/snownews/snownews-1.5.12-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/snownews/snownews-1.5.12-r1.ebuild,v 1.8 2013/01/11 02:06:25 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/snownews/snownews-1.5.12-r1.ebuild,v 1.9 2014/10/28 23:24:31 jer Exp $
 
-EAPI=3
+EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Snownews, a text-mode RSS/RDF newsreader"
@@ -14,36 +14,48 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="unicode"
 
-DEPEND=">=dev-libs/libxml2-2.5.6
+COMMON_DEPEND="
+	>=dev-libs/libxml2-2.5.6
 	>=sys-libs/ncurses-5.3[unicode?]
-	dev-libs/openssl"
-
-RDEPEND="${DEPEND}
+	dev-libs/openssl
+"
+RDEPEND="
+	${COMMON_DEPEND}
 	dev-perl/XML-LibXML
-	dev-perl/libwww-perl"
-
-src_prepare() {
-	use unicode && sed -i -e "s/-lncurses/-lncursesw/" \
-		configure
+	dev-perl/libwww-perl
+"
 
-	sed -i -e "s/-O2//" \
-		configure
+DEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+"
 
-	sed -i -e 's/$(INSTALL) -s/$(INSTALL)/' \
-		Makefile
+src_prepare() {
+	sed -i -e "s|-O2||g" configure || die
+	sed -i -e 's|$(INSTALL) -s|$(INSTALL)|g' Makefile || die
 }
 
 src_configure() {
-	local conf="--prefix=${EPREFIX}/usr"
-	./configure ${conf} || die "configure failed"
+	tc-export PKG_CONFIG
+	if use unicode; then
+		sed -i -e 's|-lncurses|`\\$(PKG_CONFIG) --libs ncursesw`|' configure || die
+	else
+		sed -i -e 's|-lncurses|`\\$(PKG_CONFIG) --libs ncurses`|' configure || die
+	fi
+
+	# perl script, not autotools based
+	./configure --prefix="${EPREFIX}/usr" || die
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" EXTRA_CFLAGS="${CFLAGS}" EXTRA_LDFLAGS="${LDFLAGS}" || die "emake failed"
+	emake \
+		CC="$(tc-getCC)" \
+		EXTRA_CFLAGS="${CFLAGS}" \
+		EXTRA_LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
-	emake PREFIX="${ED}/usr" install || die "make install failed"
+	emake PREFIX="${ED}/usr" install
 
 	dodoc AUTHOR Changelog CREDITS README README.de README.patching
 }