gentoo auto-resync : 14:01:2024 - 07:13:52

9 files changed, 111 insertions, 156 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 708f223ba3ff..9aaf36e49683 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index 2fac0231970c..a1cc4c1c3849 100644
--- a/net-libs/libpsl/Manifest
+++ b/net-libs/libpsl/Manifest
@@ -1,4 +1,6 @@
 AUX libpsl-0.21.2-tests-optional.patch 1141 BLAKE2B a72459d3e735391222d0a4e2fb7e42eccdd07a0c2ef05c381b49f3a967df797d3da225fcb5cb6d98ad8a14eb460589e60f7f16d338171c7b081741d5382b09ed SHA512 1b3fee48b1f5c85f58f704e3447e831b1a0b17a07b7f1e9456e8fde54ece4222be79c3f11811bfc5c601317b5a4b18ac7c358e5d438a08c6452b4ccdbd53b2aa
 DIST libpsl-0.21.2.tar.gz 7617025 BLAKE2B b50f805bb467dc3284bc91645a37a2208098ad809d3771c74ef13c3b8f6029a07ad80a56702c7e3d1a1125d272403c85dd97b64a28465b9ff2d095eaf94b9a4d SHA512 f1df72220bf4391d4701007100b0df66c833a2cbcb7481c9d13f0b9e0cad3b66d2d15d4b976e5bad60d2ad1540355112fa1acb07aa925c241d2d7cd20681c71d
+DIST libpsl-0.21.5.tar.gz 7624251 BLAKE2B a0076f622b85df99f866de6707850ac216b764bdb68c6d516f4603da42dac8eae3ee4c53d68dbb6af6f779c2c7f1b9caab74c8b558209b1f6823f95c13fc3ceb SHA512 c14d575cecc0f1693894dd79565b6b9220084ddfa43b908a1cefe16d147cdd5ec47796eb0c2135e2f829a951abaf39d8a371ab5c1352f57b36e610e25adf91f5
 EBUILD libpsl-0.21.2.ebuild 1311 BLAKE2B b5f9fb3476567bad769fb93ec34e0acc6ad46abff57b51caf28323c8a671277758f5551d4387ca511ca99ae0e6470cf3084fa4312a5240f82a9353970500fe0b SHA512 50c828251a50b878458cbe9616356bf2c1bfab4f41f7383c11a91d4e0a05754b916670a25dcf07e02961d28a92ccd4e020df3233947d17c575cec1da7656ddff
+EBUILD libpsl-0.21.5.ebuild 1265 BLAKE2B 82ed03044ca92aa9aed1a71a11bfa8777a0ac8a49c622042ec45192cae6770fdc4c4bb06f175ea60dec2a304873a903cdf5035bc7c49a3fcdaf79259951f4f1b SHA512 f4bf48d4264e5d1c1ff3fd4963a478eadf2596834e28e8e60b0cc51319632b5de67eb0c3febb60463333733cb16c69f47a70e18d007bea1eab46255c7b2896e7
 MISC metadata.xml 255 BLAKE2B 36ae66735664b8ed69846146d268e59f89bbea0d01d46f692709b9bfc521f70875a331b0995442435566e1896d9090bc9d9a6b9a63bf5de51b55d9a095f60d7a SHA512 4ce190fd174d39c74bce7eec22d651f9f15248ebbb7a2ffb68f7c9bae01ed412b6652285fcbb055770896d8ea0a1241c3aea30c2a0f4c223aba3b1dd723f1b9e
