gentoo resync : 15.11.2017

18 files changed, 628 insertions, 119 deletions

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index ec8b9390cf13..ed1f3bafbed2 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,7 +1,5 @@
 AUX calamares-pkexec 43 SHA256 1a9c278c085bcb7cb3b1027bf6ad19d153492667730afd2b94c8736387355168 SHA512 768148cd58cdfb5c6791b76ec60c21a4ca852120f53ed31a83bc7a2e0a26aa77b10bd3756182d3dff03208e820def4b83c45edba0484fa2f5a33c93880c3f4bb WHIRLPOOL bda196e8adb3b9207e9f98677dff5a4664504c114ab72bd0879d8518b74b95b558a2c90bcc612dd6f570b04c9f21fd5b46a51d55dd0f73b4fa288b3482d61f4d
-DIST calamares-3.1.6.tar.gz 2266993 SHA256 d18d50aca6dc8b8d4d4933b507fdaabeb607adc9c9c14646f1031c005aeaaf98 SHA512 d6e7fa5a040e507141bbd6b3863f5743b9646e503cfec26ed710718835a782b0acf582f24959eb52d906eeca60061d39e01b4a542c3d83535efa17eb4a5b0b85 WHIRLPOOL 3fc71da001282cbe7c670b192335ddac460f3fb053849a51d95d9113b6c31a27ff65ce64811ca26c456ec01911ce8685d73c793183e71bc696cd896f9bf38507
 DIST calamares-3.1.7.tar.gz 2275893 SHA256 91ffee72df1d222c50db81c3f48d44e617019db95d1f58ab16a962b1fb47d749 SHA512 eaf516db4d97b89a5854c5dac5fd556a2deb47bebb88e7c55e2bb7d4ce050e913afbf08c6536503f5c3af7427a43b75f67bfa317e1601bb5a6f05f17c5bf6760 WHIRLPOOL 71e248e3dd8a9e05b5a0d25807607c3d026ba896835edd559ce716c9edf5ae8b840570ae453772558cd05757d99acc09c90f23423045f1754cd56b8693b99a4d
-EBUILD calamares-3.1.6.ebuild 1974 SHA256 e085c918ef2eabc105c18edd8ccc071e76b71a48f384a969cb185def6ccbc754 SHA512 e6b308f8fe540fc520d4f071e6276e924dfbff7c0176a3b27bd0ca9ebf400ffdcbf54483cbcdcc2eaca11bf72463ceb80505262f5dfa06c4c02f519d645c8b38 WHIRLPOOL c7a51d470b9c62172866746df925699bdc96323f07a2e85d291d5eeb37d36f7b253e8dde2aeebb1d676efde79c71467731507f7198a10b82323637fc0b768d5f
 EBUILD calamares-3.1.7.ebuild 1974 SHA256 e085c918ef2eabc105c18edd8ccc071e76b71a48f384a969cb185def6ccbc754 SHA512 e6b308f8fe540fc520d4f071e6276e924dfbff7c0176a3b27bd0ca9ebf400ffdcbf54483cbcdcc2eaca11bf72463ceb80505262f5dfa06c4c02f519d645c8b38 WHIRLPOOL c7a51d470b9c62172866746df925699bdc96323f07a2e85d291d5eeb37d36f7b253e8dde2aeebb1d676efde79c71467731507f7198a10b82323637fc0b768d5f
 MISC ChangeLog 7327 SHA256 06876264cef6e8962030c803f3add9300544f649cd1b76266580629be569e897 SHA512 66c97585da7e7083117bd87828614f7f003e87ef90fd5f232153b7de58bb44573dacb648ebd697b92765ac081b84667601c636c3d33b33c5293a8e5887e5a5b7 WHIRLPOOL 6a131253a3cd20cd043be6c32be5acd737c7e74760efca0237a06f514e9a58c92e18703fd20ad47ccf5d8b5137eea7cdf1f05b72087f7ff485114ee2e57c7182
 MISC ChangeLog-2015 671 SHA256 0e30b76881788f8c37df34e842750d456934309aa7e72026870766986f94f978 SHA512 707ea2c09d816d98ffce58fe26b62d85cfdabe4b8967208fc4e870cc12162381a335646be30a9bdfb16f17a90f359f3168dd9bf0d85513368f8707de06a935d2 WHIRLPOOL ccef8a153f1546f1ffc2f5a4433f87703715e86555445add9d75542550ecf62b9074117977fc3761c85b5205bbef3b168a8032069826b4335d756694fdd26faa
diff --git a/app-admin/calamares/calamares-3.1.6.ebuild b/app-admin/calamares/calamares-3.1.6.ebuild
deleted file mode 100644
index 780fcfe4fd0f..000000000000
--- a/app-admin/calamares/calamares-3.1.6.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io"
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager pythonqt +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	>=dev-cpp/yaml-cpp-0.5.1
-	>=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-auth/polkit-qt[qt5(+)]
-	>=sys-libs/kpmcore-3.0.3:5=
-	pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${DEPEND}
-	app-admin/sudo
-	dev-libs/libatasmart
-	net-misc/rsync
-	>=sys-block/parted-3.0
-	|| ( sys-boot/grub:2 sys-boot/systemd-boot )
-	sys-boot/os-prober
-	sys-fs/squashfs-tools
-	virtual/udev
-	networkmanager? ( net-misc/networkmanager )
-	upower? ( sys-power/upower )
-"
-
-src_prepare() {
-	python_setup
-	export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-	       PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-	       PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-	       PYTHON_LIBS="$(python_get_LIBS)"
-
-	eapply_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWEBVIEW_FORCE_WEBKIT=OFF
-		-DWITH_PYTHONQT=$(usex pythonqt)
-	)
-
-	kde5_src_configure
-	sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' "${S}"/calamares.desktop
-	sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' "${S}"/calamares.desktop
-}
-
-src_install() {
-	kde5_src_install
-	dobin "${FILESDIR}"/calamares-pkexec
-}
diff --git a/app-admin/dxf/Manifest b/app-admin/dxf/Manifest
index 195ea4acd5fd..119a573a9e80 100644
--- a/app-admin/dxf/Manifest
+++ b/app-admin/dxf/Manifest
@@ -1,5 +1,7 @@
 DIST dxf-6.2.0.tar.gz 284243 SHA256 c3c927dd3c397683707ade3a909bb41e887d9a0b07f7f6efdd69c7b0f4793218 SHA512 b3498e6a05401be784aeb086be3db21199bc6f0fc206bbb31344b29b84289f56dc4001020597f77b6867dff9d5b14f6ab41c921df5dabc094520af5dd6fdea0b WHIRLPOOL f4a9a8981dc1abe2d12ad4fe48de1ec6d86ef2d4cb93c110ece9c9127c10dc79986237b340f14983080aea0fbea61e422555e18864966bb57830ddb27c8d7ca8
 DIST dxf-6.3.0.tar.gz 292165 SHA256 df183e9a3661b0e264438c7b27d830cf6920bc343dc2e1fc84aa1d1a141aed01 SHA512 6c4273d0c1cecb2094722b4fff0d883bb26a6c5f976ae046cb8856685b9122af7e0a192f7e31c4786b6fa07a30666602790da4bf13d08dca84d9937e3d81f657 WHIRLPOOL c2b2590d1975e1ac32b8f71e3c895e75e207dc11d0535692d84d8db23246a8f50685b6f17618bcdd5c7e3dfd2d22790d89e9ebf5c74b17ace0e7a399086b31cc
