gentoo resync : 10.02.2019

40 files changed, 720 insertions, 140 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index e10035fbf38c..bc6533537f55 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 34180551e581..c426e969b83c 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,12 +1,16 @@
 DIST ansible-2.5.14.tar.gz 10119785 BLAKE2B 6e771aafc16053185ee6d275d6d41f64aa3f0d6dffbe721a66b548b97e84d78916e03827d592b961f9a4e0bb03fae09320731a4b8fdb814126cecdfb51f9f136 SHA512 9635b1c4bc9a93a24f4bb2894c9fed63803cecb01c5562559e3b808791d1007b26aa0aade4aa05fd4bae0f7d01216588d4e2e0bf4c5fb6cdf677d9b40e9e2de8
 DIST ansible-2.6.11.tar.gz 10722546 BLAKE2B d98a82323409b894343c22c0b6226ef643bae34198627a6de426fdb65ef2a9892429edda20d522b8f501fe34c47b463f844abc7e6cf38009bd22398ca0c35f11 SHA512 5b795644d2bc02470b8a71be42720405614eac3e602a8906257c82ace36dc4c3727322b12ffadda6e2b752d963a40559cc35b1bc0a85596123896e7d1ac75b6b
 DIST ansible-2.6.12.tar.gz 10726648 BLAKE2B 9f3b1b48069f5b450f649bf1c21ee57922ac3db6a8b1b11c459b572bf298813490f230400f09d35d4d7b21a709643ac37cb527719fea59a1b57616b476235dcb SHA512 daee0a5c37a83dfd22b1fccb5245735e4874f7428f5e8f0244a8a208c7f73729bffc06df16d16e257ae65b8d4cafeb4e3b67e49160b5d9d530666166b5096a70
+DIST ansible-2.6.13.tar.gz 10730575 BLAKE2B 2442925421996731be59db7ca18994f9c158f0b1247554bc8252d76d6c8fe8574e4ec2e62d71d7de075a9b109c43620232c78d91dcb3aa8d574752862de4d156 SHA512 7592214bc5c0c4283c99d7a422d44a54f424afe848b40fa2c0b0a4b556361a6290b459d8bdb575ec323e4e96bbad7abc939cdb5664839bb13f5de3d054ffb880
 DIST ansible-2.7.5.tar.gz 11781337 BLAKE2B cbb1ae02ee5733c03797db8acbb79980e24afe6e265aa609bbb22d8b43675c8ec995a4b10f3212e8dbf2fe49fdbccf1d2f8ee251bb4bd11ee5198a2ca2443147 SHA512 b3a8a2c10e42f4dcf0f3867901eaaf555e6b9bcbd808b91765a8825db3ec49d618d8893f244d52e49e944d0900a876bbb31b3a7b89d636e435e94cd4b281be18
 DIST ansible-2.7.6.tar.gz 11796062 BLAKE2B 171dbcc7380ded52b03b9b109705008a492dbc5b8542fa600562c66abb8c3d3ace6bc92696559357d62fec106938e8fa4366b67cd621e4e8144fad59d0870db7 SHA512 db0813009b4683b74bf4dda640adc3dad750e053c3a87f97c6e61a2a5ea7668ea51e97ec204ddcdba6f09733bb399f824f87f365b74c35315b979603c99a6b70
+DIST ansible-2.7.7.tar.gz 11809560 BLAKE2B 3960e4dcd166fb77ddcb6bbae03b20fe679b76aee3db118ddd4642ab7b837a66929bd4ec76c071c53eba7ece47aaf8a52ceb34ea092d3e3db8355839575b684c SHA512 41e007ccc5b22eaa1a7aa9c16f8d012268cbd1055b5c10a204134b7707ab7bf205aab04efccda9fb5497034896542d29ba253ad4ea09b4755b665bada22b4c54
 EBUILD ansible-2.5.14.ebuild 1621 BLAKE2B f171fcbbeb00d59b77ef3d8b5dfcfa7c8819ffcf68cb99043de3916e47a469603b728715e6d006f44e6a32283727a1d04214085d6ab1e32dcbc079ca1353b5c5 SHA512 172e7af8d1ad44f41bcb0f6e919b6e4ea0a8e096943e43df2f6b5383c3f13c0727c288c47e2d4869b5a74637a980f1750b5dbc903c0a726041ed857e5f6d26ff
 EBUILD ansible-2.6.11.ebuild 1621 BLAKE2B f171fcbbeb00d59b77ef3d8b5dfcfa7c8819ffcf68cb99043de3916e47a469603b728715e6d006f44e6a32283727a1d04214085d6ab1e32dcbc079ca1353b5c5 SHA512 172e7af8d1ad44f41bcb0f6e919b6e4ea0a8e096943e43df2f6b5383c3f13c0727c288c47e2d4869b5a74637a980f1750b5dbc903c0a726041ed857e5f6d26ff
 EBUILD ansible-2.6.12.ebuild 1623 BLAKE2B 203df11aa81c78c98490b436317733203c9633da656d3b2a661df7a32269f57c46498d08aeef304a7c651585f0562b62f117e7c62e911b31eb325e1a14d8dcdc SHA512 3559db4b6b2ebf5d24c578506ebfa36d377e1bb508a36169c02ef35168c311393c917adbdf2c70b27bd93b58276d36806c974cba0f9443a4b9aabd6c07be6e58
+EBUILD ansible-2.6.13.ebuild 1623 BLAKE2B 203df11aa81c78c98490b436317733203c9633da656d3b2a661df7a32269f57c46498d08aeef304a7c651585f0562b62f117e7c62e911b31eb325e1a14d8dcdc SHA512 3559db4b6b2ebf5d24c578506ebfa36d377e1bb508a36169c02ef35168c311393c917adbdf2c70b27bd93b58276d36806c974cba0f9443a4b9aabd6c07be6e58
 EBUILD ansible-2.7.5.ebuild 1626 BLAKE2B 1bdce86a17494f3be67aacfa001dcad3cc573bf5829bebb1b91503ccff18b7a612df7a7e384b630e3fc17ac0d40d2efb0a1f3ad6ade9642cf03d17b0d0ae0c97 SHA512 dd2d96a324a232b6aa8c903d7b890e434c2143c393409ded7da43931cb65544577f8cb6cc64fceb5dcefd5d9b0e3c7c9c60132af8e97c6aabaffc0e494791f9d
 EBUILD ansible-2.7.6.ebuild 1630 BLAKE2B 5ebaf32d9389e349ec01a1436cf55db7826d013ef03ebc2b51e76a01a9eaabeae7044203f1ab6a12db4b307f87e9b8cff36f7b557042f93e5700fce6f931b2d9 SHA512 66fcbedd85309b41c2d00dcd329699438941fafbefd06c3fb167c465ba5cc88f0d0964ae2e18a9a3245cd766d1197a87af4b9a1c00035ee74d26dec66cbbe17a
+EBUILD ansible-2.7.7.ebuild 1630 BLAKE2B 5ebaf32d9389e349ec01a1436cf55db7826d013ef03ebc2b51e76a01a9eaabeae7044203f1ab6a12db4b307f87e9b8cff36f7b557042f93e5700fce6f931b2d9 SHA512 66fcbedd85309b41c2d00dcd329699438941fafbefd06c3fb167c465ba5cc88f0d0964ae2e18a9a3245cd766d1197a87af4b9a1c00035ee74d26dec66cbbe17a
 EBUILD ansible-9999.ebuild 1638 BLAKE2B 40aecbf314bb9e743fb7543c696a271842955853fe981bc4dc69293dcc9905e950a743a56398b0815e09107db801ba554b68ad9511ccb9e25dd3dec0f0b156d2 SHA512 814b1430d499d2e6f50879c41b1a51e07b5e5a79355deab730e26b9e9a28f9ac94e2a46b884a5e0e8ed4a12d7a74bbbdffc0a55b8e120b438c91aeb9e7ae718a
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.6.13.ebuild b/app-admin/ansible/ansible-2.6.13.ebuild
new file mode 100644
index 000000000000..4bec3453ac7f
--- /dev/null
+++ b/app-admin/ansible/ansible-2.6.13.ebuild
@@ -0,0 +1,66 @@
+# 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} )
+
+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 ~x86 ~x64-macos"
+IUSE="doc 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}] )
+	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
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+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
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/ansible/ansible-2.7.7.ebuild b/app-admin/ansible/ansible-2.7.7.ebuild
new file mode 100644
index 000000000000..1363dee05e63
--- /dev/null
+++ b/app-admin/ansible/ansible-2.7.7.ebuild
@@ -0,0 +1,66 @@
+# 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 ~x86 ~x64-macos"
+IUSE="doc 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}] )
+	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
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+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
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/ccze/Manifest b/app-admin/ccze/Manifest
index 196c7caf345d..9dcc28d841a1 100644
--- a/app-admin/ccze/Manifest
+++ b/app-admin/ccze/Manifest
@@ -4,5 +4,5 @@ AUX ccze-ldflags.patch 424 BLAKE2B a769c1c617b7f421a0cac4cdb3141169eca8a0e23fd38
 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-r3.ebuild 946 BLAKE2B a10072f19126232ed62677066e2acb0805a34492a902ad8cb5e0d03a1f39647b8572fc7444d116be0ebe5a01b199926921d0c7db8d15bc4327debda761c4470e SHA512 2aba3653cce66c2a95a960b0cbdcd7cf24e60b6340fe2f5b03cd2d0fe98fd5f52be1ae6691b184b594d6377f442b136fb0b95459fb4b2634658c62ca3c5a1b59
-EBUILD ccze-0.2.1-r4.ebuild 936 BLAKE2B 391fe783a84fa3b770421cb4e854d244bd77a46857d0cf4adf2ce71824fe5763309a83ec1fc1b72bd730f735bf1c7deb9175c8d3dd9323ec37c495a3c730c3f2 SHA512 81d8915eef015f838c5cb347e489a36b1e4f1c96d985f2d49513f1ea17c721c59d7b2309820552fdd0d1f367f4d7b8ce49574d6edd7721efb913206410da7d80
+EBUILD ccze-0.2.1-r4.ebuild 935 BLAKE2B 8de555e2a3e49bf935e8ca65e816c8346decd026e704353b5b597677df35cfec1587e704cf4b45bb141fb043e72f4cab1727c98aa79371e9911b8f333c14d80b SHA512 52283bdd30f196c27b6c8b041f7b7060e52741dc914520a00e483a16a0dfdf8044672b55d139eee9587b37ea2397585d8846d58a7042b53689ae121cd002937c
 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 cf41a220b2ca..5386743c1020 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 ~x86-fbsd"
 IUSE=""
 
 DEPEND="dev-libs/libpcre