diff --git a/net-libs/libpsl/libpsl-0.21.5.ebuild b/net-libs/libpsl/libpsl-0.21.5.ebuild
new file mode 100644
index 000000000000..dc56355321fb
--- /dev/null
+++ b/net-libs/libpsl/libpsl-0.21.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit meson-multilib python-any-r1
+
+DESCRIPTION="C library for the Public Suffix List"
+HOMEPAGE="https://github.com/rockdaboot/libpsl"
+SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="icu +idn test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	icu? ( !idn? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) )
+	idn? (
+		dev-libs/libunistring:=[${MULTILIB_USEDEP}]
+		net-dns/libidn2:=[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+pkg_pretend() {
+	if use icu && use idn ; then
+		ewarn "\"icu\" and \"idn\" USE flags are enabled. Using \"idn\"."
+	fi
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_use test tests)
+	)
+
+	# Prefer idn even if icu is in USE as well
+	if use idn ; then
+		emesonargs+=(
+			-Druntime=libidn2
+			-Dbuiltin=true
+		)
+	elif use icu ; then
+		emesonargs+=(
+			-Druntime=libicu
+			-Dbuiltin=true
+		)
+	else
+		emesonargs+=(
+			-Druntime=no
+		)
+	fi
+
+	meson_src_configure
+}
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 160d8daa8d98..db91d16405e1 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,9 +1,7 @@
-DIST mbedtls-2.28.1.tar.gz 3914438 BLAKE2B 85969895b50b63537438e0b67e1dec97a0ee4ac188c55ebcb109d5e0cc8f4a3f66f016b2ac5f920d7b10f094c9626029d19ab86be0cb5941224a7f3eed2dcc06 SHA512 cc75027ebbefb4ba1aecdc386cf6b60cceeceda79a474ff5ba67411e41aac9fc2c43c2fb0158be667f1b91e6c19082e17e4e61409acc1498b568f5efc7b00a2c
 DIST mbedtls-2.28.5.tar.gz 4005000 BLAKE2B 755287e1a1e0be5d193a8a184a9ae3ab2b6c216235657f7f2e422fe06226cd4c7d11811bcb53519018137e7ed838b241704c955872e28f133bb17a5f42222acb SHA512 339911d244b4e6e4d77b344c796f018d9ad4c56249530b8a56e0dc305ddf30bc709dca96a19c5a06710e92d167ef22893e9e17e20837e9daee0d0be00a8ccae9
