gentoo resync : 02.03.2018

21 files changed, 762 insertions, 36 deletions

diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index ffee77d51581..64c3296c29ac 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 87c8b360f1a1..8c1cabac9850 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -8,6 +8,8 @@ AUX auditd-conf.d-2.1.3 734 BLAKE2B 018677362bc82c2052885cdd0e2185050cf5e97722ea
 AUX auditd-init.d-2.4.3 2054 BLAKE2B 20e68ab676c925b8567a7e9a12d2ac055fd90477cbbd6444136b7198828798f7b6428948503c344639fab5fea54962682be7c986950c2cbae8b7c9dfeb321a4b SHA512 1b48c248db5d34f148f9c79f8b2a6acbf61c729230341b861f5e331bbfb0c8356305a09eb2cc5c82c14c4fd9a13c7c13957e1ed493834b8b3b9ee38978e4c31f
 DIST audit-2.6.4.tar.gz 1078677 BLAKE2B 056d9f269926d9b0d74f7187f833f1e94d4e03a5137750fe4ff87b71fa0ce0e0a8569b97ecbd671f951061cfb088dff17b46e37cc14122864c37615356646fc5 SHA512 69b5d3987d2b8b189d1242fde639af3d7d366e901733133e47ee71223caf73aa7da40b7811298f0af861969b0ab482c5ef9830b711bdd15bd5f4d0ebc88a1224
 DIST audit-2.7.1.tar.gz 1099083 BLAKE2B 10f72ac3273ce9e23e1fb8ad8d57dcae772ba1f861f519867399d95e14f4809897637969de45566d62a73a35e5674260155773daf8de00481fcbd1b9c3138f96 SHA512 37964d81deee8608fde5f90d5d096727d3eb009e084be34749adcb0662e607e35c49c80bd83ce38b17161f11363b691721c8a8aa5dea832d320c53ab0ebb7483
-EBUILD audit-2.6.4.ebuild 6168 BLAKE2B 361c1128c2faf2895580041349eb48deb67f8a3ba28061eebb991c1d23fca98d82f00b0d41c32fcc3ce1f4e4ed9b44654d0c6f66177ff835a9b452eb0e60839f SHA512 ca6269971071902dc3688f16287d1c54ee420bab9efd8cfb8e63bdb7eb03d4e80d1bbc75b9e4cb82be3a78743e8617fe656018e509ad77562fe8a14a8f4e5c0d
-EBUILD audit-2.7.1.ebuild 6179 BLAKE2B b4a5a03fb5f3f3807fca8d5d0c26be53480fcc619cbab9344295a7ca09921e2cc7ae2441fd5d40cee7dcb7992ea29cee274f0892bba8c987a30a572bf901c237 SHA512 3b6efbe46f347e3b7abe092557e4c3cbe7cc30fd6a1648cf1d0395dd1f9a707e7eb10c3202481874657d5b9c809506b61b8dfb8dcf494fe62152a2fa6a9007cf
+DIST audit-2.8.2.tar.gz 1121970 BLAKE2B bbec694ed1177a8590d035c2d6d197e49343fc370b101589e58736042c3b12cabb68fe796422f3133feb79068ab7d5931efa5414d22edead10c8871fefcd2549 SHA512 888ebf5e8e9d285b82d87377fc8836886d7a8b089c1be4091420a77a0250c9baf09aebb7a6330ff5043fb35f51eb6baf8d4491e26da7ad0811f0087e395b5012
+EBUILD audit-2.6.4.ebuild 6194 BLAKE2B 5e159665e671092224196d91478246d2f9f56092dac4be65d86d6094bc535c276d90f2635be17214bc9fbae94aa9d4e58d1b538766eda940260c00ce9be66591 SHA512 5769b0f13bd033b5b465ca36d707c4324338fb2ce43948a2d656ebdb76d5004030e5a10057aa8d9f532d13484fdc1819f5633ce52a12c20dd301d0b4b7eaffe5
+EBUILD audit-2.7.1.ebuild 6200 BLAKE2B 82cd0172f07d576f6464fde97462f2106446c42ba38e06c8470628437c80b7c2b7b67d28bcd84c9a48dc0851321986a788b7220534461bb406196414070c2593 SHA512 6216b623842e583033a945f47914ec2fb22945105c2b42bc5fd9588d8a49161ee15a472963a44db781192941f5d217240f2efeff7327dd6d5607d7ad54c1e2f2
+EBUILD audit-2.8.2.ebuild 6205 BLAKE2B 82d223206cf3e14c58ce4bbdec2df18e5ad874eb440b4208a7c7463305ec2ec8039783e6436dff0623478db3dcb0d7909b4f077a819bee494d086f162d455e34 SHA512 ee1194da6ee59e8efb3d625853dfd98b0b4e034282aa72cd5f38860be7023c0e8d795c6898313551fca0b8477912a3d7608d821d74f66851136786620abdd630
 MISC metadata.xml 284 BLAKE2B c99c67d5591687a10bb380f1264dd1cde6370ff3a96864093cb41c7c17617bed826652b7651490b6a4634a7429589bbd137402afd7cf8e79cfd5f636c86baa52 SHA512 84f04c94a976c0e2c7db9a7c8c392b6c714e37650efefe2db9807688c28a8cdb64722064be23b89d0263c82c5de7b7dc412ae13f95b42c97ae928c00bb584fac
