pentoo-*: moved more packages to specific categories

pentoo/pentoo-analyzer/pentoo-analyzer-2010.0.ebuild

@@ -18,8 +18,10 @@ RDEPEND="${DEPEND}
 	net-analyzer/aimsniff
 	net-analyzer/arpwatch
 	net-analyzer/bmon
+	net-analyzer/chaosreader
 	net-analyzer/dnsa
 	net-analyzer/dnsenum
+	net-analyzer/etherape
 	net-analyzer/gnome-nettool
 	net-analyzer/mbrowse
 	net-analyzer/ntop

pentoo/pentoo-exploit/pentoo-exploit-2010.0.ebuild

@@ -23,4 +23,5 @@ RDEPEND="${DEPEND}
 	net-analyzer/w3af
 	net-analyzer/yersinia
 	net-fs/winexe
-	net-misc/raccess"
+	net-misc/raccess
+	www-apps/beef"

pentoo/pentoo-forging/pentoo-forging-2010.0.ebuild

@@ -17,6 +17,8 @@ RDEPEND="${DEPEND}
 	net-analyzer/gspoof
 	net-analyzer/hping
 	net-analyzer/isic
+	net-analyzer/macchanger
+	net-analyzer/maketh
 	net-analyzer/netwag
 	net-analyzer/packit
 	net-analyzer/rain

pentoo/pentoo-rce/pentoo-rce-2010.0.ebuild

@@ -14,6 +14,7 @@ DEPEND=""
 
 #the tools
 RDEPEND="${RDEPEND}
+	app-antivirus/malheur
         dev-java/jad-bin
         dev-lang/nasm
         dev-util/ltrace

pentoo/pentoo-scanner/pentoo-scanner-2010.0.ebuild

@@ -15,6 +15,7 @@ DEPEND=""
 #the tools
 RDEPEND="${RDEPEND}
 	net-analyzer/cheops-ng
+	net-analyzer/enum4linux
 	net-analyzer/firewalk
 	net-analyzer/hunt
 	net-analyzer/ike-scan

pentoo/pentoo/pentoo-2010.0-r4.ebuild

@@ -13,8 +13,8 @@ IUSE="dwm +analyzer +bluetooth +cracking +database +enlightenment +exploit +foot
 DEPEND=""
 
 #main atoms
-RDEPEND="=sys-kernel/pentoo-sources-2.6.32-r1"
-
+RDEPEND="!livecd? ( =sys-kernel/pentoo-sources-2.6.32-r1 )"
+l
 #things not permitted to exist (due to security holes)
 RDEPEND="${RDEPEND}
 	!<net-misc/tor-0.2.1.22"
@@ -102,7 +102,7 @@ RDEPEND="${REDEPEND}
 	sys-apps/eject
 	sys-apps/hwsetup
 	sys-block/disktype )
-	=app-admin/genmenu-9999
+	app-admin/genmenu
 	app-admin/localepurge
 	app-arch/unrar
 	app-arch/unzip
@@ -206,17 +206,11 @@ RDEPEND="${RDEPEND}
 	net-analyzer/tcpreplay"
 
 RDEPEND="${RDEPEND}
-	app-antivirus/malheur
 	app-crypt/openvpn-blacklist
 	app-misc/dradis
 	amd64? ( net-analyzer/arpantispoofer )
 	x86? ( net-analyzer/autoscan-network )
-	net-analyzer/chaosreader
-	net-analyzer/enum4linux
-	net-analyzer/etherape
 	net-analyzer/honeyd
-	net-analyzer/macchanger
-	net-analyzer/maketh
 	net-analyzer/netcat6
 	net-analyzer/netdiscover
 	net-analyzer/ngrep
@@ -224,9 +218,7 @@ RDEPEND="${RDEPEND}
 	net-analyzer/snort
 	net-analyzer/tcpdump
 	net-analyzer/traceroute
-	amd64? ( net-analyzer/upnpscan )
-	net-analyzer/wireshark
-	www-apps/beef"
+	net-analyzer/wireshark"
 	#TODO: explain why these aren't included?
 	#net-wireless/waveselect
 	#dev-db/absinthe