gentoo resync : 19.04.2018

19 files changed, 128 insertions, 240 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index ad0e4e373147..f2011147815a 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 2bbe3f355796..89362df1cf60 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -2,10 +2,12 @@ DIST ansible-2.4.2.0.tar.gz 6503595 BLAKE2B df4ec4e24671f1488950f2d9eb7705fbad4e
 DIST ansible-2.4.3.0.tar.gz 6511115 BLAKE2B d43679c651f6aa5fd86c797a204645a8ee98efbcde9abaa25385aeb6f1d7c8b4ad74185434bfd159dbf673fe9339ef8f915f78238f8b8a5caf924b54cb9bdd52 SHA512 a7cda358c67c519c7e5ba248bf47070f21a27203fb29d70d9d75ecf027ba1275d71c0f96493e047281211d172a3be8273d7e08144446284695fb0bc8b94daa82
 DIST ansible-2.4.4.0.tar.gz 6512938 BLAKE2B 51e397d2242209271a8aef211c3bdeb34a15e2061a202415749ecb4232e0521aff304d5585d536b1805f14ff476b0733d559eeabe6e44de7b273b8606b11b805 SHA512 f0dcf92f2c69931fa06e6dd3845c11592d5a7e44f19a99c4d6c361022708560170f2b74ad20eded61fa5812c90eed281b78396aa92e0b33717970afb5966dd72
 DIST ansible-2.5.0.tar.gz 10073927 BLAKE2B 00e5d4245b7ea89a3826a3ab25c880c3acfdb713a045b9583dcc7fe913673954f1bee31d10a5125a8c386eca8d478ca807e44466a4c2729cfb571323836d5353 SHA512 93dee0404c5de0a9c8c5b8987f1fb2dbacceb848e8d5b4c70c5a6692d6fe8e9d4bec67d592071346f458b46b9ed2d800609a080d7d4b16266943f32d56a19220
+DIST ansible-2.5.1.tar.gz 10100358 BLAKE2B 39831c6ed49360e905ac8fb8d9ad7520c0bc16b5dbe19103c5349cb5d6fe30c2c3212f08f15a7877692b2a9a2ca3e1ab8e5580bc9919f7c2d96f7b07ae45f1e2 SHA512 d5ed9ba4bb514b79254a79a89d1572e80c5cfb1db2a67a980184aa3c26ff407f5c5c9bd0efa24f0e00af451d955f3b0d8d9ad3026be71ba7ad12487a1631ad9a
 EBUILD ansible-2.4.2.0-r1.ebuild 1408 BLAKE2B acca3919cf1cf8240b4d4cad16ad41b61cf7d6af7c4adefd81c404dc538d1bf75b97dc3e4a87ba38b1e4dd7e3cbf3b319144adad083b1e813492322cc179baae SHA512 cdf8791066fc9b72bf1c1dd3a3595c2901f71e69b24a163f2b6eb100a410d5bfc942a76cf92a5fc2d730eecd57028165eed3c4e3330ac06f1975c7022b6d904b
 EBUILD ansible-2.4.2.0.ebuild 1447 BLAKE2B fef57c75e03546d508eba962d556823db77a09b229031dd84e3f86d3db428da1bfd661a4d68ae35ef6244aa6057e1e37461aa6d35f5b986d29f80c16a97ecdc0 SHA512 3f42adbb76f6519dcfb90899331956f9767b1fb4361f0f02d954c047f56ac6cf13fe4d5bbfb733db30715f18b529f80182d1a1e54c97f7b8385d6112c0efbbb7
 EBUILD ansible-2.4.3.0.ebuild 1406 BLAKE2B f2c87ce03b3c4914087b0401485a07f7b3287ebf62a4d0b7acaa7b9c06bd670c0f91bf2288edbbd45ab577403a1b85de2733c0a3fced85c99720ae8f7848ed46 SHA512 b4d4d40758c6f638f07480af76ff2cdcebe787276c27c23b3e046841ecfaacac83845c14bca352ed603c15a3fff4eb19ae53c990e7fa2662d5b5822890091a1a
 EBUILD ansible-2.4.4.0.ebuild 1408 BLAKE2B acca3919cf1cf8240b4d4cad16ad41b61cf7d6af7c4adefd81c404dc538d1bf75b97dc3e4a87ba38b1e4dd7e3cbf3b319144adad083b1e813492322cc179baae SHA512 cdf8791066fc9b72bf1c1dd3a3595c2901f71e69b24a163f2b6eb100a410d5bfc942a76cf92a5fc2d730eecd57028165eed3c4e3330ac06f1975c7022b6d904b
 EBUILD ansible-2.5.0.ebuild 1408 BLAKE2B acca3919cf1cf8240b4d4cad16ad41b61cf7d6af7c4adefd81c404dc538d1bf75b97dc3e4a87ba38b1e4dd7e3cbf3b319144adad083b1e813492322cc179baae SHA512 cdf8791066fc9b72bf1c1dd3a3595c2901f71e69b24a163f2b6eb100a410d5bfc942a76cf92a5fc2d730eecd57028165eed3c4e3330ac06f1975c7022b6d904b
