gentoo resync : 03.12.2017

12 files changed, 138 insertions, 407 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 7cc21a823f15..5c2f0814b8bd 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/diamond/Manifest b/app-admin/diamond/Manifest
index 3253a06390cd..2a0572c7be40 100644
--- a/app-admin/diamond/Manifest
+++ b/app-admin/diamond/Manifest
@@ -1,9 +1,9 @@
 AUX diamond-4.0-psutil.patch 1842 BLAKE2B 21774c34c5557c84b5ae217acfe468b7d55a4e3b818f501ee72cec43cc01d24e7121f9fe302bdc317d60c39e39e7d4587a5caee4ddc73dcc1e87e1605499be40 SHA512 4f59e7811df1419dcf29d231f62844de6db9e5a3f6e7600b11432d1bda994b62973172cce98d257d6ce03e940645df76dee2c3cd4fced18e960527bb23b1f1ea
 AUX diamond.confd 57 BLAKE2B 8a5e3f478d3eb948e262239a9a83026e067ed67f2a4878075c8ddb7d8d356a2482da0642e673b8b3f658de6c6f30a30c830bc68af3fe2d750b998dc896525942 SHA512 51b037902394b22f957a15ad1479ebdae5ac29384f2b7a5053ea8200bad05dc9c9060cc5c6c1a931e341e99b95327e55b06aaa9a828950533265f9c96a8dff55
 AUX diamond.initd 447 BLAKE2B 76354f66282325005f193d4ad51f3deb0358604a681cfe54a596037608bd794c3fd68a78a03659295ce2021b70809edc01340f5ee39348e35275cae0b00a5042 SHA512 004b305ba945fa313da4cd51226050cec955886405026baacb15f7ab586b7ba650492b0e2cd9621b3854ec83ee6192a7b86ad4fd8239008df3c6c8bb5c8c84f3
-DIST python-diamond-4.0.515.tar.gz 620337 SHA256 3e8a1ff06b18d70a850d10689b3c8e041e91237aa8dee16db824ec368c04949f SHA512 8516e46f4f75400a55ca0127789344a897fc7cd6c10f0f8379d30db58de5a09ae676e340371cdf1a0c9ca894fd355699a1a0f430bfad148e32157d5eb97aaef5 WHIRLPOOL 39fe60e68b28e706a615c9b6068384b2ffac0710d06f26988341e1f032db4558d0018d7d746c7eef12ad0c0e04969decddd839f6cdc7fc1c01aca31c91e2591e
-DIST python-diamond-4.0.tar.gz 491433 SHA256 e84dd3c87b230d524306a07c3fc7c1db1d9796e3748025e8345a4fa18b162256 SHA512 c4a6e63bdc55f9e0ac2fbf3b644be91662635c08ecc864dfaaebf2fe62fb45609c099da63efd93ed498d2dc9e95bbcb64be09f715e21d59b30bce958a96dc56b WHIRLPOOL 2b1f6124001183058cf282d6e9c51bba0878f26308731266f2c31c549bb42db945c579b49b5a34666e0c05ccbda0163135662a11e59a482f8ef031c49c6005ba
+DIST python-diamond-4.0.515.tar.gz 620337 BLAKE2B 8df675f7e91086dc6e98166c3f6c25c7837bd53f720cd0dfdf05a1dd2954aaa190bfe8844d01acfcdf46d5be917c29c0e231f2b433a648d6dcc1f34e2c617d91 SHA512 8516e46f4f75400a55ca0127789344a897fc7cd6c10f0f8379d30db58de5a09ae676e340371cdf1a0c9ca894fd355699a1a0f430bfad148e32157d5eb97aaef5
+DIST python-diamond-4.0.tar.gz 491433 BLAKE2B ddf678b758b046b80fe347c2cd8ce2fec46f03e65415735d88969d66dc05466730e52df9e8efc27e3a3bff13862c4efcc393de6d05ec6d350e3912a706d298cb SHA512 c4a6e63bdc55f9e0ac2fbf3b644be91662635c08ecc864dfaaebf2fe62fb45609c099da63efd93ed498d2dc9e95bbcb64be09f715e21d59b30bce958a96dc56b
 EBUILD diamond-4.0-r1.ebuild 2007 BLAKE2B 25abec3a500ca23844dc17a7e987be99be9f2c5692c717269ee171de875850a665626cff0d2c17b990f90293adcd9da99b2e355a42328f8c7bbb22749a54236e SHA512 9385587aed2660c5872baa3a224e7a74be1b49c903b814fdf353a44401c79008e9f325b5b68eefc610b453dc91bee10730d87fca55397f1b94202441a73e6b4a