diff --git a/sys-process/audit/audit-2.6.4.ebuild b/sys-process/audit/audit-2.6.4.ebuild
index e83cf86b2dd1..999fbf25c03c 100644
--- a/sys-process/audit/audit-2.6.4.ebuild
+++ b/sys-process/audit/audit-2.6.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
-inherit autotools multilib multilib-minimal toolchain-funcs python-r1 linux-info systemd
+inherit autotools ltprune multilib multilib-minimal toolchain-funcs preserve-libs python-r1 linux-info systemd
 
 DESCRIPTION="Userspace utilities for storing and processing auditing records"
 HOMEPAGE="https://people.redhat.com/sgrubb/audit/"
diff --git a/sys-process/audit/audit-2.7.1.ebuild b/sys-process/audit/audit-2.7.1.ebuild
index 85a1f9a420fb..ef27492f5ac8 100644
--- a/sys-process/audit/audit-2.7.1.ebuild
+++ b/sys-process/audit/audit-2.7.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
-inherit autotools multilib multilib-minimal toolchain-funcs python-r1 linux-info systemd
+inherit autotools ltprune multilib multilib-minimal toolchain-funcs preserve-libs python-r1 linux-info systemd
 
 DESCRIPTION="Userspace utilities for storing and processing auditing records"
 HOMEPAGE="https://people.redhat.com/sgrubb/audit/"
