gentoo auto-resync : 08:10:2023 - 12:03:01

11 files changed, 254 insertions, 11 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 38db1e6f9880..fa81f5b1485c 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libesmtp/Manifest b/net-libs/libesmtp/Manifest
index c22d18975576..2f3664465c8b 100644
--- a/net-libs/libesmtp/Manifest
+++ b/net-libs/libesmtp/Manifest
@@ -1,5 +1,6 @@
+AUX libesmtp-1.1.0-fix-build-with-clang16.patch 397 BLAKE2B 563134cf6e541c77e19a6eb63dc7d8a318226b6f5b6b98cf3d1d80347a1100abee2d75a2558bf5fb388e741f6e16bf804cd91ce73673bd3d0a697df46fe313a9 SHA512 02f483897f4b6a360dd61a6631e6c835ed1f4dc96bac990b8471148f5567b7af339cb98cdfe6629e61dfc4fcbdcf286ae5425ce5cfa66d9d1bac725fe67d7401
 AUX libesmtp-1.1.0-fix-soname.patch 672 BLAKE2B 2bb9a535b94e444af19597f0ca0c06b07aca2c42e0b21510c27aec76c47fa70fa12e5b26656dc6a685b3ca95b40ba630dc93cd205f348224f4c7508ae6f4376d SHA512 881fe2a531f0f50baa449c3b9faa8c99ea4ce6d1bf3a82d5f5f7e8ca530233a5668f8a498390cd91769972420750dd73988db76c53acd4734ec45bb528b9b2af
 DIST libesmtp-1.1.0.tar.gz 169134 BLAKE2B 94ef87c65101557f6d60a6bcd7a8b0de638c24d46536ddf602da05c09858780b0a50f9fd8dae1e54a5e9a7826d45fa6da10bad751a9be50475a8f441c94ad455 SHA512 fc2a9d9922a1807cce8c8cee627ea8fd3a79c33f0987c5a487080b1a1659fd504bc45da2f919d30eced33ab3e950105383a46ecf3365493134adc1183eb99e53
 EBUILD libesmtp-1.1.0-r1.ebuild 1291 BLAKE2B e8d6cbf5ddc451864ace4eda7224f25a4969e2c01647e0660d2e6daac3819732a8ac72077ff7961657ab14c24108c1bb0121a4374387d28b2925be112141db4a SHA512 75cd91629c8f8d8e4d679c6497f75f2118334d29280de2bdd2c6616da85571518bac9deb0065ad461e2184eee768e685e4ebe48d3ed0d2cded85d55c195890d5
-EBUILD libesmtp-9999.ebuild 1241 BLAKE2B 7408afacb3eb3c73cc02f7ea5b3c4fae74e46eb4cce59fa5d3441c08a59989bbaa91acd32bebba99162668f3bd3a9d8c4a38970ebe0ffb89a7b26cd5e8194ed0 SHA512 94799222e77ba684fd347b80561c9381b304cec8d83fae4e4e27c27d2f7c7a0e1d4054e072ee5a9d876571a65825c1b8ab56934ae277153dd85747741b18668b
+EBUILD libesmtp-1.1.0-r2.ebuild 1349 BLAKE2B 9bf4c72d1859397e7b491832ca28481371887598feecb2381b68cee52e6d2269f3c9d6157bbe44e50335a0c7ec009eddf94d8c52cb28af686d4d6d9bcd397ec9 SHA512 c0ef8a918990b68ebf315e21d050c04d1c86d7749a7b6dff8a2b10b6ee6731e060c01ca52fe4a6c047a2aac4703267239c430d328f8044074cfd203a74128174
 MISC metadata.xml 250 BLAKE2B c156a03877b8e9096c64e5d031d532fe7b880c5cfd439312750f1206db620c660cbc6f85638af6b8210bac2beba0b70234b52ccfcc9a4a2783b5f3a875de7b4b SHA512 90930cf59b7f9e9ae7217acbd53f052c77f782db5f0164bac4b7fd7075cd067d3b3d1b33068292d09367d2b071f2e8ad5f4c0782be44e2538ce21b7715dc4606
