commit: 617847822a8fb81d93ab5d84257267ec2e62f981 Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com> AuthorDate: Mon Nov 16 20:18:05 2020 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Wed Nov 18 17:34:01 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61784782
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 <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/18286 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> ...-7.10.0.ebuild => logstash-bin-7.10.0-r1.ebuild} | 21 ++++++++++----------- 1 file 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 similarity index 78% rename from app-admin/logstash-bin/logstash-bin-7.10.0.ebuild rename to app-admin/logstash-bin/logstash-bin-7.10.0-r1.ebuild index e016d18660d..2003a547d37 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() {
