9 files changed, 203 insertions, 54 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 69d9d5f7cbc2..478417a8b6fd 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 8a342b6565a4..e26ec76682d8 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -2,10 +2,12 @@ DIST ansible-2.4.2.0.tar.gz 6503595 BLAKE2B df4ec4e24671f1488950f2d9eb7705fbad4e
 DIST ansible-2.4.3.0.tar.gz 6511115 BLAKE2B d43679c651f6aa5fd86c797a204645a8ee98efbcde9abaa25385aeb6f1d7c8b4ad74185434bfd159dbf673fe9339ef8f915f78238f8b8a5caf924b54cb9bdd52 SHA512 a7cda358c67c519c7e5ba248bf47070f21a27203fb29d70d9d75ecf027ba1275d71c0f96493e047281211d172a3be8273d7e08144446284695fb0bc8b94daa82
 DIST ansible-2.4.4.0.tar.gz 6512938 BLAKE2B 51e397d2242209271a8aef211c3bdeb34a15e2061a202415749ecb4232e0521aff304d5585d536b1805f14ff476b0733d559eeabe6e44de7b273b8606b11b805 SHA512 f0dcf92f2c69931fa06e6dd3845c11592d5a7e44f19a99c4d6c361022708560170f2b74ad20eded61fa5812c90eed281b78396aa92e0b33717970afb5966dd72
 DIST ansible-2.5.2.tar.gz 10105800 BLAKE2B 0d9080b666164c96c2a237f9a5f4b271a2fe9933d1999df85cd973df0cf85d850343bc33b8afb18c1bf0a7eecb2ab193e91c7a02c3e56e8a5e41338ce7a90081 SHA512 25568665b96ee9d7ca0888dadd90de178a9cc1da7dba07acb682ca4455ef91622344958ec2000eafbb4cfda87aec325be77d3d5b395aa4bbc2d180fad1a90a34
+DIST ansible-2.5.3.tar.gz 10138567 BLAKE2B ea79156f531db1586899f18babc72165b64e7e2d42690f3ef15d790d2d80c12c9f9e1b70ab5fc7b863538e9209a8e98368d0110fc2a79c70c42726449917255c SHA512 74aa767118773aa557cd43f2a9e17322d7a6b45ea643a9175fe4f613fd4566453dc6f1859768fce179db3331b3beba103e89dfe4eae66ed82b1a83cd7d261269
 EBUILD ansible-2.4.2.0-r1.ebuild 1408 BLAKE2B acca3919cf1cf8240b4d4cad16ad41b61cf7d6af7c4adefd81c404dc538d1bf75b97dc3e4a87ba38b1e4dd7e3cbf3b319144adad083b1e813492322cc179baae SHA512 cdf8791066fc9b72bf1c1dd3a3595c2901f71e69b24a163f2b6eb100a410d5bfc942a76cf92a5fc2d730eecd57028165eed3c4e3330ac06f1975c7022b6d904b
 EBUILD ansible-2.4.2.0.ebuild 1447 BLAKE2B fef57c75e03546d508eba962d556823db77a09b229031dd84e3f86d3db428da1bfd661a4d68ae35ef6244aa6057e1e37461aa6d35f5b986d29f80c16a97ecdc0 SHA512 3f42adbb76f6519dcfb90899331956f9767b1fb4361f0f02d954c047f56ac6cf13fe4d5bbfb733db30715f18b529f80182d1a1e54c97f7b8385d6112c0efbbb7
 EBUILD ansible-2.4.3.0.ebuild 1406 BLAKE2B f2c87ce03b3c4914087b0401485a07f7b3287ebf62a4d0b7acaa7b9c06bd670c0f91bf2288edbbd45ab577403a1b85de2733c0a3fced85c99720ae8f7848ed46 SHA512 b4d4d40758c6f638f07480af76ff2cdcebe787276c27c23b3e046841ecfaacac83845c14bca352ed603c15a3fff4eb19ae53c990e7fa2662d5b5822890091a1a
 EBUILD ansible-2.4.4.0.ebuild 1408 BLAKE2B acca3919cf1cf8240b4d4cad16ad41b61cf7d6af7c4adefd81c404dc538d1bf75b97dc3e4a87ba38b1e4dd7e3cbf3b319144adad083b1e813492322cc179baae SHA512 cdf8791066fc9b72bf1c1dd3a3595c2901f71e69b24a163f2b6eb100a410d5bfc942a76cf92a5fc2d730eecd57028165eed3c4e3330ac06f1975c7022b6d904b
 EBUILD ansible-2.5.2.ebuild 1406 BLAKE2B f2c87ce03b3c4914087b0401485a07f7b3287ebf62a4d0b7acaa7b9c06bd670c0f91bf2288edbbd45ab577403a1b85de2733c0a3fced85c99720ae8f7848ed46 SHA512 b4d4d40758c6f638f07480af76ff2cdcebe787276c27c23b3e046841ecfaacac83845c14bca352ed603c15a3fff4eb19ae53c990e7fa2662d5b5822890091a1a
