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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DFF2D158099 for ; Tue, 28 Nov 2023 16:02:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2EA872BC028; Tue, 28 Nov 2023 16:02:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 17EC42BC028 for ; Tue, 28 Nov 2023 16:02:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 15995342F99 for ; Tue, 28 Nov 2023 16:02:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D74413B9 for ; Tue, 28 Nov 2023 16:02:32 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1701187327.a2f3e0709d8c052abcb5b9e4cda6b3e12e23994b.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-themes/gentoo-artwork/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-themes/gentoo-artwork/gentoo-artwork-0.4.2-r1.ebuild X-VCS-Directories: x11-themes/gentoo-artwork/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: a2f3e0709d8c052abcb5b9e4cda6b3e12e23994b X-VCS-Branch: master Date: Tue, 28 Nov 2023 16:02:32 +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: a31e4312-fcd5-4204-9948-7b1b5df8b733 X-Archives-Hash: 66b18890a222093636f55b06afca6390 commit: a2f3e0709d8c052abcb5b9e4cda6b3e12e23994b Author: Ulrich Müller gentoo org> AuthorDate: Tue Nov 28 16:00:29 2023 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Tue Nov 28 16:02:07 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2f3e070 x11-themes/gentoo-artwork: Fix fperms and rm failures Other minor fixes. Closes: https://bugs.gentoo.org/907720 Closes: https://bugs.gentoo.org/846923 Signed-off-by: Ulrich Müller gentoo.org> x11-themes/gentoo-artwork/gentoo-artwork-0.4.2-r1.ebuild | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/x11-themes/gentoo-artwork/gentoo-artwork-0.4.2-r1.ebuild b/x11-themes/gentoo-artwork/gentoo-artwork-0.4.2-r1.ebuild index 7da211b69ba5..3256d4426823 100644 --- a/x11-themes/gentoo-artwork/gentoo-artwork-0.4.2-r1.ebuild +++ b/x11-themes/gentoo-artwork/gentoo-artwork-0.4.2-r1.ebuild @@ -63,7 +63,7 @@ src_unpack() { if use icons ; then # Gentoo Bubble Icons unpack gentoo-bubble-icons-${BI_VER}.tar.gz - cd "${WORKDIR}"/${PN}-0.4.2/icons/gentoo || die + pushd "${WORKDIR}"/${PN}-0.4.2/icons/gentoo >/dev/null || die cp "${FILESDIR}"/index.theme . || die @@ -75,10 +75,12 @@ src_unpack() { # fix errors in filenames mv l33t/l33t_nero.png l33t/l33t_UTI_nero.png || die # fix permissions (bug #213385) - fperms 644 l33t/l33t_MAI_mutt.png + chmod -x l33t/l33t_MAI_mutt.png || die # remove misspelled files rm "${S}"/icons/gentoo/{32x32,48x48,64x64}/slypheed.png || die + + popd >/dev/null || die fi if use pixmaps ; then @@ -102,8 +104,9 @@ src_unpack() { fi if ! use offensive ; then + local i for i in $(<"${FILESDIR}"/offensive_list) ; do - rm "${S}/${i}" || die + rm -f "${S}/${i}" || die done fi }