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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 996D115813A for ; Sun, 12 Jan 2025 15:50:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 19B0EE082F; Sun, 12 Jan 2025 15:50:57 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 988E7E0827 for ; Sun, 12 Jan 2025 15:50:56 +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 A006C33FEF1 for ; Sun, 12 Jan 2025 15:50:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 068011732 for ; Sun, 12 Jan 2025 15:50:54 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1736684057.e004a0e3d790aec54e88fa08de121be70c02c01a.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/ecm.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e004a0e3d790aec54e88fa08de121be70c02c01a X-VCS-Branch: master Date: Sun, 12 Jan 2025 15:50:54 +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: 1a14c7aa-53ba-4c9b-ac1a-41cf65adf96e X-Archives-Hash: 6675cf1709f600812d8eb488ced8f3ea commit: e004a0e3d790aec54e88fa08de121be70c02c01a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 12 11:34:36 2025 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 12 12:14:17 2025 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e004a0e3 ecm.eclass: Strip SLOT of sub-slot to sanitise metainfo target path Amends c715f7a87d835a5d7eb9204475e4e8360c6e8908 Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/ecm.eclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index a02fe23732..a4cf261e71 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -749,18 +749,18 @@ ecm_src_install() { if [[ -n ${_KDE_ORG_ECLASS} && -d "${ED}"/usr/share/metainfo/ ]]; then if [[ ${KDE_ORG_NAME} != ${PN} ]]; then - local ecm_metainfo + local ecm_metainfo mainslot=${SLOT%/*} pushd "${ED}"/usr/share/metainfo/ > /dev/null || die for ecm_metainfo in find * -type f -iname "*metainfo.xml"; do case ${ecm_metainfo} in *${KDE_ORG_NAME}*) - mv_metainfo ${ecm_metainfo} ${KDE_ORG_NAME} ${PN}${SLOT/0*/} + mv_metainfo ${ecm_metainfo} ${KDE_ORG_NAME} ${PN}${mainslot/0*/} ;; *${KDE_ORG_NAME/-/_}*) - mv_metainfo ${ecm_metainfo} ${KDE_ORG_NAME/-/_} ${PN}${SLOT/0*/} + mv_metainfo ${ecm_metainfo} ${KDE_ORG_NAME/-/_} ${PN}${mainslot/0*/} ;; org.kde.*) - mv_metainfo ${ecm_metainfo} "org.kde." "org.kde.${PN}${SLOT/0*/}-" + mv_metainfo ${ecm_metainfo} "org.kde." "org.kde.${PN}${mainslot/0*/}-" ;; esac done