Cleanup

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xB427ABC8

6 files changed, 14 insertions, 198 deletions

diff --git a/sys-process/htop/ChangeLog b/sys-process/htop/ChangeLog
index a81124e6680a..829d21752441 100644
--- a/sys-process/htop/ChangeLog
+++ b/sys-process/htop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-process/htop
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/ChangeLog,v 1.123 2012/10/30 15:51:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/ChangeLog,v 1.124 2012/10/30 20:09:27 idl0r Exp $
+
+  30 Oct 2012; Christian Ruppert <idl0r@gentoo.org> -htop-0.9-r2.ebuild,
+  -files/htop-0.9-debug.patch, -files/htop-0.9-small-width.patch,
+  -files/htop-0.9-uclibc.patch:
+  Cleanup
 
   30 Oct 2012; Jeroen Roovers <jer@gentoo.org> htop-1.0.1-r1.ebuild:
   Stable for HPPA (bug #439548).
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index 4b0f5d7a9877..3a636654ddef 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,20 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX htop-0.9-debug.patch 1001 SHA256 fe2600badc33e7fee7f75f8a5bfd4d4b78619bc2a17d6302c7469d7d39fdb1db SHA512 e59882e1b19d74fbcf8582a04eb177a8784fa4923b2e38e225bc5a9b31b95fb93294aa77b0601776f5bc624a5b08e4442834cb01ae37837561115755399c3158 WHIRLPOOL d450da30f9848b7f3c152a222e203f4d9c88883d74296ecbd2a944466cf69897e9e00aea4b0b00468eb78453a40b9fefca85bdf818ffd460198ef8f553686e52
-AUX htop-0.9-small-width.patch 1117 SHA256 1a21490b9d72774c30abb386f20fbdd7e6ebe5bb3e31034bd99f9033d01f5efa SHA512 e391750057b538d354180449751955978ed35d0e42836e0c6e3018b90185e75189c4ae50aaf7357bb34329daf7962ef5e93d49a678a2ae0c6129005e9664ace2 WHIRLPOOL 2a759d1f312c5c2ae8924bbe0c586ee06929e7dfcc76b5530fd1a1ff5b80a4802fb9ec0779e5b84720030fd8b4140dfed5e56544519388ec3610454ef087ad1d
-AUX htop-0.9-uclibc.patch 1423 SHA256 3e37b5166048011168238ff72e3a26b53a4c1e0d2730555598fcb2ab3ee3a3f6 SHA512 832ece72fc8a9540fde67b3cad48231294d5c2b598b8c5f0751c6a32ac5128ab7b6f5c61250b45d7b2e1eb3a71221f5741c906f585c0d3cee048569b55cbf7ea WHIRLPOOL 90639e1fc4e4c460396147033e27b2c404faad778a55aab40012d6fb828b3c414d852bad350de8db763c72510222ba52efea978e3a6c91164ef1d29a88ac0bc5
-DIST htop-0.9.tar.gz 418767 SHA256 4de65c38e1886bccd30ed692b30eb9bf195240680781bfe1eaf5faf84ee6fbfd SHA512 0b799afd3ad71d9b8012d37db010c708a84949f2aac47b272c987344abf10a10f9a8f2aea72240b3c8a1d5dd36ea63cd49c0293d91c0c1c05bab82bf186266c8 WHIRLPOOL d5d98d5684651f6f493905ab67efcc6719f874d12c128c8441be6b7fc2c3c4b5b23c93d5be836ee1eddc5cf65743e6a013f4a6ed57d461f4b8f7de0b887c59c0
 DIST htop-1.0.1.tar.gz 384683 SHA256 07db2cbe02835f9e186b9610ecc3beca330a5c9beadb3b6069dd0a10561506f2 SHA512 9cc442fd63fb3270929e489f645d1a63fdcba2bee4ea0e606a86257badb55fa02794b7a97de4070c951f5558b7d40a677e10801a1c42c0832521a453f956997c WHIRLPOOL 4091088071cc247fead93df788a5ecb64ce32d026e4119276acce7a91a5061561700dbb26236b17ea51b399829b60654e059ca3124f74892ab507efae370053b
-EBUILD htop-0.9-r2.ebuild 1750 SHA256 756f2f9a474d648e842c58243d592ee97fd41bb206c5bec5b5cac5369fc6b2b6 SHA512 52c03d176b621cb600cf9976f20a080c1e403263d170b27bebd7d37839d992f38ccf00ad5cf3f4a2df487a6ed428389aac4b91444dcf0d5f80b5634e25daef0e WHIRLPOOL 88740cae6287777cbd4850cdb7a471862d1d71405996240d0c889ae9ea69f382d0b76d1cc4828876350f960a0446962b1c9b2d19717c086b9036979dcc513228
 EBUILD htop-1.0.1-r1.ebuild 1853 SHA256 a5887905dff04efca6c7ca937da51cafb3fff5a6703551ff3b91fe5c32c154ed SHA512 d4997ffc40e9efe18cdd90b5c9b59b7c7fa4869af97667e8a4103a704832b6239af2e5ba286a3296e5065ec3085122c9365712975ae05a19a49897b5afd5d5e2 WHIRLPOOL 980cf481fb8df75139018fc95c4eda3f2f56ddc2b40c0445cb0e370fa52f048d1751254c499f00971675133d4d621ab20c30a6f215b4d55147f499efc0870cf8
 EBUILD htop-1.0.1.ebuild 1554 SHA256 6b8dc12916eeeccabc9ebffcfac21c4ff0f18eedf60e4d87703c35fcb99ab941 SHA512 3bc242fd6d3d25d621e2edb18df82bf48b954057b04dbdcfa04fe0102132c689b32148218254ce2a5ae085c70af9141b0cfa1e676f5a1d6162967d65414abc1c WHIRLPOOL 6e8dc59815e71a728dc3d872cd5c25bf8efd2ef86c344754b69310e3c06b1747121f9dd2a5fe605575082dd50fb1435f088327689c2a0b319a11c41e651f8fcd
-MISC ChangeLog 16397 SHA256 4bbd7d093456e1f33ceb91686848d7c3f5de5435bae4a584223248eeaa1f512f SHA512 4290758aae872e0d41c9c1ee1cfb922bde2a6caab6b6dc318b7c10ba76b0bbf596193349a3ddbc917d6e0d8606d5a25ad83d435c1e6bfe766c7f8d1b393850ff WHIRLPOOL 7f8d797c8a9b7bace1524af8e2167db1f3ad56b34cffa714e49d55f7238161e489b0ac55a980ca28c261606f0239fa7d8618f07254c9025ed9524b3162b2c4eb
+MISC ChangeLog 16581 SHA256 7b77043c79839b91810653918dc75c9f50c90cacd4274f21cd48bd75c97fca96 SHA512 e3fc80b405e1cc5aa186ed499f825ecbe0cd82b3b45f3acc15d4a65c08a6df5f1fd505fef5ccf3f7f3c10a415ee4723ec2d2d414a30d99bdd8c585a611636a8b WHIRLPOOL 4b10c7fd049483f428388b16b62accffab5107977dc94d6bc7a24ec6589a5fdf00a3894f663a8b497e70240c2ac0c97e53bbcc41a450a81799dd8e432d3287a0
 MISC metadata.xml 624 SHA256 ea0be2cf5721cb1d68215f060919177204937290083dd2635b45d043095838ec SHA512 1e4871bb46014b82071ffb3f3535c93f334fed90217ceef32d880f14c754167c5b13aaa990c585b09d7ca12a93509411ea7e362d0e1d71a63144afd709456dbf WHIRLPOOL 2cca5290c631769f9f53d6c1dd2155bffe0b0b12b33319c050898b7281f47c90a54bb72dd74937b35e930f7d6bce4b70eb172aacddf5143c73091d2daf9ca7bf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCP92kACgkQVWmRsqeSphPslQCdGS0dyEKCUaTkfPj3x7FAlrJx
-BhEAnRldk29Ryv+fhzOvnBhBG/tsnpMA
-=xttD
+iQEcBAEBCAAGBQJQkDP4AAoJEMOx0zmdw4Z1UaUIAIFinMBWnsIZO8lQkF4iyK3C
+boQ8noyDWzYzGLYbt77MyKdalBSGJe5Sd+eTW09Tvlg4SEM6tUs6qaz1t0tBJMSt
+n1EEKFDsPbzRNg901sVBw+fX/45nukJprk8ktRphyVgT36yUkyJmnrJ0lyL4wkpR
+HwuUGNNojey8ExS1bqg/UnlWmlmd3jTWfqoBDVnP+v0/05SvbTeKkV/UtbqIzpfn
+6wyBO1pz4iLqCj/OvNBdCrzbU5k9PndOlkl0tapO50JLf5QfS+P+6xnXYcgzauXw
+4xzG/wbgNxQNaHqGYUw9yQ0eX4JmDbB3f6MOtrz3rZ5oPvp2rloZcXMLbHM2Z8U=
+=T63Y
 -----END PGP SIGNATURE-----
diff --git a/sys-process/htop/files/htop-0.9-debug.patch b/sys-process/htop/files/htop-0.9-debug.patch
deleted file mode 100644
index a1aa1b9ea3ec..000000000000
--- a/sys-process/htop/files/htop-0.9-debug.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- trunk/DebugMemory.c	2006/11/08 20:40:10	66
-+++ trunk/DebugMemory.c	2011/03/22 20:37:08	216
-@@ -90,7 +90,7 @@
-    return data;
- }
- 
--void* DebugMemory_strdup(char* str, char* file, int line) {
-+void* DebugMemory_strdup(const char* str, char* file, int line) {
-    assert(str);
-    char* data = strdup(str);
-    DebugMemory_registerAllocation(data, file, line);
-@@ -102,7 +102,7 @@
- }
- 
- void DebugMemory_free(void* data, char* file, int line) {
--   assert(data);
-+   if (!data) return;
-    DebugMemory_registerDeallocation(data, file, line);
-    if (singleton->file) {
-       if (singleton->totals) fprintf(singleton->file, "%d\t", singleton->size);
---- trunk/Process.c	2010/11/22 12:40:20	206
-+++ trunk/Process.c	2011/03/22 20:37:08	216
-@@ -471,7 +471,7 @@
-       RichString_setAttr(out, CRT_colors[PROCESS_SHADOW]);
-    if (this->tag == true)
-       RichString_setAttr(out, CRT_colors[PROCESS_TAG]);
--   assert(out->len > 0);
-+   assert(out->chlen > 0);
- }
- 
- void Process_delete(Object* cast) {
diff --git a/sys-process/htop/files/htop-0.9-small-width.patch b/sys-process/htop/files/htop-0.9-small-width.patch
deleted file mode 100644
index 743111137b03..000000000000
--- a/sys-process/htop/files/htop-0.9-small-width.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 17d258ff0a216dd87655c8e93d065e5e6c504f42 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Mon, 1 Aug 2011 02:51:24 +0200
-Subject: [PATCH 3/3] Fix segfault in BarMeterMode_draw() for small terminal
- widths
-
-Segfault can be triggered by running "COLUMNS=1 ./htop"
-For me, COLUMNS=40 was the first that would not crash.
----
- ChangeLog |    2 ++
- Meter.c   |   11 +++++++++--
- 2 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/Meter.c b/Meter.c
-index 6947d9b..408b981 100644
---- a/Meter.c
-+++ b/Meter.c
-@@ -264,13 +265,19 @@ static void BarMeterMode_draw(Meter* this, int x, int y, int w) {
-    
-    w--;
-    x++;
--   char bar[w];
-+
-+   if (w < 1) {
-+      attrset(CRT_colors[RESET_COLOR]);
-+      return;
-+   }
-+   char bar[w + 1];
-    
-    int blockSizes[10];
-    for (int i = 0; i < w; i++)
-       bar[i] = ' ';
- 
--   sprintf(bar + (w-strlen(buffer)), "%s", buffer);
-+   const size_t bar_offset = w - MIN(strlen(buffer), w);
-+   snprintf(bar + bar_offset, w - bar_offset + 1, "%s", buffer);
- 
-    // First draw in the bar[] buffer...
-    double total = 0.0;
--- 
-1.7.6
-
diff --git a/sys-process/htop/files/htop-0.9-uclibc.patch b/sys-process/htop/files/htop-0.9-uclibc.patch
deleted file mode 100644
index ffe4953d80a3..000000000000
--- a/sys-process/htop/files/htop-0.9-uclibc.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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-r2.ebuild b/sys-process/htop/htop-0.9-r2.ebuild
deleted file mode 100644
index 3f21397ca7f3..000000000000
--- a/sys-process/htop/htop-0.9-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-0.9-r2.ebuild,v 1.8 2012/01/04 23:50:33 xmw 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
-
-	# patch accepted by upstream (bug 3383385), remove on >=0.9.1
-	epatch "${FILESDIR}"/${P}-small-width.patch
-
-	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
-}