Drop old; sort dependencies; drop unnecessary depend on cmake

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

7 files changed, 19 insertions, 187 deletions

diff --git a/net-analyzer/openvas-libraries/ChangeLog b/net-analyzer/openvas-libraries/ChangeLog
index fcc796717ec3..81e7a5e13ddb 100644
--- a/net-analyzer/openvas-libraries/ChangeLog
+++ b/net-analyzer/openvas-libraries/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/openvas-libraries
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/ChangeLog,v 1.31 2015/02/03 08:52:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/ChangeLog,v 1.32 2015/02/14 14:20:14 jlec Exp $
+
+  14 Feb 2015; Justin Lecher <jlec@gentoo.org> -openvas-libraries-7.0.5.ebuild,
+  -openvas-libraries-8.0_beta3.ebuild, -openvas-libraries-8.0_beta4.ebuild,
+  openvas-libraries-7.0.6.ebuild, openvas-libraries-7.0.7.ebuild,
+  openvas-libraries-8.0_beta5.ebuild:
+  Drop old; sort dependencies; drop unnecessary depend on cmake
 
 *openvas-libraries-8.0_beta5 (03 Feb 2015)
 *openvas-libraries-7.0.7 (03 Feb 2015)
@@ -164,4 +170,3 @@
   08 Feb 2008; Hanno Boeck <hanno@gentoo.org> +metadata.xml,
   +openvas-libraries-1.0.0.ebuild:
   Initial commit of openvas.
-
diff --git a/net-analyzer/openvas-libraries/openvas-libraries-7.0.5.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-7.0.5.ebuild
deleted file mode 100644
index e795c5e53887..000000000000
--- a/net-analyzer/openvas-libraries/openvas-libraries-7.0.5.ebuild
+++ /dev/null
@@ -1,56 +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-libraries/openvas-libraries-7.0.5.ebuild,v 1.1 2014/11/04 12:26:08 jlec Exp $
-
-EAPI=5
-
-inherit cmake-utils
-
-DL_ID=1787
-
-DESCRIPTION="A remote security scanner for Linux (openvas-libraries)"
-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="ldap"
-
-RDEPEND="
-	>=dev-libs/glib-2.12
-	=net-libs/gnutls-2*
-	net-libs/libpcap
-	app-crypt/gpgme
-	!net-analyzer/openvas-libnasl
-	net-libs/libssh
-	ldap? (	net-nds/openldap )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	dev-util/cmake"
-
-DOCS="ChangeLog CHANGES README"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.4-libssh.patch
-	"${FILESDIR}"/${PN}-7.0.4-bsdsource.patch
-	"${FILESDIR}"/${PN}-7.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_use_build ldap WITH_LDAP)
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-analyzer/openvas-libraries/openvas-libraries-7.0.6.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-7.0.6.ebuild
index 8c8b06613123..71a47ad59c38 100644
--- a/net-analyzer/openvas-libraries/openvas-libraries-7.0.6.ebuild
+++ b/net-analyzer/openvas-libraries/openvas-libraries-7.0.6.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-libraries/openvas-libraries-7.0.6.ebuild,v 1.2 2015/01/25 16:36:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/openvas-libraries-7.0.6.ebuild,v 1.3 2015/02/14 14:20:14 jlec Exp $
 
 EAPI=5
 
@@ -18,18 +18,18 @@ KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="ldap"
 
 RDEPEND="
+	app-crypt/gpgme
 	>=dev-libs/glib-2.12
+	!net-analyzer/openvas-libnasl
 	=net-libs/gnutls-2*
 	net-libs/libpcap
-	app-crypt/gpgme
-	!net-analyzer/openvas-libnasl
 	net-libs/libssh
 	ldap? (	net-nds/openldap )"
 DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
-	dev-util/cmake"
+	"
 
 DOCS="ChangeLog CHANGES README"
 
diff --git a/net-analyzer/openvas-libraries/openvas-libraries-7.0.7.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-7.0.7.ebuild
index 77b1a4c381dc..608f476881f5 100644
--- a/net-analyzer/openvas-libraries/openvas-libraries-7.0.7.ebuild
+++ b/net-analyzer/openvas-libraries/openvas-libraries-7.0.7.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-libraries/openvas-libraries-7.0.7.ebuild,v 1.1 2015/02/03 08:52:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/openvas-libraries-7.0.7.ebuild,v 1.2 2015/02/14 14:20:14 jlec Exp $
 
 EAPI=5
 