+DIST dxf-7.0.0.tar.gz 292703 SHA256 25cc1d5c01e4680e1955057667dbbd8494eb004e7d27dfb5b56d1d817d61a4bd SHA512 659b51f28ee6c365b57888e87e29e5500d8b3544efecb0b2257903a1e17e41722adc052d35c2ab1dbf87365d4734d1c2d57c16e31677451cf44fd23e6d9accc8 WHIRLPOOL 3a3371fd5dccfa397d8ca90c71b0588fa86470d7013bd46f0d19f2357a41a0c62c63a988bab90d37ad21e75b648b4be3cfe20f83999bf2abadbce2357d2591f8
 EBUILD dxf-6.2.0.ebuild 728 SHA256 1b093ea69c871fbab335159ed5f2e20641446db8b82389430228f4b310b57f68 SHA512 41d2a28c394598f1fc78f1e335cf73e676ce55ab3fa95dcdfc67035206f5d47fdf7ff45421e969aa214d8a50fb7f850be92fa03df122e4f4c1d6b92675aad867 WHIRLPOOL 00e7e163d1cf5eaf7675adec1fb5d89fa2aafe74ebc3e1f35d8e5dff67b707ffba6f38f7de496db402a2914343e4f1949b9edc3dd5b4d4a88dffe3f09e3ed67c
 EBUILD dxf-6.3.0.ebuild 728 SHA256 1b093ea69c871fbab335159ed5f2e20641446db8b82389430228f4b310b57f68 SHA512 41d2a28c394598f1fc78f1e335cf73e676ce55ab3fa95dcdfc67035206f5d47fdf7ff45421e969aa214d8a50fb7f850be92fa03df122e4f4c1d6b92675aad867 WHIRLPOOL 00e7e163d1cf5eaf7675adec1fb5d89fa2aafe74ebc3e1f35d8e5dff67b707ffba6f38f7de496db402a2914343e4f1949b9edc3dd5b4d4a88dffe3f09e3ed67c
+EBUILD dxf-7.0.0.ebuild 728 SHA256 1b093ea69c871fbab335159ed5f2e20641446db8b82389430228f4b310b57f68 SHA512 41d2a28c394598f1fc78f1e335cf73e676ce55ab3fa95dcdfc67035206f5d47fdf7ff45421e969aa214d8a50fb7f850be92fa03df122e4f4c1d6b92675aad867 WHIRLPOOL 00e7e163d1cf5eaf7675adec1fb5d89fa2aafe74ebc3e1f35d8e5dff67b707ffba6f38f7de496db402a2914343e4f1949b9edc3dd5b4d4a88dffe3f09e3ed67c
 MISC metadata.xml 373 SHA256 32f2fe0a92f4fa339312f0cfe976a28f886c7a9f3f66b73811704fb78ae832e4 SHA512 85d9b0ab4896713d2e796fede5635fc4bb80e402b2a6a7404fa1b7ba52e139a0ef27876dae39081c58a5ea8a5a78749b7fcc13c038b85c90c4286721931cb63c WHIRLPOOL f6466623dcc7dbe0925f7ccc0d2794bc59229812e6ba8196a8c46535e876fdcdb6cea6e22eb3246c347b144b9df75f882aba74b32357505867945da4846a11ee
diff --git a/app-admin/dxf/dxf-7.0.0.ebuild b/app-admin/dxf/dxf-7.0.0.ebuild
new file mode 100644
index 000000000000..4c3842e34cc1
--- /dev/null
+++ b/app-admin/dxf/dxf-7.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Docker registry v2 client in Python"
+HOMEPAGE="https://github.com/davedoesdev/dxf"
+SRC_URI="https://github.com/davedoesdev/dxf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-python/jwcrypto-0.4.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.9.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/tqdm-4.10.0[${PYTHON_USEDEP}]
+	>=dev-python/www-authenticate-0.9.2[${PYTHON_USEDEP}]"
+
+RESTRICT="test"
+# Require dockerd running
+
+python_test() {
+	emake test
+}
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 37d0423b7e79..bb990dcd06f8 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -14,7 +14,7 @@ DIST logrotate-3.13.0.tar.gz 213726 SHA256 2ea33f69176dd2668fb85307210d7ed0411ff
 DIST logrotate-3.9.1.tar.gz 79061 SHA256 022769e3288c80981559a8421703c88e8438b447235e36dd3c8e97cd94c52545 SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28 WHIRLPOOL 9b3558bb03c6c95f8f386ea75ca09bfda802ae4c45b9ef8408692e3aa7a2ee57447cf15ce04d0289946b9cae2266acb5509d8151d15ac6ea0ad9113aeb32dc17
 EBUILD logrotate-3.12.3-r1.ebuild 2485 SHA256 2863ca598d152971453f9d3b47c64c9859e7427afab3602f9a3a7dcb40238df0 SHA512 46b79b611ba2e3533e1c068b3422b3507e2f505d5562810f91699f936be43b99a4456603e5c9298f30dc2eae5633e391319516babfd038520a0de58e03513ab4 WHIRLPOOL 3c4e9ccf4da2ae3e2d468a178cd9370be0c570edfc3473d8ff00c09973f17afe46f447826f5f51de10dd67a8820ad996be97a8d8bbcaaaea51762be87b4a62c6
 EBUILD logrotate-3.12.3-r2.ebuild 2552 SHA256 55c7d7cd58624e29f040d575fe0d695bf66af60dfa735efd24416e2306e07140 SHA512 b3f3b5d0264bb75c717608be706eccf33d97996f38c5ca152e1797f9dfbdfc40add7065fa614a715d0a30d431dd484e34a8b48138b80d99bcdd546b597264436 WHIRLPOOL db532413f8a7aa375b952c7451a482f362ff2aa93316f62dacbc75274e692e6be19088b28305973b610eaed3bae4578998720213c8e33bd252f529cdbc02c754