+EBUILD ansible-2.5.1.ebuild 1408 BLAKE2B acca3919cf1cf8240b4d4cad16ad41b61cf7d6af7c4adefd81c404dc538d1bf75b97dc3e4a87ba38b1e4dd7e3cbf3b319144adad083b1e813492322cc179baae SHA512 cdf8791066fc9b72bf1c1dd3a3595c2901f71e69b24a163f2b6eb100a410d5bfc942a76cf92a5fc2d730eecd57028165eed3c4e3330ac06f1975c7022b6d904b
 EBUILD ansible-9999.ebuild 1476 BLAKE2B 794681453a56d367c67f048b17091b31d7439d710f2ca81da14a1f913257d8b55f0c7f0a090945fc0fbde63ec7ccf2a6e19bf31d9a953305ec4feac1761e8f83 SHA512 662d09bff2f18205c7698d69f9b07eb831a436bc733794b9767eb9ca25f48fcdea7d924d84051c4e033d4a849fff8507be687509a29ed04145f7a10b19a709b5
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.5.1.ebuild b/app-admin/ansible/ansible-2.5.1.ebuild
new file mode 100644
index 000000000000..573d04b35802
--- /dev/null
+++ b/app-admin/ansible/ansible-2.5.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 eutils versionator
+
+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="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}]
+	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_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 33c3bf50b8fc..6a1bca870e76 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -12,6 +12,6 @@ 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.9.1.tar.gz 79061 BLAKE2B b07f8fd8eb59cc4d6c80441a3b5a8aab090bc13eb8fa5e35b111feb2203fb2c3092daa469e6fec02a29b1d377bca33fbbf5859bcd351a1f4a0d82343c5f65d3d SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28
 EBUILD logrotate-3.13.0.ebuild 2543 BLAKE2B d79fec2304b6b52ec1cc064fc40aed2054edecf4abeb8dbd0d5df7f8bbb27e1a17a384cf4d44042197eac0c8ac7d5e6e888ef689fe2794ae206d946661b6196a SHA512 2f6b6caef77088ff1aee15f8a289f1b3559180034b5f2bfa5520b2c3627bb0f92e0f5555cbe914f4877b50729f84e3ca3f0353c6e1b63442e156b530819294a4
-EBUILD logrotate-3.14.0.ebuild 2522 BLAKE2B f7a463732ecd5a89c0929803ad709a7cc5be7a8552e3e09fe22ccc73ac24620899e68dc54ffb019c3c5ed690f6424c963a9e143319972a322532400993c58524 SHA512 713a0d832db869a8ff8d827c302ac39271ce2451f729e1cbee48fb7fe0cf9d145a40acf5032d9f251fa86f982fa287d6afa010186bc2d12cf899b454202f4276
+EBUILD logrotate-3.14.0.ebuild 2521 BLAKE2B ce2c62f7d4e22a2b6f44572bad573b5603fc90bef23adce04c3d02f01df39b9640387dfa880e489476d0d603f032c1c34aeaed764b2b2d6e8d3dbe7347498289 SHA512 4e66066b70eb978b1190cb6118703650bfb1b017ad386c4891b5f7068c3e15bf54e4c898957c12b4e93fc34da5c7d50309c66c531d78a7957a1d2e9ad6969385
 EBUILD logrotate-3.9.1.ebuild 1767 BLAKE2B a59f23a8a0a24b416f23a087c60fe046260cc24521f68f2551bb2a2821d12e94307e2d620ec4b625cd1b6be21cafa3d2c0f044468dbc2760897e5bb7854ac7af SHA512 ed808392727749efb6d20a410810f6eb9cb364db2e11460f4c2940abd0fb1d7430b75102f2fcabcaf64e8818da39323010d2a5d223df49c705a6171acf541a03
 MISC metadata.xml 1119 BLAKE2B ddb2266925506c260c4b3f67e4dd906d9446a17a54b5a0ffce547d3c942750ead45dd1cfdcbae548a096d87ee1e247fcda9bcb81e83b829f0526d4bfd7b4a01d SHA512 99725d54d1cf68b257446ef8afc43d4bfe05cc789c818222d603012ae1e636624962c23a845f8858f4fc7aaf5a7e7f8085a7b173185ba66d7e390012dbceef79
diff --git a/app-admin/logrotate/logrotate-3.14.0.ebuild b/app-admin/logrotate/logrotate-3.14.0.ebuild
index bf1a09bbdb50..a1587e04c660 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 ~amd64-fbsd ~x86-fbsd"
 IUSE="acl +cron selinux"
 
 CDEPEND="
