7 files changed, 12 insertions, 397 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index b4072d2922a4..d52430bb9403 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 761377dc552a..13ed33dc6b71 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -2,13 +2,10 @@ AUX curl-8.11.1-async-thread-close-eventfd.patch 1080 BLAKE2B fa1ff8ff20870c80a4
 AUX curl-prefix-3.patch 1068 BLAKE2B dbaf21f38874a308557997d6a3a7a1f9fdb817b22d9846b4d6bd2bae413b7177650f20f17b10bfcc4a6747a89470dc2672ce79ba67d08fc92ebbbba353ba6c3a SHA512 c10a0062564be885f36e7c37bb58f3aa59c387369b9aae6342f818d4671e31cec99fd9ddda3577f03d1f8e87b926b8d75b006ca543f41a264e8595af79242b62
 AUX curl-prefix-4.patch 1078 BLAKE2B 3211f94da95bb4299c3ffb34db160f92ca5ffaf2995854a97f5fa935895d31e39fe52bc9a9459071f2ba844a8bb86cbacf6fe9dc0e337499138507420d4cbf91 SHA512 ca2cec79636d69d38da41292d8da6d682c5522f0afc883b3210506f8c9c532e8231c205b7b940272de2d085be28cc3838ac721302377fef634751bb40b3b3941
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
-DIST curl-8.11.1.tar.xz 2751236 BLAKE2B a87ec2c78c5d6daf44eee4cf8e3ed124849d067f6c63145205fda18f33ddd3adce386058ead8f9b713f8e595f5e059acd13479eb00edc226247aabd3c2234112 SHA512 7c7c47a49505575b610c56b455f0919ea5082a993bf5483eeb258ead167aadb87078d626b343b417dcfc5439c53556425c8fb4fe3b01b53a87b47c01686a3e57
-DIST curl-8.11.1.tar.xz.asc 488 BLAKE2B 53d58ebb8ab722d8394b7ce94b646c876324cd89b3e47d9129bddcfbb6db338c1dbe93a5e72a25caf7be9ddd450c2b0832cfee17beb8ba701bdeefe653235d53 SHA512 c09bedb67e83fb8ca3ad73c5bd0d92fed7fc2c26dbe5a71cccb193fd151c7219713241a9fe74baefcd1d008cfafba78142bf04cec24dd4a88d67179184d35824
 DIST curl-8.12.1.tar.xz 2768160 BLAKE2B 2b3e3d91041881c0951ad470736266105d3b9720440b808fe382baa493a30075aba52eb1d329fb1f148e27cd76290d82e121e7f4abf695f215456a10e26ade3e SHA512 88915468fa1bb7256e3dd6c9d058ada6894faa1e3e7800c7d9bfee3e8be4081ae57e7f2bf260c5342b709499fc4302ddc2d7864e25bfa3300fa07f118a3de603
 DIST curl-8.12.1.tar.xz.asc 488 BLAKE2B 2a6563609c9f7ada84ca2c7048ad9406809eef4cc958760d2ab3d1b7be58d26247e579bd025870609e80ebb00295026aae30614b84e3a81bdf3ed3dbd0f5ed70 SHA512 41fc5582935090d13940d86974fdea3ea901dd5dab156c16029a87f811d2535172c59dc8dc366f2ffc37bcf85accbecb5aa765bc7b83c2991a3ef402bf25af69
 DIST curl-8.13.0.tar.xz 2773628 BLAKE2B 6869634ad50f015d5c7526699034d5a3f27d9588bc32eacc8080dbd6c690f63b1f25cee40d3fdf8fd9dd8535c305ea9c5edf1d5a02bc6d9ce60fd8c88230aca0 SHA512 d266e460f162ee455b56726e5b7247b2d1aa5265ae12081513fc0c5c79e785a594097bc71d505dc9bcd2c2f6f1ff6f4bab9dbd9d120bb76d06c5be8521a8ca7d
 DIST curl-8.13.0.tar.xz.asc 488 BLAKE2B bd568ec32a44ef7c14c38e4830bcc7711dac726e950325292f1e5de76e619839685300c5afac32330127324327e71ce0d6e574f6e95bcc4a48957345152bc86a SHA512 07f79c7fd7c305c96e10a5f52797254aed7d2a1f3577c8626b8d617855ceb82634ac6787bfa0b7130a4ed72c3a9945d3c9ba5b7be54df8bafa07ded1c62ef2be
