gentoo resync : 29.10.2017

48 files changed, 401 insertions, 902 deletions

diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 0564d19ff1ac..3c34334ce5d2 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -2,8 +2,10 @@ AUX ansible-2.3.2.0-fix_key_error.patch 2733 SHA256 de439ac7f94ec49747ebf9531bab
 DIST ansible-2.3.2.0-pycryptodome.patch 32472 SHA256 0e204895f8e16e030517dcda40c95c40b20cfe1641e077c15d80ff8fc4b0579a SHA512 cf2b1528176a12e8e48001155d8f2351e1c4914df56ae8b8542a48ccee4158c23ed1eda537ac500f1b71553aa84c574b8297398a82c4c0721ed6f9d08ad5257d WHIRLPOOL 24c9971b643da1cc5321ffe13f1b1ce27f42ab4c273b51ea532746564c0112ce5884072245e282d1525057c2d4117a5fe67d0d305f1a23d1feb9d3d464f1ec11
 DIST ansible-2.3.2.0.tar.gz 4319664 SHA256 0563b425279422487f12616ef719f6e558373b258dcf47e548d119be8d3168eb SHA512 458506da8ae65a80b442834c6047f02eb92acf9f7dd4465c63b4360c4c4817a0f7c48c92a614b91760a54d036ed13f417edf3524bb8a34a8a53ceb11efc928ac WHIRLPOOL 3ce907ba1a08e4d7cbca3c49429f4315f7cfea828806cb4710e2cce6d681a60514f9ca65e702da08a3ae6fc96cc969af73a17d3224e57996ec947438642693c6
 DIST ansible-2.4.0.0.tar.gz 6623856 SHA256 1a276fee7f72d4e6601a7994879e8467edb763dacc3e215258cfe71350b77c76 SHA512 78717b19599bdd46a7285b0b2a4c9d0d5b4cb86fd41dcf0b3340cf65945a55fae4508097058098fbeab871422c31d4f37ab4cd149abfd0af5add6004f65a207b WHIRLPOOL ef957f6b03558f3fd2f711b0551405b1991ec9f404e033e4d9ee074dad07735a651a01d8191d3d111f5e65017621f18711955465547966235048214b3b7bbe85
+DIST ansible-2.4.1.0.tar.gz 6675552 SHA256 da61afb29cc5bd6bc4737a2da06e673fb6fccc3ae2685130d19ab3a8e404fb6a SHA512 86bda43d912fc6b9cbf662e7e9e3ca3178ac577bc7857c5dfc0e68a7083d76ad405b0ca9b34f680a0d635b87e0bf5dc8cbdeefb93174242e1942eabb74b07f1d WHIRLPOOL 47fafd256e4d4a74ff6619406b595168ff7ecdf6c0ee0a48d67047d1e29707f46ec6bbd0200fa59f09f8e111c470a597f0533e63a63ca17264511fda77f4a306
 EBUILD ansible-2.3.2.0-r2.ebuild 1675 SHA256 c95a67e676514236d5fb25b6a89f1b16c2b13bd6556b860b0c5dbbcbd3989204 SHA512 7f6c8f28056800aeaf82403de41ef5971b8ea4977b2642f6531132b58e22aa7ff81d49b18f2d57261dbfebaf68e1ed625fa7331ac4cc5f489d2e68de274fe81c WHIRLPOOL 18a3ecd6b0be621ff0083ae94e3dab09191476713a93b932b8d84720ca2b8eb5cdd9b3d4834fe34984e6f786d1c34358d946c79a8ea8a182c1dce8edf1f0414b
 EBUILD ansible-2.4.0.0.ebuild 1422 SHA256 b2dcb4888b3b80c08d1dea667f1d42b07e064ae6e5f446c1431e29fd4358e676 SHA512 227aabc8dfff8bdd0322ee083627daa823a2ffc1897b9abf15d725eda1de89348faa95749f7a0ba77a8f81dcd07c098c7f154508a8426c46a714aa067229ac86 WHIRLPOOL 8881836a053741e3ff838bbd8be534a64cd62ea06ef41b2567bf96399322020e642ee06006acb2643a4435edab54797492a1cfc72c5da48628740a4dfe8c1684
+EBUILD ansible-2.4.1.0.ebuild 1424 SHA256 554bb873f35f07ba8d1f5b95c910e6396637fdbcf71c41d86e90fc1736ae7b40 SHA512 c5e793a5519429e77994af31a65583b010a12b9959a59c835e2c6131a9d2453257ba82c9199f8ee29284042590dca81bc1f5be9dc9c725769ae4958bfc7a8941 WHIRLPOOL f9c4c7f2cc5390aa98493ea364855948f26338c14dda788a53cdd24a00378bb7ff1e23760f4f945beb18ea98100d3de6b1e355ac59e0ac1c68229fedc721b93b
 EBUILD ansible-9999.ebuild 1696 SHA256 08c84153e567af00758970889bf449dc3c4a06aea6d8123c419a8fff88875ab4 SHA512 cdcae2ecd1f9257c88aa3545cb874d1992a48d0dfbfe25a599fc5cd1d60b48abf3d1f17cb992fdc750625b6916f8e264ac79776e474945ff6f6a1dec3598b372 WHIRLPOOL 9dfb579a17443a0b2ab1c4ac987da55d03ed9c58cd0d72bc2e4bc56459479ac375768c129583ed2720be5d6ac1145fbbe0a7df6366ace40ccbf60b350af9bc73
 MISC ChangeLog 9769 SHA256 199baf005e4d3f8d68566cea3ff4b6410b202cce107ab90504981dac00dd34b5 SHA512 d0f84e1dcbd3628c26e0df2d80ff829cf146f3ab8e6f355c8dc187b2ad5e4be9a1e60f22176e669548f2d355c9659dbeccafcf096de47d52c50842d1b65afac4 WHIRLPOOL b6dba8621dc6d3da894e717f48d9c5ec844c885d594976ef2a759898ba1a9e49db0172b358c0e161e615ee71ab42bc7ddf51a7b77db29e41eed6f5e768d4f5ac
 MISC ChangeLog-2015 11597 SHA256 88b37db76a87a55c7ac0afd355e215dcb788a0217a70561d8a5bdac8af71415c SHA512 25b912511f5763eb335b67a5adf194800b131440c0170b7cb37772e07ee926a2df530586ab77f8963f95b1176e5309de3f5597e7bb57df80f5e025afe83969c4 WHIRLPOOL bee785f57512f313a52908c3e93984138fde5b67ed2f800e6fa7438d6a4fa9517c05aed9326f2b922e6eb89fe4e2ea2f98f4e5a44b5a55747b6ef8fbe4ed0540
diff --git a/app-admin/ansible/ansible-2.4.1.0.ebuild b/app-admin/ansible/ansible-2.4.1.0.ebuild
new file mode 100644
index 000000000000..bc2eb3c1c4fc
--- /dev/null
+++ b/app-admin/ansible/ansible-2.4.1.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_5 )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="http://ansible.com/"
+SRC_URI="http://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/mock-1.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
+}
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 4eca733b9d17..3e5c07ee2669 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,13 +1,13 @@
 AUX apache-tools-2.2.20-Makefile.patch 1573 SHA256 a523a76bcd87059e401b89d341c691423ab4cb4752b8d8871f7d499715335ef8 SHA512 85120f1b57cd14baf3482dc21d4175447e135700a1f8e6455970c14e576cb0c510815681a9906de4c7eb68743de7e41bbb2d86e83dcb62cd57eb0c9f638f6892 WHIRLPOOL 45f4572d51ba4de804ea7be467c19720010a5e5dba9b1904b28f6666a5d0986fafe5a93737e4a38cc86dea32c6ce0ca816358744f240bd84ece0bbbf6e87d508
 AUX apache-tools-2.4.7-Makefile.patch 1695 SHA256 69e1d6f232cb887d516b36a38c4bff1e10d36ed91fd1776cb7029b798525f2f7 SHA512 f597ce5503e590ed5b2621c04dcf0a571a73b70f144df7fe4e5fb7329a4f1558a5eb16913fe3d7c58ac1030f46cd2b1882e08d0f62106fbf8d40a8677c6b9448 WHIRLPOOL 6962efc88b83d7a42029440c0abbdbda92c71a6c7ffda98072756e25ed54060050bdec1115550de76cf5fd1802cf3a7fd156796ccdb8c1c4139f375be8ade7c1
-DIST httpd-2.2.31.tar.bz2 5610489 SHA256 f32f9d19f535dac63b06cb55dfc023b40dcd28196b785f79f9346779e22f26ac SHA512 5aa47d4b76f692bbd8b309135ff99152df98cf69b505b9daf3f13f7f2a31443eaf4995161adfbc47a133b4d0e091fda2d95fc6b87a956f0ada18d7466ee28e74 WHIRLPOOL a2e3e53c51719cb6f7e641b41788cd89ce7b4d2ea105b403bfa3b3d4479b69c5604228269062f66722594e105e91121d05b1c9f27ca7dc4ecfcf339da8b8375c
 DIST httpd-2.2.34.tar.bz2 5779739 SHA256 e53183d5dfac5740d768b4c9bea193b1099f4b06b57e5f28d7caaf9ea7498160 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240 WHIRLPOOL 0bd86b3644fae79c74928c0cd8bc3e4b7d821544a760dbe6459df43210f690d3c4dc74168e029b0b5bbaba6fcd0433aeb4312794455d91b00b7c36c537dfdefd
 DIST httpd-2.4.27.tar.bz2 6527394 SHA256 71fcc128238a690515bd8174d5330a5309161ef314a326ae45c7c15ed139c13a SHA512 7e7e8070715b74cb6890096a74e194f4c6a49c14bda685b1ad832e84312f1ac4316ea03a430e679502bfd8e1853aefa544ee002a20d0f7e994b9a590c74bc42c WHIRLPOOL 35aeaa01b2bf5772ad21d1011e619befd75fdaade5aa0ca7c61367e7b7a66af28dccf8729a53418f2598199721b68aac7d8c575797ed218150d00af4e8dd4dba
 DIST httpd-2.4.28.tar.bz2 6553163 SHA256 c1197a3a62a4ab5c584ab89b249af38cf28b4adee9c0106b62999fd29f920666 SHA512 8de8e32b87e6de220e492e74db9df0882fae11c3b9732f3d3316da048c04767ac4429c0433c36f87d8705263e3376f97a7e1f66a9d7a518632a67b6fe617590a WHIRLPOOL a4c8be522d5e900e01cefc0fc6d196e3e49e45e2daffa9ec22b2dc44deace506da5a4cf68afd04b0062b87ffcd27b6e59d0b8ae71cc2304d5080d066174e95ed
-EBUILD apache-tools-2.2.31.ebuild 2154 SHA256 3a0897803e8e7751d12ba5796d1446204b8cfc262f339caf5df103d03090c181 SHA512 ee6d208a81d42676e847f6502ab55361a4212a9a0eedb12eb8fc1039bf18af84bd969b04526db0adaf05ab8c50f1d99a9425155eb34aed00f5f8272feb1e13a9 WHIRLPOOL 185d4500e1f73ebfb34bb773e52c1ca38291a2f1f1a10111a8807e0a8201b3e2cf2e68fb6cd9a8f6a626048f6dd67af63ec19366030f5e45378748e7fdfcdc3f
-EBUILD apache-tools-2.2.34.ebuild 1990 SHA256 2d38b93c76cc3d8bd45196bf63b86091becc277cabefa4e515abfd21f06e5f03 SHA512 361e835bfd379bd5edf02844f72510c6089ad3e2a311db9d042aaf1cdcbed1f70986e28173d958497b01f787a06cfac4f4969137b1e5e9b56cb43ff27eb7fad6 WHIRLPOOL e3602a6c628240961281612921a269b2c40315fae9350a73fa86c0ca3ea6946d3553624bd19a9a39200ec39959049bd2b0aae37172afe5cf7feba85f24feea48
+DIST httpd-2.4.29.tar.bz2 6567926 SHA256 777753a5a25568a2a27428b2214980564bc1c38c1abf9ccc7630b639991f7f00 SHA512 840982fd3d21463bc5c1747f211dfacf3abdf634d149e49bb49fd2e5deda140de602dbdf31e1bbe5337a48f718ab2261c408e83a8dd39a9291ee7b6b7a85639a WHIRLPOOL bd91e3baa3c2b25cb6a4e48062c38a97f9c941884be2e44805a3a08e1fdfb13bf18b37b6c7ab9e7656934f2d3b8c2893e79480ee119f073bfbb376b6c3e32a74
+EBUILD apache-tools-2.2.34.ebuild 1989 SHA256 4d01baae38b96247523ff6220f71908ca5e9c04c06084420841b0c1cea40217d SHA512 1041e7e11bb9fab007fc2e013d23b35732be287e67513fcbbb318988b224260993654e272d4ec9d76075e1dd449140c28a28c0009a49407fe880e33114743dc7 WHIRLPOOL f607531b302bcc91aeed2923d07c35b7e279496284870a5c8f8f44a4d72c78cc6223e5fe108e552906b4f4faca3fe04c03befd4f7fcf479269621e75cdad520a
 EBUILD apache-tools-2.4.27.ebuild 2665 SHA256 a4a00940d981ba9e1fce7d0b9737fb044e63c7f588ba2f0212d1776f615f97d4 SHA512 a6fb3773dddad5cc2f9ef78dd84b716c18194a77b25c4f096d7b3fbb8feac40d6c48ab1dabad7fdf065e4a25624a6ea9d8e2c092b05a711e8a1b980503863435 WHIRLPOOL 02f1c15b64dd5ca3a6f3ae963e9a3a2753887d2791a3ddda161622d6691380ea5bd439cfb851d9d3f1bf227e4af8d962aa4ddf6607ce6b87a4e0e3c4adca2c6c
 EBUILD apache-tools-2.4.28.ebuild 2674 SHA256 e1192010d093e007643ba1d6f43e62590969e8b6e72351fd256e2853b4bde00f SHA512 0c389a3b8f5edb9b63b2248ab05e9441478cfd7f801bd9e389845c4ffbe7521d09f21b78f91d681935ac8ce8615f55782ed8bfe1f79fb5756f718f095b2fe89f WHIRLPOOL e27f202caed6995f9c0911e6a75d02d84bbc4cf5f5758400c2cbfb83143f3fdff0685ce7ee95194a7fa8f1a86bb4e153e98eda1c0aeae1bdc559e7b850ed8c45
+EBUILD apache-tools-2.4.29.ebuild 2674 SHA256 e1192010d093e007643ba1d6f43e62590969e8b6e72351fd256e2853b4bde00f SHA512 0c389a3b8f5edb9b63b2248ab05e9441478cfd7f801bd9e389845c4ffbe7521d09f21b78f91d681935ac8ce8615f55782ed8bfe1f79fb5756f718f095b2fe89f WHIRLPOOL e27f202caed6995f9c0911e6a75d02d84bbc4cf5f5758400c2cbfb83143f3fdff0685ce7ee95194a7fa8f1a86bb4e153e98eda1c0aeae1bdc559e7b850ed8c45
 MISC ChangeLog 10183 SHA256 4160609514d162d5b28196a6b3a90b27cbb38ca71e9f4a8abdbae628d76a8e66 SHA512 b53f5eae871b1183b7230969cca04477a09cb263e5f6a95744831247d8c65aa95fbe5d639a184a4136de537223745500e43f36982c77d3bb0243158bd74ef664 WHIRLPOOL 8c9a2298544d2c4a91470ef3147e34e750a0cc687882511a8f6273c3073ec878a5e60536af3edab0d16d664daa57c6ce233016ca07536ae5784e2f332bed0c9a
 MISC ChangeLog-2015 27945 SHA256 5d6bee2eac0905e873ea8986ec7bc3d4bee37581d931c09e55e6ab8c414b2d83 SHA512 f2f602931d36aaec1068c643729dabc4cc30c2a936cd418f48cef14dcc25d0e6eebb79cd003667a38e82e0eddbc2c5f6b35801314c1d0fce08643713ceeb00e4 WHIRLPOOL 01ed580519a15a2b7d4b89a1ed5f7bd223eefbd6e4d3804802ae5970f08125c02b64db936c6f401075844f2a5e608499cad29963cc21d97bb3a625d58671146c
 MISC metadata.xml 508 SHA256 6278b055b895401969703dc8f7a8d49244543e693e77bf57be03485a76f518b2 SHA512 0837c71bf2c7d2c54b7f6e3fcc4f5f1f42b36d6e14a981e38d77089551318db72c731a5d0eef0fd95ca55e69629a790f2e6719ecb59368cd7dd935ebafaa89aa WHIRLPOOL e07c6e0a11487f30d482e847cef17aa6f6c9365f469e5f9debf057a93701d91ca82d014b1d89799abdbbf0203d3ff3713c502bc605c7b74a1179c3330dca256f
