gentoo resync : 11.02.2018

8 files changed, 46 insertions, 315 deletions

diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index 10e47fa45f6c..b28cb647d276 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,11 +1,7 @@
-AUX htop-1.0.3-tinfo.patch 2588 BLAKE2B 6968919b13c4b9f9d56fb3a247d3b582a325325b6d946a47fe097ec0d0d7ad8b86086f224c1396b33b2ce68f9592ee9f6ef0932ff404dd99f03a11ba5cd638a8 SHA512 071a24efb5536baae05478bb2035da0c6f1f42c7d99be92d6e8f534d78ea5ba90bdb4a8fd4d9fa27cad2097f2b593bf60dd9fa6a84758eb2f3cfbc5a58f02bf4
-AUX htop-2.0.0-tinfo.patch 3850 BLAKE2B 697aad23ca2a5bc1b11e4ae4af5907cb5f020c1ae22f403fe2611430ebced96d066043aafaccbbef73ccdd93ffde776ea188f6984a1438030f2808ae81896813 SHA512 8b2d64eaafa1dbf7217371750e9cd8bccaed80ff416f2773ce387dda8fbb81093f52392fc6b6b7377fc22b7831d5d9601ab54319df6681df090cd11ee93eb4fd
 AUX htop-2.0.2-tinfo.patch 3655 BLAKE2B 505aacb774b54e4c7d9238942ff74cc96d0f5c93c7b74e9531e41e2ffa994b4d475b16620b65b824c28da2856294ef7fcd3562d9c318d4adbcc30bb512431b0f SHA512 33273ddcb89e955ef499854fb9361b65bafa83cce8e91f4ef62dd70fc29e58e169148c957d9cd0c5a123b9e5fe66f838212c8066bff12ada38c430087d02b210
-DIST htop-1.0.3.tar.gz 399306 BLAKE2B 3ce3aad0f72102c2aa6d9c7a198eef5e1591dec41f6fabfbe03f2626e08d0967c023adba8285c94e5b5ac05d3b05ec78964035f0bd70bbdff9f429f9cb052097 SHA512 4c5c784b093bcad06eb2e8d8bb215e14f6e838a3d47d8da8402344c270c1724f85d0bcde2899571ba5d0e5a02274a0c3390a76fed61785b2604b51351f08f232
-DIST htop-2.0.1.tar.gz 477196 BLAKE2B 03b6d7a71cbf261413e828d8678daecc969c76439a1241734d7bed13f7f8a3d22b40ebc4845c924ea6c61ddae20f1b90f78790c634908cf4d161ecb314e57c72 SHA512 57991a55b69028c01549b067ec749099466df5b08a0ed9a65dd779e6d2c8ee0a5d9c330bb6c727b04a349146ad441b7115718e433d1f8232f74b28903fb351ff
+AUX htop-2.1.0-sysmacros.patch 1070 BLAKE2B 66dbe1cd52dcd972a2d9a9cd927ef0fd16e77c95b9c00b6953620a02e7af32d16d3e92ee7620f7dd39c9eb465575b82817fb57ea348fa55767886aeff1a2cca6 SHA512 e84be1b866209f0eef4f62021725757c57bdad3ef99aab79c4ce3d6f48d1c6dab1189d37681f91b929c091f76311dba9aba0388b61c7253a9fa5f1e939e2df0b
 DIST htop-2.0.2.tar.gz 476364 BLAKE2B f5519977b4bd6d189cb7f379a9f9b535a4b67a575b30056a43e259ab39a69f84083d310bbefefe8408c7ca99918f1ea9ae775808b9afe9d0f78097ac6bb88dc7 SHA512 1c9bf71a36c56b301667aa6d03756fc757fbcb63e848d9581d10db3df6193cdeb00e55ceb6e2392794ac03ea034b04459a8fe550b3ac2318cd86263a74c78cda
