From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-961953-garchives=archives.gentoo.org@lists.gentoo.org>
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 5A717139694
for <garchives@archives.gentoo.org>; Sat, 15 Jul 2017 18:17:32 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9E70AE0D20;
Sat, 15 Jul 2017 18:17:31 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 80856E0D20
for <gentoo-commits@lists.gentoo.org>; Sat, 15 Jul 2017 18:17:31 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 9E0A634194B
for <gentoo-commits@lists.gentoo.org>; Sat, 15 Jul 2017 18:17:30 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E302074B5
for <gentoo-commits@lists.gentoo.org>; Sat, 15 Jul 2017 18:17:28 +0000 (UTC)
From: "James Le Cuirot" <chewi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" <chewi@gentoo.org>
Message-ID: <1500142627.fef98f3917043e1194cedfd6538c261ab2468244.chewi@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea-bin/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-java/icedtea-bin/icedtea-bin-3.4.0.ebuild
X-VCS-Directories: dev-java/icedtea-bin/
X-VCS-Committer: chewi
X-VCS-Committer-Name: James Le Cuirot
X-VCS-Revision: fef98f3917043e1194cedfd6538c261ab2468244
X-VCS-Branch: master
Date: Sat, 15 Jul 2017 18:17:28 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 33114982-ad59-47ee-a8ce-750612bc802f
X-Archives-Hash: a16cf20b34710df84cd7b7addb621801
commit: fef98f3917043e1194cedfd6538c261ab2468244
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 18:16:22 2017 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 18:17:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fef98f39
dev-java/icedtea-bin: Fix removal of files on arm, closes #623784
The arm -> aarch32 symlink causes globbing to return duplicates and rm
therefore fails.
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-java/icedtea-bin/icedtea-bin-3.4.0.ebuild | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.4.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.4.0.ebuild
index 3aa3b0f759c..7ff07f71af7 100644
--- a/dev-java/icedtea-bin/icedtea-bin-3.4.0.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-3.4.0.ebuild
@@ -81,12 +81,15 @@ pkg_pretend() {
src_prepare() {
default
+ # I wouldn't normally use -f below but symlinks in the arm files
+ # make this fail otherwise and any other approach would be tedious.
+
if ! use alsa; then
- rm -v */jre/lib/*/libjsoundalsa.* || die
+ rm -fv */jre/lib/*/libjsoundalsa.* || die
fi
if use headless-awt; then
- rm -vr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
+ rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
*/{,jre/}bin/policytool */bin/appletviewer || die
fi
}