+EBUILD ansible-2.5.3.ebuild 1408 BLAKE2B acca3919cf1cf8240b4d4cad16ad41b61cf7d6af7c4adefd81c404dc538d1bf75b97dc3e4a87ba38b1e4dd7e3cbf3b319144adad083b1e813492322cc179baae SHA512 cdf8791066fc9b72bf1c1dd3a3595c2901f71e69b24a163f2b6eb100a410d5bfc942a76cf92a5fc2d730eecd57028165eed3c4e3330ac06f1975c7022b6d904b
 EBUILD ansible-9999.ebuild 1476 BLAKE2B 794681453a56d367c67f048b17091b31d7439d710f2ca81da14a1f913257d8b55f0c7f0a090945fc0fbde63ec7ccf2a6e19bf31d9a953305ec4feac1761e8f83 SHA512 662d09bff2f18205c7698d69f9b07eb831a436bc733794b9767eb9ca25f48fcdea7d924d84051c4e033d4a849fff8507be687509a29ed04145f7a10b19a709b5
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.5.3.ebuild b/app-admin/ansible/ansible-2.5.3.ebuild
new file mode 100644
index 000000000000..573d04b35802
--- /dev/null
+++ b/app-admin/ansible/ansible-2.5.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 9fd1515c85b0..10cbcfd59ddb 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,4 +1,6 @@
 AUX calamares-pkexec 43 BLAKE2B 432999808da0fdde0e5d9c88887a5f112ac00c90af51f3d907d02ab4f9eb4fae7348856028bcfff98ced8698d0d039bd9506f50baa90f5b12b43c1b72885f230 SHA512 768148cd58cdfb5c6791b76ec60c21a4ca852120f53ed31a83bc7a2e0a26aa77b10bd3756182d3dff03208e820def4b83c45edba0484fa2f5a33c93880c3f4bb
 DIST calamares-3.1.13.tar.gz 2279516 BLAKE2B ff2c81e81086d53c205c25dbdb7e8b1b60f5f10c979e9afd85c02426cd38037c6fbbf76e21fa5fb152ea9bf1c47658563ba5b2fb7e84b4e2734d6269584315df SHA512 451e04fe41448976e612b2a682cf38ed2683b490bb195ba82ad97d47dfd3eb808f8c25251be00104e3f3b4086ab37be462034bbd2866e64536e90f7ebcfb0d7a