diff --git a/app-admin/apache-tools/apache-tools-2.2.31.ebuild b/app-admin/apache-tools/apache-tools-2.2.31.ebuild
deleted file mode 100644
index 164fa3333408..000000000000
--- a/app-admin/apache-tools/apache-tools-2.2.31.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit flag-o-matic eutils
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="https://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="ssl"
-RESTRICT="test"
-
-RDEPEND="=dev-libs/apr-1*
-	=dev-libs/apr-util-1*
-	dev-libs/expat
-	dev-libs/libpcre
-	kernel_linux? ( sys-apps/util-linux )
-	ssl? ( dev-libs/openssl )
-	!<www-servers/apache-2.2.4"
-
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-S="${WORKDIR}/httpd-${PV}"
-
-src_prepare() {
-	# Apply these patches:
-	# (1)	apache-tools-2.2.20-Makefile.patch:
-	#		- fix up the `make install' for support/
-	#		- remove envvars from `make install'
-	epatch "${FILESDIR}"/${PN}-2.2.20-Makefile.patch
-}
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
-	append-ldflags $(no-as-needed)
-
-	# econf overwrites the stuff from config.layout.
-	econf \
-		--sbindir=/usr/sbin \
-		--with-z=/usr \
-		--with-apr=/usr \
-		--with-apr-util=/usr \
-		--with-pcre=/usr \
-		$(use_enable ssl) \
-		$(usex ssl '--with-ssl=/usr' '')
-}
-
-src_compile() {
-	cd support || die
-	emake
-}
-
-src_install () {
-	cd support || die
-
-	make DESTDIR="${D}" install || die
-
-	# install manpages
-	doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm}.1 \
-		"${S}"/docs/man/{htcacheclean,rotatelogs,ab,logresolve}.8
-
-	# Providing compatiblity symlinks for #177697 (which we'll stop to install
-	# at some point).
-	pushd "${D}"/usr/sbin/ >/dev/null || die
-	for i in *; do
-		dosym /usr/sbin/${i} /usr/sbin/${i}2
-	done
-	popd >/dev/null || die
-
-	# Provide a symlink for ab-ssl
-	if use ssl; then
-		dosym /usr/sbin/ab /usr/sbin/ab-ssl
-		dosym /usr/sbin/ab /usr/sbin/ab2-ssl
-	fi
-
-	# make htpasswd accessible for non-root users
-	dosym /usr/sbin/htpasswd /usr/bin/htpasswd
-	dosym /usr/sbin/htdigest /usr/bin/htdigest
-
-	dodoc "${S}"/CHANGES
-}
diff --git a/app-admin/apache-tools/apache-tools-2.2.34.ebuild b/app-admin/apache-tools/apache-tools-2.2.34.ebuild
index 52873291bcea..2b4760c96f25 100644
--- a/app-admin/apache-tools/apache-tools-2.2.34.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.2.34.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="ssl"
 RESTRICT="test"
 
diff --git a/app-admin/apache-tools/apache-tools-2.4.29.ebuild b/app-admin/apache-tools/apache-tools-2.4.29.ebuild
new file mode 100644
index 000000000000..efe38de48918
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.29.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic eutils multilib toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/"
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+IUSE="libressl ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1
+	dev-libs/apr-util:1
+	dev-libs/expat
+	dev-libs/libpcre
+	kernel_linux? ( sys-apps/util-linux )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
+)
+
+src_prepare() {
+	default
+
+	# This package really should upgrade to using pcre's .pc file.
+	cat <<-\EOF >"${T}"/pcre-config
+	#!/bin/bash
+	flags=()
+	for flag; do
+		if [[ ${flag} == "--version" ]]; then
+			flags+=( --modversion )
+		else
+			flags+=( "${flag}" )
+		fi
+	done
+	exec ${PKG_CONFIG} libpcre "${flags[@]}"
+	EOF
+	chmod a+x "${T}"/pcre-config
+}
+
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	tc-export PKG_CONFIG
+
+	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
+	#append-ldflags $(no-as-needed)
+
+	# econf overwrites the stuff from config.layout.
+	ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
+	econf \
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules \
+		--sbindir="${EPREFIX}"/usr/sbin \
+		--with-perl="${EPREFIX}"/usr/bin/perl \
+		--with-expat="${EPREFIX}"/usr \
+		--with-z="${EPREFIX}"/usr \
+		--with-apr="${SYSROOT}${EPREFIX}"/usr \
+		--with-apr-util="${SYSROOT}${EPREFIX}"/usr \
+		--with-pcre="${T}"/pcre-config \
+		$(use_enable ssl) \
+		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+	sed -i \
+		-e '/^LTFLAGS/s:--silent::' \
+		build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+	emake -C support
+}
+
+src_install() {
+	emake -C support DESTDIR="${D}" install
+	dodoc CHANGES
+	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+		docs/man/{htcacheclean,rotatelogs}.8
+
+	# Providing compatiblity symlinks for #177697 (which we'll stop to install
+	# at some point).
+	pushd "${ED}"/usr/sbin >/dev/null || die
+	local i
+	for i in *; do
+		dosym ${i} /usr/sbin/${i}2
+	done
+	popd >/dev/null || die
+
+	# Provide a symlink for ab-ssl
+	if use ssl; then
+		dosym ab /usr/bin/ab-ssl
+		dosym ab /usr/bin/ab2-ssl
+	fi
+}
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index b5546349f237..ec8b9390cf13 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,8 +1,8 @@
 AUX calamares-pkexec 43 SHA256 1a9c278c085bcb7cb3b1027bf6ad19d153492667730afd2b94c8736387355168 SHA512 768148cd58cdfb5c6791b76ec60c21a4ca852120f53ed31a83bc7a2e0a26aa77b10bd3756182d3dff03208e820def4b83c45edba0484fa2f5a33c93880c3f4bb WHIRLPOOL bda196e8adb3b9207e9f98677dff5a4664504c114ab72bd0879d8518b74b95b558a2c90bcc612dd6f570b04c9f21fd5b46a51d55dd0f73b4fa288b3482d61f4d
-DIST calamares-3.1.5.tar.gz 2266110 SHA256 02bd3c10e06ac207cdee0ee29f8d20bfe48eba491800e3eab704e1d294736260 SHA512 92e29668ddab880b76319fbf4eeffea21bfa0bd5b8807cb5a2c2786eafe4921f442a9a5773243fafe5942a346d46b89285e9472d4c8da70b70979a049923df06 WHIRLPOOL 74b396551aee5c7831b05a0c40df56f047bf6bd1fb0c9e3e51b2791696b9e19eb1db78128c1167a668d0d4e412cddbb819c807dfb52cc8bea667307921752a80
 DIST calamares-3.1.6.tar.gz 2266993 SHA256 d18d50aca6dc8b8d4d4933b507fdaabeb607adc9c9c14646f1031c005aeaaf98 SHA512 d6e7fa5a040e507141bbd6b3863f5743b9646e503cfec26ed710718835a782b0acf582f24959eb52d906eeca60061d39e01b4a542c3d83535efa17eb4a5b0b85 WHIRLPOOL 3fc71da001282cbe7c670b192335ddac460f3fb053849a51d95d9113b6c31a27ff65ce64811ca26c456ec01911ce8685d73c793183e71bc696cd896f9bf38507
-EBUILD calamares-3.1.5.ebuild 1974 SHA256 e085c918ef2eabc105c18edd8ccc071e76b71a48f384a969cb185def6ccbc754 SHA512 e6b308f8fe540fc520d4f071e6276e924dfbff7c0176a3b27bd0ca9ebf400ffdcbf54483cbcdcc2eaca11bf72463ceb80505262f5dfa06c4c02f519d645c8b38 WHIRLPOOL c7a51d470b9c62172866746df925699bdc96323f07a2e85d291d5eeb37d36f7b253e8dde2aeebb1d676efde79c71467731507f7198a10b82323637fc0b768d5f
+DIST calamares-3.1.7.tar.gz 2275893 SHA256 91ffee72df1d222c50db81c3f48d44e617019db95d1f58ab16a962b1fb47d749 SHA512 eaf516db4d97b89a5854c5dac5fd556a2deb47bebb88e7c55e2bb7d4ce050e913afbf08c6536503f5c3af7427a43b75f67bfa317e1601bb5a6f05f17c5bf6760 WHIRLPOOL 71e248e3dd8a9e05b5a0d25807607c3d026ba896835edd559ce716c9edf5ae8b840570ae453772558cd05757d99acc09c90f23423045f1754cd56b8693b99a4d
 EBUILD calamares-3.1.6.ebuild 1974 SHA256 e085c918ef2eabc105c18edd8ccc071e76b71a48f384a969cb185def6ccbc754 SHA512 e6b308f8fe540fc520d4f071e6276e924dfbff7c0176a3b27bd0ca9ebf400ffdcbf54483cbcdcc2eaca11bf72463ceb80505262f5dfa06c4c02f519d645c8b38 WHIRLPOOL c7a51d470b9c62172866746df925699bdc96323f07a2e85d291d5eeb37d36f7b253e8dde2aeebb1d676efde79c71467731507f7198a10b82323637fc0b768d5f
+EBUILD calamares-3.1.7.ebuild 1974 SHA256 e085c918ef2eabc105c18edd8ccc071e76b71a48f384a969cb185def6ccbc754 SHA512 e6b308f8fe540fc520d4f071e6276e924dfbff7c0176a3b27bd0ca9ebf400ffdcbf54483cbcdcc2eaca11bf72463ceb80505262f5dfa06c4c02f519d645c8b38 WHIRLPOOL c7a51d470b9c62172866746df925699bdc96323f07a2e85d291d5eeb37d36f7b253e8dde2aeebb1d676efde79c71467731507f7198a10b82323637fc0b768d5f
 MISC ChangeLog 7327 SHA256 06876264cef6e8962030c803f3add9300544f649cd1b76266580629be569e897 SHA512 66c97585da7e7083117bd87828614f7f003e87ef90fd5f232153b7de58bb44573dacb648ebd697b92765ac081b84667601c636c3d33b33c5293a8e5887e5a5b7 WHIRLPOOL 6a131253a3cd20cd043be6c32be5acd737c7e74760efca0237a06f514e9a58c92e18703fd20ad47ccf5d8b5137eea7cdf1f05b72087f7ff485114ee2e57c7182
 MISC ChangeLog-2015 671 SHA256 0e30b76881788f8c37df34e842750d456934309aa7e72026870766986f94f978 SHA512 707ea2c09d816d98ffce58fe26b62d85cfdabe4b8967208fc4e870cc12162381a335646be30a9bdfb16f17a90f359f3168dd9bf0d85513368f8707de06a935d2 WHIRLPOOL ccef8a153f1546f1ffc2f5a4433f87703715e86555445add9d75542550ecf62b9074117977fc3761c85b5205bbef3b168a8032069826b4335d756694fdd26faa
 MISC metadata.xml 1055 SHA256 8fb8c7c1b36c5350743885f9e922cbfdc8e2396f5b955abc5651c7a140da08ed SHA512 0269dad0b0a05e7c729ad5b9f1f7d6790c117b0d76b904dc909b868b1c298ff3352faafe91104b39cfc3c2e4f5e1a20244d3f5321c937d2334bd15bd910dc89f WHIRLPOOL 30ffb01457383c8d69cfea217c66d93123cf17a15a9553101013d64b6328f1f9b51ec42e3e5215aa0b71241355364bbccace3ea32baa23b072c32a76d7c6113d
diff --git a/app-admin/calamares/calamares-3.1.5.ebuild b/app-admin/calamares/calamares-3.1.7.ebuild
index 780fcfe4fd0f..780fcfe4fd0f 100644
--- a/app-admin/calamares/calamares-3.1.5.ebuild
+++ b/app-admin/calamares/calamares-3.1.7.ebuild
diff --git a/app-admin/cgmanager/Manifest b/app-admin/cgmanager/Manifest
index 4743ddc4adee..a55d86831f94 100644
--- a/app-admin/cgmanager/Manifest
+++ b/app-admin/cgmanager/Manifest
@@ -1,9 +1,7 @@
 AUX cgmanager-0.39-make-pam-conditional.patch 1068 SHA256 ed638b63b6e893a664378f7ab22083410225639c8bda431c283c8c728cd8b745 SHA512 d7673d3189af0279f9b34a94f8fd7631ab3dea68df5df11cdaaa541e4978ebeaae8d0fc91f9cf331853cd96dab6d9b284adb469d409fb58f5bda262bf96fbfa2 WHIRLPOOL 3f00abbf764411860250471fa418c1d5e30419e3f4e58f76f25aa54d91587713163fa7e5bfbe2d1b3ae89f29cd2fa8fda6f8a16e816b315739a53e504af61440
 AUX cgmanager.initd-r1 331 SHA256 f162685428a6593630daf5d636c198caf4992843ced977dc6d7288b7559a062c SHA512 f50afaf471f9e9d500cbc909da1185c1342481699eb1887f694ef91bd49c7cd727d21871ff5d6c0b6046601cfa72a4ac167926c62920b2f3a4902ec817401948 WHIRLPOOL 769e94196151bf11b9ca0ec5a190b85b47860e75d65a4bb13f624fd80794ad656b60d99cc6b28a56273b79d89431cd3c625ad3386d3c861f3bf252ec7b182d11
 AUX cgproxy.initd-r1 661 SHA256 97220fa0af6dcaa9d2cb726620ee3de8e216e55bab37cea40e5ed010ed637e35 SHA512 7f43ea6369428d71d122a191c6a1718987ed09eafe2217ae326606ddf2a50f0500d0de0520fe21e5d2edefb8ddd4c3a85623d2aac1212e821ea922cb8256fffc WHIRLPOOL 46931abeeb41bc572f195e0848d42d189df6e001b86b244c9dac5a9f1615f52491c81c3823b9d03ad97e13b4f3ec578174b84ecac5e31d2e95dfd3414cb64993
-DIST cgmanager-0.39.tar.gz 437683 SHA256 9e65487fb4e4aa0a6acd87ba7f8f00b8007d8c52608aa6d411e72e6fe9445b7b SHA512 2adf2c639191fb681ffed083629d6ba93f6d5a3534d4dc00b2cff1917c3273febcb30ec7d524ee95ce4a1b8811d902a2ff1cdffe911a66850fb9f10750ef1801 WHIRLPOOL b57c0feb75543af7e7eadccd5287962034fa2c54883289822b54ed184873fb1b6e1eb6d9dcc952fcda2f3027d84fa517c2bfed22a855ede8e700c2298d5d210a
 DIST cgmanager-0.41.tar.gz 461805 SHA256 29b155befb3ac233d5d29dbca7c791c8138bab01bfa78ea4757ebb88ce23b458 SHA512 e8ba64665a21d987cd835580c2b6bafbcb05e22ce7f6216762d04840957c2cd21fb571360e0206ae9143656beed88ff3396eb1f644052c05189093a665a705fd WHIRLPOOL 4571c88415f24dbd3aae240e2427e27786538653602b4b6ba862eff1abd7fc8b2f97784ca5bced4481f738638030a5777f3d687ee5d115492d7a91ebf4985ab1
-EBUILD cgmanager-0.39.ebuild 1333 SHA256 f7c29d99bd193495480d437278b836dd78ebaee29fd19902299b0d3c80a40be6 SHA512 94bee732d5068fc8a7063f5a6dae65eb45a4d2d7e054e33554d756e8a2515bb660caf1effdd7feff8aefdac3efcefc0c4264e81d3fa03fee5c565e995eda693a WHIRLPOOL 4e0595eef76c5861a4d1d0dca834e2f11c2a6d7ed66a5bcac6b67f9e78a71dac9c526f00a2422c15b26cc00fd29d9d2d68a8f3e18fc6e4d8c8cbf859c2b6b46d
 EBUILD cgmanager-0.41.ebuild 1234 SHA256 ba7aba502daf07b38651a67fed5d75f17cb8f2752888e937cac59ebc48e678c6 SHA512 b5236eeb934b5a8679a965783ef187b4b3f603b69d37d1a572ea1c8a0f22bbd78c7339cad4aba8f4ffdf3970dc647cf46c1b132e18f19c4fd7057031fd06ba41 WHIRLPOOL 80e26f9e4c718abd959a01a2f3e457486c95aa3830f0b7853a21560fd292376765b164112dd086e32701f55a95bf94367203653bf194bfa4e7c3ef90f7b565a4
 MISC ChangeLog 5834 SHA256 dec321c1c0ef10f9f7a0528aa31395ae91a1dde36d9edabf412010308bf27c5a SHA512 480524d8362e6adf849c8206c4c9fb31a58140bde59a8ccc21062c2859b5aa0b50800ac867254039a0f0586cac8a0da62e1b16d4f1287002a9386d5dd452be5b WHIRLPOOL 00c753a142763c2a6bfa73d200c40c0060c784333817ef0dd063de6e8cb7c31e26799df4655c25b520f7eb62f39bff689fd85f6a24c1611f983f65387d6e51ad
 MISC ChangeLog-2015 1411 SHA256 98ad80d5d71eeae2e4b1a74749e10ef94073e6cf3d2af6b3380c94cfcdec34aa SHA512 30ea6c095bc2d429288c1137b45acd298458c56f3669fbe580521c4ea11c8747697546fddf80efb7924e3d5cb5d038a60ae71718352f1b3ba748a4b6272041a0 WHIRLPOOL 7e63e060b71050272a5067e82e5a346013657b11ef507f94f1488fceddd499210a798e61133d8fd0b40a213151f6cb0d2e905eff9c49408afce57dc9936ce5ee