-EBUILD curl-8.11.1-r2.ebuild 11438 BLAKE2B 23fbba450554c39092a7e6b7a907f4720ca9407fceddd00dfccc4c7517c39f458365ec1e8ca74fb4f1cfe8033ba0a484d0d9a8537fd87a8ee029ad427aa9ae67 SHA512 12449882676c24b4929db4ab9fb7ce77ffd41e00e4091f7835c0434d25e1dfa613cc1d86e65ac1fc072f05d6a3aac671366727f1d04a09f48bde3af8747d013c
 EBUILD curl-8.12.1.ebuild 11629 BLAKE2B 3de0fe436f0d733fd18a93911678c4383a33cb8600ffb9e3739ce1763712971631bc410da11489ab992887c70706d83235cd214f5c03076280c999cdb1ffc05e SHA512 5536f39147536ae064d4613fb7bc76afde032d1e175355c9236838c15341df6f4a38869c4c5341f8524c522c376552e0e28b5017e428e984ef3f7fe25879935b
 EBUILD curl-8.13.0.ebuild 12884 BLAKE2B 67afaa65d36face2d44b5f2f425eb3a6ffbe9b3dc689c239c3ebb6800377a313099c1bbe9484ed563e0b2a4858436e221a36a3d6a33b41e21d4bb557ea703328 SHA512 f9d6085ecad1ae293bcadb9da861235ccd5865ba064e2c897426b4673f661e6dffcd6af7ff971f4a1a0cedb53caad96285ca3a16ba25ada7665ae28e54358c36
 EBUILD curl-9999.ebuild 12884 BLAKE2B 67afaa65d36face2d44b5f2f425eb3a6ffbe9b3dc689c239c3ebb6800377a313099c1bbe9484ed563e0b2a4858436e221a36a3d6a33b41e21d4bb557ea703328 SHA512 f9d6085ecad1ae293bcadb9da861235ccd5865ba064e2c897426b4673f661e6dffcd6af7ff971f4a1a0cedb53caad96285ca3a16ba25ada7665ae28e54358c36