@@ -13,7 +13,7 @@ SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="gssapi ldap python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # Testcases are pretty useless as they are built for RedHat users/groups and kernels.
diff --git a/sys-process/audit/audit-2.8.2.ebuild b/sys-process/audit/audit-2.8.2.ebuild
new file mode 100644
index 000000000000..c03f103ef2f8
--- /dev/null
+++ b/sys-process/audit/audit-2.8.2.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit autotools multilib multilib-minimal toolchain-funcs preserve-libs python-r1 linux-info systemd
+
+DESCRIPTION="Userspace utilities for storing and processing auditing records"
+HOMEPAGE="https://people.redhat.com/sgrubb/audit/"
+SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="gssapi ldap python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# Testcases are pretty useless as they are built for RedHat users/groups and kernels.
+RESTRICT="test"
+
+RDEPEND="gssapi? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	sys-libs/libcap-ng
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.34
+	python? ( dev-lang/swig:0 )"
+# Do not use os-headers as this is linux specific
+
+CONFIG_CHECK="~AUDIT"
+
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	eapply_user
+
+	# Do not build GUI tools
+	sed -i \
+		-e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \
+		"${S}"/configure.ac || die
+	sed -i \
+		-e 's,system-config-audit,,g' \
+		"${S}"/Makefile.am || die
+	rm -rf "${S}"/system-config-audit
+
+	if ! use ldap; then
+		sed -i \
+			-e '/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \
+			"${S}"/configure.ac || die
+		sed -i \
+			-e '/^SUBDIRS/s,zos-remote,,g' \
+			"${S}"/audisp/plugins/Makefile.am || die
+	fi
+
+	# Don't build static version of Python module.
+	eapply "${FILESDIR}"/${PN}-2.4.3-python.patch
+
+	# glibc/kernel upstreams suck with both defining ia64_fpreg
+	# This patch is a horribly workaround that is only valid as long as you
+	# don't need the OTHER definitions in fpu.h.
+	eapply "${FILESDIR}"/${PN}-2.1.3-ia64-compile-fix.patch
+
+	# there is no --without-golang conf option
+	sed -e "/^SUBDIRS =/s/ @gobind_dir@//" -i bindings/Makefile.am || die
+
+	# Regenerate autotooling
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local ECONF_SOURCE=${S}
+	econf \
+		--sbindir="${EPREFIX}/sbin" \
+		$(use_enable gssapi gssapi-krb5) \
+		$(use_enable static-libs static) \
+		--enable-systemd \
+		--without-python \
+		--without-python3
+
+	if multilib_is_native_abi; then
+		python_configure() {
+			mkdir -p "${BUILD_DIR}" || die
+			cd "${BUILD_DIR}" || die
+
+			if python_is_python3; then
+				econf --without-python --with-python3
+			else
+				econf --with-python --without-python3
+			fi
+		}
+
+		use python && python_foreach_impl python_configure
+	fi
+}
+
+src_configure() {
+	tc-export_build_env BUILD_{CC,CPP}
+	export CC_FOR_BUILD="${BUILD_CC}"
+	export CPP_FOR_BUILD="${BUILD_CPP}"
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+
+		python_compile() {
+			local pysuffix pydef
+			if python_is_python3; then
+				pysuffix=3
+				pydef='USE_PYTHON3=true'
+			else
+				pysuffix=2
+				pydef='HAVE_PYTHON=true'
+			fi
+
+			emake -C "${BUILD_DIR}"/bindings/swig \
+				VPATH="${native_build}/lib" \
+				LIBS="${native_build}/lib/libaudit.la" \
+				_audit_la_LIBADD="${native_build}/lib/libaudit.la" \
+				_audit_la_DEPENDENCIES="${S}/lib/libaudit.h ${native_build}/lib/libaudit.la" \
+				${pydef}
+			emake -C "${BUILD_DIR}"/bindings/python/python${pysuffix} \
+				VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}" \
+				auparse_la_LIBADD="${native_build}/auparse/libauparse.la ${native_build}/lib/libaudit.la" \
+				${pydef}
+		}
+
+		local native_build="${BUILD_DIR}"
+		use python && python_foreach_impl python_compile
+	else
+		emake -C lib
+		emake -C auparse
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" initdir="$(systemd_get_systemunitdir)" install
+
+		python_install() {
+			local pysuffix pydef
+			if python_is_python3; then
+				pysuffix=3
+				pydef='USE_PYTHON3=true'
+			else
+				pysuffix=2
+				pydef='HAVE_PYTHON=true'
+			fi
+
+			emake -C "${BUILD_DIR}"/bindings/swig \
+				VPATH="${native_build}/lib" \
+				LIBS="${native_build}/lib/libaudit.la" \
+				_audit_la_LIBADD="${native_build}/lib/libaudit.la" \
+				_audit_la_DEPENDENCIES="${S}/lib/libaudit.h ${native_build}/lib/libaudit.la" \
+				${pydef} \
+				DESTDIR="${D}" install
+			emake -C "${BUILD_DIR}"/bindings/python/python${pysuffix} \
+				VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}" \
+				auparse_la_LIBADD="${native_build}/auparse/libauparse.la ${native_build}/lib/libaudit.la" \
+				${pydef} \
+				DESTDIR="${D}" install
+		}
+
+		local native_build=${BUILD_DIR}
+		use python && python_foreach_impl python_install
+
+		# things like shadow use this so we need to be in /
+		gen_usr_ldscript -a audit auparse
+	else
+		emake -C lib DESTDIR="${D}" install
+		emake -C auparse DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS ChangeLog README* THANKS TODO
+	docinto contrib
+	dodoc contrib/{avc_snap,skeleton.c}
+	docinto contrib/plugin
+	dodoc contrib/plugin/*
+	docinto rules
+	dodoc rules/*
+
+	newinitd "${FILESDIR}"/auditd-init.d-2.4.3 auditd
+	newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd
+
+	fperms 644 "$(systemd_get_systemunitdir)"/auditd.service # 556436
+
+	[ -f "${ED}"/sbin/audisp-remote ] && \
+	dodir /usr/sbin && \
+	mv "${ED}"/{sbin,usr/sbin}/audisp-remote || die
+
+	# Gentoo rules
+	insinto /etc/audit/
+	newins "${FILESDIR}"/audit.rules-2.1.3 audit.rules
+	doins "${FILESDIR}"/audit.rules.stop*
+
+	# audit logs go here
+	keepdir /var/log/audit/
+
+	find "${D}" -name '*.la' -delete || die
+
+	# Security
+	lockdown_perms "${ED}"
+}
+
+pkg_preinst() {
+	# Preserve from the audit-1 series
+	preserve_old_lib /$(get_libdir)/libaudit.so.0
+}
+
+pkg_postinst() {
+	lockdown_perms "${EROOT}"
+	# Preserve from the audit-1 series
+	preserve_old_lib_notify /$(get_libdir)/libaudit.so.0
+}
+
+lockdown_perms() {
+	# Upstream wants these to have restrictive perms.
+	# Should not || die as not all paths may exist.
+	local basedir="$1"
+	chmod 0750 "${basedir}"/sbin/au{ditctl,report,dispd,ditd,search,trace} 2>/dev/null
+	chmod 0750 "${basedir}"/var/log/audit/ 2>/dev/null
+	chmod 0640 "${basedir}"/etc/{audit/,}{auditd.conf,audit.rules*} 2>/dev/null
+}
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index 5f5364b2be29..32e9f6ec46cb 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,7 +1,15 @@
 AUX htop-2.0.2-tinfo.patch 3655 BLAKE2B 505aacb774b54e4c7d9238942ff74cc96d0f5c93c7b74e9531e41e2ffa994b4d475b16620b65b824c28da2856294ef7fcd3562d9c318d4adbcc30bb512431b0f SHA512 33273ddcb89e955ef499854fb9361b65bafa83cce8e91f4ef62dd70fc29e58e169148c957d9cd0c5a123b9e5fe66f838212c8066bff12ada38c430087d02b210
-AUX htop-2.1.0-sysmacros.patch 1124 BLAKE2B 4fa3ef919eb6e814d2bab2b749edd36a805a7b3369c311cc6a4b0aae8da7b15c14aa3e3b7ff6f8b9ce9426c06942b96e31ee7e370ed6bac08f5ff8f67654aaed SHA512 08c24d7c720059b25acf6c107c53f47b1253f49fed4734af2ede1886b2f193a0fe76814b552862faea7ea11478ee3431463b8778be4240515cfb225681fb4340
+AUX htop-2.1.0-MakeHeader-python3.patch 710 BLAKE2B 26da173c3582436157175c46efd3f8c3571b9d02a96d8fa66e410dfc0db75cb9811f9171ff26cab503360f6252077e77bbd81ad180fc7521a413e4b71e866233 SHA512 caf2e9fe36b0d0f1f76d0d352c7cd11aab4c6b4196f2281f026257a695350541b62e23ae1db5906fb21f9360042c2d4b7ebf5b8a9ebcfb1c276dc44f690d0479
+AUX htop-2.1.0-bashisms.patch 1697 BLAKE2B 56af3d8931780a6e0e7a6f530267d295f7a94ec3f60847d1bef2897bc6f06a2aceb4290c2a1efc4747794887a9ab218f06dcf3c0176fc3e26c417315c33f6599 SHA512 92bbda50297971704f81d47284b6775bcd24a9f7a1698d66c029efdf74b9487ef92cec526829ba2f6e866f630817839776b7bd51bb588dd5c4a2340773801b80
+AUX htop-2.1.0-clear_on_sigwinch.patch 621 BLAKE2B a17551f19f48f57924e440e605dd893822b43068d12bb9d32eb11357d0431a785016d74b0c33234a68da265a530f8488c63510d4f69f205ff4c6fbfa35aa864e SHA512 b3fc6775549bb0e3c4a6f0d90a658e1b129bbc70d10d042dddc1bff9d8a35764ae6dbee69e83f61cc0d3d8a54d3ef78fb55312f4a3bb7750e4e2be1f421257fd
+AUX htop-2.1.0-color_issues.patch 2923 BLAKE2B ca204caed20c5ade062e78b8b3950424d771a9674b17f14cb892edf6c690af15d4d49776ddfe92b4bbf967281bd92e5033180fe372292480a4097ccec705366c SHA512 40c3bf80d051408fda9df4a98b9c8f3f909521549cdfca96e0468feadf53ffdf5ce62a61d6a55a91708c8db33c34a2389ecbcd6b7a8a34a1e9c0e69ce1bfb733
+AUX htop-2.1.0-header_updates.patch 1213 BLAKE2B 4bf06329ee553b29c40c46b8dd0a267d19d17c0b19e8f7938b9276cfced5ba734924c2228408e7e2bee8088250c85d9cfa1cee508c1f3b4f8554d4be8e47cd2b SHA512 63644982da6a92a5477286df4c2cc16097aee8b6f8fcee6c37448d36074770b2f5f8f5a1dbac32728db79dbfb4a094fdd31128cec1ba322ada0b6a0968e53f98
+AUX htop-2.1.0-ldflags.patch 635 BLAKE2B 7f35a75f9e35007029c05dacc8f5198b924b19e3ef28235bd0feae4d87f4d8016803f094f485030831725df6b2b7140e7c755b70e4118eee98d1acdaf16368ed SHA512 3500ba9182f2739327d0b6db1e273ab7d4d09f5c902ec78d852dba0168f30ad138aaf81fbe11b8a21848eedba394b32b0f3f2a78747c61f1fab4464f7fb44fdd
+AUX htop-2.1.0-ncurses_cflags.patch 1827 BLAKE2B 1881d0de7a8e1e16eb55280fc25d66bf00aabd3ee3ba06f74bc1f56222e324cd54c6e0458951507d296ba7573e7417b4c57c2d14f31b36487bfffbbd4cce8633 SHA512 cd3bcfd59f84828ce7842ef58ed37ed7fd376c841d7d54c634eb46bad7a5b86f02355a17a85e93c67d63382cefc51adce41ed9dbf355bd3083013c3cde38630f
+AUX htop-2.1.0-sysmacros.patch 2913 BLAKE2B 85ab3ffb0892c676a2c00519872faa898a2baad45948ac3d794eacc5bd045f592e0b46be7477c4ba27f1019f54911c11ee18cd90de433e11820cfd018c5aa7bc SHA512 ed4b05923ab4597afe6abd0c39107c858b2e9af7938625aefa23a300cfb12cf11f7f13704133d085c5bd8c64c70cc28d2db2f80a68e7a76ad4af3a9cc8c3bffa
 DIST htop-2.0.2.tar.gz 476364 BLAKE2B f5519977b4bd6d189cb7f379a9f9b535a4b67a575b30056a43e259ab39a69f84083d310bbefefe8408c7ca99918f1ea9ae775808b9afe9d0f78097ac6bb88dc7 SHA512 1c9bf71a36c56b301667aa6d03756fc757fbcb63e848d9581d10db3df6193cdeb00e55ceb6e2392794ac03ea034b04459a8fe550b3ac2318cd86263a74c78cda
 DIST htop-2.1.0.tar.gz 302938 BLAKE2B 3e290a3dbb0bf5424780ba5dcb9de8ea478bf4cabbbde202c19eb3db7e0f8d1e108ec3ea41544ac095097c39100417c72477dab96f104a6317f4edd06d69199f SHA512 203e8f4abd63334330fc673f6c9609adbeab763d80f553d8b48670091d18dd347599a9ce2dbbac374fa4a13fa904948711a441fa676f52ab1612bd2b4ee4c6eb
 EBUILD htop-2.0.2.ebuild 1390 BLAKE2B d38a5264ba9f0f2c8467f3dc2ad61440c50945a2ae2b8782879e93084b405253899a8430aff263181b9b11bc74376d8a9f087bcbf4e29908e3c9bdd607cf8d6d SHA512 82e5bc99fe341b7492f219193fb74c241ba035455e0faae7cea42635a99069c6d195157d8bb6e13277483e47d5df37a579dcf57c0a6e0a33ec31d983b9b9f5c7
+EBUILD htop-2.1.0-r1.ebuild 1979 BLAKE2B 43e3bbfcae759dcbe92f57e8d745a09170a2110ea8b3aef0f76e73c5e07098a589df3194aee217a98b109701c72568403d57562c426d141066a4aa409dcf776d SHA512 69685c882193112e4dfea70f19d61e56a75a4e5cea1a3f39598e87cad6cb97cc8323bdb8477045e363db1cea8ea844ad13bc2e50fd8f59fe5e10828bfea0d53b
 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-2.1.0-MakeHeader-python3.patch b/sys-process/htop/files/htop-2.1.0-MakeHeader-python3.patch
new file mode 100644
index 000000000000..7c8590a29919
--- /dev/null
+++ b/sys-process/htop/files/htop-2.1.0-MakeHeader-python3.patch
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 000000000000..3b5bdabe82fd
--- /dev/null
+++ b/sys-process/htop/files/htop-2.1.0-bashisms.patch
@@ -0,0 +1,37 @@
+From d4ea7cd65ccf8551cabb0706167b2c15aad7866d Mon Sep 17 00:00:00 2001
+From: Jesin <jesin00@gmail.com>
+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
new file mode 100644
index 000000000000..3ba7147e3b4f
--- /dev/null
+++ b/sys-process/htop/files/htop-2.1.0-clear_on_sigwinch.patch
@@ -0,0 +1,21 @@
+From 5fca258f33e08cd7733940391edbf9e22208de83 Mon Sep 17 00:00:00 2001
+From: guoci <zguoci@gmail.com>
+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
new file mode 100644
index 000000000000..0b4bea8bb956
--- /dev/null
+++ b/sys-process/htop/files/htop-2.1.0-color_issues.patch
@@ -0,0 +1,87 @@
+From ac2dff2881a7ab203750e8edf7a46b69ae492ed0 Mon Sep 17 00:00:00 2001
+From: Hisham Muhammad <hisham@gobolinux.org>
+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-header_updates.patch b/sys-process/htop/files/htop-2.1.0-header_updates.patch
new file mode 100644
index 000000000000..5c36d8b337e4
--- /dev/null
+++ b/sys-process/htop/files/htop-2.1.0-header_updates.patch
@@ -0,0 +1,42 @@
+From ccd156f8ba68c3c82f9a3afef46e414b2af16613 Mon Sep 17 00:00:00 2001
+From: Hisham Muhammad <hisham@gobolinux.org>
+Date: Mon, 26 Feb 2018 11:44:00 -0300
+Subject: [PATCH] Updates to generated header files
+
+---
+ Process.h                | 5 +++++
+ linux/LinuxProcessList.h | 5 +++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/Process.h b/Process.h
+index 6c41edc2..fda8480a 100644
+--- a/Process.h
++++ b/Process.h
+@@ -9,6 +9,11 @@ Released under the GNU GPL, see the COPYING file
+ in the source distribution for its full text.
+ */
+ 
++#ifdef MAJOR_IN_MKDEV
++#elif defined(MAJOR_IN_SYSMACROS) || \
++   (defined(HAVE_SYS_SYSMACROS_H) && HAVE_SYS_SYSMACROS_H)
++#endif
++
+ #ifdef __ANDROID__
+ #define SYS_ioprio_get __NR_ioprio_get
+ #define SYS_ioprio_set __NR_ioprio_set
+diff --git a/linux/LinuxProcessList.h b/linux/LinuxProcessList.h
+index 5005220a..0851a102 100644
+--- a/linux/LinuxProcessList.h
++++ b/linux/LinuxProcessList.h
+@@ -9,6 +9,11 @@ Released under the GNU GPL, see the COPYING file
+ in the source distribution for its full text.
+ */
+ 
++#ifdef MAJOR_IN_MKDEV
++#elif defined(MAJOR_IN_SYSMACROS) || \
++   (defined(HAVE_SYS_SYSMACROS_H) && HAVE_SYS_SYSMACROS_H)
++#endif
++
+ #ifdef HAVE_DELAYACCT
+ #endif
+ 
diff --git a/sys-process/htop/files/htop-2.1.0-ldflags.patch b/sys-process/htop/files/htop-2.1.0-ldflags.patch
new file mode 100644
index 000000000000..386542f35479
--- /dev/null
+++ b/sys-process/htop/files/htop-2.1.0-ldflags.patch
@@ -0,0 +1,21 @@
+From df9922a67eb8e02ab4cf1ff8f24b40f14094e699 Mon Sep 17 00:00:00 2001
+From: Hisham Muhammad <hisham@gobolinux.org>
+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
new file mode 100644
index 000000000000..0a25aeb7fa23
--- /dev/null
+++ b/sys-process/htop/files/htop-2.1.0-ncurses_cflags.patch
@@ -0,0 +1,46 @@
+From bc5d46982f3504000567e00f59e4f7a5905597a9 Mon Sep 17 00:00:00 2001
+From: Michael Klein <michael.klein@puffin.lb.shuttle.de>
+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
index 63677dd35fa9..0ab1bb0c02a0 100644
--- a/sys-process/htop/files/htop-2.1.0-sysmacros.patch
+++ b/sys-process/htop/files/htop-2.1.0-sysmacros.patch
@@ -1,40 +1,81 @@
-From 7fd09c08b5b50e5c0a2aebb66072deda4ac503fb 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.
+From d2d413161bbdf009f232faa5789131326225f838 Mon Sep 17 00:00:00 2001
+From: Explorer09 <explorer09@gmail.com>
+Date: Sat, 24 Feb 2018 11:57:18 +0800
+Subject: [PATCH] Fix build failure ('major' undefined) in glibc 2.28.
 