-EBUILD htop-1.0.3-r1.ebuild 1936 BLAKE2B 1dcbd58958402db5241d1c339cd520cab5289030223ba3236237056cf5eddf7b44bb09e9853d756880faa7ba657d13eabf2fb06f333fab1b9f5fa9643ac49475 SHA512 cbfad60ba2750f95b99ed0d51094a457c20a67954d8b3bf9878ff666c8b378e913415bd86703d1b1dc3f51ba63afd40ef7976eb9de902c81ba3221897355c487
-EBUILD htop-1.0.3.ebuild 2097 BLAKE2B b745c373730e7a55ae378a09e9596c7505825d3764218b33daccc87d7e3c9a25dd1e0cf63f71ae5cdf94d4fd79ed731dca69f4124f1541830503350825eabca8 SHA512 ee81709d86fa64b5e9900f99f75f6f08bbb1ad2c64a9c456e53a85fd94067e53103707b46f8b96d0e771f983b7613fe860e14c018e379efba557906bb9b2cbfb
-EBUILD htop-2.0.1.ebuild 1388 BLAKE2B 729cf548b2c3d85bf9f9f4b321e789ef6ffa0571274f568167beaa66a686d92c73a74dd55275279b9f684da0003b6c46638ed01eb00ed559496e35432509ec0b SHA512 fcf3f2f083d5d26f2946402d83e721bff4c395b8497c551cc4be3ac25f78e904a3df8c6e78970689398526bf84bcc17be5e1e43e81b96cad452fe516251df6dd
+DIST htop-2.1.0.tar.gz 302938 BLAKE2B 3e290a3dbb0bf5424780ba5dcb9de8ea478bf4cabbbde202c19eb3db7e0f8d1e108ec3ea41544ac095097c39100417c72477dab96f104a6317f4edd06d69199f SHA512 203e8f4abd63334330fc673f6c9609adbeab763d80f553d8b48670091d18dd347599a9ce2dbbac374fa4a13fa904948711a441fa676f52ab1612bd2b4ee4c6eb
 EBUILD htop-2.0.2.ebuild 1390 BLAKE2B d38a5264ba9f0f2c8467f3dc2ad61440c50945a2ae2b8782879e93084b405253899a8430aff263181b9b11bc74376d8a9f087bcbf4e29908e3c9bdd607cf8d6d SHA512 82e5bc99fe341b7492f219193fb74c241ba035455e0faae7cea42635a99069c6d195157d8bb6e13277483e47d5df37a579dcf57c0a6e0a33ec31d983b9b9f5c7
-MISC metadata.xml 830 BLAKE2B 58122259f59445d2b2872e1a9e9eae179c3ce4726139dc310fcb6095ff58388a76f5aed2c0570195fdbd92495f8a2c05c254d1daa6288c2a5168f26e9958e5e8 SHA512 0019a634b333e013f48aacd2c59825a7650cb02c3a6f31b57963e16845cef07d1f6b4108fece6cd12ed29d5730c52aa87d43d81303b359bbbc661b4b60e19d05
+EBUILD htop-2.1.0.ebuild 1379 BLAKE2B 28b200bb48a064344f3608bf9664c875e1822221ced53ec4ede8dae44fa7e945826ead71532a286e25408ff64c50e2f5ecf4d9091ede63ec2224e54046723cea SHA512 b82a6c3c7bdc507f1e7ac2aad70472d5e237f218af2c7564dbd1070c45c90d093e0a5bfac40f7b9629e7ff4d4595065dd5f1e903902428a03eeb25d12548acc7
+MISC metadata.xml 750 BLAKE2B 57d419667fbc0053cb2f24908a4e43fefecca832bd86e8d562a4a43090b82f049c62457388ffe8bc4c1f3d49e1119da50f8221686b69956f4ea9426259fb6f3a SHA512 e35d8a5177f9e5bb3136759a7c4c0de5dee4366e3380952c8d72dbdfab46be5f880b77450046f02846c7baa1892e88835c8480808333934ec1bec04c34cd9072
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/files/htop-2.1.0-sysmacros.patch b/sys-process/htop/files/htop-2.1.0-sysmacros.patch
new file mode 100644
index 000000000000..08f023b442e5
--- /dev/null
+++ b/sys-process/htop/files/htop-2.1.0-sysmacros.patch
@@ -0,0 +1,38 @@
+From 25c50af220c2de4542b440b7470a644caf2a3b65 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Mon, 5 Feb 2018 16:02:19 +0100
+Subject: [PATCH] Add <sys/sysmacros.h> to two files.
+
+Future glibc releases will no longer include sysmacros implicitly.
+---
+ Process.c                | 1 +
+ linux/LinuxProcessList.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/Process.c b/Process.c
+index 1836080..5122afb 100644
+--- a/Process.c
++++ b/Process.c
+@@ -19,6 +19,7 @@ in the source distribution for its full text.
+ #include <sys/param.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <signal.h>
+diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c
+index 6f2631a..7522fb1 100644
+--- a/linux/LinuxProcessList.c
++++ b/linux/LinuxProcessList.c
+@@ -25,6 +25,7 @@ in the source distribution for its full text.
+ #include <time.h>
+ #include <assert.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <fcntl.h>
+ 
+ #ifdef HAVE_DELAYACCT
+-- 
+2.16.1
+
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.1.0.ebuild
index a2b10fdb96a6..1ba6ab8008f8 100644
--- a/sys-process/htop/htop-2.0.1.ebuild
+++ b/sys-process/htop/htop-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
 
 RDEPEND="sys-libs/ncurses:0=[unicode?]"
@@ -23,7 +23,7 @@ DOCS=( ChangeLog README )
 CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.0.0-tinfo.patch"
+	"${FILESDIR}/${P}-sysmacros.patch"
 )
 
 pkg_setup() {
@@ -45,9 +45,7 @@ src_prepare() {
 src_configure() {
 	[[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
 
-	local myeconfargs=()
-
-	myeconfargs+=(
+	local myeconfargs=(
 		# fails to build against recent hwloc versions
 		--disable-hwloc
 		--enable-taskstats
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>