Drop old; fix dependencies versions

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

6 files changed, 10 insertions, 210 deletions

diff --git a/net-analyzer/openvas-scanner/ChangeLog b/net-analyzer/openvas-scanner/ChangeLog
index 6efda5460faf..ea9e4ed0eae0 100644
--- a/net-analyzer/openvas-scanner/ChangeLog
+++ b/net-analyzer/openvas-scanner/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/openvas-scanner
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-scanner/ChangeLog,v 1.18 2015/02/03 09:08:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-scanner/ChangeLog,v 1.19 2015/02/14 14:33:46 jlec Exp $
+
+  14 Feb 2015; Justin Lecher <jlec@gentoo.org> -openvas-scanner-4.0.4.ebuild,
+  -openvas-scanner-5.0_beta3.ebuild, -openvas-scanner-5.0_beta4.ebuild,
+  openvas-scanner-4.0.5.ebuild, openvas-scanner-5.0_beta5.ebuild:
+  Drop old; fix dependencies versions
 
 *openvas-scanner-5.0_beta5 (03 Feb 2015)
 
@@ -100,4 +105,3 @@
   09 Oct 2011; Hanno Boeck <hanno@gentoo.org> +openvas-scanner-3.2.4.ebuild,
   +files/openvassd, +metadata.xml:
   Initial commit, scanner part of openvas.
-
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-4.0.4.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-4.0.4.ebuild
deleted file mode 100644
index dddbc372d00c..000000000000
--- a/net-analyzer/openvas-scanner/openvas-scanner-4.0.4.ebuild
+++ /dev/null
@@ -1,67 +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.4.ebuild,v 1.1 2014/11/04 12:28:32 jlec Exp $
-
-EAPI=5
-
-inherit cmake-utils systemd
-
-MY_PN=openvassd
-
-DL_ID=1791
-
-DESCRIPTION="A remote security scanner for Linux (OpenVAS-scanner)"
-HOMEPAGE="http://www.openvas.org/"
-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.5
-	!net-analyzer/openvas-plugins
-	!net-analyzer/openvas-server"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${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() {
-	sed \
-		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
-		-i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DLOCALSTATEDIR=${EPREFIX}/var"
-		"-DSYSCONFDIR=${EPREFIX}/etc"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
-
-	insinto /etc/openvas
-	doins "${FILESDIR}"/${MY_PN}.conf "${FILESDIR}"/${MY_PN}-daemon.conf
-	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
-
-	insinto /etc/logrotate.d
-	doins "${FILESDIR}"/${MY_PN}.logrotate
-
-	dodoc "${FILESDIR}"/openvas-nvt-sync-cron
-
-	systemd_newtmpfilesd "${FILESDIR}"/${MY_PN}.tmpfiles.d ${MY_PN}.conf
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-4.0.5.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-4.0.5.ebuild
index 6064a734c496..6f57c219dff4 100644
--- a/net-analyzer/openvas-scanner/openvas-scanner-4.0.5.ebuild
+++ b/net-analyzer/openvas-scanner/openvas-scanner-4.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.5.ebuild,v 1.2 2015/02/03 09:08:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-scanner/openvas-scanner-4.0.5.ebuild,v 1.3 2015/02/14 14:33:46 jlec Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE=""
 
 RDEPEND="
-	~net-analyzer/openvas-libraries-7.0.7
+	>=net-analyzer/openvas-libraries-7.0.7
 	!net-analyzer/openvas-plugins
 	!net-analyzer/openvas-server"
 DEPEND="${RDEPEND}
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-5.0_beta3.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-5.0_beta3.ebuild
deleted file mode 100644
index 95c76385fe57..000000000000
--- a/net-analyzer/openvas-scanner/openvas-scanner-5.0_beta3.ebuild
+++ /dev/null
@@ -1,69 +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_beta3.ebuild,v 1.1 2014/10/22 07:55:55 jlec Exp $
-
-EAPI=5
-
-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/${DL_ID}/${P/_beta/+beta}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="
-	>=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}"/${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() {
-	sed \
-		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
-		-i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DLOCALSTATEDIR=${EPREFIX}/var"
-		"-DSYSCONFDIR=${EPREFIX}/etc"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
-
-	insinto /etc/openvas
-	doins "${FILESDIR}"/${MY_PN}.conf "${FILESDIR}"/${MY_PN}-daemon.conf
-	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
-
-	insinto /etc/logrotate.d
-	doins "${FILESDIR}"/${MY_PN}.logrotate
-
-	dodoc "${FILESDIR}"/openvas-nvt-sync-cron
-
-	systemd_newtmpfilesd "${FILESDIR}"/${MY_PN}.tmpfiles.d ${MY_PN}.conf
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-5.0_beta4.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-5.0_beta4.ebuild
deleted file mode 100644
index d0298f0b6cea..000000000000
--- a/net-analyzer/openvas-scanner/openvas-scanner-5.0_beta4.ebuild
+++ /dev/null
@@ -1,68 +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_beta4.ebuild,v 1.1 2014/12/01 16:49:48 jlec Exp $
-
-EAPI=5
-
-inherit cmake-utils systemd
-
-MY_PN=openvassd
-
-DL_ID=1808
-
-DESCRIPTION="A remote security scanner for Linux (OpenVAS-scanner)"
-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_beta4
-	!net-analyzer/openvas-plugins
-	!net-analyzer/openvas-server"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_beta/+beta}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.3-mkcertclient.patch
-	"${FILESDIR}"/${PN}-4.0.3-rulesdir.patch
-	"${FILESDIR}"/${PN}-4.0.3-run.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"
-		"-DSYSCONFDIR=${EPREFIX}/etc"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
-
-	insinto /etc/openvas
-	doins "${FILESDIR}"/${MY_PN}.conf "${FILESDIR}"/${MY_PN}-daemon.conf
-	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
-
-	insinto /etc/logrotate.d
-	doins "${FILESDIR}"/${MY_PN}.logrotate
-
-	dodoc "${FILESDIR}"/openvas-nvt-sync-cron
-
-	systemd_newtmpfilesd "${FILESDIR}"/${MY_PN}.tmpfiles.d ${MY_PN}.conf
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-5.0_beta5.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-5.0_beta5.ebuild
index a3a04ab523ef..3ec84d0e1dcf 100644
--- a/net-analyzer/openvas-scanner/openvas-scanner-5.0_beta5.ebuild
+++ b/net-analyzer/openvas-scanner/openvas-scanner-5.0_beta5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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_beta5.ebuild,v 1.1 2015/02/03 09:08:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-scanner/openvas-scanner-5.0_beta5.ebuild,v 1.2 2015/02/14 14:33:46 jlec Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ IUSE=""
 
 RDEPEND="
 	>=dev-libs/glib-2.16:2
-	~net-analyzer/openvas-libraries-8_beta5
+	>=net-analyzer/openvas-libraries-8_beta5
 	!net-analyzer/openvas-plugins
 	!net-analyzer/openvas-server"
 DEPEND="${RDEPEND}