->=glibc-2.28 will no longer include sysmacros implicitly.
+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 <explorer09@gmail.com>
 ---
- Process.c                | 3 +++
- linux/LinuxProcessList.c | 1 +
- 2 files changed, 4 insertions(+)
+ Process.c                |  6 ++++++
+ configure.ac             | 10 ++++++++++
+ linux/LinuxProcessList.c |  6 ++++++
+ 3 files changed, 22 insertions(+)
 
 diff --git a/Process.c b/Process.c
-index 2ff778d..e135c60 100644
+index 2ff778df..845ca54b 100644
 --- a/Process.c
 +++ b/Process.c
-@@ -19,6 +19,9 @@ in the source distribution for its full text.
- #include <sys/param.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#ifdef HAVE_SYS_SYSMACROS_H
-+# include <sys/sysmacros.h>	/* for major, minor */
+@@ -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
- #include <unistd.h>
- #include <stdlib.h>
- #include <signal.h>
+ 
+ #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 c8ba89d..fb95440 100644
+index c8ba89d2..158a7ea2 100644
 --- a/linux/LinuxProcessList.c
 +++ b/linux/LinuxProcessList.c
-@@ -25,6 +25,7 @@ in the source distribution for its full text.
- #include <time.h>
+@@ -26,6 +26,12 @@ in the source distribution for its full text.
  #include <assert.h>
  #include <sys/types.h>