diff --git a/app-admin/cgmanager/cgmanager-0.39.ebuild b/app-admin/cgmanager/cgmanager-0.39.ebuild
deleted file mode 100644
index 95c7b5cdff4f..000000000000
--- a/app-admin/cgmanager/cgmanager-0.39.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools pam
-
-DESCRIPTION="Control Group manager daemon"
-HOMEPAGE="https://linuxcontainers.org/cgmanager/introduction/"
-SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ppc64 x86"
-IUSE="pam selinux"
-
-RDEPEND="sys-libs/libnih[dbus]
-	sys-apps/dbus
-	selinux? ( sec-policy/selinux-cgmanager )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch_user
-
-	# systemd expects files in /sbin but we will have them in /usr/sbin
-	pushd config/init/systemd > /dev/null || die
-	sed -i -e "s@sbin@usr/&@" {${PN},cgproxy}.service || \
-		die "Failed to fix paths in systemd service files"
-	popd > /dev/null || die
-
-	# there is an automagic dep on pam
-	epatch "${FILESDIR}/${PN}-0.39-make-pam-conditional.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-distro=gentoo \
-		$(use_enable pam pam-module) \
-		--with-pamdir="$(getpam_mod_dir)" \
-		--with-init-script=systemd
-}
-
-src_install () {
-	default
-
-	# I see no reason to have the tests in the filesystem. Drop them
-	rm -r "${D}"/usr/share/${PN}/tests || die "Failed to remove ${PN} tests"
-
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-	newinitd "${FILESDIR}"/cgproxy.initd-r1 cgproxy
-}
diff --git a/app-admin/cli53/Manifest b/app-admin/cli53/Manifest
index df8399b90a10..a8a2ed51af8a 100644
--- a/app-admin/cli53/Manifest
+++ b/app-admin/cli53/Manifest
@@ -1,4 +1,6 @@
+DIST cli53-0.8.12.tar.gz 973966 SHA256 cf8511bd283fe9fdc7fdf493706e9f8b4902f27b9d51e6a6dc601e16472cd129 SHA512 abe5e092fb570336b2d50099934d1cc5e722e394155b86de2dc2315df70eb1a89bb57f131913ec2dd588b6476c900c9d07daab0e8396e8364548f92651377fea WHIRLPOOL ccaf6e670613e74c6087408483fcb2fed6562a042abc7e61ebe995ce7f76b2122cb4d5baef45688896991954f326191a9c80ad33dc4b6fb6848dbed0262f58ca
 DIST cli53-0.8.9.tar.gz 4372517 SHA256 c3b17d5b445d9bbfe3caf9552d4c0bbec649fd630e8eb13cbb5bc49522b02d73 SHA512 14db2d69feaa5af9e82c77b6c837be55a5d97e438eb6efbb71857fa1630ec1aa5ec77648d0979ce69ca8fcf72478b55c55c12a5e5dbac20415e656fd9c8d0beb WHIRLPOOL 2606a227142211e06096467143106e5657ecc5f2072a3450dbf41af440bfe3dbdf1d385a55accb38c625e42501e3077926e2bee0265affac66b7c0d6f7413b76
+EBUILD cli53-0.8.12.ebuild 673 SHA256 e98676dd1e446cbd73204600450b89cf69331a57b70cff7afc7b142f0f81e3aa SHA512 d4935cf863dd45b05d1c099af76943c6b79bb5ce6830d7c9b730e49cc0ed4e0169037291e9f193b445f4b5d58bd86f0b0441a6ea92bbe1d150ac3b2d01a03590 WHIRLPOOL 27081b5da3e557c7148d9f3d7034e70ff5f288cf5ae1beeb71c113648ff43183823b6a53b6771f5e692df6c8e7b49beffa38847ebd9fb637fca52aa876a591ef
 EBUILD cli53-0.8.9.ebuild 673 SHA256 e98676dd1e446cbd73204600450b89cf69331a57b70cff7afc7b142f0f81e3aa SHA512 d4935cf863dd45b05d1c099af76943c6b79bb5ce6830d7c9b730e49cc0ed4e0169037291e9f193b445f4b5d58bd86f0b0441a6ea92bbe1d150ac3b2d01a03590 WHIRLPOOL 27081b5da3e557c7148d9f3d7034e70ff5f288cf5ae1beeb71c113648ff43183823b6a53b6771f5e692df6c8e7b49beffa38847ebd9fb637fca52aa876a591ef
 EBUILD cli53-9999.ebuild 673 SHA256 aeda60a22da719c5c5083c16d23f93c3fc19110354fe32bb0d8793d51eb33111 SHA512 0fe48f48ede9500a63bbeb03f4da47aaa4235fb0fa2c29519b3860adda4c37a5a0e97587d5825ae75d97fedcef4fce5837662c7ccd88b2f6be9c3011cd73b201 WHIRLPOOL cdaec886a9b050dcf760c3d92a07bf21aa9fb24102d9a5aaebda7c7ec369440f30dc5d64f3b7dcaa775a7ad23baabeddaaad94cf90e372f5b8585d40cc34b457
 MISC ChangeLog 2842 SHA256 d57c8f789553012233b74a4849cddb3699b7de309f8ce322f4ebfd8ef8b3841f SHA512 89f809f5927c29eab9a47d1d3d839e3d82064271997d027408e8c088aa20fae69496a7f72ae8c54d3b24afdb2f5a2ab46a91747ee5b6b200568938403cd3b80c WHIRLPOOL d13ecabc30fbc2cb6aabfd6de05c370ddcebcb14e92ea15dcb8896da4647845f3ae5b107a59ad0d004f09a4f25a33965f5f1c24b77d3a3cfe740ad188935ae73
diff --git a/app-admin/cli53/cli53-0.8.12.ebuild b/app-admin/cli53/cli53-0.8.12.ebuild
new file mode 100644
index 000000000000..c2d625e1fc6d
--- /dev/null
+++ b/app-admin/cli53/cli53-0.8.12.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+	inherit golang-vcs
+else
+	inherit golang-vcs-snapshot
+	SRC_URI="https://github.com/barnybug/cli53/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Command line tool for Amazon Route 53"
+HOMEPAGE="https://github.com/barnybug/cli53"
+
+LICENSE="MIT"
+SLOT="0"
+
+EGO_PN="github.com/barnybug/cli53"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}" emake build
+}
+
+src_test() {
+	GOPATH="${WORKDIR}/${P}" go test -v || die
+}
+
+src_install() {
+	dobin cli53
+	dodoc CHANGELOG.md README.md
+}
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 11fe28cadf16..bf14ffa55870 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -5,12 +5,10 @@ AUX consul.logrotated 85 SHA256 9c69976b13ea56155e8cc9fc70327d8b7a24a0dd01f67c5f
 AUX consul.service 354 SHA256 e36670c1d1189403996ed74704c1751666d4bb2340d5c62f0bbedcfdd48ac539 SHA512 537d35e5a79d40dc62f6eb04f4631251d1e6dd62f2bd7d5483274903996052705db5fb4026000ef6e768e3dafb02f155c5bc1fd15a32813ecca8b1348a95e92d WHIRLPOOL 263352c1372f76f4676e69e7f66362eea69df71ef26d097928c6b02b7a464ce747a7f0d6acd2b01eaa2b62f88ba54bf96879ea3c1f9fb10c42dbf6eaf403ef8d
 AUX data-dir.json.example 36 SHA256 1f1f24ac4b37df816974fbe3e3ba3d7ed1c8d15cb2425ba29b196329473bf38c SHA512 cca94745ddfdcfedcc612da4a14965d4f51f0eaf519d8395e95b8b6cbe7bcb9987b8fdbffd66fb13edda7164a7b0f26e93e5aeab9e631cbf5e0a3a5c05b84b0b WHIRLPOOL a866a28ae0160a138b19c2f8bde315f175932d1bc5ac9b77823cf8e5553644520b5ab2f7206404522e25f3188d83a18001d3631a681e27ae0252c472d231c03f
 AUX ui.json.example 17 SHA256 a90eb6376a8d69443c5f72b434c84ba51280a64d9831adf3882fe548f65c391b SHA512 9aebf80a0dd2bc5345285b63c894af8c0d5864f352d97fc3ba7cd6bf22b905ace3bd221cf23092080e9f7d60832384632c2f069d580eef789eb3f81011e9869d WHIRLPOOL 40ec22ab7c14627f6fa2352b663a3f1545f259e813d14177e591dc52d50de2612d08f53976ddc581e2bef384a11caf22cad41feed521154245eef88537ee6e84
-DIST consul-0.8.4.tar.gz 6614287 SHA256 d5573d6e70d490c8b8109722c2019b5a2b35eff703b92d6276997846361cff1b SHA512 4bbb167a603f1d20940330bd9615ba0f50e0113e1d96ce47773f5d2813635f76dd1aec8f43dae4c8c547cec8a891eb0726eeeda7bd7c5b1d495029b359378e68 WHIRLPOOL e270367c69fe74f25c89ef9e8c7f71307d3b8e48b4210e43e48907f1f5a73f11f45aa2b212f70c24463e35d800b861ccd34e2c82de863fc6e7da9cd3eda5214c
 DIST consul-0.9.3.tar.gz 7278357 SHA256 69b76432203e046a8025ce13f7cc041b2308d72f07f240a57f2ba5d580fcff70 SHA512 a1c9cdd3e197afbf088bd1866af15c1864cb8d042dc65d2fcc0d9070b8bf2f9380cf2ceadaff6d5bba7ecd379d53f4b8191e1ae6832f1b2c82f21c62f07d8b0f WHIRLPOOL 9e5ac311761bc786c986d4b0cdb4ba541a46f57cffd8cac4de96292293518cd8e8f3743bcb0740b245ae5a30f9f157987078874503bd6b0685a9f3c88c92ffba
 DIST consul-1.0.0.tar.gz 7354292 SHA256 60e86cf77c3287edc98f8381c046bc876f969dd97dea7adc68019bff2207af7a SHA512 8223f79aa1b7bfc5693168b56fbe9a506ca504771c92328afeb99e78dce8699c7532582749a372dfed10dd4b7c440ace0dd248f1ae27247059da3e2f88293a88 WHIRLPOOL b40a450efc9587475ccf0f0080c0fb03769557487b3f9a29df9454551149a8235e240aacd82849736f9160d10aee1e04a76035b9bab716b244f7cb13791ff43c
-EBUILD consul-0.8.4-r1.ebuild 1524 SHA256 54f280e236dda24eda7da07f1feed8790b6f493d289b2d3455465f969172454d SHA512 a262f9fcffdff04f28a6e5be42a0037ab15a774675ab32b0d6cdfb1a7c695b9f859e2c189736157c558bef98d21a2cefe48c4556c823667b64ef4578c9541b84 WHIRLPOOL f6fa7c0857d7a470f5ff6ede65ecae00e77a504581b8a04048b314f58e82f950ab84fe4ae0b011c43cbede96ef6e811c57c77f238d870d4c59906c65a0447787
-EBUILD consul-0.9.3.ebuild 1560 SHA256 abff01f71390db4c05ec895508e7f81b9ba4f59514f4e839dc8b5b13407a4a40 SHA512 0b04e487febd8e65b0a24df723fd20532a04506140217a0b4fa671038bcbebd9f7f3d6014b4937871cd05ca1a037ec2ab66a6c3cc045d8b02caed0f61ff90061 WHIRLPOOL dea3ba50f56ab4db18036f04c1bca501e2490aadf99e2de2a0812e4ae9340817b67617f7afec890a9821285162642c786c9500029bbdad7043d8b1e66b3d5dea
-EBUILD consul-1.0.0.ebuild 1560 SHA256 abff01f71390db4c05ec895508e7f81b9ba4f59514f4e839dc8b5b13407a4a40 SHA512 0b04e487febd8e65b0a24df723fd20532a04506140217a0b4fa671038bcbebd9f7f3d6014b4937871cd05ca1a037ec2ab66a6c3cc045d8b02caed0f61ff90061 WHIRLPOOL dea3ba50f56ab4db18036f04c1bca501e2490aadf99e2de2a0812e4ae9340817b67617f7afec890a9821285162642c786c9500029bbdad7043d8b1e66b3d5dea
+EBUILD consul-0.9.3.ebuild 1577 SHA256 f75f253a354b47f0c8a82904807af3bb5ba9e4d408c68b31f3e3e934ec84ca45 SHA512 df46eaa2a8dfd4810ca069458854bd930d478f017c9c76e66bcd48d093825b3698738754a65608e3f10a7ba948bdcf55c51e109f10d44bc0405c678440c1aa7e WHIRLPOOL 7d95fb8915197d558831ea11b4ae900a19506eed8052161a589d8d7fdf55d02b2c59013b00b9de48215b388d7b6b804f924a7f32894586ec4e1ce53f9229ece2
+EBUILD consul-1.0.0.ebuild 1577 SHA256 f75f253a354b47f0c8a82904807af3bb5ba9e4d408c68b31f3e3e934ec84ca45 SHA512 df46eaa2a8dfd4810ca069458854bd930d478f017c9c76e66bcd48d093825b3698738754a65608e3f10a7ba948bdcf55c51e109f10d44bc0405c678440c1aa7e WHIRLPOOL 7d95fb8915197d558831ea11b4ae900a19506eed8052161a589d8d7fdf55d02b2c59013b00b9de48215b388d7b6b804f924a7f32894586ec4e1ce53f9229ece2
 MISC ChangeLog 6414 SHA256 b6c3345f18332d9c9965b335a0b7c4246d852886f0c089f166d2c255d6e0af4d SHA512 664491d4dcef4abda009070a482c80a681f39a564ba7d983b8cf7a680db972550233e808bbaadecfef895c9990bb263f95c6273bf6b24c2f5523b660bb68e7d3 WHIRLPOOL 215e15b6c6379fb4e02ca41848e610ebec31946d24cb8f92adc4ac9b7f7675ef6d12679cf509e50cad04ac01587e335063c19f353f2880748dd1cd13928cf04b
 MISC ChangeLog-2015 1260 SHA256 e346cb99b0d823a6e4052d51aed1e13684aa9c7feeeb8a4b3027b74073e172a7 SHA512 9bcc7db86198b81da562dc68a3ebaa3505be6febaba7c21779580493a226fe7ec37e13ce1a3503ab4b17dfe0fc4e6e8b057908c2855c2b897318460ddc67d068 WHIRLPOOL 684c125f9d249b808024e89ad593c7c4219bcf59e4842d850118b728ef28219169fa6ae05e426fdb25b2cbe94c04b41c02748adc971df47374f57b4f6950cf0e
 MISC metadata.xml 391 SHA256 6b88704531e2782296e0491cf2b57c8bef914045a088c8c68c42b6cf0a655eda SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb WHIRLPOOL 344059242683458d3619a02327cf7e2919c43b940346d351c3d30a4dc91d5089491305ddd2193aad97c593a94151dd263bb7e3482447b3d7f914fa6c20199f4a
diff --git a/app-admin/consul/consul-0.8.4-r1.ebuild b/app-admin/consul/consul-0.8.4-r1.ebuild
deleted file mode 100644
index e12beae0d6c9..000000000000
--- a/app-admin/consul/consul-0.8.4-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot systemd user
-
-KEYWORDS="~amd64"
-EGO_PN="github.com/hashicorp/consul"
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="http://www.consul.io"
-SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MPL-2.0"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND="dev-go/gox
-	>=dev-lang/go-1.7.5:=
-	>=dev-go/go-tools-0_pre20160121"
-RDEPEND=""
-
-pkg_setup() {
-	enewgroup consul
-	enewuser consul -1 -1 /var/lib/${PN} consul
-}
-
-src_prepare() {
-	eapply_user
-
-	sed -e 's:^\(GIT_DESCRIBE=\).*:\1v'${PV}':' \
-		-e 's:^\(GIT_COMMIT=\).*:\1:' \
-		-e 's:^\(GIT_DIRTY=\).*:\1:' \
-		-e 's:go get -u -v $(GOTOOLS)::' \
-		-i "${S}/src/${EGO_PN}/GNUmakefile" || die
-}
-
-src_compile() {
-	# The dev target sets causes build.sh to set appropriate XC_OS
-	# and XC_ARCH, and skips generation of an unused zip file,
-	# avoiding a dependency on app-arch/zip.
-	GOPATH="${S}" \
-		emake -C "${S}/src/${EGO_PN}" dev
-}
-
-src_install() {
-	local x
-
-	dobin "${S}/bin/${PN}"
-
-	keepdir /etc/consul.d
-	insinto /etc/consul.d
-	doins "${FILESDIR}/"*.json.example
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners consul:consul "${x}"
-	done
-
-	newinitd "${FILESDIR}/consul.initd" "${PN}"
-	newconfd "${FILESDIR}/consul.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/consul.service"
-}
diff --git a/app-admin/consul/consul-0.9.3.ebuild b/app-admin/consul/consul-0.9.3.ebuild
index 1eae049ea45d..73999db91a27 100644
--- a/app-admin/consul/consul-0.9.3.ebuild
+++ b/app-admin/consul/consul-0.9.3.ebuild
@@ -42,7 +42,7 @@ src_compile() {
 	# The dev target sets causes build.sh to set appropriate XC_OS
 	# and XC_ARCH, and skips generation of an unused zip file,
 	# avoiding a dependency on app-arch/zip.
-	GOPATH="${S}" \
+	GOPATH="${S}" GOBIN="${S}/bin" \
 		emake -C "${S}/src/${EGO_PN}" dev
 }
 
diff --git a/app-admin/consul/consul-1.0.0.ebuild b/app-admin/consul/consul-1.0.0.ebuild
index 1eae049ea45d..73999db91a27 100644
--- a/app-admin/consul/consul-1.0.0.ebuild
+++ b/app-admin/consul/consul-1.0.0.ebuild
@@ -42,7 +42,7 @@ src_compile() {
 	# The dev target sets causes build.sh to set appropriate XC_OS
 	# and XC_ARCH, and skips generation of an unused zip file,
 	# avoiding a dependency on app-arch/zip.
-	GOPATH="${S}" \
+	GOPATH="${S}" GOBIN="${S}/bin" \
 		emake -C "${S}/src/${EGO_PN}" dev
 }
 