+DIST calamares-3.2.0.tar.gz 2488863 BLAKE2B 6941cdd7eb381a6ee4f7bc2628605ee5a670de0d839b5797cec930737ec5fc09e214c484c2e8398ab2f12669bbc64768d5ee20b2aa1adae799fb96373a0b07df SHA512 0b502749ace48ce56f2bb364d265c5b9197cca2b27115663f928cb58d02ba43e93b80b5022053bca5899ce6ee35146992157408fc5af017da6d61abdcdbc4e1d
 EBUILD calamares-3.1.13.ebuild 1983 BLAKE2B ee4739b47d4224b681e5909fcc872eb59f8d414ecfd316338ae948b45fdcca51bcf7a82608b74b25e79db6a77fbe538f1ba4850edbc848a07bb4bf10aa9e471a SHA512 6c1630a7e30912297bc8238b46f40eb2935bd36ec862a421d46281881f167bd31b116c9bb19f082f9f584c01bc4102a241b8a668eae1cbcd6803e4b7404a969b
+EBUILD calamares-3.2.0.ebuild 2134 BLAKE2B 48d01855b913950b9e3fe68ed4e4ca7d2879e62bbf4f10ffa2d364704a1b806709b2afd0d48a1daa2ed8a50aab4154bc2135be949817bff8fd2c25b603ef610f SHA512 021c49d45c83ee2491f3eb14ac4d7c601139dfe40a1950fcae45381048760081c14120283a5988286f6e2487851a5629cfb1143279170e7d28924d6b38e7798c
 MISC metadata.xml 1055 BLAKE2B a6c7974103baa5a646cb1d594e3f224903df9ce5c618ad4ed46c0b3d4df5d3437be570eda0d55e3b0ca8f6df4af9627b088ace2a3f0efc802528aeb49fc7bce6 SHA512 0269dad0b0a05e7c729ad5b9f1f7d6790c117b0d76b904dc909b868b1c298ff3352faafe91104b39cfc3c2e4f5e1a20244d3f5321c937d2334bd15bd910dc89f
