[gentoo-commits] proj/kde:master commit in: kde-apps/kldap/

[Michael Palimaka]

commit:     f59fe486a2f85cd897509db367f2de9209de7a25
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Apr  3 18:57:51 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Apr  6 12:35:49 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f59fe486

kde-apps/kldap: USE=ssl, ldap moved from kdepim-kioslaves

Package-Manager: portage-2.2.27

 kde-apps/kldap/kldap-16.04.49.9999.ebuild | 11 +++++++++--
 kde-apps/kldap/kldap-9999.ebuild          | 17 ++++++++++++++---
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/kde-apps/kldap/kldap-16.04.49.9999.ebuild 
b/kde-apps/kldap/kldap-16.04.49.9999.ebuild
index f096e74..d2c8ec2 100644
--- a/kde-apps/kldap/kldap-16.04.49.9999.ebuild
+++ b/kde-apps/kldap/kldap-16.04.49.9999.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="Library for interacting with LDAP servers"
 LICENSE="LGPL-2+"
 KEYWORDS=""
-IUSE=""
+IUSE="ssl"
 
 DEPEND="
        $(add_frameworks_dep kcompletion)
@@ -19,7 +19,14 @@ DEPEND="
        $(add_frameworks_dep kwidgetsaddons)
        $(add_qt_dep qtgui)
        $(add_qt_dep qtwidgets)
-       dev-libs/cyrus-sasl
        net-nds/openldap
+       ssl? ( dev-libs/cyrus-sasl )
 "
 RDEPEND="${DEPEND}"
+
+src_configure() {
+       local mycmakeargs=(
+               $(cmake-utils_use_find_package ssl Sasl2)
+       )
+       kde5_src_configure
+}

diff --git a/kde-apps/kldap/kldap-9999.ebuild b/kde-apps/kldap/kldap-9999.ebuild
index 0f74025..26bc1ad 100644
--- a/kde-apps/kldap/kldap-9999.ebuild
+++ b/kde-apps/kldap/kldap-9999.ebuild
@@ -5,22 +5,33 @@
 EAPI=6
 
 KDE_DOXYGEN="true"
+KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
 inherit kde5
 
 DESCRIPTION="Library for interacting with LDAP servers"
 LICENSE="LGPL-2+"
 KEYWORDS=""
-IUSE=""
+IUSE="ssl"
 
 DEPEND="
        $(add_frameworks_dep kcompletion)
        $(add_frameworks_dep ki18n)
+       $(add_frameworks_dep kio)
        $(add_frameworks_dep kwidgetsaddons)
        $(add_kdeapps_dep kmbox)
        $(add_qt_dep qtgui)
        $(add_qt_dep qtwidgets)
-       dev-libs/cyrus-sasl
        net-nds/openldap
+       ssl? ( dev-libs/cyrus-sasl )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !<kde-apps/kdepim-kioslaves-16.04.50
+"
+
+src_configure() {
+       local mycmakeargs=(
+               $(cmake-utils_use_find_package ssl Sasl2)
+       )
+       kde5_src_configure
+}