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

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

4 files changed, 41 insertions, 46 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/Manifest b/net-irc/irssi/Manifest
index d1080bdf9e51..b16670abb1f3 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX irssi-0.8.15-tinfo.patch 1310 SHA256 d1a8860e6dbc2dc904f97897ef792ef271f8c0509d4a3edc6c59227d98131694 SHA512 be4afd986d0a06b2c0711ab325bc4e9174f690d89144e9f9e124c199430abf541729b1c0774bfdb918195546b42344021d0f574b96f674ae964b4054ae98dfcc WHIRLPOOL 57ad2702cec60b4e4ab03f6fe7968c06c8fba70a4de5b8f40a1fc69d45b88d6235903b891f07607d943f465a98b8de6a727fe0a4feb863bf4e944743c435f4d4
+AUX irssi-0.8.15-tinfo.patch 660 SHA256 5a52f72cefab29dea374d808541dab95a23de4fd99aa65246322051813f554a2 SHA512 f6d7d84a0974071baf28f9481432986b060d17c68875aa6f0394e1fe80453b4dd816dd887c4079939f2a2b46c9d644b6029d83c139782179dfaf173ecb01983f WHIRLPOOL 5bc380e28f8c9db74549bd78b29a7b2113e0a350d78e36f52aba5575d98bc2717a9e139c9b28ed79680aa8ae17062729c469c779853faf6eafecf21b2bcb9915
 DIST irssi-0.8.15.tar.bz2 948847 SHA256 c12d16fb605103d7c256ddce44012dc396af57f3771e086d0387c195a052a0a6 SHA512 cecda925ae7c422fd95e8e94a123be8732a59a3a3c5d149b2fe16e1cac78cc516acb7a89ad79cf4ac0c412c9d4d3ea83fe5c0535ab6428e98479dc8909d0615a WHIRLPOOL 67c9f3f995d7d2e58b61c88d00bf4b5b7bb30181b143deac23a701422bdb5857642d346f34c75307954064da4f21752bd1f860da69446554c2658db3f28163f3
 DIST irssi-0.8.16-rc1.tar.bz2 980941 SHA256 64d3edcb5e00f63c7926c0f59403d5ab1dcc414a8539b860e152f3fb87d31674 SHA512 a172737ce1abfb020cca9b1aa62343e89831faada842915156f3327ef4c0c240ea89ea1da058449a21f34d383bb80d743ef9568264b70a582e55a4a3723fd289 WHIRLPOOL 091018ef4d631a7b05c31ad2b633b59d997ffba665e2a0c31112c3a139ddc1fa72120433a5588d818bc8a0182bd35ebb301a2937716e7101294aad7ca809be0d
 EBUILD irssi-0.8.15-r1.ebuild 1395 SHA256 3489c64d044cc3300ef029df31414922d3d7b556404cc8110e0bf8d67c029e3a SHA512 2fe38b8d97d8d0f5b7f156cc47e5095604d25cdea2c088cb5212284cb178360d97feecca817f0abd456a39fd9d34f745bb41fde9eb2d4d61dbcace24b1e3603c WHIRLPOOL 2e06e9ef92dbbee11aabbf6f4339c486ede284faa89f74aa4c74dac848f62c6fb61388f5f5785b21188269bcbcb3cfab7e9e37746ee1ae8ad902ce3630f12f5b
