From 6a2b4da3823a3278fb65cfe63cb684d6f078d5eb Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tom=C3=A1=C5=A1=20M=C3=B3zes?= <hydrapolic@gmail.com>
Date: Sat, 7 Jan 2017 07:03:29 +0000
Subject: [PATCH] app-misc/elasticsearch: drop old

---
 app-misc/elasticsearch/Manifest               | 16 ----
 .../elasticsearch/elasticsearch-1.7.4.ebuild  | 71 ---------------
 .../elasticsearch/elasticsearch-1.7.5.ebuild  | 71 ---------------
 .../elasticsearch/elasticsearch-2.1.1.ebuild  | 62 -------------
 .../elasticsearch/elasticsearch-2.1.2.ebuild  | 62 -------------
 .../elasticsearch/elasticsearch-2.2.0.ebuild  | 62 -------------
 .../elasticsearch/elasticsearch-2.2.2.ebuild  | 62 -------------
 .../elasticsearch/elasticsearch-2.3.0.ebuild  | 62 -------------
 .../elasticsearch/elasticsearch-2.3.1.ebuild  | 62 -------------
 .../elasticsearch/elasticsearch-2.3.2.ebuild  | 76 ----------------
 .../elasticsearch/elasticsearch-2.3.3.ebuild  | 76 ----------------
 .../elasticsearch/elasticsearch-2.3.4.ebuild  | 76 ----------------
 .../elasticsearch/elasticsearch-2.3.5.ebuild  | 82 -----------------
 .../elasticsearch/elasticsearch-2.4.0.ebuild  | 82 -----------------
 .../elasticsearch/elasticsearch-2.4.1.ebuild  | 82 -----------------
 .../elasticsearch/elasticsearch-5.0.0.ebuild  | 84 ------------------
 .../elasticsearch-5.0.1-r1.ebuild             | 84 ------------------
 .../elasticsearch/elasticsearch-5.0.1.ebuild  | 84 ------------------
 .../elasticsearch/files/elasticsearch.conf    | 20 -----
 .../elasticsearch/files/elasticsearch.init4   | 87 -------------------
 .../elasticsearch/files/elasticsearch.init5   | 87 -------------------
 .../files/elasticsearch.service4              | 11 ---
 22 files changed, 1461 deletions(-)
 delete mode 100644 app-misc/elasticsearch/elasticsearch-1.7.4.ebuild
 delete mode 100644 app-misc/elasticsearch/elasticsearch-1.7.5.ebuild
 delete mode 100644 app-misc/elasticsearch/elasticsearch-2.1.1.ebuild
 delete mode 100644 app-misc/elasticsearch/elasticsearch-2.1.2.ebuild
 delete mode 100644 app-misc/elasticsearch/elasticsearch-2.2.0.ebuild
 delete mode 100644 app-misc/elasticsearch/elasticsearch-2.2.2.ebuild
 delete mode 100644 app-misc/elasticsearch/elasticsearch-2.3.0.ebuild
 delete mode 100644 app-misc/elasticsearch/elasticsearch-2.3.1.ebuild
 delete mode 100644 app-misc/elasticsearch/elasticsearch-2.3.2.ebuild
 delete mode 100644 app-misc/elasticsearch/elasticsearch-2.3.3.ebuild
 delete mode 100644 app-misc/elasticsearch/elasticsearch-2.3.4.ebuild
 delete mode 100644 app-misc/elasticsearch/elasticsearch-2.3.5.ebuild
 delete mode 100644 app-misc/elasticsearch/elasticsearch-2.4.0.ebuild
 delete mode 100644 app-misc/elasticsearch/elasticsearch-2.4.1.ebuild
 delete mode 100644 app-misc/elasticsearch/elasticsearch-5.0.0.ebuild
 delete mode 100644 app-misc/elasticsearch/elasticsearch-5.0.1-r1.ebuild
 delete mode 100644 app-misc/elasticsearch/elasticsearch-5.0.1.ebuild
 delete mode 100644 app-misc/elasticsearch/files/elasticsearch.conf
 delete mode 100644 app-misc/elasticsearch/files/elasticsearch.init4
 delete mode 100644 app-misc/elasticsearch/files/elasticsearch.init5
 delete mode 100644 app-misc/elasticsearch/files/elasticsearch.service4

diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 3b15d7d9686b..2f1dc70955a1 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -1,18 +1,2 @@
-DIST elasticsearch-1.7.4.tar.gz 28510433 SHA256 395f3417c26a6b36125f6a062c1129b454a961efea09151c692adc63562e5a94 SHA512 7a31c274a833d0f27dbfd54ce6c8d8f6d01562289e1c4c9258a7c338f3e4ecc9d842d2a5c0c804f333f9cdf9dcfec437640fb4a4e5cfdda3fa958bdb7a402022 WHIRLPOOL 0acff3f5b8047c2647b716d57255e7f884f06ea57e468c784e1a84742b47973570d175a723a4341c54a027b9a442c89e9bed2f66bb29c292d6c59ca40ffb3855
-DIST elasticsearch-1.7.5.tar.gz 28487351 SHA256 0aa58947d66b487488e86059352deb7c6cab5da4accdff043cce9fed7c3d2fa7 SHA512 372e9edf5bd9f68c476e15276fc90cf2ecddbafde17fe803e6a50261c2d3a80616a9440d86494d8cfa411703f87cf053d31c62f4cdee260d64cdc0c07b5741ba WHIRLPOOL e4b02117d868dd1998639aa6fa513928d2af6f9226da1d61e84c674941130b7b960aea44bc51f09f0dc852946ad41ad38ca209c4b50351afc451f329ad51f715
-DIST elasticsearch-2.1.1.tar.gz 29007342 SHA256 ebd69c0483f20ba7e51caa9606d4e3ce5fe2667e1216c799f0cdbb815c317ce6 SHA512 eff12cd7342dc0036dc88f03ced9c7cc90d284222efeca86adfd9e4cf254cb8f96105c58673b239cfc9eb9764a2a669d2cd171ca73eb43b1ec1470a13c5e1776 WHIRLPOOL 2b0e069d162ee07eddc90d879d4ce5dd2cef9e4a804a9aaeb3d99e5d532f583589e2c6a36b5e856bf19a610f220eea6aaa75d28e7b6687b60eab7bf83b2def51
-DIST elasticsearch-2.1.2.tar.gz 29008904 SHA256 069cf3ab88a36d01f86e54b46169891b0adef6eda126ea35e540249d904022e1 SHA512 25757972839e644719f0c129d862bb342bb3d76df19328b9a7e59ca65c62c695e61d8bb21a2a5bd20841b8fd5ba981cd35e83dc2c78a958a344b798b9e71c714 WHIRLPOOL aab6c78edf24101d72ca619d01617661c8701c29c9b49222262c1573912a2ab7eceeca21a367fdc7d600a38c4b381abd9ec4bf5ea59ee9f59e5fe97a76750453
-DIST elasticsearch-2.2.0.tar.gz 29419005 SHA256 ed70cc81e1f55cd5f0032beea2907227b6ad8e7457dcb75ddc97a2cc6e054d30 SHA512 b1c9d10ba6c778fe1a440c058b4968bae1cfb81cff9e00508e406ce02ec5eb889b6d7caf8fb69ef132a2e681b127fbe3b71c6298ee0c9f047aeaeec29cdc1cc6 WHIRLPOOL 1e57b2cca97d90756d592ca96ceb4e1fc026e1c9deaeceb3df3a59937a9cd8710222d6c74ece2883dd425aeb1bfde034413d2f04ea0f4a4c276c0d7de3671cee
-DIST elasticsearch-2.2.2.tar.gz 29425370 SHA256 c706db594f1feb5051d90697c6c412eadd60e00a9ec3b4f345a122801183af69 SHA512 144ca47dd3b9730e5ff81dd93e5db09d57a6f0d61d4445e8609c0ece833f57ca05d81fdf702d56008bc5e370604deb83d2d527132783467d5ae1eddc6cefeb84 WHIRLPOOL 4d6ced926237490a6ee8531ccf09128cc6bff5d73cff6f36159552a4a7a0dfbe01df0dfafb583d1c7ddc47ad5fa054ab6dd8c188cc7e3fe196f6917519e1afac
-DIST elasticsearch-2.3.0.tar.gz 27556947 SHA256 d68482c7633f2986263bc5f11f93b8a58c54c6cf5e337b615446d0a7c6fdcd8b SHA512 26671d64e6cd3406ad1de4543d84c66f58be4906d00ad22584350c5b28359c2b878850fb7cd0e49c9913d968380e8e386d77376c4f32fc37d3a43913c21558db WHIRLPOOL d26a3128d12630fca4defb669b7e23749f9742e1bf7c9497860effdbe6f51c8e86b467d3a16c78c77b7dd93efaa25e21c9694308292567eaa8e07794c57d60db
-DIST elasticsearch-2.3.1.tar.gz 27540442 SHA256 f0092e73038e0472fcdd923e5f2792e13692ea0f09ca034a54dd49b217110ebb SHA512 447d8824c4bfbec9b8431d213e3a8ae6720d1486e1389c271cc67cce5546861a817ef8c7db1c3c3669a50a61b5305739ac26f46b04d5674bbca203c3b5dbcf2f WHIRLPOOL e55501ca7fa702c33cd826d51c2d90dcfcc2843fb5b24b2d20df917cc291fe53f203360bfac6249b57c4c2914d92da92ca56b6505b6be885ece196983c176b9c
-DIST elasticsearch-2.3.2.tar.gz 27543334 SHA256 04c4d3913d496d217e038da88df939108369ae2e78eea29cb1adf1c4ab3a000a SHA512 73c4ca82eb0f4dc22907a94b9025e79183f6fcd38dbb82795800d10fc810dbee412784e62f9247390f0fb9aa19545976584bd2b62f1afe79d2cd64bb55f76dc8 WHIRLPOOL 5cc44a827de5281a9fb823a8a2e43755e0853dc5aa27f5ef7f8d1c5605d80a2dbf4c8756f01811a54307938cb3030634be6c8af2ffa465e2f35cd2a4aabeeb20
-DIST elasticsearch-2.3.3.tar.gz 27542289 SHA256 5fe0a6887432bb8a8d3de2e79c9b81c83cfa241e6440f0f0379a686657789165 SHA512 d3899d2f45128d218693ed2a0f9210ec6ce5fe4101d543b46edaaadceeb6768fe3cf04bf161ad09b38629bada74368133727dd735ef11132fffe81aabe0ef88b WHIRLPOOL 5f51b0c1a913a60073c212c9ee06b024b0ca50bbf7857f2ce1883ab51bbb8295c51c1c2d4e7fd98b5dc9db65cd753fd282a0eccf7568fad6608b3529f5e9ea36
-DIST elasticsearch-2.3.4.tar.gz 27547169 SHA256 371e0c5f4ded0a8548f1cce55faff3efebcfd5f895c2c816f220146521f6f06e SHA512 d6b61069b499d2fab1f4102240a5dfd9c0a0806d0cd7047935ef49da669e61066ca37284bd367df96aec79c47417b499988094737bf2e5a6e4c69f682e311bc0 WHIRLPOOL 46311e0a24d64d3b464ba1640b80294ab5ce2ab34a215a48f72a98492c2f07fd878ec99edd36a206b3445c4eebffac7be30e5af140e475ced312a6de2a8d3c06
-DIST elasticsearch-2.3.5.tar.gz 27547995 SHA256 1119a8c18620b98c4b85261318663a1f26dea92a26f34dfeb7f813fb7cbb468a SHA512 9c0cc8a9ae0fa2b52db583a5c006b05a84c1f84e1b8dbbafa88bec111190d056a23bd384d4241ce00dc8b56a6840857b296e4c0d2bf911f352ef67f128a87ca7 WHIRLPOOL de2aee3773d14c9b4abc0f20c3c8df1fe374a91ea54493f2c1df59fb8c02c97d684fd94b6bfaf140eebcfea4913197b10469b5aef34f62db89d825ae508a5095
-DIST elasticsearch-2.4.0.tar.gz 27364449 SHA256 3ae01140ae7bcbb91436feef381fbed774e36ef6d1e8e6a3153640db82acf4c9 SHA512 931f4d42cba43131718ec7480439b5fda0b9222a51cf9639d99ab4c00bdbedbe7e8da7a6016d88b848772cd416bc49fe7af09202160cecf839e39d803b45e869 WHIRLPOOL e03a2f7a6ea5913ce112b82e8578183c401f2d5901070a77c509ddbe7333fe62622fb2bb3e0f786a914bb15c56793e8b13220ae4588271baa3bbbcdf86223f47
-DIST elasticsearch-2.4.1.tar.gz 27364109 SHA256 23a369ef42955c19aaaf9e34891eea3a055ed217d7fbe76da0998a7a54bbe167 SHA512 69b22d5c2fc93e9bc83c5da415e110105d4d977aa98633041f51f8c55ba9e6045803584965367f6e1f962122ad81a8e07fefcc5a01c5381057ec921d65bc1751 WHIRLPOOL 893056d0cd23ae41e2cb9e3db4591108777b4360ad6be5c52782cc98379ab0f0c36b42758f9815fbaf8557c9e06723c03765fd9eb4cbfcf9fe0d3203d8e6039d
 DIST elasticsearch-2.4.3.tar.gz 27342693 SHA256 01eb684943be01d4af3131c6795073187b1a5868b6525d9686cc0d7a315db12e SHA512 357a145050ba155d60239f0127e8b772705efcddc9246492d80792c65c613f82a87dd4e4ea4a36c9555a0b5a536a34e2168d57c5b851c36f042f9a52ab3e24a8 WHIRLPOOL 07cd05120ac3bb15cd65b29caca6cc847f0e21cae7ff9a1d1002bcb66a54334c85cfc739e05d8452ba128fb3bdecb6c6cc4726e498f4c9e4e7cb8995c7ea7c2b
