removing old ebuilds, marking 4.8-r1 x86 stable

(Portage version: 2.0.51.19)

8 files changed, 14 insertions, 183 deletions

diff --git a/net-analyzer/amap/ChangeLog b/net-analyzer/amap/ChangeLog
index 96840bfdc4f5..156aa609e130 100644
--- a/net-analyzer/amap/ChangeLog
+++ b/net-analyzer/amap/ChangeLog
@@ -1,6 +1,11 @@
 # 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.27 2005/05/05 09:22:16 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.28 2005/05/07 16:12:32 vanquirius Exp $
+
+  07 May 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -files/4.6-system-pcre.patch, -amap-4.6.ebuild, amap-4.8-r1.ebuild,
+  -amap-4.8.ebuild:
+  Removing old ebuilds, marking 4.8-r1 x86 stable.
 
   05 May 2005; Daniel Black <dragonheart@gentoo.org> amap-5.0.ebuild:
   now compiles with FEATURES=userpriv
diff --git a/net-analyzer/amap/Manifest b/net-analyzer/amap/Manifest
index acc3de3339c2..338b5947126c 100644
--- a/net-analyzer/amap/Manifest
+++ b/net-analyzer/amap/Manifest
@@ -1,28 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 701ffa0a03c07892f770bf5419333da4 amap-4.7.ebuild 1393
-MD5 6f1e34801a7ab85b6284cfeb3f889c29 amap-4.6.ebuild 1393
+MD5 908c9ef05de0940c4ccca971f3da1f94 amap-4.8-r1.ebuild 1476
+MD5 b0265c3d76a497de4fe39103e10973ca amap-5.0.ebuild 1543
 MD5 a6ec2cad71b78312a76e1e1354120ebe ChangeLog 3878
-MD5 b839623bdffcf9474859bbca266230bd amap-4.8.ebuild 1438
 MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
-MD5 462f671e891cbf251fc2dd267c60b785 amap-4.8-r1.ebuild 1477
-MD5 b0265c3d76a497de4fe39103e10973ca amap-5.0.ebuild 1543
 MD5 0650e1a8429fc7f1febbffe8435ed1c4 files/digest-amap-4.7 60
-MD5 a5f16a887d88f7d685dbaed470ee6ec8 files/digest-amap-4.6 60
+MD5 e557979284a669fda0ca792fc9fc7ad5 files/digest-amap-5.0 60
 MD5 c1c1d543f5427e6ccf71fe8648a6b322 files/4.7-system-pcre.patch 1155
-MD5 c50165b5bb6fb19a617df68f6001d98d files/4.6-system-pcre.patch 1103
-MD5 a11774428cb7e97a81107a22682d1798 files/4.8-system-pcre.patch 1232
-MD5 36fabda09cbfbb3c4c9eab818e99a501 files/amap-4.8-fix-icky-lvalue-casts.diff 7058
-MD5 6a77a9ce3b2272dff2d409eccdf38833 files/digest-amap-4.8 60
-MD5 cc27dde4b08677a49290c397dc162be8 files/amap-4.8-gcc4.patch 2460
 MD5 6a77a9ce3b2272dff2d409eccdf38833 files/digest-amap-4.8-r1 60
 MD5 b078c53b085eba48231c7df7123766b5 files/amap-5.0-gcc4.patch 15883
