Version Bump

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 85 insertions, 21 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/Manifest b/net-analyzer/openvas-libraries/Manifest
index c9fc25b167fc..9bf19b1b96bb 100644
--- a/net-analyzer/openvas-libraries/Manifest
+++ b/net-analyzer/openvas-libraries/Manifest
@@ -6,28 +6,29 @@ AUX openvas-libraries-7.0.4-libssh.patch 664 SHA256 73f8d299f7b8fa3f06f2c02d1588
 AUX openvas-libraries-7.0.4-run.patch 626 SHA256 92c9c8faffd8d01a7a8a6256c33e10bd023332572d09354ee1f9e0a50589c07e SHA512 94775408c8e9dc85f12eeb84ef1e355411496e5a495f67bed900efc10d93f5ff9a96bb6d28fce1dabfb0fd15bc19f7cc53986dd17fd288677f67c13bb9ff9743 WHIRLPOOL 6b52c6b52173d593e5a4442870866107983137d54bcd6153278bb0450dbcc68cbc3ec30b6f402441168749bb122a7742d024e79592f52d9b4e582ed8e34ad82d
 AUX openvas-libraries-7.0.6-underlinking.patch 1348 SHA256 574a8e59866c3e1526ad2c45c4151a417f7342d6951563f3e94c106e95446725 SHA512 0c6eb2ea1b68468a520aa483be0be449e07a82488dc872be9eb343872e33c0d6f6ee4abb4a318e4bf7204b542262c933bf7742c644a4a999615201460030b0df WHIRLPOOL df0d15ca5a3c6f69450ef53318c8a9c34be44e2fd16419c72ee2e92282fc629c1d5958c2c4b80a6205786c2308933612c4325e962c5ce0ed4b15da8b083b9b65
 AUX openvas-libraries-8.0_beta3-underlinking.patch 909 SHA256 bd43e373b89f63b398bc64e2a42877e82a5914d913d6d9a1253f68db787f71f6 SHA512 fadeb419904428a8a0bc8b2a8e48859b5ba9fb24094b00baf56750955ba15fb5fc8e096195690d72c9367adbc9f479c811c425259cdc256db7cdef7255f20823 WHIRLPOOL 71deafe5d549eb7afa2557543a3dc24fe7ff9592008937a7c558659699e27062b73df6f4056e907206abf56ffd952f92bc93b1f181557e8ddd41a8c67d883350
+AUX openvas-libraries-8.0_beta6-include.patch 2914 SHA256 b52ec0d5cc6e49fcb9eb50abd2cc22fadb3bf124a5c7a4b6ec5d339f4f3853eb SHA512 885043e61a44cf85bc9ead24edc49bd6a31ed3926155d75ff87afce6880a915a6ef2c2cb3b87eb4dccd6165917dea2b6be45fc59b0327d43bd7dc1c13186d905 WHIRLPOOL 17bf1c41d3a6c440a198632ee7d1a74589f8b86afea29719de5868cbcb91952b2bfb373031fee0c99b3b6b060f53b49e9a7b0e79252658f0e46a2ad71e156f5b
 DIST openvas-libraries-7.0.7.tar.gz 578578 SHA256 d04563d620952618af69e2db7afef8539f6aae8dffe1e8c0f4127abe9e33d20f SHA512 6960b8ae65bb2f4182bd8c4a513c723c92990d76b4deb3c1a42d5cffb6731ab918aabfad816a7e138be3f5d4fa042c0c98a3e03ea0c4a2d4e30e60115d3df4a0 WHIRLPOOL 0c0fbcddbcbfd4c6c06428a6863b25deece4b4306f867f03a283a7916838073f94d5b9cea6983d0fd86e9066f4bf6d98ada59c24776a7c3f677375334d5012b3
