gentoo resync : 22.04.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-04-22 14:25:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-04-22 14:25:03 +0100
commit: 5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (patch)
tree: b041acef19bb9ae66c228d5c9d34d1e00aeb2b95 /app-admin
parent: 5cfef3c94cd7e82136c69a0322f5ba21f7e64632 (diff)
42 files changed, 396 insertions, 382 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index f2011147815a..4762efa35adb 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index c09cd6c6c9ea..f8cefa402b9b 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -6,6 +6,6 @@ DIST httpd-2.4.29.tar.bz2 6567926 BLAKE2B 01a83212941abad548f73fc144f9731ff51e0e
 DIST httpd-2.4.33.tar.bz2 6934765 BLAKE2B 4ff266b85358e3100c8064c84c89db0235e6f46bb4b308e6b3bf642a9c0815eb6a731ee12e3d8ea2bf31a5d5e6621152452f1e8a9625755689f552f2473b1955 SHA512 e74b2b3346d67be45a8bc8a7cbb8eabf5c403a5cfe5797a976f94a539529843fbcdf03b9ca0548816b2cf37f4ce0eb301f8d5af25b1270fdf8dd9f5bf0585269
 EBUILD apache-tools-2.2.34.ebuild 1977 BLAKE2B 792d6ea010621c815a13fa89db289cdb7d2f02cd4aecca6d032e21c2bd64af7c35a66ebe3b8102eb441d12a4b6b2ca6197e16f8479d72c82606b088b97dfc24a SHA512 4a71266da0e171579c5d9da9ed681ed5600d2d94ffb15761bbd7f28b60332158959156a65b27ac295869f647f624fe598bdf2e74aa3c7f8b16fef7cbb2dc9a52
 EBUILD apache-tools-2.4.27.ebuild 2653 BLAKE2B 00b1b5e96e7eab66981fc339faf6db5e40d05af2d819c92a5faff3ad2f60c566d0235cbf60ded1d5daa79cec7815534b96b53b8e8f00333d1a814058752dd011 SHA512 e23b494555f6685f482fcecc59b5e81147780bf399de740b91bc19de9197a3d6f9d32a701472ba6551a3039214adc2e0bfd4436e0b82edb388f26d4dc88bd110
-EBUILD apache-tools-2.4.29.ebuild 2656 BLAKE2B 575d33fc6ad9d95ec105f4318af317759f02135370ce8ffbead49cdb8ed9c61803f3652a50736ed9a1696ce902af9426002da2ead7ff8de7a3b783c5b76d340b SHA512 ef4f840c6f8fe5ac3bc12836b31a73a5c5038a58ee60259ebc9c52ac353803deacf78f56be837b30706ccd00c65aa9fd5e861fdd88bc86f758fbab390c63efb2
+EBUILD apache-tools-2.4.29.ebuild 2655 BLAKE2B 4132c82619471dd8d7ea7da20e780bfe848a571934944c9b209f4e17b6c133d7930ddac23af68ddc60ec93f39abff6075141c214b724e84dd0052ec99303e1f7 SHA512 5a8a2605aa5b46d35dfc14e3c6f39cf6164d310f594bf31d7980d1e9d0a313d22478a7df119759059aa76d0e396801f57ebbbf977247efba4f833e853a1ecae5
 EBUILD apache-tools-2.4.33.ebuild 2584 BLAKE2B 753da88acf51594057d803cdf7d30c47cea49bc9dde0bc95101b7188f13b59db91b3b7db84422f828efb8871fd95926c58ef9902823fb8d63ee18df12bf37bbc SHA512 d3c4a5bf85c81901e18bd7649d9ee368a478a2bd4b55ad2ce4820db68a576a26ea0aedcfd98dad0d2c6c3a63bb5f177d2a40a68ca5e1cef6bac7c830b41ed258
 MISC metadata.xml 466 BLAKE2B 06dbc2df528810dc0aa7335271c987c6310ceb7d8b0db3dc74c6727c27d280e499ddd9ee75580dba63e0f33e24ce63ecfa40059a46ebdec80005769608cae82c SHA512 2820a1f104fbdc752196f600def1e0c56eed6025fa3e66b297077be7a6eb735a2009f1a57cc320e2cf0c2d6cebf9db8c338cf2c6cc9c746766ab99a0b49c63fe
diff --git a/app-admin/apache-tools/apache-tools-2.4.29.ebuild b/app-admin/apache-tools/apache-tools-2.4.29.ebuild
index e05c604f2b66..a863d1e02223 100644
--- a/app-admin/apache-tools/apache-tools-2.4.29.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.29.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 IUSE="libressl ssl"
 RESTRICT="test"
 
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index fc0d54bda7a6..2f3d8656f71b 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,8 +1,6 @@
 DIST eselect-1.4.11.tar.xz 177444 BLAKE2B e6f758e2acd17cea3ae37af48e4b4327a9c9d74784aa0723b003f2e1d84ec4c13167de33c311b785fddf7b045b3312955c4d84cf6e35ef7ec9265ef5de503670 SHA512 eec3091c5e386e8b7a52cb263e3c5ce6f41e285d2ae7974f4876e2ffa93b00f9f939055d978c6b9032ee1be2561992015560cdfa93a1ff2b1720ea0100fcf96d
 DIST eselect-1.4.12.tar.xz 177520 BLAKE2B 0938fe9bd8785fe711edc1af63a9c318a4a5fe9141c61d7f1c4da0352242322f1e18e4f68f7e219a1aa2beae5b25ddac58d7c47d4272408fd8fe5207324ef7c7 SHA512 2ea182364dfb2333112e9eebe691e1963e95a4c9ab40945eb2e5bc8c81da76105c1ae6aa3d153b78dea6c1e0cadb9b0237f7556b8ceb9d48e0fba67a642d6081
-DIST eselect-1.4.8.tar.xz 176692 BLAKE2B d24f87ecd7fed1f23a26f9017ecaecaf5b69c02ffbcf9cf7d7b93fa8cad6364d934de8196aff1af955076c167ac4fa8911be03473c757f6a623c63820f3b8255 SHA512 13faa3b21d352975498eb2ea62dfb8d371f30afd6e283c30ff4e89cef035598a8cfe8fafbc6763f39081c547f6743c7f4731d21170625781b89d64eb46c22194
-EBUILD eselect-1.4.11.ebuild 1638 BLAKE2B f1876347a7cc6f59eb1bb7ff727145c59177b95ea6d9525db9dab37819336954770b399134e6d38a90e3b98266a611eb9476f13ecf7c58dc4bc3a8de68ec6abc SHA512 5b4482d9d693f62250e9d1ce69744dfb13a08cc588ca1d555e0e12bae5dc84bb25fbd83824864d6c34ca6403f281ba5eed670a0fc2a78251c73ffc230a94c74f
-EBUILD eselect-1.4.12.ebuild 1647 BLAKE2B d8dece0d1f857c5282ce3cbe97239881fbfd7762a0903e1bed9b2dae72cb9c5c7f06cb9cd84cd6b6b0ce337649759605dfb90db12fb83c9031b5968ceb3a8173 SHA512 2f39fe3845cee90e304591ade02b935118be3840fa07f1913741e28914fc0f99b7e41d240afe87006c7c8c65440c9759fe22aef0458b856f7beeb05fcd481e53
-EBUILD eselect-1.4.8.ebuild 1641 BLAKE2B 3bef4d6f93da92e36d99ae5fdcae1fb121cdbd41e1fb1b6a1d0c616a04e5919247872d3164867daa2b16f6f18d128fcdca72fbdf51fa81e4df6bb064ae58bac6 SHA512 3b45491ae813cf8cc99c9103392b2c4ab9e84b4f22f3035affac93e8bf08f3b9e130927333c5cb3bc8874ea90d8a089b542013f86c36c68a09b8a03eb0bdc8d6
+EBUILD eselect-1.4.11.ebuild 1634 BLAKE2B e28298f0caa8e8751385c546d23bebbcf6839481a43a3752c5b1e35e7d62822dbf961c58f8c81b5d7eab01cfbb0ddecf88697670c2c6003ab73906078270b3d9 SHA512 22e4238d5ed8f6229236bdcd3cb6186a1fe80bbf5b51a356392d382fbe83839a5287bf212603214dbd2f40e155dc647c3a4fd366676a707339b4550c0223d8a9
+EBUILD eselect-1.4.12.ebuild 1645 BLAKE2B 16466bef3b4daff53b08d0c2284c0ef3e431667bcd880104e23ff4f51a4a54ac310d20b1dca9635f4967149907d7d7f833d2d098461b63f8615c82462d8516a6 SHA512 10b3d9611d802074323923a6882d4096ca520078be5cd36a5a91b8b041e1e0f790196a425274a505539430718bc1bf044db7fa36c99fdaa52243aa842f239ffa
 EBUILD eselect-9999.ebuild 1437 BLAKE2B a390e3198a7f7f52f48ef56bdb73a8075d5c4c1560c0df7971d32798f1296114053b16a8faeee2982b8e106be835e3b61c3655dc2de270b488259f185e8a8980 SHA512 06a5eb4f7bed5a17f9cd56fe497a7cadb7a153580fac6aeefd6f0762ed029c78c79e4f4a50301177eff4e50ac3ac5ddfae342eb0eb4b5c64aa6a840493fa5868
 MISC metadata.xml 272 BLAKE2B 68f9c1edf77cdf1dc46891129ed694307cab4e954c6cb002c3fc32fba216949c83a21dc0618f4bf24fd8e1da5558043709210e6697fda3881adeb69a30eb569f SHA512 55cba722900834986e0ea0c9cd8463c3b69d3ada26227d45c8cc3aa07f6ca40919457f80b03a559a8f9ad55636d931cc2101b928b438aeca19b0531c90ec40a3
diff --git a/app-admin/eselect/eselect-1.4.11.ebuild b/app-admin/eselect/eselect-1.4.11.ebuild
index 69b620c0f342..cfe033136423 100644
--- a/app-admin/eselect/eselect-1.4.11.ebuild
+++ b/app-admin/eselect/eselect-1.4.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"
 
 RDEPEND="sys-apps/sed
diff --git a/app-admin/eselect/eselect-1.4.12.ebuild b/app-admin/eselect/eselect-1.4.12.ebuild
index 2403e8dc5a8d..bac304223f01 100644
--- a/app-admin/eselect/eselect-1.4.12.ebuild
+++ b/app-admin/eselect/eselect-1.4.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"
 
 RDEPEND="sys-apps/sed
