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

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

8 files changed, 45 insertions, 68 deletions

diff --git a/app-admin/ccze/ChangeLog b/app-admin/ccze/ChangeLog
index d32586a9184b..2b081d4ad38d 100644
--- a/app-admin/ccze/ChangeLog
+++ b/app-admin/ccze/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/ccze
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ccze/ChangeLog,v 1.32 2012/03/18 15:51:16 armin76 Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ccze/ChangeLog,v 1.33 2014/11/23 10:01:06 jer Exp $
+
+  23 Nov 2014; Jeroen Roovers <jer@gentoo.org> -ccze-0.2.1-r2.ebuild,
+  ccze-0.2.1-r3.ebuild, +files/ccze-0.2.1-tinfo.patch, files/ccze-fbsd.patch,
+  files/ccze-ldflags.patch, files/ccze-segfault.patch:
+  Fix building against sys-libs/ncurses[tinfo] (bug #529796).
 
   18 Mar 2012; Raúl Porcel <armin76@gentoo.org> ccze-0.2.1-r2.ebuild,
   ccze-0.2.1-r3.ebuild:
diff --git a/app-admin/ccze/Manifest b/app-admin/ccze/Manifest
index 251e773e779a..49ae906c6267 100644
--- a/app-admin/ccze/Manifest
+++ b/app-admin/ccze/Manifest
@@ -1,8 +1,18 @@
-AUX ccze-fbsd.patch 635 SHA256 f80d6bea0b9a0655330e2e55e7abb4f31c9968c19f3d9e4ac06ab2e4ce8ee3b7 SHA512 23da78ddcc3d5ef71be064c04010ef01356a5707c985ba029964b2ea2803ee6d5355ea58fa7341e7d9bd85a29536123c8862a34cb74dc4135eadaaea7992c920 WHIRLPOOL 011b498a99eb91eaac5dc6e61ccabfcbc568ed02854adcbe3ecd36c3ee8bb84deed4b191193df0ae3db9affe3ae2fe5edc7649414ac653280f7f06baa3656af7
-AUX ccze-ldflags.patch 518 SHA256 61a8433565485ace98098e1da948f9e8b85bcb204b420aae0b1eb5b6f857d4af SHA512 6b843aadb1805229beae3a46be3bfceb4df5d943798b6c24c58547657d4e85d930d326a0398c95a86795da6687e093afd436f39ca0aaa4a3210f6c4e1880e0fa WHIRLPOOL 3530aef95bc08ebb15fad8c057f042845a181bacb80e9dd577a072d8e66d4d6c7cb568a23ead0b80f0a61b4bb74e82f02df29b8a9aca1aee920974c00b40d813
-AUX ccze-segfault.patch 814 SHA256 43d82cc9ecb9c3b4aeea311411ada9622094903f60861ed4bc0b2044f294dddc SHA512 2ec3cb432ced33361bc88eac6434f4d831f313ad104a1e2e1ff095189cb5df90898262df03ec33d18d020b9b9c551ec572305ff9193e3ff6d86b1b3c7bd8cc4e WHIRLPOOL 60eb551619a5230b108a6c657a70c104cdeabe8e2adfa80786dce8d89084218bdc48b88e871c1e9b4bd971a4f6e2e1b923db8509bd8d447aaf414dec1a1c1da5
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX ccze-0.2.1-tinfo.patch 369 SHA256 0d39f8d775bbba749ab2a3fbd6813744fc9e36b8d1a3470e8a7c4734010182cf SHA512 8dd3d7a66807782fef49119e380eec9230d4d0708ef8b20cb9606740015f96f024b22967fae348bc59b3334a3b110dc1cacc8792a9a3402ddfdf600ccd71a62d WHIRLPOOL 08cada088cc6b28ec451db288af0a2cff6376806983064fccbf31d892a1ccd4086e05b87090a161fc985a395d13e917d0d15061ec660612bd858bf687f296af5
+AUX ccze-fbsd.patch 531 SHA256 38707e4cc95fabdcc4a89d07f5bc7f5c4ef723674ae43e481800ab7d112a04d4 SHA512 c94926f907b054b84df8c1887183fc44024d4a4b4e9cb4a91ce34adf25857cc30d9572673a3869fa1affacda047fa30f9d73ba198cdebecf40ae86b5fc9dceec WHIRLPOOL dfcff266a8b70f2b8305c6f3e791d75e30df8321ab2a04b39438f6576a064508bcc7d33a9a714e2ddb715981ad06c39b983d43c4cdc35f983e7baf4fd25de24d
+AUX ccze-ldflags.patch 424 SHA256 68cd44dd51f43d690760b809f962b74195a5f919719c7c34bfcb30cf6ce8d687 SHA512 7dff2e235acc665abcc3ed35744776e60a336b45cafbd80e3f4707f61d3746821e63949e73c32ee4fc5ca43b5639a816c42bb5e0b08912a7c617744dff39ec07 WHIRLPOOL 52bac605ae70d46a0fadd6e524283a41fcd57a04ba57da2b89ab330a12118672af78334694d6e2fda6f2976f0308efa1fddf1fe63f3e17c480657cc333ad326b
+AUX ccze-segfault.patch 660 SHA256 69db1dbe844d21846b351ad5fa39714336db0372d25a96a096479dfe33da12d5 SHA512 e8ebdbc8293b4d765d683bbdd222c0af3aaf0668ea8376ed830efac3cdb4a99dfc75dda6e59b95e7a36b7ab4fc521a9a1937e4ab9a48218acc76d2b02844b900 WHIRLPOOL 15dd26f2c8acdf7e277cdb95808e22ec0110f669c767ed92e25219f7cf6a14fac314cf4e855266d07002b31969690a1c250d575358aef87cea2352a3d445b987
 DIST ccze-0.2.1.tar.gz 139795 SHA256 8263a11183fd356a033b6572958d5a6bb56bfd2dba801ed0bff276cfae528aa3 SHA512 1704da8d4c97a3403a57d7841db8a6e4ba6116e401f91d9ecf1b1371cc18b40641e5665c9414740d6a523874be6b6527f5c0d4f3a3796c7b96ed83192146b2b7 WHIRLPOOL 93f8891c3a7885ca264f7269493893e6555865c89dee5cf5c890754f55db0ac60dce26d76318c8f838d7ee6ff6fe8e2454e9b4490ab607e496a5fdc0ef4f7685
-EBUILD ccze-0.2.1-r2.ebuild 1140 SHA256 b8740ff7cdf13494cabe3cd056dc02c0f8bee10eb527fd13bf0ee4336bd53c3f SHA512 c504ac5ea2a50b2dd3ef8c3e8b81de4bb971df103d3848afe2c0ab17e9bbd8dc57d4b09e0cbc00e4b847ec12a7077aff9c2bce3310b66d56ccff62fec5b1d026 WHIRLPOOL 5e8f0afd0534486ba00b2daa7d86c37c93e7de677ee07376c26804511fcdeddf9ab9294a6fbb30c256a7607f56e7daac7f56a134d95f9131ad578b2435f5a45a
-EBUILD ccze-0.2.1-r3.ebuild 1009 SHA256 9e37378b8b8c4134a9b7eea89c4582238de93aa164253cb790bd9ffb4ab30321 SHA512 b8adce51a86b2878d2c891f2c0e810fc64fe220cd4ba253c59fc521310beb6663bf7ed2626814c9ba3ccd8540f69ad764451e8892915958def84b71131020607 WHIRLPOOL bc0f7d02fdb915a64665bd0a288c84e1500d093c3eb6e361ca0b7597e14bef078b96c24f331b24fe52099fe8e4ae0bfc9b8d6632509b0ebc54821e4a62e32302
-MISC ChangeLog 3869 SHA256 40ea147085670f8118665407a7bc8e56e7c47d3c8bc5650dbd70ac68d9bd304d SHA512 98ab16a3b895c09e650760bb2d77c0b3e71ac6a597df2d2bf9969ed65eea17cae276272a03def8e9c3e4eab891b67d8dbb9b14ea1abdeca015e52f10cff42298 WHIRLPOOL e5c9323133588c127180f86ca7f6c89d332a28379ba5d4dfa3d34a484ef87b5d21dc02c8add9c1ea378707a4e7291a5244642249b2accb88ddab419ae245b405
+EBUILD ccze-0.2.1-r3.ebuild 1044 SHA256 865d6196e75fab62ab40054046c84587f0e404be038a42897a02b559f1688c9b SHA512 7d535cdec790ba21d830e2444a15e8d314e70ff76a5ea3fa59eda3b008f6c587a811f5db0b2ba1535fcf0ed3896d69e4e743180958285f3d574720d86ef0ba5e WHIRLPOOL 55b69668743482cc51603550aa3ebc3401f636de5c3cb0c5ac88f555443016687338861150111ea34ec1bdc2f1bfcc856c2891ea48a8d090b070063c23ab9bc7
+MISC ChangeLog 4131 SHA256 fa5be6c17c89031f666ae73f74cbe09cd227d0947961da65e823ce01266c75e4 SHA512 9cf521076e71a6058e0d4f6882cf5167b2f23bbfeedd59b689c4c03b40465362513a8f149f68c866926ddf45079d32a8bf7de443aac637e3b7c3f549ae3a99b2 WHIRLPOOL 5302e930b42b15a1331e324f1fdc05484b90422d7593189739b1d4fb6ab4bc5d12012548db52a9a44d5dc4eac402f8591919c4f0920a8134f5a2bc2f9083ddef
 MISC metadata.xml 623 SHA256 132a5ae27f2ea6536e84a525f645e3a2f2e4011187e94626e3998a989ea48a58 SHA512 a545353ff382d249d48e2ebd2e233122d89ec3c89c98bc00aec52ac75f44c9e31937f20b7700e175f4488b1eb9ee56d389888ce4c3a31bb5fb07c88f081c31de WHIRLPOOL 99720afb4b1e900a2d582c4eb72d699c6b22d96b26a3cab29825fe596b60178efaf6f8396e044b037c981e2353c239ce772a38df7cab31f69f9be442341175da
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlRxsGMACgkQVWmRsqeSphOZnwCdHkj5x2nFWTq7lrFyjuMTyBTj
+IL4An09KUlqQHParKWXjmTSFRSNBDbeg
+=U+UD
+-----END PGP SIGNATURE-----
diff --git a/app-admin/ccze/ccze-0.2.1-r2.ebuild b/app-admin/ccze/ccze-0.2.1-r2.ebuild
deleted file mode 100644
index 1ba0c7b7d62e..000000000000
--- a/app-admin/ccze/ccze-0.2.1-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ccze/ccze-0.2.1-r2.ebuild,v 1.8 2012/03/18 15:51:16 armin76 Exp $
-
-inherit fixheadtails autotools eutils toolchain-funcs
-
-DESCRIPTION="A flexible and fast logfile colorizer"
-HOMEPAGE="http://dev.gentoo.org/~joker/ccze/ccze.txt"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-RESTRICT="test"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-libs/libpcre"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/ccze-fbsd.patch || die "epatch ccze-fbsd.patch failed"
-	epatch "${FILESDIR}"/ccze-segfault.patch || die "epatch ccze-segfault.patch"
-
-	# GCC 4.x fixes
-	sed -e 's/-Wswitch -Wmulticharacter/-Wswitch/' \
-	    -i src/Makefile.in
-	sed -e '/AC_CHECK_TYPE(error_t, int)/d' \
-	    -i configure.ac
-
-	eautoreconf
-
-	ht_fix_file Rules.mk.in
-}
-
-src_compile() {
-	# Bug #243314
-	tc-export CC
-	econf || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog ChangeLog-0.1 NEWS THANKS README FAQ
-}
diff --git a/app-admin/ccze/ccze-0.2.1-r3.ebuild b/app-admin/ccze/ccze-0.2.1-r3.ebuild
index 304adc982613..41440fd6c972 100644
--- a/app-admin/ccze/ccze-0.2.1-r3.ebuild
+++ b/app-admin/ccze/ccze-0.2.1-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ccze/ccze-0.2.1-r3.ebuild,v 1.8 2012/03/18 15:51:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ccze/ccze-0.2.1-r3.ebuild,v 1.9 2014/11/23 10:01:06 jer Exp $
 