diff --git a/net-misc/curl/curl-8.11.1-r2.ebuild b/net-misc/curl/curl-8.11.1-r2.ebuild
deleted file mode 100644
index cc333a91ca40..000000000000
--- a/net-misc/curl/curl-8.11.1-r2.ebuild
+++ /dev/null
@@ -1,384 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Maintainers should subscribe to the 'curl-distros' ML for backports etc
-# https://daniel.haxx.se/blog/2024/03/25/curl-distro-report/
-# https://lists.haxx.se/listinfo/curl-distros
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc
-inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs verify-sig
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.se/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/curl/curl.git"
-else
-	SRC_URI="
-		https://curl.se/download/${P}.tar.xz
-		verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )
-	"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-LICENSE="BSD curl ISC test? ( BSD-4 )"
-SLOT="0"
-IUSE="+adns +alt-svc brotli debug +ftp gnutls gopher +hsts +http2 +http3 idn +imap kerberos ldap mbedtls +openssl +pop3"
-IUSE+=" +psl +progress-meter +quic rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp +websockets zstd"
-# These select the default tls implementation / which quic impl to use
-IUSE+=" +curl_quic_openssl curl_quic_ngtcp2 curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
-RESTRICT="!test? ( test )"
-
-# Only one default ssl / quic provider can be enabled
-# The default provider needs its USE satisfied
-# HTTP/3 and MultiSSL are mutually exclusive; it's not clear if MultiSSL offers any benefit at all in the modern day.
-# https://github.com/curl/curl/commit/65ece771f4602107d9cdd339dff4b420280a2c2e
-REQUIRED_USE="
-	quic? (
-		^^ (
-			curl_quic_openssl
-			curl_quic_ngtcp2
-		)
-		http3
-		ssl
-	)
-	ssl? (
-		^^ (
-			curl_ssl_gnutls
-			curl_ssl_mbedtls
-			curl_ssl_openssl
-			curl_ssl_rustls
-		)
-	)
-	curl_quic_openssl? (
-		curl_ssl_openssl
-		quic
-		!gnutls
-		!mbedtls
-		!rustls
-	)
-	curl_quic_ngtcp2? (
-		curl_ssl_gnutls
-		quic
-		!mbedtls
-		!openssl
-		!rustls
-	)
-	curl_ssl_gnutls? ( gnutls )
-	curl_ssl_mbedtls? ( mbedtls )
-	curl_ssl_openssl? ( openssl )
-	curl_ssl_rustls? ( rustls )
-	http3? ( alt-svc quic )
-"
-
-# cURL's docs and CI/CD are great resources for confirming supported versions
-# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.:
-# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core dependencies + minimum versions)
-# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a feature that moves quickly)
-# - https://github.com/curl/curl/blob/master/.github/workflows/http3-linux.yml (CI/CD for TCP/2)
-# However 'supported' vs 'works' are two entirely different things; be sane but
-# don't be afraid to require a later version.
-# ngtcp2 = https://bugs.gentoo.org/912029 - can only build with one tls backend at a time.
-RDEPEND="
-	>=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}]
-	adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	http2? ( >=net-libs/nghttp2-1.15.0:=[${MULTILIB_USEDEP}] )
-	http3? ( >=net-libs/nghttp3-1.1.0[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
-	psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] )
-	quic? (
-		curl_quic_openssl? ( >=dev-libs/openssl-3.3.0:=[quic,${MULTILIB_USEDEP}] )
-		curl_quic_ngtcp2? ( >=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] )
-	)
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] )
-	ssl? (
-		gnutls? (
-			app-misc/ca-certificates
-			>=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:=[${MULTILIB_USEDEP}]
-		)
-		mbedtls? (
-			app-misc/ca-certificates
-			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-		)
-		openssl? (
-			>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
-		)
-		rustls? (
-			>=net-libs/rustls-ffi-0.14.0:=[${MULTILIB_USEDEP}]
-		)
-	)
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig
-	test? (
-		sys-apps/diffutils
-		http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] )
-		http3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
-	)
-	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
-"
-
-DOCS=( README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	__builtin_available
-	closesocket
-	CloseSocket
-	getpass_r
-	ioctlsocket
-	IoctlSocket
-	mach_absolute_time
-	setmode
-	_fseeki64
-	# custom AC_LINK_IFELSE code fails to link even without -Werror
-	OSSL_QUIC_client_method
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-prefix-3.patch"
-	"${FILESDIR}/${PN}-respect-cflags-3.patch"
-	"${FILESDIR}/${P}-async-thread-close-eventfd.patch"
-)
-
-src_prepare() {
-	default
-
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
-	local myconf=()
-
-	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-	if use ssl; then
-		myconf+=( --without-gnutls --without-mbedtls --without-rustls )
-
-		if use gnutls; then
-			multilib_is_native_abi && einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls )
-		fi
-		if use mbedtls; then
-			multilib_is_native_abi && einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		fi
-		if use openssl; then
-			multilib_is_native_abi && einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		fi
-		if use rustls; then
-			multilib_is_native_abi && einfo "SSL provided by rustls"
-			myconf+=( --with-rustls )
-		fi
-		if use curl_ssl_gnutls; then
-			multilib_is_native_abi && einfo "Default SSL provided by gnutls"
-			myconf+=( --with-default-ssl-backend=gnutls )
-		elif use curl_ssl_mbedtls; then
-			multilib_is_native_abi && einfo "Default SSL provided by mbedtls"
-			myconf+=( --with-default-ssl-backend=mbedtls )
-		elif use curl_ssl_openssl; then
-			multilib_is_native_abi && einfo "Default SSL provided by openssl"
-			myconf+=( --with-default-ssl-backend=openssl )
-		elif use curl_ssl_rustls; then
-			multilib_is_native_abi && einfo "Default SSL provided by rustls"
-			myconf+=( --with-default-ssl-backend=rustls )
-		else
-			eerror "We can't be here because of REQUIRED_USE."
-			die "Please file a bug, hit impossible condition w/ USE=ssl handling."
-		fi
-
-	else
-		myconf+=( --without-ssl )
-		einfo "SSL disabled"
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-
-	myconf+=(
-		$(use_enable alt-svc)
-		--enable-basic-auth
-		--enable-bearer-auth
-		--enable-digest-auth
-		--enable-kerberos-auth
-		--enable-negotiate-auth
-		--enable-aws
-		--enable-dict
-		--disable-ech
-		--enable-file
-		$(use_enable ftp)
-		$(use_enable gopher)
-		$(use_enable hsts)
-		--enable-http
-		$(use_enable imap)
-		$(use_enable ldap)
-		$(use_enable ldap ldaps)
-		--enable-ntlm
-		$(use_enable pop3)
-		--enable-rt
-		--enable-rtsp
-		$(use_enable samba smb)
-		$(use_with ssh libssh2)
-		$(use_enable smtp)
-		$(use_enable telnet)
-		$(use_enable tftp)
-		--enable-tls-srp
-		$(use_enable adns ares)
-		--enable-cookies
-		--enable-dateparse
-		--enable-dnsshuffle
-		--enable-doh
-		--enable-symbol-hiding
-		--enable-http-auth
-		--enable-ipv6
-		--enable-largefile
-		--enable-manual
-		--enable-mime
-		--enable-netrc
-		$(use_enable progress-meter)
-		--enable-proxy
-		--enable-socketpair
-		--disable-sspi
-		$(use_enable static-libs static)
-		--enable-pthreads
-		--enable-threaded-resolver
-		--disable-versioned-symbols
-		--without-amissl
-		--without-bearssl
-		$(use_with brotli)
-		--with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d
-		$(use_with http2 nghttp2)
-		--without-hyper
-		$(use_with idn libidn2)
-		$(use_with kerberos gssapi "${EPREFIX}"/usr)
-		--without-libgsasl
-		$(use_with psl libpsl)
-		--without-msh3
-		$(use_with http3 nghttp3)
-		$(use_with curl_quic_ngtcp2 ngtcp2)
-		$(use_with curl_quic_openssl openssl-quic)
-		--without-quiche
-		$(use_with rtmp librtmp)
-		--without-schannel
-		--without-secure-transport
-		--without-test-caddy
-		--without-test-httpd
-		--without-test-nghttpx
-		$(use_enable websockets)
-		--without-winidn
-		--without-wolfssl
-		--with-zlib
-		$(use_with zstd)
-		--with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions
-	)
-
-	if use debug; then
-		myconf+=(
-			--enable-debug
-		)
-	fi
-
-	if use test && multilib_is_native_abi && ( use http2 || use http3 ); then
-		myconf+=(
-			--with-test-nghttpx="${BROOT}/usr/bin/nghttpx"
-		)
-	fi
-
-	if [[ ${CHOST} == *mingw* ]] ; then
-		myconf+=(
-			--disable-pthreads
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# Avoid building the client (we just want libcurl for multilib)
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-	fi
-
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi; then
-		# Shell completions
-		! tc-is-cross-compiler && emake -C scripts
-	fi
-}
-
-# There is also a pytest harness that tests for bugs in some very specific
-# situations; we can rely on upstream for this rather than adding additional test deps.
-multilib_src_test() {
-	# See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721
-	# -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches)
-	# -v: verbose
-	# -a: keep going on failure (so we see everything that breaks, not just 1st test)
-	# -k: keep test files after completion
-	# -am: automake style TAP output
-	# -p: print logs if test fails
-	# Note: if needed, we can skip specific tests. See e.g. Fedora's packaging
-	# or just read https://github.com/curl/curl/tree/master/tests#run.
-	# Note: we don't run the testsuite for cross-compilation.
-	# Upstream recommend 7*nproc as a starting point for parallel tests, but
-	# this ends up breaking when nproc is huge (like -j80).
-	# The network sandbox causes tests 241 and 1083 to fail; these are typically skipped
-	# as most gentoo users don't have an 'ip6-localhost'
-	multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi; then
-		# Shell completions
-		! tc-is-cross-compiler && emake -C scripts DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-	rm -rf "${ED}"/etc/ || die
-}
-
-pkg_postinst() {
-	if use debug; then
-		ewarn "USE=debug has been selected, enabling debug codepaths and making cURL extra verbose."
-		ewarn "Use this _only_ for testing. Debug builds should _not_ be used in anger."
-		ewarn "hic sunt dracones; you have been warned."
-	fi
-}
diff --git a/net-misc/dropbox-cli/Manifest b/net-misc/dropbox-cli/Manifest
index 0ae375da13b6..81da8389eb14 100644
--- a/net-misc/dropbox-cli/Manifest
+++ b/net-misc/dropbox-cli/Manifest
@@ -1,6 +1,6 @@
 AUX dropbox-cli-19-completion 161 BLAKE2B efbdc6b2ae9d8b0dbd5ee4ce833a323cb19c181a73e10a1d065b046e4a35db5a10270f55a6805d52f985be75766bdb56516ea787fd71f72609285455de9e85f2 SHA512 b54e326267ab5de72820be006ec02a0bb33286e6e577165cf0ad3ae3015bcd6f568f99a9866299b7ab64519907baa61a611514be067adaab3e11484d83d576df
