Fix ncurses linking, bug 509452

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

4 files changed, 81 insertions, 12 deletions

diff --git a/sys-process/htop/ChangeLog b/sys-process/htop/ChangeLog
index 6714071bf28e..0c7c44ebb0fc 100644
--- a/sys-process/htop/ChangeLog
+++ b/sys-process/htop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-process/htop
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/ChangeLog,v 1.141 2014/05/02 23:05:38 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/ChangeLog,v 1.142 2014/09/30 19:40:46 idl0r Exp $
+
+  30 Sep 2014; Christian Ruppert <idl0r@gentoo.org> htop-1.0.3.ebuild,
+  +files/htop-1.0.3-tinfo.patch:
+  Fix ncurses linking, bug 509452
 
 *htop-1.0.3 (02 May 2014)
 
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index 5faccaefa436..b61993e3b254 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -4,21 +4,22 @@ Hash: SHA256
 AUX htop-1.0.2-out-of-src.patch 790 SHA256 1b4ab41ef77108bb90b817d65d5012be4b097fa7aef4e29f7ac7973a85079388 SHA512 ecca5db4740f8607eed0f9be893cd22d801460d47121b5d544d310edba9357d7d69492e86155eff36f6ce773c832df1973e8c7161497e952d97514b2dc418386 WHIRLPOOL 035a11729cb56bf3d4540ac631439dbab82ebee9c200d81811da8d9de6f2495f34afb6ab4e2ca34c3bd40264ae39162f0544bfb2bbc59a88d5f251083dc861c8
 AUX htop-1.0.2-process.patch 461 SHA256 3b27d4e190000cdc0ab9fe24ff6ce91740cef11fdc8cb0408cca82051a02abfe SHA512 d1bbee9b69373d69195f564f57a2df06e3ad9701a7b468a5f59396f5d11440d3b4f312ccb41f407561c70e872b91b08e0e1e1dbb85ab28620ac8af760835f684 WHIRLPOOL 1375b2d8a28e9cb893aceac0a252d9f40ed4ed42feb7175577dfc518253e241113c7e56e2a5704689d40adc3238a82fbec7868773c39b586d12404031bd24b57
 AUX htop-1.0.2-tinfo.patch 2243 SHA256 48ebf2bb286ff2f8d4915199c5edc6bf5d8a74523ae5a6e5f4294ea71c3b8cdb SHA512 047c9112bf89c1029e2c31ed70b0e3c467cf32f1b6ceecee419596d2a7c5dc5240a05621a2446fde16f23d71b6410f21ffcd37acc865c756021d531d3470d7e8 WHIRLPOOL 4c69698a762f0d7a271a70c88ab0f41cf2e8f3d4aef01066bcf89879df802b03996655624a5b7cf5f2cb6c03b6e8832f969041827e9131ce275818aa987c58fc
+AUX htop-1.0.3-tinfo.patch 2588 SHA256 2b7b939a9e2f7ee06885f2b5e7ea4931647229eabb175cb408d1d47723bd629b SHA512 071a24efb5536baae05478bb2035da0c6f1f42c7d99be92d6e8f534d78ea5ba90bdb4a8fd4d9fa27cad2097f2b593bf60dd9fa6a84758eb2f3cfbc5a58f02bf4 WHIRLPOOL 5c141c7ec1624e9b7dbf57db79262bdb9d3c68fdd37ba4696b700f53ade8a41af618f44d1e947d47e081e4290ca31265aaf7945505131a06765943005ada7dff
 DIST htop-1.0.2.tar.gz 388499 SHA256 ee60657b044ece0df096c053060df7abf3cce3a568ab34d260049e6a37ccd8a1 SHA512 50ae0e8ace862520c01a707b3cf9a19591dc1081f6fc38c7fdccc81e36dd94b3cbe9db00cbb90f782c22d9b73f22526e24d04fad8368c6f2a7de0c58f9d92191 WHIRLPOOL 2766cfe1ea9c98d23c375e5a1c293c6d573d33cf7132e9aaa6ad0335a5f62976a8b8a8da6ede2f03bbadb31ac62e9d7ba5b35138a262dda73eb033afdf27b570
 DIST htop-1.0.3.tar.gz 399306 SHA256 055c57927f75847fdc222b5258b079a9542811a9dcf5421c615c7e17f55d1829 SHA512 4c5c784b093bcad06eb2e8d8bb215e14f6e838a3d47d8da8402344c270c1724f85d0bcde2899571ba5d0e5a02274a0c3390a76fed61785b2604b51351f08f232 WHIRLPOOL 14b8879210025aff9a1e098314a1b35d2bb6fcfaab42b95670e3726c61d471b1618486e6fc3dbbc97043e85f9a22196d97e676f3b2dd98250326be8527bdebbe
 EBUILD htop-1.0.2-r2.ebuild 2226 SHA256 3ba9bf820bf1a82a31fba663634e9d977908ab54dacb922a856a4eaad2752eba SHA512 a85ee6d4eac5cc3f7c50d0dbb3204926ce584f9061488a46832d7274ac4ac4c3caa97854b71dffd13dda1ee7c58332689f2705abcea6dc08b4272ce29edc9fda WHIRLPOOL 64f43e53f58112b2b9646648e484eff5a9e34ebd6f2951e141f871a6f69093e34154f490cabe84a4bf16bcca5365f4681f453997db06ec39c4debd483d3f4923
 EBUILD htop-1.0.2.ebuild 1747 SHA256 7a60e186eee1e74a726a41230f9ba7d4f9bb1741f54e9beda1ddda2804fb7ae0 SHA512 63ade6ce67a1ef698d5990db2e41105aff998e560939e5beb70e32fdcbba4d9582fa41b2726e67865e8a18578b7a3ca1b0f72cb4a92fdeb459fbdea5398e7729 WHIRLPOOL 124c2847a9ea5132b46612a3b633a3727c9b2d0bfa1841636964eaa9b107627b1df7f76e7f206e3b0de1de2adc72e60ae3f59aace28dbea941486ee6bdc3a911
