sys-process/htop: Add compatibility patch for ncurses[tinfo]

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

5 files changed, 138 insertions, 16 deletions

diff --git a/sys-process/htop/ChangeLog b/sys-process/htop/ChangeLog
index 5f444bce02a8..51ab11686a4a 100644
--- a/sys-process/htop/ChangeLog
+++ b/sys-process/htop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/htop
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/ChangeLog,v 1.136 2013/01/01 19:33:54 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/ChangeLog,v 1.137 2013/05/03 19:37:22 jlec Exp $
+
+*htop-1.0.2-r1 (03 May 2013)
+
+  03 May 2013; Justin Lecher <jlec@gentoo.org> +htop-1.0.2-r1.ebuild,
+  +files/htop-1.0.2-tinfo.patch, metadata.xml:
+  Add compatibility patch for ncurses[tinfo]
 
   01 Jan 2013; Raúl Porcel <armin76@gentoo.org> htop-1.0.2.ebuild:
   sh stable wrt #447952
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index 4bec03fce02d..0232d6efe87f 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
+AUX htop-1.0.2-tinfo.patch 2046 SHA256 ab5fdff5b875472f3e0c0674f939b8b2ed27510aee084f590b6a37a36bfc19ae SHA512 ebb375094ec6581742064b9fa9e97145581ef8cde5ca0cd5180a28f7df387791f5e9b2945cfb3043f60ac6f5137cb69f40800d390bd5a05a23f7bec38f431247 WHIRLPOOL 9bd2611060ebd9563a7ae0a2c5cb133bfa925a3d899b50f3e6038a24e5f4e95f12ab4e6e9d5fae0f666820b4423cefc072cb095b013b4ba44b15def66093969a
 DIST htop-1.0.1.tar.gz 384683 SHA256 07db2cbe02835f9e186b9610ecc3beca330a5c9beadb3b6069dd0a10561506f2 SHA512 9cc442fd63fb3270929e489f645d1a63fdcba2bee4ea0e606a86257badb55fa02794b7a97de4070c951f5558b7d40a677e10801a1c42c0832521a453f956997c WHIRLPOOL 4091088071cc247fead93df788a5ecb64ce32d026e4119276acce7a91a5061561700dbb26236b17ea51b399829b60654e059ca3124f74892ab507efae370053b
 DIST htop-1.0.2.tar.gz 388499 SHA256 ee60657b044ece0df096c053060df7abf3cce3a568ab34d260049e6a37ccd8a1 SHA512 50ae0e8ace862520c01a707b3cf9a19591dc1081f6fc38c7fdccc81e36dd94b3cbe9db00cbb90f782c22d9b73f22526e24d04fad8368c6f2a7de0c58f9d92191 WHIRLPOOL 2766cfe1ea9c98d23c375e5a1c293c6d573d33cf7132e9aaa6ad0335a5f62976a8b8a8da6ede2f03bbadb31ac62e9d7ba5b35138a262dda73eb033afdf27b570
 EBUILD htop-1.0.1-r1.ebuild 1852 SHA256 c7ad5b7efd139f85e56e0c6acdcd870929c8a907d8436e28fa3f91d6db598c22 SHA512 6e877fcd3856a2707ad8638a6fac50f99cc8669d3eb2e5305b1f5d540080e1890027c0dc02a5ffbae3fad805d5354cf60e0f7412d6e9105ebfe2a93fe76b323a WHIRLPOOL b1ae915a8f80f8d431177c481714869cce3c20c45b510c30ec29ebc108ef9c80a488535ee1b34672c17f38b419e5c1b586d6b70bf213273b149dec5512b0f7f8
 EBUILD htop-1.0.1.ebuild 1554 SHA256 6b8dc12916eeeccabc9ebffcfac21c4ff0f18eedf60e4d87703c35fcb99ab941 SHA512 3bc242fd6d3d25d621e2edb18df82bf48b954057b04dbdcfa04fe0102132c689b32148218254ce2a5ae085c70af9141b0cfa1e676f5a1d6162967d65414abc1c WHIRLPOOL 6e8dc59815e71a728dc3d872cd5c25bf8efd2ef86c344754b69310e3c06b1747121f9dd2a5fe605575082dd50fb1435f088327689c2a0b319a11c41e651f8fcd
