diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 3651c2ca4..fa71be95d 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,5 +1,5 @@
 AUX database.yml 481 SHA256 2db3df7b05f28aa5ba6d6dedc32d8d1a2e24e020d6fd8aea15b2e76ed0f6ab46 SHA512 98a83f972f78ee63d241b58fbdce3171a24b2435371d46cad609f2f2ad50a5853cbfda5cf4632cfd9e69b2fb7ba3ce3c6aa765c7b44fbeb3eed868ffc068241d WHIRLPOOL ac85e47c26dcf56d69028af91513802767a2243ff52f6e031d447dfbda9120bd6436b4a0c6ab118cf3fd09dc3b47613e4e75c8ef83f4528783402bba1ab5e2ba
 AUX metasploit.icon 7630 SHA256 d197dd3b939c35d951c2cd5c19b51200ada7f8f92d90775a9eaebdccf18e3949 SHA512 569db261a3782f3874c30ccaf076be512437a9a5a9df835baf29bacec48dd76b2896e009b5ab165ba82aff72ab15d067155f257787e69c3a7cd034dafa5a9066 WHIRLPOOL 3f66eb2a3b51dc787f5da6b2fd93165fdca3e9ae391db0ea69cb0ea5c6c1d9f2d85fffbdb117da4065e0b3e29daa5b7d7e62740cd3210768aa0cfc4a63679376
 DIST framework-4.6.0.tar.bz2 49996884 SHA256 ec6dfe58cb5a897e8c8e56d919dec7c00d56fe758efd1350c2a7a3587ef538c2 SHA512 ff73ebd5e08f96d7ffb63ad59cd4fa608705a1a72f00b82ce074fc537e7037349fedf71f768a895ec4e36aabb4ae07fd6b6a0f12ff88807b8ca9202f0d770633 WHIRLPOOL 952407ce34e0d94f7a824c6a3b963c6321da9aee0626295389b1f4f7d4671b9577e5bfab8f581144696f6c4a1bb073f7b7056d8c54853dbf60a6dcb7c320b336
-EBUILD metasploit-4.6.0.ebuild 6624 SHA256 f4b186c37bc1cf714fe49575239bf245b3725b6e8244184731b008253150c87a SHA512 207966249f8581f34e360154bced60b9c6ab4b050552e66f7c6276eeb181a516798ec5c2afbf10164c8b10dff1f179ff77070af045367d6af42dfd17fdaad6a5 WHIRLPOOL 5665e31e941c43f4076922eb69614a7931673fd81bdcd20324aaf4be02c0105b832ad474266ce05bbb9e9615588adcffcf1302c28cc77daecc170ca7d2d2fe11
-EBUILD metasploit-9999.ebuild 6462 SHA256 5839fffb630f61807f84c841ca758532cb66c2f497047f739e4b16e55dd1b789 SHA512 db4b947d2b1105e1df5361a251c090fdee3836b1cd101c60be1891f53cbc0b58f9d683275858d5ce04e2757a5dab4430deb4f7506bbfb98c0441577d0b7063f7 WHIRLPOOL 0f5ffef3beefaede2d40709511b2a97590248cc3f912b07c7dfa4811a74f52654c6e373453a8a119211069723b34ff3423ff58d6011b724a55732e8cfdbbc35c
+EBUILD metasploit-4.6.0.ebuild 6293 SHA256 6343754b28505ccec773e20c9a2385890803859d5d38c51f601448d50f39048f SHA512 45cc5cd171bae5f559035bede6bebb7bb81ace641886317c6bf540f34c2c4a645c677c00b72e47daeaa06e195d358d8ad1a95f9c9307ae2f4e65df5fddc7b168 WHIRLPOOL 36fc119489d82c116b822b7742b575f8361f3bb041d8041f309cd4e171502054d0153cd07ef75fc26b9e87fb9104adaa0ed9ce59086d47e34a58d491cdef3885
+EBUILD metasploit-9999.ebuild 6287 SHA256 46ed39cd394c00c0c99ba56a81ca730bef04305ea91f7198f1d44f2613512c4e SHA512 887a9454b9e0efc0cb39f5d88140c815fcef06d25ab4ed31fe0c12fd733a7220513ff636c3cd9daedfa3de35a05a713bc9293a451cc7cdc2b683ab2e3b7a8906 WHIRLPOOL 6b4002bf55e9390d8dc24d9360bef6351f0ca7497a6d5a0931a1b0f9dd9877532497bd90c5cb2f30f5e9090467dfef8c0d88100d997aa01ace6f2c7366621a9d
diff --git a/net-analyzer/metasploit/metasploit-4.6.0.ebuild b/net-analyzer/metasploit/metasploit-4.6.0.ebuild
index d9c9f4cf4..2717f0a96 100644
--- a/net-analyzer/metasploit/metasploit-4.6.0.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.6.0.ebuild
@@ -23,7 +23,7 @@ DESCRIPTION="Advanced open-source framework for developing, testing, and using v
 HOMEPAGE="http://www.metasploit.org/"
 SLOT="4.6"
 LICENSE="BSD"
