commit: c06f4414489da74b277b08f37e1c4f11c48258ce
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 22 08:50:49 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 08:53:04 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c06f4414
sys-process/htop: Removed old.
Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-process/htop/Manifest | 1 -
sys-process/htop/files/htop-1.0.2-out-of-src.patch | 30 -----------
sys-process/htop/files/htop-1.0.2-process.patch | 13 -----
sys-process/htop/files/htop-1.0.2-tinfo.patch | 58 --------------------
sys-process/htop/files/htop-2.0.0-commlen.patch | 22 --------
sys-process/htop/htop-2.0.0-r1.ebuild | 63 ----------------------
6 files changed, 187 deletions(-)
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index 3b35738..63ea152 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,4 +1,3 @@
DIST htop-1.0.3.tar.gz 399306 SHA256
055c57927f75847fdc222b5258b079a9542811a9dcf5421c615c7e17f55d1829 SHA512
4c5c784b093bcad06eb2e8d8bb215e14f6e838a3d47d8da8402344c270c1724f85d0bcde2899571ba5d0e5a02274a0c3390a76fed61785b2604b51351f08f232
WHIRLPOOL
14b8879210025aff9a1e098314a1b35d2bb6fcfaab42b95670e3726c61d471b1618486e6fc3dbbc97043e85f9a22196d97e676f3b2dd98250326be8527bdebbe
-DIST htop-2.0.0.tar.gz 473765 SHA256
d15ca2a0abd6d91d6d17fd685043929cfe7aa91199a9f4b3ebbb370a2c2424b5 SHA512
2df1b96e4c07a1de360dc7b7b20db0e663d7fa2c9a8a9dcc3d7dc1ce5e5b59f72d927e8e7ae919631cf0e950a82450b45116a1f8d788f63c5762bd73332ec32c
WHIRLPOOL
b7a64593bd69d8ebbac2e69c8030e197647dacfe0c53b5e4550e77fe79db87b1d106cb4ea1adfa5338628afb1f5d46244b95d4522718142e2f966f2cad59db02
DIST htop-2.0.1.tar.gz 477196 SHA256
f410626dfaf6b70fdf73cd7bb33cae768869707028d847fed94a978e974f5666 SHA512
57991a55b69028c01549b067ec749099466df5b08a0ed9a65dd779e6d2c8ee0a5d9c330bb6c727b04a349146ad441b7115718e433d1f8232f74b28903fb351ff
WHIRLPOOL
0bfd3bd5eff3a4597b349e83510cefaf8dbf0dacf8161ab0fea50216a44915cbf7d506d1479daf4e064803e0b6a0f65180fa7aa52d6ab161774a579ccb1dfe7d
DIST htop-2.0.2.tar.gz 476364 SHA256
179be9dccb80cee0c5e1a1f58c8f72ce7b2328ede30fb71dcdf336539be2f487 SHA512
1c9bf71a36c56b301667aa6d03756fc757fbcb63e848d9581d10db3df6193cdeb00e55ceb6e2392794ac03ea034b04459a8fe550b3ac2318cd86263a74c78cda
WHIRLPOOL
24468bbe22b67e84302561c4e3b593f7fa29a862e29ac66a0c5a2605c47885edf0cdfbbda7cd61519cea8ae51cb50e57ad3284e1fc728199088c60400a48b631
diff --git a/sys-process/htop/files/htop-1.0.2-out-of-src.patch
b/sys-process/htop/files/htop-1.0.2-out-of-src.patch
deleted file mode 100644
index d67abe7..0000000
--- a/sys-process/htop/files/htop-1.0.2-out-of-src.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- Makefile.am | 2 +-
- scripts/MakeHeader.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 05a72e7..dd28a87 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -43,7 +43,7 @@ debug:
- $(MAKE) all CFLAGS="" AM_CPPFLAGS="-ggdb -DDEBUG"
-
- .c.h:
-- scripts/MakeHeader.py $<
-+ $(top_srcdir)/scripts/MakeHeader.py $<
-
- cppcheck:
- cppcheck -q -v . --enable=all -DHAVE_CGROUP -DHAVE_OPENVZ
-DHAVE_TASKSTATS
-diff --git a/scripts/MakeHeader.py b/scripts/MakeHeader.py
-index 55eeed4..46af921 100755
---- a/scripts/MakeHeader.py
-+++ b/scripts/MakeHeader.py
-@@ -11,7 +11,7 @@ state = ANY
- static = 0
-
- file = open(sys.argv[1])
--name = sys.argv[1][:-2]
-+name = os.path.basename(sys.argv[1][:-2])
-
- out = open(name + ".h", "w")
- class writer:
diff --git a/sys-process/htop/files/htop-1.0.2-process.patch
b/sys-process/htop/files/htop-1.0.2-process.patch
deleted file mode 100644
index b949e26..0000000
--- a/sys-process/htop/files/htop-1.0.2-process.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: Process.c
-===================================================================
---- Process.c (revision 302)
-+++ Process.c (working copy)
-@@ -371,7 +371,7 @@
- }
-
- static void Process_writeField(Process* this, RichString* str, ProcessField
field) {
-- char buffer[128]; buffer[127] = '\0';
-+ char buffer[256]; buffer[255] = '\0';
- int attr = CRT_colors[DEFAULT_COLOR];
- int baseattr = CRT_colors[PROCESS_BASENAME];
- int n = sizeof(buffer) - 1;
diff --git a/sys-process/htop/files/htop-1.0.2-tinfo.patch
b/sys-process/htop/files/htop-1.0.2-tinfo.patch
deleted file mode 100644
index 4e13459..0000000
--- a/sys-process/htop/files/htop-1.0.2-tinfo.patch
+++ /dev/null
@@ -1,58 +0,0 @@
- Makefile.am | 2 ++
- configure.ac | 20 ++++++++++++--------
- 2 files changed, 14 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 05a72e7..7908937 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="" AM_CPPFLAGS="-pg -O2"
-
-diff --git a/configure.ac b/configure.ac
-index ff6901b..6226d90 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,6 +20,7 @@
- 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,16 +89,20 @@ 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.h],[:],[missing_headers="$missing_headers
$ac_header"])])])
- ])
-- AC_CHECK_HEADERS([ncursesw/curses.h],[:],
-- [AC_CHECK_HEADERS([ncurses/ncurses.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],[:],[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],[:],[missing_headers="$missing_headers
$ac_header"])
-+ ])
- fi
-
- if test ! -z "$missing_libraries"; then
diff --git a/sys-process/htop/files/htop-2.0.0-commlen.patch
b/sys-process/htop/files/htop-2.0.0-commlen.patch
deleted file mode 100644
index f44e43e..0000000
--- a/sys-process/htop/files/htop-2.0.0-commlen.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0b70439316b4e4608c0916317ded7e6e56982de6 Mon Sep 17 00:00:00 2001
-From: Hisham <[email protected]>
-Date: Sat, 13 Feb 2016 02:18:28 -0200
-Subject: [PATCH] Fix buffer reuse.
-
----
- linux/LinuxProcessList.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c
-index 591210e..ec643ab 100644
---- a/linux/LinuxProcessList.c
-+++ b/linux/LinuxProcessList.c
-@@ -446,7 +446,7 @@ static void LinuxProcessList_readOomData(LinuxProcess*
process, const char* dirn
- }
-
- static void setCommand(Process* process, const char* command, int len) {
-- if (process->comm && process->commLen <= len) {
-+ if (process->comm && process->commLen >= len) {
- strncpy(process->comm, command, len + 1);
- } else {
- free(process->comm);
diff --git a/sys-process/htop/htop-2.0.0-r1.ebuild
b/sys-process/htop/htop-2.0.0-r1.ebuild
deleted file mode 100644
index e589b84..0000000
--- a/sys-process/htop/htop-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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"
- "${FILESDIR}/${P}-commlen.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-native-affinity
- --enable-taskstats
- $(use_enable kernel_linux cgroup)
- $(use_enable openvz)
- $(use_enable unicode)
- $(use_enable vserver)
- )
- econf ${myeconfargs[@]}
-}