-EBUILD logrotate-3.13.0.ebuild 2547 SHA256 1a6394f85cda49eb5371539e03d3ae35fa614447acd4f7fb46a0ad20ecb99c3d SHA512 cc66cca82160e9a7eb24092a07b711d030ddb5e577ddb25e9178c2afea5edbe3dcc8657be92703c45b9ae1488b252225e68b67a3e6ff0fe763eb0bb18d82ad8f WHIRLPOOL 1ac14648acfc82ce398f956c2190253967d9ce52cfad7e1dc2217b120c135be11334e16c21f0563dc481f1d594cee87e20ec0a8af11544818c584950282c0df3
+EBUILD logrotate-3.13.0.ebuild 2545 SHA256 6dcd37ca8ab6e243b333650d2c5afc0b391a2bcc0587502d50230c273047f592 SHA512 a8e071ee12e58331ab01fa85369213ae8ca2c4a64fdc0f7ceaddc35ef56a33acc2090929c8c0133226872b644141df9070b6c94554e5481df9a096185635b827 WHIRLPOOL 5ccaf842f17e818b2b9a89e0d7c7925cc024b03fee04452e53007b91da90bdd1d9df453aac1951aa298e8da70044da1e0c502c789cc720fef77d7c7743d5961e
 EBUILD logrotate-3.9.1.ebuild 1767 SHA256 72213fbfa0a0f182e8ac774e29a8763a17b394c1b4e33e7cac664c7bccbcc96a SHA512 ed808392727749efb6d20a410810f6eb9cb364db2e11460f4c2940abd0fb1d7430b75102f2fcabcaf64e8818da39323010d2a5d223df49c705a6171acf541a03 WHIRLPOOL 245d8f38775b0a9296cc41c0af04e6aca66a7722c2eafbe6814b2a865cc4bd1237f5ef1aa146089882112144db8292d1e706323ec63d2b018ba9bac06147cb37
 MISC ChangeLog 11318 SHA256 38d98af46e97c9519c8e99cf7bf71b7c27b1814b35870579057d068c54fc14c7 SHA512 d2992032a405e2c185966f44f50a1a92c0138f8e847b55402a620f144ecedf58a23381c0ae42b12d344cf18eeab833a786ed35401a29c0c45aa2b67664ba8c51 WHIRLPOOL 66cb04fb922ba81fc9bcf4cd200c6d236d5a758f872da2e55bb09981571b914adca5c40e2597b4dea1ef994ce36782aac590adc5d6aa149b1adc08f36b1ea5dc
 MISC ChangeLog-2015 31549 SHA256 9a573fb1c828c7902f5b51a4f331a7df387a331c49509396799505c3e7c5c323 SHA512 13817496f0b30b421db6c36d2f044b7165a8282420d5124c52a6e5220cddc30ac774b63a43b395f0c0392339e67bcf6a855e16c666de34ad13004ec1d0f056fa WHIRLPOOL 4a957803bf090890dcb9ad77152e87bba98952493f97e75a00718ff024e5b774baca23c554e7ae2995d499d3791a38eb4b83f8126ab295fd2ed7c97652ed8687
diff --git a/app-admin/logrotate/logrotate-3.13.0.ebuild b/app-admin/logrotate/logrotate-3.13.0.ebuild
index 5d173b4f82b5..352c38fa9e38 100644
--- a/app-admin/logrotate/logrotate-3.13.0.ebuild
+++ b/app-admin/logrotate/logrotate-3.13.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> $
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acl +cron selinux"
 
 CDEPEND="
diff --git a/app-admin/petrovich/Manifest b/app-admin/petrovich/Manifest
index 16c74836041f..8e0941d91602 100644
--- a/app-admin/petrovich/Manifest
+++ b/app-admin/petrovich/Manifest
@@ -1,8 +1,7 @@
 AUX petrovich-1.0.0-gentoo.diff 1135 SHA256 aac6a52e39d3b725a453176565f7f28cf6f5cb176f41fdafca513c3b13be1c38 SHA512 cccefe0f88bdc0c4665e38c7e9760e273c5a40dfbbff086839128f2f3556e1e9c1094c2d7380045899d02e5c56aa84280c578a91cef86776e06841a40581b3df WHIRLPOOL 33c7400da4729787caf66f47ea9eac5e3fa492cddf9607c7030c47de49ccee3979bd4a2c378a7de6855b93a18395f19fc9bd216ba6b1def1534d3c1f22e7ff99
 AUX petrovich.conf 135 SHA256 db22ff4971cb158ced622578809ae6a33b102ffc409fa61d9d2ab8f6e30e6e12 SHA512 eaede98ec4921e5b9dae0c79f685d71c1001eed313529ff5c20a55f956d4eb2682880aebb56717f40c090feb92eeba6060aa96ecf45b94fb764cf76993febce1 WHIRLPOOL a62fa89eb8663f67c57b79fa0a2d90e6793a003269402ef590dfd456225bcf71c834e6ec2a73475081088da0bcf914b533e94355a3d7b8bb3587ee8b9611b993
 DIST petrovich-1.0.0.tar.gz 17844 SHA256 f6d1536844bda3897c7a7ee1beafa6a618fa8544f48798df61fb93e8e5a76663 SHA512 5f30cffffba670ee6c6b53b93427f380c389ba60ee5717cb6ac632aacbd81fba514c0843db4d8e093e164fd8cf275f280a9da5a184b27c077789f2e359b05b5d WHIRLPOOL cf74125699d1f559301e1c243fe9338464dabe997e4b1a29ef6d4a99b3fd43e0118e098aac76955ba6986a617505158cbe032beaaea7732e28e8dee11dce5a2b
