8 files changed, 23 insertions, 54 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index ef6d7d799fbe..69cf58d2d815 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/dnsenum/Manifest b/net-analyzer/dnsenum/Manifest
index f849be324cc5..4da070ae81a8 100644
--- a/net-analyzer/dnsenum/Manifest
+++ b/net-analyzer/dnsenum/Manifest
@@ -1,3 +1,4 @@
+AUX dnsenum-1.2.2-remove-extension.patch 1658 BLAKE2B 6a8e8f05bf05689fcb8c969a3a5cc48e46014f3a33f56ff7d9f9f6a13c01e836d85edb1c4cccd0e3cd6e4aeb463371de94e16ce92e62d23d4a56bbeecef884d4 SHA512 4b1ed39cbb64d7742a2e3f6f101c9191609bf87577dfbc927251d8952b41275245a119da68a588964f6921a3a879eb417537c9221b0489838f8c0fcb862533dd
 DIST dnsenum-1.2.2.tar.gz 902708 BLAKE2B 4ce8b9b4f641949f9d06f60e452b3c9cfc32819a6d3aa0bdcbb37c58ef22b2dcfd4b3805e5b9a1a264326ddf1f24e4b68b6cb8b2bc7ee4f7ac5ae11017da8aab SHA512 3915be8e3ddf1102520594fcb1a41506401c662175455414226165e473844fa94f8577e68395586bfbf7e97b7c5a29e20e1ad63bb40a214c53e141afe66eddd6
-EBUILD dnsenum-1.2.2.ebuild 649 BLAKE2B e05120a7393f95cadb15828ea646665cd0e87672c48be3ee20cf4e9ce2e000d8490779299cff4c49536885da68359bfdc6a5f27c0f2a550694df40521edc0ceb SHA512 c3f7a5fdd6e38035f21299acb2dfdd397d5068ef4922c773270984820636535bc90ab14e996b5c913dde769d0a27fc8fdc4068dac306403f06d4860219c064e8
+EBUILD dnsenum-1.2.2.ebuild 621 BLAKE2B 969af8445379070a812f7a8dcd2b74ab78a57ff70705f45223e2efcbc6cc946e3df8b17629cfce7e1398338c491219541179eaa452da83788982685cdd1f58bd SHA512 65ade6f95db47ac345136ae0ee171040976be9d29511769c686a576f72916a1b45855408bb9e615d7a4f9f6a8d9e77184b2de7729b7de14b98f966acc8d3d1c2
 MISC metadata.xml 329 BLAKE2B fc1f2f97306518f3fdf12bbe290e7920f98215984f6f04b95cb3a239189ddeab4608b53fd26507572d3f405c3f27b28ea7e13fe338b07f24b5f5fd7c66714024 SHA512 e8b9f19561e78a4337a22ca88ba7829ad12062ff2b648272134a30888cae43df4ad618987a6be873c0998dda53b58c2de1a4d794a522bcc5d933800e185ca586
diff --git a/net-analyzer/dnsenum/dnsenum-1.2.2.ebuild b/net-analyzer/dnsenum/dnsenum-1.2.2.ebuild
index 166ae344f4ec..ac19ef55f4d4 100644
--- a/net-analyzer/dnsenum/dnsenum-1.2.2.ebuild
+++ b/net-analyzer/dnsenum/dnsenum-1.2.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="A perl script to enumerate DNS from a server"
 HOMEPAGE="https://github.com/fwaeytens/dnsenum"
@@ -10,10 +10,9 @@ SRC_URI="https://dnsenum.googlecode.com/files/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND=""
-RDEPEND="dev-perl/Net-DNS
+RDEPEND="
+	dev-perl/Net-DNS
 	dev-perl/Net-IP
 	dev-perl/Net-Netmask
 	dev-perl/Net-Whois-IP
@@ -23,11 +22,9 @@ RDEPEND="dev-perl/Net-DNS
 
 S="${WORKDIR}"
 
-src_prepare() {
-	sed -i 's|dnsenum.pl|dnsenum|g' dnsenum.pl || die
-}
+PATCHES=( "${FILESDIR}"/${PN}-1.2.2-remove-extension.patch )
 
