Version Bump

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

3 files changed, 67 insertions, 4 deletions

diff --git a/net-analyzer/openvas-libraries/ChangeLog b/net-analyzer/openvas-libraries/ChangeLog
index b0ba52506ede..7ed628e89aa2 100644
--- a/net-analyzer/openvas-libraries/ChangeLog
+++ b/net-analyzer/openvas-libraries/ChangeLog
@@ -1,6 +1,13 @@
 # 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.33 2015/02/14 14:35:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/ChangeLog,v 1.34 2015/02/14 18:22:34 jlec Exp $
+
+*openvas-libraries-8.0_beta6 (14 Feb 2015)
+
+  14 Feb 2015; Justin Lecher <jlec@gentoo.org>
+  +files/openvas-libraries-8.0_beta6-include.patch,
+  +openvas-libraries-8.0_beta6.ebuild, -openvas-libraries-8.0_beta5.ebuild:
+  Version Bump
 
   14 Feb 2015; Justin Lecher <jlec@gentoo.org> -openvas-libraries-7.0.6.ebuild:
   Drop old
diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-8.0_beta6-include.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-8.0_beta6-include.patch
new file mode 100644
index 000000000000..7578155659de
--- /dev/null
+++ b/net-analyzer/openvas-libraries/files/openvas-libraries-8.0_beta6-include.patch
@@ -0,0 +1,54 @@
+ base/CMakeLists.txt | 2 ++
+ nasl/CMakeLists.txt | 5 +++--
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
+index c2dccf5..4f17892 100644
+--- a/base/CMakeLists.txt
++++ b/base/CMakeLists.txt
+@@ -56,6 +56,7 @@ endif (MINGW)
+ 
+ if (BUILD_STATIC)
+   add_library (openvas_base_static STATIC ${FILES})
++  set_target_properties (openvas_base_static PROPERTIES COMPILE_FLAGS "${GPGME_CFLAGS}")
+   set_target_properties (openvas_base_static PROPERTIES OUTPUT_NAME "openvas_base")
+   set_target_properties (openvas_base_static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+   set_target_properties (openvas_base_static PROPERTIES PUBLIC_HEADER "${HEADERS}")
+@@ -63,6 +64,7 @@ endif (BUILD_STATIC)
+ 
+ if (BUILD_SHARED)
+   add_library (openvas_base_shared SHARED ${FILES})
++  set_target_properties (openvas_base_shared PROPERTIES COMPILE_FLAGS "${GPGME_CFLAGS}")
+   set_target_properties (openvas_base_shared PROPERTIES OUTPUT_NAME "openvas_base")
+   set_target_properties (openvas_base_shared PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+   set_target_properties (openvas_base_shared PROPERTIES SOVERSION "${CPACK_PACKAGE_VERSION_MAJOR}")
+diff --git a/nasl/CMakeLists.txt b/nasl/CMakeLists.txt
+index 52fa5c6..afd18c2 100644
+--- a/nasl/CMakeLists.txt
++++ b/nasl/CMakeLists.txt
+@@ -41,7 +41,7 @@ endif (SNMP)
+ # The "-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1" is necessary for GPGME!
+ # The "-fno-strict-aliasing" silences warnings caused by macros defined in byteorder.h.
+ # Once the warnings have been addressed this flag should be removed.
+-set (CMAKE_C_FLAGS              "${CMAKE_C_FLAGS} ${HARDENING_FLAGS} -Wall -D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1 -fno-strict-aliasing")
++set (CMAKE_C_FLAGS              "${CMAKE_C_FLAGS} ${HARDENING_FLAGS} -Wall -D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1 -fno-strict-aliasing ${GPGME_CFLAGS}")
+ 
+ ## Compile the parser - note that there are (better) CMake macros to achieve
+ ## that
+@@ -103,7 +103,7 @@ link_directories (${LIBDIR} ../base ../misc)
+ 
+ if (BUILD_STATIC)
+    add_library (openvas_nasl_static STATIC ${FILES})
+-
++   set_target_properties (openvas_nasl_static PROPERTIES COMPILE_FLAGS "${GPGME_CFLAGS}")
+    set_target_properties (openvas_nasl_static PROPERTIES OUTPUT_NAME "openvas_nasl")
+    set_target_properties (openvas_nasl_static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+    set_target_properties (openvas_nasl_static PROPERTIES PUBLIC_HEADER "${HEADERS}")
+@@ -118,6 +118,7 @@ endif (BUILD_STATIC)
+ 
+ if (BUILD_SHARED)
+   add_library (openvas_nasl_shared SHARED ${FILES})
++  set_target_properties (openvas_nasl_shared PROPERTIES COMPILE_FLAGS "${GPGME_CFLAGS}")
+   set_target_properties (openvas_nasl_shared PROPERTIES OUTPUT_NAME "openvas_nasl")
+   set_target_properties (openvas_nasl_shared PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+   set_target_properties (openvas_nasl_shared PROPERTIES SOVERSION "${CPACK_PACKAGE_VERSION_MAJOR}")
diff --git a/net-analyzer/openvas-libraries/openvas-libraries-8.0_beta5.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-8.0_beta6.ebuild
index 7b07dfeb7345..91de36a21bf0 100644
--- a/net-analyzer/openvas-libraries/openvas-libraries-8.0_beta5.ebuild
+++ b/net-analyzer/openvas-libraries/openvas-libraries-8.0_beta6.ebuild
@@ -1,12 +1,12 @@
 # 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_beta5.ebuild,v 1.2 2015/02/14 14:20:14 jlec Exp $
+# $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 $
 
 EAPI=5
 
 inherit cmake-utils
 
-DL_ID=1866
+DL_ID=1922
 
 DESCRIPTION="A remote security scanner for Linux (openvas-libraries)"
 HOMEPAGE="http://www.openvas.org/"
@@ -21,6 +21,7 @@ RDEPEND="
 	app-crypt/gpgme
 	>=dev-libs/glib-2.16
 	>=dev-libs/hiredis-0.10.1
+	dev-libs/libgcrypt:0
 	dev-libs/libksba
 	!net-analyzer/openvas-libnasl
 	=net-libs/gnutls-2*
@@ -40,7 +41,8 @@ DOCS=( ChangeLog CHANGES README )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-7.0.4-libssh.patch
-	"${FILESDIR}"/${PN}-8.0_beta3-underlinking.patch
+#	"${FILESDIR}"/${PN}-8.0_beta3-underlinking.patch
+	"${FILESDIR}"/${P}-include.patch
 	)
 
 src_prepare() {