net-analyzer/openvas-cli: Update to latest beta; drop old

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

4 files changed, 44 insertions, 36 deletions

diff --git a/net-analyzer/openvas-cli/ChangeLog b/net-analyzer/openvas-cli/ChangeLog
index db0764b15bc2..dcf4cc13148b 100644
--- a/net-analyzer/openvas-cli/ChangeLog
+++ b/net-analyzer/openvas-cli/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/openvas-cli
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-cli/ChangeLog,v 1.7 2014/10/01 11:30:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-cli/ChangeLog,v 1.8 2014/10/22 08:11:50 jlec Exp $
+
+*openvas-cli-1.4_beta3 (22 Oct 2014)
+
+  22 Oct 2014; Justin Lecher <jlec@gentoo.org> -openvas-cli-1.3.0.ebuild,
+  openvas-cli-1.3.0-r1.ebuild, +openvas-cli-1.4_beta3.ebuild:
+  Update to latest beta; drop old
 
 *openvas-cli-1.3.0-r1 (01 Oct 2014)
 
diff --git a/net-analyzer/openvas-cli/openvas-cli-1.3.0-r1.ebuild b/net-analyzer/openvas-cli/openvas-cli-1.3.0-r1.ebuild
index e29568f1bad8..d1049467539a 100644
--- a/net-analyzer/openvas-cli/openvas-cli-1.3.0-r1.ebuild
+++ b/net-analyzer/openvas-cli/openvas-cli-1.3.0-r1.ebuild
@@ -1,21 +1,23 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-cli/openvas-cli-1.3.0-r1.ebuild,v 1.1 2014/10/01 11:30:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-cli/openvas-cli-1.3.0-r1.ebuild,v 1.2 2014/10/22 08:11:50 jlec Exp $
 
 EAPI=5
 
 inherit cmake-utils
 
-DESCRIPTION="A remote security scanner for Linux (openvas-cli)"
+DL_ID=1633
+
+DESCRIPTION="A remote security scanner for Linux (OpenVAS-cli)"
 HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/1633/${P}.tar.gz"
+SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE=""
 
 RDEPEND="
-	>=net-analyzer/openvas-libraries-7.0.2
+	>=net-analyzer/openvas-libraries-7.0.4
 	!net-analyzer/openvas-client"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/net-analyzer/openvas-cli/openvas-cli-1.3.0.ebuild b/net-analyzer/openvas-cli/openvas-cli-1.3.0.ebuild
deleted file mode 100644
index 4ba27833cffe..000000000000
--- a/net-analyzer/openvas-cli/openvas-cli-1.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-cli/openvas-cli-1.3.0.ebuild,v 1.1 2014/06/19 13:38:59 hanno Exp $
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="A remote security scanner for Linux (openvas-cli)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/1633/${P}.tar.gz"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=net-analyzer/openvas-libraries-7.0.2
-	!net-analyzer/openvas-client"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/cmake"
-
-src_configure() {
-	local mycmakeargs="-DLOCALSTATEDIR=/var -DSYSCONFDIR=/etc"
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc ChangeLog CHANGES README || die "dodoc failed"
-}
diff --git a/net-analyzer/openvas-cli/openvas-cli-1.4_beta3.ebuild b/net-analyzer/openvas-cli/openvas-cli-1.4_beta3.ebuild
new file mode 100644
index 000000000000..b030a956f60b
--- /dev/null
+++ b/net-analyzer/openvas-cli/openvas-cli-1.4_beta3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-cli/openvas-cli-1.4_beta3.ebuild,v 1.1 2014/10/22 08:11:50 jlec Exp $
+
+EAPI=5
+
+inherit cmake-utils
+
+DL_ID=1779
+
+DESCRIPTION="A remote security scanner for Linux (OpenVAS-cli)"
+HOMEPAGE="http://www.openvas.org/"
+SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="
+	>=net-analyzer/openvas-libraries-8.0_beta3
+	!net-analyzer/openvas-client"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLOCALSTATEDIR="${EPREFIX}"/var
+		-DSYSCONFDIR="${EPREFIX}"/etc
+	)
+	cmake-utils_src_configure
+}