Use pkg-config to query Libs: from ncurses.pc (for eg. -ltinfo) wrt #459652 by Diego Elio Pettenò

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 43 insertions, 19 deletions

diff --git a/games-misc/bsd-games/ChangeLog b/games-misc/bsd-games/ChangeLog
index 6d34e8e4d303..57ba5fbed5cd 100644
--- a/games-misc/bsd-games/ChangeLog
+++ b/games-misc/bsd-games/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-misc/bsd-games
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/ChangeLog,v 1.47 2010/10/19 08:05:02 tupone Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/ChangeLog,v 1.48 2013/03/05 10:56:31 ssuominen Exp $
+
+  05 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> bsd-games-2.17-r4.ebuild:
+  Use pkg-config to query Libs: from ncurses.pc (for eg. -ltinfo) wrt #459652
+  by Diego Elio Pettenò
 
   19 Oct 2010; Tupone Alfredo <tupone@gentoo.org> bsd-games-2.17-r4.ebuild:
   Respect LDFLAGS. Bug #331833 by flameeyes@gentoo.org
diff --git a/games-misc/bsd-games/Manifest b/games-misc/bsd-games/Manifest
index 2d646d6a65ea..5819a8a7e50e 100644
--- a/games-misc/bsd-games/Manifest
+++ b/games-misc/bsd-games/Manifest
@@ -1,13 +1,27 @@
-AUX bsd-games-2.17-64bit.patch 1322 RMD160 c987b732b83cdf55bb15c6c3ddbc59212f28773d SHA1 0bd044bff85f18cf188dd6068c297dda17196865 SHA256 cbe649fa75bc3e16f27032d05b8ce770ae036df83435211e429379852528fcfe
-AUX bsd-games-2.17-64bitutmp.patch 681 RMD160 4589099e91e56852dc3d6df0b8cacf3b18577b0f SHA1 520950dfcb58016bd1a2d3b11e79646f93b08596 SHA256 992f8602661cc41c3253317bfc157abe0b2041cd7d32f5a31811708e2f8c4e23
-AUX bsd-games-2.17-bg.patch 732 RMD160 c7f5c44b151111e1da8b493c6e376b61e187a6b9 SHA1 197ae9a7ce927bbc1331aaa4f7b28eb971e75f4e SHA256 d25eb2b0e6790b6a852bce08f384994fed7b37a9d33d12d01b65e67fbd8f67d7
-AUX bsd-games-2.17-gcc4.patch 893 RMD160 d48cde21ad4dd239e802cf08e1e94c91a12296bb SHA1 adbdf06c228ee81ccc0a694db979ae4aab7591bc SHA256 96639f25206401c0dde3f9f28ac287c9e26c3efb526481fa48b482f8c9ab4ac0
-AUX bsd-games-2.17-gcc43.patch 741 RMD160 11c2be32ee2d610f7e379bf724bb0b7272247b2c SHA1 7bfa30aefe38340ea8a2c214f39a23d259b45cd6 SHA256 7b07a21db2d5198f8a698ad3772b355424dd58cab04dc12cf2a4c749c9eed7ee
-AUX bsd-games-2.17-glibc2.10.patch 4213 RMD160 57c70071e302618ca800cdff030ce862b1a8668e SHA1 60fcb6ef63f4baf83caac2432d908339a048228d SHA256 ff5b298e1e4599b02ad42dda648a4d940fc98e8446db2d90a8513cfbb1721992
-AUX bsd-games-2.17-headers.patch 268 RMD160 cc0e97f981581c0635e549ce41d97549c2f7ed33 SHA1 ebce73dc15fc11859fb4ca577dbdd977628b1501 SHA256 c21d06479c6758b6091b04676d636298c01d9709dabd5587111c74ad1db662d7
-AUX config.params-gentoo 1204 RMD160 2a76258f9da2641d0c2465d40dba461eb3a91452 SHA1 3cba205238ab8cb08347bff219fa66dedb376fca SHA256 74737471f9fa6a3f523d8e91af65a175cccfa94ce162eb8e5ecef08372047414
-DIST bsd-games-2.17.tar.gz 2563311 RMD160 a8f9c829bb09dfa071ecafbd6cb15560dba888d8 SHA1 8e48a9808908e2898126fdd285196ab71c9a59c0 SHA256 066f924aef6c1c5ea946f588e36f303021f5dfc093944738f025d8edbc6fff60
-DIST bsdgames_2.17-16.diff.gz 15897 RMD160 d40d9825b042deedff5ecb91f9ff3e4da43cda1b SHA1 4e68aec31f095dd10332e138f51c8fa541658fdf SHA256 e97f561ff2253bc4da422082ca1de0575855eb48cacbcabc83a3f8436992c683
-EBUILD bsd-games-2.17-r4.ebuild 4224 RMD160 62b6ce8ad835794c645af9404ea9657a9f88d900 SHA1 f37e774d5c549e7098cd894667ad1d150564cebe SHA256 b06150b1b53f08cc24f66189f4cfc35e4dac4858106c7c3edd7230110557de3d
-MISC ChangeLog 6688 RMD160 b6e88bcc140542cd59604dd2521e456bb6d36e51 SHA1 1b278e747f1674fcac3b7e7e304c07c3d7a047b3 SHA256 1d98282bdbc89b32eeb9b3b3cabe0d1faebcb674f7abbddeafd84d22cc4fdabf
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX bsd-games-2.17-64bit.patch 1322 SHA256 cbe649fa75bc3e16f27032d05b8ce770ae036df83435211e429379852528fcfe SHA512 b01975d7c91d5daca62f6ebf08d13ee261d72cc281c2b12cb9ef02766b52232622702384e268274bdcccf8fda20f39a49a328b5cd072226b27618ebe301c1a97 WHIRLPOOL 9048c79f0eee56d8d65ecf5b469e9bbaf0f41372c44472682020b12c5b88645beaf38b607d2592e07ade0fe34da696a363b4d181889fee67a33490cbb2634e4d
+AUX bsd-games-2.17-64bitutmp.patch 681 SHA256 992f8602661cc41c3253317bfc157abe0b2041cd7d32f5a31811708e2f8c4e23 SHA512 ba5a261950bd0f5f5b6aae0ee961a84f06bc6b68504c859db387d9c32875cb4f849c555c56c52f66b00af85d44d9a2324a2d1cccc6811acf6f980cefe9508258 WHIRLPOOL c91c4d6bdd6d4b4d97ed4e132de21a057ad9adb21e9e9eb0b204ea84e2cfc9f6eec009c2e77c46b94ae32144c1c819f314cbe208556a25863944277d84544193
+AUX bsd-games-2.17-bg.patch 732 SHA256 d25eb2b0e6790b6a852bce08f384994fed7b37a9d33d12d01b65e67fbd8f67d7 SHA512 006ce0aa632c1ff671bc98584307fcfabed62e81a4680271fcbbaebf93e0f6f7c89cb1fbe311ffa472facd02991c456ced6b198c02753958b1178aa9ef16d8ba WHIRLPOOL cf2c7d51bdb2d731901f632bf99de94ccab2e2d1c08595b41e05f84b047eb23209fdabcdd27cb9962bdeddf5c2bcf01d2bf67ee9fe87ab50c4afcc60c7fe2211
+AUX bsd-games-2.17-gcc4.patch 893 SHA256 96639f25206401c0dde3f9f28ac287c9e26c3efb526481fa48b482f8c9ab4ac0 SHA512 fca57d3887f202b973bf5c03eb0d9a8e62a0ef8f746ccec0cb6e3ad2494bdf1208a1a8833bd3b762281289802b8c58d90cab62fe2642915acaf1ff87233329c5 WHIRLPOOL b86f4fadc82bc2d8588f3d6311882f624b32e5232f814226eb89c5947a9548fe208d73d04dd7f9efde2d868000b8f017f3977a34526ec6e050a968c6756a67f4
+AUX bsd-games-2.17-gcc43.patch 741 SHA256 7b07a21db2d5198f8a698ad3772b355424dd58cab04dc12cf2a4c749c9eed7ee SHA512 37d3ac2b056de4596170ec295d18c9baa64dcee402d2e191009f6db4719627427cb2f5116510bb66b2a78c93006837f8fc86b85bb005d8de698df4f416f1be72 WHIRLPOOL e5fd9c508870277ab9a98e96edf55092c2cc4f29ab131e9e98cbe10419503c29940a7868ffda54f1133842ec071c8ce150b32afb07e8be683113ab646aceccae
+AUX bsd-games-2.17-glibc2.10.patch 4213 SHA256 ff5b298e1e4599b02ad42dda648a4d940fc98e8446db2d90a8513cfbb1721992 SHA512 70d90072991ae3864fef32dd097bacac4e1b5b62e057e6887ce8284881162807d6d14e8d1fcb818db85fcf9bd811711b1bd5aa1166cc8db7e725dbd04bd66525 WHIRLPOOL 6b98ddc3b58c47fec74b51506bdf287dc1857b70178d934371ef68910d6e45c8611a0b4c1ff68fbd31065fe2b156e2791f6cc901ae4d3c073a8f3df64512befa
+AUX bsd-games-2.17-headers.patch 268 SHA256 c21d06479c6758b6091b04676d636298c01d9709dabd5587111c74ad1db662d7 SHA512 cc7c62109e835b31db0dfbb84de35fcb962bebee04b901c727b7ff087c194bfb12e4edac6b7e2f3ca0e414bd486c18962e8f5ad1f33a997e2782f58b9b62469f WHIRLPOOL bf219252c4c3b743b90504db7ce8d57213d857dcc6011b49d60149b8905142478630a064b9fb7ec6b631574bb4d670328345befa108a40b0fc2871ba5c8525ac
+AUX config.params-gentoo 1204 SHA256 74737471f9fa6a3f523d8e91af65a175cccfa94ce162eb8e5ecef08372047414 SHA512 b6734409235caec3deb531bbcdb37527b3090c41b803ccc11895ea403543722437f84bdfa044c6aa70b306384ce94a40979a347e6031bc1d937841c7222d6618 WHIRLPOOL 0e4dc8250d7dc190a8eeaa7829d3386eb1c3a53018905502005058a7b947ebefa97df9fd96689d9850983a3758c8bf0b128d51ad1374116c098824b745eb7867
+DIST bsd-games-2.17.tar.gz 2563311 SHA256 066f924aef6c1c5ea946f588e36f303021f5dfc093944738f025d8edbc6fff60 SHA512 cb2ee60474f164d42e3d47700270bbeeda3c8279d64da409c9cc05e36437ef95b92d0a85543298e97604635fcf3e068f3a5cc812e90b5c61fb8d146cf35bc38f WHIRLPOOL 4a8e4bcbf040997645d1b88ef17a3f0df6414a5ad922ea68045759eeafb09ff473ad3ed1a95304a82a4eace02ebc05c1c3966bfe46a204f22e29d4d945ad2566
+DIST bsdgames_2.17-16.diff.gz 15897 SHA256 e97f561ff2253bc4da422082ca1de0575855eb48cacbcabc83a3f8436992c683 SHA512 5edabd7471f064dda5b55f413a94ce7f93bcdbbca806346ab63a1cbf51e955aca3b8a06615eba525242040794e9e48d1911bb425499fe8380ebea43d1c9d7474 WHIRLPOOL a20d5c4ef4cfe25256f1be353faffbfa30718a0c8825e6fabf312c067f6e33d99c78044acaf113c638ee38e294530e012a7434690830044d31cb4754f0682678
+EBUILD bsd-games-2.17-r4.ebuild 4451 SHA256 9f8e68f7aa87760fb656bf56bd927e5970dfa8a94e9e4e6bf8c1bc7e27a48275 SHA512 148fa6a744758ddfcf5e799f28b763789a7b99eac5675676ff95ddfc09bea2b1a5dfcc72e4e82a6bf41482788e325d6fd4f2318ff85ecbc51aff0a9493134363 WHIRLPOOL ac86ed2c998c9965bb433a867112ae8724d225eb02d3ca161a9080c1ea7ffdc58730b2623f53f843296267d3ff9b3b96ca58f51bd159bf55fdb1166f7b331e2b
+MISC ChangeLog 6875 SHA256 29a2008e504001915bf0dd14ce6f8490656db03931b291d7080345e4f3de7751 SHA512 622dfd46f341cab082afdfff7db82746fe1d0cd0dedb08113f733a66c7cf583a341d67f1e02d5172a3b4e169c29fbe4c5554680f4e15da2630a77de5022c20cb WHIRLPOOL d9c88c4a443b9ee07b5d65f5d436fd88701c5b1e30d1c8aa76c544d0a43c8bb201df94e50745324bae95c5ae8cd0a41225cbd8869ef94c4a0216a345d563035a
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRNc78AAoJEEdUh39IaPFNsJoH/RicJUOp315FBFBpAlRVVYM+
+/RrWnQ2sxTqZW8Ya01zPnWbD187brZyB1FS2PQ2oUg24G6pQxs3AxP8/maII+1rH
+jtZMEup5W1XZE6V9M2HNl42VUIwfaq8ncd1GcVm/U+/mPwSO37Eae/qAnqwuRD6W
+PEYU+9SI+GYToPBeoxx5+2w0AdKwjm3blc4KW430HUEU+zFui3TxNc85LGkvQQlx
+NQmCAe8qRV93405L82ERQO1jHLrt77mto1ZMdFBLl2btKsUj+91EI6W7zJWIw3xJ
+B2+ZQu82eaffOXafxUVinppF/YsUBjkoeEKxJT5OebEGTUvwwrT3f5ieFI4idvQ=
+=LNs4
+-----END PGP SIGNATURE-----
diff --git a/games-misc/bsd-games/bsd-games-2.17-r4.ebuild b/games-misc/bsd-games/bsd-games-2.17-r4.ebuild
index b7012f78ac1e..740f23d9578a 100644
--- a/games-misc/bsd-games/bsd-games-2.17-r4.ebuild
+++ b/games-misc/bsd-games/bsd-games-2.17-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/bsd-games-2.17-r4.ebuild,v 1.12 2010/10/19 15:55:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/bsd-games-2.17-r4.ebuild,v 1.13 2013/03/05 10:56:31 ssuominen Exp $
 
 EAPI=2
-inherit eutils games
+inherit eutils toolchain-funcs games
 
 DEB_PATCH_VER=16
 DESCRIPTION="collection of games from NetBSD"
@@ -24,7 +24,8 @@ RDEPEND="!games-misc/wtf
 	sys-apps/miscfiles"
 DEPEND="${RDEPEND}
 	sys-devel/flex
-	sys-devel/bison"
+	sys-devel/bison
+	virtual/pkgconfig"
 
 # Set GAMES_TO_BUILD variable to whatever you want
 export GAMES_TO_BUILD=${GAMES_TO_BUILD:=adventure arithmetic atc
@@ -41,6 +42,11 @@ src_prepare() {
 		"${FILESDIR}"/${P}-bg.patch \
 		"${FILESDIR}"/${P}-gcc4.patch \
 		"${FILESDIR}"/${P}-glibc2.10.patch
+	
+	# Use pkg-config to query Libs: from ncurses.pc (for eg. -ltinfo) wrt #459652
+	sed -i \
+		-e "/ncurses_lib/s:-lncurses:'$($(tc-getPKG_CONFIG) --libs-only-l ncurses)':" \
+		configure || die
 
 	sed -i \
 		-e "s:/usr/games:${GAMES_BINDIR}:" \