diff --git a/app-admin/calamares/calamares-3.2.0.ebuild b/app-admin/calamares/calamares-3.2.0.ebuild
new file mode 100644
index 000000000000..a0864c5ac076
--- /dev/null
+++ b/app-admin/calamares/calamares-3.2.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_5,3_6} )
+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 kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kpackage)
+	$(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)
+	$(add_qt_dep qtxml)
+	dev-cpp/yaml-cpp:=
+	>=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+	dev-libs/libpwquality[${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() {
+	cmake-utils_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)"
+}
+
+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/lastpass-cli/Manifest b/app-admin/lastpass-cli/Manifest
index c3ad167a47bb..c1eef55405aa 100644
--- a/app-admin/lastpass-cli/Manifest
+++ b/app-admin/lastpass-cli/Manifest
@@ -3,9 +3,11 @@ DIST lastpass-cli-1.1.2.tar.gz 102796 BLAKE2B 7c6a19698616e9a3ab6286b2eaaaed1b4a
 DIST lastpass-cli-1.2.1.tar.gz 108780 BLAKE2B 82ebae9a6a707bb75025cf98b53bccd2403eb0a3855d7f6ca7c5fdbf55465f929df529100da7933ce73ab7ece35275e0ffd96e6463eb1ecbd81dcccca3b80047 SHA512 c7c9f20dbc083873b815834320828a30a1c488571efbfc5aea47c3bd2073819d713810c785855d4c0c208e1b95aa0e5fc550a0b6b5c0f787eca1f54589e18e62
 DIST lastpass-cli-1.2.2.tar.gz 110045 BLAKE2B 96fcfd8f6e974edb5bd8701e18e73b46c0bcbcc14c38debd50be922a25ece9397bb6b641d4f2ce3057e57af0114a263eaab03e86b74e61d89a745411051bb172 SHA512 7d211c7669fe2de3e3f34cf00025376fd39a7f96c8573a0eaff64f322daab03de21e25d5875d3286a794580ac75d330c7bfe1005b377afc2b13e4ded9d78012c
 DIST lastpass-cli-1.3.0.tar.gz 113969 BLAKE2B 5570567b17f043200f6b4eca72735d26d153a91cb4f0551a856532101ac610d2505bc90677735a8bbafe68f1a1b7ac0a026ac642a9f3786cceb7638ea29394fb SHA512 7a147e08ac4b8e4e895744f80c484db9da895f4439bccbc141fe17e480285c76479753c2b879c60258d740af39775a3fae225ad193b5e6379a1cae8862c2a3ae
+DIST lastpass-cli-1.3.1.tar.gz 114843 BLAKE2B 7983d4090092ef3443d8c502d157934fa2384426f0be22c796795cdf664be3ba396f64daa81cdf896cb6901d4063f93e54b62cda4349b14fa4d312a21c5bb76d SHA512 092d28dc459719e662fbb2c5e92e8cc75be108aa9d7b62569ee44cb34dd9588e78151fdc5ad114c30e8de21c0b8803edc41db9295548c7cbfe6e537c9a52aad2
 EBUILD lastpass-cli-1.0.0.ebuild 1012 BLAKE2B 9c0bc0d6b795f2c01838c09ca05b3a7e5fae9c09f60b65239e8d0fff49f2b244258781cd66c44eaa3795c978bf817b28dced02fe11ed4dd0d4de39d75ebe73d1 SHA512 d319bd79f9281f4ef9c6dce9ae68e58ac628addf7218b1bce38d983731a8e21cb9f4e112bb74fe2a0a598767c3381917c27191fc91834f5c1bd15fc22c92564f
 EBUILD lastpass-cli-1.1.2.ebuild 937 BLAKE2B e9b7f4264bec259d4abe5789114e0a4c64dbaba89d43a2ae0618719a7eb3ef6ecaea8f57b5eba8d477604a528c27f7cd3f7c64bf2322021c81311af079cd2a8d SHA512 f25a76711dbb73d592a3d2b325f3de0eae899ce2db7f21948624c7a846de88bfd5ee2b6bc46a4f973674df043eb0ab22817774c724145bec4975650d55f645be
 EBUILD lastpass-cli-1.2.1.ebuild 1273 BLAKE2B c60f42829455207808dabbc6304f99c02f13fb6bc01cdf378ca382d305740a8c66ebebeefc892d81325742d87f2c4ef2c2bfc55f7921bb0e59d5904271cea4c6 SHA512 7da1fb209fec0057d70cc2eff410cfcd410be6b6fba183bab5ccb8279e729df3a8acc3e1cfe2b339e6bbfd346c4d2eecee924a2c8fe15a6ebf5a502efc7fc16c
 EBUILD lastpass-cli-1.2.2.ebuild 1280 BLAKE2B b06a35c163f277bdbbc20f2366f93d4ad6ae20ebbd39317e91424db7a0828b6d664008f4e8bf8bf3dac39fb540439dae1ac5f92756dda2744918d024bee42d7b SHA512 a2455060f8ba03105c704217d23086c2f04380a63dfb6b02bdac1065cfc0559e83fd0eee2a6e3a1ea6ca9b64c9f477b4dd857b62058a49eb5fa0df997d825fd1
 EBUILD lastpass-cli-1.3.0.ebuild 1310 BLAKE2B 61bc2fb9f4b3d260f647b9265f7616bdb97dbe048d2d5699f66c8816691ff8e06653c81e28f4908eba7513814e9c619fe3b8f9e88b45c1701457efe592f0f521 SHA512 daf6a5a270b750b9f95e3b1a06c57cd7112982901d0d49c16bb4a51da92ac6db95996d427a6a8d6709ad1d2a4bbe57dd74e5261bdadfe479fa7f49b14c936bf1
+EBUILD lastpass-cli-1.3.1.ebuild 1310 BLAKE2B 61bc2fb9f4b3d260f647b9265f7616bdb97dbe048d2d5699f66c8816691ff8e06653c81e28f4908eba7513814e9c619fe3b8f9e88b45c1701457efe592f0f521 SHA512 daf6a5a270b750b9f95e3b1a06c57cd7112982901d0d49c16bb4a51da92ac6db95996d427a6a8d6709ad1d2a4bbe57dd74e5261bdadfe479fa7f49b14c936bf1
 MISC metadata.xml 643 BLAKE2B a5a01a1dbcc257692bd14369470d69eef33a00a9910ed5006c62f1f5fec2a9a261dd6ece42bcaa68345a21f6e26958f965f90459501324b0e7a168f3fcc4f7f9 SHA512 6b1a7f6566687384d328260576dad306dd07add06001b3746b4f37f05ff91b6ee72e1e2ecfd35463a5b78b4ba8dd1a7757503bdf992372dbd474967e4bf0e9f3
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.3.1.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.3.1.ebuild
new file mode 100644
index 000000000000..2c34bdeb3291
--- /dev/null
+++ b/app-admin/lastpass-cli/lastpass-cli-1.3.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils bash-completion-r1
+
+DESCRIPTION="Interfaces with LastPass.com from the command line."
+HOMEPAGE="https://github.com/lastpass/lastpass-cli"
+SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+ GPL-2+-with-openssl-exception"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl X +pinentry test"
+
+RDEPEND="
+	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-misc/curl
+	dev-libs/libxml2
+	pinentry? ( app-crypt/pinentry )
+"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBASH_COMPLETION_COMPLETIONSDIR="$(get_bashcompdir)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile all doc-man $(usex test lpass-test '')
+}
+
+src_install() {
+	cmake-utils_src_install install install-doc
+}
+
+src_test() {
+	local myctestargs=(
+		-j1 # Parallel tests fail
+	)
+
+	# The path to lpass-test is hardcoded to "${S}"/build/lpass-test
+	# which is incorrect for our out-of-source build
+	sed -e "s|TEST_LPASS=.*|TEST_LPASS=\"${BUILD_DIR}/lpass-test\"|" \
+		-i "${S}"/test/include.sh || die
+
+	cmake-utils_src_test
+}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 0a44b8661aa9..4ab191849edb 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,6 +1,5 @@
 AUX 43e2c935252b995134ce353e5e6312cf77aea480.patch 13618 BLAKE2B 91727c30b968b41dc8f6bb2ca217d5b9ccc2b5d08872be5a65a45b7f8bc37130255df139a17b7ca09b39b5b1a0b9ddcd6c54d2448148495cf493e7a085d2f0f5 SHA512 65b303c957a29bb5782a2b849944fba029dea3a533c25d4c17830391b5e4963fef304c0be876f5e7892b1a0eb4da16390d4ab1e39f459c05ecbb7100c9c0a9ca
 AUX 50puppet-mode-gentoo.el 217 BLAKE2B 632d02667437b04642b7d3510d5010a3a7952ccd6aaa301a463c629c5dd6320c847e9f05425bd5882681a471761d0fe501ccf6860faa33b9e5458a761dad40a1 SHA512 3fbe7045df9ac9d30520020d4df454a03f02989bbcaa4bae0c632f86f6e6d3fd2eeb3bed84d864077c2b85b65586406525fa621a262ec363f53d714a093f6d1a
