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, 193 deletions

diff --git a/net-analyzer/openvas-manager/ChangeLog b/net-analyzer/openvas-manager/ChangeLog
index dd9b00a9b258..237262b3a89c 100644
--- a/net-analyzer/openvas-manager/ChangeLog
+++ b/net-analyzer/openvas-manager/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/openvas-manager
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-manager/ChangeLog,v 1.18 2015/02/10 08:51:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-manager/ChangeLog,v 1.19 2015/02/14 14:28:55 jlec Exp $
+
+  14 Feb 2015; Justin Lecher <jlec@gentoo.org> -openvas-manager-5.0.7.ebuild,
+  -openvas-manager-6.0_beta3.ebuild, -openvas-manager-6.0_beta4.ebuild,
+  openvas-manager-5.0.8.ebuild, openvas-manager-6.0_beta5.ebuild:
+  Drop old; fix dependencies versions
 
   10 Feb 2015; Justin Lecher <jlec@gentoo.org> openvas-manager-5.0.8.ebuild:
   Fix dependencies, #539530
diff --git a/net-analyzer/openvas-manager/openvas-manager-5.0.7.ebuild b/net-analyzer/openvas-manager/openvas-manager-5.0.7.ebuild
deleted file mode 100644
index fbcbfa849c9c..000000000000
--- a/net-analyzer/openvas-manager/openvas-manager-5.0.7.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-manager/openvas-manager-5.0.7.ebuild,v 1.1 2014/12/01 16:44:28 jlec Exp $
-
-EAPI=5
-
-inherit cmake-utils systemd
-
-MY_PN=openvasmd
-
-DL_ID=1849
-
-DESCRIPTION="A remote security scanner for Linux (openvas-manager)"
-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.6
-	>=dev-db/sqlite-3
-	!net-analyzer/openvas-administrator"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.4-gpgerror.patch
-	"${FILESDIR}"/${PN}-5.0.4-bsdsource.patch
-	"${FILESDIR}"/${PN}-5.0.4-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
-
-	insinto /etc/openvas/
-	doins "${FILESDIR}"/${MY_PN}-daemon.conf
-	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
-
-	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
diff --git a/net-analyzer/openvas-manager/openvas-manager-5.0.8.ebuild b/net-analyzer/openvas-manager/openvas-manager-5.0.8.ebuild
index a56a82fe2083..e5dd4e5067df 100644
--- a/net-analyzer/openvas-manager/openvas-manager-5.0.8.ebuild
+++ b/net-analyzer/openvas-manager/openvas-manager-5.0.8.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-manager/openvas-manager-5.0.8.ebuild,v 1.2 2015/02/10 08:51:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-manager/openvas-manager-5.0.8.ebuild,v 1.3 2015/02/14 14:28:55 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
 	>=dev-db/sqlite-3
 	!net-analyzer/openvas-administrator"
 DEPEND="${RDEPEND}
diff --git a/net-analyzer/openvas-manager/openvas-manager-6.0_beta3.ebuild b/net-analyzer/openvas-manager/openvas-manager-6.0_beta3.ebuild
deleted file mode 100644
index 31a265d421e7..000000000000
--- a/net-analyzer/openvas-manager/openvas-manager-6.0_beta3.ebuild
+++ /dev/null
@@ -1,63 +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-manager/openvas-manager-6.0_beta3.ebuild,v 1.1 2014/10/22 08:05:09 jlec Exp $
-
-EAPI=5
-
-inherit cmake-utils systemd
-
-MY_PN=openvasmd
-
-DL_ID=1771
-
-DESCRIPTION="A remote security scanner for Linux (openvas-manager)"
-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
-	>=dev-db/sqlite-3
-	!net-analyzer/openvas-administrator"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_beta/+beta}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.4-gpgerror.patch
-	"${FILESDIR}"/${PN}-5.0.4-bsdsource.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
-
-	insinto /etc/openvas/
-	doins "${FILESDIR}"/${MY_PN}-daemon.conf
-	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
-
-	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
diff --git a/net-analyzer/openvas-manager/openvas-manager-6.0_beta4.ebuild b/net-analyzer/openvas-manager/openvas-manager-6.0_beta4.ebuild
deleted file mode 100644
index a5c96b1fe556..000000000000
--- a/net-analyzer/openvas-manager/openvas-manager-6.0_beta4.ebuild
+++ /dev/null
@@ -1,63 +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-manager/openvas-manager-6.0_beta4.ebuild,v 1.1 2014/12/01 16:44:28 jlec Exp $
-
-EAPI=5
-
-inherit cmake-utils systemd
-
-MY_PN=openvasmd
-
-DL_ID=1815
-
-DESCRIPTION="A remote security scanner for Linux (openvas-manager)"
-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
-	>=dev-db/sqlite-3
-	!net-analyzer/openvas-administrator"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_beta/+beta}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.4-gpgerror.patch
-	"${FILESDIR}"/${PN}-5.0.4-bsdsource.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
-
-	insinto /etc/openvas/
-	doins "${FILESDIR}"/${MY_PN}-daemon.conf
-	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
-
-	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
diff --git a/net-analyzer/openvas-manager/openvas-manager-6.0_beta5.ebuild b/net-analyzer/openvas-manager/openvas-manager-6.0_beta5.ebuild
index 364ecc900eed..5980991e0602 100644
--- a/net-analyzer/openvas-manager/openvas-manager-6.0_beta5.ebuild
+++ b/net-analyzer/openvas-manager/openvas-manager-6.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-manager/openvas-manager-6.0_beta5.ebuild,v 1.1 2015/02/03 09:08:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-manager/openvas-manager-6.0_beta5.ebuild,v 1.2 2015/02/14 14:28:55 jlec Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ KEYWORDS=""
 IUSE=""
 
 RDEPEND="
-	~net-analyzer/openvas-libraries-8_beta4
+	>=net-analyzer/openvas-libraries-8_beta5
 	>=dev-db/sqlite-3
 	!net-analyzer/openvas-administrator"
 DEPEND="${RDEPEND}