diff --git a/app-admin/mcollective/Manifest b/app-admin/mcollective/Manifest
index 4cf35f7bf13a..63e2b368d088 100644
--- a/app-admin/mcollective/Manifest
+++ b/app-admin/mcollective/Manifest
@@ -1,6 +1,8 @@
 AUX mcollectived.initd 497 BLAKE2B 1fe966f49117f9ea1b8c8ca4f5c92d5ddd7f8fb28658e4c3b016c193b69d1c42d35da85ace176279d09778c12fcc664748ea743c9b88219cb0fec2292ca867d4 SHA512 dc77a522e3ab6af3e23c559bfcb385033f2200b58b50db59000e7f56b2a789e8fbd83340f8ee494a1a9fdbdd1bd737a2b17ae4743823794264723fdc931ea6b0
 DIST mcollective-2.11.4.tar.gz 1517194 BLAKE2B 8723d433e4b8e07b4aecd8c9d13c322ba3e3b6cb7153dbcbbc2e2463fe0ddf48c7b1c1d659e8a28278bb2fa4ec6b3da2f148117b3633b8148f9ba5a0aaabc4b4 SHA512 56af0a8b64ff75351f3448396f8a7cbba603869cdbfa7a97dde5a820e2e287c84e410a77469a3ce01f398858f5c6570c9e3542e372eaa00e3f54e68e3c1ce63b
 DIST mcollective-2.12.0.tar.gz 1517498 BLAKE2B 0395cf027ad09e493387d6722112871ebd58def45a5a333dac801c643b989d0bb209489806123bb15a557fb6d690e0084dda2799512079ac1a599ddc664189b4 SHA512 ca3e3c6d58f7887e9564fce2ecb05b3c105f58401761082e7e7da5235166d722be9d3dc871cb8de14b7c9126fbc6e63f968c5cd1fd65701347323398fb1c56fd
+DIST mcollective-2.12.1.tar.gz 1517946 BLAKE2B 785acc53a4854f47caebe1d6a5f9cc850c3c33fd21e1b6e57d0d9761b2a7a3bbab2f2df398aa5344d90bc11397a545c8663d60ff3b2f6ff835fdc619d874928e SHA512 2398fb0202d8d5669a6efa81d96a87ee7e9221c1bc1b2e5be1917f2fec2527879b34be8df8c3052acf0ed58074b2da185f0837889d9300bde190bc95e8237d9a
 EBUILD mcollective-2.11.4.ebuild 1641 BLAKE2B 57d13dc26a9a1dc56591996ef558656cefe53001ead0d8fc4038db875d7fb598a474a370a23f03d247e19dd5358c136b6b0d3208b96aa2155cad84b00dee4080 SHA512 a699fb934af4b660c55ffb0d216e29d3b995601c1187e166e878fdbafd46ea7cea4e4951a1052139d115f00de1a38c990495715047f2c0ac13926b2fb613a25a
-EBUILD mcollective-2.12.0-r1.ebuild 1651 BLAKE2B 07e64dabd5c6c172f7c98fcd85f811c4dae62978d56d00b00229443947709194465c2738489d03ce542cc6dd9028ba722264881112882241dd085c3e505d6f6a SHA512 9189d3cc3ab5f5e937f8a76a24fe6d00ab454d57ef17bb5e00ee79cfe0d5aa9d06bba21298b8afc037257841d3a01efa2d851fdaf1d4679837b24b68ccb70676
+EBUILD mcollective-2.12.0-r1.ebuild 1649 BLAKE2B f749a108b88c1cbb668129ef4665aa2738ceaed8d4cd70b5ba80fe322bbefbc7543ca838bce92492dc6625dec52b2c7ca5dd7f338c64f38de7b203d185451bb0 SHA512 e366674680d6cc7ccb8923b7c0bc2a0dcdbafd91ae9860b2b62f65985898b91deec56f0606694aaa27bd8ccfc9c9e0053ca0162a34798907b137f10ab99c4b67
+EBUILD mcollective-2.12.1.ebuild 1651 BLAKE2B 07e64dabd5c6c172f7c98fcd85f811c4dae62978d56d00b00229443947709194465c2738489d03ce542cc6dd9028ba722264881112882241dd085c3e505d6f6a SHA512 9189d3cc3ab5f5e937f8a76a24fe6d00ab454d57ef17bb5e00ee79cfe0d5aa9d06bba21298b8afc037257841d3a01efa2d851fdaf1d4679837b24b68ccb70676
 MISC metadata.xml 534 BLAKE2B e8866ac769b65ccc61dfe79fe5883bee78ea4066187b7136b899a1a16fa74952f88fd2b81376033d36418dc670d5669d9b65fc3195720ad95adf30bfe49729b1 SHA512 e94dd85f11b4f8b838e928220cb887eeb70860e6d04f03e904ddd4332baddd3b01221305e7229fb575585235436d0d942c116f821ef37adae636a7d5c6193199
