gentoo resync : 08.10.2021

8 files changed, 10 insertions, 276 deletions

diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 8eb61cedbe4d..8dba32c9d2a6 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -7,21 +7,14 @@ 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.15.tar.gz 149102328 BLAKE2B 0ce9ba565d751cd27721f3d49dd24761937c3476cee4896ba1a4d84e4fc238296129481f18cad64270fe8af71a043c2e8e583df14f2a084850fb10c93fcea0ef SHA512 c62c4d9d1bb83e10d3e1079f56b834f2f89b1f712c29d9ce7e81786199c71d287ecbf6df158eca56a7af711eafe13dfb276e12b34e1a0a6cf6719e1fbb44a142
-DIST elasticsearch-6.8.16.tar.gz 149125098 BLAKE2B cafdb7fd97b3df087472c65ede9eb9c703f6499a03d70c5fcc497bdaafc0757d0b9e7fe84d0a8c710cdecbe85654fdad1f854209015a545e0bf43d8e585a481f SHA512 0b15f77ba5962970ef38869a233ee3d091a64b218cf42dc5f4bdd8a81322739992f75e3c438295435f28af20af1e138c2f5e3afed76a7ebc0f348764528dd0f3
 DIST elasticsearch-6.8.17.tar.gz 149132823 BLAKE2B a83d4e81059a717e48ac54e7565efe282f42103718ba9cef9994a6970769bb01248e99ffbfe061ca85a7b44890604c6174dc11046a94c455dc01da7f495524ea SHA512 5eb365efccff4e371d9ac873b45684c36cfd7f25ec51a86c3cd74beff4491dbc0097dba22f91335c35478e3b25decc6ae4bc5d538add0e17a39eb063dfa2d88c
-DIST elasticsearch-7.12.0-no-jdk-linux-x86_64.tar.gz 173069694 BLAKE2B 5de74b1e6de743246cf48e32254f9646fa25c2820d0be9df886fdefe131a302ddb8906546147f0d284e2fc0faf8cc0238bf854fe1611d28bf1e7cb1518bd4e31 SHA512 205aa2a2fa2ab7eb7b54087420e0123aa97e5456e2e1f31cad9ea7b84be3f9823a2a7c47d4cf1697833e5f795359477d3a3b0ea4955a8f92583cf2228071827e
-DIST elasticsearch-7.12.1-no-jdk-linux-x86_64.tar.gz 173079845 BLAKE2B 98214508c2c1dcb631f59d9e51d5949f9a7c5d1f68ff78c8d93af04c6a21fa1e1c6e2051f04bbdb8154443d6295ad54af2016695fcb9193b7595e1486777ba98 SHA512 c91fd66668977280d7339caf6b4fef9fce5640492f0e2a65bc537c6da8397c801a3727f1ff56b7a1591b11ea47195720c588a4eba473043f829a87cd3dcc0af4
-DIST elasticsearch-7.13.2-no-jdk-linux-x86_64.tar.gz 174688419 BLAKE2B e8541581dfc856b9b005bc7fda29c9aaf82d61c406df1f7e06ea8997a71567047d4822e5e873aee41f7a295f2eba10508c966e9ebc4e8b7c734f1c100f4a05f3 SHA512 4d02faf019eab1fc590d76fdc50c6396cfe5bc4363baaa3d1e63ca7210942cbdf5c08d28e5d4b7d2cf47fb18ee83b94529ecb2bdaba6521798721398c8a06165
+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-oss-6.8.15.tar.gz 68240776 BLAKE2B 431d845e02f2118a98021af4422ece34274b6d0811a32c5a3e679da3f8f56ca9cd45949307268811edbb83327a4a80fb84866cbbaaf01f7d3af042412b1e1bfa SHA512 7e6a819339ac6043af218f9d97d5d68c50ac46900e4293e7fa18992f7a50b10b0ab2434e26ff0dc1546204ae7526de8ac6ef6545fc0db9c862ceeaa0d96c56f5
-DIST elasticsearch-oss-6.8.16.tar.gz 68248767 BLAKE2B 2c8c14a6e2f837bc547de2e8c97f2fbe2dbf7743978a00e2fc37cd61eb46144df2a24f67360761e0342987b9194176109cfbd07545d2e8f88cae48f9508c659c SHA512 0f46c69136312d535ccff4663655500538ffc924bbe50350c2eed3372609a28e642bb906cbb9a631af5fa10568a16c1a630ef181c383ee247c98325ddc85e04c
+DIST elasticsearch-7.15.0-no-jdk-linux-x86_64.tar.gz 196775804 BLAKE2B c08a77a03dd98acbbbdabdf408c33cc7786d8b00e64558b0658e6952d3c32842b2ede48a54e58ee85ece882f56675d77ff39bc2b6ede7d8c7e446bbfd0b23965 SHA512 dbd5c5ce9a08ea0bbc55e9f470a7455d99f1458287cb1d885f07f2670cc8885dbe764315c1267f31ef745a424ece52b4e60239993e0ed7d0bec70dd8c022f7fa
 DIST elasticsearch-oss-6.8.17.tar.gz 68247749 BLAKE2B 12e85804a7d58dc27d85fbed6501831d92428405cb4636355c523a370863e00301bd75d7d12404ee0c7eefc32c53bc4b23e8fc1fecf2f606faf85369b2262cc7 SHA512 0f165357b1f389fbd01f07397a2b3ea5d493fae720c15213f2ee47a0c2c75bc4a448384767646d7585a18d4577899b840121c1829a987a16d2de68f216b28f7c
