Merge updates from master

9 files changed, 58 insertions, 7 deletions

diff --git a/app-doc/python-docs/python-docs-3.9.25.ebuild b/app-doc/python-docs/python-docs-3.9.25.ebuild
index 9c9d4fd4176e..b13da3e2f5e6 100644
--- a/app-doc/python-docs/python-docs-3.9.25.ebuild
+++ b/app-doc/python-docs/python-docs-3.9.25.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-lang/python/python-3.9.25.ebuild b/dev-lang/python/python-3.9.25.ebuild
index 64c6412b21cc..df65b1fda2f8 100644
--- a/dev-lang/python/python-3.9.25.ebuild
+++ b/dev-lang/python/python-3.9.25.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="
 	bluetooth debug +ensurepip examples gdbm +ncurses pgo +readline
 	+sqlite +ssl test tk valgrind
diff --git a/dev-python/aiohttp/aiohttp-3.13.2.ebuild b/dev-python/aiohttp/aiohttp-3.13.2.ebuild
index 6c92212802b9..c7f20019054c 100644
--- a/dev-python/aiohttp/aiohttp-3.13.2.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.13.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86"
 IUSE="+native-extensions test-rust"
 
 DEPEND="
diff --git a/dev-python/backports-zstd/backports-zstd-1.0.0-r1.ebuild b/dev-python/backports-zstd/backports-zstd-1.0.0-r1.ebuild
index 84c67d239f40..4c24561281ad 100644
--- a/dev-python/backports-zstd/backports-zstd-1.0.0-r1.ebuild
+++ b/dev-python/backports-zstd/backports-zstd-1.0.0-r1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
 
 DEPEND="
 	app-arch/zstd:=
diff --git a/dev-python/flask-compress/flask-compress-1.22.ebuild b/dev-python/flask-compress/flask-compress-1.22.ebuild
index fe11873c1f12..c2e2e1e96332 100644
--- a/dev-python/flask-compress/flask-compress-1.22.ebuild
+++ b/dev-python/flask-compress/flask-compress-1.22.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 arm64 ~x86"
 
 # brotli on cpython, brotlicffi on pypy3
 RDEPEND="
diff --git a/dev-python/reportlab/reportlab-4.4.5.ebuild b/dev-python/reportlab/reportlab-4.4.5.ebuild
index 60eb2d4b2276..ad21a00fffa2 100644
--- a/dev-python/reportlab/reportlab-4.4.5.ebuild
+++ b/dev-python/reportlab/reportlab-4.4.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/charset-normalizer[${PYTHON_USEDEP}]
diff --git a/dev-python/watchfiles/watchfiles-1.1.1.ebuild b/dev-python/watchfiles/watchfiles-1.1.1.ebuild
index 2cd7e3ad3816..659685b98ea0 100644
--- a/dev-python/watchfiles/watchfiles-1.1.1.ebuild
+++ b/dev-python/watchfiles/watchfiles-1.1.1.ebuild
@@ -82,7 +82,7 @@ LICENSE+="
 	Apache-2.0-with-LLVM-exceptions CC0-1.0 ISC MIT Unicode-DFS-2016
 "
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/anyio-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index ead206bfde04..bd32a5695ff7 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,3 +1,4 @@
 DIST debootstrap-1.0.128+nmu2.tar.bz2 70406 BLAKE2B 7ba8f2cb63da3217594e9b058e1b0b4452823d9daeaaff0f91a298bd9d29ec16b332eda03259a12a9259dc759f63f1123654454341eb32f6fd882def0f3e4582 SHA512 a8baa7df3956d407c1b9344a0f0acb8162d951b55c3f402f7f04d8b652e00a366fd0e8be8fb4ecfd3997d6374c0271a329ccc631b32958a2296c73e389d622d3
 DIST debootstrap-1.0.134.tar.bz2 76120 BLAKE2B ce885d57a9c98864ea045dd3151553b57f6d9feadaba41df063f8f9056a7d1294ade2ac32374bc59cbfcae5993956bb68cb19759a109520419b8e1134563fddc SHA512 e7b9726632d3816975c8cbd0020882f69db6d2a84f6c2d086a4e002c58afa61f8b08a8a35b40dd6a284e2cdb584817292462e5dc354fb83d177d50a56aa8cda6
+DIST debootstrap-1.0.142.tar.bz2 78819 BLAKE2B ee7ef91e94471e34174b05e1ec459809db179aca6590ce6c778861a224a111d5e9722673a72b0d109202dc6c930c010ec92a4b6f9663e289488a8e316e4d501b SHA512 e979fecd3acd2c553869f2f03a7f2452e3c13159047c8eb34d16e683cc9db57bccdfebb9fa2b3e1ed609d86eca72c2b4a8edd7a104999b0302346c66b48e4b3b
 DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05a63b17a72e4051ef94f0e60e75bde35baeace81da59d9f04126f6e463163609475b9c0fdf518f533ef SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432
diff --git a/dev-util/debootstrap/debootstrap-1.0.142.ebuild b/dev-util/debootstrap/debootstrap-1.0.142.ebuild
new file mode 100644
index 000000000000..1bfd6cf7cbb4
--- /dev/null
+++ b/dev-util/debootstrap/debootstrap-1.0.142.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="${PV/_p/+nmu}"
+
+DESCRIPTION="Debian/Ubuntu bootstrap scripts"
+HOMEPAGE="https://packages.qa.debian.org/d/debootstrap.html"
+SRC_URI="https://salsa.debian.org/installer-team/${PN}/-/archive/${MY_PV}/${PN}-${MY_PV}.tar.bz2
+	mirror://gentoo/devices.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	app-arch/dpkg
+	net-misc/wget
+	sys-devel/binutils
+"
+
+src_unpack() {
+	unpack "${PN}-${MY_PV}".tar.bz2
+	cp "${DISTDIR}"/devices.tar.gz "${S}" || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local DOCS=( TODO debian/changelog )
+	default
+	doman debootstrap.8
+}
+
+pkg_postinst() {
+	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
+		elog "To check Release files against a keyring (--keyring=K), please"
+		elog "install app-crypt/gnupg"
+	fi
+
+	if ! has_version app-crypt/debian-archive-keyring || ! has_version app-crypt/ubuntu-keyring; then
+		elog "To check Release files from Debian or Ubuntu, please install"
+		elog " app-crypt/debian-archive-keyring or"
+		elog " app-crypt/ubuntu-keyring as required"
+	fi
+}