diff --git a/net-libs/libesmtp/files/libesmtp-1.1.0-fix-build-with-clang16.patch b/net-libs/libesmtp/files/libesmtp-1.1.0-fix-build-with-clang16.patch
new file mode 100644
index 000000000000..3211737e7be9
--- /dev/null
+++ b/net-libs/libesmtp/files/libesmtp-1.1.0-fix-build-with-clang16.patch
@@ -0,0 +1,21 @@
+Bug: https://bugs.gentoo.org/896056
+--- a/smtp-api.c
++++ b/smtp-api.c
+@@ -22,6 +22,7 @@
+ 
+ #include <config.h>
+ 
++#define _GNU_SOURCE
+ #include <stdarg.h>
+ #include <string.h>
+ #include <stdlib.h>
+--- a/smtp-tls.c
++++ b/smtp-tls.c
+@@ -47,6 +47,7 @@
+ 
+ /* This stuff doesn't belong here */
+ /* vvvvvvvvvvv */
++#define _GNU_SOURCE
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
diff --git a/net-libs/libesmtp/libesmtp-9999.ebuild b/net-libs/libesmtp/libesmtp-1.1.0-r2.ebuild
index 2701484ef986..35783f626e67 100644
--- a/net-libs/libesmtp/libesmtp-9999.ebuild
+++ b/net-libs/libesmtp/libesmtp-1.1.0-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson
 
@@ -14,10 +14,10 @@ else
 	SRC_URI="https://github.com/libesmtp/libESMTP/archive/v${PV/_}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/libESMTP-${PV}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
-LICENSE="LGPL-2.1 GPL-2"
+LICENSE="LGPL-2.1+ GPL-2+"
 # 0/7 was a snapshot before 1.1.0
 # The SONAME was fixed just before the 1.1.0 release was made
 # ... but a patch was needed to get it exactly right too
@@ -31,6 +31,11 @@ DEPEND="${RDEPEND}"
 
 DOCS=( docs/{authors,bugreport,ChangeLog,faq,NEWS}.md README.md )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-soname.patch
+	"${FILESDIR}"/${P}-fix-build-with-clang16.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		-Ddefault_library="$(usex static-libs both shared)"
diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest
index 8b89eca8142f..085ebaa83703 100644
--- a/net-libs/libhubbub/Manifest
+++ b/net-libs/libhubbub/Manifest
@@ -1,4 +1,4 @@
 AUX libhubbub-0.3.6-json-c.patch 1020 BLAKE2B ddeeec6a9dce9329b91fd09afd347663aaaf1bd3b5cae0ecbc96520d8e4f034e6f1a2b8d6caee19419f38ae8aca96f51baba64b072d8c8affdf8769b8cf9966a SHA512 33c8cae170757b5890d7168c8c2e7ceb013aedbb322eb8b57854264bd6e470472ad88a737ca360ef2eaa6d732f3f0ee9f6592def2b1803d83335ae47f02f5ad8
 DIST libhubbub-0.3.7-src.tar.gz 784780 BLAKE2B dd7bd85d3401d87c7bc72dad5d6d0439ab826cf97e76a29367a045215621cb66ff6e97f4028f552b7f395691087f53df077075dc65115a41a59eca476f73305d SHA512 d8ae4a8c4ded2c0e73902bfcf4d5d353154e27f236be0f6ea878cc2daed8a399378a4a9c2021f96106e1c822585b1daa09c9bd49c1551d3e87f37348865cfce1