diff --git a/app-admin/chroot_safe/Manifest b/app-admin/chroot_safe/Manifest
index 7b3bb1f18aae..2b20cd575730 100644
--- a/app-admin/chroot_safe/Manifest
+++ b/app-admin/chroot_safe/Manifest
@@ -1,5 +1,4 @@
 AUX chroot_safe-1.4-ldflags.patch 399 BLAKE2B 3acacf5d552da06fd1907d988f113d96058efbd357cd4e6bbe514d8e8ed750b7931f3ea61a065cf605c42e3d7a21986da5d27e5b242cc0d594adcd6537b9893a SHA512 f5e3114b5d553f95d1b885d1ff43aee4d3cfb2d15a5d519818ff2f4c36fe099cdd27e6bd578dbf7ce957c38d8b329fd786f0efb22d0785197706e19892da2753
 DIST chroot_safe-1.4.tgz 25886 BLAKE2B 62247d568240a93914e5c42c3bfefd2e8793a9b6bd27c13668ff3cc48ec396b622553764e934045c0c570eeff7b15c5ae9fb7b3623c5661be537e79ce9d93287 SHA512 7eee0d8e2c75ccf4bd918f610c21511498a6499b638d09634993a4d6874882a0dbc8c27eea95e9776f1722593e3445399a893557bfa6398a11b85447564dfe61
-EBUILD chroot_safe-1.4-r1.ebuild 751 BLAKE2B 825222628b786c4067aa2b3dce7d03fd83485e388c9de3c159f40f5067160bc789f7d4454c1781a4877eda35439c22f4bcea93e339adca96f12149f83a0e9c6e SHA512 58b66c42b8b874facf8f9fbfdd84d4aabd689b3738c6cc04022b6e127972c799cdd218e21298e56ce73c7d96a61039c958f4c5218a463aad31d1711f8d5e9b32
-EBUILD chroot_safe-1.4.ebuild 783 BLAKE2B acdc573b676ce35d9cf686f15f33231099361986209e15a28ac05c17a1b487dfa7d689ecd0ae2e474a23f089f50c63972aa4673c2e2e406a652f4ce4f2dca909 SHA512 f5977571dfaf1f7e63cdd6d75bd7ba01986856e75bb73dcc49f0da6d08f9a127cfe56cb286026f3f504956994e238fa53cf571400f4fdcba2116b9935c455364
+EBUILD chroot_safe-1.4-r1.ebuild 749 BLAKE2B 27bb2b3dbd90bf5a8ee1378594a9ace8aa8e65d2e04db15747df411b183d092aae31f811fecec835ddea1ada588e51cbd862073a3598897a4f538a68d0f128c6 SHA512 aeb191ed14e6660131be89da3152a0a4844d0a55a69380462cc81f2b68bbf86c285997dc964698323f77a91a3069cf42f0cbb91645b3978d264304a06b2c5158
 MISC metadata.xml 247 BLAKE2B 306b96b46dafe605c41d3111cf9bd2fc3ef659f9f66692d05f952f8c9606d5bf1b1dd8051cdf1cd2d4e41f01934e57ae3e55ae46d23ba5acc2314d2fef325a4f SHA512 c46fc3160d29be2ce0948b1503ce44ead81dc76a264e183dc667be4e4f9bce0e235c94c2ebd06934b63cc7575aa8d5f27a528bb79185d35a138c7e0ec6dd1e3c
diff --git a/app-admin/chroot_safe/chroot_safe-1.4-r1.ebuild b/app-admin/chroot_safe/chroot_safe-1.4-r1.ebuild
index e9ade8684f94..919fdcc1757f 100644
--- a/app-admin/chroot_safe/chroot_safe-1.4-r1.ebuild
+++ b/app-admin/chroot_safe/chroot_safe-1.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN//_}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
 
diff --git a/app-admin/chroot_safe/chroot_safe-1.4.ebuild b/app-admin/chroot_safe/chroot_safe-1.4.ebuild
deleted file mode 100644
index 210b10565d66..000000000000
--- a/app-admin/chroot_safe/chroot_safe-1.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils multilib
-
-DESCRIPTION="a tool to chroot any dynamically linked application in a safe and sane manner"
-HOMEPAGE="http://chrootsafe.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN//_}/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-}
-
-src_configure() {
-	econf --libexecdir="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_compile() {
-	emake CPPFLAGS="${CXXFLAGS}" CXX="$(tc-getCXX)"
-}
-
-src_install() {
-	dolib.so chroot_safe.so
-	dosbin chroot_safe
-	sed -i -e "s:/chroot_safe::" "${ED}"/usr/sbin/chroot_safe \
-		|| die "sed chroot_safe failed"
-	doman chroot_safe.1
-	dodoc CHANGES.txt
-}
diff --git a/app-admin/gopass/Manifest b/app-admin/gopass/Manifest
index 9e05eede2059..4dfd1877d30f 100644
--- a/app-admin/gopass/Manifest
+++ b/app-admin/gopass/Manifest
@@ -1,3 +1,6 @@
+AUX gopass-1.8.4-xc-tests.patch 923 BLAKE2B 67c00d9d0d983dbb0e3f8a7e78c895dc645d1ce0e4eed2e726871d5fa35086cba10872452b76fa0ffb65ff89f3ad25c9f726141221d1dd3f11086690697da0a1 SHA512 a80ce382b9e35af43a7ddeaa7a863e73d7960e37337b66d558dfc1840a7b113767eacbb6225bbbc2f3dd581b33c0f4a9a03105a08340a9abed4768baa4c32648
 DIST gopass-1.8.3.tar.gz 6374004 BLAKE2B 1f3b66e8a631d94fbbb33347009a4614f180d7bd30f3d73e98f476fc81a3f5f0aef15c80705b1b4e871f333a3366cc051eb41785082bb90420a5d34f38e35e16 SHA512 bcf8e4cdb37355ae43d0d6d21e3248d3547fb3f1892bb2e8d5d8ddc47a784f75f4f404429733ac824bd66d719fe63fef7a1d58facde65a6d1820ecf14e7bd77e
+DIST gopass-1.8.4.tar.gz 6436185 BLAKE2B ecb086717b09a4a5ea24bc4378fd54369628b0319bfe222b2ca11583eb304c84c05513b1d2ca97089152f41903d5dae24f3aa4acc5e2f6c7e948a8d918308d66 SHA512 53440ff95589f21e1ea1d8a03e3565ad6a3b35dd747ecd62f6496fbe9ba51e94e3081142dfcc094a5986828fcf4724280ee0fdebd9cdc05f0d8720aa4f1c89ae
 EBUILD gopass-1.8.3.ebuild 1041 BLAKE2B 4fa9681eeb9b8c0b9be470cfc8fe3b3f2ef806e4b64238b412d67deb72bfff4cf9cc0bd4977028287ff6e5ce5fac26874925da6e181068c4c69555b3a7c4bfbc SHA512 1bbff9001cad0448f310a5db019117b13edc2c81a66025b10a0e491fc9f6d6f2bcc1837e5ffeae46705911aa7d8d4ba288efa92888fbfd3785805195733a7ed5
+EBUILD gopass-1.8.4.ebuild 1088 BLAKE2B bb31d0279bc124608f176d38e23ab630b85d5bf5ad9c53466e4e6f172576f64ba06721828af9dd9d8dde6570d395708184b8cc79ccff6a2c059236b2d03794ca SHA512 554f69abb959ec7d104bdf76bf28cc7bb8a0c269e601328926cea2af49f384ff366a228daa3f60a27ad53b481d359aeca9757786837e27ac959639f94fac3338
 MISC metadata.xml 326 BLAKE2B fbff56ecc7a4bd866c1220fc218f9233ed0660b04cde03047df5db992557bf5d20f518815dc15eba2a22f6b2b8cc4eb5ed1c0f2cc2753e18ce4cafd59b768637 SHA512 2d43a58c7997bd539d9aa5659fe7cfcd947c97c49d31dea4ee1230b06b0ae2c8cef4fb228b889968f65c36693d5befa76828da3644bea0852ead709bbf7d760c
