| 1 |
commit: e50b2420161923b415e3740016b1a13a10eb0d75 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 4 02:07:41 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 4 02:19:18 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e50b2420 |
| 7 |
|
| 8 |
app-misc/elasticsearch: small cleanups |
| 9 |
|
| 10 |
- Style cleanups |
| 11 |
- Use -* in KEYWORDS as it's a binary |
| 12 |
- Change systemd_is_booted test |
| 13 |
|
| 14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 15 |
|
| 16 |
app-misc/elasticsearch/elasticsearch-8.2.2.ebuild | 15 ++++++++------- |
| 17 |
1 file changed, 8 insertions(+), 7 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-misc/elasticsearch/elasticsearch-8.2.2.ebuild b/app-misc/elasticsearch/elasticsearch-8.2.2.ebuild |
| 20 |
index 7ca705a24066..74c42298df8a 100644 |
| 21 |
--- a/app-misc/elasticsearch/elasticsearch-8.2.2.ebuild |
| 22 |
+++ b/app-misc/elasticsearch/elasticsearch-8.2.2.ebuild |
| 23 |
@@ -8,17 +8,13 @@ inherit systemd tmpfiles |
| 24 |
DESCRIPTION="Free and Open, Distributed, RESTful Search Engine" |
| 25 |
HOMEPAGE="https://www.elastic.co/elasticsearch/" |
| 26 |
SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}-linux-x86_64.tar.gz" |
| 27 |
+ |
| 28 |
LICENSE="Apache-2.0 BSD-2 Elastic-2.0 LGPL-3 MIT public-domain" |
| 29 |
SLOT="0" |
| 30 |
KEYWORDS="~amd64" |
| 31 |
|
| 32 |
-PATCHES=( |
| 33 |
- "${FILESDIR}/${PN}-env.patch" |
| 34 |
-) |
| 35 |
- |
| 36 |
DEPEND="acct-group/elasticsearch |
| 37 |
acct-user/elasticsearch" |
| 38 |
- |
| 39 |
RDEPEND="acct-group/elasticsearch |
| 40 |
acct-user/elasticsearch |
| 41 |
sys-libs/zlib |
| 42 |
@@ -27,8 +23,13 @@ RDEPEND="acct-group/elasticsearch |
| 43 |
QA_PREBUILT="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*" |
| 44 |
QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*" |
| 45 |
|
| 46 |
+PATCHES=( |
| 47 |
+ "${FILESDIR}/${PN}-env.patch" |
| 48 |
+) |
| 49 |
+ |
| 50 |
src_prepare() { |
| 51 |
default |
| 52 |
+ |
| 53 |
rm -rf jdk || die |
| 54 |
sed -i -e "s:logs/:/var/log/${PN}/:g" config/jvm.options || die |
| 55 |
rm LICENSE.txt NOTICE.txt || die |
| 56 |
@@ -52,7 +53,7 @@ src_install() { |
| 57 |
keepdir /usr/share/${PN}/plugins |
| 58 |
|
| 59 |
exeinto /usr/share/${PN}/bin |
| 60 |
- doexe ${FILESDIR}/elasticsearch-systemd-pre-exec |
| 61 |
+ doexe "${FILESDIR}"/elasticsearch-systemd-pre-exec |
| 62 |
|
| 63 |
fperms -R +x /usr/share/${PN}/bin |
| 64 |
fperms -R +x /usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin |
| 65 |
@@ -77,7 +78,7 @@ pkg_postinst() { |
| 66 |
# Elasticsearch will choke on our keep file and dodir will not preserve the empty dir |
| 67 |
rm /usr/share/${PN}/plugins/.keep* || die |
| 68 |
tmpfiles_process /usr/lib/tmpfiles.d/${PN}.conf |
| 69 |
- if [ ! systemd_is_booted ]; then |
| 70 |
+ if ! systemd_is_booted ; then |
| 71 |
elog "You may create multiple instances of ${PN} by" |
| 72 |
elog "symlinking the init script:" |
| 73 |
elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance" |
Archives