Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kmailtransport/, kde-apps/kmailtransport/files/
Date: Thu, 16 Nov 2017 17:51:04
Message-Id: 1510854647.c438e9a287805c4f2d21cdff26a43a375f0974c9.asturm@gentoo
1 commit: c438e9a287805c4f2d21cdff26a43a375f0974c9
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 16 15:13:31 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 16 17:50:47 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c438e9a2
7
8 kde-apps/kmailtransport: Drop unused deps
9
10 Upstream commits:
11 e856892df885ec762efcec3c9ca4af4b9b22599d
12 097b9c664fc4d60b64bf33b900b85836ba7abbcf
13
14 Package-Manager: Portage-2.3.13, Repoman-2.3.4
15
16 .../files/kmailtransport-17.11.80-deps.patch | 37 ++++++++++++++++++++++
17 .../kmailtransport-17.12.49.9999.ebuild | 4 +--
18 kde-apps/kmailtransport/kmailtransport-9999.ebuild | 2 --
19 3 files changed, 39 insertions(+), 4 deletions(-)
20
21 diff --git a/kde-apps/kmailtransport/files/kmailtransport-17.11.80-deps.patch b/kde-apps/kmailtransport/files/kmailtransport-17.11.80-deps.patch
22 new file mode 100644
23 index 0000000000..f245f77a96
24 --- /dev/null
25 +++ b/kde-apps/kmailtransport/files/kmailtransport-17.11.80-deps.patch
26 @@ -0,0 +1,37 @@
27 +From 1e6ac475c2f591b93d3b1a10c75514d172bbbdf7 Mon Sep 17 00:00:00 2001
28 +From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
29 +Date: Thu, 16 Nov 2017 16:11:11 +0100
30 +Subject: [PATCH] Drop obsolete dependencies
31 +
32 +---
33 + CMakeLists.txt | 7 -------
34 + 1 file changed, 7 deletions(-)
35 +
36 +diff --git a/CMakeLists.txt b/CMakeLists.txt
37 +index 53761c3..1df4b65 100644
38 +--- a/CMakeLists.txt
39 ++++ b/CMakeLists.txt
40 +@@ -38,7 +38,6 @@ set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5MailTransport")
41 + find_package(KF5KCMUtils ${KF5_VERSION} CONFIG REQUIRED)
42 + find_package(KF5ConfigWidgets ${KF5_VERSION} CONFIG REQUIRED)
43 + find_package(KF5Wallet ${KF5_VERSION} CONFIG REQUIRED)
44 +-find_package(KF5DocTools ${KF5_VERSION} CONFIG REQUIRED)
45 + find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
46 + find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
47 + find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
48 +@@ -50,12 +49,6 @@ add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")
49 + add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
50 + add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
51 + add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
52 +-find_package(Sasl2)
53 +-set_package_properties(Sasl2 PROPERTIES
54 +- DESCRIPTION "The Cyrus-sasl library"
55 +- URL "http://www.cyrussasl.org"
56 +- TYPE OPTIONAL
57 +-)
58 +
59 + if(BUILD_TESTING)
60 + add_definitions(-DBUILD_TESTING)
61 +--
62 +2.13.6
63 +
64
65 diff --git a/kde-apps/kmailtransport/kmailtransport-17.12.49.9999.ebuild b/kde-apps/kmailtransport/kmailtransport-17.12.49.9999.ebuild
66 index 9ce333ecd5..98d0bd17c2 100644
67 --- a/kde-apps/kmailtransport/kmailtransport-17.12.49.9999.ebuild
68 +++ b/kde-apps/kmailtransport/kmailtransport-17.12.49.9999.ebuild
69 @@ -3,7 +3,6 @@
70
71 EAPI=6
72
73 -KDE_HANDBOOK="forceoptional"
74 KDE_TEST="true"
75 inherit kde5
76
77 @@ -30,7 +29,6 @@ COMMON_DEPEND="
78 $(add_qt_dep qtgui)
79 $(add_qt_dep qtnetwork)
80 $(add_qt_dep qtwidgets)
81 - dev-libs/cyrus-sasl
82 "
83 DEPEND="${COMMON_DEPEND}
84 test? ( $(add_frameworks_dep ktextwidgets) )
85 @@ -40,4 +38,6 @@ RDEPEND="${COMMON_DEPEND}
86 !kde-apps/kdepimlibs:4
87 "
88
89 +PATCHES=( "${FILESDIR}/${PN}-17.11.80-deps.patch" )
90 +
91 RESTRICT+=" test"
92
93 diff --git a/kde-apps/kmailtransport/kmailtransport-9999.ebuild b/kde-apps/kmailtransport/kmailtransport-9999.ebuild
94 index 9ce333ecd5..a091cdd5d7 100644
95 --- a/kde-apps/kmailtransport/kmailtransport-9999.ebuild
96 +++ b/kde-apps/kmailtransport/kmailtransport-9999.ebuild
97 @@ -3,7 +3,6 @@
98
99 EAPI=6
100
101 -KDE_HANDBOOK="forceoptional"
102 KDE_TEST="true"
103 inherit kde5
104
105 @@ -30,7 +29,6 @@ COMMON_DEPEND="
106 $(add_qt_dep qtgui)
107 $(add_qt_dep qtnetwork)
108 $(add_qt_dep qtwidgets)
109 - dev-libs/cyrus-sasl
110 "
111 DEPEND="${COMMON_DEPEND}
112 test? ( $(add_frameworks_dep ktextwidgets) )