[gentoo-commits] repo/gentoo:master commit in: eclass/

[Andreas Sturmlechner]

commit:     f5673fc04204031e26bdfa18f26b741ea65d8a26
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 11:34:36 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 19:12:12 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5673fc0

ecm.eclass: Strip SLOT of sub-slot to sanitise metainfo target path

Amends c715f7a87d835a5d7eb9204475e4e8360c6e8908

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 826a32a17d08..1f40dd69fc74 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