-EAPI=4
+EAPI=5
 
 inherit fixheadtails autotools eutils toolchain-funcs
 
@@ -29,6 +29,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/ccze-fbsd.patch
 	epatch "${FILESDIR}"/ccze-segfault.patch
 	epatch "${FILESDIR}"/ccze-ldflags.patch
+	epatch "${FILESDIR}"/${P}-tinfo.patch
 
 	# GCC 4.x fixes
 	sed -e 's/-Wswitch -Wmulticharacter/-Wswitch/' \
diff --git a/app-admin/ccze/files/ccze-0.2.1-tinfo.patch b/app-admin/ccze/files/ccze-0.2.1-tinfo.patch
new file mode 100644
index 000000000000..d0d7550e3337
--- /dev/null
+++ b/app-admin/ccze/files/ccze-0.2.1-tinfo.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -100,6 +100,7 @@
+ 		strndup strstr])
+ 
+ AC_CHECK_LIB(ncurses, initscr, [], [AC_ERROR(NCurses library not found)])
++AC_SEARCH_LIBS(stdscr, tinfo,,[AC_ERROR([Cannot find a library providing stdscr])])
+ AC_CHECK_FUNC(dlopen, [], [AC_CHECK_LIB(dl, dlopen)])
+ AC_CHECK_FUNC(getopt_long, [], [AC_CHECK_LIB(gnugetopt, getopt_long)])
+ 
diff --git a/app-admin/ccze/files/ccze-fbsd.patch b/app-admin/ccze/files/ccze-fbsd.patch
index d1f684ac26c4..ae694e0e4423 100644
--- a/app-admin/ccze/files/ccze-fbsd.patch
+++ b/app-admin/ccze/files/ccze-fbsd.patch
@@ -1,5 +1,5 @@
---- src/ccze-compat.h.old	2006-10-13 12:50:16 +0200
-+++ src/ccze-compat.h	2006-10-13 12:49:21 +0200
+--- a/src/ccze-compat.h
++++ b/src/ccze-compat.h
 @@ -29,6 +29,11 @@
  #include <stddef.h>
  #include <stdio.h>