-EBUILD petrovich-1.0.0-r1.ebuild 622 SHA256 b7727e90237870b459b5400385dd8458f63632d264f6136be215365c6716191d SHA512 f5617b3a091f302625a3fadb9f473fedf900b9e40b484b48afa3c91a12fc19e908ec435c1cf0e828db52a07b4669c3b1bad984b2db7c489920858d6860be8d98 WHIRLPOOL 8e7d967a3cc80af4ed6f667c6613f9ab671ef3ff4b74aaa99f0978eef95ecd89ba96e2ba67cdcf9168fde764f1916e5346d18084e21b4202343c0b517b738c81
-EBUILD petrovich-1.0.0.ebuild 659 SHA256 cc00a0337d3ecd980984a100f578e0102b19e5c9cf18866cf167b156faceeed3 SHA512 c1dd3338cc0f691172093c94b6733c4c4f99cfbc51e393fc5c37ce7965f400dadc5b67546d5ab7de36bac36d9bee512349c24bd533a9edc89995c1177c37dd28 WHIRLPOOL 0467fb4e6b54fa1f97932c741909a2359ca027943e1abed1b2e53fa2d9d056ea9b3177f4414cb68a1ad8893d85fdb2aa4dec46dc9ce85057ad0939bad5174f79
+EBUILD petrovich-1.0.0-r1.ebuild 621 SHA256 de26b8e24d8bcc049612a88ad3d9992979dff339e7005cc31876307c6966d9af SHA512 d5f5210399fc709679412554e9842a90846d3de8bac0abd212cdc87580fafc1f04670980709111795b067a2e48b0b96932052bbc18f29925b14360112b4c89cc WHIRLPOOL a45bf04b49b64ed816ce7a3adbb8e8e2880f29b011ef9e2e2f495f739fbbd52631227b33d4a74b89f363cc8ac4e3456e4ecd9c0094860f0e049f8b24db8f7555
 MISC ChangeLog 2704 SHA256 01bba7780b2faccaea24fdf29d60b9f973ba29dd1b6cbba605f6dd0ad961da8b SHA512 19d4c2086bccee5c3eac4c91a3f241c46d11a786596272150cf8060fe74473d4a3b2339162c65167c782a3c4409733bf2a72a770b739f6d43d01ba51439d0459 WHIRLPOOL 56c848f618d740c0ef89881980c1dc1274962143a9001c60a6489637e35ec89be6f2fc033cbeca7d0b56e9e83006056e47f0e29ca4e9fce8dee51eac88b86dc7
 MISC ChangeLog-2015 1647 SHA256 b178af438ce56bc1e15f926f22e4e3deba274711bcab5af12bf5fc789c9bbc5b SHA512 645968fedf10a4baeeb421341a208fbf7cd2d75e015b516d3e84994bcfc7ec59b149a9d2494a7e78cdf357dedc23df104ff4cd11c39d3c89a1816a9953d124ad WHIRLPOOL 40a0952df441a102fa7b2df9342fa7fe007caa2ac26fea053364ae280d2c0892c10d640cb4c65ada54157a3b3995a2943c426fe3081cc98b115dccb7fa55fdf8
 MISC metadata.xml 246 SHA256 df90d7e74c6202a0f8814fe66b9e8ee653b01499f89035b0ee28ec6c12313d5f SHA512 4d51d21df3e15db124014390bae632822966de5d93b522bb12d23471b3f27b8e097a0c5b32d742c8a15ff0d98609a76da416698b09d625eef6edaa4e3b965f60 WHIRLPOOL 6fbacaf227411034a2005d722a27c8ea8ff05e898bd740a64a6c23b56ed128bfb9757b48b6fcc96b1fe41580bd7988f3e4e08a3b79bca4d044faaf3ffe61dd2c
diff --git a/app-admin/petrovich/petrovich-1.0.0-r1.ebuild b/app-admin/petrovich/petrovich-1.0.0-r1.ebuild
index cb48d7884f6a..f5ca36fa2d0a 100644
--- a/app-admin/petrovich/petrovich-1.0.0-r1.ebuild
+++ b/app-admin/petrovich/petrovich-1.0.0-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://sourceforge.net/projects/petrovich"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
 
 RDEPEND="virtual/perl-Digest-MD5"
 
diff --git a/app-admin/petrovich/petrovich-1.0.0.ebuild b/app-admin/petrovich/petrovich-1.0.0.ebuild
deleted file mode 100644
index ffe3db4f1cd0..000000000000
--- a/app-admin/petrovich/petrovich-1.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="Filesystem Integrity Checker"
-SRC_URI="mirror://sourceforge/petrovich/${P}.tar.gz"
-HOMEPAGE="https://sourceforge.net/projects/petrovich"
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc"
-
-DEPEND="virtual/perl-Digest-MD5"
-
-src_unpack () {
-	unpack ${A}
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}"/${PF}-gentoo.diff
-}
-
-src_install() {
-	dosbin petrovich.pl
-
-	insinto /etc
-	doins "${FILESDIR}"/petrovich.conf
-
-	dodir /var/db/petrovich
-
-	dohtml CHANGES.HTML LICENSE.HTML README.HTML TODO.HTML USAGE.HTML
-}
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 38b2787eff82..d846b0e7323d 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -6,10 +6,16 @@ AUX puppet.initd 765 SHA256 5157630d3856c2cec4e22a19fb7e2d1471ff34aaacbb10f3d97f
 AUX puppet.service 355 SHA256 9ffee4138261d0abd9a45a38d23b16cc8beb6a90aca05d1a64efea5b5ddc2edc SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6 WHIRLPOOL 0f64879163051ce1cb4d4ca1d17e11e9dd7abca890824a15621b635a7c1fc391010c190952b63db637c08a0eb8130bb0f9147a378206916c3e71d43e1fb8758a
 DIST puppet-agent_1.10.7-1xenial_amd64.deb 16449418 SHA256 a23169ff2adeff419436f738a991d3026c3f06b993a9824922d26a125a53fd0f SHA512 5c73eea444186cbd0d52e42a20858964db6e7f2b6e537274b5b0a44499cc2bb0622a4eb6a55fa10dcc3946bdae3bb00b9d228aa5d1d444cc53aeefddf11f7b5b WHIRLPOOL 5eb0c71bc630ad878f2731353c93195b4e686ff0d48796fff0b700550f8f8ab69d039c818a557bdf231ecb08b85e8529706f280b19bae031a24f2687e50ae32b
 DIST puppet-agent_1.10.7-1xenial_i386.deb 16182468 SHA256 ee60570ec29561adfded01fec2017756d5f921c08677a530149b0da2ead1f29f SHA512 7d5a41af7619fe008fec5302e23482d688692affaeded4b0b2f4e693168c2ef6995beee5e2410a9cb2e7f99650119e9c5f8007ed65709ad623654bdd6c09e402 WHIRLPOOL 81d7a325d2c675f2392dfc16f1d3a411c6e7a2e449844b90358d0a97c31cc3ccdbf6a8a891bd818017b9504e898fe8aed2d12233dae4822f125f7ab2230ceb1d