+EBUILD htop-1.0.2-r1.ebuild 1889 SHA256 c809d41ce000369574ff4617f9504a65dfc05224bd714f8b9f4dbff9d3b35349 SHA512 a8950a42fe5d4b0d9f113cc7d39ace38017bb66acffad6a807e8881987b261d2803a1356bf56c8dc71f8279e4a1cee98a8315f98d3313b7a2a3db8e51d6d608f WHIRLPOOL f2560736ca50463105789140ce586c143d456e67cc0cab8f7fbbafe75fd9fdaace95f6a1e72109dfff81e46e6451cb3d30eb3965d4c1990bb18240d24f261b7e
 EBUILD htop-1.0.2.ebuild 1802 SHA256 b52b175a1d466b86542d9e1fb364bd01b68af49f32ac4c23a510645ac58b7b12 SHA512 87c11a78466288e928a560853a550bfac2d0f35d7ae0a66f23e6968abb8800ae31c0192298432167b86f9c8b03740b50e3476dfa9a0fc4e52731df1791941537 WHIRLPOOL e05b5351b755b95e93279707c0788126d2dd4f6c08e2e56d37213b6ed311e1d3c879c4b1230a94e9ba339e6b717b693c233d63c9013089ad4a773ef8ca4d2a9e
-MISC ChangeLog 17905 SHA256 fbf35150b7e67c7dd6537247b719ad20634bd1d74a1198446e06b63b348085c6 SHA512 4a490b173bd81cb594f838e0178697c8a4b19b7d2100a9eb1794be52ff89f8caf79953d816b51f837e117db5be2ef585d57c1e28eeaed149061583e81957cdd0 WHIRLPOOL 54f6d632fc22323e0614d0f9a301e56dba8138ff0ed9009ddf862b05c0d3e5413a0ae23e7e27c263e6f2d01394ba262392cafbaa5d7bbf732ccd3328e692d296
-MISC metadata.xml 624 SHA256 ea0be2cf5721cb1d68215f060919177204937290083dd2635b45d043095838ec SHA512 1e4871bb46014b82071ffb3f3535c93f334fed90217ceef32d880f14c754167c5b13aaa990c585b09d7ca12a93509411ea7e362d0e1d71a63144afd709456dbf WHIRLPOOL 2cca5290c631769f9f53d6c1dd2155bffe0b0b12b33319c050898b7281f47c90a54bb72dd74937b35e930f7d6bce4b70eb172aacddf5143c73091d2daf9ca7bf
+MISC ChangeLog 18095 SHA256 563bfa876559497308dd4f35d460b1b920622d4a2bd3cc562ce368fd18ec2578 SHA512 6ddc33bf80e727417ad91a835090ced5483711a773a82fa8d926e9185d214d994760042e9705efe495d112ed7f6e847f3bf30c4921aa4254515b3e2f0a9d8e98 WHIRLPOOL 00e7d9a49f40bd8cfd8ab5761af4d129a9379fd41c5445b7fca78b3df506e2d0925d4a441bffb9226444c608aae28ec8464b58e454fb40b9642fbe49cb4eb84d
+MISC metadata.xml 637 SHA256 57e05b927b6ab9f1c189c77f4aa26b7615e5a1256b6f2d2a187daf49d6da862f SHA512 0cb9af2a4590a751a751801243ba8af8796e879f681d5f3bfd4769c9f8299b9c3a994361cfd91b7f57b28214f4e67e333d3c7612615a65887a7b4fb4db30e92f WHIRLPOOL 611d8810231ce9dbcae6c9bcd9f8e7a6d3ead6bfa523e56b29b8e68bd59a2423fd84802f4d688f2d5fc63b41a68454d4795e8b4d703f3df4b880d3d3261d2be0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDjOiMACgkQuQc30/atMkBu9ACguViZmhZQjlMDW8dvm8M2qUBt
-z4cAn1LFgnma3E0WcvGmxt/2PrllE4JD
-=iB1Y
+iEYEAREKAAYFAlGEEgcACgkQgAnW8HDreRa2LgCeKX9lKPay/473TNtVciNOOrMD
+mokAoJJyCipPrFCGOAvGgJB7lQRoUMrO
+=XrWP
 -----END PGP SIGNATURE-----