-+#include <sys/sysmacros.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
--- 
-2.16.2
-
+ #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
new file mode 100644
index 000000000000..14a9ecd0dfb1
--- /dev/null
+++ b/sys-process/htop/htop-2.1.0-r1.ebuild
@@ -0,0 +1,76 @@
+# 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="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-fbsd ~amd64-linux ~x86-linux"
+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[@]}
+}
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index 64aae30dfd99..e0f5d61479f3 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -1,5 +1,7 @@
 DIST parallel-20171222.tar.bz2 1690077 BLAKE2B b79be7a99b767b490143158c33632591e34c7958771c1c4196c7532b031f35fe1bda7b45cdc4b68087d64aae549ff892a86d9d6396179532c424177882c24ccd SHA512 3811310ee3957072a217ebd03b23127b115364cf24645ff0f958cf6ff9490d3379b25f7176da4f7ae43afdd230eb07d49fb7acde71d522eb1d37dae711c32813
 DIST parallel-20180122.tar.bz2 1717905 BLAKE2B b3dcb1000b06d319da1b4d99edd0cd4778d7decbb31743749bc8ecf1e185dd67f80cf77351fcaa9fe98b94d42d6e610f10d4ba694d269db5403bd28d620c3599 SHA512 aa2e8408e59751e491f9d07535c9302d397446ca8750983e87ac9540c25bd0d44fbda1ffc50ba1eba3c1fb83c24e1c64ee486aeed732da7a39c426178c7a8db1