-EBUILD elasticsearch-6.8.15.ebuild 2569 BLAKE2B c9d4ceaa7e325b36bd5dd839147c1a317f3b3868680d99d125b31db162db41dacc1404e90855cef66f7f6e1065bcd421ba6d1851b71335a773f1ddf46823636b SHA512 ba88be72479b2123e152a12c59c1057078d0b61ad420f1922d07aa1d0fcfbf57ce48e23702f4dc24f0ab8524035cb55da52d247572f5788b40c14e1ce18c22fe
-EBUILD elasticsearch-6.8.16.ebuild 2569 BLAKE2B c9d4ceaa7e325b36bd5dd839147c1a317f3b3868680d99d125b31db162db41dacc1404e90855cef66f7f6e1065bcd421ba6d1851b71335a773f1ddf46823636b SHA512 ba88be72479b2123e152a12c59c1057078d0b61ad420f1922d07aa1d0fcfbf57ce48e23702f4dc24f0ab8524035cb55da52d247572f5788b40c14e1ce18c22fe
+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-7.12.0.ebuild 2434 BLAKE2B 2594f0ece134b0c9a1f3c3aa8df7cafd7d53fc7314b80891abab549d9e33f0b26585dab3f8aacb53d700345572e409816971736e05509d3d93e9f5a355f09518 SHA512 7c9a37f4243e1a0422dc1d5afd95d1c3218d2e00963342ef43574eb50b5b0013cad5ed1073fdc90b54a205d92c4e6254b638bb955941f8e3d318a0c67d5cd1e4
-EBUILD elasticsearch-7.12.1.ebuild 2369 BLAKE2B ce1ecc30a04fdf3b9942c2925bff8394049bcdc860ffa02a98d0cbad63beaf29437afca9412fff843c5fbe7e10ddbb253b56298de9f20e7256e22f1dd50a71bc SHA512 0be9c9db4eeb66bfe204005d4210d693199a447dbfb3298c13112c90dab84722a4817529f80e91b4672a838c5e7bed6d2a9711a92607369e245e3cb22006dfc6
-EBUILD elasticsearch-7.13.2.ebuild 2369 BLAKE2B ce1ecc30a04fdf3b9942c2925bff8394049bcdc860ffa02a98d0cbad63beaf29437afca9412fff843c5fbe7e10ddbb253b56298de9f20e7256e22f1dd50a71bc SHA512 0be9c9db4eeb66bfe204005d4210d693199a447dbfb3298c13112c90dab84722a4817529f80e91b4672a838c5e7bed6d2a9711a92607369e245e3cb22006dfc6
+EBUILD elasticsearch-6.8.19.ebuild 2558 BLAKE2B 0f161790a6d08f70c9657d39610504867ad758eb5142d64121df0e46e83278240251d8d24b234c79c6b2ee362ac4231d0755c5cf4092084c3fad05882b9da51d SHA512 00e7f0cee8e0ebda9af7e52678a141f06a05968e39679509a48758bc32309ddd37eb49bd5567e32a67b023e69e2e293da37fcc0a7957a4d92224e7d67d73ea8d
 EBUILD elasticsearch-7.13.4.ebuild 2389 BLAKE2B 0a33190cd4dd3c80a69bd4356ee696639c17f8e1d8b97780bac4a12435a03cd3fcb6186e0a7f916f04dfcd0358055fb6153fe3f090f9c4cfabfc982727f2fb88 SHA512 7fb066fb4aef44bb335675a20b52857d3b1cef213401bc48fc333483bc6091f8cd52e0056e0b93e1da3bba9cc571985ece4329397c93e401c7bbd9c012642ce2
