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 C862D158094 for ; Sat, 8 Oct 2022 18:34:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 03F3DE086F; Sat, 8 Oct 2022 18:34:52 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DF829E086F for ; Sat, 8 Oct 2022 18:34:51 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D1B24340DC5 for ; Sat, 8 Oct 2022 18:34:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6F9BA606 for ; Sat, 8 Oct 2022 18:34:49 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1665254073.72016c943ff8b614635e46c10b8f59b2180bd9d6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/gimp/gimp-2.99.10-r2.ebuild X-VCS-Directories: media-gfx/gimp/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 72016c943ff8b614635e46c10b8f59b2180bd9d6 X-VCS-Branch: master Date: Sat, 8 Oct 2022 18:34:49 +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: 56a776f1-b5c5-4655-bb01-9117d9c6fdc4 X-Archives-Hash: c453fc21ce27a24b0bfd96d8cb1f4648 commit: 72016c943ff8b614635e46c10b8f59b2180bd9d6 Author: Sam James gentoo org> AuthorDate: Sat Oct 8 18:34:33 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Oct 8 18:34:33 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72016c94 media-gfx/gimp: fix EbuildReservedName Signed-off-by: Sam James gentoo.org> media-gfx/gimp/gimp-2.99.10-r2.ebuild | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/media-gfx/gimp/gimp-2.99.10-r2.ebuild b/media-gfx/gimp/gimp-2.99.10-r2.ebuild index 6e2153c71aba..a4a5b7dc8ed8 100644 --- a/media-gfx/gimp/gimp-2.99.10-r2.ebuild +++ b/media-gfx/gimp/gimp-2.99.10-r2.ebuild @@ -206,16 +206,16 @@ src_compile() { # for https://bugs.gentoo.org/664938 _rename_plugins() { einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...' - local prepend=gimp-org- + local prefix=gimp-org- ( cd "${ED}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1 for plugin_slash in $(ls -d1 */); do plugin=${plugin_slash%/} if [[ -f ${plugin}/${plugin} ]]; then # NOTE: Folder and file name need to match for Gimp to load that plug-in - # so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg" - mv ${plugin}/{,${prepend}}${plugin} || exit 1 - mv {,${prepend}}${plugin} || exit 1 + # so "file-svg/file-svg" becomes "${prefix}file-svg/${prefix}file-svg" + mv ${plugin}/{,${prefix}}${plugin} || exit 1 + mv {,${prefix}}${plugin} || exit 1 fi done )