gentoo resync : 13.10.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
commit: bb72e65b6d6ce95abb5d486dad35d37dc105e89b (patch)
tree: b31a9263d386dcae4cb06764136672508dc5efdf /app-admin
parent: 9b1e6d491f32eb4caf0c8e197bdec075713c97ca (diff)
141 files changed, 1180 insertions, 665 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index bb64917acf90..9810cb492b7f 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 9261f9f69746..443161d04b7f 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,10 +1,7 @@
 DIST ansible-2.7.13.tar.gz 11861862 BLAKE2B 3123d84b9f45bb5e50a0d5db5d0b2ae10163e2818d30f29ad5a80c23979a347eb5e17806bd295df547b88a09191918443162cb25d7f339ae76df52e3960954b0 SHA512 8dc19e5c93a90d43ced6628699d2da42d522a020bb2cdd35ba73f6286998c605852c89250af8696e94aba0080b2fab12761a39c3e2eb86d39c212a198f970652
-DIST ansible-2.8.4.tar.gz 14348300 BLAKE2B 8a9b5587411d2366a91643682c0ef82b0aa5b5cd5e6b882f3ffdfa100c4f3995472913bc12e1c2f7077efb69ec8ac3ad168a79fc3d8c127b34ce03c69588a4c7 SHA512 9efacbaf053acb8cf92ebe5bda982794ecbdbf55e33a4a292a68874b637eebe82406bfba129adf839354ee18aa809d45d77502f68b8e8d07358a48c9b5687b7e
 DIST ansible-2.8.5.tar.gz 14352036 BLAKE2B a2d60132e3aeafd7dbdcca13daac1c657e19fc1b7822b33dde35e0fff67fa7093b54330652ba6c02bad710fd2d05fba3081cd0b609f16bccf7e2eba52f9fa45b SHA512 6555b9a3d3d8298410e54f7116d92fc1978bef185a5136cfb809c1942b08b96c562af9e0d6d1a25eee5a4024d309b6713ce27836857b428a7c362e26efb53777
 EBUILD ansible-2.7.13-r1.ebuild 1675 BLAKE2B 9b2c3275f960f0c36be0db1fa01e09c8acb93ae8ff4e606c8fa874d00e20512f57c528ad210a8c375f9173d7484284dce1cd2d0ac3b0590551a487e329752838 SHA512 9ea7ede55cf58584f191ada7f48465af05007d3c8a26ac18b5b06a41794b8f46f9ca46ecd900bef1c61bd433177b516c8b16b01d0eb8a13be511b341c9552798
 EBUILD ansible-2.7.13.ebuild 1635 BLAKE2B 3604fcb446a1f3df3dc8f16cd45edc20cdf773a558fc4c33d8391a40e2237cd1313f240b1a03f6810ee93333fad4ff76358c245f8896394e19a54549d3d18733 SHA512 53535468da383ecfad9ee94281fe84fdef862e3d344b2aa048dd5e231418e2c80e934189a7d376eb699c25cb594049ce2b8eaaa717ad378e8105b0ff3f7af904
