gentoo resync : 02.11.2017

11 files changed, 107 insertions, 185 deletions

diff --git a/app-admin/augeas/Manifest b/app-admin/augeas/Manifest
index 5d0179960ae3..12dc5b31e395 100644
--- a/app-admin/augeas/Manifest
+++ b/app-admin/augeas/Manifest
@@ -1,7 +1,7 @@
 DIST augeas-1.8.1.tar.gz 2165325 SHA256 65cf75b5a573fee2a5c6c6e3c95cad05f0101e70d3f9db10d53f6cc5b11bc9f9 SHA512 80be6dc75e86e2a00c56cb668824ffbe54105b64fad64a2737d980c8ee5ba347a97ddd190a1c712bd07a768ed23a8d07b0eb676033b367632036a8e7f98c976b WHIRLPOOL 71955a1a42294021f69bb9715439b248f341d06b7c2d72a72537abe3f77c8e990453a12ee99ab3ba0c979ad6fd21ef5056c6e85dc8bc01a2e9c5405389030df0
 DIST augeas-1.9.0.tar.gz 2199534 SHA256 2b463d398cabc9b42747aa61d3e83ed6a93ce03d9074cf8e7a7bd3107a668343 SHA512 340aed78ac2df455770735b41f3c10a1cbe40f160e236a735d4580edf5b635afeaf7ddadc10e759e9197c4b233e98b3b6b94a3c2f072aa765c104d64371ce171 WHIRLPOOL 226262afff83c9e3421928b24d0ca067b9971f353d152a5de6fd74d8bdf30259acf63881fe761d4c538f36865c8dcd6679583c12649e2c4545374e30a226b568
 EBUILD augeas-1.8.1.ebuild 1000 SHA256 6a112f872b20c583f7cf1d7acd019f9918a057af2c4f937b69ce5d40506e399e SHA512 47871941fbcb08efce33560c5e8d857fef6e2dff1cdde7c31af6b205517af837840b83664fde9b6943b5ee3c3a367a7709c603b9409397cb79d7f879fedde1a0 WHIRLPOOL 95be95ed87eebccabb97abef577d88ab1fc0db4cb3e807b8bf8a7e8dc0fff80cc59a68c8150a4601060d36f6ced58adbd70cfb18ea552975e59ca30d05556993
-EBUILD augeas-1.9.0.ebuild 1007 SHA256 2c7fa7d3ef04a292e16b1338da985f3bbcb2bc77f1203a362994033769c6959b SHA512 2cbfcc1006e5330d61667fcc4c01f12b7220ff9602f0b3933fd291cc1f054950554631d1e86cbfd577101ad07672bd81aff9e074cab41e96379d9e60df53e2db WHIRLPOOL df9a3056ae5580b9a5100c8930966c53340f9b0f39c6f0ab6c3ec2e3f63b665529ae5458e73c0ad36d8882315624e41939f407b183a233577ff034cd854c6a60
+EBUILD augeas-1.9.0.ebuild 1005 SHA256 a1a22e4a2978428994b82b5182c7e0ec427235587a3f4b0cf547d81bf3eca446 SHA512 8283b10f74ea521f7241ecd2b6bf1cac084a337e7f411ff3b665ba429a018336cd71e3ef53e69308c4c371985417e6f16ddd201f9da2409030aa1d794d625622 WHIRLPOOL b377c52837020e5e6da931b786abb9f519cc817cc37abbbd84cad1a417309b7e76a90ff6f45bb34e0800fd97fa9fe8a86551b3676ee2ebe05ef82e451af258df
 MISC ChangeLog 5096 SHA256 a43458b42603d43012d5331d5e373c03b92a75c3b88b9177d1238bf283bf17e1 SHA512 bf7e92ebbb1d714c13995ff12020d08d990a359c2772269d39869dba387e98b37caa4802ea14a09540ac0166b0a5d43dcef83961bfd74f2e2dcbdc1332995340 WHIRLPOOL a724244353b9c7cbb239cdb9e18c04fcbfa27e0c40990c3ee58c21389b8ecb7c3ac960ab2ed8861da2902be95d6cb1b062f0a2ee02ebdbba58dc87b9bbd9af75
 MISC ChangeLog-2015 7867 SHA256 2179c62fc1afc98a4902b960d3b945c6107fb5c7c12588bf81063d81f9d386cd SHA512 1467fb11d900332b57f356b58c470f7fcba3ff8b17a16b744cdef519922c561099a2c5c4e7c0dd0763c2333e548c8fb8428eec644944c241a639055788d35daa WHIRLPOOL bf03260b28195b879bafe06f584f824c24b9c353f9544baeb559f9f30dd20212ded555245b03e4ef16088bb7f249ee23485f4829920a37ace2d54d0e3ca04c6c
 MISC metadata.xml 693 SHA256 555de5a52dca8c4c99b3d03a5d62bf4c266e38a1ab1bb83d12efc105660a5f9a SHA512 1fcdcea259ed6cb652d08e763ccc67bee7bd5da9a7d3600dd492beaec7300868a47a7afdd71950ca8631886042428fce36cc17602a0776a9fa489f0fa2d27436 WHIRLPOOL d9cd4eb749649994fabba2e927139fa3d7a64cd515082996bcd0e2baf59d4dd6ceb1224c8f2424ad72f5da72cb6fec6e4f6ae62e6f2b2b15a4e4dbfa4fff7142
