sys-process/htop: Fix python usage; add missing check for kernel options, #469606; allow long process names

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 151 insertions, 11 deletions

diff --git a/sys-process/htop/ChangeLog b/sys-process/htop/ChangeLog
index 476a4863e014..f70dd5919cc5 100644
--- a/sys-process/htop/ChangeLog
+++ b/sys-process/htop/ChangeLog
@@ -1,6 +1,13 @@
 # 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.138 2013/05/12 16:41:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/ChangeLog,v 1.139 2013/11/08 11:31:31 jlec Exp $
+
+*htop-1.0.2-r2 (08 Nov 2013)
+
+  08 Nov 2013; Justin Lecher <jlec@gentoo.org> +htop-1.0.2-r2.ebuild,
+  +files/htop-1.0.2-out-of-src.patch, +files/htop-1.0.2-process.patch:
+  Fix python usage; add missing check for kernel options, #469606; allow long
+  process names
 
   12 May 2013; Samuli Suominen <ssuominen@gentoo.org>
   files/htop-1.0.2-tinfo.patch:
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index 1051d01baae0..fcacfca269fc 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,23 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
+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
 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-r2.ebuild 2230 SHA256 833feef20debc3853e3494c508622e8bc51d90e63bd8d87198913ac3e1192aed SHA512 ee7e0fa04e63dec855033f8885a281837d27f37c57c4bb2f557e504963c4c1be248cf2c676ec4cb1f87126dc0377726ae2ac908d08bd758f1844067d4d3c8848 WHIRLPOOL 8002d802ad12cfe741564938fac055c02b525da04eec6bf89d49f536bbd5f525318944dfa7b0551024e062d5e260bf567be1ea576991d9fc4ef926bfe7fcabd9
 EBUILD htop-1.0.2.ebuild 1802 SHA256 b52b175a1d466b86542d9e1fb364bd01b68af49f32ac4c23a510645ac58b7b12 SHA512 87c11a78466288e928a560853a550bfac2d0f35d7ae0a66f23e6968abb8800ae31c0192298432167b86f9c8b03740b50e3476dfa9a0fc4e52731df1791941537 WHIRLPOOL e05b5351b755b95e93279707c0788126d2dd4f6c08e2e56d37213b6ed311e1d3c879c4b1230a94e9ba339e6b717b693c233d63c9013089ad4a773ef8ca4d2a9e
-MISC ChangeLog 18254 SHA256 2d7f60575a252e230763c0678eb28e65bee99db7ff7c201bb001ce7f8119e206 SHA512 d1a506fcd0ac14ee38d1a3d6eb1539a5876605b7363acd4af1cbf73be93d45dbc6aaf57328e91da3996e4f04d178679ecd1b75e22c0c99db6e205ecf61e20042 WHIRLPOOL da919edb1fab7c9e1357c8430a72fa4d259542f5a6d36ab59687ba189d6608595a12ec62ebcc05f3fe2705844e086fea1b19c52f26a95b2ef11fb454867d9b71
+MISC ChangeLog 18515 SHA256 37fcbb4de65e2947cfb25c9cc9aa2f2f123793070e537fb6235657345131620c SHA512 dbd6a756796c2eb98e461703afea22c15945308ae259133f559577a041713f0cee35d26e159b67218f21d5dc239cc5373c6a2949a5b1649f8341c2ead447f833 WHIRLPOOL dbca8f38efe48790fb705c79534d336a2d6b2baa2b142ee9555e29f93902d23e239145dbf882a30035db8322a4b32c4b3c612a2b44539c8cc3703f93f553100e
 MISC metadata.xml 637 SHA256 57e05b927b6ab9f1c189c77f4aa26b7615e5a1256b6f2d2a187daf49d6da862f SHA512 0cb9af2a4590a751a751801243ba8af8796e879f681d5f3bfd4769c9f8299b9c3a994361cfd91b7f57b28214f4e67e333d3c7612615a65887a7b4fb4db30e92f WHIRLPOOL 611d8810231ce9dbcae6c9bcd9f8e7a6d3ead6bfa523e56b29b8e68bd59a2423fd84802f4d688f2d5fc63b41a68454d4795e8b4d703f3df4b880d3d3261d2be0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRj8X0AAoJEEdUh39IaPFNMO4H/ianh8RyhOq0I8G6KHXpQOOw
