commit:     13a3013b70de6756ab2a48919220af0a0de38394
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 07:17:03 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 07:25:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13a3013b

app-misc/elasticsearch: drop 6.8.23, 7.17.3

Bug: https://bugs.gentoo.org/850148
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-misc/elasticsearch/Manifest                    |  3 -
 app-misc/elasticsearch/elasticsearch-6.8.23.ebuild | 90 ----------------------
 app-misc/elasticsearch/elasticsearch-7.17.3.ebuild | 83 --------------------
 app-misc/elasticsearch/metadata.xml                |  3 -
 4 files changed, 179 deletions(-)

diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index e4a97701337b..a1aced619273 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -1,4 +1 @@
-DIST elasticsearch-6.8.23.tar.gz 149672445 BLAKE2B 
dd7b080f1496f3a20755c183befae74194eab05b04c6f77679e9dad6067eef5222a4c7ce43d6267f1233a7bf864c6f8b23d5caf52278e1fe5f48f465e6603113
 SHA512 
73258b400cd194768058105a74ca0e811962ccf81bed8c4d3a824d4e5b97a8178a31150e60602fa1e04c6764b139980eb45ae6f246864702120653b45120b597
-DIST elasticsearch-7.17.3-no-jdk-linux-x86_64.tar.gz 167378547 BLAKE2B 
4bacb075e94587351bb4638da15644ed372ec1ad2b72e1c9b84c511e84666f6b79ccc8519ce5fede119e6c134ac500a1209578f18a26fd8566646e870a17f9ba
 SHA512 
f2d5953710adfe31f1e30a0fdf4c091c0493f613a83927ddec4bbc74d2eccb839e1ffa6d44636ad0ad9c07613915847cc7a68fc87e465a8a851c96e023917bf1
 DIST elasticsearch-8.2.2-linux-x86_64.tar.gz 526116807 BLAKE2B 
bc30d3532bb62bee88fdfc8e3406d32884add3601363d5bf91f66c110e05241beb6b73cf7a2f8104a843628f4841a313ed5bdf3098030eb5e4567c98b69ac703
 SHA512 
78d1315a47ae9f082297e049320c5a9787aa9fe44cd2967f3ea37ae954ad34aaa29ca7b3210ac96955be2838d0233b7f86a3e0c66d82dda3724753a0c24c78e8
-DIST elasticsearch-oss-6.8.23.tar.gz 68573265 BLAKE2B 
80366fdc4eaaf45161a36da112397938a82d08d842d82dd5a9311abf63ca20afb93ecc06387c6852bbb1a861306382d6e7c2314e67635b6f2e75cdc183057ad8
 SHA512 
14dbb2809b06499373c3ec5035d829d62255c2c93103618fbfe3d7d03cecf8847f654e83c78f765f23224126ff18ed713b959857e8ecf435c475b11bcd143d3f

diff --git a/app-misc/elasticsearch/elasticsearch-6.8.23.ebuild 
b/app-misc/elasticsearch/elasticsearch-6.8.23.ebuild
deleted file mode 100644
index 5fd5b2ceff2e..000000000000
--- a/app-misc/elasticsearch/elasticsearch-6.8.23.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2022 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"
-
-       tmpfiles_process /usr/lib/tmpfiles.d/elasticsearch.conf
-}

diff --git a/app-misc/elasticsearch/elasticsearch-7.17.3.ebuild 
b/app-misc/elasticsearch/elasticsearch-7.17.3.ebuild
deleted file mode 100644
index be38b6a483a2..000000000000
--- a/app-misc/elasticsearch/elasticsearch-7.17.3.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/metadata.xml 
b/app-misc/elasticsearch/metadata.xml
index 42c98c32da2f..f3ded0c75da8 100644
--- a/app-misc/elasticsearch/metadata.xml
+++ b/app-misc/elasticsearch/metadata.xml
@@ -9,7 +9,4 @@
                <email>[email protected]</email>
                <name>Proxy Maintainers</name>
        </maintainer>
-       <use>
-               <flag name="x-pack">Enable additional features (may need a 
license)</flag>
-       </use>
 </pkgmetadata>

Reply via email to