+DIST puppet-agent_1.10.9-1xenial_amd64.deb 16308224 SHA256 56a5b3ec87f1337191ad26595bdcd1497251ed739ac3b232de03a21a9207c463 SHA512 5fc5d70a9fabeb73ac384875f485263c9e890d3792e56aa41f42de86c971190a21526381bb5330c2f52790e6aa82b9c1e5a7dd61f378b086b78cab8de7120b5b WHIRLPOOL 3097136277da94901ccfd5e3d437d566df708c8628bafcf8d642784d015aa7c4bb9c87743c9e7e7005ba9f0161b672a69643cc1dfaa28806d05577fd390bf567
+DIST puppet-agent_1.10.9-1xenial_i386.deb 16202586 SHA256 b854cf7a8a836440cba3381bbe320e61ba59c3821c6313aa0b981fb6bdea759f SHA512 19b84b5b6080c5b842877d9e7ee6b10837309c25e52429a14bc20939b18850eec616a5daa3a457d36504d51c9c0a8a9b71c3c9cb9c84dceb66e332a075b91e73 WHIRLPOOL 0518ac15b6d1c5a4d33bb9a8b25a9ca735a1927dc9f1853a9f260d01749c6b4521684d8784f9098626ee67be00b5cd962dbb787ac1ed7515dd8e001fb92015cd
 DIST puppet-agent_5.1.0-1xenial_amd64.deb 15141786 SHA256 1a3ad0ef1a5e4026927f3ae010e9a48b9c1e31dfb8e0691d01383d29f3b14644 SHA512 a210d225591328e2c041aad1dd7cfdac614531e1ceb524c3e35d3330962111bdc66408268550072e53190d6a10a7c8244b0bfa8a12b81f023883831c1fcbd070 WHIRLPOOL 34dc5cfcf6bb3500b89451078734d5d7a03a53a0be9e5501d6ded574cf2b6dbafe207db87aa919fd9cdadb6c2a0a05191854be3245d477e035fe7d52778cf527
 DIST puppet-agent_5.1.0-1xenial_i386.deb 15596316 SHA256 41a4d70b3ff87352d9aa5594d2b65176f9854b38b21c738321e6d7dd516ccf25 SHA512 9e364fc50baa081cc808c0e0277d6625f6064dad7d56fba352d552e9398e7197405a8c3e15fac4f569dfa11c7c4657261f06b8c90f04bef6fcc6a9794d94e927 WHIRLPOOL e54f2a75b753f94b5dff8d230776afad6193f446d8156d2d2e10d9248732a607a83fa79fe01c4fae36ad8f3cf4ddb453906cf2f4fda87e3e414ede4fa893c58e
+DIST puppet-agent_5.3.3-1xenial_amd64.deb 15647308 SHA256 0b857065ef1aa6cd1a2ecf80dc836e997266550db38db6442fe02db03973e51a SHA512 29c826d891a3930e18ed71a1c788819fe421b6a398d77ab21900feba457a386bad34ecb210d63054372af19de81eb31b13ea729adc3cb1fdd2fa09b0783b1e7d WHIRLPOOL 369586f0b0f3833ccaab1a4d01a29552d28c1d0d170d04e3f1300e97ae430ad915b8011f64c70c54b699cd9a0ccb536d55ab858d474c9d4fbb7e250caa0f8ed6
+DIST puppet-agent_5.3.3-1xenial_i386.deb 16329408 SHA256 f0697f4a49150c7a92e930f1b245e84ccbac10392e8963979e78054fa5ea4bff SHA512 418c5f0a289d9c7335b49961dd6ad28340ed66cddbd476ca4f2fe6edbc3933c1d4841783d3a0f1f0ea1fab748c6f14f90ebc82fd02cf4046cde95c87b7b94548 WHIRLPOOL 840a0c63feb4068dd77fc5a94edcaae618d83286c9f7546ccb59ea654a7b404dc4dc666ec51a1c4cd35511f957083559324f1a54c72b60d9c4a2f8d954bde3e8
 EBUILD puppet-agent-1.10.7.ebuild 3499 SHA256 1097408bfba9ee47a6d6e25c5ac631221b303bd2a72c87ebba7539a05a595107 SHA512 22bd5df84895605e506ce0b9ee000bf72208b1e24c3907834c744613d341430336ee8abc0125f94af8accbf22057e739612a939e18b4206fbd122848d1446366 WHIRLPOOL 07cac34b6b1259cfb9af1cb695730869a7bfeb23ac52a45add1485de334e95b95366421d774ddb51c24edc18e00b55adcea845b55771ef60b9bb317123f67529
+EBUILD puppet-agent-1.10.9.ebuild 3501 SHA256 1b65264355d41f0af9520be034f83b3dae20b20d2c2a49b10302bceae087fbe9 SHA512 1ac097c27ad92f8beb7abfaaf3fa3ad8f77b5113cd6c5a910ee630b3cfd0bd091ca424fe13d2e10ab9b692ba07c26a21d2ec49d34e24747959c43e5c8604d05f WHIRLPOOL 0e226fe1fdede767fc1d48652a1463353fdfc3472565410c3525350be35219630bbec000eb7fdc93f7e4a1656be38f2cfe81df9de207a9b14bd604e79a1d5c67
 EBUILD puppet-agent-5.1.0-r1.ebuild 3290 SHA256 11dce268631acad8339cd951bafc5e5f7c1d9b7e106441c1db1312f9e8ed89b9 SHA512 9babb71d75b321e7d795ffbdcf8f6c3986bbbc302e6f70331f145eaa72dd7192d39e50587f9604927db08bdd2b705d89b8caff49bf914e35b3e5dbb58de5d22c WHIRLPOOL a9dacee439fccfabcd05cacf308f53da604d776e465b5254915b02c149566d07a237ce282603164af14f6844c4a6440b050fcd158127a9d7d8a1093a163a173b
+EBUILD puppet-agent-5.3.3.ebuild 3292 SHA256 20dc7a393343f803ba3a8a4682df3228626364d99983e165e9d1a3d629210ecc SHA512 0e910701ad88dab23b047de926adea53544583dc12ce90f4697660e0847d2edf3bf90867514423f28e222a7c5bddabe083c3ab85b171bf09a869f1e8398957f6 WHIRLPOOL c684e622e5d6b3a59d4e3a0ae0304d725c8e0ff361c59179cd3ae67a8e024e99bd175918b6423109f6fded1b13ad6ab519534c147d87b25b3b5aa8fcdcf27285
 MISC ChangeLog 12414 SHA256 43b79bfdeb14a8a8c06df8809dac296ae71e59e85e5243bcdd578dd99c3c3f7b SHA512 4ad26d58ea469acd9c510f6582175ecb0a58954cc7eb2c8c90c2736e227fce04f9d196cce20b64a52153323058d6f5a2831de364251803d8eb0656b15ea4cafc WHIRLPOOL 16dab8e7506da0d6bb98f91d08c1890c12e9152baa7f15c4e1ad01f210845acfb55cbe3c8bde1a1b71559cb60d84ea436c24798290802891e3047d024b66edfb
 MISC ChangeLog-2015 1925 SHA256 14cec0025e9af42a203c9a087daf7d2bce1dd92aec66445814fe3ba58fb55611 SHA512 f5c921d2ee0079c50c6618d8efa13438d07fe0626133269c8be9b5dd7f7a3aa6d2d1643d445d5e1d527094b2d814c0d5858974e5b38dd475dcb9d0271162ec72 WHIRLPOOL 92882e38ab2de443b8c4edb81327915b6ac76d1df5bd4306827ad92704bfe844ceda17c4abc81210de36718ad6d51eade549d720035e46ef6e719262f0441354
 MISC metadata.xml 502 SHA256 93c372bb207d39c92f64f58733dce40b0156cbbc0b9464c91826e0885e4edcd3 SHA512 aedf4322173910c202b105d904e4528c6b6bb949fc05ed95c4a8d9a74133f5c7391ae30d7675bfa36a3f85880c971aff6e4a57ffdcde57b3b63c02dbed083a95 WHIRLPOOL db08ec51b5c3ce9b2cd5599e002301ea345072eac18b51486161b665970d0032297365e3001060d716d29c13696a664c4be68b5a6d17043ec8b204a0adce7ac3
