From 590b9b7b03bf4651e099949e318755af7cfa81b8 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 1 Aug 2021 22:03:23 +0100
Subject: gentoo resync : 01.08.2021

---
 net-analyzer/tracebox/tracebox-0.4.4-r100.ebuild | 50 +++++++++---------------
 1 file changed, 18 insertions(+), 32 deletions(-)

(limited to 'net-analyzer/tracebox/tracebox-0.4.4-r100.ebuild')

diff --git a/net-analyzer/tracebox/tracebox-0.4.4-r100.ebuild b/net-analyzer/tracebox/tracebox-0.4.4-r100.ebuild
index 63a8ba122cbd..7278ad0ab731 100644
--- a/net-analyzer/tracebox/tracebox-0.4.4-r100.ebuild
+++ b/net-analyzer/tracebox/tracebox-0.4.4-r100.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-{1..4} luajit )
 
-inherit autotools lua-single
+inherit autotools flag-o-matic lua-single
 
 DESCRIPTION="A Middlebox Detection Tool"
 HOMEPAGE="http://www.tracebox.org/"
@@ -15,51 +15,37 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="curl sniffer"
-
 REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="test"
 
 RDEPEND="${LUA_DEPS}
 	>=net-libs/libcrafter-0.3_p20171019
 	dev-libs/json-c
 	net-libs/libpcap
 	curl? ( net-misc/curl )
-	sniffer? ( net-libs/libnetfilter_queue )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-RESTRICT="test"
+	sniffer? ( net-libs/libnetfilter_queue )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.4-deps.patch
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-include-crafter.patch
 )
 
 src_prepare() {
 	default
-
-	sed -i -e '/SUBDIRS/s|noinst||g' Makefile.am || die
-	sed -i -e '/DIST_SUBDIRS.*libcrafter/d' noinst/Makefile.am || die
-
-	sed -i \
-		-e '/[[:graph:]]*libcrafter[[:graph:]]*/d' \
-		-e '/dist_bin_SCRIPTS/d' \
-		src/${PN}/Makefile.am \
-		|| die
-
-	sed -i \
-		-e 's|"crafter.h"|<crafter.h>|g' \
-		src/${PN}/PacketModification.h \
-		src/${PN}/PartialHeader.h \
-		src/${PN}/script.h \
-		src/${PN}/${PN}.h \
-		|| die
-
+	# remove bundled
+	# - dev-libs/json-c
+	# - net-libs/libcrafter
+	rm -r noinst || die
 	eautoreconf
 }
 
 src_configure() {
+	# https://bugs.gentoo.org/786687
+	# std::byte clashes with crafter/Types.h typedef
+	append-cxxflags -std=c++14
+
 	econf \
 		$(use_enable curl) \
 		$(use_enable sniffer)
-- 
cgit v1.2.3