diff --git a/app-admin/mcollective/mcollective-2.12.0-r1.ebuild b/app-admin/mcollective/mcollective-2.12.0-r1.ebuild
index d916d675849e..bda2a9017f8e 100644
--- a/app-admin/mcollective/mcollective-2.12.0-r1.ebuild
+++ b/app-admin/mcollective/mcollective-2.12.0-r1.ebuild
@@ -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/mcollective/mcollective-2.12.1.ebuild b/app-admin/mcollective/mcollective-2.12.1.ebuild
new file mode 100644
index 000000000000..d916d675849e
--- /dev/null
+++ b/app-admin/mcollective/mcollective-2.12.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby21 ruby22 ruby23"
+
+inherit ruby-ng
+
+DESCRIPTION="Framework to build server orchestration or parallel job execution
+systems"
+HOMEPAGE="https://docs.puppet.com/mcollective/"
+SRC_URI="https://github.com/puppetlabs/marionette-collective/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/all/marionette-collective-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +client"
+
+DEPEND=""
+RDEPEND=">=dev-ruby/stomp-1.4.4"
+
+src_compile() {
+	einfo "nothing to compile"
+}
+
+each_ruby_install() {
+	cd "marionette-collective-${PV}"
+	doruby -r lib/*
+	insinto /usr/share/mcollective
+	use client && dosbin bin/mco
+	dosbin bin/mcollectived
+	if use doc ; then
+		dohtml -r doc/*
+		insinto /usr/share/doc/${P}/ext
+		doins -r ext/*
+	fi
+	newinitd "${FILESDIR}"/mcollectived.initd mcollectived
+	insinto /etc/mcollective
+	cd etc
+	for cfg in *.dist ; do
+		newins "${cfg}" "${cfg%%.dist}"
+		sed -i -e "s:^libdir.*:libdir = /usr/share/mcollective/plugins:" \
+			"${D}"/etc/mcollective/${cfg%%.dist} || die "sed failed"
+	done
+	insinto /etc/mcollective/plugin.d
+}
+
+pkg_postinst() {
+	einfo "Mcollective requires a stomp server installed and functioning before"
+	einfo "you can use it. The recommended server to use is ActiveMQ [1] but"
+	einfo "any other stomp compatible server should work."
+	einfo
+	einfo "It is recommended you read the \'getting started\' guide [2] if this"
+	einfo "is a new installation"
+	einfo
+	einfo "[1] https://activemq.apache.org/"
+	einfo "[2] https://code.google.com/p/mcollective/wiki/GettingStarted"
+}
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 77eec9295db1..1f2538877565 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,10 +1,10 @@
 DIST sudo-1.8.20p2.tar.gz 2930769 BLAKE2B 90338e7d436683f94a9e13e9f0da668f2bbbf2184530feb63166186309881b737b783d2be80f935e5d64fd2a4264928423d2b754121be5caf07acbacbe2a6d42 SHA512 8bf67e687f7a84605fdef8d547b5cd661141b6c8fd25820c33c7e37e97ca7f21f564c3bae691f8a8cd08df7d80338e36a8f06bb5086cc104509d71d6ab1bceda
 DIST sudo-1.8.21p2.tar.gz 2976081 BLAKE2B c0b555879ddb6832c6396b557793f5d4783481fca5d721901c7ef81c1856c1cf7630fddd09bbb42207c27d51892a79c2bf5c653b5b5091ebc84f2d59981207b7 SHA512 f04bbff54ad74ba73c078e15c75d2f41332d4912078ed66157ba7346b7fff914bd0747460cb4cd0c472af2d3b344fa72f5c62c95169df68a9cac74d7245c720c
 DIST sudo-1.8.22.tar.gz 3029051 BLAKE2B c77e05b6e9cee738902d6289327fb5d34d19833d96597f983d8af01434d224dd698f9257b0965a0e480e8d19eb38eef0c8216942ca5217c3fe7516cdf397f7b7 SHA512 5ce10a9302d25bb726e347499d26a0b3697446cfcdf0fd9094ee35198db7b023d5250a53fdcb4184d1a09f5fd2a78fc645bc8e80f265666b05a91f62f49b0695
-DIST sudo-1.8.23b2.tar.gz 3078589 BLAKE2B 4d3a003d168ef27382ff77d656c82ff830a53e402f4f717ad5fdde9eb1619b1d4af453d2dc9534b7206665d8a89e710a10b6f1343b5242e6a182737436365ddf SHA512 0fe984db67c3589b501c97cabd3e4a006bf6364f3397c73a46b34a14055226225416c2aee08a5fc60f5ac06e50a8fa1db9ed8ebf3c76989870e84457ea84e356
+DIST sudo-1.8.23b3.tar.gz 3123480 BLAKE2B 959c013daa34de710e2701d932e0d22162035b380a6cb91a5bab8438916e4ea360a20b388fa4303d82049b1935f942e2aa9e2a8e06ffbcc18f59378b06a8fff2 SHA512 ee1b93f5729e1000c13519ef716b22399884b029f4b1ce79420f8a1fe71b5456c37a475c6217397717d383d8bcb3896637673cc11bf7610d29a2c7cf798c1de4
 EBUILD sudo-1.8.20_p2.ebuild 5739 BLAKE2B bd58250f5cf45c9a6480152ac0ceb11b628c5c6e05ba663b9c277c8f082b48de4be179a437e43de2f8c81d191a98840757387e655b0c2a04d4aec2827188be0e SHA512 cce6c399221a53baba5ab12c83c833c3a350ded0ca0a7144fb46b34bccaf323368408f6b4c05b3b1d7cf01563d0f53ff241f15fd553f0cb64c3164bdea052ac6
 EBUILD sudo-1.8.21_p2.ebuild 5809 BLAKE2B 06a01d30fb9642371be1a050d768eb42b011e1eb4f86238a96bfa7187025413badde2d92294411b6622ea55406f3d9aaa1492883706abbd999f42ae8a666ebdf SHA512 2847d70298fae4993128794f4b47dc093f3571f01ba5b1c60d221031b16385ab070b44c7c81dcea862e046bc5f390cda1f9af933c6ec196f7b198a4e7c36fe07
-EBUILD sudo-1.8.22-r2.ebuild 5996 BLAKE2B c39d0f62b5a35cc83b770b650ed90c6166caf976c1866d5166ab02045e181b6dfb7a5e7d789c8237dc9bb29dd243d0829a3f5b94bb2faaff67b4a0f32443bbf6 SHA512 dba017a242af87b476788104f8fb24bb9a98cdee74cb4220c790d135316500db23caf9bd7ee17312f04d66e359454fd41e85e3a9c2e209b64967000061584954
-EBUILD sudo-1.8.23_beta2.ebuild 6000 BLAKE2B 0f271466e3199849d365e2136700e3c2570008fa72054d60a27f84e515596359ccda07683c32defd0091fa7f41fcdfd5dde5f345f8b2cc73a418ac217b29bad3 SHA512 9f5b277fcbbbe9921d8e18b45b9935436e47021ee796a0fb65f3afea980b2d8da47e9ee247acd9da4434403c9d1ef2b39ceb678bf6f82c557328381d5d59bc33
+EBUILD sudo-1.8.22-r2.ebuild 5995 BLAKE2B f4e4fd4ea2136155ca38bbe0fcd402769bb5bc436baaa219acf2d488365a2439fc219197b9ace76a97fd21b81f702118d840a287dd0a284d6ebce3f01d2e58af SHA512 87365c19d5fb4499636d0990e08b8edd73112748f57bd6caf9d100edaa38646ffc03ea590304a05dd3aad27dd221d41cc82b98c91a1a785068a26c5ec6ec4e99
+EBUILD sudo-1.8.23_beta3.ebuild 6000 BLAKE2B 0f271466e3199849d365e2136700e3c2570008fa72054d60a27f84e515596359ccda07683c32defd0091fa7f41fcdfd5dde5f345f8b2cc73a418ac217b29bad3 SHA512 9f5b277fcbbbe9921d8e18b45b9935436e47021ee796a0fb65f3afea980b2d8da47e9ee247acd9da4434403c9d1ef2b39ceb678bf6f82c557328381d5d59bc33
 EBUILD sudo-9999.ebuild 6141 BLAKE2B 3fde1d106dc229a8bcf8c3231de2fac5695a61c2a87382bb22a5ef3a2959c7777b5c332d79ce22a5e8e82c7a15a71b688c42a08142ad2d564ae0e8654b4b3459 SHA512 4a8c1406ff43a6b32d24d277b4741deeeb075e68fb3ecf93afbf6a8c15d505595780daabef93f01d9b40ea599ac05a846f01e5736208592ee8c7db55398ae2f1
 MISC metadata.xml 989 BLAKE2B c7f7d49fda7750b172dd4b2e5c3fc5f1f3dd602b6347479834bf6444c9311738bcd10fbbba100cee45c97bb899e53f3c113abc61ee89b3353b50876c30966589 SHA512 bc9addd017e474acbc753d6d2cce5d77281a3c1f0857de538168eb1a7b80e0d0b313ad2b03cc710b483cc9588dcaf0208a5b8aaccea18e2ca51b567020bea9ec
diff --git a/app-admin/sudo/sudo-1.8.22-r2.ebuild b/app-admin/sudo/sudo-1.8.22-r2.ebuild
index bb13092ea546..57f4521ceffe 100644
--- a/app-admin/sudo/sudo-1.8.22-r2.ebuild
+++ b/app-admin/sudo/sudo-1.8.22-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 LICENSE="ISC BSD"
 SLOT="0"
 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 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
 fi
 IUSE="gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey"
 
diff --git a/app-admin/sudo/sudo-1.8.23_beta2.ebuild b/app-admin/sudo/sudo-1.8.23_beta3.ebuild
index b9b3625caaef..b9b3625caaef 100644
--- a/app-admin/sudo/sudo-1.8.23_beta2.ebuild
+++ b/app-admin/sudo/sudo-1.8.23_beta3.ebuild
diff --git a/app-admin/tenshi/Manifest b/app-admin/tenshi/Manifest
index 2a2f83520664..34e0194e9d12 100644
--- a/app-admin/tenshi/Manifest
+++ b/app-admin/tenshi/Manifest
@@ -1,14 +1,3 @@
-AUX tenshi-create-mandir.patch 400 BLAKE2B 015285518adb8645ffa9a4dcc3bf23d28f45aef86c1c509edc02794be1f76a3f318169df5a3d3b18f91e5557a50b00868134ab4597849830f6cfb6056f183f87 SHA512 62c1a221a4c4c80ad74a1fb7d3204c9e2452f7f70dc690d018a4da9f6d73877ef78c20ae5b934a2251194c7088e7c0f09af045fa4ac1708a7de78004e1208b35
-AUX tenshi-openrc-init-r1.patch 251 BLAKE2B cc8efd857981d36a8b1588a7753cb3e6906d1e79e36ad895e34ab6c2ed7832d4b4374d540d720ad080eb5a1ddb4d0e3fbc5e34638180fe491192b0c8abaa10e3 SHA512 8f40208c01ad67914e6e81e5c4ee520a26c7f1347a0d17778c0671f6f2edb66b0320dac0add74b910ee9df8e0400837c338c66f0934040bc44195e701e8ac675
-AUX tenshi-openrc-init.patch 400 BLAKE2B 3ee89e13fdc3aecfde8198cb3cb0f0441d9868d007e07f0e096ba2213c818694ceb362958661a16a912287c1e3b6717ce0f1f8445d3215f18d0135f71ebff2c8 SHA512 f623ddebbc873bc579484a60357aa4480bdff06d032591512765e8e8d947249899a45285d5abfeb78d77567154218f187c1f1f2d84d5a668473d5c03cfc19027
-DIST tenshi-0.12.tar.gz 28467 BLAKE2B 241acc6893c50b1d0f4e9a423f8c6bf74e71212413c7a2d0f65f3a65566c9bd64691f32047b0ae166080b37aadb7fc0b40578fe0aed673d85abc0045339f9fe9 SHA512 657998e3a8df49ad0aae9c948cdd78dab944153fdacf79ebfc31b3e57fb62d738514b94c61834342669c407a3b09e81ceab38c054153a9fae6337a377fc167db
-DIST tenshi-0.14.tar.gz 29764 BLAKE2B f1601dae3e71184ac4127e5ce63af51df5c2a1a78de272c40dd177c003436cf5c60044c93ff9cf104626b8eb18419b4dfb33d3ae2edeca75f513825d15c0d57d SHA512 9922e9b7f9f39bc38f2e8844399146a9303d8a622b167b748fd76970820b04dc15df55e4ff87c05662ba9d120876cac9fa6ffa3bf07f2ad7c4f6f58d1ca667d2
-DIST tenshi-0.15.tar.gz 28405 BLAKE2B 6a5d976e658346421d7744e42e1bc4aa5f77ca4a0da9a2a6a12ee1461a58f0a144b2ff16f8521c50fd53666e90fb24dbc92ae1314618d3e5e328a49a20b99d4d SHA512 7d241d192986d2073d8509cda8b6bd21bc678f05d6e3b830885485d259454c5e5c004b477e63dbef5eb3e5bea8c4af56d6d8ed32c6809de43ed1e144c6b3d04c
-DIST tenshi-0.16.tar.gz 24460 BLAKE2B aaef47c00a9ab63572f14ca990ee25d7231697d1180a8e8db0fd8ba413ce6f1a362f1b5dac9de30ccc1730d14a36290f0ac8cc0ff12b079650d6f8063dd2463d SHA512 b23adc764ba0bbdde99a273a233cdb5117cd160da56aa19db05f196a4d4934e3a631c9d9effe4a80388c176c3b19b46328edca02af85265d08d6e77b724b044e
 DIST tenshi-0.17.tar.gz 24597 BLAKE2B 846128e65b1a2d2a3bc5edecc9356069f44d9c13757771ec7fc5c31063d8aeb9403d447dbb088d2aa7d05d3b086ac6c569cd24a05c336225540b3baa10e79bb7 SHA512 2ca93ceaab0843c321fa69d8ba1c7b31eaf809cac4348c98327ddd9ab72df4d5ff00d6b4edeb19a9f02e154161988e0c2284248fd0e84d2b42dd82fdbaac1a78
-EBUILD tenshi-0.12.ebuild 1342 BLAKE2B c5fb552dbf0ecb866a993cdd2c2fc9fdd80d4d2c7537fdb0f1c4a008c1725df83bf953193e4c919d4388033afa8897dde6b91e7f4360e045629279d89f6bf44c SHA512 281348e573ec93eba92456d13c85d263fd32954f539ebe4cee0c66cb291b579bc034313c5d40cecef74d89dfb570d8b905bdd13fb24dfa30cd1ca10767d950a5
-EBUILD tenshi-0.14.ebuild 1185 BLAKE2B f17ca46a042bd6f0514135a9cf528854cc6173d1c959929618f50c87075075d6703cae63c16fb0f787af1cfefd9776202a386683c8c137c75f6adcfac60cac26 SHA512 53b7df0fc590a83cd12d8ba0c6c5404941f71ab1e81787b8ce924a0baaee2c8162a7abaf3b1d36e6f634bb16520aec29ab3ff7ea1efeace731b676f167335331
-EBUILD tenshi-0.15.ebuild 1186 BLAKE2B 20916392433c56dfe9af50ffb4b46a9f112c28c836d18c7cf28c8ed7a0663f65f0daa494e8dc4b21d00735b5ce9b8f2bf8ec39e05e294624bb853d1eb09dfd16 SHA512 eaffd6c1308d4c8111f443008eb7a2ec8bae686460b91509834c68801719d277f334660ae1330b6215959e6be8fa7349229e0ad214af593fb8a22d756120e769
-EBUILD tenshi-0.16-r1.ebuild 1201 BLAKE2B 39b1532683d3e310c36594ce0843b5ff29f6a3b754a2ed33ddfbbfcc2158667954a748ab5da3f989e4f1caf7ef019b9c99a193190861942f6913a839d8a5159f SHA512 f344b3f8b6d1a3e61d4a5a1f819d2cc787b20a23d310b4c7545bcbc0593d6b14572c0697659f21d083aee2387dad7e1847b5cac0cfe2052fc83f786cb540fd3d
 EBUILD tenshi-0.17.ebuild 1199 BLAKE2B e7e0499c5659c35fbd2b8662bd543350e06fbf98c4ddbfa6681fe3926949a9ccf4e2a4376ec5390704c95afc95f452481f431516d21ce060cb3d8c59bd7de136 SHA512 c8ebcb56ef759ad01bfe4f9be27b5cdff560e1184b93eac61b6e35f6dbad26dfc942923969a30d00e5b44022955b5eaa74d93aa0ce47b2465d7dbe5b5af972f7
 MISC metadata.xml 464 BLAKE2B 7a6641b592d206396a955c7aef2ce071335c3b937700f8fc5d9aacb1be093b84570afa4702ecb9d9eaec328d2aebf37f260b176d6b8e75921cdf52eff5980dd9 SHA512 db98f1636bb66ec2f345b93d9c52894032f408ae893135bb776394a5e7a1173629f58d8fce1d3b6a77962517067ca5e3859ecf4efb56bdfb950d2450d100c954
diff --git a/app-admin/tenshi/files/tenshi-create-mandir.patch b/app-admin/tenshi/files/tenshi-create-mandir.patch
deleted file mode 100644
index 72ca3f28576d..000000000000
--- a/app-admin/tenshi/files/tenshi-create-mandir.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -38,5 +38,7 @@
- 		install -g root -m 0644 -D tenshi.conf ${DESTDIR}${sysconfdir}/tenshi/tenshi.conf
- 	install -d ${DESTDIR}${docdir}
- 	install -m 0644 ${DOCS} ${DESTDIR}${docdir}/
-+	[ -d ${DESTDIR}${mandir}/man8 ] || \
-+		install -d ${DESTDIR}${mandir}/man8
- 	install -g root -m 0644 tenshi.8 ${DESTDIR}${mandir}/man8/
- 	install -g root -m 755 -d ${DESTDIR}${libdir}
diff --git a/app-admin/tenshi/files/tenshi-openrc-init-r1.patch b/app-admin/tenshi/files/tenshi-openrc-init-r1.patch
deleted file mode 100644
index 43d398610e7b..000000000000
--- a/app-admin/tenshi/files/tenshi-openrc-init-r1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tenshi.gentoo-init
-+++ b/tenshi.gentoo-init
-@@ -1,6 +1,7 @@
- #!/sbin/openrc-run
- 
--opts="depend start stop reload flush checkconfig"
-+extra_commands="checkconfig"
-+extra_started_commands="reload flush"
- 
- depend() {
- 	need clock hostname logger
diff --git a/app-admin/tenshi/files/tenshi-openrc-init.patch b/app-admin/tenshi/files/tenshi-openrc-init.patch
deleted file mode 100644
index eef9874c553a..000000000000
--- a/app-admin/tenshi/files/tenshi-openrc-init.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tenshi.gentoo-init
-+++ b/tenshi.gentoo-init
-@@ -13,7 +13,7 @@
- 
- start() {
- 	ebegin "Starting tenshi"
--	start-stop-daemon --start --quiet --exec /usr/sbin/tenshi -- -c /etc/tenshi/tenshi.conf -P /var/lib/tenshi/tenshi.pid
-+	start-stop-daemon --start --quiet --pidfile /var/lib/tenshi/tenshi.pid --exec /usr/sbin/tenshi -- -c /etc/tenshi/tenshi.conf -P /var/lib/tenshi/tenshi.pid
- 	eend $?
- }
- 
diff --git a/app-admin/tenshi/tenshi-0.12.ebuild b/app-admin/tenshi/tenshi-0.12.ebuild
deleted file mode 100644
index 00fc0e6fd7a1..000000000000
--- a/app-admin/tenshi/tenshi-0.12.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils user
-
-DESCRIPTION="Log parsing and notification program"
-HOMEPAGE="http://dev.inversepath.com/trac/tenshi"
-SRC_URI="http://dev.inversepath.com/tenshi/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	dev-perl/IO-BufferedSelect
-	sys-apps/coreutils"
-
-pkg_setup() {
-	enewgroup tenshi
-	enewuser tenshi -1 -1 /var/lib/tenshi tenshi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-create-mandir.patch"
-	epatch "${FILESDIR}/${PN}-openrc-init.patch" #218042
-	epatch "${FILESDIR}/${PN}-openrc-init-r1.patch" #398987
-
-	# Fix for bug #241254
-	sed -i 's:^docdir =.*:docdir = /usr/share/doc/${PF}:' \
-		Makefile || die "docdir substitution failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	fowners tenshi:root /etc/tenshi/tenshi.conf
-	dodir /var/lib/tenshi
-	fowners tenshi:root /var/lib/tenshi
-	doman tenshi.8
-	newinitd tenshi.gentoo-init tenshi
-	keepdir /var/lib/tenshi
-}
-
-pkg_postinst() {
-	ewarn "The sample config installed to ${ROOT}etc/tenshi/tenshi.conf"
-	ewarn "monitors /var/log/messages which, by default, can not be read"
-	ewarn "by the tenshi user.  Make sure that the tenshi user has read"
-	ewarn "permission on all the files that you want tenshi to monitor."
-}
diff --git a/app-admin/tenshi/tenshi-0.14.ebuild b/app-admin/tenshi/tenshi-0.14.ebuild
deleted file mode 100644
index 462d7eb8175f..000000000000
--- a/app-admin/tenshi/tenshi-0.14.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils user
-
-DESCRIPTION="Log parsing and notification program"
-HOMEPAGE="http://dev.inversepath.com/trac/tenshi"
-SRC_URI="http://dev.inversepath.com/tenshi/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	dev-perl/IO-BufferedSelect
-	sys-apps/coreutils"
-
-pkg_setup() {
-	enewgroup tenshi
-	enewuser tenshi -1 -1 /var/lib/tenshi tenshi
-}
-
-src_prepare() {
-	# Fix for bug #241254
-	sed -i 's:^docdir =.*:docdir = /usr/share/doc/${PF}:' \
-		Makefile || die "docdir substitution failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	fowners tenshi:root /etc/tenshi/tenshi.conf
-	dodir /var/lib/tenshi
-	fowners tenshi:root /var/lib/tenshi
-	doman tenshi.8
-	newinitd tenshi.gentoo-init tenshi
-	keepdir /var/lib/tenshi
-}
-
-pkg_postinst() {
-	ewarn "The sample config installed to ${ROOT}etc/tenshi/tenshi.conf"
-	ewarn "monitors /var/log/messages which, by default, can not be read"
-	ewarn "by the tenshi user.  Make sure that the tenshi user has read"
-	ewarn "permission on all the files that you want tenshi to monitor."
-}
diff --git a/app-admin/tenshi/tenshi-0.15.ebuild b/app-admin/tenshi/tenshi-0.15.ebuild
deleted file mode 100644
index 16c4de5754a3..000000000000
--- a/app-admin/tenshi/tenshi-0.15.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Log parsing and notification program"
-HOMEPAGE="http://dev.inversepath.com/trac/tenshi"
-SRC_URI="http://dev.inversepath.com/tenshi/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	dev-perl/IO-BufferedSelect
-	sys-apps/coreutils"
-
-pkg_setup() {
-	enewgroup tenshi
-	enewuser tenshi -1 -1 /var/lib/tenshi tenshi
-}
-
-src_prepare() {
-	# Fix for bug #241254
-	sed -i 's:^docdir =.*:docdir = /usr/share/doc/${PF}:' \
-		Makefile || die "docdir substitution failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	fowners tenshi:root /etc/tenshi/tenshi.conf
-	dodir /var/lib/tenshi
-	fowners tenshi:root /var/lib/tenshi
-	doman tenshi.8
-	newinitd tenshi.gentoo-init tenshi
-	keepdir /var/lib/tenshi
-}
-
-cpkg_postinst() {
-	ewarn "The sample config installed to ${ROOT}etc/tenshi/tenshi.conf"
-	ewarn "monitors /var/log/messages which, by default, can not be read"
-	ewarn "by the tenshi user.  Make sure that the tenshi user has read"
-	ewarn "permission on all the files that you want tenshi to monitor."
-}
diff --git a/app-admin/tenshi/tenshi-0.16-r1.ebuild b/app-admin/tenshi/tenshi-0.16-r1.ebuild
deleted file mode 100644
index 813e9479f84c..000000000000
--- a/app-admin/tenshi/tenshi-0.16-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user
-
-DESCRIPTION="Log parsing and notification program"
-HOMEPAGE="http://dev.inversepath.com/trac/tenshi"
-SRC_URI="https://github.com/inversepath/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	dev-perl/IO-BufferedSelect
-	sys-apps/coreutils"
-
-pkg_setup() {
-	enewgroup tenshi
-	enewuser tenshi -1 -1 /var/lib/tenshi tenshi
-}
-
-src_prepare() {
-	default
-	# Fix for bug #241254
-	sed -i 's:^docdir =.*:docdir = /usr/share/doc/${PF}:' \
-		Makefile || die "docdir substitution failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doman tenshi.8
-	newinitd tenshi.openrc-init tenshi
-
-	# We don't need to install LICENSE files.
-	rm "${D}/usr/share/doc/${PF}/LICENSE" || die 'failed to remove LICENSE'
-}
-
-pkg_postinst() {
-	ewarn "The sample config installed to ${ROOT}etc/tenshi/tenshi.conf"
-	ewarn "monitors /var/log/messages which, by default, can not be read"
-	ewarn "by the tenshi user.  Make sure that the tenshi user has read"
-	ewarn "permission on all the files that you want tenshi to monitor."
-}