summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-03-21 20:57:51 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-03-21 20:57:51 +0000
commitd20de5a64d9daf7ea51293cffeb445922f1e9a63 (patch)
tree8dff639abf9b87991ed29680f36f8df51c2a32ce /sys-process
parentFix cross compiling wrt #328971 by Johannes Krude (diff)
downloadhistorical-d20de5a64d9daf7ea51293cffeb445922f1e9a63.tar.gz
historical-d20de5a64d9daf7ea51293cffeb445922f1e9a63.tar.bz2
historical-d20de5a64d9daf7ea51293cffeb445922f1e9a63.zip
old
Package-Manager: portage-2.2.0_alpha92/cvs/Linux x86_64
Diffstat (limited to 'sys-process')
-rw-r--r--sys-process/htop/ChangeLog7
-rw-r--r--sys-process/htop/Manifest23
-rw-r--r--sys-process/htop/files/htop-0.8.1-non-printable-char-filter.patch12
-rw-r--r--sys-process/htop/htop-0.8.3.ebuild51
-rw-r--r--sys-process/htop/htop-0.9-r1.ebuild58
-rw-r--r--sys-process/htop/htop-0.9.ebuild60
-rw-r--r--sys-process/htop/htop-1.0.ebuild52
7 files changed, 14 insertions, 249 deletions
diff --git a/sys-process/htop/ChangeLog b/sys-process/htop/ChangeLog
index bba0d975c971..c0d43574d75c 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.109 2012/03/21 20:55:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/ChangeLog,v 1.110 2012/03/21 20:57:51 ssuominen Exp $
+
+ 21 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
+ -files/htop-0.8.1-non-printable-char-filter.patch, -htop-0.8.3.ebuild,
+ -htop-0.9.ebuild, -htop-0.9-r1.ebuild, -htop-1.0.ebuild:
+ old
21 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> htop-1.0.1.ebuild:
Fix cross compiling wrt #328971 by Johannes Krude
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index 148d01ae7d47..07fa20c9ee88 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,30 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-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-small-width.patch 1117 RMD160 f50812f799fce3ad884e131ee24a8eed23ad7e0a SHA1 7411fac42e50e68abcd5a3e98d8bd2c9f5ed48d1 SHA256 1a21490b9d72774c30abb386f20fbdd7e6ebe5bb3e31034bd99f9033d01f5efa
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
DIST htop-1.0.1.tar.gz 384683 RMD160 c13d438438c5ab8c15c056f7064ae6edb26ec8d9 SHA1 bad226ec887a2b7ea5042879ed18e067812d030e SHA256 07db2cbe02835f9e186b9610ecc3beca330a5c9beadb3b6069dd0a10561506f2
-DIST htop-1.0.tar.gz 386165 RMD160 55f2408c8dd0adb9a849858dc975a87034287bfc SHA1 9e9d5f9f2c39af0520a7ba67e7af67925334940a SHA256 242879b86db4b97e1090e7cd391247268ccbe90834ff34b6e8242926c9664852
-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-r2.ebuild 1750 RMD160 557a0fa9e49c259b7c76b7925a26246fc709b551 SHA1 e0bc47b357590a8fd78670f277394441af43e29c SHA256 756f2f9a474d648e842c58243d592ee97fd41bb206c5bec5b5cac5369fc6b2b6
-EBUILD htop-0.9.ebuild 1627 RMD160 5900c62975eaf54c5d08ff38b9605032af4796bf SHA1 2631b331f270d1455a270f89ee18e0986b10584a SHA256 13c3d24e725927830fe9dbc36be352ea8242f1efd24fd962027937b89e9a56be
EBUILD htop-1.0.1.ebuild 1549 RMD160 6677653465a9d67e92e37eadba82af3a50a60cb2 SHA1 451d0aaba60323f0dcf566b0c7c7a52bf4d96ae2 SHA256 8a9f6800da3888a06edd50b707c27fa0f9552753f6b9a790732d8106487e3221
-EBUILD htop-1.0.ebuild 1464 RMD160 f78fa8c28949ee91be85576c899314e523b4c009 SHA1 8a0d935bb2529b1f55c2b490859e4391ecf38f5a SHA256 81bf0342e58f26707f12d63452829175c16a7e4c04286dea8465524c3e902e4f
-MISC ChangeLog 14764 RMD160 d1afadf5fc5fd12b93bf450f7ba2d04e483ad16e SHA1 25bd7038f306bd94e6308e0fbe412e2b47ac06b1 SHA256 01d27cc56979b819dcf6f5572bb79da6fbda59953fcef7f5921e6c4785d77719
+MISC ChangeLog 14957 RMD160 ef6b78a0fb3a93f66278acac9019ffb0ecd1ecb3 SHA1 f713f58774604f8bd2519c1a3f1ef52ce1b6752e SHA256 cff27e47ca25265c6b00bb4d2de5873da90e6dc6bc0603db89eb95fa465a383f
MISC metadata.xml 624 RMD160 e25f614333ae72a6e90c0ce9b581280747a633f0 SHA1 bcf75d714729424cc7c5c21bae4171817a0cfdb9 SHA256 ea0be2cf5721cb1d68215f060919177204937290083dd2635b45d043095838ec
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQEcBAEBAgAGBQJPakBYAAoJEEdUh39IaPFNdA0H/RzTeSnbGG+5My0K84bTOi44
-/vCifuyDBUdkgrQcFqBkxVmpt7v+p4YCAiQtJ0HAOTJuiFvPmHUKo8rzb7fYbjL6
-vRVfH5o4t3+g0/aW3IwUq62DLNNcdoEdm7x4T6SZxIaDxirHtYPtemxzPlKpIYx3
-nonXMdb6KAAfnE43wERVFhhrffLkNxu5FZthYXikLASzDr8WF9bg9621nCvhRhLR
-JLwCA7DNvJ5tGx/h7BQAdERlUVI0nSiNQhhRzughwZ4ARHcEDwaYcPAiT428+/Im
-rB0QmWlYQHTlsLv9DYnPpFwHagdvpCfDCV1BR5QS2DF6+1Epo3se5Rn6I6ATCj4=
-=7z+3
+iQEcBAEBAgAGBQJPakDPAAoJEEdUh39IaPFNbr4H+wZnuGpH4spGxVNwUB8WgXd2
+eaGqj9Brvl3umH1eh7IRl6/wVRBb5OBeklszxFLYujsxvCRnoNTBpGqxpSuifxMr
+4hgqwSIY5vEG1rVxnig08rzObVtfaP40Ozzu839rCLCyNqMCZXgOBGqwE9d4fAQw
+VspLeI9cDEDPWB/jRGEURYXQy9ySAUqRO5I46gqrXEuYRYPwvpMPNfmRrCIVWesQ
+UJdZ2TkmZdTAy/lccJX5cRureDYBONgLMvksTPTSPSOuLVydZxCuXjCquTfPK7Di
+ttbLBVMXQ5Sz6pim0tVH9K4bsI8bRhfBdjFiNlre1Mz3j3CXn8WwxDvP5gH2/nk=
+=/vQ/
-----END PGP SIGNATURE-----
diff --git a/sys-process/htop/files/htop-0.8.1-non-printable-char-filter.patch b/sys-process/htop/files/htop-0.8.1-non-printable-char-filter.patch
deleted file mode 100644
index cfbafe84fca5..000000000000
--- a/sys-process/htop/files/htop-0.8.1-non-printable-char-filter.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u htop-0.8.1.orig/RichString.c htop-0.8.1/RichString.c
---- htop-0.8.1.orig/RichString.c 2008-03-09 03:23:49.000000000 +0100
-+++ htop-0.8.1/RichString.c 2008-11-29 19:07:29.284860473 +0100
-@@ -58,7 +58,7 @@
- int last = MIN(RICHSTRING_MAXLEN - 1, len + this->len);
- for (int i = this->len, j = 0; i < last; i++, j++) {
- memset(&this->chstr[i], 0, sizeof(this->chstr[i]));
-- this->chstr[i].chars[0] = data[j];
-+ this->chstr[i].chars[0] = ((data[j] > 31) ? data[j] : '?' );
- this->chstr[i].attr = attrs;
- }
- this->chstr[last].chars[0] = 0;
diff --git a/sys-process/htop/htop-0.8.3.ebuild b/sys-process/htop/htop-0.8.3.ebuild
deleted file mode 100644
index ba0fecb2a9cd..000000000000
--- a/sys-process/htop/htop-0.8.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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.8.3.ebuild,v 1.10 2011/07/08 10:24:22 ssuominen Exp $
-
-EAPI=3
-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 ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="sys-libs/ncurses[unicode]"
-DEPEND="${RDEPEND}"
-
-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
-}
-
-src_configure() {
- use debug && append-flags -DDEBUG
- econf \
- --enable-taskstats \
- --enable-unicode
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc README ChangeLog TODO || die
- rmdir "${ED}"/usr/{include,$(get_libdir)} || die
-}
diff --git a/sys-process/htop/htop-0.9-r1.ebuild b/sys-process/htop/htop-0.9-r1.ebuild
deleted file mode 100644
index ba9d4dfc5694..000000000000
--- a/sys-process/htop/htop-0.9-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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
-}
diff --git a/sys-process/htop/htop-0.9.ebuild b/sys-process/htop/htop-0.9.ebuild
deleted file mode 100644
index c6db2f1ea92f..000000000000
--- a/sys-process/htop/htop-0.9.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.ebuild,v 1.11 2011/07/22 13:48:01 jer Exp $
-
-EAPI=3
-
-inherit 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}"
-
-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
-
- # bug 352024, 372911
- epatch "${FILESDIR}/${P}-debug.patch"
-}
-
-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
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc ChangeLog README TODO
-}
diff --git a/sys-process/htop/htop-1.0.ebuild b/sys-process/htop/htop-1.0.ebuild
deleted file mode 100644
index 7a5ebe2d0ca8..000000000000
--- a/sys-process/htop/htop-1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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-1.0.ebuild,v 1.2 2011/12/11 00:16:01 idl0r 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="elibc_FreeBSD kernel_linux openvz unicode vserver"
-
-RDEPEND="sys-libs/ncurses[unicode?]"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog README )
-
-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
-}
-
-src_configure() {
-
- econf \
- $(use_enable openvz) \
- $(use_enable kernel_linux cgroup) \
- $(use_enable vserver) \
- $(use_enable unicode) \
- --enable-taskstats
-}