-AUX htop-0.8.1-desktop-entry.patch 396 RMD160 a86dbdf0856410707d3b352df43c10dddfb3d807 SHA1 4f852f1a9be20bb6d49369c43d43d0c2560f6c49 SHA256 fad5d148a176b61b2ceeba0dfefd6dc9efd54704ff8f845f6b7ef695a49f2625
-AUX htop-0.8.1-no-plpa.patch 3206 RMD160 0a64aee22a69a7b4b80d2df3bae666d30efb2564 SHA1 b254da652488c8238e7dd2356f57db472416ce1d SHA256 866cacdd7572fc5d013aad40195d6b863d16c556d9f3b96d0ddfe71d776bafaa
AUX htop-0.8.1-non-printable-char-filter.patch 576 RMD160 eb716cf0a079b4a06aa60c763c2b3ecb138aa82e SHA1 1ade154e42525b3e04210eb7375e1543ed6d87f5 SHA256 e4ff4eb727b9baae514589ec99d08f3c9f5160618dae493fcacca92473de68a7
-AUX htop-0.8.2-illegaladdrcopy.patch 3414 RMD160 c5bc3677f3e51729439f665260665270d55833ce SHA1 ca3bee8970f665454c33495bffb7ba5b7db0a024 SHA256 41057a981d2226f751030fcfe784864dfb6684995680b4d1ca06913440122a16
-DIST htop-0.8.1.tar.gz 414870 RMD160 8e73a9b31b6a48d4680c4df06c280c8d1bc125da SHA1 b41b4d83ab7ac40b79f6eeb730cd561293b62fd4 SHA256 25ae28202fa4b782ed0e1298d3feee407bdeb56eaf9c652d0a6f9dbf22125d28
-DIST htop-0.8.2.tar.gz 418756 RMD160 0f45cac3e503c9633876347b049a9c2be09a4b5e SHA1 d4a9fe8b864276fdb037633ba9c5b3b3c4541e66 SHA256 8e77ad7dbf6333ed158dcd3ab16da346ded680fd50a1c258e3a6771e4ca1c707
DIST htop-0.8.3.tar.gz 428061 RMD160 ac1707c2f27ac1c6576601765bda4335e49d6aea SHA1 2a0bf90f160b3d019e26712c94db612d6ff9a429 SHA256 f03bac8999c57c399cbf4332831bcce905d0393d0f97f7e32a1407b48890dd9d
-EBUILD htop-0.8.1-r1.ebuild 1358 RMD160 60a74f525922d831516242a99194db803894a513 SHA1 b2a58ef70960151d7c1337b01d206e19f8f84f9f SHA256 e63cf25023deaacbd528e2b0960268be8508c4d48cd34381141788cb2fd0c363
-EBUILD htop-0.8.2.ebuild 1570 RMD160 0f697d26140cdc5d265aa7ab3bcef0dcfcba0a69 SHA1 47bf240674852a76e1658cffcf1589d637103f7d SHA256 72eb98ccbed21f4de37b495766f65a47a3834f48ed7761448196604e322671a9
-EBUILD htop-0.8.3.ebuild 1548 RMD160 b25154556f217c4b3c1a09b84f66c1c1d9560420 SHA1 209a6e1ace137e2d43550acd118407b536444bd1 SHA256 ab14ba878a140b2e0a905246020b2dd54c2a9c33d616686bb2945a1575d1f308
+EBUILD htop-0.8.3.ebuild 1420 RMD160 0042b776cf820285a05877dd17c7b9b880def990 SHA1 f03c9eafba62f0f6df8b4c1e8c81c93475d2adcb SHA256 1febde9f5f5ca973016c353d44bfe1210540217a50fd16c4d8c07f42f3e8e31a
MISC ChangeLog 11297 RMD160 000c0aaf353ad2fa74563aa84a3d8df31af6623c SHA1 acd0b3bce72b51eb1f550555fbded3d46562c893 SHA256 dc3023767133171846b14c7158736ae09aacff468e483047d3648e619942f40c
MISC metadata.xml 616 RMD160 52898a5ac22473500d88749a14d898db9de3758d SHA1 a58a9e1991505e7f06f0fe143b67d988117b4bf0 SHA256 31daa90560dc05ee309c3606f1d66cd267b77b45045d4b33939f503fa9fdcee8
+++ /dev/null
---- 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
+++ /dev/null
-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"
+++ /dev/null
-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]]);
+++ /dev/null
-# 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
-}
+++ /dev/null
-# 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."
-}
# 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
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"
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
}
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
}
projects / gentoo.git / commitdiff