Bump, remove old

(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)

18 files changed, 18 insertions, 595 deletions

diff --git a/net-analyzer/metasploit/ChangeLog b/net-analyzer/metasploit/ChangeLog
index 3fc6c4e912e4..e7d86bedc223 100644
--- a/net-analyzer/metasploit/ChangeLog
+++ b/net-analyzer/metasploit/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-analyzer/metasploit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.58 2012/01/12 08:14:41 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.59 2012/02/28 08:09:31 patrick Exp $
+
+*metasploit-4.2.0 (28 Feb 2012)
+
+  28 Feb 2012; Patrick Lauer <patrick@gentoo.org> +files/msfrpcd-4.2-conf,
+  +files/msfrpcd-4.2-initd, +metasploit-4.2.0.ebuild, -files/msfrpcd-4.1-conf,
+  -files/msfrpcd-4.1-initd, -files/msfweb3.2.confd, -files/msfweb3.2.initd,
+  -files/msfweb3.3.confd, -files/msfweb3.3.initd, -files/msfweb3.4.confd,
+  -files/msfweb3.4.initd, -files/msfweb3.confd, -files/msfweb3.initd,
+  -metasploit-3.3.3.ebuild, -metasploit-3.4.0.ebuild, -metasploit-3.4.1.ebuild,
+  -metasploit-3.5.0.ebuild, -metasploit-3.6.0.ebuild, -metasploit-3.7.0.ebuild,
+  -metasploit-4.1.4.ebuild:
+  Bump, remove old
 
 *metasploit-4.1.4 (12 Jan 2012)
 
diff --git a/net-analyzer/metasploit/files/msfrpcd-4.1-conf b/net-analyzer/metasploit/files/msfrpcd-4.2-conf
index dc56a9d966a6..dc56a9d966a6 100644
--- a/net-analyzer/metasploit/files/msfrpcd-4.1-conf
+++ b/net-analyzer/metasploit/files/msfrpcd-4.2-conf
diff --git a/net-analyzer/metasploit/files/msfrpcd-4.1-initd b/net-analyzer/metasploit/files/msfrpcd-4.2-initd
index 7527d9c7cf78..400eac9bfe14 100644
--- a/net-analyzer/metasploit/files/msfrpcd-4.1-initd
+++ b/net-analyzer/metasploit/files/msfrpcd-4.2-initd
@@ -1,9 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/files/msfrpcd-4.1-initd,v 1.1 2012/01/12 08:14:41 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/files/msfrpcd-4.2-initd,v 1.1 2012/02/28 08:09:31 patrick Exp $
 
