summaryrefslogtreecommitdiff
path: root/sys-process/htop
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-12-24 14:11:38 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-12-24 14:11:38 +0000
commitde49812990871e1705b64051c35161d5e6400269 (patch)
tree5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /sys-process/htop
parent536c3711867ec947c1738f2c4b96f22e4863322d (diff)
gentoo resync : 24.12.2018
Diffstat (limited to 'sys-process/htop')
-rw-r--r--sys-process/htop/Manifest5
-rw-r--r--sys-process/htop/files/htop-2.0.2-tinfo.patch73
-rw-r--r--sys-process/htop/htop-2.0.2.ebuild61
-rw-r--r--sys-process/htop/htop-2.2.0.ebuild2
4 files changed, 2 insertions, 139 deletions
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index 389d44291b2b..1ac953710ef6 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,9 +1,6 @@
-AUX htop-2.0.2-tinfo.patch 3655 BLAKE2B 505aacb774b54e4c7d9238942ff74cc96d0f5c93c7b74e9531e41e2ffa994b4d475b16620b65b824c28da2856294ef7fcd3562d9c318d4adbcc30bb512431b0f SHA512 33273ddcb89e955ef499854fb9361b65bafa83cce8e91f4ef62dd70fc29e58e169148c957d9cd0c5a123b9e5fe66f838212c8066bff12ada38c430087d02b210
AUX htop-2.1.0-header_updates.patch 1213 BLAKE2B 4bf06329ee553b29c40c46b8dd0a267d19d17c0b19e8f7938b9276cfced5ba734924c2228408e7e2bee8088250c85d9cfa1cee508c1f3b4f8554d4be8e47cd2b SHA512 63644982da6a92a5477286df4c2cc16097aee8b6f8fcee6c37448d36074770b2f5f8f5a1dbac32728db79dbfb4a094fdd31128cec1ba322ada0b6a0968e53f98
-DIST htop-2.0.2.tar.gz 476364 BLAKE2B f5519977b4bd6d189cb7f379a9f9b535a4b67a575b30056a43e259ab39a69f84083d310bbefefe8408c7ca99918f1ea9ae775808b9afe9d0f78097ac6bb88dc7 SHA512 1c9bf71a36c56b301667aa6d03756fc757fbcb63e848d9581d10db3df6193cdeb00e55ceb6e2392794ac03ea034b04459a8fe550b3ac2318cd86263a74c78cda
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
-EBUILD htop-2.0.2.ebuild 1392 BLAKE2B 951213ba4c64dd0aafed491cfc608075015b22c8bfc5cb7af0436b46bb5a624d5584fe07a6e10b68d336a9a9c1aebf6a361feb0eaa18818082d404b4c14e455d SHA512 034da8860aae7b9f4587acb420cd51367eec49a062488f4ac97d0caa4093209448efc7357dbd8ff1376673259211f31a09f82172442d09578bcf40c1e8e4caf0
-EBUILD htop-2.2.0.ebuild 1496 BLAKE2B 6b43d2f0d200480be4214631e3afd49e1d73ad802eeacbedadd9fe019cbf54cba2fb7300aac7285ecd936d7b19d41d45c744551e2788f2156b251a28d6f69bc3 SHA512 86cc7d5d2b766acbad6ec771b8646dd8f050eb25a86ad6a8cfbd8f2791777619a3e3eeee8646cdfae860b0d97c76384234bad29f3c93657c395ccec09437ee71
+EBUILD htop-2.2.0.ebuild 1495 BLAKE2B 6ef4c04a69250653f26c4d3e514ea88aadaeee7347f5dc879852b13f1dbdb6f8f10d724603b57ee04ca3649ffb1a179de624a59c536a7ea05787443ca9310005 SHA512 cb91e5503e2fdb41e18feefc8cd5ab5377488a8b7c143bb406ef4f24697885797edad05fc18ffda63b20fc5afbebe6f60f289539a443c708ea50ea8c54a6a6e7
EBUILD htop-3.0.0_beta5.ebuild 1817 BLAKE2B db602dec500e6d0643d60b8c727b33e8696b12217019c6e5963df78abd98cae22e772ae09b59109fb6b593ebda918e96937493753afcedd3756cae30506710f7 SHA512 ac9885ac84d472d4a7d7173fa27c897bf657fffb29457bb4d10a579afe61846a2c5e5d7780ca6fef9a7760e5c755cad1180b44977f5932d88d93f2c118b67fe9
MISC metadata.xml 750 BLAKE2B 57d419667fbc0053cb2f24908a4e43fefecca832bd86e8d562a4a43090b82f049c62457388ffe8bc4c1f3d49e1119da50f8221686b69956f4ea9426259fb6f3a SHA512 e35d8a5177f9e5bb3136759a7c4c0de5dee4366e3380952c8d72dbdfab46be5f880b77450046f02846c7baa1892e88835c8480808333934ec1bec04c34cd9072
diff --git a/sys-process/htop/files/htop-2.0.2-tinfo.patch b/sys-process/htop/files/htop-2.0.2-tinfo.patch
deleted file mode 100644
index 4a536c0251a1..000000000000
--- a/sys-process/htop/files/htop-2.0.2-tinfo.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- htop-2.0.2/configure.ac
-+++ htop-2.0.2/configure.ac
-@@ -185,32 +185,36 @@
-
- AC_ARG_ENABLE(unicode, [AS_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.])
-- ))))))
-+ 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"])])])])
-+ 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.2/Makefile.am
-+++ htop-2.0.2/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-2.0.2.ebuild b/sys-process/htop/htop-2.0.2.ebuild
deleted file mode 100644
index 68515359d77f..000000000000
--- a/sys-process/htop/htop-2.0.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-info
-
-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-linux ~x86-linux ~amd64-fbsd"
-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.2-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/htop-2.2.0.ebuild b/sys-process/htop/htop-2.2.0.ebuild
index b2c5951cf851..01dd35aa1f5b 100644
--- a/sys-process/htop/htop-2.2.0.ebuild
+++ b/sys-process/htop/htop-2.2.0.ebuild
@@ -13,7 +13,7 @@ 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"
+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?]"