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

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

6 files changed, 25 insertions, 178 deletions

diff --git a/net-analyzer/openvas-scanner/ChangeLog b/net-analyzer/openvas-scanner/ChangeLog
index 7b2a18f1dee9..c241e8ad6e3d 100644
--- a/net-analyzer/openvas-scanner/ChangeLog
+++ b/net-analyzer/openvas-scanner/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/openvas-scanner
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-scanner/ChangeLog,v 1.14 2014/10/15 07:38:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-scanner/ChangeLog,v 1.15 2014/10/22 07:55:55 jlec Exp $
+
+*openvas-scanner-5.0_beta3 (22 Oct 2014)
+
+  22 Oct 2014; Justin Lecher <jlec@gentoo.org> -openvas-scanner-4.0.1.ebuild,
+  -openvas-scanner-4.0.3-r1.ebuild, -openvas-scanner-4.0.3-r2.ebuild,
+  openvas-scanner-4.0.3-r3.ebuild, -openvas-scanner-5.0_beta2.ebuild,
+  +openvas-scanner-5.0_beta3.ebuild:
+  Update to latest beta; drop old
 
   15 Oct 2014; Justin Lecher <jlec@gentoo.org> openvas-scanner-4.0.3-r3.ebuild:
   Drop redundant post_inst message
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-4.0.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-4.0.1.ebuild
deleted file mode 100644
index 4969cc658887..000000000000
--- a/net-analyzer/openvas-scanner/openvas-scanner-4.0.1.ebuild
+++ /dev/null
@@ -1,41 +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-scanner/openvas-scanner-4.0.1.ebuild,v 1.1 2014/06/19 13:36:02 hanno Exp $
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="A remote security scanner for Linux (openvas-scanner)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/1640/${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-plugins
-	!net-analyzer/openvas-server"
-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"
-	doinitd "${FILESDIR}"/openvassd || die
-}
-
-pkg_postinst() {
-	elog "To use openvassd, you first need to:"
-	elog "1. Call 'openvas-nvt-sync' to download/update plugins"
-	elog "2. Call 'openvas-mkcert' to generate a server certificate"
-	elog "3. Call 'openvas-adduser' to create a user"
-}
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-4.0.3-r1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-4.0.3-r1.ebuild
deleted file mode 100644
index c3eb5f088d92..000000000000
--- a/net-analyzer/openvas-scanner/openvas-scanner-4.0.3-r1.ebuild
+++ /dev/null
@@ -1,62 +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-scanner/openvas-scanner-4.0.3-r1.ebuild,v 1.1 2014/09/28 18:12:28 jlec Exp $
-
-EAPI=5
-
-inherit cmake-utils systemd
-
-MY_PN=openvassd
-
-DESCRIPTION="A remote security scanner for Linux (openvas-scanner)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/1726/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=net-analyzer/openvas-libraries-7.0.4
-	!net-analyzer/openvas-plugins
-	!net-analyzer/openvas-server"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/cmake"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-bsdsource.patch
-	"${FILESDIR}"/${P}-mkcertclient.patch
-	"${FILESDIR}"/${P}-rulesdir.patch
-	)
-
-src_configure() {
-	local mycmakeargs="-DLOCALSTATEDIR=/var -DSYSCONFDIR=/etc"
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc ChangeLog CHANGES README
-
-	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
-
-	insinto /etc/openvas
-	doins "${FILESDIR}"/${MY_PN}.conf "${FILESDIR}"/${MY_PN}-daemon.conf
-	newconfd "${FILESDIR}"/${MY_PN}-daemon.conf ${MY_PN}
-
-	insinto /etc/logrotate.d
-	doins "${FILESDIR}"/${MY_PN}.logrotate
-
-	dodoc "${FILESDIR}"/${MY_PN}.logrotate
-
-	systemd_newtmpfilesd "${FILESDIR}"/${MY_PN}.tmpfiles.d ${MY_PN}.conf
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
-
-pkg_postinst() {
-	elog "To use ${MY_PN}, you first need to:"
-	elog "1. Call 'openvas-nvt-sync' to download/update plugins"
-	elog "2. Call 'openvas-mkcert' to generate a server certificate"
-}
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-4.0.3-r3.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-4.0.3-r3.ebuild
index 79a2f11fbb67..5f41a8d7ca7e 100644
--- a/net-analyzer/openvas-scanner/openvas-scanner-4.0.3-r3.ebuild
+++ b/net-analyzer/openvas-scanner/openvas-scanner-4.0.3-r3.ebuild
@@ -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-scanner/openvas-scanner-4.0.3-r3.ebuild,v 1.2 2014/10/15 07:38:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-scanner/openvas-scanner-4.0.3-r3.ebuild,v 1.3 2014/10/22 07:55:55 jlec Exp $
 
 EAPI=5
 
@@ -8,9 +8,11 @@ inherit cmake-utils systemd
 
 MY_PN=openvassd
 
+DL_ID=1726
+
 DESCRIPTION="A remote security scanner for Linux (OpenVAS-scanner)"
 HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/1726/${P}.tar.gz"
+SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-5.0_beta2.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-5.0_beta2.ebuild
deleted file mode 100644
index beae5af8f823..000000000000
--- a/net-analyzer/openvas-scanner/openvas-scanner-5.0_beta2.ebuild
+++ /dev/null
@@ -1,64 +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-scanner/openvas-scanner-5.0_beta2.ebuild,v 1.1 2014/09/29 18:39:15 jlec Exp $
-
-EAPI=5
-
-inherit cmake-utils systemd
-
-MY_PN=openvassd
-
-DESCRIPTION="A remote security scanner for Linux (openvas-scanner)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/1742/${P/_beta/+beta}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="
-	>=net-analyzer/openvas-libraries-8.0.0
-	!net-analyzer/openvas-plugins
-	!net-analyzer/openvas-server"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/cmake"
-
-S="${WORKDIR}"/${P/_beta/+beta}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.3-bsdsource.patch
-	"${FILESDIR}"/${PN}-4.0.3-mkcertclient.patch
-	"${FILESDIR}"/${PN}-4.0.3-rulesdir.patch
-	)
-
-src_configure() {
-	local mycmakeargs="-DLOCALSTATEDIR=/var -DSYSCONFDIR=/etc"
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc ChangeLog CHANGES README
-
-	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
-
-	insinto /etc/openvas
-	doins "${FILESDIR}"/${MY_PN}.conf "${FILESDIR}"/${MY_PN}-daemon.conf
-	newconfd "${FILESDIR}"/${MY_PN}-daemon.conf ${MY_PN}
-
-	insinto /etc/logrotate.d
-	doins "${FILESDIR}"/${MY_PN}.logrotate
-
-	dodoc "${FILESDIR}"/${MY_PN}.logrotate
-
-	systemd_newtmpfilesd "${FILESDIR}"/${MY_PN}.tmpfiles.d ${MY_PN}.conf
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
-
-pkg_postinst() {
-	elog "To use ${MY_PN}, you first need to:"
-	elog "1. Call 'openvas-nvt-sync' to download/update plugins"
-	elog "2. Call 'openvas-mkcert' to generate a server certificate"
-}
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-4.0.3-r2.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-5.0_beta3.ebuild
index 6ef868fa7123..95c76385fe57 100644
--- a/net-analyzer/openvas-scanner/openvas-scanner-4.0.3-r2.ebuild
+++ b/net-analyzer/openvas-scanner/openvas-scanner-5.0_beta3.ebuild
@@ -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-scanner/openvas-scanner-4.0.3-r2.ebuild,v 1.3 2014/10/02 06:56:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-scanner/openvas-scanner-5.0_beta3.ebuild,v 1.1 2014/10/22 07:55:55 jlec Exp $
 
 EAPI=5
 
@@ -8,27 +8,31 @@ inherit cmake-utils systemd
 
 MY_PN=openvassd
 
+DL_ID=1767
+
 DESCRIPTION="A remote security scanner for Linux (OpenVAS-scanner)"
 HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/1726/${P}.tar.gz"
+SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS=""
 IUSE=""
 
 RDEPEND="
-	>=net-analyzer/openvas-libraries-7.0.4
+	>=net-analyzer/openvas-libraries-8_beta3
 	!net-analyzer/openvas-plugins
 	!net-analyzer/openvas-server"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+S="${WORKDIR}"/${P/_beta/+beta}
+
 PATCHES=(
-	"${FILESDIR}"/${P}-bsdsource.patch
-	"${FILESDIR}"/${P}-mkcertclient.patch
-	"${FILESDIR}"/${P}-rulesdir.patch
-	"${FILESDIR}"/${P}-run.patch
+	"${FILESDIR}"/${PN}-4.0.3-bsdsource.patch
+	"${FILESDIR}"/${PN}-4.0.3-mkcertclient.patch
+	"${FILESDIR}"/${PN}-4.0.3-rulesdir.patch
+	"${FILESDIR}"/${PN}-4.0.3-run.patch
 	)
 
 src_prepare() {