Version Bump

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

4 files changed, 17 insertions, 71 deletions

diff --git a/net-analyzer/openvas-manager/ChangeLog b/net-analyzer/openvas-manager/ChangeLog
index 5a1a564b776a..809440bc048b 100644
--- a/net-analyzer/openvas-manager/ChangeLog
+++ b/net-analyzer/openvas-manager/ChangeLog
@@ -1,6 +1,14 @@
 # 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.23 2015/05/19 08:56:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-manager/ChangeLog,v 1.24 2015/07/27 14:05:57 jlec Exp $
+
+*openvas-manager-5.0.11 (27 Jul 2015)
+*openvas-manager-6.0.4 (27 Jul 2015)
+
+  27 Jul 2015; Justin Lecher <jlec@gentoo.org> +openvas-manager-5.0.11.ebuild,
+  +openvas-manager-6.0.4.ebuild, -openvas-manager-5.0.8.ebuild,
+  -openvas-manager-5.0.9.ebuild, -openvas-manager-6.0.1.ebuild:
+  Version Bump
 
 *openvas-manager-5.0.10 (19 May 2015)
 *openvas-manager-6.0.3 (19 May 2015)
diff --git a/net-analyzer/openvas-manager/openvas-manager-5.0.8.ebuild b/net-analyzer/openvas-manager/openvas-manager-5.0.11.ebuild
index e5dd4e5067df..59947ce88332 100644
--- a/net-analyzer/openvas-manager/openvas-manager-5.0.8.ebuild
+++ b/net-analyzer/openvas-manager/openvas-manager-5.0.11.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.3 2015/02/14 14:28:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-manager/openvas-manager-5.0.11.ebuild,v 1.1 2015/07/27 14:05:57 jlec Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ inherit cmake-utils systemd
 
 MY_PN=openvasmd
 
-DL_ID=1911
+DL_ID=2105
 
 DESCRIPTION="A remote security scanner for Linux (openvas-manager)"
 HOMEPAGE="http://www.openvas.org/"
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE=""
 
 RDEPEND="
-	>=net-analyzer/openvas-libraries-7.0.7
+	>=net-analyzer/openvas-libraries-7.0.10
 	>=dev-db/sqlite-3
 	!net-analyzer/openvas-administrator"
 DEPEND="${RDEPEND}
diff --git a/net-analyzer/openvas-manager/openvas-manager-5.0.9.ebuild b/net-analyzer/openvas-manager/openvas-manager-5.0.9.ebuild
deleted file mode 100644
index 7d8be12add92..000000000000
--- a/net-analyzer/openvas-manager/openvas-manager-5.0.9.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.9.ebuild,v 1.1 2015/03/06 10:13:49 jlec Exp $
-
-EAPI=5
-
-inherit cmake-utils systemd
-
-MY_PN=openvasmd
-
-DL_ID=1963
-
-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.9
-	>=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-6.0.1.ebuild b/net-analyzer/openvas-manager/openvas-manager-6.0.4.ebuild
index 600601282fc4..590ed1a56a97 100644
--- a/net-analyzer/openvas-manager/openvas-manager-6.0.1.ebuild
+++ b/net-analyzer/openvas-manager/openvas-manager-6.0.4.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.1.ebuild,v 1.1 2015/04/06 10:47:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-manager/openvas-manager-6.0.4.ebuild,v 1.1 2015/07/27 14:05:57 jlec Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ inherit cmake-utils systemd
 
 MY_PN=openvasmd
 
-DL_ID=2017
+DL_ID=2133
 
 DESCRIPTION="A remote security scanner for Linux (openvas-manager)"
 HOMEPAGE="http://www.openvas.org/"
@@ -20,16 +20,16 @@ KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
 IUSE=""
 
 RDEPEND="
-	>=net-analyzer/openvas-libraries-8.0.1
+	>=net-analyzer/openvas-libraries-8.0.3
 	>=dev-db/sqlite-3
 	!net-analyzer/openvas-administrator"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-S="${WORKDIR}"/${P/_beta/+beta}
+S="${WORKDIR}"/${P}
 
 PATCHES=(
-	"${FILESDIR}"/${P}-bsdsource.patch
+	"${FILESDIR}"/${PN}-6.0.1-bsdsource.patch
 	)
 
 src_prepare() {