gentoo resync : 20.03.2021

3 files changed, 14 insertions, 37 deletions

diff --git a/net-analyzer/cutter/Manifest b/net-analyzer/cutter/Manifest
index 5d6eaf469fef..056528b40f93 100644
--- a/net-analyzer/cutter/Manifest
+++ b/net-analyzer/cutter/Manifest
@@ -1,6 +1,4 @@
 AUX cutter-1.03-debian.patch 5160 BLAKE2B 1e3b007515aea319b66843b232d731a8f0264908e50e6e3521760cb2925302d106ed2fe56aa17121cc34cde43df9021b6dc14f9247708b72afe80849ac5fbc57 SHA512 05eb0c5819687bbc6de4f4467013bae16b5faf470da062a847fe74cb0abf27fadf62dcf76760f43096db446a11f1b40107dd94c6003e24b50d5a3150a87327b6
-DIST cutter-1.03.tgz 13176 BLAKE2B d879d849be77c34d3e1882cbe500be71e631a5047116828ab07f8ab07b5bbb853e19b6e8b7dd5c42a73ce7b5c2825228cbeae07ec875e83da7bd1bd1c6f34a7a SHA512 821e8abf496e22b86bdd855fb1c9c51648a276ebb572edd2ccb172ae7025a38794df37dfe153c1807785ecec279c34b9df5e2bcc2de582b3a88ee3776cf46eea
 DIST cutter-1.04.tgz 13680 BLAKE2B 373e5e0c0fb14224974ff399c7db0a69dc5568394a881be2c285437050a1ec4cfb26acbcdd593d22519f34a32760bdbe342a96c2a4d55547f7c06bc49806e228 SHA512 79c17ec8c17e696a79aa8b11fda347f2e6929eb35f9a37da450acf6aff7ab9471e13eaef24708f90f3f0c2791fade2eb944443b98df3d3ae4eef0c408abc7b3a
-EBUILD cutter-1.03-r1.ebuild 640 BLAKE2B b6cc80c6ea0f78894b3b22c8dfcf4f46245ffbe209251883db23f48324684b69c37229f1dc3cab3872d57e5773bbcef80a9874affd4c6b6d2a35db02fba34afe SHA512 852a2a7eaf494ab58a29226aaf592626b0cca232583dff4995699a8ea3ad8aab074a5908da58ab0277f7647a70cf749d7712dd6bf2f5e0e65178a9833428ceca
-EBUILD cutter-1.04.ebuild 648 BLAKE2B 7fc4314ea247ceb100b14fbc2bda8eff9c85870b2f79c8af8f1854f476d92aa8d610f4d41279c2d2f73bce2e97a11c157d20d11f8be850cf0f8facca6fb0229b SHA512 bcde52fb15a880c4f80fd2b2d8e6c5ae4a077681733d44fb98d026cecce257e665cc53810ff3d23c5591f985ae6713e5bde77cd7a5d09f053ab137557c8ae985
+EBUILD cutter-1.04.ebuild 661 BLAKE2B d38e59539f25d53c7e583f524bd14bd180e712b985e96e349bd6d005f506310ce0ad6d0b5cc2502e1a70afde343357dc545ce2c454b83c051c5ac7056df1e31a SHA512 36c08faa41b64a7ff139bc7399b91ac753c065e5ebaae55a61e16f2e8209423ead051d625641f22b6166b8bf534a07daeb0c662f95f9b9e6922af89a79bca43e
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/cutter/cutter-1.03-r1.ebuild b/net-analyzer/cutter/cutter-1.03-r1.ebuild
deleted file mode 100644
index 7e3806ff08d3..000000000000
--- a/net-analyzer/cutter/cutter-1.03-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="TCP/IP Connection cutting on Linux Firewalls and Routers"
-HOMEPAGE="http://www.digitage.co.uk/digitage/software/linux-security/cutter"
-SRC_URI="http://www.digitage.co.uk/digitage/files/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-debian.patch
-	rm -f Makefile # implicit rules are better ;x
-}
-
-src_compile() {
-	emake cutter CC="$(tc-getCC)"
-}
-
-src_install() {
-	dosbin cutter
-	dodoc README
-	doman debian/cutter.8
-}
diff --git a/net-analyzer/cutter/cutter-1.04.ebuild b/net-analyzer/cutter/cutter-1.04.ebuild
index f11002ca418e..46cc52cc6f2c 100644
--- a/net-analyzer/cutter/cutter-1.04.ebuild
+++ b/net-analyzer/cutter/cutter-1.04.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="TCP/IP Connection cutting on Linux Firewalls and Routers"
 HOMEPAGE="http://www.digitage.co.uk/digitage/software/linux-security/cutter"
@@ -10,11 +11,17 @@ SRC_URI="http://www.digitage.co.uk/digitage/files/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.03-debian.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.03-debian.patch
-	rm -f Makefile # implicit rules are better ;x
+	default
+
+	# implicit rules are better ;x
+	rm -f Makefile || die
 }
 
 src_compile() {