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

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)

7 files changed, 29 insertions, 62 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/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;