diff --git a/app-admin/augeas/augeas-1.9.0.ebuild b/app-admin/augeas/augeas-1.9.0.ebuild
index 1caae80ecb1a..fb4630713038 100644
--- a/app-admin/augeas/augeas-1.9.0.ebuild
+++ b/app-admin/augeas/augeas-1.9.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.augeas.net/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="static-libs test"
 
 RDEPEND="
diff --git a/app-admin/mcollective/Manifest b/app-admin/mcollective/Manifest
index 51569026f3ad..3205809761b1 100644
--- a/app-admin/mcollective/Manifest
+++ b/app-admin/mcollective/Manifest
@@ -1,8 +1,10 @@
 AUX mcollectived.initd 497 SHA256 97de82c744874ad18356eb34b4b9ac411c8fdaa5b54482a68a68939df40aee2c SHA512 dc77a522e3ab6af3e23c559bfcb385033f2200b58b50db59000e7f56b2a789e8fbd83340f8ee494a1a9fdbdd1bd737a2b17ae4743823794264723fdc931ea6b0 WHIRLPOOL 1900da65b5d6f47fe98de411bd60dd88fc4ace9fffad48c38df2797ebe93dc350d38fa8563d2373c803dce5fab89ee55a2c9fe7128e6431c7d6458275641861b
 DIST mcollective-2.11.2.tar.gz 1516590 SHA256 aa3664d5ba2d4d20e448c374c315c91d55b5bb43918a04092747a4052bc3f969 SHA512 1dc393fa1a09c5151b64b84086ef9af934feeebd2700a00cc4c84696fa2a25d90a410a373b553198f5fda6e1e36808ffb8dc38edcb15bb9e4253998aa7504439 WHIRLPOOL f808d4f9ffbf733842dd29f8e0548b90a4705f8b502dcc62509380b013d69de786204025490d4fb67d657e5c6597fb0d3ffdac2724e8dbca6347511ef50be54a
 DIST mcollective-2.11.3.tar.gz 1516665 SHA256 b9080779fa56c2b77a3f37404b3ac933183e0b0940e6086b0060be2c44aa38d3 SHA512 f5e26dff03f7a671db5de12acba1ce726c8d57fb99831ddbb258da5ba297ade31ea991840fa63cb1ba261281f7f6167a8492c8764a13cc332202ccb9c88d79b8 WHIRLPOOL 69e384489c8138aecc0c404dc9a08e5d92e09deab05a43ab4781b77506f4fe6f3bbd1a9ec9399a59e8a7c89d3462d3062d73a50fae490215628826c2794bd9ff
+DIST mcollective-2.11.4.tar.gz 1517194 SHA256 2bf8425a50023744e28f26efd64931d6383b216e9918e1df49276bc5477e4493 SHA512 56af0a8b64ff75351f3448396f8a7cbba603869cdbfa7a97dde5a820e2e287c84e410a77469a3ce01f398858f5c6570c9e3542e372eaa00e3f54e68e3c1ce63b WHIRLPOOL 4e6bed8bbfbd9bf08c3380891321dd2fb673ffd4408acdd0e63c14ca3896d07014f6b034814f98ba89b52818522d49f4ad95d114cb940966ae13409f16ce9365
 EBUILD mcollective-2.11.2.ebuild 1641 SHA256 324bc04c36bbdcfa98b84a6f61c9182ee41559448e1621a8271cc0e593fdd1db SHA512 a699fb934af4b660c55ffb0d216e29d3b995601c1187e166e878fdbafd46ea7cea4e4951a1052139d115f00de1a38c990495715047f2c0ac13926b2fb613a25a WHIRLPOOL 8b10bedb9bd77b74c73bb80238496c36c1bfab0160dd7aaf589f8916be53a01551e9717c6f8ab1deea4ffdcd88f5caa166e523cc35fbb16037cc3d8f874292e1
 EBUILD mcollective-2.11.3.ebuild 1641 SHA256 324bc04c36bbdcfa98b84a6f61c9182ee41559448e1621a8271cc0e593fdd1db SHA512 a699fb934af4b660c55ffb0d216e29d3b995601c1187e166e878fdbafd46ea7cea4e4951a1052139d115f00de1a38c990495715047f2c0ac13926b2fb613a25a WHIRLPOOL 8b10bedb9bd77b74c73bb80238496c36c1bfab0160dd7aaf589f8916be53a01551e9717c6f8ab1deea4ffdcd88f5caa166e523cc35fbb16037cc3d8f874292e1
