From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0876E138359 for ; Wed, 18 Nov 2020 17:34:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 48955E09B8; Wed, 18 Nov 2020 17:34:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2EE70E09B8 for ; Wed, 18 Nov 2020 17:34:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2147B3410A8 for ; Wed, 18 Nov 2020 17:34:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5EEE2451 for ; Wed, 18 Nov 2020 17:34:10 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1605720841.617847822a8fb81d93ab5d84257267ec2e62f981.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/logstash-bin/logstash-bin-7.10.0-r1.ebuild app-admin/logstash-bin/logstash-bin-7.10.0.ebuild X-VCS-Directories: app-admin/logstash-bin/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 617847822a8fb81d93ab5d84257267ec2e62f981 X-VCS-Branch: master Date: Wed, 18 Nov 2020 17:34:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3480dc0a-14b2-4c8b-9eca-ef8dc1221f94 X-Archives-Hash: fd58217d6a2ee06ba5c56908023f98a5 commit: 617847822a8fb81d93ab5d84257267ec2e62f981 Author: Tomáš Mózes gmail com> AuthorDate: Mon Nov 16 20:18:05 2020 +0000 Commit: Thomas Deutschmann gentoo 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 gmail.com> Closes: https://github.com/gentoo/gentoo/pull/18286 Signed-off-by: Thomas Deutschmann 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() {