-EBUILD htop-1.0.3.ebuild 2140 SHA256 c92ad78539edfa2b524c553bb6b3e33b35338df4e535e78f516843f7e2afa52b SHA512 2c0624695a1f4834ec02fd8bd3e88a31647c2224a11b735de1957662974e57b166aa616940acdca3ac745926ca578a5aadc6fb13a1036bd6a25605f4739ea247 WHIRLPOOL 3068643147992a35458c83d82e1f072333dfb9cac629c824f35a80846c6c73b7dd6a5eb7685ac7c1dabd77e7f1a10e49613819248cea6f9c784db7535d8a6a64
-MISC ChangeLog 18956 SHA256 d3b445c03a5811b7d71672770b66907c792095cd8b7e035c33c7a951bc8ec92c SHA512 f7e96ffda53c92544a71c250ebbd2d23c8ba8120d407509049e74af7c4e1961aef6486ab14ba671d348127678e3f94640f77dc8bd079e9540d740bc1729728c0 WHIRLPOOL b72bc3f1006be43cd100112512b8c1c2ca46b77ac25ab6053be0a69ee3a6a263368e2ada501ed3f614ef56e6d33e7174f3e7beebc83bc3c0fd53f4d647fe9dc4
+EBUILD htop-1.0.3.ebuild 2182 SHA256 4435b25a2968299e64cba2b31e036c57d22ea539c886f2368a12d0163c7af45a SHA512 a29e6ca721866e5a8ccf82f6cb860958d1e160ff9c9d738e749818b1d1edaea595885142d6f83904c758089675c5546f9cd7292acbda61abda9499d504bd04e7 WHIRLPOOL 935d7573e3a7483dc8da9156633ec7f4161069c9c4748d5fd4c50267530d258d735e5e9c157e22b96993de7abbce452320fcb9f8e7ad0a1d94e337bce09cb77f
+MISC ChangeLog 19095 SHA256 c1ffe8735eb11a8696dc06563891cefc70bc099be370e6a7ba14a67291fddab8 SHA512 57d870dbba7b0de9ab9648a4c6819022dd8a871ab0e5263fe578015b07b55c63bbf974d7768329e7fe49d336a2a519a86c84b383e59b9050dda27c76a91580cd WHIRLPOOL 176a6263d52d64beedff9e83ca9687f0ce358ef4c75b0a23953378118f8d4c7fc48346e8643d27d13f7088e123dbc8b7f06e478c6fa1d549058515fea9d20aac
 MISC metadata.xml 704 SHA256 54cc875436ac5b0c7b4df2406509b6da7a673d28d214d433ba54ed9922187c8b SHA512 8c7164376e923411cb4e09522ad72417206d828b9b0715b5151227fdd825449a1ccea9e010f0f5644832a058f943be2553968a34cd048893cade94ab9bfb5e65 WHIRLPOOL 980dc27291da905600742cce587d6035365e217f849f78784a2bfebfe24120f377c91a2c80b4396d4f2dea24b1954d8b6f9357a22afe7e0ad43294d56cc68e73
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTZCTHAAoJEMOx0zmdw4Z1YRoH/jBddQCl8/Lua/16tSslV1Xq
-rd8Izk4gfqMhdstM5RJ6T5qHmwQxBGAyxiyEN131SqSigGr9vYJgM6DTRJOv5p5B
-Y9FxANbbJYMqJJo/Q8hn0CPRZvA5GIyetdyBtPO/vrl/l5Ev9ry+UarzK0jxtr3d
-XwDbqkqyQOFrntR/6sQL7hIhqjO6h1or4DqGcUxQ1Z/3SaG1V9AQFTK/+zpMfvah
-x5syNpJGlWwUrKqFlFKMy1I+DhMgVpjiqWWiSA5eB/qsSVZH20r5QAj2PrboTBX3
-9Kmept68zfI1V06xhtfcUfeLP4guxzjOsBtS1lG5maEfKwzwkP4z0eAaFUghRMA=
-=X5BQ
+iQEcBAEBCAAGBQJUKwdEAAoJEMOx0zmdw4Z1kiAH/2DUeD1co69XqAKXmz88F0yD
+oWnoaG3JNx2gBopTI8OG+j1jj79Y+LKgq4PjayKow3bZu2qXbAhv+zef+8aByyeg
+sef+ECcF/+9wxBE8PXHbzEfMW9EYtCtAtK7Zdabb2YYReGTp4ysEh6qMKVx2VEef
+h68bsLfoBEIQML9l9lQ/tqk3Ywz3dhhvBh4HdB+4xKrcBO293LVsIyyw8cMIwiN8
+83lSPYnNCV81qaUueZHKJHhm0Uy8L5F3s/QkCk/bkeAHXHWRnbCmPmKkpIcF0fu6
+HZ5W9ISO5ZKxYvsEveT7VNTKMFwSTyikDD4ux6C3JlKTBqkNsx6+EMeijf0SCls=
+=gTDN
 -----END PGP SIGNATURE-----
