gentoo resync : 12.05.2022

3 files changed, 2 insertions, 87 deletions

diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index d7d6b0da2486..f87956a8c844 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -8,10 +8,8 @@ AUX elasticsearch.service.conf 235 BLAKE2B 23ada111be21dff12323edbe981883cb1ed27
 AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721eae1d69e19c595bfbf329618b9cb67be9528f1994c546233cffd31b20eee39edc142bc86f7a7cf5e08903e SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c
 AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
 DIST elasticsearch-6.8.23.tar.gz 149672445 BLAKE2B dd7b080f1496f3a20755c183befae74194eab05b04c6f77679e9dad6067eef5222a4c7ce43d6267f1233a7bf864c6f8b23d5caf52278e1fe5f48f465e6603113 SHA512 73258b400cd194768058105a74ca0e811962ccf81bed8c4d3a824d4e5b97a8178a31150e60602fa1e04c6764b139980eb45ae6f246864702120653b45120b597
-DIST elasticsearch-7.16.3-no-jdk-linux-x86_64.tar.gz 167284956 BLAKE2B 9dfa13d6f08bf5bbd5752870839c344635e3cc6b9f34e92948f09afdfb3929c0942d89bd02d5844f40a80d18c2cac51c8bb207c0c830ad2853acf662f5e79845 SHA512 ec9747694ba9f8b76b1620e42addd106afa3d3c207dd3836afe2482556f8a982fa03f3536ebb762f12a6093c9a5eac63cdbf2f1941dde9e3ce69c41652749d4f
-DIST elasticsearch-7.17.1-no-jdk-linux-x86_64.tar.gz 167347718 BLAKE2B 8fd17260d0bc37a8f4a95371ed47bf2797df4eaaa226179270aced4c9fbff9bfe484ca66605a31773921d18cb2a3c91d25435555f31688ed426c4ccce8ac62e1 SHA512 3f572eed0d0a9140f843dcc07911c32a10bb76c4e2c2a4c904ba3279e0401c58fe0f7c7776a7347fec3acd5dbebf3c9f1888f59e782c3a46c76f038e82d53f7c
+DIST elasticsearch-7.17.3-no-jdk-linux-x86_64.tar.gz 167378547 BLAKE2B 4bacb075e94587351bb4638da15644ed372ec1ad2b72e1c9b84c511e84666f6b79ccc8519ce5fede119e6c134ac500a1209578f18a26fd8566646e870a17f9ba SHA512 f2d5953710adfe31f1e30a0fdf4c091c0493f613a83927ddec4bbc74d2eccb839e1ffa6d44636ad0ad9c07613915847cc7a68fc87e465a8a851c96e023917bf1
 DIST elasticsearch-oss-6.8.23.tar.gz 68573265 BLAKE2B 80366fdc4eaaf45161a36da112397938a82d08d842d82dd5a9311abf63ca20afb93ecc06387c6852bbb1a861306382d6e7c2314e67635b6f2e75cdc183057ad8 SHA512 14dbb2809b06499373c3ec5035d829d62255c2c93103618fbfe3d7d03cecf8847f654e83c78f765f23224126ff18ed713b959857e8ecf435c475b11bcd143d3f
 EBUILD elasticsearch-6.8.23.ebuild 2597 BLAKE2B 8ee44e77ee5a1e4fbf5a2b2811c1a0ef57e2b1ac9e6125ae8ee2faf9ee47f86061340af6df3497e36dd012310bf55a3bc2eab315a628c75292749bc6e4fe471d SHA512 f22f587ffb0b3eb01ceb3ee3cc072b433aaeaa6d5462bbee2d7f318bf59109357c2755bd7813ebf2729e5df97c74bc5f65848449bfe8afe75f304d41485cd4c3