+EBUILD mcollective-2.11.4.ebuild 1643 SHA256 d962c900fda8a21403f3ae1b4e9bf1281ff5b73e9e57ae31c2031a37942790b8 SHA512 1b57aebd8141f77295a4fbae23c5a25889373e41752f4eefeeb96a856f0c7b78390687eb38bce1d901e5a348f3e55ed6af4dc648d89a19e0168a1de8f30b55ec WHIRLPOOL 02ece74395a5259517209d333c3a7e32213113f74a5e1f364dc5c404c9ab762eb90a6cdebc8f23c56b358e9a17ca30c82d8e0aef0f18dfc7e96991133a70b868
 MISC ChangeLog 3721 SHA256 312164363f75e97271f70aaec2869307d5d636513297acc7d943f8d3d680adc0 SHA512 01765da77e3c2806cd60d4802a2e57971a627aaec2525363391ba723366382a31a47bc7d6f7c108f2609926ff08a173b36bca5dfd99e6d8e29af84f8cfbccee8 WHIRLPOOL 0a56b19ee5d3558597907e7eea53a1900e694f969875c5514d1a43dcdfcb8be746be7e11c8edc9e3d1b2c42612022094197339b0c6fe860e93c0cc3b8becf1f6
 MISC ChangeLog-2015 4747 SHA256 1555e32b0cce5896f5aa1dc96dbfab9ee18005ca9861412adc257970943236c5 SHA512 588921e55eae4d4e2c5af0bdc1f5dcc1c5fdc75e1afa00505e71dac184015213f613151d82012c781e0206553e8ed24641daf569b3a31280efb3420ea1ad0607 WHIRLPOOL 7ffc8e316e46570275c026a87bc20a53c0e05819d5bb491b6072dc159593806b4bbdef069c48c3ad004cc266f110edf3a5318105961e4955c6ff36979c49b922
 MISC metadata.xml 534 SHA256 a49b8acc987ea0c9e2a42cfc4191bb1b0788d6b344d76483951eadc1fbd3b0c0 SHA512 e94dd85f11b4f8b838e928220cb887eeb70860e6d04f03e904ddd4332baddd3b01221305e7229fb575585235436d0d942c116f821ef37adae636a7d5c6193199 WHIRLPOOL 1b04bb250ec256dd971405639ae14f047ec37862fb56b6eb42c4fd98dc0fdd521ea9342a48139d35d4757a1b8b3592ab80180f55ed4bdb26191df7ca2541a8fd
