commit: 1404a03d55630c51f06dd0c9b9aa4975c05894b5 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Jun 13 01:54:59 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jun 13 01:54:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1404a03d
dev-libs/protobuf: loosen abseil-cpp dependency abseil-cpp now unconditionally installs its test helper libraries. Bug: https://bugs.gentoo.org/915902 Bug: https://bugs.gentoo.org/934062 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/protobuf/{protobuf-22.5.ebuild => protobuf-22.5-r1.ebuild} | 4 ++-- .../protobuf/{protobuf-23.3-r2.ebuild => protobuf-23.3-r3.ebuild} | 4 ++-- dev-libs/protobuf/{protobuf-26.1.ebuild => protobuf-26.1-r1.ebuild} | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-libs/protobuf/protobuf-22.5.ebuild b/dev-libs/protobuf/protobuf-22.5-r1.ebuild similarity index 96% rename from dev-libs/protobuf/protobuf-22.5.ebuild rename to dev-libs/protobuf/protobuf-22.5-r1.ebuild index 1a6f7fca2589..047dddcdea67 100644 --- a/dev-libs/protobuf/protobuf-22.5.ebuild +++ b/dev-libs/protobuf/protobuf-22.5-r1.ebuild @@ -25,8 +25,8 @@ RESTRICT="!test? ( test )" BDEPEND="emacs? ( app-editors/emacs:* )" DEPEND=" - <dev-cpp/abseil-cpp-20240116.2:=[${MULTILIB_USEDEP},test?] - >=dev-cpp/abseil-cpp-20230125:=[${MULTILIB_USEDEP},test?] + <dev-cpp/abseil-cpp-20240116.2:=[${MULTILIB_USEDEP}] + >=dev-cpp/abseil-cpp-20230125:=[${MULTILIB_USEDEP}] zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] ) " diff --git a/dev-libs/protobuf/protobuf-23.3-r2.ebuild b/dev-libs/protobuf/protobuf-23.3-r3.ebuild similarity index 95% rename from dev-libs/protobuf/protobuf-23.3-r2.ebuild rename to dev-libs/protobuf/protobuf-23.3-r3.ebuild index 88af8ad53ef9..e629850b71ed 100644 --- a/dev-libs/protobuf/protobuf-23.3-r2.ebuild +++ b/dev-libs/protobuf/protobuf-23.3-r3.ebuild @@ -25,8 +25,8 @@ RESTRICT="!test? ( test )" BDEPEND="emacs? ( app-editors/emacs:* )" DEPEND=" - <dev-cpp/abseil-cpp-20240116.2:=[${MULTILIB_USEDEP},test?] - >=dev-cpp/abseil-cpp-20230125.3:=[${MULTILIB_USEDEP},test?] + <dev-cpp/abseil-cpp-20240116.2:=[${MULTILIB_USEDEP}] + >=dev-cpp/abseil-cpp-20230125.3:=[${MULTILIB_USEDEP}] zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] ) " diff --git a/dev-libs/protobuf/protobuf-26.1.ebuild b/dev-libs/protobuf/protobuf-26.1-r1.ebuild similarity index 97% rename from dev-libs/protobuf/protobuf-26.1.ebuild rename to dev-libs/protobuf/protobuf-26.1-r1.ebuild index 8b99e882da51..b98e219098fd 100644 --- a/dev-libs/protobuf/protobuf-26.1.ebuild +++ b/dev-libs/protobuf/protobuf-26.1-r1.ebuild @@ -25,7 +25,7 @@ RESTRICT="!test? ( test )" BDEPEND="emacs? ( app-editors/emacs:* )" DEPEND=" - >=dev-cpp/abseil-cpp-20230125.3:=[${MULTILIB_USEDEP},test?] + >=dev-cpp/abseil-cpp-20230125.3:=[${MULTILIB_USEDEP}] zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] ) "