-EBUILD elasticsearch-7.16.3.ebuild 2404 BLAKE2B 53442d4b047689457b04aa62696256a4748db73f07791a94a7324eb947e9a14d5d00122b0bacdfd02a38006b19b994a97f391d921b68a19817891d26c233adbe SHA512 f4a9631133a62e6528053a74b0ba5d8199a588e73b69bfc9a5c541c53e326cede24a1ffe44b3a9d8af0056e014c09965b7ecf983b944907de40f9244959ea9fb
-EBUILD elasticsearch-7.17.1.ebuild 2404 BLAKE2B 53442d4b047689457b04aa62696256a4748db73f07791a94a7324eb947e9a14d5d00122b0bacdfd02a38006b19b994a97f391d921b68a19817891d26c233adbe SHA512 f4a9631133a62e6528053a74b0ba5d8199a588e73b69bfc9a5c541c53e326cede24a1ffe44b3a9d8af0056e014c09965b7ecf983b944907de40f9244959ea9fb
+EBUILD elasticsearch-7.17.3.ebuild 2404 BLAKE2B 53442d4b047689457b04aa62696256a4748db73f07791a94a7324eb947e9a14d5d00122b0bacdfd02a38006b19b994a97f391d921b68a19817891d26c233adbe SHA512 f4a9631133a62e6528053a74b0ba5d8199a588e73b69bfc9a5c541c53e326cede24a1ffe44b3a9d8af0056e014c09965b7ecf983b944907de40f9244959ea9fb
 MISC metadata.xml 490 BLAKE2B 48bca2017c5b522ba95203316efcb1fa711a0a1689fe75bc3b645f3f305d0671e69747d657e0b561237b472a721edf7cbe51a32919a71b57dc30e86bd4c05655 SHA512 37e637e54f452cd1fcc23a5e1537d53af6a17f3e7d805bb6d091d85e564f9132931ebf9c020580bf9fe81721293d972b03fa47985c04a722570630248ca416c4
diff --git a/app-misc/elasticsearch/elasticsearch-7.17.1.ebuild b/app-misc/elasticsearch/elasticsearch-7.17.1.ebuild
deleted file mode 100644
index be38b6a483a2..000000000000
--- a/app-misc/elasticsearch/elasticsearch-7.17.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd tmpfiles
-
-DESCRIPTION="Free and Open, Distributed, RESTful Search Engine"
-HOMEPAGE="https://www.elastic.co/elasticsearch/"
-SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}-no-jdk-linux-x86_64.tar.gz"
-LICENSE="Apache-2.0 BSD-2 Elastic-2.0 LGPL-3 MIT public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="acct-group/elasticsearch
-	acct-user/elasticsearch
-	sys-libs/zlib
-	virtual/jre"
-
-QA_PREBUILT="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
-QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
-
-src_prepare() {
-	default
-
-	rm LICENSE.txt NOTICE.txt || die
-	rmdir logs || die
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /etc/${PN}/scripts
-
-	insinto /etc/${PN}
-	doins -r config/.
-	rm -r config || die
-
-	fowners root:${PN} /etc/${PN}
-	fperms 2750 /etc/${PN}
-
-	insinto /usr/share/${PN}
-	doins -r .
-
-	exeinto /usr/share/${PN}/bin
-	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	fperms -R +x /usr/share/${PN}/bin
-	fperms -R +x /usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin
-
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	fperms 0750 /var/{lib,log}/${PN}
-	dodir /usr/share/${PN}/plugins
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
-
-	newconfd "${FILESDIR}/${PN}.conf.4" ${PN}
-	newinitd "${FILESDIR}/${PN}.init.8" ${PN}
-
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
-	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
-
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.d ${PN}.conf
-}
-
-pkg_postinst() {
-	tmpfiles_process /usr/lib/tmpfiles.d/${PN}.conf
-
-	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/${PN} into the configuration directory of the instance:"
-	elog "/etc/${PN}/instance"
-	elog
-	ewarn "Please make sure you have proper permissions on /etc/${PN}"
-	ewarn "prior to keystore generation or you may experience startup fails."
-	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
-	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
-}
diff --git a/app-misc/elasticsearch/elasticsearch-7.16.3.ebuild b/app-misc/elasticsearch/elasticsearch-7.17.3.ebuild
index be38b6a483a2..be38b6a483a2 100644
--- a/app-misc/elasticsearch/elasticsearch-7.16.3.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-7.17.3.ebuild