-src_install () {
+src_install() {
 	dodoc *.txt
 	newbin ${PN}.pl ${PN}
 }
diff --git a/net-analyzer/knocker/Manifest b/net-analyzer/knocker/Manifest
index 1bdbcc61dabf..e8137607816f 100644
--- a/net-analyzer/knocker/Manifest
+++ b/net-analyzer/knocker/Manifest
@@ -2,6 +2,5 @@ AUX knocker-0.7.1-fency.patch 5350 BLAKE2B 936b898918d794e3065eec8d867e467246c5b
 AUX knocker-0.7.1-free.patch 607 BLAKE2B c19a36088b6cdce6b9e79555c349871e0aa47a9bcd9285cfa8944a267548e20fdc7df6f27c6dc3d8d123a8350b108325bbe754984b4cc9a05764a31daffc894c SHA512 f1f237747394a2ca6b14105be5461c98e441ecd3c4da0c1475ac6dfa717d2a0b004d3fb702b026b45f5f873c88d3f60b4fd5234dd445fd27346c95bc4c5c5671
 AUX knocker-0.7.1-knocker_user_is_root.patch 221 BLAKE2B 45143bc54b31b1cce735499836682cc006dc2288bd927bf2269713582c3189ebd6ebf468bd019b00b8a31aa47f6f423b0a2c5fbc70719bb663c49ff525f6b6ce SHA512 42b4d4de839e0a606d091909f7bbba0031a6e337fa7b766bb737fd60006afdc87c368cdb642e9bf14ee1d7d0c5bd7b6193006ab0240230f819b67df155f1822d
 DIST knocker-0.7.1.tar.gz 72132 BLAKE2B a6eb8e37354df630481f809c77e98f1c9dab3290b8a34e1a3c7bbfc5f3d0f41b9a1f97a8f5a8afef7e1ec0c5afa444e908b8d50eeaedf08a384e86cda1c7b182 SHA512 e65d615235328c027e1c6179a11bee186fa3d173205850e8b9fac591819e344de770d968c2667f1a18bef88cf90422c357bf76b9d05a8915629977cb8e334cc2
-EBUILD knocker-0.7.1-r2.ebuild 593 BLAKE2B b4d34997e8b8784ffdf3effef0d47f47259999cbc53323d754e0296a7c655ab70a283234f4c97cedfd7641d01ed95a4ffb3f5c0d72aca82da3817f7dbb6784ee SHA512 023fe82a6fa348ef9810f0c3e451f8dcbb2a25e8d5d81b1d715fbecf9d20b2d0c831ac8640cf585a7618caa2ab5e1bed6a0742e52bc6f62a53685d0c0513ad18
-EBUILD knocker-0.7.1-r3.ebuild 575 BLAKE2B ed2ab3b60e0309b24ba287adab10d2f7d53109f358c7c0c33f64750d25496d1851f30e9628d7984cc2179a244e0cae0e16d5e399383582e65937fb0af366c2d0 SHA512 ca3e9cc58c364b72652f2444b3083870c5f5e8b2af8769173aff1d6fe17fe296467007c4baf94725dc95c138ef333a8d88ebd784de4fbed1efc8d61564de1812
+EBUILD knocker-0.7.1-r3.ebuild 573 BLAKE2B 10d6aac45c603c55882c6a473603c0e083d6ef2f1314c1e47b3e7181ea0536339d38f2baa9db70a744503b818056c5cb026d4d2245d9de17a9a9f99bd8ef2bfe SHA512 c7fc5a7d144276829f3e6e4abbd9fb2adbdbc4768afdc32fb7ec97677c41c2453a3f6ed95b31f902d73c8efd9438c0db4dc8fb7f066095ca3e70d002017c2c87
 MISC metadata.xml 357 BLAKE2B 14daef425c693f2b57dd70d7aea0b0e854305052d7751386339e4a34c47b6ff574cc9cfbce4986bab92e639e51760addf85a3517594621f991ba4c148d416ed2 SHA512 e74b8f089a05b739cd6e7864802a5e6759b416d41f122e45ea529feadd69ecd04aff2ed695687710eba64dc24087f4fd364dbda33b59f9983aa453c3d699ba69
diff --git a/net-analyzer/knocker/knocker-0.7.1-r2.ebuild b/net-analyzer/knocker/knocker-0.7.1-r2.ebuild
deleted file mode 100644
index f8f17e39bcb8..000000000000
--- a/net-analyzer/knocker/knocker-0.7.1-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit base toolchain-funcs
-
-DESCRIPTION="Knocker is an easy to use security port scanner written in C"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://knocker.sourceforge.net"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DOCS="AUTHORS BUGS ChangeLog NEWS README TO-DO"
-
-PATCHES=( "${FILESDIR}"/${P}-free.patch )
-
-src_prepare() {
-	# fix configure checks for compiler, wrt bug #442962
-	tc-export CC
-
-	base_src_prepare
-}
diff --git a/net-analyzer/knocker/knocker-0.7.1-r3.ebuild b/net-analyzer/knocker/knocker-0.7.1-r3.ebuild
index 9731d03bf7b7..30d70e219a09 100644
--- a/net-analyzer/knocker/knocker-0.7.1-r3.ebuild
+++ b/net-analyzer/knocker/knocker-0.7.1-r3.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit base toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Knocker is an easy to use security port scanner written in C"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://knocker.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
-DOCS=( AUTHORS BUGS ChangeLog NEWS README TO-DO )
+PATCHES=(
+	"${FILESDIR}"/${P}-fency.patch
+	"${FILESDIR}"/${P}-free.patch
+	"${FILESDIR}"/${P}-knocker_user_is_root.patch
+)
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-fency.patch \
-		"${FILESDIR}"/${P}-free.patch \
-		"${FILESDIR}"/${P}-knocker_user_is_root.patch
+DOCS=( AUTHORS BUGS ChangeLog NEWS README TO-DO )
 
+src_configure() {
 	tc-export CC
+	default
 }
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 4ecab8f7f1cb..926cc7de8221 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -11,5 +11,5 @@ DIST wireshark-3.2.1.tar.xz 31522124 BLAKE2B 49a83f6c99d54b7a0910f5ace4b46caac68
 EBUILD wireshark-3.0.3.ebuild 6555 BLAKE2B 15e190ef89a4ec08342d68ae383b100294d5e63a9f5ada2bbd895419f9aca1c0d9008ba02e8e22a5c23f5d7dd1c63d248de6d8ab8d24a1320ee637801786b661 SHA512 e4e20eb5b47aa02831626969d93672798dd460dcea865818b840d7b9f18f1d2a83b14d4bacb81543eb999f838c429536605cc9a478fff069e9ee4d6241da3387
 EBUILD wireshark-3.0.7.ebuild 6593 BLAKE2B a296ff8807c208aa809e5aca04a7e2c9b1ad30f8287eb6c5dd765a34771f67a3410dfe76d2f73793958ccdc93c95ffa0d8cd0d80a96196c0e8b39ebaef1710b7 SHA512 761798113a2db0ce1c37c70f115987c60e5a99bde42ca85662ba141108d857d94de05e9c0b37d4a4c9b4a02e59a3389b30f56b0490a6b707e580ec033af672f9
 EBUILD wireshark-3.2.1.ebuild 6787 BLAKE2B b6b458d9170660f4dbb04f21bf2c3bfaaa4de1398a06e7912ad876d957fb926def74042c0149b0f482d192c48c48d5749a3145ed0e442bbd7fb7101891251cad SHA512 a9049918fb39372acb1cd70743948d12092af48dac36984d5b47e13e0e5c59ab35bbaa33aff366998b41d899b651048e22b4c061cd8feb20449015b6b30e585d
-EBUILD wireshark-99999999.ebuild 6732 BLAKE2B 126ed5c6b185754d36ec76d60118911ad9e37021c1b10d73b1d59c32710a32f4d4808957a26b72e806de4698d066aef325edfd8faa2798b23f58ad7912bfe65c SHA512 442a910a5df8f91085af414cf48037826490dc06fc3d55f17ce3e7ebba4965d6c3e5940c41e6b6da221e21847386e7c60963eb2e37e5fc103650365fa2639108
+EBUILD wireshark-99999999.ebuild 6689 BLAKE2B b2454aa1c3134927a6f2bdd7c3efa745575c1aecad6ba512631ff694fb2be8082dcea6d15d50d5553e97565b1b397217869b2ac8385ba44a3e7481e607117af2 SHA512 023c11adbcdddb2a241fd4cb8019430a99536b5493f2835273774f0201ff151370fb3ff7414497457a8998fd8a485ce1ef723720bb35bad47fae2f1af450abd4
 MISC metadata.xml 4963 BLAKE2B b3c0a51c2ffc96313fe46be2f4b970c0a22d7b479a3701a717531f7b9c46ff5b00b1d3a29a54295abb90989226afb679f2d4842c2ade5f4f1c2d7923121591b8 SHA512 03cdfa1a78a23ae572eb0eacf787b1edba135541ab94d899dad77c6f0d482d9303fa0168033a3a60a8e12dd54506999ea5bd323dc0a90c58d87d8640bda139d2
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index eb3257e5fc4c..4e0c85ef50a3 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -83,7 +83,6 @@ REQUIRED_USE="
 	plugin-ifdemo? ( plugins )
 "
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.4-androiddump.patch
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
 	"${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
 	"${FILESDIR}"/${PN}-99999999-about_dialog-plugins_add_description.patch