gentoo resync : 14.04.2018

7 files changed, 69 insertions, 5 deletions

diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 2912372f6a39..ed3b2604a392 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/dumb-init/Manifest b/sys-process/dumb-init/Manifest
index bc6fd27ee8b7..59d3e20625be 100644
--- a/sys-process/dumb-init/Manifest
+++ b/sys-process/dumb-init/Manifest
@@ -1,5 +1,5 @@
 DIST dumb-init-1.2.0.tar.gz 23370 BLAKE2B 43bf4fb99090065310516a617fd507e1f32e3d210df09ac8d0d31736614e2a1bb248b399606493f86967759f3245b58018c4d832dcfa24267c29403b5aec43d2 SHA512 07f75771014c897b2e2f4de84b88ef5b829e19df81f6cbde0372a2f30ea78237af8e5cd6ab47b0a104606ea3b85c9883b86f777bc49bc428d52a32a4ff2ddad8
 DIST dumb-init-1.2.1.tar.gz 24472 BLAKE2B a2d18aca8e67f14a436ef5a23d5010339e803cadeeee5ec01145c9ddc0e000d2ec3f91b5342f57fb6ec63c174ac51e058ec14cc6d38dbe2d9a0fcad4a82ce4f9 SHA512 5a621caab17e322bf67f6b1eecfed7a0b4c59f2369f62745a7403343d0d01a800fb075b7579a51b5f68f404a0fb35220b937b7253d1e598dfd32d9360b84ddf4
-EBUILD dumb-init-1.2.0.ebuild 579 BLAKE2B f1bcd3cf574a581873b023deb1ee5b5b68aa6c0c3bbd1296808d88c3fb5583bc13866d02c61e05fc946c20fb954948095c24d782c8b16e7e69e259d0bfa73016 SHA512 f3a6d305e079e449b87b0be8ffc86baf49f5c20a01f1e13296b5fcad663190d0e15f97a54d2a4a1751187dd0ba672f3660d0bd061da284689191864b21d09745
+EBUILD dumb-init-1.2.0.ebuild 583 BLAKE2B 6f5e1c5dc4c618a097e3fc04428ddfaa1d98ca0f6398e82cc44ed5e1479ceaac85d812161dbcb018353642ada7b8c73bbc4f56beba6a3fd9ba9c7d2626366616 SHA512 ad0b3f50a3c0deab6bf875ec68f70a5e3787d32bef011ddfc84286bbc05cdf56e3ff46b5a5638211caabe432ace7e512c2069237b36d6271a74c2ea4221c8691
 EBUILD dumb-init-1.2.1.ebuild 636 BLAKE2B f39ddbc8e27ccedaa3d70ac5718bc3eaf4a2a6d811dc8e33640102c0a3c4470aea54e76b12bfba1f3619d8417cced6b6814efaa0c374b54e0cafbd00a7dc768d SHA512 a1a3b9ac0c0032c34e16808d653c8bbf00e2ec2b6c85c6490940dc29b9f2e1df1cbbf8cb0b5c28bd7030943873d4fe54d7d2494d6b76966277235e9418f87309
 MISC metadata.xml 370 BLAKE2B b7fc36b47b1559fcfda9f48837c34bd3be5e27c8060279ca07a9044efd9563a679e28ca9091cc593a0e1fa58f9377717d233784bc1d079cc0d2a2706ebea8e61 SHA512 9da1c5732139dcd56c6dded1ee2e95349d0a3f264e33029900b35e92e764640ca0eb973ce00555b57b4d06cafca6cfc63c5c9189942a7fba7d9bb8219201d217
diff --git a/sys-process/dumb-init/dumb-init-1.2.0.ebuild b/sys-process/dumb-init/dumb-init-1.2.0.ebuild
index ef14aeec42c7..34d2910320b7 100644
--- a/sys-process/dumb-init/dumb-init-1.2.0.ebuild
+++ b/sys-process/dumb-init/dumb-init-1.2.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
@@ -6,7 +6,7 @@ EAPI=6
 inherit flag-o-matic
 
 DESCRIPTION="A minimal init system for Linux containers"
-HOMEPAGE="https://github.com/Yelp/${PN}"
+HOMEPAGE="https://github.com/Yelp/dumb-init"
 SRC_URI="https://github.com/Yelp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index 90bdb985afbf..bf80269f692f 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -9,8 +9,10 @@ AUX htop-2.1.0-ncurses_cflags.patch 1827 BLAKE2B 1881d0de7a8e1e16eb55280fc25d66b
 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
