[gentoo-commits] repo/gentoo:master commit in: app-misc/elasticsearch/files/, app-misc/elasticsearch/

[Patrice Clement]

commit:     b2607c41a5019e39fc72e266de264088c1b96292
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Tue Jun 27 12:22:50 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Jun 27 13:27:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2607c41

app-misc/elasticsearch: version bump to 5.4.2, drop old and cleanup.

Package-Manager: Portage-2.3.6, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4997

 app-misc/elasticsearch/Manifest                    |   3 +-
 app-misc/elasticsearch/elasticsearch-2.4.4.ebuild  |  79 ----------------
 app-misc/elasticsearch/elasticsearch-5.1.2.ebuild  |   6 +-
 app-misc/elasticsearch/elasticsearch-5.2.2.ebuild  |   6 +-
 app-misc/elasticsearch/elasticsearch-5.3.3.ebuild  |   6 +-
 ...rch-5.4.1.ebuild => elasticsearch-5.4.2.ebuild} |   6 +-
 .../{elasticsearch.conf3 => elasticsearch.conf}    |   0
 app-misc/elasticsearch/files/elasticsearch.conf2   |  67 --------------
 .../{elasticsearch.init8 => elasticsearch.init}    |   0
 app-misc/elasticsearch/files/elasticsearch.init6   | 103 ---------------------
 app-misc/elasticsearch/files/elasticsearch.init7   |  95 -------------------
 ...lasticsearch.service6 => elasticsearch.service} |   0
 .../elasticsearch/files/elasticsearch.service5     |  53 -----------
 13 files changed, 13 insertions(+), 411 deletions(-)

diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 8ba7fddf6fb..c9dd0a1c5c8 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -1,5 +1,4 @@
-DIST elasticsearch-2.4.4.tar.gz 27343272 SHA256 981092e6ca65ba5560b8b97a74e5ed0eb2236e9128efdb85bb652cec340158e2 SHA512 899a4d2fc64548bcd488ece223f5f189dfb191eceb36390c4b9d8d0d90ef9d2cb67ada475223b9b2e0bd0fb521a4ab978bc7f60781195927e36d027925338c14 WHIRLPOOL 1a90bb8c923a9eab6cc4390b3daaa44cd85d5c1a3a1a5ef7d274050eb25b061a11a91b0f57ebe9f3cb27aafee3267af8f63ca87837f79d622ff362fbc5b6ae1a
 DIST elasticsearch-5.1.2.tar.gz 33299777 SHA256 74d752f9a8b46898d306ad169b72f328e17215c0909149e156a576089ef11c42 SHA512 1867626e8a87f11ed109e1325fd1d16c9e0af06ebe6a30c78ea679ab533ab377f5da8ea55af6871be33af226f02187a2aadd77e5e23c097dd24055be21e9d691 WHIRLPOOL 2e9df71c915343e2cc8ad82c59b877f41f5e093cbeba21f471c32cb51a195eccc6223bc48da48bb4af2e6bea9f2539f2e93b866963148f4ca2940ba4466e614e
 DIST elasticsearch-5.2.2.tar.gz 33799732 SHA256 cf88930695794a8949342d386f028548bd10b26ecc8c4b422a94ea674faf8ac9 SHA512 670f8aa81a34191a13cc8c608a9dc7bec60c63bbed8fdb9bc0619585d644867576a7677eb0f14b4e4d064e59def186d4b431930bf79b54bcbf59a29b0b327e85 WHIRLPOOL 4ec1f3b5ed15b9f22d27512ea784ffe9e32e00808fec89418860955d2f4759d045775e18c0a61693da47f39de9f235de954eada231fbd6de5fbfd17f552e8452
 DIST elasticsearch-5.3.3.tar.gz 33701608 SHA256 c7e23fddd74d66207b01dea777597c9d04c242973e1ac61aec0f13b716ebed1d SHA512 36fc00081af5555ceb0c0c6e8300c184d40e7176e084d899f2bfaafc3a36c6ba0f457c4bccde95a282d441fa26d84aba4ee1b8ef634831ffdef2f14feb725daa WHIRLPOOL ce641c9cb2071661a221f95fe38018ae2108ffdd855c70aafba4286da369cde461ff39afc674d650ca33925c350592d82e170b2e937e73e949279ca49850a325
