From 6e0b210c8286ee15c119b192f57ce0a7b8313d0d Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Thu, 19 Mar 2020 02:35:38 +0100
Subject: [PATCH] kde.org.eclass, ecm.eclass: Re-add kde-apps-19.08 support for
 now

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
 eclass/ecm.eclass     | 28 +++++++++++++++++++++++++++-
 eclass/kde.org.eclass |  3 ++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 0e3c64b0a2ad..2892b0e0e942 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -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
diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index bb9bd618eb2e..2776b5b972f2 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -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
-- 
2.26.2