@@ -12,8 +12,8 @@
  #ifndef HAVE_STRNDUP
  char *strndup (const char *s, size_t size);
  #endif
---- src/ccze-compat.c.old	2006-10-13 12:51:35 +0200
-+++ src/ccze-compat.c	2006-10-13 12:51:44 +0200
+--- a/src/ccze-compat.c
++++ b/src/ccze-compat.c
 @@ -275,7 +275,7 @@
  		char **valuep)
  {
diff --git a/app-admin/ccze/files/ccze-ldflags.patch b/app-admin/ccze/files/ccze-ldflags.patch
index acef31a43f5c..4f8c8f207209 100644
--- a/app-admin/ccze/files/ccze-ldflags.patch
+++ b/app-admin/ccze/files/ccze-ldflags.patch
@@ -1,5 +1,5 @@
---- ccze-0.2.1/src/Makefile.in.org	2010-01-22 17:06:57.000000000 +0100
-+++ ccze-0.2.1/src/Makefile.in	2010-01-22 18:00:28.000000000 +0100
+--- a/src/Makefile.in
++++ b/src/Makefile.in
 @@ -75,7 +75,7 @@
  ${PROGRAM}: ${OBJECTS} ${PLUGIN_SOBJS}
  	${CC} -rdynamic ${ALL_CFLAGS} -o $@ $^ ${ALL_LDFLAGS}
diff --git a/app-admin/ccze/files/ccze-segfault.patch b/app-admin/ccze/files/ccze-segfault.patch
index fa30d2f515c1..5bdd823e4120 100644
--- a/app-admin/ccze/files/ccze-segfault.patch
+++ b/app-admin/ccze/files/ccze-segfault.patch
@@ -1,6 +1,5 @@
-diff -ruN ccze-0.2.1.orig/src/ccze.c ccze-0.2.1/src/ccze.c
---- ccze-0.2.1.orig/src/ccze.c	2003-05-13 20:09:30.000000000 +0200
-+++ ccze-0.2.1/src/ccze.c	2006-12-12 20:36:09.000000000 +0100
+--- a/src/ccze.c
++++ b/src/ccze.c
 @@ -209,7 +209,7 @@
  	}
        break;