gentoo resync : 30.04.2018

13 files changed, 147 insertions, 285 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index d52bf4cae9d9..c445426a3aad 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 889352e90100..8a342b6565a4 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,13 +1,11 @@
 DIST ansible-2.4.2.0.tar.gz 6503595 BLAKE2B df4ec4e24671f1488950f2d9eb7705fbad4e035d6ac67d5017417281455cc44cde1290976a9ed16675c0cc19a9190200b95b29890725c56df5f2699398accd6b SHA512 32a075959dca01e184d9c3988fc9c491e904e7627a38e3527c37a8b26340f331bd294cacfe7353d339d15488857ba5ee1b36d9ae4ebeb8b5827934a73f4b42b0
 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.1.tar.gz 10100358 BLAKE2B 39831c6ed49360e905ac8fb8d9ad7520c0bc16b5dbe19103c5349cb5d6fe30c2c3212f08f15a7877692b2a9a2ca3e1ab8e5580bc9919f7c2d96f7b07ae45f1e2 SHA512 d5ed9ba4bb514b79254a79a89d1572e80c5cfb1db2a67a980184aa3c26ff407f5c5c9bd0efa24f0e00af451d955f3b0d8d9ad3026be71ba7ad12487a1631ad9a
 DIST ansible-2.5.2.tar.gz 10105800 BLAKE2B 0d9080b666164c96c2a237f9a5f4b271a2fe9933d1999df85cd973df0cf85d850343bc33b8afb18c1bf0a7eecb2ab193e91c7a02c3e56e8a5e41338ce7a90081 SHA512 25568665b96ee9d7ca0888dadd90de178a9cc1da7dba07acb682ca4455ef91622344958ec2000eafbb4cfda87aec325be77d3d5b395aa4bbc2d180fad1a90a34
 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.1.ebuild 1406 BLAKE2B f2c87ce03b3c4914087b0401485a07f7b3287ebf62a4d0b7acaa7b9c06bd670c0f91bf2288edbbd45ab577403a1b85de2733c0a3fced85c99720ae8f7848ed46 SHA512 b4d4d40758c6f638f07480af76ff2cdcebe787276c27c23b3e046841ecfaacac83845c14bca352ed603c15a3fff4eb19ae53c990e7fa2662d5b5822890091a1a
-EBUILD ansible-2.5.2.ebuild 1408 BLAKE2B acca3919cf1cf8240b4d4cad16ad41b61cf7d6af7c4adefd81c404dc538d1bf75b97dc3e4a87ba38b1e4dd7e3cbf3b319144adad083b1e813492322cc179baae SHA512 cdf8791066fc9b72bf1c1dd3a3595c2901f71e69b24a163f2b6eb100a410d5bfc942a76cf92a5fc2d730eecd57028165eed3c4e3330ac06f1975c7022b6d904b
+EBUILD ansible-2.5.2.ebuild 1406 BLAKE2B f2c87ce03b3c4914087b0401485a07f7b3287ebf62a4d0b7acaa7b9c06bd670c0f91bf2288edbbd45ab577403a1b85de2733c0a3fced85c99720ae8f7848ed46 SHA512 b4d4d40758c6f638f07480af76ff2cdcebe787276c27c23b3e046841ecfaacac83845c14bca352ed603c15a3fff4eb19ae53c990e7fa2662d5b5822890091a1a
 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