-AUX puppet-4-webrick-ruby.patch 2062 BLAKE2B 49cecd9d0ff077dd8d9e435bfaa1f51cfd45ad6baa2fcc8198d0c2cd53e2b0e04cbc49c8488ddbe23d3187f423c03a0e14b77f242d3fda6a019770be927a78da SHA512 045fec755dea2ef258d76962fee795b4e7b01f596cb6b622434226f978d4756e059bbdf8c140c88c32d145e99f3aa627ae15349430588d00a0ed90f2371bd934
 AUX puppet-fix-tests-4.7.0.patch 1102 BLAKE2B e5c98627620f9f76f1421a13969dba3b1d279a63cdb65fc28713a9a2849c8e8cd0e42a30c9058e341d5bbabd3d24ae17c050fa551566e6c61301b83396a0b80a SHA512 81485af1a218b5616195ed80b3fc963c42d56265477be9a636c0e915a18771ff93e12cdbded45ce90da17ce72be4ea4881b5ad8e9d5a997be271df3cd2e8a2c8
 AUX puppet-systemd.patch 481 BLAKE2B 8ca58755e5c3a235c60eed11c98e20bbd3cb27c81531709b27981ee61f6f5dea63d2487d49761ff84e7590b608c170bcd369fe7ef3700a5df1bd03b29c66ec71 SHA512 08bb997cedea378efa4614e4b2ff04acdd68cdc376fde422677b64dc56b8256ecf7221210c20529bb5a9a49fa8c92f67667c7acd6ac64b665e79639318a3df97
 AUX puppet.init 917 BLAKE2B 0ebbcdd8c9d4154984130ba3f597969f5f070f65f246770583663df4f192052a0ed666d09d4d417864457814d6a680ac4f327dc2a83b774da3a3c0d4efea1c8d SHA512 6bd2e1c21abaa5149b853f1732a6bb84335a8b4ae4129db52da463597691fd983d347bc04aad69724034d37f953f50c6aa5316d517b9efed2414db8e3d94d7bf
