net-analyzer/openvas-libraries: Bump to latest beta

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

4 files changed, 25 insertions, 9 deletions

diff --git a/net-analyzer/openvas-libraries/ChangeLog b/net-analyzer/openvas-libraries/ChangeLog
index 9b96c1af9573..24c1dc9c4169 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/ChangeLog,v 1.24 2014/10/17 09:12:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/ChangeLog,v 1.25 2014/10/22 07:49:59 jlec Exp $
+
+*openvas-libraries-8.0_beta3 (22 Oct 2014)
+
+  22 Oct 2014; Justin Lecher <jlec@gentoo.org>
+  openvas-libraries-7.0.4-r1.ebuild, -openvas-libraries-8.0_beta2.ebuild,
+  +openvas-libraries-8.0_beta3.ebuild,
+  -files/openvas-libraries-8.0_beta2-underlinking.patch,
+  +files/openvas-libraries-8.0_beta3-underlinking.patch:
+  Bump to latest beta
 
   17 Oct 2014; Justin Lecher <jlec@gentoo.org> openvas-libraries-4.0.5.ebuild,
   openvas-libraries-6.0.0.ebuild, openvas-libraries-6.0.1.ebuild,
diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-8.0_beta2-underlinking.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-8.0_beta3-underlinking.patch
index 034975d6e192..034975d6e192 100644
--- a/net-analyzer/openvas-libraries/files/openvas-libraries-8.0_beta2-underlinking.patch
+++ b/net-analyzer/openvas-libraries/files/openvas-libraries-8.0_beta3-underlinking.patch
diff --git a/net-analyzer/openvas-libraries/openvas-libraries-7.0.4-r1.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-7.0.4-r1.ebuild
index 9681302d5284..707d75a283dc 100644
--- a/net-analyzer/openvas-libraries/openvas-libraries-7.0.4-r1.ebuild
+++ b/net-analyzer/openvas-libraries/openvas-libraries-7.0.4-r1.ebuild
@@ -1,14 +1,16 @@
 # 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-r1.ebuild,v 1.2 2014/10/17 09:12:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/openvas-libraries-7.0.4-r1.ebuild,v 1.3 2014/10/22 07:49:59 jlec Exp $
 
 EAPI=5
 
 inherit cmake-utils
 
+DL_ID=1722
+
 DESCRIPTION="A remote security scanner for Linux (openvas-libraries)"
 HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/1722/${P}.tar.gz"
+SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/net-analyzer/openvas-libraries/openvas-libraries-8.0_beta2.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-8.0_beta3.ebuild
index 83aed23c9406..fe77222d23b7 100644
--- a/net-analyzer/openvas-libraries/openvas-libraries-8.0_beta2.ebuild
+++ b/net-analyzer/openvas-libraries/openvas-libraries-8.0_beta3.ebuild
@@ -1,14 +1,16 @@
 # 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-8.0_beta2.ebuild,v 1.3 2014/10/17 09:12:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/openvas-libraries-8.0_beta3.ebuild,v 1.1 2014/10/22 07:49:59 jlec Exp $
 
 EAPI=5
 
 inherit cmake-utils
 
+DL_ID=1763
+
 DESCRIPTION="A remote security scanner for Linux (openvas-libraries)"
 HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/1738/${P/_beta/+beta}.tar.gz"
+SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -40,6 +42,13 @@ PATCHES=(
 	"${FILESDIR}"/${P}-underlinking.patch
 	)
 
+src_prepare() {
+	sed \
+		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
+		-i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		"-DLOCALSTATEDIR=${EPREFIX}/var"
@@ -48,7 +57,3 @@ src_configure() {
 	)
 	cmake-utils_src_configure
 }
-
-src_install() {
-	cmake-utils_src_install
-}