deleted file mode 100644
index eeb696f6cfd4..000000000000
--- a/app-admin/ansible/ansible-2.5.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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/ansible/ansible-2.5.2.ebuild b/app-admin/ansible/ansible-2.5.2.ebuild
index 573d04b35802..eeb696f6cfd4 100644
--- a/app-admin/ansible/ansible-2.5.2.ebuild
+++ b/app-admin/ansible/ansible-2.5.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index baed8c0bbd00..357c96e2cc27 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,6 +1,6 @@
 DIST eselect-1.4.11.tar.xz 177444 BLAKE2B e6f758e2acd17cea3ae37af48e4b4327a9c9d74784aa0723b003f2e1d84ec4c13167de33c311b785fddf7b045b3312955c4d84cf6e35ef7ec9265ef5de503670 SHA512 eec3091c5e386e8b7a52cb263e3c5ce6f41e285d2ae7974f4876e2ffa93b00f9f939055d978c6b9032ee1be2561992015560cdfa93a1ff2b1720ea0100fcf96d
 DIST eselect-1.4.12.tar.xz 177520 BLAKE2B 0938fe9bd8785fe711edc1af63a9c318a4a5fe9141c61d7f1c4da0352242322f1e18e4f68f7e219a1aa2beae5b25ddac58d7c47d4272408fd8fe5207324ef7c7 SHA512 2ea182364dfb2333112e9eebe691e1963e95a4c9ab40945eb2e5bc8c81da76105c1ae6aa3d153b78dea6c1e0cadb9b0237f7556b8ceb9d48e0fba67a642d6081
 EBUILD eselect-1.4.11.ebuild 1634 BLAKE2B e28298f0caa8e8751385c546d23bebbcf6839481a43a3752c5b1e35e7d62822dbf961c58f8c81b5d7eab01cfbb0ddecf88697670c2c6003ab73906078270b3d9 SHA512 22e4238d5ed8f6229236bdcd3cb6186a1fe80bbf5b51a356392d382fbe83839a5287bf212603214dbd2f40e155dc647c3a4fd366676a707339b4550c0223d8a9
-EBUILD eselect-1.4.12.ebuild 1642 BLAKE2B 7fb3b479e67203299afa1f1214bb54a55a772c1637acc5d1ffe411d9573f2d3fd2b317747e60ef59479591889e4859849c31c761e9fd6f3b47cce8abe9d24c09 SHA512 469301d956f7aa6182479160627d54c0023adb6023df19a2e0ead00e78f1cf02379c3378fb6b18cd8e04e89e90843a6dea79678b6b95396cd2c5e4319d13ce3d
+EBUILD eselect-1.4.12.ebuild 1641 BLAKE2B 52f70cc3c067889fdc92964ccd58810573e686c996a946751d1a7f579305fefc9b32cc46ad0f2ab6241c437062b55f110467fd4e4fb420e81ea71dab7aefe2ca SHA512 c9e221884a8abf04c9d13669371c3769da272c4685d80859dfbdb2419668573d68955e6191eb2419ac368854e034be9b46b6fcf39a09e301f637ede1b1ddad15
 EBUILD eselect-9999.ebuild 1437 BLAKE2B a390e3198a7f7f52f48ef56bdb73a8075d5c4c1560c0df7971d32798f1296114053b16a8faeee2982b8e106be835e3b61c3655dc2de270b488259f185e8a8980 SHA512 06a5eb4f7bed5a17f9cd56fe497a7cadb7a153580fac6aeefd6f0762ed029c78c79e4f4a50301177eff4e50ac3ac5ddfae342eb0eb4b5c64aa6a840493fa5868
 MISC metadata.xml 272 BLAKE2B 68f9c1edf77cdf1dc46891129ed694307cab4e954c6cb002c3fc32fba216949c83a21dc0618f4bf24fd8e1da5558043709210e6697fda3881adeb69a30eb569f SHA512 55cba722900834986e0ea0c9cd8463c3b69d3ada26227d45c8cc3aa07f6ca40919457f80b03a559a8f9ad55636d931cc2101b928b438aeca19b0531c90ec40a3
diff --git a/app-admin/eselect/eselect-1.4.12.ebuild b/app-admin/eselect/eselect-1.4.12.ebuild
index 09f28f29d913..ed032c86e34c 100644
--- a/app-admin/eselect/eselect-1.4.12.ebuild
+++ b/app-admin/eselect/eselect-1.4.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"
 
 RDEPEND="sys-apps/sed
diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index f721844a1ba2..9f8f65838521 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -1,4 +1,4 @@
-AUX hddgentoo.db 19342 BLAKE2B 0a784270812bf97dd0df80ca54cd0357d553750cc0c89c913d6e6ac29ecc736d2e257090c309e453628e6d1a12b70e178d0df8bcba87f792dca1b93cbdc1ba90 SHA512 50b9cc34b9a9de3bc901b471a5a1d248e034740bc9c6212e6e77a3aa4d675c16e1f5c4638c761f71befb8aaf381690316c111ac369044c09569bc7568549e0d1
+AUX hddgentoo.db 19464 BLAKE2B 82577371ce2f8702a400bf10eb0a9300506a10c5cb780b72503b908c8129c14f78f0ef339b97d86e2bef96f889a6f43e82739d810add817cf94a731b73a7b591 SHA512 03aa8c528988a1d602cd17f2d3a02e00142634dd87f92af7cb2ceab30f1d525a5954300c74e61e6614043a0636f63151e641e57aa860ed878eb339a51db8b72b
 AUX hddtemp-0.3_beta15-byteswap.patch 1037 BLAKE2B 5e0df7da8f67facd8f5d466c502b44aa1e58822ec6b91992b973aea0d3e70fdba0812746fd697341419b670a984e14c1c44a1b952d27ffc82df56b06bf6a27a3 SHA512 4d37b31129be7f767a416d4b15e3eaf94af297a7d2f4ed57f900fc48775bbb389ca1259c13dd048d670f32fe53f8d0e06c6f1c02485cb95a08d2a80aac4f76a8
 AUX hddtemp-0.3_beta15-dontwake.patch 515 BLAKE2B 56061289e8d247a11a3172eebf3ed7f04f6b55b6021c9d79dbc41553828d4b265dc049ac139473dfd48c8e904d3cd4023405f9c787a21537872c6e2185395ee4 SHA512 ff5cfeb9fcd6a17ab3937212a85076fafa9abfde72a1b602ada09b5fb71f89a200e91398e9682a17034f630b90e57559e550c0f1565d12ca642af0c2e10a99e1
 AUX hddtemp-0.3_beta15-execinfo.patch 751 BLAKE2B 955e4d3501f7a8669036168740d67574f912197110cb2a156b3aef884596346bd1cbc32279248bc91f8e94993139092b80db02fe4cc42124ada99915fcb0b899 SHA512 cd320985142df5f07cb8c56613aa4110a63fed34e2e08f95272f3d43b75289d298e9dc61e86a42e0be5f15f9a76007d894d515d4d09c8a9deb41b16aa4ea3bc6
diff --git a/app-admin/hddtemp/files/hddgentoo.db b/app-admin/hddtemp/files/hddgentoo.db
index 0b96a556e0f8..539a88a4917d 100644
--- a/app-admin/hddtemp/files/hddgentoo.db
+++ b/app-admin/hddtemp/files/hddgentoo.db
@@ -260,3 +260,4 @@
 "WDC WD1600BEVS-08RST2"						194 C "Western Digital Scorpio Blue SATA 160GB 5400RPM 8MB"
 "WDC WD30EZRZ-00Z5HB0"						194 C "Western Digital Blue 3TB SATA3 5400RPM 64MB"
 "ST31000528AS"							194 C "Seagate Barracuda 7200.12 1TB SATA2 7200RPM 32MB"
+"HITACHI HTS727550A9E364"                                       194 C "Hitachi Travelstar 7K500 500GB SATA2 7200RPM 16MB"
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index d8f6490e0762..c89064a2bc02 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,10 +1,8 @@
 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.23rc2.tar.gz 3149442 BLAKE2B dcf80e26f501cd1e22956e940a97ada7efb68158c995d9719d9c3cdf9f2979a99643e03717c316595875931c783e242bc8e1c809c65b028e93331efcecace0c7 SHA512 0ca1fb8cddb003304999b6e41c05678621e370eb25bc1cd7f3ca8d54f07c8c914b9f05da128208a9225b4e7c83ff6b736bc3a618fdee46fa8f81b70e3c3b0f31