+DIST parallel-20180222.tar.bz2 1720969 BLAKE2B c101c5bec829302ae45bf8347a22733610ef4bb038322af107ed39630b94f82a18f44419ddefcf6c062e20291c198e569856a2443fa5ad1bbe21c42c35bddfb5 SHA512 12d205e88179f2bac9585927a72f429ac186f1a3e386590ba61d54da6ecf69fb1ee124774e289a6a18fc5c8a7e0e4a0c13cc4a7bc4a853d6e46bcad52ba0243f
 EBUILD parallel-20171222.ebuild 870 BLAKE2B 8c59bf00bce95835f194564e853f2730ab87539f14b077a463cc9d84d83c77d0be0bbeeeb997827cb3ddaf7482cee9508e3c1df295bff39b6417e4a831470654 SHA512 3eaf6a0d19f2dc305976cc468631cd79b790aef1e41a803b25eee6908c528b51e3abc4f71b36392b76fdf148bc12e40502040543d34bce691fa83ab2fdc0c68a
 EBUILD parallel-20180122.ebuild 872 BLAKE2B ca91a138a59b01cfe03759ac09535604ff0f5bb9c4c69216145441a75e7d03771975f967971b4b5cbe0f4c6a79fd3dc68511fe1e43bb6def590345cde597c94f SHA512 8b7a52a0e152253144731dee8397d6b07e9ca1559febbc6a2d1cc1ee910673d80b3763ea5aa564c267da2e1e2c14dda010f438066a91da6f780eae99200056f6
+EBUILD parallel-20180222.ebuild 872 BLAKE2B ca91a138a59b01cfe03759ac09535604ff0f5bb9c4c69216145441a75e7d03771975f967971b4b5cbe0f4c6a79fd3dc68511fe1e43bb6def590345cde597c94f SHA512 8b7a52a0e152253144731dee8397d6b07e9ca1559febbc6a2d1cc1ee910673d80b3763ea5aa564c267da2e1e2c14dda010f438066a91da6f780eae99200056f6
 MISC metadata.xml 1003 BLAKE2B a5a05ad6fb91321ade93dc8534764af73614a4495ae0ae023825b155be4a2d8f095df51971bb174c3e5fa335d7753121b09b22d8fef5ec4ffce3460b95fa2ed1 SHA512 a9da23fd3dc9476e2934a06ed8c0638fb3ee2530ea0ed9305a88ef0fa517a2996494d4e97492a709a601937d794748b0cba794d0b919667decdace77123c700f