-DIST openvas-libraries-8.0+beta5.tar.gz 600233 SHA256 b8f1fcb667658cca6c89f5fc72b760eeb968edd75638d545fcb1c54a7f1a753f SHA512 bffbc371e59d0c5ee88d20168295da3c28a4cb39fb7f4c8beb691fd05228aad8361f5fe528935c2c7b442ddf06de122c3e89bd3f3127aa0277f587318af3d6af WHIRLPOOL 4b9200673efd9c1147ae23411a3db39877a11ef66bc4977864e4b6642304115ab0e9df8f7d27fe4eca10827186fb1df12c9ab175da46443d9975e73bd0f6d376
+DIST openvas-libraries-8.0+beta6.tar.gz 600138 SHA256 a7a60f026aa8a6ad855d43c3574bf8b36449574e5f21a0453e414bcaa171ec35 SHA512 93c850da35d7b2687964a10cf2d6531f3f725c2760d59815f4a0fceb97914eb13ca261a18b3107c0f206fd79cf83aa50de142fe4a13e65c36ad52f740bbb9fc8 WHIRLPOOL 66fd1a354de1f6c6fc969068b7a53707e49e2759e6aad10b816bc4baee0fa44e9bbbd17c4140a9f2e5b78e4864498971d59cb8ac7169c4d5b016977d77232986
 EBUILD openvas-libraries-7.0.7.ebuild 1288 SHA256 22b799d2d8bf90dd65d051db440aaadda47d8c25d21ae48f5232d0dd78bc2c98 SHA512 77144fadfdfbe5525cfc729e054a310a10c66ae3fbaec3371ceaca8de27578807ebf9b749a950e30d62efccc3f8ec9b633fb48f80c983706ec02ba2b9393a381 WHIRLPOOL b8bb4b3d08dc005a79ef71ef84ef1881eae00dcb8f412e89533bd4504d9c3e0c2f317f35c668de69cec36994a1519f00660304f650bf86cd87a8dff4286a71e4
