diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 69c7ea028..e0c524bdb 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,3 +1,3 @@
 AUX msfrpcd3.confd 440 RMD160 67e569204d77592e8b0e19d34d87c0c75a722687 SHA1 ff1eea41295270d0b5117ee233b5f5fe44a84834 SHA256 f1148f3f4fe24b2689d6a8f3d8510031f493100a5b48823c0a5bc2085a6439b4
 AUX msfrpcd3.initd 561 RMD160 e9811489784131c4c1e68279d43b4f2ba4c093b1 SHA1 38240c3bba090011c25fffe90d9c898e540ba463 SHA256 89a897977b53a471334caa47eeadcb5595fa783bfafd99c7ae1d5c8f9e7041bc
-EBUILD metasploit-9999.ebuild 4590 RMD160 19b1c3063681f8c4c2308af37795cbc8fd822908 SHA1 0c1628ea2cfbc14e050c57846955622b7fe2e8ce SHA256 65510a3e9dd35113dad85191bc4b6301ce949e090b859a4db3b0c7da396c7c6b
+EBUILD metasploit-9999.ebuild 4042 RMD160 ab06698fc89f4c67a0f5e672244baac84d09df23 SHA1 e474f2804c4ff65773b072fb69e7a3a97c995fa6 SHA256 000e977024a3db1b77297228f7eefc8e1a91be3cf897b70efea89c230c1d1e44
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 0a37a7bb3..c3682e198 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.1_p5699-r1.ebuild,v 1.3 2008/11/09 14:52:13 nixnut Exp $
 
-EAPI="2"
+EAPI="4"
 
 MY_P=${PN/metasploit/framework}-${PV}
 
@@ -21,7 +21,9 @@ HOMEPAGE="http://www.metasploit.org/"
 LICENSE="BSD"
 SLOT="3"
 KEYWORDS="amd64 arm ppc ~sparc x86"
-IUSE="armitage mysql postgres sqlite"
+IUSE="armitage mysql postgres"
+
+REQUIRED_USE="armitage? ( || ( mysql postgres ) )"
 
 # blocker on ruby-1.8.7:
 # http://spool.metasploit.com/pipermail/framework/2008-September/003671.html
@@ -32,8 +34,6 @@ RDEPEND="dev-lang/ruby
 	dev-ruby/hpricot
 	mysql? ( dev-ruby/mysql-ruby
 		dev-ruby/activerecord )
-	sqlite? ( dev-ruby/sqlite3-ruby
-		dev-ruby/activerecord )
 	postgres? ( dev-ruby/pg
 		dev-ruby/activerecord )
 	armitage? ( net-analyzer/nmap 
@@ -79,22 +79,9 @@ src_install() {
 		|| die "newconfd failed"
 
 	if use armitage; then
-		if use mysql || use postgres || use sqlite; then
 	#		dodoc *.txt
 			echo -e "#!/bin/sh \n\njava -Xmx256m -jar /usr/lib/${PN}${SLOT}/data/armitage/armitage.jar \$*\n" > armitage
 			dobin armitage
-		else
-			eerror "Armitage requires a database back end to run, please select one"
-			eerror "of the following:"
-			eerror "MySQL, PostgreSQL or SQLite (Not supported by Metasploit team anymore)."
-			die "No database back end selected."
-		fi
-	fi
-
-	if use sqlite; then
-		ewarn "Please note that SQLite is not supported by the Metasploit team"
-		ewarn "anymore. Please see the following URL for details:"
-		ewarn"http://dev.metasploit.com/redmine/projects/framework/wiki/Sqlite_setup"
 	fi
 }