cleanup

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

4 files changed, 6 insertions, 62 deletions

diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index a9e4186460b2..5c400c033d86 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,8 +1,7 @@
 AUX htop-0.8.1-non-printable-char-filter.patch 576 RMD160 eb716cf0a079b4a06aa60c763c2b3ecb138aa82e SHA1 1ade154e42525b3e04210eb7375e1543ed6d87f5 SHA256 e4ff4eb727b9baae514589ec99d08f3c9f5160618dae493fcacca92473de68a7
 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-r1.ebuild 1593 RMD160 d8dbb5fe98ec7986457f779a32cd40c37b1b488c SHA1 21a40786638847577aa5394cf27454c879df6200 SHA256 11bb1066286176252b689efb2a22cde78dda3767e61402b3f5834c4357606989
-EBUILD htop-0.8.3.ebuild 1420 RMD160 0042b776cf820285a05877dd17c7b9b880def990 SHA1 f03c9eafba62f0f6df8b4c1e8c81c93475d2adcb SHA256 1febde9f5f5ca973016c353d44bfe1210540217a50fd16c4d8c07f42f3e8e31a
+EBUILD htop-0.8.3.ebuild 1441 RMD160 a15f26d46fb6663b9bef520e0450c5ecfa6eff58 SHA1 125fcc6af4919c2ae5eb0bb2db14446246926c47 SHA256 4357980b8ed3a019151c3f2b694288e3e51ddc4a94ed95022056bcc201215902
 EBUILD htop-0.9.ebuild 1579 RMD160 cb17ec841c39b4b3a3743da464716d26c2c67e9a SHA1 7af911dc496d75395ae20f9649ed6af16cc55f5e SHA256 bbab1419f700d8522722bc1a9fe2f1d977a042021c1a4e19222b1c394c45cb7d
 MISC ChangeLog 12216 RMD160 3bc67d58a4d6f0b04a5c898f1b6b1d1dd75d0bc8 SHA1 c8667fb851b4a7c866b3c0ed93a1e1684f93b65b SHA256 8b8f6770c0528ba59cf3bce319c05ed680e714a32969e08873225ba62f186f46
-MISC metadata.xml 687 RMD160 a3987e016cf571adbe594c518669f2e482ffa7d0 SHA1 97e11651433e986b9fb0e8133cf61d9b07bcbf17 SHA256 2deda24f9603f077bc3f05f90c0899ed7878c9a38f005a762ce2c1a1650dc81d
+MISC metadata.xml 637 RMD160 1334d42159a61292ef79ff979e20cf3742d6c40f SHA1 41aedcdb713c5c6403bd64fd6d8a52b7bc20e388 SHA256 d3e5b20b75ddbd652c574d2c5cbd999bdaf24e93df0d0dcf6ee6d63fcf78775d
diff --git a/sys-process/htop/htop-0.8.3-r1.ebuild b/sys-process/htop/htop-0.8.3-r1.ebuild
deleted file mode 100644
index 2d87e3b0a782..000000000000
--- a/sys-process/htop/htop-0.8.3-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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-r1.ebuild,v 1.3 2010/09/03 19:00:35 grobian 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 openvz unicode vserver"
-
-DEPEND="sys-libs/ncurses[unicode?]"
-
-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
-	sed -i -e '1c\#!'"${EPREFIX}"'/usr/bin/python' \
-		scripts/MakeHeader.py || die
-}
-
-src_configure() {
-	useq debug && append-flags -DDEBUG
-
-	econf \
-		$(use_enable openvz) \
-		$(use_enable vserver) \
-		$(use_enable unicode) \
-		--enable-taskstats
-}
-
-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.8.3.ebuild b/sys-process/htop/htop-0.8.3.ebuild
index 53e389bb851a..f9a9c2c47f6b 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
+# 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.8 2010/05/03 17:57:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-0.8.3.ebuild,v 1.9 2011/01/10 19:26:20 ssuominen Exp $
 
 EAPI=3
 inherit eutils flag-o-matic multilib
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
-DEPEND="sys-libs/ncurses[unicode]"
+RDEPEND="sys-libs/ncurses[unicode]"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	if use elibc_FreeBSD && ! [[ -f ${ROOT}/proc/stat && -f ${ROOT}/proc/meminfo ]]; then
diff --git a/sys-process/htop/metadata.xml b/sys-process/htop/metadata.xml
index e3235292f9f1..f2f336b03473 100644
--- a/sys-process/htop/metadata.xml
+++ b/sys-process/htop/metadata.xml
@@ -7,7 +7,6 @@
 	<name>Thomas Anderson</name>
 </maintainer>
 <use>
-	<flag name="cgroup">Enable cgroup support</flag>
 	<flag name="openvz">Enable openvz support</flag>
 	<flag name="vserver">Enable vserver support</flag>
 </use>