diff --git a/app-admin/puppet/files/puppet-4-webrick-ruby.patch b/app-admin/puppet/files/puppet-4-webrick-ruby.patch
deleted file mode 100644
index ce4b055644f6..000000000000
--- a/app-admin/puppet/files/puppet-4-webrick-ruby.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From a358d5ec01c6f87b39e5bfbab7a35582624fdbf7 Mon Sep 17 00:00:00 2001
-From: Josh Cooper <josh@puppet.com>
-Date: Fri, 12 Jan 2018 15:30:38 -0800
-Subject: [PATCH] (PUP-8297) Don't accept already connected socket
-
-Webrick's start method yields an already connected socket, so it is not
-necessary to call accept on the socket. In ruby versions prior to 2.3.6 and
-2.4.3, the accept call was a noop.
-
-In 2.3.6 and 2.4.3, it is an error, because ruby those versions use a
-non-blocking accept to handle clients that make an TCP connection, but
-are slow to negotiate the TLS handshake[1,2]. On these versions, puppet
-master would report:
-
-    SSL_accept returned=1 errno=0 state=unknown state: unexpected record
-
-Remove the call to Socket#accept.
-
-[1] https://bugs.ruby-lang.org/issues/14005
-[2] https://github.com/ruby/ruby/commit/2e728d51e70ed3756ad760c687a08b8487b0112f
----
- lib/puppet/network/http/webrick.rb     | 1 -
- spec/unit/network/http/webrick_spec.rb | 5 +++++
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/lib/puppet/network/http/webrick.rb b/lib/puppet/network/http/webrick.rb
-index 9ebf1763be5..3ac2ff40650 100644
---- a/lib/puppet/network/http/webrick.rb
-+++ b/lib/puppet/network/http/webrick.rb
-@@ -29,7 +29,6 @@ def listen(address, port)
-         if ! IO.select([sock],nil,nil,timeout)
-           raise "Client did not send data within %.1f seconds of connecting" % timeout
-         end
--        sock.accept
-         @server.run(sock)
-       end
-     end
-diff --git a/spec/unit/network/http/webrick_spec.rb b/spec/unit/network/http/webrick_spec.rb
-index a90fc3f3378..843b0d54c8a 100644
---- a/spec/unit/network/http/webrick_spec.rb
-+++ b/spec/unit/network/http/webrick_spec.rb
-@@ -92,6 +92,11 @@
-       expect(server).to be_listening
-     end
- 
-+    it "is passed an already connected socket" do
-+      socket.expects(:accept).never
-+      server.listen(address, port)
-+    end
-+
-     describe "when the REST protocol is requested" do
-       it "should register the REST handler at /" do
-         # We don't care about the options here.