-DIST elasticsearch-5.4.1.tar.gz 33321278 SHA256 09d6422bd33b82f065760cd49a31f2fec504f2a5255e497c81050fd3dceec485 SHA512 6b88c1f93516aea57af462ced95fd32f3b2639c919fbb00348f4ea12849ce88521e095d9a4c7d96a09b420ac4ed07c7ad6fc9c54c0f2fa1f9f8fa4ec36071cb3 WHIRLPOOL 4725922bb7bb3300f6ca13533beac07e4aeab3b3d44f7013bae53449c45da510bb123a8eebce8b6eed5e5ecdf5f0b4b93cdafd9d7f654fcf341fcd175936ef64
+DIST elasticsearch-5.4.2.tar.gz 33322090 SHA256 0206124d101a293b34b19cebee83fbf0e2a540f5214aabf133cde0719b896150 SHA512 cbeacdc9f6b391cea753a656f190f37db8130bcce3210356b63a0e27964aff6c079a3650f94242c6b98b0a87f58f6748fed02eb1f3a70495e9d6ccd09d138b7d WHIRLPOOL a7f1780934626230bcc48bcf8777bd29fc2dd548d234433414f6e4e33853c0362cc5be6273c8916b692d16636f1be39be0d8ccb8fad91d6e532905ad491af8ad