-EBUILD libhubbub-0.3.7.ebuild 1213 BLAKE2B 5d9ef2795e1c40cd3951fda3a9a01c9ee0a4d2e41b0b6bb18a63e92bf49d977b041233148c7693797c3cd6645bda8daa4f622a7131a1fc5dcd062e2c4cac5d39 SHA512 53f0eb984d3570d7c9720c4718792435498eb33d1fb5da39645f61218ad7155bcbf3603ebb8d588ca762b2aa71ef7b72384592827f272caa443c3f9c2886bfad
+EBUILD libhubbub-0.3.7.ebuild 1220 BLAKE2B 5590520fbd40fec2c9e24f1fd3b78b279d4b8a7d43ef1d6ba8381889bd49c7d9cd053beb39471645d9d9ffbd1e9c9aae2b731a7b4431af80a5394cced13b12c2 SHA512 577608527443780ff5756c7510e363dfb971946f554e5dd6a828d7a45abf656660152551841a4a941b90bd65f64e29ca842e04ffbcafd6b38f5aa36124560917
 MISC metadata.xml 495 BLAKE2B 46d4a88164e0e39d037239285a009538f05b31ce5bb819f3379c356404c9924763bbb9b1d705e58684cfcf82d378187e448ba206a5fde1a1d61b2004c99e605b SHA512 90387fa992cb76ab5afa0d4eb774515bab608b96006107d40c4550abf5d8505ba369c37618d48d3be1093d0b35480ec50b23ff010a7ce150d96c7c11a0452f05
diff --git a/net-libs/libhubbub/libhubbub-0.3.7.ebuild b/net-libs/libhubbub/libhubbub-0.3.7.ebuild
index b2416650628a..650a968a8c25 100644
--- a/net-libs/libhubbub/libhubbub-0.3.7.ebuild
+++ b/net-libs/libhubbub/libhubbub-0.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ~ppc64 ~riscv x86"
 IUSE="doc test"
 
 BDEPEND="
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index a7bfcb915afe..dc92d0bd557c 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,3 +1,3 @@
 DIST libwebsockets-4.3.2.tar.gz 15616264 BLAKE2B 3b8657b79828102cbfba71ea789acd3b7aec7faaa6317974d182b3cb4b5091d8efcf1f184278f71674624a0f1968450ab056e1d91f9faf2c35c67c6c6f4cb695 SHA512 68d18574dea0563fa4f080c5d0d1cfe21a115bffdb17c6190f6741998f1e5db0739e252ef344ffe6fa4bd6781372456b240539471dd2aa900e43759e0f2d42ad
-EBUILD libwebsockets-4.3.2-r1.ebuild 2367 BLAKE2B 28a062499c007066968f5666409563eb1f156d3dc813e4e26cdba8fdcae2751bd3a4920ce3620173224e04161496502d8e048a275db81c95b9720f37c98084c8 SHA512 38c0698450dcb83fc9ac4c1ee91d7795e03eedd294ce4650d41ae471aa9710daecaf8eb4062019224d68bda25ca52d643cd9e97e9dc8051c61cebb6a5e89f10b
+EBUILD libwebsockets-4.3.2-r1.ebuild 2374 BLAKE2B f67e0a055bb88559743e3fd018e936d49113ff79bdb45ea95754181b4f24863f14af52164c14ff3c0470cb8f19ad50d158259efc98c893d257d64b504e13b251 SHA512 211bba79d0ad03e18a94e9ae1aa1d2ba17bde80e1ae01756183cfeabdde19cfdd947aaea43e847302d7e00993758fb252832d700f42f039bdac08d6840604faf
 MISC metadata.xml 1699 BLAKE2B 0436e4a694a6b0d99599d39502d3e92b52b31ff6926c68d7307efeee73f71a9b5ef3b7cbfa6197e0b65d301baa02f91ae88cee6c259b5b12129011cca237c3f1 SHA512 53c0951ddbf202ccde33f851ea7fb801e1ea4340afbe586ab937c17b7d36406dcdd777f091fc79a1767f826d19e836534ed8d020e562779867286bf6c0ea4a30
