gentoo resync : 22.12.2021

6 files changed, 5 insertions, 265 deletions

diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 1fbba9868f7a..985ba16cbb51 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -7,16 +7,9 @@ AUX elasticsearch.service.3 1527 BLAKE2B 7f7bee9019de2814cdce1e4a66932a0a2a915cd
 AUX elasticsearch.service.conf 235 BLAKE2B 23ada111be21dff12323edbe981883cb1ed275b6c7a9f55e77fdcec1919d374818683403a2a7a7c2c2839db2b8afcd66f7667d5080ecb52cade853a400f972a6 SHA512 b300dbc1b3c341ebbcac68385c651133427f342dc0351501b47730b392cc176b7b8dc53877affc6ab384d2834d246a3d0c63b6015dddf2c90d4bcf41cee9968c
 AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721eae1d69e19c595bfbf329618b9cb67be9528f1994c546233cffd31b20eee39edc142bc86f7a7cf5e08903e SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c
 AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
-DIST elasticsearch-6.8.17.tar.gz 149132823 BLAKE2B a83d4e81059a717e48ac54e7565efe282f42103718ba9cef9994a6970769bb01248e99ffbfe061ca85a7b44890604c6174dc11046a94c455dc01da7f495524ea SHA512 5eb365efccff4e371d9ac873b45684c36cfd7f25ec51a86c3cd74beff4491dbc0097dba22f91335c35478e3b25decc6ae4bc5d538add0e17a39eb063dfa2d88c
-DIST elasticsearch-6.8.19.tar.gz 149143102 BLAKE2B 74b529d9b9944101c0371c2e1a43697aca0ca5907a4fc25cb7a54b30d9d27a6e876317c8946636314db48ffab59be732ee9a52f2d989c1cff12c11ca91e68cb5 SHA512 2d12a201496668da7547eef77000d2317df083a0d03390549ded9aa80e8ea69d836b62355bb1b8ff363be446887579a34cf417b0b1b8e4d0f6a178598a3cdac1
-DIST elasticsearch-7.13.4-no-jdk-linux-x86_64.tar.gz 174690446 BLAKE2B bab17a006f14d262ee85918c8b2e5f610a1e726d158cf423bf306971826f182963e0231456539253f5054069b82672e8803c0da06166215d128bdea02e6738db SHA512 5d6d53d9d6c6faf5d6599019882aa4b5d91f04944ab26c496cab033880b71f1ce2addb98bcf12b21891c005e810ce4a0493627b9ec9f0f78b4f7786efa398eab
-DIST elasticsearch-7.15.0-no-jdk-linux-x86_64.tar.gz 196775804 BLAKE2B c08a77a03dd98acbbbdabdf408c33cc7786d8b00e64558b0658e6952d3c32842b2ede48a54e58ee85ece882f56675d77ff39bc2b6ede7d8c7e446bbfd0b23965 SHA512 dbd5c5ce9a08ea0bbc55e9f470a7455d99f1458287cb1d885f07f2670cc8885dbe764315c1267f31ef745a424ece52b4e60239993e0ed7d0bec70dd8c022f7fa
-DIST elasticsearch-7.15.1-no-jdk-linux-x86_64.tar.gz 196761964 BLAKE2B a279233f4c7f4f37fbcfe94b0a84d1158bd5d8ca0968e75ae37d752715ba4a6612b50664bc1c7371a6a3894ee1c9ac74ca88ed79a2d1e7c47b3b289565ce21cc SHA512 84690630bc87fe2655f47500f74130e5a72bdc8b0284a7ba914258cb02b16143c221976f5227c4a520e2634cc3da5f1b1ebe311c578ca22b30561a18354746a0
-DIST elasticsearch-oss-6.8.17.tar.gz 68247749 BLAKE2B 12e85804a7d58dc27d85fbed6501831d92428405cb4636355c523a370863e00301bd75d7d12404ee0c7eefc32c53bc4b23e8fc1fecf2f606faf85369b2262cc7 SHA512 0f165357b1f389fbd01f07397a2b3ea5d493fae720c15213f2ee47a0c2c75bc4a448384767646d7585a18d4577899b840121c1829a987a16d2de68f216b28f7c
-DIST elasticsearch-oss-6.8.19.tar.gz 68255213 BLAKE2B 7fba24a70dafbaf94d2c9f2f25dfc976f831759e8be67ce0a5f15ffe11b9f8d4d62b7906ad5250bcbaacab43139b4471328978c8adc4be527e178597b6bf3294 SHA512 d0a371a4bf19db38b8b0379856a3535c6472e373abd1e9cae0171cffed97005b9fb7b6f7d3d67edc3d67feb5265a9f33d974d6abad8e398148be94566735c2c0
-EBUILD elasticsearch-6.8.17.ebuild 2539 BLAKE2B de446b12484037a7952b5b21537189b1ee7157d87a779109e025648fe8cfe3c82f3c8d59dc823350faddc5ec0c6b01e7461739da052226134353ae9c3e388cea SHA512 ee3431551b5a0c2896172e00f42b96da8c400526fd907ba6c4e6e0b352a224fa85589c5b17924d42915490b0449b207652c6442b6fcd51a37d080f82b944069f
-EBUILD elasticsearch-6.8.19.ebuild 2597 BLAKE2B 2796e7be1cd512db6f812a049aae01f659d4090aabd0d70e347e237f8ea5c3f4dec6099165e135cd5cc000020315381674af375138eacebb11737d9801ede2bd SHA512 4d5cc3a06fd06b21601777b1de1ae8b3c4a5f98e3661c0f95e0956ad06ed6e6d9f42ddc8f170ee90a37638d9e4eea7f8bbf422ab87d61db2b0c1d062c8301dea
-EBUILD elasticsearch-7.13.4.ebuild 2389 BLAKE2B 0a33190cd4dd3c80a69bd4356ee696639c17f8e1d8b97780bac4a12435a03cd3fcb6186e0a7f916f04dfcd0358055fb6153fe3f090f9c4cfabfc982727f2fb88 SHA512 7fb066fb4aef44bb335675a20b52857d3b1cef213401bc48fc333483bc6091f8cd52e0056e0b93e1da3bba9cc571985ece4329397c93e401c7bbd9c012642ce2
-EBUILD elasticsearch-7.15.0.ebuild 2404 BLAKE2B b4b45c6b66072bb78efa7fd9c9e248c08283a412389df9211a8ffdd66c9daf918cf1492790fa991db124ea4fc76e66fe8b2ad2e1643f5d59d47304ce84249046 SHA512 afa0314c8cd2f46ed5af2a47d2500e4c44358c851713125027a68b578a5ca34895e8e6d966b968539b2a3ddb646c4845f48a4bff3774dcece23d6228420dce8b
-EBUILD elasticsearch-7.15.1.ebuild 2404 BLAKE2B b4b45c6b66072bb78efa7fd9c9e248c08283a412389df9211a8ffdd66c9daf918cf1492790fa991db124ea4fc76e66fe8b2ad2e1643f5d59d47304ce84249046 SHA512 afa0314c8cd2f46ed5af2a47d2500e4c44358c851713125027a68b578a5ca34895e8e6d966b968539b2a3ddb646c4845f48a4bff3774dcece23d6228420dce8b
+DIST elasticsearch-6.8.22.tar.gz 149669518 BLAKE2B 7f942891d24491c5064179f38408de62bbb257c8a611f0cbba93eb144233c6353e24b636ffdd36aacf25d528fdc88892ca71525f18e126ffc4420d8bb325bbb1 SHA512 64539d9c451cb32de227cbbe54c2ae1d90ad97fd461d1b0f2f09cffa18f1b9ad787df43a38dfbb0899f7ba2766217bbb56d012d23c25dc3e716009da11c4d26c
+DIST elasticsearch-7.16.2-no-jdk-linux-x86_64.tar.gz 199602093 BLAKE2B c1cbb96e02b9f6eff3839bc8e9aa69b60b10f8c41bc18140aee3ba09120b59a36ee8d90e0f08942c8e6726da37d7380d9b1adc5e3c3991ffecaea7d2964b1c07 SHA512 4e913e6657501a23830e138d0f7de7de57e80c0953078ecb10565770931bbba0eed37b38de0888f9618de579138d51ca16f0239048ff70de68330aba862aff8d
+DIST elasticsearch-oss-6.8.22.tar.gz 68572525 BLAKE2B c98ae3aeffead132ec884e10f3ddc8eaac853f654279214fcb268e9941a49bc9f0156fbdca6d5a538dbc5dabdbba2c23d16fe36327faa24eb2d204aec5fa54a6 SHA512 44019994f9a59a1d96ffc54847a4a7c90f70ece2c661c710878f643d6439d83b7ee6a205f445b1bfb2e7ab3de733434a6241f7b454159142e6e68255e8807e52
+EBUILD elasticsearch-6.8.22.ebuild 2597 BLAKE2B 2796e7be1cd512db6f812a049aae01f659d4090aabd0d70e347e237f8ea5c3f4dec6099165e135cd5cc000020315381674af375138eacebb11737d9801ede2bd SHA512 4d5cc3a06fd06b21601777b1de1ae8b3c4a5f98e3661c0f95e0956ad06ed6e6d9f42ddc8f170ee90a37638d9e4eea7f8bbf422ab87d61db2b0c1d062c8301dea
+EBUILD elasticsearch-7.16.2.ebuild 2404 BLAKE2B b4b45c6b66072bb78efa7fd9c9e248c08283a412389df9211a8ffdd66c9daf918cf1492790fa991db124ea4fc76e66fe8b2ad2e1643f5d59d47304ce84249046 SHA512 afa0314c8cd2f46ed5af2a47d2500e4c44358c851713125027a68b578a5ca34895e8e6d966b968539b2a3ddb646c4845f48a4bff3774dcece23d6228420dce8b
 MISC metadata.xml 490 BLAKE2B 48bca2017c5b522ba95203316efcb1fa711a0a1689fe75bc3b645f3f305d0671e69747d657e0b561237b472a721edf7cbe51a32919a71b57dc30e86bd4c05655 SHA512 37e637e54f452cd1fcc23a5e1537d53af6a17f3e7d805bb6d091d85e564f9132931ebf9c020580bf9fe81721293d972b03fa47985c04a722570630248ca416c4
