[gentoo-commits] repo/gentoo:master commit in: sys-process/htop/, sys-process/htop/files/

[Lars Wendler]

commit:     9f20fabce7e1778e143ce849820c61cc18904b83
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 27 14:35:38 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Nov 27 14:35:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f20fabc

sys-process/htop: Removed old.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-process/htop/Manifest                     |  1 -
 sys-process/htop/files/htop-2.0.2-tinfo.patch | 73 ---------------------------
 sys-process/htop/htop-2.0.2.ebuild            | 61 ----------------------
 3 files changed, 135 deletions(-)

diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index 01c2fd6812c..47f15a7d70f 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,3 +1,2 @@
-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

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 4a536c0251a..00000000000
--- 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 68515359d77..00000000000
--- 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[@]}
-}