-IR27c/ZkMXQquAVsr9ammfYhufp+VviLDmBasUqziOzCSu+5i7gV3ft4tni9CSMc
-0eU6tDCNOE+oSr/TMPeo+33nuci8KHvsgPQaN6rEbaJhYmsTfrdEGyYqGzQ6MfLi
-QkvVLui+v0YWxSbm2oUDCggM5Uh0CpN42GRzGIUa7L23sD2uikh+qGAz6njby4eG
-eNQvfOwQPooiZifvjEP30g92VnqLg2NbQUWl3Su1mwJ6CgC9dY96s9UFRYbOyWVy
-Uk9Q1O/gBxQZAiLHFxFZGNm7d7Ej6FvvnNcTDcmJiL5zABa5Zr2Ia2mS+iQ409Y=
-=n/pn
+iQIcBAEBCgAGBQJSfMuUAAoJELnU8jG9FVir16cP+wdQ3dNqEb5VQZcs2hpI1wQ8
+EexP9Q7xwpZ1GQok1cLwCRzBrNHN3vN1uE4+aalKBus9wDGHAz+1Fax+Yo0RqCk7
+WjXY8EPDt6/jQQQy4GHX+xo0RqeggF2RC39v3Y0KIXoxWyv0wSX/dNEyYJqZeutZ
+UUnKxyUQBWld2mz+uX3bN+O5I2yM8UBO7uFa/0ML4g1VjNU5Q9Kx76gZm1EFS1zJ
+oz3T59iMtdlZuG1hWxf2Lk3FTGhCFoOtPCi21meAWlv9QIJMU7ZL4LrBfVnyldGU
+YPlll8R99WUgdiyuvbTjJ+Z0CRYa7rftBXuspKbiHTaY7paYJuUY0UUVtNzyJEGh
+hqWQaFvss6ElNa5VAJ5zYmQ5GWy3XQlETBJiMG5IWqiM90TKMJdzOKc5JnV5lTb2
+eAioqPCnQiV/mRLVH0f4D0N/jVUSowDTPTw/AwcS1nWaNb/o+izIvQwsbzWwnYpN
+bPpK7Rn5GNEzkXKnEQ8IWtDH7oniHnuvchrg0GyqsYAS5uuA4nbw4GzFJEaz9K2W
+8a51Qa0n9khDL12s+WR2nIU/OEptPfOa4y64ZUquAZNSUrOzKi81PR/7QSUG/HOp
+DB0wjYPzDLnP2/Cba9DiYf1NQDeP81vXwRO+Lm/yFFF1vDCQbA9cFPS8zdO2V0i+
+UkDXIdmQ6LicnMbURZHT
+=Csn/
 -----END PGP SIGNATURE-----
diff --git a/sys-process/htop/files/htop-1.0.2-out-of-src.patch b/sys-process/htop/files/htop-1.0.2-out-of-src.patch
new file mode 100644
index 000000000000..d67abe7f4116
--- /dev/null
+++ b/sys-process/htop/files/htop-1.0.2-out-of-src.patch
@@ -0,0 +1,30 @@
+ Makefile.am           | 2 +-
+ scripts/MakeHeader.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 05a72e7..dd28a87 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -43,7 +43,7 @@ debug:
+ 	$(MAKE) all CFLAGS="" AM_CPPFLAGS="-ggdb -DDEBUG"
+ 
+ .c.h:
+-	scripts/MakeHeader.py $<
++	$(top_srcdir)/scripts/MakeHeader.py $<
+ 
+ cppcheck:
+ 	cppcheck -q -v . --enable=all -DHAVE_CGROUP -DHAVE_OPENVZ -DHAVE_TASKSTATS
+diff --git a/scripts/MakeHeader.py b/scripts/MakeHeader.py
+index 55eeed4..46af921 100755
+--- a/scripts/MakeHeader.py
++++ b/scripts/MakeHeader.py
+@@ -11,7 +11,7 @@ state = ANY
+ static = 0
+ 
+ file = open(sys.argv[1])
+-name = sys.argv[1][:-2]
++name = os.path.basename(sys.argv[1][:-2])
+ 
+ out = open(name + ".h", "w")
+ class writer:
diff --git a/sys-process/htop/files/htop-1.0.2-process.patch b/sys-process/htop/files/htop-1.0.2-process.patch
new file mode 100644
index 000000000000..b949e262d35b
--- /dev/null
+++ b/sys-process/htop/files/htop-1.0.2-process.patch
@@ -0,0 +1,13 @@
+Index: Process.c
+===================================================================
+--- Process.c	(revision 302)
++++ Process.c	(working copy)
+@@ -371,7 +371,7 @@
+ }
+ 
+ static void Process_writeField(Process* this, RichString* str, ProcessField field) {
+-   char buffer[128]; buffer[127] = '\0';
++   char buffer[256]; buffer[255] = '\0';
+    int attr = CRT_colors[DEFAULT_COLOR];
+    int baseattr = CRT_colors[PROCESS_BASENAME];
+    int n = sizeof(buffer) - 1;
diff --git a/sys-process/htop/htop-1.0.2-r2.ebuild b/sys-process/htop/htop-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..2b5a28e1515c
--- /dev/null
+++ b/sys-process/htop/htop-1.0.2-r2.ebuild
@@ -0,0 +1,81 @@
+# 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-r2.ebuild,v 1.1 2013/11/08 11:31:31 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils linux-info python-any-r1
+
+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 )
+
+CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
+
+# config.h problems
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+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
+	python-any-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tinfo.patch
+	"${FILESDIR}"/${P}-process.patch
+	"${FILESDIR}"/${P}-out-of-src.patch
+)
+
+src_prepare() {
+	rm missing || die
+	sed \
+		-e '1c\#!'"${EPREFIX}"'/usr/bin/python' \
+		-i scripts/MakeHeader.py || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	[[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
+
+	local myeconfargs=()
+
+	use kernel_FreeBSD && myeconfargs+=( --with-proc=/compat/linux/proc )
+
+	myeconfargs+=(
+		$(use_enable openvz)
+		$(use_enable kernel_linux cgroup)
+		$(use_enable vserver)
+		$(use_enable unicode)
+		--enable-taskstats
+		)
+	autotools-utils_src_configure
+}