-EBUILD openvas-libraries-8.0_beta5.ebuild 1318 SHA256 54c89f1bac508f13316e89da397d6ee3654bad29ed4e721d97281ede8eb5a519 SHA512 191bc5a92b745bd8e3e6100fd5af839d896c29e17f9897cd174a666ba301419791136596688fbf117c10dd1e2596ab6be8cc945d07baf8abc237e8717aee0fa6 WHIRLPOOL 3ab3b4c75c41d589863bea5c32758ad53e6eab2e260d132382f20ddcfe11ed07896e026aa88491b95bf06900ff3bc0753c0cde038b58c0406660342c848a0506
-MISC ChangeLog 5919 SHA256 0511151cebc85e4e31b3f67f4e45bcf2d6cfb44d9fb09b171196f13b3e4933b7 SHA512 cfeb4cef9b732b50fb651768e5affd4ab307923804fba60b577c74390fada617d2c988dd5592cb6206197a60387d754aaae377c1f10929d56aeb34735678afd4 WHIRLPOOL 04d5b989ade9ccb5072197f22d173a43f7930b8adc8f974692489a63852d28b5c2a17bf66cacf6d729fa47924668ccff49299f975fa9e4fa6ab679a56823ab0a
+EBUILD openvas-libraries-8.0_beta6.ebuild 1375 SHA256 925b23bc077c0cf0450e446352b5800ec3dbd7636c467e477d95210f43afa361 SHA512 44082ab97d092af68a530dda62f042b95097581ad97fbea88609f9b56e7070d81b1941d69a8f6318724a0bc453c202ce79909ad7b1af44c43e50b7f1f885f9a0 WHIRLPOOL c14eb3197d06907439ed31d85fb408fc6d37b8ce5e76ae8bedf0488335e5ddaa823a6ec5f237b3eaad8a77a91198bd1c3af278a2927c13457768e97697a5e354
+MISC ChangeLog 6154 SHA256 fd1b3b571299838c949e7bbcecfff1835f73776f68b5bb08aa0ef2a932b76be0 SHA512 e2bd20cbc435705d67ce31d718e7d38a8ea570b1ccdbc4d0a23e93696055504d53fce574f1bc0628663d4794ffb2459906cfd802efb75b3bd9640761b71c361b WHIRLPOOL 9edbf56b914674c2b297eafbf554bfdd91aebe208c723b8034ccfd686889913eaed1ef13a68a322f3c0e9801bc895eba73e88d0e61c37a3310398c0c5d1a5180
 MISC metadata.xml 272 SHA256 dcb8ec15610a3eef62f9d23edad84415c2e533cdbd39a2e04bad6228e3fba98f SHA512 693a10453cc5ae8d645ba4f45439931fbe69c5dd1f0710b30a311481ec7d4dd33b6291e1ac0accf8fe27154b31fc33095e965fb2e2afb951d4a773b39ae02767 WHIRLPOOL a05cbbef3e2da2acc698abcc814290cd39484de28ebc321fd72af097cab0cee36a896cfcaed8fa3ab63f6199a18599ef590c08ead21809576103772ba9a8b400
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJU3144XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJU35NcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirPiYP/0i4M4icbk7POe3QOUhgK5Dj
-w2OzWJTwQKgvnNzH9N9xvBkaa7XCZMKAkdpjrvbuHkt5lQ1BvOa6zthoHrtGOWIV
-CX2j5A0zBQkJgElCtcgDYFjcvS/hJljpCIcOSkrH8Q2xYb7ogjDGn0lxV2zc5bwG
-kOcC1s4oai5ixk3ZsUXJ1nJnxEIouZuJFd0USRc4aAMCFUTXvZsfhbDmOMGSjgtW
-O93OqwWCk6iSvAsTYXGc+uJCY2PsCClprd7R4DSNr/RTF5B0YGRx0F3HgXI7C4pL
-Ecd4Fvum2lSVrYPgcuFcM4rshlj/BBsxuYSWHuufqWCloYPXYS+QiPdEHiNSK4GQ
-sU0vgtlkZOBK0hyTPDaVBlUri/zo0nvRMtNDp1x614gXok/5xKpthagY2K7bVGrs
-+dbs2OX4XPXRBBuY6lU/cKRCKSDbrf9YITHh5Pq6hGHJCCHXl+RXUUsL9E9lF6Go
-nLIDBcQ1W3s1e0lpndK3UxzWoMd70kUYF2KroFfI06mJW5rdmi5olQ31yYlHw9w9
-BwTpVyIqmYnTpZ0spn5F1GiLCBl6453e0+c/RVGFJJKA9TI/DPc4Y8cw2Zh1RwJZ
-Nbc30zTFRgLrSfF9l+Kcw6olhXUJgBnf6aYWf7rd39B9DSF3cwyX3FWDhL0Iz/+X
-YKufunNmcBJSNLEq+hZ6
-=wx9e
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirJugP/090j2v/CRe2MYIVas6Vh8f5
+xKGbdRHo/Mx5z7pnDnZjKgM/4BZRH4HlcB+TUcgu0zgB2iRjDNYa1PfHuPQGkZNw
+2+ripCBNiqYTh5Zh9QWDPKlfmJ2xPH37epp24mxP9ed+KYhedEDeySJNxhXnqdke
+c5h0mi+wjO9/FDM8VZB/+CSSVE0U9u7HX0vaDmNfPucuYjn9wob1FBojZtEj94Vi
+mlfFOse4mutlMLgr/SR+4t+FdKqU4LdEEDG+0lZi9eEfJgdlmPHCqGAp1n2SiJcu
+FmLuvbilRFMx5pJeRFObNpbrgFJpFm0hLEVGpcTjGEdpzsojESQLU9aijgaxVic3
+yZAyxAnnpzb0S5yyyjAruSd9bTxQpnxr75hl+/Q6QKGTj/XzyZWqhcA+lbwmMlZh
+5eajQ+PdajGSMB2msPhB3Ujcfra1w1bnpmCViBiIVGF3PDbqV+7dl7YpJIMEn/30
+wZ+IX1p7I3dVefHUXfDWOFQPR45eH1zRuvH0fR+QM5rG8jNtyT4PrBWG8vxZpU1t
+9kfvb66Ygcs4DyS32qSfnjLAxAfSo3PfWo9/0HnVD0qg1Z8xP40YjPsntNTAXocf
+3VX52VrWoZzDSZ41Gz/IHAKFGLAEoTql8IFDcmRk5fQPTmqXpNE3saOK8UKW6DSb
+r+gNTpJ300n1RwohYOgu
+=HZVK
 -----END PGP SIGNATURE-----
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() {