-EBUILD irssi-0.8.15-r2.ebuild 1631 SHA256 4f32459fd0c48d6ff89b8bacf7a23b76e897b3c3e219ac8d6c8ed79cb796c6df SHA512 f703cf88e77cd55cafc3f0790ec52bda9da44ad301fe693b3da669e343a68b552624e63f76a308206d441014f748d0322e35635c84185ca77bfdf4f7345fe4d2 WHIRLPOOL 8d3a483a40aa71c55070c29563d2a68c3357507daa553b15724d65276f52ad01b831041e33416960133baeacc99fd894c93c7b6b8ef631040d79fe62a9a84595
+EBUILD irssi-0.8.15-r2.ebuild 1497 SHA256 cc8ca099cd4b7e60f298c9a171df1cace2138e849666628982ff34245c1d2f6a SHA512 6b96fdadcf60f2d98d3429643ec90def4b8af40ec78dae7f535814690cc831cf10c73ff0b3ca1ed10d40593b0849085dba20e65cb21e38fcb26cc0049d871056 WHIRLPOOL 4f598f7c19426d888eda01964c9a636350faa43c9f54a6700ef8bfbc70944c42baeac5850d783570c353846ee6de7279e6c6bc8317d122ce02d7172414ba1b8a
 EBUILD irssi-0.8.16_rc1.ebuild 1632 SHA256 0dd22c4d4dc7706012113c99df49def05524a074d97bcca6f27edf257450010f SHA512 a98f0aa40a9473d1b14ed6e686d93107d81cbf5df6b2a21de5491710b9c7485f519fd80b448fd43fb547db879ed2e27489288c0f5f0e8c3f86304e8939ff7127 WHIRLPOOL ffba2f78f302f781f840e949cca8d9f879c60bf8cc23d68b211e703b5d5977852140fd1a088cc5a45a76cef6e400e27421d876892b6b7dc841c3dcf8c77caecd
 EBUILD irssi-9999.ebuild 1278 SHA256 261c37989d709bcad167c85d731ab1f6e65b4e434b7724e093ef892e9d711d4c SHA512 66244904ca18ac870e2e2932ffa5d74ea07ad85feb8cbcf121d9eba19a04c01c57596df0f844a985b79f02a1c2eec8daae83488f6f7f9769978ed15c8ead2ce7 WHIRLPOOL 26695858d43c7c9c58323c28e9a243674fdd5ac6a89e957b5783528df77df019d54f2e6e14f4191de69f43aa4a9bcd1c1685481f323bfb4d8e935d44e8d41615
-MISC ChangeLog 25908 SHA256 f0bbb2cee4b19b35b2c9bcbc897b01987335a044ad3badef37c543ee5dadaa3e SHA512 8f198aba3c56f89ddf7d1aa3603308545622deee98f942377f73359607a689a570e6b6e2200bca3401fc38cd425651d9fac9a2f70ee2e681cf4747c6fe625725 WHIRLPOOL 77c86d21965a1fc480ebaceeefbec268be1f053a0bccf40b6cb40eb08c5a3624fddca677dc42260e7ccc438681e4a6cb85a0688b01a4f466e67a4813e47a5034
+MISC ChangeLog 26614 SHA256 7ed1541049c13fc6855b0dff09bcc93bfb26e904a4d3db00cd297a016ad5fef8 SHA512 a667dc2fd40f2ae146e64dca8af0d055583c1100f75325709ab783d76d9a9212dfaff216fe508ff602250712d8af9510be5656a7632c765ccaa1c6108dd02795 WHIRLPOOL 39adf7db62efafbd8bee722d312b703614027085a8c656ae261b04cf73ce91367b92ef0b6d65ccad0b124db1f145fb81e2207e53fae8fd25fdbf7f2d7576af82
 MISC metadata.xml 270 SHA256 4962741e0eded229c8ac0cca6dc8fed203d9b63ed7d8de546c661e6661579c75 SHA512 d5854a0d3b4ba749b35e980202f1bb430bb0ffe7de651d381e52b59407486fb0b32bca09f9cbfcd1c94896e90c822eb3f425f28190b680a56b0bbb802933a781 WHIRLPOOL 375e0a25bf1b6bb3212c7a9ce1f0f03b10f6fabf4ebe3007c28a43d92a92e7ce3a2d51d591ddc86caa1c368c6daebff62847792078983371528859a11b0a2a7b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMXnGkACgkQI1lqEGTUzyT95gCg2gdJvTJxt8bhs82g5kQHag5a
-pEIAn1KhIRqXuiNXHWc1HJpk1ZOg9tzz
-=9hY8
+iF4EAREIAAYFAlMYE78ACgkQoBEVQmGOlx9eGwEAnckkEwp26gYdPwXGmxo5lmHz
+ldv9zHzun0Rrwmiuhq8A/32Kb+R8UnVolMkBmCUOEzLKm85sMD1QYoXxNZyc341Z
+=maUy
 -----END PGP SIGNATURE-----
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) \