Fix building against sys-libs/ncurses[tinfo]. Respect LDFLAGS.

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

3 files changed, 43 insertions, 18 deletions

diff --git a/games-roguelike/nethack/ChangeLog b/games-roguelike/nethack/ChangeLog
index 926caa2d3077..6ddb7c30e7c2 100644
--- a/games-roguelike/nethack/ChangeLog
+++ b/games-roguelike/nethack/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-roguelike/nethack
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.34 2010/03/02 21:10:39 mr_bones_ Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.35 2014/03/21 05:11:09 jer Exp $
+
+  21 Mar 2014; Jeroen Roovers <jer@gentoo.org> nethack-3.4.3-r1.ebuild:
+  Fix building against sys-libs/ncurses[tinfo]. Respect LDFLAGS.
 
   02 Mar 2010; Michael Sterrett <mr_bones_@gentoo.org>
   -files/3.4.3-QT-support.patch, nethack-3.4.3-r1.ebuild,
diff --git a/games-roguelike/nethack/Manifest b/games-roguelike/nethack/Manifest
index e5c7f0c97068..1f9a50d51d5e 100644
--- a/games-roguelike/nethack/Manifest
+++ b/games-roguelike/nethack/Manifest
@@ -1,12 +1,22 @@
-AUX 3.4.3-X-support.patch 920 RMD160 1cad76af263fa640097ef6f67f1298886df098ea SHA1 3fe24974e6e1df078a4a0992c9313f59e2f0c662 SHA256 e1d3a7110c97b80b1d3e3bd4204f1ea018fbbc03d2a937efdb292cc1f611f525
-AUX 3.4.3-bison.patch 603 RMD160 0fd71789e69640ac8c14183edd5974938d5e6f66 SHA1 2705d64f5c2692a4f1f561c90b816dce5dbe27b0 SHA256 8b8eab414c4dfeb20ab60dc543eb023eac90da0a9e1c8a2375833fdf61baec7f
-AUX 3.4.3-default-options.patch 1262 RMD160 10bdb2cbe10a7396a8f88052d6a61e62629c26d8 SHA1 678a7d263649b77b25a55290f68074042a64961a SHA256 5ba428f0c4d476c41b5ab94fb52737e39d32b7944d46755195745d97f14f38bd
-AUX 3.4.3-gentoo-paths.patch 576 RMD160 84319d80353e1c029d4130a73ae65b18680f2c91 SHA1 b8cc137b8b5c04071d81c741635fd261250490b6 SHA256 09b96c2659aab5749e5f16ceedfba40597938c9aa06e6bfc05e6b5f029a2ffb1
-AUX 3.4.3-macos.patch 307 RMD160 460ef1f4279e5c0e09de3cfe77b7984fbab0dede SHA1 a96ef11b97a9cbf08c9207144986d4355a27e6b1 SHA256 2df99fde20c8ff4b919da95bb4a36222b9eac564cfc2e02233da95dcbc25bb17
-AUX dot.nethackrc 2717 RMD160 0e9868a1b8f017337d8c37e740399e25512bdb5b SHA1 27c973b8c336355012e2e2c4f0007bce9cce9f84 SHA256 19d692014e1b053439f5f818291e32a971942490ca7e3d2b7912b43a4563f98c
-AUX nethack-3.4.3-gibc210.patch 330 RMD160 18a1bca6e71c7dc7930039fcb330f0c1791e31ce SHA1 45663beda1b67529886f1839f96be45021623c54 SHA256 5c74be994e8c5622b0c97f6178ef123ef614c9a1e2b4005da7fd36692f1df47e
-AUX nethack-3.4.3-recover.patch 2542 RMD160 393d6e4d141df1f836af083f96dd5bdd8e91d5dd SHA1 14c9117fcab1c200fa241988049a22203ef5422f SHA256 ce309d4b1d4ebb2c865754de905e5e16470f05c19460fc9491d98386a8015f63
-DIST nethack-343-src.tgz 3497458 RMD160 42f600d24715a0b7e631b357c135761410b3ca95 SHA1 c26537093c38152bc0fbcec20468d975b35f59fd SHA256 bb39c3d2a9ee2df4a0c8fdde708fbc63740853a7608d2f4c560b488124866fe4
-EBUILD nethack-3.4.3-r1.ebuild 4590 RMD160 a1b8768eae3ec46670fc9a33e00a106b534cee90 SHA1 6ff4df3b3a8ef100c9988b68311b200084b2632a SHA256 f3efbcc94612147c4a12737353a19420258aa1629acd78c293b146badaa77fa4
-MISC ChangeLog 7317 RMD160 d9383379048458eee44b99b42f25f88931c65375 SHA1 5d6dc0c742b0a0c84b8c72f1ff909e008a1f613e SHA256 75e08d26ae3077c16b4500a949d4634fc7ce319d73e150ba407dbca709f72669
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 3.4.3-X-support.patch 920 SHA256 e1d3a7110c97b80b1d3e3bd4204f1ea018fbbc03d2a937efdb292cc1f611f525 SHA512 bada4a9fc3d5d339c324540c009d3d84fb4b10eed40cae39536211e7016054a7c7ef9efb271eaab46fc208ccefc7d7c1205f742e43867cc7fbb3e52f896d62b9 WHIRLPOOL 600c7d1fe827a668387c88de7b9208990e946239833134436634dea667172863c1a6f143aee6e519e6f4df4b8a298131d865f6ec774c429d710775b0ab6b384e
+AUX 3.4.3-bison.patch 603 SHA256 8b8eab414c4dfeb20ab60dc543eb023eac90da0a9e1c8a2375833fdf61baec7f SHA512 5da9fe61bc7fb976fb8ee68d6035d80febb4d489ad23168159ba3c4215441071d1526d031056c0b84fa668a709c31de7030030f1dc30248b4b7e317316384cd4 WHIRLPOOL 63054f237634331403a941701cbd1de75e97c7adb13ec54ebfb50981f7bc7f8a96789c6c48abdd4a58a4804984a2bc35cb7ca40a68d0b8c817a2b556e321a563
+AUX 3.4.3-default-options.patch 1262 SHA256 5ba428f0c4d476c41b5ab94fb52737e39d32b7944d46755195745d97f14f38bd SHA512 cb775b0b67c781c02266dfea60211eddd4b792ce93428251db6af2ed78e8a6674555e82231d319693e75415b0e3ed8a58b2a4d0d3d3a91ddd9619b747c9ebed1 WHIRLPOOL b638a5d44d2cd55cd9de2394107c9219e38a499e74ffcd64995aeff6d57e4fef290ca38d4caa091c11ee49f50f11bb0dfea4ce1fb400c8ecf81cfd657815658c
+AUX 3.4.3-gentoo-paths.patch 576 SHA256 09b96c2659aab5749e5f16ceedfba40597938c9aa06e6bfc05e6b5f029a2ffb1 SHA512 44b9c6f868a67eab6e5441e7cce6ebcf4d584f6abb2226b556182c58680d68c29c021a1693f430a11a615ac495e7ee9927ad5e7fe27a98fd91b04f05d8c6e358 WHIRLPOOL 1af46058c1222228a20fb1402d2c36c9221b614f5b25e945cdac298030bb5b9beb7196c9da8a5d2b0887146b601463562fb39c6fe40389b4df3142ba951b95d3
+AUX 3.4.3-macos.patch 307 SHA256 2df99fde20c8ff4b919da95bb4a36222b9eac564cfc2e02233da95dcbc25bb17 SHA512 28f87f9b3ffd14dbcb707fbd1214b8bda960d5d1453a55fa0145f5df219d07e8593000e2c4cb31ee5ad4c50f81c76ef5ba51ea352f66e53e408b967da2f0881b WHIRLPOOL 9ed2af44d2b526c810e1e13974a0687aff2bdfb47af4f5c1d029b70497aa27ef999e3bfda4a7192f58bbcce99e532f3f8ea9b26fadf3588447dd52efd6d35899
+AUX dot.nethackrc 2717 SHA256 19d692014e1b053439f5f818291e32a971942490ca7e3d2b7912b43a4563f98c SHA512 36647889577c524edb9fdcae9cd385a0ec530b8a9854d87c052a6c74a0d17d702a6c7b616e314ecc94cbb4d0f05f3fd1e9dfb26ce3f4a0a9bab295af2e711a0c WHIRLPOOL fee873b42e283e9e9766503d6263fbf9987285d8095435e626da6a691c6f3089a31506d92434bf1aaf51bebeca9e01f0f07b8ec5e5a7d201f90fb28a29357a8f
+AUX nethack-3.4.3-gibc210.patch 330 SHA256 5c74be994e8c5622b0c97f6178ef123ef614c9a1e2b4005da7fd36692f1df47e SHA512 98a6d4dc35c652391e69ed4ba6fb56b20b80fd23ea0494979f5f7ccd397050e5510c29af06546bdf66462605a2a1160dd949eecf023cbf012eb60432fdbda805 WHIRLPOOL 2e23b4fb5383dc77da072d7644da82fab9c5bd06213616e5779dc8654870a810a25fda595aa2acb244e7ec9c567dcae53e4fcba9ba30eb6b23513e3e3710f3c5
+AUX nethack-3.4.3-recover.patch 2542 SHA256 ce309d4b1d4ebb2c865754de905e5e16470f05c19460fc9491d98386a8015f63 SHA512 f3ecd7e59254fea509fecb9517c47b029c9293443b81e36e94699026d31f0f3c83212b8bf372059761173397e3a6817b6e36ce099aa4223fe0e6cc0283879627 WHIRLPOOL e5b07ca7c0d2b3f8dd0b4a9417060268a94ae345443e00620f72f083b75eaf9125aec30e266db576bf7052136bee5c12c9382b7c4404b606e63ef68f3c792316
+DIST nethack-343-src.tgz 3497458 SHA256 bb39c3d2a9ee2df4a0c8fdde708fbc63740853a7608d2f4c560b488124866fe4 SHA512 052342c19619219f291571d48cf7799f962eb6ec6f8a276427225c0abbd833eada18abeff9fbd647919f2a9e3bb097d7f154675e283fe48abc4752f24c192d8f WHIRLPOOL 397c787f83149d96ddbfa6a2235c20c3724ed67946889d432774901cb7ddc71b177e2cbd6c3029f4eb0b4df21c81c6a427494dad550fdbace01876a3d9c79d75
+EBUILD nethack-3.4.3-r1.ebuild 4777 SHA256 904cd8a525a5f84aedbef0d6eb88399bef04cc6109e3a218d3f91893aac81666 SHA512 95b9174386533dc8bdf9c56dc8e34984205bbd27489f2da4f0815c781bc0eafd4dde0e3c0a430994bf91e8d7e5279a56f35a767fffa31efb5f1aa3fd6ddede62 WHIRLPOOL 4da489d43aed289b07881929110dd503910d4782c40cda281b600db4473f4d57605bc17772d28a9e5234084f2b0b28b056ae564870d08d20abcd3a94f284bb78
+MISC ChangeLog 7449 SHA256 2d4406b0df765a4580c5c95bac0ad3529d50e48d2f920ffb9c83d3915c608fac SHA512 14cd897573fed0e44bcc15ac88fce237412ed81f7eb0407366b412ab1938cb3d4b3f510531381b9dbcdf7175b857fea58236fd4140fd991063cabee5b74d5dc6 WHIRLPOOL 2ecba45129ccda7e91065dd80dc873ad7d97fd1fb0bbd8c651609c0b35c164f8ea183d9b193a9c4c3bc8a8d8bc5bcc84469bd9e0bfea34c2fdcc9c41ee7ee0ce
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlMrye4ACgkQVWmRsqeSphM7/QCfQARGiEgQVOW1aRo2x3uj5ciV
+uRYAoIEdus9Lk2wDo+vv4Y0Vabxs0K1/
+=Euhs
+-----END PGP SIGNATURE-----
diff --git a/games-roguelike/nethack/nethack-3.4.3-r1.ebuild b/games-roguelike/nethack/nethack-3.4.3-r1.ebuild
index d120ac45458a..00e0f703772b 100644
--- a/games-roguelike/nethack/nethack-3.4.3-r1.ebuild
+++ b/games-roguelike/nethack/nethack-3.4.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/nethack-3.4.3-r1.ebuild,v 1.27 2010/03/02 21:10:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/nethack-3.4.3-r1.ebuild,v 1.28 2014/03/21 05:11:09 jer Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs flag-o-matic games
@@ -22,6 +22,7 @@ RDEPEND=">=sys-libs/ncurses-5.2-r5
 		x11-libs/libXt
 	)"
 DEPEND="${RDEPEND}
+	virtual/pkgconfig
 	X? (
 		x11-proto/xproto
 		x11-apps/bdftopcf
@@ -65,13 +66,20 @@ src_prepare() {
 			|| die "sed Makefile failed"
 	fi
 
+	# sys-libs/ncurses[tinfo]
+	sed -i \
+		-e '/^WINTTYLIB/s| = .*| = '"$(
+				$(tc-getPKG_CONFIG) --libs ncurses
+			)"'|g' \
+		src/Makefile || die
+
 	if use X ; then
 		epatch "${FILESDIR}/${PV}-X-support.patch"
 	fi
 }
 
 src_compile() {
-	local lflags="-L/usr/X11R6/lib"
+	local lflags="${LDFLAGS}"
 
 	cd "${S}"/src
 	append-flags -I../include
@@ -88,7 +96,11 @@ src_compile() {
 		LFLAGS="${lflags}" \
 		|| die "main build failed"
 	cd "${S}"/util
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" recover || die "util build failed"
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LFLAGS="${lflags}" \
+		recover || die "util build failed"
 }
 
 src_install() {