diff --git a/app-admin/dxf/Manifest b/app-admin/dxf/Manifest
index cb8356955743..d017bada09e6 100644
--- a/app-admin/dxf/Manifest
+++ b/app-admin/dxf/Manifest
@@ -1,5 +1,7 @@
 DIST dxf-6.1.0.tar.gz 281228 SHA256 e5e3bff461ed83fdcbb885f4022db07a336a9992b8257e651b9ab4fac13ebe5f SHA512 ebe0757e311a39bffa86728cbf875c0386e2d7e476c2cc1faf23d578f0d0f504658f9c256a9f6465c2fde351876a40a8c4fc1c5ae6308db8c93a9319e9732eb7 WHIRLPOOL f108b1f230f24cbd1990008c65c5c8bcd8afe033fe79b963412441a6cd1c69115ca4693c4db254681f08b4f9572266324bb82dad14a3f89c6382f1dc22c4063c
+DIST dxf-6.2.0.tar.gz 284243 SHA256 c3c927dd3c397683707ade3a909bb41e887d9a0b07f7f6efdd69c7b0f4793218 SHA512 b3498e6a05401be784aeb086be3db21199bc6f0fc206bbb31344b29b84289f56dc4001020597f77b6867dff9d5b14f6ab41c921df5dabc094520af5dd6fdea0b WHIRLPOOL f4a9a8981dc1abe2d12ad4fe48de1ec6d86ef2d4cb93c110ece9c9127c10dc79986237b340f14983080aea0fbea61e422555e18864966bb57830ddb27c8d7ca8
 DIST python-dxf-6.0.0.tar.gz 18059 SHA256 9f3b60f87be1f47bf03f26f4fcfa8176dccdcfa7ea0533a0a6bb89b05f96a1bf SHA512 fb502aac73f7e4ff6c2ef8e11887ec71093c9387857da4eeca222fba23bd669d06e0f085660637ad9774decb310b56ed36c14e29014de3e15108d77417309d41 WHIRLPOOL 2ceb04804a358c2f09b7c1cff15b15c5b0d249639a3909eb0401c06e523ca0f655d740fa3929009c0cef23932e3ce65e1b52a05e59c2bb127c25947e1c528f5b
 EBUILD dxf-6.0.0.ebuild 745 SHA256 22fa6c31b3df3ac652c1566563cad959f58225b221766b345a07bdf39f68120c SHA512 81c230987456bdddb83a59e01a511dc03a956732e1b7a4acc6d2bf711579705c7d4176c84c1f0267e6cdbe857572a55c5a52f143efa0a882671860e45a5b83a9 WHIRLPOOL c537cc3b7b29e6e80d954855c2f7531acb1a0ae7ec2a91272c4ee3315e5d1a0f1c7278f547c5e293acf18e67fd6f11aecbe10faf6d1d5f04f9ee2137126bf583
 EBUILD dxf-6.1.0.ebuild 728 SHA256 1b093ea69c871fbab335159ed5f2e20641446db8b82389430228f4b310b57f68 SHA512 41d2a28c394598f1fc78f1e335cf73e676ce55ab3fa95dcdfc67035206f5d47fdf7ff45421e969aa214d8a50fb7f850be92fa03df122e4f4c1d6b92675aad867 WHIRLPOOL 00e7e163d1cf5eaf7675adec1fb5d89fa2aafe74ebc3e1f35d8e5dff67b707ffba6f38f7de496db402a2914343e4f1949b9edc3dd5b4d4a88dffe3f09e3ed67c
+EBUILD dxf-6.2.0.ebuild 728 SHA256 1b093ea69c871fbab335159ed5f2e20641446db8b82389430228f4b310b57f68 SHA512 41d2a28c394598f1fc78f1e335cf73e676ce55ab3fa95dcdfc67035206f5d47fdf7ff45421e969aa214d8a50fb7f850be92fa03df122e4f4c1d6b92675aad867 WHIRLPOOL 00e7e163d1cf5eaf7675adec1fb5d89fa2aafe74ebc3e1f35d8e5dff67b707ffba6f38f7de496db402a2914343e4f1949b9edc3dd5b4d4a88dffe3f09e3ed67c
 MISC metadata.xml 373 SHA256 32f2fe0a92f4fa339312f0cfe976a28f886c7a9f3f66b73811704fb78ae832e4 SHA512 85d9b0ab4896713d2e796fede5635fc4bb80e402b2a6a7404fa1b7ba52e139a0ef27876dae39081c58a5ea8a5a78749b7fcc13c038b85c90c4286721931cb63c WHIRLPOOL f6466623dcc7dbe0925f7ccc0d2794bc59229812e6ba8196a8c46535e876fdcdb6cea6e22eb3246c347b144b9df75f882aba74b32357505867945da4846a11ee
diff --git a/app-admin/dxf/dxf-6.2.0.ebuild b/app-admin/dxf/dxf-6.2.0.ebuild
new file mode 100644
index 000000000000..4c3842e34cc1
--- /dev/null
+++ b/app-admin/dxf/dxf-6.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Docker registry v2 client in Python"
+HOMEPAGE="https://github.com/davedoesdev/dxf"
+SRC_URI="https://github.com/davedoesdev/dxf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-python/jwcrypto-0.4.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.9.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/tqdm-4.10.0[${PYTHON_USEDEP}]
+	>=dev-python/www-authenticate-0.9.2[${PYTHON_USEDEP}]"
+
+RESTRICT="test"
+# Require dockerd running
+
+python_test() {
+	emake test
+}
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 99a53d690356..3b16e9921fe6 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,6 +1,8 @@
 DIST keepassxc-2.1.4.tar.gz 3345520 SHA256 40a990dbcf442eb3cad99452b58ffd36e5855b39e78f213ea20e99fbc7876701 SHA512 48030eb6df595c73644f43d6222654c5f76962ae5aa2f44ca4dc9c8e45726380c6be4300af7a8279b07c06b70912da444f2b17c5b6c37a91cb239d695e7518d8 WHIRLPOOL da2bdac3e334b48903c6b20532ea4a0af0fe057e10e702ba6a4221e828b8f416d666ff67407b434d38b4cbbe5119d3c8a49927e4d5092f4f62ab49e30981017c
 DIST keepassxc-2.2.1.tar.gz 3880551 SHA256 184663e8b08e081dedf4c9dbdd68bf86ed0f5e32388b4781b7afcf89ef5c8e4d SHA512 bce2a0d6d3ad32bb507afac22670b34c37f5e36de6a30bb7c9b5a523c12bad59d95a414b90608451660fb9ce224279c7658e1892f2b99c673908449cc86e5595 WHIRLPOOL 32a0ede5c150bc4fc54c1b0a8f3c46110a19349d732913bdc9f3bc6492c1998569b2cd7a178ec9bb11e5b8dc9698138d8a7f26000211377a0c90f505605fe54c
+DIST keepassxc-2.2.2.tar.gz 3885990 SHA256 d36b21415f666d68eb130d739302759a0746b8df9315f828b44b7c1333c2d6a3 SHA512 73a167a79af56d4b6dbef7ce4050ca599f2c107a5c8af3b9e28241504572988b2d8b258135b7a34dfceae5a18cbda26b97ed513bbde14fe3d38e3f41b882d34b WHIRLPOOL 8dd6bf0e02d251f7a2b0dc2850d219257d9de6c856b03f7d867d1606cfed67d07c7126b1c9ccb1b843e26db8d15f9a8e76ce0514f42df12199418b71e2969913
 EBUILD keepassxc-2.1.4-r1.ebuild 1540 SHA256 3278a66dd4bc71729f00ab33e6748d467e6f1df0cad860057b8caec0ffedbe7d SHA512 7dcda961fda3b3166b2e38a878e2b2782e604c3373b67c358347746fccfa781082ce1c3417aeb8c1b76b8fc5ae94b38bff1442fc2477267b4a5096afdf1803ea WHIRLPOOL e4c0f0445cb2bed3c0c9b1c91e586ef83be009b608a6ac9850ab89dcdabea388ac862e8dea8afa8097028c649b1a90346ff8b376fdf8366c728bfbb349797ab0
 EBUILD keepassxc-2.2.1-r1.ebuild 1544 SHA256 fe045462fbd25433b4734c1b5aef97c0841f18412ecbf7182afadfb199ca4b0a SHA512 5695e22f30dc7e60c463ea4a0703111839345facb251e896526e4d5cb5d566516b939bc440c94e0a1b68272eeb458f47b8ddf1e529e5eb7037dca4b6698517a8 WHIRLPOOL b950f8b76eada1d6e6199a0e726083cff09fc7e0dfa449fc8ca61176ab631e41b520bc65960c13ce0b82acc6a9f0a68a13f8f94ff334a621637756cea5eb898f
+EBUILD keepassxc-2.2.2.ebuild 1544 SHA256 fe045462fbd25433b4734c1b5aef97c0841f18412ecbf7182afadfb199ca4b0a SHA512 5695e22f30dc7e60c463ea4a0703111839345facb251e896526e4d5cb5d566516b939bc440c94e0a1b68272eeb458f47b8ddf1e529e5eb7037dca4b6698517a8 WHIRLPOOL b950f8b76eada1d6e6199a0e726083cff09fc7e0dfa449fc8ca61176ab631e41b520bc65960c13ce0b82acc6a9f0a68a13f8f94ff334a621637756cea5eb898f
 EBUILD keepassxc-9999.ebuild 1544 SHA256 fe045462fbd25433b4734c1b5aef97c0841f18412ecbf7182afadfb199ca4b0a SHA512 5695e22f30dc7e60c463ea4a0703111839345facb251e896526e4d5cb5d566516b939bc440c94e0a1b68272eeb458f47b8ddf1e529e5eb7037dca4b6698517a8 WHIRLPOOL b950f8b76eada1d6e6199a0e726083cff09fc7e0dfa449fc8ca61176ab631e41b520bc65960c13ce0b82acc6a9f0a68a13f8f94ff334a621637756cea5eb898f
 MISC metadata.xml 819 SHA256 eef8083b85f448c94b9b84f542ac6894cb0d16e91f03a22e27d31cc744667d7d SHA512 b0607500bf25e7d4b504dd7fe0c03cf25f21cc32b79a0fe3a58d847f7ad2647c0452077ad8e16e1b2c63987ef68842b8d673fa0ebe657d918f27e0b163c8957d WHIRLPOOL aa80bba4cfa8cb4e5fadb8e36eced51596072c5a01a20b723742940dd1e7ec12a9ccd908fdf0ec04b8c703b81d6fe520a2f8aea4cae248afa9eafe12076e9914
