commit:     9007ea9ed20c439028fb059dffd77163fb3c5b14
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  8 10:27:10 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sat Jan  8 10:32:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9007ea9e

net-analyzer/amap: treeclean

Closes: https://bugs.gentoo.org/680546
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 net-analyzer/amap/Manifest                    |  1 -
 net-analyzer/amap/amap-5.4-r1.ebuild          | 82 ---------------------------
 net-analyzer/amap/files/4.8-system-pcre.patch | 45 ---------------
 net-analyzer/amap/metadata.xml                |  8 ---
 profiles/package.mask                         |  6 --
 5 files changed, 142 deletions(-)

diff --git a/net-analyzer/amap/Manifest b/net-analyzer/amap/Manifest
deleted file mode 100644
index df01ea68a292..000000000000
--- a/net-analyzer/amap/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST amap-5.4.tar.gz 263331 BLAKE2B 
683bcdd1ebb22dcd74c2ac20147ec5e5fe2bafb2452abda22a9a95c4d8fe1955394067b9a3765344674b48979cd56a99251d6359cd0247ac623da756a017a220
 SHA512 
e1a9f03940eded3eedad0028786f4ea6c18077072d52eb2f843ef0b4ff736bf1766c4bdb4eff52d3a8f6038d8f795e39be1c15bcae8283ddae8f40a7fff8647d

diff --git a/net-analyzer/amap/amap-5.4-r1.ebuild 
b/net-analyzer/amap/amap-5.4-r1.ebuild
deleted file mode 100644
index 17fd129b9fa7..000000000000
--- a/net-analyzer/amap/amap-5.4-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A network scanning tool for pentesters"
-HOMEPAGE="https://www.thc.org/thc-amap/";
-SRC_URI="https://www.thc.org/releases/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="ssl"
-
-DEPEND="
-       dev-libs/libpcre
-       ssl? ( dev-libs/openssl:0= )
-"
-RDEPEND="
-       ${DEPEND}
-       !sci-biology/amap
-"
-
-PATCHES=(
-       "${FILESDIR}"/4.8-system-pcre.patch
-)
-
-src_prepare() {
-       rm -r pcre-3.9 || die
-
-       sed -i -e "s:etc/:share/amap/:g" amap-lib.c || die
-
-       # Above change requires below change. See sources...
-       sed -i '/strlen(AMAP_PREFIX/s: 5 : 12 :' amap-lib.c || die
-       sed -i 's:/usr/local:/usr:' amap.h || die
-
-       # Files to be updated are at different location, bug 207839.
-       sed -i '/AMAP_RESOURCE/s:www:freeworld:' amap.h || die
-
-       sed -i '/DATADIR/s:/etc:/share/amap:' Makefile.am || die
-
-       default
-}
-
-src_configure() {
-       # non-autotools configure script
-       ./configure || die
-
-       sed -i \
-               -e '/^XDEFINES=/s:=.*:=:' \
-               -e '/^XLIBS=/s:=.*:=:' \
-               -e '/^XLIBPATHS/s:=.*:=:' \
-               -e '/^XIPATHS=/s:=.*:=:' \
-               -e "/^CC=/d" \
-               Makefile || die
-
-       if use ssl ; then
-               sed -i \
-                       -e '/^XDEFINES=/s:=:=-DOPENSSL:' \
-                       -e '/^XLIBS=/s:=:=-lcrypto -lssl:' \
-                       Makefile || die
-       fi
-
-       sed -i Makefile \
-               -e '/-o amap/{s|(OPT) |(OPT) $(LDFLAGS) |g}' \
-               || die
-}
-
-src_compile() {
-       emake CC=$(tc-getCC) OPT="${CFLAGS}"
-}
-
-src_install() {
-       dobin amap amapcrap
-       insinto /usr/share/amap
-       doins appdefs.*
-
-       doman ${PN}.1
-       dodoc README TODO CHANGES
-}

diff --git a/net-analyzer/amap/files/4.8-system-pcre.patch 
b/net-analyzer/amap/files/4.8-system-pcre.patch
deleted file mode 100644
index 097bfbf45eb5..000000000000
--- a/net-analyzer/amap/files/4.8-system-pcre.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --exclude='*~' -urN amap-4.8.orig/amap-inc.h amap-4.8/amap-inc.h
---- amap-4.8.orig/amap-inc.h   2005-02-21 21:47:47.251638320 -0500
-+++ amap-4.8/amap-inc.h        2005-02-21 21:48:27.774477912 -0500
-@@ -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 --exclude='*~' -urN amap-4.8.orig/configure amap-4.8/configure
---- amap-4.8.orig/configure    2005-02-21 21:47:47.240639992 -0500
-+++ amap-4.8/configure 2005-02-21 21:48:41.379409648 -0500
-@@ -13,10 +13,6 @@
-   exit 0
- fi
- 
--cd pcre-3.9 || exit 1
--./configure || exit 1
--cd ..
--
- echo
- echo
- echo "Starting amap auto configuration ..."
-diff --exclude='*~' -urN amap-4.8.orig/Makefile.am amap-4.8/Makefile.am
---- amap-4.8.orig/Makefile.am  2005-02-21 21:47:47.242639688 -0500
-+++ amap-4.8/Makefile.am       2005-02-21 21:49:16.070135856 -0500
-@@ -1,5 +1,5 @@
- CC=gcc
--LIB=-lpcre -L./pcre-3.9/ -I./pcre-3.9/
-+LIB=-lpcre
- OPT=-O2
- OPT_DEBUG=-ggdb -Wall -lefence
- BINDIR=/bin
-@@ -7,7 +7,7 @@
- MANDIR=/man/man1
- SCRIPTS=appdefs.trig appdefs.resp appdefs.rpc
- MANPAGE=amap.1
--all:  pcre strip
-+all:  amap amapcrap
- 
- pcre:
-       cd pcre-3.9 && make

diff --git a/net-analyzer/amap/metadata.xml b/net-analyzer/amap/metadata.xml
deleted file mode 100644
index dce3f3be66c0..000000000000
--- a/net-analyzer/amap/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<maintainer type="project">
-       <email>[email protected]</email>
-       <name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 31cb2c95d84e..e798dcbe3f3b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -243,12 +243,6 @@ sci-biology/picard
 >=dev-libs/intel-compute-runtime-21.47.21710
 >=dev-util/intel-graphics-compiler-1.0.9389
 
-# Jonas Stein <[email protected]> (2021-12-01)
-# Removal on 2022-01-01.
-# Disbanded by upstream who sugessted to
-# use nmap instead many years ago. (bug #680546)
-net-analyzer/amap
-
 # Sam James <[email protected]> (2021-12-01)
 # OSL 12 is a development release (for now).
 # Doesn't work with LLVM 13 yet; mask to help

Reply via email to