commit:     c438e9a287805c4f2d21cdff26a43a375f0974c9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 16 15:13:31 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 16 17:50:47 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c438e9a2

kde-apps/kmailtransport: Drop unused deps

Upstream commits:
e856892df885ec762efcec3c9ca4af4b9b22599d
097b9c664fc4d60b64bf33b900b85836ba7abbcf

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 .../files/kmailtransport-17.11.80-deps.patch       | 37 ++++++++++++++++++++++
 .../kmailtransport-17.12.49.9999.ebuild            |  4 +--
 kde-apps/kmailtransport/kmailtransport-9999.ebuild |  2 --
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/kde-apps/kmailtransport/files/kmailtransport-17.11.80-deps.patch 
b/kde-apps/kmailtransport/files/kmailtransport-17.11.80-deps.patch
new file mode 100644
index 0000000000..f245f77a96
--- /dev/null
+++ b/kde-apps/kmailtransport/files/kmailtransport-17.11.80-deps.patch
@@ -0,0 +1,37 @@
+From 1e6ac475c2f591b93d3b1a10c75514d172bbbdf7 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <[email protected]>
+Date: Thu, 16 Nov 2017 16:11:11 +0100
+Subject: [PATCH] Drop obsolete dependencies
+
+---
+ CMakeLists.txt | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 53761c3..1df4b65 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -38,7 +38,6 @@ set(CMAKECONFIG_INSTALL_DIR 
"${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5MailTransport")
+ find_package(KF5KCMUtils ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5ConfigWidgets ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5Wallet ${KF5_VERSION} CONFIG REQUIRED)
+-find_package(KF5DocTools ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
+@@ -50,12 +49,6 @@ add_definitions("-DQT_NO_CAST_FROM_ASCII 
-DQT_NO_CAST_TO_ASCII")
+ add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
+ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
+ add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+-find_package(Sasl2)
+-set_package_properties(Sasl2 PROPERTIES
+-                             DESCRIPTION "The Cyrus-sasl library"
+-                             URL "http://www.cyrussasl.org";
+-                             TYPE OPTIONAL
+-)
+ 
+ if(BUILD_TESTING)
+    add_definitions(-DBUILD_TESTING)
+-- 
+2.13.6
+

diff --git a/kde-apps/kmailtransport/kmailtransport-17.12.49.9999.ebuild 
b/kde-apps/kmailtransport/kmailtransport-17.12.49.9999.ebuild
index 9ce333ecd5..98d0bd17c2 100644
--- a/kde-apps/kmailtransport/kmailtransport-17.12.49.9999.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-17.12.49.9999.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=6
 
-KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
 inherit kde5
 
@@ -30,7 +29,6 @@ COMMON_DEPEND="
        $(add_qt_dep qtgui)
        $(add_qt_dep qtnetwork)
        $(add_qt_dep qtwidgets)
-       dev-libs/cyrus-sasl
 "
 DEPEND="${COMMON_DEPEND}
        test? ( $(add_frameworks_dep ktextwidgets) )
@@ -40,4 +38,6 @@ RDEPEND="${COMMON_DEPEND}
        !kde-apps/kdepimlibs:4
 "
 
+PATCHES=( "${FILESDIR}/${PN}-17.11.80-deps.patch" )
+
 RESTRICT+=" test"

diff --git a/kde-apps/kmailtransport/kmailtransport-9999.ebuild 
b/kde-apps/kmailtransport/kmailtransport-9999.ebuild
index 9ce333ecd5..a091cdd5d7 100644
--- a/kde-apps/kmailtransport/kmailtransport-9999.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-9999.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=6
 
-KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
 inherit kde5
 
@@ -30,7 +29,6 @@ COMMON_DEPEND="
        $(add_qt_dep qtgui)
        $(add_qt_dep qtnetwork)
        $(add_qt_dep qtwidgets)
-       dev-libs/cyrus-sasl
 "
 DEPEND="${COMMON_DEPEND}
        test? ( $(add_frameworks_dep ktextwidgets) )

Reply via email to