diff --git a/app-admin/gopass/files/gopass-1.8.4-xc-tests.patch b/app-admin/gopass/files/gopass-1.8.4-xc-tests.patch
new file mode 100644
index 000000000000..5780f17bf347
--- /dev/null
+++ b/app-admin/gopass/files/gopass-1.8.4-xc-tests.patch
@@ -0,0 +1,28 @@
+Skip xc cli tests, 1.8.3 failed when run with no arguments for these commands
+but 1.8.4 doesn't.
+
+--- gopass-1.8.4/src/github.com/gopasspw/gopass/commands_test.go
++++ gopass-1.8.4/src/github.com/gopasspw/gopass/commands_test.go
+@@ -55,14 +55,14 @@
+ 	".templates.remove":      {},
+ 	".templates.show":        {},
+ 	".unclip":                {},
+-	".xc.decrypt":            {},
+-	".xc.encrypt":            {},
+-	".xc.export":             {},
+-	".xc.export-private-key": {},
+-	".xc.generate":           {},
+-	".xc.import":             {},
+-	".xc.import-private-key": {},
+-	".xc.remove":             {},
++	// ".xc.decrypt":            {},
++	// ".xc.encrypt":            {},
++	// ".xc.export":             {},
++	// ".xc.export-private-key": {},
++	// ".xc.generate":           {},
++	// ".xc.import":             {},
++	// ".xc.import-private-key": {},
++	// ".xc.remove":             {},
+ }
+ 
+ func TestGetCommands(t *testing.T) {
diff --git a/app-admin/gopass/gopass-1.8.4.ebuild b/app-admin/gopass/gopass-1.8.4.ebuild
new file mode 100644
index 000000000000..1733d9991751
--- /dev/null
+++ b/app-admin/gopass/gopass-1.8.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/gopasspw/gopass"
+
+inherit golang-vcs-snapshot golang-build bash-completion-r1
+
+DESCRIPTION="a simple but powerful password manager for the terminal"
+HOMEPAGE="https://www.gopass.pw/"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.11"
+RDEPEND="
+	dev-vcs/git
+	>=app-crypt/gnupg-2
+"
+
+PATCHES=( "${FILESDIR}"/${P}-xc-tests.patch )
+
+src_install() {
+	dobin gopass
+
+	local DOCS=( src/${EGO_PN}/{CHANGELOG,CONTRIBUTING}.md src/${EGO_PN}/docs/*.md )
+	einstalldocs
+
+	# install fish completion
+	./gopass completion fish > "${T}"/${PN}.fish || die
+	insinto /usr/share/fish/vendor_completions.d
+	doins "${T}"/${PN}.fish
+
+	# install bash completion
+	./gopass completion bash > "${T}"/${PN} || die
+	dobashcomp "${T}"/${PN}
+
+	# install zsh completion
+	./gopass completion zsh > "${T}"/${PN}.zsh || die
+	insinto /usr/share/zsh/site-functions
+	newins "${T}"/${PN}.zsh _${PN}
+}
diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index af93cbe213d8..e79aa1a45c2f 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -15,5 +15,5 @@ DIST hddtemp-0.3-beta15.tar.bz2 256372 BLAKE2B 1c928234c36172c387a002190045cd050
 DIST hddtemp-20080531.db.bz2 5627 BLAKE2B b973a981ee55033c8ba190efd9dc8586589292ef1f2b00542be7db2be64df812847665abefc7517f7c71dc70df153766570f62b69fc4891e758e82200ff8d589 SHA512 cd03cc300aece4f7427fde1b58840643c8e41e6c0ce30b418a62bf44b268f249ef3dc4f5f4bcbc9cc0cfe0346c18d4f1da22451c87efc3d46faebcb81a1fe059
 DIST hddtemp_0.3-beta15-53.diff.gz 52845 BLAKE2B ae4ef1f98ff39a39bdb49b2752f6f442c6ebe8ea6b0e8e743cc3ab9ef39d07abe8970648b841b3974cd814fdef72bc59cfe93c4b4d1cf2a85de1a0d94c4409b9 SHA512 1006ffa92f9973eb1da6444f8e8eed681e641efd17a52954b0e6c5041ecae13108af4ed89534ec4f2799685f96191769d3b168dbbb96085dc801150c7c547511
 EBUILD hddtemp-0.3_beta15-r26.ebuild 2972 BLAKE2B f273cee116ed77f85fdedaab31f82c6a7bd109b306a9d56745767050cc65ed79c2b28875f934b02fbdde87db6e8e1185605525f1562d930d3b5eadf8bc4edd0c SHA512 64c30191b0103c410b9d8461c283738a56ccdc09b7fd2f9d8ee3f4e05f1a16768d2e94fe74f7638e1ed8c3852976a19fe9f3766581c49ed884f686495eca1bf5
-EBUILD hddtemp-0.3_beta15-r27.ebuild 2994 BLAKE2B 677e5f404ada610f7ed0e284e503625d33b7048b10c28c84d9e5e3ef8ec57901a89ebeebeef5c08d2ae271eb2c7f5a7d2da6a351c627cd16d373ba286bd462a2 SHA512 7c2cca4c497711991556dc45f35e7cb18eb88c66a2aab762740dd210b338408a920c16da016d19017a976095c38eec983e99fcdd3337335ddea8cea95f0e3601
+EBUILD hddtemp-0.3_beta15-r27.ebuild 2991 BLAKE2B 556468d34208d67522e78fdddad3b5318667ed9748cce1c92e866c64328093c4792bed972e85b4fc21e7b6a3764156a7dd71586d901b365d7e95701e24589fc1 SHA512 d858e3a4bdcbb7f977ade669fe7a6bc6742beab7dbae8ed2da94bea5d1fc935cab1b78faa9d7f5992f483cae287a3c024007e838e14abe95774000fbaf980bb4
 MISC metadata.xml 260 BLAKE2B 41040f0f9342dec7a3993d99bd9fb49f624c8fc8a0be036b3c2e3f2f20d4182d23c5b98a5451f5d2d6906d749b7756b7ec10b1e135bfa7b1633234ebdae1370a SHA512 480d8cf7f249c083d64b11e13bd93b42856531860afa935a9265bfcf9491fbd3997a9b9d8e90630daba103402fc9aa08c63ef18091cd6ee68310c0a8f3c38af3
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r27.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r27.ebuild
index 51042e1ce1b7..68a009f85906 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r27.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r27.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ppc ~ppc64 sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ppc ~ppc64 sparc x86"
 IUSE="network-cron nls selinux"
 
 DEPEND=""
diff --git a/app-admin/ide-smart/Manifest b/app-admin/ide-smart/Manifest
index 3106f7d4796d..7c9c3af5ef9c 100644
--- a/app-admin/ide-smart/Manifest
+++ b/app-admin/ide-smart/Manifest
@@ -1,5 +1,4 @@
 AUX ide-smart-1.4-fix-build-system.patch 280 BLAKE2B feac0eeafdc202a7f0074c6ca8c102f5602bcd1b9ec734e605d122464c9e782db1efd502677d415b1620090a82b5ee70755e25bf478700eb6b89d059a9ba5bf4 SHA512 7b27a8842d0ac7834d660f1ef46563a210a37e737c469cfae0ec07d18ae6fa523b6482f8fcba3f63247742c86215e01a35294ea664a416e7ffa92184c91b8c03
 DIST ide-smart-1.4.tar.gz 19739 BLAKE2B d9c94b53855628ea10ea563f709754e7f79e50d43e24f76ac3c6dc9b5bdee81a547e63c4583c3506cc899c7e761b59dfbea6bb121f39053cefcac20a984b8d3b SHA512 9ac5cd03b67731aba5371ec9edb3aabb7d3e3b3680552b14741106d8d5ffe5a1705ad379dd8df60b972f3e23f66ed35b98341544feb4b856912138ccac109660
-EBUILD ide-smart-1.4-r1.ebuild 691 BLAKE2B 365faf918071ed12a596f8cf029c6b9fdb5e76dee3e6dc0c0ba11fadf868aa2ab7c8ed8af06aa25b559e6a65f71dbecd606b9e3065aca481d8db49bfd679285e SHA512 6a54fb402a507937358b6ada716caf88e9335dd02c83cee489bb2c2dd026521361a2df821a1bea13dbd025929d318036ec1648135dbbee703b7c9e9d07f13ae1
-EBUILD ide-smart-1.4-r2.ebuild 573 BLAKE2B 57cfe05fbfeb32bf53330832b088eac307aa7d7c06eebee48583e8a958fdba7b023707dcb74174c65bd2b4892484156cb8e16a88269b8424dd7ab55044745f05 SHA512 3b207fcb8a9157bbeac307c9d0804655fabbd1ed965b400a330ec3c42c633e28f6f6238321f507f16ffeed9bad7ff2e557fba77224f0fe7cb61983eb4c6fb12c
+EBUILD ide-smart-1.4-r2.ebuild 571 BLAKE2B 3965c37e9c49d26fbe06858608e4be7df16b76a3dc8cad6d9f4edd6be236cd5b1837477eecb8ec6a603e50cd89f2be5e9e7a4f390f5aee75316a778f7de8ff69 SHA512 d35f03930fbdefebb0f4ae453edf5e45ce8af73696ecb2f5a1da357c60cf3fb3c56493143144880ab8ff3551d6d75951fb6a8805996665c6682db8ef0a69fce6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/ide-smart/ide-smart-1.4-r1.ebuild b/app-admin/ide-smart/ide-smart-1.4-r1.ebuild
deleted file mode 100644
index 5ffb6e04cbb2..000000000000
--- a/app-admin/ide-smart/ide-smart-1.4-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A tool to read SMART information from harddiscs"
-HOMEPAGE="http://www.linalco.com/comunidad.html http://www.linux-ide.org/smart.html"
-SRC_URI="http://www.linalco.com/ragnar/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-PATCHES=( "${FILESDIR}"/${PN}-1.4-fix-build-system.patch )
-
-src_prepare() {
-	default
-
-	# yes, the tarball includes pre-compiled
-	# object files and binaries
-	rm ${PN}{,.o} || die
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	dobin ide-smart
-	doman ide-smart.8
-	einstalldocs
-}
diff --git a/app-admin/ide-smart/ide-smart-1.4-r2.ebuild b/app-admin/ide-smart/ide-smart-1.4-r2.ebuild
index 744a2b8863d8..c4d034211730 100644
--- a/app-admin/ide-smart/ide-smart-1.4-r2.ebuild
+++ b/app-admin/ide-smart/ide-smart-1.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.linalco.com/ragnar/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
 src_compile() {
diff --git a/app-admin/kubectx/Manifest b/app-admin/kubectx/Manifest
index b82ddf5f4932..0bd058302d91 100644
--- a/app-admin/kubectx/Manifest
+++ b/app-admin/kubectx/Manifest
@@ -1,5 +1,7 @@
 DIST kubectx-0.5.0.tar.gz 398389 BLAKE2B 6eb5a91667e62e029bc9810e4e5833acdb99a73201713f9eb3fcee991001546fbcb7a381e3b1a568952b1a224975a238c41f65382cf384ea266f3dad55a79949 SHA512 0a587a0260960dfc69c3a30c3e73d2b2ac83937ef8a05df345445f1dc64adc725d42f7652ec2c65a02becdc40a7de3e49b402d7991f8dc970ee60b913b3ae5df
 DIST kubectx-0.6.1.tar.gz 481134 BLAKE2B 2e7476dfb4fe0296abfbfd939af53438692a4efb7f899b659aa8578f2b4610c0cc87ad0eaa142276b32b5441febde211232ed39f2306af5fd232fea8a5cc688d SHA512 cb4616777a090625cba892b8f73c06a8c5e182d1373c636576a8ae6937bb9817c2546ae1ee3f56a9473f0b04a93965a1a857fdd2ba10451ea0e0509c9f765a79
+DIST kubectx-0.6.3.tar.gz 483452 BLAKE2B 9f74a5df0c30e8414bfba0c2934ed0601dab249a78e8083179fc129dfe288b596f8f0932c3daf84b89ebb740a9c6694189f596c7a944bb6a584495a999d08192 SHA512 63054b51e3d2f52e895aa5b15162f67c81970c0d27e974f60f7f6641156d04cc4b590894e7eedcba3925f344009e65d04189c046f67d1edaf7f092ffe8d5dba1
 EBUILD kubectx-0.5.0.ebuild 695 BLAKE2B 7d577b4d94e9deb6ce514fc3997052526670ce9c4d9df60d90136388b04f80c360957ed46d3ca83093d73fe6ab696433d099ad853e3299ad897cd4d7460d2419 SHA512 ac6b600bbdb46ddb0bb2d4d4fffe25bd41217d231ccef053169bac0e5f5e8b0ff0ec85fa67bc73996c590845b6768dddea4cbc2b3afa53077a93a5f341597a40
 EBUILD kubectx-0.6.1.ebuild 695 BLAKE2B 7d577b4d94e9deb6ce514fc3997052526670ce9c4d9df60d90136388b04f80c360957ed46d3ca83093d73fe6ab696433d099ad853e3299ad897cd4d7460d2419 SHA512 ac6b600bbdb46ddb0bb2d4d4fffe25bd41217d231ccef053169bac0e5f5e8b0ff0ec85fa67bc73996c590845b6768dddea4cbc2b3afa53077a93a5f341597a40
+EBUILD kubectx-0.6.3.ebuild 692 BLAKE2B 12a53742c7e79321ea3a3e2f534ba525e65d8d3968494908eae813933aa4de9f07310f2c151301eed696e15da27d6c1f1b444a5dc191ec479c0aeac0c3870915 SHA512 d672947603b0f6c3d2783082b25a3c5ae595d471251df46e8b6ed533c371211c781bc0b6330f14b7659bf88f285207cf74131e879823a600af9708a2576a6a40
 MISC metadata.xml 247 BLAKE2B cc3ffec52f77e1ce57763359a7fc71a3225e3a2cda5cb797e98661c354fb9ee896033b1aa38c3a22c3587467da2833a801b710c8f43b3dffb2e9de327c48ab45 SHA512 a47289a415c6b8ee6759241cbaf42a851208f940432451a4b893f336d2c980aab922f8bb37de656465758532321dcbdfb372d1ee85739da46ec83ab89fa3f046
diff --git a/app-admin/kubectx/kubectx-0.6.3.ebuild b/app-admin/kubectx/kubectx-0.6.3.ebuild
new file mode 100644
index 000000000000..da79bbe5c433
--- /dev/null
+++ b/app-admin/kubectx/kubectx-0.6.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vcs-snapshot bash-completion-r1
+
+DESCRIPTION="Fast way to switch between clusters and namespaces in kubectl"
+HOMEPAGE="https://github.com/ahmetb/kubectx"
+SRC_URI="https://github.com/ahmetb/kubectx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="sys-cluster/kubectl"
+
+src_install() {
+	dobin kubectx kubens
+
+	insinto /usr/share/zsh/site-functions
+	newins completion/kubectx.zsh _kubectx
+	newins completion/kubens.zsh _kubens
+
+	newbashcomp completion/kubectx.bash kubectx
+	newbashcomp completion/kubens.bash kubens
+}
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index 2c1a8414faf7..cdf0d14d1f42 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -3,5 +3,7 @@ AUX mcelog-129-debugflags.patch 416 BLAKE2B 97aa6da3146380b40013966bb109de412158
 AUX mcelog.init-r1 349 BLAKE2B 17f8a28dc1174fa62d50cb0d6dcae7bf4755ea99ff380d42a5beb16ab6ca07f1dbfcf7783ecb3b8f85f714357c39b0a333630c69e0bef5af32ba602686117cfd SHA512 a43f0efe7eb5007e9422ca2eba43b666d5110696c8b049b74990849e200b89b99e3d22707803e21e4452b0e75bbacdec0526ed933b234301ebbbb19d700df0d4
 AUX mcelog.service 213 BLAKE2B 08da6eac0afe17a04948f5ff958aba5c64ff491f6842a0b84e914a82cce16782b2c9dfdc83123d609cabd4e9e60eb38a9e43fe7a22a2afca8f53c3dc8e65ac87 SHA512 8317d9310d58663bb28f2528e0872520e30475439b9ce69ebb2452d7dc3583d2aecab80d9f6ef895ac8a17f666c3229d7cd768026ea16cc5403fb05d8bdc5c75
 DIST mcelog-161.tar.gz 308227 BLAKE2B cd208cce2685b779a2cac6d347b890d5bff5f07d2e7165c1d078f914aefcc26bef2ab968ec6baac4410134d8188dd73e4f3d77f13603307f8c6b592554146497 SHA512 af38fcc1cc9621d6cfbda2b9acc7698cddbe631690bf394398978bdafd0d98075539012827ca876cef3f64cc56a00d31d0bd0f4fe2ea9171eb41bf0163e35f0e
+DIST mcelog-162.tar.gz 308347 BLAKE2B bd438e85ea793c6c5ce4d561f0400e91b101a010cce7f937751a11a0a974fec49db7e9d768fc50db68a91c973c90c8ab1b4ffa80964cb6fde860b9f2ac217435 SHA512 d61a0b7ad3974098963edde1e9e9acdf4dbd1a025577b7044bafc17302abd19080c8145a2700c691400af0768ff4b6833d47697e1478c5bef8831f7f8b61ae48
 EBUILD mcelog-161.ebuild 1367 BLAKE2B 36af6f137e53810836f18110ab2ac3aadd3be922a17746d77a82e8f43214733bcd3462740d2c3ff0384e04bdd739e6dea3d2673b5a11d20c92700eea867237c7 SHA512 d243573977569374a72ec19629d48bc735c94e7c49dfde00550128cdd8e3713c8eed966be26e11a1d7a46156f2b3db00bf342cb80eee80409d284c359bcc6909
+EBUILD mcelog-162.ebuild 1369 BLAKE2B e7be76b28b79b54b41c2d450991dd23f954eabdeda40f48e35d6a8d0ec6d40e7330df989cdfd5b9f34de73e4852ac57e38a27e5ef0b886e6e2f3742528b86dea SHA512 e754a01ebc332b56204efa51387cccee503dd0dbf9d050f44a4f7684153a3d6dccf27267b596dafab976e098cc4c040d1e49204ff04a76705329a78db8d71a7a
 MISC metadata.xml 644 BLAKE2B b5d4ef8c5541a2ead6cf23b47cf4adfcdd6607a1911411afef41f53e08db548e8606cb50d52e8c7caee29f574838157484e96878fc205467c53bfc6951eca3e6 SHA512 26990a9c8ef8333f6fe292e465cb8aaaafb6436af48cee7840d932fbde92e8396cdfa9d2718eca2a6284c8ba87a8c6a47506c57b0af8c9fe1894673b2e98a1a6
diff --git a/app-admin/mcelog/mcelog-162.ebuild b/app-admin/mcelog/mcelog-162.ebuild
new file mode 100644
index 000000000000..557b542b3a9f
--- /dev/null
+++ b/app-admin/mcelog/mcelog-162.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="http://mcelog.org/"
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~X86_MCE"
+		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+		"${FILESDIR}"/${PN}-129-debugflags.patch
+	eapply_user
+	tc-export CC
+}
+
+src_install() {
+	default
+
+	insinto /etc/cron.daily
+	newins ${PN}.cron ${PN}
+
+	insinto /etc/logrotate.d/
+	newins ${PN}.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	dodoc *.pdf
+}
+
+pkg_postinst() {
+	einfo "The default configuration set is now installed in /etc/${PN}"
+	einfo "you might want to edit those files."
+	einfo
+	einfo "A sample cronjob is installed into /etc/cron.daily"
+	einfo "without executable bit (system service is the preferred method now)"
+}
diff --git a/app-admin/needrestart/Manifest b/app-admin/needrestart/Manifest
index 42330c6a8942..2f39583284a0 100644
--- a/app-admin/needrestart/Manifest
+++ b/app-admin/needrestart/Manifest
@@ -4,6 +4,7 @@ DIST needrestart-3.0.tar.gz 58437 BLAKE2B 6f3b79f793dab85af2a68f3796926b958c077b
 DIST needrestart-3.1.tar.gz 58882 BLAKE2B c29d7a56905b047f73743075f520116004a8eed8d88ca402e958fc6a4a430213c9ba4dec469dd1221cbad5b8c6123a9e1acb451f63c6dfdfcd11dc27bce147af SHA512 a55f4e83be676d26d815f28df2a7d56c17bd74d6c1a801f5d1ee05344853d7272dda018b3c19b7753dd6f256e793261d5581df49449c4c9577309add15d4bb70
 DIST needrestart-3.2.tar.gz 59702 BLAKE2B 9eb8073a4dc6f7a402ee9ce055960663a08d3d4b11805ef4189c8416d59bda53e02f4b07f43f49b73a99eb9b82d8e94ca5757cd6c7463dcfa34949ca7e6521da SHA512 56e881d73b1bf1cbee8a94ae871c2fe350d6b31e4701fdc256bbedb0d9934111f5f201d3d7b7f25ff54f78fd450c95f4c2bad6f06de5e9ce379a393fd73280d5
 DIST needrestart-3.3.tar.gz 59814 BLAKE2B bfba00dee7c0f225efcaaa80b301eb38d0ea82645f253c8bef9294102f9f4183433ed1b6efe71a9dc34c65f76364ff3fc2344e840b34f97361f3ddcd0dc9ab4b SHA512 ea2f3cbe228a6b879905bd3b3de8b5e0bb2362e8d3cd566817d2e7d519d54207ff5923eb8e49cbd8ffe8ed50729f4da04bf4d55268e806f49157860584058d50
+DIST needrestart-3.4.tar.gz 63219 BLAKE2B 892bb610001575b7e653e06380ba39bb91608db6b5cc491d1e89543a72a17f69547f2610ebe7f3e51835dc1af5a32604fe54f79b6565c9f97df194a87f5f7bdf SHA512 3d63a9c32112b1d4f5d0c6d66430323761c9e7c17f01f52d0572b64ebf113fc9b52838dada363667632ae51894312d891ae8016e8eb5cbd4e0d06fa37c603f25
 EBUILD needrestart-2.11-r1.ebuild 855 BLAKE2B cf57592733872915455d20c0c10ce8f0e6438fbeae4bf998efb7d5613d3968f33369f3e37406fdb02d913ced830905bb34761db7cffd711663df16a207bdb6cc SHA512 dd8451935fd7e9ae0d80bf8d78193e0ae5eb1a9ad2babf895b223271024fe8fb968e2b2e0c153744fb9bece1a7d82d0864bdb093642504c061d225a5a4d2ce33
 EBUILD needrestart-2.11.ebuild 825 BLAKE2B 42e2af640eb7aa73c5012e05de007554612b9c915d04e24bce1f7d9866e0072b799a5725782db0d743c8ca0e958b9f923ae46657e0f9172d936cd834de2c2d50 SHA512 feeeaf8e9f7644db79f63735677d21c14e9c047ee392b1ab342c7174fd701ad098d4c5d9e903a9f5a1d0575537261e5526970c3fe287320b5985c1b8aacd714d
 EBUILD needrestart-3.0.ebuild 855 BLAKE2B e1c5709c7a1891b7719606258337def8a0bc67c7afa23983e583433c664efeab7b555751fdac08ac74230015fde860abd14f57cea297a0e98b89b1205d74682e SHA512 08ce4d08db3de0d76c57f1ae89d7827d2a34483a28125a0d627b9d57aee3d1da6a3d5c13e19d25df9a7481541bdec4147881c6cc1fb2953050f0d054861ee5f0
@@ -11,5 +12,6 @@ EBUILD needrestart-3.1-r1.ebuild 918 BLAKE2B 776c121b6e60ba62d84de3c5fe19a431ebc
 EBUILD needrestart-3.1.ebuild 855 BLAKE2B e1c5709c7a1891b7719606258337def8a0bc67c7afa23983e583433c664efeab7b555751fdac08ac74230015fde860abd14f57cea297a0e98b89b1205d74682e SHA512 08ce4d08db3de0d76c57f1ae89d7827d2a34483a28125a0d627b9d57aee3d1da6a3d5c13e19d25df9a7481541bdec4147881c6cc1fb2953050f0d054861ee5f0
 EBUILD needrestart-3.2.ebuild 855 BLAKE2B e1c5709c7a1891b7719606258337def8a0bc67c7afa23983e583433c664efeab7b555751fdac08ac74230015fde860abd14f57cea297a0e98b89b1205d74682e SHA512 08ce4d08db3de0d76c57f1ae89d7827d2a34483a28125a0d627b9d57aee3d1da6a3d5c13e19d25df9a7481541bdec4147881c6cc1fb2953050f0d054861ee5f0
 EBUILD needrestart-3.3.ebuild 862 BLAKE2B c7b40d4ad4875a39f2e214c1544b77627b8b2c09648fe8d92dcc18a8f3dbd9de60715ffd285c9d18a8350427ab5d915f67da90e40f545a4b7a8e20e23b59253c SHA512 83fba7bd0aa4f3b157b352b309698d0abc3ce06ea4c07b4fa59aa0a57d3d157dbd63d1e2bac0037304871a384d9300307210a36b6d15d55cd8977ea9cdcb4d86
-EBUILD needrestart-9999.ebuild 855 BLAKE2B cf57592733872915455d20c0c10ce8f0e6438fbeae4bf998efb7d5613d3968f33369f3e37406fdb02d913ced830905bb34761db7cffd711663df16a207bdb6cc SHA512 dd8451935fd7e9ae0d80bf8d78193e0ae5eb1a9ad2babf895b223271024fe8fb968e2b2e0c153744fb9bece1a7d82d0864bdb093642504c061d225a5a4d2ce33
+EBUILD needrestart-3.4.ebuild 852 BLAKE2B f841c3447fb59b83ef4e73f8bd277f22c661e688e993bd859cc0f3cfc3ec1451007a7ad2eb0e1867b7b10eb9e4074ee95a901df8f09fbc0b984ca44abda6f473 SHA512 b6f7c7d103dab3c53129f300c3d7a633088255ede208f7a8545da363551411e5b11493b0ca2a01bcb918237a722df86ed89167824d36aa5be81a3379d01ff438
+EBUILD needrestart-9999.ebuild 852 BLAKE2B f841c3447fb59b83ef4e73f8bd277f22c661e688e993bd859cc0f3cfc3ec1451007a7ad2eb0e1867b7b10eb9e4074ee95a901df8f09fbc0b984ca44abda6f473 SHA512 b6f7c7d103dab3c53129f300c3d7a633088255ede208f7a8545da363551411e5b11493b0ca2a01bcb918237a722df86ed89167824d36aa5be81a3379d01ff438
 MISC metadata.xml 461 BLAKE2B 28793d229fbcb27f6ad2bf256bfae268236133d14302a72693b90e319af2bc2dc4c1928546b9f3c5e5fc657fa4013fb28acedb1762b84bed60850e5ba0852c23 SHA512 6b8877f41545dafdb30cc0ed3664e568901cc13c68c5221817631be63d454ef30d1b2e923f3a8fd9b0d77be825e1f183601e7a7d474a1d196b2a8eef099095b4
diff --git a/app-admin/needrestart/needrestart-3.4.ebuild b/app-admin/needrestart/needrestart-3.4.ebuild
new file mode 100644
index 000000000000..82173bf1f12c
--- /dev/null
+++ b/app-admin/needrestart/needrestart-3.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/liske/${PN}.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Restart daemons after library updates"
+HOMEPAGE="https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart"
+
+SLOT="0"
+LICENSE="GPL-2+"
+
+RDEPEND="
+	>=sys-apps/sed-4.2.2
+	dev-lang/perl:=
+	dev-perl/libintl-perl
+	dev-perl/Module-Find
+	dev-perl/Module-ScanDeps
+	dev-perl/Proc-ProcessTable
+	dev-perl/Sort-Naturally
+	dev-perl/TermReadKey
+	sys-apps/init-system-helpers
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+src_install() {
+	default
+	doman man/*.1
+	dodoc -r ex
+}
diff --git a/app-admin/needrestart/needrestart-9999.ebuild b/app-admin/needrestart/needrestart-9999.ebuild
index 3019c0bacfe7..82173bf1f12c 100644
--- a/app-admin/needrestart/needrestart-9999.ebuild
+++ b/app-admin/needrestart/needrestart-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/liske/${PN}.git"
diff --git a/app-admin/ps_mem/Manifest b/app-admin/ps_mem/Manifest
index bd9f4d107015..97f02f2d80fc 100644
--- a/app-admin/ps_mem/Manifest
+++ b/app-admin/ps_mem/Manifest
@@ -2,5 +2,5 @@ DIST ps_mem-3.12.tar.gz 18074 BLAKE2B 98861120b09b3a25b29b5b461d50d8e6a8a684fe76
 DIST ps_mem-3.13.tar.gz 18331 BLAKE2B a0689a98597e02a63cc83188e717421bf873b9202c0f524165ffc838fd438c539209c2f4e6561226bda8c6f85364707d29d13519d6d3e53a6d34cb39378d2de1 SHA512 bf5affaede5f052cc878d46ef81186511a1e8f5939cd7e8560ab2df9faf4dc31566cb4172d956cdcf1e6fc5586ba3458ba1011aee3720f6b7eeb3cf40b4f90dc
 EBUILD ps_mem-3.12-r1.ebuild 668 BLAKE2B f38a2dc6eec91a08bcbb6b7f662658c07518c766c43f6e77a129f5e2bbb3e689c44d7d025380335f9b74d0bd92d88e8c3396f2fe26dbada8b8a9d16f56b44727 SHA512 7d26aa36507731657c3bc3412e4710688e807da5cb8908f3b1d9f715effb24d9e9bc03462ab7f493afcc3c6dc318618aee2792ad59d088a3bfdb204271588a40
 EBUILD ps_mem-3.12.ebuild 661 BLAKE2B 7fbdba869bb25c68c0d6c02784a0d50a1ba18ed005a6ca5539d3d2444aaad0dc024af2f3a8167929c9420a4baaf2f479a6552c149761062fb9c22c0536f701d4 SHA512 09757dda1899056fe5ad0d8ec8919e6ea57b1b0ace6aa970d4f177a03ef5f738004bc368c0417101b579bf9a94f8e67935b6d8cb9c9dbde9b3f27786e70f0baa
-EBUILD ps_mem-3.13.ebuild 732 BLAKE2B 7d3ec283726fa6c744d8dc86af3acd13dd71f59b1aa7fbd36f874454025d5c34e968474c68bb008932f8e465f216f2daa315508f347bf1abcacf212c56849760 SHA512 da9335d34e6a99c1d0bdb69876e9a7de59d4ab5bcc18ee284fb52af66a0236e4f4d2a2ba5a9779c65d8c03bffa2b43f942217538c303545b8ed22b58af82cf03
+EBUILD ps_mem-3.13.ebuild 726 BLAKE2B 1b9d1a41ed69e573a842669cbee2e5f41fb0a4d9840006141d92825bac11f9733f07fc73c2b09a00c96a386cb3eeaa3115e05264aa2da754bd95c7b2e6ffc7a8 SHA512 5c5530c9648c9892deb3fb66ca19c6122107256f6b8e12eb3b5dd08d479314624b64581f5f01c796fddd95018143a63e45b01f159db8b2ac22c3af89a6d7c216
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/app-admin/ps_mem/ps_mem-3.13.ebuild b/app-admin/ps_mem/ps_mem-3.13.ebuild
index cedefddc1a27..b977cc31a563 100644
--- a/app-admin/ps_mem/ps_mem-3.13.ebuild
+++ b/app-admin/ps_mem/ps_mem-3.13.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 @@ SRC_URI="https://github.com/pixelb/${PN}/tarball/${COMMIT} -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 sparc x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-admin/r10k/Manifest b/app-admin/r10k/Manifest
index c90dca7a71bd..2c654045b329 100644
--- a/app-admin/r10k/Manifest
+++ b/app-admin/r10k/Manifest
@@ -1,3 +1,5 @@
 DIST r10k-1.5.1.gem 164864 BLAKE2B 398f656913b9c0b3835d782dec3aa0d7a475dc49ac6fba7734239a795e209048969c1e66575029eae5ac19513ac57e24adbfc839c9f5c0537c82fe0fe65def30 SHA512 4440a893aaa6ec0337f9347b620f92afd93099465c148bfe90cd44c2c6fe29cc8411b8c225044a9547d24a8857b580dcf2ea190bf64fe9ba180d1c5c3832d1dd
-EBUILD r10k-1.5.1-r2.ebuild 2127 BLAKE2B fb14e3b0dc36d26e168d7986e1c421d8e8098e25a513f1fcad8de0dabfbd2d4b4fa0ceae16c1795342dd0de617d7f7fad996d5375ce772304fc862dd891f8b5b SHA512 94eb12be84982b760c32635d0fb74b2e262c6585d87292468caf6b22f60a980a75c2665a923c63cffdf2fbaf7814c78ecec37a3c9b2cd9fb6411928614410b8f
+DIST r10k-3.1.0.gem 202240 BLAKE2B 46b7b03d7d57aa856f31ee1a8fe804b1e5ed2272f2543955c46fd194a956c4074fab7a0ca59ce828e1d0841cd7beabdcaa7a167329a8ac707e96be9e71f2cd2f SHA512 7ec80be0e09d0693f33eaca4420a47a6fa7c2216ab8a06a45611b7150f97be00eaca7dd674962f14b169f9b0b315c3b47c76612baee0724c7d928541e535a960
+EBUILD r10k-1.5.1-r2.ebuild 2131 BLAKE2B de5a13b71bb521c86393bca53da848ffc973efb2f199d28ee541b9869cb874b701f86084ef74754eb8543e8c9622f07b9cb2f7ccc09f0c4fa0a37186fea07312 SHA512 006378f1882b424be37282753543b1c562cf4fbfd298368c37c3944aca1ec611bb6a2058e7cb6c59278ba9488dded3b6b83a90e00a3c72b5c2b221bb5e06ca5a
+EBUILD r10k-3.1.0.ebuild 1096 BLAKE2B dc9c736609bad40702eea4b23c93c1979d448ab1d5906ace81b855ae19f8087e245e1238bd3635827c4af2128d7d2f44819f864d0e4bd9a66ce13e2c7669083a SHA512 d193f72c3ebd4b0d809f93dd521900c638731f3d01993bc82639e1a5a067cd3b8a6a7710c7eb07188df898a17525fd67c493c515168cb9f53c508fe4b86cb922
 MISC metadata.xml 582 BLAKE2B e3b514385b7b851b3ce037de51024108005224c75fba470db28fe6e4d6b3632ace21a8e829198e0b22d1ba0e76b1a5c01df10426ea497ec3b00e20e578608d2d SHA512 fb8913a9f806ac0b2035dc788ee78536fff96ffb635454f668d7836d8ba849fea158e628da12743c1844b658961866b3d64e8faf700c7e373065045175785536
diff --git a/app-admin/r10k/r10k-1.5.1-r2.ebuild b/app-admin/r10k/r10k-1.5.1-r2.ebuild
index 26d06ae24c0c..ff43d400d34e 100644
--- a/app-admin/r10k/r10k-1.5.1-r2.ebuild
+++ b/app-admin/r10k/r10k-1.5.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/app-admin/r10k/r10k-3.1.0.ebuild b/app-admin/r10k/r10k-3.1.0.ebuild
new file mode 100644
index 000000000000..c03f18e4e6a9
--- /dev/null
+++ b/app-admin/r10k/r10k-3.1.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+
+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*
+	>=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.2.8
+	=dev-ruby/puppet_forge-2.2*
+"
+
+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/json_pure/json/' \
+		-e '/cri/ s/2\.6\../2.7/' \
+		-e '/systemu/ s/2.5.2/2.5/' \
+		-e '/faraday/ s/0.9.0/0.9/' \
+		-e '/semantic_puppet/ s/~>/>/' \
+		-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/sagan/Manifest b/app-admin/sagan/Manifest
index d7072151a276..9658b9a2beb7 100644
--- a/app-admin/sagan/Manifest
+++ b/app-admin/sagan/Manifest
@@ -1,10 +1,12 @@
-AUX mysql_check.patch 944 BLAKE2B 81fa58f1d60d81c6ec8c9e5b2f4d0a41aa67f51792f439205fb4a9016e989fc58035ac9878c27043aff8512ee490108e79b7627e052e1a222494a43d8b7a1475 SHA512 5758990b9c85a73d38c00d03a0ff9812e3ffe18a8831daebc01329c2db9253d75467b341aeffe563adcbd4fc907c510991ccf2e9bd8d9c6e7b6b353e7d2a4412
+AUX mysql_check.patch 937 BLAKE2B 26cfacf66fdc336c8ed3dec23776c30797bac1382b40fe0955f9640b314b3f1e9b035b677f3d8f0aa6ba706a135f759be2d7ae9505dcc654f176638da77a97f2 SHA512 3de16b396e85f658cf10b775795a0ea1adaf609dd26900d6cb27c055a2402b820c8b8c7bf80696bc3186c8435c6ad71b05f593b8f055b237915a06168c60761b
 AUX sagan-1.0.0-liblognorm-json-c.patch 2840 BLAKE2B 569957ec95bf5fc5bb1e844ba1d5f6a1c68415bd877551dbef03c62afbe66cde528fc4a2b80c3ca5faa92a3e97d2824a0e77b54add21e4a8092f6022b3e4c273 SHA512 1aa092351d317c373416a98ca6bbab19a070e43d0d4b82fe6dd1ac5a7cbb67741247ca2655e905a682ef5527fbf139c70a469a960be1dfdaa05c643a9749a4e9
 AUX sagan.confd 239 BLAKE2B 2ca76c1bd5bdb7b29f007a4d93602f020f76b10d6e4313e138e09b49de0b0c6796bc729f32e88831881bdcd52637bfb3a8e42481d89a09648a2833a000570ace SHA512 7ee746984d3bb3361e3155860d54e307f9b94b9e3f98c09c29b4259cd37d7aefe969b5b942c04048328ec23265a2689b22403c32e3552b8062201aca2ef3ac34
 AUX sagan.init 432 BLAKE2B 561344909a8f6610504f91bf72ba6fa89ac03fdacacd3189372f466b690b3421c3f1a8ce4750b747c53613c75f9b61696ec7b3c490597eb0eca36ebece23a26e SHA512 c5ec82e48ac33785a0e63deb6b2079e97a2f9b5f96682ccbf646b4deae5782cbceb5756b17fdff7af8cafd4e561e298d842c4c4f4aa5229ccc58f5f0fc06e6f7
 AUX sagan.init-r1 424 BLAKE2B e6fdd676e772d2abfca02215026a95321edecb41fcbeec3aa45afe15abd667e323ec2f21375d41c692b9648017002c0b410d551034dcbd3f060f5bb1e2f95026 SHA512 341754a9b18fa4b4082a852cec2eaa5ea78be33eb9d8cdef5b7ec61a9d67d3b264b2c6a2aef030bd85d3644539447345c88fd23ebe99145e40f990f565706809
 DIST sagan-0.2.3.tar.gz 231774 BLAKE2B b385a4b22f2fe7567dbb0c52ec022794eacf057a0dc797daa0432ef4bdfc344473a500298825f56a32513025e9c7cee3ff70fc577d7a9454e87022510a71edb4 SHA512 2110f3d34db69cb5c453b8e37d06debeea7531ebf15a9b78954ac1657ddce34feaaff87d14695759c3deb2eed5ecc0e6fec5881fb5037af8efa6c3c9600242cc
 DIST sagan-1.0.0RC3.tar.gz 285207 BLAKE2B 7322ffc73a8e86f07ef106b04feb9140ba94a51b9e286ef0c0b0d3fa609e8e03cef4c75e1d32502c1b70a4c078d8601d2a1c58058137bb793c8a52cecc4be20b SHA512 29388a339b290bb4de2359c0c54b9e1d43ef207b223a499a1a4faa36de4d9590a777a796dd773948e995d052b71f3ef47ca5bad5c133116c4dbb53b4fe336123
+EBUILD sagan-0.2.3-r1.ebuild 2036 BLAKE2B e6c21884fdcfb2facbd58710bf392a8f1035fa1b618a0e681b36ae8cbe5c15c4f4a7bcd23688b78ec54741bc0cdd7f20c3be49f20b0f9b9f5c847ee85944941f SHA512 480306cf980503d7be31af758a4ea1f9e4b7d8179b9aa0f2fc4bcbf3be78b5d16c9cf900b07daf3bb1c5fb94ce73e4c78ed6da8ac0f423d5339d9d334786ade8
 EBUILD sagan-0.2.3.ebuild 2024 BLAKE2B c3d9db48c8aa738f812ce22b5c3c1ab4ed436b8130480a30f7daad2f64dca7d425fccfec0668c96bcd18ee2fd5a4f3b49b8c1f785eaa9d4030c8865f0327cc69 SHA512 892c84a08c01258e6cafb52c8e5b12fcd38b4644c9160645baf39cf37dd1e270b951e9dcdc8aa1c720445b89f9848fb3905cbe7b806ad4e292be3f0f1d72be40
+EBUILD sagan-1.0.0_rc3-r1.ebuild 2248 BLAKE2B 602ea4352f8a83d55c53e26136d44613f6fce83bb8adfd40d58a1bd5c0da57b3dbadecb723f37680b7def468729c30fec1e9fad28801ca5b322a14a5dd814115 SHA512 0739f9f740e3468b848a1e446ad22f2bf1e0fe988a0a0a56873ec26284fc3cde41eba8aacc2233679706b2d9730a4fe2c1588be5f456ee0a52eb15fe96528732
 EBUILD sagan-1.0.0_rc3.ebuild 2080 BLAKE2B a82272fc36cbd9eafa62cf7da9bd0b412c06f4d235861be44be21fd811fddcbe299e75dcdd56370787a3f9f35c47592a3dcc2d9608457e532ce1c0ee3dc68c44 SHA512 3dcc104b0f36a134cc0217c7c5f6373d13a6b479f8f97545953b8c551d28c330515176914c9f3447211a5c6882c68b90e656e53d61a9221489e1229f6302344f
 MISC metadata.xml 711 BLAKE2B 19677ce6a88bd62ae22cc1383a8f671082c0f2b844d3e75344e5ff3aa01bc51e4826b3c02f30221af0f9b2b620e9bc9ccb2a6c55944d1b34de072c7f985531eb SHA512 0ddee4d50afea4e3813b9ffc57d444b95c56773f58a469e28d99a85bda787143a23f4adae995632283b2ec5269cbe38e3ffecd294448c675169c4ef10033afb6
diff --git a/app-admin/sagan/files/mysql_check.patch b/app-admin/sagan/files/mysql_check.patch
index d2247aab571e..37f7d61fa0c8 100644
--- a/app-admin/sagan/files/mysql_check.patch
+++ b/app-admin/sagan/files/mysql_check.patch
@@ -16,8 +16,8 @@ rename to configure.ac
 -	AC_CHECK_LIB(mysqlclient_r, main,,AC_MSG_ERROR(The MySQL library libmysqlclient_r is missing!
 -If you're not interested in MySQL support use the --disable-mysql flag.))
 -	fi
-+	LIBS=$(mysql_config --libs_r) 
-+	AC_CHECK_LIB(mysqlclient_r, main,,AC_MSG_ERROR(The MySQL library libmysqlclient_r is missing!))
++	LIBS=$(mysql_config --libs)
++	AC_CHECK_LIB(mysqlclient, main,,AC_MSG_ERROR(The MySQL library libmysqlclient is missing!))
 +fi
 +LIBS="$save_LIBS $LIBS"
 +
diff --git a/app-admin/sagan/sagan-0.2.3-r1.ebuild b/app-admin/sagan/sagan-0.2.3-r1.ebuild
new file mode 100644
index 000000000000..99142b741816
--- /dev/null
+++ b/app-admin/sagan/sagan-0.2.3-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit eutils autotools-utils user
+
+DESCRIPTION="Sagan is a multi-threaded, real time system and event log monitoring system"
+HOMEPAGE="http://sagan.quadrantsec.com/"
+SRC_URI="http://sagan.quadrantsec.com/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+libdnet +lognorm mysql +pcap postgres smtp snort"
+
+RDEPEND="dev-libs/libpcre
+	app-admin/sagan-rules[lognorm?]
+	smtp? ( net-libs/libesmtp )
+	pcap? ( net-libs/libpcap )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:* )
+	lognorm? ( dev-libs/liblognorm )
+	libdnet? ( dev-libs/libdnet )
+	snort? ( >=net-analyzer/snortsam-2.50 )
+	"
+
+DEPEND="virtual/pkgconfig
+	${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog FAQ INSTALL README NEWS TODO )
+PATCHES=( "${FILESDIR}"/mysql_check.patch )
+
+pkg_setup() {
+	enewgroup sagan
+	enewuser sagan -1 -1 /dev/null sagan
+}
+
+src_configure() {
+	 local myeconfargs=(
+		$(use_enable mysql)
+		$(use_enable postgres postgresql)
+		$(use_enable smtp esmtp)
+		$(use_enable lognorm)
+		$(use_enable libdnet)
+		$(use_enable pcap libpcap)
+		$(use_enable snort snortsam)
+		--disable-prelude
+	)
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	diropts -g sagan -o sagan -m 775
+
+	dodir /var/log/sagan
+
+	keepdir /var/log/sagan
+
+	touch "${ED}"/var/log/sagan/sagan.log
+	chown sagan.sagan "${ED}"/var/log/sagan/sagan.log
+
+	newinitd "${FILESDIR}"/sagan.init sagan
+	newconfd "${FILESDIR}"/sagan.confd sagan
+
+	insinto /usr/share/doc/${PF}/examples
+	doins -r extra/*
+}
+
+pkg_postinst() {
+	if use smtp; then
+		ewarn "You have enabled smtp use flag. If you plan on using Sagan with"
+		ewarn "email, create valid writable home directory for user 'sagan'"
+		ewarn "For security reasons it was created with /dev/null home directory"
+	fi
+
+	einfo "For configuration assistance see"
+	einfo "http://wiki.quadrantsec.com/bin/view/Main/SaganHOWTO"
+}
diff --git a/app-admin/sagan/sagan-1.0.0_rc3-r1.ebuild b/app-admin/sagan/sagan-1.0.0_rc3-r1.ebuild
new file mode 100644
index 000000000000..4156492fe77b
--- /dev/null
+++ b/app-admin/sagan/sagan-1.0.0_rc3-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit eutils autotools-utils user
+
+DESCRIPTION="Sagan is a multi-threaded, real time system and event log monitoring system"
+HOMEPAGE="http://sagan.quadrantsec.com/"
+SRC_URI="http://sagan.quadrantsec.com/download/sagan-1.0.0RC3.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="geoip +libdnet +lognorm mysql +pcap smtp snort"
+
+RDEPEND="dev-libs/libpcre
+	app-admin/sagan-rules[lognorm?]
+	smtp? ( net-libs/libesmtp )
+	pcap? ( net-libs/libpcap )
+	lognorm? (
+		dev-libs/liblognorm
+		dev-libs/json-c:=
+		dev-libs/libee
+		dev-libs/libestr
+			)
+	libdnet? ( dev-libs/libdnet )
+	snort? ( >=net-analyzer/snortsam-2.50 )
+	geoip? ( dev-libs/geoip )
+	"
+
+DEPEND="virtual/pkgconfig
+	${RDEPEND}"
+
+# Package no longer logs directly to a database
+# and relies on Unified2 format to accomplish it
+RDEPEND="${RDEPEND} mysql? ( net-analyzer/barnyard2[mysql] )"
+
+REQUIRED_USE="mysql? ( libdnet )"
+
+DOCS=( AUTHORS ChangeLog FAQ INSTALL README NEWS TODO )
+PATCHES=( "${FILESDIR}"/${PN}-1.0.0-liblognorm-json-c.patch )
+S="${WORKDIR}/sagan-1.0.0RC3/"
+
+pkg_setup() {
+	enewgroup sagan
+	enewuser sagan -1 -1 /dev/null sagan
+}
+
+src_configure() {
+	 local myeconfargs=(
+		$(use_enable smtp esmtp)
+		$(use_enable lognorm)
+		$(use_enable libdnet)
+		$(use_enable pcap libpcap)
+		$(use_enable snort snortsam)
+		$(use_enable geoip)
+	)
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	diropts -g sagan -o sagan -m 775
+
+	dodir /var/log/sagan
+
+	keepdir /var/log/sagan
+
+	touch "${ED}"/var/log/sagan/sagan.log
+	chown sagan.sagan "${ED}"/var/log/sagan/sagan.log
+
+	newinitd "${FILESDIR}"/sagan.init-r1 sagan
+	newconfd "${FILESDIR}"/sagan.confd sagan
+
+	insinto /usr/share/doc/${PF}/examples
+	doins -r extra/*
+}
+
+pkg_postinst() {
+	if use smtp; then
+		ewarn "You have enabled smtp use flag. If you plan on using Sagan with"
+		ewarn "email, create valid writable home directory for user 'sagan'"
+		ewarn "For security reasons it was created with /dev/null home directory"
+	fi
+
+	einfo "For configuration assistance see"
+	einfo "http://wiki.quadrantsec.com/bin/view/Main/SaganHOWTO"
+}
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index db8618261711..6a53c273d175 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -2,8 +2,10 @@ AUX setools-4.1.1-remove-gui.patch 890 BLAKE2B 70c7a7fb4b6bb31d8735d4b938ff84800
 AUX setools-4.2.0-remove-gui.patch 988 BLAKE2B 8ba64a764292e2309fc27bdd8595bbe10c644642bb59b66b4423f50a077aac372c63da31a231a27940eb624bfea7de2f5ca305f9cc9b162d56d40f9f4ff4bab9 SHA512 e1f2216b14523a7033ebf3293646909df3be2756280186c5d8e6b1c01c7246663732c0f27c949bdac218749bb9631b47bdd82b7457a051df2380254021df4b95
 DIST setools-4.1.1.tar.gz 461649 BLAKE2B a753718aa6a5de889ba7a2eea921340061edf1bcb0b572a365e858949a92d2f8a92a876be2e4bc539d85fa6029511ab6afabfbe8138cdb5a73b587a9b58551bb SHA512 2e55a3b07e2f94d7c84054f31d266567b9acc708fe2b0e16ac3ea24e8301c712bcf564ff915a6135a1a6ba6822682bb3a6530dae20161a832fb7048364acbd04
 DIST setools-4.2.0.tar.gz 363802 BLAKE2B a57a7d565bb6e91f67cba0516434d8a0d3635d0717e878d8ac43b6cf7de0884ea74152ec50e93554f7d1a75a4098db2241668e1765e7b069d23b6cc13d4b712e SHA512 b51f458f7f2d1b569f63478f53709268615f711104915cc2d5031b2049435e4f43a103ebe50c9797ebe4b2645bf1974c73c2f53e7f602ae03c47221edb89d680
+DIST setools-4.2.1.tar.gz 365096 BLAKE2B f415ec15ce7caade2a511896c6027720ecd8b4fae938d9dee1e0b677388966557b9615503df58dd6057f5c0ef81690f753f3e1af773ef5fd8095b29aca0ab249 SHA512 7d00295fe7ff16e96e15266807f8e0a67cc2978f9051cd85afb9ee71ca7fad16ccf7421a4a163bb793950bc20a44f3cbb8409b4e0642d0f96cf7a3df7bc59c31
 EBUILD setools-4.1.1-r1.ebuild 1460 BLAKE2B 3f1b952af9d7151a1729106e23f22f1e5c5a863afe6c84124429989ccba5d2e46abbaffac809dfee51b0876332dc70242d971016bd7af4b90ae9b3d903c1a0af SHA512 ea755596d4924c9e959cd37c6815f981af107fdac766285c36148b4dca32a6ec24f1e0688a4589e732b70374ce2f6ab0ff637da11979d13526717b585b89c0d5
 EBUILD setools-4.1.1.ebuild 1488 BLAKE2B 462d30b33838dc2c548baff9bb32ca2f978df8a62d5a6e936dfc3bab4dd2522513a90635d64244c6750587cb061380a92a4158bc8e38bddcd2065987463ce9ca SHA512 074263f51282f81cd723ad261c286d46a93a8e13be2fec152adf61a8618685ad43460751d152077d22f395ed854d3362d49c47476ff1fc8b92fe1b62d7351fe5
 EBUILD setools-4.2.0.ebuild 1201 BLAKE2B 36b9bab96ee7db94c4627a4d0579dc7b8ece8979515d15f83e002c8048d9da5577a0574777b9ecd13df62f112486c901d2312464437d64e42ce16ccc1c82c513 SHA512 fb723880d5473e437636774909cb5c98910aa3a3764f87c4ee8a4049377dad98f38163e314d5b08851ac75332d967c529329b291aba1e375806c39af4607739c
-EBUILD setools-9999.ebuild 1201 BLAKE2B 36b9bab96ee7db94c4627a4d0579dc7b8ece8979515d15f83e002c8048d9da5577a0574777b9ecd13df62f112486c901d2312464437d64e42ce16ccc1c82c513 SHA512 fb723880d5473e437636774909cb5c98910aa3a3764f87c4ee8a4049377dad98f38163e314d5b08851ac75332d967c529329b291aba1e375806c39af4607739c
+EBUILD setools-4.2.1.ebuild 1201 BLAKE2B 2244435edf3e51f5727b6fe188462aedb64b68624a6d02ce32e48bd7c01e4a79db17d4f627d91a886c75803a92d005278ba8eda9bab777846718b3bd2a4c9049 SHA512 c5330e616e4d211754650994c65350137fc6cfd5f0be16e2f3cb295127c081f37946feb283713a7726462d0b367023b63f3051a807e2b24c78758009630613bb
+EBUILD setools-9999.ebuild 1201 BLAKE2B 2244435edf3e51f5727b6fe188462aedb64b68624a6d02ce32e48bd7c01e4a79db17d4f627d91a886c75803a92d005278ba8eda9bab777846718b3bd2a4c9049 SHA512 c5330e616e4d211754650994c65350137fc6cfd5f0be16e2f3cb295127c081f37946feb283713a7726462d0b367023b63f3051a807e2b24c78758009630613bb
 MISC metadata.xml 401 BLAKE2B dc411a73d59193727d72889e4e5f3840aa9cf7b1b6ef55f28ab6a6beee533276954e27fe105a60c392c49ac761745304865c221ff9417464112eb866f35bf6e9 SHA512 354eb8fc14e5673dfd6ad2781a784cd6d77442bf879a96c206b758615c1612397c09c20161efb9e37bc56a588e97a74a20939773dec0b1f137eb6ac353234d2f
diff --git a/app-admin/setools/setools-4.2.1.ebuild b/app-admin/setools/setools-4.2.1.ebuild
new file mode 100644
index 000000000000..8df9cb7cd407
--- /dev/null
+++ b/app-admin/setools/setools-4.2.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Policy Analysis Tools for SELinux"
+HOMEPAGE="https://github.com/SELinuxProject/setools/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git"
+else
+	SRC_URI="https://github.com/SELinuxProject/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="X test"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
+	>=sys-libs/libsepol-2.8:=
+	>=sys-libs/libselinux-2.8:=
+	X? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)"
+
+DEPEND="${RDEPEND}
+	>=dev-python/cython-0.27
+	test? (
+		sys-apps/checkpolicy
+	)"
+
+python_prepare_all() {
+	sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
+	sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \
+		die "failed to set lib_dirs"
+
+	use X || local PATCHES=( "${FILESDIR}"/setools-4.2.0-remove-gui.patch )
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild
index 70e0fb4bed29..8df9cb7cd407 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/app-admin/systemrescuecd-x86/Manifest b/app-admin/systemrescuecd-x86/Manifest
index d6d3ac047505..6494bc66fa8a 100644
--- a/app-admin/systemrescuecd-x86/Manifest
+++ b/app-admin/systemrescuecd-x86/Manifest
@@ -1,3 +1,4 @@
+DIST systemrescuecd-6.0.0.iso 931135488 BLAKE2B 82879883780ff11a35f2fe635a5ee1a268de590bac79326ac2c49c960cd18755b3c10548d65eb5fb7ce5749c00f5040bb10c5ad5b196e48033fb70e3ff466026 SHA512 9bd8c06338357882fd8e3f17ddfb918e1f69e25fff6460957f9c50d496ccc3d4501e39b4596e3f387e4f7a481c9b33d18ba18fb49d74f6d916a7c5997b24c03a
 DIST systemrescuecd-x86-5.1.2.iso 523479040 BLAKE2B abf6f1e3e05e382b48dcfd4ecde9f70896462418cf36057e3a42dc2366e0b56133deeb6f00363d15d94238c22fb8ac5c88b57ca6c213c9dcc299fa04def5e2cd SHA512 516e60632459dd5408f83035aa265ed4169b13f978a23960a85837c9c8b5bbab70776e22a6e6727184bd9df81cbbeff4a5819d5927ff0ff3a79036bc4c54cfdc
 DIST systemrescuecd-x86-5.2.1.iso 570523648 BLAKE2B 9bb6b2ff7b9930f658baddbf60ef89e86171febcfb48eb0a6ce1bfea8fd3348773a9da948370f9f310dd0e992c40aa64a4ef1442f5cd7f408f847d147074cf1f SHA512 6820f079c9e97ac0d383ed9096a120e7e31771e1d41465f4cf7f5db36a7cb83ccfaae5c5e561181c3b3cb169d4cc4a9a6904a707ecde06a6de4f2456d2a658e4
 DIST systemrescuecd-x86-5.2.2.iso 572006400 BLAKE2B 2cc95acc529ae8e0525664ffbdfefaf6e4513e8135fa6af120121b0b7930b0203bd17d5d70ccafacfe0064bb8615f45aa22b6e6e3fcee8a005a0315fd9b5cf62 SHA512 7dd1ccd63775e35f6589808416468c4a9314f4a7a5d0cb1f2bc34ffb9eef3a450b0da244dfc9e325d828c39404c0cdcce27cc990eade33762c17a1e32f8db9b5
@@ -8,4 +9,5 @@ EBUILD systemrescuecd-x86-5.2.1.ebuild 1588 BLAKE2B 88c93971c0fd71928de91c7d2d37
 EBUILD systemrescuecd-x86-5.2.2.ebuild 1588 BLAKE2B 88c93971c0fd71928de91c7d2d37079ef46537e92abdf7f8aeba30b272325ab3cd889a64f16aef63226bc59dd690ec9b545c0c78cba361a1c156a45560aaab5d SHA512 0a36c0954f88b29305844d133ee8d3171a8be0bbc66e22595daca50568a9ba50d715829d0deec34babeba5791819d89a767c1a197c7efd64b776b3c2f5f1fa5d
 EBUILD systemrescuecd-x86-5.3.1.ebuild 1585 BLAKE2B 2990cf5577fe457ca542e4e1f51125dcde9df4242f13b2ef928a4cf9cb6b3119c27f4c3779aa99e2768c59812dc636492ef61ea0d37d32891907f2a96b6bd49c SHA512 0bab335bdfef131cfc6a8079eda20e85acf81e919811705fdc1dd73b80e1f635e6f061042bab60949a7b295d49c17b4237a049f74ff9cb09a9febd4f6aa125da
 EBUILD systemrescuecd-x86-5.3.2.ebuild 1585 BLAKE2B 2990cf5577fe457ca542e4e1f51125dcde9df4242f13b2ef928a4cf9cb6b3119c27f4c3779aa99e2768c59812dc636492ef61ea0d37d32891907f2a96b6bd49c SHA512 0bab335bdfef131cfc6a8079eda20e85acf81e919811705fdc1dd73b80e1f635e6f061042bab60949a7b295d49c17b4237a049f74ff9cb09a9febd4f6aa125da
+EBUILD systemrescuecd-x86-6.0.0.ebuild 1823 BLAKE2B 6bc4cab4b3a89b14180a3a4cc11e07974004095624f027d176aa425cab3ac7d20e7e6eff897614132c7799811e89cfbb9020f0403fe6dbe9179505fa6683e96e SHA512 ca95f10cc90743b200c98645cbec043028c464e18bb1b88941a3d4f5bc03fb3b4a4176f2e9d3e087912033f4815035bd84703e6d0d4091ddeb54ee28afa4c59d
 MISC metadata.xml 610 BLAKE2B 400c26cbce80747fe88b60d34ea0f018b7119ad6ef333e8de931424aaa929db90ba0836a4520fbe62baa0c7aa9992745c4c082e495f318066acf5285e56dcd10 SHA512 5092c69f83df351b3697ab0c83e165eba5c7ceffd197707047bdd4d2e809ff7267e436e91e3035223beb088c48835ae28fd4032a8122687af116fa1405b30b15
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-6.0.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-6.0.0.ebuild
new file mode 100644
index 000000000000..58953e3649e7
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-6.0.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P=${P/-x86/}
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, amd64 variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${MY_P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+pkg_pretend() {
+	ewarn "Please note that starting with version 6.0.0, upstream has switched"
+	ewarn "to Arch Linux as base of their distribution, and running on 32-bit"
+	ewarn "systems is no longer supported."
+}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${MY_P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED%/}/usr/share/${PN%-*}/${MY_P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${MY_P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/tmpreaper/Manifest b/app-admin/tmpreaper/Manifest
index 0f8f52953ca8..a6cb81459031 100644
--- a/app-admin/tmpreaper/Manifest
+++ b/app-admin/tmpreaper/Manifest
@@ -1,7 +1,5 @@
 AUX tmpreaper-1.6.13-fix-protect.patch 1204 BLAKE2B 8c1b66d939ac8e997272265744873a22a5e5306d8fbec6e56ace78cf4162387c2cb2c2d7372ec62f0e7c99fa954d7e321482d0dbaa75ba6e3ff48a8785277e3c SHA512 7b7f386d8f685e6b38ff3a96030e69a5134016e0a0b30b6841ddc4ae02ae3f90c47388426be98ec35a920e40360aa0cd8662e29d03a765c6ae0209f9907c53c0
 AUX tmpreaper-1.6.13-gentoo.patch 1766 BLAKE2B a619096b159686dbcdaacdbd3bf979f74664f8abb2c58957dec7fcb17bee7c1b5b790f4e7283af9f82fb1f7eac2a76f73c5ec26804c6bd799643d553fb56be17 SHA512 0086ac04a352bd35ce9e95576816fc324011bfff78cfa089828bf3befb8b183ae2213be9759422ce1f9ddd1cb26dcdf292b429ffe2d0873a1f6f6577e34c5fc9
-DIST tmpreaper_1.6.13+nmu1.tar.gz 141080 BLAKE2B ad2895e0444e3c1a1ceabf71c34b560a817e7cc274482bde63a07499fac799ef127f5b64c953d43cd11a279819972b63b7e21a683f6250a77eeadc299a491a78 SHA512 c868d421a7757a47b81c8932743981ded2b415c83377f8781fdfd4dfda48c701991da17fa262dfa0680b2a315d6b46ee4c9035ba4c06f5a0c1bc32efa717f19f
 DIST tmpreaper_1.6.14.tar.gz 158981 BLAKE2B 1c9ec124c6e57c0aab5d555594950dda37f06a6404a0d111da05be7a48bf6141e09e942c090d3f79ccf855f958a7b32f0d64c73da68b412da74465e39bdb72ae SHA512 e78fab0cd2cc8c851e2806be70c102697bff86230e181bfad1c76b15fe5455fb431bc0dd16bebf77a2e9bb64b5f5a1474d24254ff780d4d72d343ea0e6e30ccb
-EBUILD tmpreaper-1.6.13-r1.ebuild 1113 BLAKE2B 34be61752588526b7e06cf50b816f049604af02125ac7b3e8b74c12d76afe5282d3f940e75f760b1f50e5be0ae9b4105f408529675957458fd7cc3ba546edc8f SHA512 1c40a66f0fdc5b6cf9406af6b985c8bb32eec4f3f2a21839fd1e87ff57eaff4a85151a1cfd21a5b0e1f61e67fae079b4c37c85b45129c58477fe1f2f2f187be3
 EBUILD tmpreaper-1.6.14.ebuild 1133 BLAKE2B 06c66f570767191ae32c1456db113490a133d86a43b13dab7243e93fb009608162ff17958b1aad86063d4f2190faa579c27cce1b0a1db2749784b00491cdc490 SHA512 4743a15af0c8c3ebed5bb34d1bc905d593d8616d06934377a3dbd3aaf710d2855455d806912f35a2ca130a7a0c157cf8a8f035e1dbec530b34c17fe5a51be3da
 MISC metadata.xml 1167 BLAKE2B 7c6f25158d5a4e3e4586ef1824ccfa233ab52f6695324951ae6de2fbe4247ffd780f2806254066f34029b661c1313b01f0bb2f67ef5f335e95be97f6a9fc805e SHA512 64813b5adc37817c87f5eaa4bed0e725a3b24b2e3edadd27c92c811d13f30c09d6334b0ab18a37b4f028a335b75a5ac43be19073731ce58e35f8528335c6176a
diff --git a/app-admin/tmpreaper/tmpreaper-1.6.13-r1.ebuild b/app-admin/tmpreaper/tmpreaper-1.6.13-r1.ebuild
deleted file mode 100644
index f325a9728446..000000000000
--- a/app-admin/tmpreaper/tmpreaper-1.6.13-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-MY_P="${PN}_${PV}+nmu1"
-DESCRIPTION="A utility for removing files based on when they were last accessed"
-HOMEPAGE="https://packages.debian.org/sid/tmpreaper"
-SRC_URI="mirror://debian/pool/main/t/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND="sys-fs/e2fsprogs"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P/_/-}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-protect.patch
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_install() {
-	emake DESTDIR="${D}" install
-	insinto /etc
-	doins debian/tmpreaper.conf
-
-	exeinto /etc/cron.daily
-	newexe debian/cron.daily tmpreaper
-	doman debian/tmpreaper.conf.5
-	dodoc README ChangeLog debian/README*
-}
-
-pkg_postinst() {
-	elog "This package installs a cron script under /etc/cron.daily"
-	elog "You can configure it using /etc/tmpreaper.conf"
-	elog "Consult tmpreaper.conf man page for more information"
-	elog "Read /usr/share/doc/${P}/README.security and"
-	elog "remove SHOWWARNING from /etc/tmpreaper.conf afterwards"
-}