gentoo resync : 16.11.2017

5 files changed, 194 insertions, 70 deletions

diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 9ec5adce953f..5c83216935ab 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -5,11 +5,13 @@ DIST nss-3.30.2.tar.gz 9499119 SHA256 0d4a77ff26bcee79fa8afe0125e0df6ae9e798b6b3
 DIST nss-3.30.tar.gz 9500552 SHA256 a8c0000dae5e992f6563972e26dbfefc50d006dd845c43b8ca24ea50169ff3a9 SHA512 c21e9b5e4b689ea8cbc6f4d7913df43e2a78c4435e0ce092f2ce00e46079ce2268e17ec8527b283ac69eff3d96ff0165a5b42b6579bfe0a720115ff2938260d3 WHIRLPOOL bc0a59484010a5771b515dde1440ccca8a63b167d3d8839b3606460fdf9d2dc3ab7d889173c88edb7d685d39ad3614c4cbc66284d0faced47cdcc01a69997d9a
 DIST nss-3.32.1.tar.gz 9494609 SHA256 4de59ca7f5bf4a56fbcfdbb4a054f254ba9f408f56476957404a091048624652 SHA512 b377aba822c2955d801022eba1636b71943a64f6e74d5611c2625910d230059383c4dbdedd65e70b356eaea33aeefdd24de3b31d7a4823d921ea475af3dd9da8 WHIRLPOOL 4c15b4ba85ce10787b9ee541d20a829a99aed5628b59f7e7e3045ec694d6d8a0a83bc730ae4d74148cf7c425f59debfd1574cb1b036c1407d1f9d4896647d9cf
 DIST nss-3.33.tar.gz 9578033 SHA256 98f0dabd36408e83dd3a11727336cc3cdfee4cbdd9aede2b2831eb2389c284e4 SHA512 82adc0b73805ba5e73b9bf350fffa383a8b4396c05f49edb360a53319b4ad26d928a135bee245f9da009d162129db4441a96ef05346dadac20922b21284468b0 WHIRLPOOL c11129bce97990a41a3118e62d79481fbd38cad51356a6b6c1b0af7efe2f27b3d5d51a8e987287c1cdff77ccee14a3e96d5bbb76e92f9a81b2f50988de250dea
