QA: Unnecessary definition of S and RDEPEND removed.

4 files changed, 17 insertions, 22 deletions

diff --git a/net-analyzer/amap/ChangeLog b/net-analyzer/amap/ChangeLog
index 4b6ea5ab1447..50f07d1bf31a 100644
--- a/net-analyzer/amap/ChangeLog
+++ b/net-analyzer/amap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/amap
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.3 2003/11/26 17:29:40 iggy Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.4 2004/03/21 14:04:46 mboman Exp $
+
+  21 Mar 2004; Michael Boman <mboman@gentoo.org> amap-2.7.ebuild,
+  amap-4.3.ebuild:
+  QA: Unnecessary definition of S and RDEPEND removed.
 
   26 Nov 2003; Brian Jackson <iggy@gentoo.org> amap-4.3.ebuild:
   bump to stable
diff --git a/net-analyzer/amap/Manifest b/net-analyzer/amap/Manifest
index 78398d43e163..73b8b005081c 100644
--- a/net-analyzer/amap/Manifest
+++ b/net-analyzer/amap/Manifest
@@ -1,6 +1,6 @@
-MD5 4328e11a3d8f5aa20b84b1b108d50a96 amap-2.7.ebuild 1077
-MD5 3bc0c4ed1fc11a4b78967bec2838ebb1 amap-4.3.ebuild 1193
-MD5 bf2db56875b1231e6f8e87046f164b23 ChangeLog 669
+MD5 0333b18e4c91ae5fe5deefc681ab1894 ChangeLog 812
+MD5 043354e9ecee05f383e408688e8e0b89 amap-2.7.ebuild 1023
+MD5 4064f678d150e993a33a1121845dc720 amap-4.3.ebuild 1142
 MD5 b373e02c23d40f3f13a57f15b4fba233 metadata.xml 438
 MD5 6ab433a807edba43512f283f9c6c9bbc files/digest-amap-2.7 59
 MD5 6bdf30d6d6aa4b292a997760f68c8cd3 files/digest-amap-4.3 60
diff --git a/net-analyzer/amap/amap-2.7.ebuild b/net-analyzer/amap/amap-2.7.ebuild
index b8cccaa5de1c..397c64f15c14 100644
--- a/net-analyzer/amap/amap-2.7.ebuild
+++ b/net-analyzer/amap/amap-2.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-2.7.ebuild,v 1.3 2003/10/04 15:34:57 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-2.7.ebuild,v 1.4 2004/03/21 14:04:46 mboman Exp $
 
 DESCRIPTION="A next-generation scanning tool for pentesters"
 HOMEPAGE="http://www.thc.org/releases.php"
@@ -10,20 +10,15 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE="ssl"
 DEPEND="virtual/glibc
-	ssl? ( >=openssl-0.9.6j )"
-RDEPEND=""
-
-S=${WORKDIR}/${P}
+	ssl? ( >=dev-libs/openssl-0.9.6j )"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	# gentoo standard place for templates/configuration files
-	mv amap.h amap.h.orig
-	sed amap.h.orig -e '/archpath/ s:/usr/etc/:/usr/share/amap/:' > amap.h
+	sed -i -e '/archpath/ s:/usr/etc/:/usr/share/amap/:' amap.h
 }
 
-
 src_compile() {
 	make || die
 }
diff --git a/net-analyzer/amap/amap-4.3.ebuild b/net-analyzer/amap/amap-4.3.ebuild
index 83c0a834e2a5..7e3c7fe7b275 100644
--- a/net-analyzer/amap/amap-4.3.ebuild
+++ b/net-analyzer/amap/amap-4.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-4.3.ebuild,v 1.2 2003/11/26 17:29:40 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-4.3.ebuild,v 1.3 2004/03/21 14:04:46 mboman Exp $
 
 DESCRIPTION="A network scanning tool for pentesters"
 HOMEPAGE="http://www.thc.org/releases.php"
@@ -10,17 +10,13 @@ SLOT="0"
 KEYWORDS="x86 ~amd64 ~ia64 ~sparc ~ppc"
 IUSE="ssl"
 DEPEND="virtual/glibc
-	ssl? ( >=openssl-0.9.6j )"
-RDEPEND=""
-
-S=${WORKDIR}/${P}
+	ssl? ( >=dev-libs/openssl-0.9.6j )"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	# gentoo standard place for templates/configuration files
-	mv amap.h amap.h.orig
-	sed amap.h.orig -e 's:/usr/local/bin:/usr/share/amap:' > amap.h
+	sed -i -e 's:/usr/local/bin:/usr/share/amap:' > amap.h
 }
 
 src_compile() {