diff --git a/app-admin/mcollective/mcollective-2.11.4.ebuild b/app-admin/mcollective/mcollective-2.11.4.ebuild
new file mode 100644
index 000000000000..795e37902641
--- /dev/null
+++ b/app-admin/mcollective/mcollective-2.11.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby21 ruby22 ruby23"
+
+inherit ruby-ng
+
+DESCRIPTION="Framework to build server orchestration or parallel job execution
+systems"
+HOMEPAGE="https://docs.puppet.com/mcollective/"
+SRC_URI="https://github.com/puppetlabs/marionette-collective/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/all/marionette-collective-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +client"
+
+DEPEND=""
+RDEPEND="dev-ruby/stomp"
+
+src_compile() {
+	einfo "nothing to compile"
+}
+
+each_ruby_install() {
+	cd "marionette-collective-${PV}"
+	doruby -r lib/*
+	insinto /usr/share/mcollective
+	use client && dosbin bin/mco
+	dosbin bin/mcollectived
+	if use doc ; then
+		dohtml -r doc/*
+		insinto /usr/share/doc/${P}/ext
+		doins -r ext/*
+	fi
+	newinitd "${FILESDIR}"/mcollectived.initd mcollectived
+	insinto /etc/mcollective
+	cd etc
+	for cfg in *.dist ; do
+		newins "${cfg}" "${cfg%%.dist}"
+		sed -i -e "s:^libdir.*:libdir = /usr/share/mcollective/plugins:" \
+			"${D}"/etc/mcollective/${cfg%%.dist} || die "sed failed"
+	done
+	insinto /etc/mcollective/plugin.d
+}
+
+pkg_postinst() {
+	einfo "Mcollective requires a stomp server installed and functioning before"
+	einfo "you can use it. The recommended server to use is ActiveMQ [1] but"
+	einfo "any other stomp compatible server should work."
+	einfo
+	einfo "It is recommended you read the \'getting started\' guide [2] if this"
+	einfo "is a new installation"
+	einfo
+	einfo "[1] https://activemq.apache.org/"
+	einfo "[2] https://code.google.com/p/mcollective/wiki/GettingStarted"
+}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index dd9b86ebd180..61ba4ca15299 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -14,14 +14,12 @@ DIST puppet-3.8.7.tar.gz 2650247 SHA256 50460a3dd8d25118e25eb01178d09743dabc01cd
 DIST puppet-4.10.1.tar.gz 2954351 SHA256 271738d2b5aaec8faafd543076ac0d9012fcd6051bccd2f70a66cd479362c605 SHA512 d232f062b93485f7eea8abb9c5420462e313e6050e7335159f051f7c7af86338c006ae4edc09e0e1370784ee7b076911ca563a4cfc6a1f2afc7179bed08d2032 WHIRLPOOL 1a5b8c3fc87fdb4e23196cc13ad46c963cdb6314cfc0e4d3a6d44adad4545289cf41886c6150ee14fcd0d30d9b29f32987c6e31a7c39077a2c53aac7147c69dd
 DIST puppet-4.10.6.tar.gz 2977099 SHA256 19250a3659339961953d48d71aa5951d52bcee3bac0a1e2f45042aa82fcf358a SHA512 f983005d161bbd5fb81dfd15a32cb0ae2417557bd4faa1a62d2fb10fffa55c91ea29c1577785af9642a2878c78405ab99c7e6ee4268fcedcc107c07a0a5bfdd1 WHIRLPOOL 4619f7e89a02560f2c6bd1194b1f50699348fcddf5889628884c807deb0afd9b530883d280db20086a787052d2456ef61b2eef84854e95724562f1a0225b2640
 DIST puppet-4.10.8.tar.gz 2979824 SHA256 2a11f9230f2b681173107fcfe6574dc38d8061c7d369fa88525dfb652fb7f198 SHA512 9f3384702dd4938e1e00aeceb0745b760de32000e0dd59d5b846d1120a46026499176a51d0409e3a0ae414efc0872854c204d1941385695a4c57c209fbd1f28d WHIRLPOOL 06ed0f915786e6d0c5698a8bebfb68628d96b236b667ec44c994c043949cb4a47c8d42b2fbe8391178f38862fe816237d28501b4e39a6326d74ef2d62eb438eb
-DIST puppet-4.8.1.tar.gz 2873371 SHA256 8b3ee6b60639e2a2839ad7403fab8f8ecc390a93e6e47b03f1b053aa262bcf17 SHA512 9ecde04c68874652b501e779764bb3227d226564e80f06c2c15bd982620529ec55f8e11911bcf68db994ee98287746761752538aa5aeee474ddf37f21976e2d1 WHIRLPOOL d3a4b0b4b15dceb75cb3f161b73843af53f5d21121ba1fb06fdae422ec458f62f5fa47d0f5c7bfb96e3e9b04eb62c4c1e1a97f7131101e4f6f4ff952127c0685
 DIST puppet-5.1.0.tar.gz 2734018 SHA256 ceb8059704d2e79c1f9147716b596261e1c6c38da3313a2283def777ecf9193c SHA512 07019f40c5b7f18243f13abb899c2ff2ea4b135895ab98c13da3df50f8e720e2759f8eb39e349ff04286da7de504cffea3df8acf9711e8591b25001a2a3f9c15 WHIRLPOOL a5e4e44c68a503307b01729546121a03a0271bc68f8db139e7d52981f9ce9f6db4e24b18a252633794e7de1c7aceb6d833c817a291099081b31190060bb59d50
 EBUILD puppet-3.8.7-r1.ebuild 5301 SHA256 62c457fdbe347a1237427fbcca093e205e8aa5f0a0a82d848015efce50bde0ae SHA512 f098685cae0f9e2a77da1e8b82fb2d1c28fa0d28214449e628ac1f3a02b4c07c53eedd000b4ac94154d8ecb2e899fac61d0660fad6cc780f5944349a513f84ba WHIRLPOOL d1b96ec8d9c38baefe15a5b77fa6f18ee0dfd40a030425050bcca09bad8bb9316a4c3815a8c027eae1c4c1a51755a88b67cbbd0351a4ef228e7cf6b539803b0e
-EBUILD puppet-4.10.1.ebuild 4911 SHA256 5027b773b1f78cd11cee723f431c9254d3bcf5a28da47e6866daa6b491355fa9 SHA512 5ea1902e13577a934344565db53ad42face48b08def199f32c2fbb38b2747f7f7e1b52882bce5289894e462431fe39f75c7f63f0271878e732cd2263e52b8eaa WHIRLPOOL f178c02748737602a6f277a29d54a1808f63b0c5cd3aee0c9dc39b2a0dec1c30a5b6093cce9b8cf7a13c52b10f8f1c7c38edb908ac575c0a6587fa86cbda20d2
+EBUILD puppet-4.10.1.ebuild 4910 SHA256 241f0c08173142728990233133226beb34fc8604ef950f93700b9e11947a89c7 SHA512 8ca0293dca3b31c6883da7965aa884030fdef7b2e2d8feaa8d5511f697def3819d90243ec0fb136feb30fab35a013b91dc5e6a3ee969ef00312ad24f00c2ab8a WHIRLPOOL 7ab3c198ccab35623991a7998bd421a37b8ec1af653131ed79a3e6728db0b358dc43e0dba31f916aeedff4222ecc3557d6ceabec843bb8f9b87db3d571a883c4
 EBUILD puppet-4.10.6-r1.ebuild 5573 SHA256 49daf4ffbc0311cb92b30b10219da4b421eb4d3d67958394d5078c3b0e22ddc9 SHA512 3ca9a12e808f70aef8b02975804012a7fbe96484b12ccb0a871a3f79686d71f24eda5342d41ce555aa65a827c645631f3f0e9f943b1ce93d6fe4c60eb910dd84 WHIRLPOOL 01521b31871c76e5de3dffc5bb91fb22a9392977976971e69219ea052499aafb7893988e40e746c12c95025306ce2b10e76d1531fd9f1ef93d750c9e209f8fd3
 EBUILD puppet-4.10.6.ebuild 5529 SHA256 f9a004fbb4a13514101692d29cbf23e96d05c91cd5b77bf47ce68f9c0ea58fff SHA512 1c0728ea0ea361c1c551629349ad36e3191a1279400130e4a5fa067a2b9e9022c0537056e78425c9f49abba905972d5607265e7516c302e4c09360a9f344fa74 WHIRLPOOL b55127045d5778b3daf4fc4bc7b82d57a5668bd382d6b3fd0fa73b1a9320fb60c50acdd096aa371521383cb17259c42b5518c95fc448ea438be6ccd2b44d4474
 EBUILD puppet-4.10.8.ebuild 5566 SHA256 d4810b6e8b5a23d4de3290943ff28ed2c76d7585d566529a0ffb0083970ced2b SHA512 ecbad4f16a4789ee47039279fd5a7247f2600d50e80c8a69b2a1c6c1b8988db7e819ae01eb92660029a08b1f442054a41c53666b10ab084c857bfcc3b230d528 WHIRLPOOL eadcc24108873db026d1294a3b9b293eed5bc0ef609a083bc83f8cb38f3dc0e013e90f08a7cd478c660e32f31299fe37bc123cdd7f1daef61d55f9d1cb052dc9
-EBUILD puppet-4.8.1.ebuild 4732 SHA256 4ee2c0ea64544ba7993687e6405f716f51b6f486bb10f23d4bdad763f968b0a1 SHA512 7dcfecdb30c78d673de700786036b0328588d93175ed419e4b84a5a57f4c76b9c09e59f85c3e14bb24c5a0883b5885b4fb9f6878e604a5a939b0c33ecd398f14 WHIRLPOOL b4811641f59d9663fef5c72f07e4a220608fff5a5c60ab3a594d992b2707795d7975088e260c8a5fcacb1c7381708de8cc19e036bb1ace78b9bf1e9429df5ff2
 EBUILD puppet-5.1.0-r1.ebuild 3818 SHA256 6b8f56ce122a09f24f1752fd18d21d67dbbdc0e2b065a240e42838dec5da153c SHA512 cd1fc1ad13ab691c76bbc814285316fb14867ba606dad3e8900f314470e6bce143c77f920a468f7787a6b48e52352aa12884b84ad952ca0c29d67f954157dad1 WHIRLPOOL 5b41c22e086ca783dc3a33bbe3d20664f808508ebf960847dc0616067e948341b91735867624b7c6eed16364a8c60104d279e7dc364d820007609ab8a7b9d780
 EBUILD puppet-5.1.0.ebuild 3865 SHA256 87a9da9798d6ce26a1135e14b287922d8658852a357f1a56c4ad235094db377c SHA512 6a62c22b405fe4b5ef9df3d8878a8ef401e97e4f62d00a681d95c16502805b8e505be0beb9362c7dff361f722de6bcf322fbcde5d45bef5fe4b0f23212bb99ec WHIRLPOOL 4744be2477265de9abda387530b4b28ec49b47a606019f634cb0465a96d35630936c1472e9ad5468fb7b5220415f02a71701e7a135e340cca6a119e43fc2ad39
 MISC ChangeLog 7719 SHA256 ebfd68981bbfd64b0ff92511b97749e56ab20d4663b4190a4ce89fc458a3a40b SHA512 98f3a66da3959b16036bf32851f8881d1928092c5ce64c02819dd9bf8578a2eb142e8f2ced5a85aa6d5b5cf1f15842e8ac9d6b9a851b2efdcab59eca9f2df1bd WHIRLPOOL 6fb9b83691125722682f433be9c49a75d7ee4e9eccc26ab6d273a379508f830b3ba7bf67a87924b4c0722590003f20530e2d9ddb1d29f2d5a0458d070672cef3
diff --git a/app-admin/puppet/puppet-4.10.1.ebuild b/app-admin/puppet/puppet-4.10.1.ebuild
index 77b1ce4bfcd7..0b1f70e67d94 100644
--- a/app-admin/puppet/puppet-4.10.1.ebuild
+++ b/app-admin/puppet/puppet-4.10.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
+KEYWORDS="amd64 hppa ~ppc x86"
 IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
 RESTRICT="test"
 
diff --git a/app-admin/puppet/puppet-4.8.1.ebuild b/app-admin/puppet/puppet-4.8.1.ebuild
deleted file mode 100644
index e2846fe6aefd..000000000000
--- a/app-admin/puppet/puppet-4.8.1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-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 ~x86"
-IUSE="augeas diff doc emacs 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
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#		dev-ruby/rspec-collection_matchers
-
-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() {
-	# 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"
-
-	# 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 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
-#	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 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
-
-	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 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/sshguard/Manifest b/app-admin/sshguard/Manifest
index b539e366f382..93f08632dcfe 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -3,9 +3,11 @@ AUX sshguard.initd 572 SHA256 759ef54c0f54a27023020ff8da7811b38459a194d7d75d15ea
 DIST sshguard-1.7.1.tar.gz 832220 SHA256 2e527589c9b33219222d827dff63974229d044de945729aa47271c4a29aaa195 SHA512 205f45f0f1260ebf2a1efabe5b4391b23c219f37df096383d87c220e7392cf58827a4e509be65287bac5b2af49fa0fc390775e1472cff4fb28f2323821f00fd1 WHIRLPOOL 2810c8c77d623dd21baace30bcd4c20efe1f7544e0db3a8abe84ca823e4cc391ecde072d56e63e10c2a490d1417e18fcd9cae16692ac72fffbf216a23036798e
 DIST sshguard-2.0.0.tar.gz 886995 SHA256 e87c6c4a6dddf06f440ea76464eb6197869c0293f0a60ffa51f8a6a0d7b0cb06 SHA512 c9f7ef4b8d4b1ecbcee33b95e013c51f37b4a05226c6cd1f3c85006c83a32cf555644069d529a7317dcf6616f86a399d7338a5a414238de05bd41dc3005488e4 WHIRLPOOL 9ee1dc00c8f5571b3f36575e793a263dd70fa61f23c52bb446df5ffcddae981adbf7eb3c9dd6ad3894c1e434293297ab4894537a697df6282678ff5ebb5c3af9
 DIST sshguard-2.0.99.tar.gz 1110725 SHA256 189b99b582ac70e2130402493b205b3608893301b49cedec84aa36c80ae2a308 SHA512 776a241b7af9a4afb048c99791202c0bf0f5130e265116a0f049853f8eb3d108e056c75f9dc009cf93a0dffe8d34b18b6fddc63febd54cc35bb6e71d6d2e77bb WHIRLPOOL 7905324d09974790412d16f3da775fb03f76cb0e4802268e78fd09e59c1586c290a3b70b820b833ebb9f7f9e0184bd1c91784d38036c36a65f5796f998529ba9
+DIST sshguard-2.1.0.tar.gz 1117466 SHA256 21252a4834ad8408df384ee4ddf468624aa9de9cead5afde1c77380a48cf028a SHA512 0a75e9d1a8c9c010c767a49e96e88db4a92aae8d428deebcff1ce8befa36b77cb1937f2fcb2a4e2a3e86d47896a8405265eb30ee7a603fc18a3ee117d646b119 WHIRLPOOL 35b44288ae78740b8c3f52ae1851ca0058bc9b3f33de61b7cb06690b970b60ce61d009b38fb91a543a12e0dbf3526ab7e448722d0446ebd51a2af2abf02aedb0
 EBUILD sshguard-1.7.1.ebuild 1226 SHA256 ceb2f79d92f976569c597fa0be6afd77e23d2403d30abf0c5f23e723c624e5fb SHA512 c0e4e5219c2e95e07d83cdb8b2d9fc9efdc666b74eca4de0adea96fe50539da23d5e143d81dfc2c71e738fd5ba182309c0b51530bafe19b6ee6fc2c96d063973 WHIRLPOOL c1308912e922af560269eeded9c6b267a3cb7e5788b0254060b0ac120afa0d500f036994728368fbfd0ee0b0efad122a58a6aad819ef9f6191603c126cd449ee
 EBUILD sshguard-2.0.0.ebuild 891 SHA256 2e34ac923f39347d82ee0b280d8bf60ead891ed38bc4bd14e1244a094fed7f16 SHA512 9fe8e23d3ff513956d40835a93e97f008ffdecd989a4602bf2069505bda63df62fd854756e90a1ab04536943a5832416ad74e6dcea765be2780a910f04b42965 WHIRLPOOL 61fcebccc60c97fed4f6a57642895227bae7cd9a247870c6481c2791acbd156393121907801ee9467044ccef2a4e33616269870315115493c9dc730db3834923
 EBUILD sshguard-2.0.99.ebuild 710 SHA256 113d4ea05bb7ae32cf23826be1524f1e7d6779d503e83c2c5480bdc6b879400c SHA512 c378de845ef6b78eac17757bea66c67ea73d244abaacb8674a52e1c6297761cc7b65d2b35ba92e5f8ac5faa5c24e07b7f4c2be9f009a172546501bb05f88a268 WHIRLPOOL 32eb71ce76377241aa736b7ea0dda8fe76e13c9dee8456c9450326cc3327b32fbe293a6ec2f589cca3a33eb71b09fda53a23dbd72c7050cf7e68020d735cca96
+EBUILD sshguard-2.1.0.ebuild 710 SHA256 113d4ea05bb7ae32cf23826be1524f1e7d6779d503e83c2c5480bdc6b879400c SHA512 c378de845ef6b78eac17757bea66c67ea73d244abaacb8674a52e1c6297761cc7b65d2b35ba92e5f8ac5faa5c24e07b7f4c2be9f009a172546501bb05f88a268 WHIRLPOOL 32eb71ce76377241aa736b7ea0dda8fe76e13c9dee8456c9450326cc3327b32fbe293a6ec2f589cca3a33eb71b09fda53a23dbd72c7050cf7e68020d735cca96
 MISC ChangeLog 4254 SHA256 eaa6f2711106460318d556aef3f7f0e62dc82f10177d193f60f3a400e4ba94ca SHA512 ef97796e890fab12c8b03707a42d76759457dd1350ecbd772f40e66f39f5b1a643958fa20c8c0c2324b630ecd6ebb3ef890aad477a0457b77fd6e29172a1b296 WHIRLPOOL 109df28dadc52bdbf8d5d3d6fbbee7a0c5e34b936331a0a22284f7367ba063bb6705d65044413e40a8b87ca3568e96f73484376372d5713cabd62c928dcb6ea8
 MISC ChangeLog-2015 3411 SHA256 0b12c834f0a95041a023e9e36432da480f9ca49dd19d105865cc8d02517ed16a SHA512 5bd3f8a5f63a0dc036f5320243bb07d96953bc03d9a2ff51820778a817612f2ab9e07e59db9f2e76d68db5cdce39dfa93cb90955db18caa06a9d96407b914edd WHIRLPOOL 19d9a00d8dcfc869cf49618f20b1debb59c3cd967cbb1b8591749f5d97669084589d8af2a68a2302e7abcea8ae85526785e4ce5e0de843fa098437d7ae212de1
 MISC metadata.xml 467 SHA256 b423370fb24f542610016f009bfab7cbd668b4211c9fb0e88e4c14302f4c9993 SHA512 3d936c9b01370bdee03cf23d2ff8632eabc3352054b1b7797baa6e8f1496adc35e79ae286a63bc9a9d6ae5f1e920300f417c08f637ad78e0c40711f2e51dc7b9 WHIRLPOOL 138db6422139317a253113f2cce164cfe6d91c330ed0f6963ddd5b620fdd5b0941454276e511f9f2c8f49c1d50ec6904b15db43a67bbdcbd3a185822888780cb
diff --git a/app-admin/sshguard/sshguard-2.1.0.ebuild b/app-admin/sshguard/sshguard-2.1.0.ebuild
new file mode 100644
index 000000000000..1e45c36ba086
--- /dev/null
+++ b/app-admin/sshguard/sshguard-2.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="protects hosts from brute force attacks against ssh"
+HOMEPAGE="http://sshguard.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+
+DEPEND="
+	sys-devel/flex
+"
+RDEPEND="
+	virtual/logger
+"
+DOCS=(
+	CHANGELOG.rst
+	CONTRIBUTING.rst
+	README.rst
+	examples/net.sshguard.plist
+	examples/sshguard.service
+	examples/whitelistfile.example
+)
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	insinto /etc
+	newins examples/sshguard.conf.sample sshguard.conf
+}
diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index 20479d48da93..4bcd75bfc274 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -10,7 +10,7 @@ AUX sysklogd.logrotate 402 SHA256 2e864ce0e5a2ca2c7964f7dff0fe1a76a5dcb90d237c0d
 AUX sysklogd.rc7 1447 SHA256 704c5a7eb81023a8de4f5e0b2aee7f6701ffec2e5a49f62093e68c60864adb47 SHA512 f3c8f00fbf65833735d57927fe25c6299103bbc0b8fa548103b4f2f06f0dc2aa2276f12326ff7477f4ba491a96ccd30fe01cc53e841b0ccee83c4dacabb5a94e WHIRLPOOL b9a481d43e57288e08d3aa0bce58efb7dd4418759d15ed24aff6246da340736ff95dfe9392abbd235231d4dc7536c14098d6284e831394f09ff8a48022e6bdaf
 DIST sysklogd-1.5.1.tar.gz 90011 SHA256 5166c185ae23c92e8b9feee66a6e3d0bc944bf673112f53e3ecf62e08ce7c201 SHA512 a72196a1a172d25be1c4791ef6256fe71fa2ba8c1383d230e646e93f8a65c3a57c535189726325da4c792fdb2e9cb119bba43c878816a8e78e78189fd32b12b7 WHIRLPOOL a9be298553e89d1b61f3ac4d5cfc6bd5662ab84d9120adfcdd6b8aaf5fe4d54d9e34ac19dab5c1738578af302597e424e95fc68345a1855e3be2760b093037ea
 DIST sysklogd_1.5-6.diff.gz 25677 SHA256 1c5366865bd058530071a6071c317ab3562f33f4b0f3a934878cb97059fde20a SHA512 816961a835a43057569f62fd20d9f7b5e0bfcfcb173b68947457708504db3ce47e635956c8a9564f9bd577d8f3c49dfc725d321dfd3370b2de918363c30f838e WHIRLPOOL 0c330ed79b5a688ddec0a80e6333c181cfa297350ec9559166e5828d715a305b5b52eee5f7cc95f7b4ebccf03f21de594d428fa2b2ef117bd0a1630684c71364
-EBUILD sysklogd-1.5.1-r1.ebuild 1712 SHA256 e74362cbac8a71c7314362da8b11c5b74ff53493ce1060fe861114a7c636d503 SHA512 55596c949870980f4138387d382b51aefc37d53c03e61e75c50424bbd1049c0098dd26f039038252b2fb794f96ac1646da2054763d0965dc66c30064479b06ef WHIRLPOOL 47fff401109a4d1c1355fba66cad2aec19d4a30f3f11b6fb39c3ff4476f9bb5212d11f84f6626de785776fa4a0a3e6769b7f331280744e736208fe423b634097
+EBUILD sysklogd-1.5.1-r1.ebuild 1711 SHA256 685ec783b516cc32d68567687af8cb3eb79312beb86a5b661bc9a6f25a42eee2 SHA512 ca3d1e099db4e4bc4c66fadd899469eee3090420e7cdb52a0b42bc7ea81864be016ec28550b1f80c6bd09a56a7ed80146fdb199292a0b955a9897e9d0584228b WHIRLPOOL f4e6e4c6ca5d9d84f6aa033c292c3fa92d3c19456845a02f371059df492d8ef5e6fb7208d78b115f8261136c025ad900e3f2bfad9b8398f1c7359d0d3d81b226
 EBUILD sysklogd-1.5.1.ebuild 1640 SHA256 9a6b736f61db6b68bee7e91ce87a89ec5926553b4e5561f7de32c8e381e94fcd SHA512 7608dbe2f695a63775e89022088cb4f191f3100475f90c6d5194568661b7b9171c16ff6499a8b7344de7da4499127c41c442261ba5955e60f39468b6e4452248 WHIRLPOOL 6b7cd1b21fade85a28edb637eb9f5792ba992925d73b39bbd291a3a6988993b84ef24794fb35ee3911c6373fa098b6e3c60cddb63176646a1ff9655a842d8aa2
 MISC ChangeLog 3315 SHA256 4441e6ba58fddb02cd7f9822fc9358815aa787e77128cad32da43bd4cd41e350 SHA512 43cb2daa243d6b1df40b72fe86d1828aebc1ec4173335a50a08291dfbbd9dc7189aea26b9a7c7c7dd53741965dbb8acb93b4863bce696346866c00a85a0d49eb WHIRLPOOL d232d2a8d1a22ccfb315e5bcf06a122797a01655ab9cf5889a848cea90243466a52cbdaffbd3decc17d67c9c4022f87843aa8ffff91f4311e328ee5aee0b548b
 MISC ChangeLog-2015 15635 SHA256 cfccc77a19c2729be872db0550b7e0f67c97a659803f2c82edf724c4622a9dd8 SHA512 51b47993682d6e95eccb280d1287f434c0571b92d81bfb12fa27bac13fd44d5736b3c895725ab7787b1a1701bd4ceb373e7a85483518c5f365c2910309694d73 WHIRLPOOL efd9b53f4b75b728f913efbf91e8921618bf85cb59c0bf7eb0db726fc4645740c75b30e89305aa090efabd74109fd1aa69fc1688f21d1b3b3efad7e7cd02c108
diff --git a/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild b/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild
index 84b9d1750410..3f971c2babb9 100644
--- a/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild
+++ b/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.infodrom.org/projects/sysklogd/download/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="logrotate"
 RESTRICT="test"