-DIST mbedtls-3.2.1.tar.gz 4097571 BLAKE2B 4f33172c9c7a3ffbad6600c41d9b574a79e512ec417c3ec90a04085cce393456e8502e94150094bc80a217c352c8148d67bdab1bf0cb311c8dc88d653475a003 SHA512 e7f1726d2cdae6c580d588b40c8a51b9e353786efdd2e50fd1c11c7f46a2b6fe2622cfe2ee5cf998ec762b5ebf8f4720cfc1a1ecaebc497489f9d6a263a83523
-DIST mbedtls-3.5.0.tar.gz 5614026 BLAKE2B 958825f59bb7f269c81042da66a1cd1d12ac799b599613582da591d455dc159aa344370bae8c0436e33c293bd69b1ae9266d2788a0bacd58f0ae8247bafb7f3d SHA512 87b58f698bb740aecb639155ac1248674d2b15ee7fa0eb01136f8fe476ddce0069589a13d532f38ee6db8285abed25570d2bcf55148c2324d8277048a93aacdd
-EBUILD mbedtls-2.28.1.ebuild 2751 BLAKE2B 82ec54f58cd561c1f75f488d40894817a5c07d81fc4be3e8c3769590ac748377bae677d090704addd0deb371fb197f7a57c05db5b299b4766fd898a6ef76344f SHA512 813f136f08c723528b96377c58867c83e4424cf2cb843efb830535ef4574a1327879e03d07b8906260cba1215d92b0983e165dbca0c2de5811c1ef49c3548d8a
-EBUILD mbedtls-2.28.5.ebuild 2761 BLAKE2B 4a3ee0e033de9755cf4999eebe92d64e26e5a0e4587f979cfc03d83ea79f6a40c41a5dab42d72b9e5a14f6bf4a32aeeaa33c596ed9a6f01b61cd3cf7669722c5 SHA512 33dcd0c74643a4f7344f83f5b00949da86e1675183b4630feb7ae317379863557e9f61ce8edf876e3cbee548ab0df8a39b35190f0b0a351a628774bb747f4222
-EBUILD mbedtls-3.2.1.ebuild 2447 BLAKE2B f9e945b371996d118fe2dee4f5d7e9dc374c8d633b899630c5c931a1de16a813ec7b49da7d10f5c3f8ac9ae75c34ac8c5540d8344d05208ae12d131c7e63fd74 SHA512 ec8ba8bc268487b1d6e56378221c35462b869a3e2c5debbc9a252bc3f21715ca482033b39585baa3ff160234b598276cf40022e82c76aff9dd14ed68eba56ae4
-EBUILD mbedtls-3.5.0.ebuild 2457 BLAKE2B de993ed8cfe5d33b8fc957e878f150045a32600eff19db60b7640450afd8d9617541f4630265f23129088a843e530cc5f3eb10a84181029850a7a424240a7b07 SHA512 3af80b3ac422fbece6ede42acbe2ecf34d9656ff5500f4d60b180e0dafde8ed8bff9fb366662af10ace61096b8ce8c67086640e1b69db8d7c37244741104fd6c
-MISC metadata.xml 1002 BLAKE2B 033d355a23e984031d34df15058ec85e3e733cc3d88b3828d40a18e599ce7e669a413889a580534c06dd36a0d377583754a8115fc84a39461dc1727950eccdab SHA512 4687bdebe365f74517b650e62c7b7062d36e4f460370bc8e1517963866556076f56e74e9191b166b6d3a0b990947ab653d10768ade6d6275783c62c81f0b094b
+DIST mbedtls-2.28.6.tar.gz 3988909 BLAKE2B d4991fce07ab5120340a7ea6b5eae6888e9568e6d93bb41e1a4b4cc6f7868489ad3542aef346dffc39212d543e3b2d08e7409c078d37a2f7d512e4afa7ca5b60 SHA512 1ce2cfe55b569c6332a462447f69ec1e349e23410afeda88f5f55037493cf145e1031f9a7c8fe080f346cfae98802a13258891376684e7491d171101cb302754
+DIST mbedtls-3.5.1.tar.gz 5580943 BLAKE2B 67ff3e2bf69f507108ee20ddabd7257cb42475e143fc00c7dae5ac9356898cd4db6d8abc5e4995107cafc2dd4802b87b6b2edb888f10c52f34e85a49332c061b SHA512 bb36395f9d889f1e19ee6968d01ec96f974d543ea46cb3935aa86683918e31bf81f46d0d436bcda947c71d622286217bdf4c3afd82503008ac16728e1bdcfc7a
+EBUILD mbedtls-2.28.5.ebuild 2703 BLAKE2B c47d404259f4c490c72583a0794e0fe7256e9e8157dc6a90bdd3cc27c41a5ade354ba007dbbbb413c091e31a2472818b3f64fe7b1f84224e0d650910a0890efe SHA512 c60e280dda496816c5dc40314d05349d8a81739c0d1dfeadc5146f2788305d2b758bfbd7e23688d73fc98a83149bd55631aa921a1eb04869e57e5b5170f3ed28
+EBUILD mbedtls-2.28.6.ebuild 2791 BLAKE2B 51a3545b38a38668886edffa738b14a43e961183371f38590222bca1a5597a87da5ad8a8a30ef858dc0f907b5c0f08b9c348d18d68b1bef725f83a9be25b089a SHA512 ae548bf000435f0896d2819c349f8eba51bd2623f626cecac3c841c9f66e7a0cc67806b7217c921c1c4e6f60e70e4655982e0cdc94c37547bb238f9534e79d34
+EBUILD mbedtls-3.5.1.ebuild 2498 BLAKE2B 5747289ed398df2cc5101830e64742baf47a394023517cd8d0e439453492a66b94739625241f5a70f6a99d3fc85d405b904b7af746a6780471da11fdec1f1645 SHA512 985a2c98e02ea27aef1e3b38f6a99cc57def21e9351e170d0eaa5717ade0b3b6b46a32c648e9fa12de552f153e176f25b18407696a4fb79db8176b9ef8e88860
+MISC metadata.xml 1002 BLAKE2B 4a21796402fdc34bb08fef67e542c868e07a227a2f22619dd88020ef72e2d6afe2d1284b94434aef1199a4edd4fc53580470f4658304c3572bb4f5701e0b107e SHA512 1faa80fc64e1d36d8f847e44b229f503d27b4419573e28a1b1f52d80f28607f7092e6a878e81b4749429b9f3dd876f75efd3097aeda926b4293eac085519d4f2
diff --git a/net-libs/mbedtls/mbedtls-2.28.5.ebuild b/net-libs/mbedtls/mbedtls-2.28.5.ebuild
index 2edf0c6ccf69..0ef263d1a1fe 100644
--- a/net-libs/mbedtls/mbedtls-2.28.5.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.28.5.ebuild
@@ -71,16 +71,10 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
-	# psa isn't ready yet, it might be in 3.x(?) but certainly not
-	# at the moment.
-	# bug #718390
-	CMAKE_SKIP_TESTS=(
-		psa_crypto
-		psa_its-suite
-	)
-
+	# Disable parallel run, bug #718390
+	# https://github.com/Mbed-TLS/mbedtls/issues/4980
 	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake_src_test
