Fix tinfo underlinking (bug #527118 by Michael Vasiliev and fix by Jeroen).

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

4 files changed, 55 insertions, 8 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 5ea556c52b48..128eb9ab52ed 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/mc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.311 2014/09/05 21:00:13 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.312 2014/11/01 15:55:26 slyfox Exp $
+
+  01 Nov 2014; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/mc-4.8.13-tinfo.patch, mc-4.8.13.ebuild:
+  Fix tinfo underlinking (bug #527118 by Michael Vasiliev and fix by Jeroen).
 
 *mc-4.8.13 (05 Sep 2014)
 
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index ae84d94206e8..42a2bd3c0086 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -2,19 +2,20 @@
 Hash: SHA256
 
 AUX mc-4.8.11-ncurses_build_fix.patch 1188 SHA256 62dadbcbca441c0eeca7e2414697fc4679fa461b47470967b34c8dcfbafd4a49 SHA512 66b6c778f15bf75f2474bdaaf3114d9644e7c2b6ca8ce3dbd2f2f379f8daf90b0896e0c22164b0d5791d7ad8b9b3b13a298032a882bc0273cf6b59653b201b02 WHIRLPOOL b272312da887167907d26b67b873a9f567a9b635409223c9f3069e4691ae06f034befe708b0044dae7aace95610cdcb8e033c9d7559ba4d846e38cf4a03a1174
+AUX mc-4.8.13-tinfo.patch 1742 SHA256 e195c6d498a2aaca51401215969f6bf42fba607666d54b504ac5478745c6d098 SHA512 7714d42ece73fe6f044f5cc0f59ab5c23bedb820122291d1af581f5f7dd94d4410072868205e94419be459ed9769c8ed75dfb8ad5b945c8df820901f756e7c3c WHIRLPOOL 9f6030011f81dc518adeb7cbaed1efab09b7c1bd72328d15abfc2be31bec5e814c89aae281327557074d86f809e993a5233a5261b3ed26c6dcbf6d9f3e6a2008
 DIST mc-4.8.11.tar.xz 2211144 SHA256 1877ea844f9d71e133b9e03ca3bebcd7b10b9ba5b419b8d268e255816fe1993a SHA512 5afb9e0704b8c0e98cd4787f03baf40131a0ab40027103e42f44b2ebd5b6c33b8702d7f534ca8175f3b8efbb25a04f08f0f51a1eb3a1783a99e6117472344fbc WHIRLPOOL bbe6dbad549f45b9d4aab0985ce9a2c35e42017d2f2020972d27d8d43c66473c49fea8754fd6635195b72e6a531625a28327c0f2aa65f5e79cea0db0d54ea7e6
 DIST mc-4.8.12.tar.xz 2237892 SHA256 5f2fd570a798dc0cc06374adffef8ca403588c4e73dfdf908e9a4311718153fe SHA512 f482177fd2a457b75d96b953922f473ad669ae4d83910c0c3d5445dd459fff38c9abdc0b39e531b58692e00beb6cae2ca4858d79f55204105a62889784b1fbd3 WHIRLPOOL 79fa8fef9f1a076588093360a1f1b5f31ad6e88c2de285408c118492f9d1e9d37ab8d36d3d96b3dae29e3d547a5ecca601cf5ef0a49e7d3e6f5c81a8172536ba
 DIST mc-4.8.13.tar.xz 2231448 SHA256 36d6191a47ec5d89d3788e48846fb620c481816441ff25264add8898d277b657 SHA512 556047072cc1d22a911cfb3cc82b03d204881f2773e06a8fe2020ecfbd4ffa491e1c710ca2124b9f3b219cd73f2b732a4bfad1671f095c1768864704514b067f WHIRLPOOL 4224dea453e6d46aa0a783bcf1778dab5dc8eac090bae45a617145a8507e7c65b78dd7d7b0f50d2477a4002c62c75ce5304be59a20e84842042fe602318cccf4
 EBUILD mc-4.8.11.ebuild 2631 SHA256 ce8c8731cb21d692a8944f41e28a9f212908fde98c6c1c7fa412887f7bfdc599 SHA512 29ad68127d1e733a34fdba4e14884111c3280dfc394963f80984e87056712f8b677f0147504d5b7377d54c6e279e828caf3bd5441887fd6bc308ba4f63dec506 WHIRLPOOL 84e33e69d07fe2dab1d77492a0701478d49de20812b34b3d3679b2a015767a74c8582ba330df2c52fe5d1b66e9a076a1447150209b55c01850783df6266933e3
 EBUILD mc-4.8.12.ebuild 2590 SHA256 b0b170afef4c09c214aae5a96c524fe752aabce698db4425d3c4ac3fb240a623 SHA512 8d21ac16f60e57b3326f7160b6d6e8af915735ed9ae60303a60418c1ff1664a33124e3c847793021c138aaa5b72264fba789f9df38c4840bc2b94bb32a762198 WHIRLPOOL 854e03121fe1147fe6a1f2dedb647640fc8be7cb559daa7220abc9ea50a7acd9c36cb2dd2374d4d605df2a9ad8f4e944d5e0d25ad77aa61d3ab8631c276c1e16
-EBUILD mc-4.8.13.ebuild 2590 SHA256 c3f73d5142e8fc1cfe04662c93b49add38e08fc667aa24613b044a318f00a52c SHA512 d8ec3cabe0f8f6b6057759743e151cadb3f488a941c21c0338ca703a6e002db53e3232a09b68fa7ec7a2613d235a54673317c8ac7d0a6f67ec04e3ba69a2c076 WHIRLPOOL 281b49e844a4be98c70fd1a20b269939ca06aa09ed4cd7270fe7e22d5fa4bcdc2dcc01df3654d872423e449a0b5e04650e073ce3719f2e12266b4f461ff65a25
+EBUILD mc-4.8.13.ebuild 2653 SHA256 bb3b615ca98711fffd5cf6ecf278b9357371d4aa9fddc5de3121918ef414ca1e SHA512 be88a9bef8f3b000143c142315129d79bb3161d807af703b472257a29c1790de357acdd4a15899f94b1b464f93e085d88e8c527b7bcf12a1a914d0ad3661267f WHIRLPOOL 0123aafe24a2e5d2713cf02e10326271052fec00f0a5c523f2d33500accbcfc3a79dc08905dc260993f8ddbbd092bc3e2dc6ee441ef05ba07c428a3fb5f21bd2
 EBUILD mc-9999.ebuild 2883 SHA256 9cd304088c881b3f8cca9b0a1faa93654c1e8583b8542712139065290e64deb2 SHA512 02194e3b2e4b3157043bcb41eb249f0f771260fd4f93b79feabaffc0d9887731cbb9ad84d0247e8e1eba1238f557e442a2774a58b9f50b82dfa4533c4a706f8f WHIRLPOOL 4b8ffa91a840203f22f8b7485ce0898ad15cd4e4e858c05dcd1b88928bf7499b24c1c705b880deccf15368b68de9ec93ea69a231c9ad73b4146631c70cc65da3
-MISC ChangeLog 46527 SHA256 b06c6d2116752248a1c06c0f0e966383bb036680de76aafbcf9fa732960898ff SHA512 34481e647a6d52e17ae3f0dc8a9bfeee499980021d8759275d0f84e22c23c851a64ab74dea7535597225c1644796874ef92b4ccecbef1bf0ebbabf1abc35352e WHIRLPOOL f1dcf2d50beb70450c05b6cfe9548ca19f6bb236ef76790fc30139ad6c7cc73ba58dce3a5d2916c3403f38f664cf62f2c72dee86c07d8f1829a8460d5f4d3c41
+MISC ChangeLog 46710 SHA256 02ac328969fcfb34f3e201c8cdd66909de4a25957cf82411ae5e68d6fe0c6c77 SHA512 80fbe085ac7a85396e970c7b1710e0c42f7a350573e2a5953e13a46a6fcd859b1ccb6e5e8d99bbe4c8698e65b19fc05a3bf57065ed333aa5ac9bd0457f5a0938 WHIRLPOOL 0dbc15f319c499a66fd13a5b46707ca27a1274d2a53908a664e7324436ee56d1160141b784c263b024d1b5664a7051d24a77c14e45670ea1982332a90ab5c448
 MISC metadata.xml 950 SHA256 7a5f3db095ee82a58da8299170da072eb298919ae2beec7020e2ca12982b3263 SHA512 9143eda1ccedb0613eb915f30e70259c32b5075669e256c43c488c1baf34ffecb3210583144bf0389af463fdbc98f60f5d781b6afa77f1951cba11b16555132b WHIRLPOOL cbcc220f6ba1de379b0225d0079945991362aadf88df2aac225994841ec7c81f5132ef3a0b506433d46abe445673dc7dc406fce37dc5e04a17179c6858a3bdea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQKJGAACgkQcaHudmEf86oJ7wCcCCtYuhENzxUX/P02xIp64/Io
-4t4AnA3EN7oe96BRyUK5PVCMWiODukAx
-=pkon
+iEYEAREIAAYFAlRVAnEACgkQcaHudmEf86pR5ACfb9Tfkd3y9owbfYq9IYt39TkU
+XfYAnRA+fp4c2DXr227NaE4ESvJt1beY
+=JqY2
 -----END PGP SIGNATURE-----
diff --git a/app-misc/mc/files/mc-4.8.13-tinfo.patch b/app-misc/mc/files/mc-4.8.13-tinfo.patch
new file mode 100644
index 000000000000..761c103df654
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.13-tinfo.patch
@@ -0,0 +1,39 @@
+Gentoo-bug: https://bugs.gentoo.org/527118
+--- a/m4.include/mc-with-screen-ncurses.m4
++++ b/m4.include/mc-with-screen-ncurses.m4
+@@ -101,6 +101,9 @@
+         LIBS=
+         AC_SEARCH_LIBS([has_colors], [ncurses], [MCLIBS="$MCLIBS $LIBS"], 
+                        [AC_MSG_ERROR([Cannot find ncurses library])])
++        AC_SEARCH_LIBS([stdscr],[tinfo ncurses],[MCLIBS="$MCLIBS $LIBS"],
++                       [AC_MSG_ERROR([Cannot find a library providing stdscr])])
++
+ 
+         screen_type=ncurses
+         screen_msg="Ncurses library"
+@@ -111,10 +114,15 @@
+         AC_SEARCH_LIBS([addwstr], [ncursesw ncurses curses], [MCLIBS="$MCLIBS $LIBS";ncursesw_found=yes],
+                        [AC_MSG_WARN([Cannot find ncurses library, that support wide characters])])
+ 
++        AC_SEARCH_LIBS([stdscr],[tinfo ncursesw ncurses curses],[MCLIBS="$MCLIBS $LIBS"],
++                       [AC_MSG_ERROR([Cannot find a library providing stdscr])])
++
+         if test x"$ncursesw_found" = "x"; then
+             LIBS=
+             AC_SEARCH_LIBS([has_colors], [ncurses curses], [MCLIBS="$MCLIBS $LIBS"], 
+                            [AC_MSG_ERROR([Cannot find ncurses library])])
++            AC_SEARCH_LIBS([stdscr],[tinfo ncurses curses],[MCLIBS="$MCLIBS $LIBS"],
++                           [AC_MSG_ERROR([Cannot find a library providing stdscr])])
+         fi
+ 
+         dnl Check the header
+@@ -166,6 +174,9 @@
+     LIBS=
+     AC_SEARCH_LIBS([has_colors], [ncursesw], [MCLIBS="$MCLIBS $LIBS"],
+ 		   [AC_MSG_ERROR([Cannot find ncursesw library])])
++    AC_SEARCH_LIBS([stdscr],[tinfow ncursesw],[MCLIBS="$MCLIBS $LIBS"],
++           [AC_MSG_ERROR([Cannot find a library providing stdscr])])
++
+ 
+     dnl Check the header
+     ncurses_h_found=
diff --git a/app-misc/mc/mc-4.8.13.ebuild b/app-misc/mc/mc-4.8.13.ebuild
index 7a3d4dd1afbf..1a46b72e7d00 100644
--- a/app-misc/mc/mc-4.8.13.ebuild
+++ b/app-misc/mc/mc-4.8.13.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/app-misc/mc/mc-4.8.13.ebuild,v 1.1 2014/09/05 21:00:13 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.13.ebuild,v 1.2 2014/11/01 15:55:26 slyfox Exp $
 
 EAPI=5
 
-inherit eutils flag-o-matic
+inherit autotools eutils flag-o-matic
 
 MY_P=${P/_/-}
 
@@ -43,6 +43,9 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	[[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
+
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+	eautoreconf
 }
 
 S=${WORKDIR}/${MY_P}