diff --git a/app-admin/keepassxc/keepassxc-2.2.2.ebuild b/app-admin/keepassxc/keepassxc-2.2.2.ebuild
new file mode 100644
index 000000000000..15016b6c462e
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.2.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SCM=""
+[[ "${PV}" == 9999 ]] && SCM="git-r3"
+inherit cmake-utils gnome2-utils xdg-utils ${SCM}
+unset SCM
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org"
+
+if [[ "${PV}" != 9999 ]] ; then
+	SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="autotype debug http test yubikey"
+
+RDEPEND="
+	dev-libs/libgcrypt:=
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+	autotype? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXtst
+	)
+	yubikey? ( sys-auth/ykpers )
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qtconcurrent:5
+	test? ( dev-qt/qttest:5 )
+"
+
+src_prepare() {
+	 use test || \
+		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
+
+	 cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_GUI_TESTS=OFF
+		-DWITH_TESTS="$(usex test)"
+		-DWITH_XC_AUTOTYPE="$(usex autotype)"
+		-DWITH_XC_HTTP="$(usex http)"
+		-DWITH_XC_YUBIKEY="$(usex yubikey)"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-admin/lastpass-cli/Manifest b/app-admin/lastpass-cli/Manifest
index da69844af8ef..38ea6162a693 100644
--- a/app-admin/lastpass-cli/Manifest
+++ b/app-admin/lastpass-cli/Manifest
@@ -1,9 +1,11 @@
 DIST lastpass-cli-1.0.0.tar.gz 92311 SHA256 42096c0bd3972b0e9cc9cef32fbf141e47b04b9e2387fb3abe8b105e135fb41e SHA512 4709b3e4d6064c8c5cb593344e6417355d7df570240dce8eb77a19f3377ea38585280a9602cf8ab926c55c6afd84b297f261b0c8a40d355734d5cc542d46f610 WHIRLPOOL 394bfb597f5262dd1e47c7a3c48ef093b398f90c6dcacac6b172bb008891c76faf448ecf6be0ebfa277d18d335b166b7efadc063acc57ce88274004d1734bf21
 DIST lastpass-cli-1.1.2.tar.gz 102796 SHA256 bc737d8e6d713c8aecdfb7f34b29aa9a8ae9b1e9ba80b31059686b18591a8c39 SHA512 8115cb07cfca15ef402bdbd8ce943352e1534ddb781274e21cb0fafa4bcd9ab7abe4ddba57c4ebbce326f09cc9249f244607d16cac5597e61cf21c73417e7d9c WHIRLPOOL c7e6a4d5ac9b8c52f53e081b367289b390704fa4dfbf13a9ea0086e4ca0d49f9ef5a39f9ea854387ffb66fbd18f9b5263d17ae6573c4286fb7a36ebdce724d7f
 DIST lastpass-cli-1.2.1.tar.gz 108780 SHA256 1a49a37a67a973296e218306e6d36c9383347b1833e5a878ebc08355b1c77456 SHA512 c7c9f20dbc083873b815834320828a30a1c488571efbfc5aea47c3bd2073819d713810c785855d4c0c208e1b95aa0e5fc550a0b6b5c0f787eca1f54589e18e62 WHIRLPOOL c74988f37c96d065c0fea58c946c3aa3f4925d889247247b89ffe25012077d8eb3c694a3d539a40cf3f2be1fdd195b6ef6c1ef2d429587cc18fb8a8db8fb8a93
+DIST lastpass-cli-1.2.2.tar.gz 110045 SHA256 26c93ae610932139dacaff2e0f916c5628def48bb4129b4099101cf4e6c7c499 SHA512 7d211c7669fe2de3e3f34cf00025376fd39a7f96c8573a0eaff64f322daab03de21e25d5875d3286a794580ac75d330c7bfe1005b377afc2b13e4ded9d78012c WHIRLPOOL 0b3060e180b590999d3b3265140e8b060e017ae453fed74fe91c2f8d728a71ffcfac05e94b1eddb8575e9c6949b53364d0bfe037a9ae256a2a1c1e971ba1d12e
 EBUILD lastpass-cli-1.0.0.ebuild 1012 SHA256 181d3b59b7733521798cd2cf98dbf35aa13c6706708b6e8131faa3c3b91fb8cf SHA512 d319bd79f9281f4ef9c6dce9ae68e58ac628addf7218b1bce38d983731a8e21cb9f4e112bb74fe2a0a598767c3381917c27191fc91834f5c1bd15fc22c92564f WHIRLPOOL 301454d57323c010210efedb18a3e89471774cb1fcdaad56dbb2d1f77148259d17378416e450174625bd06c702681ad27f1f0dc15b28e1c950e2508d51c9625d
 EBUILD lastpass-cli-1.1.2.ebuild 937 SHA256 d51bc2955e555db6cf251c5f55425c4252d5913cfb01362c90999f4c17032cb1 SHA512 f25a76711dbb73d592a3d2b325f3de0eae899ce2db7f21948624c7a846de88bfd5ee2b6bc46a4f973674df043eb0ab22817774c724145bec4975650d55f645be WHIRLPOOL c35423cc750934178522f26c7ea484343d5fb19812a4e6d7d3ba0b98f68994997d935bfd2d216fef1a0f1913bede373050315b035bc53b4c370b9eb9d7ac1e41
 EBUILD lastpass-cli-1.2.1.ebuild 1273 SHA256 769fbc6bba7cd192b602c7fec8a51d4c15f738ce03ceddabd6e6142677333f55 SHA512 7da1fb209fec0057d70cc2eff410cfcd410be6b6fba183bab5ccb8279e729df3a8acc3e1cfe2b339e6bbfd346c4d2eecee924a2c8fe15a6ebf5a502efc7fc16c WHIRLPOOL d557b8b146d8adbd20afc1e1d4149e24aa49b4dd95aa3f2e29a35c06de122e13d9d95b9e5541f21ae48883f753add824a15d2cadd46dd5378d044c9e6ff5b172
+EBUILD lastpass-cli-1.2.2.ebuild 1280 SHA256 9e5abd6a35621bdd426cbd3709d2579c8eda9a46eb85cd59894dff605509a1e5 SHA512 a2455060f8ba03105c704217d23086c2f04380a63dfb6b02bdac1065cfc0559e83fd0eee2a6e3a1ea6ca9b64c9f477b4dd857b62058a49eb5fa0df997d825fd1 WHIRLPOOL f9640295341e0dc9902d44aafbcc0e29c1ba2f78ba511b9605afa050303fe6ee268daf3442dd38f2a66d472bd3f12b010b73d43965b94fcaa48a66f6ced578cf
 MISC ChangeLog 8685 SHA256 c5c191dd0b7af5ee8f6c7527afabf1728671c379b50a3743a0aae7dd1ec091c4 SHA512 425f91ed3a9003094527192da9d6d5ad1701ce0fd524d37ffda1550b74f733af0eb3cc5332c7da491a3a5188c0047f02caa36023de1a7ca852926043adec9724 WHIRLPOOL b34ff580eefe5a5b3159b971cc419b2c45ea8e9cf884783eb0e3f6f45c28ed6e8ebf12093781ae0b816b6c88daf5f77489e98c88a719af8e4e0ab379476e1ad6
 MISC ChangeLog-2015 1046 SHA256 84a7da020cc2fdf4df41673d0a8475580995a7e159490cfeb2a29b360558bb81 SHA512 b4759454a0a8113f55caff2ff736903ec4c335730545cac178311ea8b076cd8c522a8104ff9a117bccf2b57b2b37593666e55922c8a46f638a5cadb0dee5149e WHIRLPOOL b3c1ff878c10744bd6f7f54a344f2858ac625d5b5fbb306d0d026b131878271542a9bc7f2b821a89e15073933ef85da2a114c39305d0932b0e60acf77b3bcab9
 MISC metadata.xml 643 SHA256 7b04ceab7153ce462669fca6ee8dd72e37c4c6e9e6f2b9de866c97b03af4d036 SHA512 6b1a7f6566687384d328260576dad306dd07add06001b3746b4f37f05ff91b6ee72e1e2ecfd35463a5b78b4ba8dd1a7757503bdf992372dbd474967e4bf0e9f3 WHIRLPOOL 3215f5055176a55e1e0489f560061f242fb2887d4e68ebe0655925aa751a88333de8fd8513cd065e8a74cbdf96df686adbd8fd34021e8a600f4181050786e241
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.2.2.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.2.2.ebuild
new file mode 100644
index 000000000000..2822408086a3
--- /dev/null
+++ b/app-admin/lastpass-cli/lastpass-cli-1.2.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils bash-completion-r1
+
+DESCRIPTION="Interfaces with LastPass.com from the command line."
+HOMEPAGE="https://github.com/lastpass/lastpass-cli"
+SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl X +pinentry test"
+
+RDEPEND="
+	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-misc/curl
+	dev-libs/libxml2
+	pinentry? ( app-crypt/pinentry )
+"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBASH_COMPLETION_COMPLETIONSDIR="$(get_bashcompdir)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile all doc-man $(usex test lpass-test '')
+}
+
+src_install() {
+	cmake-utils_src_install install install-doc
+}
+
+src_test() {
+	local myctestargs=(
+		-j1 # Parallel tests fail
+	)
+
+	# The path to lpass-test is hardcoded to "${S}"/build/lpass-test
+	# which is incorrect for our out-of-source build
+	sed -e "s|TEST_LPASS=.*|TEST_LPASS=\"${BUILD_DIR}/lpass-test\"|" \
+		-i "${S}"/test/include.sh || die
+
+	cmake-utils_src_test
+}
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 7d8cf83e1934..d480f7ac8123 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -1,10 +1,3 @@
-AUX logrotate-3.11.0-Werror.patch 468 SHA256 633ec5e7d0d44e490d4fc2f71ccb7742ee44087143f2a175077c5ea71c3bf3e8 SHA512 a846e9d3778a33622d7daccbd5880cadf2201ec3914c9f47c0c67c1786edd720a33c140f18f7259024e13e1f5cedcd447deb9cfb0d70882fb52332bfffe3c42e WHIRLPOOL ed64892d93334eeaee8ad244227f396a23c8d005177d32952b2575cef5efc6c52ef23d6e0d3ce889c5a652e4b511df11857a7fd717efb54ee9240da117b6c6e6
-AUX logrotate-3.11.0-fbsd.patch 1421 SHA256 04bd0e7a2fd75d41a424d35b31dbbcc3e25ed44c3cac7bc5b2ae5db643a06b27 SHA512 dd552c5879cc9cc120a7ff953d1934278a9976a46e84c010bb135e1988dd12cadfe7cb5e2f5067d5b882dc521713fb2a024cb61ad0216cdb33297f356bc0307e WHIRLPOOL 4d6556b6f72e7843e910ba8519c6e8f0986fbb516e8d7700e4feac337cc6e8cb1f802302e0bb228c5597aaefd41a752174871cc027da740bc775f51d5339c1c0
-AUX logrotate-3.11.0-ignore-hidden.patch 548 SHA256 56fca1f490e9a9f13f110297a8988e59800b10b9d06b4f284f76dbaba4ad717e SHA512 a86caa30b787abc1328652e590dd73633a38830739ff6c6c9f5d43fb2919e53383ec8091f5e0d6af475d13fd68bd1e636cd43cd5adf377c22ff2ea694ba32cf1 WHIRLPOOL 5164d9048e9f147197077e73933a219d8074bd57bd2835e997cba12ba7e815f87495d46bc6c6bf9f54957f4f501fb24284a75aef9bac0d1c84cee9c94e5beb1e
-AUX logrotate-3.11.0-lfs.patch 346 SHA256 ad8cfab537560d663afa954e654592c9f139aefc9848f08619212ee46ab074f4 SHA512 cdffb9f1481bb8777319423c9617898b50712129a80d721fef8c243a030248a70540d2db0d421e8e974bc6623d8739d1a50da8b65894cdc385dd8d741c2710e1 WHIRLPOOL 82fec61a2bd484cbcc18cea898197923ea8cfea86039bdb2bef7effa9635f6287d06e879bccf11b22f770cb1b93542756e2f11d9f8564f35966f69e6fea9f3d4
-AUX logrotate-3.11.0-noasprintf.patch 1274 SHA256 8a84f7c46b117f0c9705333e50c9a2c3173b62b6fb2a86b3752d9cb597a84c8d SHA512 d673aa820cd95b744deb24b1c5ccbc82f22d5f6220028a0b96c7abc3190cfc5f85fed1f8bba7fd98b8b3ff458fccb08c2adb80046151088bc0797f814de2a9f5 WHIRLPOOL 573505eea80a433d47d83cde1e252d704a1e543b149816a75854de7042dd417af31d2848c04e0a225e16b6d00cae3d6b673a336cf018ee2438bb3102a1244705
-AUX logrotate-3.12.2-fbsd.patch 855 SHA256 127c90627ba4dc79d0120d3a86b8e7696b89546cb164230f12466113d874141b SHA512 3e54314ce32735bd70fe46792c073fd5eb345a77e40eae4b9c899671cc8b7dd8d6f1042a28f05364431fc730a3dbe924d19d6eacbb387c6384268a397dd9ac85 WHIRLPOOL b734147fad23c8a0d16aaee33910995ce11310497616a390c74415d66e74ab6508b65e144e5c692fba635f5c0882106d8dd72b99ec941439e589e2712efdf155
-AUX logrotate-3.12.2-ignore-hidden.patch 542 SHA256 35488583344d963ea1c19a798bc9f8d9c174395f299d1a81a65680e47c36362b SHA512 86d7335dda9b913928eb14dc39a120e14f3796fc30516fbfb5424c575520802edb84224bf5673084be7e983f9e2d856d80d58fa4200a0a43a9624d41dc20a206 WHIRLPOOL a711fbb2fe8ee74123ecbca4202ff8cac60bdb8c0fc197aa8dc96e101cad32d8e1b85bc378bfd8d0fd831753e39f7c9a177db194d9d2450bee2e29f09af37f86
 AUX logrotate-3.12.3-fbsd.patch 855 SHA256 127c90627ba4dc79d0120d3a86b8e7696b89546cb164230f12466113d874141b SHA512 3e54314ce32735bd70fe46792c073fd5eb345a77e40eae4b9c899671cc8b7dd8d6f1042a28f05364431fc730a3dbe924d19d6eacbb387c6384268a397dd9ac85 WHIRLPOOL b734147fad23c8a0d16aaee33910995ce11310497616a390c74415d66e74ab6508b65e144e5c692fba635f5c0882106d8dd72b99ec941439e589e2712efdf155
 AUX logrotate-3.12.3-ignore-hidden.patch 542 SHA256 35488583344d963ea1c19a798bc9f8d9c174395f299d1a81a65680e47c36362b SHA512 86d7335dda9b913928eb14dc39a120e14f3796fc30516fbfb5424c575520802edb84224bf5673084be7e983f9e2d856d80d58fa4200a0a43a9624d41dc20a206 WHIRLPOOL a711fbb2fe8ee74123ecbca4202ff8cac60bdb8c0fc197aa8dc96e101cad32d8e1b85bc378bfd8d0fd831753e39f7c9a177db194d9d2450bee2e29f09af37f86
 AUX logrotate-3.13.0-fbsd.patch 855 SHA256 22618ce2fcf3555f4922ea98e90bac7846a840fe4da76d1c14d66614b13b21b0 SHA512 5343814545554392f1ee1be5b35866ebce0d8f2f580cb7807940e3a5b2092025f1b9619fa0ff3bdf4b99aada4c46a602d6c34c6e3c1e42b15ce51cf9d879a3ed WHIRLPOOL e78ea306458781dd88f3efbea57bc1d42f761aa5b98a286608be661a2904d91fbf53475740304e5a5f9f47bb361d87588c829900f90c2b7764fad2b066dac0ad
@@ -16,16 +9,11 @@ AUX logrotate-3.9.1-ignore-hidden.patch 551 SHA256 3f04aa2ff9ff85cf0486c40f6a81c
 AUX logrotate-3.9.1-noasprintf.patch 1263 SHA256 edc5f3db12c27c3353cfe1764c10d3b97581f249096e61f875440e429afc778a SHA512 c84be7ef011fe09a2fae67fa918080c1b0c098f0000e6cacdfcc34311f17c0131e68bc1e337559391ae7272fd326ac7ba6ba1cca20f99a9cc51367ac35a924e6 WHIRLPOOL 0d702f6c92483791e9fe2b5128e324fcda7c5ee825c46fab4405b5752f836bce00aaaf8ec9a284a5214aa2e10a4818bfb2e8cd9a4e2bce6f0836ec1c543dd3ea
 AUX logrotate.conf 743 SHA256 9144148139ab9aaaaa5b02d3f88e44b6dfd23b8ddd6c86d2f543eb5ad566f775 SHA512 c0357a432a4619392895d8180db3c593239a96f62aba7cfd981c76e9d1dfd9d93d63860655025b1e9473374c2a51068028c3a3f316cb5cbb71562ca4a61d8d24 WHIRLPOOL b2cd43773242adc78b2b322679db16946a5db95d56591a6e53316660937f7696f51b66fb8c106f7e2b98fc119070397f986ecfd1563409749801a5331c058357
 AUX logrotate.tmpfiles 16 SHA256 5624b71671928b2d5a076c32172b65b679b8502aae66b2840fc252fb09504209 SHA512 f51852b1d5708a8fc48c6fcfd2fc4f34f3cd88d9119c607c0cb47f0cc0dc7370bd3399a9ebf781943cdd16a25bb4db0d81337140fc179faa72e18a848f3d8c36 WHIRLPOOL 6fc46fb539199e992112081a3d8d24bd6bf50597b268a08b36eb86158f513ead488cdcec23eec88750c79767f6a7f8024d17909e5d14888f9b1634eaaece00b7
-DIST logrotate-3.11.0.tar.gz 176488 SHA256 7dcb440ed2f1937459e1e06f841c6af1e564b77b2df8009147b56c8649197910 SHA512 67ceb2e18c175a5935c81e7699af7a5e6625cef50a3f52e993d49d6c10d9c433f6c7354a8dd05cb35ab28e4393d1db198f2e46e5f6eafd3e6f040b6518438cc1 WHIRLPOOL 0a581aa5922386b84a7c40a9490364287f4e162f7180fd0e15bf191694294168b663947c7081e92755406fe4f0b3b8792b6f0c5f0e646afa5505a17995a86858
-DIST logrotate-3.12.2.tar.gz 202700 SHA256 754777ada2ef2f34378e8f6025cdb0c0725e212f12195d59971c42df0ae0597f SHA512 ba8c3d7c7134b9ab5968c0dc8a1c5d24d7287a3204e1c6eed080b537d6a0ed7765a47c69b3067493304994e3f4238dc0173b593e4628316bfadf3decd002da16 WHIRLPOOL a299bc2bd50ab36acdd4ab747a479c5b94e84ac92bf55b71a8a8a7d4e1b55eb909dce94c22a5fdadda946dc783376923de5f46729084e21b54811489ce97c482
 DIST logrotate-3.12.3.tar.gz 202991 SHA256 435a3f9a534a37e11657532a090f6bf521d8696bdf9cb799a360c1750ba3aea9 SHA512 ab700a50736c7ce8a6e5b9dc2504919c6d3e6ae48a7f112f6980253df5c6bab7fc507c82a0cd961d73ed1312c930da46d96d9f27046996644e0759c84c6a1ae9 WHIRLPOOL ceadd2a748850f0035702156b9a566bf3a38749edf823062f1c867e60cac1c7b40d770d6c923eed79972ce58394b3220e16e40e97e192a6a7046cf09c5fcbf77
 DIST logrotate-3.13.0.tar.gz 213726 SHA256 2ea33f69176dd2668fb85307210d7ed0411ff2a0429e4a0a2d881e740160e4b0 SHA512 3dec2fcdd674d3337b71fd70339cb5e3dd06b4bc24bee191356a30c2a211a290ae7747e63b90581e32a6d6d1f73cf62d5b0ee5a91aa05bad4d6ee403a35d9e76 WHIRLPOOL 952c5eda18870876ea5109d4c5ae7ac1048d3ea07c89b4a0320a48baa8170fbc200f5b4a1cc193da0f6b0e1ef8dbdcdb82f74f23d4f12e5a19bb98650c1e7d5a
 DIST logrotate-3.9.1.tar.gz 79061 SHA256 022769e3288c80981559a8421703c88e8438b447235e36dd3c8e97cd94c52545 SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28 WHIRLPOOL 9b3558bb03c6c95f8f386ea75ca09bfda802ae4c45b9ef8408692e3aa7a2ee57447cf15ce04d0289946b9cae2266acb5509d8151d15ac6ea0ad9113aeb32dc17
-EBUILD logrotate-3.11.0.ebuild 2005 SHA256 101653a12e2243dd4253abbc24becfeef0d2bae5037ae848a1f4848bec4a163e SHA512 eb0392730a076565c459a2645b6497b86d3a86d0096661eb468b00cbb909ffbed7db762adb866a9cbfca40ff339d90ce0c970404b718b8f8a4d084dbf51a1ddf WHIRLPOOL 0317478d7fc84c7d1716d2b449298b382a2349a5ed746c458a9e47a129fdbe9d4e7ec330bc36c07e9be0ae2ca041518424f1ce7ef3333e547667947eec5f6c12
-EBUILD logrotate-3.12.2.ebuild 1903 SHA256 d909fdef412279a0147a2f9d02986cafea2c4bd63936ab0fa0538ecad797483e SHA512 78ae7250c4c26ff7f702746535bace0f34b68d2ceb9d6cc3744975d1842781bb2037fa520b873806659db2e5acb8b58ec14996865be82e62d1d892acdae3b134 WHIRLPOOL 728c71c61e3ac0830ea100d891bcaf7fa8c9cf75e7c8f455862442d31a0f83b459d50ef54101a31745c84d6f491473404ded5c9372cf551a8499eff60893a49a
-EBUILD logrotate-3.12.3-r1.ebuild 2487 SHA256 e1871fe019ac5de8ef40c4e4b33e6e2a2b14ff52f39fd7969b3e547551dba63c SHA512 b085e9bbc3a21814f7d12bdbd37b38094527e04253bd64e5a90ecf366b58b1a9aae98752508f0f59a2fcf09f548bfa5c7e65436c4ce80918eee78df978ad34cc WHIRLPOOL 90c109fdf4396b723ecee00ebb676b0d8718d7fe9f72bdb5a87782355c411cfe72af86994c7564cd16c6f26397f2724eb63bcd04e3f767c5e318e59340681416
+EBUILD logrotate-3.12.3-r1.ebuild 2485 SHA256 2863ca598d152971453f9d3b47c64c9859e7427afab3602f9a3a7dcb40238df0 SHA512 46b79b611ba2e3533e1c068b3422b3507e2f505d5562810f91699f936be43b99a4456603e5c9298f30dc2eae5633e391319516babfd038520a0de58e03513ab4 WHIRLPOOL 3c4e9ccf4da2ae3e2d468a178cd9370be0c570edfc3473d8ff00c09973f17afe46f447826f5f51de10dd67a8820ad996be97a8d8bbcaaaea51762be87b4a62c6
 EBUILD logrotate-3.12.3-r2.ebuild 2552 SHA256 55c7d7cd58624e29f040d575fe0d695bf66af60dfa735efd24416e2306e07140 SHA512 b3f3b5d0264bb75c717608be706eccf33d97996f38c5ca152e1797f9dfbdfc40add7065fa614a715d0a30d431dd484e34a8b48138b80d99bcdd546b597264436 WHIRLPOOL db532413f8a7aa375b952c7451a482f362ff2aa93316f62dacbc75274e692e6be19088b28305973b610eaed3bae4578998720213c8e33bd252f529cdbc02c754