-DIST dropbox-cli-2023.py.xz 14308 BLAKE2B e0e1f28c911e5744f26bc3854e1283884f7daa57c247f0a13cd5f571124edca1f11e61ea487bccae294b34c4ce30884758662f95d0438efd1e0e3e64ead6a819 SHA512 c11928de24c6ab10c142eedfa244a903795b37bb75e7e805dbf28fe5b18f524db210eb432bf43eb3c99d67b0caca51c85bbe533b3d7d877cfdc7595925483294
 DIST dropbox-cli-2024.01.22.py.xz 14316 BLAKE2B c2bc33a6d1f74103a3685340747c8d9c974f75e0deec4cd97690333b7697730aa61beef1b315f1375a29d02c6bdf2609464b8ff41cffe7b7ec6efd5978762207 SHA512 272ad65476c8ebd55154feb848e1027b891c91252ca3fa3f50c7db84a7c71697843ae999716a671f697b891721b5c536927c2e63fd2c2afd298a37770aebf123
-EBUILD dropbox-cli-2023.ebuild 716 BLAKE2B c6ac51e52a65a63a281e8f8e19a170918b31a6542dda60ef853ebbcc9087ed9a701c08fffa3817e26b2c548caa66b78f3010ce0262f70b6c1f9f97866a0f92dc SHA512 8e087224ce3b8297e45fe843708d0cbffedf33736620e59c96c742e0f2d1e447dce340d5cfed6f7ede53d8c56ffdbd75bf0e27cec2991089c9632bcb59e56a9c
+DIST dropbox-cli-2024.04.17.py.xz 14328 BLAKE2B 6ec293e38708765df41598baaf6e93b4da5a2ca0b36092f347fdf3d6f75f0fb3dc143b8b40c2c7b2b57c86acbd9cd02e58e302c2f1e9d108e940f73def8d971f SHA512 ae66737ac629166aded65defe852338b023dc1cd872253afe7dff333213157f641602df711e43fc3cd4fe1c02fcc608888613d57caca4d19226e9a2ceeab92c5
 EBUILD dropbox-cli-2024.01.22.ebuild 900 BLAKE2B 2bc0317de6341b5072ed004c63346304cd87e866904475188b6058a2221dbb415ec1183d440f2f18294768f78900c4c8f6a124d136484cd6245eb513345b9768 SHA512 15ba1a79f9ef83b1d52fb5371bd7f805876f742bc96a265049872c3d52d23bd40a43666ffdb685fc12996e637af5574b6066e1718576bbfa120b3cc7030823e9