-EBUILD ansible-2.8.4-r1.ebuild 1756 BLAKE2B 30327a58804ddf1ee56c9ce618270afa554462123140e2ef6376b1655620289677b69ec6a49da1096cadc09924147f75fadbb7738cb68eb7cdc34ccb0b2f290b SHA512 386092c824fb03e07b89589281e64b4adcd817f1f977b8c9004497fa5b115a053c2789994d1385cf56afe134cad1b67d40ec3d36845989acbbc8cc11ba2b677d
-EBUILD ansible-2.8.4.ebuild 1716 BLAKE2B 8ddd4c96e597576d970964d5e9daf4d5f965230f3c42fffedddbd6d20a56b22d98151c0f0f3637304385e02e97af466e18c5cacee258fd93ea7006db5ea14046 SHA512 f70424d820a489d02936f625822ddecab576241d59ab65f8552fa254e4376d2cc0d746af29f3331c6814a45c60cf32f8ac46537a9ae668ebb1dea2d7354a73b2
-EBUILD ansible-2.8.5.ebuild 1756 BLAKE2B 30327a58804ddf1ee56c9ce618270afa554462123140e2ef6376b1655620289677b69ec6a49da1096cadc09924147f75fadbb7738cb68eb7cdc34ccb0b2f290b SHA512 386092c824fb03e07b89589281e64b4adcd817f1f977b8c9004497fa5b115a053c2789994d1385cf56afe134cad1b67d40ec3d36845989acbbc8cc11ba2b677d
+EBUILD ansible-2.8.5.ebuild 1754 BLAKE2B dba223a203261ebe347e6379e1dc829d44ffc0c59dd0138f0cd843115eaca7b12f774522162f15950899f0b4994bac624ca10f4a582deaa5aba1a908058128a4 SHA512 7a53449ded7610d3a6e5ee0c61bbfedd0c17e7632ab4abcbe79800f2d5ddd92561c2b6f915093d3114ed9a85df8254fe1477b11a6c6947246679dbba8a8ecb93
 EBUILD ansible-9999.ebuild 1795 BLAKE2B 0f7288af3da8d075bed73dc9141c64cbecf4ec420bc79e64601d0af162cdfce7545dcb76939bc5b6d425d36b6c8f547082fd3c34b30bbe3ea155d56c00bc97e6 SHA512 3040bba45955f3e58d630222aaa0314506d12580d115fb00162ec2fb37eaaf12e48264164a75ddd5eaf62d61f47eb0ccc0402a05e4b61a47508394912f623a77
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.8.4-r1.ebuild b/app-admin/ansible/ansible-2.8.4-r1.ebuild
deleted file mode 100644
index b078e69e7bf9..000000000000
--- a/app-admin/ansible/ansible-2.8.4-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
-IUSE="doc test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
-python_prepare_all() {
-	rm -fv MANIFEST.in || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
-	distutils-r1_python_install_all
-
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.8.4.ebuild b/app-admin/ansible/ansible-2.8.4.ebuild
deleted file mode 100644
index def82c47563a..000000000000
--- a/app-admin/ansible/ansible-2.8.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
-IUSE="doc test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
-python_prepare_all() {
-	rm -fv MANIFEST.in || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
-	distutils-r1_python_install_all
-
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.8.5.ebuild b/app-admin/ansible/ansible-2.8.5.ebuild
index b078e69e7bf9..b0307b32f958 100644
--- a/app-admin/ansible/ansible-2.8.5.ebuild
+++ b/app-admin/ansible/ansible-2.8.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
 IUSE="doc test"
 RESTRICT="test"
 
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 052c8430ab60..3710fe312141 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -2,6 +2,6 @@ AUX apache-tools-2.2.20-Makefile.patch 1573 BLAKE2B 56de28f38934b73740d68f6429f3
 AUX apache-tools-2.4.7-Makefile.patch 1695 BLAKE2B 8fac145613ac9f587e49bc6932c5712b7d7cad0d91422e11701edd24152e1d33907cbf31e3bef709555253759cea72199d4537df5d20d3ce9ca5dc898ba26779 SHA512 f597ce5503e590ed5b2621c04dcf0a571a73b70f144df7fe4e5fb7329a4f1558a5eb16913fe3d7c58ac1030f46cd2b1882e08d0f62106fbf8d40a8677c6b9448
 DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240
 DIST httpd-2.4.41.tar.bz2 7072373 BLAKE2B 88a2390736209d5ef04bffcb867bc8d6019302885e6f3cc63d18123336d4d0657252105a3bfebf4e91b8daa02119d4a61f4c0a9702244858a3193ec6cf681c0f SHA512 350cc7dcd2c439e0590338fa6da3f44df44f9bb885c381e91f91b14c2f48597f6f0bbac0ea118a8a67eaa70ae7edbb769beace368643ed73f6daee44c307b335
-EBUILD apache-tools-2.2.34.ebuild 1977 BLAKE2B 792d6ea010621c815a13fa89db289cdb7d2f02cd4aecca6d032e21c2bd64af7c35a66ebe3b8102eb441d12a4b6b2ca6197e16f8479d72c82606b088b97dfc24a SHA512 4a71266da0e171579c5d9da9ed681ed5600d2d94ffb15761bbd7f28b60332158959156a65b27ac295869f647f624fe598bdf2e74aa3c7f8b16fef7cbb2dc9a52
-EBUILD apache-tools-2.4.41.ebuild 2576 BLAKE2B 189881dc49c7e5066fe39bf63bdd99984ddb96e31aba5ff67c1c6c837367d4acd217d7ab6b7f305fc9cc6042426534840e09701dd9380f11545d916b0cce7fd1 SHA512 56b79c32eedd23bfa65bb4b75a063ef5b802f2bd45bd773e88edac2aa9b41ad10386493479c012c397f9c8cbc12c0e04d1a47409e3ef305539977102d970d474
+EBUILD apache-tools-2.2.34.ebuild 1955 BLAKE2B ac89e162cbd366e9d1088630a918a5fc39b656776ecf1ba0fddf9ca4eb844dc5f92ded218bca1a5ecad4f8ed25c4d57b13c9c9fb738018a56cd257ff31ca4abc SHA512 943de88edb1e55d04be1520c86c318f3fe59a75dd685160e2c29dd7b4b99a40f73995e12cfc6262728b50548689d246bf04738727d518623d04e9d3ebc447207
+EBUILD apache-tools-2.4.41.ebuild 2554 BLAKE2B 138448a508312f75c2bc15271e2fc1306bc0a131f01b02491411167279c0a20e7f2b036b72bd5a92c04b6ba147b3aad5193caa5271b65af194c6e8e367ba5cfc SHA512 9112aa33a023092cf703fffde26b4a1e3e55f595e925f104230bfe1c697727d9d855d85b5570e8403c38719e2e68163933fe88ddc0882b5d889296911c8b863a
 MISC metadata.xml 580 BLAKE2B 013a1f5cecbfa1086e720d341855be076e98b313f03ad99147bc692a5988fc6e0006545104cfe245798f88ab617c6e2c84928d0a73d127715dcb8ba352e8aa94 SHA512 611ed7b76b150a829902110a843a5a97622d2ec645850b6988c578496d716019e511830767a0c3dc300c69f02b5b933c806ea5598f6938b5d6b9d14b58985122
diff --git a/app-admin/apache-tools/apache-tools-2.2.34.ebuild b/app-admin/apache-tools/apache-tools-2.2.34.ebuild
index e7272e344834..e98b337dda0a 100644
--- a/app-admin/apache-tools/apache-tools-2.2.34.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.2.34.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="ssl"
 RESTRICT="test"
 
diff --git a/app-admin/apache-tools/apache-tools-2.4.41.ebuild b/app-admin/apache-tools/apache-tools-2.4.41.ebuild
index 03b9e8d46a7b..55ffe619976f 100644
--- a/app-admin/apache-tools/apache-tools-2.4.41.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.41.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 IUSE="libressl ssl"
 RESTRICT="test"
 
diff --git a/app-admin/ccze/Manifest b/app-admin/ccze/Manifest
index 022bc203e783..d76b8bea15a9 100644
--- a/app-admin/ccze/Manifest
+++ b/app-admin/ccze/Manifest
@@ -3,5 +3,5 @@ AUX ccze-fbsd.patch 531 BLAKE2B ef16b94b4c1a94a3385b3b21c6c1fc51a463769de06f65cb
 AUX ccze-ldflags.patch 424 BLAKE2B a769c1c617b7f421a0cac4cdb3141169eca8a0e23fd384b4bac702a2f84c15643e2a780eed2b706540a88b8c881227592caf588d1278148dbf8cec8e55dd3847 SHA512 7dff2e235acc665abcc3ed35744776e60a336b45cafbd80e3f4707f61d3746821e63949e73c32ee4fc5ca43b5639a816c42bb5e0b08912a7c617744dff39ec07
 AUX ccze-segfault.patch 660 BLAKE2B 863fa14c8ded2df423b0ff5cd9936ccb390b11d3b0dfa396d515e9a85e411c9f9f7f3ba76f04c4ba04ccc19cc43594f4d304b54cb2155ef44ef08c9c00d4b691 SHA512 e8ebdbc8293b4d765d683bbdd222c0af3aaf0668ea8376ed830efac3cdb4a99dfc75dda6e59b95e7a36b7ab4fc521a9a1937e4ab9a48218acc76d2b02844b900
 DIST ccze-0.2.1.tar.gz 139795 BLAKE2B 112e3968ca00bdb9ebda91b30a697f4422935755b3bf33d47c0a8800f3d05e371a4ca4db0ef52f10e5cba1c537ee3f666479103dc88a30f270c76268fece5cb6 SHA512 1704da8d4c97a3403a57d7841db8a6e4ba6116e401f91d9ecf1b1371cc18b40641e5665c9414740d6a523874be6b6527f5c0d4f3a3796c7b96ed83192146b2b7
-EBUILD ccze-0.2.1-r4.ebuild 934 BLAKE2B 044fe28bf9d82531a8e6594f092f1c1f8877f4261c2705a1dfb5f4fc5f6f80c94c61ab83c837d806dc1a6a1f83dd3222024d017205b80fed75dc7a266bdbe7c8 SHA512 63dac9b987a313e87f4553d00c1a88e17c7f849d7ad207a0f3324227623aa2de2195dc1736bbbaa7fb9f9d1423ce02f87630b377c6cf3f09fc4f0931d99cd07e
+EBUILD ccze-0.2.1-r4.ebuild 924 BLAKE2B a1ae489331999ec59273f0e7de356b7fb1fd8abcec689193652da1838c85a85c5f6b048f8aecfb655f0c801250482d76a74b213dfccc1aff68d89d3b1d918da4 SHA512 3b29874ff8cad6787b801981efd196f4e42010af83fe2285dc3128f52f7700efb53aad6aae5c4e42390aaa33b5be5e90da92cb5a0d126049f85b8338473f865a
 MISC metadata.xml 492 BLAKE2B a2658f32b8d62f60965cb71d66e3bc90c4d0aa03d4e53bca596de964c63bcd0b157b9e407ca91f789457731bf62d0d4b504376917acdf2f95b76a63bc513c29e SHA512 96d871b02eee0348e6d62f01bd25deca9044248f0f495be24fc8cadd30c16ef933a285e250f58d58b47f64eec8f964de2ef243617f66266a655cb83f02acd8d8
diff --git a/app-admin/ccze/ccze-0.2.1-r4.ebuild b/app-admin/ccze/ccze-0.2.1-r4.ebuild
index a84298b4a5dc..3d3a5c02977f 100644
--- a/app-admin/ccze/ccze-0.2.1-r4.ebuild
+++ b/app-admin/ccze/ccze-0.2.1-r4.ebuild
@@ -13,7 +13,7 @@ RESTRICT="test"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE=""
 
 DEPEND="dev-libs/libpcre
diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest
index b9fc0327ffa1..c60fb4d1b239 100644
--- a/app-admin/cdist/Manifest
+++ b/app-admin/cdist/Manifest
@@ -1,5 +1,5 @@
-DIST cdist-4.10.6.tar.gz 676651 BLAKE2B 107b60c8890ede0bfa9f741375cc1705946b2d6be9caa4ae41c2ba155097b64e451474218ae9d5a8e2aa2511908869e8a5aa24fe15f0d41a50c8775d037a7eb3 SHA512 558fbe242a24fcd204a0b2519c9ad73405fe20466600af3635c6a5029641c4aec4315be99af0d5d9c1920aaadfe96942ffab94133c48675655ea8107fc8af90c
 DIST cdist-5.1.3.tar.gz 915245 BLAKE2B 5fce58f6fcbd48852e1c0c5568b72c360e74fd49b5321e2aedfdc8e48fd090cbdd7bab87a94e76d087f04f5a706bf2c7b1bebdc5a80867e26d8cc6e28afdeab3 SHA512 8330a5af80dfc07da722675ae1d402ebae4ba0aada451a02d782365d68d1d43a643609f3326f5ed793d2902838ee29071c0255c9d8a9d38c1e8a7c92a24cef46
-EBUILD cdist-4.10.6.ebuild 594 BLAKE2B b4eacbd2736994e8119709f83dc059ef2f5b14b08916c1f02f715db051ad3511e79bcad5666cb0b80b06eb70c13095e224716429c3c02c6a51bfc49f41ebbb42 SHA512 3b50d7c613d08f3502f055ce6d81338dd97610560375065eb65d8721a3a43bb6f6ee93971059c0920bbb02c82b40036b233fddad643c6ba7efb24d6f649fb27d
+DIST cdist-6.0.0.tar.gz 934813 BLAKE2B 3cb18ebb3059fc9a37beb1567c691e1d34a9cde5d49081e8798b5ba86ea8da3b6c964d2c8bea7bf2f04f986b0b4a8766c8ea53ce48fb4bc024264e72efec1fcb SHA512 e846060f3020d6281d41e97b9cc33250cd1d4ae0d110a2792fc2447af110fef91199fc0382d5a1e501f487fda42f703957ff5a39cf28061338609a600290d792
 EBUILD cdist-5.1.3.ebuild 594 BLAKE2B b4eacbd2736994e8119709f83dc059ef2f5b14b08916c1f02f715db051ad3511e79bcad5666cb0b80b06eb70c13095e224716429c3c02c6a51bfc49f41ebbb42 SHA512 3b50d7c613d08f3502f055ce6d81338dd97610560375065eb65d8721a3a43bb6f6ee93971059c0920bbb02c82b40036b233fddad643c6ba7efb24d6f649fb27d
+EBUILD cdist-6.0.0.ebuild 600 BLAKE2B 7d60e5a8a18e901fa330ddf7c2366c490388f5a4a3a754b0a6ac99abd299b1c3235f41156c45a2fcbec7250c34370290dc897ed824e13e63d721de3b1388b913 SHA512 5467e9c1ec7f2e2823f35e076607a2d2c0ece0265ee5fb278058f7d497311ca44a2f237d520552bf685d90acf6d54745fae0005586fbdee0fe84b76d601be5f0
 MISC metadata.xml 443 BLAKE2B 2742628c4f58fc21f1fca78752bce1e6275ec34ca7aa547a39d8a11cf3c7d9c149030078a55383f706053fa3cd70f071d5d5c571f3b009e941cbbc2c29b6c21a SHA512 5d1dbb6742101c7b89662f3edba9d3eb7da595611fbb613a1da1482e76cbf563fdf5fbf227471ca4c90e5a96d62c65433beaf9b90bbc716c7614ea5fe6b5063a
diff --git a/app-admin/cdist/cdist-4.10.6.ebuild b/app-admin/cdist/cdist-6.0.0.ebuild
index 5d7033af2783..7a9ce8da65df 100644
--- a/app-admin/cdist/cdist-4.10.6.ebuild
+++ b/app-admin/cdist/cdist-6.0.0.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 python_install_all() {
-	use doc && HTML_DOCS=( docs/dist/html/*.html docs/dist/html/man{1,7}/*.html )
+	use doc && local HTML_DOCS=( docs/dist/html/*.html docs/dist/html/man{1,7}/*.html )
 	distutils-r1_python_install_all
 
 	doman docs/dist/man/man1/*.1 docs/dist/man/man7/*.7
diff --git a/app-admin/chrpath/Manifest b/app-admin/chrpath/Manifest
index 76fa1ee65a59..b29d7f7602e9 100644
--- a/app-admin/chrpath/Manifest
+++ b/app-admin/chrpath/Manifest
@@ -6,6 +6,6 @@ AUX chrpath-0.16-testsuite-1.patch 547 BLAKE2B a6b579d54dff49736474afdcf8a7a0694
 AUX chrpath-keepgoing.patch 1041 BLAKE2B d5ec2b6d482fbd42b2d3cd04626984c1d6ea0c5ca35d5aa25160bb6781a0bd534c637d90e19f8c873e12ad477b2f0d17d57f066401afd95fc0d82c4e3319ff12 SHA512 7bd459313f3cd83c86c63adf8a39df41c0454f6a689aab803d3211b5ffa295a72ce45a8ed7c3f61af0f705fc614c4ce48d86c6a5706b20c4d45265bbeafceb9c
 DIST chrpath-0.13.tar.gz 125129 BLAKE2B 004db7e3567ceeb700d018e7e32036843413605466c218bf40252927b169775c5a86f81f8ea355f0d141821313d114ec24654ed62d75443e31739118e31bc497 SHA512 9ec2ab2731fb553497996939b421130ae221d478dab8887c184ae91f7d3ae697688e7a30e3bea30cc0cf765f1dc8c7f47d2a1f4369b36079b4033e8d0303d75e
 DIST chrpath-0.16.tar.gz 134506 BLAKE2B 7003cc1cb2332ffbe6fe0873c6d30cbc3ea696e041be33b39c3d36ae34a2497b8dd40bb373773c546b8d63cfd8534e796fd7d7cbc99d37fb8751fc960907070f SHA512 aa04d490f78bff20a56fe20539cec10218c0772a668909eda8324ca825f51e8ef92001e95d9c316e79a145a043c9c327ec94d1a82e104ab408ca1021832745aa
-EBUILD chrpath-0.13-r2.ebuild 1138 BLAKE2B e3f27d3048e8e18b3ee04835a3a3728c0cb895645a49db63ddfe67e8854119aeb576d9b552af95f9ee0147c3a01156759a6dd41bb6bc7c20386dec2480a858e1 SHA512 fd27bc5cab5b990f29afd71adb04ba1316043b59b1103ffa2dfe688f7b7a5e20486db80058c854bac781ab9593303110ea5ee7c9251ef9f3dc672b18c3f25ae5
-EBUILD chrpath-0.16.ebuild 1062 BLAKE2B 870a477dbc0437bab4c7031fc9354953831d812fd7e5de934713e18dd4d7372c28fde77d35fecf5eab78e95b858bffef22c3af09a8309f8da20169cfc2f2a801 SHA512 2c50348c25793408f5858bd789ff76f7221fc90a63231ce811932f6a09b7d9d5cffe1784dfb642bc91577bbf24e4bbff18de58759d3fca5e2c054bd23467ff46
+EBUILD chrpath-0.13-r2.ebuild 1116 BLAKE2B ee45e402eba482358bd07fa9ab007dcd2d9dc3d715051a93adc987c9ddebd63f44de8b503a18ca2bcf0447d086e496b2c86ed0a6909944e66d5c2d34e9b75808 SHA512 63ec5a10d9608666018acc6c6946e0188ccbc0d66a160509567b931e6cc300a941781e505c87b86d0e9c9206cc1b328e1d3d7711c7b01238f31a4c9af2298caf
+EBUILD chrpath-0.16.ebuild 1040 BLAKE2B 0d77d79aa171ad8429007a2136819b67fdce1a1e035aefb9b8b0ad7f651249a79f6b7e156712eddcdd171912587528ad3fb0d471c75fa0a6ef80fc795974bc80 SHA512 ddd41c76f3ae21d27f97cfd7d8abc248a16397aa5519efe750cf8c39c1066c3402ee4222b1c9042cf9fe7344c76f8b4d2fd41da3c1392c33f491bc07c032839b
 MISC metadata.xml 325 BLAKE2B 3d1e56e84a1ee9bfb3ab37bdce7fe7d4d2d74eca05ad6beee2f3d90da661f5bf59aa45dff767a72f210dcbdcff7818e41494a58e8c14183a6f11a9f59c0b073f SHA512 bc84447080d9969bb04b15981db6ef6cc35d7a38a796085a7397f5bf2f629ea97785828f895aeb8296e87977d40991a4dd5ffec9cf4ae2393f267afa8d3768c8
diff --git a/app-admin/chrpath/chrpath-0.13-r2.ebuild b/app-admin/chrpath/chrpath-0.13-r2.ebuild
index 0aeb65d4f648..d47a2afa4974 100644
--- a/app-admin/chrpath/chrpath-0.13-r2.ebuild
+++ b/app-admin/chrpath/chrpath-0.13-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://alioth-archive.debian.org/releases/${PN}/${PN}/${PV}/${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/app-admin/chrpath/chrpath-0.16.ebuild b/app-admin/chrpath/chrpath-0.16.ebuild
index 323e49a75d97..5174d593ad4a 100644
--- a/app-admin/chrpath/chrpath-0.16.ebuild
+++ b/app-admin/chrpath/chrpath-0.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://alioth-archive.debian.org/releases/${PN}/${PN}/${PV}/${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/app-admin/clog/Manifest b/app-admin/clog/Manifest
index 55db72b6ed42..58b3a2f80091 100644
--- a/app-admin/clog/Manifest
+++ b/app-admin/clog/Manifest
@@ -1,3 +1,3 @@
 DIST clog-1.3.0.tar.gz 705807 BLAKE2B 5e78cf1ed209ef7dae301175e11048eec3e9227ca740ae444a0302e5ee40af260349c9b02d8fe86a159c2db9bc29b5854240000f793e868b270a5852eb552229 SHA512 dfd4ae9c5e31be1620c246edd4b1642ff2351589da04c4fb805d3566e3efe0958ba6978fea567d40b7faeb217ba9f7b42b201a059f939c35564ee8f40b8b452a
-EBUILD clog-1.3.0.ebuild 354 BLAKE2B 2f2f58618bcc3cff831dc7259013736ba0f82dec53931c50ddd0d15cc085907722673c5b875abc9f33457a291fa202fd3395f8ae0f0d235d9b3ededd083d680b SHA512 82b999d0b511e5aba4faee4395d32876151b3448c5257955c775ff77e002df0d55c4476faf350d913aef03296f83857abff4cf5fa1b429be1aec8df072f8cc47
+EBUILD clog-1.3.0.ebuild 342 BLAKE2B 634f05fd2bb39db1f2e9c4fa826e0ab6495c38fdfb51192c27422bf9e883d91bd7734c59687205b744cce67fe9978c646eadc4b2b286d620cd813c5a43927b0a SHA512 379d51358dc054a58780de219088476610637ddc48bc51cc2fb1b560431753c903182f2e99840070ab3939dab3eb2698251bc4dc690f8900acd3d5fb24675647
 MISC metadata.xml 247 BLAKE2B 481f340933d489b2df2b718152ba79fac9d5561acac95070086d5abcd5c5bcca3d9e33eb3b2e56a9fa87978cff3ea33127e0672b3e721f71058eff43ef04acfb SHA512 f7f4f34a879fe0fee0e2054e2c47ed3348c773c96767475a8587272825b7af88a610f35ac2fe22fcba6d973acea82e073dcf3bb3abe0b6b9acbb2dc9c543db24
diff --git a/app-admin/clog/clog-1.3.0.ebuild b/app-admin/clog/clog-1.3.0.ebuild
index 75be48ed9125..238bf2e43f37 100644
--- a/app-admin/clog/clog-1.3.0.ebuild
+++ b/app-admin/clog/clog-1.3.0.ebuild
@@ -9,6 +9,6 @@ DESCRIPTION="clog is a colorized log tail utility"
 HOMEPAGE="https://taskwarrior.org/docs/clog/"
 SRC_URI="https://tasktools.org/download/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
 LICENSE="MIT"
 SLOT="0"
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index 7f618fba1242..434e13ddd97c 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -5,6 +5,6 @@ AUX conserver.initd-r1 428 BLAKE2B 574fa8611e928b17e70b1da522060c230b3f51ef0daf8
 AUX conserver.pam-pambase 194 BLAKE2B ad284008c94f4c19b911a93279b12893a1c686806b22f7f19500e7216c19768ab161f9ba5cf2405d9d46f412a08c0cb04de0bc05ead15fb75da931575c2c3be2 SHA512 5368394be5b9d97e0ae751d84fbb4848aa27fd57b1a2eea8c7919e56246e390985deca80f0019c2104034103f73ac382a5ab2129113a0ff0b63b0b8bd83648c9
 DIST conserver-8.2.3.tar.gz 329825 BLAKE2B 94ceb427a18b38855ee3146e432be50248a518221d9779c833b3bf1190dedf800ff498ffdd88eafc7cea343b2f87f476738977021c85f19c869bf0a012f1da11 SHA512 35b387629973620aa25211d9532f940e17d7891aa7216776c315cb9fde09106b7388e7cef29f5a2ead8660fc35e2be2b14f38a51cd2b3198251b7e7e70a2254d
 DIST conserver-8.2.4.tar.gz 432854 BLAKE2B 5b6003609187e629544a7183b32cb7b2ab6c854cabf915271a3a924d18c2c13a1bf01f0524740b35859d83c4cb5cc525b87182c342b0075d5486ba428ed71091 SHA512 c59b9bcf582209f8450a8189c1af536951e15ff3aa97994ea99f9de5c6028237a9fa3ca8ba0f7d63ec33b96e45adf76be755181c4199621debfed9feaf1659ad
-EBUILD conserver-8.2.3.ebuild 2302 BLAKE2B daebfeb728432113b951a44a157456458ffbda3e73b29f577757e31e22e15e40cebf980357a318b854d3aa00f4acdca142a4acd41638841c9c951024aa3333b1 SHA512 1a2e224234208b72961f7675fa9816a2172b3f1ea80dad66e1ffdb62d3deebedacac9bcb98a8ed834266a7bc40cb924b26c303b186dac1fe478599eac5fb99d2
-EBUILD conserver-8.2.4.ebuild 2311 BLAKE2B 30b33e9c0adac2aa6b46bda93703afda74263eedf4c023ddb35bc3e5e155c90c055a72263bbd17c45281d9f72d64bf0af29ad63bbca6448f4c65b42281932d28 SHA512 c08d2a60a879e6f00d0e94a3ebf97427342c06129a17bb4b6ee66b524491cff6fe746d69a80f6dc09a9c9f0bc10e8c3b7d00860af905e87a0a552ab85e6cdb1e
+EBUILD conserver-8.2.3.ebuild 2303 BLAKE2B 295c0f95b18ca352acab3d54fedd344689d6087aaa3340de236f423121ead7ecf72c6ed88631091087086866fd665a39482bc15edd76d3bad7cde0f85c82d6e5 SHA512 1733401706b85b956590857f8ad63a3e0941edaa2f721f3a310851bf03c8eed9fe57b49399485540c60ef1fe1494155d56e34c6018b9f890b93396795c3f06a4
+EBUILD conserver-8.2.4.ebuild 2312 BLAKE2B 755e0edcb553d9603cd456d4edfee6821916b932a427521a33b7fe6c5311ac525d46568c6a7f9138f2bb995c826f9d534b2673731e86c89ad2cb42af8421ab54 SHA512 4985e844270698deeb713abff2a53428378cee30f883c125444c273de5bdf6824a348d06c9df0c6c79a0bac3f104ba5cc07a5abdc3ce2bba987e1c72404a0561
 MISC metadata.xml 1378 BLAKE2B 942f6b9d8fd616f089d0651fbdfc41de96033acf65f127cbfded2fb9c390fd9b86c037a62679ea27b18e4e618bf764d09277350e9fdbaadc914c18a6961618e2 SHA512 6b3e06cfa1013f71eb42c9c073df8c97d2b8fa6b935b637ba29096db88d75bab1bb192695ed4a5dad63d88341a366327f419cb357777c0abb09799c8bcc40970
diff --git a/app-admin/conserver/conserver-8.2.3.ebuild b/app-admin/conserver/conserver-8.2.3.ebuild
index d9a7265bfbad..8050e3f5da86 100644
--- a/app-admin/conserver/conserver-8.2.3.ebuild
+++ b/app-admin/conserver/conserver-8.2.3.ebuild
@@ -24,7 +24,7 @@ DEPEND="debug? ( dev-libs/dmalloc:= )
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	tcpd? ( sys-apps/tcp-wrappers )
 "
 RDEPEND="${DEPEND}
diff --git a/app-admin/conserver/conserver-8.2.4.ebuild b/app-admin/conserver/conserver-8.2.4.ebuild
index 6429ff850b3e..7b500c68159f 100644
--- a/app-admin/conserver/conserver-8.2.4.ebuild
+++ b/app-admin/conserver/conserver-8.2.4.ebuild
@@ -24,7 +24,7 @@ DEPEND="debug? ( dev-libs/dmalloc:= )
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	tcpd? ( sys-apps/tcp-wrappers )
 "
 RDEPEND="${DEPEND}
diff --git a/app-admin/consolehm/Manifest b/app-admin/consolehm/Manifest
deleted file mode 100644
index d40d5eb68b5d..000000000000
--- a/app-admin/consolehm/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX consolehm-gcc4.patch 250 BLAKE2B 645d4a4aee3dd5a693b4528ef842b7aeca9369aa1574175c2e96b2fc5e05bccc961a6c1bd8bcb74902a911e1a6f1ad57095eec454fe989bbc5075ad7f297ce51 SHA512 d9d74aed3961073c2356ce30296635e000e8c9b0ab27b1b860d6a9ee30dd49c0e7ac9fea8c4f21118c36e3973ede0a07b14afd6da2506a0762fdafb89abcccbb
-DIST consolehm-1.31.tar.gz 21615 BLAKE2B e2e90628026eb5936b346bc6ee072f23e9dacdf4f028612d647771f6cb23b816a18a4f139ff7cf6c2333fd6cda133bd7220929113f6d77993e7073ec8086b1ec SHA512 595a5808bf85b878254e10fbe9a7beccffb4e5a35e03fe9fbea710963733fb4d6afe6fe6b70b30fa2b4fd565ed4ac1ffcca624b6717cc3b6d900960e7e6001f8
-EBUILD consolehm-1.31.ebuild 1027 BLAKE2B c47dd43e3aac39d882b2361d61cd5c5b89580df0b752f13e5df3d80601cfae183289b73d2d727b03da20127b463cfe648ec38c7e12e70b20bb3d38410cda266a SHA512 18f4e3d33fb3b439973c0d6dbdf5b14fc8d26e6ad5c073b884e9ee28bfe958394d715f4cd99bc53348dd38d1e42ea9bf35da70a970e3d8966d6f56254984f25d
-MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/app-admin/consolehm/consolehm-1.31.ebuild b/app-admin/consolehm/consolehm-1.31.ebuild
deleted file mode 100644
index 5fe3da38f115..000000000000
--- a/app-admin/consolehm/consolehm-1.31.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Console based hardware monitor for FreeBSD"
-HOMEPAGE="ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/fenner/"
-SRC_URI="ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/fenner/${P}.tar.gz"
-LICENSE="BSD-2"
-SLOT="0"
-
-KEYWORDS="~x86-fbsd"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${PN}-gcc4.patch || die "patch failed"
-	export CHMS="${S}/consolehm"
-	# The only 'SMBus' smb.h i've found is in a different place:
-	cd "${S}/consolehm"
-	sed -i.orig -e 's:machine/smb.h:dev/smbus/smb.h:g' \
-		configure.in \
-		configure \
-		chm.h  || die "sed failed."
-}
-
-src_compile() {
-	cd "${S}/consolehm"
-	econf || die "econf failed"
-	MAKE=make emake || die "emake failed"
-}
-
-src_install() {
-	dobin "${S}/consolehm/chm"
-	doman "${S}/consolehm/chm.8"
-	dodoc "${S}"/CHANGELOG
-	dodoc "${S}"/README
-	dodoc "${S}"/TODO
-}
diff --git a/app-admin/consolehm/files/consolehm-gcc4.patch b/app-admin/consolehm/files/consolehm-gcc4.patch
deleted file mode 100644
index 85f677a29cbf..000000000000
--- a/app-admin/consolehm/files/consolehm-gcc4.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- consolehm/consolehm/chm.c.orig	2000-12-23 03:51:45 -0300
-+++ consolehm/consolehm/chm.c	2007-01-12 11:18:27 -0300
-@@ -165,6 +165,7 @@
- 			printf("Delay: %d microseconds. \n\n",delay);
- 			break;
- 		default:
-+			;;
- 	}
- 	
- 	file_handle = OpenIO();
diff --git a/app-admin/consolehm/metadata.xml b/app-admin/consolehm/metadata.xml
deleted file mode 100644
index a00f3aeb1f81..000000000000
--- a/app-admin/consolehm/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>bsd@gentoo.org</email>
-	<name>BSD Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-admin/consul-template/Manifest b/app-admin/consul-template/Manifest
index 343214853e98..e43863480f3f 100644
--- a/app-admin/consul-template/Manifest
+++ b/app-admin/consul-template/Manifest
@@ -3,9 +3,6 @@ AUX consul-template.initd 592 BLAKE2B 21d6ff6bee67a82c4305eba3765f8e9c49ee59357a
 AUX consul-template.logrotated 103 BLAKE2B 66f91c1a2cd0c926da67e99ccf0535c6ff5ed1e57c23fb3bb3df4066cfdc1ff70f2eae6a67c7816d8d38d41106f003fe2a98732a9180838c05d04a710d9bef09 SHA512 642b53e43fd7a4da00907600f26e3814893b61856a62083c804b0077043a4f8f6603f0ae4461e901105f8e1fe52c2f34f3e949e752441f5f510e9cc21890ca75
 AUX consul-template.service 398 BLAKE2B 94a30973f6e0ee114dc844bf9b83e423d72a2fc0a3bc0fb6a01668fdc268c7a4f7d550c67f2f6f5e5de3140d6f14aba99eb65702ee8e335e2c3750a8aba6d7ef SHA512 6f0621088475a392c142ff8cc7236850a61f2fdcb10d456a29a68dff1c12cd52f66cdb37ae2d7c84ba7513f430dc8cea6fd5f128a559b4de708c5b517aab75e1
 DIST consul-template-0.20.0.tar.gz 46430965 BLAKE2B 025919b928e07cda618e05aab4488214459e6bc443524bbf8fa83331c3ad5708ebbeaf0cf20351ff70a325fb56aed9cede3010b43726fa32b5b1997d6f4f294a SHA512 a09ff31ddd7d11d78e8c2afcc9a63ab4458cc9feacc02fbf95a30c82b9ad58526c6e6575f5b3ddb21d0dd720687b9ee135bacdbe761f1b5f95592a3e3e74c170
-<<<<<<< HEAD
-EBUILD consul-template-0.20.0.ebuild 1534 BLAKE2B efb7e210dc8e15979c5a97b2c7578560027d0596c60409a2b1ce7a31da13f5eae8da03e2577177387e50507fb385ade659f78ba362bf6489824a1909c18d8aac SHA512 5554d0d5668989615abc120e1b321f70223ccc3c829428602fe3e5cb977606ef39ae4f6092492221199e3aad289acfa27a92c487e45f6b0b8b30039c987bb2c7
-=======
 DIST consul-template-0.22.0.tar.gz 186074 BLAKE2B b2c38e2a0e720fb39ce0978ca929b872e1dd898d510a0ab5697a746257f25fc77e172c418c5db9c9865e2e0530b7d38d7373f7c792e37c723950c02dd06b7859 SHA512 0875a4a20ba9e9e078cd26c620cb9edbd22193b6b5fe25bb6006bd7d3272dcf29d7051448d3672f9d9caaa1b871f08b050fa07882933ad6d13b90d1c8f6406af
 DIST github.com-BurntSushi-toml-v0.3.1.tar.gz 42077 BLAKE2B d846b7961dc3447a43e5c91dee1897a9701c997a407d9ba8737d08b82b493f99823eeab87cc9d4fe6dd4dbdb7b0d2a218d9f9f220ffcda2056188afbf0f2ab87 SHA512 75801d0263a68613233f3b18e35b000e1aeb5322015c0f032598d9447122fc45b1854741ce6ce9fb4d5a064546ad26f3d6384710bd8e6e1229ed2d4551524852
 DIST github.com-armon-go-metrics-ec5e00d3c878b2a97bbe0884ef45ffd1b4f669f5.tar.gz 27423 BLAKE2B 48344146241205d76ae35407e4e5131db7277a7bcd2b44c966ed2c8fbfcd7bd628dcedb7538c28b9106643f8c0f2af4bf0985ada6cb58db0bff739583435b306 SHA512 bf28c4df0927296214f4e89263e30a6ab7c2f5fb62c20177e597890bb878f68df4aaf5445ff9af629864b38da8f506fb530f09ff22d5d8509ad7b5f4ca20a395
@@ -49,5 +46,4 @@ DIST github.com-square-go-jose-v2.3.1.tar.gz 299480 BLAKE2B 861aa2e72c5e12013aab
 DIST github.com-stretchr-testify-v1.3.0.tar.gz 102859 BLAKE2B 0b590484005372f6c1a8c591c6439d1072c53299db1508495c02712b187623552196421321c5e64aedc0fba6acdbd68db53ddbc8e5d6a78fd783e6f7344783b1 SHA512 29dc8389f0efba9caeb2d2d5704878c93f3b00c21e6ad2712bac52bbc09c460d9028aecbfd5430f200a15fd0e8c8d0157e084b72463d82ceecc5459d93d4d896
 EBUILD consul-template-0.20.0.ebuild 1534 BLAKE2B efb7e210dc8e15979c5a97b2c7578560027d0596c60409a2b1ce7a31da13f5eae8da03e2577177387e50507fb385ade659f78ba362bf6489824a1909c18d8aac SHA512 5554d0d5668989615abc120e1b321f70223ccc3c829428602fe3e5cb977606ef39ae4f6092492221199e3aad289acfa27a92c487e45f6b0b8b30039c987bb2c7
 EBUILD consul-template-0.22.0.ebuild 3306 BLAKE2B b5c6f9977cc1ac9f497b9c543729921c2ac036c1ed75272094e95029ffe2f1bf68aad307574ec55cc1a39ed2f80d8d2535f280ef635a586f359b0cc0e9a519b8 SHA512 bb59f560b81f53a4fa41fbf71fb9af6b728518d6c9769da86332f5f8863f7546bbe6362801bd2b4eb830d926a07bae7a6d8182fe12088b30ac407f4e1d162af4
->>>>>>> next
 MISC metadata.xml 316 BLAKE2B 857b3a0a26e35ac2f52f797b85a42f91c74a10b4d8d6a1f5394465e68f6ad57bd732286650966f99cc516ec68d00f31f0f880931e2041cb596d50e521ac3a599 SHA512 e66cfdeeab0bec39ed4149454fd1876ce963f7bd0012fc659abf92aefbad4e5fba90c9fe84019273d5f837f6bdf438146b433d9ea00cfe1cf4356e112522f1ad
diff --git a/app-admin/doas/Manifest b/app-admin/doas/Manifest
index 32d9bf7c67df..266bfc8a7b4c 100644
--- a/app-admin/doas/Manifest
+++ b/app-admin/doas/Manifest
@@ -1,3 +1,3 @@
 DIST OpenDoas-6.0.tar.gz 28482 BLAKE2B 8d35a12f18609c9dd7746ff8ce7c39d16d7c5e595a05c0f1b91211d757029ae78311573228178f95ef92624f7a49d6ca1d1d0efd264104d66e1d20a8aa623241 SHA512 2bf5e00895a45d87785e7a494a1506844afd843ef5375e0b0e3795ebc24712bb941c6feeb87e426e41a240d40aca9b4c099f77220745bb7142a7a4b303441f60
-EBUILD doas-6.0.ebuild 759 BLAKE2B b464cbe922306990bbe10bf49cfb287a5be9f1bfc6e9508df7182c7daf5dc786276e4af63ad2723d2314e58a30acd3a0a7012697f679a6c6e59f8c9f7ec4f290 SHA512 28fc11ada8266651ac3f84eb084526ca8f7dfcb076467d06dec6af5ad6595263a3e781cb04b62d97242424873fcf99e72877c392e72301b68997e20b9636ac90
+EBUILD doas-6.0.ebuild 757 BLAKE2B 5cc07f49c5d2d6cc265b64cec423210db1a9b7a23420452495a8872821dba52205222e6437abf23e57f948a95a8d3baccc66bc77b88866739d075a3f4275c6bd SHA512 e4ac22ef41bdc89438d4165a1552e4883b5eaa02a484a978f15ceeb07a9775bdbda6a1669feb7fdac5d5ac39396bdd1789c88af2189369cbe339617f9795c2cc
 MISC metadata.xml 435 BLAKE2B 63f345e2db83040c0cd34cce3dbc5f1f53495f3dc6c4b54ef9b09085eb32708a81dbe1e36f8702649cad0f2bae6f3affa4d95a5e996df5d66d6d0425136c09b6 SHA512 87342e8a10501960ff97fe359c4caa697269db4d95e5e008705aa23467b164a25c6cb8c7158530c39cd19a1840192815c3e336b09ce71938bc56dbd2819b18ec
diff --git a/app-admin/doas/doas-6.0.ebuild b/app-admin/doas/doas-6.0.ebuild
index 0249bca14a16..5ee851f748f7 100644
--- a/app-admin/doas/doas-6.0.ebuild
+++ b/app-admin/doas/doas-6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="amd64 arm"
 IUSE="pam"
 
-RDEPEND="pam? ( virtual/pam )"
+RDEPEND="pam? ( sys-libs/pam )"
 DEPEND="${RDEPEND}
 	virtual/yacc"
 
diff --git a/app-admin/eclean-kernel/Manifest b/app-admin/eclean-kernel/Manifest
index 3ca4b5a92bdc..696dbb8bfba5 100644
--- a/app-admin/eclean-kernel/Manifest
+++ b/app-admin/eclean-kernel/Manifest
@@ -1,6 +1,6 @@
 DIST eclean-kernel-0.4.3.tar.gz 10650 BLAKE2B 228d17cfc5bed34e892dd6340498b87cbc32f22e83aff70824ef24f88836e3ad2306eda8704e25b7cfbadb33984edee8effd613dad67ada25519c601ec6b6ec7 SHA512 a2ffbfe800672ad0cd105425497dae72c0779ec9da5ba6a6b4efd8846762467acf6b8e70c67744e7c7639d5ba2ba4643ad344aae193e72d12d12f48b1793ff4c
 DIST eclean-kernel-1.99.4.tar.bz2 78909 BLAKE2B 0cac3a001c3180c57bdf9a63366d9950928690328fd560f984c1d35bcf88712e897462a153bc3f0250ebbbb42518798e3407c3533351543ff32bd68ecee2ee5e SHA512 f3263b83b36878104e21fe122eb96a16c5c5a930b062fdd62d6a574db597644222d5a19d7833cbb894a955076b06bcb1a22c94d5f87c2787420dd1de32d0f789
-EBUILD eclean-kernel-0.4.3.ebuild 496 BLAKE2B 7b487677ebc6c669527ea384f86e9137dbc1c516107c248b7c15a9f1f8ae2a84433c3b06d426a1143dcf3c59ec691bdd91469b8d6a5ae09126a29c27a68d91cf SHA512 6e2498c23eac95fc82380f13211bd72554bdbfc8c5057a7c0a75b9654737eb6c27af18374bd3667b41b28083563c15f9baa427fd0bd59b6d4c1512147d26243b
+EBUILD eclean-kernel-0.4.3.ebuild 486 BLAKE2B 61aa62a599230c6ae820f451ffdc097c70135f71c1636e2368bc72e8ee774760b1c550fc1b1165417f2c48654939fe3153e6d33389435e4fa2a335def9151ee3 SHA512 ec24f6ad1ebdd673dc983808850cc96e84a3194c0c1634ce1f49631b9c3537ff0913cb512883e702e53ffccdeb16a284901ac3294c1ee52a3f0cf5a12785b585
 EBUILD eclean-kernel-1.99.4.ebuild 362 BLAKE2B 20894519cc3270ab4880c0373894638d18ecfeb34fa49a7f801e4889d22f78702c87201c3cba929092b38149f3b14109b058f95f597eea8c1507011af37b14d8 SHA512 61b64ce5d1f0e842de988f1d62bb41af6e16ef73a05ab35b90d97410292c5409c3873fac6dbd9a09e4be033cd19e70a283cfd6be48183409822c29ef26abdc85
 EBUILD eclean-kernel-9999.ebuild 401 BLAKE2B 075d11ebda0764b47d16b0bf36174af6554ea42b1a62450890b7051f33a9fcc2691a6da8a1e73161e38879af2eedefb6b5bd7aceb01c5ed92050f505e805c75c SHA512 efef86fdb8d6d8f65f6be0693967449d6fb36bb45e9346de2ea60ef9ca0178bb61303b2415a0a589482ff0dfdd020812206dc0fdefb6ac97a6c2e6de880a3843
 MISC metadata.xml 539 BLAKE2B 23dbdae146e666b8698181642673dc708027ddac7c33a9f53edc9cbf1d1e1ce62e8d4531a6962098bdd6cd2029369b587823b2f9630e285b43c0db340b29e70f SHA512 2a74b715ba28178d042f907014b02fd181e0e481f4eb9230b15ef542be61b2e1fce17efba4819b6d06de09ed7988b39047b59182b6c4de86a2a05ad0350635dd
diff --git a/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild b/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild
index c4b2a5852ccd..e7bbda32ef41 100644
--- a/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/eclean-kernel/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] )"
diff --git a/app-admin/emacs-updater/Manifest b/app-admin/emacs-updater/Manifest
index 4631eabfc7c3..00a8c59ea7b1 100644
--- a/app-admin/emacs-updater/Manifest
+++ b/app-admin/emacs-updater/Manifest
@@ -1,5 +1,5 @@
 DIST emacs-updater-1.15.tar.xz 7020 BLAKE2B bb35103b328a57dcaeb11c258bddbd3a08141d1e245ac4943c7a5a8b815440db0cd06eaac01ad2a00e6e2aa0d23311d774d190fd761be66514856077b3c4e296 SHA512 8cc7dd3e0e28ae71030c7c5f29d54f24e12adcbd0615f3c598ad262bd233f028c2424c277aac7dff7b4201a2ac24bfab0e05d1fdc07edcee2c184a733f699b8a
 DIST emacs-updater-1.16.tar.xz 7112 BLAKE2B 82160ef71b4c22a385a45765c1f60b7d428297cfb3b51f84bd44b176d1bd302165f9ccdde803aae628a2dab9e0520098082232c513b2006ae5facfa283f287ab SHA512 3de3126debc49ea47bd57802c1a3aa82a0769ab392741fb891c93ffb66141f05f58025fa0de746ec78795fc34c135536740e447e1f6a4ae59aa847d21bd6215b
-EBUILD emacs-updater-1.15.ebuild 969 BLAKE2B 9b77db09396e09d9c80f7f49a46bae2e202b0cfd1b43ff96f7cb762c6255565967265c6cafc24d5d6859195c77a6047eea70a5d437985fb5333a811f176148c9 SHA512 30e75f83c944a730a58ad8dbc36f640fe1e87d378db2ba4465678737f77e8f29156eb50b0ac6b07ba084f0b13d5ff216fb90d0db8a28301b81c4fdaaa03bf684
-EBUILD emacs-updater-1.16.ebuild 975 BLAKE2B 849e7e48c226fce94686eef0c3e219c9458e77c23f0c012ce13c88424a765bdab505e1397f22bb90e3209efcf80c0c9df56197c910be672588c1158b05dbdac3 SHA512 ab7eb7321d2a986073951ec206f2b5d3beffa8dd4d272c2c12a2149dd8057a80bee43a5f647aba0a2752ebf9875d7129d68bcb3fc559f77cefbc3b1966c3fa78
-MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
+EBUILD emacs-updater-1.15.ebuild 947 BLAKE2B 0e2bbe9663e9bf7ce6a6c8c53a6749b59d969932866e14a6d0b8313f2b0765019e97041a784639f3db09484204c054233c073c3815b5bfcd5ed4068f1bff1d6c SHA512 5435bacfd84cbc37dbc36ecbcfa88a2c7652c03bd0584182104a2afdabb24b249234c7459cb7a498f5437a9f7b114f30f2f6a17ae83f04526e6845b0169f857d
+EBUILD emacs-updater-1.16.ebuild 944 BLAKE2B ba26ec13d9bb84f684b4569b2b05c22ba927b428e06d9217815ba3255e8d97ea530f70b871e72165baa625e679d4a78b2d6534efeff8421e07f3039d8cbe08a2 SHA512 ce82d545fe6da6f30dfdbb077da016d40041be126f7fc653c547202efc21d72f2907bd90571739b798cd49bdf186e3157864a85d4a660fa6220e874806da4a9e
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-admin/emacs-updater/emacs-updater-1.15.ebuild b/app-admin/emacs-updater/emacs-updater-1.15.ebuild
index 5f285a56dcac..f95293356b5a 100644
--- a/app-admin/emacs-updater/emacs-updater-1.15.ebuild
+++ b/app-admin/emacs-updater/emacs-updater-1.15.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 DEPEND="|| ( sys-apps/util-linux app-misc/getopt )"
 RDEPEND="${DEPEND}
diff --git a/app-admin/emacs-updater/emacs-updater-1.16.ebuild b/app-admin/emacs-updater/emacs-updater-1.16.ebuild
index ef79c178430b..37785564b0ee 100644
--- a/app-admin/emacs-updater/emacs-updater-1.16.ebuild
+++ b/app-admin/emacs-updater/emacs-updater-1.16.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 DEPEND="|| ( sys-apps/util-linux app-misc/getopt )"
 RDEPEND="${DEPEND}
diff --git a/app-admin/emacs-updater/metadata.xml b/app-admin/emacs-updater/metadata.xml
index c438baf3b326..c918cdef9591 100644
--- a/app-admin/emacs-updater/metadata.xml
+++ b/app-admin/emacs-updater/metadata.xml
@@ -5,4 +5,5 @@
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest
index 5121cf256677..282a2faaf147 100644
--- a/app-admin/entr/Manifest
+++ b/app-admin/entr/Manifest
@@ -1,3 +1,3 @@
-DIST entr-4.2.tar.gz 25599 BLAKE2B e1bf4e54df7077219d213d994a26ea10517dc88db92194d68acaa3a01e80ea3e81334b0b24bb39654da1d220b7175ab4088f583c46f9007e93e5da7fc7fe1c04 SHA512 67fc4eea415a5deffb59b493f17aa577746217c2cda6b5645d22541be6cc10ed949bb6e37bd46bc6e5cfd951f7ff611eb927be6f5d43db381437d3d1eb6f7968
-EBUILD entr-4.2.ebuild 576 BLAKE2B a9d9b2a2a469f49a19d44787f58eca8f6dd1f1792237efd731e6d01c36949fad0563f0024f3f474f2e039bbc9c9fae3d87be71e01405c203af37eb74744e715c SHA512 3c91e40d05ca6e5e44ba18ae4c10bbd2d19891de7e82f61d67d60c8ef198edc27b78346ccf027c41f762721966e809f0ef4a64188a587781b324d8a78a552520
+DIST entr-4.3.tar.gz 23756 BLAKE2B 0272b0185932d7c388818df0cc615e991c9545473a823c478ad9f0b6a23c97c0f4b2727b109a7bb18e2b0792f18d94d188d4a5d3fc90c479628ea078b1288f96 SHA512 f65dfc3f106e25ec4ff39eaec94222d8a547eb35390c654f6a741f92541c1b86d7d303a795308fcbfced44ac8eca6ad67e70393802ac9d46153e037dc1eab902
+EBUILD entr-4.3.ebuild 551 BLAKE2B d33d3a0fc6d239c851a63f05a66726b8cc4303fc7a01e132278418122dbad9fbd9c391d6f01d86c50c0965e5e3c7d6b2a14d6f2263ac3722521f05ea27970654 SHA512 4e39184ad8268fafabb60f3be857d1adbf015b51cb7b2f58aaa204b9d5351f5a8dc2bcd957c019e1a55c28042253e91e51e8cdf9b835a3640247e0c8d4a06239
 MISC metadata.xml 377 BLAKE2B 377ae6a1620e09bf5a309a212ed7b4db5516e51b9e955373502252ab4fa5bdd9520d5c145905634d76e3884a3a993a6fb2cbe37e730e177081ea5f0c65b3c1ec SHA512 7db7620ce42324e2a551b2fa5898aab491c868b5d28b938e163ea1bf24aed66913fff8d611e95c634e65aa5372bed9314a55b278d62157929d6873cea7994bd6
diff --git a/app-admin/entr/entr-4.2.ebuild b/app-admin/entr/entr-4.3.ebuild
index be89649663dc..bfade6f4da8e 100644
--- a/app-admin/entr/entr-4.2.ebuild
+++ b/app-admin/entr/entr-4.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit toolchain-funcs vcs-snapshot
+inherit toolchain-funcs
 
 DESCRIPTION="Run arbitrary commands when files change"
 HOMEPAGE="http://entrproject.org"
@@ -11,7 +11,7 @@ SRC_URI="http://entrproject.org/code/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 src_configure() {
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 5ccd745006ff..e495f70d9a3d 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,8 +1,8 @@
 DIST eselect-1.4.12.tar.xz 177520 BLAKE2B 0938fe9bd8785fe711edc1af63a9c318a4a5fe9141c61d7f1c4da0352242322f1e18e4f68f7e219a1aa2beae5b25ddac58d7c47d4272408fd8fe5207324ef7c7 SHA512 2ea182364dfb2333112e9eebe691e1963e95a4c9ab40945eb2e5bc8c81da76105c1ae6aa3d153b78dea6c1e0cadb9b0237f7556b8ceb9d48e0fba67a642d6081
 DIST eselect-1.4.14.tar.xz 177492 BLAKE2B 236ddb09231283a153c20be779d012979a25d42a7043c75af866e777731761406d92896bfef399c3bc63e529af4e36cf538801302dc4bb719f065d6bab8ad9e4 SHA512 b17fb63039577f20515056fae1b0f7e86fa2d96f38a5eec22e637cee0b25f4d68087ef8a5bd4043893db5be66ea201bc8ae6437bb049d208b81e76a57612d658
 DIST eselect-1.4.15.tar.xz 178996 BLAKE2B 4354d975c8af2e1de0f0c6efe2badc92584e947f9b73c05aac144caf8f9d74c850d366c7c225112322a504262b5f285f6e2e8d32223f1b2d4bac87db740a148c SHA512 ceb55fecc2bf70e816679af9b20653b29aa9ce24ca2d4cd0c6e02ab214689459bc2ccd5b3968ac49249b8fb6613c6055e7e76598b86c6a114a9abf847c4a2b58
-EBUILD eselect-1.4.12.ebuild 1623 BLAKE2B 6d8d236b4b11ec808ab1f95c0a1c295fc4ffff17f85151dd176354a1a1bb7459eb9d64f59411b7a7e3905a563884865c5dc23973f5d6674f13ebafde00ef3d0b SHA512 398ca70365af9bb0aef6807b8d797fe55c10afabe25b2e7a4657aba39b70748f04a5f94b24569701042399e9c4ffea1c48b824f7b179608d080981ff1159f2da
-EBUILD eselect-1.4.14.ebuild 1627 BLAKE2B 681b9aa31b4e3e7cc0857c9ee13dabeeb78936f3c6a41f8ae43a44526086bf8e52ef047ba9543b0fd14280abf0025164dc6fd5b22da481b1009cdd7a9f65c4fd SHA512 8028a79b110b47c0b75ec0621729cad9be30a103ede0d0e6c3e07220fac775704df733da7b64304db2e882e3aacf310750338f9ee224baef602cf1100f96da06
-EBUILD eselect-1.4.15.ebuild 1640 BLAKE2B a2628b326ad57259ad0dc50fcce13403dda4505f5f83aa9982ad0f230c543ea3937414f5538eb635cfe8dcd9e3d3cb93d6a97cbb541dea582245fceed1fc8e5f SHA512 4437117d84c679538e30e85e77a8707c1639c28619e9161a15cf90b69edc856901fed81a8eab6dfb867d4f4ad294c804d5f19197a627d7d40ffefbf9a2296e19
+EBUILD eselect-1.4.12.ebuild 1601 BLAKE2B 2686a4c94796f4eea06114c9cf242c4dff3daf650423fb7e89437ec8ad9d9164b1ecefdeda7c81bd6d7d1bd61d2c0d487db4ae0d5381f84bd3a31208abf5379b SHA512 43935b87ccc169dc442e81a05c9f7bb4f7a417606895693a91810b1a1f5e096d9eab7de8e939f43cf06e698ff9616d00f47deae7d970fea62a4d822777330848
+EBUILD eselect-1.4.14.ebuild 1605 BLAKE2B 1580569165e5273eacbf56cb4d74c6435f9c72bf0e2bf1012089997f6a99de3ab0b8503f5fe528043edc4a470257fb22c4361b7a62a913bd5c0ddbfd1b373281 SHA512 7afeaaa18391f92e834701a3f1d1a80c066815eccaaffde62dfd6edbf9279b2e73a125dee428c8696d5da1f1dc67772c85feb2c540643099ac17d88d660a5f78
+EBUILD eselect-1.4.15.ebuild 1610 BLAKE2B c1587a77851bbbf877c142f7c303b81e316772860ce972e7e9bb460e8c6de2aa5c4a4d0185183e69946c36ee782aa7805618865e5587a959a621621d19230ba5 SHA512 3707a3ea7fe5e7841f8b9ef68c223db549ad5547a1ef9b359d2559c76f2de79b34d9f1baef8927adddf46cb6911e5a7c90d42f294796ddbe22ca0aeca5f645c1
 EBUILD eselect-9999.ebuild 1437 BLAKE2B a390e3198a7f7f52f48ef56bdb73a8075d5c4c1560c0df7971d32798f1296114053b16a8faeee2982b8e106be835e3b61c3655dc2de270b488259f185e8a8980 SHA512 06a5eb4f7bed5a17f9cd56fe497a7cadb7a153580fac6aeefd6f0762ed029c78c79e4f4a50301177eff4e50ac3ac5ddfae342eb0eb4b5c64aa6a840493fa5868
 MISC metadata.xml 272 BLAKE2B 68f9c1edf77cdf1dc46891129ed694307cab4e954c6cb002c3fc32fba216949c83a21dc0618f4bf24fd8e1da5558043709210e6697fda3881adeb69a30eb569f SHA512 55cba722900834986e0ea0c9cd8463c3b69d3ada26227d45c8cc3aa07f6ca40919457f80b03a559a8f9ad55636d931cc2101b928b438aeca19b0531c90ec40a3
diff --git a/app-admin/eselect/eselect-1.4.12.ebuild b/app-admin/eselect/eselect-1.4.12.ebuild
index 327564831742..dd1ab17e85ee 100644
--- a/app-admin/eselect/eselect-1.4.12.ebuild
+++ b/app-admin/eselect/eselect-1.4.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"
 
 RDEPEND="sys-apps/sed
diff --git a/app-admin/eselect/eselect-1.4.14.ebuild b/app-admin/eselect/eselect-1.4.14.ebuild
index e4f23dae6b0d..b30ff80bc0d8 100644
--- a/app-admin/eselect/eselect-1.4.14.ebuild
+++ b/app-admin/eselect/eselect-1.4.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"
 
 RDEPEND="sys-apps/sed
diff --git a/app-admin/eselect/eselect-1.4.15.ebuild b/app-admin/eselect/eselect-1.4.15.ebuild
index 61a8c2e50a68..7165c6e763a0 100644
--- a/app-admin/eselect/eselect-1.4.15.ebuild
+++ b/app-admin/eselect/eselect-1.4.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"
 
 RDEPEND="sys-apps/sed
diff --git a/app-admin/evtxtools/Manifest b/app-admin/evtxtools/Manifest
index 9fc4713d8fb7..709bbef172c3 100644
--- a/app-admin/evtxtools/Manifest
+++ b/app-admin/evtxtools/Manifest
@@ -1,3 +1,3 @@
 DIST Parse-Evtx-1.1.1.zip 71351 BLAKE2B 27e28a75e5a4ccce437f86a5924790d602cb7091c422a5f39e5a1ee0e785762b2f77999c84dd7f4fc52dbd58a90e03a80ca9de916e4df12c464959c8c8a5bfc5 SHA512 308fc3da4e9291f5f84cfbb0a2a17f92d45a2314d6b1806acb59e1a2d521041487a51a6e88e70c03a683df5a9442a30d8dc2483cf684cb96bb86f0a05f27e752
-EBUILD evtxtools-1.1.1-r1.ebuild 779 BLAKE2B 361a04fde07fcdba78795671a634eb6e1f653ade17e04f3a11d72d732418506a71be44f8c8336f45e1d5f212c855587aaa47120ec26fef1bfddaa2d590907c06 SHA512 80bf828201683d733564491eb27e6771c8b40e0068470b83c97fb8fbfe042c9b2d32a0e5430ab44660302a655fb2f18dd22bed246b2fb941b072005171c1f4f3
+EBUILD evtxtools-1.1.1-r1.ebuild 767 BLAKE2B 49ea4ef7b318f48a16154c072b8549119e3cd422ba8e2bc83cb162e585919b9876917bc53da419a59b2f7a6d935002fb0d1d63183593b917098c5c0634a89104 SHA512 f97cd31347ebf8be1fbfa930caab5e10a6cf8a707bee63740664dee435b64855232ffef8b19a17bb6b5e16d66c78e1bb4980b2c6b4073bbeb4dfb91ff2ab151a
 MISC metadata.xml 247 BLAKE2B 94608f4bda5b60a090b18717a5d81d90defbb5e482043059dcb7a41d39a21b9192e6f58a1ebdb83cc8cfaa9fe85ced13c40e6e43c110e0e21b2cb6a36f6dc852 SHA512 1196d40f8c6a3b2e5d0c0590c2f56b53ead40ec8d9eb2c125094eb961b092558c51baa89f237fda24cf1050e85c78dd7419e1d217c2feceb32c6296990ac54c3
diff --git a/app-admin/evtxtools/evtxtools-1.1.1-r1.ebuild b/app-admin/evtxtools/evtxtools-1.1.1-r1.ebuild
index 972e084d7673..3beba8065263 100644
--- a/app-admin/evtxtools/evtxtools-1.1.1-r1.ebuild
+++ b/app-admin/evtxtools/evtxtools-1.1.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit perl-app perl-module
+inherit perl-module
 
 MY_PN="Parse-Evtx"
 DESCRIPTION="Read, decode and dump Windows Vista/2008/7 event log file "
diff --git a/app-admin/gam-server/Manifest b/app-admin/gam-server/Manifest
index 00d2fb8abaa4..d3236919df3e 100644
--- a/app-admin/gam-server/Manifest
+++ b/app-admin/gam-server/Manifest
@@ -6,5 +6,5 @@ AUX gam-server-0.1.10-noinst-lib.patch 2207 BLAKE2B 28ebca731a16fb10c0f186c3eb75
 DIST gamin-0.1.10.tar.bz2 452194 BLAKE2B 75537862c2b90734b616630b80103499f549fbab69f2417cc089b050a7e245d89701b0703a0916d6dc08a706785ee509ee4feed0375107f777fdf4248ff5f93b SHA512 ccdbc06eeb958ed2d888aee3fcadbadf00e9e6566802adee82035e0762ac3351ed2a2983eabe07503ddde2ddf035185c6cd98cbece2feadaaa36e8f656a38306
 DIST gamin-0.1.9-freebsd.patch.bz2 4635 BLAKE2B ea27afc7b978e15e9e957cbc1129b5bc8f0dfea7571e7bbfda981bc319929f8702d6a823bababb97af2b1da95c8403e9189c5ecaf599275e063f71d370526b89 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b
 DIST pkg-config-0.26.tar.gz 396399 BLAKE2B 5a88cf825d6ad99d198418798b28c779cfd4c0bcfaa023e915a818c141a504c49a6281ea0b2d04a7a9ec89f9924c87f8b1ddaa5a088952715397081383b3528a SHA512 9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4
-EBUILD gam-server-0.1.10-r2.ebuild 2651 BLAKE2B 4dcf004c90ca9aa6d6204b4a58b8b7253280088904e5cbab88987cc96e99c4206dd6f4d58cb6819ba5c04604bdd620c0b2f9a4e24d056c7abaa73245aa823533 SHA512 722546e4f96567a71cb6db8e5fe6935ccf7cceb9634010ae21aa5b5ffc8af532c6a43790d40de7e2eda61518d9cc767f67672a1e0ef289d139b01be5fb52e1d7
+EBUILD gam-server-0.1.10-r2.ebuild 2629 BLAKE2B c0883054e66f4145dc5041527d5d78f3dae0fd281f0750fe78ba9a38285210924904634a4f22e8d58e4f27761d7226ee3f2f5eba5e5438b83faa90f575549ce6 SHA512 5e823e9351c231ef5385cd58b7557ddcc0421b225e75a8b013f612012f8b669ac97cf982332c189efcd8c61ba50a7698c99f8b85c2263be7c0a14527c2fe24ab
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
index f82ee5263352..9d66f04b72eb 100644
--- a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
+++ b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-solaris"
 IUSE="debug kernel_linux"
 
 RDEPEND=">=dev-libs/glib-2:2
diff --git a/app-admin/gamin/Manifest b/app-admin/gamin/Manifest
index b11ee4cc59f1..dbaf496c6821 100644
--- a/app-admin/gamin/Manifest
+++ b/app-admin/gamin/Manifest
@@ -1,2 +1,2 @@
-EBUILD gamin-0.1.10-r1.ebuild 614 BLAKE2B f73759bb5ecec1d7d3bd0c4ab54c7400b3b9b22a3bd626743474b660ff4dde0dfcb64f34a4c50009091c1e195f62f656171638985b91e385980a6f7a097a28c8 SHA512 c99fe83583f6ed19ce3304cae523f0007ca9a18a252b3be98792eec0c6a11aaf3db8db0aa9f9a041490d2044034abdef2aa5dd8e740f4f36fd581b9d2bcbc94d
+EBUILD gamin-0.1.10-r1.ebuild 592 BLAKE2B ab48d84a1767c380a019165d787a76b0013161d1cb1af52a125a83bb5e672fb08c72b3bf17208a86d6861831cf11f4eb2dd71ac749892e86d113d444615b51f3 SHA512 126a402a9ca6c6a13ba7f611a4b160504ce4e7b1b34baf2b57eb06247fff8348ad5b0b703cdbaba9b632886e01360a779413b8baf5eb9b6dfd8852d56c7d3bca
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/app-admin/gamin/gamin-0.1.10-r1.ebuild b/app-admin/gamin/gamin-0.1.10-r1.ebuild
index 5f08ea6d4748..eafa0bc06fdc 100644
--- a/app-admin/gamin/gamin-0.1.10-r1.ebuild
+++ b/app-admin/gamin/gamin-0.1.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!app-admin/fam
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index f0889aca081a..19640b675a93 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -7,8 +7,8 @@ AUX gkrellmd.initd 345 BLAKE2B 922967be33dcc733c55cfffa59addc01bbe2ba0298be14541
 AUX gkrellmd.service 173 BLAKE2B c89a772fd0273b54766f5cea36aab9156d7a1d59f5759bdd673651afebdc21e1bf6108cadbc6328287e6fc62d0edac215eeb7e6dd9d8d6a916c7ff913222c511 SHA512 8703ea4e51d243050034b65b7bc50b3d1862a6369af72b0d9e47285558763066e27dbdfadd54a4316da0402aac0d92c17cf1c42eed2b7926226191ce5d85089d
 DIST gkrellm-2.3.10.tar.bz2 782794 BLAKE2B c0aac7df866d40c79667551ca4b25346da4267a0aad8853776425a08097dcfe3a24082e7e5d17db6d3936b59d10c29afa11e8a425319c19696141c02f7d95f25 SHA512 3ae0baa0d51729e1bac7b8f10e008bd7ed9d93d48cd894630e3a027565266e6458df0dcb3171fb271ca7766f4030149e3e6aa234ec191e8e223ae4dee1feb295
 DIST gkrellm-2.3.11.tar.bz2 783123 BLAKE2B b68c60477e4994e9508a8e5ea39fd09ab5cf0f019fc6b4567b9482b3b1fd315dd2548daed262095b42dda43ac068295d5c3c375c5cb80c91fda76ef8b9834df2 SHA512 e4147aa90e09925b9672728f287880bde26632d77d83d3f0b9458a201593a57158d9eb8cbb31e569e0d71d91a08c9bceba29814f59e542315775663ef9fd27a9
-EBUILD gkrellm-2.3.10-r2.ebuild 3276 BLAKE2B fcb5c7222e306fec7d2a3936617ee19606f0cdf95d6cbfb17291669c77b1dd5942401b72355aadf5a2a1267aca4a1e78c8256d80ed8d78f93135e061d30acbda SHA512 30b6a8c19d6f848276372a4c63d4cdfc91b27cdb276bbaea41773af4461da7c39e18a00684c6d6fc24e25d6df9b8d9e2d071fe6ebb407b143460e2188079a77d
-EBUILD gkrellm-2.3.11-r1.ebuild 3350 BLAKE2B 9ea403477a4987e1fdaf3c3325a5d8ac59ab9e6d66c275e30d1015368bf160ed2d288d5b855dcc31a766d65dc5c52423d16bc3fa0694c771016fcfb2df727b01 SHA512 eb4402414885b31ef605a91cd79a3d5cc82cb7fb75bd01531d8023481cb6bdb2735116e30a55fc6fc453ea6afefc73cdecb5410681944cc5c12418d5de41c9ff
-EBUILD gkrellm-2.3.11.ebuild 3390 BLAKE2B ebf9593c76124df73379b39d679711ecb537fd7d7a70168a3d8312ba162a8d027ec617be46ff6aed8c76b6c5aa19c957336678d67bc4d94ce17f4eee2c5afb1e SHA512 65cdfae09c0f1fbe39c45fb08985397387ed815c706f7c548d777f4d15b55f937ccfbe5a917f458b322a42d966cedfde5a0718d26b272fe0efe82ddc18cb2692
-EBUILD gkrellm-9999.ebuild 3350 BLAKE2B 9ea403477a4987e1fdaf3c3325a5d8ac59ab9e6d66c275e30d1015368bf160ed2d288d5b855dcc31a766d65dc5c52423d16bc3fa0694c771016fcfb2df727b01 SHA512 eb4402414885b31ef605a91cd79a3d5cc82cb7fb75bd01531d8023481cb6bdb2735116e30a55fc6fc453ea6afefc73cdecb5410681944cc5c12418d5de41c9ff
+EBUILD gkrellm-2.3.10-r2.ebuild 3266 BLAKE2B d2d297ce64b5eabc551f063ad3b28b4a1351925c9a112bc8ed66bacc0825a69dfe2a02bcedf614f5b78e799f9a86171aabc77a2862a1cd7061e925097fd374c0 SHA512 7621c428ce861597b84802c5097df3c9a0777648e6a24a416c11d2255a09f8bf7fb96b1b57ba50902881d030b49a0fa694d998c14667900cf5b67c64b7a972c9
+EBUILD gkrellm-2.3.11-r1.ebuild 3340 BLAKE2B abbdc51c93283e45f59bce3d08cea145d25e53745b74a78031681e3dae31ecefb9c6ba57a0e93f2952fe2f576c587ad1733688a40258467f2218391a89191965 SHA512 4868a487263094f3557998fabf8f908a05b1023983d45b576f1c14295df880356647e7f1588f5ac0de8f0b1d21ab16379e4a4d96f7dbe455a960f35f11a54c36
+EBUILD gkrellm-2.3.11.ebuild 3380 BLAKE2B fcbdcea39dc5cd9d3064b88135cfb3e0157005df600c4e527b33401fef53d51b81d6aba724e732b63e71a38235e6955fddff697d1aa86afd9213b57901acb071 SHA512 1cf4e0fb31e9e323ed1859c847ebded405489376c3cbec6365d63a62aba7362c3b355a330574aaab40ce7338da1a12a0871e45960a787eebe83f9a37ae419290
+EBUILD gkrellm-9999.ebuild 3340 BLAKE2B abbdc51c93283e45f59bce3d08cea145d25e53745b74a78031681e3dae31ecefb9c6ba57a0e93f2952fe2f576c587ad1733688a40258467f2218391a89191965 SHA512 4868a487263094f3557998fabf8f908a05b1023983d45b576f1c14295df880356647e7f1588f5ac0de8f0b1d21ab16379e4a4d96f7dbe455a960f35f11a54c36
 MISC metadata.xml 917 BLAKE2B 88567611e5ddaed8c1f81e639c7e82a120f9201f56b9e512bca08d948c78a967e57490e754f7e3b2c9a4a9a2c216b1288c8059593589378b5404b51db50a9644 SHA512 8b880d60459e4cba922f2fe586f0dfdcc4b0f8054e5f5cf8650ab10bacb30380b67f81795c671e28bf0c51bd6f3379c3b653bc78c0ec954bc7456dccdad274f0
diff --git a/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild b/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
index 6deb89dbedcc..855cd74f586b 100644
--- a/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X"
 
 RDEPEND="
diff --git a/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild b/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
index 42065f550af0..1e4443fdd6e6 100644
--- a/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.srcbox.net/gkrellm"
 else
 	SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-3"
 SLOT="2"
diff --git a/app-admin/gkrellm/gkrellm-2.3.11.ebuild b/app-admin/gkrellm/gkrellm-2.3.11.ebuild
index c129a3783e30..93834c49a9a6 100644
--- a/app-admin/gkrellm/gkrellm-2.3.11.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.11.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.srcbox.net/gkrellm"
 else
 	SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-3"
 SLOT="2"
diff --git a/app-admin/gkrellm/gkrellm-9999.ebuild b/app-admin/gkrellm/gkrellm-9999.ebuild
index 42065f550af0..1e4443fdd6e6 100644
--- a/app-admin/gkrellm/gkrellm-9999.ebuild
+++ b/app-admin/gkrellm/gkrellm-9999.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.srcbox.net/gkrellm"
 else
 	SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-3"
 SLOT="2"
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 867bf1e07516..fc41eb384fd6 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -4,5 +4,5 @@ DIST glance-18.0.0.tar.gz 1987182 BLAKE2B 1e30d1897b360a8691e79e5e4eda290148146d
 EBUILD glance-17.0.0.ebuild 4933 BLAKE2B c13548031d58d2009e6cd38721ce97c966ac4e26ebba60bee1047115de63978d51ffa154d1b7ca6f929b95c0faf988f10387c025bb3e200b7f356407933d1f5f SHA512 e279c6c8a4c225c3c82c6d4d0e42c445016d18ac30ed7b36402462c6b2d7028eedbd117574191ff383a532dcf9db34a261c9e3df9c3f8a590073df4bdecf4c1a
 EBUILD glance-18.0.0.ebuild 5064 BLAKE2B 9853b05b91e6698cff58658ce9bcaab04fe188d25b3dbac8f52e9054d667482fc0dde4ebdc6d703a4bfcd4d566e928e0d33517cbf9204ea4e03ae4f2137b574a SHA512 994297106d3ed31c1d81c82a6c18eb0aa1ce1838bac168be2007a0c2da5dc71b02dc4f0f2e033b5ae2249c3bbc17246f90e950b4dbdad784a73f69b40b206090
 EBUILD glance-2018.2.9999.ebuild 4935 BLAKE2B ee851e3b85ac17acfd1c4bd17872ad5d4fc244b5bd674a679893e2d1cff0c6037e1f8503cb8cbdc24c577ca5f31ebac6164908433c4973f755bd8525672432ea SHA512 12ead5e77d22134e34e3b25408e7ddb2914e5cd027b4ede10a25cf5e258e16bee75ce897ce0abf0f4218525b00b8281e8b60e18926dfcd416186f445bf6ba7b5
-EBUILD glance-2019.1.9999.ebuild 5066 BLAKE2B a7cccf57a70e0ab42f4bca3b1a8d9591ecaba618d45be091383c91ad9df36786a0861d83960ee2160894afac3af891c8e74a37ed26e09567696eecd75330f556 SHA512 89da6fc1135e953c9264679b9a1230bae0d7686e1da12d468527a60fe35467f49fc15fd2924898ed015c1ba68bfc1d03eb9792402534a89b6ca792ce482938fb
+EBUILD glance-2019.1.9999.ebuild 5107 BLAKE2B fca67661ccc03db0279824d6352afd1d20103bbbb1e946eef4114d996f395bdbfbf152e88137c88d12961415d1d8136888037709f47f50cf1ed3f7dfe82d658b SHA512 888b1ca0843323152ffaee1e8a5b71ec2d327f58014559e4d77caed27137ba74ade854b8afab06c8bfeb578c1204d9f8a5a09da5bcfe5873b016aabe8499fcc7
 MISC metadata.xml 786 BLAKE2B 2d0d8d4d270200eafcb2570528bfc0fb0f3932295550186f9cf930c05d7ade06faf004d159047fe347716249166cf9f595c2512cea86aa86fc2c604582380106 SHA512 eed1ca2a7e15b1844de0a3a35453ab5890622cf161407df5ccb9d21ab2634691c94237496ddc8ab02881a687e16f8378f37817b20705112e11ee55d2a813f99a
diff --git a/app-admin/glance/glance-2019.1.9999.ebuild b/app-admin/glance/glance-2019.1.9999.ebuild
index 2647706b8889..3c7b073c2f82 100644
--- a/app-admin/glance/glance-2019.1.9999.ebuild
+++ b/app-admin/glance/glance-2019.1.9999.ebuild
@@ -121,7 +121,9 @@ python_prepare_all() {
 }
 
 python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
+	if [ ! -z ${EGIT_BRANCH+x} ]; then
+		use doc && "${PYTHON}" setup.py build_sphinx
+	fi
 }
 
 python_install_all() {
diff --git a/app-admin/gnome-system-log/Manifest b/app-admin/gnome-system-log/Manifest
index a64ef545b994..6801e5c0dcf1 100644
--- a/app-admin/gnome-system-log/Manifest
+++ b/app-admin/gnome-system-log/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-system-log-3.9.90.tar.xz 1350788 BLAKE2B 3325bb071a0a5c9b472ba1b570e8962ca4f00840127c757f482e4d0b25723eab4d96d83da168984f785c2c52b011c18fae718013ce94f146f3b68498d212bc7d SHA512 1500c62fed7babf2b1cc0f95e23d490bf8065bacf68c44095d882d4f429548b179df9276e3f2ff0bf03bb4db0bb5cd525e3210a5ea04f23a34e547a13f3dc2b7
-EBUILD gnome-system-log-3.9.90.ebuild 822 BLAKE2B 85a07afb95d785af44395d07a98bb98d7002b2c6218f43395b88db9a38a9dbe9ac1ec52d8bad2fd7430894ab472abb93519ffd648edb08c3d678fc8db21a8ef2 SHA512 1cfabe019b57a1aae41161f76a5383f9188ed0abc4a56fa3b8aeec0c83f7b4f57bce671fa9e9844a7d91e082aad64e3be66f66acd519a4f7afcd6dc4917be61b
+EBUILD gnome-system-log-3.9.90.ebuild 812 BLAKE2B 59191ca3506decce321179e36d83127432bbb8a664557850cf2d2501f2507b0a96bc17b04c8aa5eaed21e4d77796fd5b4f3fd0c787cf694a6b5820e2a28dd799 SHA512 b978acf5b3ca9d1e9b6b77a682d244b5ad910913957969e00d9b8f53066a67dbf84b280c70a3e9eaafa351029a3bad89410677629b5c6ea04813521c5a25251f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-admin/gnome-system-log/gnome-system-log-3.9.90.ebuild b/app-admin/gnome-system-log/gnome-system-log-3.9.90.ebuild
index c82379d3ce5f..3697ee7615fe 100644
--- a/app-admin/gnome-system-log/gnome-system-log-3.9.90.ebuild
+++ b/app-admin/gnome-system-log/gnome-system-log-3.9.90.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Attic/GnomeUtils"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.31:2
diff --git a/app-admin/haskell-updater/Manifest b/app-admin/haskell-updater/Manifest
index 31f64e4d51a8..29f543e89d62 100644
--- a/app-admin/haskell-updater/Manifest
+++ b/app-admin/haskell-updater/Manifest
@@ -2,8 +2,8 @@ DIST haskell-updater-1.2.10.tar.gz 26586 BLAKE2B adc46f85118fa55e530aa079ef2df06
 DIST haskell-updater-1.2.12.tar.gz 26708 BLAKE2B d0b040cb3b6211b3c5c60f8cfa3dbccbf9cb15d246b21609a21aac746a8a034e284fe0b99891b5035980252a7aa8b376ad943f32882dc29e16226d95583cb053 SHA512 f3a993cb556919bf2e57fdaca7eea9146abc59096e779cbffb69a5c29fc5f6ef889c8ccf4d8331dbd9279919ea91bb05a16d83ad70085d5ef5a44d61120fe7e7
 DIST haskell-updater-1.2.9.tar.gz 26675 BLAKE2B a3d11cdcee886a07d87cd2888a9deea1d963b7234b4a10a6b78e9467fae4e9382c92f14a6ba0593f86bf9422ab2cb4bec823de96f34b463590ae18429c118edb SHA512 d19b6154d5ef4da176638c237082586688e2ac73a41c075fc3e51979b86b9e48ca5a9bfe6c870d468d66d95c1464456feed8afc388aea282aa7aad5a35f5e0da
 DIST haskell-updater-1.3.1.tar.gz 26573 BLAKE2B 68e5357e8f24b9b372dba4feac76595cbf35602d9d9094d616497c9d0040177b5f1def5833770041b693220717f3a4976877e0608858d5d8d4dddd26620c71e5 SHA512 39c36c4a8997806bb4d64625bc9ed72334a68e57f8c32f75d0c3704ab52b3b68605444c89480e5186c04bb275b3608ea9544366ebc5a00e010cc5fb4ae8296df
-EBUILD haskell-updater-1.2.10.ebuild 1067 BLAKE2B 13ec8d391f9046db45bd820988e90cc2b3e960a8d09cc245468206ba67da95ddad19056175012ec94a3be60e413a7ac17831ef622927e38b79216515bfd3cbb3 SHA512 73667872eb360dc9796de23306b049a55ab03d617bcbcec9caf8db0a5395522ac9bf8f3ba64a952c177bdf2e502de84fa7bf02699490f4c83979a474f6ff0651
-EBUILD haskell-updater-1.2.12-r1.ebuild 1084 BLAKE2B 134c72af64da1a9cfe55204f33ce8a207e545dd2430939ad81f3d06e4c6391272c633d1427e96376726b1d4cd6ccd516f8f6fb3477e4c18550901695ed340439 SHA512 0255aa8fffa8921f05bc8b083f0496c9a607b6766045554075e59f64912531ad28d61a7e3d46c694b433c8b933a017f17b6b286bdf699135c2a8088069f11a61
-EBUILD haskell-updater-1.2.9.ebuild 1067 BLAKE2B 13ec8d391f9046db45bd820988e90cc2b3e960a8d09cc245468206ba67da95ddad19056175012ec94a3be60e413a7ac17831ef622927e38b79216515bfd3cbb3 SHA512 73667872eb360dc9796de23306b049a55ab03d617bcbcec9caf8db0a5395522ac9bf8f3ba64a952c177bdf2e502de84fa7bf02699490f4c83979a474f6ff0651
-EBUILD haskell-updater-1.3.1.ebuild 1091 BLAKE2B df71368669f80a9ea8f425ceca2ab14961b6637e6fb9a0dacedfa1c0d6ffc9ce582ad847828c274a8a5526f631e82d29406a81e6c1612a68667d76db443a5e3b SHA512 0d7886a3519c95548a09e57b8e293ecab1094fb70f4d30b6f30fac2b4db3a57c245e32f9f468d3a59e0311b37930461ae6dfe1794ecbdccf88be2743da108384
+EBUILD haskell-updater-1.2.10.ebuild 1057 BLAKE2B 6de5eede85c3ece64df6022075ba7f8b6ba6f326e9b1a96cf0b59e4e226275f49c4017fd8df17320648201b1772879bd76638da022f293cde3f612d3fda82071 SHA512 ef104cf24e0adf77e184c2932cb758835900e495c129152661cd557dda810df3b35e280b7150c760fe4a21a790970bf93daee9909724f6876545fb42ea9ced97
+EBUILD haskell-updater-1.2.12-r1.ebuild 1074 BLAKE2B 551cd294e08427c2f4edc6b7f5a451b9cc71ce8abfa8145b01e34bb4936102248aa01c92e74e153654146dc2a94edd32149d0c8eb60e34c0668449e1e7729389 SHA512 5e2e0fa01c5f750b402245a8b8aee055302954353f11d3efb08826b5652394d6354d1771005051cd8fdff143623743976d985d80858542991d7b057648bdb1f8
+EBUILD haskell-updater-1.2.9.ebuild 1057 BLAKE2B 6de5eede85c3ece64df6022075ba7f8b6ba6f326e9b1a96cf0b59e4e226275f49c4017fd8df17320648201b1772879bd76638da022f293cde3f612d3fda82071 SHA512 ef104cf24e0adf77e184c2932cb758835900e495c129152661cd557dda810df3b35e280b7150c760fe4a21a790970bf93daee9909724f6876545fb42ea9ced97
+EBUILD haskell-updater-1.3.1.ebuild 1081 BLAKE2B 38aec82f7296816766c16ba0cc79755565b876001112416de24c0aeed4e70c671738edb0c06bea58e300d004d895bd9bc249838247a2464adf82789e84693712 SHA512 2f6981052e64f8c22a2fa7896552fc68377f1c0c3337af23b9932796de8421996b7fd438549cbbeaaecc2927fb044553d5ab80a961142662393e1c7dedf5d8ed
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
index 61e60ee2e73b..5a8c8239ede7 100644
--- a/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-lang/ghc-6.12.1"
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild
index df22496ce85a..e4b014ecc799 100644
--- a/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-lang/ghc-6.12.1"
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
index 61e60ee2e73b..5a8c8239ede7 100644
--- a/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-lang/ghc-6.12.1"
diff --git a/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild b/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild
index 368c5c29c821..e27c083e3a07 100644
--- a/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-lang/ghc-6.12.1"
diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest
index 1908834d6c51..f5f7d2179cfb 100644
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@@ -1,5 +1,5 @@
 DIST hcloud-1.12.0.tar.xz 436432 BLAKE2B b1263bfa89cb52d197d51c181b1166db84ae10613e448aea16b7b8a5399214a82025f3282d39ac359712b3ddac2decaeda148d9b392fdcb1f5d4d7dc6aa6a598 SHA512 f557ba4515ed158e9c153db4c6de97fba17123c7128b6fcc2bb58472a54f32e342df44f634c42af06a3160b45af4f1f9c28df001a0922bfdca10ade3b1640368
 DIST hcloud-1.13.0.tar.xz 442896 BLAKE2B 8bf43da9a4db336a1a313cc6a3b10897c18af57a36d9d02cc35e0edd22e0d1f711963056edf8e5b2eb2ee32e4c5d7e3f9685963b0d438e61d338ab27a1641b27 SHA512 1352e688c2c96995539a8f2a30b4893d6ccc3e8f092ff94ceca086ff67f2e6bb26ed3bdf6fa3bb3c9d02d93264f48ff0fac2bfff649ddcc0bc94143fea5c4da6
 EBUILD hcloud-1.12.0.ebuild 553 BLAKE2B 83f94fe447972429f478b2f60df1c2cdac0d67a7886c2aaa1ec9beef7bc932182b386c53c7ab928b19b789bfb839c11a8ecc1729bb6c3a473646df3a8058aa42 SHA512 7030b9b8444d564185eb27682c388d8c078ab9994387e93b415d9083f005063df9ae9d5324e2daf77d54256d1a00a0571730de354e744cbd9e219cd562ef83de
-EBUILD hcloud-1.13.0.ebuild 554 BLAKE2B d6f92f687c94a7785a57e5ed3e882444e291a24fe70bf984981060be3bafa92c0a843787125daba62d5a619ab00569262c2e5ee2a01905f4e0fc8bd3ab08550f SHA512 7fbab9e1651f78fdcffb4524ced748a3ead31af2dad6b28d4f7459d0efb9405070137d0fb22dd3bdd0ac1655f254cbf5eda301b9f06542bad8d83914e4173913
+EBUILD hcloud-1.13.0.ebuild 553 BLAKE2B 83f94fe447972429f478b2f60df1c2cdac0d67a7886c2aaa1ec9beef7bc932182b386c53c7ab928b19b789bfb839c11a8ecc1729bb6c3a473646df3a8058aa42 SHA512 7030b9b8444d564185eb27682c388d8c078ab9994387e93b415d9083f005063df9ae9d5324e2daf77d54256d1a00a0571730de354e744cbd9e219cd562ef83de
 MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/app-admin/hcloud/hcloud-1.13.0.ebuild b/app-admin/hcloud/hcloud-1.13.0.ebuild
index 4367320daaac..8ba6e8b3dd55 100644
--- a/app-admin/hcloud/hcloud-1.13.0.ebuild
+++ b/app-admin/hcloud/hcloud-1.13.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE=""
 DEPEND="dev-lang/go:="
diff --git a/app-admin/kube-bench/Manifest b/app-admin/kube-bench/Manifest
index b7bca0190daf..3db38ff5c15d 100644
--- a/app-admin/kube-bench/Manifest
+++ b/app-admin/kube-bench/Manifest
@@ -21,8 +21,6 @@ DIST github.com-spf13-cobra-v0.0.1.tar.gz 101512 BLAKE2B 1f61e9a6ce820742d5a5759
 DIST github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz 6347 BLAKE2B a1e62d37f3f736086ba5b198ca33e243f4650571d42448c593ba7c0970883aea401e8ddfc90975686bb5c992e5133294662a05b245620ca52c254b2a7e866d29 SHA512 04522be3439a2c3a06f38f764e275d8d093b935d610386bb99364f105d7d805a6a7e7a928796682955549a88d43b21f385404c1401ee66374d324f954bd4769c
 DIST github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz 40078 BLAKE2B 4a15afdf122a58dd006d57da88176fd2804d98706ac3d8c496dc14b084851288dd28bad95f7871d738f0487db46aa7969dffbdf005c14fc6f46bcd0ad7e0f673 SHA512 4f4d606bfe94ea51a6cde535f16078602f1d63bd2896aed52bb53b3d219510ab38ad4bdc692da2eb355c9361041d7322db6424f63783bcc367343a1666cdf297
 DIST github.com-spf13-viper-v1.0.0.tar.gz 30804 BLAKE2B 9f88f872c1bcd0f3590f7b4bbc35e03b3d3fec5233eeff0ed1cc1cd68dff1b29a5170492683f864a8b66fddd57722cac2ecb06a0035f6b4dc40a636025e0ccac SHA512 a9264fb09dd9d069f3ec1543a32c55a1268e6b33c3715da9116fe6e23f7b6f179785331f07f13cc03db29eb38f017eb5e8569e144bcaafbd73801857e0387504
-DIST kube-bench-0.0.33.tar.gz 253236 BLAKE2B f441cbb4315d785084a51ac89ee3f02b79d569a38079384b82afc8a966e2b9fa948f93db5655abb8ddebf8df1a95afc53376992441889f53b009fd96dd809937 SHA512 f6b688126c2f09d1af3128e4888548eb943b07a336d378eeeb35ca8d84ba69d93d8672b114559f91dcab72000c9bcc996d415d01f1de9af6ce6810a399a6e631
 DIST kube-bench-0.0.34.tar.gz 254837 BLAKE2B a7606ec52741bb0551a9073e1f58d23db6571c7d7ad6775ebe13ff32396530fd03b7845ede40baec6bea6cb437426454cef624b1c711bd5fef242a772e14e7e3 SHA512 4df1b88ae3d6425dff7473066bfa6561f32e5ef6f137984f7a90e713f3dd1e59f8551353cbc3e86fe35c6cd3793d2acc13b9db426bd7930d22d1a06e9c7f4156
-EBUILD kube-bench-0.0.33.ebuild 2286 BLAKE2B 1307c1868df0a78e5628a5b06ad32ca491e57d87c10eeb311ab2cfa6ee4f13da76f1a369dea2ff45130023bbc69ecb347ac32272361f3b42aeb060a0bf038e6b SHA512 fa680496be332ece42bc89f528fbb6f253e41bba1b40d9f653ce8d7fc4e696524b72516fe805bc26d5e64b40b254e1c3ab64f8d54c40eee757284fec942358d5
-EBUILD kube-bench-0.0.34.ebuild 2286 BLAKE2B 1307c1868df0a78e5628a5b06ad32ca491e57d87c10eeb311ab2cfa6ee4f13da76f1a369dea2ff45130023bbc69ecb347ac32272361f3b42aeb060a0bf038e6b SHA512 fa680496be332ece42bc89f528fbb6f253e41bba1b40d9f653ce8d7fc4e696524b72516fe805bc26d5e64b40b254e1c3ab64f8d54c40eee757284fec942358d5
+EBUILD kube-bench-0.0.34.ebuild 2298 BLAKE2B f1ae1ade7f9c6f80353c1088b5cef0f73f7469f9497fc4853b3c4165218232282401a42ad208a00ba1e520761aab5586a2af14b00b6a73459d2037c39f61b8b7 SHA512 cb86130b6b2ae9fb82ba94aa443414e4bfd776dc527b0137bc29776ca811cd9f919d799f25a5ab60ab3dbe1086e89a849fe244d8a1abb2c9c6dcfbaa687688dd
 MISC metadata.xml 333 BLAKE2B c8437977b6a07e36929b13f767af0f09158bedd1ea7a0bee1da52dd1b83acb2929248c3c385a5fba14362721ab6871d399ddfba53d15bbe84a87af0ad771b73b SHA512 295cae435555436e9091195ac585fd30d022aba0b76244c85927f19f14b38dde95fb14192c832f00f52e3cf71aa3d95f7527b22a90690f85206178c49d620c8d
diff --git a/app-admin/kube-bench/kube-bench-0.0.33.ebuild b/app-admin/kube-bench/kube-bench-0.0.33.ebuild
deleted file mode 100644
index 5efb03763d5c..000000000000
--- a/app-admin/kube-bench/kube-bench-0.0.33.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/aquasecurity/kube-bench"
-
-EGO_VENDOR=(
-	"github.com/fatih/color v1.5.0"
-	"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
-	"github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
-	"github.com/hashicorp/hcl 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
-	"github.com/inconshreveable/mousetrap v1.0.0"
-	"github.com/jinzhu/gorm 5174cc5c242a728b435ea2be8a2f7f998e15429b"
-	"github.com/jinzhu/inflection 1c35d901db3da928c72a72d8458480cc9ade058f"
-	"github.com/lib/pq 83612a56d3dd153a94a629cd64925371c9adad78"
-	"github.com/magiconair/properties 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"
-	"github.com/mattn/go-colorable 5411d3eea5978e6cdc258b30de592b60df6aba96"
-	"github.com/mattn/go-isatty 57fdcb988a5c543893cc61bce354a6e24ab70022"
-	"github.com/mitchellh/mapstructure 06020f85339e21b2478f756a78e295255ffa4d6a"
-	"github.com/pelletier/go-toml 0131db6d737cfbbfb678f8b7d92e55e27ce46224"
-	"github.com/spf13/afero 57afd63c68602b63ed976de00dd066ccb3c319db"
-	"github.com/spf13/cast v1.1.0"
-	"github.com/spf13/cobra v0.0.1"
-	"github.com/spf13/jwalterweatherman 12bd96e66386c1960ab0f74ced1362f66f552f7b"
-	"github.com/spf13/pflag 4c012f6dcd9546820e378d0bdda4d8fc772cdfea"
-	"github.com/spf13/viper v1.0.0"
-	"golang.org/x/sys e24f485414aeafb646f6fca458b0bf869c0880a1 github.com/golang/sys"
-	"golang.org/x/text 17ff2d5776d2 github.com/golang/text"
-	"gopkg.in/yaml.v2 v2.2.2 github.com/go-yaml/yaml"
-	"k8s.io/client-go v10.0.0 github.com/kubernetes/client-go"
-)
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-ARCHIVE_URI="https://github.com/aquasecurity/kube-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Bench for Security runs the CIS Kubernetes Benchmark"
-HOMEPAGE="https://github.com/aquasecurity/kube-bench"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -v -ldflags "-X github.com/aquasecurity/kube-bench/cmd.KubeBenchVersion=${PV}" -o ${PN} . || die
-	popd || die
-}
-
-src_install() {
-	dobin src/${EGO_PN}/${PN}
-	insinto /etc/kube-bench
-	doins -r src/${EGO_PN}/cfg
-}
diff --git a/app-admin/kube-bench/kube-bench-0.0.34.ebuild b/app-admin/kube-bench/kube-bench-0.0.34.ebuild
index 5efb03763d5c..cf7b9e1eb726 100644
--- a/app-admin/kube-bench/kube-bench-0.0.34.ebuild
+++ b/app-admin/kube-bench/kube-bench-0.0.34.ebuild
@@ -49,7 +49,7 @@ RESTRICT="test"
 
 src_compile() {
 	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -v -ldflags "-X github.com/aquasecurity/kube-bench/cmd.KubeBenchVersion=${PV}" -o ${PN} . || die
+	GOPATH="${S}" go build -mod vendor -v -ldflags "-X github.com/aquasecurity/kube-bench/cmd.KubeBenchVersion=${PV}" -o ${PN} . || die
 	popd || die
 }
 
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 506865132de1..793e3eb21e68 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -8,8 +8,8 @@ DIST logrotate-3.13.0.tar.gz 213726 BLAKE2B b9970a0fb49b9de9c83ee679fd4587b6a162
 DIST logrotate-3.14.0.tar.gz 215413 BLAKE2B 7914188922d81b1f8b6c4e493fae71d23bc9e65ebfcb190ebb4287c875af53204cbecb51c2731a3dc57530a30c685c3a626074265d9a2462714ff6ff077ea5ca SHA512 5f584d9be01737960eaffcf43746270a5395486d2161577a9ee3e757cb4dfe5a207c8b1d097181dd413560d76ecc0e3d526f87d1b123a52dc3e5e49d529a5fb5
 DIST logrotate-3.15.0.tar.gz 219496 BLAKE2B b9f9cd0b22b79c3da1ea6092c5f3ebf9fca39da3a4bb7e1da39a8bf96f0bdb573864b77681671ad227cfc444bbc3e64a518805780580adb954bfacd564f00e2f SHA512 9520f15eaec54da426699f1f5ce31949d1372fa25c5c127dfbf29ff717a1c15a6fd14437c1d7b67b116b12c8a5c28f6012e39ad4b3ca2b053c874d02efe98d84
 DIST logrotate-3.15.1.tar.gz 220263 BLAKE2B c164c542a0770965f5193f5816509f566b9afeb82ce8388a184d16c2b3e79aa0ef93be10d477c85f62037f01b3e626ea56d3173ca8cf017b8aa315f2e23b1a2b SHA512 72294607762751fb1aaaca1d62ebd87d109d837d50606176159a5e74782a993123321967b7a6185df6ca9c87a54febb832ac7537ceaa580a895901a995570cd5
-EBUILD logrotate-3.13.0.ebuild 2543 BLAKE2B d79fec2304b6b52ec1cc064fc40aed2054edecf4abeb8dbd0d5df7f8bbb27e1a17a384cf4d44042197eac0c8ac7d5e6e888ef689fe2794ae206d946661b6196a SHA512 2f6b6caef77088ff1aee15f8a289f1b3559180034b5f2bfa5520b2c3627bb0f92e0f5555cbe914f4877b50729f84e3ca3f0353c6e1b63442e156b530819294a4
-EBUILD logrotate-3.14.0.ebuild 2511 BLAKE2B c824de62f72544448b54948e5025b0bfee7be00b9355be4e5c64d51721efc064dacec319f9de4e93c61a7aec2bd70c4d0515a693be375d35c16c30cb1a2b927b SHA512 e088a56371b59e4d10f4ea5574ba12985b9b7fe81de11624cfb302fee0bc08581334230776aaca74d67d9ca160dad4301f06b14e5c608c26ecffccbf370a252e
-EBUILD logrotate-3.15.0.ebuild 2491 BLAKE2B 54d0c42640b5bc52d8a06515dc93a8fb3882e5bff1307ff83ba61c02022f5a798646e56eb3eac11edad9b1d4a347a792401a155e8782df4bfe78eb782d429043 SHA512 ca4f7eb1af6d0ade04ff4917b254bb63b733daac0bcffc758804c2f15478a8b8c2ea6715fd10ace0f09966557f3d6999fcfeddcd9fd22cae6594838507fa5f08
-EBUILD logrotate-3.15.1.ebuild 2499 BLAKE2B c5642260f3cc83c3c2a9efc208b63d28db682dd25b38fdd03de9277818deba869fe0f809932c12a52f5a4bc9cebd2b3f00cf9d4df9f01b4333c1d3bdd9655a62 SHA512 264ff42deecdc6fcd787adb0fef729e0e96fba0705eceb49d5ff519b7fda2e149a59b1dcca022a55a1ae11c98f646e802dfa92a840a4bb78766b0e05ec206792
+EBUILD logrotate-3.13.0.ebuild 2521 BLAKE2B b9f4d9d7b5664010d820981a41d5b5a59416ebadafb1d4f56fd379360f80529ef75e9a963054dfcff7381b64fc502a9f340e44f53fb677069a06807af096c2c5 SHA512 d8ba8320011370cf271707d5ce40dd0b9933da211280db864ffc497a480703fa7530fff28d6cc1e7d56a852343f90ef73cb27cb54be8b07645a1d3e1922a29e8
+EBUILD logrotate-3.14.0.ebuild 2489 BLAKE2B 2ed5dc0a9a65b481cd4123a5228dfd8ddf639a033614f5d194880ec4f6be73e87b1b0dc925274fe5b33401cd148b0a3ddd897bccf64dd3f8e1f1ddc7fc6f3569 SHA512 cc319ff3c0f0e211dd466604f5e0b604b295d4dff3fbc6a257d1cb9ecf6db5daf82b2c8fa2663a93392446ba3609cb729bce0ab6e5c92f9488c50815a8bddb4d
+EBUILD logrotate-3.15.0.ebuild 2469 BLAKE2B 3ab214cc35d61b8c7cb809a12c638ab7d7ff91e85f7af59aa51056a5564120641dc417b3bba8ee8417b6bc5b48190ca3671767c185fcd987690544c54a3c1d0f SHA512 94b39e04ff7a9cfd4be0c95628cdb621f02451ad9dc947456059ff811eb089b9f5826b024b75f51aab2f789c8ba26535943e946528b0a02bf1daf8a99276cf04
+EBUILD logrotate-3.15.1.ebuild 2477 BLAKE2B 9610191509a4b84c95e695fe205ebb072362a086f0f8999cd670dc8d9fff77196e5341bfe51728532bdc19f1ac9052e04276448c644b31a112e464f054694fa9 SHA512 61e21b18a2b1a925e7f24ef0ec3b35785f83abb84ab92fda76aa9aee4884306f9f18bfc0b0aae0df634b7d9c44a769f32fb27cb4273e86468fbce67edf2753d9
 MISC metadata.xml 1126 BLAKE2B 1655e4bbc549896f4faef7cab3c539a5dc2a9910c80eacc6ee5626d97f1b6a5df448a502f3899833afb1723ee42f0be01e025a5d23ea3af1bab2a0311f43760e SHA512 f895d0c5ed7b02c4b92af5596a160199b6d765564050dda45171ff6e81137c508da5a8ae5fece89f04b2355d0f1b41f839aac667e4a8d8119ff64f44f34c6084
diff --git a/app-admin/logrotate/logrotate-3.13.0.ebuild b/app-admin/logrotate/logrotate-3.13.0.ebuild
index 3e708af36c72..88d7a22eb14a 100644
--- a/app-admin/logrotate/logrotate-3.13.0.ebuild
+++ b/app-admin/logrotate/logrotate-3.13.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> $
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="acl +cron selinux"
 
 CDEPEND="
diff --git a/app-admin/logrotate/logrotate-3.14.0.ebuild b/app-admin/logrotate/logrotate-3.14.0.ebuild
index 7355adb85194..a33ee2fb1e62 100644
--- a/app-admin/logrotate/logrotate-3.14.0.ebuild
+++ b/app-admin/logrotate/logrotate-3.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> $
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="acl +cron selinux"
 
 CDEPEND="
diff --git a/app-admin/logrotate/logrotate-3.15.0.ebuild b/app-admin/logrotate/logrotate-3.15.0.ebuild
index 34b327c5d757..c2bec14c8481 100644
--- a/app-admin/logrotate/logrotate-3.15.0.ebuild
+++ b/app-admin/logrotate/logrotate-3.15.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> $
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="acl +cron selinux"
 
 CDEPEND="
diff --git a/app-admin/logrotate/logrotate-3.15.1.ebuild b/app-admin/logrotate/logrotate-3.15.1.ebuild
index 2be55d79dadf..ee5b360db5be 100644
--- a/app-admin/logrotate/logrotate-3.15.1.ebuild
+++ b/app-admin/logrotate/logrotate-3.15.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> $
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="acl +cron selinux"
 
 CDEPEND="
diff --git a/app-admin/longrun/Manifest b/app-admin/longrun/Manifest
index 016068bc56a5..41fe8629ae1e 100644
--- a/app-admin/longrun/Manifest
+++ b/app-admin/longrun/Manifest
@@ -2,5 +2,5 @@ AUX 0.9-makefile_cflags.patch 305 BLAKE2B 7b2c0df4162b44c723286b86f1cdff3de6761d
 AUX 0.9-replace-loff_t.patch 992 BLAKE2B 81c94054ba9ab75cd6c9f71e10c78b6f921695e9b0273aa35a394bade52d1183e588a3a5c8b894c1c16cf5c3c620f1777ab56e591fdb68ed6e70927c4aa89f2c SHA512 6eb0e828afcd6265babd4cefd50191610095c8d6309b75089ecf3f34363231bf8a2b68c3db0d3938904951035232b9bafcb2029de832e9c7515922dad3ceac1b
 DIST longrun-0.9.tar.bz2 11539 BLAKE2B a308dc7f350399da0bf593e2eee8109a90103b298d943976f0da143c52105362aa100763dcdd3cacd4c3244cdd5a7eb9a1b355aa803a69a2225ea18c6e5a60dd SHA512 6b38160f54d0cb9124c46c0e3ba22faf4ba4376ef58f7db40aabbab20836b1551dd839d28e5bf49540a5ce0e13312bd1d7332cc59ce45fa49f81d0b9746ef055
 DIST longrun_0.9-19.diff.gz 14697 BLAKE2B 98a7497679df5be0346a37b6119a9418c7fba80672eb2c345784628c3517c6f1fbc8d953abe2696a3b576310cd489e5c1d3595153bbfa9d82dfb44697c246116 SHA512 591519183017dd84d6f78554eea9f215be9346efc3f30889f5a25d01c6b68bd5a949507b9a0c871f9aca0b49e415c4fa261821d4158b24c93481394403b83e35
-EBUILD longrun-0.9-r4.ebuild 1766 BLAKE2B 6e0cece68b00d87f1d8d96059aea5f964c3215d90a48493f88358374ce09bc1798e53e4df6a9e613d918f790ffb26be3cb718ecf8550ac39de2a141f11a321e8 SHA512 447e4e55c29db55c4b105681a485e682bc7158f1a1caf4b7e3b95a572014a893ead7170290ec50b95d6fc5eda42de2ee6d81ccb501e97e532956dc368f05ff4d
+EBUILD longrun-0.9-r4.ebuild 1777 BLAKE2B f82219f45752d5ae2adba9ad499f72fbe0b7e7109eb6906e32c025ee35abfbc3527d64d246514246991ed4c49c04ac6896bfaa46614bda5849bf228cd7fab15c SHA512 0a0749b7f1d7ff762a733b1a36fb8db3340218f250ef65547d21a41e353a7f43ad01f95db2a9d55355a31ba3e5c13b4f6e30fb26351fed9256572aa4ac2857ee
 MISC metadata.xml 437 BLAKE2B 932878fe62012a5285dfc19f3e2a2d8a3f0eff2809dca919e58b81e2c82e256c1cf7fd4a8b477919973ed76ec0481ec00f25de43b78f054ae6f016948f5969d0 SHA512 1962bfa09950f194062baddd9996a84ba6264c1ed76e4e93d376a9935500a35377ea36c24fc55668d59f8488b9d3cdfe56139b91cc179d52e184f7f164d23ab9
diff --git a/app-admin/longrun/longrun-0.9-r4.ebuild b/app-admin/longrun/longrun-0.9-r4.ebuild
index 0508c52ea188..d4bfcd432236 100644
--- a/app-admin/longrun/longrun-0.9-r4.ebuild
+++ b/app-admin/longrun/longrun-0.9-r4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://freshmeat.net/projects/longrun/"
 DEBIAN_PATCH_VERSION="19"
 DEBIAN_PATCH="${PN}_${PV}-${DEBIAN_PATCH_VERSION}.diff"
 SRC_URI="
-	mirror://kernel/linux/utils/cpu/crusoe/${P}.tar.bz2
+	https://www.kernel.org/pub/linux/utils/cpu/crusoe/${P}.tar.bz2
 	mirror://debian/pool/main/l/${PN}/${DEBIAN_PATCH}.gz"
 
 LICENSE="GPL-2"
diff --git a/app-admin/mcollective/Manifest b/app-admin/mcollective/Manifest
index abbe5243253a..bcd082884cbf 100644
--- a/app-admin/mcollective/Manifest
+++ b/app-admin/mcollective/Manifest
@@ -1,6 +1,6 @@
 AUX mcollectived.initd 497 BLAKE2B 1fe966f49117f9ea1b8c8ca4f5c92d5ddd7f8fb28658e4c3b016c193b69d1c42d35da85ace176279d09778c12fcc664748ea743c9b88219cb0fec2292ca867d4 SHA512 dc77a522e3ab6af3e23c559bfcb385033f2200b58b50db59000e7f56b2a789e8fbd83340f8ee494a1a9fdbdd1bd737a2b17ae4743823794264723fdc931ea6b0
-DIST mcollective-2.12.3.tar.gz 1516461 BLAKE2B f8fa65ffadb98ae3511416aaf8b0875486b75f20e4da4007ad70820f453a6ecd81b57d7aa30ae38b014b984330f6c4d525002a54edb2c00d629b6fd4b2250049 SHA512 55798d4579a6be8a7790b046f8b4e72607935c83ec874b6147258d827e0bf279f08dfa121d7cc4a8ed922986aa6bad9ebd62b7e3cbc1e7ef526cf58edce1bcdc
 DIST mcollective-2.12.4.tar.gz 1517723 BLAKE2B e49a43ae7b99a5f22fe33549b26f938941f4e007c164c3c8de77daf2b3410c7db21e5023a400c87a2e4927a5a986e3b66bc3363a0c697ea06f0dd112825ae368 SHA512 f357297253f1cb5815738c8899a543642ce721c60ba023b13a7b14a99049d909622f8500ed82fc68c142cc1ffc106aed5a9bf8b1604a47c19a04a5ef4006b9e5
-EBUILD mcollective-2.12.3.ebuild 1649 BLAKE2B b9fafb43c324d42bce01b95452bace880809ed327170098fb81c36fcc7c0505464624166ebcee596a9068742e1a6958e727052f553693db5e0275764180ca4aa SHA512 9ae9e1b5f0e5b31cd1dc44edc844253bfca1c80e8b626ec06a2e0a66eb08c0d935747a097f2f516d8e85f0ce79f28a675d1866b866789af47706048c92ad6c2f
+DIST mcollective-2.12.5.tar.gz 1517727 BLAKE2B b5d91c748bb1bfc63c7c040fb067d7ba39badede094d975f0b87587fe3a6c5bb6757a5be73f887be5d83f99dfefb0272bd48da6c9e79b4aee34c8d5f51e2e6c5 SHA512 639458d83b3f25d9aa433c205b9d16ded5ec689c1efb4827457fc3075c000d7abc2b70c9c8cf741c8bea03c1e47284015e69bf834e7a5670c68a40097e45891b
 EBUILD mcollective-2.12.4.ebuild 1646 BLAKE2B 36932cbac263d9e0c2d6c0ff41a78d902eb9608d2bbf7a819f97a439feab2e7dfce45d3fd7b5a726a8ff61e87a4c1659efb25ca4a713eb1c4d2fd9313c0bf0aa SHA512 1382a7674f73b359669965fa7c591d4e1c60276b918bb028c36edfead8f9cf7efdb1fa0907d757df5210561602bb4a2345e3d15dca86482335289a71eec1d705
+EBUILD mcollective-2.12.5.ebuild 1648 BLAKE2B d268764e64142e422ca811b6bb193736e78f4945e2eb66a4d90736301c25de16fb1cc1fb779ad4a7db9b4a67ec3ad296b71e1e9ed7207747e26df54433e6e294 SHA512 fd52bc97fd2d8a68383305e31b0f16b3acfc590e855f5cf66d3e18557e036ea5c43a85cc256f69560ad1a5926e69664526c2a59fd9e8cb5375b46f62b1d132ba
 MISC metadata.xml 534 BLAKE2B e8866ac769b65ccc61dfe79fe5883bee78ea4066187b7136b899a1a16fa74952f88fd2b81376033d36418dc670d5669d9b65fc3195720ad95adf30bfe49729b1 SHA512 e94dd85f11b4f8b838e928220cb887eeb70860e6d04f03e904ddd4332baddd3b01221305e7229fb575585235436d0d942c116f821ef37adae636a7d5c6193199
diff --git a/app-admin/mcollective/mcollective-2.12.3.ebuild b/app-admin/mcollective/mcollective-2.12.5.ebuild
index e5ded06a8259..f3db2424947f 100644
--- a/app-admin/mcollective/mcollective-2.12.3.ebuild
+++ b/app-admin/mcollective/mcollective-2.12.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,7 +15,7 @@ S="${WORKDIR}/all/marionette-collective-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc +client"
 
 DEPEND=""
diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest
index da308d0053ba..a962d24a31ee 100644
--- a/app-admin/metalog/Manifest
+++ b/app-admin/metalog/Manifest
@@ -6,6 +6,6 @@ AUX metalog.initd-r1 651 BLAKE2B 7b7739ca48acd3ce646478b51639c14f7cf131a698570f7
 AUX metalog.service-r1 153 BLAKE2B 0353f6c1983b7146ce6471be82540aeb87d930e5c9f7334a4133754c52c2c8770c04a9eeb6f9f20ecc41359b1eae135e525d2dbde2471f2d973bb751690703d7 SHA512 72076f6aeab9975dedd824ea1d48b96f6a964d06f529923d4f7a1280a1123a63c0e958f74c6a1417c6362487a69d165bf3eb6c417aae3887ff43ae726f5a30d8
 DIST metalog-20181125.tar.gz 39472 BLAKE2B 64d90835d50c7cb10ab2bf2708d00189b9f8cb56438c29d5c445c5527cce030f918ba74f83cdcd54017f04fe2a8ab30e5631bcdf6681e56c311f8069981a9b5c SHA512 4b187a29b9e25a0f762f929c6993fa6e49ead470916a43a0dfbf16720a1a633121357d2f152bf4cdcd71c016aa4fc8fd6cffb35249abd430fbbf66651986bc4b
 DIST metalog-3.tar.xz 360784 BLAKE2B 951841d423769cd97e14985e15d5a2499ca351e082c0effe28dc16d46db91235b7ef0448fe32d38b2ed5b53011d04b3375dc87c2a859c49bede2ae177ec16954 SHA512 2ac614bb85fe466308c4ced0842fdab5f056eda60e892189a8220719f1e06a72fce3c76842a2ac8c63a6808c20d8b7a7d8676896e14f7f54e40630ecbd21e289
-EBUILD metalog-20181125.ebuild 1586 BLAKE2B c45cb708078d664983c4ef7dd17f2326384850b2a6e2ba1ca774365778b258e7f720536a399668e2b582de1a0ea63206e552e95c81659b1efe29cd890dbd1c4b SHA512 d1c8b3faf2085bc1a1c52bfb7b2517813c57d720215cff55b20543cd37dfcfb5b632a06515451b7d480f61b5703ae5a7c1b2b18fe80cc17a4c3b804b8f956dc9
-EBUILD metalog-3-r2.ebuild 1471 BLAKE2B 5da0f4866c405bd0d7073a1d98a8ad9acef166ff67af57c3330aafd68aacc7bc6ae8c81d28e402554ee637d26f5ce3aa14adfcdcb5a4cad3422a44f849e5bdb9 SHA512 91abf5ae5b73cd63246672d6bffe3ecbef91c271556958f7d1488bece9445109030752d5c932050e0413541aa240b3f09afd881f0a7350b58bfcf8dafe76bf70
+EBUILD metalog-20181125.ebuild 1576 BLAKE2B 23728412911f5d20839f8616e0b3855640fd2fa65c93a0d86bf4926fc2a937804376ca062fab1e4cc912fcf7c6c19a0faff69a51cc9707ea92575710928c79a5 SHA512 447652bf64a2e2ad1c37c8d85cb608600977e57efd7fab8d8325d6b1322fe99a5e6c852572e25581b66c243fa3c72f7f3fb6f6725c1c7e9aab2216bee37b80c2
+EBUILD metalog-3-r2.ebuild 1461 BLAKE2B 1a40a4a22c147dce2ff4d749be7e57a1870d3010d0adb61f10e83825f8fd82d6c9d920f180fece2ee17c3b529a7eb8d86075b5f3d721278c0320a26ec7d36643 SHA512 e8f125a3afce1b6c8341ab1591416a27de99e8fc7f5d2137438d60b8280134f3002d37b6803c12e81d8deaa7948ebfc9a203b2cd8ad2f15353091b65f7325765
 MISC metadata.xml 334 BLAKE2B 2d9ae46fcede549cabba6654513afcb6bee8ea22ba48bdc910c7b136e4d27bf6e223db5b13501b275790ecbf4fcbcb4ebf5ac9b6b81c6fa098e2f2c402793b0b SHA512 14ef6878732ffc5d14d1d27cec55ec886e76969e016ce8a009cafffa0b8d4e470c1b0f2480da5aaf0ed885c101b20d5edd7ce333efb9bc6f0bf56462e7260b37
diff --git a/app-admin/metalog/metalog-20181125.ebuild b/app-admin/metalog/metalog-20181125.ebuild
index 2fa7ff1a44ed..4c2f141dfe02 100644
--- a/app-admin/metalog/metalog-20181125.ebuild
+++ b/app-admin/metalog/metalog-20181125.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/hvisage/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin"
 IUSE="unicode"
 
 RDEPEND=">=dev-libs/libpcre-3.4"
diff --git a/app-admin/metalog/metalog-3-r2.ebuild b/app-admin/metalog/metalog-3-r2.ebuild
index a3b3bc3dceb9..6caf82e65427 100644
--- a/app-admin/metalog/metalog-3-r2.ebuild
+++ b/app-admin/metalog/metalog-3-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="unicode"
 
 RDEPEND=">=dev-libs/libpcre-3.4"
diff --git a/app-admin/mktwpol/Manifest b/app-admin/mktwpol/Manifest
index 8a07df1e6ad4..9e42f5557097 100644
--- a/app-admin/mktwpol/Manifest
+++ b/app-admin/mktwpol/Manifest
@@ -1,5 +1,5 @@
 DIST mktwpol-1.0.0.tar.gz 59748 BLAKE2B 954d86774bf5e88612dc67f0ee29b637da188f64a8203b8aa84511e940db059afce0e993f4a703429688e29e964e5efc53a21b32f1ead3cee70bb7f056fc62a4 SHA512 f7a04bb3acdada6407e3e422e26ba2c0c454f10011a2848d0c8e962996e135a381c893f7fcdea67e1a3a23f503eb2071448beca05b7ca90e179d2a28173a973e
 DIST mktwpol-1.0.1.tar.gz 60491 BLAKE2B 66d7db396bbf7e5b2c4dd537ac9bcd387298ae733348b63c6d5cb6df79e9440ea751c27eccec66978371fa81a17929d25fcfbeca6787abf8b49f087b54a6468d SHA512 aa44af97533f130b89b83c6f2a8878d290770b677f6fb9fe654b033f57fcfb3d063a6a6ddf29599aa066452d75911cf8053d65b21c37e322851a10f4381cb33d
-EBUILD mktwpol-1.0.0.ebuild 1327 BLAKE2B e526b80f8c99b1d6f899f71d4284189ed3c6e5b5bd45a80ecc1fd735376c3d7f8b2607917e84bd3e93e87c04850f1db76aee721992fcf40708d9e5802b5ff966 SHA512 5af5b285e3cd9cf4197d7b30c485339dac7dcd0ecb7499e320e1df24514827995d2d951b53b669dee688bad0577aa004d9fed27dce7c0bc6b66a0b57a71179fc
-EBUILD mktwpol-1.0.1.ebuild 2247 BLAKE2B f6ea333d2a4c69d9eb5095eed4aa2d0612cad2221c83db9b1aff97d0bddd7e06a9538274e58ec0297049984e8c6cbcfb194102fe8078da5238fbc72456179505 SHA512 83eb862e31aae103eb629789b25fff0df6b5d795621696c0dfd6fd749125458f1157bf26c72a43aae6145201ee28b3b0930a58e54ff23c8de2f9ff0e00074c4a
+EBUILD mktwpol-1.0.0.ebuild 1317 BLAKE2B 5947d97ae3fd59e6d000d29106836eb287b8d259e91333eeec7ed758dd5489506fbb4e3dfb1eb3271d9d4f1677ea805f75bff71a7a84cd244ed9b054ec2be53e SHA512 2510cb3d0f76ced5bba386823c268620203701d5dd0f7eb34646bf571a3a90d7b0c2582920c44203c0ae00260072680fb988584be31784e99f67796279d45030
+EBUILD mktwpol-1.0.1.ebuild 2237 BLAKE2B 988778d0278d2540af2c8796a815e3eb1c0deee5f00c996caf8c0dc88a6d3d0e2511e1bf6abced250814bd4c440f4a1435cf1aba3de01c1cd7ecbcc61a532317 SHA512 13c2d8671c8ded7b5adb544ce50e8eb9fb74cfe6f4fa353d9cb3ac23b0e4c0c15ae0cdd1a076d88451cb9e8e6e85636c340199bc73b48c29e628d58d8cea8234
 MISC metadata.xml 1736 BLAKE2B 20ff68ca7302bd5a8918c5b8befa447e8bb9cf908d2ad0a01fbf9ed0bb7f0823c0571d945906dbba7750fe650abcf0c93f516f81a0532f8b3bb25976dd5eccf4 SHA512 80690242944a3eb26ee4a5766b310c4ece95d24e6fd07d66c4cacba17ff8d6ce507d52e09a470c734acbc4757f9e41064440b302d5d65c1d39241ee293b1bcba
diff --git a/app-admin/mktwpol/mktwpol-1.0.0.ebuild b/app-admin/mktwpol/mktwpol-1.0.0.ebuild
index daa6b71b8e59..9ae1172956d7 100644
--- a/app-admin/mktwpol/mktwpol-1.0.0.ebuild
+++ b/app-admin/mktwpol/mktwpol-1.0.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mktwpol/${P}.tar.gz"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="app-admin/tripwire"
diff --git a/app-admin/mktwpol/mktwpol-1.0.1.ebuild b/app-admin/mktwpol/mktwpol-1.0.1.ebuild
index b494367e73b9..448fa252c4fe 100644
--- a/app-admin/mktwpol/mktwpol-1.0.1.ebuild
+++ b/app-admin/mktwpol/mktwpol-1.0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mktwpol/${PF}.tar.gz"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="app-admin/tripwire"
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index a0e313f863cc..7918a9929ec5 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -8,10 +8,6 @@ EBUILD mongo-tools-3.6.13.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8d
 EBUILD mongo-tools-3.6.14.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
 EBUILD mongo-tools-3.6.8.ebuild 1345 BLAKE2B 1baf6f2c407b2a4d1e81a6a04444b9c43ef74e6abd7e68c08c4ef1e0540b8dcb6c54c83a58b4687d2aa20f3fbbfd88b793e20058adaecb8e53b13e76a328ee54 SHA512 2286b4f40c01231648535b0f050e1ce36f5fdd654acd83389b35604d41e92bd584dec654b5368a7ee4e6ff7d420b19faeadc1c1c7f252093f365e23efb6604eb
 EBUILD mongo-tools-4.0.10.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8da68c81104d554789720b6268f25b06ee42fc728da388617543a18dc3c139b27c1ac28cc8fbf3b2bd519d053a2c9fa1 SHA512 529a9d42003103e564d7b5147d582da78db2435ae3587ef6827fd640947fdd5bd559fcf86ec82f0882a5c04b79fda9d9af612a8fed12e9d256bd5e3fa1e267fb
-<<<<<<< HEAD
-EBUILD mongo-tools-4.0.12.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
-=======
 EBUILD mongo-tools-4.0.12.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8da68c81104d554789720b6268f25b06ee42fc728da388617543a18dc3c139b27c1ac28cc8fbf3b2bd519d053a2c9fa1 SHA512 529a9d42003103e564d7b5147d582da78db2435ae3587ef6827fd640947fdd5bd559fcf86ec82f0882a5c04b79fda9d9af612a8fed12e9d256bd5e3fa1e267fb
->>>>>>> next
 EBUILD mongo-tools-4.2.0.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
 MISC metadata.xml 463 BLAKE2B 1e4d37c222538ce5d55e6f5c05ecbe85f57ac74eacaf5935540797f03c4c069b2ce2bd0cbb6b433eb86de9b2480058013759db3d504982df908c2ba9e1b4d2ec SHA512 f09474b3932dd6ae36da20c64a394acf65ad1e3a875e7ca743efa22db8b7e3109c9ebe4c489e62eda12c5bdd4d689ede61eca8a4cc89c42d0a08a270f041fcdc
diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
index d72ff250bb13..b2f276e958ab 100644
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -3,6 +3,6 @@ AUX monit.pamd 120 BLAKE2B 76744f79babaa99fa2961f73158ca755f885e9ea8e20b76dcb29f
 AUX monit.service 226 BLAKE2B 3b3041900987acd5bb6faa770c6631f6554b2e4360520252369951b3f7f87a3dd96440a58c9d2c4973ce9980a00ab7085c92af1e6542ae10d679ba352d170b19 SHA512 3ca0499ebd21aee812b78883c144c0a346a8cb6106392544836bf76d594e96b7e77be4b32b8c3170273e8236b25000c268724148252d98a4b99131f8b0ce4e88
 DIST monit-5.25.3.tar.gz 1355925 BLAKE2B f1c4775ad82ccea262fa5d9c3c9396e634cb3742c59ff9d8b3c87552501ee749a829932570b8d2836fe77a14fb42fea2ee42cab1aa355ca09df6dccda9aa5f51 SHA512 9030b8e6a02eeaf497382f14f7cf855a96599ab060130f077208edd5db35fee1b74f9166df4deff87b4a1954c8d4fff83b5465166938a3f8aea8d4d4c0371e90
 DIST monit-5.26.0.tar.gz 1371327 BLAKE2B eb130c36ad9df0b042fc241fde540ea12945ff1d63d14925da8435e88586141f5ebc116ad5a540a4fbfa507e0101d4cf4ef8a4435fd638f39d5472ba0d6e12d5 SHA512 ae5bfc9f2e8cf2d2efa7a121f3bb865dc5b66b647e23e005349799f3f4384dfa1534ed88d0767ca41dac4cea2674fb82cfb51098129d350b470143df548c6900
-EBUILD monit-5.25.3.ebuild 1203 BLAKE2B 424209d91e4e709e0e2e110d4d85d37ed0979f0ff4190c30955192b0454e881f66a54ea6e9a0b6eeaaf31abc7f7378a8ba5b1954d561c5d0ffa0d3ff0eedf802 SHA512 b67bb6c0c16aa686b249aa2da65a1d69c1f3635e03de4a72871fbc55b6f4ac5db7cca9165e27b5a7e5de4eeb51339bd5e1391bd9c7087f38151fabfdec7132de
-EBUILD monit-5.26.0.ebuild 1206 BLAKE2B c0a6526fa3f8d1ee377d6a09c30d58223d8416333f215a67b1fae0ec7a355d46f8cb76e8a9e426dd6aa683d80a20d0e855ee27ad79057f9424577ee0361dea43 SHA512 90c85734564053a9b8d7da656e6cd22b86483954f1e6d2c164194817b4ae05dcab2d6f87c06e41a8a6e8e3ef80094f644804bc1b24d772febb7a3876346628a6
+EBUILD monit-5.25.3.ebuild 1204 BLAKE2B b1afff4ec33ccbea3c8e06de97e756590706a54492bac64da87b5a40278ed835806cbccbe9b2b7869e443b83f00f9b6cdf6d78e6929d5683916cf11756c3da7f SHA512 02a0b6d37182baf77a2cb835664ea0d8faf3a473647d234ffc2a62df313d564ec491d9682808161bf4da62aa558fa03293a1b8eea017840acb52298bcfe1834d
+EBUILD monit-5.26.0.ebuild 1207 BLAKE2B aa074c71f4eb188e69feb148663344e15c8ab1e818c960018d59abd21ea5713eb148cdb9c796b996b00aca20f9a4e46ab3ce75f90465d35fb2cd7901a18b9858 SHA512 add86722d2fa2a539c6ac3c4758731e0b72d279d8c56f9634880507e1db0e364a2c4b66ef7d23a60c6a56550bb5fc15d0f8d99a16aa11cd81890093eb368fcf9
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/app-admin/monit/monit-5.25.3.ebuild b/app-admin/monit/monit-5.25.3.ebuild
index 6f690f325b5e..f64d0e3989d7 100644
--- a/app-admin/monit/monit-5.25.3.ebuild
+++ b/app-admin/monit/monit-5.25.3.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
 		libressl? ( dev-libs/libressl:0= )
 	)"
 DEPEND="${RDEPEND}
-	pam? ( virtual/pam )"
+	pam? ( sys-libs/pam )"
 BDEPEND="
 	sys-devel/flex
 	sys-devel/bison
diff --git a/app-admin/monit/monit-5.26.0.ebuild b/app-admin/monit/monit-5.26.0.ebuild
index 71d8de2c4988..7bbf46381a98 100644
--- a/app-admin/monit/monit-5.26.0.ebuild
+++ b/app-admin/monit/monit-5.26.0.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
 		libressl? ( dev-libs/libressl:0= )
 	)"
 DEPEND="${RDEPEND}
-	pam? ( virtual/pam )"
+	pam? ( sys-libs/pam )"
 BDEPEND="
 	sys-devel/flex
 	sys-devel/bison
diff --git a/app-admin/perl-cleaner/Manifest b/app-admin/perl-cleaner/Manifest
index ef6903d0d21e..54050592e00e 100644
--- a/app-admin/perl-cleaner/Manifest
+++ b/app-admin/perl-cleaner/Manifest
@@ -1,6 +1,6 @@
 DIST perl-cleaner-2.25.tar.bz2 7435 BLAKE2B 348f5429874bf7b1db5c9ba5b1479c3d5fbce68fc9ef91aa44dad3325ab2287d4bfda9221063dd643ec3b6df465443bb9a024705ec46f15c50ccd618ef193ce6 SHA512 5ef5682872ce840c0df98de82a6cf622120435f542206a00bb8fe0f9d5e46fb9898a89ab576b08a74b0d69d57a90a930d9f8d7d0b527fa3a928a6e4ddbad6ee9
 DIST perl-cleaner-2.27.tar.bz2 7493 BLAKE2B 03d8bc336fd0a42bce16c4bf8b2272a7ff24d605b483af777ef7ab3d59accd0082709200705638ab116934f675b17c5cf109c40a3ab739654ff64abebd8c0558 SHA512 097d68dff30da198636f73fc44600f1863c7f69f87110315bb83297c96d826f2f101f56ab546fde94ff60ca00da0aaa569fefea3c2599155f3bd69c66fb42ed6
-EBUILD perl-cleaner-2.25.ebuild 1033 BLAKE2B cb2b0768286815689d8516f06b8fb78436b0fc3746768e25458af4d8843e65c20298496cb808c0b19c55f96d9c2eaeb121afc6aed52704b48ddc18bb6467175c SHA512 5d13694ae65fc83e1429c85a92b30dbc033a30ac31e93809eb63e54c7d22e1ec24479ddffdf01d3fb6fe2164b3373a96a0e0383ba5d2e4afa6d80036eac61e41
-EBUILD perl-cleaner-2.27.ebuild 1037 BLAKE2B 284f21939352dfec4cc062d5894897928a8bf66ec232677345b7de87f716f41f60d3e1f93fd0cbd0b20d92d57761d6033dbe26a40d681ab94c24600aec737741 SHA512 fad95dfce502ed72c6127ab26502a4ee3dc7cff6ce009c3359d4f1c57a6669ed4ab9148e5fe34c4a3f46d1d940331276205fa7ed5285df12371295e54caeea99
-EBUILD perl-cleaner-9999.ebuild 1050 BLAKE2B f76baac00e3c30d41dfbd55f46c06cf864cc2aae23aa6eef08fff4312bdc74f3867d696524aff2626ca58f1cdcf300d4fcab35979292da82828be5910827f996 SHA512 f9fe20c139ebe9704210a1550887d2ff9c09d17b6b1366ee1a4ec6815f2b4ca304b6cb321d94550c40bc7b7eaf8ded066b83e7b141c415b921bd66287fbdb07b
+EBUILD perl-cleaner-2.25.ebuild 1011 BLAKE2B d711c7193a1b54b755ef8d48aa80b18a3cd3bb8ffd61e15c5248a9df5271cdb5a2b13916f0a53c5fa466cc2e21a291172a497fb33e9dc11de33db20780d78683 SHA512 79b01cee2cf61c714d9f0cef382a66575ee5e1df75a6b25b712429b0c5f4d437db08c3336b9cddded5a712fd674c5a7ca1f98e69eb6a2d951e060eb11a6b7543
+EBUILD perl-cleaner-2.27.ebuild 1015 BLAKE2B d798616fa5c208c5b1ee20628de7cbe1aaedd0989c30041a6e6c6efc094d48a524a76572bf5d99cc09678d3a8cca5a2e37d56e901290ed38f8ed3d55fa02fd6a SHA512 6bc0ae69cb86f893354c7bfceda60c9553203a198170df0a2809f83f4828f7ad163ec341c93308271b6bf3a9668ef512ce9b9afae83a1553e65ddfd9b8818a08
+EBUILD perl-cleaner-9999.ebuild 1028 BLAKE2B 48e53facb01a5cbf42079e8e2ee552383671722b001022129ed2e686edafd0ebf37c7a791e1c0f8e9646f03de07a981f4af903cde878c5a7be66e7efbb0337b4 SHA512 727449b10dea92b4a777aed760b57f052aeb5981216402f3443507833276c188c08d9cdd4f97e3cbf06367569fbc0e3b6fe2448b1eefb077e03dd5e30e1157a4
 MISC metadata.xml 248 BLAKE2B 7e969e31666e369b4b1826230eb9c103e51962ac23701a7d5e49d211d6da6ee2f6a8372d72b3ba454140d2c1fb7ab6d122f011e9c8144e95a9cc11f01d2e6481 SHA512 53fd9b61e8fd7f18f9493861896a34938e5f6ee4efb3d2c71703dfa81587d0943f0d439fac0e0c106966dabba08d6aeb4b0a2ff85addf30d992c9b7c78ab6314
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.25.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.25.ebuild
index a824c7030168..23302941ce44 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.25.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.25.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.27.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.27.ebuild
index 00eefdc2e1d5..d3d15c410a23 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.27.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.27.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
index 5fed8f148ae8..8fe627b27446 100644
--- a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-admin/psmon/Manifest b/app-admin/psmon/Manifest
index 7631cc7649ab..3ed0861df886 100644
--- a/app-admin/psmon/Manifest
+++ b/app-admin/psmon/Manifest
@@ -1,3 +1,3 @@
 DIST psmon-1.39.tar.gz 57475 BLAKE2B 37998dabcfe5b329f74b7f6996fe3e8a350cc756a064e98549a38ade997115c3f03c57bf8b145c732edb021fe615be2a1210419f8b77666ad5caa79b74ccdc75 SHA512 08992023af29433da0fe8c48b610df3008b9ea14e197b52bc9582895275fc65cd0faca7e29f36356344219d6a61ef9350713aaa60377ce7ae49a882044b91e32
-EBUILD psmon-1.39-r1.ebuild 695 BLAKE2B 0dd013438894ea6a1fd4aa6851c59c611dffe6aef97aba66c36ebefd45a1ac13898d05e0f0755d975af79a3a3ed98e669b44f75c088edf5f91c79b04ff0a0bea SHA512 54a8b473acd59f2f75851ff5e67d6113632f9d11f5f61cc0d1939d6e800a14ec1781e34dbb287c938cee00057161d9f44f99d009e598d5d664bb044778f98cc0
+EBUILD psmon-1.39-r1.ebuild 730 BLAKE2B 53d580ec2727878737b450fc49b915c2763cd9599aee7c8034c56868b6eeee325144820e36db2cbf588fa8415c6cd0ff6c81b09bf3dd451b4b738965f1f4a39f SHA512 91f6ed7950cf43ae6f147a740cb3d9d2413444f686740a3e725bb4665ed35e463d958a7033a2b84fc307746e3f8765f099edc529bbbda47a6bbd645efe41bbc1
 MISC metadata.xml 375 BLAKE2B 74e5f745053591b49f00e4040f0e06afd9133c3d26fdff1047e591f06babb50e1af8616c7416de01793ff8294986b56937ae9c3fa244e7493f0a3e926ccd34ba SHA512 450413515ed27e78edeec89a59c27cb83efb6c5be58cf5321d1212ca191c5d87c6982e7d8cfb8f28a79383c529ecbaa7b02219d695dc5712b5566afada6fcf08
diff --git a/app-admin/psmon/psmon-1.39-r1.ebuild b/app-admin/psmon/psmon-1.39-r1.ebuild
index c1f5927344ec..758e8395e1c5 100644
--- a/app-admin/psmon/psmon-1.39-r1.ebuild
+++ b/app-admin/psmon/psmon-1.39-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit perl-app
+GENTOO_DEPEND_ON_PERL_SUBSLOT="no"
+inherit perl-module
 
 DESCRIPTION="Monitors process table to slay aggressive, and spawn dead, processes"
 HOMEPAGE="http://www.psmon.com/"
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 24a421c9bc1b..e990f3cc98e7 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,12 +1,15 @@
 AUX puppet-agent.conf.tmpfilesd 39 BLAKE2B 5ad1c862fec60701bdd18fb5f968d53b54b04e585b47941dbddcf2aab14d83af741e41c6f9e2ab359d6f4004bcd4f9215b34a6ac556882de4c12bb92da8f89b4 SHA512 24a2d8a49ec805da87953be60b1fefbca7e5b441f7f2865f43306526c2715aa1704705029fe45bf981786ea13cffbfd1c9b9502db416fc21534f87b17e348ab5
 AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520d75f6034c92bcfaa0fff2cf7d19d40fa251f3a9009c32660474d2ef24c2481e93c04bc16b2979 SHA512 d40522b2060e4d4d72e60cca17860d029223e442e69982b6c553b72c4bd6d8b0d6be22baa496486cd0d9e99d6ed55789cba565186979fcd6cf3e49acb8a45171
 AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
+DIST puppet-agent_6.10.0-1stretch_amd64.deb 19699044 BLAKE2B 06345d1178cd9fe15f7ae5a56676764517de6587f238a35212845b89a8ac17664cf88821dcfd7fc51de6809104e1e6e6ee22512b7b007ddcd866d898bbc1b461 SHA512 d3bfeb31d769efec58584e582e62b880d399905abf742f394d2a1fc022647ffca14f9ea208a27dbf57cd6ab530737524ca57f021a27dc1a96d105a5dbe1ceded
+DIST puppet-agent_6.10.0-1stretch_i386.deb 20013932 BLAKE2B f19775e2557cbb69ab1f539def040ef7109ee271a44aee1f6ce5dc685b86b78dc0c69fbaee7f29fd054079311169e47bd26f71e154fbe623fdc29489eab67ae5 SHA512 5d0d782c92d392c35a1283e9dd3d4230a657151424838ae3f5f87a6f76c822457e7ad26b7399a2f6e3152e91b23df88767dd18b936dab06939475285dac82e39
 DIST puppet-agent_6.7.2-1stretch_amd64.deb 19184682 BLAKE2B 6078c1b21f0e737881d949cfaf052571b40df450e53724696e2738141da30e59da7abf03ce00285ab77fd4ac52291ab6e42da373420807499f37b75c872fa83e SHA512 1c464448b1478397af7b806f8bfcaee0378af9d4b6bfa5a73e8245064329b1b49136107c5fcbaea0ef6cd4e1daf840d1ba331e798b2cd255ead54969520315c9
 DIST puppet-agent_6.7.2-1stretch_i386.deb 19452604 BLAKE2B 1915e7b7085db6cb87980a98a7cb85881331719e2af98b07f8461514a0296b3cf5181eb88f78893055a0fa09fc2ffce0e81e866db27abcecf9d8f745e329311c SHA512 8d89735601c9764e207eef77f5d42e836ee9d7c0c0f2856e0f293919cce52e7a42fc28fca42bd0e0bed760063aae527007ef7ce25503ce05fcfd495a44243ee3
 DIST puppet-agent_6.8.0-1stretch_amd64.deb 19184708 BLAKE2B ac961857784eaaa55604285cf305dac437007628ea5baa3c3ae9a8a345fcb8cf2b20820bd80cc2c96afb77cb03c4d2779b17b1183c9bc9461b56860d2179f448 SHA512 707146f71b21df4b89244df7b786f481136cfe7b0cabf20aa0d4784aca547ba85c75d13309b77c853b9e034b8271f350b30bc5358010d90b7573e3fdb63c31b6
 DIST puppet-agent_6.8.0-1stretch_i386.deb 19478404 BLAKE2B 0b9d76bb3d745ca42e489e16a133d684aa0e485941d59c6773c447f5fc79be7a964f0a2ff9e4c334a47b7d2ffc0264bd49e4f7806cbc2e72e037da1c9e385d51 SHA512 f8bc962b32abbaf070b81245b7488b4fc131d5a9e3ec94ac97038f5e9c942c70a493e61e13190fe2837eb898518724bb5f360b37531003dab37606436d66219b
 DIST puppet-agent_6.9.0-1stretch_amd64.deb 19846122 BLAKE2B 7f9133d1f5cb85f45c96490c230ee0cfda707db390a3a39be218fcd730e2298099e6d70c4f44bb5c6af46736c2c8aa7906a16375088c0119045dc77b53343b91 SHA512 f96cb1a6108a21192493b7b9958243e537ab41ce3ab6a7dde4d12bcd5da25ec6a5b29632acb87c4e156256578e8348c6fdfe26043539292f98203cce69b04fff
 DIST puppet-agent_6.9.0-1stretch_i386.deb 20170516 BLAKE2B 391a61a847bc05f9f03885f2e2140ea42b4eeca247f3223f17a82d3ede2e1bbc88226f9794777f4b20e81943d94b11612f8d4ffd9f74c2f494bdc242fb05e1a1 SHA512 595dbe1591a8ee9d703a3efdf103a3095966b22cafd0fd63fb2a7b9274ea858b55d0b915ecc32e93c49bcbeba453654fc9126efe3855924fb5c5b6732e0af83d
+EBUILD puppet-agent-6.10.0.ebuild 2177 BLAKE2B 84453f7cf7d5f5318eb7aef13050c331cdf903cd8306387db135ebcfcb2fad4645aee9429920482e5952f94f12338d4bb2f36b43ab69c6f325a8c5efb781899e SHA512 b11e26983e25c1c60ac0e279b512696048914cca0acef6041854a9b0fb5a50cefdfc5d146481ee71eabc6660a2a06d31a8c257d345ac89542be492387d528dce
 EBUILD puppet-agent-6.7.2.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
 EBUILD puppet-agent-6.8.0.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
 EBUILD puppet-agent-6.9.0.ebuild 2177 BLAKE2B 84453f7cf7d5f5318eb7aef13050c331cdf903cd8306387db135ebcfcb2fad4645aee9429920482e5952f94f12338d4bb2f36b43ab69c6f325a8c5efb781899e SHA512 b11e26983e25c1c60ac0e279b512696048914cca0acef6041854a9b0fb5a50cefdfc5d146481ee71eabc6660a2a06d31a8c257d345ac89542be492387d528dce
diff --git a/app-admin/puppet-agent/puppet-agent-6.10.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.10.0.ebuild
new file mode 100644
index 000000000000..a72df734d6b1
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-6.10.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils systemd unpacker user
+
+DESCRIPTION="general puppet client utils along with hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
+SRC_URI="
+	amd64? ( ${SRC_BASE}_amd64.deb )
+	x86?   ( ${SRC_BASE}_i386.deb )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/augeas
+	!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	!app-emulation/virt-what"
+
+DEPEND="
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	app-portage/eix
+	sys-apps/dmidecode
+	sys-libs/glibc
+	sys-libs/readline:0/7
+	sys-libs/ncurses:0[tinfo]
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/run/puppet puppet
+}
+
+src_install() {
+	# conf.d
+	doconfd etc/default/puppet
+	doconfd etc/default/pxp-agent
+	# logrotate.d
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/pxp-agent
+	# puppet itself
+	insinto /etc/puppetlabs
+	doins -r etc/puppetlabs/*
+	# logdir for systemd
+	dodir var/log/puppetlabs/puppet/
+	fperms 0750 var/log/puppetlabs/puppet/
+	# the rest
+	insinto /opt
+	dodir opt/puppetlabs/puppet/cache
+	doins -r opt/*
+	fperms 0750 /opt/puppetlabs/puppet/cache
+	# init
+	newinitd "${FILESDIR}/puppet.initd" puppet
+	systemd_dounit lib/systemd/system/puppet.service
+	systemd_dounit lib/systemd/system/pxp-agent.service
+	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
+	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
+	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
+	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+	dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
+	dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
+}
diff --git a/app-admin/puppet-lint/Manifest b/app-admin/puppet-lint/Manifest
index fd7a169f4fe4..84819ac75d26 100644
--- a/app-admin/puppet-lint/Manifest
+++ b/app-admin/puppet-lint/Manifest
@@ -1,3 +1,5 @@
 DIST puppet-lint-2.3.6.gem 87552 BLAKE2B 0a2f4b9c2ef76c06bc4fb6eb0f737af406bf3949e7c9001685c6522714b550c0f2c5680d5d39f5d3994496a497664e912eadc44bdb7aa4c27635d23b36a90776 SHA512 d162307e66bb5f1dd923f2f9fab55de7b4c5fad6264d7a1bae8df20bd45c5a786b66d9f5b3bd235230fea959c67242462e711212f65807040048f4c0be7122b9
+DIST puppet-lint-2.4.1.gem 92160 BLAKE2B 5bcdf14cad8cbf90e69c6afaa6935768db3cd9023175a8d5632951c7ff0d5b91362988c0e667c0f852eae705920a6a570f582db394b89436f61eda50f314dc9b SHA512 39d872350ab9ad276c346a7020269f246889dfb00eef020f93a5b53a93e4ae8fd5cf307ac057d6129edf52974ea71af0abcf422e9e0be0ba570d029ffa7011bc
 EBUILD puppet-lint-2.3.6.ebuild 624 BLAKE2B 4ac251b1b01aca51123969199c9dfe49aabbcc7318e06c78a197299542ce5ed54a2bbdae8831d8349c58342b2bed43580b4b437417891f01e5c53d7559304267 SHA512 af8e5d8e726bc773053a9cfe5a4d0615db3acd67395762344dcc48a88ce5ca9c03124e4ee59ad0270c9d600299f1c812ab8884f43221b092fb8c2e8714f0ce2b
+EBUILD puppet-lint-2.4.1.ebuild 586 BLAKE2B 60d694ebd57c1112b3a76a4da7ec2efb3e72da48ffad9eb0fb284db50fa7185cc885bb19c3cb6f69b15c6f2ae24fdc1ee0078c570bd4d5a39ba2afcad29ffef6 SHA512 241c69280163c708f3c251d1f840aa851db3fb90ca0a5c433a95ef6b04c7f78b57d4db95ccb17332a8122cf80644d1b0de893998851b4992ab5b9587ace3be5e
 MISC metadata.xml 453 BLAKE2B 4fb00983f98c8c178fa1dc667f966b0f1fd54861ef71e37211fb46edceb8f91c15d55add637a50eda53ccaff8a1d3a6dcbdd02afe2ae32cf0f69797427897d6a SHA512 bd9238c56ddcdcb124df5d7530343756b865d2f279b719fb0ce7bf4e37565709194cb7f564811be6376fd4d3b61403d76eb9542aac3a267c2eb08f1bade21524
diff --git a/app-admin/puppet-lint/puppet-lint-2.4.1.ebuild b/app-admin/puppet-lint/puppet-lint-2.4.1.ebuild
new file mode 100644
index 000000000000..738798f64b2f
--- /dev/null
+++ b/app-admin/puppet-lint/puppet-lint-2.4.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit eutils ruby-fakegem
+
+DESCRIPTION="A linter for puppet DSL"
+HOMEPAGE="http://puppet-lint.com/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec-its:1
+	dev-ruby/rspec-collection_matchers:1
+	dev-ruby/rspec-json_expectations )"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 54b33e76c744..364c7fb005d0 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -13,12 +13,14 @@ AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7
 DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2
 DIST puppet-5.5.14.tar.gz 3075736 BLAKE2B bfea82d40f9671cdefab0b10c9481e4fbad397dd0a4aa26f5d0fa9ffa94477a5cc59b3724ab9ae3ee2e7e9230881676582c328c804ce9138dc484b9bd92e0ec3 SHA512 861100c02e0b8a5bb232d266bcd5e54b0e32cf26954ea37f276690aa3159ffdb28195ab8691df61ee0098300d226ea1d369dbdff8aae69101c2bbe6068ede8b1
 DIST puppet-5.5.16.tar.gz 3084466 BLAKE2B f3e2f12331b4794b90a81a4f80e626fcd3d5252b7cbdacc1d6243faa557540d3a68e5e23b7b5c3e4f4286774e9a9198e59fb15d7d7c41d7193754ed5c80dd624 SHA512 7d9e533e352a22e347ac6467094c4bdbde893c2503f47b4a2d175fd6e759e6662991efdd1a0a83d9495d22f28da4ae7a30cc771c5d90b8252c4618bd8837833a
+DIST puppet-6.10.0.tar.gz 2803541 BLAKE2B da122259341da54db8e9a6c3261934df5020164304bc493674d5164c0a11da1270746b41edb67c1d7c1f96b2553071c87ab2086f78b8184a1fab4dc3dbcc70fc SHA512 ff58d5898f34baa14363dc5c4f16eaa75b709b09cdb711662f3a74351d0abce85f3aa990057f296e208db8e559ecfa5ba9206ad5737aa64675e60c3e595747f5
 DIST puppet-6.7.2.tar.gz 2907345 BLAKE2B bbb0f789ae64b5039e5b1bd2ce985e89ba693d33352baee7a1d11df7f314663aa3606a73d42d6b20042f81ee405a72cd17b9cf8f3c3cb257869e982f84cfd552 SHA512 6ebcaff30bda27fc17870b991287d620d455db8cf9a41c59833efc2a7541d3622228a7278689eb0494d0f6328cd334764f21ffe8700a567696e05398a5c16b7d
 DIST puppet-6.8.0.tar.gz 2906582 BLAKE2B 2dd2f9eb203aa951e0ea9639efa20aac3edb063b4bd68dd0b05a07fc2a399c4b59b3b87a1cb573096c5042920080623b9afb9c4d863b6249664edcc291cd1787 SHA512 c8446529e706dab7fd156b5bbca638f1722b07a638f626df2002a4ad218ec5e448f533395a6eed613b31ebbacea56539e903c040998d4110c8a362f2ead7f43b
 DIST puppet-6.9.0.tar.gz 2911311 BLAKE2B 1d58d0e976430031732de4f63c3ec100088f1d93894cf52caff252befeabe1ea3cf51939063143bd7c9011bb56f2a6420ba38ae230edea19ac8f1f135ed6f56f SHA512 4d1bc1a398c1e75bf8e832d477a0fff4fa3613510f8d59d73594e6fc2f2bbbedf050b1e7729b71bb1428c230f42fcf7b98f7a7683fc3c52cb36a596e20e6540b
 EBUILD puppet-4.10.12.ebuild 5620 BLAKE2B 75fed43f7044fef014b1c9297066e07a5ef624fd187d141475e5fbaf69aab50494e783a16b212f3063cfaa059bec310b9771ccfa88d3f8ddcfc5458a75d2ba22 SHA512 8649b6811f330733ba25602e35e13bbd5be094c8f395d5f6c7a859662d831a579b9b3ad2a44b1ed9ea60882c32eb89a261f5e36977d79a2e9a88d5f12959a3cd
 EBUILD puppet-5.5.14.ebuild 3822 BLAKE2B b639a7bd6b1a2a0229271a2c00ae246e5cd219b91510f1fb1b5bcc4668d2f81c631233329628b78240354ae884ca9e4de02287896b326eef1220c81eb3d4e173 SHA512 1043b71e29082c1020a4c67814394dc70707c3f299afadb035bb2e15e4425a38dfa76b2323f4ad31b7142c1494cb05616ed28f0cf8f46b88760fcc53c3e734a5
 EBUILD puppet-5.5.16.ebuild 3824 BLAKE2B 0501c0a04cea8cd762732a7b6728833c99c828d79c39c18dc738e2c7cb063a8f14f997108a4d3863fc0abfbedf9546dd1541f01cbbb4ea3fdcb723a49fe6ec39 SHA512 baaadc5c82ea91dab0dbcf93a5b836248183777db978e0ec0621183b695191a19b6c7fdad892d0cec05c4426c64c949eadc4dce89f08cdea8b7b6f6913d01917
+EBUILD puppet-6.10.0.ebuild 3680 BLAKE2B 080661787edaa5fdfbb24a927cd1bd9f64ec30d3d928cfab512098a6a951dc42403625db7843ab9583ce3599484af0912065f3e759beedaa946332b27ccf4378 SHA512 420679b3193c53324c65a122a6633c329eb01d07bf4506a8ceeb3b7b4f7323af69fe3dc54b183934aee0ebbf691150946620fc2f134a8df64a8023669b0942cc
 EBUILD puppet-6.7.2.ebuild 3652 BLAKE2B 432cd4204b9115e0ddf08878e78977ce7b5baf73713846fb5150fa80d1e001a498d40d8d14284ddf09768990f6b9b3723da368c8222c0780a6c1f94d9b5079a5 SHA512 3e6ce509903378c9d6241d29183da2e84c01ab4918b20e6eb65b2c57e801549cb710e288515392d2b691c1bbb47c8cf207efd06a6242fa5eec6bb8090835a0e7
 EBUILD puppet-6.8.0.ebuild 3652 BLAKE2B 432cd4204b9115e0ddf08878e78977ce7b5baf73713846fb5150fa80d1e001a498d40d8d14284ddf09768990f6b9b3723da368c8222c0780a6c1f94d9b5079a5 SHA512 3e6ce509903378c9d6241d29183da2e84c01ab4918b20e6eb65b2c57e801549cb710e288515392d2b691c1bbb47c8cf207efd06a6242fa5eec6bb8090835a0e7
 EBUILD puppet-6.9.0-r1.ebuild 3680 BLAKE2B 080661787edaa5fdfbb24a927cd1bd9f64ec30d3d928cfab512098a6a951dc42403625db7843ab9583ce3599484af0912065f3e759beedaa946332b27ccf4378 SHA512 420679b3193c53324c65a122a6633c329eb01d07bf4506a8ceeb3b7b4f7323af69fe3dc54b183934aee0ebbf691150946620fc2f134a8df64a8023669b0942cc
diff --git a/app-admin/puppet/puppet-6.10.0.ebuild b/app-admin/puppet/puppet-6.10.0.ebuild
new file mode 100644
index 000000000000..d633c6865a1a
--- /dev/null
+++ b/app-admin/puppet/puppet-6.10.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit eutils user ruby-fakegem eapi7-ver
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="https://puppet.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	dev-ruby/json:=
+	dev-ruby/semantic_puppet
+	>=dev-ruby/facter-3.0.0
+	dev-ruby/concurrent-ruby
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl
+	dev-ruby/hocon"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+	)"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+#   dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# can't be run within portage.
+	epatch "${FILESDIR}/puppet-fix-tests-6.4.1.patch"
+
+	# fix systemd path
+	epatch "${FILESDIR}/puppet-systemd.patch"
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
+	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
+	elog "not already done so."
+	elog
+}
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index f7a013956a28..9a7cb74500dd 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -3,7 +3,9 @@ AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0
 DIST puppetdb-6.4.0.tar.gz 41720668 BLAKE2B a4637750c553eed8ee5bdd46212a7455fe1d59015aa78fe01f6fa9ee2b4a98ec50a2a8b551f65d4bc6965b2a969f559c53f5a6324a8e48983a1d027948387ce7 SHA512 c49afce1661ed284280e89ed9dbc2406a657e5f2cdbc501acf50900d431b58a341f1541789ea4ffe9109e8d30faf47eb85573a589426c40ad50597a7d81b5552
 DIST puppetdb-6.5.0.tar.gz 41768030 BLAKE2B 2a52239dabb5c026f4d00ee2942e3128ce50f1de23aa5ff5d53f2020237b54867b48727e774ecc27f5f18bd1617b43fcf30fbd3b03a730ca60d5bab7296e3f9c SHA512 8aee40101a17e22ef5b9b7b965ffe8d8a9b8dfaa787721b3e6a5e7363b98e0c52dc0583216a058540618a6a980cf80f138fa6b358a9daac518abd50981910cf5
 DIST puppetdb-6.6.0.tar.gz 43366185 BLAKE2B 224c13ff2583a7c8124f03845eca4756be6446e7470565c44d3fe1fcb756d5564ae2ded69d0bef1dda939efe082756c0e44afd3c6b0fc4268a744946860b5a02 SHA512 5076f52af51b7a3b43a0deb9cf1f10d77da98a5e531983d3661cda522c8d46f70882457934be6f70e77587b930077c0a4d2eaf7ed41eff9c6bcf4bc5ecbf2205
+DIST puppetdb-6.7.0.tar.gz 43437454 BLAKE2B ac1d656fe727c6c784ebcc6be4f84d3c2aa6fc48a154316e20d89d851456a2af826cb6840937875b78764299c882a631401c1cf2289888c76381a0bd966b859c SHA512 ccfd97651a7b1e1c242159c2f3c793370f8db1a37b115c47ca2754236cf7b67e39bd1bfc0244496e8dbbda47b5c847862be259d40574a41387ed809e62b11a47
 EBUILD puppetdb-6.4.0.ebuild 2763 BLAKE2B 5a717db469771e4e5ca2a19c165c9e5afbb41e32a1e906ff530d883e8a391c8187327b73fcf00f5dd9abfe7f9e73c167cc238df150d8b599598962fa353233cd SHA512 53b05e2c0934a232ec65fa12549a448968f5fba4d520d8e3c047e4721552a005e0690b44bf975b2ad42a23ed10884f797a03d1e05ba608f3abf4a60512407a77
 EBUILD puppetdb-6.5.0.ebuild 2763 BLAKE2B 5a717db469771e4e5ca2a19c165c9e5afbb41e32a1e906ff530d883e8a391c8187327b73fcf00f5dd9abfe7f9e73c167cc238df150d8b599598962fa353233cd SHA512 53b05e2c0934a232ec65fa12549a448968f5fba4d520d8e3c047e4721552a005e0690b44bf975b2ad42a23ed10884f797a03d1e05ba608f3abf4a60512407a77
 EBUILD puppetdb-6.6.0.ebuild 2765 BLAKE2B c66521b63c4680a2819820dfed00f28f49adbb5cd8abb1b64e16d6eee6e9fbb81ac30a7353a9e5288afbffe5850103c6813ce02982cc3f2a23be52ac020ef5e2 SHA512 1cfe6e646f930e88780dfe3fa3cc935d4840c1bd9a83b8c2adc85a5989ad5dcd370a283b88e3d9481327ee77dcb6368d7613d0fcb5a9b38f7a158a894c841c37
+EBUILD puppetdb-6.7.0.ebuild 2765 BLAKE2B c66521b63c4680a2819820dfed00f28f49adbb5cd8abb1b64e16d6eee6e9fbb81ac30a7353a9e5288afbffe5850103c6813ce02982cc3f2a23be52ac020ef5e2 SHA512 1cfe6e646f930e88780dfe3fa3cc935d4840c1bd9a83b8c2adc85a5989ad5dcd370a283b88e3d9481327ee77dcb6368d7613d0fcb5a9b38f7a158a894c841c37
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-6.7.0.ebuild b/app-admin/puppetdb/puppetdb-6.7.0.ebuild
new file mode 100644
index 000000000000..616793cb4123
--- /dev/null
+++ b/app-admin/puppetdb/puppetdb-6.7.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd user
+
+DESCRIPTION="PuppetDB collects data generated by Puppet."
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+=">=virtual/jdk-1.8.0"
+DEPEND+=""
+
+pkg_setup() {
+	enewgroup puppetdb
+	enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
+}
+
+src_prepare() {
+	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
+	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
+	sed -i 's/sysconfig/conf\.d/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	dodir /opt/puppetlabs/server/data/puppetdb
+	insinto /opt/puppetlabs/server/apps/puppetdb
+	insopts -m0744
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppetdb.jar
+	insinto /etc/puppetlabs/puppetdb
+	doins ext/config/logback.xml
+	doins ext/config/bootstrap.cfg
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetdb/conf.d
+	doins ext/config/conf.d/jetty.ini
+	doins ext/config/conf.d/repl.ini
+	doins ext/config/conf.d/database.ini
+	doins ext/config/conf.d/config.ini
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
+	doins ext/cli/foreground
+	doins ext/cli/ssl-setup
+	doins ext/cli/config-migration
+	doins ext/cli/foreground
+	doins ext/cli/anonymize
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetdb/bin
+	doins ext/bin/puppetdb
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
+	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
+	# init type tasks
+	newconfd ext/default puppetdb
+	systemd_dounit ext/redhat/puppetdb.service
+	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
+	newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetdb.logrotate.conf puppetdb
+	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
+	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
+}
+
+pkg_postinst() {
+	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
+	elog
+	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
+}
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 0e654df4306d..cbfd7fc7a48c 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -2,6 +2,8 @@ AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a
 AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58
 DIST puppetserver-6.5.0.tar.gz 76080713 BLAKE2B 0562128001a24eae6cec071a366e16ab3ce5b0babbe50330ecddd13ab3dbfd35d6cb23634770e4bd7904cd231752ce923d4af8dc42d783cc137f300efcb05fb2 SHA512 d871f3817c370ddd08e8d791deb1a30aa50ab0d801192ebfb5ef225d8dce21885175fe4e9911287437b687b2bcbf5a098d8b9511b24bd05fdf4854575a686cfe
 DIST puppetserver-6.6.0.tar.gz 59095750 BLAKE2B adbc08a68a1382106c43d27604c2cef52bd1d9875c5f555320d97d31dcf9d248c88baa2d6dfd37a855010fda76ad4d273a7bd5eca77bb216aabf6a120e41cee0 SHA512 2b43092752e246027a437398d6d23a4085caa2956a1453cec2e62f1001fca1c98bddca0a9d90c178ce9c89a06c26edcaee49416c1b8a4941e2bc4b6b5bb1fe0e
+DIST puppetserver-6.7.0.tar.gz 59097892 BLAKE2B 99f57d54e7cf2a071edb266f1487b80dad86a92d27fc6143c8581f08d430aceb66845f92c44e153748529611048f96b91817a80249c7707d6f861eae455bb133 SHA512 bc7e9e57f072a3b29b75a383d9c60414ef4db30f725faa69da3b258b860005f7f50fa4bb5a454bc90a5277d8c636231e2d0a5cbe23addf0dbf46be3f3ec28278
 EBUILD puppetserver-6.5.0.ebuild 5370 BLAKE2B b3b8bbba45305b658c94fcc43c9e2d11b854e80f536e5e3c3afc7c4182f954b9491f47eb83529dbd00a894b793c9a0cf660ed7b52051b840b24e7fedec97a6b2 SHA512 31b6e681af9dd22d9388a447237289e3e48d79d2e7e1ba79d10e70084b99a9d7cf99fdd19b58a210f990ed1b202af2367a0e0911f8579a876ff284413f6051ce
 EBUILD puppetserver-6.6.0-r1.ebuild 5393 BLAKE2B 72168876f0d5ce90d779ddf60ed2069e284c3ef98a9e62a594e1b8614a3ac2f2681d25f7c3222ef0084d1d816d991d818d471f874bc8675d2a39fdaab260b288 SHA512 640a1e81775befe3a5a19ed8c8a19c53d11a30cbd9bf9613a5c19ee487bcc1d2e0948d91779a4c9bd7ccc1fb8e86f4c77fb0eaf1ddd5a13ad0158093729afed5
+EBUILD puppetserver-6.7.0.ebuild 5393 BLAKE2B 72168876f0d5ce90d779ddf60ed2069e284c3ef98a9e62a594e1b8614a3ac2f2681d25f7c3222ef0084d1d816d991d818d471f874bc8675d2a39fdaab260b288 SHA512 640a1e81775befe3a5a19ed8c8a19c53d11a30cbd9bf9613a5c19ee487bcc1d2e0948d91779a4c9bd7ccc1fb8e86f4c77fb0eaf1ddd5a13ad0158093729afed5
 MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c
diff --git a/app-admin/puppetserver/puppetserver-6.7.0.ebuild b/app-admin/puppetserver/puppetserver-6.7.0.ebuild
new file mode 100644
index 000000000000..45ac7ad8e73d
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-6.7.0.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd user
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+="
+		>=virtual/jdk-1.8.0
+		app-admin/puppet-agent[puppetdb?]"
+DEPEND+=""
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
+}
+
+src_prepare() {
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	insinto /opt/puppetlabs/server/apps/puppetserver
+	insopts -m0774
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppet-server-release.jar
+	insinto /etc/puppetlabs/puppetserver
+	doins ext/config/logback.xml
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetserver/services.d
+	doins ext/system-config/services.d/bootstrap.cfg
+	doins ext/config/services.d/ca.cfg
+	insinto /etc/puppetlabs/puppetserver/conf.d
+	doins ext/config/conf.d/puppetserver.conf
+	doins ext/config/conf.d/auth.conf
+	doins ext/config/conf.d/global.conf
+	doins ext/config/conf.d/web-routes.conf
+	doins ext/config/conf.d/metrics.conf
+	doins ext/config/conf.d/webserver.conf
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+	doins ext/cli/ca
+	doins ext/cli/irb
+	doins ext/cli/foreground
+	doins ext/cli/gem
+	doins ext/cli/ruby
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli
+	doins ext/cli_defaults/cli-defaults.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/bin
+	doins ext/bin/puppetserver
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
+	# other sys stuff
+	dodir /etc/puppetlabs/code
+	# needed for systemd
+	dodir /var/log/puppetlabs/puppetserver
+	dodir /etc/puppetlabs/puppet/ssl
+	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+	fperms -R 771 /etc/puppetlabs/puppet/ssl
+	# systemd type things
+	insinto /etc/systemd/system/puppetserver.service.d/
+	systemd_dounit ext/redhat/puppetserver.service
+	insinto /etc/default
+	newins ext/default puppetserver
+	# normal init type tasks
+	dosym ../default/puppetserver /etc/conf.d/puppetserver
+	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetserver.logrotate.conf puppetserver
+	# cleanup
+	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+	fowners -R puppet:puppet /opt/puppetlabs/server/data
+	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+	fperms -R 700 /var/log/puppetlabs/puppetserver
+	insinto /opt/puppetlabs/server/data
+	doins ext/build-scripts/jruby-gem-list.txt
+	doins ext/build-scripts/mri-gem-list-no-dependencies.txt
+	insopts -m 0644
+	insinto /usr/lib/tmpfiles.d
+	newins ext/puppetserver.tmpfiles.conf puppetserver.conf
+}
+
+pkg_postinst() {
+	elog "to install you may want to run the following:"
+	elog
+	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
+	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
+	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
+	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+	elog "puppet config set --section master codedir /etc/puppetlabs/code"
+	elog
+	elog "# install puppetserver gems"
+	elog "cd /opt/puppetlabs/server/apps/puppetserver"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
+	elog "while read LINE; do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
+	elog "while read LINE; do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
+}
diff --git a/app-admin/pwgen/Manifest b/app-admin/pwgen/Manifest
index 2e50bdb376af..f5310ccc609e 100644
--- a/app-admin/pwgen/Manifest
+++ b/app-admin/pwgen/Manifest
@@ -1,4 +1,4 @@
 AUX pwgen.rc 389 BLAKE2B d8a3af8df9be2a78e18aaddd7d17269ecb0c61a4c77252a77bb2d492edfe5b8c31279de616c4b0bf92ef6ec4763235b18931edc333121c543cae3e839927bedc SHA512 5d2bdf0dfbaf8fc31cd8217495fccccfefb383779c8a03faedcfaa830851b3bbdccb63fdf8d1bf8aa8a96759ea90a31da6b7a4e0cf5368e62ed10b8db8b0382d
 DIST pwgen-2.08.tar.gz 54884 BLAKE2B 43bb6176d9408558b362bd84839c190c4bcf5d8f71b46fcbbe0b00c390d957683fd9403ff697e96cef2e4de27776c841e12032d3589965629e8e2d29bf202583 SHA512 4a930dc7d4c58a4434209db30c54629d76fce57d0fd5767cd7894168bb1a5b85eaae6734a982b0f4e0640540c366ce27ad84860ff2c406dea3f5902b5bb54255
-EBUILD pwgen-2.08.ebuild 616 BLAKE2B 6f71677b2e4942cd00b3675b10eaa73c22047642afea5034ad3dc3fbf73811188b274562011a94437863f448b426eff3907dcc1838fa6dd1dba66fcdffb800fc SHA512 20045fc69973fc91523c83ae724ec54b5089a533daf9eed62d8736ffde06c4f3fc1537998c5cb56f3031420df165662d404af4b6c8f5f0cb9461969c744a568a
+EBUILD pwgen-2.08.ebuild 594 BLAKE2B 4583f692930989a7b76ef34df60f5106c834ad327423d5c8aa5229f9e88dd37d010c409f55d183eb22cbb1090cb706248cd0f1343cd3dc10dfd1866afafd3e81 SHA512 399e6902f45711d4c7ffe822090c8b9cf6e95f08c7ea711c998adb5e4c70fd31661f2cc629c0740dd27b72bfb6b87db2c7d743bc9ceeb58e2c8eeb7a91e685c1
 MISC metadata.xml 765 BLAKE2B 133e60da10e57e53ea3013d7615aae83d8d38bf18b8e92c1a081d43524551180e2654233e0a2b2207dd11f31114cd221f33fa5eb4c1486c87ea0bd031c613f2f SHA512 5a6e7e1b7e8fc44e9f39e5d0f349a27360d94778522131c749748690fd6db5278a5a9354242b2030bdfc8db7890e340621a1d939364bd40d3d96b018cc6e443f
diff --git a/app-admin/pwgen/pwgen-2.08.ebuild b/app-admin/pwgen/pwgen-2.08.ebuild
index a05eca05e835..cf2729bb7764 100644
--- a/app-admin/pwgen/pwgen-2.08.ebuild
+++ b/app-admin/pwgen/pwgen-2.08.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="livecd"
 
 src_configure() {
diff --git a/app-admin/pydf/Manifest b/app-admin/pydf/Manifest
index 874688e9d63b..fd0f480460aa 100644
--- a/app-admin/pydf/Manifest
+++ b/app-admin/pydf/Manifest
@@ -1,3 +1,3 @@
 DIST pydf_12.tar.gz 14207 BLAKE2B 9bd972529c38380b474fbbd82069e880d950cb5b9ef659f82cfb19417447abd16ecb049e0f6df3354e39c404b06dd7546296289633a4d77b61c41a5378a301f5 SHA512 5a5819b83fe2425cb951a139b38b1b639d17e1d17c4e3e4a80fc4eb6d5632c42b03a2767e1864c8bee13dbd72ebb91ec79fefde1ba448e2af9fc4a314821a3d0
-EBUILD pydf-12-r1.ebuild 785 BLAKE2B a74a795a3e5160c17827314e5ef24ccd3da277b857a0a0667470773ba2644a1e8d46d73656a0e0e7d1183669f88440ea9deadaffd9b8eb71ea25401d060538d1 SHA512 f0655d304845b8ad99ed4e4634dab44f54eea1d53f02aa7e7701c7b3685d9e952a765f121c7201c21a017344f01072475221ef04f1f1b6ca9e02d024e5878866
+EBUILD pydf-12-r1.ebuild 763 BLAKE2B 4be7767f30f33000e28ac0d9ddd2507c06d5e3676f7f7eeb592ff3a5e617f255adf12433008ddeb53653df7a4a3e4bfab528f15edf331b3bf7df814ee3800d64 SHA512 088fc20be5934db1da7e4ba1541a2cf97dfa2d1bcfad1691af6ba0dec4043cc4f4bab218fb052e66b3402e96d19cfe814ea2cec108790aeead7eadbdb8357894
 MISC metadata.xml 251 BLAKE2B f3c965f619454b2d17e1039b6c218308c83af9214f41a5b18244ce9bd811b0a0b6e0227fdaac9b1659a2e2467e6b992b771ff6cf431220648363ab8173ee76f2 SHA512 e8203a24b5e739dcf0d94742215ee6ccdccbd00bb43001f9df58d27100fa427b01937065e1d7399e3552532b09179611e06099e3af14aac5fcf9ddc4ca5463da
diff --git a/app-admin/pydf/pydf-12-r1.ebuild b/app-admin/pydf/pydf-12-r1.ebuild
index 80889c5f9a24..1c8441931abe 100644
--- a/app-admin/pydf/pydf-12-r1.ebuild
+++ b/app-admin/pydf/pydf-12-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://kassiopeia.juls.savba.sk/~garabik/software/pydf/${PN}_${PV}.tar.
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-admin/r10k/Manifest b/app-admin/r10k/Manifest
index 6ea0d7557a37..86ea1704f7f1 100644
--- a/app-admin/r10k/Manifest
+++ b/app-admin/r10k/Manifest
@@ -1,7 +1,9 @@
 DIST r10k-3.2.0.gem 206336 BLAKE2B badc840ec7e6793daf205f1352899fa909e9a922a353a52841809dc80fd03758a865e0cb8210e58bb5c25968207d537b3f19c1903fbb519c50b6af2dd27eb5fb SHA512 7ea00ec28ba631877d33fa8b00b25e1c69346b787499ec7b26118c16acecf6bd39fcdc4618af016ebf5b62850b6d984510f7e9153dd4e99771def299b7d0703d
 DIST r10k-3.3.0.gem 206848 BLAKE2B 92fedb9871c6e22df3a3f8c4cf18feac1bf3ef51e2e67b3001c811bc81397eda71bc9da94ef860d6e39b989fd1c1a3b9dae402142496f17c4427ff2de62188fd SHA512 674c5c386885dd1476264d8bc047ddad0411b6344350662021ede8a5352e95fd50a72f62127b00bf6b2bc8e6b3835b017128788707610d510a64eee13b9f4d4f
 DIST r10k-3.3.1.gem 208384 BLAKE2B 81e7de3d2fabd038240478ab7ace4fba181a4370544f964b438a6b96de34a741f653aff018ece21453b119ae6b12f06934cc82be8a6b78cd5a72277195a5fe81 SHA512 20f9c92fbabed82521d452f339d9d2fd8cc438cac1cc11385a6e2874a5d55fe6425ddfcd281d8e63ee043adec5fbbfba0c37ef0c6e15d498c64ba550740ccd6e
+DIST r10k-3.3.2.gem 208384 BLAKE2B 8d5ce5d7fb2497b701fdf7cd0a742db7b221a2b327464b553b9dbd893ecfbda2498302fb14cda89df7030c6b48dfb048d23d5c271773a3974e75b115ad0e3c49 SHA512 ccc71c856f204aafe9f15b497c3881aaa3beff50c36647e06590cbbaebaed58514eb30a5d57bbee4ba071e3586083c0b07decbd68c859667e6eb6bb57a40aef5
 EBUILD r10k-3.2.0.ebuild 933 BLAKE2B 6e7df53cab2a25bb5bf6fa4218cd670b742a68aeeb5402dd09d1f34861d0596250b915965a06b4cc8c157009d671046c00758cb576223d108e6b8d40067a23a6 SHA512 66c0c7e12e9f934c9e5f3024021e31ef4dce674f3eb27763bdc60413c9ef79dd101ed5cdcbdeec6cab9332fcbb60454754aea7c05f251b23327fef6f227eb7c8
 EBUILD r10k-3.3.0.ebuild 941 BLAKE2B d66e537eb1478ad0acf777d35efde0ecdad4594c5032ce01cfcb873eecef8e9fe65f237a0465ecc2f2368fb3019e728f54c7eebcfd06f461362f65ebc9cceb4f SHA512 eee05605d5294656c76a5207b25ced88a7162cfc15308660bb51fd9d22d13ccea24c288d21d540b8da108bcfe18e6539c589f0f2d3dd420ec1050850d7f19365
 EBUILD r10k-3.3.1.ebuild 916 BLAKE2B db2bdfab6af08c85fafdc36a9cf45e340ca0a65a0d8917c793d020e23d5773d77e71b40926be7e03a7161e4b0c8cbf80452ed928bd198594cc26fa55616d5158 SHA512 18d544b67913d9f0cb8f5cd0ac906b7ca482cb9bfa926b8feb98bef68447ba7450bc52ad00a2ca60289ef93a45340e8d8f96771e5647004b816fbd871e69ad4d
+EBUILD r10k-3.3.2.ebuild 916 BLAKE2B db2bdfab6af08c85fafdc36a9cf45e340ca0a65a0d8917c793d020e23d5773d77e71b40926be7e03a7161e4b0c8cbf80452ed928bd198594cc26fa55616d5158 SHA512 18d544b67913d9f0cb8f5cd0ac906b7ca482cb9bfa926b8feb98bef68447ba7450bc52ad00a2ca60289ef93a45340e8d8f96771e5647004b816fbd871e69ad4d
 MISC metadata.xml 582 BLAKE2B e3b514385b7b851b3ce037de51024108005224c75fba470db28fe6e4d6b3632ace21a8e829198e0b22d1ba0e76b1a5c01df10426ea497ec3b00e20e578608d2d SHA512 fb8913a9f806ac0b2035dc788ee78536fff96ffb635454f668d7836d8ba849fea158e628da12743c1844b658961866b3d64e8faf700c7e373065045175785536
diff --git a/app-admin/r10k/r10k-3.3.2.ebuild b/app-admin/r10k/r10k-3.3.2.ebuild
new file mode 100644
index 000000000000..1826c94b4704
--- /dev/null
+++ b/app-admin/r10k/r10k-3.3.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Puppet environment and module deployment"
+HOMEPAGE="https://github.com/puppetlabs/r10k"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+git"
+
+ruby_add_rdepend "
+	~dev-ruby/colored-1.2
+	~dev-ruby/cri-2.15.6
+	>=dev-ruby/gettext-setup-0.24:0
+	~dev-ruby/log4r-1.1.10
+	>=dev-ruby/multi_json-1.10:0
+	=dev-ruby/puppet_forge-2.3*
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/archive-tar-minitar
+)"
+
+RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
+
+all_ruby_prepare() {
+	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid specs for unpackaged rugget git provider
+	rm -rf spec/unit/git_spec.rb spec/unit/git/rugged || die
+}
diff --git a/app-admin/ranpwd/Manifest b/app-admin/ranpwd/Manifest
index 5eeba6300813..d1cdb74af610 100644
--- a/app-admin/ranpwd/Manifest
+++ b/app-admin/ranpwd/Manifest
@@ -1,3 +1,3 @@
 DIST ranpwd-1.2.tar.gz 41018 BLAKE2B 787907c5ed7541f24846e4574c4e40005b85d33667d4ac2a85633085976d047271de797c2f1de3bb0e34cdd56b8b2b60ea8ae80b478c3f1d1124a413a01e351b SHA512 7ae8ff593623a2102e50fbb3356889291408263100a358de14bd44b13c1d2931bf0e1e8ec972a620b8328a179a38a0d614099ffea2473079f9ed2425809a922f
-EBUILD ranpwd-1.2.ebuild 557 BLAKE2B 0ada59fc8688143bee161a6a727de93a8fee59a6a2ba5ad4fe69bd58b38dfb6decbd02489957f64a04e5d5437b1a771ad48a5ced4b90d98f375a092a3a9805e1 SHA512 4049d84199a006edad47bd172997987bbec12873638c04d9948649e2cbae75146f7695370f954cc8022a1ffc86206ffbdc63f245ffbf121a63cbceb661df467f
+EBUILD ranpwd-1.2.ebuild 568 BLAKE2B ef3bbf8547cbaec63d1d607b8f415c37a560949e90e019f88e1e8965d3d0e49a677a58e6964e8810f37d19090e86b96e37e84e3bfe1f063f37741ecfad1c7721 SHA512 6ffdac5f5bfc837219c89fe2ad41a8c9787939bb67bdc0c46b3c5a1eee3d69ab4e8cb563d3cce377a5b19bd3118da53ee6c6af407a189015cb7e5de6ee20e4a6
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/app-admin/ranpwd/ranpwd-1.2.ebuild b/app-admin/ranpwd/ranpwd-1.2.ebuild
index 6d8cf1681815..75be421d8d0c 100644
--- a/app-admin/ranpwd/ranpwd-1.2.ebuild
+++ b/app-admin/ranpwd/ranpwd-1.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Generate random passwords using the in-kernel cryptographically"
 HOMEPAGE="https://www.kernel.org/pub/software/utils/admin/ranpwd/"
-SRC_URI="mirror://kernel/software/utils/admin/${PN}/${P}.tar.gz"
+SRC_URI="https://www.kernel.org/pub/software/utils/admin/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index f0df7f53384f..b81d405238da 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -7,10 +7,13 @@ AUX rsyslog.initd-r1 1755 BLAKE2B 768dc0d2bcbf240b7a09e814d681ce65a319cd128ef40b
 DIST rsyslog-8.1904.0.tar.gz 2902708 BLAKE2B 515d5e32c2dc6cdd8dd51fc595ad775503438603f28828e9f1a427b184a5a61de32af2ee90334b7d56a9404106d74da47386a18a370278d5a16422a6bb09f556 SHA512 cccb48f06508d7e7c2dd788903f4d7ddb3020cdf6079aea1d52387c56b920f10b08957a79b5d420ccdb54cae50d1da6e5eb80cde9498bceaeda4f6ce37f694fd
 DIST rsyslog-8.1907.0.tar.gz 2926855 BLAKE2B 65c674e53bfa960e3fe5c7f41a304cf8736fe72e2391895dde9fdc17fabeb2f92fccab48965d5e1689a5852136a43a3355f89c9fa9d1d1974335ce80204bb4ac SHA512 2aa3f6106e48fa63c6d4389f83e7a3212817c626d04881682236055792cf5c9d8a941638c9a508c470b6a24c934ef5cb0eda65ea25179d98831afbe2a27c1519
 DIST rsyslog-8.1908.0.tar.gz 2952939 BLAKE2B c6784753262a71f30f32fc35ad3e3e75fa2af271bdb0a62c2d4796d3d0413c7f619052a5e33c52c5f3b22aa474d14b7bb06e9c502944f914e708265835fd90ff SHA512 66b6755e1f5a610ed8ec3f8fad1ee227f8ff34618a8f2660a801e6f9aa734980190fbffd8144ac30d63f8297a06e86ada65ba838242d8a006bca8e30f56dce80
+DIST rsyslog-8.1910.0.tar.gz 2957635 BLAKE2B ea350d3fb923c2f7d2799942fec6a77ef893fa12bc95a5b1428b8e280d96b562cd864469ebf13ee57e9ea89787765a4bb13d155460defc73a3a85b17ad6a5ab1 SHA512 85f5df91a6357ecb38708b4d569d26804a50ca28c928a636ac7749595f1a7105c3450fbd521835a436ebdfdcac33a33986e09a09026745ea4d1a2897406770d5
 DIST rsyslog-doc-8.1904.0.tar.gz 8042650 BLAKE2B 585fe5c63eee1fb46f94dcd3d529045b3900e08c291e0e71ed9bf32a6200e6c7283820b262bd56e9aeb74cc227ecd518caafec5a8f87c1d8523d5d7fd95030aa SHA512 da0ff00fbe71756b3c27fd8b94e88611452c3ba611e583862556393faaaa596ca8f32f694ad40a3e1df67385d9f9ca80db6a58f5d2e336fe95639dd7cd0de828
 DIST rsyslog-doc-8.1907.0.tar.gz 8071764 BLAKE2B 90c18a93bb2f2c9158a4696245c44c36ab4c40597d1eb8df8af257f57aa17e71436bd60792c4f982ebc15395abacd53281046e4ae6df65c306f815e6599fb8bc SHA512 72dcddef6e36a92d2bdcf54072fff7516b6c731f43a53ef8f5d4ebdbe46bc7aeb63bbc3e739a6e5897602ea7705c4bdd8f57aa10796955ed772a6c7cf552c5e5
 DIST rsyslog-doc-8.1908.0.tar.gz 8082984 BLAKE2B 7f102a215b0c51b961a4e44e97c8a3cd9966215dba44a194a5ff925b8a2b1ad3389461e2de3dae6dfb770bc36c9a31747298bdb7e975d6fa86ca209c9e314ac3 SHA512 d826013de671c895be7becd2a7c5ce1fb218149c6128d486116be6a01fc69099026f5a277b30fc57e626aeb4038e00b17abcad9a45ea3c9838e7041de9d991a5
+DIST rsyslog-doc-8.1910.0.tar.gz 8158007 BLAKE2B 7a05cf7070ba350d0fb939350868ff0dd9d03be46ebd1b1261e54add70ab680afe0b356f563ea9e10148aed17667fc0b729e2fa8f7ff7cff3e4cec9d0da209a8 SHA512 e46f14e40ae690efbe3114a859c1c94c8f9573ca5ebdb533ad4b5ed76c3a930c887cc205e7279fcc546fda3ce624eae507ce08d5d10ee1eb167a957edd742bf2
 EBUILD rsyslog-8.1904.0-r1.ebuild 12569 BLAKE2B 119a617375da61a37962edddae9f20888fcac469325b77f07c15141d471a00e62f6647b94d9837990ad7bccc0e85fb071de8b63f411245f9759f2163677fa663 SHA512 2a6514fbe431f61c29a8f261f528458c05e82398a34b4cd810c36cadaf5d355f7678f530f52d9236269eab01c990703b2bdfe2c6b6b8d3ea0005f1f168587a54
 EBUILD rsyslog-8.1907.0-r1.ebuild 12546 BLAKE2B d562cb749a8632d6399613667f786dabf472b65b112a5775a9f2977b3a513b25f50454419fb62ff02648e4dc1acf5fb226b7d01d62e70bdbcd1de69f6c6cbb97 SHA512 9d683b5267a57653bbc7f8caff1b8e60e78b6e7dbfc6cb2ba7f63ac80776b75cc1d3ba84c27a9659cfd48e568c01af97423f5450af6173e94a9bb9ae38eda95c
 EBUILD rsyslog-8.1908.0.ebuild 12548 BLAKE2B b8fb662688270ee92cc4382bbc39a78e8bf4db46f48e4dcbb4cb3efb0194eb8dffad999cff631199909573590842dd56efc5fb38c05cb88e72ea0bfe5040aa64 SHA512 fabfdc53abf6aab98f7ec7a0ee4381d73155df3a3f1e3dec5b9f8705fa83d336005de173bcbcf34d3a136f5c4565416d35e289c0a827d6fdde63ee5784c656f8
-MISC metadata.xml 3875 BLAKE2B 4281901c6e209ace8f89bf7ec7f036cbabff009da2f080c5b5d77a0639099c8d87ed9925d70e7e3edb6cad8204ebee3a4b74a688b6a22810473a22d90c441347 SHA512 039cd323565bc8e96762bef5b7b34747fffc6d70176397d4be8fd83d1f9dd094e77c21f7005f0d3dc47813ddd97bdbad1ce47ef71a2742ffdbd4145142d2d0b5
+EBUILD rsyslog-8.1910.0.ebuild 12548 BLAKE2B b8fb662688270ee92cc4382bbc39a78e8bf4db46f48e4dcbb4cb3efb0194eb8dffad999cff631199909573590842dd56efc5fb38c05cb88e72ea0bfe5040aa64 SHA512 fabfdc53abf6aab98f7ec7a0ee4381d73155df3a3f1e3dec5b9f8705fa83d336005de173bcbcf34d3a136f5c4565416d35e289c0a827d6fdde63ee5784c656f8
+MISC metadata.xml 3874 BLAKE2B c09a57dcbd88bda6c510ca741e1ee8c5207e5906843fe3ae21c8dd6575c7b104dae74e79e5a27c8bf9f0348673f5c33eb6c4b12fafbb1ba64f1a9f81bd374eaa SHA512 2f7a72017376018aa5d864deb33675d51ab50cd8481dffb7f1421b83d4e07f19a86a90705dbb6191686fc650284e2bcbe30ed0af07082b57eef46dd615778868
diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml
index 7334da40b164..44991a3a81a8 100644
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@@ -17,7 +17,7 @@
 		<flag name="kubernetes">Build the kubernetes modify plugin (requires <pkg>net-misc/curl</pkg>)</flag>
 		<flag name="libressl">Use <pkg>dev-libs/libressl</pkg> instead of <pkg>dev-libs/openssl</pkg> (you still need to enable functionality which requires OpenSSL)</flag>
 		<flag name="mdblookup">Build the MaxMind DB lookup message modify plugin using <pkg>dev-libs/libmaxminddb</pkg></flag>
-		<flag name="mongodb">Build the MongoDB output module (requires <pkg>dev-libs/libmongo-client</pkg>)</flag>
+		<flag name="mongodb">Build the MongoDB output module (requires <pkg>dev-libs/mongo-c-driver</pkg>)</flag>
 		<flag name="mysql">Build the MySQL database output module (requires <pkg>virtual/mysql</pkg>)</flag>
 		<flag name="normalize">Build the normalize modify module (requires <pkg>dev-libs/libee</pkg> and <pkg>dev-libs/liblognorm</pkg>)</flag>
 		<flag name="omhttp">Build the http output module (requires <pkg>net-misc/curl</pkg>)</flag>
diff --git a/app-admin/rsyslog/rsyslog-8.1910.0.ebuild b/app-admin/rsyslog/rsyslog-8.1910.0.ebuild
new file mode 100644
index 000000000000..09eed323e458
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.1910.0.ebuild
@@ -0,0 +1,462 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit autotools eutils linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+
+	SRC_URI="
+		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
+	"
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres"
+IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.8:=
+	>=dev-libs/libestr-0.1.9
+	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+	kerberos? ( virtual/krb5 )
+	kubernetes? ( >=net-misc/curl-7.35.0 )
+	mdblookup? ( dev-libs/libmaxminddb:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	normalize? (
+		>=dev-libs/liblognorm-2.0.3:=
+	)
+	clickhouse? ( >=net-misc/curl-7.35.0 )
+	omhttpfs? ( >=net-misc/curl-7.35.0 )
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	relp? ( >=dev-libs/librelp-1.2.17:= )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
+		openssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	systemd? ( >=sys-apps/systemd-234 )
+	uuid? ( sys-apps/util-linux:0= )
+	xxhash? ( dev-libs/xxhash:= )
+	zeromq? (
+		>=net-libs/czmq-3.0.2
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-archive-2015.02.24
+	virtual/pkgconfig
+	elibc_musl? ( sys-libs/queue-standalone )
+	test? (
+		>=dev-libs/liblogging-1.0.1[stdlog]
+		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+		!jemalloc? ( sys-libs/libfaketime )
+		${PYTHON_DEPS}
+	)"
+
+REQUIRED_USE="
+	kubernetes? ( normalize )
+	ssl? ( || ( gnutls openssl ) )
+"
+
+if [[ ${PV} == "9999" ]]; then
+	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+	DEPEND+=" >=sys-devel/bison-2.4.3"
+	DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if use doc; then
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${PN}-doc-${PV}.tar.gz
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# https://github.com/rsyslog/rsyslog/issues/3626
+	sed -i \
+		-e '\|^#!/bin/bash$|a exit 77' \
+		tests/mmkubernetes-cache-expir*.sh \
+		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		--disable-liblogging-stdlog
+		$(use_enable test testbench)
+		$(use_enable test libfaketime)
+		$(use_enable test extended-tests)
+		# Input Plugins without depedencies
+		--enable-imdiag
+		--enable-imfile
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without depedencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-fmhash
+		$(use_enable xxhash fmhash-xxhash)
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmlastmsg
+		$(use_enable normalize pmnormalize)
+		--enable-pmnull
+		--enable-pmpanngfw
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable clickhouse)
+		$(use_enable curl fmhttp)
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable kubernetes mmkubernetes)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable omhttp)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable gnutls)
+		$(use_enable openssl)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq omczmq)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/README.gentoo
+	)
+
+	use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+
+	keepdir /var/empty/dev
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/doc/${PF}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/doc/${PF}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl ; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+		return 0
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
index 00686cb4f302..f4dd11c1de2c 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -2,6 +2,6 @@ AUX sshguard-2.1.0-conf.patch 408 BLAKE2B bec9debaa542d7d2d7f21d5308cda162a75a63
 AUX sshguard.confd 634 BLAKE2B f083e6d4f7df6cefae89ef382a82cd7c5863c6a2ded34aee61ab028f8320c35552b80d5d8222ed35adb13a70cf6096eb5d88749f5b5ff72ca483f27fd1c0de56 SHA512 72b2a9c995bcb604516525f8190eaf35fa57e18274f83a8d00fd5b223b598c0c4ffd8b7ce89b1139c89380e5a7181c8024a6041375c445edb29c8f8b49abee50
 AUX sshguard.initd-r2 389 BLAKE2B b4098e0baf82e1c1f1978d6b3916fe9f2e67891d02b7b842492558f9b44c1c0c23204d88c036f49e069c42b0fbbdba31d8292419a2d22e603f29926228a8a223 SHA512 951ea1479836d1b318c35be03c340e5101aa3663bf2581cd0d928de2fea36f0b7906e50d9abf1b6b11fa682427e8d72b45bc95bb8f40a85fb471bfe354108108
 DIST sshguard-2.4.0.tar.gz 771506 BLAKE2B 82e9caf70dc9a1ba9ef6ba1c0916424a74891c84069a4a879c9057f3baea32af68f35d8b31cacdd60d323f5ec7b02a6e12aff1ec72fc0291b74c4882cd441d93 SHA512 64293700ef85f0843c333c3a27b04c5b2f69bf8dddf46353a371d4178915deb931362b3641ded0eeb5365f30cb63ce6ce17256d8d094383d1cfe661065b9c1c6
-EBUILD sshguard-2.4.0.ebuild 756 BLAKE2B dc5b4e082dd6a45b95b7d8af451f36987ee690e280e533858a77aac2e27af831135f2b0006ec8b8cb59f08090f7b56abb443eff0409890e0b7d24196c8a511f5 SHA512 7b8ce693bca7d5757eab80679723f700d85274da12cc112bbaa316817222b5960e9c58681090f9d4ad4e13267c55e870b1fa9498f0585ec64bdf75e425c97a33
+EBUILD sshguard-2.4.0.ebuild 746 BLAKE2B 0284fa3b1f9204fbca96a816efbe9c547556fd3b0cc18c5cf8b35d1e90bed01f4e0db7d0cf1705a575486ef11cbfd609deb8b06eb5c3a841415b853e62d96530 SHA512 8e6a32839fee40b4870ddd1b4308b44c8b3d3a0e9136f269bb935178e9f8551b8194a4a8e6f20f778c4a77ec261009928fa7267f357986ca27617d532360fddb
 EBUILD sshguard-99999.ebuild 799 BLAKE2B 38b307936f73e2926466241496fdf59a6cf7def5e60405674a1a07666cdbf0042310977e79078352e623244670e22a8cd41b2ff7969b2ca6577441beca55ca69 SHA512 a33dbdc779c7021aecfa9927eb7e41313ce8b82f3509f1a33e8beacae5597db7e8f5b1a1484edee7e03956fe07d9a39717673985bc8988dba0e20835cd722aea
 MISC metadata.xml 348 BLAKE2B 9dd6c721b71bc5c73a367a9a7e4ef55ee0f0805c917968e66788716241db4c4aa4479ceffdb881d26c7da8b53fd2a5db921c7ef4138e9ff5401e621124d0bc19 SHA512 b93ba2b6eb5371962e1565ef4a333b50ba0dc44ae4365486fd55b04bdac546c8ff68fedebbb7a01d3cb4810f48148bfb870bef952b631fca931cf149ea8429ec
diff --git a/app-admin/sshguard/sshguard-2.4.0.ebuild b/app-admin/sshguard/sshguard-2.4.0.ebuild
index 8926537ef84c..56a7c135e833 100644
--- a/app-admin/sshguard/sshguard-2.4.0.ebuild
+++ b/app-admin/sshguard/sshguard-2.4.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm x86"
 
 DEPEND="
 	sys-devel/flex
diff --git a/app-admin/stow/Manifest b/app-admin/stow/Manifest
index 08590cff417f..544ce0c7de32 100644
--- a/app-admin/stow/Manifest
+++ b/app-admin/stow/Manifest
@@ -1,3 +1,5 @@
 DIST stow-2.2.2.tar.gz 579324 BLAKE2B fc4ab7f386e8245b361cee5fc0decd91caec543ec6178c82720866c33a974ba9d68e999a68c3b7357d873ab1b58bb8b022bf02dad029972f42c317ffc288bd04 SHA512 8a3e5da6b5cb4c1ee1b512bae5a9859f83659d5de05f7a9af1dd09df2a32f6b8c6d43b79736db91232c43621d542041d4ef92eb088925796adad0676f200a9b5
-EBUILD stow-2.2.2-r1.ebuild 621 BLAKE2B 5cd0b3810fd8d2bde5dc13cf5e80639d463bd17a51ed8750d11aaeb75a4ed4983938d3e4faffea30adf08da2432ebf2417fa6b6df071f9a09d290877fedba27c SHA512 0ad9daf266d7a2163a778569d74e45c1cdc506c455ae7ba783ce07b5f4f32f9fb99979a188b770566c8d2e72a10bd256d5900333b8d3bbc7566a05cb828c82f1
-MISC metadata.xml 469 BLAKE2B c09f5d5ad52c89661d6c2b43f1762584cf3282ec9812233df01900ea4b738faf2c66b4405f0d5b01f33016b7c98714cb14fb503f84ed2332596d65ad676217f1 SHA512 d2dedba051ac4de16316392a51e87ea36f435c7f568523ddbd06aa620f4d350edafc6bc996954d9982dd1496951c22731fc5cb5df2725414986281709dafb126
+DIST stow-2.3.1.tar.gz 654191 BLAKE2B 9fd54fd3ff76aa7b72ed973cd6d70b8dc747fa3bb1ecc6bedd221b308d7d141a21a2f077c67efb432f2c7c4fb6bd126639038b196946206bf4a7f95040477ab2 SHA512 e9a7de1a6f10eaf7cdbe6737e0a8be1498e2eac46b6c57e65b83759b061efd1c0db45f7cba123e35428307e3aebe5baef9ea8bd4b5eb6ec5e1b159117a760441
+EBUILD stow-2.2.2-r1.ebuild 620 BLAKE2B f6041e927a8c7369cc96c3afdc5ba4778ee9dcddd672a339fb369eb70a24d34ffc21d711ae36f004c3d65797bfcdd1a010cd1180ace4b4d14bc9d640bdf820d8 SHA512 51bada943c05c6ad71ba8ca6ff6678a51fc37c9df063977f9478403604acd7d9993b288cc21c3556922749000a5d34276d6df6575aa107378e8a5aa20611bc21
+EBUILD stow-2.3.1.ebuild 619 BLAKE2B 474edc9a9f6c99ff99bb2f7192cb83973b7d6d92d44d08f30605712856840901c0cbd99366ae5607f5d3af9dfed0c695afb48741ffa729805e1377dbb9483e91 SHA512 6c77dbf6b120b83e490d3748e0aa6c4a864bc6b512e0a7c0ca46b4e5dfeedea2d0e4437ca137124f09d34becd33700408c3f00cce54e22557659065256c71b46
+MISC metadata.xml 249 BLAKE2B 210caabfc49730fad6228e8c34b09d11554fece8f3f754a26c6239b3b0de845ea128507b2c17d6e97343f9e6e2ae01272eb024992c3c64d3903794fbf73a66ed SHA512 c13d64a0d3034eeb4c9567f5e1236ecd6f3c3cbdec69b805627298cdb7050ae01a19a3cb075ec905de9497079a3e855bdccef2f37f65540b6ae184439f01cdae
diff --git a/app-admin/stow/metadata.xml b/app-admin/stow/metadata.xml
index 04f725369a73..ceeed1534bdd 100644
--- a/app-admin/stow/metadata.xml
+++ b/app-admin/stow/metadata.xml
@@ -2,15 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ewfalor@gmail.com</email>
-		<name>Erik Falor</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 	</maintainer>
-<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/stow/stow-2.2.2-r1.ebuild b/app-admin/stow/stow-2.2.2-r1.ebuild
index 553379c37f3d..6c38e26d6bd5 100644
--- a/app-admin/stow/stow-2.2.2-r1.ebuild
+++ b/app-admin/stow/stow-2.2.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/stow/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="test"
 
 DEPEND="dev-lang/perl
diff --git a/app-admin/stow/stow-2.3.1.ebuild b/app-admin/stow/stow-2.3.1.ebuild
new file mode 100644
index 000000000000..834867c86051
--- /dev/null
+++ b/app-admin/stow/stow-2.3.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit perl-functions
+
+DESCRIPTION="GNU Stow is a symlink farm manager"
+HOMEPAGE="https://www.gnu.org/software/stow/"
+SRC_URI="mirror://gnu/stow/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="test"
+
+DEPEND="dev-lang/perl
+	test? (
+		dev-perl/IO-stringy
+		virtual/perl-Test-Harness
+		dev-perl/Test-Output
+	)"
+RDEPEND="dev-lang/perl:="
+
+src_configure() {
+	perl_set_version
+	econf "--with-pmdir=${VENDOR_LIB}"
+}
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index e9342ccae9e9..50f5b6d4fb8d 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,6 +1,6 @@
 DIST sudo-1.8.27.tar.gz 3293178 BLAKE2B 174d63ece5c24309dc0d237fadfc4131243aca333491ffa6dcdb3c44b53cb8149d3bf2f3aea2aa49529ea811d4727a11ac1909305e342b858a4c14f923f12956 SHA512 0480def650ab880ab9e6c51c606a06897fd638f0381e99c038f5aa47d064aaa2fb35b73eee7f86e73185e18d5dbb8b6ba49c616b1785a1edb2dd6d7b2fa4fcac
-DIST sudo-1.8.28rc1.tar.gz 3312316 BLAKE2B 051111a9a39333aef2c9a5afcb893b08656400bed42687370ba1d6ef1a60b8bbb3d3c8457a8150eaeed6a838de5f3d657f12ecdcad9881a5b9a5228fbeb2adee SHA512 03ab9fe009808f5b46bdee1f30b9c1a2bc94b7f342e573afa06089935c3a8f844f1ee3579b0b243a7195caf65502ac576b2b1629d9484ec1c54b9567478f6f42
-EBUILD sudo-1.8.27-r1.ebuild 6662 BLAKE2B 90eb9b9a0bd6de53d6bfb2ca9fd754225e50267c2e36038728dd9c7f716c0a16d9de67a3c44b5c1f719844967e2867c4b32a46d82db3a43ea5e2d8273b9466b9 SHA512 1c662e3e02c77f54001b3e59a1a68a4fc6726176e07aeec06d5b587e19550e288e36eb5b35033ef785af5ec881800e7c8ec98fb7e22cc96c25ad67ecb31b84fe
-EBUILD sudo-1.8.28_rc1.ebuild 6639 BLAKE2B 1d6eefb8aaef5caf0eba296eab4f486208b28fbfcd4c821e861474fd888bfb58c27bb2fef263b7e32606b2cec24e54dbecb417e7b3c4239a60efb98cfff2a13c SHA512 2be45175f30a8a65943104b2217c05eb73bcd6ecc31e647c9db7bbad05f07992755cbfb9f42621cb1f7589d1c16088d3dd84365c38adb59765bd75bb2ddc49bd
-EBUILD sudo-9999.ebuild 6639 BLAKE2B 1d6eefb8aaef5caf0eba296eab4f486208b28fbfcd4c821e861474fd888bfb58c27bb2fef263b7e32606b2cec24e54dbecb417e7b3c4239a60efb98cfff2a13c SHA512 2be45175f30a8a65943104b2217c05eb73bcd6ecc31e647c9db7bbad05f07992755cbfb9f42621cb1f7589d1c16088d3dd84365c38adb59765bd75bb2ddc49bd
+DIST sudo-1.8.28rc2.tar.gz 3311100 BLAKE2B 18aa7504f5cc8e58308472cf9e59cebdb5cde52d944b0e93d0235c94f7af7cb6cd62ae7bb757d33ca6708958687fdb3638b5ec5c9778c80254bb95a2f503fa81 SHA512 b8f148d1b2aa09c54ea30b48781f736916594106d0d49da1bcf4d76fc369365b3fec6233e62f4a6faaae9568a0d63d48aab9f4155f8dc2e4c8579e64fcab9335
+EBUILD sudo-1.8.27-r1.ebuild 6641 BLAKE2B 87663af3782d324385698c58407b6a74858bc60f8e174edf25789eda5f46039dfe811656f96371833dfaef5bad5a51804fae4cb98fb7b17fd64e09aeea0040de SHA512 cdc83a9b9578c23e3dfd30898555e2276332ff947b8695d6a322fd75a564f2be5ad8d62164d88e055a832ed15884e4dac999d93afbd90f683648ad96f0603990
+EBUILD sudo-1.8.28_rc2.ebuild 6618 BLAKE2B 8cca6568c81a5012800749cf30111cafa3ee9900efdd5d49a450c2b8c99dae4567a3bb396e0fe1651fb824e07d90ae15547e2425c2eb0768eeac45e5209b7fff SHA512 08060b50aa82206f4e6a28692cea7eb9dfb67e815c5dcd979557fe640d3b35addc6d19fb657d8dd97a09b8ea19b5b712bb4934d124ce8ce796435149fdb1684e
+EBUILD sudo-9999.ebuild 6618 BLAKE2B 8cca6568c81a5012800749cf30111cafa3ee9900efdd5d49a450c2b8c99dae4567a3bb396e0fe1651fb824e07d90ae15547e2425c2eb0768eeac45e5209b7fff SHA512 08060b50aa82206f4e6a28692cea7eb9dfb67e815c5dcd979557fe640d3b35addc6d19fb657d8dd97a09b8ea19b5b712bb4934d124ce8ce796435149fdb1684e
 MISC metadata.xml 1379 BLAKE2B 3fb47838664544236c2c5ce55ba77cda8fdef3ff1bd050a775878444040c76ec1d18fecd7ecbcc11121c90e76e9634f4c01da676dc178dbc7787b9250774e28a SHA512 81def82cf20eb6a57d38a1cced2fef18f5f5b56b6bb92a036cf925dec1c1b77f18e3c7b5997f4055ce840873032df65edae08810e6838bb0ab6309020a4a30d6
diff --git a/app-admin/sudo/sudo-1.8.27-r1.ebuild b/app-admin/sudo/sudo-1.8.27-r1.ebuild
index 6a259192f45d..bc2da1f33189 100644
--- a/app-admin/sudo/sudo-1.8.27-r1.ebuild
+++ b/app-admin/sudo/sudo-1.8.27-r1.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} != "9999" ]] ; then
 	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
+		KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-solaris"
 	fi
 fi
 
@@ -39,7 +39,7 @@ CDEPEND="
 		>=net-nds/openldap-2.1.30-r1
 		dev-libs/cyrus-sasl
 	)
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	sasl? ( dev-libs/cyrus-sasl )
 	skey? ( >=sys-auth/skey-1.1.5-r1 )
 	sssd? ( sys-auth/sssd[sudo] )
diff --git a/app-admin/sudo/sudo-1.8.28_rc1.ebuild b/app-admin/sudo/sudo-1.8.28_rc2.ebuild
index 69778e4b8d41..023e5a069d09 100644
--- a/app-admin/sudo/sudo-1.8.28_rc1.ebuild
+++ b/app-admin/sudo/sudo-1.8.28_rc2.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-solaris"
 	fi
 fi
 
@@ -38,7 +38,7 @@ DEPEND="
 		>=net-nds/openldap-2.1.30-r1
 		dev-libs/cyrus-sasl
 	)
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	sasl? ( dev-libs/cyrus-sasl )
 	skey? ( >=sys-auth/skey-1.1.5-r1 )
 	sssd? ( sys-auth/sssd[sudo] )
diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index 69778e4b8d41..023e5a069d09 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-solaris"
 	fi
 fi
 
@@ -38,7 +38,7 @@ DEPEND="
 		>=net-nds/openldap-2.1.30-r1
 		dev-libs/cyrus-sasl
 	)
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	sasl? ( dev-libs/cyrus-sasl )
 	skey? ( >=sys-auth/skey-1.1.5-r1 )
 	sssd? ( sys-auth/sssd[sudo] )
diff --git a/app-admin/swatchdog/Manifest b/app-admin/swatchdog/Manifest
index e46514d7432a..4ab99bd81d49 100644
--- a/app-admin/swatchdog/Manifest
+++ b/app-admin/swatchdog/Manifest
@@ -2,5 +2,5 @@ AUX swatchdog-confd 678 BLAKE2B 4ad9fb2627f69f2edf5d4ac48653fa89e9bcb1e2e00c0031
 AUX swatchdog-init 1502 BLAKE2B 547590375d8f35b9a96cc149eaf6a66a6b705577a5ed7ced91d21ea7e457deb5ffa13fa3c87487f6d573a5368c8cabd58da372bd6c95737abab73d45dbc94e92 SHA512 30d5451cd871c15d2e50a3d5f32f4ea986971e2aa9a0b06ce5e383643aacd72a29c1574ec03bc3c0c994ebb13287f5870e8987971bcb73821f3ee744c7c574a3
 AUX swatchdogrc 299 BLAKE2B 05a0b3c13e6e184d7da0d302f62a0a6c3bcf25a90a30a3c207bcb19d6aa07f7068db7a56ffc5518625d0e40cd2b269e5c2fca7e2a5808cb81ba564087e0ad469 SHA512 64dfe179ccab5674742b8198f15b5439c324c7e9648fa0064a36010f7160303abd09c5af4efdb422628827ff8f327a8db312c4fdfbf02aab29c772d82f1d5b44
 DIST swatchdog-3.2.4.tar.gz 30122 BLAKE2B 103491a231306cedad030fca8cc309ce89e8cbc8a3fcee63cd482efb733b91db8b29193bb1e9b9c5213261b150e3dc6be2b506dee83b2297d5af2f1451f596c8 SHA512 4e0a4e3feed00df0f0d04f94cc090e53e71fa9b20d46236ec41d63b98b5733d80a5941b491cffcbb0b655a9c7d2b5c9423ca7ae043346dbe1b05ee6ab24b9489
-EBUILD swatchdog-3.2.4-r1.ebuild 767 BLAKE2B 5763f3766e8840120532c40db221a371fbea422cb41c400f492b85f0d83ba569d53ce299c08096e2cad312e71716285c46ed125410f800466feac588cfd395f6 SHA512 6002de4c68848260f282666cf0cf51f9f97acc7466bd71301b80a3d1392ffb2f6c1e94a41bd6c0db3f98f05eb35bd152fc3fe691b09846b41308ed32b0f3e8f8
+EBUILD swatchdog-3.2.4-r1.ebuild 733 BLAKE2B 50f7431b0cb172a4aeb17a8d576a9b76d6161123ab11c6c5806f4cfbe4c760d8ec247fb948fa0d14fdbd872d9e2057bf3a2f460e061916a4c4169f7a4ee44341 SHA512 28edf913ebee9cfc162a9b895ecd8f2802adb7fefc7c5ea5c6234bd2912cabc99bde53296c2fc0883eabf2b77a0d99085813600a662547f8d668654158faf89c
 MISC metadata.xml 1059 BLAKE2B 51b78e31bbd8888f2e7befb66aaa1de4d5d15f20b1054c15ef282f54eaa9c44d14c2cef1394a7b4891e5bcb385917fdc4bd1f41a8b225bc8ff7c1465106b596f SHA512 cc3dac43b83c180b48772c8142be11a9a5bebff4275dcb8fc65c4eb1cd4d23a9b5657fe33f843202a392eb0e880bb76ab893131d34527cf6056eeecb21bb0b5c
diff --git a/app-admin/swatchdog/swatchdog-3.2.4-r1.ebuild b/app-admin/swatchdog/swatchdog-3.2.4-r1.ebuild
index c572801b8f3a..d6766029f57a 100644
--- a/app-admin/swatchdog/swatchdog-3.2.4-r1.ebuild
+++ b/app-admin/swatchdog/swatchdog-3.2.4-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-GENTOO_DEPEND_ON_PERL_SUBSLOT=yes
-inherit perl-app
+inherit perl-module
 
 DESCRIPTION="Simple log watcher"
 HOMEPAGE="https://sourceforge.net/projects/swatch/"
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index a112d2a00cb1..814b0580be92 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -3,11 +3,11 @@ AUX sysstat-11.7.3-flags.patch 274 BLAKE2B 67abbdad7a4cf9f20af1baf16e0c73c63f497
 AUX sysstat.init.d 378 BLAKE2B fe781f1a53e183023da2b46ecefb37881eedf8e8df2623927b24f33aa3344776b39db038d598ad050f1d48462d52300fb17731f29b0a8ab9c800fbe379efa249 SHA512 328ee3d40d45a0b1702c74fe0195ce4444cc8f63cb0fa68ba40ca20cfa183dd7acf4fc846cd76a4bcf426a3b4064316061dbbf26ca20047711528399e17b20b4
 DIST sysstat-12.0.5.tar.gz 711967 BLAKE2B 96aa49d82e71407dbd99d840ca5f71af83f54ba6315c858fae71f97290e8cf9c4f5358ad6389c7489366a62667c35835151e3187382a56c98153d3a04bcc2b8d SHA512 c1061f1af35430e81e488e4b2f18b8588ec4f3c419ade004c49ca24baf60b5b76a6a59eb25f3b17b51a9f60c5833a914a514872d0235b2ca405341a2f4a32cb3
 DIST sysstat-12.0.6.tar.gz 712148 BLAKE2B 1118ce071e06c2853ffdec2be1b8b3bf060571caf988e17e04ff62cbf43e7111c5951a131d176b49ad35e1da75d2b8936e23f1a385e1c83a013b802a0fc36003 SHA512 e8f542b26c2b0b7b3aadbf34dce640879d27f8f1659447f15ffb5a210987c74840418046409403da85a9eb4c01484615d230ddc700611b7c0088d72165bffe86
-DIST sysstat-12.1.5.tar.gz 1032031 BLAKE2B 9fbc0c0d132983daa334345f1f83ac8a46092cf52f35bafd443febd8ce40e4ab11b5b9b05b92e4074ecf9feab682035b2e08094ce10f3287036821be57db0800 SHA512 9dbc44b0226efc2f219ff71d2f0b83c930263fe8d6d0b451ae8404b3056558de04c76c16f2e8ba62083cde3a37cabbcd466d9247bd61ba5921dbc2ab6a1f686b
 DIST sysstat-12.1.6.tar.gz 1089333 BLAKE2B 3a3c3867b6b78ca1da7d5ef5838f5aad490e6d454aff3e8db266136ce7666112bcd1ad05b727c2455c16e53f6c84e0e75e32e8f4cc9318300aa9076921f68c1c SHA512 9c03e911fd6843b1719e080fce429e0d33f73f01619251f425dd4bbcc9d2764cd9beb8f8ebb4406b9540634d36c83303c10abcf682b079d35045454b1541984d
+DIST sysstat-12.1.7.tar.gz 1213236 BLAKE2B 11e54c8ef940d057b7494fc09620f644aeb9622c41756466835e4daf14c145ff0f3a06954657c4f065f20c172659c54bfaed5b3dcf084b8bc1f8d565420c0f1f SHA512 0ee3b246619ff6e904db1359b4dc05789fe1f55759d170f78de918b001a81137823801bdcb4c9d9137c3337d38259e79ccef9c76310d361e0a81bb2731b7a3d1
 EBUILD sysstat-12.0.5.ebuild 1693 BLAKE2B a70bf736b6ab9884abcea8a31b01494b4880fa6c3cbf2911f00660e704ad6ede2059debe19c858f58106543651bae91ad6c9d339a45f109cb126e371b848d2ed SHA512 7b94c3b44265af2e49d79b2738343f60dec9b31f315be518507e0245995840b3a84d5ca5ee3cfbe286c4c22815adbb6b1a8ece9f3452ef8e3f201e8f3a28e330
 EBUILD sysstat-12.0.6.ebuild 1694 BLAKE2B 0a56fa763a3ad76df9b73f857da77153b6ee3af3d0b92a02c79bddae3c462b9d66a7a41a5fc6a7e32f32d949e06fd83878663dc7de7d2157d7ecb30d0ca99bea SHA512 8a3e2accfbcc3fd818d0ffd77d8a0ca53d302aa96d1320504244730a5b2c95628551c7cbfa08e291ada1071ed6b029c16f657e3a2a0505636f032f6f2b1f5478
-EBUILD sysstat-12.1.5.ebuild 1708 BLAKE2B 19bba927cc5d2f9227eefe2e647eba6fc47617b80b5c8e1967d05c6c181af69a80dfd33d4d47f6f54e55a671a53723d3c4ccde21780546dc14147c978dd94f3e SHA512 c2ec3fc831b52727d7c46e8675f266dd7309756748765a0cf1bb8a2e4cb5397fd008a98f2e016c1aae430c34bcf810dd70bc24f5ad59f1a5b320ca3af715eb5f
 EBUILD sysstat-12.1.6.ebuild 1701 BLAKE2B 195658f4a166da3df50865bc7a4f4883a1ba8ffeebad23f9e0c1d76503948d66bf95857590d5296072a34876920ad8c57d34f1ede20f6bac287881eca46d4954 SHA512 71c2a6d7269c1e7a472689f9f09e0def12b167b06f1c1ea3fb1ef79aa51e6ce0af05c3a97ab5365ae16f6cb81c4ee43f388f593d53e0c97fb8d0cddc3078b06e
+EBUILD sysstat-12.1.7.ebuild 1701 BLAKE2B 195658f4a166da3df50865bc7a4f4883a1ba8ffeebad23f9e0c1d76503948d66bf95857590d5296072a34876920ad8c57d34f1ede20f6bac287881eca46d4954 SHA512 71c2a6d7269c1e7a472689f9f09e0def12b167b06f1c1ea3fb1ef79aa51e6ce0af05c3a97ab5365ae16f6cb81c4ee43f388f593d53e0c97fb8d0cddc3078b06e
 EBUILD sysstat-999999.ebuild 1597 BLAKE2B 3b18ae2364877c157a2a3c26bd36a270ad27c2a886ab9f0ecbf63ebc6ca1bd4b874606657d27f65f592a12c22fefab192ec691fa1d9a7b7354fa940f6e538226 SHA512 3d7bc304bf0d618e56a7552b4e88207c6e884be5464ad239e171a268d6fe5aa79c2f7929db0835c57e95f829b8eb9eae500e5187aad85316220a996c6be583dc
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/app-admin/sysstat/sysstat-12.1.5.ebuild b/app-admin/sysstat/sysstat-12.1.7.ebuild
index 2938a1a2fe44..79183431381f 100644
--- a/app-admin/sysstat/sysstat-12.1.5.ebuild
+++ b/app-admin/sysstat/sysstat-12.1.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils flag-o-matic systemd toolchain-funcs
+inherit flag-o-matic systemd toolchain-funcs
 
 DESCRIPTION="System performance tools for Linux"
 HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
diff --git a/app-admin/tripwire/Manifest b/app-admin/tripwire/Manifest
index 0781e2d84f98..d219a49f96c0 100644
--- a/app-admin/tripwire/Manifest
+++ b/app-admin/tripwire/Manifest
@@ -2,5 +2,5 @@ AUX tripwire 466 BLAKE2B 1fca6945b6b8ce959b7c617eef9454690662676020ce7451396f8cd
 AUX tripwire.txt 11492 BLAKE2B f157c47e1461095a51e9868127d25df6769c3ea6441fe34925c29ef3e93541e66516ba59b1c04120979a4edc1f31bf166ac72998f2adba571d64ffa7c7008fd3 SHA512 ec53b2f71fb33f227628e1160a72fecf4a1aca7ee58b750945e7c0d0ce756a37666a02fe9e8ec235055fe6d28e1d20e77a449ae229f5d5d2349eaffe07827d47
 AUX twcfg.txt 604 BLAKE2B 78c0e1457e5ea37031c8f9cf5a340ee600775973ea2475daadb07f3cb59f117667506438628ced1b4b1fa738855748df7d4b2e6695d65de9ed832f335943797a SHA512 c8a568638d5a18bb9508ee6f70aea815b8bfdb9efbf7823cdad59890a617bbe941454f6f4622e38e4ac4622e1d611c9fc085d73aec5a23b5c13ae7f1d783b388
 DIST tripwire-2.4.3.7.tar.gz 1002257 BLAKE2B fb0c847087e8b27d2a111b4a4122b3c4d5b187efe6f80995c6d06c7592a22fec2c537bbebba9c21a7761a8047535de4a96a6b94246da586faad4e9fc92137196 SHA512 541138f4a4c3a4227f31de6607503d305f0d893bdd5d24928d619d3a25bb8fe7061a45c041992ace957b976b834b5f4212b5c727eee1cbc76ddb2e2c52aeafbd
-EBUILD tripwire-2.4.3.7.ebuild 2352 BLAKE2B 8f5af9db16c1d2bc652d1f26da4fede5931263265cd5a55fdddedfe90dfa076a854c26a01f90a5816f9e6acc5171e1365ef3f8d3f7e7d799089778a80bf5726c SHA512 97ca9b2dc6cce1fe4de2b1d710c48bc51bd07a90f6fc72db0d1def23f95e7936cd3327259d14f15ff76dc7ceaf222a7ad9836ae2cc1e57a9300f284765f5ef80
+EBUILD tripwire-2.4.3.7.ebuild 2342 BLAKE2B e6ef550d3078cd7f0f5084212d51923a6a1ed19d3c579ecbcf6d7c7ad6e469883f249e79b45269bc375addeb7db85a3cf6cbfdfc50789042c39bddc1e2d3e195 SHA512 1f5e2c2f7bb0f413a06a138045bc85ea24afee96d7986b9dbd9579d0762514b43ac57b2ec18575b1e79774d22972dca524cbbfb72560cd6c3dfc12a594ca4b14
 MISC metadata.xml 1538 BLAKE2B 24c822b7e513325d6daba8c4647afe2849032120492733ca117df4cf109358657c8ff8bd482a9a033834893fb0768aba47ae7df907f342ee61e72f7b374110d3 SHA512 ac08238f1e05e7fa7fe888ace88bbfd71498fed7508bd59e53088b767b1b9c8b566bd62dddd2aef87d28987974fbbdd5be94d1fe9ed01dddd15df59081d7cd20
diff --git a/app-admin/tripwire/tripwire-2.4.3.7.ebuild b/app-admin/tripwire/tripwire-2.4.3.7.ebuild
index 106459556912..41ea0cc71d54 100644
--- a/app-admin/tripwire/tripwire-2.4.3.7.ebuild
+++ b/app-admin/tripwire/tripwire-2.4.3.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Tripwire/tripwire-open-source/archive/${PV}.tar.gz -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 IUSE="libressl selinux ssl static +tools"
 
 DEPEND="
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 80afbfb84849..50cd0b8c379c 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -3,10 +3,7 @@ AUX vault.confd 243 BLAKE2B 6598fa2138c4ca94fdd6b7a02048ee4a4eb2b37d17b8a065ae2f
 AUX vault.initd 573 BLAKE2B 444541b8912910cf6b5d038e466e18baebb7dfd2905d802217baf9e861bb7f2a3e032716545c74e269782aa420fbd052745322576b4bcb8c4cf53ba07471b261 SHA512 11124e6fc656977c20b55b578e30fd76b8f6905760c2f17f93b960a317975f1914c6bd8d4ffd3741ba405bfe5aa0cecb68067f8ce52b2df9015863d31f9a7aad
 AUX vault.logrotated 83 BLAKE2B 63b106e949f8a2da0ca97f1d07732fdea4dafbe44cb97ea81074472b95489d179deccd14f4d4176043f488f2be68b96dc6bee20748fe68f650d70fd32078d2bd SHA512 83d73760d85dbb731652aa5936d2780208ac4643e975538652f53b49305d024df6d72a8a06d82f430982b07cf940b2fd69f9a6eedb39d380136c8e5bfda280e5
 AUX vault.service 677 BLAKE2B 0d9c6636c841ff33fa38afca10f10c62d273dc1c6419e35e2fa844472de0c963e177c80a6db3e95230db6f641ab50148843085cb4f141fa2dd2765aecf8457d3 SHA512 15951d095181fb1b1a5f79e0f385bdb96812a517ea59e05017141a29ed880d0e6f29d377e7c4bc53d5b70175122785a39923297b8e3304fc46a63835d2d2ec50
-DIST vault-1.2.2-webui.tar.xz 1920136 BLAKE2B 81b90a0d796727c7523712ae50f85a24fa98b8b78c304d3ee50654e7f0ea1b3d58005abcbe55a15c3b496f5fce5701306ac57f0c6decc7ab8ae24ab12f5dd81d SHA512 b454e02e664190903b11bf0e3e465463182f3b7060efeb2c858127306869d731193102ba58398c28441d2be1a3956b88b2591aab1460047647742ba9dab5a00c
-DIST vault-1.2.2.tar.gz 27588019 BLAKE2B 5d989d1750a134f0c68e25ced7406ec8e7ae1d2233a1ece634e1487e4879af2d4a3e938aea1016d6872754f31ef19c85d04cd65e63f6547d7a5cf3cfa93ec208 SHA512 ce9211b3deb1839759646f8488fe2b89fec379bafed472921a62cd507f842ed05647fe4da7cb9482d195b028a29eb576f947da24aecd8b19181c7282fd3a155d
 DIST vault-1.2.3-webui.tar.xz 1916848 BLAKE2B 503425336fac45645b837380dcf94be4bdbb3876b1408a6bbd6ccaca96fd93e47dd2fcaf9913a70cb69fc0c7c1c36a90680acb629be3d616fe77d95662d93ed0 SHA512 1e414143ea163dc021ffefba023ff827f8241db5c125c3aa5de407dc4ae476413d32bf3b150167ffb14026f07663a26f3ab62b142019758f751a4f115d438d87
 DIST vault-1.2.3.tar.gz 27773681 BLAKE2B 862b386c96e7d284c5b82a89dca5a0a8668a900a5b32758a472b5d7ea4ed995dce608dfda0398bcf15e703f21099ddc662abb585cca0e2d2f43a0863184e055c SHA512 9543e394f187cd9b06e88b64319504e07519041741650db3b7b905f1b34348ed7d9e22955ce2a456ffd2e06210e9e01b1a0ded459cde4840fbf5903ff6e21e75
-EBUILD vault-1.2.2.ebuild 2356 BLAKE2B 44b548555490725c9cdd4d94868a3a056a57e513f1cfca5c6a88b177dff71bcf2b0041e3cd9a4680d06671b87f784de6baeb86d51aca668120cd5b7769d209e7 SHA512 a8ac5a57df9e4994cce9ac55a720b2fe54dfa4ef076887d7068dfaa1dc70fbe611ece1ec6b25118979fac7a6aeea8875a4ecd46d57f953cfc5c34725c1701d25
-EBUILD vault-1.2.3.ebuild 2356 BLAKE2B 44b548555490725c9cdd4d94868a3a056a57e513f1cfca5c6a88b177dff71bcf2b0041e3cd9a4680d06671b87f784de6baeb86d51aca668120cd5b7769d209e7 SHA512 a8ac5a57df9e4994cce9ac55a720b2fe54dfa4ef076887d7068dfaa1dc70fbe611ece1ec6b25118979fac7a6aeea8875a4ecd46d57f953cfc5c34725c1701d25
+EBUILD vault-1.2.3.ebuild 2356 BLAKE2B c68a7cc7b1b93c93a9a0bb9e4e67ce6900071650f567054a9e4fe5b9b383ea106635ad4a595219f16c877c767ce751d8fbb679cb6d442c2098e5e7e9d7200079 SHA512 55f85e6d4781cd7ad278942f080081bfdc7a6587405a84f79a842680a6142b32a4e32d5547874790556279bd39d9e9279ff3735025552502ffe6ba56159ac4c7
 MISC metadata.xml 371 BLAKE2B bdee8ae91cf8ccf66bfceb7ee5e1a46494d3e1b36cf5159ce9e6ad36eb251ea0ea03b1a9aab034936021d1a0f17c8577dafb30dc76a912ec04d8cfc3ae8c37cc SHA512 2517b0ec49190a14a2261c3544e4115435abcc0824a0fd255f6eb585d2de9e97f6feddeff8bb15c505d0f9e3086839e00e2abbd18bc639b45a25f6a7f384be6a
diff --git a/app-admin/vault/vault-1.2.2.ebuild b/app-admin/vault/vault-1.2.2.ebuild
deleted file mode 100644
index cda2c7eb5033..000000000000
--- a/app-admin/vault/vault-1.2.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps golang-base golang-vcs-snapshot systemd user
-
-EGO_PN="github.com/hashicorp/${PN}"
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	webui? (
-		mirror://gentoo/${VAULT_WEBUI_ARCHIVE}
-		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
-	)"
-SLOT="0"
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-KEYWORDS="~amd64"
-IUSE="+webui"
-
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.11:=
-	dev-go/gox"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-src_unpack() {
-	golang-vcs-snapshot_src_unpack
-	if use webui; then
-		# The webui assets build has numerous nodejs dependencies,
-		# see https://github.com/hashicorp/vault/blob/master/ui/README.md
-		pushd "${S}/src/${EGO_PN}" >/dev/null || die
-		unpack "${VAULT_WEBUI_ARCHIVE}"
-		popd >/dev/null
-	fi
-}
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
-		-e 's:^\(GIT_DIRTY=\).*:\1:' \
-		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
-		-i src/${EGO_PN}/scripts/build.sh || die
-	sed -e "/hooks/d" \
-		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
-		-i src/${EGO_PN}/Makefile || die
-
-	# Avoid network-sandbox violations since go-1.13
-	rm src/${EGO_PN}/go.mod || die
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
-	mkdir bin || die
-	export -n GOCACHE XDG_CACHE_HOME #678970
-	export GOBIN=${S}/bin GOPATH=${S}
-	cd src/${EGO_PN} || die
-	# The fmt target may need to be executed if it was previously
-	# executed by an older version of go (bug 665438).
-	emake fmt
-	BUILD_TAGS="$(usex webui ui '')" \
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-	emake
-}
-
-src_install() {
-	dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	keepdir /etc/${PN}.d
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-
-	dobin bin/${PN}
-}
diff --git a/app-admin/vault/vault-1.2.3.ebuild b/app-admin/vault/vault-1.2.3.ebuild
index cda2c7eb5033..ba761e123410 100644
--- a/app-admin/vault/vault-1.2.3.ebuild
+++ b/app-admin/vault/vault-1.2.3.ebuild
@@ -21,7 +21,7 @@ IUSE="+webui"
 
 RESTRICT="test"
 
-DEPEND=">=dev-lang/go-1.11:=
+DEPEND=">=dev-lang/go-1.12:=
 	dev-go/gox"
 
 FILECAPS=(
diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest
index 7e33e4db29e3..8b43a098ea3d 100644
--- a/app-admin/webapp-config/Manifest
+++ b/app-admin/webapp-config/Manifest
@@ -6,9 +6,9 @@ DIST webapp-config-1.52.tar.bz2 62951 BLAKE2B 8abc9f5503c9204fdb2d860f819e06a9f7
 DIST webapp-config-1.53.tar.bz2 63429 BLAKE2B bb13d52a4c19859ff4730df2f7db75452effa23d1864d97aada38137f00ada8eec530f728f1c3ae06ecbed713a2d489b7225db3fc02aeabbf6241d0956761609 SHA512 7d2fc7197d537f2264c26b68b61e69273d2fcd3eec93657db54ba685c8383e7b8245cf05ed2ddd8b72453bf3fbf8f4bc4867e53d608331799df2e6162be14820
 DIST webapp-config-1.54.tar.bz2 58954 BLAKE2B 42a4305c51ccb8bb9db455c6ae2663b5d17c9d477eee3e504569c802e5f0d10183f3e6cd1e747462dcc0559d6ed7ba53a8b5607ed422f34813a33e0e8148bb90 SHA512 fa61e88696eaed130575e5ae9a17ec827aa14aece359e5ba43fa723ad00083def22e44fb02d99fc5ba6000a5949c5ce7aecea9307d2bfae333e202ef111dcd31
 DIST webapp-config-1.55.tar.bz2 72583 BLAKE2B be958dc991f0e1f6835d9c29350b7d97e3f23d52971f6013165ce59a8f4b32ac6262c9719956d1bcdbe60797f07d77910b44a749ae545c4dc15f765525144709 SHA512 44294b276fd036908438cd984ebf70433639caa18d8330bab348433b4f39ea2c42c57fa8de4f0a6198f7875429a3ef9ebe61321c288d910f9be8b3414865f438
-EBUILD webapp-config-1.52-r1.ebuild 1606 BLAKE2B 9f9f8643009e63730bc35ef404784d4883dfc396cf901d1cd13099c49bd8ccd5fea30603d2f8a2951dabcc5f4c9755a1cebde4457e4a26aed54bcce26530d4d8 SHA512 bff85d0cd35afc3fc99525ea34db8a6a49c0aa56b91ba4e8a6ad5dab9f5a34880b7f193166c0cdc40d37e51741306e091a080dfb363cc5d5401a315fce0d4d79
-EBUILD webapp-config-1.53-r2.ebuild 1681 BLAKE2B fcd34092a599031d937b6493db7623d92e2744c313c93abd2ec81ef732f06f9f08e3f16c23f1ecdeabea6c69754ce16cb97d6fdf3242d4bc0ae66456044b9f81 SHA512 cd626595ae8c4ac134088870d409311cabcc787a08766a945210e7f2c0ba464b985f899812cf0d291e8cb602c3116026fd1b10d66ad05d8753b7d721ed9641e6
-EBUILD webapp-config-1.54-r2.ebuild 1736 BLAKE2B b4d7b8e5996f95ffc3f334d00ae9e78f13f839e09c844034071060a63ca56527adf51c20424aa26c0649dd59deccd4be9278a00f3a4b3b5c50a97d7d978e8edc SHA512 87093f86927d996abaeb289a3f629783142c1f58a669d0d1643af2b686e76c232d6acf2f7319d6461b837f0a81b44f9b9200b4abce84deead4b472d7033ed32b
-EBUILD webapp-config-1.55-r1.ebuild 1686 BLAKE2B acf048e850ed315d6967bd00645d01470d590c0be742a5e927944d31314a2e5989bc20c114bf62e93a458a6eb58b305f7d15f437cc5d41c0b1465e7ad5704225 SHA512 290e3e19f6fb0eea1039d36786e3eed2a94f4d93ef467c7959d660b03c6915d649cf673a5e776484fa6a1982e9ba0898a6049e86ec6ea24370dc2115df821dba
-EBUILD webapp-config-9999.ebuild 1812 BLAKE2B d1649ed301a740e9fa809a25bf60c1824a3cf2006418cb3d6c51bcfe734305ac08a7135bbca13e6e8170e11869c5e85216c594c75fa3f71c984792c54e05988c SHA512 8a9cf42de3160d6404bbcb0ebc4cf71a8babce0a2e477b31704b6949f647a58a66efcdbfa1ac92ddc4eb1782f29aa45006560f963904bbe27ea254f6b8f9b29f
+EBUILD webapp-config-1.52-r1.ebuild 1596 BLAKE2B 3ba116d9692192197ebba784ca7b73c58a25c6328befe0e66a53a449fda37cfb6b11786f04134c05d2a95ed3ecd092c96c6899e7f56ad37dc185a11ed51e3fc4 SHA512 25fb6dc7ee8b33622cf5a61eaec398ac676e450cf56f7992df4e86d0f44b4598db816d755a9ff5d6cbbd74910ae5540deeb73fd9b422b7643a9493a187fc7637
+EBUILD webapp-config-1.53-r2.ebuild 1671 BLAKE2B aad9fa78c132094f38ea65f07cb7548016c476b097420fc489449ebd26f45f5ede981c8e0f724b2c3dbada1d8a22f0cfacf644080f267082a73f62dd661e07cf SHA512 ab433bfeccd5f43327b0594afa46ee3c214d8ab78c1532e3da60df26138e219e61c3b056910fe64e4aaede05dfe28ac29463821cd2a4f1fc9ec3f8fa6c934243
+EBUILD webapp-config-1.54-r2.ebuild 1726 BLAKE2B 5944a4cad768a90466c9f3a6ae8cbe8c3d4550e3e8c4ac9393946f1415827e9cfc34377902e4303ac6185a32995563c0b4629464f6bb252024f56b8d3f077d2c SHA512 e0879b0f1535032bd14aaed9b3aeeb34d5585442e4d895a3dc4dffeea637e90a13b1b28042e8d68118e85284d814d22fb8f0c227970139fe958929873b113fdc
+EBUILD webapp-config-1.55-r1.ebuild 1676 BLAKE2B cec2149db20f36f805aeb2c21c8c8c65e40dd4450a203e87838ed75df0a04209bbdf7420bb22f865c2ad0e45a723f2c0a3554cc29d9f493229e32d77b0e97824 SHA512 d019e56d9a0b688ecc767bbe63086086888c0e4b111ca9c53ddc5144fae63461b49a6abf91a3914ee4240929d3580ba4ed1f4c5116f75b28d1cfd7355ff7f282
+EBUILD webapp-config-9999.ebuild 1802 BLAKE2B d55668d18c432771173b3de65f37f4aa86a39d95747bdefaea04c8ef7a17d49add8f1774120e85545cbfc12e1d4a3e40f734c076f1d4c5386c75fdedb8011246 SHA512 0d830a004c3fac2584ef4b41076e703a50d7aa4a0e13c56bdaf8a6276e212aec29e4fbb22191c4329fa432ed5d12870ed25923501d7bd452af80dd029970ccc4
 MISC metadata.xml 549 BLAKE2B 44f2ec07f40387bd51440d500cacc4ff24cbb3d1ec2e1c9bec29119a589e4c4bb005723d861be2ab9c1929d74d209c10771de5500eedb56e44265969129201be SHA512 1c99c9b52ab10378a3716d3f6dd1d6f70f61ac6bcf0c8a934254b71376a429f601358ad1108292e03ab780bc6c53810fd8a484e42a4ad6f959fb1903ed591b7b
diff --git a/app-admin/webapp-config/webapp-config-1.52-r1.ebuild b/app-admin/webapp-config/webapp-config-1.52-r1.ebuild
index e8c416dd5e3a..f130079e175b 100644
--- a/app-admin/webapp-config/webapp-config-1.52-r1.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.52-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 DESCRIPTION="Gentoo's installer for web-based applications"
 HOMEPAGE="https://sourceforge.net/projects/webapp-config/"
diff --git a/app-admin/webapp-config/webapp-config-1.53-r2.ebuild b/app-admin/webapp-config/webapp-config-1.53-r2.ebuild
index 15de132f0265..de1d206427eb 100644
--- a/app-admin/webapp-config/webapp-config-1.53-r2.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.53-r2.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 inherit distutils-r1
 
 SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 DESCRIPTION="Gentoo's installer for web-based applications"
 HOMEPAGE="https://sourceforge.net/projects/webapp-config/"
diff --git a/app-admin/webapp-config/webapp-config-1.54-r2.ebuild b/app-admin/webapp-config/webapp-config-1.54-r2.ebuild
index ef021cd91a8d..6bb05c35e9cd 100644
--- a/app-admin/webapp-config/webapp-config-1.54-r2.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.54-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
 inherit distutils-r1
 
 SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 DESCRIPTION="Gentoo's installer for web-based applications"
 HOMEPAGE="https://sourceforge.net/projects/webapp-config/"
diff --git a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
index 8624a90412d8..85f0927eb623 100644
--- a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
 inherit distutils-r1 prefix
 
 SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 
 DESCRIPTION="Gentoo's installer for web-based applications"
 HOMEPAGE="https://sourceforge.net/projects/webapp-config/"
diff --git a/app-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-9999.ebuild
index da6dfb24b9f4..6324eda26679 100644
--- a/app-admin/webapp-config/webapp-config-9999.ebuild
+++ b/app-admin/webapp-config/webapp-config-9999.ebuild
@@ -14,7 +14,7 @@ then
 	KEYWORDS=""
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
 DESCRIPTION="Gentoo's installer for web-based applications"
diff --git a/app-admin/xstow/Manifest b/app-admin/xstow/Manifest
index 54dce9a69741..20fa1fef277a 100644
--- a/app-admin/xstow/Manifest
+++ b/app-admin/xstow/Manifest
@@ -2,4 +2,4 @@ AUX 99xstow 65 BLAKE2B c3d3dae69e0ed5251a996ddfb164795718974e1c2464176e680373fab
 AUX xstow-1.0.1-ncurses.patch 1070 BLAKE2B 58782b144bf997d88e1480f7743afb8d6dc2e814a4a412bb0d0ebf8cc83ae0d1aab5605228e7a6228e0aec6b8fca83104249e80e7f2406aafe2f9ab8408cf6eb SHA512 63fce626ad5b376a5aa2d335fdd4d73ce3a1b7fccc5a6ff5ab92182d6f3ca40417926b9d35f3447ed73f386d3022d6dc81ec39a2f790fea46b681d344fdad389
 DIST xstow-1.0.1.tar.bz2 153530 BLAKE2B ad5d2677725f2254bb87a4cf8f73e8158868a206f41e9a2ee7bb2547ae6e8634ab65f58655a04051425e5818071253672ccf96b8ddccd01026e992d085e0c1c5 SHA512 bb4bb0e9d8fbfe3933c2137cd2258e3246ebfba549aec669a7f324e82af0eea4ab7ca38e68d7102c1417c1566029318749139fa91efd7a904b8f742d426a3d4b
 EBUILD xstow-1.0.1.ebuild 1233 BLAKE2B 4e9f6f5dc62d3865a724f13038865faa05567d0677fecae352d001427b8e67ddcf2aa52e7090d46ef7c1c406373240cc9df1c55872d3199f467fbbe1db336c3d SHA512 8fcfc7e9bf0d041bc868a949f96483188dbe0a9070028466d948e6432f249764571c564789ee0476d9e4eb0882efaffcda1753a313ce9c7659d37c3f2d7811f1
-MISC metadata.xml 643 BLAKE2B e6df59691a659e8790b1deadc96f89e8d6e913f76d44ad3c2613060706264cc8733db8f7dde018da313d177ce997eb3c5bcb7ce9afdf2bc40022300e1371be19 SHA512 4c060ddc762544f9f635d8cd4543694ff685caa0994995d0551d2b6f9d0c2f52566007d8bd3ca5ed6e7f8d83528c2983eccd2e5923591c010e00ddeab6909840
+MISC metadata.xml 422 BLAKE2B b4f2fdf4510d87729e84ce43f6576e220eae0e82219c62e18ca7d3db1483d819fe60218df9baf68292463e326860bccf180f961a1b2c9df884c209f232b7a705 SHA512 c78f69be0d671d4d92a65412327ae34d9a61777227194b3d41032232da8e623be99ce8c7d6897b65e4b2971e37cad1ec1d5f180779c31cca55bbddd5e74e5344
diff --git a/app-admin/xstow/metadata.xml b/app-admin/xstow/metadata.xml
index b3d90cf176bd..4154b7255346 100644
--- a/app-admin/xstow/metadata.xml
+++ b/app-admin/xstow/metadata.xml
@@ -2,17 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ewfalor@gmail.com</email>
-		<name>Erik Falor</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>A program that manages the installation of software packages.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">xstow</remote-id>
diff --git a/app-admin/yaala/Manifest b/app-admin/yaala/Manifest
deleted file mode 100644
index ce711583c960..000000000000
--- a/app-admin/yaala/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX yaala-0.7.3-r1-correct-paths.patch 1095 BLAKE2B 5c7a232836bd19ffa678db3c2d522f9d831535e3dc086e014fc45fe233ae9e20aa1a69359ccc2e913b1b2cd66ba29e053957ed32aabdb38948a57e55b485796e SHA512 c44bad33bf23ed089a4ddc2497cc5507c3c1927053c09ed64e39dad95400b0f0d1170da499c504240919262391f6424c5a830298e7c5a49542dd3424fabed8a7
-DIST yaala-0.7.3.tar.bz2 41528 BLAKE2B 527f691730cd50f60137bce014958423bea4bf007891ac0a6fa0888099da7678661612369d29b41683de81a25bc92163f0d9f413e5a11e9f86c273e0e866ca8e SHA512 30ad37c2c612f47472a840ea40aa924ffa59828455e7268dc29eb3d0276aab835b54396a29eabce88ef0e357523086b182ca1ec366b50851ecb8d2530f4eac01
-EBUILD yaala-0.7.3-r2.ebuild 1623 BLAKE2B 606c3b8b9e69c8b4e4d2887ebcc38ed3523bafd6e87bbe2d7ea52523fd02fecafc0da548dd7a8f0b62fa102e3d6e3d38f5f5cf2b3316fad6290ffbead848658a SHA512 63ccbeedf296fbbea7423dddf5ae04b38855dadb341b8483aae17df9932489fe0b940680c3a43861e8843e296e155817bfc46dd9837fa1317b240a6fd80a7eec
-MISC metadata.xml 238 BLAKE2B fbb26a50a5cd4f4478d909e0aa54bc63c07c072ad947198f61296cd359913b0d7e34fcc3ca64b64db0ac82ed4930d27d7ff934f5134e0a1fc4f2b1eac8c02651 SHA512 af9c2c7ac7e822d72151c5fd3ab45d2f6d88284a6d3e4a845df488c1a2938084ae7baf1fb3d907292d4e672e6c1d6e636a6ea554316bf53e971e2c81a11a3e1b
diff --git a/app-admin/yaala/files/yaala-0.7.3-r1-correct-paths.patch b/app-admin/yaala/files/yaala-0.7.3-r1-correct-paths.patch
deleted file mode 100644
index e938abf4b802..000000000000
--- a/app-admin/yaala/files/yaala-0.7.3-r1-correct-paths.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/yaala	2013-04-03 15:50:03.909024254 +0200
-+++ b/yaala	2013-04-03 15:49:46.545691028 +0200
-@@ -58,6 +58,6 @@
- 
- parse_argv (@ARGV);
--read_config (get_config ('config') ? get_config ('config') : 'config');
-+read_config (get_config ('config') ? get_config ('config') : '/etc/yaala/config');
- 
- unless (get_config ('input'))
- {
---- a/lib/Yaala/Parser/WebserverTools.pm	2013-04-03 16:04:02.665685730 +0200
-+++ b/lib/Yaala/Parser/WebserverTools.pm	2013-04-03 16:04:36.729018853 +0200
-@@ -11,7 +11,7 @@
- 	detect_browser detect_os extract_data);
- @Yaala::Parser::WebserverTools::ISA = ('Exporter');
- 
--read_config ('webserver.config');
-+read_config ('/etc/yaala/webserver.config');
- 
- our $referer_format = get_config ('referer_format');
- our $localhost_name = '';
---- a/lib/Yaala/Data/Persistent.pm	2013-04-03 16:08:06.935684219 +0200
-+++ b/lib/Yaala/Data/Persistent.pm	2013-04-03 16:07:54.229017631 +0200
-@@ -18,5 +18,5 @@
- our $HAVE_STORABLE = 0;
- our $WANT_PERSISTENCY = 1;
- our $DATA_STRUCTURE = {};
--our $FILENAME = 'persistency.data';
-+our $FILENAME = '/var/lib/yaala/persistency.data';
- 
-
diff --git a/app-admin/yaala/metadata.xml b/app-admin/yaala/metadata.xml
deleted file mode 100644
index 1f0914e3ecd6..000000000000
--- a/app-admin/yaala/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>
-    Yet Another Log Analyzer
-  </longdescription>
-</pkgmetadata>
diff --git a/app-admin/yaala/yaala-0.7.3-r2.ebuild b/app-admin/yaala/yaala-0.7.3-r2.ebuild
deleted file mode 100644
index e11eeb4dc61f..000000000000
--- a/app-admin/yaala/yaala-0.7.3-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PERL_EXPORT_PHASE_FUNCTIONS=no
-inherit eutils perl-module
-
-DESCRIPTION="Yet Another Log Analyzer"
-HOMEPAGE="http://www.yaala.org/"
-SRC_URI="http://www.${PN}.org/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="gd"
-
-RDEPEND="
-	dev-lang/perl
-	virtual/perl-Storable
-	gd? ( dev-perl/GDGraph )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7.3-r1-correct-paths.patch
-
-	sed -i "s:/var/lib/${PN}:/usr/bin:g" packaging/${PN}.cron || die 'Failed to correct path in cron file.'
-}
-
-src_install() {
-	dobin ${PN}
-
-	# Switch to ^y when we switch to EAPI=6.
-	local mod="Y${PN:1}"
-
-	perl_set_version
-
-	insinto "${VENDOR_LIB}/${mod}/"
-	doins lib/${mod}/*.pm
-
-	insinto "${VENDOR_LIB}/${mod}/Data/"
-	doins lib/${mod}/Data/*.pm
-
-	insinto "${VENDOR_LIB}/${mod}/Parser/"
-	doins lib/${mod}/Parser/*.pm
-
-	insinto "${VENDOR_LIB}/${mod}/Report/"
-	doins lib/${mod}/Report/*.pm
-
-	dodoc AUTHORS CHANGELOG README{,.persistency,.selections}
-
-	insinto /usr/share/${PN}
-	doins -r reports
-	doins -r sample_configs
-
-	insinto /etc/${PN}
-	doins {,webserver.}config
-
-	insinto /etc/logrotate.d
-	doins packaging/${PN}.cron
-
-	keepdir /var/lib/${PN}
-	fperms 777 /var/lib/${PN}
-}
-
-pkg_postinst() {
-	ewarn "It is required that you change the configuration files in /etc/${PN}"
-	ewarn "before you run \`yaala ...\`, otherwise it will refuse to execute because"
-	ewarn "Setup.pm checks whether the variable 'select' has been unquoted and set."
-	echo ""
-	elog "Example configuration files can be found in /usr/share/${PN}."
-}
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
commit	bb72e65b6d6ce95abb5d486dad35d37dc105e89b (patch)
tree	b31a9263d386dcae4cb06764136672508dc5efdf /app-admin
parent	9b1e6d491f32eb4caf0c8e197bdec075713c97ca (diff)