diff --git a/app-misc/elasticsearch/elasticsearch-6.8.17.ebuild b/app-misc/elasticsearch/elasticsearch-6.8.17.ebuild
deleted file mode 100644
index 6b347e7957c4..000000000000
--- a/app-misc/elasticsearch/elasticsearch-6.8.17.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd tmpfiles
-
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${P}.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}.tar.gz )"
-LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RDEPEND="acct-group/elasticsearch
-	acct-user/elasticsearch
-	virtual/jre:1.8"
-
-QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
-
-src_prepare() {
-	default
-
-	rm bin/*.{bat,exe} LICENSE.txt NOTICE.txt || die
-	rmdir logs || die
-
-	if use x-pack; then
-		rm bin/x-pack/*.bat || die
-		rm -r modules/x-pack-ml/platform/{darwin,windows}-x86_64 || die
-	fi
-}
-
-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"
-
-	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
-
-	if use x-pack; then
-		chmod +x "${ED}"/usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin/* || die
-	fi
-
-	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.3" ${PN}
-	newinitd "${FILESDIR}/${PN}.init.6" ${PN}
-
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
-	newtmpfiles "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
-	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${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/${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-6.8.19.ebuild b/app-misc/elasticsearch/elasticsearch-6.8.22.ebuild
index 8fe587826d7b..8fe587826d7b 100644
--- a/app-misc/elasticsearch/elasticsearch-6.8.19.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-6.8.22.ebuild
diff --git a/app-misc/elasticsearch/elasticsearch-7.13.4.ebuild b/app-misc/elasticsearch/elasticsearch-7.13.4.ebuild
deleted file mode 100644
index e2035c21e8ff..000000000000
--- a/app-misc/elasticsearch/elasticsearch-7.13.4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 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
-	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.15.1.ebuild b/app-misc/elasticsearch/elasticsearch-7.15.1.ebuild
deleted file mode 100644
index 698358cf9bf6..000000000000
--- a/app-misc/elasticsearch/elasticsearch-7.15.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 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.15.0.ebuild b/app-misc/elasticsearch/elasticsearch-7.16.2.ebuild
index 698358cf9bf6..698358cf9bf6 100644
--- a/app-misc/elasticsearch/elasticsearch-7.15.0.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-7.16.2.ebuild