Thanks for jer for reporting in bug 453396 that "And now cross-compiling might fail because you use pkg-config directly." - correct this by using a sed to in src_prepare to change pkg-config to $(tc-getPKG_CONFIG). Add "-Wl,--as-needed" to LDFLAGS, thanks to jer in comment 23 of bug 453396.

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

3 files changed, 19 insertions, 10 deletions

diff --git a/net-irc/irssi/ChangeLog b/net-irc/irssi/ChangeLog
index d27607d7ea5f..8d8da15ce113 100644
--- a/net-irc/irssi/ChangeLog
+++ b/net-irc/irssi/ChangeLog
@@ -1,6 +1,12 @@
 # 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.183 2014/03/04 13:08:52 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.184 2014/03/05 03:11:15 gienah Exp $
+
+  05 Mar 2014; Mark Wright <gienah@gentoo.org> irssi-0.8.15-r2.ebuild:
+  Thanks for jer for reporting in bug 453396 that "And now cross-compiling might
+  fail because you use pkg-config directly." - correct this by using a sed to in
+  src_prepare to change pkg-config to $(tc-getPKG_CONFIG). Add "-Wl,--as-needed"
+  to LDFLAGS, thanks to jer in comment 23 of bug 453396.
 
 *irssi-0.8.15-r2 (04 Mar 2014)
 
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 3ed6a4c5151f..f4343bed4443 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -4,14 +4,14 @@ Hash: SHA256
 AUX irssi-0.8.15-tinfo.patch 1310 SHA256 d1a8860e6dbc2dc904f97897ef792ef271f8c0509d4a3edc6c59227d98131694 SHA512 be4afd986d0a06b2c0711ab325bc4e9174f690d89144e9f9e124c199430abf541729b1c0774bfdb918195546b42344021d0f574b96f674ae964b4054ae98dfcc WHIRLPOOL 57ad2702cec60b4e4ab03f6fe7968c06c8fba70a4de5b8f40a1fc69d45b88d6235903b891f07607d943f465a98b8de6a727fe0a4feb863bf4e944743c435f4d4
 DIST irssi-0.8.15.tar.bz2 948847 SHA256 c12d16fb605103d7c256ddce44012dc396af57f3771e086d0387c195a052a0a6 SHA512 cecda925ae7c422fd95e8e94a123be8732a59a3a3c5d149b2fe16e1cac78cc516acb7a89ad79cf4ac0c412c9d4d3ea83fe5c0535ab6428e98479dc8909d0615a WHIRLPOOL 67c9f3f995d7d2e58b61c88d00bf4b5b7bb30181b143deac23a701422bdb5857642d346f34c75307954064da4f21752bd1f860da69446554c2658db3f28163f3
 EBUILD irssi-0.8.15-r1.ebuild 1395 SHA256 3489c64d044cc3300ef029df31414922d3d7b556404cc8110e0bf8d67c029e3a SHA512 2fe38b8d97d8d0f5b7f156cc47e5095604d25cdea2c088cb5212284cb178360d97feecca817f0abd456a39fd9d34f745bb41fde9eb2d4d61dbcace24b1e3603c WHIRLPOOL 2e06e9ef92dbbee11aabbf6f4339c486ede284faa89f74aa4c74dac848f62c6fb61388f5f5785b21188269bcbcb3cfab7e9e37746ee1ae8ad902ce3630f12f5b
-EBUILD irssi-0.8.15-r2.ebuild 1472 SHA256 5862d8efefe1190401abbeeba1b39db7db776ea35fb0401d989aa0fbe0948335 SHA512 29e0e5de0704e5954df8efa9e854bf794d637a271ab7f74780b4919d7d9de0a107d460d82fe5c9c2dc05b29b54772ffd47b9a67bca53da5cf0389fd4e49471dd WHIRLPOOL 2b2f5928cbe564f54dbff58daf915c1a9aaf6c893fc538689d4f21169ee6e9ed8515b2daf10744349677f6116adf640a81d8f33cc74dc7336544f65bee389149
+EBUILD irssi-0.8.15-r2.ebuild 1700 SHA256 858195697928e990189de4db4504f000f0c551291ed3dba9ea1374b640b9863d SHA512 a15eba90f8e8754664675a1bbc0ab960cc57096b98bcfc094da6658437acc15b0ff59bc5b4b15dbadcd15fe36cf789d965eb5cd627970497493eb04e9d30d408 WHIRLPOOL debe4651e660c650f24b8adde24f7809a74aa5e4752f0218b13b7efe3993f45d0343ce5cc52bf4faeed289bd5b2ae61097f52d25133c0359013af188f25c831a
 EBUILD irssi-9999.ebuild 1351 SHA256 88103f701e85596a30b2b2a8dd44cc3044ceef2a0843e84d683abf823ff2e20a SHA512 0f9a97f7243a1b9f4bfe7e2cba43fa8ca70a71ef187f41928b9eb81f0fe946d3e5c0139c897db93c1998c2f624497a1f213cbcb152b69eedd850b669448ff367 WHIRLPOOL 1caf2dcccbac33883a0e2f8d58ded3f21248ee9345765a935031e3c4c1d0c010c560a8f5b2dc9fb26561cee068ae5791f5615724bb02dab38e5f2f1bb5cb6a8c