-EBUILD diamond-4.0.515.ebuild 1891 BLAKE2B dd072a19d3f824522f8bb49768edd664f3485d0559bde274a0a3327dabf8b3f99b9b9698d16379f04bfa0aa6428418c72675cf06a8eb9e792fac99b004b2c6d0 SHA512 344ad91933e15d9d93fd7bd796650f98dc7bfd1a57a38053346251f852b7b6e9fdb56bcd386cf7310c87a56c847724b6dd91a13116fa9010f80f4662008230e2
-EBUILD diamond-9999.ebuild 1663 BLAKE2B 9f43ba072c8129914dde03748b8e2eb041fe0f6dcd42983d09a7f1c6ee6e40a1730c397be401453d2a42b191269d084853f913e93337ab57f95e423a4c4effe7 SHA512 d2b16d9339b1c724eda84377fe78d8abfb1c31f37f5363ae6718662ae4d1d02d7af0edc52247802da8dd449928ad17ef34028933e0d8fa52f7d0310eef3a1c2f
+EBUILD diamond-4.0.515.ebuild 2128 BLAKE2B e19b1e5cf4f88e92bcc46c620f5284fbe97d4b2988b498957b7d306a2780255d8ed48e2dd7f794c90df49f9c202fe0cb5a5a5593117df4ff25d8b96b2572e4bd SHA512 a05a1a5a48584a90d2384543d88520f1759cab46923eb028914f68c7b1246440fb8a80c7927ba2cefe4f4945871247124c551b17b68db3101fb1c7c113744152
+EBUILD diamond-9999.ebuild 1900 BLAKE2B cdd17d24f9817cf9110aa198ca8f11d468deb5b162215fa2b5ecc2c82072f4ebdeb6751ba047b6392b69b9a90c438912dabd627ce54ad088bafb4ccf62fc4a3d SHA512 f595d59ab69d2deb704e6a1ea739540a7760a37c786ba3d0da509029bf367ebd855e131bf187c423443bd107ea5db30489b17053c959955bf242607b3f1dc59e
 MISC metadata.xml 802 BLAKE2B d013e1b87c2f1d5f0f628766ed754a4ac50e9c9e710b7b2542081cd06988f7f577513a53165c54ff4d1d1de3bba92ec2089eaa15d16cbe946f7489d0345aeaaa SHA512 c455baa068661000d395e15f6952b3106cb3633f1a95395745c6a0d7cc5dbfb193d018af1341f27b250226bdc109e961bda4a612115d5805958f8e500108239a
diff --git a/app-admin/diamond/diamond-4.0.515.ebuild b/app-admin/diamond/diamond-4.0.515.ebuild
index a10298e45b41..6c874d48ed22 100644
--- a/app-admin/diamond/diamond-4.0.515.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.ebuild
@@ -32,7 +32,10 @@ RDEPEND="dev-python/configobj
 	redis? ( dev-python/redis-py )
 	!kernel_linux? ( >=dev-python/psutil-3 )"
 DEPEND="${RDEPEND}
