Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/elasticsearch/
Date: Thu, 13 Sep 2018 15:34:35
Message-Id: 1536852860.6667ee120f413a64758aefb6ba62dc19d96f36d5.whissi@gentoo
1 commit: 6667ee120f413a64758aefb6ba62dc19d96f36d5
2 Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
3 AuthorDate: Thu Sep 13 15:11:26 2018 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 13 15:34:20 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6667ee12
7
8 app-misc/elasticsearch: fix x-pack path
9
10 Closes: https://github.com/gentoo/gentoo/pull/9823
11 Closes: https://bugs.gentoo.org/665654
12 Package-Manager: Portage-2.3.49, Repoman-2.3.10
13
14 app-misc/elasticsearch/elasticsearch-6.4.0.ebuild | 6 +++---
15 1 file changed, 3 insertions(+), 3 deletions(-)
16
17 diff --git a/app-misc/elasticsearch/elasticsearch-6.4.0.ebuild b/app-misc/elasticsearch/elasticsearch-6.4.0.ebuild
18 index e022c71854f..2a715bac374 100644
19 --- a/app-misc/elasticsearch/elasticsearch-6.4.0.ebuild
20 +++ b/app-misc/elasticsearch/elasticsearch-6.4.0.ebuild
21 @@ -16,7 +16,7 @@ IUSE="x-pack"
22
23 RDEPEND="virtual/jre:1.8"
24
25 -QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
26 +QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
27
28 pkg_setup() {
29 enewgroup ${PN}
30 @@ -31,7 +31,7 @@ src_prepare() {
31
32 if use x-pack; then
33 rm bin/x-pack/*.bat || die
34 - rm -r modules/x-pack/x-pack-ml/platform/{darwin,windows}-x86_64 || die
35 + rm -r modules/x-pack-ml/platform/{darwin,windows}-x86_64 || die
36 fi
37 }
38
39 @@ -55,7 +55,7 @@ src_install() {
40 chmod +x "${ED}"/usr/share/${PN}/bin/* || die
41
42 if use x-pack; then
43 - chmod +x "${ED}"/usr/share/${PN}/modules/x-pack/x-pack-ml/platform/linux-x86_64/bin/* || die
44 + chmod +x "${ED}"/usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin/* || die
45 fi
46
47 keepdir /var/{lib,log}/${PN}