app-text/multitail: Add fix for ncurses[tinfo], #459206

(Portage version: 2.2.0_alpha165/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

3 files changed, 38 insertions, 6 deletions

diff --git a/app-text/multitail/ChangeLog b/app-text/multitail/ChangeLog
index 5c150ddc1a6c..6bbc9ccb93fc 100644
--- a/app-text/multitail/ChangeLog
+++ b/app-text/multitail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/multitail
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/ChangeLog,v 1.95 2013/02/25 19:07:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/ChangeLog,v 1.96 2013/03/04 18:58:11 jlec Exp $
+
+  04 Mar 2013; Justin Lecher <jlec@gentoo.org> multitail-5.2.12.ebuild,
+  +files/multitail-5.2.12-as-needed.patch:
+  Add fix for ncurses[tinfo], #459206
 
   25 Feb 2013; Justin Lecher <jlec@gentoo.org> multitail-5.2.9.ebuild,
   multitail-5.2.10.ebuild, multitail-5.2.11.ebuild, multitail-5.2.12.ebuild:
diff --git a/app-text/multitail/files/multitail-5.2.12-as-needed.patch b/app-text/multitail/files/multitail-5.2.12-as-needed.patch
new file mode 100644
index 000000000000..1ec5ba2c26b5
--- /dev/null
+++ b/app-text/multitail/files/multitail-5.2.12-as-needed.patch
@@ -0,0 +1,26 @@
+--- Makefile.old	2009-07-02 20:16:52.561919791 +0200
++++ Makefile	2009-07-02 20:17:21.947666469 +0200
+@@ -4,19 +4,19 @@ DESTDIR=/
+ CONFIG_FILE=$(DESTDIR)/etc/multitail.conf
+ 
+ DEBUG=-g # -D_DEBUG # -pg #  -D_DEBUG  #-pg -W -pedantic # -pg #-fprofile-arcs
+-LDFLAGS+=-lpanel -lncurses -lutil -lm $(DEBUG) -rdynamic
++LIBS+=`$(PKG_CONFIG) --libs ncurses panel` -lutil -lm
+ # LDFLAGS+=-lc_p -lpanel_g -lncurses_g -lutil -lm -pg -g -rdynamic
+-CFLAGS+=-funsigned-char -D`uname` -O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG) -DCONFIG_FILE=\"$(CONFIG_FILE)\"
++CFLAGS+=-funsigned-char -D`uname` -Wall -DVERSION=\"$(VERSION)\" -DCONFIG_FILE=\"$(CONFIG_FILE)\" -rdynamic
+ 
+ OBJS=utils.o mt.o error.o my_pty.o term.o scrollback.o help.o mem.o cv.o selbox.o stripstring.o color.o misc.o ui.o exec.o diff.o config.o cmdline.o globals.o history.o
+ 
+ all: multitail
+ 
+ multitail: $(OBJS)
+-	$(CC) -Wall -W $(OBJS) $(LDFLAGS) -o multitail
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ multitail_ccmalloc: $(OBJS)
+-	ccmalloc --no-wrapper $(CC) -Wall -W $(OBJS) $(LDFLAGS) -o ccmultitail
++	ccmalloc --no-wrapper $(CC) $(CFLAGS) $(LDFLAGS)  $(OBJS) -o ccmultitail $(LIBS)
+ 
+ install: multitail
+ 	cp multitail $(DESTDIR)/usr/bin
diff --git a/app-text/multitail/multitail-5.2.12.ebuild b/app-text/multitail/multitail-5.2.12.ebuild
index 9140f9f7bce8..2f433b39f209 100644
--- a/app-text/multitail/multitail-5.2.12.ebuild
+++ b/app-text/multitail/multitail-5.2.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/multitail-5.2.12.ebuild,v 1.2 2013/02/25 19:07:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/multitail-5.2.12.ebuild,v 1.3 2013/03/04 18:58:11 jlec Exp $
 
 EAPI=5
 
@@ -15,19 +15,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
 IUSE="debug doc examples"
 
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}"/5.2.2-as-needed.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
 
 	use x86-interix && epatch "${FILESDIR}"/${PN}-5.2.6-interix.patch
 
 	sed -e '/gcc/d' -i Makefile || die
+
+	tc-export CC PKG_CONFIG
 }
 
 src_configure() {
-	tc-export CC
 	use debug && append-flags "-D_DEBUG"
 	use prefix && sed "s:DESTDIR=/:DESTDIR=${EROOT}:g" -i Makefile
 }