diff --git a/app-admin/puppet-agent/puppet-agent-1.10.9.ebuild b/app-admin/puppet-agent/puppet-agent-1.10.9.ebuild
new file mode 100644
index 000000000000..c36e4339205a
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-1.10.9.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2017 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/xenial/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1xenial"
+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.3.3.ebuild b/app-admin/puppet-agent/puppet-agent-5.3.3.ebuild
new file mode 100644
index 000000000000..c81db21fbeb6
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-5.3.3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 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/xenial/puppet5/${PN:0:1}/${PN}/${PN}_${PV}-1xenial"
+SRC_URI="
+	amd64? ( ${SRC_BASE}_amd64.deb )
+	x86?   ( ${SRC_BASE}_i386.deb )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="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-5.0.1 )"
+
+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_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
+}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 61ba4ca15299..73dbd5072f2a 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -15,6 +15,7 @@ DIST puppet-4.10.1.tar.gz 2954351 SHA256 271738d2b5aaec8faafd543076ac0d9012fcd60
 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-5.1.0.tar.gz 2734018 SHA256 ceb8059704d2e79c1f9147716b596261e1c6c38da3313a2283def777ecf9193c SHA512 07019f40c5b7f18243f13abb899c2ff2ea4b135895ab98c13da3df50f8e720e2759f8eb39e349ff04286da7de504cffea3df8acf9711e8591b25001a2a3f9c15 WHIRLPOOL a5e4e44c68a503307b01729546121a03a0271bc68f8db139e7d52981f9ce9f6db4e24b18a252633794e7de1c7aceb6d833c817a291099081b31190060bb59d50
+DIST puppet-5.3.3.tar.gz 2843386 SHA256 45360f64fe0375df617571d58e929515e2094daa1d0dc78e2b6718d7cbeaf18e SHA512 b5bb9ac4059855c7cac624ea0fdc2c3366cea82bf07bee195a179a0a709fa53e7fffe883e581c1e07a64705a638b156288301227f7334226ddc401a9bf770afe WHIRLPOOL 19c8511ba58186692ee0ace02158c16529715cc213f0eb7266bb078a10db6e698081edc4b3e0735f1e79fb568066cc6f1699d0b1a954a29d74d1a91f393130fa
 EBUILD puppet-3.8.7-r1.ebuild 5301 SHA256 62c457fdbe347a1237427fbcca093e205e8aa5f0a0a82d848015efce50bde0ae SHA512 f098685cae0f9e2a77da1e8b82fb2d1c28fa0d28214449e628ac1f3a02b4c07c53eedd000b4ac94154d8ecb2e899fac61d0660fad6cc780f5944349a513f84ba WHIRLPOOL d1b96ec8d9c38baefe15a5b77fa6f18ee0dfd40a030425050bcca09bad8bb9316a4c3815a8c027eae1c4c1a51755a88b67cbbd0351a4ef228e7cf6b539803b0e
 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
@@ -22,6 +23,7 @@ EBUILD puppet-4.10.6.ebuild 5529 SHA256 f9a004fbb4a13514101692d29cbf23e96d05c91c
 EBUILD puppet-4.10.8.ebuild 5566 SHA256 d4810b6e8b5a23d4de3290943ff28ed2c76d7585d566529a0ffb0083970ced2b SHA512 ecbad4f16a4789ee47039279fd5a7247f2600d50e80c8a69b2a1c6c1b8988db7e819ae01eb92660029a08b1f442054a41c53666b10ab084c857bfcc3b230d528 WHIRLPOOL eadcc24108873db026d1294a3b9b293eed5bc0ef609a083bc83f8cb38f3dc0e013e90f08a7cd478c660e32f31299fe37bc123cdd7f1daef61d55f9d1cb052dc9
 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
+EBUILD puppet-5.3.3.ebuild 3818 SHA256 6b8f56ce122a09f24f1752fd18d21d67dbbdc0e2b065a240e42838dec5da153c SHA512 cd1fc1ad13ab691c76bbc814285316fb14867ba606dad3e8900f314470e6bce143c77f920a468f7787a6b48e52352aa12884b84ad952ca0c29d67f954157dad1 WHIRLPOOL 5b41c22e086ca783dc3a33bbe3d20664f808508ebf960847dc0616067e948341b91735867624b7c6eed16364a8c60104d279e7dc364d820007609ab8a7b9d780
 MISC ChangeLog 7719 SHA256 ebfd68981bbfd64b0ff92511b97749e56ab20d4663b4190a4ce89fc458a3a40b SHA512 98f3a66da3959b16036bf32851f8881d1928092c5ce64c02819dd9bf8578a2eb142e8f2ced5a85aa6d5b5cf1f15842e8ac9d6b9a851b2efdcab59eca9f2df1bd WHIRLPOOL 6fb9b83691125722682f433be9c49a75d7ee4e9eccc26ab6d273a379508f830b3ba7bf67a87924b4c0722590003f20530e2d9ddb1d29f2d5a0458d070672cef3
 MISC ChangeLog-2015 37770 SHA256 3183b2d4bab4f43c30b81d32da261e55a0311a0e0f32127fe36e7678a7964670 SHA512 5495eb8a18269cf58f6d8f5e20049da35692ce6e30fe126f65c0c15b77c477206b3dca3e2b61ac165d82ed2fc665775b474cf4bc667d3746aa5d12a58f55c51a WHIRLPOOL c5401b362aa38e38685603c8d0365a06c08f3f4b46533d2242b614133ddbca4c5ebe8897d60109c7c383cd4f5a61f118313e7c949f501e3f80473981ef26498d
 MISC metadata.xml 1514 SHA256 b064512148509253a4e3621c23e9ec3722bb39dd72ed5b1720799faa6625f73b SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64 WHIRLPOOL 8488598872c70c1d28c302636b4a5b009be8cd0380a814b161500af8db6343bde421d95d1ca4ce8877cfbc1d073b825cbd2a8e90dc2ac170fceb146d0916a400
