[gentoo-commits] gentoo-x86 commit in net-analyzer/openvas-libraries: ChangeLog openvas-libraries-7.0.4.ebuild

[gentoo-commits] gentoo-x86 commit in net-analyzer/openvas-libraries: ChangeLog openvas-libraries-7.0.4.ebuild

[Justin Lecher (jlec)]

jlec        14/09/28 16:48:59

  Modified:             ChangeLog openvas-libraries-7.0.4.ebuild
  Log:
  net-analyzer/openvas-libraries: Import fedora patches, make ldap support optional
  
  (Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

Revision  Changes    Path
1.18                 net-analyzer/openvas-libraries/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-libraries/ChangeLog?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-libraries/ChangeLog?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-libraries/ChangeLog?r1=1.17&r2=1.18

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ChangeLog	28 Sep 2014 15:15:10 -0000	1.17
+++ ChangeLog	28 Sep 2014 16:48:59 -0000	1.18
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/openvas-libraries
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/ChangeLog,v 1.17 2014/09/28 15:15:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/ChangeLog,v 1.18 2014/09/28 16:48:59 jlec Exp $
+
+  28 Sep 2014; Justin Lecher <jlec@gentoo.org> openvas-libraries-7.0.4.ebuild,
+  +files/openvas-libraries-7.0.4-bsdsource.patch,
+  +files/openvas-libraries-7.0.4-libssh.patch:
+  Import fedora patches, make ldap support optional
 
 *openvas-libraries-7.0.4 (28 Sep 2014)
 



1.2                  net-analyzer/openvas-libraries/openvas-libraries-7.0.4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-libraries/openvas-libraries-7.0.4.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-libraries/openvas-libraries-7.0.4.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-libraries/openvas-libraries-7.0.4.ebuild?r1=1.1&r2=1.2

Index: openvas-libraries-7.0.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/openvas-libraries-7.0.4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openvas-libraries-7.0.4.ebuild	28 Sep 2014 15:15:10 -0000	1.1
+++ openvas-libraries-7.0.4.ebuild	28 Sep 2014 16:48:59 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.4.ebuild,v 1.1 2014/09/28 15:15:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/openvas-libraries-7.0.4.ebuild,v 1.2 2014/09/28 16:48:59 jlec Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE=""
+IUSE="ldap"
 
 RDEPEND="
 	>=dev-libs/glib-2.12
@@ -21,8 +21,8 @@
 	net-libs/libpcap
 	app-crypt/gpgme
 	!net-analyzer/openvas-libnasl
-	net-nds/openldap
-	net-libs/libssh"
+	net-libs/libssh
+	ldap? (	net-nds/openldap )"
 DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex
@@ -31,10 +31,16 @@
 
 DOCS="ChangeLog CHANGES README"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-libssh.patch
+	"${FILESDIR}"/${P}-bsdsource.patch
+	)
+
 src_configure() {
 	local mycmakeargs=(
 		"-DLOCALSTATEDIR=${EPREFIX}/var"
 		"-DSYSCONFDIR=${EPREFIX}/etc"
+		$(cmake-utils_use_build ldap WITH_LDAP)
 	)
 	cmake-utils_src_configure
 }