-IUSE="gui +java lorcon pcaprub serialport test"
+IUSE="+java lorcon pcaprub serialport test"
 
 DEPEND="lorcon? ( net-wireless/lorcon[ruby] )"
 RDEPEND="${DEPEND}
@@ -42,7 +42,6 @@ RDEPEND="${DEPEND}
 	>=app-admin/eselect-metasploit-0.10
 	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
 	net-analyzer/nmap
-	gui? ( virtual/jre )
 	!arm? ( java? ( dev-ruby/rjb ) )
 	pcaprub? ( net-libs/libpcap )
 	test? ( dev-ruby/bundler )"
@@ -161,13 +160,6 @@ src_install() {
 	fi
 
 	fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
-
-	if use gui; then
-		make_desktop_entry msfgui${SLOT} "Metasploit Framework" metasploit 'GNOME;System;Network;'
-		doicon "${FILESDIR}"/metasploit.icon
-	else
-		rm "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/msfgui
-	fi
 }
 
 pkg_postinst() {
@@ -187,8 +179,3 @@ pkg_config() {
 	su postgres -c "createuser msf_user -D -S -R"
 	su postgres -c "createdb --owner=msf_user msf_database"
 }
-
-#doesn't work yet but maybe soon?
-#src_test() {
-#	bundle check || die "Dependency issue"
-#}
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index e909c6e42..223b34845 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -23,10 +23,10 @@ DESCRIPTION="Advanced open-source framework for developing, testing, and using v
 HOMEPAGE="http://www.metasploit.org/"
 SLOT="9999"
 LICENSE="BSD"
-IUSE="gui +java lorcon pcaprub serialport test"
+IUSE="+java lorcon pcaprub serialport test"
 
-DEPEND="test? ( dev-ruby/bundler )"
-RDEPEND="dev-db/postgresql-server
+#RDEPEND isn't guarenteed till after src_test so all this is DEPEND now
+DEPEND="dev-db/postgresql-server
 	dev-lang/ruby[ssl]
 	>=dev-ruby/activesupport-3.0.0
 	>=dev-ruby/activerecord-3.2.11
@@ -42,10 +42,10 @@ RDEPEND="dev-db/postgresql-server
 	>=app-admin/eselect-metasploit-0.10
 	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
 	net-analyzer/nmap
-	gui? ( virtual/jre )
 	!arm? ( java? ( dev-ruby/rjb ) )
 	dev-ruby/pcaprub
-	lorcon? ( net-wireless/lorcon[ruby] )"
+	lorcon? ( net-wireless/lorcon[ruby] )
+	test? ( dev-ruby/bundler )"
 
 RESTRICT="strip"
 
@@ -152,13 +152,6 @@ src_install() {
 	fi
 
 	fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
-
-	if use gui; then
-		make_desktop_entry msfgui${SLOT} "Metasploit Framework" metasploit 'GNOME;System;Network;'
-		doicon "${FILESDIR}"/metasploit.icon
-	else
-		rm "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/msfgui
-	fi
 }
 
 pkg_postinst() {