commit:     a163f568470d539fbd9e374cf23cd86d34747d2f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 16 02:22:47 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 16 02:23:16 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a163f568

net-dns/c-ares: workaround new gtest

Bug: https://github.com/c-ares/c-ares/issues/993
Closes: https://bugs.gentoo.org/957945
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-dns/c-ares/c-ares-1.34.4.ebuild | 10 +++++++---
 net-dns/c-ares/c-ares-1.34.5.ebuild | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/net-dns/c-ares/c-ares-1.34.4.ebuild 
b/net-dns/c-ares/c-ares-1.34.4.ebuild
index bd6750fac2b8..f5bf9a5624da 100644
--- a/net-dns/c-ares/c-ares-1.34.4.ebuild
+++ b/net-dns/c-ares/c-ares-1.34.4.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 # Both Daniel and Brad are listed as possible signers on the homepage
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bradhouse.asc
-inherit edo multilib-minimal verify-sig
+inherit edo flag-o-matic multilib-minimal verify-sig
 
 DESCRIPTION="C library that resolves names asynchronously"
 HOMEPAGE="https://c-ares.org/";
@@ -22,9 +22,8 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
-# <gtest-1.17.0: bug #957945
 BDEPEND="
-       test? ( <dev-cpp/gtest-1.17.0 )
+       test? ( dev-cpp/gtest )
        verify-sig? ( sec-keys/openpgp-keys-bradhouse )
 "
 
@@ -65,6 +64,11 @@ src_prepare() {
        fi
 }
 
+src_configure() {
+       use test && append-cxxflags -std=gnu++17
+       multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
        local myeconfargs=(
                --enable-symbol-hiding

diff --git a/net-dns/c-ares/c-ares-1.34.5.ebuild 
b/net-dns/c-ares/c-ares-1.34.5.ebuild
index 337040880a55..c2639589bb8b 100644
--- a/net-dns/c-ares/c-ares-1.34.5.ebuild
+++ b/net-dns/c-ares/c-ares-1.34.5.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 # Both Daniel and Brad are listed as possible signers on the homepage
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bradhouse.asc
-inherit edo multilib-minimal verify-sig
+inherit edo flag-o-matic multilib-minimal verify-sig
 
 DESCRIPTION="C library that resolves names asynchronously"
 HOMEPAGE="https://c-ares.org/";
@@ -22,9 +22,8 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
-# <gtest-1.17.0: bug #957945
 BDEPEND="
-       test? ( <dev-cpp/gtest-1.17.0 )
+       test? ( dev-cpp/gtest )
        verify-sig? ( sec-keys/openpgp-keys-bradhouse )
 "
 
@@ -65,6 +64,11 @@ src_prepare() {
        fi
 }
 
+src_configure() {
+       use test && append-cxxflags -std=gnu++17
+       multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
        local myeconfargs=(
                --enable-symbol-hiding

Reply via email to