diff --git a/app-admin/eselect/eselect-1.4.8.ebuild b/app-admin/eselect/eselect-1.4.8.ebuild
deleted file mode 100644
index c3904da9fc27..000000000000
--- a/app-admin/eselect/eselect-1.4.8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils bash-completion-r1
-
-DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
-SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
-
-LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs vim-syntax"
-
-RDEPEND="sys-apps/sed
-	|| (
-		sys-apps/coreutils
-		sys-freebsd/freebsd-bin
-		app-misc/realpath
-	)"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/docutils )"
-RDEPEND="${RDEPEND}
-	sys-apps/file
-	sys-libs/ncurses:0"
-
-PDEPEND="emacs? ( app-emacs/eselect-mode )
-	vim-syntax? ( app-vim/eselect-syntax )"
-
-src_compile() {
-	emake
-	use doc && emake html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	newbashcomp misc/${PN}.bashcomp ${PN}
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
-	if use doc; then
-		docinto html
-		dodoc *.html doc/*.html doc/*.css
-	fi
-
-	# needed by news module
-	keepdir /var/lib/gentoo/news
-	if ! use prefix; then
-		fowners root:portage /var/lib/gentoo/news
-		fperms g+w /var/lib/gentoo/news
-	fi
-}
-
-pkg_postinst() {
-	# fowners in src_install doesn't work for the portage group:
-	# merging changes the group back to root
-	if ! use prefix; then
-		chgrp portage "${EROOT}/var/lib/gentoo/news" \
-			&& chmod g+w "${EROOT}/var/lib/gentoo/news"
-	fi
-}
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index e53108dc3bdc..945dd0a3c4b3 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -2,11 +2,11 @@ AUX filebeat.confd 269 BLAKE2B f9cc2a3d96be870d755c41606a274e94d6f6a2a5be71aeb3f
 AUX filebeat.initd 1388 BLAKE2B 2a427750a15e6910344dee1d2707773b01961360ae3a7e3337a761b759b2c9fcd9a914385e8ff6292841ad6c07781af3b5cf059f1338a6f2f33bda576bb125cc SHA512 9b08635b9ba6e180881780de0fa9d6c8c1b2e7496fc803c2b38127fee13d13ca5d00792132cdc8bd4073018e3f6e374d4164a86e450a1dbeb68b2694fa0dbb12
 AUX filebeat.initd.1 1388 BLAKE2B 6ca4f3f4d50bba2a036a35b8e74bfa92d5b03ccaf8548df215d3d68ba9a2eaf9e2996374d49011f9e4380bc59f6307e262eee1367801bfb8279eb0b1639b83c4 SHA512 374b466b39feb832b414d0491510190758007079b6c865823878db00d5c17235f657deb0822066f124e3f07616dc4ff3237e87f6f35785e071815ec4e533b1dd
 DIST filebeat-5.5.2.tar.gz 18075191 BLAKE2B 9786cb8f3db003c86e4bc6d56fcac660b615e7e6ad82d0912f70c545f2af3caab605be739481355466438a1769c20b28db576d208af6b0af9620ce6408068215 SHA512 ad92b41a9ceaad6c6e6fc80d0adccd7fe03a7056d121484bcf35c6a46b2061a5ef6d32121dd12d59b51e7678769da5c405b1d549fa130631ae3f1989b78fba48
-DIST filebeat-5.6.5.tar.gz 18145468 BLAKE2B 57f3320012d8c17b7b961dd6d843e982e3cc5fe0f39658ca5ccc2fb9056c8dd4527306b7cfe483d3fa39bef5892dd22c4f07f24aad1e804bd76cdda94b56a3e8 SHA512 f1c8ffa2521e0e15a14850199c3da83d8f8489d5f97364b205ee8120b56e2ae47055c78ed6a5ef2d0296f449339efa05f2d7bce7282b1e7f2e044d7ed3244d4c
-DIST filebeat-6.0.1.tar.gz 15150919 BLAKE2B 40149de3257d78a737d71f59f8be91a3bd60185f716ecc89dbe373283ab6481afe709ff573efb8b1079f2c571c6de036bd705dd082c3cba1eda44d282409247c SHA512 baf21acf38409b398f261509d25d2b009342fdde1fcd824c99d16cc279355ae5eb029699a5a7e3b6e58abdbed4ef5fda1b4058ed94b807fd5964ad24828585e2
+DIST filebeat-5.6.9.tar.gz 18209544 BLAKE2B 41891b984240af46fb3d9d7818203d7ef8fd5a089d7683877e3907061259442da4884976cfefcc90666699ebe3adb1ce6c87a026a50b07e218a5de6b642b9472 SHA512 2aa40afbd0f1c987aebf51d22aa03c87048766a4c7d41938ff27ffca841666d34cfbf08ae120d98d222a7d3ff447bbce9f1d65b434aef1c9d73c5019aa1558a1
 DIST filebeat-6.1.1.tar.gz 17061456 BLAKE2B 5a5d23618f8140f3815c499305d99ae3dc4c4caa49535043040387922f924ee49a9494b5139f34a70d74173d97332b92909fc74e2f91a2fc0f288ef5d1493ade SHA512 54e85cfce58ba724f6b2892f115ac9ef5b1bb89ce8dc6f2a977e50ccfc07cf95fc578e46e0cadd96acd90c59f4b01446851b93c519afa094ff6dcdb7e716219a
+DIST filebeat-6.2.4.tar.gz 19466271 BLAKE2B 417f1db19b7fdd9bcf66f2c3dcdf2aaa6be9ba5edff1c97a0b8f4a5d7953ef27bcbd860e097fb40e67b3b42b795b684dabb2995eee572243831f749a7184b625 SHA512 49293e28e4ca769a88f7b889ea888a559ae7e142698714e24bf5519d00c2030237cac591590aa284f17792906a6137333173716ddf5db4496217f8b5a054b19c
 EBUILD filebeat-5.5.2.ebuild 1646 BLAKE2B 37f6ac540ed27b471021be5666233d00ceacdcbdf6a32954c5987fa85c957223d84536dd5c0e93bf6acd988b01a061008cffff005806d8b2d8cee7f722884f33 SHA512 4b36e36a4f95c893bca863c4510e903f6265e4950fa000cae61896915c558beb4d8c4b10d8aa78d154bef7eb67886628f499153f988ff66e5b1066cb949b2029
-EBUILD filebeat-5.6.5.ebuild 1647 BLAKE2B de539c0afa664ffb179608e02a73dd75837afdc5564879653b1a5d41c0362dca5b65e5c7b891a3209fb1ecb18b126fa03a4da55ed8287196b2bf14b461999643 SHA512 eae4bdcb37e0ebce86ea8425cacc4289ba311e3f66c50e79b09d3625052f671d24f60fba7dc0be9d8a1758124552cec573b9c843874a0c2e77582c9863d1358c
-EBUILD filebeat-6.0.1.ebuild 1276 BLAKE2B d77562bb3fad920f86ae8a8c155ce161c59f07972c39b546eee8fc723e85ac3943a76fed6a9e6c8ba15926759125f6199a8bc99faddfbc3970c71b35296b96d2 SHA512 d369a624fd8c417059e45ed1b56a848fa8ed1b06d1917f23f251480a29b83847d1f45357e9e7c7b10c592bb94b4d6dead91c98a80d485c3a59acdc8eaa563185
+EBUILD filebeat-5.6.9.ebuild 1496 BLAKE2B cd528a4a68ef61ae3f5fea941e8a71e72002cb5b18814b3d9b3bdfdd86520f42ac87818acaf313807a2b7cdc1eef1f6ffa26d06d5190b9446c3f95b614718158 SHA512 0a7de42d1408d5c3a54836ebea8450e27b57f42824dbb1e2ce3d705123df752d8f68e8c40de2b17a6dae93307856eaa3898925994839e6d5e13e7275a30988f9
 EBUILD filebeat-6.1.1.ebuild 1303 BLAKE2B 9e3c7601566336639171e69171b51d1a7ca33d8636de2cca01709d1c97a65a82fda7b650efd682fd4d4909587a5868a84c4ea4053798b1daa73f11a036951a82 SHA512 fa282f9c87f051c0f33f0344f34d81c8dc9d8beb7d8b8d74ca8490bfb4f727f557145d138f7397452635b96b9be1a0a82e52f6b894a9e0b48cff16a11065491b
+EBUILD filebeat-6.2.4.ebuild 1216 BLAKE2B f3b33fcbe8ac9fae7bffe893254eed1c8daccb095cc04a9b8f07160afe029e6d960910aa0fa4805d61bb1649fb8de9f8f5f0016cba2cc8175651734937ae953c SHA512 4bbed842b8b59e0ddfce1b2ba4118692f03189908e957328f9a6db00e42b5901d32cc7dec8ae449bfdef6bbd8fa1abf06cf428def31070fdb0321ee7d2a55b8a
 MISC metadata.xml 461 BLAKE2B 8bd064daf5ee2d3fe746a73bf36f01926fee1f9796b29499a7fb1db844aface3be7dfd137ed31f606e78834c1d7a135d0119f400244ba33ce3feb81fa792eb6e SHA512 903c43c9cf4b371e34afffd0b425086d5fba6f37af0d761fc0065d114dc843ea0dcdd439682e48749bdf2f9138bfc3dc6cfcc6490503daeb7a71ce5706a779d8
diff --git a/app-admin/filebeat/filebeat-5.6.5.ebuild b/app-admin/filebeat/filebeat-5.6.9.ebuild
index fccd5dd69a88..4537daa105ba 100644
--- a/app-admin/filebeat/filebeat-5.6.5.ebuild
+++ b/app-admin/filebeat/filebeat-5.6.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,28 +10,21 @@ SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
 
 DEPEND=">=dev-lang/go-1.9.2"
 RDEPEND="!app-admin/filebeat-bin"
 
-ELASTIC="${WORKDIR}/src/github.com/elastic"
-BEATS="${ELASTIC}/beats"
-S="${BEATS}"
+S="${WORKDIR}/src/github.com/elastic/beats"
 
 src_unpack() {
-	mkdir -p "${ELASTIC}" || die
-	unpack ${P}.tar.gz
-	mv beats-${PV} "${BEATS}" || die
+	mkdir -p "${S%/*}" || die
+	default
+	mv beats-${PV} "${S}" || die
 }
 
 src_compile() {
-	cd ${BEATS}/filebeat || die
-	GOPATH="${WORKDIR}" emake
-}
-
-src_test() {
-	cd ${BEATS}/filebeat || die
-	GOPATH="${WORKDIR}" emake check
+	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
 }
 
 src_install() {
@@ -42,8 +35,8 @@ src_install() {
 	newconfd "${FILESDIR}/${PN}.confd" ${PN}
 	newinitd "${FILESDIR}/${PN}.initd" ${PN}
 
-	insinto "/usr/share/doc/${PF}/examples"
-	doins ${PN}/{filebeat.yml,filebeat.full.yml}
+	docinto examples
+	dodoc ${PN}/{filebeat.yml,filebeat.full.yml}
 
 	insinto "/etc/${PN}"
 	doins ${PN}/{filebeat.template.json,filebeat.template-es2x.json,filebeat.template-es6x.json}
diff --git a/app-admin/filebeat/filebeat-6.0.1.ebuild b/app-admin/filebeat/filebeat-6.2.4.ebuild
index 0717397854fd..cf379ba2e314 100644
--- a/app-admin/filebeat/filebeat-6.0.1.ebuild
+++ b/app-admin/filebeat/filebeat-6.2.4.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+inherit eapi7-ver
+
 DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
 HOMEPAGE="https://www.elastic.co/products/beats"
 SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -10,25 +12,21 @@ SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
 
 DEPEND=">=dev-lang/go-1.9.2"
 RDEPEND="!app-admin/filebeat-bin"
 
-RESTRICT="test"
-
-ELASTIC="${WORKDIR}/src/github.com/elastic"
-BEATS="${ELASTIC}/beats"
-S="${BEATS}"
+S="${WORKDIR}/src/github.com/elastic/beats"
 
 src_unpack() {
-	mkdir -p "${ELASTIC}" || die
-	unpack ${P}.tar.gz
-	mv beats-${PV} "${BEATS}" || die
+	mkdir -p "${S%/*}" || die
+	default
+	mv beats-${PV} "${S}" || die
 }
 
 src_compile() {
-	cd ${BEATS}/filebeat || die
-	GOPATH="${WORKDIR}" emake
+	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
 }
 
 src_install() {
@@ -39,8 +37,8 @@ src_install() {
 	newconfd "${FILESDIR}/${PN}.confd" ${PN}
 	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
 
-	insinto "/usr/share/doc/${PF}/examples"
-	doins ${PN}/{filebeat.yml,filebeat.reference.yml}
+	docinto examples
+	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
 
 	dobin filebeat/filebeat
 }
@@ -48,7 +46,7 @@ src_install() {
 pkg_postinst() {
 	if [[ -n "${REPLACING_VERSIONS}" ]]; then
 		elog "Please read the migration guide at:"
-		elog "https://www.elastic.co/guide/en/beats/libbeat/6.0/upgrading.html"
+		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
 		elog ""
 	fi
 
diff --git a/app-admin/paxtest/Manifest b/app-admin/paxtest/Manifest
index a86071f77f0d..350672a0525a 100644
--- a/app-admin/paxtest/Manifest
+++ b/app-admin/paxtest/Manifest
@@ -1,4 +1,4 @@
-AUX paxtest-0.9.13-Makefile.patch 675 BLAKE2B 1ed7f94daaf1823aa50b83f5b1565fb5929e04b01cadc9d7f232a688040d45c6864093e45cd5592c0dc558b893ea23cab84c1297d2ba922c74e595847c7aaf44 SHA512 91447e797fcb320abade16bd8c0bd9ec53a112fe157165407790eddac15f02338e59244fb56715b5ada1d1ed526093bba600ec8b7c2a0f330315b7a821c7c276
+AUX paxtest-0.9.13-Makefile.patch 508 BLAKE2B dddbe4e9c2cf761c4abcff5f2d708a90750a0f11dc685cd99d162ef4a90a3beaa9a3c12f01994ff34202ba33b8a04554c59213d4bbcb48491528ca957c443c10 SHA512 ed28fc2d852ef0f4da5268c8f66e9a5c5f2b75509cb67627ab1afbd9c3b89609a0e88686cb317f3e6e48874e02d5593b7a7661160ef849859cb9e77be375a6fc
 DIST paxtest-0.9.15.tar.gz 37929 BLAKE2B 0b0290212fa27b8f27bea62c209423b6ea57e9c3e7d972fd069f0213b3963eb7a65921c669ac402b5d83f6556ba9ede90375b58f0f7ec6daf6cc3a293372edf5 SHA512 e152f5ada943f69b3745b51ac6d80f35a4c1aff777e93360287ef18b117d07861216d9d0d2075d2511d33e2cb4ea07168bb9ff2f00e79de6060e546b6806c487
-EBUILD paxtest-0.9.15-r1.ebuild 958 BLAKE2B 53dd0dbcfcf101d81245e611a3cbed2327c4af34fe6abda213a87105ec67bddf8077da01db1cb22727b84c0e9fe80a100428bd531cac07e93d63ccd1d7ba9f15 SHA512 04480944defd3d5a2322ada44b7ecfabcd6bfcb6ea2b7266d0f3cb06e66f987f2fdbd670735d157fd8b16799060d3996f2c090852ab8ecc1fc057d88e96dcac0
+EBUILD paxtest-0.9.15-r1.ebuild 942 BLAKE2B 87d557f82a0e54ddc70f1505c3b693f31beb307afb8603c67f70cf2bbfed2d788180f84358ef430a083faa8e2a76c98d77166316cd6f29962442e5aa628d1775 SHA512 c9bf34adbd5935fd323bc20fbf8e53a0c3fa436b0fe38cb1d347de9612a1b7019f26ce99afb12a4e66c9562e123f78fe52e68068d9f9c9b4893826c841d05199
 MISC metadata.xml 1140 BLAKE2B 4ba22a2a46b61986421373ff6a401f6c056bdb47b89b38552faa0e7b761b1bc171f253f238b59659183678590632d1f414f1108df2ad6ece17ffdb8eb32d45c1 SHA512 8abd1878f49a3e0fb560c0547555140f369d419b07ac05def097deaf386a162a4ce9fc7263dcf417e2909985900a8e01f517fcc3282c93c156c3339fe6a9f6ed
diff --git a/app-admin/paxtest/files/paxtest-0.9.13-Makefile.patch b/app-admin/paxtest/files/paxtest-0.9.13-Makefile.patch
index 1f8a99a689b2..4dd4831eb453 100644
--- a/app-admin/paxtest/files/paxtest-0.9.13-Makefile.patch
+++ b/app-admin/paxtest/files/paxtest-0.9.13-Makefile.patch
@@ -1,6 +1,5 @@
-diff -Naur paxtest-0.9.13.orig/Makefile paxtest-0.9.13/Makefile
---- paxtest-0.9.13.orig/Makefile	2014-12-09 19:53:48.000000000 -0500
-+++ paxtest-0.9.13/Makefile	2014-12-12 13:07:55.715099100 -0500
+--- a/Makefile
++++ b/Makefile
 @@ -52,12 +52,14 @@
  endif
  
diff --git a/app-admin/paxtest/paxtest-0.9.15-r1.ebuild b/app-admin/paxtest/paxtest-0.9.15-r1.ebuild
index ed402aa9eaf8..4fe8a445c276 100644
--- a/app-admin/paxtest/paxtest-0.9.15-r1.ebuild
+++ b/app-admin/paxtest/paxtest-0.9.15-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
-inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="PaX regression test suite"
 HOMEPAGE="https://pax.grsecurity.net"
@@ -21,12 +21,15 @@ DEPEND="${RDEPEND}
 # EI_PAX flags are not strip safe.
 RESTRICT="strip"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.13-Makefile.patch"
+)
+
 src_prepare() {
 	mv Makefile.psm Makefile
-	epatch "${FILESDIR}/${PN}-0.9.13-Makefile.patch"
+	default
 	sed -i "s/^CC := gcc/CC := $(tc-getCC)/" Makefile
 	sed -i "s/^LD := ld/LD := $(tc-getLD)/" Makefile
-	eapply_user
 }
 
 src_compile() {
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 5c4bfb00d803..d970e523299c 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -6,11 +6,14 @@ AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520
 AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
 DIST puppet-agent_1.10.10-1stretch_amd64.deb 15422814 BLAKE2B 77d23e6b66620ab9718316f9c273cef86ed2c194cb234ab55765fd28178bbdbff963f9117a5fe904ebea4ffdb901f7e5386e1b75781fe497217e261d087bb57e SHA512 49d391f63197122f2d9e1505091e09d167873255172edb6843e4e6ce28d257ca1d99ca2ec72647c349eb8367c43ef1d4390bbaa0d1aa46cab9b8bd4474c12376
 DIST puppet-agent_1.10.10-1stretch_i386.deb 16281012 BLAKE2B f03f59649724797b1f2366ce95ed1684dcfa5fa765840a7107d6b1803def4c4925a6913e44e10b72d4eac5235efb1565dadd995ac1a865c2a21e0d791d9e29d5 SHA512 2e6115b8fe16f888d315a940bed77b4a310528c5cba3d21a2d52013a6d5081f38f1120c5d5e5e19bdcab69c2836920687ac259320a1ca45d9e56210c86061e63
-DIST puppet-agent_5.3.4-1stretch_amd64.deb 16013766 BLAKE2B 6461011e05d4ea55b95e02a73b195a9aaea46e769f289a856f97df0c0e0809da9c31973b2ac19dc9aeb1911c5cc1379ffb5479c6b1acdc209e123edd1d532eba SHA512 d89014cf597709a0614576f3f8c60d4f76099ec23053e56fbff0d9bec4ebbc24414d1cca1aac1ae0842a8ce59842618845f2c01e6233fc7be033e36d8b5e5389
-DIST puppet-agent_5.3.4-1stretch_i386.deb 16609070 BLAKE2B c4902e8d57c2b522ab8085c0e10e94110fdc44af54790e9c0855c90877504f11a1fe12bb02b9df99f95d6736195000bc41bf4bb8cddd4e2d283da45c31ea8798 SHA512 1f5812f688cbaed4ec64f78a3417d4c83e3d013f908ffa60c33f3adab50ed157558976bdc3564433a7f4595894b1c4f27ef38e0a3f83239234fe68556a1a9e51
+DIST puppet-agent_1.10.12-1stretch_amd64.deb 15443166 BLAKE2B 74c8465fd8cc98ca114acdc600c3f259072d64765cdd8308092b7177233d44656f429407520ead2e02494951f57f1c79b5dfe8c76b2dd7bba7c1316426746df8 SHA512 1391530be340ad0439260f7bd3df8ad251ffaa02fc2f358e4ff2189b8c64a0b2d0caab9f84b84b26ebe2176decef2a39d3114f6433ba6eacd962ff45e1e04c43
+DIST puppet-agent_1.10.12-1stretch_i386.deb 16308082 BLAKE2B 6606c15aac51b28e9e8011168563dff9069b6b065f861c01f4fc768064fe266f83211fbc8fefebfe4bdf81c6220b5daa19f66a9214bd1f2ff53a3b1a2e87128a SHA512 fce0a3ac12afcc293fbdf3cc990407b82592228ed8ed609f4b98c17cea35c8e5ff5f47287880601fa80ac2f7fa608dfe00b3594a906d52bc2bd2e04117ccb856
 DIST puppet-agent_5.5.0-1stretch_amd64.deb 16911686 BLAKE2B c80fdd9aa00a060abb8a6ff5def8cba23e61766701bbded1290f559328a5f097742f47c2ed14ac18121002de3599ef50606b1cde82085148ea17836fdac98e35 SHA512 3fe56f65c01ca23e110d9f1e4ebeefd5fec00ad248c3e1ae663fa04918272f5e4077dde819b3343ab4142233b4e3f7c5b589bc5d52c409b78c5d00ab3aa21646
 DIST puppet-agent_5.5.0-1stretch_i386.deb 17631262 BLAKE2B bc67729d4222933f7f589e3ca1db2f0e8cddcf6cecb92293070db545a95b6c1552ce2b6b3365ea19ec87565e8cbff0112f801d217eb335644454f5eb01199362 SHA512 8daa15c589726c391f34908b7e6543ef7dd2e86724d40ae6a1a38803247e2cc41775211378dcdc04dbd5b43af50ac350b9b209a969488fae3c679056763b28c2
+DIST puppet-agent_5.5.1-1stretch_amd64.deb 17325604 BLAKE2B 1fab815d5d238cb6a05da91a4a9645644915493b2117ff29b8ba258edab18084394c8054f37c5bcbee9bf903dabce5741d7ef4be0a94a0ec8c13ac4b825b8bca SHA512 c4c7ce50cf576a6b12ecee8b9a6c7969512b3625e7ea0f16cc4cd367cebee5271cdaf7cc084fe4d344b42ab6e200664fe7b167acd9cd0da23d2ff3cd9028d6f7
+DIST puppet-agent_5.5.1-1stretch_i386.deb 18063690 BLAKE2B ea7c7068e57da1249c1b1c7232e1af673840b0c8c7e5795574ffcb1861c68683ac9f21f8f4216272130b12a61bb8b324e49d6bf7f0c3d314857fd2591a7ad6ff SHA512 1a64616191a5143b150fe1d145ea786233ab763e87d5fe86bd1b3306fa73bab60d2f3d5c0bb7fcb6fe7c700a47a4c94c72eef1509732b18a5caf0fcd7f060602
 EBUILD puppet-agent-1.10.10.ebuild 3501 BLAKE2B 6b18e594c1769f47944a469d44a5f033c5cfd5b4c6cc45905b838c50ab0b3c8586f723f7b12639b29dc299ec08cd7efbb0843150371ef7cdb292ace77a81c1d6 SHA512 55dd791106fb8b79442185a26eb0c8aa58307e837c634cb0b94f58634ef9e9243d0236cc5fc68b09c157a6232141276bb78f818db385bf2f5f70c893b1f000a1
-EBUILD puppet-agent-5.3.4.ebuild 2516 BLAKE2B 06148b9a47075b3833544cd3e5affbe2e445ca31ad5ccce81bc1c6714ac7a74316bdf33155803876401b1bae6ded1c0793aa65c1ed48c887090e6efa25917ff4 SHA512 f09cf5b9bdcf694fee0227ba055b7368ac1ad1701eaf372e9e669d3480a24560dcf6ea423f95f0fda51f43774a036dce1a6ec4fa08482cebdbdacedff21a0427
-EBUILD puppet-agent-5.5.0.ebuild 2518 BLAKE2B ddd8588910d8dbdfb811334149835b98a63891af846d086e1f2b3f2d3b9e73c10559c20c0ee739d4cfc621f1daea4eb14004f49cd8f67f345e02dd0e73d0a322 SHA512 f59d9b5674313893ece281ad6b5ef678235fad81bda383a9616edec4dd9264bc37d6171fa037a77553f234af3d515cdbf27fbaa2637b50fd3d719d7fbc0afcae
+EBUILD puppet-agent-1.10.12.ebuild 3503 BLAKE2B af093dfa7ef8b54f6e82f6047a0fc6d908b9341cabb273388856284a26c57e141dce71ca59e1ecc5764191a04cd0616d31a3458667eaf30e0ff698015645fc6f SHA512 8f54b9257f935fa3ed49b29cd4c78949e24bbe52ac31a072b3d83fc982f372eae62f5dabe7bfcd9968ca9c7eb59320113e5eca7d2894997aa811963d7f2b931f
+EBUILD puppet-agent-5.5.0.ebuild 2516 BLAKE2B 06148b9a47075b3833544cd3e5affbe2e445ca31ad5ccce81bc1c6714ac7a74316bdf33155803876401b1bae6ded1c0793aa65c1ed48c887090e6efa25917ff4 SHA512 f09cf5b9bdcf694fee0227ba055b7368ac1ad1701eaf372e9e669d3480a24560dcf6ea423f95f0fda51f43774a036dce1a6ec4fa08482cebdbdacedff21a0427
+EBUILD puppet-agent-5.5.1.ebuild 2483 BLAKE2B 30390ed9d7b832b2b24714d560d38d4a454e27729118e9593e584d985db035e46cce2467288c655cb5326b31f98c3766506a4d389840c47e9b74d61dc37afc84 SHA512 aa6d6d9548eb31f0deac21d6a682231bcd1028b0e5b85694d0f936f9327fbdd70502c0c7063c24bf188f4fbf377879daf4f2316e70d40fc0361295bfb51ce25a
 MISC metadata.xml 502 BLAKE2B 9eaaec32ba54988999831d4d873dff6c525b42ede2da3cc9a5b67359299233f2ffdafa04a949df6aa58d764e36beaf8ce64c053a306f6e055a245b207e8f2aaa SHA512 aedf4322173910c202b105d904e4528c6b6bb949fc05ed95c4a8d9a74133f5c7391ae30d7675bfa36a3f85880c971aff6e4a57ffdcde57b3b63c02dbed083a95
diff --git a/app-admin/puppet-agent/puppet-agent-1.10.12.ebuild b/app-admin/puppet-agent/puppet-agent-1.10.12.ebuild
new file mode 100644
index 000000000000..053bc1d011da
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-1.10.12.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils systemd unpacker user
+
+DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/stretch/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
+SRC_URI="
+	amd64? ( ${SRC_BASE}_amd64.deb )
+	x86?   ( ${SRC_BASE}_i386.deb )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/augeas
+	!app-admin/mcollective
+	!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	!app-emulation/virt-what"
+
+DEPEND="
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	app-portage/eix
+	sys-apps/dmidecode
+	sys-libs/glibc
+	>=sys-libs/readline-6.0
+	<sys-libs/readline-7.0
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="
+	/opt/puppetlabs/puppet
+	/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/*
+	/opt/puppetlabs/puppet/lib/engines/*
+	/opt/puppetlabs/puppet/lib/virt-what/*
+	/opt/puppetlabs/puppet/lib/*
+	/opt/puppetlabs/puppet/bin/*"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/run/puppet puppet
+}
+
+src_prepare() {
+	if use experimental; then
+		epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
+	fi
+}
+
+src_install() {
+	# conf.d
+	doconfd etc/default/puppet
+	doconfd etc/default/mcollective
+	doconfd etc/default/pxp-agent
+	# logrotate.d
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/mcollective
+	doins etc/logrotate.d/pxp-agent
+	# puppet itself
+	insinto /etc/puppetlabs
+	doins -r etc/puppetlabs/*
+	# logdir for systemd
+	dodir var/log/puppetlabs/puppet/
+	fperms 0750 var/log/puppetlabs/puppet/
+	# the rest
+	insinto /opt
+	dodir opt/puppetlabs/puppet/cache
+	doins -r opt/*
+	fperms 0750 /opt/puppetlabs/puppet/cache
+	# init
+	newinitd "${FILESDIR}/puppet.initd" puppet
+	newinitd "${FILESDIR}/mcollective.initd" mcollective
+	systemd_dounit lib/systemd/system/puppet.service
+	systemd_dounit lib/systemd/system/mcollective.service
+	systemd_dounit lib/systemd/system/pxp-agent.service
+	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
+	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
+	dosym ../../opt/puppetlabs/bin/mco /usr/bin/mco
+	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
+	dosym ../../opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
+	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+	dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
+	dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
+	dosym ../../opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
+}
diff --git a/app-admin/puppet-agent/puppet-agent-5.5.0.ebuild b/app-admin/puppet-agent/puppet-agent-5.5.0.ebuild
index a638b7af8a01..657676c3b82d 100644
--- a/app-admin/puppet-agent/puppet-agent-5.5.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-5.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
diff --git a/app-admin/puppet-agent/puppet-agent-5.3.4.ebuild b/app-admin/puppet-agent/puppet-agent-5.5.1.ebuild
index 657676c3b82d..f006c5cc9d5d 100644
--- a/app-admin/puppet-agent/puppet-agent-5.3.4.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-5.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
@@ -52,7 +52,6 @@ src_install() {
 	doconfd etc/default/pxp-agent
 	# logrotate.d
 	insinto /etc/logrotate.d
-	doins etc/logrotate.d/mcollective
 	doins etc/logrotate.d/pxp-agent
 	# puppet itself
 	insinto /etc/puppetlabs
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index f6eb7325cc34..da3e9fbc7c98 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -10,15 +10,17 @@ AUX puppetmaster.init 1090 BLAKE2B 367b678860b955003ff8d79e69cd8c4a6d652ae738bec
 AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8fc8eca3c0199828b2c0119547cd744c49f79334de1bc0a7227c0791a5b3645eedb51d3fa8be5822487354b1a SHA512 e177109d90f5954e7cd1968db1d0e0d0e2c6e98bc4d53d0ae0a816d181e304e1b7555f65d8807b98df9f0f8cf7ebafc9d8cca9c32574fb7127c4b480d23b5cc6
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
 DIST puppet-4.10.10.tar.gz 2995864 BLAKE2B c01e6a7529d70a4481e64b4119cfd9d05e79d655ef17495a98e2ab800ea527ef09f234782e7362b25bf1b1ed11d7c2a48e40815ac6dccc5a2d460886beb604e7 SHA512 e517ee349ead56932c9ff54f910d10842c1cd6b6f28673223a65fb72334662d4eabeccc1c7c7603e17aa712c356edbc27fe53d6e7dd7ba042cc0616d0076d755
+DIST puppet-4.10.11.tar.gz 3022878 BLAKE2B d3eec840bb1c46e0dfbbc9dad598b362049a76c7ee60b4ff314e7ba2ce19613f834baced94afbbf499b513391107c4229be5f40c275d0724b200358722db0e96 SHA512 5eaac8bd973d0013e7774c9bda81524332f2b3b0177c04e78554bfb0815697b4b296d5dd11a04f7fad782ad975b350b149b1cd97fc5f06974952314f163f1b40
 DIST puppet-4.10.8.tar.gz 2979824 BLAKE2B 802b65d48ff7d8303e3cc847a9f753a5e19c0ada6ee02dc1fc9c748da8d69462c34bdfeddeedf0057179ff1133665439c41e970c41ca1728463292ef26e996ab SHA512 9f3384702dd4938e1e00aeceb0745b760de32000e0dd59d5b846d1120a46026499176a51d0409e3a0ae414efc0872854c204d1941385695a4c57c209fbd1f28d
 DIST puppet-5.3.4.tar.gz 2889645 BLAKE2B f1f4e2d9dfe457f89aa7d99724eaa9368ea50027747e2506b5cbfa176c1a9060bf87ce8c037b78f3c86c2e2974087f9ab4fc76cb7374f1a348ff410e9cfa83e1 SHA512 f24008651be15cf5c915f7a03dc0319eb2d076ddfb06c44fd846421fe29baba27ea43b29134077e1dc7c14a48b44104dcaaefe73bfdb00d7667c1c25a1b871fd
 DIST puppet-5.3.5.tar.gz 2890869 BLAKE2B 1baeddbaa47803811e14bfdbbf5624b617ced2ec6ec6b8072d51a556455838bf0934b1e0c578ef6b4d5df763260c0fa0f027295e3c8403c172a25fcc72179283 SHA512 d48b836a9c7db451c73048917e091a1dd3e1c259f4dde7a8867fe9931d9dbab46219f4b4dfa739669bb8d713a9defe13eae0d5b2dd26a6930b589f4cb0ab1361
 DIST puppet-5.4.0.tar.gz 2958138 BLAKE2B 2cb7e890774abde7183a7b3ac33771fe8006f526b7780a566788591cba20c1ff7540429a4ead13830700fc07105fdaec4317de69f4efa44c4b245b31164b6048 SHA512 6b6955416e4f14ba45318c1afce7db77226da2d14f8dbfeca059780caf188f9687bf31dff4a4c57f8172468e09c35e021721a8b8caf99050d72f90b290fbdb71
-DIST puppet-5.5.0.tar.gz 3033293 BLAKE2B c8131e023b09bccc9228caae711654534a1cc5a6f290e3ece8cc1614de4374e0c440fd02826b5425576c4d61181a5e3218fa73bf9a277dee392a93193761a596 SHA512 96da65373153a0687f4823e66f7ee1f25b8e157be1840ed8ddfa9d18c030f2964211736b280b9a95dc651a2591bbd1b32d1a65376461f392ebd9104c633f3f3d
+DIST puppet-5.5.1.tar.gz 3035639 BLAKE2B 2930ca9eb928d7c6a69ea76673fc4d002e230bf6dbcd28764e8d5bd504ae11326dc856ed64480e13c9eb1d683ad5e8ef64fc9e217942b59d90c6a0bc98e0197c SHA512 20bf7094193f30cfc7a91244275fc79eef0296036ffbc6bbe405e9ca75123b722be6855c746ef8cd35f80bd7a7308408a9205d064f0f910e11877e4db0ebdabc
 EBUILD puppet-4.10.10-r1.ebuild 5635 BLAKE2B 42c4009603b09985df1574ca66ea4821a337e2859b31c3d923e4784003c486fb648e27cfbc42e638477913659720883cb5ed09fc51f5e895f03eff867738a9a9 SHA512 6f2d6b3ae4a7bcd053eca8dc599cba96b8043797c0ebf7689f660207d777514a01caa98985d426cbb05811dc7ad2d45f9927e098927a5cb34292ecdae376cb02
+EBUILD puppet-4.10.11.ebuild 5635 BLAKE2B 42c4009603b09985df1574ca66ea4821a337e2859b31c3d923e4784003c486fb648e27cfbc42e638477913659720883cb5ed09fc51f5e895f03eff867738a9a9 SHA512 6f2d6b3ae4a7bcd053eca8dc599cba96b8043797c0ebf7689f660207d777514a01caa98985d426cbb05811dc7ad2d45f9927e098927a5cb34292ecdae376cb02
 EBUILD puppet-4.10.8.ebuild 5564 BLAKE2B 51164a6bd2fb31c08d9a1f0f08fa67861f11c1b6de316322f9596defbc3df05b980d897bad8b13f0c7fc3d3344eae0fdf81574555f6736969f797d6d91306424 SHA512 c9a64796ff31f9416606ee37e019d400294a1bbcbbfe1603577e47bf64ee95d0afd307711c06cde3a6bbc01fecae7c2b755ab16700ff697aa01f6cff5e510c74
 EBUILD puppet-5.3.4.ebuild 3935 BLAKE2B bfcc3982749c77abba4558e62fc0b65c6ab7bbfb862f33668bd69d83faf5a8cd9353c03b0ed335ad77fe67d46dc804b30052f7e60d2c8ce2f3f3724c3b4e7c09 SHA512 104948c503ced42c82aee51368cee51a8324d970419d57dd8039a123ce1a6d37ec782e976729acab20ded722e7e2372c6c23d32c88466de1cc5375cf95acef2b
 EBUILD puppet-5.3.5.ebuild 3935 BLAKE2B bfcc3982749c77abba4558e62fc0b65c6ab7bbfb862f33668bd69d83faf5a8cd9353c03b0ed335ad77fe67d46dc804b30052f7e60d2c8ce2f3f3724c3b4e7c09 SHA512 104948c503ced42c82aee51368cee51a8324d970419d57dd8039a123ce1a6d37ec782e976729acab20ded722e7e2372c6c23d32c88466de1cc5375cf95acef2b
 EBUILD puppet-5.4.0-r1.ebuild 3835 BLAKE2B 48de92cbd4ad755641c7d06af9ee0d1019b50677ba9aae2ba813ef203a4d2aed399fd6d5dfb66795cd32259cd0eea0a6a10a00e136158779016e063fe458b066 SHA512 5edcc10fdd53fe7725c7f352d3dd4343032763ede042730173d46e9e62ebc0f553a363cf66bffc3f6d433a714115153532dbc5fba88334d8e248064704f8fd86
-EBUILD puppet-5.5.0.ebuild 3835 BLAKE2B 48de92cbd4ad755641c7d06af9ee0d1019b50677ba9aae2ba813ef203a4d2aed399fd6d5dfb66795cd32259cd0eea0a6a10a00e136158779016e063fe458b066 SHA512 5edcc10fdd53fe7725c7f352d3dd4343032763ede042730173d46e9e62ebc0f553a363cf66bffc3f6d433a714115153532dbc5fba88334d8e248064704f8fd86
+EBUILD puppet-5.5.1.ebuild 3835 BLAKE2B 48de92cbd4ad755641c7d06af9ee0d1019b50677ba9aae2ba813ef203a4d2aed399fd6d5dfb66795cd32259cd0eea0a6a10a00e136158779016e063fe458b066 SHA512 5edcc10fdd53fe7725c7f352d3dd4343032763ede042730173d46e9e62ebc0f553a363cf66bffc3f6d433a714115153532dbc5fba88334d8e248064704f8fd86
 MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
diff --git a/app-admin/puppet/puppet-4.10.11.ebuild b/app-admin/puppet/puppet-4.10.11.ebuild
new file mode 100644
index 000000000000..a75388c365f1
--- /dev/null
+++ b/app-admin/puppet/puppet-4.10.11.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit xemacs-elisp-common eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/gettext-setup-0.10:0
+	>=dev-ruby/hiera-2.0
+	>=dev-ruby/locale-2.1
+	>=dev-ruby/rgen-0.6.5
+	dev-ruby/json:=
+	>=dev-ruby/facter-3.0.0
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl"
+
+# ruby_add_bdepend "
+# 	test? (
+# 		dev-ruby/mocha:0.14
+# 		=dev-ruby/rack-1*
+# 		dev-ruby/rspec-its
+# 		dev-ruby/rspec-collection_matchers
+# 		>=dev-ruby/vcr-2.9:2
+# 		>=dev-ruby/webmock-1.24:0
+# 	)"
+
+DEPEND+=" ${DEPEND}
+	xemacs? ( app-editors/xemacs )"
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# can't be run within portage.
+	epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
+
+	# fix systemd path
+	epatch "${FILESDIR}/puppet-systemd.patch"
+
+	if use experimental; then
+		epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
+	fi
+
+	# Use working version of mocha
+	sed -i -e '1igem "mocha", "~>0.14.0"; gem "rack", "~>1.0"' spec/spec_helper.rb || die
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb || die
+
+	# Avoid failing specs that need further investigation.
+	sed -i -e '/should resolve external facts/,/^    end/ s:^:#:' \
+		spec/integration/indirector/facts/facter_spec.rb || die
+	sed -i -e "/describe 'cfacter'/,/^  end/ s:^:#:" spec/unit/defaults_spec.rb || die
+	rm -f spec/unit/indirector/ldap_spec.rb \
+		spec/unit/parser/functions/create_resources_spec.rb || die
+
+	# Avoid specs that rely on tools from other OSs
+	rm -f spec/unit/provider/package/{dnf,tdnf,yum}_spec.rb \
+	   spec/unit/provider/user/directoryservice_spec.rb || die
+
+	# Avoid specs that depend on hiera-eyaml to avoid circular
+	# dependencies
+	rm -f spec/unit/functions/lookup_spec.rb || die
+
+	# Avoid specs that fail due to an unpackaged file
+	sed -i -e '/when loading pp resource types using auto loading/,/^  end/ s:^:#:' spec/unit/pops/loaders/loaders_spec.rb || die
+}
+
+all_ruby_compile() {
+	if use xemacs ; then
+		# Create a separate version for xemacs to be able to install
+		# emacs and xemacs in parallel.
+		mkdir ext/xemacs
+		cp ext/emacs/* ext/xemacs/
+		xemacs-elisp-compile ext/xemacs/puppet-mode.el
+	fi
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	if use xemacs ; then
+		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
+		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if [ "$(get_major_version $v)" = "3" ]; then
+			elog
+			elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
+			elog "/etc/puppetlabs/puppet"
+			elog "Also, puppet now uses config directories for modules and manifests."
+			elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
+			elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
+			elog "for more information."
+			elog
+		fi
+	done
+
+	use xemacs && xemacs-elisp-site-regen
+}
+
+pkg_postrm() {
+	use xemacs && xemacs-elisp-site-regen
+}
diff --git a/app-admin/puppet/puppet-5.5.0.ebuild b/app-admin/puppet/puppet-5.5.1.ebuild
index 452d26e515b2..452d26e515b2 100644
--- a/app-admin/puppet/puppet-5.5.0.ebuild
+++ b/app-admin/puppet/puppet-5.5.1.ebuild
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 8c4d7fbd4eda..c9d29201d4b8 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,8 +1,6 @@
 AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
-DIST puppetdb-5.1.3.tar.gz 24157962 BLAKE2B 750159e8c83cfdc820040bb6837c83309d96da519a84fdf6aadd394473993f128edbd76b7a5b0e2591f75d52c9fdf942e84545ff97b8a7d29ac3ae3520d04ea1 SHA512 153e6cba59fb824fd9bca802ea4f0e05e6c6d69d6ef47566079bdf1ac26f7bc13fa893b633f9506494d2189ef160b6b3c23fcb340e76df41089228c047c566e0
-DIST puppetdb-5.1.4.tar.gz 25425088 BLAKE2B daa4788676d85d3a51d2b572aa9bf88b50fa1a35c92d175b44c532e7d82c3f19b734d885411174a8929a772b25a405738a08dca009a1369bfcb69a456e819f96 SHA512 2a34a6188bc474742e6b9cba5f0df1d5bcecd176f2874e12dbbf9c2fa8706b2d9276baece09f7a593eb6ab7cccd6b8804e15d67cb99cedcf7f6226fd59e82308
 DIST puppetdb-5.2.1.tar.gz 25435195 BLAKE2B aed0e6175df0a603ea0aaf792c31b4933d408a4f7a037b557a8acb4b237e4c639a06f954232e049efe4b486d780a3af129c8a6a48833019168cd70f38e5bf403 SHA512 6d0b06f083093394f74e952112c6b388fd6c94452cf2954172dafc5dc42c7a0b45f6a9a7afcb6196f12316e15653943c3faed8a06ba7a7bd75a31db8515e0103
-EBUILD puppetdb-5.1.3.ebuild 2763 BLAKE2B 4f7058feec44cc0b681cb7d83b494c8e024a923fb84dc173f013ffed64103ed46f6725278e2039bc6c33bc79798f1e3e03f481959a8a08f05d3b820af36ff993 SHA512 032e3f021880cd77a83d5841e130af2eb2e831f54d3760542ee7c3a97a98e5f92e7abe2697d83e896881fd285c7af826854030faade413bba66f0642cd6d7fcf
-EBUILD puppetdb-5.1.4.ebuild 2763 BLAKE2B a3aece6216d2a180ea14cb90e7d306720c09ce617e430c1b78241a696153f6d33787ab3d89f466b8635f80889531923d2e7a6305ede45e7b2c83bfa5438eb72a SHA512 34767f94ee58a38a05f975fc3f28b6b851eae1f9e0dab5985d671139319cf3c5df70c1afc2aee34a77c0172b499918aee8d188c290220d4ce2cca2abe91039c2
-EBUILD puppetdb-5.2.1.ebuild 2765 BLAKE2B 9a316933c8e8d0e28eb674c4b5aaa6830a7f1db5aad515d6fd7ac1c649c067d482b367a9fff7e6de0c31bd06b35e915a165a50f9af192ae5440a5cd9cf3207f7 SHA512 19a3c9de354f5c9a88cfe8d6b350878a63b9c0bdc262cf66c9ca2655df3f88a269c78afef7cd89d6f28689989e593ada7221c842e6be1e041a329e37192b57cf
+DIST puppetdb-5.2.2.tar.gz 25436396 BLAKE2B e30d80b7da29c8cf3b00c9cda3d6e0a4c5635b3bb3a4e6d3e2bf284531509828df6d845a0d30b2a7a454ec35ab4879019fc4c68fc3aa8b6a72c3d0896b9e75f7 SHA512 cc598539801bedd4ef0052f50013320be5dc1eaf8098db8898a0759609d6d4e26aa094550bc1a45c041f9fe65ee99b0c00c00586d3cc93003836f1415bd92456
+EBUILD puppetdb-5.2.1.ebuild 2763 BLAKE2B a3aece6216d2a180ea14cb90e7d306720c09ce617e430c1b78241a696153f6d33787ab3d89f466b8635f80889531923d2e7a6305ede45e7b2c83bfa5438eb72a SHA512 34767f94ee58a38a05f975fc3f28b6b851eae1f9e0dab5985d671139319cf3c5df70c1afc2aee34a77c0172b499918aee8d188c290220d4ce2cca2abe91039c2
+EBUILD puppetdb-5.2.2.ebuild 2765 BLAKE2B 9a316933c8e8d0e28eb674c4b5aaa6830a7f1db5aad515d6fd7ac1c649c067d482b367a9fff7e6de0c31bd06b35e915a165a50f9af192ae5440a5cd9cf3207f7 SHA512 19a3c9de354f5c9a88cfe8d6b350878a63b9c0bdc262cf66c9ca2655df3f88a269c78afef7cd89d6f28689989e593ada7221c842e6be1e041a329e37192b57cf
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-5.1.3.ebuild b/app-admin/puppetdb/puppetdb-5.1.3.ebuild
deleted file mode 100644
index f9227ac7708d..000000000000
--- a/app-admin/puppetdb/puppetdb-5.1.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib systemd user
-
-DESCRIPTION="PuppetDB collects data generated by Puppet."
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+=">=virtual/jdk-1.7.0"
-DEPEND+=""
-
-pkg_setup() {
-	enewgroup puppetdb
-	enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
-}
-
-src_prepare() {
-	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
-	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
-	sed -i 's/sysconfig/conf\.d/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	dodir /opt/puppetlabs/server/data/puppetdb
-	insinto /opt/puppetlabs/server/apps/puppetdb
-	insopts -m0744
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppetdb.jar
-	insinto /etc/puppetlabs/puppetdb
-	doins ext/config/logback.xml
-	doins ext/config/bootstrap.cfg
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetdb/conf.d
-	doins ext/config/conf.d/jetty.ini
-	doins ext/config/conf.d/repl.ini
-	doins ext/config/conf.d/database.ini
-	doins ext/config/conf.d/config.ini
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
-	doins ext/cli/foreground
-	doins ext/cli/ssl-setup
-	doins ext/cli/config-migration
-	doins ext/cli/foreground
-	doins ext/cli/anonymize
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetdb/bin
-	doins ext/bin/puppetdb
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
-	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
-	# init type tasks
-	newconfd ext/default puppetdb
-	systemd_dounit ext/redhat/puppetdb.service
-	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
-	newinitd "${FILESDIR}/puppetdb.initd" puppetdb
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetdb.logrotate.conf puppetdb
-	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
-	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
-	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
-	elog
-	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}
diff --git a/app-admin/puppetdb/puppetdb-5.2.1.ebuild b/app-admin/puppetdb/puppetdb-5.2.1.ebuild
index 5c45e1c342fd..e2e9e4db500f 100644
--- a/app-admin/puppetdb/puppetdb-5.2.1.ebuild
+++ b/app-admin/puppetdb/puppetdb-5.2.1.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+=">=virtual/jdk-1.7.0"
 DEPEND+=""
diff --git a/app-admin/puppetdb/puppetdb-5.1.4.ebuild b/app-admin/puppetdb/puppetdb-5.2.2.ebuild
index e2e9e4db500f..5c45e1c342fd 100644
--- a/app-admin/puppetdb/puppetdb-5.1.4.ebuild
+++ b/app-admin/puppetdb/puppetdb-5.2.2.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND+=">=virtual/jdk-1.7.0"
 DEPEND+=""
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 87f043206db6..bcbeafc4b881 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,8 +1,6 @@
 AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
-DIST puppetserver-5.1.4.tar.gz 66628031 BLAKE2B 815f0eb1508589855556ae0f82a2f595a22fd3e13a8168c7c2d8add0f7c18981bb220feee9573d29a94a06e13ac801797e6d96a9ef378c4a743889c938e4238f SHA512 4444880041e36aaee8834476dacdbd5fb166326f054b8beca55f644d1c97318bc2dd0d3d3ae8bfbc1b072e61efcde87c31e763c48a77b05c3af5f873e969d820
-DIST puppetserver-5.1.5.tar.gz 66639947 BLAKE2B 897b340711facada214e68d6ae571e5eca1d6f966a72509fb6d862f89a9e1befa388d1766ee8332edbd8a3a61ba320888525e265b93953a3c6e2931c760c44fc SHA512 7451ae86b5bce59aad502e344bdc60fe4fb3a2351ff1737bc249051e0628bbdf5d6b5fd3e2764c15783945d4604dc7c1efbeb2fd9faedd36d870cc3669d7af53
 DIST puppetserver-5.3.0.tar.gz 66913938 BLAKE2B ed24e0c5a8ad14c2c63f7a88deca6a020121fa53890a68b83f3608081c6480540056d483a00df5c1b0d5a008216f27b5d72efa54d885c55f09b1f40441469b39 SHA512 5f08f0adba257947ec61eae91b7a417e9055510e278e444ce7c88358163b9bb00f2bf02580ace6064e508c43f8b60ca21d12aa3d1525814754e6259791b34bc5
-EBUILD puppetserver-5.1.4.ebuild 4888 BLAKE2B 530aec65438466346b7f8a3499164ebb0c8b70b4c58d583fb6e97d8a1d3d841e278dd82d2089aef15bf4a45b412ec580052d9dd10bba47271394df934422ed2c SHA512 093de3334a5fab1e58a3f3202ed4f194af1441910e0282f9c5b58055a190f74605bd49c982f72851268086775212e63cfa79442997ec94b79fd45b9a9ed76dd5
-EBUILD puppetserver-5.1.5.ebuild 4888 BLAKE2B 24f004c85c5726d79a4d8ad3563b03560d59f4b36380d9ade3954860cc36eb2d3070d4a491d7f6a01e9a5c09ff4d77c5220117b8c9b5119192db3a657dabcdd7 SHA512 281a4673302b36b1073df542be68a8dccd6bf682a9cd68aecfe63d185d9c7eda17ec79d627fb1790ebf0d85a93d92132f6eb5a850aee28995ddaf7c851c81609
-EBUILD puppetserver-5.3.0.ebuild 4890 BLAKE2B 53593fd7c160edd1ec9d8802cdd93dcb00b050721071ab09e41c385f791a3f5a59652e6336d41ef58b0a2a63dada18cd7fa85389a3b7a662f87a7e8c7e3635c3 SHA512 8f6e778ab9e799dc7b1211b4639e32d95e1d693938446a203e1824132e3132788a5d60e884f7a3851cdeb062e3bd0de84f7e8c9ba1fb377bec682e214bffac2e
+DIST puppetserver-5.3.1.tar.gz 67239406 BLAKE2B 0aca973ad039d51877926459f935e48cb9ee6ed60792ca67af3a65800fc8fd9de8e6cadd3edc83ac83385f8dfba4f0cd83c9a6db665578f3d1d235ccc00e6547 SHA512 3d618c351299f4cc038682ab43eb4686bd1baf8f88390c8ac41eb3be9fdf8a7a3a501f0ab8713e45bee0ed02d7a9fd1ed1b7252ebb640ee52aa5da638f0b2ce2
+EBUILD puppetserver-5.3.0.ebuild 4888 BLAKE2B 24f004c85c5726d79a4d8ad3563b03560d59f4b36380d9ade3954860cc36eb2d3070d4a491d7f6a01e9a5c09ff4d77c5220117b8c9b5119192db3a657dabcdd7 SHA512 281a4673302b36b1073df542be68a8dccd6bf682a9cd68aecfe63d185d9c7eda17ec79d627fb1790ebf0d85a93d92132f6eb5a850aee28995ddaf7c851c81609
+EBUILD puppetserver-5.3.1.ebuild 4890 BLAKE2B 53593fd7c160edd1ec9d8802cdd93dcb00b050721071ab09e41c385f791a3f5a59652e6336d41ef58b0a2a63dada18cd7fa85389a3b7a662f87a7e8c7e3635c3 SHA512 8f6e778ab9e799dc7b1211b4639e32d95e1d693938446a203e1824132e3132788a5d60e884f7a3851cdeb062e3bd0de84f7e8c9ba1fb377bec682e214bffac2e
 MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c
diff --git a/app-admin/puppetserver/puppetserver-5.1.4.ebuild b/app-admin/puppetserver/puppetserver-5.1.4.ebuild
deleted file mode 100644
index 1223ba14b638..000000000000
--- a/app-admin/puppetserver/puppetserver-5.1.4.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib systemd tmpfiles user
-
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="puppetdb"
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+="
-		>=virtual/jdk-1.8.0
-		app-admin/puppet-agent[puppetdb?]"
-DEPEND+=""
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
-}
-
-src_prepare() {
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
-	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	insinto /opt/puppetlabs/server/apps/puppetserver
-	insopts -m0774
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppet-server-release.jar
-	doins jruby-9k.jar
-	doins jruby-1_7.jar
-	insinto /etc/puppetlabs/puppetserver
-	doins ext/config/logback.xml
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetserver/services.d
-	doins ext/system-config/services.d/bootstrap.cfg
-	doins ext/config/services.d/ca.cfg
-	insinto /etc/puppetlabs/puppetserver/conf.d
-	doins ext/config/conf.d/puppetserver.conf
-	doins ext/config/conf.d/auth.conf
-	doins ext/config/conf.d/global.conf
-	doins ext/config/conf.d/web-routes.conf
-	doins ext/config/conf.d/metrics.conf
-	doins ext/config/conf.d/webserver.conf
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
-	doins ext/cli/irb
-	doins ext/cli/foreground
-	doins ext/cli/gem
-	doins ext/cli/ruby
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli
-	doins ext/cli_defaults/cli-defaults.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/bin
-	doins ext/bin/puppetserver
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
-	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
-	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
-	# other sys stuff
-	dodir /etc/puppetlabs/code
-	# needed for systemd
-	dodir /var/log/puppetlabs/puppetserver
-	dodir /etc/puppetlabs/puppet/ssl
-	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
-	fperms -R 771 /etc/puppetlabs/puppet/ssl
-	# systemd type things
-	insinto /etc/systemd/system/puppetserver.service.d/
-	systemd_dounit ext/redhat/puppetserver.service
-	insinto /etc/default
-	newins ext/default puppetserver
-	# normal init type tasks
-	dosym ../default/puppetserver /etc/conf.d/puppetserver
-	newinitd "${FILESDIR}/puppetserver.init" puppetserver
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetserver.logrotate.conf puppetserver
-	# cleanup
-	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
-	fowners -R puppet:puppet /opt/puppetlabs/server/data
-	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
-	fperms -R 700 /var/log/puppetlabs/puppetserver
-	insinto /opt/puppetlabs/server/data
-	newins ext/build-scripts/gem-list.txt puppetserver-gem-list.txt
-	newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
-}
-
-pkg_postinst() {
-	elog "to install you may want to run the following:"
-	elog
-	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
-	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
-	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
-	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
-	elog "puppet config set --section master codedir /etc/puppetlabs/code"
-	elog
-	elog "# install puppetserver gems"
-	elog "cd /opt/puppetlabs/server/apps/puppetserver"
-	elog "echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }" > jruby.conf"
-	elog "while read LINE"
-	elog "do"
-	elog "	java -cp puppet-server-release.jar:jruby-1_7.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/puppetserver-gem-list.txt"
-}
diff --git a/app-admin/puppetserver/puppetserver-5.3.0.ebuild b/app-admin/puppetserver/puppetserver-5.3.0.ebuild
index 2b6f7873b99e..20133466d29d 100644
--- a/app-admin/puppetserver/puppetserver-5.3.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-5.3.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+="
 		>=virtual/jdk-1.8.0
diff --git a/app-admin/puppetserver/puppetserver-5.1.5.ebuild b/app-admin/puppetserver/puppetserver-5.3.1.ebuild
index 20133466d29d..2b6f7873b99e 100644
--- a/app-admin/puppetserver/puppetserver-5.1.5.ebuild
+++ b/app-admin/puppetserver/puppetserver-5.3.1.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND+="
 		>=virtual/jdk-1.8.0
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 1f2538877565..57769f2c411f 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,10 +1,10 @@
 DIST sudo-1.8.20p2.tar.gz 2930769 BLAKE2B 90338e7d436683f94a9e13e9f0da668f2bbbf2184530feb63166186309881b737b783d2be80f935e5d64fd2a4264928423d2b754121be5caf07acbacbe2a6d42 SHA512 8bf67e687f7a84605fdef8d547b5cd661141b6c8fd25820c33c7e37e97ca7f21f564c3bae691f8a8cd08df7d80338e36a8f06bb5086cc104509d71d6ab1bceda
 DIST sudo-1.8.21p2.tar.gz 2976081 BLAKE2B c0b555879ddb6832c6396b557793f5d4783481fca5d721901c7ef81c1856c1cf7630fddd09bbb42207c27d51892a79c2bf5c653b5b5091ebc84f2d59981207b7 SHA512 f04bbff54ad74ba73c078e15c75d2f41332d4912078ed66157ba7346b7fff914bd0747460cb4cd0c472af2d3b344fa72f5c62c95169df68a9cac74d7245c720c
 DIST sudo-1.8.22.tar.gz 3029051 BLAKE2B c77e05b6e9cee738902d6289327fb5d34d19833d96597f983d8af01434d224dd698f9257b0965a0e480e8d19eb38eef0c8216942ca5217c3fe7516cdf397f7b7 SHA512 5ce10a9302d25bb726e347499d26a0b3697446cfcdf0fd9094ee35198db7b023d5250a53fdcb4184d1a09f5fd2a78fc645bc8e80f265666b05a91f62f49b0695
-DIST sudo-1.8.23b3.tar.gz 3123480 BLAKE2B 959c013daa34de710e2701d932e0d22162035b380a6cb91a5bab8438916e4ea360a20b388fa4303d82049b1935f942e2aa9e2a8e06ffbcc18f59378b06a8fff2 SHA512 ee1b93f5729e1000c13519ef716b22399884b029f4b1ce79420f8a1fe71b5456c37a475c6217397717d383d8bcb3896637673cc11bf7610d29a2c7cf798c1de4
+DIST sudo-1.8.23rc1.tar.gz 3137550 BLAKE2B 4ed50b54db643a04c77332f052e109045782cae34c60a53b1d4e29f64cb02561cb3a6ef70eeafeedbcfefd91e5e6a04ce9a9302c291babe8328ea33bfcc5081c SHA512 7d88e0a29c222fb759d951fc770434af217f3b56b90a196553882e9b6e680134da2a4b0e323a4cf6d38d71cc1ed6797ebcd8e5230e74fcc88d19d98a4d1438e2
 EBUILD sudo-1.8.20_p2.ebuild 5739 BLAKE2B bd58250f5cf45c9a6480152ac0ceb11b628c5c6e05ba663b9c277c8f082b48de4be179a437e43de2f8c81d191a98840757387e655b0c2a04d4aec2827188be0e SHA512 cce6c399221a53baba5ab12c83c833c3a350ded0ca0a7144fb46b34bccaf323368408f6b4c05b3b1d7cf01563d0f53ff241f15fd553f0cb64c3164bdea052ac6
 EBUILD sudo-1.8.21_p2.ebuild 5809 BLAKE2B 06a01d30fb9642371be1a050d768eb42b011e1eb4f86238a96bfa7187025413badde2d92294411b6622ea55406f3d9aaa1492883706abbd999f42ae8a666ebdf SHA512 2847d70298fae4993128794f4b47dc093f3571f01ba5b1c60d221031b16385ab070b44c7c81dcea862e046bc5f390cda1f9af933c6ec196f7b198a4e7c36fe07
-EBUILD sudo-1.8.22-r2.ebuild 5995 BLAKE2B f4e4fd4ea2136155ca38bbe0fcd402769bb5bc436baaa219acf2d488365a2439fc219197b9ace76a97fd21b81f702118d840a287dd0a284d6ebce3f01d2e58af SHA512 87365c19d5fb4499636d0990e08b8edd73112748f57bd6caf9d100edaa38646ffc03ea590304a05dd3aad27dd221d41cc82b98c91a1a785068a26c5ec6ec4e99
-EBUILD sudo-1.8.23_beta3.ebuild 6000 BLAKE2B 0f271466e3199849d365e2136700e3c2570008fa72054d60a27f84e515596359ccda07683c32defd0091fa7f41fcdfd5dde5f345f8b2cc73a418ac217b29bad3 SHA512 9f5b277fcbbbe9921d8e18b45b9935436e47021ee796a0fb65f3afea980b2d8da47e9ee247acd9da4434403c9d1ef2b39ceb678bf6f82c557328381d5d59bc33
+EBUILD sudo-1.8.22-r2.ebuild 5993 BLAKE2B 0527039455c29177d4c93a2f0c1e014db7ecb8817999196ae5310aaecd0e750c8b47185750308ce6250a1c1cb53f28935fcedf7b389beee52589aa721c3e4fb5 SHA512 a42f405ba15b9e532892f5ac1d269ec7daab680442bca15ff4e4e720514ac59cf8805013bc3251d141d6c465a678747975477d86006a25f6dcb3db3c54007e3c
+EBUILD sudo-1.8.23_rc1.ebuild 6000 BLAKE2B 0f271466e3199849d365e2136700e3c2570008fa72054d60a27f84e515596359ccda07683c32defd0091fa7f41fcdfd5dde5f345f8b2cc73a418ac217b29bad3 SHA512 9f5b277fcbbbe9921d8e18b45b9935436e47021ee796a0fb65f3afea980b2d8da47e9ee247acd9da4434403c9d1ef2b39ceb678bf6f82c557328381d5d59bc33
 EBUILD sudo-9999.ebuild 6141 BLAKE2B 3fde1d106dc229a8bcf8c3231de2fac5695a61c2a87382bb22a5ef3a2959c7777b5c332d79ce22a5e8e82c7a15a71b688c42a08142ad2d564ae0e8654b4b3459 SHA512 4a8c1406ff43a6b32d24d277b4741deeeb075e68fb3ecf93afbf6a8c15d505595780daabef93f01d9b40ea599ac05a846f01e5736208592ee8c7db55398ae2f1
 MISC metadata.xml 989 BLAKE2B c7f7d49fda7750b172dd4b2e5c3fc5f1f3dd602b6347479834bf6444c9311738bcd10fbbba100cee45c97bb899e53f3c113abc61ee89b3353b50876c30966589 SHA512 bc9addd017e474acbc753d6d2cce5d77281a3c1f0857de538168eb1a7b80e0d0b313ad2b03cc710b483cc9588dcaf0208a5b8aaccea18e2ca51b567020bea9ec
diff --git a/app-admin/sudo/sudo-1.8.22-r2.ebuild b/app-admin/sudo/sudo-1.8.22-r2.ebuild
index 57f4521ceffe..9221a7353de5 100644
--- a/app-admin/sudo/sudo-1.8.22-r2.ebuild
+++ b/app-admin/sudo/sudo-1.8.22-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 LICENSE="ISC BSD"
 SLOT="0"
 if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
 fi
 IUSE="gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey"
 
diff --git a/app-admin/sudo/sudo-1.8.23_beta3.ebuild b/app-admin/sudo/sudo-1.8.23_rc1.ebuild
index b9b3625caaef..b9b3625caaef 100644
--- a/app-admin/sudo/sudo-1.8.23_beta3.ebuild
+++ b/app-admin/sudo/sudo-1.8.23_rc1.ebuild
diff --git a/app-admin/supervisor/Manifest b/app-admin/supervisor/Manifest
index ecb19fb6040d..90c04b61890d 100644
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@@ -3,6 +3,6 @@ AUX init.d 630 BLAKE2B 541cb9bb68547f093a68586504129823c7c1b519960f50284f45c395b
 AUX init.d-r1 452 BLAKE2B 5d1b15d6d4a39ebb586ffdccd138bd1f2f3681798c3ff3e1465654967a87e96a922cfc6b1aca193173ce6f06714b4f4f8216c81acf02dc77cb65476101a216c9 SHA512 8490213db35c47d31ae901401673ad7ffb6a15e32abc54ac8d3ac50fe59261a0767dbd706015edfef4dfd83c9ecd2c7c9201c9cb4a04d0b2f5634280c5883959
 DIST supervisor-3.1.4.tar.gz 392321 BLAKE2B 316789fae200f02242a90d3a22a3c6486576f74dbab81b95efc72768a89c54999a370625f9589afe1edff08351840fbe27a7ef8674e6f1e3bbdd4237f3227df6 SHA512 7182db4169d37aa8f7a2a4e1d57ce40f6dea21759ed73fb49286dd5ffb2bdede0fccdc71344e93c8f8c067a2cbc4e3cb0a9a50b22bacdb1b8bc1378581ed5f07
 DIST supervisor-3.3.3.tar.gz 418354 BLAKE2B 50ce29cdad6c4d8c1a041de74d970ef57031c8b3b77180f8b837e402773ac912d384397e650b94eaeaf1db2d9a6bbb21f19247454262e96ea0f1b733226701a2 SHA512 8285445da8a0ed790fbdf75d988304ab8fcefd9c36975ae6526ec58f511c73cd8707f22b7cff40c3aed5e63f3665d096ed4b5dbc2cc456fe0c5b4547149dbb4a
-EBUILD supervisor-3.1.4.ebuild 1193 BLAKE2B e62379c93e44d3277c51f38dc329e0de1ff3adaa33ab0fbabc9f396468c801a4b7384dacca3b631b576041e5f4a9e893e08b5f82434aeedb0cbf191a80da8a2a SHA512 a1be2bc91dea3bf91e0b3507345805e924d52fc1c61e85c1474349aee595cbf27f1fc14e945be2d428240ffad95a0594951360c7cca6664e53d00cdfca3d6637
-EBUILD supervisor-3.3.3.ebuild 1078 BLAKE2B 65209439e0acda84564751236df525e80c8d18080f9679be2c9044330b09b4e3adf891fa64eb1d51f3e8e2b3a600b48f1185127188e525c8e2d5db65da56181e SHA512 718292f6c63fb0508ccb8db825115dc2d688df4f2abab4a2a42974208c3cde932d3be350a0fd32a1be7f70dc86db8f027f7e78dbac72b901a5b064f7c919dba1
+EBUILD supervisor-3.1.4.ebuild 1189 BLAKE2B 7cc5230fee7d774c9f8265ee4359d3d602fa38ee89cfdb629669d3142dc33121c458d19a77209d26f10e6c7d1fcb841118aa64cd0a6ae31fb98e553c75d5bcc2 SHA512 8f5312013c0f3405f80918a086a5fa075dec20e18a36761f6c9ae873f5764ef92fb3abafd5c843e1b4fdea639dca3bb2a6732ac24a1ddb3524b0c5ad95893029
+EBUILD supervisor-3.3.3.ebuild 1074 BLAKE2B 1ade30bf2054092df4e0928285bf1387ceaf2dcad91573ba47d35c6a959e5d13b6e3af97459a52e07b80eccca7b8381a9a98b5c0250d62317ffca93b4d284973 SHA512 30a12c94fa47ebb92286c741662283df9ba7d9d63a831109d5ade79aa6182bc309497f1217a7977cfb961108d51449191af43203089ed9bbd550222d884c364d
 MISC metadata.xml 747 BLAKE2B 7457a1fcfee7f890a2e1ddc071f8c428884d9882401bcc43067954f50890016492da9935fdf89588c9ad1f4cd9ad114be06081af25582538c39393c36f777a2a SHA512 420e1cc33360e66c4d45c4ed7bd535615669b073bd7f5f7e5fd2c21f561b6246e19fe01bdc93809068f923f2025a5ef9fbfb133da6b451af7780dc514586037b
diff --git a/app-admin/supervisor/supervisor-3.1.4.ebuild b/app-admin/supervisor/supervisor-3.1.4.ebuild
index 1f774d43fdcd..78725722c4b3 100644
--- a/app-admin/supervisor/supervisor-3.1.4.ebuild
+++ b/app-admin/supervisor/supervisor-3.1.4.ebuild
@@ -12,7 +12,7 @@ inherit distutils-r1
 MY_PV="${PV/_beta/b}"
 
 DESCRIPTION="A system for controlling process state under UNIX"
-HOMEPAGE="http://supervisord.org/ https://pypi.python.org/pypi/supervisor"
+HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="repoze ZPL BSD HPND GPL-2"
diff --git a/app-admin/supervisor/supervisor-3.3.3.ebuild b/app-admin/supervisor/supervisor-3.3.3.ebuild
index 7297e311db18..7b8ea8a006c4 100644
--- a/app-admin/supervisor/supervisor-3.3.3.ebuild
+++ b/app-admin/supervisor/supervisor-3.3.3.ebuild
@@ -12,7 +12,7 @@ inherit distutils-r1
 MY_PV="${PV/_beta/b}"
 
 DESCRIPTION="A system for controlling process state under UNIX"
-HOMEPAGE="http://supervisord.org/ https://pypi.python.org/pypi/supervisor"
+HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="repoze ZPL BSD HPND GPL-2"
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index d9115b7e191f..20b8463f2c67 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -2,5 +2,5 @@ AUX testdisk-7.0-qtbindir.patch 958 BLAKE2B 0d3ba4622cc6a83fe6b1fe65dd51203e05c9
 DIST testdisk-7.0.tar.bz2 676990 BLAKE2B deeeee290f05d4a992ff69c990cca8480c74e67ba2df0b523640833b968ed98dc9f44e5f33b2666daf07286dd8349b98171d6c65f7f3baae3d5cca159a5c9584 SHA512 b1ebe1d2fca453660a17623b70c06e0195cb5f07056fb7bc683d575c034fb71dfb793582c804dcff0ca57789a6de84bbf13b1a554353811660996e42199102e2
 DIST testdisk-7.1_pre20180322.tar.gz 632598 BLAKE2B 741610622c9afa2c41d14e8eb391cbe629a5f7ac102cf4cbf446b0c0d7330cb8482a17c1ce8470aa9d1b0578aac254cf17aa061e21dd831a803152514fab5422 SHA512 fbe699ccfbe31be636d71eda5d1fccb8efb16788bf664e048ee16344c3d3689961aaa7ef4c9123690db695bb7ae3439440bd775ab8b8455500232b2fc6048ebc
 EBUILD testdisk-7.0-r3.ebuild 2495 BLAKE2B c697b2ec48c74b2ca7f5da94fd9a3c563ed587626cf1872f7a30ded729dd33f7c700da3142b8fd3513c1a6b17876893b9218dd44672f1f8b2b03fefeac73889c SHA512 0a3a0d78fc7437884e81b9842c0b1ac40c58c0eae43e27c1effa01c0e2ac350dab48ccd5316fac99c4468943d7ef05545341cdb74c3eb6f5b9a153eb9a23ce8f
-EBUILD testdisk-7.1_pre20180322.ebuild 2409 BLAKE2B 23c156df12e4419d37415f17331db822c276ce6d66a9cbdd18c935da09a2875b1ff1344ddfb902009f0603f55d12068a2a7d1148953332c78d1e9d8934931996 SHA512 18371a6576525d36a28b7eb9612dbc7db4f3641b4b955b7990167153bf33f99082239eb887c005d92ccb929635f7b167c9afa60affbc6f005704052e9234b19b
+EBUILD testdisk-7.1_pre20180322.ebuild 2408 BLAKE2B d068b15b4937388dbb44a847b25c5056c8dde7735c3341d2875d6269d5df7d2543a237c1dab0ac365bace8a7ad8bfa93a162a308e4c6ab00dfb5f91632e1af04 SHA512 c577d34667411e293b2397563ae05b489f7755f43dce2e10bf4c0d4b0a9d32d0f81fb58fb792dcfe2a8d12a77666b1dc9d774186c983a9f555b388ce8ddccf5d
 MISC metadata.xml 447 BLAKE2B da97d4af9961ab42d914dd33abbf433e5974ed49efb2ac2c4ff6cfdd50735bddc48b9b9e15d86a3701d740c73ef9df31439599fdd1cb6a37a306ddcf1cdafc73 SHA512 f6e65d544043790ff6b654dce7e4995214fde5f5c5f35926e396721cc223c97f06a918d7d345e9f4f51c82437af41887a0cb442eb0c7172f839df3249eb58095
diff --git a/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild b/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild
index 4aa4e9621ca4..01b29321c4ff 100644
--- a/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild
+++ b/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://git.cgsecurity.org/cgit/${PN}/snapshot/${PN}-${COMMIT}.tar.gz -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~x86"
 IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
 
 REQUIRED_USE="static? ( !qt5 )"
diff --git a/app-admin/verynice/Manifest b/app-admin/verynice/Manifest
index c659652a903b..2a24b408e73a 100644
--- a/app-admin/verynice/Manifest
+++ b/app-admin/verynice/Manifest
@@ -1,7 +1,7 @@
 AUX verynice 372 BLAKE2B 995a40cf67092736685e16b9a5429467972db32debebd64915e233e4be57862496b96c8a70bb57786e3770af3552f747359c534e4bfd62c91271a1ee974946b1 SHA512 b65b2f826b29ce19a237eace78518d0b31af0138caae0342c5354341dccd93cb13ffbf8d82acd1a52d0d710e62ae9d4a18a84e479c01c8931f78051daeab7e02
-AUX verynice-1.1-build.patch 2525 BLAKE2B 76eff33ad7ac3af2b12b8a25becc4aeecea8de7462e314f84da8df5889ac9a1c8fd5f84e92c39e0eac18fa1a0016783e2901332f8c071dec2d6e7e7312d27614 SHA512 8421776550e74a0d409cc3a02e65e96a047571abf0a7d5f0f1c97217978a150711bb7dd68b77abac044b4b7844970bed969151b166f91da20cd36c2c491bdee6
+AUX verynice-1.1-build.patch 2529 BLAKE2B 5ec0b3c4b4c1a91d3f7076068bfd3a39128d896682a8b356100240f7daf1b885d2606ec8c2dc1afdd29add09649f8642158f6dad373aeb7ba349e46997aa1a0a SHA512 d532a4a80b8d0719c07a5171403b90eba6562b6645703e4b7c79368cc71eca546cd0033796def0d3016c6ab2a62db85e266ef67ffdff5a6268f403213bf2ab70
 AUX verynice.service 158 BLAKE2B b71905d327904eb6a524e5d6b2dbc1606ffd0b5bbfad659c9d336ea41edbe8e6510966886cf814888bf8ec55cdd033299b1c91b7e7e3c3f455fa0f8a6ab8ddd3 SHA512 03a88cc405c8d6fa18f1e523e6987b1455011cf17ff38f1e937d523b33d88cae839f256811b487ec3141d8b396a15b8af778998d53bf55dd69f6a6a6dbc6a148
 DIST verynice-1.1.tar.gz 37576 BLAKE2B ac499b298858ada109f298bb2d37dc5fc7ecd17386994749a5a8a3612038eaa98d1f122ed990d9c8bd9e17a428b0a3b4c0c7f0df4a9f1c0441e3fe22fbeb1d07 SHA512 731fa22162bb4f48b943839ccf8ccdc769587e323da11e4a77ad14539a724ffbb89e5f4122e1ab36df3306c507afc958d1125160d34d9cbf55df4dc69e4a0139
-EBUILD verynice-1.1-r2.ebuild 775 BLAKE2B 1eeda57b9658a2e5fe65852674d268a4f24961cfd036083b37c016f0087a7a03f1ce421ab059ccc777eef2bd0fd1b6f7cdbdf979e6cb6dbdb5de9b912924123d SHA512 775d4f86677f8d9fdf8015d2b5ba4376dd5d3c8ed0dab91165c8cf099b06409bb4c666e8891b340dd0a8490d4cdb48b2a90357c4a285e15949ca99fccc94a16f
-EBUILD verynice-1.1-r3.ebuild 753 BLAKE2B e7129dac8aa5fe8f53e899a8bd981e7a8180572fbde6735814ce2bc2abd9e050301597179bcbe4a71fc53be4468b81f6a218f23e1ce9d4709b93d32f049d266f SHA512 3b69f7b7ed2b35cc9dc407dd5ea736328b7f9bc1eb3ae3df3f4644c969df4fdd3135a5c3f7ef4f5e0068a178a40ba402200e35e5fce40fc2c06a3a65c7ff4590
+EBUILD verynice-1.1-r2.ebuild 780 BLAKE2B ead43a3cb913646f7269b253f0f5c37951411aec437408c446d47018966d8f313fb5402244a174ef4ffce2819350d4b9fe1c55bacebed6cc828b3937399c9db7 SHA512 72074cefa72a8f125a9669ad35a7b1c240ed8dd4e05110c957a4b7733cc521897714a7d0035639664eb63af52f9ffc96df0160498f75133a5e9e88ab650c7aac
+EBUILD verynice-1.1-r3.ebuild 729 BLAKE2B 0b519f289c07ccda9c48765b88bf37bc184355ece6698a859dfd8e2fd9e2ab643dcbc9d6e255b9a7cb830fd1f19de080aa82d913e21d2c9f08999bab53f0549f SHA512 98a2149b7d39117b58f0fe6fee1b11808666390234b0f3e02b5944be1eb785991cc874b960861e168b92f3cb75ecc4d7687d43905bd170d5e9be20475546568f
 MISC metadata.xml 318 BLAKE2B 1786ed2568f2f60dcaa875da07b616c2c77a1d4fe0151463db5542db66caef11931259da6bca4b437e125849caa3a3505ee607eca6c57b35ecfa75f45c82f370 SHA512 04cee3becd3a20c8f455969ea4c38d7a0843283bafded1af5310fe090159ad2ae0c804fc4893fa88138ad98aa3feda6991624c8a4942b245b64db5eebb3dcf46
diff --git a/app-admin/verynice/files/verynice-1.1-build.patch b/app-admin/verynice/files/verynice-1.1-build.patch
index a70202b99300..3782c74a5c05 100644
--- a/app-admin/verynice/files/verynice-1.1-build.patch
+++ b/app-admin/verynice/files/verynice-1.1-build.patch
@@ -5,8 +5,8 @@ Subject: build system
 respect flags, add LDFLAGS to linker line
 fix install rules
 
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -15,13 +15,15 @@
  #    along with this program; if not, write to the Free Software
  #    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
diff --git a/app-admin/verynice/verynice-1.1-r2.ebuild b/app-admin/verynice/verynice-1.1-r2.ebuild
index d4536a3b895e..e9dc02e399c0 100644
--- a/app-admin/verynice/verynice-1.1-r2.ebuild
+++ b/app-admin/verynice/verynice-1.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit eutils systemd toolchain-funcs
+inherit epatch systemd toolchain-funcs
 
 DESCRIPTION="A tool for dynamically adjusting the nice-level of processes"
 HOMEPAGE="https://web.archive.org/web/2010033109/http://thermal.cnde.iastate.edu/~sdh4/verynice/"
@@ -17,7 +17,7 @@ IUSE=""
 S=${WORKDIR}/${PN}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${PN}-1.1-build.patch
 }
 
 src_compile() {
diff --git a/app-admin/verynice/verynice-1.1-r3.ebuild b/app-admin/verynice/verynice-1.1-r3.ebuild
index b6334a5e2815..7aba33fc8dc2 100644
--- a/app-admin/verynice/verynice-1.1-r3.ebuild
+++ b/app-admin/verynice/verynice-1.1-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils systemd toolchain-funcs
+inherit systemd toolchain-funcs
 
 DESCRIPTION="A tool for dynamically adjusting the nice-level of processes"
 HOMEPAGE="https://web.archive.org/web/20130621090315/http://thermal.cnde.iastate.edu/~sdh4/verynice/"
@@ -16,10 +16,9 @@ IUSE=""
 
 S=${WORKDIR}/${PN}
 
-src_prepare() {
-	default
-	epatch "${FILESDIR}"/${P}-build.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1-build.patch
+)
 
 src_compile() {
 	tc-export CC
diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest
index 0d3ef0600844..662623e5adc2 100644
--- a/app-admin/webalizer/Manifest
+++ b/app-admin/webalizer/Manifest
@@ -8,5 +8,5 @@ DIST webalizer-geodb-20140201.tgz 733070 BLAKE2B fd97dfd14e2fcbc6c97d6cb423c922d
 DIST webalizer-geodb-latest.tgz 639447 BLAKE2B a4a604f8ead42c403ce750c9f373e8ffc4a7510aab6cfd43b88f39b93f5636460860b72fcfcb9468a5a06739b830149878c948e5b3dd0748e14ee9cbfb2be9d4 SHA512 0f32d1249902e17f37cd0e7680004262bbe5b4a34a00d882319258c6aed80503e89ed192d8365731ab507fa54560082ae16c7023d0bc2232350709106be24117
 DIST webalizer.conf.gz 8986 BLAKE2B 6cee5f96c31a189bf7ce75ec845081d9a2f0e547362d415c84f78f1ddaa8e3ffd327517968037ac1606a485d9cba740054bb9851065d0ea03739b5558c7ef6f9 SHA512 ec7f815e0215116d72e6d93b471a4b86a1c152a8ebae7c374144cabeeb06750d3a39fde65faf069e9aeb133f27b0b4cdee16bed5442e7fbd4eb4f45a4f3cd84b
 EBUILD webalizer-2.23.05.ebuild 3813 BLAKE2B 73b3e795b6463598b432ed32a2cb9cb58c14824141c6edade11786c54bb52449cd13da01d68f930ece01376a8581c16e3779c394e3641ff9de2086a80e91ee35 SHA512 c81bdbb98168cb608c9eee163e71dbea85c487f16034fad1d772880f6b0b5350aa071fc5f3e870eaf49e8bfa5c6354c31c93866d8faaff9cec0843993afcde24
-EBUILD webalizer-2.23.08.ebuild 4223 BLAKE2B f5d63d82b6ed773db575df4753eb5a09c7a81ff062d8091d853a7d40b6301fd873d814ead75ccbaaf323bb4729488a900de9f20337551236f74c6748bc95285e SHA512 984725647e329236b7867edcb2b72dfd66e34b055d85a209c1b465f78195076d4e387ad47b9529b9150f5d877adb62b78371b4d7ae010a88307d740278cc7c98
+EBUILD webalizer-2.23.08.ebuild 4222 BLAKE2B abf62b488d87de185333e3900fe995400416acca263ede382d5da791304d154d95d0651a4531d453fbcf9d674f5733585044ba428bf80705bc13c1573310067d SHA512 8267cb7a29cb7cb006a631b6e04cb01c701f14c602ede2a0ab0dd40da6d15edc70adf118a2fcc4561cc8db975c71642f9fb97e99dfaa44ee5957d8eade13f862
 MISC metadata.xml 434 BLAKE2B 72cde450aa4735601e14978c5bfc3be91f257907988e6017dc27f7aca8dad9b8586dc78943d69a10344d25d2435fb8394b5fe1239a0ea7ff2ae3ae2b26ba0eec SHA512 9d006c56a0019b4ea29e8f9f845ca9006ecdccf64b9e50c343420af4b3852b5c08f09a23d792c3d1454454f8a0696a0dbc4b36b4da2c6f0d4967f533ad3a3149
diff --git a/app-admin/webalizer/webalizer-2.23.08.ebuild b/app-admin/webalizer/webalizer-2.23.08.ebuild
index e7680d49d8e4..605bbadefb1f 100644
--- a/app-admin/webalizer/webalizer-2.23.08.ebuild
+++ b/app-admin/webalizer/webalizer-2.23.08.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2
 	${GEODB_URL}/webalizer-geodb-${GEODB_DATE}.tgz"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86"
 IUSE="bzip2 xtended geoip nls"
 SLOT="0"
author	V3n3RiX <venerix@redcorelinux.org>	2018-04-22 14:25:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-04-22 14:25:03 +0100
commit	5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (patch)
tree	b041acef19bb9ae66c228d5c9d34d1e00aeb2b95 /app-admin
parent	5cfef3c94cd7e82136c69a0322f5ba21f7e64632 (diff)