diff --git a/app-misc/elasticsearch/elasticsearch-2.4.4.ebuild b/app-misc/elasticsearch/elasticsearch-2.4.4.ebuild
deleted file mode 100644
index f3901ac933b..00000000000
--- a/app-misc/elasticsearch/elasticsearch-2.4.4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils systemd user
-
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://download.elasticsearch.org/${PN}/release/org/${PN}/distribution/tar/${PN}/${PV}/${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="strip"
-
-RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
-
-pkg_preinst() {
-	if has_version '<app-misc/elasticsearch-2.3.2'; then
-		export UPDATE_NOTES=1
-	fi
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
-}
-
-src_prepare() {
-	rm -rf bin/*.{bat,exe} || die
-	rm LICENSE.txt || die
-
-	default
-}
-
-src_install() {
-	keepdir /etc/${PN}
-
-	insinto /etc/${PN}
-	doins config/*
-	rm -rf config || die
-
-	insinto /usr/share/${PN}
-	doins -r ./*
-
-	exeinto /usr/share/${PN}/bin
-	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	chmod +x "${D}"/usr/share/${PN}/bin/* || die
-
-	keepdir /var/{lib,log}/${PN}
-	keepdir /usr/share/${PN}/plugins
-
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" "${PN}.conf"
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${PN}.sysctl.d" "${PN}.conf"
-
-	newinitd "${FILESDIR}/${PN}.init6" "${PN}"
-	newconfd "${FILESDIR}/${PN}.conf2" "${PN}"
-	systemd_newunit "${FILESDIR}"/${PN}.service5 "${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 and logging.yml"
-	elog "into the configuration directory of the instance:"
-	elog "/etc/${PN}/instance"
-	elog
-	if ! [ -z ${UPDATE_NOTES} ]; then
-		elog "This update changes some configuration variables. Please review"
-		elog "${EROOT%/}/etc/conf.d/elasticsearch before restarting your services."
-	fi
-}

diff --git a/app-misc/elasticsearch/elasticsearch-5.1.2.ebuild b/app-misc/elasticsearch/elasticsearch-5.1.2.ebuild
index 279ff77b886..434ea6d44fa 100644
--- a/app-misc/elasticsearch/elasticsearch-5.1.2.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-5.1.2.ebuild
@@ -58,9 +58,9 @@ src_install() {
 	insinto /etc/sysctl.d
 	newins "${FILESDIR}/${PN}.sysctl.d" "${PN}.conf"
 
-	newinitd "${FILESDIR}/${PN}.init7" "${PN}"
-	newconfd "${FILESDIR}/${PN}.conf3" "${PN}"
-	systemd_newunit "${FILESDIR}"/${PN}.service6 "${PN}.service"
+	newinitd "${FILESDIR}/${PN}.init" "${PN}"
+	newconfd "${FILESDIR}/${PN}.conf" "${PN}"
+	systemd_newunit "${FILESDIR}"/${PN}.service "${PN}.service"
 }
 
 pkg_postinst() {

diff --git a/app-misc/elasticsearch/elasticsearch-5.2.2.ebuild b/app-misc/elasticsearch/elasticsearch-5.2.2.ebuild
index 2ff60df7ea5..707ea90fc6f 100644
--- a/app-misc/elasticsearch/elasticsearch-5.2.2.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-5.2.2.ebuild
@@ -52,9 +52,9 @@ src_install() {
 	insinto /etc/sysctl.d
 	newins "${FILESDIR}/${PN}.sysctl.d" "${PN}.conf"
 
-	newinitd "${FILESDIR}/${PN}.init8" "${PN}"
-	newconfd "${FILESDIR}/${PN}.conf3" "${PN}"
-	systemd_newunit "${FILESDIR}"/${PN}.service6 "${PN}.service"
+	newinitd "${FILESDIR}/${PN}.init" "${PN}"
+	newconfd "${FILESDIR}/${PN}.conf" "${PN}"
+	systemd_newunit "${FILESDIR}"/${PN}.service "${PN}.service"
 }
 
 pkg_postinst() {

diff --git a/app-misc/elasticsearch/elasticsearch-5.3.3.ebuild b/app-misc/elasticsearch/elasticsearch-5.3.3.ebuild
index d1e49f508e0..e19798d3a14 100644
--- a/app-misc/elasticsearch/elasticsearch-5.3.3.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-5.3.3.ebuild
@@ -50,9 +50,9 @@ src_install() {
 	insinto /etc/sysctl.d
 	newins "${FILESDIR}/${PN}.sysctl.d" "${PN}.conf"
 
-	newinitd "${FILESDIR}/${PN}.init8" "${PN}"
-	newconfd "${FILESDIR}/${PN}.conf3" "${PN}"
-	systemd_newunit "${FILESDIR}"/${PN}.service6 "${PN}.service"
+	newinitd "${FILESDIR}/${PN}.init" "${PN}"
+	newconfd "${FILESDIR}/${PN}.conf" "${PN}"
+	systemd_newunit "${FILESDIR}"/${PN}.service "${PN}.service"
 }
 
 pkg_postinst() {

diff --git a/app-misc/elasticsearch/elasticsearch-5.4.1.ebuild b/app-misc/elasticsearch/elasticsearch-5.4.2.ebuild
similarity index 90%
rename from app-misc/elasticsearch/elasticsearch-5.4.1.ebuild
rename to app-misc/elasticsearch/elasticsearch-5.4.2.ebuild
index d1e49f508e0..e19798d3a14 100644
--- a/app-misc/elasticsearch/elasticsearch-5.4.1.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-5.4.2.ebuild
@@ -50,9 +50,9 @@ src_install() {
 	insinto /etc/sysctl.d
 	newins "${FILESDIR}/${PN}.sysctl.d" "${PN}.conf"
 
-	newinitd "${FILESDIR}/${PN}.init8" "${PN}"
-	newconfd "${FILESDIR}/${PN}.conf3" "${PN}"
-	systemd_newunit "${FILESDIR}"/${PN}.service6 "${PN}.service"
+	newinitd "${FILESDIR}/${PN}.init" "${PN}"
+	newconfd "${FILESDIR}/${PN}.conf" "${PN}"
+	systemd_newunit "${FILESDIR}"/${PN}.service "${PN}.service"
 }
 
 pkg_postinst() {

diff --git a/app-misc/elasticsearch/files/elasticsearch.conf3 b/app-misc/elasticsearch/files/elasticsearch.conf
similarity index 100%
rename from app-misc/elasticsearch/files/elasticsearch.conf3
rename to app-misc/elasticsearch/files/elasticsearch.conf

diff --git a/app-misc/elasticsearch/files/elasticsearch.conf2 b/app-misc/elasticsearch/files/elasticsearch.conf2
deleted file mode 100644
index 053cd18d147..00000000000
--- a/app-misc/elasticsearch/files/elasticsearch.conf2
+++ /dev/null
@@ -1,67 +0,0 @@
-################################
-# Elasticsearch
-################################
-
-# Elasticsearch configuration directory
-#CONF_DIR=/etc/elasticsearch
-
-# Elasticsearch data directory
-#DATA_DIR=/var/lib/elasticsearch
-
-# Elasticsearch logs directory
-#LOG_DIR=/var/log/elasticsearch
-
-# Elasticsearch PID directory
-#PID_DIR=/run/elasticsearch
-
-# Heap size defaults to 256m min, 1g max
-# Set ES_HEAP_SIZE to 50% of available RAM, but no more than 31g
-#ES_HEAP_SIZE=2g
-
-# Heap new generation
-#ES_HEAP_NEWSIZE=
-
-# Maximum direct memory
-#ES_DIRECT_SIZE=
-
-# Additional Java OPTS
-#ES_JAVA_OPTS=
-
-# Path to the GC log file
-#ES_GC_LOG_FILE=/var/log/elasticsearch/gc.log
-
-################################
-# 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=65535
-
-# The maximum number of bytes of memory that may be locked into RAM
-# Set to "unlimited" if you use the 'bootstrap.mlockall: true' option
-# in elasticsearch.yml (ES_HEAP_SIZE  must also be set).
-# 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

diff --git a/app-misc/elasticsearch/files/elasticsearch.init8 b/app-misc/elasticsearch/files/elasticsearch.init
similarity index 100%
rename from app-misc/elasticsearch/files/elasticsearch.init8
rename to app-misc/elasticsearch/files/elasticsearch.init

diff --git a/app-misc/elasticsearch/files/elasticsearch.init6 b/app-misc/elasticsearch/files/elasticsearch.init6
deleted file mode 100644
index e3252c55c67..00000000000
--- a/app-misc/elasticsearch/files/elasticsearch.init6
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/sbin/openrc-run
-
-name="Elasticsearch"
-description="Elasticsearch Server"
-
-ES_INSTANCE=${SVCNAME#*.}
-PID_DIR=${PID_DIR:="/run/elasticsearch"}
-
-if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then
-	PIDFILE="${PID_DIR}/elasticsearch.${ES_INSTANCE}.pid"
-	ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
-	CONF_DIR="/etc/elasticsearch/${ES_INSTANCE}"
-	LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}"
-else
-	PIDFILE="${PID_DIR}/elasticsearch.pid"
-	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_GC_LOG_FILE=${ES_GC_LOG_FILE:="/dev/null"}
-MAX_OPEN_FILES=${MAX_OPEN_FILES:=65535}
-MAX_MAP_COUNT=${MAX_MAP_COUNT:=262144}
-
-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_OPTS
-export ES_JAVA_OPTS
-export ES_HEAP_SIZE
-export ES_HEAP_NEWSIZE
-export ES_DIRECT_SIZE
-export ES_GC_LOG_FILE
-export ES_STARTUP_SLEEP_TIME
-
-server_command="/usr/share/elasticsearch/bin/elasticsearch"
-server_args="-d -p ${PIDFILE} --default.path.home=${ES_HOME} --default.path.logs=${LOG_DIR} --default.path.data=${DATA_DIR} --default.path.conf=${CONF_DIR}"
-
-depend() {
-	use net
-}
-
-start() {
-	local conf
-	local conf_file
-	for conf in elasticsearch.yml logging.yml; do
-		conf_file="${CONF_DIR}/${conf}"
-		if [ ! -f "${conf_file}" ]; then
-			eerror "${conf_file} must be copied into place"
-			return 1
-		fi
-	done
-
-	if [ -n "${MAX_LOCKED_MEMORY}" -a -z "${ES_HEAP_SIZE}" ]; then
-		eerror "MAX_LOCKED_MEMORY is set - ES_HEAP_SIZE must also be set"
-		return 1
-	fi
-
-	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
-
-	ebegin "Starting ${SVCNAME}"
-
-	if [ -n "${MAX_LOCKED_MEMORY}" ]; then
-		rc_ulimit="${rc_ulimit} -l ${MAX_LOCKED_MEMORY}"
-	fi
-
-	if [ -n "${MAX_OPEN_FILES}" ]; then
-		rc_ulimit="${rc_ulimit} -n ${MAX_OPEN_FILES}"
-	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 "${PID_DIR}"
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${ES_BASE_PATH}"
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${LOG_DIR}"
-	checkpath -d -o root:root -m755 "${CONF_DIR}/scripts"
-
-	start-stop-daemon --start \
-		--background \
-		--chdir "${ES_HOME}" \
-		--user="${ES_USER}" \
-		--pidfile="${PIDFILE}" \
-		--exec ${server_command} -- ${server_args}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop \
-		--pidfile=${PIDFILE} \
-		--user="${ES_USER}" \
-		--retry=TERM/20
-	eend $?
-}

diff --git a/app-misc/elasticsearch/files/elasticsearch.init7 b/app-misc/elasticsearch/files/elasticsearch.init7
deleted file mode 100644
index 65072d5f21d..00000000000
--- a/app-misc/elasticsearch/files/elasticsearch.init7
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/sbin/openrc-run
-
-name="Elasticsearch"
-description="Elasticsearch Server"
-
-ES_INSTANCE=${SVCNAME#*.}
-PID_DIR=${PID_DIR:="/run/elasticsearch"}
-
-if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then
-	PIDFILE="${PID_DIR}/elasticsearch.${ES_INSTANCE}.pid"
-	ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
-	CONF_DIR="/etc/elasticsearch/${ES_INSTANCE}"
-	LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}"
-else
-	PIDFILE="${PID_DIR}/elasticsearch.pid"
-	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
-
-server_command="/usr/share/elasticsearch/bin/elasticsearch"
-server_args="-d -p ${PIDFILE} -Edefault.path.logs=${LOG_DIR} -Edefault.path.data=${DATA_DIR} -Edefault.path.conf=${CONF_DIR}"
-
-depend() {
-	use net
-}
-
-start() {
-	local conf
-	local conf_file
-	for conf in elasticsearch.yml; do
-		conf_file="${CONF_DIR}/${conf}"
-		if [ ! -f "${conf_file}" ]; then
-			eerror "${conf_file} must be copied into place"
-			return 1
-		fi
-	done
-
-	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
-
-	ebegin "Starting ${SVCNAME}"
-
-	if [ -n "${MAX_LOCKED_MEMORY}" ]; then
-		rc_ulimit="${rc_ulimit} -l ${MAX_LOCKED_MEMORY}"
-	fi
-
-	if [ -n "${MAX_OPEN_FILES}" ]; then
-		rc_ulimit="${rc_ulimit} -n ${MAX_OPEN_FILES}"
-	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 "${PID_DIR}"
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${ES_BASE_PATH}"
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${LOG_DIR}"
-
-	start-stop-daemon --start \
-		--background \
-		--chdir "${ES_HOME}" \
-		--user="${ES_USER}" \
-		--pidfile="${PIDFILE}" \
-		--exec ${server_command} -- ${server_args}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop \
-		--pidfile=${PIDFILE} \
-		--user="${ES_USER}" \
-		--retry=TERM/20
-	eend $?
-}

diff --git a/app-misc/elasticsearch/files/elasticsearch.service6 b/app-misc/elasticsearch/files/elasticsearch.service
similarity index 100%
rename from app-misc/elasticsearch/files/elasticsearch.service6
rename to app-misc/elasticsearch/files/elasticsearch.service

diff --git a/app-misc/elasticsearch/files/elasticsearch.service5 b/app-misc/elasticsearch/files/elasticsearch.service5
deleted file mode 100644
index 80ece6480f1..00000000000
--- a/app-misc/elasticsearch/files/elasticsearch.service5
+++ /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 \
-                                                -Des.pidfile=${PID_DIR}/elasticsearch.pid \
-                                                -Des.default.path.home=${ES_HOME} \
-                                                -Des.default.path.logs=${LOG_DIR} \
-                                                -Des.default.path.data=${DATA_DIR} \
-                                                -Des.default.path.conf=${CONF_DIR}
-
-StandardOutput=journal
-StandardError=inherit
-
-# Specifies the maximum file descriptor number that can be opened by this process
-LimitNOFILE=65535
-
-# Specifies the maximum number of bytes of memory that may be locked into RAM
-# Set to "infinity" if you use the 'bootstrap.mlockall: 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