diff --git a/net-analyzer/subdomainer/Manifest b/net-analyzer/subdomainer/Manifest
index 8afc697a9..c4bab4962 100644
--- a/net-analyzer/subdomainer/Manifest
+++ b/net-analyzer/subdomainer/Manifest
@@ -1,3 +1,3 @@
 AUX subdomainer-python_fix.patch 206 RMD160 6cc8ddf732c1ee5c0c76748e3ca2e6aaba19cfb0 SHA1 c2e2e44b9e5e8d5850fa53ca473eacf97c9e7dcd SHA256 4337e4445203d7714fe2dd40968cfc242a8d5aab8b82d809a19570dcdd35e352
 DIST subdomainer-1.3b.tar 30720 RMD160 a971b9e64b23fcc9e6e2002d38485f61d0733f44 SHA1 16c624d02e5daa83447be2abb13978f235cd0135 SHA256 19b47f1b236aa6227b2024b574c8839163cb5cf961f798e2a58fd1b1349dc349
-EBUILD subdomainer-1.3.ebuild 641 RMD160 f2a95bc3e2132769c224eeec42c88b06e2ef2e3a SHA1 b806b902b557c82010097d144fd7db1b3842dedb SHA256 339ed4a3b6fa87bb1e0d4e486ef74cda8991b63247c862696ca171940b96bd80
+EBUILD subdomainer-1.3.ebuild 653 RMD160 91004bc777ad5b406d36c90d9757411b9cf1da07 SHA1 d6c3811fd75ec5a0d42aca54381543697be3553d SHA256 e04dc5ca2a9e2c902866982945c467d674235e09d352236c72721a29ba08f3dc
diff --git a/net-analyzer/subdomainer/subdomainer-1.3.ebuild b/net-analyzer/subdomainer/subdomainer-1.3.ebuild
index 9c25ab1d1..374c5ac17 100644
--- a/net-analyzer/subdomainer/subdomainer-1.3.ebuild
+++ b/net-analyzer/subdomainer/subdomainer-1.3.ebuild
@@ -1,21 +1,25 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="2"
+
 inherit eutils
+
 DESCRIPTION="This script will search in Google, Msn.search and Yahoo for subdomains related to the target domain"
 HOMEPAGE="http://www.edge-security.com/edge-soft.php"
 SRC_URI="http://www.edge-security.com/soft/${P}b.tar"
+
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
-RDEPEND=""
-SLOT="0"
+
+DEPEND=""
+RDEPEND="virtual/python"
 S="${WORKDIR}"/"${PN}"
 
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/"${PN}"-python_fix.patch
 }
 
diff --git a/net-analyzer/theHarvester/Manifest b/net-analyzer/theHarvester/Manifest
index 0ea4256aa..3547f96ef 100644
--- a/net-analyzer/theHarvester/Manifest
+++ b/net-analyzer/theHarvester/Manifest
@@ -1,2 +1,2 @@
 DIST theHarvester-1.4.tar 30720 RMD160 6a421cad783d3dd6a4391467c857c6fbc335ce91 SHA1 e7e0b34163cb8d6415e12bdef65a318d2dd0d8c8 SHA256 351fa62954f7aeb41575f35fed63527d54aa3938cad7aed714e185e421fb7377
-EBUILD theHarvester-1.4.ebuild 547 RMD160 37accb44ab0a0e617b13ea199f0fa7e40ff7c485 SHA1 f734ea8e218864daf325371fdfac50db8f2cc7eb SHA256 68fa378544a3eabec3016dd209e421a1d28435adf32cd2f93ea4e2fc5031e82c
+EBUILD theHarvester-1.4.ebuild 544 RMD160 d0b17b575059b16756f793caeec5d69022650184 SHA1 6feab60dd41aa3e55b49bbac00bc446648441a48 SHA256 b4baf456bd00bed4866e072616ad7632db7b66c56b913fc0cb5c9de84be1ee75
diff --git a/net-analyzer/theHarvester/theHarvester-1.4.ebuild b/net-analyzer/theHarvester/theHarvester-1.4.ebuild
index fcb76445b..1c254c11e 100644
--- a/net-analyzer/theHarvester/theHarvester-1.4.ebuild
+++ b/net-analyzer/theHarvester/theHarvester-1.4.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 DESCRIPTION="The Harvester is a tool designed to collect email accounts of the target domain"
-HOMEPAGE="http://www.edge-security.com/edge-soft.php"
+HOMEPAGE="http://www.edge-security.com/theHarvester.php"
 SRC_URI="http://www.edge-security.com/soft/${P}.tar"
