diff options
author | Tomáš Mózes <hydrapolic@gmail.com> | 2020-11-16 20:18:05 +0000 |
---|---|---|
committer | Thomas Deutschmann <whissi@gentoo.org> | 2020-11-18 18:34:01 +0100 |
commit | 617847822a8fb81d93ab5d84257267ec2e62f981 (patch) | |
tree | a23d070631f6c31e645dd41cf0ce12016f5444be | |
parent | app-emulation/xen-tools: always depend on x11-libs/pixman (diff) | |
download | gentoo-617847822a8fb81d93ab5d84257267ec2e62f981.tar.gz gentoo-617847822a8fb81d93ab5d84257267ec2e62f981.tar.bz2 gentoo-617847822a8fb81d93ab5d84257267ec2e62f981.zip |
app-admin/logstash-bin: drop bundled java
Closes: https://bugs.gentoo.org/754867
Closes: https://bugs.gentoo.org/754870
Signed-off-by: Tomáš Mózes <hydrapolic@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18286
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
-rw-r--r-- | app-admin/logstash-bin/logstash-bin-7.10.0-r1.ebuild (renamed from app-admin/logstash-bin/logstash-bin-7.10.0.ebuild) | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/app-admin/logstash-bin/logstash-bin-7.10.0.ebuild b/app-admin/logstash-bin/logstash-bin-7.10.0-r1.ebuild index e016d18660d0..2003a547d375 100644 --- a/app-admin/logstash-bin/logstash-bin-7.10.0.ebuild +++ b/app-admin/logstash-bin/logstash-bin-7.10.0-r1.ebuild @@ -31,17 +31,16 @@ S="${WORKDIR}/${MY_P}" src_prepare() { default - rm vendor/jruby/lib/jni/aarch64-Linux/libjffi-1.2.so \ - vendor/jruby/lib/jni/arm-Linux/libjffi-1.2.so \ - vendor/jruby/lib/jni/i386-SunOS/libjffi-1.2.so \ - vendor/jruby/lib/jni/mips64el-Linux/libjffi-1.2.so \ - vendor/jruby/lib/jni/ppc64-Linux/libjffi-1.2.so \ - vendor/jruby/lib/jni/ppc64le-Linux/libjffi-1.2.so \ - vendor/jruby/lib/jni/sparcv9-Linux/libjffi-1.2.so \ - vendor/jruby/lib/jni/sparcv9-SunOS/libjffi-1.2.so \ - vendor/jruby/lib/jni/x86_64-DragonFlyBSD/libjffi-1.2.so \ - vendor/jruby/lib/jni/x86_64-FreeBSD/libjffi-1.2.so \ - vendor/jruby/lib/jni/x86_64-SunOS/libjffi-1.2.so || die + local d + for d in aarch64-Linux arm-Linux Darwin i386-Linux i386-SunOS \ + i386-Windows mips64el-Linux ppc64-AIX ppc64le-Linux ppc64-Linux \ + ppc-AIX sparcv9-Linux sparcv9-SunOS x86_64-DragonFlyBSD \ + x86_64-FreeBSD x86_64-OpenBSD x86_64-SunOS x86_64-Windows; do + rm -r vendor/jruby/lib/jni/$d || die + done + + # remove bundled java + rm -r jdk || die } src_install() { |