commit: b5c59cd9c14353728b310e075c647c0c8ecc260e Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Tue Oct 9 13:21:36 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Tue Oct 9 13:22:11 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5c59cd9
sys-process/htop: Removed old. Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 sys-process/htop/Manifest | 1 - .../htop/files/htop-2.1.0-MakeHeader-python3.patch | 29 -------- sys-process/htop/files/htop-2.1.0-bashisms.patch | 37 --------- .../htop/files/htop-2.1.0-clear_on_sigwinch.patch | 21 ------ .../htop/files/htop-2.1.0-color_issues.patch | 87 ---------------------- sys-process/htop/files/htop-2.1.0-ldflags.patch | 21 ------ .../htop/files/htop-2.1.0-ncurses_cflags.patch | 46 ------------ sys-process/htop/files/htop-2.1.0-sysmacros.patch | 81 -------------------- sys-process/htop/htop-2.1.0-r1.ebuild | 76 ------------------- 9 files changed, 399 deletions(-) diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest index edcf3a82aed..01c2fd6812c 100644 --- a/sys-process/htop/Manifest +++ b/sys-process/htop/Manifest @@ -1,4 +1,3 @@ DIST htop-2.0.2.tar.gz 476364 BLAKE2B f5519977b4bd6d189cb7f379a9f9b535a4b67a575b30056a43e259ab39a69f84083d310bbefefe8408c7ca99918f1ea9ae775808b9afe9d0f78097ac6bb88dc7 SHA512 1c9bf71a36c56b301667aa6d03756fc757fbcb63e848d9581d10db3df6193cdeb00e55ceb6e2392794ac03ea034b04459a8fe550b3ac2318cd86263a74c78cda -DIST htop-2.1.0.tar.gz 302938 BLAKE2B 3e290a3dbb0bf5424780ba5dcb9de8ea478bf4cabbbde202c19eb3db7e0f8d1e108ec3ea41544ac095097c39100417c72477dab96f104a6317f4edd06d69199f SHA512 203e8f4abd63334330fc673f6c9609adbeab763d80f553d8b48670091d18dd347599a9ce2dbbac374fa4a13fa904948711a441fa676f52ab1612bd2b4ee4c6eb DIST htop-2.2.0.tar.gz 308109 BLAKE2B 323a3bfe5032b6d59a3f751831a2af6aa7ae7e9ecceb35828812cb375d919de51f401ffe59fffdfc83a72c8dace879c5d5a0e857511c20e2126d11cdc4101b0b SHA512 ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e DIST htop-3.0.0_beta5.tar.gz 175780 BLAKE2B f7d03485e74387c656e5a576f0a53c832bac668cee79750402335b2051a17d405392b99316f1546cc76fa83dc3bc85055ca58b928225df0e162ffdb9c1889a5f SHA512 eaa04a278257a1447cd60825083c864d3c23a4a5607447ce05356d550f42ff68a810f14bf91314b7266f9741aab8141d67d98316a31fa7806fb6b858cc804344 diff --git a/sys-process/htop/files/htop-2.1.0-MakeHeader-python3.patch b/sys-process/htop/files/htop-2.1.0-MakeHeader-python3.patch deleted file mode 100644 index 7c8590a2991..00000000000 --- a/sys-process/htop/files/htop-2.1.0-MakeHeader-python3.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://bugs.gentoo.org/646880 - ---- a/scripts/MakeHeader.py -+++ b/scripts/MakeHeader.py -@@ -1,5 +1,5 @@ - #!/usr/bin/env python --import os, sys, string -+import os, sys, string, io - try: - from cStringIO import StringIO - except ImportError: -@@ -16,7 +16,7 @@ SKIPONE=4 - state = ANY - static = 0 - --file = open(sys.argv[1]) -+file = io.open(sys.argv[1], "r", errors="ignore") - name = sys.argv[1][:-2] - - out = StringIO() -@@ -94,7 +94,7 @@ out.write( "#endif\n" ) - # This prevents a lot of recompilation during development - out.seek(0) - try: -- with open(name + ".h", "r") as orig: -+ with io.open(name + ".h", "r", errors="ignore") as orig: - origcontents = orig.readlines() - except: - origcontents = "" diff --git a/sys-process/htop/files/htop-2.1.0-bashisms.patch b/sys-process/htop/files/htop-2.1.0-bashisms.patch deleted file mode 100644 index 3b5bdabe82f..00000000000 --- a/sys-process/htop/files/htop-2.1.0-bashisms.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d4ea7cd65ccf8551cabb0706167b2c15aad7866d Mon Sep 17 00:00:00 2001 -From: Jesin <[email protected]> -Date: Mon, 26 Feb 2018 18:07:52 -0500 -Subject: [PATCH] Fix bashisms (#749) - -The configure script relied on bash-specific extensions to shell syntax -and behavior, causing build failures on systems with other /bin/sh -implementations. This commit replaces those with equivalent constructs -that should work in all POSIX shells. ---- - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d4bb36b0..3d69756d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -66,7 +66,7 @@ dnl glibc 2.25 deprecates 'major' and 'minor' in <sys/types.h> and requires to - dnl include <sys/sysmacros.h>. However the logic in AC_HEADER_MAJOR has not yet - dnl been updated in Autoconf 2.69, so use a workaround: - m4_version_prereq([2.70], [], --[if test $ac_cv_header_sys_mkdev_h = no; then -+[if test "x$ac_cv_header_sys_mkdev_h" = xno; then - AC_CHECK_HEADER(sys/sysmacros.h, [AC_DEFINE(MAJOR_IN_SYSMACROS, 1, - [Define to 1 if `major', `minor', and `makedev' are declared in <sys/sysmacros.h>.])]) - fi]) -@@ -278,8 +278,8 @@ then - PKG_PROG_PKG_CONFIG() - PKG_CHECK_MODULES(LIBNL3, libnl-3.0, [], [missing_libraries="$missing_libraries libnl-3"]) - PKG_CHECK_MODULES(LIBNL3GENL, libnl-genl-3.0, [], [missing_libraries="$missing_libraries libnl-genl-3"]) -- CFLAGS+=" $LIBNL3_CFLAGS $LIBNL3GENL_CFLAGS" -- LIBS+=" $LIBNL3_LIBS $LIBNL3GENL_LIBS" -+ CFLAGS="$CFLAGS $LIBNL3_CFLAGS $LIBNL3GENL_CFLAGS" -+ LIBS="$LIBS $LIBNL3_LIBS $LIBNL3GENL_LIBS" - AC_DEFINE(HAVE_DELAYACCT, 1, [Define if delay accounting support should be enabled.]) - fi - diff --git a/sys-process/htop/files/htop-2.1.0-clear_on_sigwinch.patch b/sys-process/htop/files/htop-2.1.0-clear_on_sigwinch.patch deleted file mode 100644 index 3ba7147e3b4..00000000000 --- a/sys-process/htop/files/htop-2.1.0-clear_on_sigwinch.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 5fca258f33e08cd7733940391edbf9e22208de83 Mon Sep 17 00:00:00 2001 -From: guoci <[email protected]> -Date: Sat, 17 Feb 2018 13:25:57 -0500 -Subject: [PATCH] call clear() function when SIGWINCH is received. (#660) - ---- - Action.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Action.c b/Action.c -index a6394ac3..50ab0bb9 100644 ---- a/Action.c -+++ b/Action.c -@@ -185,6 +185,7 @@ static Htop_Reaction sortBy(State* st) { - // ---------------------------------------- - - static Htop_Reaction actionResize(State* st) { -+ clear(); - Panel_resize(st->panel, COLS, LINES-(st->panel->y)-1); - return HTOP_REDRAW_BAR; - } diff --git a/sys-process/htop/files/htop-2.1.0-color_issues.patch b/sys-process/htop/files/htop-2.1.0-color_issues.patch deleted file mode 100644 index 0b4bea8bb95..00000000000 --- a/sys-process/htop/files/htop-2.1.0-color_issues.patch +++ /dev/null @@ -1,87 +0,0 @@ -From ac2dff2881a7ab203750e8edf7a46b69ae492ed0 Mon Sep 17 00:00:00 2001 -From: Hisham Muhammad <[email protected]> -Date: Mon, 5 Feb 2018 07:01:12 +0100 -Subject: [PATCH] Fix color behavior on some terminals. - -Fixes #635. ---- - CRT.c | 32 +++++++++++++++++--------------- - CRT.h | 1 + - ColorsPanel.c | 1 + - 3 files changed, 19 insertions(+), 15 deletions(-) - -diff --git a/CRT.c b/CRT.c -index 237e30ef..ca9a10dd 100644 ---- a/CRT.c -+++ b/CRT.c -@@ -37,6 +37,7 @@ in the source distribution for its full text. - #define White COLOR_WHITE - - #define ColorPairGrayBlack ColorPair(Magenta,Magenta) -+#define ColorIndexGrayBlack ColorIndex(Magenta,Magenta) - - #define KEY_WHEELUP KEY_F(20) - #define KEY_WHEELDOWN KEY_F(21) -@@ -713,22 +714,23 @@ void CRT_enableDelay() { - - void CRT_setColors(int colorScheme) { - CRT_colorScheme = colorScheme; -- if (colorScheme == COLORSCHEME_BLACKNIGHT) { -- for (int i = 0; i < 8; i++) -- for (int j = 0; j < 8; j++) { -- if (ColorIndex(i,j) != ColorIndex(Magenta,Magenta)) { -- init_pair(ColorIndex(i,j), i, j); -- } -- } -- init_pair(ColorIndex(Magenta,Magenta), 8, 0); -- } else { -- for (int i = 0; i < 8; i++) -- for (int j = 0; j < 8; j++) { -- if (ColorIndex(i,j) != ColorIndex(Magenta,Magenta)) { -- init_pair(ColorIndex(i,j), i, (j==0?-1:j)); -- } -+ -+ for (int i = 0; i < 8; i++) { -+ for (int j = 0; j < 8; j++) { -+ if (ColorIndex(i,j) != ColorPairGrayBlack) { -+ int bg = (colorScheme != COLORSCHEME_BLACKNIGHT) -+ ? (j==0 ? -1 : j) -+ : j; -+ init_pair(ColorIndex(i,j), i, bg); - } -- init_pair(ColorIndex(Magenta,Magenta), 8, -1); -+ } - } -+ -+ int grayBlackFg = COLORS > 8 ? 8 : 0; -+ int grayBlackBg = (colorScheme != COLORSCHEME_BLACKNIGHT) -+ ? -1 -+ : 0; -+ init_pair(ColorIndexGrayBlack, grayBlackFg, grayBlackBg); -+ - CRT_colors = CRT_colorSchemes[colorScheme]; - } -diff --git a/CRT.h b/CRT.h -index 590fff6e..933fe068 100644 ---- a/CRT.h -+++ b/CRT.h -@@ -26,6 +26,7 @@ in the source distribution for its full text. - #define White COLOR_WHITE - - #define ColorPairGrayBlack ColorPair(Magenta,Magenta) -+#define ColorIndexGrayBlack ColorIndex(Magenta,Magenta) - - #define KEY_WHEELUP KEY_F(20) - #define KEY_WHEELDOWN KEY_F(21) -diff --git a/ColorsPanel.c b/ColorsPanel.c -index 627a516a..2028335f 100644 ---- a/ColorsPanel.c -+++ b/ColorsPanel.c -@@ -78,6 +78,7 @@ static HandlerResult ColorsPanel_eventHandler(Panel* super, int ch) { - this->settings->changed = true; - const Header* header = this->scr->header; - CRT_setColors(mark); -+ clear(); - Panel* menu = (Panel*) Vector_get(this->scr->panels, 0); - Header_draw(header); - RichString_setAttr(&(super->header), CRT_colors[PANEL_HEADER_FOCUS]); diff --git a/sys-process/htop/files/htop-2.1.0-ldflags.patch b/sys-process/htop/files/htop-2.1.0-ldflags.patch deleted file mode 100644 index 386542f3547..00000000000 --- a/sys-process/htop/files/htop-2.1.0-ldflags.patch +++ /dev/null @@ -1,21 +0,0 @@ -From df9922a67eb8e02ab4cf1ff8f24b40f14094e699 Mon Sep 17 00:00:00 2001 -From: Hisham Muhammad <[email protected]> -Date: Sat, 17 Feb 2018 14:50:55 -0200 -Subject: [PATCH] Fix preservation of LDFLAGS value during configure script - -Fixes #738. ---- - -diff --git a/configure.ac b/configure.ac -index df922e07..44595050 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -167,7 +167,7 @@ m4_define([HTOP_CHECK_SCRIPT], - LIBS="$htop_config_script $LIBS " - htop_script_success=yes - ], []) -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$htop_save_LDFLAGS" - fi - if test "x$htop_script_success" = xno; then - [$5] diff --git a/sys-process/htop/files/htop-2.1.0-ncurses_cflags.patch b/sys-process/htop/files/htop-2.1.0-ncurses_cflags.patch deleted file mode 100644 index 0a25aeb7fa2..00000000000 --- a/sys-process/htop/files/htop-2.1.0-ncurses_cflags.patch +++ /dev/null @@ -1,46 +0,0 @@ -From bc5d46982f3504000567e00f59e4f7a5905597a9 Mon Sep 17 00:00:00 2001 -From: Michael Klein <[email protected]> -Date: Mon, 26 Feb 2018 14:19:01 +0100 -Subject: [PATCH] use CFLAGS from ncurses*-config, if present (#745) - -Fixes #695. ---- - configure.ac | 18 ++++++++++++------ - 1 file changed, 12 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 36aebc5e..d4bb36b0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -164,19 +164,25 @@ m4_define([HTOP_CHECK_SCRIPT], - [ - if test ! -z "m4_toupper($HTOP_[$1]_CONFIG_SCRIPT)"; then - # to be used to set the path to ncurses*-config when cross-compiling -- htop_config_script=$(m4_toupper($HTOP_[$1]_CONFIG_SCRIPT) --libs 2> /dev/null) -+ htop_config_script_libs=$(m4_toupper($HTOP_[$1]_CONFIG_SCRIPT) --libs 2> /dev/null) -+ htop_config_script_cflags=$(m4_toupper($HTOP_[$1]_CONFIG_SCRIPT) --cflags 2> /dev/null) - else -- htop_config_script=$([$4] --libs 2> /dev/null) -+ htop_config_script_libs=$([$4] --libs 2> /dev/null) -+ htop_config_script_cflags=$([$4] --cflags 2> /dev/null) - fi - htop_script_success=no - htop_save_LDFLAGS="$LDFLAGS" -- if test ! "x$htop_config_script" = x; then -- LDFLAGS="$htop_config_script $LDFLAGS" -+ htop_save_CFLAGS="$CFLAGS" -+ if test ! "x$htop_config_script_libs" = x; then -+ LDFLAGS="$htop_config_script_libs $LDFLAGS" -+ CFLAGS="$htop_config_script_cflags $CFLAGS" - AC_CHECK_LIB([$1], [$2], [ - AC_DEFINE([$3], 1, [The library is present.]) -- LIBS="$htop_config_script $LIBS " -+ LIBS="$htop_config_script_libs $LIBS " - htop_script_success=yes -- ], []) -+ ], [ -+ CFLAGS="$htop_save_CFLAGS" -+ ]) - LDFLAGS="$htop_save_LDFLAGS" - fi - if test "x$htop_script_success" = xno; then diff --git a/sys-process/htop/files/htop-2.1.0-sysmacros.patch b/sys-process/htop/files/htop-2.1.0-sysmacros.patch deleted file mode 100644 index 0ab1bb0c02a..00000000000 --- a/sys-process/htop/files/htop-2.1.0-sysmacros.patch +++ /dev/null @@ -1,81 +0,0 @@ -From d2d413161bbdf009f232faa5789131326225f838 Mon Sep 17 00:00:00 2001 -From: Explorer09 <[email protected]> -Date: Sat, 24 Feb 2018 11:57:18 +0800 -Subject: [PATCH] Fix build failure ('major' undefined) in glibc 2.28. - -glibc 2.28 no longer defines 'major' and 'minor' in <sys/types.h> and -requires us to include <sys/sysmacros.h>. (glibc 2.25 starts -deprecating the macros in <sys/types.h>.) Now do include the latter if -found on the system. - -At the moment, let's also utilize AC_HEADER_MAJOR in configure script. -However as Autoconf 2.69 has not yet updated the AC_HEADER_MAJOR macro -to reflect the glibc change [1], so add a workaround code. - -Fixes #663. Supersedes pull request #729. - -Reference: -[1] https://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commit;h=e17a30e987d7ee695fb4294a82d987ec3dc9b974 - -Signed-off-by: Kang-Che Sung <[email protected]> ---- - Process.c | 6 ++++++ - configure.ac | 10 ++++++++++ - linux/LinuxProcessList.c | 6 ++++++ - 3 files changed, 22 insertions(+) - -diff --git a/Process.c b/Process.c -index 2ff778df..845ca54b 100644 ---- a/Process.c -+++ b/Process.c -@@ -28,6 +28,12 @@ in the source distribution for its full text. - #include <time.h> - #include <assert.h> - #include <math.h> -+#ifdef MAJOR_IN_MKDEV -+#include <sys/mkdev.h> -+#elif defined(MAJOR_IN_SYSMACROS) || \ -+ (defined(HAVE_SYS_SYSMACROS_H) && HAVE_SYS_SYSMACROS_H) -+#include <sys/sysmacros.h> -+#endif - - #ifdef __ANDROID__ - #define SYS_ioprio_get __NR_ioprio_get -diff --git a/configure.ac b/configure.ac -index 44595050..36aebc5e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -61,6 +61,16 @@ AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h],[ - ]) - AC_CHECK_HEADERS([execinfo.h],[:],[:]) - -+AC_HEADER_MAJOR -+dnl glibc 2.25 deprecates 'major' and 'minor' in <sys/types.h> and requires to -+dnl include <sys/sysmacros.h>. However the logic in AC_HEADER_MAJOR has not yet -+dnl been updated in Autoconf 2.69, so use a workaround: -+m4_version_prereq([2.70], [], -+[if test $ac_cv_header_sys_mkdev_h = no; then -+ AC_CHECK_HEADER(sys/sysmacros.h, [AC_DEFINE(MAJOR_IN_SYSMACROS, 1, -+ [Define to 1 if `major', `minor', and `makedev' are declared in <sys/sysmacros.h>.])]) -+fi]) -+ - # Checks for typedefs, structures, and compiler characteristics. - # ---------------------------------------------------------------------- - AC_HEADER_STDBOOL -diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c -index c8ba89d2..158a7ea2 100644 ---- a/linux/LinuxProcessList.c -+++ b/linux/LinuxProcessList.c -@@ -26,6 +26,12 @@ in the source distribution for its full text. - #include <assert.h> - #include <sys/types.h> - #include <fcntl.h> -+#ifdef MAJOR_IN_MKDEV -+#include <sys/mkdev.h> -+#elif defined(MAJOR_IN_SYSMACROS) || \ -+ (defined(HAVE_SYS_SYSMACROS_H) && HAVE_SYS_SYSMACROS_H) -+#include <sys/sysmacros.h> -+#endif - - #ifdef HAVE_DELAYACCT - #include <netlink/attr.h> diff --git a/sys-process/htop/htop-2.1.0-r1.ebuild b/sys-process/htop/htop-2.1.0-r1.ebuild deleted file mode 100644 index c0f863a1c76..00000000000 --- a/sys-process/htop/htop-2.1.0-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) - -inherit autotools linux-info python-single-r1 - -DESCRIPTION="interactive process viewer" -HOMEPAGE="https://hisham.hm/htop/"; -SRC_URI="https://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-fbsd ~amd64-linux ~x86-linux ~x64-macos" -IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver" - -RDEPEND="sys-libs/ncurses:0=[unicode?]" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - virtual/pkgconfig" - -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -DOCS=( ChangeLog README ) - -CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS" - -PATCHES=( - - # Fixes from upstream (can usually be removed with next version bump) - "${FILESDIR}/${P}-sysmacros.patch" - "${FILESDIR}/${P}-ldflags.patch" - "${FILESDIR}/${P}-bashisms.patch" - "${FILESDIR}/${P}-ncurses_cflags.patch" - "${FILESDIR}/${P}-clear_on_sigwinch.patch" - "${FILESDIR}/${P}-header_updates.patch" - "${FILESDIR}/${P}-color_issues.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 - - python-single-r1_pkg_setup - linux-info_pkg_setup -} - -src_prepare() { - rm missing || die - - default - use python_single_target_python2_7 || \ - eapply "${FILESDIR}/${PN}-2.1.0-MakeHeader-python3.patch" #646880 - eautoreconf - python_fix_shebang scripts/MakeHeader.py -} - -src_configure() { - [[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971 - - local 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[@]} -}
