From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D05061382C5 for ; Tue, 15 Jun 2021 01:22:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22C6FE0833; Tue, 15 Jun 2021 01:22:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 05E17E0833 for ; Tue, 15 Jun 2021 01:22:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C2095335CE9 for ; Tue, 15 Jun 2021 01:22:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0BF76794 for ; Tue, 15 Jun 2021 01:22:11 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1623720096.cd260d9a9fdb2c2a8f0ef7b4e947c7df0ef1d2a2.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/tripwire/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/tripwire/tripwire-2.4.3.7.ebuild X-VCS-Directories: app-admin/tripwire/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: cd260d9a9fdb2c2a8f0ef7b4e947c7df0ef1d2a2 X-VCS-Branch: master Date: Tue, 15 Jun 2021 01:22:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7d06db19-f0c7-40e5-a4cf-7a5cc49492f8 X-Archives-Hash: 64d0c91d8254c9b48cee16cf22f4157e commit: cd260d9a9fdb2c2a8f0ef7b4e947c7df0ef1d2a2 Author: Sam James gentoo org> AuthorDate: Tue Jun 15 01:21:32 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jun 15 01:21:36 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd260d9a 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 gentoo.org> app-admin/tripwire/tripwire-2.4.3.7.ebuild | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/app-admin/tripwire/tripwire-2.4.3.7.ebuild b/app-admin/tripwire/tripwire-2.4.3.7.ebuild index 423a09ff991..306f4125452 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() {