commit:     6a9fd15d54a437a8c052c8788c14c10a8838cbac
Author:     Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Fri May 22 13:43:38 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Jun 12 14:32:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a9fd15d

app-misc/elasticsearch: drop old

Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 app-misc/elasticsearch/Manifest                    |  1 -
 app-misc/elasticsearch/elasticsearch-5.6.16.ebuild | 69 ----------------------
 app-misc/elasticsearch/files/elasticsearch.conf.2  | 59 ------------------
 app-misc/elasticsearch/files/elasticsearch.init.2  | 60 -------------------
 app-misc/elasticsearch/files/elasticsearch.service | 53 -----------------
 5 files changed, 242 deletions(-)

diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index cfe38f90da5..2646a3af8cd 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -1,4 +1,3 @@
-DIST elasticsearch-5.6.16.tar.gz 33894983 BLAKE2B 
f96e78f1f28d8106948c91a0d31ea3d41b538fb0fd8534e2f52be651cf22986c76eae67c58c8ef10fef218d1646b1b4b5aa0a3625520e62e482063420775e92e
 SHA512 
cc831e50ce311366484c47cf9fead9bd6562035132e6fd29508e78776dd71846c713d8d1e7a0a99338df46cad124149fb5d767e0ae0bbbed0b50153e234f2631
 DIST elasticsearch-6.8.8.tar.gz 149927766 BLAKE2B 
329bb778100125d9624acc84252fe8281cd4ee3823fbafeabf8aeeca529c3cd8902b197d5e5a852d55f7a56ec410312e3932b34736607890dedad9e12c3afe2e
 SHA512 
c703d6230a42b77fb0f169158afbc18517118375e341ef889c231acc0f096a44716ba4fc1a2558fd000b0ceff4d9c3aff2f2c792f2c2ae92f0e7f82c6a70eaec
 DIST elasticsearch-7.6.2-no-jdk-linux-x86_64.tar.gz 148140124 BLAKE2B 
9a850011533052d7a4041484936dfa2c8fe7f7976314147bc2b1d5f239bbdfe68a3593d3e0d2bb4d709a71e81aa7c200f9530921dab9d50c0ab3e349f4769ffb
 SHA512 
aa5f499b26e92e19a673093fe2ff73c1c03a8da029b59cb83db43f9e2dfd7c650ee6a122bcf647b7e83f658ad9b9cc64092e6e7c1b4f8476f2973a6006b8df3c
 DIST elasticsearch-7.7.0-no-jdk-linux-x86_64.tar.gz 157716656 BLAKE2B 
812c4db511f844fb23cb79bdfe3778281f1b6dad6a45553380829e330231304ce0e18eb975867e8474f652a63bdab2f4fb8c14158753aa8b29db5debfd3f00ae
 SHA512 
a8d6cb7186301f50ba72ee5cde6c26390bdb6a8c13d902a75c63038b3dbb3cd7e544bbf6934d88324d722a213b7bf2efc0b27f9cae64428e6842d640bda5ee54

