Version bump, bug 508954. Cleanup

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B427ABC8)

5 files changed, 53 insertions, 138 deletions

diff --git a/sys-process/htop/ChangeLog b/sys-process/htop/ChangeLog
index ce0f73dd2aee..6714071bf28e 100644
--- a/sys-process/htop/ChangeLog
+++ b/sys-process/htop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-process/htop
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/ChangeLog,v 1.140 2014/02/03 16:43:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/ChangeLog,v 1.141 2014/05/02 23:05:38 idl0r Exp $
+
+*htop-1.0.3 (02 May 2014)
+
+  02 May 2014; Christian Ruppert <idl0r@gentoo.org> -htop-1.0.1.ebuild,
+  -htop-1.0.1-r1.ebuild, -htop-1.0.2-r1.ebuild, +htop-1.0.3.ebuild,
+  metadata.xml:
+  Version bump, bug 508954. Cleanup
 
   03 Feb 2014; Justin Lecher <jlec@gentoo.org> htop-1.0.1.ebuild,
   htop-1.0.1-r1.ebuild, htop-1.0.2.ebuild, htop-1.0.2-r1.ebuild,
diff --git a/sys-process/htop/htop-1.0.1-r1.ebuild b/sys-process/htop/htop-1.0.1-r1.ebuild
deleted file mode 100644
index f7456d7f3f6c..000000000000
--- a/sys-process/htop/htop-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-1.0.1-r1.ebuild,v 1.7 2014/02/03 16:43:30 jlec Exp $
-
-EAPI=4
-
-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 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
-
-RDEPEND="sys-libs/ncurses[unicode?]"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog README )
-
-pkg_setup() {
-	if use kernel_FreeBSD && ! [[ -f ${ROOT}/compat/linux/proc/stat && -f ${ROOT}/compat/linux/proc/meminfo ]]; then
-		echo
-		eerror "htop requires linprocfs mounted at /compat/linux/proc to build and function."
-		eerror "To mount it, type:"
-		[ -d /compat/linux/proc ] || eerror "mkdir -p /compat/linux/proc"
-		eerror "mount -t linprocfs none /compat/linux/proc"
-		eerror "Alternatively, place this information into /etc/fstab"
-		echo
-		die "htop needs /compat/linux/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() {
-	[[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
-
-	myconf=''
-
-	use kernel_FreeBSD && myconf="${myconf} --with-proc=/compat/linux/proc"
-
-	econf \
-		$(use_enable openvz) \
-		$(use_enable kernel_linux cgroup) \
-		$(use_enable vserver) \
-		$(use_enable unicode) \
-		--enable-taskstats \
-		${myconf}
-}
diff --git a/sys-process/htop/htop-1.0.1.ebuild b/sys-process/htop/htop-1.0.1.ebuild
deleted file mode 100644
index fca7081c5592..000000000000
--- a/sys-process/htop/htop-1.0.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-1.0.1.ebuild,v 1.12 2014/02/03 16:43:30 jlec Exp $
-
-EAPI=4
-
-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 ~amd64-fbsd ~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
-		echo
-		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"
-		echo
-		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() {
-	[[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
-
-	econf \
-		$(use_enable openvz) \
-		$(use_enable kernel_linux cgroup) \
-		$(use_enable vserver) \
-		$(use_enable unicode) \
-		--enable-taskstats
-}
diff --git a/sys-process/htop/htop-1.0.2-r1.ebuild b/sys-process/htop/htop-1.0.3.ebuild
index 6295a3abbd4d..ac68b51452e6 100644
--- a/sys-process/htop/htop-1.0.2-r1.ebuild
+++ b/sys-process/htop/htop-1.0.3.ebuild
@@ -1,25 +1,34 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-1.0.2-r1.ebuild,v 1.2 2014/02/03 16:43:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-1.0.3.ebuild,v 1.1 2014/05/02 23:05:38 idl0r Exp $
 
-EAPI=4
+EAPI=5
 
-inherit autotools eutils
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils linux-info python-any-r1
 
 DESCRIPTION="interactive process viewer"
-HOMEPAGE="http://htop.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://hisham.hm/htop/"
+SRC_URI="http://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
+IUSE="kernel_FreeBSD kernel_linux oom openvz unicode vserver"
 
 RDEPEND="sys-libs/ncurses[unicode?]"
 DEPEND="${RDEPEND}"
 
 DOCS=( ChangeLog README )
 
+CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
+
+# config.h problems
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
 pkg_setup() {
 	if use kernel_FreeBSD && ! [[ -f ${ROOT}/compat/linux/proc/stat && -f ${ROOT}/compat/linux/proc/meminfo ]]; then
 		echo
@@ -36,28 +45,35 @@ pkg_setup() {
 		ewarn "To use lsof features in htop(what processes are accessing"
 		ewarn "what files), you must have sys-process/lsof installed."
 	fi
+
+	python-any-r1_pkg_setup
+	linux-info_pkg_setup
 }
 
 src_prepare() {
 	rm missing || die
-	sed -i -e '1c\#!'"${EPREFIX}"'/usr/bin/python' \
-		scripts/MakeHeader.py || die
-	epatch "${FILESDIR}"/${P}-tinfo.patch
-	eautoreconf
+
+	sed \
+		-e '1c\#!'"${EPREFIX}"'/usr/bin/python' \
+		-i scripts/MakeHeader.py || die
+
+	autotools-utils_src_prepare
 }
 
 src_configure() {
 	[[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
 
-	local myconf=''
+	local myeconfargs=()
 
-	use kernel_FreeBSD && myconf="${myconf} --with-proc=/compat/linux/proc"
+	use kernel_FreeBSD && myeconfargs+=( --with-proc=/compat/linux/proc )
 
-	econf \
-		$(use_enable openvz) \
-		$(use_enable kernel_linux cgroup) \
-		$(use_enable vserver) \
-		$(use_enable unicode) \
-		--enable-taskstats \
-		${myconf}
+	myeconfargs+=(
+		$(use_enable openvz)
+		$(use_enable kernel_linux cgroup)
+		$(use_enable vserver)
+		$(use_enable unicode)
+		$(use_enable oom)
+		--enable-taskstats
+		)
+	autotools-utils_src_configure
 }
diff --git a/sys-process/htop/metadata.xml b/sys-process/htop/metadata.xml
index cb2b58bcfb07..1cc6802ab8d2 100644
--- a/sys-process/htop/metadata.xml
+++ b/sys-process/htop/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>idl0r@gentoo.org</email>
-    <name>Christian Ruppert</name>
-  </maintainer>
-  <use>
-    <flag name="openvz">Enable openvz support</flag>
-    <flag name="vserver">Enable vserver support</flag>
-  </use>
-  <longdescription>
+	<maintainer>
+		<email>idl0r@gentoo.org</email>
+		<name>Christian Ruppert</name>
+	</maintainer>
+	<use>
+		<flag name="oom">Add column to track the OOM-killer score of processes</flag>
+		<flag name="openvz">Enable openvz support</flag>
+		<flag name="vserver">Enable vserver support</flag>
+	</use>
+	<longdescription>
 htop is an interactive process viewer for Linux. It aims to be a 'better top':
 you can scroll the process list vertically and horizontally, and select a
 process to be killed with the arrow keys instead of by typing its process id.