-MD5 e557979284a669fda0ca792fc9fc7ad5 files/digest-amap-5.0 60
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCeeXYmdTrptrqvGERArCmAKCSpN+xHDHTkiKVzVEO8xqy7V7DCwCfYbK1
-LTBwXWzXfd6wkXdDX/dujAQ=
-=tiWo
------END PGP SIGNATURE-----
+MD5 cc27dde4b08677a49290c397dc162be8 files/amap-4.8-gcc4.patch 2460
+MD5 a11774428cb7e97a81107a22682d1798 files/4.8-system-pcre.patch 1232
+MD5 36fabda09cbfbb3c4c9eab818e99a501 files/amap-4.8-fix-icky-lvalue-casts.diff 7058
diff --git a/net-analyzer/amap/amap-4.6.ebuild b/net-analyzer/amap/amap-4.6.ebuild
deleted file mode 100644
index d6f034c5e3de..000000000000
--- a/net-analyzer/amap/amap-4.6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-4.6.ebuild,v 1.3 2005/01/25 10:30:14 ka0ttic 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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
-IUSE="ssl"
-
-DEPEND="virtual/libc
-	dev-libs/libpcre
-	ssl? ( >=dev-libs/openssl-0.9.6j )"
-
-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"
-
-	rm -rf pcre-3.9
-	epatch ${FILESDIR}/${PV}-system-pcre.patch
-}
-
-src_compile() {
-	# has it's own stupid custom configure script
-	./configure || die "configure failed"
-	sed -i \
-		-e '/^XDEFINES=/s:=.*:=:' \
-		-e '/^XLIBS=/s:=.*:=:' \
-		-e '/^XLIBPATHS/s:=.*:=:' \
-		-e '/^XIPATHS=/s:=.*:=:' \
-		Makefile || die "pruning vars"
-	if use ssl ; then
-		sed -i \
-			-e '/^XDEFINES=/s:=:=-DOPENSSL:' \
-			-e '/^XLIBS=/s:=:=-lcrypto -lssl:' \
-			Makefile || die "adding ssl"
-	fi
-	emake OPT="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	dobin amap amapcrap || die "dobin failed"
-	insinto /usr/share/amap
-	doins appdefs.* || die "doins failed"
-
-	doman ${PN}.1
-	dodoc README TODO CHANGES
-}
diff --git a/net-analyzer/amap/amap-4.8-r1.ebuild b/net-analyzer/amap/amap-4.8-r1.ebuild
index 524e6aef7666..4429c9f27f67 100644
--- a/net-analyzer/amap/amap-4.8-r1.ebuild
+++ b/net-analyzer/amap/amap-4.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-4.8-r1.ebuild,v 1.1 2005/04/10 17:37:02 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-4.8-r1.ebuild,v 1.2 2005/05/07 16:12:32 vanquirius Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ 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
diff --git a/net-analyzer/amap/amap-4.8.ebuild b/net-analyzer/amap/amap-4.8.ebuild
deleted file mode 100644
index 3af3e06d5d71..000000000000
--- a/net-analyzer/amap/amap-4.8.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-4.8.ebuild,v 1.2 2005/04/07 20:54:35 vanquirius Exp $
-
-inherit eutils
-
-DESCRIPTION="A network scanning tool for pentesters"
-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"
-IUSE="ssl"
-
-DEPEND="virtual/libc
-	dev-libs/libpcre
-	ssl? ( >=dev-libs/openssl-0.9.6j )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i \
-		-e 's:/usr/local:/usr:' \
-		-e '/AMAP_APPDEF_PATH/s:/etc:/share/amap:' \
-		amap.h || die "sed amap.h failed"
-
-	rm -rf pcre-3.9
-	epatch ${FILESDIR}/${PV}-system-pcre.patch
-	epatch ${FILESDIR}/${P}-fix-icky-lvalue-casts.diff
-}
-
-src_compile() {
-	# has it's own stupid custom configure script
-	./configure || die "configure failed"
-	sed -i \
-		-e '/^XDEFINES=/s:=.*:=:' \
-		-e '/^XLIBS=/s:=.*:=:' \
-		-e '/^XLIBPATHS/s:=.*:=:' \
-		-e '/^XIPATHS=/s:=.*:=:' \
-		Makefile || die "pruning vars"
-	if use ssl ; then
-		sed -i \
-			-e '/^XDEFINES=/s:=:=-DOPENSSL:' \
-			-e '/^XLIBS=/s:=:=-lcrypto -lssl:' \
-			Makefile || die "adding ssl"
-	fi
-	emake OPT="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	dobin amap amapcrap || die "dobin failed"
-	insinto /usr/share/amap
-	doins appdefs.* || die "doins failed"
-
-	doman ${PN}.1
-	dodoc README TODO CHANGES
-}
diff --git a/net-analyzer/amap/files/4.6-system-pcre.patch b/net-analyzer/amap/files/4.6-system-pcre.patch
deleted file mode 100644
index 95e1c8b14fc0..000000000000
--- a/net-analyzer/amap/files/4.6-system-pcre.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ur amap-4.6.orig/Makefile.am amap-4.6/Makefile.am
---- amap-4.6.orig/Makefile.am	2004-09-27 09:36:40.792243656 -0400
-+++ amap-4.6/Makefile.am	2004-09-27 09:36:40.928222984 -0400
-@@ -1,11 +1,11 @@
- CC=gcc
--LIB=-lpcre -L./pcre-3.9/ -I./pcre-3.9/
-+LIB=-lpcre
- OPT=-O2
- OPT_DEBUG=-ggdb -Wall -lefence
- DIR=/bin
- SCRIPTS=appdefs.trig appdefs.resp appdefs.rpc
- MANPAGE=amap.1
--all:	pcre strip
-+all:	amap amapcrap
- 
- pcre:
- 	cd pcre-3.9 && make
-diff -ur amap-4.6.orig/amap-inc.h amap-4.6/amap-inc.h
---- amap-4.6.orig/amap-inc.h	2004-09-27 09:36:40.789244112 -0400
-+++ amap-4.6/amap-inc.h	2004-09-27 09:36:40.930222680 -0400
-@@ -20,7 +20,7 @@
- #include <errno.h>
- #include <sys/resource.h>
- #include <sys/wait.h>
--#include "pcre-3.9/pcre.h"
-+#include <pcre.h>
- #ifdef OPENSSL
-  #include <openssl/ssl.h>
-  #include <openssl/err.h>
-diff -ur amap-4.6.orig/configure amap-4.6/configure
---- amap-4.6.orig/configure	2004-09-27 09:36:40.795243200 -0400
-+++ amap-4.6/configure	2004-09-27 09:36:53.814264008 -0400
-@@ -13,9 +13,6 @@
-   exit 0
- fi
- 
--cd pcre-3.9 || exit 1
--./configure || exit 1
--cd ..
- 
- echo
- echo
diff --git a/net-analyzer/amap/files/digest-amap-4.6 b/net-analyzer/amap/files/digest-amap-4.6
deleted file mode 100644
index 773e2e3e73f3..000000000000
--- a/net-analyzer/amap/files/digest-amap-4.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5af4b9342eb78c5d5db2492aab9a37a7 amap-4.6.tar.gz 252938
diff --git a/net-analyzer/amap/files/digest-amap-4.8 b/net-analyzer/amap/files/digest-amap-4.8
deleted file mode 100644
index 81a50fc78fa3..000000000000
--- a/net-analyzer/amap/files/digest-amap-4.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 db6f6aa06afc6aeea7c7e0c594c73b69 amap-4.8.tar.gz 258019