diff --git a/sys-process/htop/files/htop-1.0.3-tinfo.patch b/sys-process/htop/files/htop-1.0.3-tinfo.patch
new file mode 100644
index 000000000000..62a887baf376
--- /dev/null
+++ b/sys-process/htop/files/htop-1.0.3-tinfo.patch
@@ -0,0 +1,62 @@
+diff --git a/Makefile.am b/Makefile.am
+index 820e2e5..85f49e9 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -36,6 +36,8 @@ SUFFIXES = .h
+ BUILT_SOURCES = $(myhtopheaders)
+ htop_SOURCES = $(myhtopheaders) $(myhtopsources) config.h
+ 
++htop_LDADD = $(NCURSES_LIBS)
++
+ profile:
+ 	$(MAKE) all CFLAGS="-pg" AM_CPPFLAGS="-pg -O2 -DNDEBUG"
+ 
+diff --git a/configure.ac b/configure.ac
+index 2b934e8..3593885 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,6 +20,7 @@ AM_PROG_CC_C_O
+ AC_DISABLE_SHARED
+ AC_ENABLE_STATIC
+ AC_PROG_LIBTOOL
++PKG_PROG_PKG_CONFIG
+ 
+ # Checks for libraries.
+ AC_CHECK_LIB([m], [ceil], [], [missing_libraries="$missing_libraries libm"])
+@@ -89,20 +90,24 @@ fi
+ 
+ AC_ARG_ENABLE(unicode, [AC_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes")
+ if test "x$enable_unicode" = xyes; then
+-   AC_CHECK_LIB([ncursesw], [refresh], [], [
+-      missing_libraries="$missing_libraries libncursesw"
+-      AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])
++   PKG_CHECK_MODULES([NCURSES], [ncursesw],[
++     AC_CHECK_LIB([ncursesw], [refresh], [], [
++         missing_libraries="$missing_libraries libncursesw"
++         AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])
++      ])
++      AC_CHECK_HEADERS([ncursesw/curses.h],[:],
++         [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
++            [AC_CHECK_HEADERS([ncurses/curses.h],[:],
++               [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
+    ])
+-   AC_CHECK_HEADERS([ncursesw/curses.h],[:],
+-      [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
+-         [AC_CHECK_HEADERS([ncurses/curses.h],[:],
+-            [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
+ else
+-   AC_CHECK_LIB([ncurses], [refresh], [], [missing_libraries="$missing_libraries libncurses"])
+-   AC_CHECK_HEADERS([curses.h],[:],
+-      [AC_CHECK_HEADERS([ncurses/curses.h],[:],
+-         [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
+-            [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
++   PKG_CHECK_MODULES([NCURSES], [ncurses],[
++      AC_CHECK_LIB([ncurses], [refresh], [], [missing_libraries="$missing_libraries libncurses"])
++      AC_CHECK_HEADERS([curses.h],[:],
++         [AC_CHECK_HEADERS([ncurses/curses.h],[:],
++            [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
++               [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
++   ])
+ fi
+ 
+ if test ! -z "$missing_libraries"; then
diff --git a/sys-process/htop/htop-1.0.3.ebuild b/sys-process/htop/htop-1.0.3.ebuild
index ac68b51452e6..1ce6aa99a1d6 100644
--- a/sys-process/htop/htop-1.0.3.ebuild
+++ b/sys-process/htop/htop-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-1.0.3.ebuild,v 1.1 2014/05/02 23:05:38 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-1.0.3.ebuild,v 1.2 2014/09/30 19:40:46 idl0r Exp $
 
 EAPI=5
 
@@ -29,6 +29,8 @@ CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
 # config.h problems
 AUTOTOOLS_IN_SOURCE_BUILD=1
 
+PATCHES=("${FILESDIR}/${P}-tinfo.patch")
+
 pkg_setup() {
 	if use kernel_FreeBSD && ! [[ -f ${ROOT}/compat/linux/proc/stat && -f ${ROOT}/compat/linux/proc/meminfo ]]; then
 		echo