-	test? ( dev-python/mock )"
+	test? (
+		dev-python/mock
+		dev-python/pysnmp
+	)"
 
 src_prepare() {
 	# adjust for Prefix
@@ -48,6 +51,10 @@ src_prepare() {
 }
 
 python_test() {
+	# don't want to depend on docker for just this
+	mv src/collectors/docker_collector/test/{test,no}docker_collector.py || die
+	# fails on binding ports
+	mv src/collectors/portstat/tests/{test,no}_portstat.py || die
 	"${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}"
 }
 
diff --git a/app-admin/diamond/diamond-9999.ebuild b/app-admin/diamond/diamond-9999.ebuild
index c37ee683c298..57df76bc0741 100644
--- a/app-admin/diamond/diamond-9999.ebuild
+++ b/app-admin/diamond/diamond-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -32,7 +32,10 @@ RDEPEND="dev-python/configobj
 	redis? ( dev-python/redis-py )
 	!kernel_linux? ( >=dev-python/psutil-3 )"
 DEPEND="${RDEPEND}
-	test? ( dev-python/mock )"
+	test? (
+		dev-python/mock
+		dev-python/pysnmp
+	)"
 
 src_prepare() {
 	# adjust for Prefix
@@ -42,6 +45,10 @@ src_prepare() {
 }
 
 python_test() {
+	# don't want to depend on docker for just this
+	mv src/collectors/docker_collector/test/{test,no}docker_collector.py || die
+	# fails on binding ports
+	mv src/collectors/portstat/tests/{test,no}_portstat.py || die
 	"${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}"
 }
 
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index 8e5389d6d586..d9b06a876fc9 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -1,7 +1,10 @@
 AUX filebeat.confd 269 BLAKE2B f9cc2a3d96be870d755c41606a274e94d6f6a2a5be71aeb3fc10f989d58b1bb5cc3683b38ede75f7e34937daa4189eccdd30c306b20e219c91bc90ac22d21b40 SHA512 89f2a8ead476750b3fd9a94dcc84311503907e78e66c70d151f27c7fdc8835e7bae6667a6aed0b6470a8f9b42c850396973fd09b1b6aec2d170e3774c8cfddff
 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 SHA256 39e792324a35fe84ef9a63cd5324252bc71d1c665188e8d597e12ca170cfde7a SHA512 ad92b41a9ceaad6c6e6fc80d0adccd7fe03a7056d121484bcf35c6a46b2061a5ef6d32121dd12d59b51e7678769da5c405b1d549fa130631ae3f1989b78fba48 WHIRLPOOL 46d182bd339abd26f3c4cf3f8d3a716180fc00147458f571eec34aefcaa67d9e88a561988e37c47083528024e4e0559b255c7a17efa43e0e4b21b653a575f7fd
-DIST filebeat-5.6.4.tar.gz 18145215 SHA256 c06f913af79bb54825483ba0ed4b31752db5784daf3717f53d83b6b12890c0a4 SHA512 1ae66b7dd81f04434d667ecc295a747f8c650ba1affb88d7ae358051c739634b75c64d9c52d55fe6ee0b65848ff1825e508426c03d7e822517f55602091e186a WHIRLPOOL 37dbff315872dbbd5237aec2e32004a962b3f729f53d77e1f4cf86a094b2c0673499a408483c9a9be2be1521097f5dedb244c340fd05fe700b9d40291e83e58b
+DIST filebeat-5.6.4.tar.gz 18145215 BLAKE2B ff5c848a87365fd9c592a2a10d852cdca2e32206827c26e8f631c35015623c8fb85c49799d6bae91877a0d7e718f316856e8cf8833ef29694c7d1cef5d86b47c SHA512 1ae66b7dd81f04434d667ecc295a747f8c650ba1affb88d7ae358051c739634b75c64d9c52d55fe6ee0b65848ff1825e508426c03d7e822517f55602091e186a
+DIST filebeat-6.0.0.tar.gz 15118739 BLAKE2B 5b4e4998c98c52f65ad239a1002e499e042a37ccd4d53acc21c3647bbc9fc7dee913c7c3393684eccc962892d93d4ff62a91957888a46f38b8b3430c11d99c42 SHA512 6dbeecb640fe2e39b81be90fdd05d03c1b3ffddd20ef06ab7c51805eede82035a8d0a00de3132edb77594383095bd5e7a79609e3bdf3d62377140cde7ed3fcd7
 EBUILD filebeat-5.5.2.ebuild 1646 BLAKE2B 37f6ac540ed27b471021be5666233d00ceacdcbdf6a32954c5987fa85c957223d84536dd5c0e93bf6acd988b01a061008cffff005806d8b2d8cee7f722884f33 SHA512 4b36e36a4f95c893bca863c4510e903f6265e4950fa000cae61896915c558beb4d8c4b10d8aa78d154bef7eb67886628f499153f988ff66e5b1066cb949b2029
 EBUILD filebeat-5.6.4.ebuild 1647 BLAKE2B 85c4d12afa9a40f972ea2521c38f905de1f0d2546a96b54999db6dce650a49e6e7cf6682f76b9b3b4523c720e52a85c1002dc3f39bb11f59a292653734486cbc SHA512 b64da8481ef50ffc13f51dc82ae0d4cf0101b6b27f502e3341a6513d62984c23b31bcf0ca0f8c4a214f133b19c4eb73d83dcb5ad0c73dc54d8a8131caf866c9c
+EBUILD filebeat-6.0.0.ebuild 1337 BLAKE2B f3442e1b92e856b00352873630a9846430c83e5d02c564c87ba4a0b1392f82d5e49e2b24144df9fed7dfd38f271d59b0f7d69fbbd444695f8e09f64a2c22fed4 SHA512 0dd483c416b765fb6c7ca70a7ae14767bcc88e482c7201c54c09a96c035a3eb6b3c62da6120a66cc14f16f5299cb1e33d2a25105b72fa4b251634858e9ddd08e
 MISC metadata.xml 461 BLAKE2B 8bd064daf5ee2d3fe746a73bf36f01926fee1f9796b29499a7fb1db844aface3be7dfd137ed31f606e78834c1d7a135d0119f400244ba33ce3feb81fa792eb6e SHA512 903c43c9cf4b371e34afffd0b425086d5fba6f37af0d761fc0065d114dc843ea0dcdd439682e48749bdf2f9138bfc3dc6cfcc6490503daeb7a71ce5706a779d8
diff --git a/app-admin/filebeat/filebeat-6.0.0.ebuild b/app-admin/filebeat/filebeat-6.0.0.ebuild
new file mode 100644
index 000000000000..3b7aa080920a
--- /dev/null
+++ b/app-admin/filebeat/filebeat-6.0.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=dev-lang/go-1.8.3"
+RDEPEND="!app-admin/filebeat-bin"
+
+ELASTIC="${WORKDIR}/src/github.com/elastic"
+BEATS="${ELASTIC}/beats"
+S="${BEATS}"
+
+src_unpack() {
+	mkdir -p "${ELASTIC}" || die
+	unpack ${P}.tar.gz
+	mv beats-${PV} "${BEATS}" || die
+}
+
+src_compile() {
+	cd ${BEATS}/filebeat || die
+	GOPATH="${WORKDIR}" emake
+}
+
+src_test() {
+	cd ${BEATS}/filebeat || die
+	GOPATH="${WORKDIR}" emake check
+}
+
+src_install() {
+	keepdir /var/{lib,log}/${PN}
+
+	fperms 0750 /var/{lib,log}/${PN}
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
+
+	insinto "/usr/share/doc/${PF}/examples"
+	doins ${PN}/{filebeat.yml,filebeat.reference.yml}
+
+	dobin filebeat/filebeat
+}
+
+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 ""
+	fi
+
+	elog "Example configurations:"
+	elog "${EROOT%/}/usr/share/doc/${PF}/examples"
+}
diff --git a/app-admin/filebeat/files/filebeat.initd.1 b/app-admin/filebeat/files/filebeat.initd.1
new file mode 100644
index 000000000000..2cb33ba8ebc0
--- /dev/null
+++ b/app-admin/filebeat/files/filebeat.initd.1
@@ -0,0 +1,43 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+FILEBEAT_USER="${FILEBEAT_USER:-root}"
+FILEBEAT_GROUP="${FILEBEAT_GROUP:-root}"
+FILEBEAT_CONFIG="${FILEBEAT_CONFIG:-/etc/filebeat/filebeat.yml}"
+FILEBEAT_DATADIR="${FILEBEAT_DATADIR:-/var/lib/filebeat}"
+FILEBEAT_LOGDIR="${FILEBEAT_LOGDIR:-/var/log/filebeat}"
+FILEBEAT_OPTS="${FILEBEAT_OPTS:-}"
+
+command="/usr/bin/filebeat"
+command_args="-c ${FILEBEAT_CONFIG} ${FILEBEAT_OPTS} -path.config $(dirname $FILEBEAT_CONFIG) \
+	-path.data ${FILEBEAT_DATADIR} -path.home ${FILEBEAT_DATADIR} -path.logs ${FILEBEAT_LOGDIR}"
+command_background="true"
+command_user="${FILEBEAT_USER}:${FILEBEAT_GROUP}"
+extra_commands="checkconfig"
+pidfile="/run/filebeat.pid"
+retry="TERM/5/KILL/5"
+start_stop_daemon_args="--chdir ${FILEBEAT_DATADIR}"
+
+depend() {
+	use net
+	after elasticsearch
+}
+
+checkconfig() {
+	if [ ! -e ${FILEBEAT_CONFIG} ]; then
+		eend "Please create a configuration file at ${FILEBEAT_CONFIG}"
+		return 1
+	fi
+
+	ebegin "Checking your configuration"
+	${command} ${command_args} test config
+	eend $? "Configuration error. Please fix your configuration files."
+}
+
+start_pre() {
+	checkconfig || return 1
+
+	checkpath -d -o "${FILEBEAT_USER}":"${FILEBEAT_GROUP}" -m750 "${FILEBEAT_DATADIR}"
+	checkpath -d -o "${FILEBEAT_USER}":"${FILEBEAT_GROUP}" -m750 "${FILEBEAT_LOGDIR}"
+}
diff --git a/app-admin/hardening-check/Manifest b/app-admin/hardening-check/Manifest
index 2c1c22deca1b..194e328e60b2 100644
--- a/app-admin/hardening-check/Manifest
+++ b/app-admin/hardening-check/Manifest
@@ -1,6 +1,6 @@
-DIST hardening-wrapper_2.5.tar.gz 21157 SHA256 9ae2cc44d9543476b5b8655b4699af5421218dce44ce0d4a89cf5d81ba12b9bf SHA512 e2c183736e9f1dd1b39ecde7d2bf2c22d4c87c69cb158d98bb527b8325d88ea86bceb6087633cc761e973a22d0cf97c6266464d117e408ed2aee2e67c8ab5565 WHIRLPOOL 652327876a29ad8a69529bcb85b1331a227348a1ca87c1e5cf69fbcea0ad7c57afdcb14536eebfc8668834a701ee80f8579b8851f596e41ee782e4c6dbf47cb9
-DIST hardening-wrapper_2.6.tar.xz 19436 SHA256 c5fc46439646d0929a0605e4f3db67e57eefbbf5ceec5a2888440dbdf4450224 SHA512 924d9d816148bc5f2d25d66fd24c7b2a77fef8d62eb7656d4c9b0ee50c767789f25aaa3b776138103682366ff7c2266be4a207d4b11361655b5097131033283e WHIRLPOOL b74177a5f12984d381f3f9143a03605b157f571edc9ed09cdea2c72920c41aea3b1e5687409539cc087d66dd6a496e6204a1d5f165ce7070849d34b3ee851134
-DIST hardening-wrapper_2.7.tar.xz 19604 SHA256 20c601c6ccac7534d17d4be9442a4ad8f02b8461c2c50dee8b45d596cd6cf8e7 SHA512 834242b28e06f32d6e899f13fcfc66f560e4137267f8cb46fab21337240fec612ea2803345012308af50c0fc4af92f52a28a18803ba330998ad7cb1321023121 WHIRLPOOL ebcee88c6225187b685f0c4792642131a8b9cc3b28fc293348c0cb59a5dc1f484df526f27fb9761204cdefae3d8a99975353a2160ec4fe4ebdea79cd4a8e4dd7
+DIST hardening-wrapper_2.5.tar.gz 21157 BLAKE2B 9976de519667e3816be0ccee446dd81ed67beb331e59badfceed61bdb323644af502d3b280c70b0ec3638569cfda751dd68ebd4ca23f4cf09ce170d300ea0751 SHA512 e2c183736e9f1dd1b39ecde7d2bf2c22d4c87c69cb158d98bb527b8325d88ea86bceb6087633cc761e973a22d0cf97c6266464d117e408ed2aee2e67c8ab5565
+DIST hardening-wrapper_2.6.tar.xz 19436 BLAKE2B 61b04985f1511470640f1631af3d95613a5f9ff843b95fa53557cc183ff1e3be384c2af473f5c936697b7c70a573ab6b32c6a36d62ef9298729c079c95f4d7ee SHA512 924d9d816148bc5f2d25d66fd24c7b2a77fef8d62eb7656d4c9b0ee50c767789f25aaa3b776138103682366ff7c2266be4a207d4b11361655b5097131033283e
+DIST hardening-wrapper_2.7.tar.xz 19604 BLAKE2B fc6e17867708f9ecd5d430035f5142ae7a42d525adbe55bfc14c3cad767b0fed86df00c2a8e1c5099e1320167aa1ba7454c1dbca1210b431841e191f0be3392d SHA512 834242b28e06f32d6e899f13fcfc66f560e4137267f8cb46fab21337240fec612ea2803345012308af50c0fc4af92f52a28a18803ba330998ad7cb1321023121
 EBUILD hardening-check-2.5.ebuild 556 BLAKE2B efc8969e237ad22dd969666f2dcf71c8dbac9c92b6cd2ba6816f05e3de3f0cdeaefe8308111f0888ffa1f9880817c04f74016498fe84f97b994950885a068e0e SHA512 5694da1316e087986930237f4fd5e752768be07235f6c9c2fc4c95ed89514588a9773fe374225ea4216c3a493172823fb3b9e05478e8a5f0f36203834ca2ac55
 EBUILD hardening-check-2.6.ebuild 571 BLAKE2B efbd82f61d84c70e17b7be358b1798c57500f2cb0b30914ebdaf1ed76e18c2066cba53ff9e8155658e3c09e7875727dab960f302b163e9b5f56c1e8f3e8ead9f SHA512 9a34d79a769ce49efdbc448d0c6daa65ee118ff335c8cf774e058291a14871fdc8d44283c53da9ad4db6888be5b5552d7098a9910d895440809c299a6f31401b
 EBUILD hardening-check-2.7.ebuild 588 BLAKE2B 74236a0133aa2a99e6def70fca4fbc89dec13183a3418214ca2e2dd3f40d8d6bc224d7b7c58d304a4abeb722933d6b7d236381034e48c110ed11307843b827e1 SHA512 009c7b2eb86d6ae882c097dde72d9d1ae055db7db3be19a4224d74f0f1d4035c918f68f3b23a5da98b66a06ca6b7133d5ffcb12d5df2da8d92d0bf02c056384a
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 10cb0b273abd..ba95497cb153 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -10,17 +10,14 @@ AUX puppetmaster.init 1090 BLAKE2B 367b678860b955003ff8d79e69cd8c4a6d652ae738bec
 AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8fc8eca3c0199828b2c0119547cd744c49f79334de1bc0a7227c0791a5b3645eedb51d3fa8be5822487354b1a SHA512 e177109d90f5954e7cd1968db1d0e0d0e2c6e98bc4d53d0ae0a816d181e304e1b7555f65d8807b98df9f0f8cf7ebafc9d8cca9c32574fb7127c4b480d23b5cc6
 AUX puppetmaster.init-r1 921 BLAKE2B e8918248f91d7699f4cdfdd49ebf11401f0ea82c59ead3fcc9b954493a0afce19d597328a8a097009472add04c39b7892e9d940a29a549afaae0a5a88c1ad227 SHA512 cb73ee391fc493648504af8eee2595af102ed9dcd9043f4316fb93749b37d0492e28f0082fc43bb8266357d1c298246e75f3d8b99d195dd169e3a5761f06fbba
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
-DIST puppet-3.8.7.tar.gz 2650247 BLAKE2B 20728a12c9c123f4a366ee89b25235fd73215a764ebe7fbd5f618d99f8db06935845778d3759722ccaf6f6a68536ea6de34a413824afba777d72e11d0543e864 SHA512 f86568d4f33c8c18da270e089e1274ce2e3c705c116b078531bb66656f0bbb9a2fc95effbb8bf5355a082d4f32ce5b44e7f6e316937164aa0d71dd47e654c618
 DIST puppet-4.10.1.tar.gz 2954351 BLAKE2B 6cf8ac28d8c09f4b82956b3fc8ebc17c0ec35c77818797e5101d03e099850b75fcfa35ec19bd351bcb51fb1d5071541f4f2b8b3be9eada3d21c00c8d8108aa95 SHA512 d232f062b93485f7eea8abb9c5420462e313e6050e7335159f051f7c7af86338c006ae4edc09e0e1370784ee7b076911ca563a4cfc6a1f2afc7179bed08d2032
-DIST puppet-4.10.6.tar.gz 2977099 BLAKE2B fea4ece994c9ee639bdc4a079760b04286e8d9804dc502c7598add658cd7abc975d74fcce49dc63223a6696565e8be6f6a2c495bf4cf40aded314d36f1ce839e SHA512 f983005d161bbd5fb81dfd15a32cb0ae2417557bd4faa1a62d2fb10fffa55c91ea29c1577785af9642a2878c78405ab99c7e6ee4268fcedcc107c07a0a5bfdd1
 DIST puppet-4.10.8.tar.gz 2979824 BLAKE2B 802b65d48ff7d8303e3cc847a9f753a5e19c0ada6ee02dc1fc9c748da8d69462c34bdfeddeedf0057179ff1133665439c41e970c41ca1728463292ef26e996ab SHA512 9f3384702dd4938e1e00aeceb0745b760de32000e0dd59d5b846d1120a46026499176a51d0409e3a0ae414efc0872854c204d1941385695a4c57c209fbd1f28d
+DIST puppet-4.10.9.tar.gz 2981668 BLAKE2B 315c39953c2ba70b547fd7a393c7be0bd3c387bd52e3f383a932ebc03f9d96c17d988d53b15bcb8d08bc22ebcaf1c9c5cff00f9c34d730e231417565aad5311f SHA512 0ac70f716a602b15d28504cc594c5a0d4f8005083de6751c682dc9180feca68148d942353a63e16aaa2e783e6ebe90b8f77b0b033c671a5134bcbcdff36a3204
 DIST puppet-5.1.0.tar.gz 2734018 BLAKE2B d4169fee328710b7685de2606196de68e21ca31f9a9945bdd84255f5185fd2d95c6543a7b88b5130f1f01e60e04294664de71a8ccd1319c2e0bebf4d031e6225 SHA512 07019f40c5b7f18243f13abb899c2ff2ea4b135895ab98c13da3df50f8e720e2759f8eb39e349ff04286da7de504cffea3df8acf9711e8591b25001a2a3f9c15
 DIST puppet-5.3.3.tar.gz 2843386 SHA256 45360f64fe0375df617571d58e929515e2094daa1d0dc78e2b6718d7cbeaf18e SHA512 b5bb9ac4059855c7cac624ea0fdc2c3366cea82bf07bee195a179a0a709fa53e7fffe883e581c1e07a64705a638b156288301227f7334226ddc401a9bf770afe WHIRLPOOL 19c8511ba58186692ee0ace02158c16529715cc213f0eb7266bb078a10db6e698081edc4b3e0735f1e79fb568066cc6f1699d0b1a954a29d74d1a91f393130fa
-EBUILD puppet-3.8.7-r1.ebuild 5301 BLAKE2B 5231721b0463360d6f7d9e576ebff1ace8b0aa21110f2b4e73b95de377efc96272f76659ec03a3f6d3738b3d55c099d84b2b6c1e50da89369cadeff928933afb SHA512 f098685cae0f9e2a77da1e8b82fb2d1c28fa0d28214449e628ac1f3a02b4c07c53eedd000b4ac94154d8ecb2e899fac61d0660fad6cc780f5944349a513f84ba
 EBUILD puppet-4.10.1.ebuild 4911 BLAKE2B 9b7b3b8cb8a6aae28b460efadda66f84df31ed7458e9055e1242eb99854c817039e0ddf6874ede9c9204d2bc3bdb2c62adae2faf14778eec3c71140de024bf84 SHA512 5ea1902e13577a934344565db53ad42face48b08def199f32c2fbb38b2747f7f7e1b52882bce5289894e462431fe39f75c7f63f0271878e732cd2263e52b8eaa
-EBUILD puppet-4.10.6-r1.ebuild 5573 BLAKE2B 4c703278b5fbc875d9fd84d8fa6101554f604c12e21ffbdc490624c664075b0ad35537a1d482e64915aec6bd8be059c71ff2daf63c6356a727de2bce09f66998 SHA512 3ca9a12e808f70aef8b02975804012a7fbe96484b12ccb0a871a3f79686d71f24eda5342d41ce555aa65a827c645631f3f0e9f943b1ce93d6fe4c60eb910dd84
-EBUILD puppet-4.10.6.ebuild 5529 BLAKE2B 29fd8870fb1d377e89e4cad4c47fa32a3dcd6992ff525e2d5b7018beef6568ee96a916e886728936ea175b4970b1a9f7641372f8081b945ad53dfe49bde01d42 SHA512 1c0728ea0ea361c1c551629349ad36e3191a1279400130e4a5fa067a2b9e9022c0537056e78425c9f49abba905972d5607265e7516c302e4c09360a9f344fa74
 EBUILD puppet-4.10.8.ebuild 5566 BLAKE2B ef297d5556d0e44111d05cd81917b4715fe40d3b70adabcb1369ed442a24930d3b165b28501fe7c82343aa3cbcf9f42d26cbc5ae1062db19cc4572db6b2f546a SHA512 ecbad4f16a4789ee47039279fd5a7247f2600d50e80c8a69b2a1c6c1b8988db7e819ae01eb92660029a08b1f442054a41c53666b10ab084c857bfcc3b230d528
+EBUILD puppet-4.10.9.ebuild 5619 BLAKE2B eb324da5789174f5a2228911a24459e37b5afb0769fcceb956f2082cd12137038c1a08881a2dddbfaa4629f494a147f1189c742234b16acf727ce00b32ba4c96 SHA512 c5ba1cd5154ad8c24b76afa44a7e2b56ea186a075bed569ea25db860f98f918c0bcfa4574d7e58086ef947cbd25002bef702bb758d85864438cef4a89761b6fa
 EBUILD puppet-5.1.0-r1.ebuild 3818 BLAKE2B 759137043cf2c99033635f117c71ca93b2806e7d3181d507e0bd4fa584a32040bb08a0b23305c84584e7f31f52672d11457f417fc50a30f4df9b4c6acf73974a SHA512 cd1fc1ad13ab691c76bbc814285316fb14867ba606dad3e8900f314470e6bce143c77f920a468f7787a6b48e52352aa12884b84ad952ca0c29d67f954157dad1
 EBUILD puppet-5.1.0.ebuild 3865 BLAKE2B 10999d7fe76eb19c04fc54cdb995843091a8157fbbb90acac504baacc5cf9c411d351462497cfdac9594b40326b9d914f219be8ab3f1e31734211fd79262750e SHA512 6a62c22b405fe4b5ef9df3d8878a8ef401e97e4f62d00a681d95c16502805b8e505be0beb9362c7dff361f722de6bcf322fbcde5d45bef5fe4b0f23212bb99ec
 EBUILD puppet-5.3.3.ebuild 3818 BLAKE2B 759137043cf2c99033635f117c71ca93b2806e7d3181d507e0bd4fa584a32040bb08a0b23305c84584e7f31f52672d11457f417fc50a30f4df9b4c6acf73974a SHA512 cd1fc1ad13ab691c76bbc814285316fb14867ba606dad3e8900f314470e6bce143c77f920a468f7787a6b48e52352aa12884b84ad952ca0c29d67f954157dad1
diff --git a/app-admin/puppet/puppet-3.8.7-r1.ebuild b/app-admin/puppet/puppet-3.8.7-r1.ebuild
deleted file mode 100644
index f7e608e5bbfa..000000000000
--- a/app-admin/puppet/puppet-3.8.7-r1.ebuild
+++ /dev/null
@@ -1,196 +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"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit elisp-common 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 ~hppa ~ppc ~sparc ~x86"
-IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite vim-syntax xemacs"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	>=dev-ruby/rgen-0.7.0
-	>=dev-ruby/facter-1.6.2 <dev-ruby/facter-3
-	dev-ruby/json
-	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 )"
-
-DEPEND="${DEPEND}
-	emacs? ( virtual/emacs )
-	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"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Fix compatibility with ruby22 and later. Psych has been the 
-	# default YAML engine since ruby 2.0 and ruby22 and later no longer 
-	# define YAML::ENGINE at all.
-	sed -i -e '/YAML_ENGINE =/ s/syck/psych/' lib/puppet/vendor/safe_yaml/lib/safe_yaml.rb
-
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# Avoid Rails specs to avoid this dependency and because they
-	# currently fail against Rails 4.1.
-	find spec -type f -name '*rails*' -o -name '*active_record*' | xargs rm || die
-	rm -r spec/unit/rails || die
-	rm spec/unit/parser/collector_spec.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 spec/integration/parser/future_compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-all_ruby_compile() {
-	if use emacs ; then
-		elisp-compile ext/emacs/puppet-mode.el
-	fi
-
-	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
-	#${RUBY} install.rb --destdir="${D}" install || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	#systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	newinitd "${FILESDIR}"/puppet.init-r1 puppet
-
-	# Initial configuration files
-	insinto /etc/puppet
-
-	# Location of log and data files
-	keepdir /var/log/puppet
-	fowners -R puppet:puppet /var/log/puppet
-
-	if use minimal ; then
-		rm "${ED}/etc/puppet/auth.conf"
-	else
-		insinto /usr/lib/systemd/system
-		doins "${WORKDIR}/all/${P}/ext/systemd/puppetmaster.service"
-		newinitd "${FILESDIR}"/puppetmaster.init-r1 puppetmaster
-		newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
-		insinto /etc/puppet
-
-		keepdir /etc/puppet/manifests
-		keepdir /etc/puppet/modules
-
-		keepdir /var/lib/puppet/ssl
-		keepdir /var/lib/puppet/facts
-		keepdir /var/lib/puppet/files
-		fowners -R puppet:puppet /var/lib/puppet
-		fperms 0750 /var/lib/puppet
-	fi
-	fperms 0750 /etc/puppet
-	fowners :puppet /etc/puppet
-
-	if use emacs ; then
-		elisp-install ${PN} ext/emacs/puppet-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	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
-
-	if [ \
-		-f "${EPREFIX}/etc/puppet/puppetd.conf" -o \
-		-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \
-		-f "${EPREFIX}/etc/puppet/puppetca.conf" \
-	] ; then
-		elog
-		elog "Please remove deprecated config files."
-		elog "	/etc/puppet/puppetca.conf"
-		elog "	/etc/puppet/puppetd.conf"
-		elog "	/etc/puppet/puppetmasterd.conf"
-		elog
-	fi
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [ "$(get_major_version $v)" = "2" ]; then
-			elog
-			elog "If you're upgrading from 2.x then we strongly suggest you to read:"
-			elog "http://docs.puppetlabs.com/guides/upgrading.html"
-			elog
-		fi
-	done
-
-	use emacs && elisp-site-regen
-	use xemacs && xemacs-elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use xemacs && xemacs-elisp-site-regen
-}
diff --git a/app-admin/puppet/puppet-4.10.6.ebuild b/app-admin/puppet/puppet-4.10.6.ebuild
deleted file mode 100644
index 90ba147596df..000000000000
--- a/app-admin/puppet/puppet-4.10.6.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-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 ~x86"
-IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	>=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-4.10.6-r1.ebuild b/app-admin/puppet/puppet-4.10.9.ebuild
index 62e5e757fb54..1c317f21c78d 100644
--- a/app-admin/puppet/puppet-4.10.6-r1.ebuild
+++ b/app-admin/puppet/puppet-4.10.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 #RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -17,12 +17,14 @@ 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"
+KEYWORDS="~amd64 ~arm ~ppc64"
 IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
 RESTRICT="test"
 
 ruby_add_rdepend "
-	dev-ruby/hiera
+	>=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