gentoo resync : 10.11.2019

21 files changed, 141 insertions, 294 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 602f8d3ec106..f768f8681bc5 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/fwanalog/Manifest b/net-firewall/fwanalog/Manifest
deleted file mode 100644
index 61af46d8f501..000000000000
--- a/net-firewall/fwanalog/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fwanalog-0.6.4.tar.gz 128787 BLAKE2B db0aa3a8b9a3b779f96505117b23642bd43816715527f8a01208c8deb3de9abc1a05669fb395c9bf6d0f6e30ac63e609d9792e5d3c01c7279431f776b43e933d SHA512 953ca03c070e82370dc2a993c19113b4a92f89be6a0d77edbbcb722420c9fc28d3f4bb454441c3e82f36eb27584ff88090beab18c095051a2e8ef7bc28b52da2
-EBUILD fwanalog-0.6.4.ebuild 953 BLAKE2B 31900226b322ea76ec7e7383f62ebc0fba27fa9db797b69d7acb4b4db096283e7ca9d39555e2fdda70134190ed41dce7a744c9990ed7e435ada8c5d995f7766a SHA512 e3665b286b4a9250aa24d698d2fc29f21798bf7acefd5d8849503493d3a721ee5008e79b7a56b3b40a0be7c163beb06af016b5170fb9336aa73e7fa335aec1d7
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-firewall/fwanalog/fwanalog-0.6.4.ebuild b/net-firewall/fwanalog/fwanalog-0.6.4.ebuild
deleted file mode 100644
index 8ffa0f00ba05..000000000000
--- a/net-firewall/fwanalog/fwanalog-0.6.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Script to parse firewall logs and analyze them with Analog"
-HOMEPAGE="http://tud.at/programm/fwanalog/"
-SRC_URI="http://tud.at/programm/fwanalog/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND="" # this is just a bash script
-RDEPEND="app-shells/bash
-	sys-apps/grep
-	virtual/awk
-	sys-apps/sed
-	app-arch/gzip
-	sys-apps/diffutils
-	dev-lang/perl
-	>=app-admin/analog-5.31"
-
-src_install() {
-	insinto /etc/fwanalog
-
-	insopts -m0700 ; doins fwanalog.sh
-
-	insopts -m0600
-	doins fwanalog-dom.tab fwanalog.lng services.conf
-	doins fwanalog.analog.conf fwanalog.analog.conf.local
-	newins fwanalog.opts.linux24 fwanalog.opts
-
-	dosed "s/\"zegrep\"/\"egrep\"/" /etc/fwanalog/fwanalog.opts
-
-	dodoc CONTRIBUTORS ChangeLog README
-	docinto support ; dodoc support/*
-	docinto langfiles ; dodoc langfiles/*
-}
diff --git a/net-firewall/fwanalog/metadata.xml b/net-firewall/fwanalog/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-firewall/fwanalog/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-firewall/fwipsec/Manifest b/net-firewall/fwipsec/Manifest
deleted file mode 100644
index 55441035b79b..000000000000
--- a/net-firewall/fwipsec/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fwipsec-0.4.2.tar.bz2 13114 BLAKE2B 3f3ade1dd10eeccea57b6c85b7b36a7f6b0e0ada509964bd4e624e9e4d7cf898576deab205c0047b34bb2d08d0bb4af5e914a93ff990a6cf4930a5b4222399b8 SHA512 752af6b937f6b08b3613f50c789911dd09b1648c57b9ab613fe98922c9f38043a1cee9b45a94f02b51031f3ef4feefc29f192beafec4506202925f71f8e82d0d
-EBUILD fwipsec-0.4.2-r1.ebuild 645 BLAKE2B f1bdf92ea4e1d5b2b34749be82a43f6660930f769540c603df2c14392bc3bc74cb95746f5fc39399b66b320a59e11f598439c681e66c97e08e41ec31346c221f SHA512 4a688c704a3400a041af12ee62a9019e40b1290d644d2ffc85a9f61ce231b6470e96bc20a3d0de9a5f7f672e8950b410402fed80d397eff79fe63529ff9857f4
-MISC metadata.xml 244 BLAKE2B 34722265ebb2e6b9d26e0098923142b7cc32172faa2f079ddfde7f7737534000261a06e7b67ebccb4290283e166e929fda60264916515e731326715585c26b0b SHA512 b7e666d8c442cf743a0945509197a8ade888c22a0b6f175af937185df2649c05bbbd95e3bff0c33da81bf393899d7b8552fbd27d42dd18572119d5e61f1410e3
diff --git a/net-firewall/fwipsec/fwipsec-0.4.2-r1.ebuild b/net-firewall/fwipsec/fwipsec-0.4.2-r1.ebuild
deleted file mode 100644
index 311c2cf7fdd8..000000000000
--- a/net-firewall/fwipsec/fwipsec-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="Firewall scripts that control iptables, FreeS/WAN, and squid"
-HOMEPAGE="http://fwipsec.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ~ppc ~sparc x86"
-
-DEPEND=">=net-firewall/iptables-1.2.7
-		sys-apps/iproute2"
-
-src_install() {
-	exeinto /etc/fwipsec
-	doexe fwipsec.*
-	doinitd fwipsec
-
-	dodoc LICENSE DOCS/README*
-	doman DOCS/*.5
-}
-
-pkg_postinst() {
-	elog "Edit /etc/fwipsec/fwipsec.defs to set your base rules."
-}
diff --git a/net-firewall/fwipsec/metadata.xml b/net-firewall/fwipsec/metadata.xml
deleted file mode 100644
index 30534ef172e2..000000000000
--- a/net-firewall/fwipsec/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">fwipsec</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-firewall/fwknop/Manifest b/net-firewall/fwknop/Manifest
index 3f79edcce261..e6f0abbc8143 100644
--- a/net-firewall/fwknop/Manifest
+++ b/net-firewall/fwknop/Manifest
@@ -2,6 +2,8 @@ AUX fwknopd.confd 475 BLAKE2B 46c87fd251ab4bf57a35a6604e01a5a0ac80bdaca0c00f0fc8
 AUX fwknopd.init 2706 BLAKE2B 561cc62b1e557d425648947c25751dfb2fe323b04cb96ea1d05e395cbe1cd61466e11689f93d02569545057e43fedfa405558106bf687c2b16cd9c7bde9928a1 SHA512 6e58cb40bd2c69b624fa5bb320f79e6befd91bc39e4aa66ec0b2a2a014b9342377ea919b364cf52cfda76b924d5d497a79b0d66f2e0c7339894b75bfa9e165fa
 AUX fwknopd.service 235 BLAKE2B c46c01121a745ee46a5415654c0ba422531008ed52915833712f748026eda3afd8019d6ec6bb86434b40ad273a4cc46115d3a64a73b621731ec68f3bad92dc41 SHA512 890bbba586183275cbd3b420a9c0d609ff3eca0fd239b4af97e2730e2790f317fc114f51d60107ba4fbddd2cabb60c70d8b615e2a75bb80cf27d352c894a1c6d
 AUX fwknopd.tmpfiles.conf 31 BLAKE2B 81d88d9bb1fd826c242b2815e1a6c0e5a300f22e19dd65ad67e114d692731cb532162ac877f0239879ebfcf0432d61053adcddd2c234d85ed60bf33720b22dcc SHA512 73b56a42c7728c9dabd82cd81bd6ffa1b948fe80fa67feee348ad65f957f1f2ea53c6b5d74fa2784ea75c45c2c27b5d989da4a618f3a4cf67914c927e04b74ae
+DIST fwknop-2.6.10.tar.gz 1988197 BLAKE2B d4c2010c64ab160f0edc02e2b1530749ee47ff6ed16d6b556d366daef7ce5e22ef38fbbbf6e8cfaa14e0d9706ba2b65937b03c70b54b3429ff1732ae33c1852c SHA512 3b3e35eda574abd1759431c88677eea7078c54cb3252c0ee0e1019b5b8224ed8844d30760da70a952e1cd92b04715a547f6effabda54678f791fff9afa32cd80
 DIST fwknop-2.6.9.tar.gz 3043542 BLAKE2B 11440fa0fe5e990a269587fa9ee1da0242f3dc939d6dc185d6adff9e9c995a8ffe902a6351a057c619cb6ff056519caea38f7b865978fe5ac810a39281bb3fc3 SHA512 4706560d44c911c8604059d88dded9c1b8c333399d90ec7dc366c0fba96c79680bdbf1b8b5e76cc34aaf3a1e58fff80db8f5f20c96d57481bdb476a9b99f4d1b
+EBUILD fwknop-2.6.10.ebuild 3547 BLAKE2B 6e8fe513e25749fad0dde47ea4e28cdfb0c2f878684dc2b8c8adf74d88678afd4316ad63c60770044e33e584cc2a9844204ce4e2d1af5a3865959ae79caab06f SHA512 18ec5b1ce8632f81b3bbf13d08d2275120b9e364d2d764446393840b5ba7003842a2f3df74cc35d48b4a90167d2c7f56a3878af53e52cd0a704465fc180d6c7c
 EBUILD fwknop-2.6.9-r1.ebuild 3691 BLAKE2B babb21cf1329d59180d03fca97865bdee9d50cb3e10ab3e837784078ebbd4110791c7832f9db32ed9126518cae0c5d74a9bac13d0f0409ddce36aaa8e9bed62f SHA512 ee6a6065e916cf745dfa9e8903166ab0de571138720134568349767f9f63ea0b00d5991a2b29206279f17d0e2968fb573195d3191c89bd0d1b2ca34c21a18473
-MISC metadata.xml 1018 BLAKE2B c8ebfede556ff455c9ecb0548ce0d7668be39bedaca89449bc28565bdf11a78119e7797861ede4cfe1fab2302d534aea6a4bf0cce49cc213b1052d7d737575d5 SHA512 c0f5cf642da2b03bcb7c1a0563fadf90300e2d79f9b2f48ffafe58c64f66f8438a6c6c8c224203d4eb24c146a26883577800002d7fb9c5bd822b4055e0bb9219
+MISC metadata.xml 1217 BLAKE2B 2b44d1d81f7d4bc625c3130cf29328fce6d85fbeedfb5376146dad93b020f03440f620e68187fa1ffd496fdff0cedaa6f02d015578ec0620070ea97029b9eec8 SHA512 b215b1ad55f6ba7e9f4ac316916241ec2084bcd2e3e5ca6a7d81c935df6affdbc36066914b1bb4d984333e005a57f54c6c8f07013a4e14e465f9dd6dbc6c93d2
diff --git a/net-firewall/fwknop/fwknop-2.6.10.ebuild b/net-firewall/fwknop/fwknop-2.6.10.ebuild
new file mode 100644
index 000000000000..41a07f7c1a83
--- /dev/null
+++ b/net-firewall/fwknop/fwknop-2.6.10.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Python extension supports only Python 2.
+# See https://github.com/mrash/fwknop/issues/167
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools distutils-r1 eutils linux-info readme.gentoo-r1 systemd
+
+DESCRIPTION="Single Packet Authorization and Port Knocking application"
+HOMEPAGE="https://www.cipherdyne.org/fwknop/"
+SRC_URI="https://www.cipherdyne.org/fwknop/download/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+client extras firewalld gdbm gpg +iptables nfqueue python +server udp-server"
+
+DEPEND="
+	client? ( net-misc/wget[ssl] )
+	firewalld? ( net-firewall/firewalld[${PYTHON_USEDEP}] )
+	gdbm? ( sys-libs/gdbm )
+	gpg? (
+		app-crypt/gpgme
+		dev-libs/libassuan
+		dev-libs/libgpg-error
+	)
+	iptables? ( net-firewall/iptables )
+	nfqueue? ( net-libs/libnetfilter_queue )
+	python? ( ${PYTHON_DEPS} )
+	server? ( !nfqueue? ( !udp-server? ( net-libs/libpcap ) ) )
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="
+	nfqueue? ( server )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	server? ( ^^ ( firewalld iptables ) )
+	udp-server? ( server )
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="
+Example configuration files were installed to '${EPREFIX}/etc/fwknopd/'.
+Please edit them to suit your needs and then remove the .example suffix.
+
+fwknopd supports several backends: firewalld, iptables, ipfw, pf, ipf.
+You can set the desired backend via FIREWALL_EXE option in fwknopd.conf
+instead of the default one chosen at compile time.
+"
+
+src_prepare() {
+	default_src_prepare
+
+	# Install example configs with .example suffix.
+	if use server; then
+		sed -i -e 's|conf;|conf.example;|g' Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}/run"
+		$(use_enable client)
+		$(use_enable !gdbm file-cache)
+		$(use_enable nfqueue nfq-capture)
+		$(use_enable server)
+		$(use_enable udp-server)
+		$(use_with gpg gpgme)
+	)
+	use firewalld && myeconfargs+=(--with-firewalld="${EPREFIX}/usr/sbin/firewalld")
+	use iptables && myeconfargs+=(--with-iptables="${EPREFIX}/sbin/iptables")
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default_src_install
+
+	if use extras; then
+		dodoc extras/apparmor/usr.sbin.fwknopd
+		dodoc extras/console-qr/console-qr.sh
+		dodoc extras/fwknop-launcher/*
+	fi
+
+	if use server; then
+		newinitd "${FILESDIR}/fwknopd.init" fwknopd
+		newconfd "${FILESDIR}/fwknopd.confd" fwknopd
+		systemd_dounit "${FILESDIR}/fwknopd.service"
+		systemd_newtmpfilesd "${FILESDIR}/fwknopd.tmpfiles.conf" fwknopd.conf
+		readme.gentoo_create_doc
+	fi
+
+	if use python; then
+		# Redefine DOCS, otherwise distutils-r1 eclass interferes.
+		local DOCS=()
+		cd python || die
+		distutils-r1_src_install
+	fi
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+	if use server; then
+		readme.gentoo_print_elog
+
+		if ! linux_config_exists || ! linux_chkconfig_present NETFILTER_XT_MATCH_COMMENT; then
+			echo
+			ewarn "fwknopd daemon relies on the 'comment' match in order to expire"
+			ewarn "created firewall rules, which is an important security feature."
+			ewarn "Please enable NETFILTER_XT_MATCH_COMMENT support in your kernel."
+			echo
+		fi
+		if use nfqueue && \
+			! linux_config_exists || ! linux_chkconfig_present NETFILTER_XT_TARGET_NFQUEUE; then
+			echo
+			ewarn "fwknopd daemon relies on the 'NFQUEUE' target for NFQUEUE mode."
+			ewarn "Please enable NETFILTER_XT_TARGET_NFQUEUE support in your kernel."
+			echo
+		fi
+	fi
+}
diff --git a/net-firewall/fwknop/metadata.xml b/net-firewall/fwknop/metadata.xml
index 096122a1ea1e..abed2bc853d1 100644
--- a/net-firewall/fwknop/metadata.xml
+++ b/net-firewall/fwknop/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>hlein@korelogic.com</email>
+		<name>Hank Leininger</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="client">Build fwknop client</flag>
 		<flag name="extras">Install utility scripts and AppArmor policy for fwknopd</flag>
diff --git a/net-firewall/pftop/Manifest b/net-firewall/pftop/Manifest
deleted file mode 100644
index d1e685055635..000000000000
--- a/net-firewall/pftop/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST pftop-0.7-patches-3.tar.bz2 10611 BLAKE2B 1baccf91dad77dc2e8313f910f45eae19181791efab20af7398a421050f9ea239d975f52d4746a5d7d8b8245cf20913bda28e3541eb0a83549583b985842b118 SHA512 7c8f438e8fc1c507313cf9fe69da2b27bdc57e4cf27b8b0d6153fb0c269d417a59ff93cd74987809b131ae2d148b659ca00d93da1346a515b11c1d8bbfc67f1f
-DIST pftop-0.7.tar.gz 59765 BLAKE2B e2d753c2a8580eb62b76d0c3ab4a6614ade922de9fdcf31c948cbab691a1f6520da8724371489a5913daf334ae21cb2a8ec04c1b07fb26376115874a5433a886 SHA512 e9be01704adc112bd1f5dc011f7900754d600df6be50e28ee4a937faabe00b627ed4d1565e92560d750e70f5117533c494565f616f3562eae61301642d438713
-EBUILD pftop-0.7-r2.ebuild 1224 BLAKE2B 0fe3c4cb2e2f9fa7a34fcd87484ca6c969d2014e808f4fa729d591f2a30ee957311857072b7e89bf529b50ffdfc9022c2b887acb704aff839a44bc4a7edf5459 SHA512 8c3f6d2175d60bd3947356654a3f4c3186667cd2be177dc36f46697c62485dcbbcd8197f2574a65f58ee9432d54a29c7bc48a28811d2f0769650a71daaca9361
-MISC metadata.xml 274 BLAKE2B f0991bf3798eb13100d0b57c52f72b7e8d5f2f14fa77089ba7a152dea469267c02869e57c72e49136bd2045bae689706aff0e75eff3caed6b30f404407a15b82 SHA512 1dc28fd9f50a7167a6a63321444d2f691f5f35c59d7f79621a3e2b60bdc4632652688f16eec66e8e7197a12d02fa718404ff73d337d6a971c2074a006a45a5a7
diff --git a/net-firewall/pftop/metadata.xml b/net-firewall/pftop/metadata.xml
deleted file mode 100644
index 14471d2862db..000000000000
--- a/net-firewall/pftop/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="altq">Enable altq(4) support — alternate queuing of network packets.</flag>
-	</use>
-</pkgmetadata>
diff --git a/net-firewall/pftop/pftop-0.7-r2.ebuild b/net-firewall/pftop/pftop-0.7-r2.ebuild
deleted file mode 100644
index eef79663b6c4..000000000000
--- a/net-firewall/pftop/pftop-0.7-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-PATCH_PV=3
-
-inherit bsdmk flag-o-matic eutils
-
-DESCRIPTION="Tool for real-time display of active states and rule statistics for pf"
-HOMEPAGE="http://www.eee.metu.edu.tr/~canacar/pftop/"
-SRC_URI="http://www.eee.metu.edu.tr/~canacar/${P}.tar.gz
-	mirror://gentoo/${P}-patches-${PATCH_PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="altq"
-
-RDEPEND="sys-libs/ncurses"
-
-src_prepare() {
-	epatch "${WORKDIR}"/patches/*
-}
-
-src_compile() {
-	# OS_LEVEL variable refers to the version of pf shipped with OpenBSD.
-	# On FreeBSD we have to know it.
-	local OSLEVEL
-
-	case ${CHOST} in
-		*-openbsd*)
-			local obsdver=${CHOST/*-openbsd/}
-			OSLEVEL=${obsdver//.}
-			;;
-		*-freebsd[78]*)	OSLEVEL=41 ;;
-		*-freebsd9*)	OSLEVEL=45 ;;
-		*)
-			die "Your OS/Version is not supported (${CHOST}), please report."
-			;;
-	esac
-	append-flags "-DHAVE_SNPRINTF -DHAVE_VSNPRINTF -DOS_LEVEL=${OSLEVEL}"
-	use altq && append-flags "-DHAVE_ALTQ"
-	mkmake LOCALBASE="/usr" CFLAGS="${CFLAGS}" || die "pmake failed"
-}
-
-src_install() {
-	mkinstall DESTDIR="${D}" LOCALBASE="/usr" MANDIR="/usr/share/man/man" \
-		NO_MANCOMPRESS= install || die
-}
diff --git a/net-firewall/quicktables/Manifest b/net-firewall/quicktables/Manifest
deleted file mode 100644
index f571c1b85900..000000000000
--- a/net-firewall/quicktables/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST quicktables-2.3.tar.gz 20287 BLAKE2B ab556b218566adefc710ae17d89dc84b0276081ee3edb063d88c2334c716d6aeeec2efc1bc4966c58310eec305178693faaec04b85371eb52d1f4a3f778b0377 SHA512 4a2a7c98d353724b845a8c474c39a2759a51ad4dae38a327d2db614a9e872ca3d1d05b150ab1e6815d461ec575590c5793a9342300524197fd9a52d294e55766
-EBUILD quicktables-2.3.ebuild 426 BLAKE2B 8b926f3b21e28ea2cde8749ea0093aaa5badad6f22de22df5d91872273097bb3a1e59a1091be9635a2681801047bd6e168f84d71569df9f4acac58a8eccad4d3 SHA512 78532076da759517f008c9244d421179eaa22bd79db9252817971266a352c4c125b5d5edba7e930f19676eaebf2b0d5b85505e3671f5b04258493db2803f56ba
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-firewall/quicktables/metadata.xml b/net-firewall/quicktables/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-firewall/quicktables/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-firewall/quicktables/quicktables-2.3.ebuild b/net-firewall/quicktables/quicktables-2.3.ebuild
deleted file mode 100644
index 5068e5d69a46..000000000000
--- a/net-firewall/quicktables/quicktables-2.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="a quick iptables script generator"
-HOMEPAGE="http://qtables.radom.org/"
-SRC_URI="http://qtables.radom.org/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-IUSE=""
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-
-RDEPEND="net-firewall/iptables"
-
-src_install() {
-	dosbin quicktables-2.3 || die
-	dodoc changes readme todo
-}
diff --git a/net-firewall/shapecfg/Manifest b/net-firewall/shapecfg/Manifest
deleted file mode 100644
index e33d2d64bfcf..000000000000
--- a/net-firewall/shapecfg/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX README.shaper 1698 BLAKE2B c87c4ba675a7fade1fc86e5cc6d78290e27365496e31bc468c65295b84b9bbb8648fddedcb17dd0923dc16b7deeb23b3d400ab33f7ddfa13d8faf10ecb116d8f SHA512 1c71dec95441defe5353a481639788a024a4bdff413958362989c784eeeecc098f4edea7a94f5c643cd83fd0ec8a24c321985579596c766e468f34e9b1c74f47
-AUX shapercfg-2.0.36-glibc.patch 372 BLAKE2B 545cb5df4d1a9c3a7de71800b7f9305904669c3baf25d5dc458ce28ddd228197784920429b138c8a80842a9dfd8c1c28c79d7c2e0e75886745b5c2ef2201c3dd SHA512 d9fae6594a0992fda9cc11c9c395be37f72ea8e2f3cfdf05a4657f98dfec8787f031c4b1a2725b970a1c6467c60e682beb5478e6bce1e987ddbde531d693ce42
-DIST shaper.36.tar.gz 671 BLAKE2B 545f6dcf75187294ec1f09a8b12e15f2ff4da6bc8766d91f1ff6c0fb0c3ea2aecd4a045b021921cd301892c36848957da9171191b828c0a363b82edad86e17ae SHA512 5e2e7149b68e8256ec7d38c9bf5bd9de53867a9b5c859610ed21c3edbef458ba28e9bb3a3d95ee2f048483b5ca3020d474eeb15bac161eb14b3726212b9216fe
-EBUILD shapecfg-36.ebuild 729 BLAKE2B bd8e07d69bd1fe9dea732da5a0ad4d279aa3bb49ed3bba0501f4fa1b9fb2dfa2e9413dd704ad4194fa6f6484d39b0fa96fe7e997236098cf3d64af837ba98480 SHA512 ba5c4b64da3d198c5d3b608bd9fe9bcfbeed8d4ac1bd15e1f70ae014c544abb897eba6d46bd15f7f752e46693e3fbee9c3bac8eb4cf7987187be4194f3ecc1a0
-MISC metadata.xml 244 BLAKE2B fcc265125d0849eb0a093b0d57d57b20b95e0424df24e9f2be2697a0560a08f77d787c84cba6d10c2e6e32f824402f485b6339b42fc33b56f7ce2daf5c2e4a76 SHA512 d922092251c07becd0effd06de2ed063038394b7396c9a303e4e234ac514ec7a3c9f00e76503f4bb435ac5dce5401f3d05495def1ce94d63fa9d823dda1e3a54
diff --git a/net-firewall/shapecfg/files/README.shaper b/net-firewall/shapecfg/files/README.shaper
deleted file mode 100644
index 60c2b4d6afb6..000000000000
--- a/net-firewall/shapecfg/files/README.shaper
+++ /dev/null
@@ -1,50 +0,0 @@
-
-Traffic Shaper For Linux
-
-This is the current ALPHA release of the traffic shaper for Linux. It works
-within the following limits:
-
-o       Minimum shaping speed is currently about 9600 baud (it can only
-	shape down to 1 byte per clock tick)
-
-o       Maximum is about 256K, it will go above this but get a bit blocky.
-
-o       If you ifconfig the master device that a shaper is attached to down
-	then your machine will follow.
-
-o       The shaper must be a module.
-
-
-Setup:
-
-A shaper device is configured using the shapeconfig program.
-Typically you will do something like this
-
-shapecfg attach shaper0 eth1
-shapecfg speed shaper0 64000
-ifconfig shaper0 myhost netmask 255.255.255.240 broadcast 1.2.3.4.255 up
-route add -net some.network netmask a.b.c.d dev shaper0
-
-The shaper should have the same IP address as the device it is attached to
-for normal use.
-
-Gotchas:
-
-        The shaper shapes transmitted traffic. It's rather impossible to
-shape received traffic except at the end (or a router) transmitting it.
-
-        Gated/routed/rwhod/mrouted all see the shaper as an additional device
-and will treat it as such unless patched. Note that for mrouted you can run
-mrouted tunnels via a traffic shaper to control bandwidth usage.
-
-        The shaper is device/route based. This makes it very easy to use
-with any setup BUT less flexible. You may well want to combine this patch
-with Mike McLagan 's patch to allow routes to be
-specified by source/destination pairs.
-
-        There is no "borrowing" or "sharing" scheme. This is a simple
-traffic limiter. I'd like to implement Van Jacobson and Sally Floyd's CBQ
-architecture into Linux one day (maybe in 2.1 sometime) and do this with
-style.
-
-
diff --git a/net-firewall/shapecfg/files/shapercfg-2.0.36-glibc.patch b/net-firewall/shapecfg/files/shapercfg-2.0.36-glibc.patch
deleted file mode 100644
index 3fb6a36ae50b..000000000000
--- a/net-firewall/shapecfg/files/shapercfg-2.0.36-glibc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- shaper/shapecfg.c.glibc	Tue Sep 29 20:24:02 1998
-+++ shaper/shapecfg.c	Tue Sep 29 20:29:27 1998
-@@ -3,9 +3,9 @@
- #include <stdlib.h>
- #include <linux/types.h>
- #include <netinet/in.h>
--#include <linux/if.h>
--#include <linux/if_shaper.h>
--#include <linux/sockios.h>
-+#include <net/if.h>
-+#include <net/if_shaper.h>
-+#include <sys/ioctl.h>
- 
- void usage(char *name)
- {	
diff --git a/net-firewall/shapecfg/metadata.xml b/net-firewall/shapecfg/metadata.xml
deleted file mode 100644
index 30d444a41f42..000000000000
--- a/net-firewall/shapecfg/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">cbqinit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-firewall/shapecfg/shapecfg-36.ebuild b/net-firewall/shapecfg/shapecfg-36.ebuild
deleted file mode 100644
index a187ab54e4ca..000000000000
--- a/net-firewall/shapecfg/shapecfg-36.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="configuration tool for setting traffic bandwidth parameters"
-HOMEPAGE="ftp://archive.download.redhat.com/pub/redhat/linux/9/en/os/i386/SRPMS https://sourceforge.net/projects/cbqinit"
-SRC_URI="mirror://gentoo/shaper.${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}/shaper
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/shapercfg-2.0.36-glibc.patch
-	rm -f Makefile
-}
-
-src_compile() {
-	append-flags -Wall
-	emake shapecfg || die
-}
-
-src_install() {
-	dobin shapecfg || die
-	dodoc "${FILESDIR}"/README.shaper
-}