-EBUILD logrotate-3.12.3.ebuild 2479 SHA256 f5bc883c099160493f924e3b72aa304eac5d23248f21137876b1f774a24539e8 SHA512 4e0b4b99277ee692318a6d6f4358a5463f11c339cc1e610040a9a436b412d5f8ba22ededee3453a4dc6dccd66067ee04931a39d3b27f08189592c2366f0c0365 WHIRLPOOL 9d71a14ec8ba93fa742d20d1275e757236b37413947248614fdbcf723a49dbaf700e20145e6523ac759d637a795355af1f636227db0803b04f994bbbedaafaf3
 EBUILD logrotate-3.13.0.ebuild 2552 SHA256 55c7d7cd58624e29f040d575fe0d695bf66af60dfa735efd24416e2306e07140 SHA512 b3f3b5d0264bb75c717608be706eccf33d97996f38c5ca152e1797f9dfbdfc40add7065fa614a715d0a30d431dd484e34a8b48138b80d99bcdd546b597264436 WHIRLPOOL db532413f8a7aa375b952c7451a482f362ff2aa93316f62dacbc75274e692e6be19088b28305973b610eaed3bae4578998720213c8e33bd252f529cdbc02c754
 EBUILD logrotate-3.9.1.ebuild 1767 SHA256 72213fbfa0a0f182e8ac774e29a8763a17b394c1b4e33e7cac664c7bccbcc96a SHA512 ed808392727749efb6d20a410810f6eb9cb364db2e11460f4c2940abd0fb1d7430b75102f2fcabcaf64e8818da39323010d2a5d223df49c705a6171acf541a03 WHIRLPOOL 245d8f38775b0a9296cc41c0af04e6aca66a7722c2eafbe6814b2a865cc4bd1237f5ef1aa146089882112144db8292d1e706323ec63d2b018ba9bac06147cb37
 MISC ChangeLog 11318 SHA256 38d98af46e97c9519c8e99cf7bf71b7c27b1814b35870579057d068c54fc14c7 SHA512 d2992032a405e2c185966f44f50a1a92c0138f8e847b55402a620f144ecedf58a23381c0ae42b12d344cf18eeab833a786ed35401a29c0c45aa2b67664ba8c51 WHIRLPOOL 66cb04fb922ba81fc9bcf4cd200c6d236d5a758f872da2e55bb09981571b914adca5c40e2597b4dea1ef994ce36782aac590adc5d6aa149b1adc08f36b1ea5dc