diff --git a/app-misc/elasticsearch/elasticsearch-5.6.16.ebuild 
b/app-misc/elasticsearch/elasticsearch-5.6.16.ebuild
deleted file mode 100644
index 0fa64b4d269..00000000000
--- a/app-misc/elasticsearch/elasticsearch-5.6.16.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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() {
-       default
-
-       rm -v bin/*.{bat,exe} LICENSE.txt || die
-}
-
-src_install() {
-       keepdir /etc/${PN}
-       keepdir /etc/${PN}/scripts
-
-       insinto /etc/${PN}
-       doins -r 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}
-       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.2" ${PN}
-       newinitd "${FILESDIR}/${PN}.init.2" ${PN}
-
-       systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
-       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/files/elasticsearch.conf.2 
b/app-misc/elasticsearch/files/elasticsearch.conf.2
deleted file mode 100644
index e802448a86a..00000000000
--- a/app-misc/elasticsearch/files/elasticsearch.conf.2
+++ /dev/null
@@ -1,59 +0,0 @@
-################################
-# Elasticsearch
-################################
-
-# Elasticsearch home directory
-#ES_HOME=/usr/share/elasticsearch
-
-# Elasticsearch Java path
-#JAVA_HOME=
-
-# Elasticsearch configuration directory
-#CONF_DIR=/etc/elasticsearch
-
-# Elasticsearch data directory
-#DATA_DIR=/var/lib/elasticsearch
-
-# Elasticsearch logs directory
-#LOG_DIR=/var/log/elasticsearch
-
-# Additional Java OPTS
-#ES_JAVA_OPTS=
-
-################################
-# Elasticsearch service
-################################
-
-# When executing the init script, this user will be used to run the 
elasticsearch service.
-# The default value is 'elasticsearch' and is declared in the init.d file.
-# Note that this setting is only used by the init script. If changed, make 
sure that
-# the configured user can read and write into the data, work, plugins and log 
directories.
-# For systemd service, the user is usually configured in file 
/usr/lib/systemd/system/elasticsearch.service
-#ES_USER=elasticsearch
-#ES_GROUP=elasticsearch
-
-# The number of seconds to wait before checking if Elasticsearch started 
successfully as a daemon process
-#ES_STARTUP_SLEEP_TIME=5
-
-################################
-# System properties
-################################
-
-# Specifies the maximum file descriptor number that can be opened by this 
process
-# When using Systemd, this setting is ignored and the LimitNOFILE defined in
-# /usr/lib/systemd/system/elasticsearch.service takes precedence
-MAX_OPEN_FILES=65536
-
-# The maximum number of bytes of memory that may be locked into RAM
-# Set to "unlimited" if you use the 'bootstrap.memory_lock: true' option
-# in elasticsearch.yml.
-# When using Systemd, the LimitMEMLOCK property must be set
-# in /usr/lib/systemd/system/elasticsearch.service
-MAX_LOCKED_MEMORY=unlimited
-
-# Maximum number of VMA (Virtual Memory Areas) a process can own
-# When using Systemd, this setting is ignored and the 'vm.max_map_count'
-# property is set at boot time in /usr/lib/sysctl.d/elasticsearch.conf
-#MAX_MAP_COUNT=262144
-
-rc_ulimit="-l $MAX_LOCKED_MEMORY -n $MAX_OPEN_FILES"

diff --git a/app-misc/elasticsearch/files/elasticsearch.init.2 
b/app-misc/elasticsearch/files/elasticsearch.init.2
deleted file mode 100644
index 6e572c58da2..00000000000
--- a/app-misc/elasticsearch/files/elasticsearch.init.2
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/sbin/openrc-run
-
-name="Elasticsearch"
-description="Elasticsearch Server"
-
-ES_INSTANCE=${SVCNAME#*.}
-
-if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then
-       ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
-       CONF_DIR="/etc/elasticsearch/${ES_INSTANCE}"
-       LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}"
-else
-       ES_BASE_PATH="/var/lib/elasticsearch/_default"
-       CONF_DIR="/etc/elasticsearch"
-       LOG_DIR="/var/log/elasticsearch/_default"
-fi
-
-ES_HOME=${ES_HOME:="/usr/share/elasticsearch"}
-ES_USER=${ES_USER:="elasticsearch"}
-ES_GROUP=${ES_GROUP:="elasticsearch"}
-ES_STARTUP_SLEEP_TIME=${ES_STARTUP_TIME:=5}
-MAX_OPEN_FILES=${MAX_OPEN_FILES:=65536}
-MAX_MAP_COUNT=${MAX_MAP_COUNT:=262144}
-
-DATA_DIR=${DATA_DIR:="${ES_BASE_PATH}/data"}
-
-if [ -f "${CONF_DIR}/elasticsearch.in.sh" ]; then
-    ES_INCLUDE="${CONF_DIR}/elasticsearch.in.sh"
-fi
-
-export ES_INCLUDE
-export JAVA_HOME
-export JAVA_OPTS
-export ES_JVM_OPTIONS
-export ES_JAVA_OPTS
-export ES_STARTUP_SLEEP_TIME
-
-pidfile="/run/elasticsearch/${RC_SVCNAME}.pid"
-
-command="/usr/share/elasticsearch/bin/elasticsearch"
-command_args="--daemonize --pidfile=${pidfile} -Edefault.path.logs=${LOG_DIR} 
-Edefault.path.data=${DATA_DIR} -Edefault.path.conf=${CONF_DIR}"
-command_user="${ES_USER}:${ES_GROUP}"
-required_files="${CONF_DIR}/elasticsearch.yml"
-retry="TERM/30/KILL/30"
-
-depend() {
-       use net
-}
-
-start_pre() {
-       if [ -n "${MAX_MAP_COUNT}" -a -f /proc/sys/vm/max_map_count ]; then
-               sysctl -q -w vm.max_map_count=${MAX_MAP_COUNT}
-       fi
-
-       checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/lib/elasticsearch"
-       checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/log/elasticsearch"
-       checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/run/elasticsearch"
-       checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${ES_BASE_PATH}"
-       checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${LOG_DIR}"
-}

diff --git a/app-misc/elasticsearch/files/elasticsearch.service 
b/app-misc/elasticsearch/files/elasticsearch.service
deleted file mode 100644
index 927acef5ee8..00000000000
--- a/app-misc/elasticsearch/files/elasticsearch.service
+++ /dev/null
@@ -1,53 +0,0 @@
-[Unit]
-Description=Elasticsearch
-Documentation=http://www.elastic.co
-Wants=network.target
-After=network.target
-
-[Service]
-Environment=ES_HOME=/usr/share/elasticsearch
-Environment=CONF_DIR=/etc/elasticsearch
-Environment=DATA_DIR=/var/lib/elasticsearch
-Environment=LOG_DIR=/var/log/elasticsearch
-Environment=PID_DIR=/run/elasticsearch
-EnvironmentFile=-/etc/conf.d/elasticsearch
-
-WorkingDirectory=/usr/share/elasticsearch
-
-User=elasticsearch
-Group=elasticsearch
-
-ExecStartPre=/usr/share/elasticsearch/bin/elasticsearch-systemd-pre-exec
-
-ExecStart=/usr/share/elasticsearch/bin/elasticsearch \
-                                                -p 
${PID_DIR}/elasticsearch.pid \
-                                                -Edefault.path.home=${ES_HOME} 
\
-                                                -Edefault.path.logs=${LOG_DIR} 
\
-                                                
-Edefault.path.data=${DATA_DIR} \
-                                                -Edefault.path.conf=${CONF_DIR}
-
-StandardOutput=journal
-StandardError=inherit
-
-# Specifies the maximum file descriptor number that can be opened by this 
process
-LimitNOFILE=65536
-
-# Specifies the maximum number of bytes of memory that may be locked into RAM
-# Set to "infinity" if you use the 'bootstrap.memory_lock: true' option
-# in elasticsearch.yml and 'MAX_LOCKED_MEMORY=unlimited' in 
/etc/conf.d/elasticsearch
-#LimitMEMLOCK=infinity
-
-# Disable timeout logic and wait until process is stopped
-TimeoutStopSec=0
-
-# SIGTERM signal is used to stop the Java process
-KillSignal=SIGTERM
-
-# Java process is never killed
-SendSIGKILL=no
-
-# When a JVM receives a SIGTERM signal it exits with code 143
-SuccessExitStatus=143
-
-[Install]
-WantedBy=multi-user.target

Reply via email to