diff --git a/net-libs/libwebsockets/libwebsockets-4.3.2-r1.ebuild b/net-libs/libwebsockets/libwebsockets-4.3.2-r1.ebuild
index 0c365e8cd6bf..fef44cb5492c 100644
--- a/net-libs/libwebsockets/libwebsockets-4.3.2-r1.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0/19" # libwebsockets.so.19
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ~ppc64 ~riscv x86"
 IUSE="access-log caps cgi client dbus extensions generic-sessions http-proxy http2 ipv6
 	+lejp libev libevent libuv mbedtls peer-limits server-status smtp socks5
 	sqlite3 ssl threads zip"
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index a3c1ca4b8fc7..1513e23373e6 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,5 +1,9 @@
 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 2720 BLAKE2B 9eb6fdd05100c85e3eee67c35ea6a32dcf35f864760891845158d58987e28bd255d0c431533e3a5f0655d62c85b23be0833a915b8bafbdcd0b48a1ff30d9c2fc SHA512 b3d181116d8cd08a108bff77c67824bb91666dec81d648aacf342d1b8f124518014cfbe918ed6762f01e4b2b7566863ddc7fb2e944d2ef6cf961cb02c43e02e9
+EBUILD mbedtls-2.28.5.ebuild 2738 BLAKE2B 7abac124046e31d8d0574deb80477f4ddd7616edac8e1cf4c8792b42065fce324982543c176c1e250a2ca46e99f3720d19a0394fbcd0f3a43572512536a142ab SHA512 1b196dd6921d90756441f34c2336d3349c7d15ce7ad3eec7efabbc69a511723e53eee392a2e33b1964f18a53a55db0b57a1789061ca33c7576f7485d9406e68e
 EBUILD mbedtls-3.2.1.ebuild 2416 BLAKE2B e1ec53b24f5af4e5af4470e7163599b454944b207573d2ee551422cbc862e1c9216b3688330f71f28d39fc1906ce6351b92755b4b28c125f79dd958365220555 SHA512 21bbdcb3c0f4366ca2859e1ea799f9a85e3c98768eaf387c5861856a4e621204653452ee64ef4eff26dffcc767902092ba2bfba909cff42e468161b3f5f48814
+EBUILD mbedtls-3.5.0.ebuild 2427 BLAKE2B 5f382ecdcaa3030396dce6cb0f3af5729af4fd4ecca749bb3cce6030b11ef83ef59e681aa6fd4305a9c16b8ec583f3a4740ce9db9a66780d63094774da6ded42 SHA512 9c380468ad471ab735d70f2e99bba85edee463ff247fc619098b1503228b837aceb15bfb14869b7482a14acf547b0f093498927d8592933bcc681ef0829777ab
 MISC metadata.xml 762 BLAKE2B a26d735045051649101684a2a76c9ae5541eb910b257c8024b794ff4c07b03dc014c92e6b4aeae8c1967d620878259cf7f15716148ca6f2bd58a3686bca54bda SHA512 f68756f7973b13899757de58860ac24fb1794cf885d65814b77fc895787e78a61cee2569124c1ba552dea4b97d43a0cfe1a300cc263c04cccab10a4307cc6b78
diff --git a/net-libs/mbedtls/mbedtls-2.28.5.ebuild b/net-libs/mbedtls/mbedtls-2.28.5.ebuild
new file mode 100644
index 000000000000..5572ea122e71
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-2.28.5.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2023 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://tls.mbed.org/"
+SRC_URI="https://github.com/Mbed-TLS/mbedtls/archive/${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${P}
+
+LICENSE="Apache-2.0"
+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"
+IUSE="cmac cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	programs? (
+		dev-libs/openssl:=
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		app-doc/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/config.h || die
+}
+
+src_prepare() {
+	use cmac && enable_mbedtls_option MBEDTLS_CMAC_C
+	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
+	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
+	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
+	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)
+		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
+		-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 && 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
+	CMAKE_SKIP_TESTS=(
+		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.0.ebuild
new file mode 100644
index 000000000000..c9e64588eeee
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-3.5.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2023 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://tls.mbed.org/"
+SRC_URI="https://github.com/Mbed-TLS/mbedtls/archive/${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${P}
+
+LICENSE="Apache-2.0"
+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"
+IUSE="cpu_flags_x86_sse2 doc programs static-libs test threads"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	programs? (
+		dev-libs/openssl:=
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		app-doc/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 && emake -C "${S}" apidoc
+}
+
+multilib_src_test() {
+	# psa isn't ready yet, even in 3.0.0.
+	# bug #718390
+	CMAKE_SKIP_TESTS=(
+		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
+}