5.2 version bump, remove old ebuild.

(Portage version: 2.0.54)

5 files changed, 34 insertions, 23 deletions

diff --git a/net-analyzer/amap/ChangeLog b/net-analyzer/amap/ChangeLog
index caa77e4192f3..99e3a6c8e5b8 100644
--- a/net-analyzer/amap/ChangeLog
+++ b/net-analyzer/amap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/amap
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.33 2005/08/24 23:19:48 agriffis Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.34 2006/01/16 01:28:57 vanquirius Exp $
+
+*amap-5.2 (16 Jan 2006)
+
+  16 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> -amap-4.7.ebuild,
+  +amap-5.2.ebuild:
+  5.2 version bump, remove old ebuild. Note that amap -W still flunks.
 
   24 Aug 2005; Aron Griffis <agriffis@gentoo.org> amap-4.8-r1.ebuild:
   stable on ia64
diff --git a/net-analyzer/amap/Manifest b/net-analyzer/amap/Manifest
index ab5efb40505b..325fc6b18214 100644
--- a/net-analyzer/amap/Manifest
+++ b/net-analyzer/amap/Manifest
@@ -1,15 +1,17 @@
-MD5 a7ef9e440df41ddc5e145e15c5c970dd amap-4.8-r1.ebuild 1469
-MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
-MD5 bf0cd3ae53ef3b3f2ef5bab3e309c44b amap-5.1.ebuild 1545
 MD5 96e68368c08bcb4ac7a513695e34c615 ChangeLog 4520
 MD5 701ffa0a03c07892f770bf5419333da4 amap-4.7.ebuild 1393
+MD5 a7ef9e440df41ddc5e145e15c5c970dd amap-4.8-r1.ebuild 1469
 MD5 b0265c3d76a497de4fe39103e10973ca amap-5.0.ebuild 1543
+MD5 bf0cd3ae53ef3b3f2ef5bab3e309c44b amap-5.1.ebuild 1545
+MD5 c12c57f44d7ffff67d533a1b2b826e91 amap-5.2.ebuild 1508
+MD5 c1c1d543f5427e6ccf71fe8648a6b322 files/4.7-system-pcre.patch 1155
 MD5 a11774428cb7e97a81107a22682d1798 files/4.8-system-pcre.patch 1232
-MD5 b078c53b085eba48231c7df7123766b5 files/amap-5.0-gcc4.patch 15883
-MD5 6a77a9ce3b2272dff2d409eccdf38833 files/digest-amap-4.8-r1 60
-MD5 cc27dde4b08677a49290c397dc162be8 files/amap-4.8-gcc4.patch 2460
-MD5 8af326d838e7d5807c2891ddf8d3817e files/digest-amap-5.1 60
 MD5 36fabda09cbfbb3c4c9eab818e99a501 files/amap-4.8-fix-icky-lvalue-casts.diff 7058
+MD5 cc27dde4b08677a49290c397dc162be8 files/amap-4.8-gcc4.patch 2460
+MD5 b078c53b085eba48231c7df7123766b5 files/amap-5.0-gcc4.patch 15883
 MD5 0650e1a8429fc7f1febbffe8435ed1c4 files/digest-amap-4.7 60
+MD5 6a77a9ce3b2272dff2d409eccdf38833 files/digest-amap-4.8-r1 60
 MD5 e557979284a669fda0ca792fc9fc7ad5 files/digest-amap-5.0 60
-MD5 c1c1d543f5427e6ccf71fe8648a6b322 files/4.7-system-pcre.patch 1155
+MD5 8af326d838e7d5807c2891ddf8d3817e files/digest-amap-5.1 60
+MD5 0b7cb125cb06c7b694fa7b8bbbd88988 files/digest-amap-5.2 60
+MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
diff --git a/net-analyzer/amap/amap-4.7.ebuild b/net-analyzer/amap/amap-5.2.ebuild
index c848a6260cfb..659bdce6bc4e 100644
--- a/net-analyzer/amap/amap-4.7.ebuild
+++ b/net-analyzer/amap/amap-5.2.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-4.7.ebuild,v 1.8 2005/04/09 08:29:02 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-5.2.ebuild,v 1.1 2006/01/16 01:28:57 vanquirius Exp $
 
 inherit eutils
 
 DESCRIPTION="A network scanning tool for pentesters"
-HOMEPAGE="http://www.thc.org/releases.php"
-SRC_URI="http://packetstormsecurity.nl/groups/thc/${P}.tar.gz"
+HOMEPAGE="http://www.thc.org/thc-amap/"
+SRC_URI="http://www.thc.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ssl"
 
 DEPEND="virtual/libc
@@ -19,14 +19,17 @@ DEPEND="virtual/libc
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	sed -i \
-		-e 's:/usr/local:/usr:' \
-		-e '/AMAP_APPDEF_PATH/s:/bin:/share/amap:' \
-		amap.h || die "sed amap.h failed"
-
+	cd "${S}"
+
+	chmod 755 .
+	sed -i -e "s:etc/:share/amap/:g" \
+		amap-lib.c || die "sed amap-lib.c failed"
+	sed -i 's:/usr/local:/usr:' amap.h || die "sed amap.h failed"
+	sed -i '/DATADIR/s:/etc:/share/amap:' \
+		Makefile.am || die "sed Makefile.am failed"
 	rm -rf pcre-3.9
-	epatch ${FILESDIR}/${PV}-system-pcre.patch
+
+	epatch "${FILESDIR}"/4.8-system-pcre.patch
 }
 
 src_compile() {
diff --git a/net-analyzer/amap/files/digest-amap-4.7 b/net-analyzer/amap/files/digest-amap-4.7
deleted file mode 100644
index 030a187c647b..000000000000
--- a/net-analyzer/amap/files/digest-amap-4.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c2ce244321b0b7b5eb28fdc785452b9a amap-4.7.tar.gz 253217
diff --git a/net-analyzer/amap/files/digest-amap-5.2 b/net-analyzer/amap/files/digest-amap-5.2
new file mode 100644
index 000000000000..e1394ae6a62c
--- /dev/null
+++ b/net-analyzer/amap/files/digest-amap-5.2
@@ -0,0 +1 @@
+MD5 e3b1f5ebd24aac03aacb38ec183eb426 amap-5.2.tar.gz 262875