Fix building with uClibc wrt #374595 by Pinkbyte. Revision bump to avoid problems in stable and newly introduced eautoreconf.

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

4 files changed, 126 insertions, 5 deletions

diff --git a/sys-process/htop/ChangeLog b/sys-process/htop/ChangeLog
index 803b2c9a6ae5..0c6efc444a68 100644
--- a/sys-process/htop/ChangeLog
+++ b/sys-process/htop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-process/htop
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/ChangeLog,v 1.95 2011/07/08 10:24:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/ChangeLog,v 1.96 2011/07/09 21:01:46 ssuominen Exp $
+
+*htop-0.9-r1 (09 Jul 2011)
+
+  09 Jul 2011; Samuli Suominen <ssuominen@gentoo.org> +htop-0.9-r1.ebuild,
+  +files/htop-0.9-uclibc.patch:
+  Fix building with uClibc wrt #374595 by Pinkbyte. Revision bump to avoid
+  problems in stable and newly introduced eautoreconf.
 
   08 Jul 2011; Samuli Suominen <ssuominen@gentoo.org> htop-0.8.3.ebuild:
   Convert from "useq" to "use".
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index 35ebab47cc10..aa742cc819de 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -3,16 +3,18 @@ Hash: SHA256
 
 AUX htop-0.8.1-non-printable-char-filter.patch 576 RMD160 eb716cf0a079b4a06aa60c763c2b3ecb138aa82e SHA1 1ade154e42525b3e04210eb7375e1543ed6d87f5 SHA256 e4ff4eb727b9baae514589ec99d08f3c9f5160618dae493fcacca92473de68a7
 AUX htop-0.9-debug.patch 1001 RMD160 d08dc3ab94a5b13d844311e79984a00e59d10497 SHA1 c2442079a52aca5c38f9891d3000f0983c702380 SHA256 fe2600badc33e7fee7f75f8a5bfd4d4b78619bc2a17d6302c7469d7d39fdb1db
+AUX htop-0.9-uclibc.patch 1423 RMD160 6517287e8f555edf6be81198c08c138ba0141238 SHA1 e1ee42f8eb1a18261380d7db6c989388a2f44703 SHA256 3e37b5166048011168238ff72e3a26b53a4c1e0d2730555598fcb2ab3ee3a3f6
 DIST htop-0.8.3.tar.gz 428061 RMD160 ac1707c2f27ac1c6576601765bda4335e49d6aea SHA1 2a0bf90f160b3d019e26712c94db612d6ff9a429 SHA256 f03bac8999c57c399cbf4332831bcce905d0393d0f97f7e32a1407b48890dd9d
 DIST htop-0.9.tar.gz 418767 RMD160 ac0ef275e8ad5a27e5f35fa03800b15ef0966cfe SHA1 d755bff386c260c06162d50113794722e98e9200 SHA256 4de65c38e1886bccd30ed692b30eb9bf195240680781bfe1eaf5faf84ee6fbfd
 EBUILD htop-0.8.3.ebuild 1441 RMD160 31d9a152febc34f2c059b0feb2eae4141c0a95cd SHA1 3795ed075de6e1c64d07f9bd4db25b3381a9d377 SHA256 f15b4a1c5fa86425382b5e47235340a2678206c84544bca12cf0ebf7ee5842fa
+EBUILD htop-0.9-r1.ebuild 1657 RMD160 ede827dd2bbb5bb541a0ef785a7238fa331278f0 SHA1 35663741fb0f99302f2ab4356b246e9575bd764e SHA256 9d09edd4c9b823b8c01bd0a9f38fdfa509837636b6f8c21fc59c29c46f7fcbeb
 EBUILD htop-0.9.ebuild 1631 RMD160 5542b764743e9929c6c32150153edf261faecff4 SHA1 38b33013cd76c2cdf55095eef9b4b6ee41ef91ae SHA256 49c448a2189fde2f68fd9d4e80924cead6c3a6487e73ace148c89731a17b263f
-MISC ChangeLog 12966 RMD160 9fa6bee6862ebe1c9967456b13d1f24845f9ad70 SHA1 eca54169b853ace42fdd990c400fe74cfa1d20ac SHA256 1c83de6515a379ff807f14e90e5c273cfbd1a2ed07227ddf888b8bf8b0b6443f
+MISC ChangeLog 13232 RMD160 9232325fcc84d67efd6e3bb317eea873cce212ab SHA1 a3dd0e3305106ba934896b0712953ce519f22eef SHA256 3f2cf778d3a1928161fe338473287bbbeb053d4659fa26a8ed736c216e53623c
 MISC metadata.xml 646 RMD160 bb721b5dbe90097a4a2d661e9e5af19c7a5e5321 SHA1 984c37dac245d6a5eb05bfaddba2c6ff29c9d88b SHA256 ca74851034f4d0b5382110463036025b2b6f9b2340274225ad9f56f6ecc457f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4W2ocACgkQXkR9YqOcLPE0vQD+LO29MIWmAgaWhN1C7WhYDJ1j
