commit: 812ed0dc593a40ad402f7091f31938d389a67803 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Jun 13 02:53:25 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jun 13 02:57:11 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=812ed0dc
dev-cpp/abseil-cpp: unconditionally depend on gtest This is unfortunate but it's needed given abseil-cpp needs it for some of the libraries it installs. An alternative would be to control the helpers with USE=testlib or something, I guess. Fixes: 53bb853b51f0ccdacba1714a9405e23fbdd96ce2 Bug: https://bugs.gentoo.org/915902 Closes: https://bugs.gentoo.org/934175 Signed-off-by: Sam James <sam <AT> gentoo.org> ...eil-cpp-20230125.3-r2.ebuild => abseil-cpp-20230125.3-r3.ebuild} | 6 ++---- ...eil-cpp-20230802.0-r1.ebuild => abseil-cpp-20230802.0-r2.ebuild} | 6 ++---- ...eil-cpp-20240116.2-r1.ebuild => abseil-cpp-20240116.2-r2.ebuild} | 3 ++- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r3.ebuild similarity index 95% rename from dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r2.ebuild rename to dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r3.ebuild index a1f813ccd43b..48ca679ec13a 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r2.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r3.ebuild @@ -16,13 +16,11 @@ SLOT="0/${PV%%.*}.0" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" IUSE="test" -DEPEND="" -RDEPEND="${DEPEND}" - +RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" BDEPEND=" ${PYTHON_DEPS} test? ( - >=dev-cpp/gtest-1.13.0 sys-libs/timezone-data ) " diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r2.ebuild similarity index 95% rename from dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r1.ebuild rename to dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r2.ebuild index 812cf4bb324a..1281eefffab0 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r1.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r2.ebuild @@ -16,13 +16,11 @@ SLOT="0/${PV%%.*}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86" IUSE="test" -DEPEND="" -RDEPEND="${DEPEND}" - +RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" BDEPEND=" ${PYTHON_DEPS} test? ( - >=dev-cpp/gtest-1.13.0 sys-libs/timezone-data ) " diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r2.ebuild similarity index 95% rename from dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r1.ebuild rename to dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r2.ebuild index 6241785276e6..1281eefffab0 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r1.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r2.ebuild @@ -16,10 +16,11 @@ SLOT="0/${PV%%.*}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86" IUSE="test" +RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" BDEPEND=" ${PYTHON_DEPS} test? ( - >=dev-cpp/gtest-1.13.0 sys-libs/timezone-data ) "
