commit: 565063d48acd7613035303696ddd06b42fa92517 Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> AuthorDate: Wed May 28 12:49:14 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed May 28 14:45:32 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=565063d4
net-libs/mbedtls: fix file collisions between slots Closes: https://bugs.gentoo.org/947612 Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42294 Closes: https://github.com/gentoo/gentoo/pull/42294 Signed-off-by: Sam James <sam <AT> gentoo.org> net-libs/mbedtls/mbedtls-2.28.10.ebuild | 1 + net-libs/mbedtls/mbedtls-2.28.9-r1.ebuild | 3 ++- net-libs/mbedtls/mbedtls-3.6.3.1.ebuild | 5 ++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/net-libs/mbedtls/mbedtls-2.28.10.ebuild b/net-libs/mbedtls/mbedtls-2.28.10.ebuild index 6ad8425dcafd..ff5d7e9de016 100644 --- a/net-libs/mbedtls/mbedtls-2.28.10.ebuild +++ b/net-libs/mbedtls/mbedtls-2.28.10.ebuild @@ -17,6 +17,7 @@ IUSE="cmac cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib" RESTRICT="!test? ( test )" RDEPEND=" + programs? ( !net-libs/mbedtls:3[programs] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) " DEPEND="${RDEPEND}" diff --git a/net-libs/mbedtls/mbedtls-2.28.9-r1.ebuild b/net-libs/mbedtls/mbedtls-2.28.9-r1.ebuild index 622ce0e78ec5..3d4000f9d424 100644 --- a/net-libs/mbedtls/mbedtls-2.28.9-r1.ebuild +++ b/net-libs/mbedtls/mbedtls-2.28.9-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,6 +17,7 @@ IUSE="cmac cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib" RESTRICT="!test? ( test )" RDEPEND=" + programs? ( !net-libs/mbedtls:0[programs] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) " DEPEND="${RDEPEND}" diff --git a/net-libs/mbedtls/mbedtls-3.6.3.1.ebuild b/net-libs/mbedtls/mbedtls-3.6.3.1.ebuild index b51ca303a93e..4653d4c91d9e 100644 --- a/net-libs/mbedtls/mbedtls-3.6.3.1.ebuild +++ b/net-libs/mbedtls/mbedtls-3.6.3.1.ebuild @@ -17,7 +17,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv IUSE="cpu_flags_x86_sse2 doc programs static-libs test threads" RESTRICT="!test? ( test )" -RDEPEND="!>net-libs/mbedtls-3:0" +RDEPEND=" + !>net-libs/mbedtls-3:0 + programs? ( !net-libs/mbedtls:0[programs] ) +" BDEPEND=" ${PYTHON_DEPS} doc? (
