diff --git a/net-analyzer/mosref/Manifest b/net-analyzer/mosref/Manifest
index b87d9817b..63d1f440b 100644
--- a/net-analyzer/mosref/Manifest
+++ b/net-analyzer/mosref/Manifest
@@ -1,13 +1,4 @@
 AUX mosref-gentoo.patch 1463 RMD160 22cc6efa9cbe0c289f8585a3ffaf8409ac489af3 SHA1 af044276cda23cf06ad1f6064eeddc095e2da866 SHA256 d09279b404c607db82c9c8a3534ce4879111610f6d69375c0079026b3d61cecf
-MD5 a69491e57454f379a758a791acaea424 files/mosref-gentoo.patch 1463
-RMD160 22cc6efa9cbe0c289f8585a3ffaf8409ac489af3 files/mosref-gentoo.patch 1463
-SHA256 d09279b404c607db82c9c8a3534ce4879111610f6d69375c0079026b3d61cecf files/mosref-gentoo.patch 1463
 DIST mosref-2.0-beta3-documentation.tar.gz 151687 RMD160 950e61042e5098a5c1dae01f07a00b68abfb9f2e SHA1 a5a94bb38026a8dd0e998ef3dd83e087c7726560 SHA256 c38ce9e3fc7e431f30ef2b16935b562da93aecf92c5db353678a488c87a12af3
 DIST mosref-2.0-beta3.tar.gz 1191694 RMD160 ac3c726906495bad827083a413fb62365c944cac SHA1 7b406a0bd96060c26c326e5cd95cf9ef2cc6a560 SHA256 7d2e32efda1ba5c9245cd6f6378b33b0b9e0ca43a7d9a02f1a3d0e8b1a55b00a