+		cmake_src_test -j1
 }
 
 multilib_src_install() {
diff --git a/net-libs/mbedtls/mbedtls-2.28.1.ebuild b/net-libs/mbedtls/mbedtls-2.28.6.ebuild
index 88331eaf0432..f0133d22a389 100644
--- a/net-libs/mbedtls/mbedtls-2.28.1.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.28.6.ebuild
@@ -3,27 +3,33 @@
 
 EAPI=8
 
-inherit cmake multilib-minimal
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake multilib-minimal python-any-r1
 
 DESCRIPTION="Cryptographic library for embedded systems"
 HOMEPAGE="https://www.trustedfirmware.org/projects/mbed-tls/"
 SRC_URI="https://github.com/Mbed-TLS/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
+S="${WORKDIR}"/${PN}-${P}
 
-LICENSE="Apache-2.0"
+LICENSE="|| ( Apache-2.0 GPL-2+ )"
 SLOT="0/7.14.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="cmac cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	programs? (
-		dev-libs/openssl:0=
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? (
+		app-text/doxygen
+		media-gfx/graphviz
 	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-text/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
+	test? ( dev-lang/perl )
+"
 
 enable_mbedtls_option() {
 	local myopt="$@"
@@ -47,13 +53,14 @@ src_prepare() {
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
 		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
+		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
 		-DINSTALL_MBEDTLS_HEADERS=ON
 		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DLINK_WITH_PTHREAD=$(usex threads)
 		-DMBEDTLS_FATAL_WARNINGS=OFF # Don't use -Werror, #744946
+		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
+		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
 	)
 
 	cmake_src_configure
@@ -61,19 +68,14 @@ multilib_src_configure() {
 
 multilib_src_compile() {
 	cmake_src_compile
-	use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
+	use doc && multilib_is_native_abi && emake -C "${S}" apidoc
 }
 
 multilib_src_test() {
-	# psa isn't ready yet, it might be in 3.x(?) but certainly not
-	# at the moment.
-	# bug #718390
-	local myctestargs=(
-		-E "(psa_crypto|psa_its-suite)"
-	)
-
+	# Disable parallel run, bug #718390
+	# https://github.com/Mbed-TLS/mbedtls/issues/4980
 	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake_src_test
+		cmake_src_test -j1
 }
 
 multilib_src_install() {
diff --git a/net-libs/mbedtls/mbedtls-3.2.1.ebuild b/net-libs/mbedtls/mbedtls-3.2.1.ebuild
deleted file mode 100644
index 86aebd1df472..000000000000
--- a/net-libs/mbedtls/mbedtls-3.2.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://www.trustedfirmware.org/projects/mbed-tls/"
-SRC_URI="https://github.com/Mbed-TLS/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/12.18.4" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cpu_flags_x86_sse2 doc programs static-libs test threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	programs? (
-		dev-libs/openssl:0=
-	)"
-DEPEND="${RDEPEND}
-	doc? ( app-text/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/mbedtls_config.h || die
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DMBEDTLS_FATAL_WARNINGS=OFF # Don't use -Werror, #744946
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
-}
-
-multilib_src_test() {
-	# psa isn't ready yet, even in 3.0.0.
-	# bug #718390
-	local myctestargs=(
-		-E "(psa_crypto|psa_its-suite)"
-	)
-
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake_src_test
-}
-
-multilib_src_install() {
-	cmake_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/mbedtls/mbedtls-3.5.0.ebuild b/net-libs/mbedtls/mbedtls-3.5.1.ebuild
index 66d87b69c563..963a8edbe27c 100644
--- a/net-libs/mbedtls/mbedtls-3.5.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-3.5.1.ebuild
@@ -3,26 +3,23 @@
 
 EAPI=8
 
-inherit cmake multilib-minimal
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake multilib-minimal python-any-r1
 
 DESCRIPTION="Cryptographic library for embedded systems"
 HOMEPAGE="https://www.trustedfirmware.org/projects/mbed-tls/"
 SRC_URI="https://github.com/Mbed-TLS/mbedtls/archive/${P}.tar.gz"
 S="${WORKDIR}"/${PN}-${P}
 
-LICENSE="Apache-2.0"
+LICENSE="|| ( Apache-2.0 GPL-2+ )"
 SLOT="0/15.20.6" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="cpu_flags_x86_sse2 doc programs static-libs test threads"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-	programs? (
-		dev-libs/openssl:=
-	)
-"
-DEPEND="${RDEPEND}"
 BDEPEND="
+	${PYTHON_DEPS}
 	doc? (
 		app-text/doxygen
 		media-gfx/graphviz
@@ -49,12 +46,13 @@ src_prepare() {
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
 		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
 		-DINSTALL_MBEDTLS_HEADERS=ON
 		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DLINK_WITH_PTHREAD=$(usex threads)
 		-DMBEDTLS_FATAL_WARNINGS=OFF # Don't use -Werror, #744946
+		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
+		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
 	)
 
 	cmake_src_configure
@@ -66,15 +64,10 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
-	# psa isn't ready yet, even in 3.0.0.
-	# bug #718390
-	CMAKE_SKIP_TESTS=(
-		psa_crypto
-		psa_its-suite
-	)
-
+	# Disable parallel run, bug #718390
+	# https://github.com/Mbed-TLS/mbedtls/issues/4980
 	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake_src_test
+		cmake_src_test -j1
 }
 
 multilib_src_install() {
diff --git a/net-libs/mbedtls/metadata.xml b/net-libs/mbedtls/metadata.xml
index b9ac7a476e4e..1b3db4f9f537 100644
--- a/net-libs/mbedtls/metadata.xml
+++ b/net-libs/mbedtls/metadata.xml
@@ -10,7 +10,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription lang="en">
-		The aim of the mbed TLS project is to provide a quality, open-source
+		The aim of the Mbed TLS project is to provide a quality, open-source
 		cryptographic library written in C and targeted at embedded systems.
 	</longdescription>
 	<use>
@@ -21,7 +21,7 @@
 			Warning: the HAVEGE random generator is not suitable for
 			virtualized environments
 		</flag>
-		<flag name="programs">Build PolarSSL programs</flag>
+		<flag name="programs">Build Mbed TLS programs</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">Mbed-TLS/mbedtls</remote-id>