diff --git a/app-admin/puppet/puppet-5.3.3.ebuild b/app-admin/puppet/puppet-5.3.3.ebuild
new file mode 100644
index 000000000000..f74a524361aa
--- /dev/null
+++ b/app-admin/puppet/puppet-5.3.3.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 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_TASK_DOC="doc:all"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit 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 ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	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
+	dev-ruby/hocon"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	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
+
+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 )"
+
+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"
+
+	# 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
+}
+
+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 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
+
+	for v in ${REPLACING_VERSIONS}; do
+		if [ "$(get_major_version $v)" = "4" ]; then
+			elog
+			elog "Please see the following url for the release notes for puppet-5"
+			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
+			elog
+		fi
+	done
+}
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 9804af7c599d..263934ed7b11 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,8 +1,10 @@
 AUX puppetdb.initd 1824 SHA256 cb406d0eb615d53e19b3b68598d446062ce53098278e78db602d677eb8f37ea9 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961 WHIRLPOOL 659f4530099f9dcf7f0b56cd8241d4e1e4a7b1a31e0bd9d921ecca565f5158cc19be9f49b1c01d5a6d6e4ad7ab8abac584ec06c42dfa6209a01b933aff7ed0f3
 DIST puppetdb-4.4.0.tar.gz 23629723 SHA256 b9e656846981397a3eed64dff44a7171e6a01b7e8c76c877bd93267d96f50414 SHA512 2caaa2b39146b42388b03ecd830d386efcc25774dfe9b6e1bd25fd6f1820902364dda7526c2e019657d18371be4afdb84a165d9bec1078a6c3621bc80241a5a2 WHIRLPOOL 768e33674c5b62c96c3379cd822f09f519d6e70cd976526ba630c8bfef7c1ee226f0b5bcb6957040355769aecbd1889f25fbc22e8685a6430c077af9f5256639
 DIST puppetdb-5.0.1.tar.gz 24055687 SHA256 ac75c40c16ecfd14a64c3122811adcceaa2f32c1874e07c763ad0b1ec7338a27 SHA512 0e08e27a2004b6cf07704a77d931ad30326559e3fd6504c9a839f468c8379c49407214187bf47f960fd3b5cdba9ec162c69e67e7ed7125c4137a77ed076e42f1 WHIRLPOOL fdde4ec40c95cf436da97f78f5c70a0adcc037cea9f20e93b569cec966dfb5d40c78ce5991571ab2495aca1d424341bdbf785eced325b5b9925628eca03c0357
+DIST puppetdb-5.1.3.tar.gz 24157962 SHA256 73f2efe4a418ef9a1bbbaa334abeee71cb180f9c64b18fa00fa421294281f0e4 SHA512 153e6cba59fb824fd9bca802ea4f0e05e6c6d69d6ef47566079bdf1ac26f7bc13fa893b633f9506494d2189ef160b6b3c23fcb340e76df41089228c047c566e0 WHIRLPOOL 4ae169a3fe75a4e2958fc39b4d5a0ef4c4223766af972d13d1b8a62b7592e717e01d810f8627e81bcdaaf957bb649795793ffa57233a75f1f7fb4f527576fe74
 EBUILD puppetdb-4.4.0.ebuild 2807 SHA256 3a047598cce8551a0d7d351782f8d725e43051148aaeb34055a5ee4d683bbd0d SHA512 16d8e30f793351b58fee71964122754bf270dc977480804e86461e0131c67e2081eff5f2b728bcce69186ebdab7707aa7f03cf70b3afc4e42a18b59d1ed2d11a WHIRLPOOL 4e21f78d43607fb3f0916b78d96f1caa7b05637c50f65eba32c951ddfd34711ffa4aaf16c08fa10842d91e7eaa6a3d11322f8afcabde530e2f35f362b3447304
 EBUILD puppetdb-5.0.1.ebuild 2763 SHA256 5f2b268e16f7cd1dcdfa841f0e5e5d9bed6b326014986356eee081c71a9ba02e SHA512 032e3f021880cd77a83d5841e130af2eb2e831f54d3760542ee7c3a97a98e5f92e7abe2697d83e896881fd285c7af826854030faade413bba66f0642cd6d7fcf WHIRLPOOL 383ff1eaab16137b7cd57cfc08568c939a892556411b762e2808ed3adfaeb54ef1d5f0e77c5c43d2085317b4c54a4547a84952e03b7a76faf10daada9a51f5a8
+EBUILD puppetdb-5.1.3.ebuild 2765 SHA256 396da65f05748759d0df6a9a293105df17cfb846da8658dea739c2851caa912a SHA512 c90e4694587c868795a1511378ecba1fc9c61327d9ef5223ffdf03b6f41e3ba7b2e579d8485d7aeca4230eb48e6b73c2bde2ffd50809954f4100ef70ac2bd9b0 WHIRLPOOL 62b02c62cbe138ba1c1d75ae794f66abfe97f234b1c376326a2f0d96c2a733493eb193e44015e74792437a5662f26b672cfacb803159eb75285e820bde073523
 MISC ChangeLog 8628 SHA256 36660f6cf0c1651feab9ff36627e50898819767efd65a3d483c8587952a80daa SHA512 7fb22ded0dcea17ffd3e4af54d15002bac8546ed3934f93ef4b9fee4ff24fbe2e928adeaa2132fd8023a8ec6d59b34cd384ac120958bf14b4661c706f4b3d5b0 WHIRLPOOL 74823e3d2e87b97db89c6dedd6322e9ca0e357135c0c39a2b0794d99469e640388d02c97cc612448ff09a71f373b6b222dc32a0fa6a5bcdca175e4c8e4476b38
 MISC ChangeLog-2015 1236 SHA256 3fea32c44cd920a4d0afd13b438efb32b9a64e483039d8f4379492a5f9d19b42 SHA512 57021ccb882ac0ee0b534edeed6cf510d3919616289edb066ae561b1db2ee81ebb95903abf45b57c45759a6755edee74c0968630a8296b919a7f393e25a8af01 WHIRLPOOL a4eb6aac2ccbc720cdb5aba6050445a4a33ab5bba4eeee30357fc96208a6a3a21df16f0c9bde06a000d9551d49dc2f9bcabccfe453e884356c0a320b2bd19b0a
 MISC metadata.xml 485 SHA256 f18e5c9519ed297b90056ab501981cbe9a4c4815d64f6ff85ebad1b5aa45dfe5 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2 WHIRLPOOL cd481863aa29249fe38cd2ed4dd4bb4093c4a52fc26f6900c491fbc500071878140185b72e84a35c978a8b12fad1548d8cf7c1c972bdbac838b95832b54f14be
