1 |
commit: 49da4ccbd8b37648ee94a7bd853a56b41b59b981 |
2 |
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Aug 9 08:40:07 2017 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 9 20:57:47 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49da4ccb |
7 |
|
8 |
app-misc/elasticsearch: bump to 5.5.1, drop old. |
9 |
|
10 |
Gentoo-Bug: https://bugs.gentoo.org/626738 |
11 |
|
12 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
13 |
Closes: https://github.com/gentoo/gentoo/pull/5366 |
14 |
|
15 |
app-misc/elasticsearch/Manifest | 2 +- |
16 |
...earch-5.1.2.ebuild => elasticsearch-5.5.1.ebuild} | 20 ++++---------------- |
17 |
2 files changed, 5 insertions(+), 17 deletions(-) |
18 |
|
19 |
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest |
20 |
index d36188f3cbd..61a037f5ecb 100644 |
21 |
--- a/app-misc/elasticsearch/Manifest |
22 |
+++ b/app-misc/elasticsearch/Manifest |
23 |
@@ -1,4 +1,4 @@ |
24 |
-DIST elasticsearch-5.1.2.tar.gz 33299777 SHA256 74d752f9a8b46898d306ad169b72f328e17215c0909149e156a576089ef11c42 SHA512 1867626e8a87f11ed109e1325fd1d16c9e0af06ebe6a30c78ea679ab533ab377f5da8ea55af6871be33af226f02187a2aadd77e5e23c097dd24055be21e9d691 WHIRLPOOL 2e9df71c915343e2cc8ad82c59b877f41f5e093cbeba21f471c32cb51a195eccc6223bc48da48bb4af2e6bea9f2539f2e93b866963148f4ca2940ba4466e614e |
25 |
DIST elasticsearch-5.2.2.tar.gz 33799732 SHA256 cf88930695794a8949342d386f028548bd10b26ecc8c4b422a94ea674faf8ac9 SHA512 670f8aa81a34191a13cc8c608a9dc7bec60c63bbed8fdb9bc0619585d644867576a7677eb0f14b4e4d064e59def186d4b431930bf79b54bcbf59a29b0b327e85 WHIRLPOOL 4ec1f3b5ed15b9f22d27512ea784ffe9e32e00808fec89418860955d2f4759d045775e18c0a61693da47f39de9f235de954eada231fbd6de5fbfd17f552e8452 |
26 |
DIST elasticsearch-5.3.3.tar.gz 33701608 SHA256 c7e23fddd74d66207b01dea777597c9d04c242973e1ac61aec0f13b716ebed1d SHA512 36fc00081af5555ceb0c0c6e8300c184d40e7176e084d899f2bfaafc3a36c6ba0f457c4bccde95a282d441fa26d84aba4ee1b8ef634831ffdef2f14feb725daa WHIRLPOOL ce641c9cb2071661a221f95fe38018ae2108ffdd855c70aafba4286da369cde461ff39afc674d650ca33925c350592d82e170b2e937e73e949279ca49850a325 |
27 |
DIST elasticsearch-5.4.3.tar.gz 33326964 SHA256 0ceaf6a2243e9a6f3519dce62991ccab09a44326d6899688cd09422b8c31c68f SHA512 8cc8c96ed6d1db947f20624b5231a9718897fbe5acdab9828ef3ec580b8e5bef2bbdf961ace437d192c2bae3d70f6962e1ab6985c25e314979daf6479470acc0 WHIRLPOOL 2d124ceb2aabde87d043bd4178704e1b451a174ff0b9082894aaaf74d924113f656f95d8d25ee58f7987c6821000907dcb67e217989835d6344ae30fd8f08c42 |
28 |
+DIST elasticsearch-5.5.1.tar.gz 33476827 SHA256 e0924ae2af5f4435cef009ad3a567169e9653263e7a3b8693dba932698ea7e34 SHA512 9bedd48396cdd6c39c107a7951eba8446b8574493bd44c17a79ba3443670a48b72c053006821cf69dc17bf49ff1c05904db14a07d8a6403b2d2061fc605937bd WHIRLPOOL 770b2eab9d67212fde7bafb5eaa885c13195f3ecb41897c261bac405987397e299d064badda454d12901ed86a8f9a4e87ab0242ccf5f6971005397ad9061f8c6 |
29 |
|
30 |
diff --git a/app-misc/elasticsearch/elasticsearch-5.1.2.ebuild b/app-misc/elasticsearch/elasticsearch-5.5.1.ebuild |
31 |
similarity index 74% |
32 |
rename from app-misc/elasticsearch/elasticsearch-5.1.2.ebuild |
33 |
rename to app-misc/elasticsearch/elasticsearch-5.5.1.ebuild |
34 |
index 434ea6d44fa..3b2c5bc251f 100644 |
35 |
--- a/app-misc/elasticsearch/elasticsearch-5.1.2.ebuild |
36 |
+++ b/app-misc/elasticsearch/elasticsearch-5.5.1.ebuild |
37 |
@@ -3,7 +3,7 @@ |
38 |
|
39 |
EAPI=6 |
40 |
|
41 |
-inherit eutils systemd user |
42 |
+inherit systemd user |
43 |
|
44 |
DESCRIPTION="Open Source, Distributed, RESTful, Search Engine" |
45 |
HOMEPAGE="https://www.elastic.co/products/elasticsearch" |
46 |
@@ -12,16 +12,8 @@ LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain" |
47 |
SLOT="0" |
48 |
KEYWORDS="~amd64" |
49 |
|
50 |
-RESTRICT="strip" |
51 |
- |
52 |
RDEPEND="virtual/jre:1.8" |
53 |
|
54 |
-pkg_preinst() { |
55 |
- if has_version '<app-misc/elasticsearch-2.3.2'; then |
56 |
- export UPDATE_NOTES=1 |
57 |
- fi |
58 |
-} |
59 |
- |
60 |
pkg_setup() { |
61 |
enewgroup ${PN} |
62 |
enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN} |
63 |
@@ -51,7 +43,7 @@ src_install() { |
64 |
chmod +x "${D}"/usr/share/${PN}/bin/* || die |
65 |
|
66 |
keepdir /var/{lib,log}/${PN} |
67 |
- keepdir /usr/share/${PN}/plugins |
68 |
+ dodir /usr/share/${PN}/plugins |
69 |
|
70 |
systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" "${PN}.conf" |
71 |
|
72 |
@@ -69,12 +61,8 @@ pkg_postinst() { |
73 |
elog "symlinking the init script:" |
74 |
elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance" |
75 |
elog |
76 |
- elog "Please make sure you put elasticsearch.yml and logging.yml" |
77 |
- elog "into the configuration directory of the instance:" |
78 |
+ elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts" |
79 |
+ elog "from /etc/elasticsearch into the configuration directory of the instance:" |
80 |
elog "/etc/${PN}/instance" |
81 |
elog |
82 |
- if ! [ -z ${UPDATE_NOTES} ]; then |
83 |
- elog "This update changes some configuration variables. Please review" |
84 |
- elog "${EROOT%/}/etc/conf.d/elasticsearch before restarting your services." |
85 |
- fi |
86 |
} |