diff --git a/sys-process/parallel/parallel-20180222.ebuild b/sys-process/parallel/parallel-20180222.ebuild
new file mode 100644
index 000000000000..a195928e2b8b
--- /dev/null
+++ b/sys-process/parallel/parallel-20180222.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
+HOMEPAGE="https://www.gnu.org/software/parallel/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-lang/perl:=
+	dev-perl/Devel-Size
+	virtual/perl-Data-Dumper
+	virtual/perl-File-Temp
+	virtual/perl-IO"
+DEPEND="${RDEPEND}"
+
+DOCS="NEWS README"
+
+src_configure() {
+	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+
+	# See src/Makefile.am for this one:
+	rm -f "${ED}"usr/bin/sem
+	dosym ${PN} /usr/bin/sem
+}
+
+pkg_postinst() {
+	elog "To distribute jobs to remote machines you'll need these dependencies"
+	elog " net-misc/openssh"
+	elog " net-misc/rsync"
+}
diff --git a/sys-process/time/Manifest b/sys-process/time/Manifest
index e2d6c1b10b12..1b2375eaa18b 100644
--- a/sys-process/time/Manifest
+++ b/sys-process/time/Manifest
@@ -6,5 +6,5 @@ DIST time-1.7.2.tar.gz 108371 BLAKE2B 17d83faa24974fdd5853d83b0524a9f97780db19c4
 DIST time-1.7.tar.gz 103066 BLAKE2B 900df9031f90fbdab5b778c8ec61b3fe5efb2cb6a21834a31e3eefe845e05977b7c3206579e0bd7959f4dd5a34a909b16cc96f743aaf81cc1edb182a5669c68c SHA512 d759b651e343beddc0b3bd06af85881486b72319c979a2e7f752d5a34edd8b7c1c19391c5c7a2e8f6685746cc7a046bf2c8e082b31458a1dd043ed90a4cebcd1
 EBUILD time-1.7-r1.ebuild 557 BLAKE2B 8d590bfbc57301a251d16908277f659d974eb83a4f121903782626b61b8fd852ccd8b38e641eb0c82489fc555a1450e03a5deffa1ff7fe2ffe7c832060d312b3 SHA512 5b627020ad01ba84c38cd154eede8bd1e9cdd8ff26ddb43be298bf1dc06720111d12d583e90997c8fdb582805cef40bd20ad5d54deb26b15c30e801efdc1fd69
 EBUILD time-1.7-r3.ebuild 643 BLAKE2B dd0f80a88ce6217c1e14248ebc51629f745dedb882f7853e249df18424ebda5638775e00233a7299282c5d3173dcdf0c7d6b55172cb336e480f250c1ee246dd3 SHA512 385137702371965342aa1178b21ed070f8bcc26a771d6c3d42e80de0bb2ce71ddebedb0e47fb833edf37aa148acbb06b690200fd3ac2f900ee46326466c2149f
-EBUILD time-1.7.2.ebuild 683 BLAKE2B f5e4fee69b16f75efbdba077cda680b5c294e38155427bec7f3bb422933d1188d719d94c0cd626f51c5d358c521372cd6c7cb18bf20febe81378d4e0a073f689 SHA512 fb9fd063b22f08caadb404d9f0e37cffa3b0e478e84a6fcc8a0a6a7852f05441596997b59b67db77db085ded85e68fa3c65a603f93f2cb7be98a598d7c14d473
+EBUILD time-1.7.2.ebuild 684 BLAKE2B 2db03a7a4ed4dfd5d735417b643a22b410f6ecfff9aba04a8bb1bd18d04512e2ee83ff12f87c3dcc5aac1e44b9a41fdcbbec30d55d9a6e5eab5cf02adf4bd498 SHA512 46f115e2b0eaa08fa1b3cd479a93ff011e4a78294673803a9b9c3389b40423a6820c8ab325898df5e3b4309f52100afdc8ded7aab4e4314819bd4b32ff502a0f
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-process/time/time-1.7.2.ebuild b/sys-process/time/time-1.7.2.ebuild
index 2dbebf19cb45..a10b393bad43 100644
--- a/sys-process/time/time-1.7.2.ebuild
+++ b/sys-process/time/time-1.7.2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Displays info about resources used by a program"
 HOMEPAGE="https://www.gnu.org/directory/time.html"
 SRC_URI="http://git.savannah.gnu.org/cgit/time.git/snapshot/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
