Use pkg-config to get libncurses libraries, like libtinfo wrt #454322 by "Grigoriy"

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

4 files changed, 46 insertions, 9 deletions

diff --git a/media-sound/lame/ChangeLog b/media-sound/lame/ChangeLog
index 08131eeb57e3..47c39acb011f 100644
--- a/media-sound/lame/ChangeLog
+++ b/media-sound/lame/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/lame
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.161 2013/02/21 18:41:59 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.162 2013/03/02 17:58:47 ssuominen Exp $
+
+  02 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> lame-3.99.5.ebuild,
+  +files/lame-3.99.5-pkgconfig-to-get-correct-libs.patch:
+  Use pkg-config to get libncurses libraries, like libtinfo wrt #454322 by
+  "Grigoriy"
 
   21 Feb 2013; Zac Medico <zmedico@gentoo.org> lame-3.99.5.ebuild:
   Add ~arm-linux keyword.
diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index b0744d617804..ba22b2e687c0 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -3,17 +3,22 @@ Hash: SHA256
 
 AUX lame-3.96-ccc.patch 809 SHA256 2322bdc40007993d77a31f5c9c0edf8af550de48b1ee3a2dbb0f6acea6c27197 SHA512 3ca09cde933763a06c5ccc25ae24d0ecfe471a56358d1bdec2a157c50342f099fff8760e11528d840a68cd8d68260b0916fa4781325f526573760abf96dfb962 WHIRLPOOL dd9ecd8344ed4256a703f6f4dc4f3bb93d8865a3fa5b8f67a3a79e685387500cbcdb59ba63a804e04a977ace8ab4892288fe6fd6c7e4ffd500b260e497dd94e4
 AUX lame-3.98-gtk-path.patch 8519 SHA256 65e345a2af2547592910aaf02775b2fb091c23801a4e1bc50d2d872cc414656b SHA512 015e82755c24f7ff2b643bb1b9fc7cf400b2b48c5210253b3109c090bd852f7d2ce7a44cd1a3d117900b2d1c9e09059042077c9cef258ba1b2387bf1a11d9585 WHIRLPOOL 59354f93da9adc86a11cae0793e0491126029d227e6aa8846bf70e431e4aba9420fc13910268ac52c8f9b1e3c65813b2fe31f8afe8de64ebeeb791b1360db512
+AUX lame-3.99.5-pkgconfig-to-get-correct-libs.patch 937 SHA256 e8d1be31320e93937a28f21312462454a13c5ff2b14733d2bc18ca1f19a8eaf9 SHA512 2e1100c008a076e004aae6bfe6590510febbe2e42af1039625bb9205d38108f5bc53651022033d4def09ca8f972b679ca236c4afb6d5d6c30fe325e3eca3756a WHIRLPOOL 9f3c68e83b12cb0358d7429d9ae92f1189ba830417bfa02a9ab5422276ac8c03e9da08bb4fda0ec062c5c902f5b2f1d90a8b0e3dc8686078c50b2179a3f34756
 DIST lame-3.99.3.tar.gz 1443843 SHA256 d4ea3c8d00d2cc09338425a25dbfeb4d587942cb3c83a677c09aeb1e850c74cf SHA512 13f01790b4ceb15824e3267955e15b91994c6350f7a59188ca331c24b29b4613953860b6193bebc6a1d7c6a71072d92604c1c0d09b443952ebed1d3229d09955 WHIRLPOOL b27782ed141b1c2a8730e44bfb15f57e68ba4c9522c0ca8d716910ffaccc8070b4c4efc091ea17e0babab409b52a8927b0a8163b4273e2ac3424171aac9a4a7c
 DIST lame-3.99.5-automake-2.12.patch.gz 536 SHA256 49833b952d846405fdcc8d87de55f60dda5fb2268e1b36861c53dfd39dbd275d SHA512 9d6211e257d573ced5c29c43ba5d5cc98a231b213d6e0cfc352b14776c06c9e656ed1873d5caae466afb27dfe753eeac0842c7221a8538ccecea8f4ba0f8bfe2 WHIRLPOOL 506e505cbf8659c3f67084565fc581e4dee3ba2016db3d835e3e63d9eca0d4383443e7596229f51b349c1f8c53ef42a581761d27778de4c1e5b698c85418b401
 DIST lame-3.99.5.tar.gz 1445348 SHA256 24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff SHA512 ce62d7eb9fc8c53c343374ded30f11153a296910f0be7e649197bca7412c6660aad1aa6143d56b750f866229eb492cf7bb4f682535c383fb4aa57d7077d8b4d8 WHIRLPOOL c238107bfb824c67c639875547e24b64ceeeb22125800af753ca42de129138f480574a6cfe132bc2c9cffeb39e54b6d57059be69cb41bdc164cdbf29bd95afe9
 EBUILD lame-3.99.3.ebuild 1722 SHA256 7065837133d8453b32126a927cbd598a14a3f6697ae8087d9ee12ae191f02511 SHA512 60d490a007ed2d138b05d0839a8ee41054deec7bc39000aa7c4a7f50a7bb9a1bcec1b1ff0045e7682310a6ea86867168b6bd591e5ea29054934c6ad1f25a4fc2 WHIRLPOOL 6df45695c561b9f2c703e0083695ba4d5194c379a075b768b54a55ffb6e35ee86f933be3c1fba732312a94e7ab6c182c379ec63a1d7b6a95950ebbbf960533e4
