kde.org.eclass, ecm.eclass: Re-add kde-apps-19.08 support for now
authorAndreas Sturmlechner <asturm@gentoo.org>
Thu, 19 Mar 2020 01:35:38 +0000 (02:35 +0100)
committerAndreas Sturmlechner <asturm@gentoo.org>
Thu, 19 Mar 2020 01:35:38 +0000 (02:35 +0100)
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
eclass/ecm.eclass
eclass/kde.org.eclass

index 0e3c64b0a2adaf5598b00621036fa5b014cb1a0a..2892b0e0e942c506c10e9f5d868a66ac54b8ae97 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: ecm.eclass
@@ -218,6 +218,27 @@ case ${ECM_DESIGNERPLUGIN} in
                ;;
 esac
 
+# @ECLASS-VARIABLE: KDE_DESIGNERPLUGIN
+# @DESCRIPTION:
+# If set to "false", do nothing.
+# Otherwise, add "designer" to IUSE to toggle build of designer plugins
+# and add the necessary BDEPEND.
+# TODO: drop after KDE Applications 19.08.3 removal
+: ${KDE_DESIGNERPLUGIN:=false}
+case ${KDE_DESIGNERPLUGIN} in
+       true)
+               IUSE+=" designer"
+               BDEPEND+="
+                       designer? ( >=kde-frameworks/kdesignerplugin-${KFMIN}:${KFSLOT} )
+               "
+               ;;
+       false) ;;
+       *)
+               eerror "Unknown value for \${KDE_DESIGNERPLUGIN}"
+               die "Value ${KDE_DESIGNERPLUGIN} is not supported"
+               ;;
+esac
+
 case ${ECM_EXAMPLES} in
        true)
                IUSE+=" examples"
@@ -524,6 +545,11 @@ ecm_src_configure() {
                cmakeargs+=( -DBUILD_DESIGNERPLUGIN=$(usex designer) )
        fi
 
+       # TODO: drop after KDE Applications 19.08.3 removal
+       if in_iuse designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then
+               cmakeargs+=( $(cmake_use_find_package designer KF5DesignerPlugin) )
+       fi
+
        if [[ ${ECM_QTHELP} = true ]]; then
                cmakeargs+=( -DBUILD_QCH=$(usex doc) )
        fi
index bb9bd618eb2ec6b77e0556a52acdc2344756f19f..2776b5b972f229297c1501a2ad429097f420985f 100644 (file)
@@ -110,9 +110,10 @@ _kde.org_calculate_src_uri() {
        if [[ ${KDE_RELEASE_SERVICE} = true ]]; then
                case ${PV} in
                        ??.??.[6-9]? )
-                               _src_uri+="unstable/release-service/${PV}/src/"
+                               _src_uri+="unstable/applications/${PV}/src/"
                                RESTRICT+=" mirror"
                                ;;
+                       19.08.3? ) _src_uri+="stable/applications/${PV}/src/" ;;
                        *) _src_uri+="stable/release-service/${PV}/src/" ;;
                esac
        fi