+DIST sudo-1.8.23.tar.gz 3150674 BLAKE2B 11b1c7bfa372005cda8baf651c4662f6fd15e94ca77f7705b23ca6573424796d5c1f8e47e2874c4b54017141d01a632885ac60c92346d932537048373cad0ede SHA512 a9d61850a4857bfd075547a13efb13b054e4736e3ebe3c8a98a90a090b1d9b9688354ec9725fc99d1d256999b6f9c6ae6215ce9770fcdebd7f24731107b48342
 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 5993 BLAKE2B 0527039455c29177d4c93a2f0c1e014db7ecb8817999196ae5310aaecd0e750c8b47185750308ce6250a1c1cb53f28935fcedf7b389beee52589aa721c3e4fb5 SHA512 a42f405ba15b9e532892f5ac1d269ec7daab680442bca15ff4e4e720514ac59cf8805013bc3251d141d6c465a678747975477d86006a25f6dcb3db3c54007e3c
-EBUILD sudo-1.8.23_rc2.ebuild 6000 BLAKE2B 0f271466e3199849d365e2136700e3c2570008fa72054d60a27f84e515596359ccda07683c32defd0091fa7f41fcdfd5dde5f345f8b2cc73a418ac217b29bad3 SHA512 9f5b277fcbbbe9921d8e18b45b9935436e47021ee796a0fb65f3afea980b2d8da47e9ee247acd9da4434403c9d1ef2b39ceb678bf6f82c557328381d5d59bc33
+EBUILD sudo-1.8.23.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.21_p2.ebuild b/app-admin/sudo/sudo-1.8.21_p2.ebuild
deleted file mode 100644
index 81a7dffe1216..000000000000
--- a/app-admin/sudo/sudo-1.8.21_p2.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils pam multilib libtool
-
-MY_P=${P/_/}
-MY_P=${MY_P/beta/b}
-
-uri_prefix=
-case ${P} in
-	*_beta*|*_rc*) uri_prefix=beta/ ;;
-esac
-
-DESCRIPTION="Allows users or groups to run commands as other users"
-HOMEPAGE="https://www.sudo.ws/"
-SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
-	ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
-
-# Basic license is ISC-style as-is, some files are released under
-# 3-clause BSD license
-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"
-fi
-IUSE="gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey"
-
-CDEPEND="
-	gcrypt? ( dev-libs/libgcrypt:= )
-	openssl? ( dev-libs/openssl:0= )
-	pam? ( virtual/pam )
-	sasl? ( dev-libs/cyrus-sasl )
-	skey? ( >=sys-auth/skey-1.1.5-r1 )
-	ldap? (
-		>=net-nds/openldap-2.1.30-r1
-		dev-libs/cyrus-sasl
-	)
-	sys-libs/zlib
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sudo )
-	ldap? ( dev-lang/perl )
-	pam? ( sys-auth/pambase )
-	>=app-misc/editor-wrapper-3
-	virtual/editor
-	sendmail? ( virtual/mta )
-"
-DEPEND="
-	${CDEPEND}
-	sys-devel/bison
-"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	pam? ( !skey )
-	skey? ( !pam )
-	?? ( gcrypt openssl )
-"
-
-MAKEOPTS+=" SAMPLES="
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-set_rootpath() {
-	# FIXME: secure_path is a compile time setting. using ROOTPATH
-	# is not perfect, env-update may invalidate this, but until it
-	# is available as a sudoers setting this will have to do.
-	einfo "Setting secure_path ..."
-
-	# first extract the default ROOTPATH from build env
-	ROOTPATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
-	if [[ -z ${ROOTPATH} ]] ; then
-		ewarn "	Failed to find ROOTPATH, please report this"
-	fi
-
-	# then remove duplicate path entries
-	cleanpath() {
-		local newpath thisp IFS=:
-		for thisp in $1 ; do
-			if [[ :${newpath}: != *:${thisp}:* ]] ; then
-				newpath+=:$thisp
-			else
-				einfo "   Duplicate entry ${thisp} removed..."
-			fi
-		done
-		ROOTPATH=${newpath#:}
-	}
-	cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${ROOTPATH:+:${ROOTPATH}}
-
-	# finally, strip gcc paths #136027
-	rmpath() {
-		local e newpath thisp IFS=:
-		for thisp in ${ROOTPATH} ; do
-			for e ; do [[ $thisp == $e ]] && continue 2 ; done
-			newpath+=:$thisp
-		done
-		ROOTPATH=${newpath#:}
-	}
-	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
-
-	einfo "... done"
-}
-
-src_configure() {
-	local ROOTPATH
-	set_rootpath
-
-	# audit: somebody got to explain me how I can test this before I
-	# enable it.. - Diego
-	# plugindir: autoconf code is crappy and does not delay evaluation
-	# until `make` time, so we have to use a full path here rather than
-	# basing off other values.
-	myeconfargs=(
-		--enable-zlib=system
-		--with-editor="${EPREFIX}"/usr/libexec/editor
-		--with-env-editor
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
-		--with-rundir="${EPREFIX}"/var/run/sudo
-		--with-secure-path="${ROOTPATH}"
-		--with-vardir="${EPREFIX}"/var/db/sudo
-		--without-linux-audit
-		--without-opie
-		$(use_enable gcrypt)
-		$(use_enable nls)
-		$(use_enable openssl)
-		$(use_enable sasl)
-		$(use_with offensive insults)
-		$(use_with offensive all-insults)
-		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
-		$(use_with ldap)
-		$(use_with pam)
-		$(use_with skey)
-		$(use_with selinux)
-		$(use_with sendmail)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use ldap ; then
-		dodoc README.LDAP
-		dosbin plugins/sudoers/sudoers2ldif
-
-		cat <<-EOF > "${T}"/ldap.conf.sudo
-		# See ldap.conf(5) and README.LDAP for details
-		# This file should only be readable by root
-
-		# supported directives: host, port, ssl, ldap_version
-		# uri, binddn, bindpw, sudoers_base, sudoers_debug
-		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
-		EOF
-
-		insinto /etc
-		doins "${T}"/ldap.conf.sudo
-		fperms 0440 /etc/ldap.conf.sudo
-
-		insinto /etc/openldap/schema
-		newins doc/schema.OpenLDAP sudo.schema
-	fi
-
-	pamd_mimic system-auth sudo auth account session
-
-	keepdir /var/db/sudo
-	fperms 0700 /var/db/sudo
-
-	# Don't install into /var/run as that is a tmpfs most of the time
-	# (bug #504854)
-	rm -rf "${D}"/var/run
-}
-
-pkg_postinst() {
-	if use ldap ; then
-		ewarn
-		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
-		ewarn
-		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
-			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
-			ewarn "configured in /etc/nsswitch.conf."
-			ewarn
-			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
-			ewarn "  sudoers: ldap files"
-			ewarn
-		fi
-	fi
-	if use prefix ; then
-		ewarn
-		ewarn "To use sudo, you need to change file ownership and permissions"
-		ewarn "with root privileges, as follows:"
-		ewarn
-		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
-		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
-		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
-		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
-		ewarn
-	fi
-
-	elog "To use the -A (askpass) option, you need to install a compatible"
-	elog "password program from the following list. Starred packages will"
-	elog "automatically register for the use with sudo (but will not force"
-	elog "the -A option):"
-	elog ""
-	elog " [*] net-misc/ssh-askpass-fullscreen"
-	elog "     net-misc/x11-ssh-askpass"
-	elog ""
-	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
-	elog "variable to the program you want to use."
-}
diff --git a/app-admin/sudo/sudo-1.8.23_rc2.ebuild b/app-admin/sudo/sudo-1.8.23.ebuild
index b9b3625caaef..b9b3625caaef 100644
--- a/app-admin/sudo/sudo-1.8.23_rc2.ebuild
+++ b/app-admin/sudo/sudo-1.8.23.ebuild
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index ecbca17e8ea1..9e4c3b5c3259 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -2,5 +2,7 @@ AUX ulogd.init 949 BLAKE2B bebbf58aab0957017980d46762743f366d9f2daeca35bbed53c1a
 AUX ulogd.logrotate 193 BLAKE2B 65e6d518260ad322539f05ea5a3177092db8cfa67bd8cd035cd714f8c3e6f90860ce47e27dccdf66feed68258f9bbbe2ef16fa103000f0166927a8cf9fc6969c SHA512 be62a8c63d567d90ab07d9a9e86fb85d868683c385de598b81fa369fd13581a144a0be1aedd2b899d653d94475679eee1fd4939ae72a35777d75208584b2f17a
 AUX ulogd.service 390 BLAKE2B e1395888ffe09cafd98a4384ab7b06e18c0e1b92fa80fb07a05415a3927bcd68a5d3d900ada141c684359bd37910801d40e069cba8cefc8a7c323584b9d8b993 SHA512 73923e6a851bf4f34f532c8b3fa17eb227f2fb2b4c485b89a488789f2d4af3605bd09538095a6acbee6d74300e98755bb03bacabe450104319938cfff62e4c89
 DIST ulogd-2.0.5_p20161017.tar.gz 137936 BLAKE2B 4cd252820920b0f872ddf97894c5917ed03fcab78b7fc215fa0ad00fbce2d2bd8cadc80120d452868e5292c97e595ea0ea861d685919fd18a8f040b683f2fe5d SHA512 b9a3f5323766856fc20d58a6c55f9bc955f50e9d7052df0828ca08bf9d573326e69920f6c90c9d3e877c4dc1a29a5a994cde070bd0834fbf4dee8eebbb251e98
+DIST ulogd-2.0.7.tar.bz2 394573 BLAKE2B bec028a3b35038a8cc0f3f8b81b3e19addb66fce09e4ea0f3b2cd29b20cdb28025a576badd0765d9bb15f9d097799b6f55ff45058f8a838daa836c3fe878eef0 SHA512 1ad12bcf91bebe8bf8580de38693318cdabd17146f1f65acf714334885cf13adf5f783abdf2dd67474ef12f82d2cfb84dd4859439bc7af10a0df58e4c7e48b09
 EBUILD ulogd-2.0.5_p20161017.ebuild 3283 BLAKE2B cca75edb07b6a0ed2189e49a7adfe01f3b484c08475bd2dab869b2f103e4b22888245b9a2d5f141a1fd67913e57bdfcbc48d6e6f4f8afe58c01c3ecc318b6036 SHA512 2a053311bf836f933fdb3ffa23f354bda4eaac186a36fbe50ccd4aeed719d8c172ab67f969339b0ef29a4698b0bd7b2fac9804eaa75d4b2c84b7808a096f9791
+EBUILD ulogd-2.0.7.ebuild 3189 BLAKE2B 4dbdef30ed6674105cb54246b43f65ee0583a4b764992af68d7e6c3a19e2c877a7b98b2c9110833cef23c9d23b2c6a71cdfdb5697ca0638d0d4b5ef7888ba414 SHA512 d98d9b11e868d75ae14e9bfbe2469878e67e568e73e07c3288801c793c6decf713db779ea9e199f7fd7b902fb3228bd60ff0142c5f1303bd93607df6544aa483
 MISC metadata.xml 1106 BLAKE2B b3573379c3ff51e2547356bca45add6e891b5ab04784c8c926c52633551209c91ccf51103c289d4e45e16e7fb1f9775055131c400fdfa3627c158282ba0991ef SHA512 d97a125e3fcc6ed123c2da7520bd9f2fa615394d583ac5d984225286676ad3b01d0b5ccf01567d68cacffed6e12e5182bdbd618355e8bec2a05ade66369f9f1d
diff --git a/app-admin/ulogd/ulogd-2.0.7.ebuild b/app-admin/ulogd/ulogd-2.0.7.ebuild
new file mode 100644
index 000000000000..7ece68975264
--- /dev/null
+++ b/app-admin/ulogd/ulogd-2.0.7.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic linux-info ltprune readme.gentoo-r1 systemd user
+
+DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
+HOMEPAGE="https://netfilter.org/projects/ulogd/index.html"
+SRC_URI="https://www.netfilter.org/projects/ulogd/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres selinux sqlite ulog"
+
+COMMON_DEPEND="
+	|| ( net-firewall/iptables net-firewall/nftables )
+	>=net-libs/libnfnetlink-1.0.1
+	dbi? ( dev-db/libdbi )
+	json? ( dev-libs/jansson )
+	nfacct? (
+		>=net-libs/libmnl-1.0.3
+		>=net-libs/libnetfilter_acct-1.0.1
+	)
+	nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 )
+	nflog? ( >=net-libs/libnetfilter_log-1.0.0 )
+	mysql? ( virtual/mysql )
+	pcap? ( net-libs/libpcap )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${COMMON_DEPEND}
+	doc? (
+		app-text/linuxdoc-tools
+		app-text/texlive-core
+		dev-texlive/texlive-fontsrecommended
+		virtual/latex-base
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-ulogd )
+"
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="
+You must have at least one logging stack enabled to make ulogd work.
+Please edit the example configuration located at '${EPREFIX}/etc/ulogd.conf'.
+"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if use nfacct && kernel_is lt 3 3 0; then
+		ewarn "NFACCT input plugin requires a kernel >= 3.3."
+	fi
+
+	if use ulog && kernel_is ge 3 17 0; then
+		ewarn "ULOG target has been removed in the 3.17 kernel release."
+		ewarn "Consider enabling NFACCT, NFCT, or NFLOG support instead."
+	fi
+
+	enewgroup ulogd
+	enewuser ulogd -1 -1 /var/log/ulogd ulogd
+}
+
+src_prepare() {
+	default_src_prepare
+
+	# Change default settings to:
+	# - keep log files in /var/log/ulogd instead of /var/log;
+	# - create sockets in /run instead of /tmp.
+	sed -i \
+		-e "s|var/log|var/log/${PN}|g" \
+		-e 's|tmp|run|g' \
+		ulogd.conf.in || die
+}
+
+src_configure() {
+	append-lfs-flags
+	local myeconfargs=(
+		$(use_with dbi)
+		$(use_with json jansson)
+		$(use_enable nfacct)
+		$(use_enable nfct)
+		$(use_enable nflog)
+		$(use_with mysql)
+		$(use_with pcap)
+		$(use_with postgres pgsql)
+		$(use_with sqlite)
+		$(use_enable ulog)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default_src_compile
+
+	if use doc; then
+		# Prevent access violations from bitmap font files generation.
+		export VARTEXFONTS="${T}/fonts"
+		emake -C doc
+	fi
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doc/${PN}.html )
+
+	default_src_install
+	prune_libtool_files --modules
+	readme.gentoo_create_doc
+
+	doman ${PN}.8
+
+	use doc && dodoc doc/${PN}.{dvi,ps,txt}
+	use mysql && dodoc doc/mysql-*.sql
+	use postgres && dodoc doc/pgsql-*.sql
+	use sqlite && dodoc doc/sqlite3.table
+
+	insinto /etc
+	doins ${PN}.conf
+	fowners root:ulogd /etc/${PN}.conf
+	fperms 640 /etc/${PN}.conf
+
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	diropts -o ulogd -g ulogd
+	keepdir /var/log/ulogd
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}