diff --git a/app-admin/logrotate/files/logrotate-3.11.0-Werror.patch b/app-admin/logrotate/files/logrotate-3.11.0-Werror.patch
deleted file mode 100644
index 43c0ebaeb189..000000000000
--- a/app-admin/logrotate/files/logrotate-3.11.0-Werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar a/Makefile.am b/Makefile.am
---- a/Makefile.am	2016-11-30 13:05:55.000000000 +0100
-+++ b/Makefile.am	2016-12-02 23:46:15.288908073 +0100
-@@ -8,7 +8,7 @@
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- # GNU General Public License for more details.
- #
--AM_CFLAGS = -Wall -Werror
-+AM_CFLAGS = -Wall
- sbin_PROGRAMS = logrotate
- logrotate_SOURCES = basenames.c config.c log.c logrotate.c \
- 		    basenames.h config.h log.h logrotate.h queue.h
diff --git a/app-admin/logrotate/files/logrotate-3.11.0-fbsd.patch b/app-admin/logrotate/files/logrotate-3.11.0-fbsd.patch
deleted file mode 100644
index f5aa65272b88..000000000000
--- a/app-admin/logrotate/files/logrotate-3.11.0-fbsd.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c	2016-12-02 23:33:36.768905615 +0100
-+++ b/config.c	2016-12-02 23:36:15.568906130 +0100
-@@ -1,6 +1,6 @@
- #include "queue.h"
- /* Alloca is defined in stdlib.h in NetBSD */
--#ifndef __NetBSD__
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__)
- #include <alloca.h>
- #endif
- #include <limits.h>
-@@ -24,6 +24,10 @@
- #include <fnmatch.h>
- #include <sys/mman.h>
- 
-+#if !defined(PATH_MAX) && defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
-+
- #include "basenames.h"
- #include "log.h"
- #include "logrotate.h"
-diff -Nuar a/logrotate.c b/logrotate.c
---- a/logrotate.c	2016-11-30 14:07:15.000000000 +0100
-+++ b/logrotate.c	2016-12-02 23:36:44.218906223 +0100
-@@ -1,6 +1,6 @@
- #include "queue.h"
- /* alloca() is defined in stdlib.h in NetBSD */
--#ifndef __NetBSD__
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__)
- #include <alloca.h>
- #endif
- #include <limits.h>
-@@ -26,6 +26,10 @@
- #include <limits.h>
- #endif
- 
-+#if !defined(PATH_MAX) && defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
-+
- #include "basenames.h"
- #include "log.h"
- #include "logrotate.h"
-diff -Nuar a/Makefile.legacy b/Makefile.legacy
---- a/Makefile.legacy	2016-11-30 13:05:55.000000000 +0100
-+++ b/Makefile.legacy	2016-12-02 23:37:33.938906384 +0100
-@@ -22,7 +22,9 @@
- 
- ifeq ($(WITH_ACL),yes)
- CFLAGS += -DWITH_ACL
-+ifneq ($(OS_NAME),FreeBSD)
- LOADLIBES += -lacl
-+endif
- # See pretest
- TEST_ACL=1
- else
diff --git a/app-admin/logrotate/files/logrotate-3.11.0-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.11.0-ignore-hidden.patch
deleted file mode 100644
index 104f202efd27..000000000000
--- a/app-admin/logrotate/files/logrotate-3.11.0-ignore-hidden.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c	2016-11-30 13:05:55.000000000 +0100
-+++ b/config.c	2016-12-02 23:33:36.768905615 +0100
-@@ -383,7 +383,9 @@
- 	int i;
- 
- 	/* Check if fname is '.' or '..'; if so, return false */
--	if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
-+    /* Don't include 'hidden' files either; this breaks Gentoo
-+       portage config file management http://bugs.gentoo.org/87683 */
-+    if (fname[0] == '.')
- 		return 0;
- 
- 	/* Check if fname is ending in a taboo-extension; if so, return false */
diff --git a/app-admin/logrotate/files/logrotate-3.11.0-lfs.patch b/app-admin/logrotate/files/logrotate-3.11.0-lfs.patch
deleted file mode 100644
index 9cd5745e846a..000000000000
--- a/app-admin/logrotate/files/logrotate-3.11.0-lfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nuar a/configure.ac b/configure.ac
---- a/configure.ac	2016-12-02 14:08:40.000000000 +0100
-+++ b/configure.ac	2016-12-02 23:48:03.878908425 +0100
-@@ -12,6 +12,7 @@
- AC_PROG_CC_STDC
- AC_STRUCT_ST_BLKSIZE
- AC_STRUCT_ST_BLOCKS
-+AC_SYS_LARGEFILE
- 
- dnl Use 64-bit file offsets on 32-bit systems (defines C macros if necessary)
- AC_SYS_LARGEFILE
diff --git a/app-admin/logrotate/files/logrotate-3.11.0-noasprintf.patch b/app-admin/logrotate/files/logrotate-3.11.0-noasprintf.patch
deleted file mode 100644
index 36733a25d03b..000000000000
--- a/app-admin/logrotate/files/logrotate-3.11.0-noasprintf.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c	2016-12-02 23:36:15.568906130 +0100
-+++ b/config.c	2016-12-02 23:41:17.438907108 +0100
-@@ -49,39 +49,6 @@
- #include "asprintf.c"
- #endif
- 
--#if !defined(HAVE_ASPRINTF) && !defined(_FORTIFY_SOURCE)
--#include <stdarg.h>
--
--int asprintf(char **string_ptr, const char *format, ...)
--{
--	va_list arg;
--	char *str;
--	int size;
--	int rv;
--
--	va_start(arg, format);
--	size = vsnprintf(NULL, 0, format, arg);
--	size++;
--	va_start(arg, format);
--	str = malloc(size);
--	if (str == NULL) {
--		va_end(arg);
--		/*
--		 * Strictly speaking, GNU asprintf doesn't do this,
--		 * but the caller isn't checking the return value.
--		 */
--		fprintf(stderr, "failed to allocate memory\\n");
--		exit(1);
--	}
--	rv = vsnprintf(str, size, format, arg);
--	va_end(arg);
--
--	*string_ptr = str;
--	return (rv);
--}
--
--#endif
--
- #if !defined(HAVE_STRNDUP)
- char *strndup(const char *s, size_t n)
- {
-diff -Nuar a/logrotate.h b/logrotate.h
---- a/logrotate.h	2016-11-30 13:05:55.000000000 +0100
-+++ b/logrotate.h	2016-12-02 23:40:54.518907034 +0100
-@@ -82,8 +82,5 @@
- extern int debug;
- 
- int readAllConfigPaths(const char **paths);
--#if !defined(asprintf) && !defined(_FORTIFY_SOURCE)
--int asprintf(char **string_ptr, const char *format, ...);
--#endif
- 
- #endif
diff --git a/app-admin/logrotate/files/logrotate-3.12.2-fbsd.patch b/app-admin/logrotate/files/logrotate-3.12.2-fbsd.patch
deleted file mode 100644
index 67a60e3af177..000000000000
--- a/app-admin/logrotate/files/logrotate-3.12.2-fbsd.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c	2017-04-22 23:46:08.201991730 +0200
-+++ b/config.c	2017-04-22 23:49:43.021996055 +0200
-@@ -25,6 +25,10 @@
- #include <sys/mman.h>
- #include <libgen.h>
- 
-+#if !defined(PATH_MAX) && defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
-+
- #include "log.h"
- #include "logrotate.h"
- 
-diff -Nuar a/logrotate.c b/logrotate.c
---- a/logrotate.c	2017-04-21 10:52:10.000000000 +0200
-+++ b/logrotate.c	2017-04-22 23:50:20.691996814 +0200
-@@ -1,6 +1,6 @@
- #include "queue.h"
- /* alloca() is defined in stdlib.h in NetBSD */
--#ifndef __NetBSD__
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__)
- #include <alloca.h>
- #endif
- #include <limits.h>
-@@ -27,6 +27,10 @@
- #include <limits.h>
- #endif
- 
-+#if !defined(PATH_MAX) && defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
-+
- #include "log.h"
- #include "logrotate.h"
- 
diff --git a/app-admin/logrotate/files/logrotate-3.12.2-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.12.2-ignore-hidden.patch
deleted file mode 100644
index 0bbb91dcb4fc..000000000000
--- a/app-admin/logrotate/files/logrotate-3.12.2-ignore-hidden.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c	2017-04-18 14:57:02.000000000 +0200
-+++ b/config.c	2017-04-22 23:46:08.201991730 +0200
-@@ -389,7 +389,9 @@
- 	int i;
- 
- 	/* Check if fname is '.' or '..'; if so, return false */
--	if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
-+  /* Don't include 'hidden' files either; this breaks Gentoo
-+     portage config file management http://bugs.gentoo.org/87683 */
-+  if (fname[0] == '.')
- 		return 0;
- 
- 	/* Check if fname is ending in a taboo-extension; if so, return false */
diff --git a/app-admin/logrotate/logrotate-3.11.0.ebuild b/app-admin/logrotate/logrotate-3.11.0.ebuild
deleted file mode 100644
index 2570ecbb1bf9..000000000000
--- a/app-admin/logrotate/logrotate-3.11.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Rotates, compresses, and mails system logs"
-HOMEPAGE="https://github.com/logrotate/logrotate"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${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"
-IUSE="acl +cron selinux"
-
-CDEPEND="
-	>=dev-libs/popt-1.5
-	selinux? (
-		sys-libs/libselinux
-	)
-	acl? ( virtual/acl )"
-
-DEPEND="${CDEPEND}
-	>=sys-apps/sed-4"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-logrotate )
-	cron? ( virtual/cron )"
-
-install_cron_file() {
-	sed -i 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.cron || die
-	exeinto /etc/cron.daily
-	newexe "${S}"/examples/logrotate.cron "${PN}"
-}
-
-PATCHES=(
-	"${FILESDIR}/${P}-ignore-hidden.patch"
-	"${FILESDIR}/${P}-fbsd.patch"
-	"${FILESDIR}/${P}-noasprintf.patch"
-	"${FILESDIR}/${P}-Werror.patch"
-	"${FILESDIR}/${P}-lfs.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with acl) $(use_with selinux)
-}
-
-src_compile() {
-	emake ${myconf} RPM_OPT_FLAGS="${CFLAGS}"
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	insinto /usr
-	dobin logrotate
-	doman logrotate.8
-	dodoc ChangeLog.md examples/logrotate*
-
-	insinto /etc
-	doins "${FILESDIR}"/logrotate.conf
-
-	use cron && install_cron_file
-
-	keepdir /etc/logrotate.d
-}
-
-pkg_postinst() {
-	elog "The ${PN} binary is now installed under /usr/bin. Please"
-	elog "update your links"
-	elog
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "If you wish to have logrotate e-mail you updates, please"
-		elog "emerge virtual/mailx and configure logrotate in"
-		elog "/etc/logrotate.conf appropriately"
-		elog
-		elog "Additionally, /etc/logrotate.conf may need to be modified"
-		elog "for your particular needs.  See man logrotate for details."
-	fi
-}
diff --git a/app-admin/logrotate/logrotate-3.12.2.ebuild b/app-admin/logrotate/logrotate-3.12.2.ebuild
deleted file mode 100644
index 15b0107f6562..000000000000
--- a/app-admin/logrotate/logrotate-3.12.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Rotates, compresses, and mails system logs"
-HOMEPAGE="https://github.com/logrotate/logrotate"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${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"
-IUSE="acl +cron selinux"
-
-CDEPEND="
-	>=dev-libs/popt-1.5
-	selinux? ( sys-libs/libselinux )
-	acl? ( virtual/acl )"
-
-DEPEND="${CDEPEND}
-	>=sys-apps/sed-4"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-logrotate )
-	cron? ( virtual/cron )"
-
-install_cron_file() {
-	sed -i 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.cron || die
-	exeinto /etc/cron.daily
-	newexe "${S}"/examples/logrotate.cron "${PN}"
-}
-
-PATCHES=(
-	"${FILESDIR}/${P}-ignore-hidden.patch"
-	"${FILESDIR}/${P}-fbsd.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with acl) $(use_with selinux)
-}
-
-src_compile() {
-	emake ${myconf} RPM_OPT_FLAGS="${CFLAGS}"
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	insinto /usr
-	dobin logrotate
-	doman logrotate.8
-	dodoc ChangeLog.md examples/logrotate*
-
-	insinto /etc
-	doins "${FILESDIR}"/logrotate.conf
-
-	use cron && install_cron_file
-
-	keepdir /etc/logrotate.d
-}
-
-pkg_postinst() {
-	elog "The ${PN} binary is now installed under /usr/bin. Please"
-	elog "update your links"
-	elog
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "If you wish to have logrotate e-mail you updates, please"
-		elog "emerge virtual/mailx and configure logrotate in"
-		elog "/etc/logrotate.conf appropriately"
-		elog
-		elog "Additionally, /etc/logrotate.conf may need to be modified"
-		elog "for your particular needs.  See man logrotate for details."
-	fi
-}
diff --git a/app-admin/logrotate/logrotate-3.12.3-r1.ebuild b/app-admin/logrotate/logrotate-3.12.3-r1.ebuild
index b5f5d4e95d90..81b5ffc20c50 100644
--- a/app-admin/logrotate/logrotate-3.12.3-r1.ebuild
+++ b/app-admin/logrotate/logrotate-3.12.3-r1.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/logrotate/logrotate-3.12.3.ebuild b/app-admin/logrotate/logrotate-3.12.3.ebuild
deleted file mode 100644
index 34807c80e888..000000000000
--- a/app-admin/logrotate/logrotate-3.12.3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd
-
-DESCRIPTION="Rotates, compresses, and mails system logs"
-HOMEPAGE="https://github.com/logrotate/logrotate"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${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"
-IUSE="acl +cron selinux bzip2"
-
-CDEPEND="
-	>=dev-libs/popt-1.5
-	selinux? ( sys-libs/libselinux )
-	acl? ( virtual/acl )"
-
-DEPEND="${CDEPEND}
-	>=sys-apps/sed-4"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-logrotate )
-	cron? ( virtual/cron )
-	bzip2? ( app-arch/bzip2 )"
-
-STATEFILE="/var/lib/misc/logrotate.status"
-OLDSTATEFILE="/var/lib/logrotate.status"
-
-move_old_state_file() {
-	elog "logrotate state file is now located at ${STATEFILE}"
-	elog "See bug #357275"
-	if [[ -e "${OLDSTATEFILE}" ]] ; then
-		elog "Moving your current state file to new location: ${STATEFILE}"
-		mv -n "${OLDSTATEFILE}" "${STATEFILE}"
-	fi
-}
-
-install_cron_file() {
-	exeinto /etc/cron.daily
-	newexe "${S}"/examples/logrotate.cron "${PN}"
-}
-
-PATCHES=(
-	"${FILESDIR}/${P}-ignore-hidden.patch"
-	"${FILESDIR}/${P}-fbsd.patch"
-)
-
-src_prepare() {
-	default
-	sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
-}
-
-src_configure() {
-	if use bzip2 ; then
-		compressconf="--with-compress-command=/bin/bzip2 --with-uncompress-command=/bin/bunzip2 --with-compress-extension=.bz2"
-	fi
-	econf $(use_with acl) $(use_with selinux) ${compressconf} --with-state-file-path="${STATEFILE}"
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	insinto /usr
-	dobin logrotate
-	doman logrotate.8
-	dodoc ChangeLog.md examples/logrotate-default
-
-	insinto /etc
-	doins "${FILESDIR}"/logrotate.conf
-
-	use cron && install_cron_file
-
-	systemd_dounit examples/logrotate.{service,timer}
-
-	keepdir /etc/logrotate.d
-}
-
-pkg_postinst() {
-	elog "The ${PN} binary is now installed under /usr/bin. Please"
-	elog "update your links"
-	elog
-	move_old_state_file
-	elog
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "If you wish to have logrotate e-mail you updates, please"
-		elog "emerge virtual/mailx and configure logrotate in"
-		elog "/etc/logrotate.conf appropriately"
-		elog
-		elog "Additionally, /etc/logrotate.conf may need to be modified"
-		elog "for your particular needs. See man logrotate for details."
-	fi
-}
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index fac2cbf6d610..9cc09e84be97 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -3,11 +3,9 @@ AUX mcelog-129-debugflags.patch 416 SHA256 5c94bd92035c24038bd05caf0357e72a3085f
 AUX mcelog.init-r1 349 SHA256 bd2419d3e68a1d79a6f799af8760bb8498f70b4a1cf21227f141b167c8d367f1 SHA512 a43f0efe7eb5007e9422ca2eba43b666d5110696c8b049b74990849e200b89b99e3d22707803e21e4452b0e75bbacdec0526ed933b234301ebbbb19d700df0d4 WHIRLPOOL 1c79b79164fb94cf434353038c8ed2ebd6c0e4b02cb5da25f2ced6b9e2c6d2e9af6c35c4d8036c7beec9579ceb307a3387ba0b21f61f27b28281d11df608d5ee
 AUX mcelog.service 213 SHA256 6c9d5bad415f8ed7c6cb4bb111d7ad2d4f916f5737c2559f4fdc3a04b9fc3ff4 SHA512 8317d9310d58663bb28f2528e0872520e30475439b9ce69ebb2452d7dc3583d2aecab80d9f6ef895ac8a17f666c3229d7cd768026ea16cc5403fb05d8bdc5c75 WHIRLPOOL 2066c70585a5204786983d1139737a584c12b34d03a7373d717a98d1d880993d953cc509de6b5a02a3a5212c42f42bd0e20ae3d9d9b905c4ff20b3365c68589f
 DIST mcelog-149.tar.gz 296943 SHA256 a9313ed45cabaf7ef0a4d986ecf24a3c9ced9a4b1e34032d380af4e70c73512f SHA512 d2cb7cb26d4407dd03a425568a19c96e5f53cc9447c58cd105d74a2f69b645ef6b444c9533186aac6b052f0721959a321a3f8061477d1451a62be36add097aeb WHIRLPOOL ddea0a8efca6e5180d4d3ce663a0366b1a2eb78d8d11690e21aea81d3956838013aec7e83f29f6a745a63d18e95e8c71a2b00be135a5982013462b3911aa7f57
-DIST mcelog-152.tar.gz 297083 SHA256 7a903710a8ae0a031d337cc1e9e01f5353467e7f9aecea44bd50659793163022 SHA512 e89a4d81c87211f345d2f90dfb36bbb6ef4474745ac878285801b6ab4edd1ebc32feaf38b60f5976e7b9f29700495c2325f0e05c8ec432a22d77c1e9207a5e1a WHIRLPOOL 38e9526e2a16e4f25d0c4b218884c871b84cf0c2416ed80069746d0af3b7c2eff9d17b6f350b04f53564a172fb61b61ff8b51038ca639c37dbfbc7e6d3b34cec
-DIST mcelog-153.tar.gz 297099 SHA256 9b827f708855804b6952de6f6cbf2f6523fa1203c621e6050064388f459646f1 SHA512 9a92587c13680e83fd1b89d45c160cec91c6a90cfa32f5858fea444b2013f1a9ec3349edf0f7777908898967b1c1604761f481b91e87fd31b0c5255530b9453d WHIRLPOOL 2572ee54b68fcdab7b83207ef84035cb8096cb30fa225a2d11f823a8b2ecd4d19a728ba7f094e9b67c8f293a4611b2824eb555e6bf646939af47444c101fae14
+DIST mcelog-154.tar.gz 297148 SHA256 dde7aa13c5cc4916a168c2a1f68435a41f2236cf222266425942dfbcb735593f SHA512 8a160aaa8a0ed736cb81082321e199e6a6e4f7f6528915752af545db28918e89dcb6bf321a92472d776c61914d08c613900273b3d265a375684e3212547abe38 WHIRLPOOL 5ae469480520ccae572514fa19847235c362248a25d9c37bc2223dffa17547ed7a6cf7203914f5f7e6850be659d051f10424720d64f754a7ff32915f33f31b06
 EBUILD mcelog-149.ebuild 1216 SHA256 305dd87d7987c249084b01c4ec1bb45711f9a7b3294b28804047d70db22e5a13 SHA512 a0414d1608bfde9177e2f10dcd135f6f1dd8c9f9498a187fce8e3868db02a65f09dd74520b6659aa1424725a15d7a4c58542d505c1ce1ad12ffd48afce1e8b86 WHIRLPOOL 97c7efb4750b001d72a6952584783774bb4173e9041255582616b9ff46d3293d393842554fdf7bcdcdeb5baf836803586f12a6dce0faee28d1c6c1ebc94a84cd
-EBUILD mcelog-152.ebuild 1218 SHA256 962a0ac4c29a822efae0b33abca073a0bdfd6b2992f0a29ae2c56494cc365cf1 SHA512 8ff47aa8e9c52bdcbc0734accd716d514d89c0936c24340ddb7ce1b13e1c3c8992d56bce98378d7a6d5cd74579183049861d97ce67919cffa2650d202ba24364 WHIRLPOOL 3e0c3c00c2196c838f294b00e6ca46ee6e416c5d04cff0ccb28ef191e5a7b10c8899e5ae7661586f3440bf66b905bf3cdd847ded3ef036f2290b8035bff61da6
-EBUILD mcelog-153.ebuild 1372 SHA256 80774217d878f68286e3a14c846b52ae35c3a97e6ef2cc98e89643a1313a4eee SHA512 cf76774ce8ec0634a8a8e8eed22d6048085a4bbbf767e871963d37617bdeb0383590d85d00a7709e76d9a460dfbe90867c4b62e93e829c4081ed14025469b505 WHIRLPOOL 32d365e0bab72e105825dc2de67174be91151f70e7d3c87711fa8793a3fe0808c2c431e33ca13cc6d7f64ac51f55965c5712362b4e8d336f429a680009b5429f
+EBUILD mcelog-154.ebuild 1372 SHA256 80774217d878f68286e3a14c846b52ae35c3a97e6ef2cc98e89643a1313a4eee SHA512 cf76774ce8ec0634a8a8e8eed22d6048085a4bbbf767e871963d37617bdeb0383590d85d00a7709e76d9a460dfbe90867c4b62e93e829c4081ed14025469b505 WHIRLPOOL 32d365e0bab72e105825dc2de67174be91151f70e7d3c87711fa8793a3fe0808c2c431e33ca13cc6d7f64ac51f55965c5712362b4e8d336f429a680009b5429f
 MISC ChangeLog 3878 SHA256 487ad272bd946e20585e24c42fee9904d70395ca9f203b303a63c87e59e3f21a SHA512 729fbff0e43c1424fe279707ffbbd052ed2084b8274ef34307c1ea8984eb33e45b9c9c0724db624e54c863f52d92e1415d090366d94de00a75c56a6ef97193a7 WHIRLPOOL e49a4df2b397508bb73dde74c9abb469e40eb7f367eb3993e224c163edce3c0485dfb8f267865f33218b623dab4d1662aade526d540434ca0f54e989be3809bb
 MISC ChangeLog-2015 6067 SHA256 cd64e94164463a072484250bb9b73182b1e491a600d910710eb565fb4cb86b42 SHA512 f20d1f881f6a77470c629c1c23ced367eefe144ffc1459794d030fd4af428b99cf39ac774caa30853131934bb988dcaf872b9d2d452df9e627f8dde12a562411 WHIRLPOOL a07cb5f6e7e7f165616ff6484b36550a66998ced271e3e6ea8bdd3a2e7f93043f7af0eb648b39ae8173ca6b073600f002ddd463444f15f8cf95c04267571d90f
 MISC metadata.xml 837 SHA256 85fedba2c329867f241e36c6b464a640fa324d39f56e55642289a389791b4dd1 SHA512 f6e69af6afc0de8c5436fbe468a3afbcb96e808c5e21d8a5fa65878bbff0c31ee883c4cda638acfeef1dabd77c85d0fbb3091b180b0cd16df14471e64db8df80 WHIRLPOOL f8c9ac9caf750b21604909620c8435c0c7f7a2f3dbb0f18d93a256acfe81896029a72e88dd0d99eceafe35ad20b8a4dd6244a5b6028583d3b118468a553108dd
diff --git a/app-admin/mcelog/mcelog-152.ebuild b/app-admin/mcelog/mcelog-152.ebuild
deleted file mode 100644
index 4ac0a016c0dd..000000000000
--- a/app-admin/mcelog/mcelog-152.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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 )"
-
-CONFIG_CHECK="~X86_MCE"
-
-# TODO: add mce-inject to the tree to support test phase
-RESTRICT="test"
-
-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/mcelog/mcelog-153.ebuild b/app-admin/mcelog/mcelog-154.ebuild
index 1e3b09353f30..1e3b09353f30 100644
--- a/app-admin/mcelog/mcelog-153.ebuild
+++ b/app-admin/mcelog/mcelog-154.ebuild
diff --git a/app-admin/mcollective/Manifest b/app-admin/mcollective/Manifest
index f80122ce125c..51569026f3ad 100644
--- a/app-admin/mcollective/Manifest
+++ b/app-admin/mcollective/Manifest
@@ -1,10 +1,8 @@
 AUX mcollectived.initd 497 SHA256 97de82c744874ad18356eb34b4b9ac411c8fdaa5b54482a68a68939df40aee2c SHA512 dc77a522e3ab6af3e23c559bfcb385033f2200b58b50db59000e7f56b2a789e8fbd83340f8ee494a1a9fdbdd1bd737a2b17ae4743823794264723fdc931ea6b0 WHIRLPOOL 1900da65b5d6f47fe98de411bd60dd88fc4ace9fffad48c38df2797ebe93dc350d38fa8563d2373c803dce5fab89ee55a2c9fe7128e6431c7d6458275641861b
-DIST mcollective-2.11.1.tar.gz 1516922 SHA256 d5e150408e61d51b3844e14c6304cf61f27243c5dc658e689bbaaee91dce6b0b SHA512 88d2511829936a5987c8ddab068f59d17f16230cb339801672238ae54ce2115e93d7271a78001176ccc203a1b70f7ee2f35992e414059f1db9cb05db210463e5 WHIRLPOOL cff40347c46464a18d6d98e3a3e2a7dab4169f5c0e1b60f08f3292cc87adcc123fc423203d664bcee1dac47a1dd44e44726702de5c2ea0ed0c5e55d8dbe0b45a
 DIST mcollective-2.11.2.tar.gz 1516590 SHA256 aa3664d5ba2d4d20e448c374c315c91d55b5bb43918a04092747a4052bc3f969 SHA512 1dc393fa1a09c5151b64b84086ef9af934feeebd2700a00cc4c84696fa2a25d90a410a373b553198f5fda6e1e36808ffb8dc38edcb15bb9e4253998aa7504439 WHIRLPOOL f808d4f9ffbf733842dd29f8e0548b90a4705f8b502dcc62509380b013d69de786204025490d4fb67d657e5c6597fb0d3ffdac2724e8dbca6347511ef50be54a
 DIST mcollective-2.11.3.tar.gz 1516665 SHA256 b9080779fa56c2b77a3f37404b3ac933183e0b0940e6086b0060be2c44aa38d3 SHA512 f5e26dff03f7a671db5de12acba1ce726c8d57fb99831ddbb258da5ba297ade31ea991840fa63cb1ba261281f7f6167a8492c8764a13cc332202ccb9c88d79b8 WHIRLPOOL 69e384489c8138aecc0c404dc9a08e5d92e09deab05a43ab4781b77506f4fe6f3bbd1a9ec9399a59e8a7c89d3462d3062d73a50fae490215628826c2794bd9ff
-EBUILD mcollective-2.11.1.ebuild 1638 SHA256 8b055a142d13d0436d3ef1be2093df2ad0e4d58f38f40681d0166a103fcd27a4 SHA512 59bf34c79a512b0a83807e36658bbabb5dec625ea54a4ee406bc54b9a330b8936f83aa59870b0ac30ca1f00694b71f4a8eefc1a84e60ae5ebd1e8aff43cc836e WHIRLPOOL 3fe6f79a49c1243fa4760622affac8c0320e2b9428ec87750f270e1bf9732bd2852b8bac05dd343af4ba33662384de183dda60a5070c4a1df9dc6ef2ce33df07
 EBUILD mcollective-2.11.2.ebuild 1641 SHA256 324bc04c36bbdcfa98b84a6f61c9182ee41559448e1621a8271cc0e593fdd1db SHA512 a699fb934af4b660c55ffb0d216e29d3b995601c1187e166e878fdbafd46ea7cea4e4951a1052139d115f00de1a38c990495715047f2c0ac13926b2fb613a25a WHIRLPOOL 8b10bedb9bd77b74c73bb80238496c36c1bfab0160dd7aaf589f8916be53a01551e9717c6f8ab1deea4ffdcd88f5caa166e523cc35fbb16037cc3d8f874292e1
-EBUILD mcollective-2.11.3.ebuild 1643 SHA256 d962c900fda8a21403f3ae1b4e9bf1281ff5b73e9e57ae31c2031a37942790b8 SHA512 1b57aebd8141f77295a4fbae23c5a25889373e41752f4eefeeb96a856f0c7b78390687eb38bce1d901e5a348f3e55ed6af4dc648d89a19e0168a1de8f30b55ec WHIRLPOOL 02ece74395a5259517209d333c3a7e32213113f74a5e1f364dc5c404c9ab762eb90a6cdebc8f23c56b358e9a17ca30c82d8e0aef0f18dfc7e96991133a70b868
+EBUILD mcollective-2.11.3.ebuild 1641 SHA256 324bc04c36bbdcfa98b84a6f61c9182ee41559448e1621a8271cc0e593fdd1db SHA512 a699fb934af4b660c55ffb0d216e29d3b995601c1187e166e878fdbafd46ea7cea4e4951a1052139d115f00de1a38c990495715047f2c0ac13926b2fb613a25a WHIRLPOOL 8b10bedb9bd77b74c73bb80238496c36c1bfab0160dd7aaf589f8916be53a01551e9717c6f8ab1deea4ffdcd88f5caa166e523cc35fbb16037cc3d8f874292e1
 MISC ChangeLog 3721 SHA256 312164363f75e97271f70aaec2869307d5d636513297acc7d943f8d3d680adc0 SHA512 01765da77e3c2806cd60d4802a2e57971a627aaec2525363391ba723366382a31a47bc7d6f7c108f2609926ff08a173b36bca5dfd99e6d8e29af84f8cfbccee8 WHIRLPOOL 0a56b19ee5d3558597907e7eea53a1900e694f969875c5514d1a43dcdfcb8be746be7e11c8edc9e3d1b2c42612022094197339b0c6fe860e93c0cc3b8becf1f6
 MISC ChangeLog-2015 4747 SHA256 1555e32b0cce5896f5aa1dc96dbfab9ee18005ca9861412adc257970943236c5 SHA512 588921e55eae4d4e2c5af0bdc1f5dcc1c5fdc75e1afa00505e71dac184015213f613151d82012c781e0206553e8ed24641daf569b3a31280efb3420ea1ad0607 WHIRLPOOL 7ffc8e316e46570275c026a87bc20a53c0e05819d5bb491b6072dc159593806b4bbdef069c48c3ad004cc266f110edf3a5318105961e4955c6ff36979c49b922
 MISC metadata.xml 534 SHA256 a49b8acc987ea0c9e2a42cfc4191bb1b0788d6b344d76483951eadc1fbd3b0c0 SHA512 e94dd85f11b4f8b838e928220cb887eeb70860e6d04f03e904ddd4332baddd3b01221305e7229fb575585235436d0d942c116f821ef37adae636a7d5c6193199 WHIRLPOOL 1b04bb250ec256dd971405639ae14f047ec37862fb56b6eb42c4fd98dc0fdd521ea9342a48139d35d4757a1b8b3592ab80180f55ed4bdb26191df7ca2541a8fd
diff --git a/app-admin/mcollective/mcollective-2.11.1.ebuild b/app-admin/mcollective/mcollective-2.11.1.ebuild
deleted file mode 100644
index 4caa041bf9c9..000000000000
--- a/app-admin/mcollective/mcollective-2.11.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-inherit ruby-ng
-
-DESCRIPTION="Framework to build server orchestration or parallel job execution
-systems"
-HOMEPAGE="http://marionette-collective.org/"
-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"
-
-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/mcollective/mcollective-2.11.3.ebuild b/app-admin/mcollective/mcollective-2.11.3.ebuild
index 795e37902641..1e7cca4d5674 100644
--- a/app-admin/mcollective/mcollective-2.11.3.ebuild
+++ b/app-admin/mcollective/mcollective-2.11.3.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/socklog/Manifest b/app-admin/socklog/Manifest
index de4d0e6451d3..456d928f7e99 100644
--- a/app-admin/socklog/Manifest
+++ b/app-admin/socklog/Manifest
@@ -1,6 +1,6 @@
 AUX socklog-2.1.0-headers.patch 925 SHA256 6687d9d7c93c993b99f47948999c03b6b1402cda78d5f854d093ac881171ddf3 SHA512 d522a421a592813992646d9d2679b26c7c70a87645e06705ba212b26decd6f7dd969b4a35f54732b0b383783956c1b9ab2fc3cd402f6f5ff1a941ef1863c1419 WHIRLPOOL 29d971746c61eabd4c4c3d42bb6fb76ca53a69e859d457b0820c2e316a0373e8c60aea62df9b0f210a99469543004f29215f1d6864a46e271abced9ab2ae9702
 DIST socklog-2.1.0.tar.gz 56942 SHA256 aa869a787ee004da4e5509b5a0031bcc17a4ab4ac650c2ce8d4e488123acb455 SHA512 920ce5e661a6a3d970fa77ee3c228d48699ea03530be2b43b7517458b25e31a0a7f352ece2d076c715b6d34dbb26b424b48eb0f55b9bcd0355b74d3e34c77ac7 WHIRLPOOL b0dcf0eeacbd3edb0465ccbd40ec546fe293c3d293fac254e11ca8c07514b01de2a6d45a6ef0ce697e33a5d631810af62955fb66333f2606f36dc51587025806
-EBUILD socklog-2.1.0.ebuild 878 SHA256 aa1b52e185767329a1c5e82a7f1bdd2010b6ccd5cf06f9aa9b7f1acc9330b796 SHA512 a65fb7d7b8f4b7c88fedd2ef6d747abc1aa3381426066ad2ad2f980e5ab418a8ee3b5d43bafc9f8ac7d14f8d9815f8c7232bc54f1a4c278a2f22b6c25173db6d WHIRLPOOL d91150e39541d666f01a064816ddc09bc1a07fc774daf088131681a899cb27ae31b6e3697ee6b76cbd749b61adeee8a7711cfe6c4489dbb58014b51b497d110f
+EBUILD socklog-2.1.0.ebuild 897 SHA256 b8bcc38fd3668bc4a74a2aa16d29427ab1a5cf1b8defb05d76ebbc4ebcc9fff2 SHA512 9bc1780369034e44693e96c63163b31d2e5c308953a4664ad09876b15657962465d029cac8d66f6169fd7e1a845f0c655799ee6780cf6411c2567287a025a0fc WHIRLPOOL 237f4e103a82e553348684d6be626266e8ea18f6853ed14be90cdb4ce08f9994e44966f9a7887c2f116987816e100fcc56ea74ad6bb6efc6188f6f405683f71a
 MISC ChangeLog 2464 SHA256 99b9e80db47207713bc58aa8c58dd30592b57300800bf0b010143081d450a647 SHA512 352535da4552ec2d626e25e357d9843006a9c75a9353ccc05ba217e442675c2f83e8574761aff7ff95f931764ab532e57484f60a983571dee38109cbfae45adc WHIRLPOOL de6c81c08b28972d1b279f468b364384d9b3c5c37e65ba473a21aed0f5ea68f8fbfc76a93eee32fa550868ec8299e353224244b4c57247b55cea9c37e638ac41
 MISC ChangeLog-2015 1882 SHA256 8f4f22c396ce72efb1007ff9cd604b4669ac129a2689d19ced55bf24b3ff28c4 SHA512 a1f4abc4dae09ad86208933499f518e719a46bca4f5c672e5cf3cb06a32777956420befa2daac73abc649c4e36737301fe58b6ff1d36707e3e3b600492fbad6b WHIRLPOOL 2d554936dfbc6e1f648cd44b7a73b2df14b68cf6d6298b8f0398332d805d9489f25cd561dd1796695094b0a646e72b101f17cc6239aa3c5c3e1e8dfcd6c30139
 MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/app-admin/socklog/socklog-2.1.0.ebuild b/app-admin/socklog/socklog-2.1.0.ebuild
index f7853dd9904b..1cfad2788449 100644
--- a/app-admin/socklog/socklog-2.1.0.ebuild
+++ b/app-admin/socklog/socklog-2.1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
+EAPI=6
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -16,20 +16,22 @@ IUSE="static"
 
 RDEPEND=">=sys-process/runit-1.4.0"
 
+PATCHES=( "${FILESDIR}"/${PN}-2.1.0-headers.patch )
+
 S=${WORKDIR}/admin/${P}/src
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.0-headers.patch
+	default
 	use static && append-ldflags -static
-	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld
+	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS}" > conf-cc || die
+	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld || die
 }
 
 src_install() {
-	dobin tryto uncat socklog-check || die
-	dosbin socklog socklog-conf || die
+	dobin tryto uncat socklog-check
+	dosbin socklog socklog-conf
 
-	cd ..
+	cd .. || die
 	dodoc package/CHANGES
 	dohtml doc/*.html
 	doman man/*
diff --git a/app-admin/swatchdog/Manifest b/app-admin/swatchdog/Manifest
index fa7da9d432e0..64055bcd2eb1 100644
--- a/app-admin/swatchdog/Manifest
+++ b/app-admin/swatchdog/Manifest
@@ -2,7 +2,6 @@ AUX swatchdog-confd 678 SHA256 8dfa6bf1768d75cc23555df58d45cb8c52ae467a83e61acb0
 AUX swatchdog-init 1502 SHA256 b48c46f349520bebef1187524856434acc609ec79360230ccf72c41dfc2cd0bd SHA512 30d5451cd871c15d2e50a3d5f32f4ea986971e2aa9a0b06ce5e383643aacd72a29c1574ec03bc3c0c994ebb13287f5870e8987971bcb73821f3ee744c7c574a3 WHIRLPOOL c5e312cac327a6433f9f17195ab64db4d94dd00615c9b392c2658e79d37f1d3409b7127a098558b1455160e3cecd52d12eb173b51445ada1a042aba1700d3a57
 AUX swatchdogrc 299 SHA256 67c35bbd4d0abb51fcf42cb50c1f25bac3ec5d1cc4b1da09e66a08d6cc719c92 SHA512 64dfe179ccab5674742b8198f15b5439c324c7e9648fa0064a36010f7160303abd09c5af4efdb422628827ff8f327a8db312c4fdfbf02aab29c772d82f1d5b44 WHIRLPOOL 2800da2a3960b2edcddd8ffc45c9a03b75adb4b105d53ddc7f15b72dc42b7c847785e540cce2ceb94c5863144d84c795368791771f0d357e168431ce88d6ae2f
 DIST swatchdog-3.2.4.tar.gz 30122 SHA256 5bb644d3750ee89b9aecab797df66b28b9fd174a5f0f96cd62367af8975b4f63 SHA512 4e0a4e3feed00df0f0d04f94cc090e53e71fa9b20d46236ec41d63b98b5733d80a5941b491cffcbb0b655a9c7d2b5c9423ca7ae043346dbe1b05ee6ab24b9489 WHIRLPOOL 1681139e54e5f665c2573983e8488859f907b3083f3ca1106faca137fb0b978cb0b90218899728ae8775334360b28ec4572f78415bca47a6d8a1a72be9f86ef5
-EBUILD swatchdog-3.2.4-r1.ebuild 768 SHA256 514a39cbc8100ccaae9753bf0b828261bf18215c05f6d6040d1718f5c51ca09a SHA512 b61d632d0088e2de4d577889361e9fd4510ad31797fd1583fc3b8df0b2187c53678e4bfc5c8aa776e1d562db2f469d694d2d0fe35d86c968275fd86de95a6f14 WHIRLPOOL e6b1d89a9ea139e05c0c207d50346cb4b8803d586cc6b12d2f1d81edc855deeb7578fab3c3e87e80197b509d26d0a8a0cad5b1583abbca5551aec5f0f8cb0968
-EBUILD swatchdog-3.2.4.ebuild 672 SHA256 3597d1fb44d080886bf5c0f952ca4bce7982cc93bde8bba29c676ebc40591d7c SHA512 706a131392c669be2747ff0a600abda92515e2e2427419df5c28217da9480585a09a137a20ed3536a0e2147e57e9dc3a6c9ed0ec0e0abe2e56cfa62b761ef2e2 WHIRLPOOL 2646079d3b1ba4b57311489a774ca7cb1f225c013cc63d13e6e04c7430540e50c3f2635d126a39bb3fa4e43b6437fc2d2d2655abd46d022334e238eb8dd2b376
+EBUILD swatchdog-3.2.4-r1.ebuild 767 SHA256 b90e5da1647c6c628663f9214c748f727d9220b06f2f6e3aec19f60a9ab104e2 SHA512 6002de4c68848260f282666cf0cf51f9f97acc7466bd71301b80a3d1392ffb2f6c1e94a41bd6c0db3f98f05eb35bd152fc3fe691b09846b41308ed32b0f3e8f8 WHIRLPOOL 905d5f111e71624688ae481ff999e61e988f753a02de696b8a7be06c7419587d94fae4c9cf712cdde8d3a5813cba46aad4a76488f523bf37c0181b7f5d2c4bcc
 MISC ChangeLog 482 SHA256 c57bf04f2abe00401de876ba006cbe6e5806916879070296618b203c8abd881d SHA512 24cefa0bd960cabfeb193e240174ffc59448f64231dc4c5bc1f02b68fb6aa18926ac8318bb9c9e965adfa58d2fe34dfe7153eb08a82af364b313959d5f518265 WHIRLPOOL 5949c24050ede359d85ebf3a9649ee35342ccc051b673c1f7400965d336bbf70d7c97141acdb38bf28aef60e1a463e043c8412e956a0ff415b54b663e954a22b
 MISC metadata.xml 1137 SHA256 f231977c3ac1e7d0c13d1dbf8dafe073a2a58419ab3494e0af3d013d2ca0d2e6 SHA512 3a4efd76ee1a609c59a84ec43482982c27d9cf0ba4e4f42cb162c8dc39acbe89ffb146735d04aa111c404e546311df40cd9da782d76c766ac37e14aedb5f4884 WHIRLPOOL b2b6e317a183fe29c41ddfa53d3ddf462a0437d4f8a2f4e46e2d4b6db15c6d727a82d7675deefb2288c208b67e4281f3604c7e63fcab2d96e89eb0e69b01f774
diff --git a/app-admin/swatchdog/swatchdog-3.2.4-r1.ebuild b/app-admin/swatchdog/swatchdog-3.2.4-r1.ebuild
index 025756396a7c..c572801b8f3a 100644
--- a/app-admin/swatchdog/swatchdog-3.2.4-r1.ebuild
+++ b/app-admin/swatchdog/swatchdog-3.2.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/swatch/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="dev-perl/Date-Manip
diff --git a/app-admin/swatchdog/swatchdog-3.2.4.ebuild b/app-admin/swatchdog/swatchdog-3.2.4.ebuild
deleted file mode 100644
index 0dcfd1b80623..000000000000
--- a/app-admin/swatchdog/swatchdog-3.2.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL_SUBSLOT=yes
-inherit perl-app
-
-DESCRIPTION="Simple log watcher"
-HOMEPAGE="https://sourceforge.net/projects/swatch/"
-SRC_URI="mirror://sourceforge/swatch/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="dev-perl/Date-Manip
-		dev-perl/Date-Calc
-		dev-perl/File-Tail
-		dev-perl/TimeDate
-		>=virtual/perl-Time-HiRes-1.12
-		!app-admin/swatch"
-
-src_install() {
-	emake install
-	newinitd "${FILESDIR}/${PN}-init" "${PN}"
-	newconfd "${FILESDIR}/${PN}-confd" "${PN}"
-	insinto /etc
-	doins "${FILESDIR}/${PN}rc"
-}
diff --git a/app-admin/tmpwatch/Manifest b/app-admin/tmpwatch/Manifest
index 51d94906d6bd..25b5f20ffdde 100644
--- a/app-admin/tmpwatch/Manifest
+++ b/app-admin/tmpwatch/Manifest
@@ -1,8 +1,7 @@
 AUX tmpwatch-2.11-boottime.patch 1034 SHA256 5150b5d350213a6d3d4c5d747520077e5a1d7558c5f7174bacc138e72ec92d0a SHA512 6ad3cfe0dcd1a14d071ac64ca09279aae853c3b5a47604d99c2ff24319145d5c599ed6e780ac7eb9a2e2d185495e9d7e2133c905490b647f6b639a4bcd0def92 WHIRLPOOL 553353bb72b312aaebec9aa04b2211ec1e9340c41b08cde52caeb316861b39dc260bff3548d631e94a3c6c88fd5dff463ef3618994b6dd1c6865c01685daec22
 AUX tmpwatch.cron 1533 SHA256 ece4417d5ce022d647753e2005a11ee3b905d9f25e8f559a361c59a7760057f0 SHA512 9c96eaccc70d6eadac1233b6cd6772c61dbe8fed348fbe45d729bba8d8434f32bb4ba800cf92f151d7576763f7fde7c5c25b55293ecdac5f5254ce387da8b016 WHIRLPOOL 5ec5ef4f7ea2ad491c39656ae6cd84884cf5dab28bc36e5b7e890a818715185307b3a422a840ac35a12056fe6364ad09c336256e860e4ce05cc78c315f4b802b
 DIST tmpwatch-2.11.tar.bz2 145609 SHA256 93168112b2515bc4c7117e8113b8d91e06b79550d2194d62a0c174fe6c2aa8d4 SHA512 9242c5e1812c2ffc756cfc4cdc3023d0c0515e7c180e58ca3a838aa075d09fe4dc08dbc9afbc87ce3382e8aa8cb80a70e406deeab4ce10b39b6845d667989d97 WHIRLPOOL 94d83c4a2b1c1a19ab88632c61de37903b709bc7fa88aff9f8ac4f4b71a26b8e6fbcb1564b3bce08ed5d1d0a78511c3470978a13211356f5fdf10b4d40f2de1c
-EBUILD tmpwatch-2.11-r2.ebuild 722 SHA256 000e6d20aed139b7ac3fcf4663ca45d206dfe8efb323b64d0ade2583fc94239a SHA512 91a43b7cf57e996674560d685b49d7e2fcbdf005782d787e129da6a13d1a784997ba2c0ec030073b73034575a71687e1bc31b1ee4b9e08401d65fa6b51b62973 WHIRLPOOL df164934639bae18f14992619536ee469f1d1304c4b6375159ec039dfa993e011d33a4989d6ee5e6d6f2aa28569d86fb8eaaef67546fdfbb9bf7e1aa71135fd8
-EBUILD tmpwatch-2.11.ebuild 722 SHA256 12e154c3f0197ebf62c68c338273b519d6b213f37c7357e116c2ebc75cc026b5 SHA512 a7543348e40cca314a89a04ab8d1d6e2c226172cd1b819cc26516cc92d81bbe0f71e8ff6673b16ec6e88e57aa34c9e55a69cc33badd1b7844a1c0e4dd14ff11a WHIRLPOOL a71956b225a739226885c667575f44f8a2da4d374c5c840ff301cccadd3742740dbcf7442273311b912ec126fdeac981b8943fccdee4240c2339c3b09f6fd39a
+EBUILD tmpwatch-2.11-r2.ebuild 704 SHA256 b1650aa07d29ef1fa13ab43d58c38eae828b068705aa511d8fb9838da320d6d4 SHA512 297c4f41388e35eae3c1f0a4b13354bdb638b7df16d70e676be67faaead0a76ab71cd90c312cb97eed39bc18be1b06e674856e0afd832084a8cb0677a68b021b WHIRLPOOL 2494421dd6c33cb9cb84ba6b4c1207680a91575fc43711355b8abba36822805db06d094a2ad7ff7bd69160111904308554d03e2e3c390049bb381798879dd26e
 MISC ChangeLog 3011 SHA256 98b53b719c552a79f897a1b602b768a8ead92f8217d62c8b35128c760c3e3cb2 SHA512 cf128f51a822d6f80c36fa89237a13b893d5765f4c7d1bf001935fa784c725f46057bf467408f6be9e520dd1ca81e03580a3831d5e1db7205043c26512b515de WHIRLPOOL c663c0bc940b186591ee5380299a36acc79316ad80841cf1eb0f0aa9107b2b6f58b433401cfe20376bcc27d7b47c27714152777985d4e99e45677dd2ade7d4f6
 MISC ChangeLog-2015 13646 SHA256 241cb43ec00ffaffefbf3c8a0f4c0ffa7cbaa293a0e257bd6f3f7b056d80f653 SHA512 288f1be301627114bbbf8135b7631d715eedc037f99b32b053fc915f123678835deaa59625b3f4a82cf2e98fcfcdd422afb8c28b1bc5dbafeadbfc30fc628a88 WHIRLPOOL e6cb093b566e4de6675d912aaac8b0f4f9581b1d947414487689df0050d0a588a219e42fd716bf94b7c7455966b7d9b14eae19905ae38c667617f88c4516a1d7
 MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild b/app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild
index b1028a59fbb6..d95863cf391c 100644
--- a/app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild
+++ b/app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 inherit toolchain-funcs eutils
 
 DESCRIPTION="Files which haven't been accessed are removed from specified directories"
-HOMEPAGE="https://fedorahosted.org/tmpwatch/"
-SRC_URI="https://fedorahosted.org/releases/t/m/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://pagure.io/tmpwatch"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-admin/tmpwatch/tmpwatch-2.11.ebuild b/app-admin/tmpwatch/tmpwatch-2.11.ebuild
deleted file mode 100644
index 5e251f8628b1..000000000000
--- a/app-admin/tmpwatch/tmpwatch-2.11.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Files which haven't been accessed are removed from specified directories"
-HOMEPAGE="https://fedorahosted.org/tmpwatch/"
-SRC_URI="https://fedorahosted.org/releases/t/m/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-tmpreaper )"
-DEPEND=""
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	dosbin tmpwatch || die
-	doman tmpwatch.8 || die
-	dodoc ChangeLog NEWS README AUTHORS || die
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}/${PN}.cron" "${PN}" || die
-}