Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kldap/files/, kde-apps/kldap/
Date: Sun, 04 Dec 2016 16:40:52
Message-Id: 1480804623.ff5c9fd03609c296e1e8a66aad2649756af089dc.kensington@gentoo
1 commit: ff5c9fd03609c296e1e8a66aad2649756af089dc
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Sat Dec 3 17:52:39 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 3 22:37:03 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ff5c9fd0
7
8 kde-apps/kldap: Drop unused DEPEND
9
10 Package-Manager: portage-2.3.0
11
12 .../kldap/files/kldap-16.11.90-unused-dep.patch | 35 ++++++++++++++++++++++
13 kde-apps/kldap/kldap-16.12.49.9999.ebuild | 3 +-
14 2 files changed, 37 insertions(+), 1 deletion(-)
15
16 diff --git a/kde-apps/kldap/files/kldap-16.11.90-unused-dep.patch b/kde-apps/kldap/files/kldap-16.11.90-unused-dep.patch
17 new file mode 100644
18 index 0000000..b9a8653
19 --- /dev/null
20 +++ b/kde-apps/kldap/files/kldap-16.11.90-unused-dep.patch
21 @@ -0,0 +1,35 @@
22 +commit 30142edcebfd8d294fae205b2fc919d9586a003d
23 +Author: David Faure <faure@×××.org>
24 +Date: Sat Nov 26 20:31:53 2016 +0100
25 +
26 + Nothing in here requires kmbox, remove dependency.
27 +
28 +diff --git a/CMakeLists.txt b/CMakeLists.txt
29 +index 6cde803..c8ea9a5 100644
30 +--- a/CMakeLists.txt
31 ++++ b/CMakeLists.txt
32 +@@ -22,11 +22,9 @@ include(ECMQtDeclareLoggingCategory)
33 +
34 + set(KLDAP_LIB_VERSION ${PIM_VERSION})
35 +-set(MBOXLIB_VERSION "5.3.90")
36 +
37 + find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
38 + find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
39 + find_package(KF5DocTools ${KF5_VERSION} CONFIG REQUIRED)
40 +-find_package(KF5Mbox ${MBOXLIB_VERSION} CONFIG REQUIRED)
41 + add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")
42 +
43 +
44 +diff --git a/kioslave/src/ldap/CMakeLists.txt b/kioslave/src/ldap/CMakeLists.txt
45 +index 43c32bb..be686a9 100644
46 +--- a/kioslave/src/ldap/CMakeLists.txt
47 ++++ b/kioslave/src/ldap/CMakeLists.txt
48 +@@ -4,7 +4,7 @@ ecm_qt_declare_logging_category(kio_ldap_PART_SRCS HEADER kldap_debug.h IDENTIFI
49 +
50 + add_library(kio_ldap MODULE ${kio_ldap_PART_SRCS})
51 +
52 +-target_link_libraries(kio_ldap KF5::KIOCore KF5::I18n KF5::Ldap KF5::Mbox)
53 ++target_link_libraries(kio_ldap KF5::KIOCore KF5::I18n KF5::Ldap)
54 + set_target_properties(kio_ldap PROPERTIES OUTPUT_NAME "ldap")
55 + install(TARGETS kio_ldap DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kio)
56 +
57
58 diff --git a/kde-apps/kldap/kldap-16.12.49.9999.ebuild b/kde-apps/kldap/kldap-16.12.49.9999.ebuild
59 index 3a311f2..694bdfa 100644
60 --- a/kde-apps/kldap/kldap-16.12.49.9999.ebuild
61 +++ b/kde-apps/kldap/kldap-16.12.49.9999.ebuild
62 @@ -18,7 +18,6 @@ DEPEND="
63 $(add_frameworks_dep ki18n)
64 $(add_frameworks_dep kio)
65 $(add_frameworks_dep kwidgetsaddons)
66 - $(add_kdeapps_dep kmbox)
67 $(add_qt_dep qtgui)
68 $(add_qt_dep qtwidgets)
69 net-nds/openldap
70 @@ -28,6 +27,8 @@ RDEPEND="${DEPEND}
71 !kde-apps/kdepim-kioslaves
72 "
73
74 +PATCHES=( "${FILESDIR}/${PN}-16.11.90-unused-dep.patch" )
75 +
76 src_prepare() {
77 kde5_src_prepare