aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <andreas.sturmlechner@gmail.com>2016-12-03 18:52:39 +0100
committerAndreas Sturmlechner <andreas.sturmlechner@gmail.com>2016-12-03 23:37:03 +0100
commitff5c9fd03609c296e1e8a66aad2649756af089dc (patch)
treee927e939f0129e1ec08600d95b121e24c9e74473
parentkde-apps/kdeedu-meta: Drop kde-apps/kde4-l10n (diff)
downloadkde-ff5c9fd0.tar.gz
kde-ff5c9fd0.tar.bz2
kde-ff5c9fd0.zip
kde-apps/kldap: Drop unused DEPEND
Package-Manager: portage-2.3.0
-rw-r--r--kde-apps/kldap/files/kldap-16.11.90-unused-dep.patch35
-rw-r--r--kde-apps/kldap/kldap-16.12.49.9999.ebuild3
2 files changed, 37 insertions, 1 deletions
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
new file mode 100644
index 0000000000..b9a8653e1d
--- /dev/null
+++ b/kde-apps/kldap/files/kldap-16.11.90-unused-dep.patch
@@ -0,0 +1,35 @@
+commit 30142edcebfd8d294fae205b2fc919d9586a003d
+Author: David Faure <faure@kde.org>
+Date: Sat Nov 26 20:31:53 2016 +0100
+
+ Nothing in here requires kmbox, remove dependency.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6cde803..c8ea9a5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -22,11 +22,9 @@ include(ECMQtDeclareLoggingCategory)
+
+ set(KLDAP_LIB_VERSION ${PIM_VERSION})
+-set(MBOXLIB_VERSION "5.3.90")
+
+ find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5DocTools ${KF5_VERSION} CONFIG REQUIRED)
+-find_package(KF5Mbox ${MBOXLIB_VERSION} CONFIG REQUIRED)
+ add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")
+
+
+diff --git a/kioslave/src/ldap/CMakeLists.txt b/kioslave/src/ldap/CMakeLists.txt
+index 43c32bb..be686a9 100644
+--- a/kioslave/src/ldap/CMakeLists.txt
++++ b/kioslave/src/ldap/CMakeLists.txt
+@@ -4,7 +4,7 @@ ecm_qt_declare_logging_category(kio_ldap_PART_SRCS HEADER kldap_debug.h IDENTIFI
+
+ add_library(kio_ldap MODULE ${kio_ldap_PART_SRCS})
+
+-target_link_libraries(kio_ldap KF5::KIOCore KF5::I18n KF5::Ldap KF5::Mbox)
++target_link_libraries(kio_ldap KF5::KIOCore KF5::I18n KF5::Ldap)
+ set_target_properties(kio_ldap PROPERTIES OUTPUT_NAME "ldap")
+ install(TARGETS kio_ldap DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kio)
+
diff --git a/kde-apps/kldap/kldap-16.12.49.9999.ebuild b/kde-apps/kldap/kldap-16.12.49.9999.ebuild
index 3a311f2660..694bdfa391 100644
--- a/kde-apps/kldap/kldap-16.12.49.9999.ebuild
+++ b/kde-apps/kldap/kldap-16.12.49.9999.ebuild
@@ -18,7 +18,6 @@ DEPEND="
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kio)
$(add_frameworks_dep kwidgetsaddons)
- $(add_kdeapps_dep kmbox)
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
net-nds/openldap
@@ -28,6 +27,8 @@ RDEPEND="${DEPEND}
!kde-apps/kdepim-kioslaves
"
+PATCHES=( "${FILESDIR}/${PN}-16.11.90-unused-dep.patch" )
+
src_prepare() {
kde5_src_prepare