-MISC metadata.xml 612 BLAKE2B 93d4540329c13044aff07cc0f442b1c4de50bbf8a771e1c7de4fc454dd77b1fbdbefec7e8840346a969f48fe85a7ec5f0e2216fed46a0ad3ae14f309f72490ec SHA512 ed2cc28ffe983197ab3a9a1da9f92199e926e7854b3b2a11b9593805d70b8928421c91464bb6cb2d5fc77ee2057e0d5b41b265f2f5fe3a77b85e83bae25d74ce
+EBUILD elasticsearch-7.15.0.ebuild 2404 BLAKE2B b4b45c6b66072bb78efa7fd9c9e248c08283a412389df9211a8ffdd66c9daf918cf1492790fa991db124ea4fc76e66fe8b2ad2e1643f5d59d47304ce84249046 SHA512 afa0314c8cd2f46ed5af2a47d2500e4c44358c851713125027a68b578a5ca34895e8e6d966b968539b2a3ddb646c4845f48a4bff3774dcece23d6228420dce8b
+MISC metadata.xml 490 BLAKE2B 48bca2017c5b522ba95203316efcb1fa711a0a1689fe75bc3b645f3f305d0671e69747d657e0b561237b472a721edf7cbe51a32919a71b57dc30e86bd4c05655 SHA512 37e637e54f452cd1fcc23a5e1537d53af6a17f3e7d805bb6d091d85e564f9132931ebf9c020580bf9fe81721293d972b03fa47985c04a722570630248ca416c4
diff --git a/app-misc/elasticsearch/elasticsearch-6.8.16.ebuild b/app-misc/elasticsearch/elasticsearch-6.8.16.ebuild
deleted file mode 100644
index e090a2d2fede..000000000000
--- a/app-misc/elasticsearch/elasticsearch-6.8.16.ebuild
+++ /dev/null
@@ -1,90 +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() {
-	tmpfiles_process ${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-6.8.15.ebuild b/app-misc/elasticsearch/elasticsearch-6.8.19.ebuild
index e090a2d2fede..24df69cda8d5 100644
--- a/app-misc/elasticsearch/elasticsearch-6.8.15.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-6.8.19.ebuild
@@ -72,8 +72,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-
 	elog
 	elog "You may create multiple instances of ${PN} by"
 	elog "symlinking the init script:"
@@ -87,4 +85,6 @@ pkg_postinst() {
 	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"
+
+	tmpfiles_process
 }
diff --git a/app-misc/elasticsearch/elasticsearch-7.12.0.ebuild b/app-misc/elasticsearch/elasticsearch-7.12.0.ebuild
deleted file mode 100644
index 45949c1449de..000000000000
--- a/app-misc/elasticsearch/elasticsearch-7.12.0.ebuild
+++ /dev/null
@@ -1,84 +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_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
-QA_PREBUILT="
-	usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/bin/.*
-	usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/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 ${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.12.1.ebuild b/app-misc/elasticsearch/elasticsearch-7.12.1.ebuild
deleted file mode 100644
index bdf9f6e767d4..000000000000
--- a/app-misc/elasticsearch/elasticsearch-7.12.1.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 ${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.13.2.ebuild b/app-misc/elasticsearch/elasticsearch-7.15.0.ebuild
index bdf9f6e767d4..698358cf9bf6 100644
--- a/app-misc/elasticsearch/elasticsearch-7.13.2.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-7.15.0.ebuild
@@ -14,6 +14,7 @@ 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\)/.*"
@@ -64,7 +65,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	tmpfiles_process ${PN}.conf
+	tmpfiles_process /usr/lib/tmpfiles.d/${PN}.conf
 
 	elog
 	elog "You may create multiple instances of ${PN} by"
diff --git a/app-misc/elasticsearch/files/elasticsearch-systemd-pre-exec b/app-misc/elasticsearch/files/elasticsearch-systemd-pre-exec
index 30f773638d37..30f773638d37 100644..100755
--- a/app-misc/elasticsearch/files/elasticsearch-systemd-pre-exec
+++ b/app-misc/elasticsearch/files/elasticsearch-systemd-pre-exec
diff --git a/app-misc/elasticsearch/metadata.xml b/app-misc/elasticsearch/metadata.xml
index 08964a1b836c..42c98c32da2f 100644
--- a/app-misc/elasticsearch/metadata.xml
+++ b/app-misc/elasticsearch/metadata.xml
@@ -5,10 +5,6 @@
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomáš Mózes</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>erkiferenc@gmail.com</email>
-		<name>Ferenc Erki</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>