Fix LDAP configure logic, #540216

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 16 insertions, 26 deletions

diff --git a/net-analyzer/openvas-libraries/ChangeLog b/net-analyzer/openvas-libraries/ChangeLog
index f340a33fc8e9..9f03044ba64e 100644
--- a/net-analyzer/openvas-libraries/ChangeLog
+++ b/net-analyzer/openvas-libraries/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/openvas-libraries
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/ChangeLog,v 1.35 2015/02/14 19:13:35 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/ChangeLog,v 1.36 2015/02/17 10:11:30 jlec Exp $
+
+*openvas-libraries-8.0_beta6-r1 (17 Feb 2015)
+*openvas-libraries-7.0.7-r1 (17 Feb 2015)
+
+  17 Feb 2015; Justin Lecher <jlec@gentoo.org>
+  +openvas-libraries-7.0.7-r1.ebuild, +openvas-libraries-8.0_beta6-r1.ebuild,
+  -files/openvas-libraries-8.0_beta3-underlinking.patch,
+  -openvas-libraries-7.0.7.ebuild, -openvas-libraries-8.0_beta6.ebuild:
+  Fix LDAP configure logic, #540216
 
   14 Feb 2015; Justin Lecher <jlec@gentoo.org>
   files/openvas-libraries-8.0_beta6-include.patch:
diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-8.0_beta3-underlinking.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-8.0_beta3-underlinking.patch
deleted file mode 100644
index 034975d6e192..000000000000
--- a/net-analyzer/openvas-libraries/files/openvas-libraries-8.0_beta3-underlinking.patch
+++ /dev/null
@@ -1,19 +0,0 @@
- base/CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
-index 013b097..c9080c4 100644
---- a/base/CMakeLists.txt
-+++ b/base/CMakeLists.txt
-@@ -59,7 +59,10 @@ if (MINGW)
- else (MINGW)
-   set (FILES array.c credentials.c openvas_hosts.c cvss.c drop_privileges.c
-        nvti.c nvticache.c openvas_compress.c openvas_file.c openvas_networking.c
--       openvas_string.c pidfile.c settings.c gpgme_util.c pwpolicy.c osp.c)
-+       openvas_string.c pidfile.c settings.c gpgme_util.c pwpolicy.c osp.c
-+       ${CMAKE_SOURCE_DIR}/misc/openvas_server.c
-+       ${CMAKE_SOURCE_DIR}/omp/xml.c
-+       )
-   set (HEADERS array.h credentials.h openvas_hosts.h cvss.h drop_privileges.h
-        nvticache.h nvti.h settings.h openvas_compress.h openvas_file.h osp.h
-        openvas_networking.h openvas_string.h pidfile.h gpgme_util.h pwpolicy.h)
diff --git a/net-analyzer/openvas-libraries/openvas-libraries-7.0.7.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-7.0.7-r1.ebuild
index 608f476881f5..5893ed777561 100644
--- a/net-analyzer/openvas-libraries/openvas-libraries-7.0.7.ebuild
+++ b/net-analyzer/openvas-libraries/openvas-libraries-7.0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/openvas-libraries-7.0.7.ebuild,v 1.2 2015/02/14 14:20:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/openvas-libraries-7.0.7-r1.ebuild,v 1.1 2015/02/17 10:11:30 jlec Exp $
 
 EAPI=5
 
@@ -20,8 +20,9 @@ IUSE="ldap"
 RDEPEND="
 	app-crypt/gpgme
 	>=dev-libs/glib-2.12
-	=net-libs/gnutls-2*
+	dev-libs/libksba
 	!net-analyzer/openvas-libnasl
+	=net-libs/gnutls-2*
 	net-libs/libpcap
 	net-libs/libssh
 	ldap? (	net-nds/openldap )"
@@ -51,7 +52,7 @@ src_configure() {
 	local mycmakeargs=(
 		"-DLOCALSTATEDIR=${EPREFIX}/var"
 		"-DSYSCONFDIR=${EPREFIX}/etc"
-		$(cmake-utils_use_build ldap WITH_LDAP)
+		$(usex ldap -DBUILD_WITHOUT_LDAP=0 -DBUILD_WITHOUT_LDAP=1)
 	)
 	cmake-utils_src_configure
 }
diff --git a/net-analyzer/openvas-libraries/openvas-libraries-8.0_beta6.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-8.0_beta6-r1.ebuild
index 91de36a21bf0..b42406423a15 100644
--- a/net-analyzer/openvas-libraries/openvas-libraries-8.0_beta6.ebuild
+++ b/net-analyzer/openvas-libraries/openvas-libraries-8.0_beta6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/openvas-libraries-8.0_beta6.ebuild,v 1.1 2015/02/14 18:22:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/openvas-libraries-8.0_beta6-r1.ebuild,v 1.1 2015/02/17 10:11:30 jlec Exp $
 
 EAPI=5
 
@@ -41,7 +41,6 @@ DOCS=( ChangeLog CHANGES README )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-7.0.4-libssh.patch
-#	"${FILESDIR}"/${PN}-8.0_beta3-underlinking.patch
 	"${FILESDIR}"/${P}-include.patch
 	)
 
@@ -56,7 +55,7 @@ src_configure() {
 	local mycmakeargs=(
 		"-DLOCALSTATEDIR=${EPREFIX}/var"
 		"-DSYSCONFDIR=${EPREFIX}/etc"
-		$(cmake-utils_use_build ldap WITH_LDAP)
+		$(usex ldap -DBUILD_WITHOUT_LDAP=0 -DBUILD_WITHOUT_LDAP=1)
 	)
 	cmake-utils_src_configure
 }