summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2018-02-05 16:10:21 +0100
committerLars Wendler <polynomial-c@gentoo.org>2018-02-05 16:12:43 +0100
commit6ab816b4b2bbfd375d272a82b5d91757be3f87ca (patch)
tree424cec922bc55c3959d9a5cdc7d88134f69d570d /sys-process
parentsys-process/htop: Bump to version 2.1.0 (diff)
downloadgentoo-6ab816b4b2bbfd375d272a82b5d91757be3f87ca.tar.gz
gentoo-6ab816b4b2bbfd375d272a82b5d91757be3f87ca.tar.bz2
gentoo-6ab816b4b2bbfd375d272a82b5d91757be3f87ca.zip
sys-process/htop: Removed old.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'sys-process')
-rw-r--r--sys-process/htop/Manifest2
-rw-r--r--sys-process/htop/files/htop-1.0.3-tinfo.patch62
-rw-r--r--sys-process/htop/files/htop-2.0.0-tinfo.patch82
-rw-r--r--sys-process/htop/htop-1.0.3-r1.ebuild74
-rw-r--r--sys-process/htop/htop-1.0.3.ebuild82
-rw-r--r--sys-process/htop/htop-2.0.1.ebuild61
-rw-r--r--sys-process/htop/metadata.xml1
7 files changed, 0 insertions, 364 deletions
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index 72879e96ad04..f0451a60ad15 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,4 +1,2 @@
-DIST htop-1.0.3.tar.gz 399306 BLAKE2B 3ce3aad0f72102c2aa6d9c7a198eef5e1591dec41f6fabfbe03f2626e08d0967c023adba8285c94e5b5ac05d3b05ec78964035f0bd70bbdff9f429f9cb052097 SHA512 4c5c784b093bcad06eb2e8d8bb215e14f6e838a3d47d8da8402344c270c1724f85d0bcde2899571ba5d0e5a02274a0c3390a76fed61785b2604b51351f08f232
-DIST htop-2.0.1.tar.gz 477196 BLAKE2B 03b6d7a71cbf261413e828d8678daecc969c76439a1241734d7bed13f7f8a3d22b40ebc4845c924ea6c61ddae20f1b90f78790c634908cf4d161ecb314e57c72 SHA512 57991a55b69028c01549b067ec749099466df5b08a0ed9a65dd779e6d2c8ee0a5d9c330bb6c727b04a349146ad441b7115718e433d1f8232f74b28903fb351ff
DIST htop-2.0.2.tar.gz 476364 BLAKE2B f5519977b4bd6d189cb7f379a9f9b535a4b67a575b30056a43e259ab39a69f84083d310bbefefe8408c7ca99918f1ea9ae775808b9afe9d0f78097ac6bb88dc7 SHA512 1c9bf71a36c56b301667aa6d03756fc757fbcb63e848d9581d10db3df6193cdeb00e55ceb6e2392794ac03ea034b04459a8fe550b3ac2318cd86263a74c78cda
DIST htop-2.1.0.tar.gz 302938 BLAKE2B 3e290a3dbb0bf5424780ba5dcb9de8ea478bf4cabbbde202c19eb3db7e0f8d1e108ec3ea41544ac095097c39100417c72477dab96f104a6317f4edd06d69199f SHA512 203e8f4abd63334330fc673f6c9609adbeab763d80f553d8b48670091d18dd347599a9ce2dbbac374fa4a13fa904948711a441fa676f52ab1612bd2b4ee4c6eb
diff --git a/sys-process/htop/files/htop-1.0.3-tinfo.patch b/sys-process/htop/files/htop-1.0.3-tinfo.patch
deleted file mode 100644
index 62a887baf376..000000000000
--- a/sys-process/htop/files/htop-1.0.3-tinfo.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 820e2e5..85f49e9 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -36,6 +36,8 @@ SUFFIXES = .h
- BUILT_SOURCES = $(myhtopheaders)
- htop_SOURCES = $(myhtopheaders) $(myhtopsources) config.h
-
-+htop_LDADD = $(NCURSES_LIBS)
-+
- profile:
- $(MAKE) all CFLAGS="-pg" AM_CPPFLAGS="-pg -O2 -DNDEBUG"
-
-diff --git a/configure.ac b/configure.ac
-index 2b934e8..3593885 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,6 +20,7 @@ AM_PROG_CC_C_O
- AC_DISABLE_SHARED
- AC_ENABLE_STATIC
- AC_PROG_LIBTOOL
-+PKG_PROG_PKG_CONFIG
-
- # Checks for libraries.
- AC_CHECK_LIB([m], [ceil], [], [missing_libraries="$missing_libraries libm"])
-@@ -89,20 +90,24 @@ fi
-
- AC_ARG_ENABLE(unicode, [AC_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes")
- if test "x$enable_unicode" = xyes; then
-- AC_CHECK_LIB([ncursesw], [refresh], [], [
-- missing_libraries="$missing_libraries libncursesw"
-- AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])
-+ PKG_CHECK_MODULES([NCURSES], [ncursesw],[
-+ AC_CHECK_LIB([ncursesw], [refresh], [], [
-+ missing_libraries="$missing_libraries libncursesw"
-+ AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])
-+ ])
-+ AC_CHECK_HEADERS([ncursesw/curses.h],[:],
-+ [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
-+ [AC_CHECK_HEADERS([ncurses/curses.h],[:],
-+ [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
- ])
-- AC_CHECK_HEADERS([ncursesw/curses.h],[:],
-- [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
-- [AC_CHECK_HEADERS([ncurses/curses.h],[:],
-- [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
- else
-- AC_CHECK_LIB([ncurses], [refresh], [], [missing_libraries="$missing_libraries libncurses"])
-- AC_CHECK_HEADERS([curses.h],[:],
-- [AC_CHECK_HEADERS([ncurses/curses.h],[:],
-- [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
-- [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
-+ PKG_CHECK_MODULES([NCURSES], [ncurses],[
-+ AC_CHECK_LIB([ncurses], [refresh], [], [missing_libraries="$missing_libraries libncurses"])
-+ AC_CHECK_HEADERS([curses.h],[:],
-+ [AC_CHECK_HEADERS([ncurses/curses.h],[:],
-+ [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
-+ [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
-+ ])
- fi
-
- if test ! -z "$missing_libraries"; then
diff --git a/sys-process/htop/files/htop-2.0.0-tinfo.patch b/sys-process/htop/files/htop-2.0.0-tinfo.patch
deleted file mode 100644
index e04019519e0c..000000000000
--- a/sys-process/htop/files/htop-2.0.0-tinfo.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- htop-2.0.0/configure.ac
-+++ htop-2.0.0/configure.ac
-@@ -23,6 +23,7 @@
- AC_DISABLE_SHARED
- AC_ENABLE_STATIC
- AC_PROG_LIBTOOL
-+PKG_PROG_PKG_CONFIG
-
- # Checks for platform.
- # ----------------------------------------------------------------------
-@@ -175,32 +176,36 @@
-
- AC_ARG_ENABLE(unicode, [AC_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes")
- if test "x$enable_unicode" = xyes; then
-- HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config",
-- HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config",
-- HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config",
-- HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW],
-- HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW],
-- HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW],
-- missing_libraries="$missing_libraries libncursesw"
-- AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])
-- ))))))
--
-- AC_CHECK_HEADERS([ncursesw/curses.h],[:],
-- [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
-- [AC_CHECK_HEADERS([ncurses/curses.h],[:],
-- [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
-+ PKG_CHECK_MODULES([NCURSES], [ncursesw],[
-+ HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config",
-+ HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config",
-+ HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config",
-+ HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW],
-+ HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW],
-+ HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW],
-+ missing_libraries="$missing_libraries libncursesw"
-+ AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])
-+ ))))))
-+
-+ AC_CHECK_HEADERS([ncursesw/curses.h],[:],
-+ [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
-+ [AC_CHECK_HEADERS([ncurses/curses.h],[:],
-+ [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
-+ ])
- else
-- HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config",
-- HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config",
-- HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES],
-- HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES],
-- missing_libraries="$missing_libraries libncurses"
-- ))))
-+ PKG_CHECK_MODULES([NCURSES], [ncurses],[
-+ HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config",
-+ HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config",
-+ HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES],
-+ HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES],
-+ missing_libraries="$missing_libraries libncurses"
-+ ))))
-
-- AC_CHECK_HEADERS([curses.h],[:],
-- [AC_CHECK_HEADERS([ncurses/curses.h],[:],
-- [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
-- [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
-+ AC_CHECK_HEADERS([curses.h],[:],
-+ [AC_CHECK_HEADERS([ncurses/curses.h],[:],
-+ [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
-+ [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
-+ ])
- fi
-
- if test "$my_htop_platform" = "freebsd"; then
---- htop-2.0.0/Makefile.am
-+++ htop-2.0.0/Makefile.am
-@@ -85,6 +85,8 @@
- BUILT_SOURCES = $(myhtopheaders) $(myhtopplatheaders)
- htop_SOURCES = $(myhtopheaders) $(myhtopplatheaders) $(myhtopsources) $(myhtopplatsources) config.h
-
-+htop_LDADD = $(NCURSES_LIBS)
-+
- target:
- echo $(htop_SOURCES)
-
diff --git a/sys-process/htop/htop-1.0.3-r1.ebuild b/sys-process/htop/htop-1.0.3-r1.ebuild
deleted file mode 100644
index 3f35a581888a..000000000000
--- a/sys-process/htop/htop-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils linux-info
-
-DESCRIPTION="interactive process viewer"
-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 oom openvz unicode vserver"
-
-RDEPEND="sys-libs/ncurses:0=[unicode?]"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-DOCS=( ChangeLog README )
-
-CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
-
-# config.h problems
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-PATCHES=("${FILESDIR}/${P}-tinfo.patch")
-
-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
-
- linux-info_pkg_setup
-}
-
-src_prepare() {
- rm missing || die
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- [[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
-
- local myeconfargs=()
-
- use kernel_FreeBSD && myeconfargs+=( --with-proc=/compat/linux/proc )
-
- 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/htop-1.0.3.ebuild b/sys-process/htop/htop-1.0.3.ebuild
deleted file mode 100644
index 1665da56d72f..000000000000
--- a/sys-process/htop/htop-1.0.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils linux-info python-any-r1
-
-DESCRIPTION="interactive process viewer"
-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 oom openvz unicode vserver"
-
-RDEPEND="sys-libs/ncurses:0=[unicode?]"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- virtual/pkgconfig"
-
-DOCS=( ChangeLog README )
-
-CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
-
-# config.h problems
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-PATCHES=("${FILESDIR}/${P}-tinfo.patch")
-
-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
-
- python-any-r1_pkg_setup
- linux-info_pkg_setup
-}
-
-src_prepare() {
- rm missing || die
-
- 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 myeconfargs=()
-
- use kernel_FreeBSD && myeconfargs+=( --with-proc=/compat/linux/proc )
-
- 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/htop-2.0.1.ebuild b/sys-process/htop/htop-2.0.1.ebuild
deleted file mode 100644
index a2b10fdb96a6..000000000000
--- a/sys-process/htop/htop-2.0.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-info
-
-DESCRIPTION="interactive process viewer"
-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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
-
-RDEPEND="sys-libs/ncurses:0=[unicode?]"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-DOCS=( ChangeLog README )
-
-CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.0.0-tinfo.patch"
-)
-
-pkg_setup() {
- 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
-
- linux-info_pkg_setup
-}
-
-src_prepare() {
- rm missing || die
-
- default
- eautoreconf
-}
-
-src_configure() {
- [[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
-
- local myeconfargs=()
-
- myeconfargs+=(
- # fails to build against recent hwloc versions
- --disable-hwloc
- --enable-taskstats
- $(use_enable kernel_linux cgroup)
- $(use_enable kernel_linux linux-affinity)
- $(use_enable openvz)
- $(use_enable unicode)
- $(use_enable vserver)
- )
- econf ${myeconfargs[@]}
-}
diff --git a/sys-process/htop/metadata.xml b/sys-process/htop/metadata.xml
index 31af477b5ce7..b3278785fded 100644
--- a/sys-process/htop/metadata.xml
+++ b/sys-process/htop/metadata.xml
@@ -10,7 +10,6 @@
<name>Lars Wendler</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>