+DIST nss-3.34.tar.gz 9586315 SHA256 0d45954181373023c7cfc33e77c8c636d394ec7e55b93e059149ed7888652af5 SHA512 72388b596151499850546a68d9a20d82434c59f159564fb7170980f110d43d7026f174f93660d3bb6da79b618fd7d4f1f16246fc80ba568aa555df99ebbaea21 WHIRLPOOL ae6784022aa74671c62141023e40e5dfce51bc90b49c6520ad46307eb3b84246c1557bbcc0b63554d6aef42940a2667f46cebfe57f9962342f176e79fe9384e0
 DIST nss-cacert-class1-class3.patch 22950 SHA256 6bba29cee34276e2ca6436dabedfeba2b61fb46668c5d5ceabf0c871574649bf SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0 WHIRLPOOL 1246223b01292604e5609bb9c580f092dc5937bf8c98f6891b099e8bab960e03612b6617e30a55d6ff8817d88f190e03812fe8f89f84f25c20970493dc2f7700
 EBUILD ca-certificates-20161130.3.30-r1.ebuild 5957 SHA256 1170f2cf15ebeb6246fb8e8306ec3a2f30dc395473814ba29f486b8f10237523 SHA512 9daed98f9c1b864f6fb5aaa9172820ca660f0c794b9a68a82dd90979630c7f0d66682fd27896d679fcdfcd0048fbac77ce25b133db65f0e03c73628276649477 WHIRLPOOL ed4cbd382c9f91db90ab72856d954b929032bcea350c856083b3682239a8d33a2815bb164004137f33fa86786593b471707cca53fee913854156fe57e096942e
 EBUILD ca-certificates-20161130.3.30.2.ebuild 6252 SHA256 c913c9bc87dedd440bcf5ec81a813a9be6cab4e600487ddee44bff2a717b5ac7 SHA512 103c83cbd4275f17581a8d85c53c907373d737ba5c86b389ae986b3692d8559f6da1cea9c47678164a0fed7ba20970c15c91db6c2277f5903066d29ed2aa9aca WHIRLPOOL 3fc151f5dbf795f2eb9c8b0d62a16aac11f04d57c011646aaa3deba8f532d771e42306098e53df1a2b1da7f5da14333b68b7ca2c9054c588bb01e2cfdd519f26
 EBUILD ca-certificates-20170717.3.32.1.ebuild 6278 SHA256 6a119d901acd84ee15e09f3331f0179fc59abaf134479346babab2ea4a8b43ce SHA512 394207e7ac8970d6b0724ec1bb3d7c233724d4c2f9a05a8c7a475b2d40e08483e940ad185ca6eea023c5d6bff6868b0aa10c4f642eccb6238ffa71ef9505df94 WHIRLPOOL e706d2d9404b81c1b193e3a7c0a61a3465e9d2b3912713196773362b08106aa1fb29f0e5d7138c1bb349fe90390f4a597c93a43291dff8d00b2bcdb63dbbfe9a
 EBUILD ca-certificates-20170717.3.33.ebuild 6278 SHA256 6a119d901acd84ee15e09f3331f0179fc59abaf134479346babab2ea4a8b43ce SHA512 394207e7ac8970d6b0724ec1bb3d7c233724d4c2f9a05a8c7a475b2d40e08483e940ad185ca6eea023c5d6bff6868b0aa10c4f642eccb6238ffa71ef9505df94 WHIRLPOOL e706d2d9404b81c1b193e3a7c0a61a3465e9d2b3912713196773362b08106aa1fb29f0e5d7138c1bb349fe90390f4a597c93a43291dff8d00b2bcdb63dbbfe9a
+EBUILD ca-certificates-20170717.3.34.ebuild 6278 SHA256 6a119d901acd84ee15e09f3331f0179fc59abaf134479346babab2ea4a8b43ce SHA512 394207e7ac8970d6b0724ec1bb3d7c233724d4c2f9a05a8c7a475b2d40e08483e940ad185ca6eea023c5d6bff6868b0aa10c4f642eccb6238ffa71ef9505df94 WHIRLPOOL e706d2d9404b81c1b193e3a7c0a61a3465e9d2b3912713196773362b08106aa1fb29f0e5d7138c1bb349fe90390f4a597c93a43291dff8d00b2bcdb63dbbfe9a
 MISC ChangeLog 13827 SHA256 03be314bd258d19e70f073f6041d41e923f368948cd6972a2d2974a8626cba81 SHA512 45905a654eb2f3927c7146a616938fec5345fe5e8dd5d21c02598731870caeb210f89f099d2f130e1d98f4c2b1c7c82a78841172ba0e930e208a944064ded770 WHIRLPOOL 2c89a74ef968ba4d445414547dec2dd152cdcbef4a29fe128d4e197d1ac7b82cd99f83853b0d0bae0165dd7f6c7239e5664847d84e2dd4a18a503f64e04caa6c
 MISC ChangeLog-2015 18522 SHA256 79448844b1ba037ee3e6776a0fb72f52f4183900673949aeb28c7b2922f7b739 SHA512 9878595d40dfe3e6eb2acaf5d63eaaf8ed626abd7c2a57621feb26b1bd470ff45457b0abae297fe5fcf335bd968a73a4b051b72471cb671f81539d17f1919bf7 WHIRLPOOL b9d6560a5791537e4a18a9d66463fecdd2f631c3f73dbda40596438b4e4dbcac40a36a321b149d704b883ecf96039275ec2df7104a69b9234c971cba801b7347
 MISC metadata.xml 528 SHA256 82257b6c86e0cd30e5939f853827af168389f14bd3010ac8cf8e3dd1085545e2 SHA512 84e804b3a3715fa5a862f5b97c8821d0ecd6a95820a198a09543461374e24d3f0d0dcdc96687f065c0d69b4bf8e151bbf692d02850185c0e71418b14513e2e74 WHIRLPOOL 654f1f8d4b0c4646a749ee982e2437db39421fcd018a2c428a77f3d1f11279a69533019a02749b153c0d5c30f9fa18403b0f4a45de6315bb347d991368d4c5c1
