Thanks to jer for help, try to address some concerns in https://bugs.gentoo.org/show_bug.cgi?id=453396#c25 : Change irssi-0.8.15-r2 to link against -lncurses -ltinfo when sys-libs/ncurses it built with the tinfo USE flag to be consistent with how irssi-0.8.15-r1 links against -lncurses when sys-libs/ncurses it built without the tinfo USE flag. Replace the pkg-config --libs ncurses with logic in curses.m4 that checks if irssi needs to also link with -ltinfo or not. Add the --without-terminfo configure flag as without this irssi defaults to linking with -ltinfo without -lncurses

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

3 files changed, 35 insertions, 40 deletions

diff --git a/net-irc/irssi/ChangeLog b/net-irc/irssi/ChangeLog
index 37a2e2417cf6..5116272f7005 100644
--- a/net-irc/irssi/ChangeLog
+++ b/net-irc/irssi/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-irc/irssi
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.185 2014/03/05 21:51:36 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.186 2014/03/06 06:20:38 gienah Exp $
+
+  06 Mar 2014; Mark Wright <gienah@gentoo.org> files/irssi-0.8.15-tinfo.patch,
+  irssi-0.8.15-r2.ebuild:
+  Thanks to jer for help, try to address some concerns in
+  https://bugs.gentoo.org/show_bug.cgi?id=453396#c25 : Change irssi-0.8.15-r2 to
+  link against -lncurses -ltinfo when sys-libs/ncurses it built with the tinfo
+  USE flag to be consistent with how irssi-0.8.15-r1 links against -lncurses
+  when sys-libs/ncurses it built without the tinfo USE flag. Replace the pkg-
+  config --libs ncurses with logic in curses.m4 that checks if irssi needs to
+  also link with -ltinfo or not.  Add the --without-terminfo configure flag as
+  without this irssi defaults to linking with -ltinfo without -lncurses
 
   05 Mar 2014; Sven Wegener <swegener@gentoo.org> irssi-0.8.15-r2.ebuild,
   +irssi-0.8.16_rc1.ebuild, irssi-9999.ebuild:
diff --git a/net-irc/irssi/files/irssi-0.8.15-tinfo.patch b/net-irc/irssi/files/irssi-0.8.15-tinfo.patch
index 60ad511f4dc6..b16a07008561 100644
--- a/net-irc/irssi/files/irssi-0.8.15-tinfo.patch
+++ b/net-irc/irssi/files/irssi-0.8.15-tinfo.patch
@@ -1,35 +1,21 @@
 --- irssi-0.8.15-orig/curses.m4	2010-04-04 02:19:58.000000000 +1000
-+++ irssi-0.8.15/curses.m4	2014-03-02 13:06:29.834097805 +1100
-@@ -95,6 +95,7 @@
- 
- 	AC_SUBST(CURSES_LIBS)
- 	AC_SUBST(CURSES_INCLUDEDIR)
-+	AC_SUBST(NCURSES_LIBS)
- 
- 	AC_ARG_WITH(sco,
- 	  [  --with-sco              Use this to turn on SCO-specific code],[
-@@ -131,7 +132,8 @@
- 	  if test x$withval = xno ; then
- 		search_ncurses=false
- 	  elif test x$withval != xyes ; then
--		AC_NCURSES($withval/include, ncurses.h, -L$withval/lib -lncurses, -I$withval/include, "ncurses on $withval/include")
-+		NCURSES_LIBS="`pkg-config --libs-only-l ncurses`"
-+		AC_NCURSES($withval/include, ncurses.h, -L$withval/lib "$NCURSES_LIBS", -I$withval/include, "ncurses on $withval/include")
- 	  fi
- 	)
- 
-@@ -230,8 +232,14 @@
- ])
- 
- AC_DEFUN([AC_SEARCH_NCURSES], [
-+    AC_SUBST(NCURSES_LIBS)
-+    AC_SUBST(NCURSES_INCLUDES)
-+    NCURSES_LIBS=`pkg-config --libs-only-l ncurses`
-+    NCURSES_INCLUDES=`pkg-config --cflags-only-I ncurses`
-     AC_CHECKING("location of ncurses.h file")
- 
-+    AC_NCURSES($NCURSES_INCLUDES, ncurses.h, $NCURSES_LIBS,,
-+	       [ncurses in $NCURSES_INCLUDES])
-     AC_NCURSES(/usr/include, ncurses.h, -lncurses,,
- 	       [ncurses in /usr/include])
-     AC_NCURSES(/usr/include/ncurses, ncurses.h, -lncurses, -I/usr/include/ncurses,
++++ irssi-0.8.15/curses.m4	2014-03-06 16:36:12.404404130 +1100
+@@ -218,9 +218,17 @@
+ 			CURSES_LIBS="$CHECKLIBS"
+ 		],, $CHECKLIBS)
+ 	    ], $CURSES_LIBS)
++	    AC_CHECK_LIB(ncurses, tputs, [
++	        true;
++	    ], [
++                CHECKLIBS=`echo "$3"|sed 's/-lncurses/-lncurses -ltinfo/g'`
++		AC_CHECK_LIB(tinfo, tputs, [
++			CURSES_LIBS="$CHECKLIBS"
++		],, $CHECKLIBS)
++	    ], $CURSES_LIBS)
+ 	    CURSES_INCLUDEDIR="$4"
+ 	    search_ncurses=false
+-	    screen_manager="$5"
++	    screen_manager=$5
+             AC_DEFINE(HAS_CURSES)
+             has_curses=true
+ 	    has_ncurses=true
diff --git a/net-irc/irssi/irssi-0.8.15-r2.ebuild b/net-irc/irssi/irssi-0.8.15-r2.ebuild
index c20009c4c1d0..8f0e16b67529 100644
--- a/net-irc/irssi/irssi-0.8.15-r2.ebuild
+++ b/net-irc/irssi/irssi-0.8.15-r2.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-irc/irssi/irssi-0.8.15-r2.ebuild,v 1.5 2014/03/05 21:51:36 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.15-r2.ebuild,v 1.6 2014/03/06 06:20:38 gienah Exp $
 
 EAPI=4
 
-inherit autotools-utils eutils flag-o-matic perl-module toolchain-funcs
+inherit autotools-utils eutils perl-module
 
 # Keep for _rc compability
 MY_P="${P/_/-}"
@@ -32,9 +32,6 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-0.8.15-tinfo.patch"
-	sed -e "s@pkg-config@$(tc-getPKG_CONFIG)@g" \
-		-i "${S}/curses.m4" \
-		|| die "Could not configure pkg-config in curses.m4"
 	AUTOTOOLS_AUTORECONF=1
 	autotools-utils_src_prepare
 }
@@ -43,6 +40,7 @@ src_configure() {
 	econf \
 		--with-proxy \
 		--with-ncurses="${EPREFIX}"/usr \
+		--without-terminfo \
 		--with-perl-lib=vendor \
 		$(use_with perl) \
 		$(use_with socks5 socks) \