[gentoo-commits] repo/gentoo:master commit in: net-analyzer/cutter/

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/cutter/

[Sam James]

commit:     4843bca585c452ed9981d698f0ee26eb46855476
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 20:28:28 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 20:58:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4843bca5

net-analyzer/cutter: port 1.04 to EAPI 7

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/cutter/cutter-1.04.ebuild | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/net-analyzer/cutter/cutter-1.04.ebuild b/net-analyzer/cutter/cutter-1.04.ebuild
index f11002ca418..045a2f6cf17 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"
@@ -12,9 +13,15 @@ LICENSE="GPL-2"
 SLOT="0"
 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() {

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/cutter/

[Sam James]

commit:     bac288fd803b5dbc54e81b95456f564493e205ab
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 21:24:51 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 21:24:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bac288fd

net-analyzer/cutter: Stabilize 1.04 amd64, #776517

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/cutter/cutter-1.04.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/cutter/cutter-1.04.ebuild b/net-analyzer/cutter/cutter-1.04.ebuild
index 045a2f6cf17..6764ea2b674 100644
--- a/net-analyzer/cutter/cutter-1.04.ebuild
+++ b/net-analyzer/cutter/cutter-1.04.ebuild
@@ -11,7 +11,7 @@ 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

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/cutter/

[Sam James]

commit:     8737d388b378e43d9daa208283677d70fe1ac9b4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 21:54:13 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 21:54:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8737d388

net-analyzer/cutter: Stabilize 1.04 x86, #776517

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/cutter/cutter-1.04.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/cutter/cutter-1.04.ebuild b/net-analyzer/cutter/cutter-1.04.ebuild
index 6764ea2b674..46cc52cc6f2 100644
--- a/net-analyzer/cutter/cutter-1.04.ebuild
+++ b/net-analyzer/cutter/cutter-1.04.ebuild
@@ -11,7 +11,7 @@ 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

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/cutter/

[Sam James]

commit:     6bd1b9b36f1bf2b638f82b73d33a2414e4c60804
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 21:57:23 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 22:01:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bd1b9b3

net-analyzer/cutter: drop 1.03-r1

Bug: https://bugs.gentoo.org/776517
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/cutter/Manifest              |  1 -
 net-analyzer/cutter/cutter-1.03-r1.ebuild | 28 ----------------------------
 2 files changed, 29 deletions(-)

diff --git a/net-analyzer/cutter/Manifest b/net-analyzer/cutter/Manifest
index cc59c2538cd..9cd1ba973c9 100644
--- a/net-analyzer/cutter/Manifest
+++ b/net-analyzer/cutter/Manifest
@@ -1,2 +1 @@
-DIST cutter-1.03.tgz 13176 BLAKE2B d879d849be77c34d3e1882cbe500be71e631a5047116828ab07f8ab07b5bbb853e19b6e8b7dd5c42a73ce7b5c2825228cbeae07ec875e83da7bd1bd1c6f34a7a SHA512 821e8abf496e22b86bdd855fb1c9c51648a276ebb572edd2ccb172ae7025a38794df37dfe153c1807785ecec279c34b9df5e2bcc2de582b3a88ee3776cf46eea
 DIST cutter-1.04.tgz 13680 BLAKE2B 373e5e0c0fb14224974ff399c7db0a69dc5568394a881be2c285437050a1ec4cfb26acbcdd593d22519f34a32760bdbe342a96c2a4d55547f7c06bc49806e228 SHA512 79c17ec8c17e696a79aa8b11fda347f2e6929eb35f9a37da450acf6aff7ab9471e13eaef24708f90f3f0c2791fade2eb944443b98df3d3ae4eef0c408abc7b3a

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 7e3806ff08d..00000000000
--- 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
-}