+DIST htop-2.2.0.tar.gz 308109 BLAKE2B 323a3bfe5032b6d59a3f751831a2af6aa7ae7e9ecceb35828812cb375d919de51f401ffe59fffdfc83a72c8dace879c5d5a0e857511c20e2126d11cdc4101b0b SHA512 ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e
 DIST htop-3.0.0_beta4.tar.gz 179849 BLAKE2B 2990090a3b898673fd3bf985077721aed79d00ee07c8a6808b25eb84e320a9c494bd8ad7440ea142ae01bd634ab8863e2cca01c5a52bd19a7e2f4746334acce8 SHA512 4a9c8765ddbd366b06f23e14dc2176cd2da5346e32867c6fa9f11e57018acb6cc37f9ada044febb1b9d414e4dc5958c3c84455649e9c05f64ddf1b37c59fc05e
 EBUILD htop-2.0.2.ebuild 1390 BLAKE2B d38a5264ba9f0f2c8467f3dc2ad61440c50945a2ae2b8782879e93084b405253899a8430aff263181b9b11bc74376d8a9f087bcbf4e29908e3c9bdd607cf8d6d SHA512 82e5bc99fe341b7492f219193fb74c241ba035455e0faae7cea42635a99069c6d195157d8bb6e13277483e47d5df37a579dcf57c0a6e0a33ec31d983b9b9f5c7
 EBUILD htop-2.1.0-r1.ebuild 1990 BLAKE2B 9e2842b82870620628f502cfb81e53436c78eca5ece566cd393751e6da1878a792d56632c294b52ff4c4aee02bfa1ffc81cbd22da8e7f52136bb6073a9de98ae SHA512 34441c4ea5ea25169d6bf84c89008b1b0d1d54eaaf1fbc6e46b5f3afabe561578ec8823bd02d6da2f563ae87213284fba66436657cb74bb1b18a6502ada5cd53
+EBUILD htop-2.2.0.ebuild 1504 BLAKE2B eab36c8ce2218b6aad12a6db3eb13643b0da2f6a5e57153fc0635f95cc693d60d3898b70f8e1fb58deaca1f0b13c0f7a7315135dcd960a9b217733735654b145 SHA512 63313f981af313b63dc06803ebf75fc8fa264eac4e9bed29821b15959e67ff508e8cab97ce93f26aa57a50d7de6dea673453941cf24f885197f1ed26b0252e02
 EBUILD htop-3.0.0_beta4.ebuild 1849 BLAKE2B 219ddc0369c745dfcd08821a05dbb8115dcc3ec89dc3c5b8bdbaed91da1b408f3258dca8676052a5915d78735f881d253eb017e2707bbc83e0ec9183c67b33ba SHA512 4f42160dc348cb5be44b86ab3e82a6f03043631d64f9d0602c729a3cf8774c54daa70a1c1fd96d166c9efab880412003845ccdadbdef37174711e33e89b45c7f
 MISC metadata.xml 750 BLAKE2B 57d419667fbc0053cb2f24908a4e43fefecca832bd86e8d562a4a43090b82f049c62457388ffe8bc4c1f3d49e1119da50f8221686b69956f4ea9426259fb6f3a SHA512 e35d8a5177f9e5bb3136759a7c4c0de5dee4366e3380952c8d72dbdfab46be5f880b77450046f02846c7baa1892e88835c8480808333934ec1bec04c34cd9072
diff --git a/sys-process/htop/htop-2.2.0.ebuild b/sys-process/htop/htop-2.2.0.ebuild
new file mode 100644
index 000000000000..980d490717ab
--- /dev/null
+++ b/sys-process/htop/htop-2.2.0.ebuild
@@ -0,0 +1,62 @@
+# 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 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 ~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"
+
+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
+
+	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/procps/Manifest b/sys-process/procps/Manifest
index 64cab77627d7..3ad69352c652 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -4,8 +4,8 @@ AUX procps-3.3.12-proc-tests.patch 1835 BLAKE2B 99fe8d63620f37f98cddc60e8bcbaadb
 AUX procps-3.3.12-strtod_nol_err.patch 3328 BLAKE2B f880817bf85fc32668a10ec099444adc047aa2ba92c4ddf3ed74193acc2b3c496c35bcb3aed228a12cc06dfaa21899ee725c295ab3de10382b225785a8a2278f SHA512 00618dcf62dd2c054060eb9cef223ab8d7d93a53649fc8d0cc8251d5763e98deca97433d0017f0118dcce9d4c920ccf0a60998865efb569544e1fa47cb1c11b3
 AUX procps-3.3.8-kill-neg-pid.patch 1446 BLAKE2B b55d7c52f1d28b3ef8a6964490afaf3c74f7a89376fc50dfc7efae85caff0c7265e1f09db73da5b911c42ed1060735d83a37f3d8ce05ced33c53c0b98fc126fe SHA512 3ed4e83d81f7dd574ff68bbcae9ad9f8649a39d46a17de5fd4297f215d8f70cd28e415b1d3c7b5142e7719343af28f4b393061a60eb012caece81dfe5ff6c271
 DIST procps-ng-3.3.12.tar.xz 845484 BLAKE2B d317935e28de45ca5afa59ce33f85e286820a630c7fe036bddcf7a4418fa347cbc9cab39ef380f482ce13f47555598fd2419c67c3f861d7e4e2e89a9b2f4ae4a SHA512 ea816740ff72cc53d99b5d2e78a511b627ea5b295e0efff67605c56d1ab075abc6b0e2da3df4facbfe903fc9d679e892d351b6884a966d37c6f4bfd9141a924b
