Remove old. Block sci-biology/amap (bug #248233).

Package-Manager: portage-2.2_rc40/cvs/Linux i686

7 files changed, 19 insertions, 303 deletions

diff --git a/net-analyzer/amap/ChangeLog b/net-analyzer/amap/ChangeLog
index c6f7e4fc14ab..ab3d3a5ec93a 100644
--- a/net-analyzer/amap/ChangeLog
+++ b/net-analyzer/amap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/amap
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.43 2008/03/06 17:34:15 nixnut Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.44 2009/08/25 23:59:07 jer Exp $
+
+  25 Aug 2009; Jeroen Roovers <jer@gentoo.org> -amap-4.8-r1.ebuild,
+  -files/amap-4.8-fix-icky-lvalue-casts.diff, -files/amap-4.8-gcc4.patch,
+  -amap-5.2.ebuild, amap-5.2-r1.ebuild:
+  Remove old. Block sci-biology/amap (bug #248233).
 
   06 Mar 2008; nixnut <nixnut@gentoo.org> amap-5.2-r1.ebuild:
   Stable on ppc wrt bug 212358
diff --git a/net-analyzer/amap/Manifest b/net-analyzer/amap/Manifest
index e28ffedd4ab0..ac41da432823 100644
--- a/net-analyzer/amap/Manifest
+++ b/net-analyzer/amap/Manifest
@@ -1,10 +1,5 @@
 AUX 4.8-system-pcre.patch 1232 RMD160 8bf8ea0a6327d7e58022d1b20b4f3ddc0adb2c2f SHA1 21b2d46a40f4972588cf107330c87cfc7b19bbe3 SHA256 608adf3637c8670ad5cfe4a2f69cdab5640b427f94bfed3e00df5c68dbeeca66
-AUX amap-4.8-fix-icky-lvalue-casts.diff 7058 RMD160 7f7521bd237c88c71bdc586070efa0fee0baae01 SHA1 5860ed08c2b3280fb71a9a66d0a4f30d31829cd7 SHA256 aaaf53542b885925b574ddeb4343984a4192b3c7e7be9c0534de8810ae694759
-AUX amap-4.8-gcc4.patch 2460 RMD160 56a17cc14073e3ff8ec95ac0b96dde5470f79646 SHA1 3fcf8d08670e533d4a815f08361b78ca6d75ed15 SHA256 fd68426f166315f3f767aa16937aba90893232916f0616b5ec6092e32a59805d
-DIST amap-4.8.tar.gz 258019 RMD160 bb1dd1d0b6e7de676dcf9ee368b88eef15a65ed0 SHA1 ed7e0525ef7af1f87aaba818b22bdb442f066b87 SHA256 85b6426bf6c67517d6298207ce6fdde14f9ec6ac8cbca7d43ab1c171722a0490
 DIST amap-5.2.tar.gz 262875 RMD160 4ea604ecb086f8e3cac84b45caac93b4a04eba26 SHA1 0474391a4c78040a7504bcce3b45bd926a682c41 SHA256 0ca1d5e9feab7d44af39dc058a688a0636f8e798315ee742847c4057e4467fb6
-EBUILD amap-4.8-r1.ebuild 1469 RMD160 4184978bde04fac1ffb25dc237f9eb1f2ae93ae3 SHA1 3dba7ed144487707a482ebe331ecf9b41a4fb0f4 SHA256 f199afe9eee9227f923c88e1a2328bacb516c2fa244a9d3b439e56142a97af43
-EBUILD amap-5.2-r1.ebuild 1808 RMD160 d5b05b8da10d255d4f084280c3e13ea59f8ceb3e SHA1 3ad2e0837a14ea81ca103e61bc19d06b7a4e34da SHA256 efb6e24f6418f77bb4f6874ae6505155cf2cc510f8ff662bb09f2b01d6f59e89
-EBUILD amap-5.2.ebuild 1515 RMD160 7aa09f23546a4d94cb5ec8abb1ad2fd995e43bf9 SHA1 0dedb7a0f0c3533c1f709f475a42506dd054c11a SHA256 f4a09db44a74de5d27e3b613ddf874b6838ffe1505df4d23563b92038f82b161
-MISC ChangeLog 5676 RMD160 de22253a63417742c8346723d23d724f77dda26b SHA1 78731d476fed1e48e25797a7a726ceb6373d21c4 SHA256 2994d054ec0c064fb6b4e4d5ddb7e7efb4b1d91fefb9fbef572b8e473842ab90
+EBUILD amap-5.2-r1.ebuild 1849 RMD160 2a1a5ca6bf25c7b57fbcc155576efe15d4bfbc33 SHA1 77196b2837ea115f83b504e86df5ab80b96dcb99 SHA256 eaa56dc72405247d5124f91eacac464e9aa2fcc3f8fff2a483a2baa3c8930a6f
+MISC ChangeLog 5908 RMD160 137bf2a444ee84ab7bda98c255b7f70da31e4542 SHA1 5d7d4d92f1f5f437081936d27dae3217287f6fda SHA256 23530f56799139a9e4eede13ff79375874761f340f057b30c3cf7a129e6519bc
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
diff --git a/net-analyzer/amap/amap-4.8-r1.ebuild b/net-analyzer/amap/amap-4.8-r1.ebuild
deleted file mode 100644
index 1fd8c3b7760b..000000000000
--- a/net-analyzer/amap/amap-4.8-r1.ebuild
+++ /dev/null
@@ -1,59 +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-r1.ebuild,v 1.7 2005/08/24 23:19:48 agriffis 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
-	epatch ${FILESDIR}/${P}-gcc4.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-5.2-r1.ebuild b/net-analyzer/amap/amap-5.2-r1.ebuild
index ab064f94d216..c74bcd2b25a6 100644
--- a/net-analyzer/amap/amap-5.2-r1.ebuild
+++ b/net-analyzer/amap/amap-5.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-5.2-r1.ebuild,v 1.6 2008/03/06 17:34:15 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-5.2-r1.ebuild,v 1.7 2009/08/25 23:59:07 jer Exp $
 
 inherit eutils toolchain-funcs
 
@@ -13,8 +13,14 @@ SLOT="0"
 KEYWORDS="amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="ssl"
 
-DEPEND="dev-libs/libpcre
-		ssl? ( >=dev-libs/openssl-0.9.6j )"
+DEPEND="
+	dev-libs/libpcre
+	ssl? ( >=dev-libs/openssl-0.9.6j )
+"
+RDEPEND="
+	${DEPEND}
+	!sci-biology/amap
+"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-analyzer/amap/amap-5.2.ebuild b/net-analyzer/amap/amap-5.2.ebuild
deleted file mode 100644
index 6cc84e1e529c..000000000000
--- a/net-analyzer/amap/amap-5.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-5.2.ebuild,v 1.2 2007/12/29 10:56:33 welp 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 ~x86-fbsd"
-IUSE="ssl"
-
-DEPEND="virtual/libc
-	dev-libs/libpcre
-	ssl? ( >=dev-libs/openssl-0.9.6j )"
-
-src_unpack() {
-	unpack ${A}
-	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}"/4.8-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/files/amap-4.8-fix-icky-lvalue-casts.diff b/net-analyzer/amap/files/amap-4.8-fix-icky-lvalue-casts.diff
deleted file mode 100644
index a22afecda61e..000000000000
--- a/net-analyzer/amap/files/amap-4.8-fix-icky-lvalue-casts.diff
+++ /dev/null
@@ -1,124 +0,0 @@
-diff --exclude='*~' -urN amap-4.8.orig/amap.c amap-4.8/amap.c
---- amap-4.8.orig/amap.c	2005-02-21 21:55:38.616979896 -0500
-+++ amap-4.8/amap.c	2005-02-21 22:27:37.473269400 -0500
-@@ -352,8 +352,8 @@
- 
- 
- // AMAP_MEMDUP //
--char *amap_memdup(char *string, int len) {
--  char *ptr;
-+void *amap_memdup(char *string, int len) {
-+  void *ptr;
- 
-   if (string == NULL)
-     return NULL;
-@@ -441,7 +441,7 @@
-     if ((line[0] != '#') && (index(line, ':') != NULL) && (only_trigger == NULL || strncmp(only_trigger, line, strlen(only_trigger)) == 0)) { // weed out comment lines
-       count_triggers++;
-       if (count_triggers > 1) {
--        if (((amap_struct_triggers*) trigger->next = (amap_struct_triggers*) malloc(sizeof(amap_struct_triggers))) == NULL)
-+        if ((trigger->next = malloc(sizeof(amap_struct_triggers))) == NULL)
-           amap_error("malloc failed");
-         trigger = (amap_struct_triggers*) trigger->next;
-         memset(trigger, 0, sizeof(amap_struct_triggers));
-@@ -609,7 +609,7 @@
-     if ((line[0] != '#') && (index(line, ':') != NULL)) { // weed out comment lines
-       count_responses++;
-       if (count_responses > 1) {
--        if (((amap_struct_responses*) response->next = (amap_struct_responses*) malloc(sizeof(amap_struct_responses))) == NULL)
-+        if ((response->next = malloc(sizeof(amap_struct_responses))) == NULL)
-           amap_error("malloc failed");
-         response = (amap_struct_responses*) response->next;
-         memset(response, 0, sizeof(amap_struct_responses));
-@@ -656,7 +656,7 @@
-           triggerptr_tmp->trigger = strdup(triggerptr);
-           if (i + 1 < count) {
-             triggerptr = ptr;
--            if (((amap_struct_triggerptr*) triggerptr_tmp->next = malloc(sizeof(amap_struct_triggerptr))) == NULL)
-+            if ((triggerptr_tmp->next = malloc(sizeof(amap_struct_triggerptr))) == NULL)
-               amap_error("malloc failed");
-             triggerptr_tmp = (amap_struct_triggerptr*) triggerptr_tmp->next;
-             triggerptr_tmp->next = NULL;
-@@ -728,7 +728,7 @@
-       if (opt->verbose > 1)
-         printf("%d/%s ", port_tmp->port, port_tmp->ip_prot == AMAP_PROTO_TCP ? "tcp" : "udp");
-       if (pto != pfrom) {
--        if (((amap_struct_ports *) port_tmp->next = (amap_struct_ports *) malloc(sizeof(amap_struct_ports))) == NULL)
-+        if ((port_tmp->next = malloc(sizeof(amap_struct_ports))) == NULL)
-           amap_error("malloc failed");
-         port_tmp = (amap_struct_ports *) port_tmp->next;
-         memset(port_tmp, 0, sizeof(amap_struct_ports));
-@@ -768,7 +768,7 @@
-       amap_error("line in nmap file is too long or not terminating with \\n: %s", line);
-     if ((line[0] == 'H') && (index(line, ' ') != NULL) && ((portinfo = strstr(line, "/open/")) != NULL)) { // just care for data lines
-       if (count != 0) {
--        if (((amap_struct_targets*) target->next = (amap_struct_targets*) malloc(sizeof(amap_struct_targets))) == NULL)
-+        if ((target->next = malloc(sizeof(amap_struct_targets))) == NULL)
-           amap_error("malloc failed");
-         target = (amap_struct_targets*) target->next;
-         memset(target, 0, sizeof(amap_struct_targets));
-@@ -809,7 +809,7 @@
-       if (opt->verbose > 1)
-         printf("%d/%s ", port_tmp->port, port_tmp->ip_prot == AMAP_PROTO_TCP ? "tcp" : "udp");
-       while ((portinfo = strstr(proto + 1, "/open/")) != NULL) {
--        if (((amap_struct_ports *) port_tmp->next = (amap_struct_ports *) malloc(sizeof(amap_struct_ports))) == NULL)
-+        if ((port_tmp->next = malloc(sizeof(amap_struct_ports))) == NULL)
-           amap_error("malloc failed");
-         port_tmp = (amap_struct_ports *) port_tmp->next;
-         memset(port_tmp, 0, sizeof(amap_struct_ports));
-@@ -1024,7 +1024,7 @@
-   } else {
-     while (ids->next != NULL)
-       ids = (amap_struct_identifications*) ids->next;
--    if (((char *) ids->next = malloc(sizeof(amap_struct_identifications))) == NULL)
-+    if ((ids->next = malloc(sizeof(amap_struct_identifications))) == NULL)
-       amap_error("malloc failed");
-     ids = (amap_struct_identifications*) ids->next;
-   }
-@@ -1765,7 +1765,7 @@
-                   fcntl(s, F_SETFL, O_NONBLOCK);
-                   coms[i].timer = time(NULL);
-                   coms[i].socket = s;
--                  (char*) coms[i].sockaddr = amap_memdup((char *) &target_in, sizeof(target_in));
-+                  coms[i].sockaddr = amap_memdup((char *) &target_in, sizeof(target_in));
-                   coms[i].sockaddr_len = sizeof(target_in);
-                   scaninfo.running++;
-                   errno = 0;
-@@ -2098,7 +2098,7 @@
-       port_tmp = amap_add_port_string(port_tmp, argv[optind + 1], cmd_proto, &opt);
-       i = optind + 2;
-       while (i < argc) {
--        if (((amap_struct_ports *) port_tmp->next = (amap_struct_ports *) malloc(sizeof(amap_struct_ports))) == NULL)
-+        if ((port_tmp->next = malloc(sizeof(amap_struct_ports))) == NULL)
-           amap_error("malloc failed");
-         port_tmp = (amap_struct_ports *) port_tmp->next;
-         memset(port_tmp, 0, sizeof(amap_struct_ports));
-@@ -2110,7 +2110,7 @@
-       while (strcmp(target_tmp->target, argv[optind]) != 0 && target_tmp->next != NULL)
-         target_tmp = (amap_struct_targets *) target_tmp->next;
-       if (strcmp(target_tmp->target, argv[optind]) != 0) { // it is not
--        if (((amap_struct_targets *) target_tmp->next = (amap_struct_targets *) malloc(sizeof(amap_struct_targets))) == NULL)
-+        if ((target_tmp->next = malloc(sizeof(amap_struct_targets))) == NULL)
-           amap_error("malloc failed");
-         target_tmp = (amap_struct_targets *) target_tmp->next;
-         memset(target_tmp, 0, sizeof(amap_struct_targets));
-@@ -2125,7 +2125,7 @@
-           printf("%d/%s ", port_tmp->port, port_tmp->ip_prot == AMAP_PROTO_TCP ? "tcp" : "udp");
-         i = optind + 2;
-         while (i < argc) {
--          if (((amap_struct_ports *) port_tmp->next = (amap_struct_ports *) malloc(sizeof(amap_struct_ports))) == NULL)
-+          if ((port_tmp->next = malloc(sizeof(amap_struct_ports))) == NULL)
-             amap_error("malloc failed");
-           port_tmp = (amap_struct_ports *) port_tmp->next;
-           memset(port_tmp, 0, sizeof(amap_struct_ports));
-@@ -2155,7 +2155,7 @@
-             while (((port_tmp->ip_prot != cmd_proto) || (port_tmp->port != (unsigned short int) pfrom)) && port_tmp->next != NULL)
-               port_tmp = (amap_struct_ports *) port_tmp->next;
-             if (port_tmp->port != (unsigned short int) pfrom) { // we have to add the port
--              if (((amap_struct_ports *) port_tmp->next = (amap_struct_ports *) malloc(sizeof(amap_struct_ports))) == NULL)
-+              if ((port_tmp->next = malloc(sizeof(amap_struct_ports))) == NULL)
-                 amap_error("malloc failed");
-               port_tmp = (amap_struct_ports *) port_tmp->next;
-               memset(port_tmp, 0, sizeof(amap_struct_ports));
-Files amap-4.8.orig/.amap.c.swp and amap-4.8/.amap.c.swp differ
-Files amap-4.8.orig/.amap.h.swp and amap-4.8/.amap.h.swp differ
diff --git a/net-analyzer/amap/files/amap-4.8-gcc4.patch b/net-analyzer/amap/files/amap-4.8-gcc4.patch
deleted file mode 100644
index 33ce822f233c..000000000000
--- a/net-analyzer/amap/files/amap-4.8-gcc4.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- amap-4.8/amap.c	2005-04-10 14:28:06.000000000 -0300
-+++ amap-4.8.new/amap.c	2005-04-10 14:23:00.000000000 -0300
-@@ -424,7 +424,7 @@
-   f = amap_open_file(filename, "trigger", extension, opt->verbose);
-   if (opt->verbose > 1)
-     printf("\n");
--  if (((amap_struct_triggers*) triggers = (amap_struct_triggers*) trigger = (amap_struct_triggers*) malloc(sizeof(amap_struct_triggers))) == NULL)
-+  if ((triggers = trigger = (amap_struct_triggers*) malloc(sizeof(amap_struct_triggers))) == NULL)
-     amap_error("malloc failed");
-   memset(trigger, 0, sizeof(amap_struct_triggers));
- 
-@@ -599,7 +599,7 @@
-   f = amap_open_file(filename, "response", extension, opt->verbose);
-   if (opt->verbose > 1)
-     printf("\n");
--  if (((amap_struct_responses*) responses = (amap_struct_responses*) response = (amap_struct_responses*) malloc(sizeof(amap_struct_responses))) == NULL)
-+  if ((responses = response = (amap_struct_responses*) malloc(sizeof(amap_struct_responses))) == NULL)
-     amap_error("malloc failed");
-   memset(response, 0, sizeof(amap_struct_responses));
- 
-@@ -644,7 +644,7 @@
-         for (i = 0; i < strlen(triggerptr); i++)
-           if (triggerptr[i] == ',')
-             count++;
--        if (((amap_struct_triggerptr*) triggerptr_tmp = response->triggerptr = malloc(sizeof(amap_struct_triggerptr))) == NULL)
-+        if ((triggerptr_tmp = response->triggerptr = malloc(sizeof(amap_struct_triggerptr))) == NULL)
-           amap_error("malloc failed");
-         triggerptr_tmp->next = NULL;
-         
-@@ -756,7 +756,7 @@
-   int count = 0;
- 
-   f = amap_open_file(filename, "nmap", "", opt->verbose);
--  if (((amap_struct_targets*) targets = (amap_struct_targets*) target = (amap_struct_targets*) malloc(sizeof(amap_struct_targets))) == NULL)
-+  if ((targets = target = (amap_struct_targets*) malloc(sizeof(amap_struct_targets))) == NULL)
-     amap_error("malloc failed");
-   memset(target, 0, sizeof(amap_struct_targets));
-   if ((port_tmp = target->ports = (amap_struct_ports *) malloc(sizeof(amap_struct_ports))) == NULL)
-@@ -2057,7 +2057,7 @@
-       responses_tmp = (amap_struct_responses*) responses_tmp->next;
-     }
-   } else {
--    if (((amap_struct_triggers*) triggers = (amap_struct_triggers*) malloc(sizeof(amap_struct_triggers))) == NULL)
-+    if (( triggers = (amap_struct_triggers*) malloc(sizeof(amap_struct_triggers))) == NULL)
-       amap_error("malloc failed");
-     triggers->next = NULL;
-     triggers->id = strdup("NULL");