+EBUILD dropbox-cli-2024.04.17.ebuild 901 BLAKE2B 65f5cbfb0d383d0316b9fbfe27b02053ccd66d9fc87c823b798964bd05bb6d8d17a3f5034d1cf37a2e9edcfa69f4888885d3ce20a09207ef5c8f92a7fc42f67e SHA512 067624de47fd387de32582e39ef96eadcc4a3b36932d034442c361e06ab135b53b9ab665694d45a849bd7851be86e502547073989f446be5168454a1404cfaf4
 MISC metadata.xml 311 BLAKE2B ff3b8e2e3f7b28ac858933b5cb5dda2eb2c56621c5fa07d0adc571066d598ecc97cdf114425d3c3cb5f4d49df8ce88a79b16f4f17ee462cc98ffeb9b9dba4d62 SHA512 774123d6db311ce59f6aeeb930364d3341156a0236b2606e10dac09ddb8604cb2e323c308213a39446bc8abeeaf61617162bff808cda282f441a6a8df671de4f
diff --git a/net-misc/dropbox-cli/dropbox-cli-2023.ebuild b/net-misc/dropbox-cli/dropbox-cli-2024.04.17.ebuild
index 2fe765ca00b0..da236857a5ad 100644
--- a/net-misc/dropbox-cli/dropbox-cli-2023.ebuild
+++ b/net-misc/dropbox-cli/dropbox-cli-2024.04.17.ebuild
@@ -1,19 +1,23 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..13} )
 
 inherit python-r1 bash-completion-r1
 
 DESCRIPTION="Cli interface for dropbox (python), part of nautilus-dropbox"
 HOMEPAGE="https://www.dropbox.com/"