-DIST procps-ng-3.3.13.tar.xz 901156 BLAKE2B ee172016800d3570855873e38fc6ce1b05bb4f43e960097adf6ae806ca8140636d14b0fa8185b19b5580476f5943370d2f128f56ef7274bc66b30c80e0fe9c8b SHA512 9419a54b9875d4e33dd63face5c85cdbef1b8376416d469609128c9370c337a32b9b951c865e53c2ae6cfc8ce8eb7657f724a997cd3206d7af97ddf8a978e008
+DIST procps-ng-3.3.14.tar.xz 926924 BLAKE2B b18f8ec50a1449008b01a52be51a3a509266945b82fbb6964f54b9746d71b90e4a1a37be29b4bf07fedc70d4528fac7f7099d7b245bd9c6ed033e77eb49aae77 SHA512 45617924ae1520765c15d71b76278dc80cac04f5985f83c9b65a8ba379d9a80a2ff0dc14c5a6edee7d6cfa66ce50ec019e8b5203704175ff94547ae6ff2b18c5
 EBUILD procps-3.3.12-r1.ebuild 2328 BLAKE2B 389b25d2ed9e1855392b6fea552d4fc7c9a5d8ebfb81502a9f7125b9687d8195905ee9550a75a8e44e59d1cae4dea0abada40cdcf895b032f4deb1d518bd4e96 SHA512 6ec0d09ae0afa59d2880d88873db63c8091e3d95ebfa1cc76e729bf6c139a7afe11f4ee1649f830839fbce61e756c792b528c15655544587a8ed0ffe52a8246b
 EBUILD procps-3.3.12.ebuild 1984 BLAKE2B 64041bcd297cca29ee4702ad4ee2555da2abb24c749e7070402981efb359d0017235f30e94fa6aa94e01f54b03fbc4d6e602c6b90810645935e0a3a0e84fbc16 SHA512 ebdf9a402bf2682892fc8b2628da524fd85d7fc1c0593b6c4e4e742743bcedfc643d2076863e863a35cbb894bd8d37a0771c58f1eaeb6447a367ad5f445cf5db
-EBUILD procps-3.3.13.ebuild 2066 BLAKE2B 476532905b101230dc1818448f870abf2934939104859943c6389965bbc846aaf724bace914ee319d179af032d957ce18c3b9b3638a33290b2c8e196c6edd60e SHA512 a3308497a5ff3f280d27db1e988574177141424648e43c7062e8e53159e21ffb91e08aae33ffbb1b7d581387f16ca27b220b555d011903446a8225c70d85e696
+EBUILD procps-3.3.14.ebuild 2066 BLAKE2B 476532905b101230dc1818448f870abf2934939104859943c6389965bbc846aaf724bace914ee319d179af032d957ce18c3b9b3638a33290b2c8e196c6edd60e SHA512 a3308497a5ff3f280d27db1e988574177141424648e43c7062e8e53159e21ffb91e08aae33ffbb1b7d581387f16ca27b220b555d011903446a8225c70d85e696
 MISC metadata.xml 653 BLAKE2B de137950217a24b13838a10e3dddacd94898c4d4be18c9080e31d666fe74d6f8e5fe3edfb4f3caf369fde1c82858e4c8828883c21f3ed32867a5f35d0771dc89 SHA512 d98bc7ed5e5437134c30db0a2ecbe4f430143aad2b91775e128fe735ddc39801e8d8fe62905cabbd8a41c4d07698110605b74056296282a74ac7622a09272703
diff --git a/sys-process/procps/procps-3.3.13.ebuild b/sys-process/procps/procps-3.3.14.ebuild
index 5e9a2b13394f..5e9a2b13394f 100644
--- a/sys-process/procps/procps-3.3.13.ebuild
+++ b/sys-process/procps/procps-3.3.14.ebuild