-VERSION=4.0
+VERSION=4.2
 PIDFILE=/var/run/msfrpcd${VERSION}.pid
 
 start() {
diff --git a/net-analyzer/metasploit/files/msfweb3.2.confd b/net-analyzer/metasploit/files/msfweb3.2.confd
deleted file mode 100644
index b0cf87e6dfaf..000000000000
--- a/net-analyzer/metasploit/files/msfweb3.2.confd
+++ /dev/null
@@ -1,10 +0,0 @@
-# Config file for /etc/init.d/metasploit
-
-# Bind to the following IP instead of the loopback address
-IPADDR=127.0.0.1
-
-# Bind to the following TCP port instead of default 55555
-PORT=55555
-
-# All options
-MSF_OPTS="-a $IPADDR -p $PORT"
diff --git a/net-analyzer/metasploit/files/msfweb3.2.initd b/net-analyzer/metasploit/files/msfweb3.2.initd
deleted file mode 100644
index 0618169b8a01..000000000000
--- a/net-analyzer/metasploit/files/msfweb3.2.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/files/msfweb3.2.initd,v 1.1 2009/07/08 09:09:41 pva Exp $
-
-PIDFILE=/var/run/msfweb3.2.pid
-
-start() {
-	ebegin "Starting msfweb3.2"
-	start-stop-daemon --start --quiet --background --startas msfweb3.2 --exec /usr/lib/metasploit3.2/msfweb \
-		--pidfile ${PIDFILE} --make-pidfile -- ${MSF_OPTS}
-	eend $?
-	einfo "Note: msfweb3.2 is started but needs some before it serves clients."
-}
-
-stop() {
-	ebegin "Stopping msfweb"
-	start-stop-daemon --stop --quiet -s 9 --pidfile ${PIDFILE}
-	eend $?
-}
diff --git a/net-analyzer/metasploit/files/msfweb3.3.confd b/net-analyzer/metasploit/files/msfweb3.3.confd
deleted file mode 100644
index b0cf87e6dfaf..000000000000
--- a/net-analyzer/metasploit/files/msfweb3.3.confd
+++ /dev/null
@@ -1,10 +0,0 @@
-# Config file for /etc/init.d/metasploit
-
-# Bind to the following IP instead of the loopback address
-IPADDR=127.0.0.1
-
-# Bind to the following TCP port instead of default 55555
-PORT=55555
-
-# All options
-MSF_OPTS="-a $IPADDR -p $PORT"
diff --git a/net-analyzer/metasploit/files/msfweb3.3.initd b/net-analyzer/metasploit/files/msfweb3.3.initd
deleted file mode 100644
index 430fc65ba7c1..000000000000
--- a/net-analyzer/metasploit/files/msfweb3.3.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/files/msfweb3.3.initd,v 1.1 2010/03/01 12:52:51 patrick Exp $
-
-PIDFILE=/var/run/msfweb3.3.pid
-
-start() {
-	ebegin "Starting msfweb3.3"
-	start-stop-daemon --start --quiet --background --startas msfweb3.3 --exec /usr/lib/metasploit3.3/msfweb \
-		--pidfile ${PIDFILE} --make-pidfile -- ${MSF_OPTS}
-	eend $?
-	einfo "Note: msfweb3.3 is started but needs some before it serves clients."
-}
-
-stop() {
-	ebegin "Stopping msfweb"
-	start-stop-daemon --stop --quiet -s 9 --pidfile ${PIDFILE}
-	eend $?
-}
diff --git a/net-analyzer/metasploit/files/msfweb3.4.confd b/net-analyzer/metasploit/files/msfweb3.4.confd
deleted file mode 100644
index b0cf87e6dfaf..000000000000
--- a/net-analyzer/metasploit/files/msfweb3.4.confd
+++ /dev/null
@@ -1,10 +0,0 @@
-# Config file for /etc/init.d/metasploit
-
-# Bind to the following IP instead of the loopback address
-IPADDR=127.0.0.1
-
-# Bind to the following TCP port instead of default 55555
-PORT=55555
-
-# All options
-MSF_OPTS="-a $IPADDR -p $PORT"
diff --git a/net-analyzer/metasploit/files/msfweb3.4.initd b/net-analyzer/metasploit/files/msfweb3.4.initd
deleted file mode 100644
index 971b13f1e228..000000000000
--- a/net-analyzer/metasploit/files/msfweb3.4.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/files/msfweb3.4.initd,v 1.1 2010/05/19 02:42:03 patrick Exp $
-
-PIDFILE=/var/run/msfweb3.4.pid
-
-start() {
-	ebegin "Starting msfweb3.4"
-	start-stop-daemon --start --quiet --background --startas msfweb3.4 --exec /usr/lib/metasploit3.4/msfweb \
-		--pidfile ${PIDFILE} --make-pidfile -- ${MSF_OPTS}
-	eend $?
-	einfo "Note: msfweb3.4 is started but needs some before it serves clients."
-}
-
-stop() {
-	ebegin "Stopping msfweb"
-	start-stop-daemon --stop --quiet -s 9 --pidfile ${PIDFILE}
-	eend $?
-}
diff --git a/net-analyzer/metasploit/files/msfweb3.confd b/net-analyzer/metasploit/files/msfweb3.confd
deleted file mode 100644
index b0cf87e6dfaf..000000000000
--- a/net-analyzer/metasploit/files/msfweb3.confd
+++ /dev/null
@@ -1,10 +0,0 @@
-# Config file for /etc/init.d/metasploit
-
-# Bind to the following IP instead of the loopback address
-IPADDR=127.0.0.1
-
-# Bind to the following TCP port instead of default 55555
-PORT=55555
-
-# All options
-MSF_OPTS="-a $IPADDR -p $PORT"
diff --git a/net-analyzer/metasploit/files/msfweb3.initd b/net-analyzer/metasploit/files/msfweb3.initd
deleted file mode 100644
index 67cba7696014..000000000000
--- a/net-analyzer/metasploit/files/msfweb3.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/files/msfweb3.initd,v 1.1 2007/09/09 11:56:21 cedk Exp $
-
-PIDFILE=/var/run/msfweb3.pid
-
-start() {
-	ebegin "Starting msfweb3"
-	start-stop-daemon --start --quiet --background --startas /usr/bin/msfweb3 --exec /usr/bin/ruby \
-		--pidfile ${PIDFILE} --make-pidfile -- ${MSF_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping msfweb"
-	start-stop-daemon --stop --quiet -s 9 --pidfile ${PIDFILE}
-	eend $?
-}
diff --git a/net-analyzer/metasploit/metasploit-3.3.3.ebuild b/net-analyzer/metasploit/metasploit-3.3.3.ebuild
deleted file mode 100644
index d3c6c44e79e6..000000000000
--- a/net-analyzer/metasploit/metasploit-3.3.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.3.3.ebuild,v 1.1 2010/03/01 12:52:52 patrick Exp $
-
-SRC_URI="http://www.metasploit.com/releases/framework-${PV}.tar.bz2"
-
-DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
-HOMEPAGE="http://www.metasploit.org/"
-
-LICENSE="BSD"
-SLOT="3.3"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="gtk sqlite postgres"
-
-# Note we use bundled gems (see data/msfweb/vendor/rails/) as upstream voted for
-# such solution, bug #247787
-RDEPEND="dev-lang/ruby
-	dev-ruby/rubygems
-	gtk? ( dev-ruby/ruby-libglade2 )
-	sqlite? ( dev-ruby/sqlite3-ruby
-		 dev-ruby/activerecord )
-	postgres? ( dev-ruby/ruby-postgres
-		dev-ruby/activerecord )"
-DEPEND=""
-
-S=${WORKDIR}/msf3
-
-src_install() {
-	if [[ "${SRC_URI}" != "" ]] ; then
-		# svn sources...
-		find "${S}" -type d -name ".svn" -print0 | xargs -0 -n1 rm -R
-	fi
-
-	# should be as simple as copying everything into the target...
-	dodir /usr/lib/${PN}${SLOT}
-	cp -R "${S}"/* "${D}"/usr/lib/${PN}${SLOT} || die "Copy files failed"
-
-	# do not remove LICENSE, bug #238137
-	dodir /usr/share/doc/${PF}
-	cp -R "${S}"/{documentation,README} "${D}"/usr/share/doc/${PF}
-	rm -Rf "${D}"/usr/lib/${PN}${SLOT}/documentation "${D}"/usr/lib/${PN}${SLOT}/README
-	dosym /usr/share/doc/${PF}/documentation /usr/lib/${PN}${SLOT}/documentation
-
-	dodir /usr/bin/
-	use gtk || rm msfgui
-	for file in msf*; do
-		dosym /usr/lib/${PN}${SLOT}/${file} /usr/bin/${file}${SLOT}
-	done
-
-	chown -R root:0 "${D}"
-
-	newinitd "${FILESDIR}"/msfweb${SLOT}.initd msfweb${SLOT} \
-		|| die "newinitd failed"
-	newconfd "${FILESDIR}"/msfweb${SLOT}.confd msfweb${SLOT} \
-		|| die "newconfd failed"
-}
-
-pkg_postinst() {
-	if [[ "${SRC_URI}" == "" ]] ; then
-		elog "If you wish to update ${PN} manually simply run:"
-		elog
-		elog "ESVN_REVISION=<rev> emerge =${PF}"
-		elog
-		elog "where <rev> is either HEAD (in case you wish to get all updates)"
-		elog "or specific revision number. But NOTE, this update will vanish"
-		elog "next time you reemerge ${PN}. To make update permanent either"
-		elog "create ebuild with specific revision number inside your overlay"
-		elog "or report revision bump bug at http://bugs.gentoo.org ."
-		elog
-		elog "In case you use portage it's also possible to create"
-		elog "/etc/portage/env/${CATEGORY}/${PN} file with ESVN_REVISION=<rev>"
-		elog "content. Then each time you run emerge ${PN} you'll have said"
-		elog "<rev> installed. For example, if you run"
-		elog " # mkdir -p /etc/portage/env/${CATEGORY}"
-		elog " # echo ESVN_REVISION=HEAD >> /etc/portage/env/${CATEGORY}/${PN}"
-		elog "each time you reemerge ${PN} it'll be updated to get all possible"
-		elog "updates for framework-${PV%_p*} branch."
-		elog "You can do similar things in paludis using /etc/paludis/bashrc."
-	fi
-}
diff --git a/net-analyzer/metasploit/metasploit-3.4.0.ebuild b/net-analyzer/metasploit/metasploit-3.4.0.ebuild
deleted file mode 100644
index ac747ff6b7e2..000000000000
--- a/net-analyzer/metasploit/metasploit-3.4.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.4.0.ebuild,v 1.1 2010/05/19 02:42:04 patrick Exp $
-
-SRC_URI="http://www.metasploit.com/releases/framework-${PV}.tar.bz2"
-
-DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
-HOMEPAGE="http://www.metasploit.org/"
-
-LICENSE="BSD"
-SLOT="3.4"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="gtk sqlite postgres"
-
-# Note we use bundled gems (see data/msfweb/vendor/rails/) as upstream voted for
-# such solution, bug #247787
-RDEPEND="dev-lang/ruby
-	dev-ruby/rubygems
-	gtk? ( dev-ruby/ruby-libglade2 )
-	sqlite? ( dev-ruby/sqlite3-ruby
-		 dev-ruby/activerecord )
-	postgres? ( dev-ruby/ruby-postgres
-		dev-ruby/activerecord )"
-DEPEND=""
-
-S=${WORKDIR}/msf3
-
-src_install() {
-	if [[ "${SRC_URI}" != "" ]] ; then
-		# svn sources...
-		find "${S}" -type d -name ".svn" -print0 | xargs -0 -n1 rm -R
-	fi
-
-	# should be as simple as copying everything into the target...
-	dodir /usr/lib/${PN}${SLOT}
-	cp -R "${S}"/* "${D}"/usr/lib/${PN}${SLOT} || die "Copy files failed"
-
-	# do not remove LICENSE, bug #238137
-	dodir /usr/share/doc/${PF}
-	cp -R "${S}"/{documentation,README} "${D}"/usr/share/doc/${PF}
-	rm -Rf "${D}"/usr/lib/${PN}${SLOT}/documentation "${D}"/usr/lib/${PN}${SLOT}/README
-	dosym /usr/share/doc/${PF}/documentation /usr/lib/${PN}${SLOT}/documentation
-
-	dodir /usr/bin/
-	use gtk || rm msfgui
-	for file in msf*; do
-		dosym /usr/lib/${PN}${SLOT}/${file} /usr/bin/${file}${SLOT}
-	done
-
-	chown -R root:0 "${D}"
-
-	newinitd "${FILESDIR}"/msfweb${SLOT}.initd msfweb${SLOT} \
-		|| die "newinitd failed"
-	newconfd "${FILESDIR}"/msfweb${SLOT}.confd msfweb${SLOT} \
-		|| die "newconfd failed"
-}
-
-pkg_postinst() {
-	if [[ "${SRC_URI}" == "" ]] ; then
-		elog "If you wish to update ${PN} manually simply run:"
-		elog
-		elog "ESVN_REVISION=<rev> emerge =${PF}"
-		elog
-		elog "where <rev> is either HEAD (in case you wish to get all updates)"
-		elog "or specific revision number. But NOTE, this update will vanish"
-		elog "next time you reemerge ${PN}. To make update permanent either"
-		elog "create ebuild with specific revision number inside your overlay"
-		elog "or report revision bump bug at http://bugs.gentoo.org ."
-		elog
-		elog "In case you use portage it's also possible to create"
-		elog "/etc/portage/env/${CATEGORY}/${PN} file with ESVN_REVISION=<rev>"
-		elog "content. Then each time you run emerge ${PN} you'll have said"
-		elog "<rev> installed. For example, if you run"
-		elog " # mkdir -p /etc/portage/env/${CATEGORY}"
-		elog " # echo ESVN_REVISION=HEAD >> /etc/portage/env/${CATEGORY}/${PN}"
-		elog "each time you reemerge ${PN} it'll be updated to get all possible"
-		elog "updates for framework-${PV%_p*} branch."
-		elog "You can do similar things in paludis using /etc/paludis/bashrc."
-	fi
-}
diff --git a/net-analyzer/metasploit/metasploit-3.4.1.ebuild b/net-analyzer/metasploit/metasploit-3.4.1.ebuild
deleted file mode 100644
index 71ae2854e86f..000000000000
--- a/net-analyzer/metasploit/metasploit-3.4.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.4.1.ebuild,v 1.1 2010/09/04 18:55:42 patrick Exp $
-
-SRC_URI="http://www.metasploit.com/releases/framework-${PV}.tar.bz2"
-
-DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
-HOMEPAGE="http://www.metasploit.org/"
-
-LICENSE="BSD"
-SLOT="3.4"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="gtk sqlite postgres"
-
-# Note we use bundled gems (see data/msfweb/vendor/rails/) as upstream voted for
-# such solution, bug #247787
-RDEPEND="dev-lang/ruby
-	dev-ruby/rubygems
-	gtk? ( dev-ruby/ruby-libglade2 )
-	sqlite? ( dev-ruby/sqlite3-ruby
-		 dev-ruby/activerecord )
-	postgres? ( dev-ruby/ruby-postgres
-		dev-ruby/activerecord )"
-DEPEND=""
-
-S=${WORKDIR}/msf3
-
-src_install() {
-	if [[ "${SRC_URI}" != "" ]] ; then
-		# svn sources...
-		find "${S}" -type d -name ".svn" -print0 | xargs -0 -n1 rm -R
-	fi
-
-	# should be as simple as copying everything into the target...
-	dodir /usr/lib/${PN}${SLOT}
-	cp -R "${S}"/* "${D}"/usr/lib/${PN}${SLOT} || die "Copy files failed"
-
-	# do not remove LICENSE, bug #238137
-	dodir /usr/share/doc/${PF}
-	cp -R "${S}"/{documentation,README} "${D}"/usr/share/doc/${PF}
-	rm -Rf "${D}"/usr/lib/${PN}${SLOT}/documentation "${D}"/usr/lib/${PN}${SLOT}/README
-	dosym /usr/share/doc/${PF}/documentation /usr/lib/${PN}${SLOT}/documentation
-
-	dodir /usr/bin/
-	use gtk || rm msfgui
-	for file in msf*; do
-		dosym /usr/lib/${PN}${SLOT}/${file} /usr/bin/${file}${SLOT}
-	done
-
-	chown -R root:0 "${D}"
-
-	newinitd "${FILESDIR}"/msfweb${SLOT}.initd msfweb${SLOT} \
-		|| die "newinitd failed"
-	newconfd "${FILESDIR}"/msfweb${SLOT}.confd msfweb${SLOT} \
-		|| die "newconfd failed"
-}
-
-pkg_postinst() {
-	if [[ "${SRC_URI}" == "" ]] ; then
-		elog "If you wish to update ${PN} manually simply run:"
-		elog
-		elog "ESVN_REVISION=<rev> emerge =${PF}"
-		elog
-		elog "where <rev> is either HEAD (in case you wish to get all updates)"
-		elog "or specific revision number. But NOTE, this update will vanish"
-		elog "next time you reemerge ${PN}. To make update permanent either"
-		elog "create ebuild with specific revision number inside your overlay"
-		elog "or report revision bump bug at http://bugs.gentoo.org ."
-		elog
-		elog "In case you use portage it's also possible to create"
-		elog "/etc/portage/env/${CATEGORY}/${PN} file with ESVN_REVISION=<rev>"
-		elog "content. Then each time you run emerge ${PN} you'll have said"
-		elog "<rev> installed. For example, if you run"
-		elog " # mkdir -p /etc/portage/env/${CATEGORY}"
-		elog " # echo ESVN_REVISION=HEAD >> /etc/portage/env/${CATEGORY}/${PN}"
-		elog "each time you reemerge ${PN} it'll be updated to get all possible"
-		elog "updates for framework-${PV%_p*} branch."
-		elog "You can do similar things in paludis using /etc/paludis/bashrc."
-	fi
-}
diff --git a/net-analyzer/metasploit/metasploit-3.5.0.ebuild b/net-analyzer/metasploit/metasploit-3.5.0.ebuild
deleted file mode 100644
index cf2c8b473c37..000000000000
--- a/net-analyzer/metasploit/metasploit-3.5.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.5.0.ebuild,v 1.2 2010/11/14 23:16:38 patrick Exp $
-
-SRC_URI="http://www.metasploit.com/releases/framework-${PV}.tar.bz2"
-
-DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
-HOMEPAGE="http://www.metasploit.org/"
-
-LICENSE="BSD"
-SLOT="3.5"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="gtk sqlite postgres"
-
-# Note we use bundled gems (see data/msfweb/vendor/rails/) as upstream voted for
-# such solution, bug #247787
-RDEPEND="dev-lang/ruby
-	dev-ruby/rubygems
-	gtk? ( dev-ruby/ruby-libglade2 )
-	sqlite? ( dev-ruby/sqlite3-ruby
-		 dev-ruby/activerecord )
-	postgres? ( dev-ruby/ruby-postgres
-		dev-ruby/activerecord )"
-DEPEND=""
-
-S=${WORKDIR}/msf3
-
-src_install() {
-	if [[ "${SRC_URI}" != "" ]] ; then
-		# svn sources...
-		find "${S}" -type d -name ".svn" -print0 | xargs -0 -n1 rm -R
-	fi
-
-	# should be as simple as copying everything into the target...
-	dodir /usr/lib/${PN}${SLOT}
-	cp -R "${S}"/* "${D}"/usr/lib/${PN}${SLOT} || die "Copy files failed"
-
-	# do not remove LICENSE, bug #238137
-	dodir /usr/share/doc/${PF}
-	cp -R "${S}"/{documentation,README} "${D}"/usr/share/doc/${PF}
-	rm -Rf "${D}"/usr/lib/${PN}${SLOT}/documentation "${D}"/usr/lib/${PN}${SLOT}/README
-	dosym /usr/share/doc/${PF}/documentation /usr/lib/${PN}${SLOT}/documentation
-
-	dodir /usr/bin/
-	use gtk || rm msfgui
-	for file in msf*; do
-		dosym /usr/lib/${PN}${SLOT}/${file} /usr/bin/${file}${SLOT}
-	done
-
-	chown -R root:0 "${D}"
-
-}
-
-pkg_postinst() {
-	if [[ "${SRC_URI}" == "" ]] ; then
-		elog "If you wish to update ${PN} manually simply run:"
-		elog
-		elog "ESVN_REVISION=<rev> emerge =${PF}"
-		elog
-		elog "where <rev> is either HEAD (in case you wish to get all updates)"
-		elog "or specific revision number. But NOTE, this update will vanish"
-		elog "next time you reemerge ${PN}. To make update permanent either"
-		elog "create ebuild with specific revision number inside your overlay"
-		elog "or report revision bump bug at http://bugs.gentoo.org ."
-		elog
-		elog "In case you use portage it's also possible to create"
-		elog "/etc/portage/env/${CATEGORY}/${PN} file with ESVN_REVISION=<rev>"
-		elog "content. Then each time you run emerge ${PN} you'll have said"
-		elog "<rev> installed. For example, if you run"
-		elog " # mkdir -p /etc/portage/env/${CATEGORY}"
-		elog " # echo ESVN_REVISION=HEAD >> /etc/portage/env/${CATEGORY}/${PN}"
-		elog "each time you reemerge ${PN} it'll be updated to get all possible"
-		elog "updates for framework-${PV%_p*} branch."
-		elog "You can do similar things in paludis using /etc/paludis/bashrc."
-	fi
-}
diff --git a/net-analyzer/metasploit/metasploit-3.6.0.ebuild b/net-analyzer/metasploit/metasploit-3.6.0.ebuild
deleted file mode 100644
index 0611c83a993c..000000000000
--- a/net-analyzer/metasploit/metasploit-3.6.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.6.0.ebuild,v 1.1 2011/04/18 09:26:10 patrick Exp $
-
-SRC_URI="http://updates.metasploit.com/data/releases/framework-${PV}.tar.bz2"
-
-DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
-HOMEPAGE="http://www.metasploit.org/"
-
-LICENSE="BSD"
-SLOT="3.6"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="gtk sqlite postgres"
-
-# Note we use bundled gems (see data/msfweb/vendor/rails/) as upstream voted for
-# such solution, bug #247787
-RDEPEND="dev-lang/ruby
-	dev-ruby/rubygems
-	gtk? ( dev-ruby/ruby-libglade2 )
-	sqlite? ( dev-ruby/sqlite3-ruby
-		 dev-ruby/activerecord )
-	postgres? ( dev-ruby/ruby-postgres
-		dev-ruby/activerecord )"
-DEPEND=""
-
-S=${WORKDIR}/msf3
-
-src_install() {
-	if [[ "${SRC_URI}" != "" ]] ; then
-		# svn sources...
-		find "${S}" -type d -name ".svn" -print0 | xargs -0 -n1 rm -R
-	fi
-
-	# should be as simple as copying everything into the target...
-	dodir /usr/lib/${PN}${SLOT}
-	cp -R "${S}"/* "${D}"/usr/lib/${PN}${SLOT} || die "Copy files failed"
-
-	# do not remove LICENSE, bug #238137
-	dodir /usr/share/doc/${PF}
-	cp -R "${S}"/{documentation,README} "${D}"/usr/share/doc/${PF}
-	rm -Rf "${D}"/usr/lib/${PN}${SLOT}/documentation "${D}"/usr/lib/${PN}${SLOT}/README
-	dosym /usr/share/doc/${PF}/documentation /usr/lib/${PN}${SLOT}/documentation
-
-	dodir /usr/bin/
-	use gtk || rm msfgui
-	for file in msf*; do
-		dosym /usr/lib/${PN}${SLOT}/${file} /usr/bin/${file}${SLOT}
-	done
-
-	chown -R root:0 "${D}"
-
-}
-
-pkg_postinst() {
-	if [[ "${SRC_URI}" == "" ]] ; then
-		elog "If you wish to update ${PN} manually simply run:"
-		elog
-		elog "ESVN_REVISION=<rev> emerge =${PF}"
-		elog
-		elog "where <rev> is either HEAD (in case you wish to get all updates)"
-		elog "or specific revision number. But NOTE, this update will vanish"
-		elog "next time you reemerge ${PN}. To make update permanent either"
-		elog "create ebuild with specific revision number inside your overlay"
-		elog "or report revision bump bug at http://bugs.gentoo.org ."
-		elog
-		elog "In case you use portage it's also possible to create"
-		elog "/etc/portage/env/${CATEGORY}/${PN} file with ESVN_REVISION=<rev>"
-		elog "content. Then each time you run emerge ${PN} you'll have said"
-		elog "<rev> installed. For example, if you run"
-		elog " # mkdir -p /etc/portage/env/${CATEGORY}"
-		elog " # echo ESVN_REVISION=HEAD >> /etc/portage/env/${CATEGORY}/${PN}"
-		elog "each time you reemerge ${PN} it'll be updated to get all possible"
-		elog "updates for framework-${PV%_p*} branch."
-		elog "You can do similar things in paludis using /etc/paludis/bashrc."
-	fi
-}
diff --git a/net-analyzer/metasploit/metasploit-3.7.0.ebuild b/net-analyzer/metasploit/metasploit-3.7.0.ebuild
deleted file mode 100644
index ab5fe6a421bb..000000000000
--- a/net-analyzer/metasploit/metasploit-3.7.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.7.0.ebuild,v 1.1 2011/05/07 17:01:11 patrick Exp $
-
-SRC_URI="http://updates.metasploit.com/data/releases/framework-${PV}.tar.bz2"
-
-DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
-HOMEPAGE="http://www.metasploit.org/"
-
-LICENSE="BSD"
-SLOT="3.7"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="gtk sqlite postgres"
-
-# Note we use bundled gems (see data/msfweb/vendor/rails/) as upstream voted for
-# such solution, bug #247787
-RDEPEND="dev-lang/ruby
-	dev-ruby/rubygems
-	gtk? ( dev-ruby/ruby-libglade2 )
-	sqlite? ( dev-ruby/sqlite3-ruby
-		 dev-ruby/activerecord )
-	postgres? ( dev-ruby/ruby-postgres
-		dev-ruby/activerecord )"
-DEPEND=""
-
-S=${WORKDIR}/msf3
-
-src_install() {
-	if [[ "${SRC_URI}" != "" ]] ; then
-		# svn sources...
-		find "${S}" -type d -name ".svn" -print0 | xargs -0 -n1 rm -R
-	fi
-
-	# should be as simple as copying everything into the target...
-	dodir /usr/lib/${PN}${SLOT}
-	cp -R "${S}"/* "${D}"/usr/lib/${PN}${SLOT} || die "Copy files failed"
-
-	# do not remove LICENSE, bug #238137
-	dodir /usr/share/doc/${PF}
-	cp -R "${S}"/{documentation,README} "${D}"/usr/share/doc/${PF}
-	rm -Rf "${D}"/usr/lib/${PN}${SLOT}/documentation "${D}"/usr/lib/${PN}${SLOT}/README
-	dosym /usr/share/doc/${PF}/documentation /usr/lib/${PN}${SLOT}/documentation
-
-	dodir /usr/bin/
-	use gtk || rm msfgui
-	for file in msf*; do
-		dosym /usr/lib/${PN}${SLOT}/${file} /usr/bin/${file}${SLOT}
-	done
-
-	chown -R root:0 "${D}"
-
-}
-
-pkg_postinst() {
-	if [[ "${SRC_URI}" == "" ]] ; then
-		elog "If you wish to update ${PN} manually simply run:"
-		elog
-		elog "ESVN_REVISION=<rev> emerge =${PF}"
-		elog
-		elog "where <rev> is either HEAD (in case you wish to get all updates)"
-		elog "or specific revision number. But NOTE, this update will vanish"
-		elog "next time you reemerge ${PN}. To make update permanent either"
-		elog "create ebuild with specific revision number inside your overlay"
-		elog "or report revision bump bug at http://bugs.gentoo.org ."
-		elog
-		elog "In case you use portage it's also possible to create"
-		elog "/etc/portage/env/${CATEGORY}/${PN} file with ESVN_REVISION=<rev>"
-		elog "content. Then each time you run emerge ${PN} you'll have said"
-		elog "<rev> installed. For example, if you run"
-		elog " # mkdir -p /etc/portage/env/${CATEGORY}"
-		elog " # echo ESVN_REVISION=HEAD >> /etc/portage/env/${CATEGORY}/${PN}"
-		elog "each time you reemerge ${PN} it'll be updated to get all possible"
-		elog "updates for framework-${PV%_p*} branch."
-		elog "You can do similar things in paludis using /etc/paludis/bashrc."
-	fi
-}
diff --git a/net-analyzer/metasploit/metasploit-4.1.4.ebuild b/net-analyzer/metasploit/metasploit-4.2.0.ebuild
index 906d4bf17bc9..dd5ade5883b3 100644
--- a/net-analyzer/metasploit/metasploit-4.1.4.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.2.0.ebuild
@@ -1,13 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-4.1.4.ebuild,v 1.1 2012/01/12 08:14:41 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-4.2.0.ebuild,v 1.1 2012/02/28 08:09:31 patrick Exp $
 
 EAPI="3"
 inherit eutils
 
-#SRC_URI="http://updates.metasploit.com/data/releases/framework-${PV}.tar.bz2"
-# Naughty upstream ... no versioning at the moment
-SRC_URI="http://downloads.metasploit.com/data/releases/framework-latest.tar.bz2"
+SRC_URI="http://updates.metasploit.com/data/releases/framework-${PV}.tar.bz2"
 
 DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
 HOMEPAGE="http://www.metasploit.org/"
@@ -78,7 +76,7 @@ src_install() {
 	# Avoid useless revdep-rebuild trigger #377617
 	dodir /etc/revdep-rebuild/
 	echo "SEARCH_DIRS_MASK=\"/usr/lib*/${PN}${SLOT}/data/john\"" > \
-		${D}/etc/revdep-rebuild/70-${PN}-${SLOT}
+		"${D}"/etc/revdep-rebuild/70-${PN}-${SLOT}
 }
 
 pkg_postinst() {