+# https://linux.dropbox.com/packages/dropbox.py
+# https://www.dropbox.com/download?dl=packages/dropbox.py
+# https://raw.githubusercontent.com/dropbox/nautilus-dropbox/master/dropbox.in
 SRC_URI="https://dev.gentoo.org/~grozin/${P}.py.xz"
+S=${WORKDIR}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="+gpg"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -22,8 +26,6 @@ RDEPEND="net-misc/dropbox
 	gpg? ( app-crypt/gpgme[python] )
 	dev-python/pygobject:3[${PYTHON_USEDEP}]"
 
-S=${WORKDIR}
-
 src_install() {
 	newbin ${P}.py ${PN}
 	python_replicate_script "${D}"/usr/bin/${PN}
diff --git a/net-misc/ytmdl/Manifest b/net-misc/ytmdl/Manifest
index b325d25f2d66..5f70b3ed6f2d 100644
--- a/net-misc/ytmdl/Manifest
+++ b/net-misc/ytmdl/Manifest
@@ -1,4 +1,4 @@
 AUX ytmdl-2023.11.26-data_files.patch 208 BLAKE2B 51cb77162812f798ce73d3d71d7a1ad113c047b3ed1e75747d09017b400353dc1fd7bd13ab180ad2e33f4d5c52c65330ff841240677b89da45c85e57a4328993 SHA512 66e6b4177c64232878c5ff04d09a931e0d3a51d0f797f5e2186d3c2870f606c6ac54a367abf90fb3805018f01f6ddb79065aa3a543171f1d1cbcc06e813f910c
 DIST ytmdl-2024.08.15.1.gh.tar.gz 1120362 BLAKE2B ae6bdb8b610f585da7ed15cda298edbbed6a1274459ebb6f13e1afa3a7ed6666e49d7461cf197aa2ac46ca9f989d2d802dd89e83848204395e228d90cc6b9ed0 SHA512 431672b12f4366afd1b6a9dde9e52c14c51db53a7f41eb49a6680590bcf9ec0ca6736506c509262b99ffcf713f940bbb7c903937761ea16bc8dcdc6084201071
-EBUILD ytmdl-2024.08.15.1.ebuild 1644 BLAKE2B f3b9c52427b37c460b1678fd2e49f1553de8bac90c2a4c60e541419bba1f1b8088dc8f608a9175ca4afb9ffb10d6b6f53d26b8d3221586db60f81cd991e24f13 SHA512 ae39a424a3b1a17903dc44a4ea519464ee86aca14db95c982ecab2a3570eb8720dc1e644845915c418cb762c283b93d123bdac13c926bc4eb3eb316c98a4b0bc
+EBUILD ytmdl-2024.08.15.1-r1.ebuild 1644 BLAKE2B a2d968224fa165e4e4eda4aea0adf91ce3ee927ae51483071abf3cbc81d068206c9518caf5995ea8a76c73b3437ee330dc794957082a32917bf06599f01671e3 SHA512 7fbfcf1c10d434c56d1652b25b01be887625bf25859256ecef3c88d8ab32cd41c572f19e6eec28b5cce71234c5a1391ba388de19016b7349b6629a1e1281f470
 MISC metadata.xml 450 BLAKE2B 9901cfebf346a8874315680cdef3ff19d49a84a812358aa122b99645ccde78f8c3b3ea42b1d16bdfcf9f670a694ebcbd9ce50cbcaefcef11c97eeee85264b442 SHA512 32a761ea39aaf5654523a09bfd5bfc6f4052cd35248439bb46175409085cb13b5fbb0097269785ae11df5701fa785ee564d756af5b00b4ab8112cdf3381f45e3
diff --git a/net-misc/ytmdl/ytmdl-2024.08.15.1.ebuild b/net-misc/ytmdl/ytmdl-2024.08.15.1-r1.ebuild
index bfc65d4ded7b..4c056c75ec0f 100644
--- a/net-misc/ytmdl/ytmdl-2024.08.15.1.ebuild
+++ b/net-misc/ytmdl/ytmdl-2024.08.15.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..12} )
+PYTHON_COMPAT=( python3_{11..13} )
 
 inherit bash-completion-r1 distutils-r1 edo