diff --git a/sys-process/htop/files/htop-1.0.2-tinfo.patch b/sys-process/htop/files/htop-1.0.2-tinfo.patch
new file mode 100644
index 000000000000..e7fb43d25a9e
--- /dev/null
+++ b/sys-process/htop/files/htop-1.0.2-tinfo.patch
@@ -0,0 +1,50 @@
+ Makefile.am  |  2 ++
+ configure.ac | 20 ++++++++++++--------
+ 2 files changed, 14 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 05a72e7..7908937 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="" AM_CPPFLAGS="-pg -O2"
+ 
+diff --git a/configure.ac b/configure.ac
+index ff6901b..6226d90 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -89,16 +89,20 @@ 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.h],[:],[missing_headers="$missing_headers $ac_header"])])])
+    ])
+-   AC_CHECK_HEADERS([ncursesw/curses.h],[:],
+-        [AC_CHECK_HEADERS([ncurses/ncurses.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],[:],[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],[:],[missing_headers="$missing_headers $ac_header"])
++   ])
+ fi
+ 
+ if test ! -z "$missing_libraries"; then
diff --git a/sys-process/htop/htop-1.0.2-r1.ebuild b/sys-process/htop/htop-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..be5709594175
--- /dev/null
+++ b/sys-process/htop/htop-1.0.2-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-1.0.2-r1.ebuild,v 1.1 2013/05/03 19:37:22 jlec Exp $
+
+EAPI=4
+
+# autotools for auto* dependencies
+inherit autotools eutils
+
+DESCRIPTION="interactive process viewer"
+HOMEPAGE="http://htop.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
+
+RDEPEND="sys-libs/ncurses[unicode?]"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog README )
+
+pkg_setup() {
+	if use kernel_FreeBSD && ! [[ -f ${ROOT}/compat/linux/proc/stat && -f ${ROOT}/compat/linux/proc/meminfo ]]; then
+		eerror
+		eerror "htop requires linprocfs mounted at /compat/linux/proc to build and function."
+		eerror "To mount it, type:"
+		[ -d /compat/linux/proc ] || eerror "mkdir -p /compat/linux/proc"
+		eerror "mount -t linprocfs none /compat/linux/proc"
+		eerror "Alternatively, place this information into /etc/fstab"
+		eerror
+		die "htop needs /compat/linux/proc mounted"
+	fi
+
+	if ! has_version sys-process/lsof; then
+		ewarn "To use lsof features in htop(what processes are accessing"
+		ewarn "what files), you must have sys-process/lsof installed."
+	fi
+}
+
+src_prepare() {
+	rm missing || die
+	sed -i -e '1c\#!'"${EPREFIX}"'/usr/bin/python' \
+		scripts/MakeHeader.py || die
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+	eautoreconf
+}
+
+src_configure() {
+	[[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
+
+	myconf=''
+
+	use kernel_FreeBSD && myconf="${myconf} --with-proc=/compat/linux/proc"
+
+	econf \
+		$(use_enable openvz) \
+		$(use_enable kernel_linux cgroup) \
+		$(use_enable vserver) \
+		$(use_enable unicode) \
+		--enable-taskstats \
+		${myconf}
+}
diff --git a/sys-process/htop/metadata.xml b/sys-process/htop/metadata.xml
index 4ed6d14fbf64..cb2b58bcfb07 100644
--- a/sys-process/htop/metadata.xml
+++ b/sys-process/htop/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>idl0r@gentoo.org</email>
-		<name>Christian Ruppert</name>
-	</maintainer>
-	<use>
-		<flag name="openvz">Enable openvz support</flag>
-		<flag name="vserver">Enable vserver support</flag>
-	</use>
-	<longdescription>
+  <maintainer>
+    <email>idl0r@gentoo.org</email>
+    <name>Christian Ruppert</name>
+  </maintainer>
+  <use>
+    <flag name="openvz">Enable openvz support</flag>
+    <flag name="vserver">Enable vserver support</flag>
+  </use>
+  <longdescription>
 htop is an interactive process viewer for Linux. It aims to be a 'better top':
 you can scroll the process list vertically and horizontally, and select a
 process to be killed with the arrow keys instead of by typing its process id.