diff --git a/app-admin/puppetdb/puppetdb-5.1.3.ebuild b/app-admin/puppetdb/puppetdb-5.1.3.ebuild
new file mode 100644
index 000000000000..25044630bdf0
--- /dev/null
+++ b/app-admin/puppetdb/puppetdb-5.1.3.ebuild
@@ -0,0 +1,92 @@
+# 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/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index ddf125acf98a..f84079d48c48 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -2,9 +2,11 @@ AUX puppetserver.init 2138 SHA256 d0beb6010d75aa355662bacc11f122823725ee36cb9256
 AUX puppetserver.initd 2021 SHA256 6765d45ca5cd20ddc3f7fc784216a9cd0453575077e7ebfa8c4cdc0ca22d6b23 SHA512 e219da1099bb4183f5b835b93d414a0c3181332e6e898d14cfdaa6e7347c98d23b01b98ed0995e60ab37c755c407d90ee2ad73dc7e63488c9922f62d569d89c6 WHIRLPOOL 347416638227bd122e03f2e8adfe175597ddb298ddf1dd2bde222ba763b8a86785535641c44ef5a9223b33e8d013abbe645c5512589d987070b5a88107ac9b31
 DIST puppetserver-2.8.0.tar.gz 34015599 SHA256 0f6f49b149639b80c3caecaeced44c7c0cb98728da7ce12f6725b061f3152812 SHA512 7023278fe501614f1ff9650f72b9193054cb79888ce03f29932a10fa826ee07d67e96eee80a3f2c19007b8bae14008846ea850fb98544bcd39e1ada11fadd22c WHIRLPOOL 6319b7aaefd45b5c49189e15eb06575841c8ca24f3032739515f48f35efcc0ea4d3490f84b2325ff864b57e1a789263596d7f6095a4b35171d3b17a77b07ae68
 DIST puppetserver-5.0.0.tar.gz 66380485 SHA256 b1b62c31d31a69cf1912d6b785f53cbff219a98e0e7300b7f50114694b06ccbf SHA512 1dd7b332871abf12981a7ef33ee92a813275c86ca0cd72a24c3853679c3e93aaf264b76bf4108bf62c04021889e0b7ee0bb46963bd1f3df1f8e67c48e41698e8 WHIRLPOOL 89d15509f3afc96ccdae5370346c101dc48daa68dddbfc98b51151d0e706945858b4485d7358710223c43760f317b5aa6a27b247db3fa02d80077694b0ee4a9c
+DIST puppetserver-5.1.4.tar.gz 66628031 SHA256 f094ead85531d0e131723fe04a51815413e717c13cf4b1bfa757002a785aec98 SHA512 4444880041e36aaee8834476dacdbd5fb166326f054b8beca55f644d1c97318bc2dd0d3d3ae8bfbc1b072e61efcde87c31e763c48a77b05c3af5f873e969d820 WHIRLPOOL e743d12ba68d5195e49f119f67570a49fd9920400a650ecb752518da3c6b75cc5f3257f844e224c8b2c6e6abd37a013e153d3ce2d3a4b096199795c796a40535
 EBUILD puppetserver-2.8.0.ebuild 4052 SHA256 48b793e9706747cfd5283cfc8317c32277b5b306ee7df3252222cfe29e281b20 SHA512 10fe93d4747aa1d7f3f1c4f400c63ad4a75e5dc7f5a662c0601bbd22a69b3f29ef04bd7f7fdabdf3fe74e5d2fef2429a083db598f1869648e739d8d6f99974af WHIRLPOOL e23d0e5111eeb62d923c014f90672c994e311b97ad0ecab57b1727dfba9ae85402780ce8ad7b75d90778f59a97f8f3336f15a6546d1df34761df28993ace8af7
 EBUILD puppetserver-5.0.0-r1.ebuild 4939 SHA256 08674dbcd4d0a317128964b18c4dbc93a32effa38126d6b9ca749d48b51237f3 SHA512 04832ab34dea9f8f6cc31f1b22688e3e8961c592b28f8b0e58522c849d2e3ba37879d7fff3afbf572ea768141da6fba871f1d9766c3bde2ff8573dabddce1248 WHIRLPOOL e226ac44eab49bf807272cca5d8738f9bdf0092d043b3d49d8d9efd2dfa55636d3652e7fa674ccf5814987b44b39fce7751e226c828edd0b372df7c4bdd76169
 EBUILD puppetserver-5.0.0-r2.ebuild 4890 SHA256 491606b7edde87459361b8d138181a13f92ab297450dba73702f83f646a52e9e SHA512 65f3d4e8522a505b039aa73a7fc724f62dd3d68a9db0f2f03487f7644de8143e43e3b3f73a73d66b56cbc8a7c2bbb78af8dd528aedf35bb4d74f3ef31bf201be WHIRLPOOL bc08bddfa5945c83bc4d5639e2ffc859f859fb6d47b3d45b9e21d7ec7cd7584688fac019dd504c5cb02697a1c8fa9260eccb33fc242522e114c0f1b2aec24196
+EBUILD puppetserver-5.1.4.ebuild 4890 SHA256 491606b7edde87459361b8d138181a13f92ab297450dba73702f83f646a52e9e SHA512 65f3d4e8522a505b039aa73a7fc724f62dd3d68a9db0f2f03487f7644de8143e43e3b3f73a73d66b56cbc8a7c2bbb78af8dd528aedf35bb4d74f3ef31bf201be WHIRLPOOL bc08bddfa5945c83bc4d5639e2ffc859f859fb6d47b3d45b9e21d7ec7cd7584688fac019dd504c5cb02697a1c8fa9260eccb33fc242522e114c0f1b2aec24196
 MISC ChangeLog 7993 SHA256 9a47868558e376193b4e988493a375526e8a01b780cb28e7ac140958522e0843 SHA512 473e51d6f52a3fbe7224caeba4aa4363357c87acb5939ba2d238f9857f1c72dba6eb5ccc3d76e9cce6d8c564df7888185ee960c963b7b8308006cd3f53d7c716 WHIRLPOOL af4fa4e71885c9a6cad8a59712e7de6c7854629c07a235915ad0b882fa0539c9e996e2e222eb2a835580049bcc0bf59618e36b825842c48c696f65f5fd0537d4
 MISC ChangeLog-2015 878 SHA256 55c43d296cd6cf910139ea29afe0d041358cc5a8ea0366936dfb75ba21640eae SHA512 5ad7c7171faf5a1c05cb9afaf307880e37744cdf472b1f6f1a72c1ab98f58f2e2150d8582ad72ad0ab9b45a075b7c1ce700603c942b183328a18cee505a186b7 WHIRLPOOL 7c5aaee9bea21577e2864ccc6c31d5accafd4a74ebb79d4f73388a0b3995de84471ed7b18c896747c8730349236136cd23f44f5c71a7aff3a08ef13ef42cc682
 MISC metadata.xml 468 SHA256 cedfad43df11b56dfc9042bc532da2c772f94202ca8819f38fd9cba9e3341107 SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c WHIRLPOOL 356c70f8cfbd446e22a6849124d474ef9ce0663da00694accad62fab22458f69802bb06a247c61950a6e2c384996f6b067c0440499ddfa667342fbe8d627721d
diff --git a/app-admin/puppetserver/puppetserver-5.1.4.ebuild b/app-admin/puppetserver/puppetserver-5.1.4.ebuild
new file mode 100644
index 000000000000..569321228c04
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-5.1.4.ebuild
@@ -0,0 +1,130 @@
+# 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"
+}