From cd260d9a9fdb2c2a8f0ef7b4e947c7df0ef1d2a2 Mon Sep 17 00:00:00 2001 From: Sam James Date: Tue, 15 Jun 2021 01:21:32 +0000 Subject: app-admin/tripwire: update EAPI 6 -> 7, workaround GCC 11 failure Set C++ standard to c++14 rather than perform a huge sed on the byte type. Closes: https://bugs.gentoo.org/786465 Signed-off-by: Sam James --- app-admin/tripwire/tripwire-2.4.3.7.ebuild | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'app-admin/tripwire') diff --git a/app-admin/tripwire/tripwire-2.4.3.7.ebuild b/app-admin/tripwire/tripwire-2.4.3.7.ebuild index 423a09ff9917..306f41254523 100644 --- a/app-admin/tripwire/tripwire-2.4.3.7.ebuild +++ b/app-admin/tripwire/tripwire-2.4.3.7.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools flag-o-matic @@ -36,8 +36,17 @@ src_configure() { # see #32613, #45823, and others. # -taviso@gentoo.org strip-flags - append-cppflags -DCONFIG_DIR='"\"/etc/tripwire\""' -fno-strict-aliasing - econf $(use_enable ssl openssl) $(use_enable static) + + append-cppflags -DCONFIG_DIR='"\"/etc/tripwire\""' + append-cflags -fno-strict-aliasing + + # "integer.cpp:1162:24: error: reference to ‘byte’ is ambiguous" + # bug #786465 + append-cxxflags -std=c++14 + + econf \ + $(use_enable ssl openssl) \ + $(use_enable static) } src_install() { -- cgit v1.2.3-65-gdbad