[gentoo-commits] proj/kde:master commit in: kde-apps/kdepim-runtime/, kde-apps/kdepim-runtime/files/

[Andreas Sturmlechner]

commit:     5160336c5b12b0550572f908dcf08a195ee70201
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 16 21:52:04 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 16 21:52:04 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5160336c

kde-apps/kdepim-runtime: Add back kdelibs4support DEPEND, add USE oauth

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...kdepim-runtime-18.11.80-nokdelibs4support.patch | 55 ----------------------
 .../kdepim-runtime-18.12.49.9999.ebuild            | 12 ++++-
 kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild | 12 ++++-
 kde-apps/kdepim-runtime/metadata.xml               |  3 ++
 4 files changed, 23 insertions(+), 59 deletions(-)

diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-18.11.80-nokdelibs4support.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-18.11.80-nokdelibs4support.patch
deleted file mode 100644
index d1a916cb1d..0000000000
--- a/kde-apps/kdepim-runtime/files/kdepim-runtime-18.11.80-nokdelibs4support.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 952b572f381f965edbb0b339f7c04a4054aa262e Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@g.o>
-Date: Tue, 13 Nov 2018 19:23:21 +0100
-Subject: [PATCH] Move required KF5KDELibs4Support dependency to conditional
- kolab resource
-
-Fix definitions required for build when not provided by KF5KDELibs4Support.
-
-BUG: 400934
----
- CMakeLists.txt           | 7 +++----
- resources/CMakeLists.txt | 1 +
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9c567ab0e..f16bc117a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -126,7 +126,6 @@ find_package(KF5DocTools ${KF5_VERSION} CONFIG REQUIRED) # pop3
- find_package(KF5Holidays ${KF5_VERSION} CONFIG REQUIRED)
- find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
- find_package(KF5IconThemes ${KF5_VERSION} CONFIG REQUIRED)
--find_package(KF5KDELibs4Support ${KF5_VERSION} CONFIG REQUIRED)
- 
- # KdepimLibs package
- find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
-@@ -149,10 +148,10 @@ find_package(KPimGAPI ${KGAPI_LIB_VERSION} CONFIG REQUIRED)
- 
- option(KDEPIM_RUN_ISOLATED_TESTS "Run the isolated tests." FALSE)
- 
--
- #add_definitions( -DQT_DISABLE_DEPRECATED_BEFORE=0x060000 )
--
--
-+# QUrl
-+add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
-+remove_definitions(-DQT_NO_CAST_FROM_ASCII)
- 
- add_subdirectory(resources)
- add_subdirectory(agents)
-diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
-index 99f7dbf00..d2534cd92 100644
---- a/resources/CMakeLists.txt
-+++ b/resources/CMakeLists.txt
-@@ -43,6 +43,7 @@ add_subdirectory( dav )
- add_subdirectory( ical )
- add_subdirectory( imap )
- if (Libkolabxml_FOUND)
-+    find_package(KF5KDELibs4Support ${KF5_VERSION} CONFIG REQUIRED)
-     add_subdirectory( kolab )
- endif()
- add_subdirectory( facebook )
--- 
-2.19.1
-

diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-18.12.49.9999.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-18.12.49.9999.ebuild
index 2df05fd0fe..440c589d90 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-18.12.49.9999.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-18.12.49.9999.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
 LICENSE="GPL-2+ LGPL-2.1+"
 KEYWORDS=""
-IUSE=""
+IUSE="+oauth"
 
 # TODO kolab
 COMMON_DEPEND="
@@ -21,6 +21,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
 	$(add_frameworks_dep kholidays)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
@@ -60,6 +61,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtxml)
 	dev-libs/cyrus-sasl:2
 	dev-libs/libical:=
+	oauth? ( $(add_qt_dep qtnetworkauth) )
 "
 DEPEND="${COMMON_DEPEND}
 	$(add_qt_dep qtxmlpatterns)
@@ -74,4 +76,10 @@ RDEPEND="${COMMON_DEPEND}
 
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${PN}-18.11.80-nokdelibs4support.patch" )
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package oauth Qt5NetworkAuth)
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
index 2df05fd0fe..440c589d90 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
 LICENSE="GPL-2+ LGPL-2.1+"
 KEYWORDS=""
-IUSE=""
+IUSE="+oauth"
 
 # TODO kolab
 COMMON_DEPEND="
@@ -21,6 +21,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
 	$(add_frameworks_dep kholidays)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
@@ -60,6 +61,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtxml)
 	dev-libs/cyrus-sasl:2
 	dev-libs/libical:=
+	oauth? ( $(add_qt_dep qtnetworkauth) )
 "
 DEPEND="${COMMON_DEPEND}
 	$(add_qt_dep qtxmlpatterns)
@@ -74,4 +76,10 @@ RDEPEND="${COMMON_DEPEND}
 
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${PN}-18.11.80-nokdelibs4support.patch" )
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package oauth Qt5NetworkAuth)
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/kdepim-runtime/metadata.xml b/kde-apps/kdepim-runtime/metadata.xml
index 2fdbf33d96..bf1135a307 100644
--- a/kde-apps/kdepim-runtime/metadata.xml
+++ b/kde-apps/kdepim-runtime/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@g.o</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="oauth">Enable support OAuth authentication for EWS via <pkg>dev-qt/qtnetworkauth</pkg></flag>
+	</use>
 </pkgmetadata>