-SDHJshfuDSR47rlgnK0A/RpFUD+P8J9Qne8/auFFBcE9k/6rMLwLALOTyHsGIVGB
-=tjw9
+iF4EAREIAAYFAk4YwWgACgkQXkR9YqOcLPHA6QEAqOUODUKXG3wqt0zdyoR64Y8m
+AXb7kU936eEO69f9BDwBAKVImlhPuDPLHklGqb3A/yHF+f4WnT8Fc/TuzdH6geId
+=xyoU
 -----END PGP SIGNATURE-----
diff --git a/sys-process/htop/files/htop-0.9-uclibc.patch b/sys-process/htop/files/htop-0.9-uclibc.patch
new file mode 100644
index 000000000000..ffe4953d80a3
--- /dev/null
+++ b/sys-process/htop/files/htop-0.9-uclibc.patch
@@ -0,0 +1,54 @@
+http://bugs.gentoo.org/374595
+
+--- CRT.c
++++ CRT.c
+@@ -11,7 +11,9 @@ in the source distribution for its full
+ #include <signal.h>
+ #include <stdlib.h>
+ #include <stdbool.h>
++#ifdef HAVE_EXECINFO_H
+ #include <execinfo.h>
++#endif
+ 
+ #include "String.h"
+ 
+@@ -125,12 +127,14 @@ static void CRT_handleSIGSEGV(int sgn) {
+    CRT_done();
+    #if __linux
+    fprintf(stderr, "\n\nhtop " VERSION " aborting. Please report bug at http://htop.sf.net\n");
+-   #else
+-   fprintf(stderr, "\n\nhtop " VERSION " aborting. Unsupported platform.\n");
+-   #endif
++   #ifdef HAVE_EXECINFO_H
+    size_t size = backtrace(backtraceArray, sizeof(backtraceArray));
+    fprintf(stderr, "Backtrace: \n");
+    backtrace_symbols_fd(backtraceArray, size, 2);
++   #endif
++   #else
++   fprintf(stderr, "\n\nhtop " VERSION " aborting. Unsupported platform.\n");
++   #endif
+    abort();
+ }
+ 
+--- CRT.h
++++ CRT.h
+@@ -14,7 +14,9 @@ in the source distribution for its full
+ #include <signal.h>
+ #include <stdlib.h>
+ #include <stdbool.h>
++#ifdef HAVE_EXECINFO_H
+ #include <execinfo.h>
++#endif
+ 
+ #include "String.h"
+ 
+--- configure.ac
++++ configure.ac
+@@ -25,6 +25,7 @@ AC_HEADER_STDC
+ AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h curses.h],[:],[
+   missing_headers="$missing_headers $ac_header"
+ ])
++AC_CHECK_HEADERS([execinfo.h],[:],[:])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
diff --git a/sys-process/htop/htop-0.9-r1.ebuild b/sys-process/htop/htop-0.9-r1.ebuild
new file mode 100644
index 000000000000..ba9d4dfc5694
--- /dev/null
+++ b/sys-process/htop/htop-0.9-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-0.9-r1.ebuild,v 1.1 2011/07/09 21:01:46 ssuominen Exp $
+
+EAPI=4
+inherit autotools eutils flag-o-matic multilib
+
+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 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+IUSE="debug elibc_FreeBSD kernel_linux openvz unicode vserver"
+
+RDEPEND="sys-libs/ncurses[unicode?]"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog README TODO )
+
+pkg_setup() {
+	if use elibc_FreeBSD && ! [[ -f ${ROOT}/proc/stat && -f ${ROOT}/proc/meminfo ]]; then
+		eerror
+		eerror "htop needs /proc mounted to compile and work, to mount it type"
+		eerror "mount -t linprocfs none /proc"
+		eerror "or uncomment the example in /etc/fstab"
+		eerror
+		die "htop needs /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() {
+	sed -i -e '1c\#!'"${EPREFIX}"'/usr/bin/python' \
+		scripts/MakeHeader.py || die
+
+	epatch "${FILESDIR}"/${P}-debug.patch #352024, 372911
+	epatch "${FILESDIR}"/${P}-uclibc.patch #374595
+
+	eautoreconf
+}
+
+src_configure() {
+	use debug && append-flags -DDEBUG
+
+	econf \
+		$(use_enable openvz) \
+		$(use_enable kernel_linux cgroup) \
+		$(use_enable vserver) \
+		$(use_enable unicode) \
+		--enable-taskstats \
+		--without-valgrind
+}