-DIST elasticsearch-5.0.0.tar.gz 32968292 SHA256 a866534f0fa7428e980c985d712024feef1dee04709add6e360fc7b73bb1e7ae SHA512 a4fa650d643c242a1f90059cfe6eb27e3d240b3deafc426abeae72c13aeae84b01ffb8b872b748619dfc58225ca29bde054fe10e1529522f9a06a1051991e4cd WHIRLPOOL a05a6dc785c00bb461ea286490cacc0222f9f95f0dea7ba61c6308cee0284edc53ee0a2047f723e990fa99f7ed09feda46313997b8f6dd487b042a6b26ecf8d6
-DIST elasticsearch-5.0.1.tar.gz 32944777 SHA256 542e197485fbcb1aac46097439337d2e9ac6a54b7b1e29ad17761f4d65898833 SHA512 3c4c5a692cc77b01b978d3a02f049fcce36b573b6a2097a9d6714618ec0e6de0583f750516ba461eb1d13386ffad636d8663134452edaaeb2b8889c701316598 WHIRLPOOL d5ceb8e87e36be880f3bf746bfa52f7431d62ff9cd666c9dc64093760474d973ffcad792fd0a5927bef61a8e36c2fced76e03eae42e77eb1d158dcd05579b858
 DIST elasticsearch-5.1.1.tar.gz 33291322 SHA256 cd45bafb1f74a7df9bad12c77b7bf3080069266bcbe0b256b0959ef2536e31e8 SHA512 2b5faf97c5ff41a9f12e21749d60f3632b39987d4886713ee9646110acdd17323d263168980d7dd4035732556b604acd68dc37ae7b805d84493075776b9d7bcd WHIRLPOOL ebb46d4a5643f09c0c903055c407a54d46264347924ca37cc73adfee3dd8a9bf2157b1be92b9b1d85636ea92b2d1f89d558c5413c804412996ea9bce42f1c3c6