@@ -18,18 +18,18 @@ KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="ldap"
 
 RDEPEND="
+	app-crypt/gpgme
 	>=dev-libs/glib-2.12
 	=net-libs/gnutls-2*
-	net-libs/libpcap
-	app-crypt/gpgme
 	!net-analyzer/openvas-libnasl
+	net-libs/libpcap
 	net-libs/libssh
 	ldap? (	net-nds/openldap )"
 DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
-	dev-util/cmake"
+	"
 
 DOCS="ChangeLog CHANGES README"
 
diff --git a/net-analyzer/openvas-libraries/openvas-libraries-8.0_beta3.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-8.0_beta3.ebuild
deleted file mode 100644
index 4bd70632b6b3..000000000000
--- a/net-analyzer/openvas-libraries/openvas-libraries-8.0_beta3.ebuild
+++ /dev/null
@@ -1,59 +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-libraries/openvas-libraries-8.0_beta3.ebuild,v 1.2 2014/10/22 23:12:00 jer Exp $
-
-EAPI=5
-
-inherit cmake-utils
-
-DL_ID=1763
-
-DESCRIPTION="A remote security scanner for Linux (openvas-libraries)"
-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="ldap"
-
-RDEPEND="
-	>=dev-libs/glib-2.16
-	>=dev-libs/hiredis-0.10.1
-	=net-libs/gnutls-2*
-	net-libs/libpcap
-	app-crypt/gpgme
-	!net-analyzer/openvas-libnasl
-	>=net-libs/libssh-0.5.0
-	ldap? (	net-nds/openldap )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	dev-util/cmake"
-
-S="${WORKDIR}"/${P/_beta/+beta}
-
-DOCS=( ChangeLog CHANGES README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.4-libssh.patch
-	"${FILESDIR}"/${PN}-7.0.4-bsdsource.patch
-	"${FILESDIR}"/${P}-underlinking.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_use_build ldap WITH_LDAP)
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-analyzer/openvas-libraries/openvas-libraries-8.0_beta4.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-8.0_beta4.ebuild
deleted file mode 100644
index ec1d209161f8..000000000000
--- a/net-analyzer/openvas-libraries/openvas-libraries-8.0_beta4.ebuild
+++ /dev/null
@@ -1,58 +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-libraries/openvas-libraries-8.0_beta4.ebuild,v 1.1 2014/12/01 16:38:03 jlec Exp $
-
-EAPI=5
-
-inherit cmake-utils
-
-DL_ID=1807
-
-DESCRIPTION="A remote security scanner for Linux (openvas-libraries)"
-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="ldap"
-
-RDEPEND="
-	>=dev-libs/glib-2.16
-	>=dev-libs/hiredis-0.10.1
-	=net-libs/gnutls-2*
-	net-libs/libpcap
-	app-crypt/gpgme
-	!net-analyzer/openvas-libnasl
-	>=net-libs/libssh-0.5.0
-	ldap? (	net-nds/openldap )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	dev-util/cmake"
-
-S="${WORKDIR}"/${P/_beta/+beta}
-
-DOCS=( ChangeLog CHANGES README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.4-libssh.patch
-	"${FILESDIR}"/${PN}-8.0_beta3-underlinking.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_use_build ldap WITH_LDAP)
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-analyzer/openvas-libraries/openvas-libraries-8.0_beta5.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-8.0_beta5.ebuild
index 4cdd5957a9e7..7b07dfeb7345 100644
--- a/net-analyzer/openvas-libraries/openvas-libraries-8.0_beta5.ebuild
+++ b/net-analyzer/openvas-libraries/openvas-libraries-8.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-libraries/openvas-libraries-8.0_beta5.ebuild,v 1.1 2015/02/03 08:52:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/openvas-libraries-8.0_beta5.ebuild,v 1.2 2015/02/14 14:20:14 jlec Exp $
 
 EAPI=5
 
@@ -22,17 +22,17 @@ RDEPEND="
 	>=dev-libs/glib-2.16
 	>=dev-libs/hiredis-0.10.1
 	dev-libs/libksba
+	!net-analyzer/openvas-libnasl
 	=net-libs/gnutls-2*
 	net-libs/libpcap
-	net-analyzer/net-snmp
-	!net-analyzer/openvas-libnasl
 	>=net-libs/libssh-0.5.0
+	net-analyzer/net-snmp
 	ldap? (	net-nds/openldap )"
 DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
-	dev-util/cmake"
+	"
 
 S="${WORKDIR}"/${P/_beta/+beta}