commit: e004a0e3d790aec54e88fa08de121be70c02c01a
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 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 <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 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