diff --git a/app-misc/ca-certificates/ca-certificates-20170717.3.34.ebuild b/app-misc/ca-certificates/ca-certificates-20170717.3.34.ebuild
new file mode 100644
index 000000000000..7778372001e5
--- /dev/null
+++ b/app-misc/ca-certificates/ca-certificates-20170717.3.34.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# The Debian ca-certificates package merely takes the CA database as it exists
+# in the nss package and repackages it for use by openssl.
+#
+# The issue with using the compiled debs directly is two fold:
+# - they do not update frequently enough for us to rely on them
+# - they pull the CA database from nss tip of tree rather than the release
+#
+# So we take the Debian source tools and combine them with the latest nss
+# release to produce (largely) the same end result.  The difference is that
+# now we know our cert database is kept in sync with nss and, if need be,
+# can be sync with nss tip of tree more frequently to respond to bugs.
+
+# When triaging bugs from users, here's some handy tips:
+# - To see what cert is hitting errors, use openssl:
+#   openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
+#   Focus on the errors written to stderr.
+#
+# - Look at the upstream log as to why certs were added/removed:
+#   https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
+#
+# - If people want to add/remove certs, tell them to file w/mozilla:
+#   https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit eutils python-any-r1
+
+if [[ ${PV} == *.* ]] ; then
+	# Compile from source ourselves.
+	PRECOMPILED=false
+	inherit versionator
+
+	DEB_VER=$(get_version_component_range 1)
+	NSS_VER=$(get_version_component_range 2-)
+	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
+else
+	# Debian precompiled version.
+	PRECOMPILED=true
+	inherit unpacker
+fi
+
+DESCRIPTION="Common CA Certificates PEM files"
+HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
+NMU_PR=""
+if ${PRECOMPILED} ; then
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
+else
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
+		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
+		cacert? (
+			https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch
+		)"
+fi
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="insecure_certs"
+${PRECOMPILED} || IUSE+=" cacert"
+
+DEPEND=""
+if ${PRECOMPILED} ; then
+	DEPEND+=" !<sys-apps/portage-2.1.10.41"
+fi
+# c_rehash: we run `c_rehash`
+# debianutils: we run `run-parts`
+RDEPEND="${DEPEND}
+	app-misc/c_rehash
+	sys-apps/debianutils"
+
+if ! ${PRECOMPILED}; then
+	DEPEND+=" ${PYTHON_DEPS}"
+fi
+
+S=${WORKDIR}
+
+pkg_setup() {
+	# For the conversion to having it in CONFIG_PROTECT_MASK,
+	# we need to tell users about it once manually first.
+	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
+		|| ewarn "You should run update-ca-certificates manually after etc-update"
+}
+
+src_unpack() {
+	${PRECOMPILED} || default
+
+	# Do all the work in the image subdir to avoid conflicting with source
+	# dirs in $WORKDIR.  Need to perform everything in the offset #381937
+	mkdir -p "image/${EPREFIX}"
+	cd "image/${EPREFIX}" || die
+
+	${PRECOMPILED} && unpacker_src_unpack
+}
+
+src_prepare() {
+	cd "image/${EPREFIX}" || die
+	if ! ${PRECOMPILED} ; then
+		mkdir -p usr/sbin
+		cp -p "${S}"/${PN}/sbin/update-ca-certificates usr/sbin/ || die
+
+		if use cacert ; then
+			pushd "${S}"/nss-${NSS_VER} >/dev/null
+			epatch "${DISTDIR}"/nss-cacert-class1-class3.patch
+			popd >/dev/null
+		fi
+	fi
+
+	default
+	eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
+	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
+	sed -i \
+		-e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
+		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
+		usr/sbin/update-ca-certificates || die
+}
+
+src_compile() {
+	cd "image/${EPREFIX}" || die
+	if ! ${PRECOMPILED} ; then
+		python_setup
+		local d="${S}/${PN}/mozilla" c="usr/share/${PN}"
+		# Grab the database from the nss sources.
+		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
+		emake -C "${d}"
+
+		# Now move the files to the same places that the precompiled would.
+		mkdir -p etc/ssl/certs etc/ca-certificates/update.d "${c}"/mozilla
+		if use cacert ; then
+			mkdir -p "${c}"/cacert.org
+			mv "${d}"/CAcert_Inc..crt "${c}"/cacert.org/cacert.org_root.crt || die
+		fi
+		mv "${d}"/*.crt "${c}"/mozilla/ || die
+	else
+		mv usr/share/doc/{ca-certificates,${PF}} || die
+	fi
+
+	if ! use insecure_certs ; then
+		elog "To prevent applications relying on system's trusted root certificate store"
+		elog "from using CAs where at least one major browser vendor Gentoo is following"
+		elog "has decided to apply trust level restrictions, the following"
+		elog "certificate(s) were removed:"
+		# Remove untrusted certs from StartCom and WoSign (bug #598072)
+		elog "$(find "${c}" -type f \( \
+			-iname '*startcom*' \
+			-o -iname '*wosign*' \
+			\) -printf '%P removed; see https://bugs.gentoo.org/598072 for details\n' -delete)"
+	fi
+
+	(
+	echo "# Automatically generated by ${CATEGORY}/${PF}"
+	echo "# $(date -u)"
+	echo "# Do not edit."
+	cd "${c}"
+	find * -name '*.crt' | LC_ALL=C sort
+	) > etc/ca-certificates.conf
+
+	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
+}
+
+src_install() {
+	cp -pPR image/* "${D}"/ || die
+	if ! ${PRECOMPILED} ; then
+		cd ca-certificates
+		doman sbin/*.8
+		dodoc debian/README.* examples/ca-certificates-local/README
+	fi
+
+	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
+	doenvd 98ca-certificates
+}
+
+pkg_postinst() {
+	if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then
+		# if the user has local certs, we need to rebuild again
+		# to include their stuff in the db.
+		# However it's too overzealous when the user has custom certs in place.
+		# --fresh is to clean up dangling symlinks
+		"${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
+	fi
+
+	if [ -n "$(find -L "${EROOT}"etc/ssl/certs/ -type l)" ] ; then
+		ewarn "Removing the following broken symlinks:"
+		ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
+	fi
+}
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 3b43e7d1a09c..1f6a6314bbbe 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -7,10 +7,9 @@ AUX elasticsearch.service 1718 SHA256 444bf14b63eb2a702afa313d5d0e8a2c322bfceac7
 AUX elasticsearch.sysctl.d 24 SHA256 d2130d8587c6a8860d51903b5c2f70703da61cddeb42d526fcda20fd0ec9e99c SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c WHIRLPOOL fadf47db434ba8a1533be79adb7c3045315fca661900608f50a608ec6ccd5ab34032e9a15f6b8ec5fc754ef1123ba44c68d93483c2bef8530c8523a925c9b3bd
 AUX elasticsearch.tmpfiles.d 56 SHA256 391d807443518cd5568f871e64a970487ac750a43ead260f2e2b213131095c63 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a WHIRLPOOL 0fc897d34569e2786b06eae2d06178ac87e34d9ec24a3229213b038c3314188efecc0876ad39a482f4e0a446b71dfee49d6cbb53db4aa3de0d973c6d131d571e
 DIST elasticsearch-5.5.2.tar.gz 33485703 SHA256 0870e2c0c72e6eda976effa07aa1cdd06a9500302320b5c22ed292ce21665bf1 SHA512 62048f15b43e38a61e3a19a1599c25cd0d9009cc1172db5b450b04dec349ecd313b1f20e3d1c7ed1c101ae3e6f6c6d2cdf004a9713ad803576277f93e3adbdb9 WHIRLPOOL 3a71cef2858b76b11e1693907e745912a83f23e26c35a3456c6324fc19c317c53d4404e20134b034e41e162c1ea8d58c38bbd4afe0394d886ab32f6b698172ec
-DIST elasticsearch-5.6.3.tar.gz 33774486 SHA256 492b7e59d5204b3dc7eb13b611c33b3db36b392bdd6a4c004ba99c6543fc28f9 SHA512 ee57d010e196eb25e5296fe95ab2de5e503d4d66f7eec8c8f6ac2ff9ddbc1a8dc1514202d705e291ee49d3e04650b597a9afc5f92f179b8faa5e2fe3c662f33e WHIRLPOOL bda081e6b91d1076a39e0af75b44d7f877f28178281de1f22c5177abf804c9395dacabb3c93ec93aff65223df42353bc955bbf60e74fb07f99320096dd97173a
+DIST elasticsearch-5.6.4.tar.gz 33776770 SHA256 1098fc776fae8c74e65f8e17cf2ea244c1d07c4e6711340c9bb9f6df56aa45b0 SHA512 37730f39cf1711b6a20861370ef7aff4b48e7f90ad82cb1c8c92643179194c4dcdf0180691d8065304bf61e7f5a2fb1ed5c84c384e0b2ff7ad0dc58ac7352f47 WHIRLPOOL 37f1a615a7916738bb8f4809213edced96aaecf3d93df8cad0bc175c71191a6f1d3d616fc40b71e647b65e4c2e03f4f6ab9a4ff333b55d3728ca100b2181edbc
 EBUILD elasticsearch-5.5.2.ebuild 1618 SHA256 ee4a9297fab6f32f75d8df993f3cce07906328c3b4ce5fb499c495237c989096 SHA512 0018a5cecab2293bfe43581fcc67bd395e669ed2913a1e40676de420763415ab090589a742b127730ca6b8a467f06f10f3f3d1c2bec87db479909cb1a668f62f WHIRLPOOL 233680704ea7848404d497901ef2ddf723ba4f35915653abb341eda4b03dd378ac37b5950a82e164f2ef6f6ccdccc124d44421e06e9618ecbfcb0ca7d905540b
-EBUILD elasticsearch-5.6.3-r1.ebuild 1688 SHA256 9f5c02c1ee82296988aa542cc90663b2d1cdf3f396b7eacbe66911a1250d4942 SHA512 9a577ae695f21d63fd537a26837987e7c4c6525e937bc4219635890e9daac31f332adf02968a3e94e4be768c51a830726196b97f0006b49ba3b385a65e5c854d WHIRLPOOL 516c8d65586dad4cdfd4c27f357615a93291ed6a8d7e7156da19ead6130755b3b7115e79c4161eae6de78a765281403a6ebeee0384ada5a30c341ea7a4d63907
-EBUILD elasticsearch-5.6.3.ebuild 1618 SHA256 ee4a9297fab6f32f75d8df993f3cce07906328c3b4ce5fb499c495237c989096 SHA512 0018a5cecab2293bfe43581fcc67bd395e669ed2913a1e40676de420763415ab090589a742b127730ca6b8a467f06f10f3f3d1c2bec87db479909cb1a668f62f WHIRLPOOL 233680704ea7848404d497901ef2ddf723ba4f35915653abb341eda4b03dd378ac37b5950a82e164f2ef6f6ccdccc124d44421e06e9618ecbfcb0ca7d905540b
+EBUILD elasticsearch-5.6.4.ebuild 1688 SHA256 9f5c02c1ee82296988aa542cc90663b2d1cdf3f396b7eacbe66911a1250d4942 SHA512 9a577ae695f21d63fd537a26837987e7c4c6525e937bc4219635890e9daac31f332adf02968a3e94e4be768c51a830726196b97f0006b49ba3b385a65e5c854d WHIRLPOOL 516c8d65586dad4cdfd4c27f357615a93291ed6a8d7e7156da19ead6130755b3b7115e79c4161eae6de78a765281403a6ebeee0384ada5a30c341ea7a4d63907
 MISC ChangeLog 8202 SHA256 1531683acbf9c20038e964e166b7b748c2ec4f12bb8f219d75cc685b7dc8825b SHA512 54cb8dc75318bc52e9c947cec07f8926fc1f022429e9b784b21b51faba3022c6f07f50dc065e9e90529b30941ced47e9a0c03e801328f7e694f6881b0a89e6bb WHIRLPOOL 2d1c8f0e9be37b76175dda86322581da84e07c6745d7b57dfad300f10e3ecd250a7abc90e1737d699b0844961864fbb10a3be00951dbc29d503ca3abd50cab65
 MISC ChangeLog-2015 5203 SHA256 8aa86f4c8b0c8a0c2d099ff71b4886f6e7be91d4e10e22d6f49d8ba1ab0ee7be SHA512 2326fb4073b91dc0a39d18ca0a81257c8995ce7afa0d53e31db1851dd45b3b3a94f7bfa9dda00a82b5ecaf16ad022e9236a07aebe9f2ee6f3b9b024b179039ed WHIRLPOOL 03f3e445a6f763d6e42d6d13b336ab10b4ee1d64c9119f8da2e03710b180db180e8abb702241edcdc56009992bea3a1ba0395eb096e61fb97930298099e4c4ff
 MISC metadata.xml 493 SHA256 d5758f4d01ca56bdfc258e4935a6cdb891f186c7ca36b96f783065fb23dc68ff SHA512 ce03769abc314d3bf561ff5820a8c8582196e9e6755e1e695dcf1224afbc04b609fdec7a1499d2d7a3aa0a350ad9fea94e0e3b46eff7c3c6150a524edd28d399 WHIRLPOOL a69393456ad8bcfd9f698131a0b6e0bca5d220101b0f3d8a91b716f92bbfe1c5e205bac3bbdb6e5f6e7764a30abfb6a0215440c11f288b3aa40ec6c5506cf608
diff --git a/app-misc/elasticsearch/elasticsearch-5.6.3.ebuild b/app-misc/elasticsearch/elasticsearch-5.6.3.ebuild
deleted file mode 100644
index b2ac22fbd6cd..000000000000
--- a/app-misc/elasticsearch/elasticsearch-5.6.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user
-
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}.tar.gz"
-LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="virtual/jre:1.8"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
-}
-
-src_prepare() {
-	rm -v bin/*.{bat,exe} LICENSE.txt || die
-
-	default
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /etc/${PN}/scripts
-
-	insinto /etc/${PN}
-	doins config/*
-	rm -rv config || die
-
-	insinto /usr/share/${PN}
-	doins -r ./*
-
-	exeinto /usr/share/${PN}/bin
-	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
-
-	keepdir /var/{lib,log}/${PN}
-	dodir /usr/share/${PN}/plugins
-
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" "${PN}.conf"
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${PN}.sysctl.d" "${PN}.conf"
-
-	newinitd "${FILESDIR}/${PN}.init" "${PN}"
-	newconfd "${FILESDIR}/${PN}.conf" "${PN}"
-	systemd_newunit "${FILESDIR}"/${PN}.service "${PN}.service"
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
-	elog "from /etc/elasticsearch into the configuration directory of the instance:"
-	elog "/etc/${PN}/instance"
-	elog
-}
diff --git a/app-misc/elasticsearch/elasticsearch-5.6.3-r1.ebuild b/app-misc/elasticsearch/elasticsearch-5.6.4.ebuild
index cd91e97f3079..cd91e97f3079 100644
--- a/app-misc/elasticsearch/elasticsearch-5.6.3-r1.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-5.6.4.ebuild