+
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
-RDEPEND=""
-SLOT="0"
-S="${WORKDIR}"/"${PN}"
 
-src_unpack() {
-	unpack "${A}"
-}
+DEPEND=""
+RDEPEND="virtual/python"
+
+S="${WORKDIR}"/"${PN}"
 
 src_compile() {
 	elog "Nothing to compile"
diff --git a/net-analyzer/unicornscan/Manifest b/net-analyzer/unicornscan/Manifest
index a4254feb7..66c362d15 100644
--- a/net-analyzer/unicornscan/Manifest
+++ b/net-analyzer/unicornscan/Manifest
@@ -1,3 +1,3 @@
 AUX unicornscan-0.4.7-configure.patch 441 RMD160 6de3a99f931262bb023705532adfb3e123b89481 SHA1 b55923655d32838eeed2564812533aaf4f1b3d24 SHA256 88e7c584f3d5c14292d7e6670d59d8ff3183ae3aa4ab5d631128890779615d48
 DIST unicornscan-0.4.7-2.tar.bz2 3080498 RMD160 b257e49d4edf7689f2a2391a8c96112aaca46acf SHA1 5361150afa999e68076a453072830dd23dd9bfee SHA256 06c1e7f7471bcf6d34f0094b8fe4fa117dd945f91e0a0c1c2575e12465f0e2ec
-EBUILD unicornscan-0.4.7.ebuild 1670 RMD160 afa2ac654106d0d7d125840d3405bb823aad87ab SHA1 6b79769d58fc02e66be89db367c7f16977de2c8d SHA256 e1926bbcbd0a950e9653b82aba266e27e3b49c8fdc80dbd93cff85351a41ce12
+EBUILD unicornscan-0.4.7.ebuild 1234 RMD160 f391e532abb7a91fb90345290026d91a38a1ff35 SHA1 d1521ffa98a4651383c8f40e0ba996a1f28acea7 SHA256 285e7079d59535f242969b528de99076eff438e682c3aa1cdcb839f473deda22
diff --git a/net-analyzer/unicornscan/unicornscan-0.4.7.ebuild b/net-analyzer/unicornscan/unicornscan-0.4.7.ebuild
index 54ea78918..f7f20021c 100644
--- a/net-analyzer/unicornscan/unicornscan-0.4.7.ebuild
+++ b/net-analyzer/unicornscan/unicornscan-0.4.7.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="2"
 inherit flag-o-matic eutils
 
 DESCRIPTION="A utility for information gathering or security auditing"
@@ -12,37 +13,26 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE="geoip httpd mysql postgres"
+
 DEPEND="net-libs/libpcap
 		dev-libs/libdnet
 		sys-devel/libtool
 		geoip? ( dev-libs/geoip )
 		mysql? ( dev-db/mysql )
 		postgres? ( dev-db/libpq )"
-RDEPEND="httpd? ( dev-lang/php 
-				  www-servers/apache )"
+RDEPEND="${DEPEND}
+		httpd? ( dev-lang/php[apache2]
+		 		  www-servers/apache )"
 
-pkg_setup() {
-		if use httpd && ! built_with_use --missing true dev-lang/php apache2; then
-				eerror "The httpd USE flag for this package enables dependecies"
-				eerror "needed for the web based front end."
-				eerror "For this reason, you have to merge dev-lang/php"
-				eerror "with the apache2 USE flag enabled, or disable the httpd"
-				eerror "USE flag for this package."
-				die "Missing apache2 USE flag on dev-lang/php"
-		fi
-}
-
-src_unpack() {
-		unpack ${A}
-		cd "${S}"
-		epatch "${FILESDIR}/${P}-configure.patch"
+src_configure() {
+		epatch "${FILESDIR}"/${P}-configure.patch
 }
 
 src_compile() {
 		local myconf=""
-		
+
 		append-flags "-D_GNU_SOURCE"
-		
+
 		if use geoip ; then
 				myconf="--with-geoip"
 		fi
@@ -50,7 +40,7 @@ src_compile() {
 		if use mysql ; then
 				myconf="$myconf --with-mysql"
 		fi
-		
+
 		if use postgres ; then
 				myconf="$myconf --with-pgsql"
 		fi