-EBUILD lame-3.99.5.ebuild 1836 SHA256 aae18ecc9d58ca151709c959b7dda52bbdceadad463db39a2e0452156cb6ae66 SHA512 5565e60b61142ea8808f33512f0519a30e550322034ad2b8e216d7df3d0ab7704a408b942d712b57312108122082e2cb698f5bc7462ceada2de14f514c098961 WHIRLPOOL 0d87ab8679574face3642f8dae93605efe0e3e5b1aed8ce3b4cdb6d978798f57416c8dfe54f24ef0fa7c515f86fdc750f3543e2d4a94007399ed52da4aef9352
-MISC ChangeLog 21223 SHA256 b78f1eb78768be56e811385b8db471371bb5372c28ddad1b2bf561cd7e259286 SHA512 fdc20bb147cc512a9e6a07cd888a265cff737dade858eaee81ab0e1329af574b3e64e231171c8e9d445f06c9acd3b8f6c22a16955ae584f39ef1fa1f83b28a04 WHIRLPOOL f8def47905443e00467bbb958716e34ec1001feccbfccb038fd5d57d9b19f9e05396da60786d5235112d293fc7d419f3867c51aaaa7ee6c04b6167bca12ed278
+EBUILD lame-3.99.5.ebuild 1876 SHA256 aa2769ac13bea6b294559d5960b221b6a524d85797dabb00de2af9feea907e07 SHA512 fe5625cd5a70e3ebef4444595c569a0c4f91f5cb2160d2693dd25fbf40bb8958fec1f162f344b26f51133039e07fdfc8b9b079d46ff105a9d91fbcaaa7c49aa1 WHIRLPOOL 7dc43bf8a110e68b1a6827e82f7f8a8797d6f483000ac3f7fda2aacc7796861cde18dab333c9e5bc1671f938ef02ce0001a7c474c966eb98a3ad6a9e5a72de51
+MISC ChangeLog 21446 SHA256 7d2decff8dc7da5123bdfc29458a99156fff2e3f4b0e6829397c2822cb19a37e SHA512 1ae1129544dc82364f510c1d258eea5fca47861d4d90a8e15e21273a3f5ddb6ebb13f514f482acd2327e6ab03c52c2b73bff60c6974949d509141be86dfa7715 WHIRLPOOL 3057b2d849f82bf4c661ad059c6da3a78263c93157f8d013f55d8d3266f5e8defa38af80b85044f515d67d9e85f74a35b2153a2183b6c0b82d9ca5538ad1ae50
 MISC metadata.xml 264 SHA256 69ff3c8176be87b9e058cf261280c392e026742616602914b8ee3e3b6eaa2280 SHA512 bf40a711085ca56a9a88c27f5b4387aa6dd5bf9315b9a09e795116e7bdddedcc1f390dfb125090df7525749821980ea61f3457af4b19895a8a09debc1ed8e5b0 WHIRLPOOL 24230bee523a72cc630e8c2d818befb38f54575b04e7dcf1a7501e23b939c8c06f84db2fc687771bc6e1994cc2059626a402bca3237f289aeb274ccccabbcd65
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEmangACgkQ/ejvha5XGaMBuACglE7rlPE9Rt9pVSzpMZp9y1/B
-TKIAn19sOAue5EJD5xCbQCgDMi2BuyIN
-=PONO
+iQEcBAEBCAAGBQJRMj2DAAoJEEdUh39IaPFNNhkH/1DMpNZmlsxuQMhgnKR9H/Eb
+HJ+sSZuYeSCzPOcYx4+NnKwKO9hwfaROMQ2GdyU+h6awPbedEFeVoXsA22A9m4Wm
+jBbyj8RuvNahjkzCPYBmbzMUCA85L2uHpWvUMCuTzB7Dd18BCalHAdB7S07yTjod
+U0h81eAt5rOEYN8x1H9zjNVzgz4WdHFpwzxoBSoyssS5tKexzlYAotzKyQyriy0z
+ZvWohLaQtTplcSJ3/c50GQY1V3bE6qED3qkJI2AllyYQ0/fyO8vbOLxkx4XZFPcv
+zzv4gFA+kx5DqpvF2KMU/HLg8BdiWfpPKSyLL5h5t9tRl3kizz9YE2fyanrSyNc=
+=5E8o
 -----END PGP SIGNATURE-----
