gentoo resync : 26.11.2017

5 files changed, 262 insertions, 15 deletions

diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 1f6a6314bbbe..5bb669a5cceb 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -1,15 +1,18 @@
-AUX elasticsearch-systemd-pre-exec 221 SHA256 cfe5d1afe9e7395c47d2a39ab85058ae6295fe9d094a8e25dc80a10c78e0b7f2 SHA512 1dc41303da367122779759fc1967540357a21aac6df4f5d8761d36dc643673df660b47e5c1b595ecf9316265fe7684ddcb5290df8369379c1bdbc8c933726644 WHIRLPOOL ae0548c7cc96c7ba91af04af02dd395ebc0a8290200168c014594b71d24954afc4be9d0182de3a4fc6de4a3e893daf42954926351dd1e96ed75c7692b089066c
-AUX elasticsearch.conf 2077 SHA256 ec51be1e6aade76dafebb63183693c4ab2de0e4111d5f358b31ff4ecc75a0b7c SHA512 d386f409e7c7d7e654b43ba42298d0c8d14f0973a656582c06e21dc5e1a93088367725c1ef1644d0bde553912297f1693fca9b461f51ac823be3140f56f9dd5a WHIRLPOOL 24e3fcecd818c0ec2625eb6fa01ff4d3656466334eb157e0675a1a0fcd678a3e407e66ed4cbf4c74fd848e7eed3fe43b11d417cc9d41c6597ab76e5f4ad835cf
-AUX elasticsearch.conf.2 2070 SHA256 d11e1b1706101705971735fcae7ecf1b9a23430fa37a8fa09ee78b7885d3a4a1 SHA512 e10d7699046e7db71d822154be6e21785906977d991cae6709a4fd0439c262915ddbf5499b8dd501da86985644f402b96c92fa5d83feb9d0684d3eec766164f9 WHIRLPOOL 94d0c284378c5f3517da53d71e43e45fb2c184166905c2e1d07dbcf43cc5f321f4d24f9b7be93d6a86d5f632c4d13040f2ccf3ebb5ec5949e6e8e83d27cf799d
-AUX elasticsearch.init 2503 SHA256 d5a3225da5d00eaa6d8dd97bcd31503b8814cbc4e0a8b29e5a7c290ac03bb7bd SHA512 55369ea6fc19979a722528afead2a4a19912fd212db450e4fb840c88d0a868faaa87ff8fe33a8a12370559f68b729771ee4b5fdbf066a263a97bb7944d68b9b6 WHIRLPOOL cc6f72a296f8d612845fe624b29bea4d669ab9a0a5c2ca44f598dac6fff32695c64d19eb7c49a21a9f6bee3d49aaf881ebe348edea50d41e98eb355214a27ab8
-AUX elasticsearch.init.2 1830 SHA256 b7be4438e13fb4db11d1fedf078cc0f65f3b4a9e5238075c783789ca3e5a5aa2 SHA512 babc54a225f1ea5c98a6c2e0a680635a5af30305a869e35db65f5f6ddeb00577b3011f83b3190567646b7d67a314710c83212a233dc31a0fb78691eb1358b96a WHIRLPOOL fca8569d1ece09985f56775b0ab8bb55ad4766c1b841d446f78c220d94e6e8091e2f9dff1e895733dc2115fd46ef3bf2afac6306a1ab6add8e1aa67dde532d91
-AUX elasticsearch.service 1718 SHA256 444bf14b63eb2a702afa313d5d0e8a2c322bfceac742fe38844e44c02698bb2a SHA512 98530c01f41a2d98254033a1a292075abc6086e0608062dfbe28385e4f57da390a9c43521bfce72193c2b710e58e590f08f514257b8150140dbb9ade40ef5470 WHIRLPOOL f34e6c906a13e67b23d66de67466b6545eda413bea150b6da383e59eb4947720e8969ba3617320c3446522a788dc4bb5831c4cc1a1a99343c5b85d2397f3d2c7
-AUX elasticsearch.sysctl.d 24 SHA256 d2130d8587c6a8860d51903b5c2f70703da61cddeb42d526fcda20fd0ec9e99c SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c WHIRLPOOL fadf47db434ba8a1533be79adb7c3045315fca661900608f50a608ec6ccd5ab34032e9a15f6b8ec5fc754ef1123ba44c68d93483c2bef8530c8523a925c9b3bd
-AUX elasticsearch.tmpfiles.d 56 SHA256 391d807443518cd5568f871e64a970487ac750a43ead260f2e2b213131095c63 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a WHIRLPOOL 0fc897d34569e2786b06eae2d06178ac87e34d9ec24a3229213b038c3314188efecc0876ad39a482f4e0a446b71dfee49d6cbb53db4aa3de0d973c6d131d571e
-DIST elasticsearch-5.5.2.tar.gz 33485703 SHA256 0870e2c0c72e6eda976effa07aa1cdd06a9500302320b5c22ed292ce21665bf1 SHA512 62048f15b43e38a61e3a19a1599c25cd0d9009cc1172db5b450b04dec349ecd313b1f20e3d1c7ed1c101ae3e6f6c6d2cdf004a9713ad803576277f93e3adbdb9 WHIRLPOOL 3a71cef2858b76b11e1693907e745912a83f23e26c35a3456c6324fc19c317c53d4404e20134b034e41e162c1ea8d58c38bbd4afe0394d886ab32f6b698172ec
-DIST elasticsearch-5.6.4.tar.gz 33776770 SHA256 1098fc776fae8c74e65f8e17cf2ea244c1d07c4e6711340c9bb9f6df56aa45b0 SHA512 37730f39cf1711b6a20861370ef7aff4b48e7f90ad82cb1c8c92643179194c4dcdf0180691d8065304bf61e7f5a2fb1ed5c84c384e0b2ff7ad0dc58ac7352f47 WHIRLPOOL 37f1a615a7916738bb8f4809213edced96aaecf3d93df8cad0bc175c71191a6f1d3d616fc40b71e647b65e4c2e03f4f6ab9a4ff333b55d3728ca100b2181edbc
-EBUILD elasticsearch-5.5.2.ebuild 1618 SHA256 ee4a9297fab6f32f75d8df993f3cce07906328c3b4ce5fb499c495237c989096 SHA512 0018a5cecab2293bfe43581fcc67bd395e669ed2913a1e40676de420763415ab090589a742b127730ca6b8a467f06f10f3f3d1c2bec87db479909cb1a668f62f WHIRLPOOL 233680704ea7848404d497901ef2ddf723ba4f35915653abb341eda4b03dd378ac37b5950a82e164f2ef6f6ccdccc124d44421e06e9618ecbfcb0ca7d905540b
-EBUILD elasticsearch-5.6.4.ebuild 1688 SHA256 9f5c02c1ee82296988aa542cc90663b2d1cdf3f396b7eacbe66911a1250d4942 SHA512 9a577ae695f21d63fd537a26837987e7c4c6525e937bc4219635890e9daac31f332adf02968a3e94e4be768c51a830726196b97f0006b49ba3b385a65e5c854d WHIRLPOOL 516c8d65586dad4cdfd4c27f357615a93291ed6a8d7e7156da19ead6130755b3b7115e79c4161eae6de78a765281403a6ebeee0384ada5a30c341ea7a4d63907
-MISC ChangeLog 8202 SHA256 1531683acbf9c20038e964e166b7b748c2ec4f12bb8f219d75cc685b7dc8825b SHA512 54cb8dc75318bc52e9c947cec07f8926fc1f022429e9b784b21b51faba3022c6f07f50dc065e9e90529b30941ced47e9a0c03e801328f7e694f6881b0a89e6bb WHIRLPOOL 2d1c8f0e9be37b76175dda86322581da84e07c6745d7b57dfad300f10e3ecd250a7abc90e1737d699b0844961864fbb10a3be00951dbc29d503ca3abd50cab65
-MISC ChangeLog-2015 5203 SHA256 8aa86f4c8b0c8a0c2d099ff71b4886f6e7be91d4e10e22d6f49d8ba1ab0ee7be SHA512 2326fb4073b91dc0a39d18ca0a81257c8995ce7afa0d53e31db1851dd45b3b3a94f7bfa9dda00a82b5ecaf16ad022e9236a07aebe9f2ee6f3b9b024b179039ed WHIRLPOOL 03f3e445a6f763d6e42d6d13b336ab10b4ee1d64c9119f8da2e03710b180db180e8abb702241edcdc56009992bea3a1ba0395eb096e61fb97930298099e4c4ff
-MISC metadata.xml 493 SHA256 d5758f4d01ca56bdfc258e4935a6cdb891f186c7ca36b96f783065fb23dc68ff SHA512 ce03769abc314d3bf561ff5820a8c8582196e9e6755e1e695dcf1224afbc04b609fdec7a1499d2d7a3aa0a350ad9fea94e0e3b46eff7c3c6150a524edd28d399 WHIRLPOOL a69393456ad8bcfd9f698131a0b6e0bca5d220101b0f3d8a91b716f92bbfe1c5e205bac3bbdb6e5f6e7764a30abfb6a0215440c11f288b3aa40ec6c5506cf608
+AUX elasticsearch-systemd-pre-exec 221 BLAKE2B 22176ca536032f7a7e3724a85100ed3ab5e15a7acacdacf185d733ff272d65712c9166f1d3123cd09a6e3de9a65a29340e0ca7ebb246d359a4d843eddd0ea25b SHA512 1dc41303da367122779759fc1967540357a21aac6df4f5d8761d36dc643673df660b47e5c1b595ecf9316265fe7684ddcb5290df8369379c1bdbc8c933726644
+AUX elasticsearch.conf 2077 BLAKE2B 1601e7850d88c90bd6ab1037f3b867b3e2bcfe6a8356f33984ac9d6041f8cb1dba06a59b8e62565e44b09fd3018e982d00a7b986be0a11ac0a9429bd60af3522 SHA512 d386f409e7c7d7e654b43ba42298d0c8d14f0973a656582c06e21dc5e1a93088367725c1ef1644d0bde553912297f1693fca9b461f51ac823be3140f56f9dd5a
+AUX elasticsearch.conf.2 2070 BLAKE2B b620bc7bddfb57c0d1c409c8af919c85fd28df79fe3329a770c7e5a46e7a6898b9b7f6b0340a19af6e5536856620aa5981e3df0c0c1fa50dd57a204d752ce248 SHA512 e10d7699046e7db71d822154be6e21785906977d991cae6709a4fd0439c262915ddbf5499b8dd501da86985644f402b96c92fa5d83feb9d0684d3eec766164f9
+AUX elasticsearch.conf.3 2196 BLAKE2B e711aa58eca0df5857fa48a4dc21f5dd144977f3cd0209a58c15868531a108175ecdd21ddc18e1daf1e83c0bbd26da7c00b260698b3ef87c938b6d18928df733 SHA512 36a98d788cff404ccfe0fdff7bbe358750df8db9e5a5f419991b90e257e97331ec93c5f9a84bed57099dd239abb572ef450a191582e7145d8d7517c242707e49
+AUX elasticsearch.init 2503 BLAKE2B 8208d09d6afba9e1f334ee958baa6a106eb7dc05abc69871146c7dfdcc15922454161b44f6ac754b1de6e5362c9e33a7137efa5de6bc0359685c4c8158889494 SHA512 55369ea6fc19979a722528afead2a4a19912fd212db450e4fb840c88d0a868faaa87ff8fe33a8a12370559f68b729771ee4b5fdbf066a263a97bb7944d68b9b6
+AUX elasticsearch.init.2 1830 BLAKE2B 57dea653c636c7ccb40fa6ab777f0713b245bf9d344b39de23aaaad753c229196cb81acd01c4ac1c9ae29c166b1dbfa38e829d60172106dbc384aeb6e21a544e SHA512 babc54a225f1ea5c98a6c2e0a680635a5af30305a869e35db65f5f6ddeb00577b3011f83b3190567646b7d67a314710c83212a233dc31a0fb78691eb1358b96a
+AUX elasticsearch.init.3 1816 BLAKE2B ad4a62479797fed8bfe9b5003586ad2813d8dfa26f6686331bcf9f7a673ffd8171f9b8839d00bd8cffad2e9cf850a924e96b9a2d151b8ddc9928ca36168370d2 SHA512 2e08b1675e7888187ad2a6e1d73f29e0534c079670602fb2057d661b04deaedf6cc365caea83fa7e4b4f527737239dba45964cd380c1f7f463d9c875cf13e4d0
+AUX elasticsearch.service 1718 BLAKE2B 1d3df50f9b521a897f6f57c411265ce3d5da849c23a6d5274959739531ec1f1373f59adb9d0ac94318eefbe90cf10218b67aa47530bdd162ed306354fb9cf2db SHA512 98530c01f41a2d98254033a1a292075abc6086e0608062dfbe28385e4f57da390a9c43521bfce72193c2b710e58e590f08f514257b8150140dbb9ade40ef5470
+AUX elasticsearch.service.2 1617 BLAKE2B d2b62c9dfa0e2bb6159ce8a06f0d7bc45fc4906c2ba05a5979e09cff0ed6676926cc4ee91aa84ae491b538b833e78f1bc781d848f8ecd82dc2d73b62fe8b161e SHA512 1a8ab08c69a9054a9024484dff0c07d010668420e698be5553d3fda3df893e09badf86f32c3a98529668938186305fae5c33e6229b87778fe1530a5f2b3d078d
+AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721eae1d69e19c595bfbf329618b9cb67be9528f1994c546233cffd31b20eee39edc142bc86f7a7cf5e08903e SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c
+AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
+DIST elasticsearch-5.5.2.tar.gz 33485703 BLAKE2B 96a9055041506c9e92d64f8922daeca5fcb45b0e1f34ff8a8aaf14024505bf7d2b8d786de40d267252c3354473ea6ca186cf75e8d994940b43459122a3931a0e SHA512 62048f15b43e38a61e3a19a1599c25cd0d9009cc1172db5b450b04dec349ecd313b1f20e3d1c7ed1c101ae3e6f6c6d2cdf004a9713ad803576277f93e3adbdb9
+DIST elasticsearch-5.6.4.tar.gz 33776770 BLAKE2B c74df8a496c30be315abfd7d1a71f7f8eb75de1a64a7ddd22ff742bd547ec38d417c1ce4002ed6c90b2716837ee0425cf87c910d9f810999e837d118268dcd66 SHA512 37730f39cf1711b6a20861370ef7aff4b48e7f90ad82cb1c8c92643179194c4dcdf0180691d8065304bf61e7f5a2fb1ed5c84c384e0b2ff7ad0dc58ac7352f47
+DIST elasticsearch-6.0.0.tar.gz 28017602 BLAKE2B cea47a17109eb5d46b1d94c3763f19923d97392c4a39a8dffb157b8ce60cf959e4680c2a54c5a9d204db64393f3f22dc52c0de94888753e817d808575ff352fd SHA512 25bb622d2fc557d8b8eded634a9b333766f7b58e701359e1bcfafee390776eb323cb7ea7a5e02e8803e25d8b1d3aabec0ec1b0cf492d0bab5689686fe440181c
+EBUILD elasticsearch-5.5.2.ebuild 1618 BLAKE2B ce21557cb37e492f54d68284cd4b95c68e8560f3e62ae1c8287bcb4b2c622df7cd14709ff020138be4013cbb5279c25d60de6ee0698d0c48b3c364e5e06193aa SHA512 0018a5cecab2293bfe43581fcc67bd395e669ed2913a1e40676de420763415ab090589a742b127730ca6b8a467f06f10f3f3d1c2bec87db479909cb1a668f62f
+EBUILD elasticsearch-5.6.4.ebuild 1688 BLAKE2B fb88862c69873ae7d27784d54306534bcef0d8e02f87024ac87f22e89bdf9310b655ecd5fdaf6ccac71bd1a52445f2d139963dad1ab426c6dff645050230d2e8 SHA512 9a577ae695f21d63fd537a26837987e7c4c6525e937bc4219635890e9daac31f332adf02968a3e94e4be768c51a830726196b97f0006b49ba3b385a65e5c854d
+EBUILD elasticsearch-6.0.0.ebuild 1690 BLAKE2B 218d513c3bd36d299c362a08541eafb54b3fa20ee41ff117698f221d97e49afe1658705cf091bbef9d92131c0eacf4ebc151e337a1d0d8b9746dcd7e4c25dda3 SHA512 6b4b2fef48924f189089aab2063d7b387135600138889f0d8ce18e236ab9c7aa2cb954ee78e64e7537e8e0ea7de4054903d48f27f4008f4cfb0f7ab1241dcc4b
+MISC metadata.xml 493 BLAKE2B 8149c45c1eb86d156ec0a32f016e8eed79d8e8fb7b6f0294ad606eebe9c63208e3d450796cdfc123fb7b2b2bcd10ff0cf23f2b6d2a99c177cb1e795965984892 SHA512 ce03769abc314d3bf561ff5820a8c8582196e9e6755e1e695dcf1224afbc04b609fdec7a1499d2d7a3aa0a350ad9fea94e0e3b46eff7c3c6150a524edd28d399
diff --git a/app-misc/elasticsearch/elasticsearch-6.0.0.ebuild b/app-misc/elasticsearch/elasticsearch-6.0.0.ebuild
new file mode 100644
index 000000000000..aeab2b8db112
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-6.0.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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() {
+	rm -v bin/*.{bat,exe} LICENSE.txt || die
+
+	default
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /etc/${PN}/scripts
+
+	insinto /etc/${PN}
+	doins 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.3" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.3" ${PN}
+
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
+	systemd_newunit "${FILESDIR}"/${PN}.service.2 ${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.3 b/app-misc/elasticsearch/files/elasticsearch.conf.3
new file mode 100644
index 000000000000..70c052a64cce
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.conf.3
@@ -0,0 +1,62 @@
+################################
+# 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
+
+# https://www.elastic.co/guide/en/elasticsearch/reference/master/max-number-of-threads.html
+MAX_THREADS=4096
+
+rc_ulimit="-l $MAX_LOCKED_MEMORY -n $MAX_OPEN_FILES -u $MAX_THREADS"
diff --git a/app-misc/elasticsearch/files/elasticsearch.init.3 b/app-misc/elasticsearch/files/elasticsearch.init.3
new file mode 100644
index 000000000000..ab086197ec91
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.init.3
@@ -0,0 +1,61 @@
+#!/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
+export ES_PATH_CONF="${CONF_DIR}"
+
+pidfile="/run/elasticsearch/${RC_SVCNAME}.pid"
+
+command="/usr/share/elasticsearch/bin/elasticsearch"
+command_args="--daemonize --pidfile=${pidfile} -Epath.logs=${LOG_DIR} -Epath.data=${DATA_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.2 b/app-misc/elasticsearch/files/elasticsearch.service.2
new file mode 100644
index 000000000000..8db69326f267
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.service.2
@@ -0,0 +1,52 @@
+[Unit]
+Description=Elasticsearch
+Documentation=https://www.elastic.co
+Wants=network.target
+After=network.target
+
+[Service]
+Environment=ES_HOME=/usr/share/elasticsearch
+Environment=ES_PATH_CONF=/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 \
+                                                -Epath.home=${ES_HOME} \
+                                                -Epath.logs=${LOG_DIR} \
+                                                -Epath.data=${DATA_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