-MISC ChangeLog 25075 SHA256 44f1fb094a19a188bfb1c390866ee06025facb23c7a0a9d97b07472acb467402 SHA512 5fc1fac685817d2db340444cc0e2d2c3f3c68cbc8d439d67487f3d2dee8e32dddbe7d3baa609702f709301625b8f765a1e50fda8a2d8d4f526d0b9aa6dde1ba2 WHIRLPOOL 7d80ebdc37a4dade6950f9a57c20d875d7e01c68806a77b4ec2ec09f08d960878296526b0ecccbfdfbdcbbfea1b7c941fa9124c5944e08943f844d09dfd57dec
+MISC ChangeLog 25447 SHA256 d3e50778b3451daeb5bd1e9416355758a2cbe1433ebbaf3396020702c1f319bd SHA512 149d9293003e6b89a1bb29d72d06e8dee7e44374e001b44354aac3a17af3b20d6b6ff68ebb98c30037234632731dcfb4fef4ba51e71ad6402685b62a20a6d9f1 WHIRLPOOL c8d1b14ca80caa549d5970c2cdd9f7d7786ed93993583a7a18383721cb72a9622a6368916a82cefe92705ede383102acdb4568a2363353e0ef1bedd7e6b29f96
 MISC metadata.xml 270 SHA256 4962741e0eded229c8ac0cca6dc8fed203d9b63ed7d8de546c661e6661579c75 SHA512 d5854a0d3b4ba749b35e980202f1bb430bb0ffe7de651d381e52b59407486fb0b32bca09f9cbfcd1c94896e90c822eb3f425f28190b680a56b0bbb802933a781 WHIRLPOOL 375e0a25bf1b6bb3212c7a9ce1f0f03b10f6fabf4ebe3007c28a43d92a92e7ce3a2d51d591ddc86caa1c368c6daebff62847792078983371528859a11b0a2a7b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlMV0G0ACgkQoBEVQmGOlx+/VgEA2oIENGjFX//0hfbDt0GrshRL
-FeAXwdU6r+CSbmoxr0YA/1ebomroWcVwYSu1I2fuPkVl9wq+5DtthYHDV/dt1Jzr
-=ylH0
+iF4EAREIAAYFAlMWleEACgkQoBEVQmGOlx+kXwD9FOGzq2JEejRQQIclqwWJj0fL
+oA9pEL4/Gy4IMAqxYVsA/jV6V5QonSRCaCahSqB9WWlcz6igeEMQtHUjWc9pl5Uf
+=kohn
 -----END PGP SIGNATURE-----
diff --git a/net-irc/irssi/irssi-0.8.15-r2.ebuild b/net-irc/irssi/irssi-0.8.15-r2.ebuild
index edd37d82a4a5..e762b0ae5c6a 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.3 2014/03/04 13:08:52 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.15-r2.ebuild,v 1.4 2014/03/05 03:11:15 gienah Exp $
 
 EAPI=4
 
-inherit autotools-utils perl-module
+inherit autotools-utils eutils flag-o-matic perl-module toolchain-funcs
 
 # Keep for _rc compability
 MY_P="${P/_/-}"
@@ -30,14 +30,17 @@ RDEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
-PATCHES=( "${FILESDIR}/${PN}-0.8.15-tinfo.patch" )
-
 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
 }
 
 src_configure() {
+	$(test-flag-CC "-Wl,--as-needed") && append-ldflags "-Wl,--as-needed"
 	econf \
 		--with-proxy \
 		--with-ncurses="${EPREFIX}"/usr \