diff --git a/sys-process/tini/Manifest b/sys-process/tini/Manifest
index 8d4edc5d0bf4..feb38eec873d 100644
--- a/sys-process/tini/Manifest
+++ b/sys-process/tini/Manifest
@@ -1,7 +1,9 @@
 DIST tini-0.13.2.tar.gz 27828 BLAKE2B 2a983cc654c6553d372ee425d4d153b50522a5e3ee0190262383b650e63c3239f30553504f49925b6e7caaa721fc350bab98e0c87446757d65d4056df58ee4a3 SHA512 117822bf2e45b7cf732bfcd2aa5ea268a189c395f189c03d0e5dcd982872cff29d50adbb1a4d1b85859db4736e932900cfb64a1c487ba271a305146e9677a1d4
 DIST tini-0.15.0.tar.gz 29473 BLAKE2B 24aa6ec5f0d24603907d7de816d15d1b6cb6c90a254e5b0f6a52f29ba1dc2ffd7b578b67a97b68230f49b22b7848a677f73db06c659d60eeef48ca46764c961e SHA512 774addddeb2bcefd1db2e4bff7c55bba6c3f4adc41e0b2a647059eef8cc5cc9d4a47b68cb4b89aa4e9e52b85916fe2680dad2a414c82b3c276beea89e3689481
 DIST tini-0.16.1.tar.gz 29641 BLAKE2B 637ee17bbf8553b7803dc78cc40ec55ea919ec003005c7f2524322df6cc93a2e4c6fc017fa25c581f50eb17482956ebf37bf49c7796c33d227c7327ca467a906 SHA512 aa0a802c403a07771a2b28a07b97fa2c93d40b5d5be2cba6556c8e7a92e608453010625d0236d26c27bdd2820aed3ad9ca676b70f7fcd5986d7f91eb928d053c
+DIST tini-0.17.0.tar.gz 30881 BLAKE2B 8212bfa56b6ade3b79e1d4d3144b10b98e4daf19e9a9c93f6db44dfea22f80b4c6810619832b339984681d1933d00964f7cfbf516286354141f795d3cb5e745f SHA512 4e59241bd621cd89f9c07dcd7a21754a947c87d3571b06bc5f034c0059a20cbc02d4d22fd08a79633b84fd47980dbf5240e2d2fa382aaf5c32e6003710b7691a
 EBUILD tini-0.13.2.ebuild 910 BLAKE2B 44bd74197ebd18fddb00f4f9b285da19dcdbcdce97548317ca4e786e7e3ce5724e3a2c85c5741b6ceff57e46c87c632cd27e2c629a7b18ecb7d98eb91b0f4e63 SHA512 a7f116a229f64b1b90f7117ad3788e514138f30a10779ce13c06672f796fda300e69301426c0c912ee777894e7e156b1dc4421cc3b9d2a994e86a28f25ea2334
 EBUILD tini-0.15.0.ebuild 911 BLAKE2B 6f9ec5ab6f2788df3db968daddcbce06ea1b873392daadfc9b7c895e166497e6e8655d20696b8573c27256897936aaaa93559bc89d91d388ded358666a5a7cf1 SHA512 cb538a26c6d6d0aeed29b976613c85cc5363e790b6eb2c73d78b43ece9185adbe811976e3cc9e9a38ec987e8b5dc5e5585b8bdec3be40cf11b37237f15567f02
 EBUILD tini-0.16.1.ebuild 910 BLAKE2B 44bd74197ebd18fddb00f4f9b285da19dcdbcdce97548317ca4e786e7e3ce5724e3a2c85c5741b6ceff57e46c87c632cd27e2c629a7b18ecb7d98eb91b0f4e63 SHA512 a7f116a229f64b1b90f7117ad3788e514138f30a10779ce13c06672f796fda300e69301426c0c912ee777894e7e156b1dc4421cc3b9d2a994e86a28f25ea2334
+EBUILD tini-0.17.0.ebuild 911 BLAKE2B db44d845dd47b42e0a707d5bb342cfdcc7f6d79ba2f5e114fc03788be003854e7f7b2b53f86b80a1bae961b85d0ae98a8dce34187027aa2e088cd7b33feb4e46 SHA512 1b3d1aa8f75d7ac3fbbae3dbdee31e370e1c2c44c1763ade560e5940153fa0f45c63e7e3ffba97b18fa5c0f41b50efec3bd519964893af77467c2e2c8126709d
 MISC metadata.xml 603 BLAKE2B 5e702a958ad14189e4be030441833428283784695d116c8404be905b6aece027ec8acbe05394c6108d13ad04eae0284dc88cbab77364aeb73dfc21001457f7f7 SHA512 9e6651c7f9ae7a2b3d856af9e74e8656f89de4496fcacf5d97bcbe4d2b20be01c306cb3e116a0ad7eabe213e2476245894ffa53e5c63ef9b4e73ca989584af9c
diff --git a/sys-process/tini/tini-0.17.0.ebuild b/sys-process/tini/tini-0.17.0.ebuild
new file mode 100644
index 000000000000..15f145ee4ab7
--- /dev/null
+++ b/sys-process/tini/tini-0.17.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="A tiny but valid init for containers"
+HOMEPAGE="https://github.com/krallin/tini"
+SRC_URI="https://github.com/krallin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+args +static"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	# Do not strip binary
+	sed -i -e 's/-Wl,-s")$/")/' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=()
+	use args || mycmakeargs+=(-DMINIMAL=ON)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	append-cflags -DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use static; then
+		mv "${ED%/}"/usr/bin/{${PN}-static,${PN}} || die
+	else
+		rm "${ED%/}"/usr/bin/${PN}-static || die
+	fi
+}