diff --git a/media-sound/lame/files/lame-3.99.5-pkgconfig-to-get-correct-libs.patch b/media-sound/lame/files/lame-3.99.5-pkgconfig-to-get-correct-libs.patch
new file mode 100644
index 000000000000..12a302e33741
--- /dev/null
+++ b/media-sound/lame/files/lame-3.99.5-pkgconfig-to-get-correct-libs.patch
@@ -0,0 +1,27 @@
+If libncurses is configured to build libtinfo as a separate library,
+part of the symbols that used to be in libncurses are now in libtinfo
+
+Use ncurses.pc to get correct "Libs:" and "Libs.private:"
+
+http://bugs.gentoo.org/454322
+
+--- configure.in
++++ configure.in
+@@ -374,7 +374,7 @@
+ AC_CHECK_HEADERS(ncurses/termcap.h)
+ AC_CHECK_LIB(termcap, initscr, HAVE_TERMCAP="termcap")
+ AC_CHECK_LIB(curses, initscr, HAVE_TERMCAP="curses")
+-AC_CHECK_LIB(ncurses, initscr, HAVE_TERMCAP="ncurses")
++PKG_CHECK_MODULES(TERMCAP, ncurses, HAVE_TERMCAP="ncurses", HAVE_TERMCAP="")
+ 
+ AM_ICONV
+  
+@@ -621,7 +621,7 @@
+ dnl todo: always use yes as default, use simulation instead ?
+ AC_MSG_CHECKING(for termcap)
+ if test "x${HAVE_TERMCAP}" != "x"; then
+-  FRONTEND_LDADD="-l${HAVE_TERMCAP} ${FRONTEND_LDADD}"
++  FRONTEND_LDADD="-l${HAVE_TERMCAP} ${TERMCAP_LIBS} ${FRONTEND_LDADD}"
+   AC_DEFINE(HAVE_TERMCAP, 1, have termcap)
+   TERMCAP_DEFAULT="yes"
+ else
diff --git a/media-sound/lame/lame-3.99.5.ebuild b/media-sound/lame/lame-3.99.5.ebuild
index 2f6d65761171..823ee9415235 100644
--- a/media-sound/lame/lame-3.99.5.ebuild
+++ b/media-sound/lame/lame-3.99.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.99.5.ebuild,v 1.13 2013/02/21 18:41:59 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.99.5.ebuild,v 1.14 2013/03/02 17:58:47 ssuominen Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -25,6 +25,7 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-3.96-ccc.patch \
 		"${FILESDIR}"/${PN}-3.98-gtk-path.patch \
+		"${FILESDIR}"/${P}-pkgconfig-to-get-correct-libs.patch \
 		"${WORKDIR}"/${P}-automake-2.12.patch
 
 	mkdir libmp3lame/i386/.libs || die #workaround parallel build with nasm
@@ -33,8 +34,7 @@ src_prepare() {
 
 	use mmx || sed -i -e '/AC_PATH_PROG/s:nasm:dIsAbLe&:' configure.in #361879
 
-	AT_M4DIR=${S} eautoreconf
-	epunt_cxx #74498
+	AT_M4DIR=. eautoreconf
 }
 
 src_configure() {