From d642d853e0ff98d168d0143abe52bdd6996b44ca Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 6 Dec 2024 22:59:10 +0100 Subject: [PATCH] frameworks.kde.org.eclass: Drop KF 5.239.9999 support Follow-up to 606e50d8915e39aca485d0e36897ca7c9a1a8a85 Signed-off-by: Andreas Sturmlechner --- eclass/frameworks.kde.org.eclass | 44 +++++++++++++------------------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/eclass/frameworks.kde.org.eclass b/eclass/frameworks.kde.org.eclass index 75da3be79c0..395f6156198 100644 --- a/eclass/frameworks.kde.org.eclass +++ b/eclass/frameworks.kde.org.eclass @@ -61,32 +61,24 @@ KDE_ORG_SCHEDULE_URI+="/Frameworks" # Helper variable to construct release group specific SRC_URI. _KDE_SRC_URI="mirror://kde/" -case ${KDE_BUILD_TYPE} in - live) - if [[ ${PV} == 5.239.9999 ]]; then - EGIT_BRANCH="kf5" - fi - ;; - *) - if [[ -z ${KDE_ORG_COMMIT} ]]; then - _KDE_SRC_URI+="stable/frameworks/$(ver_cut 1-2)/" - case ${KDE_ORG_NAME} in - kdelibs4support | \ - kdesignerplugin | \ - kdewebkit | \ - khtml | \ - kjs | \ - kjsembed | \ - kmediaplayer | \ - kross | \ - kxmlrpcclient) - _KDE_SRC_URI+="portingAids/" - ;; - esac +# TODO: Remove after last KF5 PortingAid treecleaned; bug 755956 +if [[ ${KDE_BUILD_TYPE} != live && -z ${KDE_ORG_COMMIT} ]]; then + _KDE_SRC_URI+="stable/frameworks/$(ver_cut 1-2)/" + case ${KDE_ORG_NAME} in + kdelibs4support | \ + kdesignerplugin | \ + kdewebkit | \ + khtml | \ + kjs | \ + kjsembed | \ + kmediaplayer | \ + kross | \ + kxmlrpcclient) + _KDE_SRC_URI+="portingAids/" + ;; + esac - SRC_URI="${_KDE_SRC_URI}${KDE_ORG_TAR_PN}-${PV}.tar.xz" - fi - ;; -esac + SRC_URI="${_KDE_SRC_URI}${KDE_ORG_TAR_PN}-${PV}.tar.xz" +fi fi