-EBUILD mosref-2.0_beta3.ebuild 1168 RMD160 11a6331fbbe8ea3e81f746f2170ef6010234272e SHA1 bac941be112fd23df389f7d49983cb159b48c79b SHA256 945dad169c2f2d6eee3a5c757aa061d417f3eeeb84caf8671d37fc31746f9ced
-MD5 772ca3fb59a35c2c298ec7e627a11a17 mosref-2.0_beta3.ebuild 1168
-RMD160 11a6331fbbe8ea3e81f746f2170ef6010234272e mosref-2.0_beta3.ebuild 1168
-SHA256 945dad169c2f2d6eee3a5c757aa061d417f3eeeb84caf8671d37fc31746f9ced mosref-2.0_beta3.ebuild 1168
-MD5 416f1ba2ac169e1148428453dc83fb28 files/digest-mosref-2.0_beta3 545
-RMD160 7dc69a97621f00ed9b662a5ffda6299ee5f3128b files/digest-mosref-2.0_beta3 545
-SHA256 668acab3c1205663e5451afb42d55c9b733f8b19136ed9bf1344ec18c969f658 files/digest-mosref-2.0_beta3 545
+EBUILD mosref-2.0_beta3.ebuild 1175 RMD160 f5531fc2286065c2f8c257c0563615ca1a19d0c1 SHA1 12ce4ad1f52f9db914846b8b3665f04156b0e272 SHA256 4ef6a663baeffbd5dacda072bd814b9a8f8e83449925bbe263f4a8735375e651
diff --git a/net-analyzer/mosref/mosref-2.0_beta3.ebuild b/net-analyzer/mosref/mosref-2.0_beta3.ebuild
index 395a310e3..9bb396bdc 100644
--- a/net-analyzer/mosref/mosref-2.0_beta3.ebuild
+++ b/net-analyzer/mosref/mosref-2.0_beta3.ebuild
@@ -1,20 +1,24 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 inherit eutils
+
 MY_P="${P/_/-}"
 DESCRIPTION="A secure remote execution framework using a compact Scheme-influenced VM"
 HOMEPAGE="http://sourceforge.net/projects/mosref/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
 	 doc? ( mirror://sourceforge/${PN}/${MY_P}-documentation.tar.gz )"
+
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~x86"
+IUSE="doc sources"
+
 RESTRICT="strip"
+
 DEPEND=""
 RDEPEND="${DEPEND}"
-IUSE="doc sources"
 
 S="${WORKDIR}"/"${MY_P}"
 
@@ -29,13 +33,13 @@ src_unpack() {
 }
 
 src_compile() {
-	epatch ${FILESDIR}/${PN}-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-gentoo.patch
 	make  || die "make failed"
 }
 
 src_install() {
 	sed -i -e "s|%%DESTDIR%%|${D}usr|" bin/install.ms || die "sed failed"
-	make install || die "emake install failed"
+	emake install || die "emake install failed"
 	if use doc;then
 		dodoc doc/vm-implementation*
 		cd "${WORKDIR}"/"${PN}"-reference
diff --git a/net-analyzer/ntp-fingerprint/Manifest b/net-analyzer/ntp-fingerprint/Manifest
index d9f06a453..4f6c6b0e1 100644
--- a/net-analyzer/ntp-fingerprint/Manifest
+++ b/net-analyzer/ntp-fingerprint/Manifest
@@ -1,3 +1,3 @@
 AUX README.txt 1244 RMD160 d6e2ec928ed68d29b4553ffbb61ab7de7c535ad4 SHA1 1579dc4251d709136d30e22e7de0359946254f78 SHA256 66304f8ad79bac86390923df623829ada8eae128e65ce20e3cb736b56d100069
 AUX ntp-fingerprint.pl 3930 RMD160 ba4383d1289ac001e93c462b5661a1a7f89dba76 SHA1 76c220d47816613540f0cfbf56f74fd27e2ee699 SHA256 f017b3db70b202ab355b02cb6de5cb2a4e04ecca3d52de3c2c1752cbe7829803
-EBUILD ntp-fingerprint-0.1.ebuild 456 RMD160 092503a4b4b5be27a3e6b8d93a18c482719f1d65 SHA1 16827571c6a8a45d81d4f71f2e3d49ab845e4803 SHA256 6e22434f5083a1f71fbb3edbd8787f1d5c6c772ac7b56d86bb8eaaa8f3eae835
+EBUILD ntp-fingerprint-0.1.ebuild 484 RMD160 f118ec181f54b9f57fcc082e7384b05be4f72c0d SHA1 e50c3dd7c8af651a305d63cbdabc2b264723937c SHA256 59b1c497194c5e4881fd4c8fd8119a49cefb10de446f4812e32ff920bad5fb46
diff --git a/net-analyzer/ntp-fingerprint/ntp-fingerprint-0.1.ebuild b/net-analyzer/ntp-fingerprint/ntp-fingerprint-0.1.ebuild
index 7d0cb5603..3ad18d7fa 100644
--- a/net-analyzer/ntp-fingerprint/ntp-fingerprint-0.1.ebuild
+++ b/net-analyzer/ntp-fingerprint/ntp-fingerprint-0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /root/portage/net-analyzer/ntp-fingerprint/ntp-fingerprint-0.1.ebuild,v 1.1.1.1 2006/03/09 21:57:23 grimmlin Exp $
 
 DESCRIPTION="A ntp fingerprinter"
-HOMEPAGE=""
+HOMEPAGE="none"
 SRC_URI=""
 
 LICENSE="GPL-2"
@@ -12,6 +12,7 @@ KEYWORDS="~amd64 ~x86 ~ppc"
 IUSE=""
 
 DEPEND=""
+RDEPEND="dev-lang/perl"
 
 src_install() {
 	newbin "${FILESDIR}"/"${PN}".pl "${PN}"
diff --git a/net-analyzer/onesixtyone/Manifest b/net-analyzer/onesixtyone/Manifest
index 739e8e436..238aa88c8 100644
--- a/net-analyzer/onesixtyone/Manifest
+++ b/net-analyzer/onesixtyone/Manifest
@@ -1,3 +1,2 @@
 DIST onesixtyone-0.3.2.tar.gz 7325 RMD160 2b6a4e6c15f198843da0e50dd8722b5d94c655e6 SHA1 347e24efa91385a7fb8283986b3e7521aa1fb059 SHA256 450806718f72a75ea108e3675ca7856f15c518fcf517df68483c486c39910d02
-EBUILD onesixtyone-0.3.2-r1.ebuild 590 RMD160 6a645a72abe1be144a3fb7c45ca874c4e1768488 SHA1 eb7d5c74b86ffad19f52363141f40fec074f79ba SHA256 9b48903f311ef303b7179cdf29e26cad20dced5938eaa883c5a9ea2b999e462a
-EBUILD onesixtyone-0.3.2.ebuild 531 RMD160 4b19fd70a03f737556d78d8a3f81c35ca34f5093 SHA1 f0ca1db8e0a37d34cf079e5525f8b4c62118ba9a SHA256 15b0ec2287709942fa1be7895057c04910290c4d2d1f602d6827f6393e51dab5
+EBUILD onesixtyone-0.3.2-r1.ebuild 668 RMD160 0ccf47c9f94147988e4abd8d5311fd2a96b8958d SHA1 431249717df9eae8b69825d1e840d5f159547329 SHA256 3726266e8e47b98ca7a49d0782bd8b3fe18b419fca7e93bf6053faa564d46cee
diff --git a/net-analyzer/onesixtyone/onesixtyone-0.3.2-r1.ebuild b/net-analyzer/onesixtyone/onesixtyone-0.3.2-r1.ebuild
index 6e8bede73..de23ea44a 100644
--- a/net-analyzer/onesixtyone/onesixtyone-0.3.2-r1.ebuild
+++ b/net-analyzer/onesixtyone/onesixtyone-0.3.2-r1.ebuild
@@ -1,18 +1,25 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 # Nonofficial ebuild by Ycarus. For new version look here : http://gentoo.zugaina.org/
 
+EAPI="2"
+
 DESCRIPTION="An efficient SNMP scanner"
 HOMEPAGE="http://www.phreedom.org/solar/onesixtyone/"
 SRC_URI="http://www.phreedom.org/solar/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
-DEPEND=""
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc"
 IUSE=""
-RESTRICT="nomirror"
 
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	sed -i "s|-o|$CFLAGS -o|g" Makefile || die "sed failed"
+}
 
 src_install() {
 	dobin onesixtyone
diff --git a/net-analyzer/onesixtyone/onesixtyone-0.3.2.ebuild b/net-analyzer/onesixtyone/onesixtyone-0.3.2.ebuild
deleted file mode 100644
index 023c78d98..000000000
--- a/net-analyzer/onesixtyone/onesixtyone-0.3.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-# Nonofficial ebuild by Ycarus. For new version look here : http://gentoo.zugaina.org/
-
-DESCRIPTION="An efficient SNMP scanner"
-HOMEPAGE="http://www.phreedom.org/solar/onesixtyone/"
-SRC_URI="http://www.phreedom.org/solar/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-DEPEND=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
-IUSE=""
-RESTRICT="nomirror"
-
-
-src_install() {
-	dobin onesixtyone
-	dodoc ChangeLog INSTALL README dict.txt
-}