diff --git a/app-misc/elasticsearch/elasticsearch-1.7.4.ebuild b/app-misc/elasticsearch/elasticsearch-1.7.4.ebuild
deleted file mode 100644
index 1ad3bf36d3d7..000000000000
--- a/app-misc/elasticsearch/elasticsearch-1.7.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils systemd user
-
-MY_PN="${PN%-bin}"
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="strip"
-QA_PREBUILT="usr/share/elasticsearch/lib/sigar/libsigar-*.so"
-
-RDEPEND="|| ( virtual/jre:1.7 virtual/jre:1.8 )"
-
-pkg_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 /bin/bash /var/lib/${MY_PN} ${MY_PN}
-}
-
-src_prepare() {
-	rm -rf lib/sigar/*{solaris,winnt,freebsd,macosx}*
-	rm -rf bin/*.{bat,exe}
-	rm lib/sigar/libsigar-ia64-linux.so
-	rm LICENSE.txt
-
-	use amd64 && {
-		rm lib/sigar/libsigar-x86-linux.so
-	}
-
-	use x86 && {
-		rm lib/sigar/libsigar-amd64-linux.so
-	}
-}
-
-src_install() {
-	dodir /etc/${MY_PN}
-
-	insinto /usr/share/doc/${P}/examples
-	doins config/*
-	rm -rf config
-
-	insinto /usr/share/${MY_PN}
-	doins -r ./*
-	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
-
-	keepdir /var/{lib,log}/${MY_PN}
-
-	newinitd "${FILESDIR}/elasticsearch.init4" "${MY_PN}"
-	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
-	systemd_newunit "${FILESDIR}"/${PN}.service4 "${PN}.service"
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${MY_PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
-	elog
-	elog "Each of the example files in /usr/share/doc/${P}/examples"
-	elog "should be extracted to the proper configuration directory:"
-	elog "/etc/${MY_PN} (for standard init)"
-	elog "/etc/${MY_PN}/instance (for symlinked init)"
-	elog
-}
diff --git a/app-misc/elasticsearch/elasticsearch-1.7.5.ebuild b/app-misc/elasticsearch/elasticsearch-1.7.5.ebuild
deleted file mode 100644
index 1ad3bf36d3d7..000000000000
--- a/app-misc/elasticsearch/elasticsearch-1.7.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils systemd user
-
-MY_PN="${PN%-bin}"
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="strip"
-QA_PREBUILT="usr/share/elasticsearch/lib/sigar/libsigar-*.so"
-
-RDEPEND="|| ( virtual/jre:1.7 virtual/jre:1.8 )"
-
-pkg_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 /bin/bash /var/lib/${MY_PN} ${MY_PN}
-}
-
-src_prepare() {
-	rm -rf lib/sigar/*{solaris,winnt,freebsd,macosx}*
-	rm -rf bin/*.{bat,exe}
-	rm lib/sigar/libsigar-ia64-linux.so
-	rm LICENSE.txt
-
-	use amd64 && {
-		rm lib/sigar/libsigar-x86-linux.so
-	}
-
-	use x86 && {
-		rm lib/sigar/libsigar-amd64-linux.so
-	}
-}
-
-src_install() {
-	dodir /etc/${MY_PN}
-
-	insinto /usr/share/doc/${P}/examples
-	doins config/*
-	rm -rf config
-
-	insinto /usr/share/${MY_PN}
-	doins -r ./*
-	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
-
-	keepdir /var/{lib,log}/${MY_PN}
-
-	newinitd "${FILESDIR}/elasticsearch.init4" "${MY_PN}"
-	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
-	systemd_newunit "${FILESDIR}"/${PN}.service4 "${PN}.service"
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${MY_PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
-	elog
-	elog "Each of the example files in /usr/share/doc/${P}/examples"
-	elog "should be extracted to the proper configuration directory:"
-	elog "/etc/${MY_PN} (for standard init)"
-	elog "/etc/${MY_PN}/instance (for symlinked init)"
-	elog
-}
diff --git a/app-misc/elasticsearch/elasticsearch-2.1.1.ebuild b/app-misc/elasticsearch/elasticsearch-2.1.1.ebuild
deleted file mode 100644
index a70e231e3e64..000000000000
--- a/app-misc/elasticsearch/elasticsearch-2.1.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils systemd user
-
-MY_PN="${PN%-bin}"
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://download.elasticsearch.org/${MY_PN}/release/org/${MY_PN}/distribution/tar/${MY_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_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 /bin/bash /var/lib/${MY_PN} ${MY_PN}
-}
-
-src_prepare() {
-	rm -rf bin/*.{bat,exe}
-	rm LICENSE.txt
-}
-
-src_install() {
-	dodir /etc/${MY_PN}
-	dodir /etc/${MY_PN}/scripts
-
-	insinto /usr/share/doc/${P}/examples
-	doins config/*
-	rm -rf config
-
-	insinto /usr/share/${MY_PN}
-	doins -r ./*
-	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
-
-	keepdir /var/{lib,log}/${MY_PN}
-	keepdir /usr/share/${MY_PN}/plugins
-
-	newinitd "${FILESDIR}/elasticsearch.init5" "${MY_PN}"
-	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
-	systemd_newunit "${FILESDIR}"/${PN}.service4 "${PN}.service"
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${MY_PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
-	elog
-	elog "Each of the example files in /usr/share/doc/${P}/examples"
-	elog "should be extracted to the proper configuration directory:"
-	elog "/etc/${MY_PN} (for standard init)"
-	elog "/etc/${MY_PN}/instance (for symlinked init)"
-	elog
-}
diff --git a/app-misc/elasticsearch/elasticsearch-2.1.2.ebuild b/app-misc/elasticsearch/elasticsearch-2.1.2.ebuild
deleted file mode 100644
index a70e231e3e64..000000000000
--- a/app-misc/elasticsearch/elasticsearch-2.1.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils systemd user
-
-MY_PN="${PN%-bin}"
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://download.elasticsearch.org/${MY_PN}/release/org/${MY_PN}/distribution/tar/${MY_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_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 /bin/bash /var/lib/${MY_PN} ${MY_PN}
-}
-
-src_prepare() {
-	rm -rf bin/*.{bat,exe}
-	rm LICENSE.txt
-}
-
-src_install() {
-	dodir /etc/${MY_PN}
-	dodir /etc/${MY_PN}/scripts
-
-	insinto /usr/share/doc/${P}/examples
-	doins config/*
-	rm -rf config
-
-	insinto /usr/share/${MY_PN}
-	doins -r ./*
-	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
-
-	keepdir /var/{lib,log}/${MY_PN}
-	keepdir /usr/share/${MY_PN}/plugins
-
-	newinitd "${FILESDIR}/elasticsearch.init5" "${MY_PN}"
-	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
-	systemd_newunit "${FILESDIR}"/${PN}.service4 "${PN}.service"
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${MY_PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
-	elog
-	elog "Each of the example files in /usr/share/doc/${P}/examples"
-	elog "should be extracted to the proper configuration directory:"
-	elog "/etc/${MY_PN} (for standard init)"
-	elog "/etc/${MY_PN}/instance (for symlinked init)"
-	elog
-}
diff --git a/app-misc/elasticsearch/elasticsearch-2.2.0.ebuild b/app-misc/elasticsearch/elasticsearch-2.2.0.ebuild
deleted file mode 100644
index a70e231e3e64..000000000000
--- a/app-misc/elasticsearch/elasticsearch-2.2.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils systemd user
-
-MY_PN="${PN%-bin}"
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://download.elasticsearch.org/${MY_PN}/release/org/${MY_PN}/distribution/tar/${MY_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_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 /bin/bash /var/lib/${MY_PN} ${MY_PN}
-}
-
-src_prepare() {
-	rm -rf bin/*.{bat,exe}
-	rm LICENSE.txt
-}
-
-src_install() {
-	dodir /etc/${MY_PN}
-	dodir /etc/${MY_PN}/scripts
-
-	insinto /usr/share/doc/${P}/examples
-	doins config/*
-	rm -rf config
-
-	insinto /usr/share/${MY_PN}
-	doins -r ./*
-	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
-
-	keepdir /var/{lib,log}/${MY_PN}
-	keepdir /usr/share/${MY_PN}/plugins
-
-	newinitd "${FILESDIR}/elasticsearch.init5" "${MY_PN}"
-	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
-	systemd_newunit "${FILESDIR}"/${PN}.service4 "${PN}.service"
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${MY_PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
-	elog
-	elog "Each of the example files in /usr/share/doc/${P}/examples"
-	elog "should be extracted to the proper configuration directory:"
-	elog "/etc/${MY_PN} (for standard init)"
-	elog "/etc/${MY_PN}/instance (for symlinked init)"
-	elog
-}
diff --git a/app-misc/elasticsearch/elasticsearch-2.2.2.ebuild b/app-misc/elasticsearch/elasticsearch-2.2.2.ebuild
deleted file mode 100644
index a70e231e3e64..000000000000
--- a/app-misc/elasticsearch/elasticsearch-2.2.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils systemd user
-
-MY_PN="${PN%-bin}"
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://download.elasticsearch.org/${MY_PN}/release/org/${MY_PN}/distribution/tar/${MY_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_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 /bin/bash /var/lib/${MY_PN} ${MY_PN}
-}
-
-src_prepare() {
-	rm -rf bin/*.{bat,exe}
-	rm LICENSE.txt
-}
-
-src_install() {
-	dodir /etc/${MY_PN}
-	dodir /etc/${MY_PN}/scripts
-
-	insinto /usr/share/doc/${P}/examples
-	doins config/*
-	rm -rf config
-
-	insinto /usr/share/${MY_PN}
-	doins -r ./*
-	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
-
-	keepdir /var/{lib,log}/${MY_PN}
-	keepdir /usr/share/${MY_PN}/plugins
-
-	newinitd "${FILESDIR}/elasticsearch.init5" "${MY_PN}"
-	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
-	systemd_newunit "${FILESDIR}"/${PN}.service4 "${PN}.service"
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${MY_PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
-	elog
-	elog "Each of the example files in /usr/share/doc/${P}/examples"
-	elog "should be extracted to the proper configuration directory:"
-	elog "/etc/${MY_PN} (for standard init)"
-	elog "/etc/${MY_PN}/instance (for symlinked init)"
-	elog
-}
diff --git a/app-misc/elasticsearch/elasticsearch-2.3.0.ebuild b/app-misc/elasticsearch/elasticsearch-2.3.0.ebuild
deleted file mode 100644
index a70e231e3e64..000000000000
--- a/app-misc/elasticsearch/elasticsearch-2.3.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils systemd user
-
-MY_PN="${PN%-bin}"
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://download.elasticsearch.org/${MY_PN}/release/org/${MY_PN}/distribution/tar/${MY_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_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 /bin/bash /var/lib/${MY_PN} ${MY_PN}
-}
-
-src_prepare() {
-	rm -rf bin/*.{bat,exe}
-	rm LICENSE.txt
-}
-
-src_install() {
-	dodir /etc/${MY_PN}
-	dodir /etc/${MY_PN}/scripts
-
-	insinto /usr/share/doc/${P}/examples
-	doins config/*
-	rm -rf config
-
-	insinto /usr/share/${MY_PN}
-	doins -r ./*
-	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
-
-	keepdir /var/{lib,log}/${MY_PN}
-	keepdir /usr/share/${MY_PN}/plugins
-
-	newinitd "${FILESDIR}/elasticsearch.init5" "${MY_PN}"
-	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
-	systemd_newunit "${FILESDIR}"/${PN}.service4 "${PN}.service"
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${MY_PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
-	elog
-	elog "Each of the example files in /usr/share/doc/${P}/examples"
-	elog "should be extracted to the proper configuration directory:"
-	elog "/etc/${MY_PN} (for standard init)"
-	elog "/etc/${MY_PN}/instance (for symlinked init)"
-	elog
-}
diff --git a/app-misc/elasticsearch/elasticsearch-2.3.1.ebuild b/app-misc/elasticsearch/elasticsearch-2.3.1.ebuild
deleted file mode 100644
index a70e231e3e64..000000000000
--- a/app-misc/elasticsearch/elasticsearch-2.3.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils systemd user
-
-MY_PN="${PN%-bin}"
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://download.elasticsearch.org/${MY_PN}/release/org/${MY_PN}/distribution/tar/${MY_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_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 /bin/bash /var/lib/${MY_PN} ${MY_PN}
-}
-
-src_prepare() {
-	rm -rf bin/*.{bat,exe}
-	rm LICENSE.txt
-}
-
-src_install() {
-	dodir /etc/${MY_PN}
-	dodir /etc/${MY_PN}/scripts
-
-	insinto /usr/share/doc/${P}/examples
-	doins config/*
-	rm -rf config
-
-	insinto /usr/share/${MY_PN}
-	doins -r ./*
-	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
-
-	keepdir /var/{lib,log}/${MY_PN}
-	keepdir /usr/share/${MY_PN}/plugins
-
-	newinitd "${FILESDIR}/elasticsearch.init5" "${MY_PN}"
-	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
-	systemd_newunit "${FILESDIR}"/${PN}.service4 "${PN}.service"
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${MY_PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
-	elog
-	elog "Each of the example files in /usr/share/doc/${P}/examples"
-	elog "should be extracted to the proper configuration directory:"
-	elog "/etc/${MY_PN} (for standard init)"
-	elog "/etc/${MY_PN}/instance (for symlinked init)"
-	elog
-}
diff --git a/app-misc/elasticsearch/elasticsearch-2.3.2.ebuild b/app-misc/elasticsearch/elasticsearch-2.3.2.ebuild
deleted file mode 100644
index a0baa8b09d90..000000000000
--- a/app-misc/elasticsearch/elasticsearch-2.3.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils systemd user
-
-MY_PN="${PN%-bin}"
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://download.elasticsearch.org/${MY_PN}/release/org/${MY_PN}/distribution/tar/${MY_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 ${MY_PN}
-	enewuser ${MY_PN} -1 /bin/bash /usr/share/${MY_PN} ${MY_PN}
-	esethome ${MY_PN} /usr/share/${MY_PN}
-}
-
-src_prepare() {
-	rm -rf bin/*.{bat,exe}
-	rm LICENSE.txt
-}
-
-src_install() {
-	dodir /etc/${MY_PN}
-	dodir /etc/${MY_PN}/scripts
-
-	insinto /etc/${MY_PN}
-	doins config/*
-	rm -rf config
-
-	insinto /usr/share/${MY_PN}
-	doins -r ./*
-
-	insinto /usr/share/${MY_PN}/bin
-	doins "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
-
-	keepdir /var/{lib,log}/${MY_PN}
-	keepdir /usr/share/${MY_PN}/plugins
-
-	newinitd "${FILESDIR}/elasticsearch.init6" "${MY_PN}"
-	newconfd "${FILESDIR}/${MY_PN}.conf2" "${MY_PN}"
-	systemd_newunit "${FILESDIR}"/${PN}.service5 "${PN}.service"
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${MY_PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml and logging.yml"
-	elog "into the configuration directory of the instance:"
-	elog "/etc/${MY_PN}/instance"
-	elog
-	if ! [ -z ${UPDATE_NOTES} ]; then
-		elog "This update changes some configuration variables. Please review"
-		elog "/etc/conf.d/elasticsearch before restarting your services."
-	fi
-}
diff --git a/app-misc/elasticsearch/elasticsearch-2.3.3.ebuild b/app-misc/elasticsearch/elasticsearch-2.3.3.ebuild
deleted file mode 100644
index a0baa8b09d90..000000000000
--- a/app-misc/elasticsearch/elasticsearch-2.3.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils systemd user
-
-MY_PN="${PN%-bin}"
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://download.elasticsearch.org/${MY_PN}/release/org/${MY_PN}/distribution/tar/${MY_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 ${MY_PN}
-	enewuser ${MY_PN} -1 /bin/bash /usr/share/${MY_PN} ${MY_PN}
-	esethome ${MY_PN} /usr/share/${MY_PN}
-}
-
-src_prepare() {
-	rm -rf bin/*.{bat,exe}
-	rm LICENSE.txt
-}
-
-src_install() {
-	dodir /etc/${MY_PN}
-	dodir /etc/${MY_PN}/scripts
-
-	insinto /etc/${MY_PN}
-	doins config/*
-	rm -rf config
-
-	insinto /usr/share/${MY_PN}
-	doins -r ./*
-
-	insinto /usr/share/${MY_PN}/bin
-	doins "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
-
-	keepdir /var/{lib,log}/${MY_PN}
-	keepdir /usr/share/${MY_PN}/plugins
-
-	newinitd "${FILESDIR}/elasticsearch.init6" "${MY_PN}"
-	newconfd "${FILESDIR}/${MY_PN}.conf2" "${MY_PN}"
-	systemd_newunit "${FILESDIR}"/${PN}.service5 "${PN}.service"
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${MY_PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml and logging.yml"
-	elog "into the configuration directory of the instance:"
-	elog "/etc/${MY_PN}/instance"
-	elog
-	if ! [ -z ${UPDATE_NOTES} ]; then
-		elog "This update changes some configuration variables. Please review"
-		elog "/etc/conf.d/elasticsearch before restarting your services."
-	fi
-}
diff --git a/app-misc/elasticsearch/elasticsearch-2.3.4.ebuild b/app-misc/elasticsearch/elasticsearch-2.3.4.ebuild
deleted file mode 100644
index a0baa8b09d90..000000000000
--- a/app-misc/elasticsearch/elasticsearch-2.3.4.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils systemd user
-
-MY_PN="${PN%-bin}"
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://download.elasticsearch.org/${MY_PN}/release/org/${MY_PN}/distribution/tar/${MY_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 ${MY_PN}
-	enewuser ${MY_PN} -1 /bin/bash /usr/share/${MY_PN} ${MY_PN}
-	esethome ${MY_PN} /usr/share/${MY_PN}
-}
-
-src_prepare() {
-	rm -rf bin/*.{bat,exe}
-	rm LICENSE.txt
-}
-
-src_install() {
-	dodir /etc/${MY_PN}
-	dodir /etc/${MY_PN}/scripts
-
-	insinto /etc/${MY_PN}
-	doins config/*
-	rm -rf config
-
-	insinto /usr/share/${MY_PN}
-	doins -r ./*
-
-	insinto /usr/share/${MY_PN}/bin
-	doins "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
-
-	keepdir /var/{lib,log}/${MY_PN}
-	keepdir /usr/share/${MY_PN}/plugins
-
-	newinitd "${FILESDIR}/elasticsearch.init6" "${MY_PN}"
-	newconfd "${FILESDIR}/${MY_PN}.conf2" "${MY_PN}"
-	systemd_newunit "${FILESDIR}"/${PN}.service5 "${PN}.service"
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${MY_PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml and logging.yml"
-	elog "into the configuration directory of the instance:"
-	elog "/etc/${MY_PN}/instance"
-	elog
-	if ! [ -z ${UPDATE_NOTES} ]; then
-		elog "This update changes some configuration variables. Please review"
-		elog "/etc/conf.d/elasticsearch before restarting your services."
-	fi
-}
diff --git a/app-misc/elasticsearch/elasticsearch-2.3.5.ebuild b/app-misc/elasticsearch/elasticsearch-2.3.5.ebuild
deleted file mode 100644
index 198f14a60170..000000000000
--- a/app-misc/elasticsearch/elasticsearch-2.3.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils systemd user
-
-MY_PN="${PN%-bin}"
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://download.elasticsearch.org/${MY_PN}/release/org/${MY_PN}/distribution/tar/${MY_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 ${MY_PN}
-	enewuser ${MY_PN} -1 /bin/bash /usr/share/${MY_PN} ${MY_PN}
-	esethome ${MY_PN} /usr/share/${MY_PN}
-}
-
-src_prepare() {
-	rm -rf bin/*.{bat,exe}
-	rm LICENSE.txt
-}
-
-src_install() {
-	dodir /etc/${MY_PN}
-	dodir /etc/${MY_PN}/scripts
-
-	insinto /etc/${MY_PN}
-	doins config/*
-	rm -rf config
-
-	insinto /usr/share/${MY_PN}
-	doins -r ./*
-
-	insinto /usr/share/${MY_PN}/bin
-	doins "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
-
-	keepdir /var/{lib,log}/${MY_PN}
-	keepdir /usr/share/${MY_PN}/plugins
-
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/${MY_PN}.tmpfiles.d" "${MY_PN}.conf"
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${MY_PN}.sysctl.d" "${MY_PN}.conf"
-
-	newinitd "${FILESDIR}/elasticsearch.init6" "${MY_PN}"
-	newconfd "${FILESDIR}/${MY_PN}.conf2" "${MY_PN}"
-	systemd_newunit "${FILESDIR}"/${PN}.service5 "${PN}.service"
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${MY_PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml and logging.yml"
-	elog "into the configuration directory of the instance:"
-	elog "/etc/${MY_PN}/instance"
-	elog
-	if ! [ -z ${UPDATE_NOTES} ]; then
-		elog "This update changes some configuration variables. Please review"
-		elog "/etc/conf.d/elasticsearch before restarting your services."
-	fi
-}
diff --git a/app-misc/elasticsearch/elasticsearch-2.4.0.ebuild b/app-misc/elasticsearch/elasticsearch-2.4.0.ebuild
deleted file mode 100644
index 198f14a60170..000000000000
--- a/app-misc/elasticsearch/elasticsearch-2.4.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils systemd user
-
-MY_PN="${PN%-bin}"
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://download.elasticsearch.org/${MY_PN}/release/org/${MY_PN}/distribution/tar/${MY_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 ${MY_PN}
-	enewuser ${MY_PN} -1 /bin/bash /usr/share/${MY_PN} ${MY_PN}
-	esethome ${MY_PN} /usr/share/${MY_PN}
-}
-
-src_prepare() {
-	rm -rf bin/*.{bat,exe}
-	rm LICENSE.txt
-}
-
-src_install() {
-	dodir /etc/${MY_PN}
-	dodir /etc/${MY_PN}/scripts
-
-	insinto /etc/${MY_PN}
-	doins config/*
-	rm -rf config
-
-	insinto /usr/share/${MY_PN}
-	doins -r ./*
-
-	insinto /usr/share/${MY_PN}/bin
-	doins "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
-
-	keepdir /var/{lib,log}/${MY_PN}
-	keepdir /usr/share/${MY_PN}/plugins
-
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/${MY_PN}.tmpfiles.d" "${MY_PN}.conf"
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${MY_PN}.sysctl.d" "${MY_PN}.conf"
-
-	newinitd "${FILESDIR}/elasticsearch.init6" "${MY_PN}"
-	newconfd "${FILESDIR}/${MY_PN}.conf2" "${MY_PN}"
-	systemd_newunit "${FILESDIR}"/${PN}.service5 "${PN}.service"
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${MY_PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml and logging.yml"
-	elog "into the configuration directory of the instance:"
-	elog "/etc/${MY_PN}/instance"
-	elog
-	if ! [ -z ${UPDATE_NOTES} ]; then
-		elog "This update changes some configuration variables. Please review"
-		elog "/etc/conf.d/elasticsearch before restarting your services."
-	fi
-}
diff --git a/app-misc/elasticsearch/elasticsearch-2.4.1.ebuild b/app-misc/elasticsearch/elasticsearch-2.4.1.ebuild
deleted file mode 100644
index 198f14a60170..000000000000
--- a/app-misc/elasticsearch/elasticsearch-2.4.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils systemd user
-
-MY_PN="${PN%-bin}"
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://download.elasticsearch.org/${MY_PN}/release/org/${MY_PN}/distribution/tar/${MY_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 ${MY_PN}
-	enewuser ${MY_PN} -1 /bin/bash /usr/share/${MY_PN} ${MY_PN}
-	esethome ${MY_PN} /usr/share/${MY_PN}
-}
-
-src_prepare() {
-	rm -rf bin/*.{bat,exe}
-	rm LICENSE.txt
-}
-
-src_install() {
-	dodir /etc/${MY_PN}
-	dodir /etc/${MY_PN}/scripts
-
-	insinto /etc/${MY_PN}
-	doins config/*
-	rm -rf config
-
-	insinto /usr/share/${MY_PN}
-	doins -r ./*
-
-	insinto /usr/share/${MY_PN}/bin
-	doins "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
-
-	keepdir /var/{lib,log}/${MY_PN}
-	keepdir /usr/share/${MY_PN}/plugins
-
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/${MY_PN}.tmpfiles.d" "${MY_PN}.conf"
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${MY_PN}.sysctl.d" "${MY_PN}.conf"
-
-	newinitd "${FILESDIR}/elasticsearch.init6" "${MY_PN}"
-	newconfd "${FILESDIR}/${MY_PN}.conf2" "${MY_PN}"
-	systemd_newunit "${FILESDIR}"/${PN}.service5 "${PN}.service"
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${MY_PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml and logging.yml"
-	elog "into the configuration directory of the instance:"
-	elog "/etc/${MY_PN}/instance"
-	elog
-	if ! [ -z ${UPDATE_NOTES} ]; then
-		elog "This update changes some configuration variables. Please review"
-		elog "/etc/conf.d/elasticsearch before restarting your services."
-	fi
-}
diff --git a/app-misc/elasticsearch/elasticsearch-5.0.0.ebuild b/app-misc/elasticsearch/elasticsearch-5.0.0.ebuild
deleted file mode 100644
index 9f0a61927010..000000000000
--- a/app-misc/elasticsearch/elasticsearch-5.0.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils systemd user
-
-MY_PN="${PN%-bin}"
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="strip"
-
-RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_preinst() {
-	if has_version '<app-misc/elasticsearch-2.3.2'; then
-		export UPDATE_NOTES=1
-	fi
-}
-
-pkg_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 /bin/bash /usr/share/${MY_PN} ${MY_PN}
-	esethome ${MY_PN} /usr/share/${MY_PN}
-}
-
-src_prepare() {
-	rm -rf bin/*.{bat,exe}
-	rm LICENSE.txt
-}
-
-src_install() {
-	dodir /etc/${MY_PN}
-	dodir /etc/${MY_PN}/scripts
-
-	insinto /etc/${MY_PN}
-	doins config/*
-	rm -rf config
-
-	insinto /usr/share/${MY_PN}
-	doins -r ./*
-
-	insinto /usr/share/${MY_PN}/bin
-	doins "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
-
-	keepdir /var/{lib,log}/${MY_PN}
-	keepdir /usr/share/${MY_PN}/plugins
-
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/${MY_PN}.tmpfiles.d" "${MY_PN}.conf"
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${MY_PN}.sysctl.d" "${MY_PN}.conf"
-
-	newinitd "${FILESDIR}/elasticsearch.init6" "${MY_PN}"
-	newconfd "${FILESDIR}/${MY_PN}.conf2" "${MY_PN}"
-	systemd_newunit "${FILESDIR}"/${PN}.service5 "${PN}.service"
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${MY_PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml and logging.yml"
-	elog "into the configuration directory of the instance:"
-	elog "/etc/${MY_PN}/instance"
-	elog
-	if ! [ -z ${UPDATE_NOTES} ]; then
-		elog "This update changes some configuration variables. Please review"
-		elog "/etc/conf.d/elasticsearch before restarting your services."
-	fi
-}
diff --git a/app-misc/elasticsearch/elasticsearch-5.0.1-r1.ebuild b/app-misc/elasticsearch/elasticsearch-5.0.1-r1.ebuild
deleted file mode 100644
index ca759e06dc4f..000000000000
--- a/app-misc/elasticsearch/elasticsearch-5.0.1-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils systemd user
-
-MY_PN="${PN%-bin}"
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="strip"
-
-RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_preinst() {
-	if has_version '<app-misc/elasticsearch-2.3.2'; then
-		export UPDATE_NOTES=1
-	fi
-}
-
-pkg_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 /bin/bash /usr/share/${MY_PN} ${MY_PN}
-	esethome ${MY_PN} /usr/share/${MY_PN}
-}
-
-src_prepare() {
-	rm -rf bin/*.{bat,exe}
-	rm LICENSE.txt
-}
-
-src_install() {
-	dodir /etc/${MY_PN}
-	dodir /etc/${MY_PN}/scripts
-
-	insinto /etc/${MY_PN}
-	doins config/*
-	rm -rf config
-
-	insinto /usr/share/${MY_PN}
-	doins -r ./*
-
-	insinto /usr/share/${MY_PN}/bin
-	doins "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
-
-	keepdir /var/{lib,log}/${MY_PN}
-	keepdir /usr/share/${MY_PN}/plugins
-
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/${MY_PN}.tmpfiles.d" "${MY_PN}.conf"
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${MY_PN}.sysctl.d" "${MY_PN}.conf"
-
-	newinitd "${FILESDIR}/elasticsearch.init7" "${MY_PN}"
-	newconfd "${FILESDIR}/${MY_PN}.conf3" "${MY_PN}"
-	systemd_newunit "${FILESDIR}"/${PN}.service5 "${PN}.service"
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${MY_PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml and logging.yml"
-	elog "into the configuration directory of the instance:"
-	elog "/etc/${MY_PN}/instance"
-	elog
-	if ! [ -z ${UPDATE_NOTES} ]; then
-		elog "This update changes some configuration variables. Please review"
-		elog "/etc/conf.d/elasticsearch before restarting your services."
-	fi
-}
diff --git a/app-misc/elasticsearch/elasticsearch-5.0.1.ebuild b/app-misc/elasticsearch/elasticsearch-5.0.1.ebuild
deleted file mode 100644
index 9f0a61927010..000000000000
--- a/app-misc/elasticsearch/elasticsearch-5.0.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils systemd user
-
-MY_PN="${PN%-bin}"
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="strip"
-
-RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_preinst() {
-	if has_version '<app-misc/elasticsearch-2.3.2'; then
-		export UPDATE_NOTES=1
-	fi
-}
-
-pkg_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 /bin/bash /usr/share/${MY_PN} ${MY_PN}
-	esethome ${MY_PN} /usr/share/${MY_PN}
-}
-
-src_prepare() {
-	rm -rf bin/*.{bat,exe}
-	rm LICENSE.txt
-}
-
-src_install() {
-	dodir /etc/${MY_PN}
-	dodir /etc/${MY_PN}/scripts
-
-	insinto /etc/${MY_PN}
-	doins config/*
-	rm -rf config
-
-	insinto /usr/share/${MY_PN}
-	doins -r ./*
-
-	insinto /usr/share/${MY_PN}/bin
-	doins "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
-
-	keepdir /var/{lib,log}/${MY_PN}
-	keepdir /usr/share/${MY_PN}/plugins
-
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/${MY_PN}.tmpfiles.d" "${MY_PN}.conf"
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${MY_PN}.sysctl.d" "${MY_PN}.conf"
-
-	newinitd "${FILESDIR}/elasticsearch.init6" "${MY_PN}"
-	newconfd "${FILESDIR}/${MY_PN}.conf2" "${MY_PN}"
-	systemd_newunit "${FILESDIR}"/${PN}.service5 "${PN}.service"
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${MY_PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml and logging.yml"
-	elog "into the configuration directory of the instance:"
-	elog "/etc/${MY_PN}/instance"
-	elog
-	if ! [ -z ${UPDATE_NOTES} ]; then
-		elog "This update changes some configuration variables. Please review"
-		elog "/etc/conf.d/elasticsearch before restarting your services."
-	fi
-}
diff --git a/app-misc/elasticsearch/files/elasticsearch.conf b/app-misc/elasticsearch/files/elasticsearch.conf
deleted file mode 100644
index 54e3df9a82dc..000000000000
--- a/app-misc/elasticsearch/files/elasticsearch.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# please modify/copy
-# /etc/elasticsearch/elasticsearch.in.sh.sample
-# to 
-# /etc/elasticsearch/[instance/]elasticsearch.in.sh
-#
-# many variables/options are available in this file
-
-# ES_USER="elasticsearch:elasticsearch"
-## set max fds (ulimit -n X)
-# ES_MAX_FD=""
-
-## override elasticsearch.in.sh
-#
-# ES_CLASSPATH=""
-# JAVA_OPTS=""
-# ES_JAVA_OPTS=""
-# ES_HEAP_SIZE=""
-# ES_HEAP_NEWSIZE=""
-# ES_DIRECT_SIZE=""
-# ES_USE_IPV4=""
diff --git a/app-misc/elasticsearch/files/elasticsearch.init4 b/app-misc/elasticsearch/files/elasticsearch.init4
deleted file mode 100644
index ddb5aba6ba8f..000000000000
--- a/app-misc/elasticsearch/files/elasticsearch.init4
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/sbin/openrc-run
-
-name="Elasticsearch"
-description=""
-
-ES_USER=${ES_USER:="elasticsearch"}
-ES_INSTANCE=${SVCNAME#*.}
-
-if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then
-	PIDFILE="/run/elasticsearch/elasticsearch.${ES_INSTANCE}.pid"
-	ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
-	ES_CONF_PATH="/etc/elasticsearch/${ES_INSTANCE}"
-	ES_LOG_PATH="/var/log/elasticsearch/${ES_INSTANCE}"
-else
-	PIDFILE="/run/elasticsearch/elasticsearch.pid"
-	ES_BASE_PATH="/var/lib/elasticsearch/_default"
-	ES_CONF_PATH="/etc/elasticsearch"
-	ES_LOG_PATH="/var/log/elasticsearch/_default"
-fi
-
-ES_DATA_PATH="${ES_BASE_PATH}/data"
-ES_WORK_PATH="${ES_BASE_PATH}/work"
-
-export ES_INCLUDE="/usr/share/elasticsearch/bin/elasticsearch.in.sh"
-export JAVA_OPTS
-export ES_JAVA_OPTS
-export ES_HEAP_SIZE
-export ES_HEAP_NEWSIZE
-export ES_DIRECT_SIZE
-export ES_USE_IPV4
-
-server_command="/usr/share/elasticsearch/bin/elasticsearch"
-server_args=" -p ${PIDFILE} -Des.default.path.conf=\"${ES_CONF_PATH}\" -Des.default.path.data=\"${ES_DATA_PATH}\" -Des.default.path.work=\"${ES_WORK_PATH}\" -Des.default.path.logs=\"${ES_LOG_PATH}\""
-
-depend() {
-	use net
-}
-
-start() {
-	# elasticsearch -Des.config=/path/to/config/file
-	# elasticsearch -Des.network.host=10.0.0.4
-	
-	[ ! -f "${ES_INCLUDE}" ] && {
-		eerror "${ES_INCLUDE} must be copied into place"
-		return 1
-	}
-
-	local conf
-	local conf_file
-	for conf in elasticsearch.yml logging.yml; do
-		conf_file="${ES_CONF_PATH}/${conf}"
-		if [ ! -f "${conf_file}" ]; then
-			eerror "${conf_file} must be copied into place"
-			return 1
-		fi
-	done
-
-	ebegin "Starting ${SVCNAME}"
-
-	if [ -n "${ES_MAX_FD}" ]; then
-		ulimit -n ${ES_MAX_FD}
-		einfo "Max open filedescriptors  : ${ES_MAX_FD}"
-	fi
-
-	checkpath -d -o "${ES_USER}" -m750 "/var/lib/elasticsearch"
-	checkpath -d -o "${ES_USER}" -m750 "/var/log/elasticsearch"
-	checkpath -d -o "${ES_USER}" -m750 "$(dirname "${PIDFILE}")"
-	checkpath -d -o "${ES_USER}" -m750 "${ES_BASE_PATH}"
-	checkpath -d -o "${ES_USER}" -m750 "${ES_LOG_PATH}"
-
-	start-stop-daemon --start \
-		--background \
-		--chdir "${ES_BASE_PATH}" \
-		--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/KILL/5
-	eend $?
-}
diff --git a/app-misc/elasticsearch/files/elasticsearch.init5 b/app-misc/elasticsearch/files/elasticsearch.init5
deleted file mode 100644
index 5b1da0e27d51..000000000000
--- a/app-misc/elasticsearch/files/elasticsearch.init5
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/sbin/openrc-run
-
-name="Elasticsearch"
-description=""
-
-ES_USER=${ES_USER:="elasticsearch"}
-ES_INSTANCE=${SVCNAME#*.}
-
-if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then
-	PIDFILE="/run/elasticsearch/elasticsearch.${ES_INSTANCE}.pid"
-	ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
-	ES_CONF_PATH="/etc/elasticsearch/${ES_INSTANCE}"
-	ES_LOG_PATH="/var/log/elasticsearch/${ES_INSTANCE}"
-else
-	PIDFILE="/run/elasticsearch/elasticsearch.pid"
-	ES_BASE_PATH="/var/lib/elasticsearch/_default"
-	ES_CONF_PATH="/etc/elasticsearch"
-	ES_LOG_PATH="/var/log/elasticsearch/_default"
-fi
-
-ES_DATA_PATH="${ES_BASE_PATH}/data"
-ES_WORK_PATH="${ES_BASE_PATH}/work"
-
-export ES_INCLUDE="/usr/share/elasticsearch/bin/elasticsearch.in.sh"
-export JAVA_OPTS
-export ES_JAVA_OPTS
-export ES_HEAP_SIZE
-export ES_HEAP_NEWSIZE
-export ES_DIRECT_SIZE
-export ES_USE_IPV4
-
-server_command="/usr/share/elasticsearch/bin/elasticsearch"
-server_args=" -p ${PIDFILE} -Des.default.path.conf=${ES_CONF_PATH} -Des.default.path.data=${ES_DATA_PATH} -Des.default.path.work=${ES_WORK_PATH} -Des.default.path.logs=${ES_LOG_PATH}"
-
-depend() {
-	use net
-}
-
-start() {
-	# elasticsearch -Des.config=/path/to/config/file
-	# elasticsearch -Des.network.host=10.0.0.4
-
-	[ ! -f "${ES_INCLUDE}" ] && {
-		eerror "${ES_INCLUDE} must be copied into place"
-		return 1
-	}
-
-	local conf
-	local conf_file
-	for conf in elasticsearch.yml logging.yml; do
-		conf_file="${ES_CONF_PATH}/${conf}"
-		if [ ! -f "${conf_file}" ]; then
-			eerror "${conf_file} must be copied into place"
-			return 1
-		fi
-	done
-
-	ebegin "Starting ${SVCNAME}"
-
-	if [ -n "${ES_MAX_FD}" ]; then
-		ulimit -n ${ES_MAX_FD}
-		einfo "Max open filedescriptors  : ${ES_MAX_FD}"
-	fi
-
-	checkpath -d -o "${ES_USER}" -m750 "/var/lib/elasticsearch"
-	checkpath -d -o "${ES_USER}" -m750 "/var/log/elasticsearch"
-	checkpath -d -o "${ES_USER}" -m750 "$(dirname "${PIDFILE}")"
-	checkpath -d -o "${ES_USER}" -m750 "${ES_BASE_PATH}"
-	checkpath -d -o "${ES_USER}" -m750 "${ES_LOG_PATH}"
-
-	start-stop-daemon --start \
-		--background \
-		--chdir "${ES_BASE_PATH}" \
-		--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/KILL/5
-	eend $?
-}
diff --git a/app-misc/elasticsearch/files/elasticsearch.service4 b/app-misc/elasticsearch/files/elasticsearch.service4
deleted file mode 100644
index 739c6f8888bf..000000000000
--- a/app-misc/elasticsearch/files/elasticsearch.service4
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Elasticsearch
-After=network.target
-
-[Service]
-User=elasticsearch
-Environment=ES_INCLUDE=/usr/share/elasticsearch/bin/elasticsearch.in.sh
-ExecStart=/usr/share/elasticsearch/bin/elasticsearch -Des.default.path.conf=/etc/elasticsearch
-
-[Install]
-WantedBy=multi-user.target
-- 
2.26.2