gentoo auto-resync : 13:11:2024 - 03:02:42

4 files changed, 4 insertions, 110 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index f358254e0eef..48dd45c63e06 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index a8a912aac234..191f3ff23701 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,7 +1,5 @@
-DIST mbedtls-2.28.7.tar.gz 3990571 BLAKE2B 91a11d9d56fc058c3aef797e644c2c141cd70dc96716e75d9074de89717298a10c93e403a2fed9ae6f34c7549753a70d61b6602fbc21bc568c2e260d4f369f65 SHA512 1cf6722d60a49375f857c8d84f06dbb50ea08accaa12b329d75a93b959aef382410e7b6e0a1511407402b3eec5e2208eaf5e9fc2c8574ed0f8f44234bc4401b3
 DIST mbedtls-2.28.8.tar.bz2 3343796 BLAKE2B 1efde6698662873c40df9733bae902db4e009f3dd26a937e05707ca1a208b71675df0737b44b5895a60cfbf42f18f92dae88cba62f32b55733947b9c0481880e SHA512 c8e91ec50ab2caf1f33e907279dc30fca2a8cd97e6e531be857149589e52aeffb95b445b2a9fa674886f0071f446381da3bb8107f7e850f3390128b069ac9ea7
-DIST mbedtls-3.6.0.tar.bz2 4811255 BLAKE2B d453f072c39aa2ca5669f0fe84ab01ea826a98e1e48b59b5a788e3ae948c33500e8e0565ed6481ef049ee3efc72eb92828c9d08f5606766cb6c9dbde749459b8 SHA512 5c395890d486144af882aa96c9430103f79df889139969a64a490c0cafbdd5631a72bb668aa59b062204f19a5bb36dfcc5a096b59d76c7ef27f2560cd2388682
-EBUILD mbedtls-2.28.7.ebuild 2778 BLAKE2B 44f088d695dda332898d75b5a421811de6ef0955df53933ffb1823aa30e3d4cba8b9f5313c75f7369af3ad6ea50958786bd96a177ac3c4ef2a857a0e0680c1de SHA512 8532902a23117b45b324482188e6a36a07f279e996e9cec8666ec13d238ca577042a3a5c69c6dec21ad508cfa9af1febda959725c8fa346209c9b543057b707f
+DIST mbedtls-3.6.1.tar.bz2 4977592 BLAKE2B afecf4968a8f1b64413d7cc17919bacc69e3b5e5ff9e1750c43f965f6c7cd9af9be7a0d09fcab986b9a22e7951a038a653568a2e6cba976dbc8714692a784192 SHA512 c75e207273f39ff1980e629123422299e8f81b2ea4a1a206896f06911b48cb06db1d20d129ec675b1ec10fe7a92fa81bd33b19a84d21370d092442b34b02048f
 EBUILD mbedtls-2.28.8.ebuild 2770 BLAKE2B 97b08c08b32b809725b8eeb9d4325cfcbfbf8e3413083867b0f2cbfb4eecaf86fca2a8c4c7dd77ca66c70f60179dfdc04e2047ef1aff86ec3eb1122fec1ddb2e SHA512 7d1c512416845ad5002c2d91cd90bf545f6b42b26f9bd6408f7309cfd674cee1d2c842af68168415f25e5eb34e0d2694ae085445fccc30cdd17846c05d5c154b
-EBUILD mbedtls-3.6.0.ebuild 2484 BLAKE2B 59fc3d51188a2409f452fe91bc7fdbabb4a650d3bec0ea5b6a3e14eff265d902c4077d15bf4d88d362edfad570c1b7540b57afe15377bb28810a4160537e66fe SHA512 685d9296e2a325459e501ee3e2efbec5f06c9af29c6097e8bdbf0b3338fe7422bd83432cf8d06d5d0b39deb907d22c528e06b7e605d027524b96690cf80fbb5c
+EBUILD mbedtls-3.6.1.ebuild 2482 BLAKE2B 7f11721496a31ffca1cae04b287166e832b8756cb465d4416ec4e53435da9cc6483801f23579296133abd9849d9a8f1c57ba3b2b7ae8ee6d39a715695035004e SHA512 1df63381c789efeaa68a3b18faf53e4ffa31ce37bb2bb4b37d2ca46de01b86de2a153b01be23939d6218238a444965ee548a74f4610409de0bb27882192643aa
 MISC metadata.xml 1058 BLAKE2B 6b3d24de59849c4fe1a629007300b3bc85aa9e7808e54f91a257c5d9de5eaf7b0567ad248aa928ea6b30a8977ff2d70410721bb03a7839c3f97d7d1c5f416e13 SHA512 8f8a6fef48532d23d10efc7a2334606840ae80d46373a423ab1898950e23487587c8babca2aacfbe7fa5dd4d1327d42e171ad01235f813541acfce27a0fa968b
diff --git a/net-libs/mbedtls/mbedtls-2.28.7.ebuild b/net-libs/mbedtls/mbedtls-2.28.7.ebuild
deleted file mode 100644
index 9fb3290b27d5..000000000000
--- a/net-libs/mbedtls/mbedtls-2.28.7.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 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 ~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="
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	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/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_TESTING=$(usex test)
-		-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
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	use doc && multilib_is_native_abi && emake -C "${S}" apidoc
-}
-
-multilib_src_test() {
-	# 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 -j1
-}
-
-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.6.0.ebuild b/net-libs/mbedtls/mbedtls-3.6.1.ebuild
index d0df71ce9d3d..0d3fb3694a4e 100644
--- a/net-libs/mbedtls/mbedtls-3.6.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-3.6.1.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 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/releases/download/v${PV}/${P}.tar.bz2"
+SRC_URI="https://github.com/Mbed-TLS/mbedtls/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="|| ( Apache-2.0 GPL-2+ )"
 SLOT="0/16.21.7" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}