clean up

(Portage version: 2.2_rc67/cvs/Linux x86_64)

6 files changed, 7 insertions, 311 deletions

diff --git a/sys-process/htop/files/htop-0.8.1-desktop-entry.patch b/sys-process/htop/files/htop-0.8.1-desktop-entry.patch
deleted file mode 100644
index bcc82f168186..000000000000
--- a/sys-process/htop/files/htop-0.8.1-desktop-entry.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- htop.desktop.orig	2008-11-23 16:08:39.000000000 +0200
-+++ htop.desktop	2008-11-23 16:09:34.000000000 +0200
-@@ -1,12 +1,10 @@
- [Desktop Entry]
--Encoding=UTF-8
--Version=0.7
-+Version=1.0
- Name=Htop
- Type=Application
- Comment=Show System Processes
- Terminal=true
- Exec=htop
--Path=
- Icon=htop
--Categories=ConsoleOnly;System;Application;
-+Categories=ConsoleOnly;System;
- GenericName=Process Viewer
diff --git a/sys-process/htop/files/htop-0.8.1-no-plpa.patch b/sys-process/htop/files/htop-0.8.1-no-plpa.patch
deleted file mode 100644
index ee89da35bd4b..000000000000
--- a/sys-process/htop/files/htop-0.8.1-no-plpa.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-Not-linux hosts does not support PLPA.
-Since htop works also without it, why not?
-
-Original patch from FreeBSD by Yi-Jheng Lin <yzlin@cs.nctu.edu.tw>
-Modified to be conditional by Timothy Redaelli <drizzt@gentoo.org>
-
-https://bugs.gentoo.org/220469
-
---- configure.ac
-+++ configure.ac
-@@ -97,8 +97,9 @@
- 
- PLPA_INCLUDED(plpa-1.1)
- PLPA_INIT(plpa_happy=yes, plpa_happy=no)
--if test "x$plpa_happy" = xno; then
--   AC_MSG_ERROR([Failed to initialize PLPA.])
-+AM_CONDITIONAL([HAVE_PLPA], [test "$plpa_happy" = "yes"])
-+if test "$plpa_happy" = "yes"; then
-+   AC_DEFINE([HAVE_PLPA], [1], [Have plpa])
- fi
- 
- AC_CONFIG_FILES([Makefile])
---- htop.c
-+++ htop.c
-@@ -112,9 +112,11 @@
-    mvaddstr(15, 0, "   F9 k: kill process/tagged processes      P: sort by CPU%");
-    mvaddstr(16, 0, " + [ F7: lower priority (+ nice)            M: sort by MEM%");
-    mvaddstr(17, 0, " - ] F8: higher priority (root only)        T: sort by TIME");
-+#ifdef HAVE_PLPA
-    if (pl->processorCount > 1)
-       mvaddstr(18, 0, "      a: set CPU affinity                F4 I: invert sort order");
-    else
-+#endif
-       mvaddstr(18, 0, "                                         F4 I: invert sort order");
-    mvaddstr(19, 0, "   F2 S: setup                           F6 >: select sort column");
-    mvaddstr(20, 0, "   F1 h: show this help screen");
-@@ -131,8 +133,10 @@
-    mvaddstr(16, 0, " + [ F7"); mvaddstr(16,40, "    M");
-    mvaddstr(17, 0, " - ] F8"); mvaddstr(17,40, "    T");
-                                mvaddstr(18,40, " F4 I");
-+#if HAVE_PLPA
-    if (pl->processorCount > 1)
-       mvaddstr(18, 0, "      a:");
-+#endif
-    mvaddstr(19, 0, "   F2 S"); mvaddstr(19,40, " F6 >");
-    mvaddstr(20, 0, "   F1 h");
-    mvaddstr(21, 0, "  F10 q"); mvaddstr(21,40, "    s");
-@@ -630,6 +634,7 @@
-          refreshTimeout = 0;
-          break;
-       }
-+#ifdef HAVE_PLPA
-       case 'a':
-       {
-          if (pl->processorCount == 1)
-@@ -665,6 +670,7 @@
-          refreshTimeout = 0;
-          break;
-       }
-+#endif
-       case KEY_F(10):
-       case 'q':
-          quit = 1;
---- Process.c
-+++ Process.c
-@@ -28,7 +28,9 @@
- #include <pwd.h>
- #include <sched.h>
- 
-+#ifdef HAVE_PLPA
- #include <plpa.h>
-+#endif
- 
- // This works only with glibc 2.1+. On earlier versions
- // the behavior is similar to have a hardcoded page size.
-@@ -493,6 +495,7 @@
-    return (err == 0);
- }
- 
-+#ifdef HAVE_PLPA
- unsigned long Process_getAffinity(Process* this) {
-    unsigned long mask = 0;
-    plpa_sched_getaffinity(this->pid, sizeof(unsigned long), (plpa_cpu_set_t*) &mask);
-@@ -502,6 +505,7 @@
- bool Process_setAffinity(Process* this, unsigned long mask) {
-    return (plpa_sched_setaffinity(this->pid, sizeof(unsigned long), (plpa_cpu_set_t*) &mask) == 0);
- }
-+#endif
- 
- void Process_sendSignal(Process* this, int signal) {
-    kill(this->pid, signal);
---- Makefile.am
-+++ Makefile.am
-@@ -1,5 +1,7 @@
- 
-+if HAVE_PLPA
- SUBDIRS = plpa-1.1
-+endif
- 
- bin_PROGRAMS = htop
- dist_man_MANS = htop.1
-@@ -35,7 +37,9 @@
- 
- BUILT_SOURCES = $(myhtopheaders)
- htop_SOURCES = $(myhtopheaders) $(myhtopsources) config.h debug.h
-+if HAVE_PLPA
- htop_LDADD = $(top_builddir)/plpa-1.1/src/libplpa_included.la
-+endif
- 
- profile:
- 	$(MAKE) all CFLAGS="-pg -O2"
diff --git a/sys-process/htop/files/htop-0.8.2-illegaladdrcopy.patch b/sys-process/htop/files/htop-0.8.2-illegaladdrcopy.patch
deleted file mode 100644
index 6202d4ba0690..000000000000
--- a/sys-process/htop/files/htop-0.8.2-illegaladdrcopy.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Found from http://sourceforge.net/tracker/?func=detail&aid=2803527&group_id=108839&atid=651633
-
-Index: FunctionBar.c
-===================================================================
---- FunctionBar.c	(revision 162)
-+++ FunctionBar.c	(working copy)
-@@ -52,12 +52,14 @@ FunctionBar* FunctionBar_new(char** func
-       this->functions = malloc(sizeof(char*) * 15);
-       this->keys = malloc(sizeof(char*) * 15);
-       this->events = malloc(sizeof(int) * 15);
--      int i = 0;
--      while (i < 15 && functions[i]) {
-+      int i;
-+      for (i = 0; i < 15; i++) {
-+         if (functions[i] == NULL) /* We don't know the size of the array,  */
-+            break;                 /* so let's assume it is NULL terminated */
-+                                   /* and break if we find that NULL        */
-          this->functions[i] = String_copy(functions[i]);
-          this->keys[i] = String_copy(keys[i]);
-          this->events[i] = events[i];
--         i++;
-       }
-       this->size = i;
-    } else {
-Index: htop.c
-===================================================================
---- htop.c	(revision 162)
-+++ htop.c	(working copy)
-@@ -151,7 +151,7 @@ static void showHelp(ProcessList* pl) {
-    clear();
- }
- 
--static char* CategoriesFunctions[10] = {"      ", "      ", "      ", "      ", "      ", "      ", "      ", "      ", "      ", "Done  "};
-+static char* CategoriesFunctions[] = {"      ", "      ", "      ", "      ", "      ", "      ", "      ", "      ", "      ", "Done  ", NULL};
- 
- static void Setup_run(Settings* settings, int headerHeight) {
-    ScreenManager* scr = ScreenManager_new(0, headerHeight, 0, -1, HORIZONTAL, true);
-@@ -190,7 +190,7 @@ static HandlerResult pickWithEnter(Panel
- }
- 
- static Object* pickFromVector(Panel* panel, Panel* list, int x, int y, char** keyLabels, FunctionBar* prevBar) {
--   char* fuKeys[2] = {"Enter", "Esc"};
-+   char* fuKeys[] = {"Enter", "Esc", NULL};
-    int fuEvents[2] = {13, 27};
-    if (!list->eventHandler)
-       Panel_setEventHandler(list, pickWithEnter);
-@@ -326,7 +326,7 @@ int main(int argc, char** argv) {
-    Panel_setRichHeader(panel, ProcessList_printHeader(pl));
-    
-    char* searchFunctions[] = {"Next  ", "Exit  ", " Search: ", NULL};
--   char* searchKeys[] = {"F3", "Esc", "  "};
-+   char* searchKeys[] = {"F3", "Esc", "  ", NULL};
-    int searchEvents[] = {KEY_F(3), 27, ERR};
-    FunctionBar* searchBar = FunctionBar_new(searchFunctions, searchKeys, searchEvents);
-    
-@@ -656,7 +656,7 @@ int main(int argc, char** argv) {
-          
-          Panel* affinityPanel = AffinityPanel_new(pl->processorCount, curr);
- 
--         char* fuFunctions[2] = {"Set    ", "Cancel "};
-+         char* fuFunctions[3] = {"Set    ", "Cancel ", NULL};
-          void* set = pickFromVector(panel, affinityPanel, 15, headerHeight, fuFunctions, defaultBar);
-          if (set) {
-             unsigned long new = AffinityPanel_getAffinity(affinityPanel);
-@@ -695,7 +695,7 @@ int main(int argc, char** argv) {
-       {
-          Panel* sortPanel = Panel_new(0, 0, 0, 0, LISTITEM_CLASS, true, ListItem_compare);
-          Panel_setHeader(sortPanel, "Sort by");
--         char* fuFunctions[2] = {"Sort  ", "Cancel "};
-+         char* fuFunctions[] = {"Sort  ", "Cancel ", NULL};
-          ProcessField* fields = pl->fields;
-          for (int i = 0; fields[i]; i++) {
-             char* name = String_trim(Process_fieldTitles[fields[i]]);
diff --git a/sys-process/htop/htop-0.8.1-r1.ebuild b/sys-process/htop/htop-0.8.1-r1.ebuild
deleted file mode 100644
index 3016a936dcf4..000000000000
--- a/sys-process/htop/htop-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-0.8.1-r1.ebuild,v 1.11 2009/06/13 12:40:41 gentoofan23 Exp $
-
-EAPI="2"
-
-inherit autotools eutils flag-o-matic
-
-IUSE="debug unicode"
-DESCRIPTION="interactive process viewer"
-HOMEPAGE="http://htop.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-
-DEPEND="sys-libs/ncurses[unicode?]"
-RDEPEND="${DEPEND}"
-
-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
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-desktop-entry.patch
-	epatch "${FILESDIR}"/${P}-non-printable-char-filter.patch
-	epatch "${FILESDIR}"/${P}-no-plpa.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	useq debug && append-flags -O -ggdb -DDEBUG
-	econf \
-		--enable-taskstats \
-		$(use_enable unicode) \
-		|| die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc README ChangeLog TODO || die
-}
diff --git a/sys-process/htop/htop-0.8.2.ebuild b/sys-process/htop/htop-0.8.2.ebuild
deleted file mode 100644
index 345987925114..000000000000
--- a/sys-process/htop/htop-0.8.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-0.8.2.ebuild,v 1.1 2009/06/13 12:40:41 gentoofan23 Exp $
-
-EAPI="2"
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="interactive process viewer"
-HOMEPAGE="http://htop.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug"
-
-DEPEND="sys-libs/ncurses[unicode]"
-RDEPEND="${DEPEND}"
-
-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() {
-	epatch "${FILESDIR}"/${PN}-0.8.1-non-printable-char-filter.patch \
-		"${FILESDIR}"/${P}-illegaladdrcopy.patch
-}
-
-src_configure() {
-	useq debug && append-flags -O -ggdb -DDEBUG
-	econf \
-		--enable-taskstats \
-		--enable-unicode
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc README ChangeLog TODO || die "documentation installation failed."
-	rmdir "${D}"/usr/{include,$(get_libdir)} || die "Removing empty directory failed."
-}
diff --git a/sys-process/htop/htop-0.8.3.ebuild b/sys-process/htop/htop-0.8.3.ebuild
index cae9cd0378b4..53e389bb851a 100644
--- a/sys-process/htop/htop-0.8.3.ebuild
+++ b/sys-process/htop/htop-0.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-0.8.3.ebuild,v 1.7 2010/04/30 21:48:10 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-0.8.3.ebuild,v 1.8 2010/05/03 17:57:41 ssuominen Exp $
 
 EAPI=3
 inherit eutils flag-o-matic multilib
@@ -15,10 +15,9 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-
 IUSE="debug"
 
 DEPEND="sys-libs/ncurses[unicode]"
-RDEPEND="${DEPEND}"
 
 pkg_setup() {
-	if use elibc_FreeBSD && ! [[ -f "${ROOT}"/proc/stat && -f "${ROOT}"/proc/meminfo ]] ; then
+	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"
@@ -27,7 +26,7 @@ pkg_setup() {
 		die "htop needs /proc mounted"
 	fi
 
-	if ! has_version sys-process/lsof ; then
+	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
@@ -38,14 +37,14 @@ src_prepare() {
 }
 
 src_configure() {
-	useq debug && append-flags -O -ggdb -DDEBUG
+	useq debug && append-flags -DDEBUG
 	econf \
 		--enable-taskstats \
 		--enable-unicode
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc README ChangeLog TODO || die "documentation installation failed."
-	rmdir "${ED}"/usr/{include,$(get_libdir)} || die "Removing empty directory failed."
+	emake DESTDIR="${D}" install || die
+	dodoc README ChangeLog TODO || die
+	rmdir "${ED}"/usr/{include,$(get_libdir)} || die
 }