diff --git a/net-analyzer/openvas-administrator/Manifest b/net-analyzer/openvas-administrator/Manifest
deleted file mode 100644
index 7c47c4725..000000000
--- a/net-analyzer/openvas-administrator/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX openvasad 1007 RMD160 0a064a9a26807a9aa10c515b27be0e10c0d1fb60 SHA1 a793b7e0e34e37bb726cdab970c513239450f2db SHA256 8cd0431df92d3e31b7f2940cf49bf921d0f0cb9304fca71af3d7eac879ccf581
-DIST openvas-administrator-1.1.1.tar.gz 133542 RMD160 c4c55978086e88bb3e35bd4e73c46711029bb4b8 SHA1 cbfa2374d7020e0247ef071c850a8d450ad2500c SHA256 cddf5f55e97125d9220f407a2050714da967a6695a54441daab56e20e2334089
-EBUILD openvas-administrator-1.1.1-r1.ebuild 879 RMD160 53e95b72ed2645e4c681ae4b3b334a132448970f SHA1 6f68ae2b225ec9d0f61db8aae89d5b52f9d3ffd4 SHA256 7e9501ae96043abfb9ec4eb007c1db12dd06dfb3a732705abad29d1b0485770f
diff --git a/net-analyzer/openvas-administrator/files/openvasad b/net-analyzer/openvas-administrator/files/openvasad
deleted file mode 100644
index ee2c5118b..000000000
--- a/net-analyzer/openvas-administrator/files/openvasad
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: 
-
-depend() {
-	need net openvassd
-}
-sanity_test() {
-	if [ -z "${OPENVAS_USER}" ] ; then
-		eerror "OPENVAS_USER is empty"
-		return 1
-	fi
-	if [ "${OPENVAS_USER}" != 'root' ] ; then
-		chown -R ${OPENVAS_USER}:${OPENVAS_GROUP} /var/cache/openvas/ /var/lib/openvas/ /var/log/openvas/
-		chgrp -R ${OPENVAS_USER} /etc/openvas/ /var/lib/openvas/ /usr/share/openvas/openvasmd/global_report_formats/
-		chmod -R g+rX /etc/openvas/ /var/lib/openvas/
-	fi
-}
-
-start() {
-	source /etc/conf.d/openvassd
-	ebegin "Starting openvasad (OpenVAS administrator) as user ${OPENVAS_USER}"
-	sanity_test || return 1
-	start-stop-daemon --start --name openvasad --chuid ${OPENVAS_USER} --exec /usr/sbin/openvasad \
-		--pidfile /var/run/openvas/openvasad.pid
-	eend $?
-}
-
-stop() {
-	ebegin "Stop openvasmd"
-	start-stop-daemon --stop --name openvasad \
-		--pidfile /var/run/openvas/openvasad.pid
-	eend $?
-}
diff --git a/net-analyzer/openvas-administrator/openvas-administrator-1.1.1-r1.ebuild b/net-analyzer/openvas-administrator/openvas-administrator-1.1.1-r1.ebuild
deleted file mode 100644
index 4ec4686e0..000000000
--- a/net-analyzer/openvas-administrator/openvas-administrator-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit cmake-utils
-
-DESCRIPTION="A remote security scanner for Linux (openvas-administrator)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/853/${P}.tar.gz"
-
-SLOT="4"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="app-crypt/gpgme
-	>=dev-libs/glib-2
-	net-libs/gnutls
-	net-libs/libpcap
-	net-analyzer/openvas-libraries:4"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-CMAKE_BUILD_DIR="${S}"
-
-src_configure() {
-	mycmakeargs=(-DLOCALSTATEDIR=/var -DSYSCONFDIR=/etc)
-	cmake-utils_src_configure || die
-}
-
-src_compile() {
-	mycmakeargs=(-DLOCALSTATEDIR=/var -DSYSCONFDIR=/etc)
-	cmake-utils_src_compile || die
-}
-
-src_install() {
-	cmake-utils_src_install || die
-	doinitd "${FILESDIR}"/openvasad || die
-}
diff --git a/net-analyzer/openvas-cli/Manifest b/net-analyzer/openvas-cli/Manifest
deleted file mode 100644
index 103342bdf..000000000
--- a/net-analyzer/openvas-cli/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST openvas-cli-1.1.2.tar.gz 56803 RMD160 6de1095d278fb46e6d7858c8a8522c2a4abd9f46 SHA1 2784cffa7c060d2d1d20ce2fbff911720a4c3a4a SHA256 1a54dc8709f02f46b15a479e7d8ad077c7fee2816e7a5044bd250fa2097c6bd3
-EBUILD openvas-cli-1.1.2.ebuild 507 RMD160 5b73738956de785521489e69d5434e5632d32d65 SHA1 924a7a6a9fb6c5148d4f6eed64683c98325801e3 SHA256 6285879230efe88ddf8a32df6f2e07ecda91a50c314b2eb2fb4cdee7916b2798
diff --git a/net-analyzer/openvas-cli/openvas-cli-1.1.2.ebuild b/net-analyzer/openvas-cli/openvas-cli-1.1.2.ebuild
deleted file mode 100644
index 108a30089..000000000
--- a/net-analyzer/openvas-cli/openvas-cli-1.1.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit cmake-utils
-
-DESCRIPTION="A remote security scanner for Linux"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/851/${P}.tar.gz"
-
-SLOT="4"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.0
-	>=app-crypt/gpgme-1.1.2
-	net-libs/gnutls
-	net-analyzer/openvas-libraries:4"
-DEPEND="${RDEPEND}
-	dev-util/cmake"
diff --git a/net-analyzer/openvas-gsa/Manifest b/net-analyzer/openvas-gsa/Manifest
deleted file mode 100644
index 9dcadfc7a..000000000
--- a/net-analyzer/openvas-gsa/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX openvas-gsa 969 RMD160 181aec6342bc8f0c8d0efd01aca50aae69ebb4e7 SHA1 ac20ba222164507c7039117d24b88bd37be055d4 SHA256 c0ad03392736f645988f8e75bb33622336aadc2d98624b4b370609c7d5efedd3
-DIST greenbone-security-assistant-2.0.1.tar.gz 351124 RMD160 f4cd7a4de6ecd1532840c589e10353e1aae4cf66 SHA1 46cc76df30e52700075796df31691c270d5f4564 SHA256 ac7e3ea6107cb15093467d2b7acea27927289fdc4c486343bf0c6a13e79f92fd
-EBUILD openvas-gsa-2.0.1-r1.ebuild 1318 RMD160 3aa280221c530512e3f6d06fdb7610ea3780605f SHA1 78aa8f897a5acfd161444a2650a96a2b3e4d8378 SHA256 8ee4d79e6efea8267ad2dba0a3acb5da7a6513310f08a151d1ea908a874bc46d
diff --git a/net-analyzer/openvas-gsa/files/openvas-gsa b/net-analyzer/openvas-gsa/files/openvas-gsa
deleted file mode 100755
index f66ea23cf..000000000
--- a/net-analyzer/openvas-gsa/files/openvas-gsa
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: 
-
-depend() {
-	need net
-}
-
-sanity_test() {
-	if [ -z "${OPENVAS_USER}" ] ; then
-		eerror "OPENVAS_USER is empty"
-		return 1
-	fi
-	if [ "$OPENVAS_USER" != 'root' ] ; then
-		chown -R $OPENVAS_USER:$OPENVAS_GROUP /var/cache/openvas/ /var/lib/openvas/ /var/log/openvas/
-		chgrp -R $OPENVAS_USER /etc/openvas/ /var/lib/openvas/ /usr/share/openvas/openvasmd/global_report_formats/
-		chmod -R g+rX /etc/openvas/ /var/lib/openvas/
-	fi
-}
-
-start() {
-	source /etc/conf.d/openvassd
-	ebegin "Starting gsad as user ${OPENVAS_USER}"
-	sanity_test || return 1
-	export PATH="$PATH:/usr/sbin"
-	start-stop-daemon --start --name gsad --chuid "${OPENVAS_USER}" --exec /usr/sbin/gsad \
-		--pidfile /var/run/openvas/gsad.pid
-	eend $?
-}
-
-stop() {
-	ebegin "Stop openvassd"
-	start-stop-daemon --stop --name gsad \
-		--pidfile /var/run/openvas/gsad.pid
-	eend $?
-}
diff --git a/net-analyzer/openvas-gsa/openvas-gsa-2.0.1-r1.ebuild b/net-analyzer/openvas-gsa/openvas-gsa-2.0.1-r1.ebuild
deleted file mode 100644
index 2ddccc4f8..000000000
--- a/net-analyzer/openvas-gsa/openvas-gsa-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit cmake-utils versionator
-
-DESCRIPTION="A remote security scanner for Linux (GSA)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/857/greenbone-security-assistant-${PV}.tar.gz"
-SLOT="4"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+administrator doc"
-
-RDEPEND=">=dev-libs/glib-2.14
-	dev-libs/libxml2
-	dev-libs/libxslt
-	net-libs/gnutls
-	net-analyzer/openvas-libraries:4
-	>=net-libs/libmicrohttpd-0.4.2"
-DEPEND="${RDEPEND}
-	net-analyzer/openvas-manager:4
-	administrator? ( net-analyzer/openvas-administrator:4 )
-	doc? ( app-doc/doxygen )"
-
-#MY_S=greenbone-security-assistant-"$(replace_version_separator 2 '+')"
-S="$WORKDIR/greenbone-security-assistant-${PV}"
-
-CMAKE_BUILD_DIR="${S}"
-
-src_configure() {
-	mycmakeargs=(-DLOCALSTATEDIR=/var -DSYSCONFDIR=/etc)
-	cmake-utils_src_configure || die
-}
-
-src_compile() {
-	mycmakeargs=(-DLOCALSTATEDIR=/var -DSYSCONFDIR=/etc)
-	cmake-utils_src_compile || die
-	if use doc ; then
-			emake doc || die
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install || die
-	if use doc ; then
-		dodoc "${S}"/doc/generated/html/* || die
-		dodoc "${S}"/doc/generated/latex/* || die
-	fi
-	doinitd "${FILESDIR}/openvas-gsa" || die
-}
diff --git a/net-analyzer/openvas-gsd/Manifest b/net-analyzer/openvas-gsd/Manifest
deleted file mode 100644
index 89751c2bc..000000000
--- a/net-analyzer/openvas-gsd/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST gsd-1.2.0.tar.gz 663457 RMD160 267ff506ac37abed00a041f67983646cb18bfa97 SHA1 3a1562a311e895e3676c059d0ee93a5ee05576b4 SHA256 8d85c6a8e805bbf9a599c3fe94b16261f44156e15923b1ca6ee734789944813a
-EBUILD openvas-gsd-1.2.0.ebuild 906 RMD160 7347325b011204404668fcc95110cce306c245a2 SHA1 4ea3a1efa972c6404babc9ca8bcbe7ca969da936 SHA256 43388f0b62157f9a47a19ba13a7f16f05b75a473684942b399353b53dc16f660
diff --git a/net-analyzer/openvas-gsd/openvas-gsd-1.2.0.ebuild b/net-analyzer/openvas-gsd/openvas-gsd-1.2.0.ebuild
deleted file mode 100644
index 707f139ba..000000000
--- a/net-analyzer/openvas-gsd/openvas-gsd-1.2.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit cmake-utils
-
-DESCRIPTION="A remote security scanner for Linux GSD"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/861/gsd-${PV}.tar.gz"
-
-SLOT="4"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/glib-2
-	net-libs/gnutls
-	net-analyzer/openvas-libraries:4
-	x11-libs/qt-core:4
-	x11-libs/qt-webkit"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-S="$WORKDIR/gsd-${PV}"
-
-CMAKE_BUILD_DIR="${S}"
-
-src_prepare() {
-	if ! use doc ; then
-		sed -i 's/FATAL_ERROR/WARNING/' doc/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(-DLOCALSTATEDIR=/var -DSYSCONFDIR=/etc)
-	cmake-utils_src_configure || die
-}
-
-src_compile() {
-	mycmakeargs=(-DLOCALSTATEDIR=/var -DSYSCONFDIR=/etc)
-	cmake-utils_src_compile || die
-}
diff --git a/net-analyzer/openvas-libraries/Manifest b/net-analyzer/openvas-libraries/Manifest
deleted file mode 100644
index bf490f9fe..000000000
--- a/net-analyzer/openvas-libraries/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gpgme-include.patch 2483 RMD160 52e4946f2c98129fdfb6efbf3a486b92327921cf SHA1 217f7fd48b8747f62e2a42d28736adc5c7002781 SHA256 f5de1083f18ccd33ee74da3a7f45bad302b259ac8c875d091ecf9686bcf7f24a
-DIST openvas-libraries-4.0.5.tar.gz 664966 RMD160 2f508f55c7f9b2d4ceb41add63c27ab3658957de SHA1 3dad9907800a0cbfbe4229be41ad124f1a56c085 SHA256 88bfe25bd5d255327fc6b61378b599c0caeec9cbb106b8dff5bce07bb65d727b
-EBUILD openvas-libraries-4.0.5.ebuild 2181 RMD160 f41bcee67a927b3cda30ed6c5164fbb6eb25d1cd SHA1 3cdee7ce5f34023ea920335234378da2610ad8cc SHA256 ca94eef68641eae2e1e0ce00341df791fb18e80114359e1e2997e6540f8f2a32
-EBUILD openvas-libraries-9999.ebuild 883 RMD160 2d0485c4aac455f37b19efbc10bd8e640eb69434 SHA1 a9b69d5077e4cab1e2fe5a54c5959af203a955bc SHA256 b17ac0196cf50a011794b38a81e2506e1465411984d7163d7f2e023e41ba9544
diff --git a/net-analyzer/openvas-libraries/files/gpgme-include.patch b/net-analyzer/openvas-libraries/files/gpgme-include.patch
deleted file mode 100644
index 7c485dc30..000000000
--- a/net-analyzer/openvas-libraries/files/gpgme-include.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- old_openvas-libraries-3.0.4/nasl/CMakeLists.txt	2010-02-15 14:19:12.000000000 +0100
-+++ old_openvas-libraries-3.0.4/nasl/CMakeLists.txt	2010-03-21 12:19:50.000000000 +0100
-@@ -125,6 +125,9 @@ 
- exec_program (pkg-config
-               ARGS --cflags glib-2.0
-               OUTPUT_VARIABLE GLIB_CFLAGS)
-+exec_program (gpgme-config
-+              ARGS --cflags
-+              OUTPUT_VARIABLE GPGME_CFLAGS)
- 
- ## Library
- 
-@@ -171,7 +174,7 @@ 
- 
- add_library (openvas_nasl_static STATIC ${FILES})
- 
--set_target_properties (openvas_nasl_static PROPERTIES COMPILE_FLAGS "${GLIB_CFLAGS} ${WMI_LIBS}")
-+set_target_properties (openvas_nasl_static PROPERTIES COMPILE_FLAGS "${GLIB_CFLAGS} ${WMI_LIBS} ${GPGME_CFLAGS}")
- set_target_properties (openvas_nasl_static PROPERTIES OUTPUT_NAME "openvas_nasl")
- set_target_properties (openvas_nasl_static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
- target_link_libraries (openvas_nasl_static libopenvas_base libopenvas_misc
-@@ -179,7 +182,7 @@ 
- 			gpg-error gnutls pcap resolv)
- 
- add_library (openvas_nasl_shared SHARED ${FILES})
--set_target_properties (openvas_nasl_shared PROPERTIES COMPILE_FLAGS "${GLIB_CFLAGS} ${WMI_LIBS}")
-+set_target_properties (openvas_nasl_shared PROPERTIES COMPILE_FLAGS "${GLIB_CFLAGS} ${WMI_LIBS} ${GPGME_CFLAGS}")
- set_target_properties (openvas_nasl_shared PROPERTIES OUTPUT_NAME "openvas_nasl")
- set_target_properties (openvas_nasl_shared PROPERTIES CLEAN_DIRECT_OUTPUT 1)
- set_target_properties (openvas_nasl_shared PROPERTIES SOVERSION "${CPACK_PACKAGE_VERSION_MAJOR}")
-@@ -194,6 +197,12 @@ 
- exec_program (pkg-config
-               ARGS --libs glib-2.0
-               OUTPUT_VARIABLE GLIB_LDFLAGS)
-+exec_program (gpgme-config
-+              ARGS --cflags
-+              OUTPUT_VARIABLE GPGME_CFLAGS)
-+exec_program (gpgme-config
-+              ARGS --libs
-+              OUTPUT_VARIABLE GPGME_LDFLAGS)
- 
- # Add ("import") static libs from Make based subprojects of openvas-libraries
- add_library (libopenvas_base SHARED IMPORTED)
-@@ -212,9 +221,9 @@ 
-                        libopenvas_hg ${GLIB_LDFLAGS} -lgcrypt -lgpgme
-                        -lgpg-error -lgnutls -lpcap -lresolv)
- set_target_properties (openvas-nasl PROPERTIES COMPILE_FLAGS
--                       ${GLIB_CFLAGS})
-+                       "${GLIB_CFLAGS} ${GPGME_CFLAGS}")
- set_target_properties (openvas-nasl PROPERTIES LINK_FLAGS
--                       ${GLIB_LDFLAGS})
-+                       "${GLIB_LDFLAGS} ${GPGME_LDFLAGS}")
- 
- ## Install
- 
-
diff --git a/net-analyzer/openvas-libraries/openvas-libraries-4.0.5.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-4.0.5.ebuild
deleted file mode 100644
index 9d4275401..000000000
--- a/net-analyzer/openvas-libraries/openvas-libraries-4.0.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit cmake-utils eutils
-
-DESCRIPTION="A remote security scanner for Linux"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/872/${P}.tar.gz"
-
-SLOT="4"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc restricted"
-
-RDEPEND=">=app-crypt/gpgme-1.1.2
-	>=dev-libs/glib-2.12
-	dev-libs/libgcrypt
-	>=net-libs/gnutls-2.0
-	net-libs/libpcap
-	!net-analyzer/openvas-libnasl
-	sys-apps/util-linux" #for libuuid
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( app-doc/doxygen )"
-
-#nasl_grammar.y is generated in source but cmake build in ${S}_build
-CMAKE_BUILD_DIR="${S}"
-pkg_setup() {
-	if use restricted ; then
-		einfo "Creating openvas user"
-		enewgroup openvas || die
-		enewuser openvas -1 -1 /var/lib/openvas/ openvas || die
-	fi
-}
-
-src_prepare() {
-#	epatch "${FILESDIR}"/${P}_cmake.patch
-	sed -i 's/\/run/\/run\/openvas\//g' CMakeLists.txt || die
-}
-
-src_configure() {
-# localstatedir redefined to /var because openvas install all stuff in $localstatedir/lib/openvas
-# letting localstatedir to /var/lib goes to stuff installed in /var/lib/lib/openvas
-# openvas-librries-4 does the same but in /usr/var
-	mycmakeargs=(-DLOCALSTATEDIR=/var \
-	-DSYSCONFDIR=/etc \
-	-DOPENVAS_PID_DIR=/var/run/openvas/)
-	cmake-utils_src_configure || die
-	#TODO doesnt respect CFLAGS
-}
-
-src_compile() {
-	mycmakeargs=(-DLOCALSTATEDIR=/var \
-	-DSYSCONFDIR=/etc \
-	-DOPENVAS_PID_DIR=/var/run/openvas/)
-	cmake-utils_src_compile  || die
-	if use doc ; then
-		emake doc || die
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install || die
-	if use doc ; then
-		dodoc "${S}"/doc/generated/html/* || die
-		dodoc "${S}"/doc/generated/latex/* || die
-	fi
-	dodir /var/run/openvas/ || die
-	dodir /var/cache/openvas/ || die
-	if use restricted ; then
-		fowners openvas:openvas /var/run/openvas/ || die
-		fowners openvas:openvas /var/cache/openvas || die
-		fowners openvas:openvas /var/lib/openvas/ || die
-		fowners openvas:openvas /var/log/openvas/ || die
-		fowners openvas:openvas /var/cache/openvas/ || die
-		fowners root:openvas /etc/openvas/ || die
-	fi
-}
diff --git a/net-analyzer/openvas-libraries/openvas-libraries-9999.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-9999.ebuild
deleted file mode 100644
index 1fe399a53..000000000
--- a/net-analyzer/openvas-libraries/openvas-libraries-9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit subversion eutils
-
-DESCRIPTION="A remote security scanner for Linux (openvas-libraries)"
-HOMEPAGE="http://www.openvas.org/"
-EAPI="2"
-#SRC_URI="http://wald.intevation.org/frs/download.php/737/${MY_P}.tar.gz"
-ESVN_REPO_URI="https://svn.wald.intevation.org/svn/openvas/trunk/openvas-libraries/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="-*"
-IUSE=""
-
-DEPEND=">=net-libs/gnutls-2.0
-	net-libs/libpcap
-	>=app-crypt/gpgme-1.1.2
-	>=dev-libs/glib-2.12
-	!net-analyzer/openvas-libnasl"
-RDEPEND="${DEPEND}"
-
-#src_prepare() {
-#	#remove this patch after they learn how to include things properly
-#        epatch "${FILESDIR}"/gpgme-include.patch
-#}
-
-src_install() {
-	einstall || die "failed to install"
-	find "${D}" -name '*.la' -delete
-	dodoc ChangeLog CHANGES TODO || die
-}
diff --git a/net-analyzer/openvas-manager/Manifest b/net-analyzer/openvas-manager/Manifest
deleted file mode 100644
index 5b283e2f6..000000000
--- a/net-analyzer/openvas-manager/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX openvasmd 1096 RMD160 a4a41f24497c93e97cf716a3d98f8d197a9a3527 SHA1 660d63221e71aeb924f0631707fab16f2abf355a SHA256 d20246c85d7078627d6204d881e202a683e8698d7b836ed8ece059745c3e05de
-DIST openvas-manager-2.0.4.tar.gz 1064257 RMD160 a3220c6d3facf170abb391c36efd4fff9d76792b SHA1 46d0ad6275bc91ff9081c058147f85700ee17f43 SHA256 553c44860d111c1fb0544aa7204704b331d851d1fa982c982052c08e52cbd041
-EBUILD openvas-manager-2.0.4-r1.ebuild 1377 RMD160 a66dd11df40e1cfd50c99f7e672df975a4eebb58 SHA1 afc8a63b915d6f16fda40a0ea8252a0752099047 SHA256 66d9e2a925554c4592a803ea92118bfcb6f27b398596db3bbc9b86d2bf01d823
diff --git a/net-analyzer/openvas-manager/files/openvasmd b/net-analyzer/openvas-manager/files/openvasmd
deleted file mode 100644
index 00c5ba7c5..000000000
--- a/net-analyzer/openvas-manager/files/openvasmd
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: 
-
-depend() {
-	need net openvassd
-}
-
-sanity_test() {
-	if [ -z "${OPENVAS_USER}" ] ; then
-		eerror "OPENVAS_USER is empty"
-		return 1
-	fi
-	if [ ! -s "/var/lib/openvas/mgr/tasks.db" ]; then
-		eerror "Manager database (/var/lib/openvas/mgr/tasks.db) is empty or not found"
-		return 1
-	fi
-	#TODO use user set in confd
-	chown -R openvas:openvas /var/cache/openvas/ /var/lib/openvas/ /var/log/openvas/
-	chgrp -R openvas /etc/openvas/ /var/lib/openvas/ /usr/share/openvas/openvasmd/global_report_formats/
-	chmod -R g+rX /etc/openvas/ /var/lib/openvas/
-}
-
-start() {
-	source /etc/conf.d/openvassd
-	ebegin "Starting openvasmd (manager) as user ${OPENVAS_USER}"
-	sanity_test || return 1
-	start-stop-daemon --start --name openvasmd --chuid ${OPENVAS_USER} --exec /usr/sbin/openvasmd \
-		--pidfile /var/run/openvas/openvasmd.pid
-	eend $?
-}
-
-stop() {
-	ebegin "Stop openvasmd"
-	start-stop-daemon --stop --name openvasmd \
-		--pidfile /var/run/openvas/openvasmd.pid
-	eend $?
-}
diff --git a/net-analyzer/openvas-manager/openvas-manager-2.0.4-r1.ebuild b/net-analyzer/openvas-manager/openvas-manager-2.0.4-r1.ebuild
deleted file mode 100644
index 4a6eabf2c..000000000
--- a/net-analyzer/openvas-manager/openvas-manager-2.0.4-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit cmake-utils eutils
-
-DESCRIPTION="A remote security scanner for Linux (openvas-manager)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/871/${P}.tar.gz"
-
-SLOT="4"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="pdf doc"
-
-RDEPEND="app-crypt/gpgme
-	>=dev-db/sqlite-3
-	>=dev-libs/glib-2
-	net-libs/gnutls
-	>=dev-db/sqlite-3.0
-	net-libs/libpcap
-	net-analyzer/openvas-libraries:4
-	pdf? ( dev-texlive/texlive-latexextra )
-	"
-#	dev-tex/latex2html
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-CMAKE_BUILD_DIR="${S}"
-
-src_configure() {
-	mycmakeargs=(-DLOCALSTATEDIR=/var -DSYSCONFDIR=/etc)
-	cmake-utils_src_configure || die
-}
-
-src_compile() {
-	mycmakeargs=(-DLOCALSTATEDIR=/var -DSYSCONFDIR=/etc)
-	cmake-utils_src_compile || die
-}
-
-src_install() {
-	cmake-utils_src_install || die
-	doinitd "${FILESDIR}"/openvasmd || die
-}
-
-pkg_postinst() {
-	einfo "Dont forget to openvas-mkcert-client -n om -i"
-	einfo "Or simply openvas-mkcert-client and create yourself user om"
-	if [ -e /var/lib/openvas/mgr/tasks.db ] ; then
-		einfo "You have already a manager database, please run openvasmd --update"
-	fi
-	#be sure that this is readable
-	fowners -R root:openvas /usr/share/openvas/openvasmd/global_report_formats/ || die
-}
diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest
deleted file mode 100644
index e36a7b909..000000000
--- a/net-analyzer/openvas-scanner/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX openvassd 1042 RMD160 0562b3cb36b66acbdd4d5ecd41cb47e696449e1c SHA1 72c0e29403b52825dd8c4a462595b47517103b68 SHA256 71e3977b28cc409c8551de38521e7e102145ab13aae562bd2b88198a11c7cf9a
-AUX openvassd.conf 2956 RMD160 355df449b39753467ed4a090ac4aafbf13d2c07f SHA1 43e26cefe08acd4c2ed0f62a87ef187171cb2b19 SHA256 41a35301d681a04da6d996eba72f2d594300461a4425d1cecac44e014144f05f
-AUX openvassd.confd 132 RMD160 d26d763e744c51b522a1dec0ae32b368b4cf65f2 SHA1 6572df4fc57c8c79afbdfe75a276abb9276a4615 SHA256 07474a6c6a5e1f0425f025c9293999572ddfa25f638a7d6ff4bc775399cbb667
-DIST openvas-scanner-3.2.4.tar.gz 228199 RMD160 652f13c8997efb83b561da4a5349a01d767d0fb6 SHA1 78fcaf15d8c6e83e93bccfd17f911a7ff6b8fe1a SHA256 ac26e085476709183c8512a1fecdcd4ca242c44572892e2ab0ea7ea2da78351c
-EBUILD openvas-scanner-3.2.4-r1.ebuild 1467 RMD160 8b8b861439f27b9dee5589cbd0618a2b12788ad5 SHA1 62b0141c72ba8bf1792b26a02277ca66f6bb476a SHA256 3ee43868b4a1c68b5e4c930305b6d237eb4c42cb55bb312aa88d379fec3919cc
diff --git a/net-analyzer/openvas-scanner/files/openvassd b/net-analyzer/openvas-scanner/files/openvassd
deleted file mode 100644
index cb4777d0d..000000000
--- a/net-analyzer/openvas-scanner/files/openvassd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: 
-
-depend() {
-	need net
-}
-
-sanity_test() {
-	if [ -z "${OPENVAS_USER}" ] ; then
-		eerror "OPENVAS_USER is empty"
-		return 1
-	fi
-	if [ $OPENVAS_USER != 'root' ] ; then
-		chown -R $OPENVAS_USER:$OPENVAS_GROUP /var/cache/openvas/ /var/lib/openvas/ /var/log/openvas/
-		chgrp -R $OPENVAS_USER /etc/openvas/ /var/lib/openvas/ /usr/share/openvas/openvasmd/global_report_formats/
-		chmod -R g+rX /etc/openvas/ /var/lib/openvas/
-	fi
-}
-
-start() {
-	ebegin "Starting openvassd (scanner) as user ${OPENVAS_USER}"
-	sanity_test || return 1
-	#for using sbin tools when running as non root
-	export PATH="$PATH:/sbin:/usr/sbin"
-	start-stop-daemon --start --name openvassd --chuid "${OPENVAS_USER}" --exec /usr/sbin/openvassd \
-		--pidfile /var/run/openvas/openvassd.pid
-	eend $? 
-}
-
-stop() {
-	ebegin "Stop openvassd (scanner)"
-	start-stop-daemon --stop --name openvassd \
-		--pidfile /var/run/openvas/openvassd.pid
-	eend $?
-}
diff --git a/net-analyzer/openvas-scanner/files/openvassd.conf b/net-analyzer/openvas-scanner/files/openvassd.conf
deleted file mode 100644
index 5cc5377bf..000000000
--- a/net-analyzer/openvas-scanner/files/openvassd.conf
+++ /dev/null
@@ -1,103 +0,0 @@
-# Configuration file of the OpenVAS Security Scanner
-
-
-
-# Every line starting with a '#' is a comment
-
-[Misc]
-
-# Path to the security checks folder : 
-plugins_folder = /var/lib/openvas/plugins
-
-# Path to OpenVAS caching folder: 
-cache_folder = /var/cache/openvas/
-
-# Path to OpenVAS include directories: 
-# (multiple entries are separated with colon ':')
-include_folders = /var/lib/openvas/plugins
-
-# Maximum number of simultaneous hosts tested : 
-max_hosts = 30
-
-# Maximum number of simultaneous checks against each host tested : 
-max_checks = 10
-
-# Niceness. If set to 'yes', openvassd will renice itself to 10.
-be_nice = no
-
-# Log file (or 'syslog') : 
-logfile = /var/log/openvas/openvassd.messages
-
-# Shall we log every details of the attack ? (disk intensive)
-log_whole_attack = no
-
-# Log the name of the plugins that are loaded by the server ?
-#log_plugins_name_at_load = no
-
-# Dump file for debugging output, use `-' for stdout
-dumpfile = /var/log/openvas/openvassd.dump
-
-# Rules file : 
-rules = /etc/openvas/openvassd.rules
-
-# CGI paths to check for (cgi-bin:/cgi-aws:/ can do)
-#cgi_path = /cgi-bin:/scripts
-
-# Range of the ports the port scanners will scan : 
-# 'default' means that OpenVAS will scan ports found in its
-# services file.
-port_range = default
-
-# Optimize the test (recommended) : 
-optimize_test = yes
-
-# Optimization : 
-# Read timeout for the sockets of the tests : 
-#checks_read_timeout = 5
-# Ports against which two plugins should not be run simultaneously :
-# non_simult_ports = Services/www, 139, Services/finger
-#non_simult_ports = 139, 445
-# Maximum lifetime of a plugin (in seconds) : 
-#plugins_timeout = 320
-
-# Safe checks rely on banner grabbing :
-safe_checks = yes
-
-# Automatically activate the plugins that are depended on
-auto_enable_dependencies = yes
-
-# Do not echo data from plugins which have been automatically enabled
-#silent_dependencies = no
-
-# Designate hosts by MAC address, not IP address (useful for DHCP networks)
-use_mac_addr = no
-
-#--- Knowledge base saving (can be configured by the client) :
-# Save the knowledge base on disk : 
-#save_knowledge_base = no
-# Restore the KB for each test :
-#kb_restore = no
-# Only test hosts whose KB we do not have :
-#only_test_hosts_whose_kb_we_dont_have = no
-# Only test hosts whose KB we already have :
-#only_test_hosts_whose_kb_we_have = no
-# KB test replay :
-#kb_dont_replay_scanners = no
-#kb_dont_replay_info_gathering = no
-#kb_dont_replay_attacks = no
-#kb_dont_replay_denials = no
-#kb_max_age = 864000
-#--- end of the KB section
-
-
-
-# If this option is set, OpenVAS will not scan a network incrementally
-# (10.0.0.1, then 10.0.0.2, 10.0.0.3 and so on..) but will attempt to
-# slice the workload throughout the whole network (ie: it will scan
-# 10.0.0.1, then 10.0.0.127, then 10.0.0.2, then 10.0.0.128 and so on...
-#slice_network_addresses = no
-
-# Should consider all the NASL scripts as being signed ? (unsafe if set to 'yes')
-nasl_no_signature_check = yes
-
-#end.
diff --git a/net-analyzer/openvas-scanner/files/openvassd.confd b/net-analyzer/openvas-scanner/files/openvassd.confd
deleted file mode 100644
index 0d27b1511..000000000
--- a/net-analyzer/openvas-scanner/files/openvassd.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-# /etc/conf.d/openvassd: config file for /etc/init.d/openvassd
-
-OPENVAS_USER="root"
-OPENVAS_GROUP="root"
-OPENVAS_STRICT_RIGHT="yes"
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-3.2.4-r1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-3.2.4-r1.ebuild
deleted file mode 100644
index 6625e25b3..000000000
--- a/net-analyzer/openvas-scanner/openvas-scanner-3.2.4-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-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/873/${P}.tar.gz"
-SLOT="4"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="restricted"
-
-RDEPEND="app-crypt/gpgme
-	>=dev-libs/glib-2
-	net-libs/gnutls
-	net-libs/libpcap
-	net-analyzer/openvas-libraries:4[restricted]"
-DEPEND="${RDEPEND}"
-
-CMAKE_BUILD_DIR="${S}"
-
-src_configure() {
-	mycmakeargs=(-DLOCALSTATEDIR=/var -DSYSCONFDIR=/etc -DOPENVAS_PID_DIR=/var/run/openvas/)
-	cmake-utils_src_configure || die
-}
-
-#TODO dont respect CFLAGS
-src_compile() {
-	mycmakeargs=(-DLOCALSTATEDIR=/var -DSYSCONFDIR=/etc -DOPENVAS_PID_DIR=/var/run/openvas/)
-	cmake-utils_src_compile  || die
-}
-
-src_install() {
-	cmake-utils_src_install || die
-	insinto /etc/openvas
-	doins "${FILESDIR}"/openvassd.conf || die
-	dodoc README ChangeLog || die
-	doinitd "${FILESDIR}"/openvassd || die
-	newconfd "${FILESDIR}"/openvassd.confd openvassd || die
-	if use restricted ; then
-		fowners root:openvas /etc/openvas/openvassd.conf || die
-		sed -i 's/root/openvas/' "${D}"/etc/conf.d/openvassd || die
-	fi
-}
-
-pkg_postinst() {
-	einfo "1. Call 'openvas-nvt-sync' to download/update plugins"
-	einfo "2. Call 'openvas-mkcert' to generate server certificate"
-	einfo "3. Call 'openvas-adduser' to create a user"
-}
diff --git a/net-analyzer/openvas/Manifest b/net-analyzer/openvas/Manifest
deleted file mode 100644
index 7d6f6e71a..000000000
--- a/net-analyzer/openvas/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-EBUILD openvas-4.0.0-r1.ebuild 1225 RMD160 5d89f72fc5ad0b7aca477f53671918082dd137e7 SHA1 d12a8f5ebd915eb4cdbb08b209279857bbc5fc4f SHA256 a21b416f6da39e37bae4784afe1c5061ec400062a7cd4bd07027c5934babbb25
diff --git a/net-analyzer/openvas/openvas-4.0.0-r1.ebuild b/net-analyzer/openvas/openvas-4.0.0-r1.ebuild
deleted file mode 100644
index fc5658d43..000000000
--- a/net-analyzer/openvas/openvas-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-DESCRIPTION="A remote security scanner"
-HOMEPAGE="http://www.openvas.org/"
-SLOT="4"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="cli qt webgui"
-
-DEPEND=""
-
-RDEPEND="net-analyzer/openvas-scanner:4
-	cli?    ( net-analyzer/openvas-cli:4 )
-	qt?     ( net-analyzer/openvas-gsd:4 )
-	webgui? ( net-analyzer/openvas-gsa:4
-		net-analyzer/openvas-manager:4 )
-	!net-analyzer/openvas-client
-	!net-analyzer/openvas-libnasl
-	!net-analyzer/openvas-plugins"
-
-pkg_postinst() {
-	elog "1. Call 'openvas-nvt-sync' to download/update plugins"
-	elog "2. Call 'openvas-mkcert' to generate server certificate"
-	elog "3. Call 'openvas-adduser' to create a user"
-	elog "4. Call 'openvasad -c 'add_user' -n <youname>  -r Admin' to create a user using openvas-administrator"
-	elog "5. Call 'openvas-mkcert-client -n om -i' to generate a client certificate"
-	elog "6. Run  '/etc/init.d/openvassd start' "
-	elog "7. Run  'touch /var/lib/openvas/mgr/tasks.db' file"
-	elog "8. Call 'openvasmd --rebuild' to create OpenVAS Manager database"
-	elog "9. Run '/etc/init.d/openvas-gsa start' "
-	elog "0. Go to 'https://localhost' "
-}