Merge updates from master

dev-java/eclipse-ecj/Manifest

@@ -1,4 +1,4 @@
 DIST ecjsrc-4.20.jar 2255761 BLAKE2B 42e16e1bd3d90b8d9bf3e57f83b3e06f2857a20db3e3ac065ce39e95fc47e75de33186115c36dede691bc37fd55fa8123f2220d13f3d5819404f5de702b10fd2 SHA512 fb27c0a37ed5cdfdcdbc904d067bfdd0477ddfd873a6cd8477d3b473734fd0e37329f0e9ab85dc5f89994d68d9886a488bd88568bc00e25f54c1a5a468dc1384
 DIST ecjsrc-4.26.jar 2347137 BLAKE2B 22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534 SHA512 e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f
-DIST ecjsrc-4.38.jar 2346850 BLAKE2B 12b1be5d4e4124d5643639da61eb223a7fca3911e3ef1bc26c68fb6d4cfa76163560b4233f95bd4d723d876a46c7bce3257a8510c6c37cacd3c26f38cfff5a1d SHA512 64b5b8fbba907f74a73c314e3966c67f349c0f43aabb2cfc60cfdc2ea660769a34bd7d2488f839c8e65ddf3e05b3cae4d93a72f6861ddb2f8ca185073ff12dc0
 DIST ecjsrc-4.39.jar 2352925 BLAKE2B 135dfd9ee887f92a8e07c3ec5c5198635fb29dc265aa8a35c1c0a29c4ad2bb5b84194439bc599714757018f7c9afd014e5289d8462c4e7d521054bebb6f5e8cc SHA512 b171019d8ceec7ff2a28ee299b85c3be72c57fe23f234d34d1ca1beff8f8d7a76fa34a02e79e90fb9d711e9ff26eff1610421b3bac6652150bb6ec878aeb5bf9
+DIST ecjsrc-4.40.jar 2384152 BLAKE2B caad3a612997575d94c52d0fd67a5cb217e3bb4e4238b50ff8116e6d0fb453d39abb4b1a4f7b8f6b53868a4b0246915b488ff0b8953b00168f69917395e37fb3 SHA512 e04700d9a97a3bc1a6ad92f41475c4eddd0e7264ade4f04fb2fd827c3a79b83c8ec40ce1a0b9c919eaa855709a8672e12916093078dab7343a62f18a46015b60

dev-java/eclipse-ecj/eclipse-ecj-4.40.ebuild

@@ -1,13 +1,13 @@
 # Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+EAPI=9
 
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-pkg-simple
 
-DMF="R-${PV/_rc/RC}-202512010920"
+DMF="R-${PV/_rc/RC}-202606010713"
 
 DESCRIPTION="Eclipse Compiler for Java"
 HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt"
@@ -15,14 +15,14 @@ SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${P
 S="${WORKDIR}"
 
 LICENSE="EPL-1.0"
-SLOT="4.38"
+SLOT="4.40"
 KEYWORDS="amd64 ~arm64"
 
 BDEPEND="app-arch/unzip"
 
 # jdk-25 because of compilation errors with jdk-21
 DEPEND="
-	>=dev-java/ant-1.10.15:0
+	>=dev-java/ant-1.10.15-r1:0
 	>=virtual/jdk-25:*
 "
 

dev-python/fonttools/files/fonttools-4.63.0-py315.patch

@@ -0,0 +1,48 @@
+From 731282b6a7335b425c37a02ce865b9189ad6ca63 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 11 Jul 2026 19:52:51 +0200
+Subject: [PATCH] Replace private `glob.glob1()` with `glob.glob(...,
+ root_dir=...)`
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Replace the use of undocumented `glob.glob1()` function that was removed
+in Python 3.15 with its equivalent `glob.glob(..., root_dir=...)`.  This
+fixes compatibility with Python 3.15 (where the function is removed),
+and works all the way down to Python 3.10.
+
+See: https://docs.python.org/3.13/whatsnew/3.13.html#new-deprecations
+
+Signed-off-by: Michał Górny <mgorny@gentoo.org>
+---
+ MetaTools/buildTableList.py       | 2 +-
+ MetaTools/check_table_coverage.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/MetaTools/buildTableList.py b/MetaTools/buildTableList.py
+index b344f330f..9bdd95642 100755
+--- a/MetaTools/buildTableList.py
++++ b/MetaTools/buildTableList.py
+@@ -12,7 +12,7 @@ fontToolsDir = os.path.normpath(fontToolsDir)
+ tablesDir = os.path.join(fontToolsDir, "Lib", "fontTools", "ttLib", "tables")
+ docFile = os.path.join(fontToolsDir, "Doc/source/ttx.rst")
+ 
+-names = glob.glob1(tablesDir, "*.py")
++names = glob.glob("*.py", root_dir=tablesDir)
+ 
+ modules = []
+ tables = []
+diff --git a/MetaTools/check_table_coverage.py b/MetaTools/check_table_coverage.py
+index 5764daddb..19ec986eb 100644
+--- a/MetaTools/check_table_coverage.py
++++ b/MetaTools/check_table_coverage.py
+@@ -141,7 +141,7 @@ KNOWN_GAPS: dict[str, set[str]] = {
+ def get_table_modules() -> list[tuple[str, str]]:
+     """Return sorted list of (module_name, tag_raw) for all table .py files."""
+     modules = []
+-    for filename in glob.glob1(TABLES_DIR, "*.py"):
++    for filename in glob.glob("*.py", root_dir=TABLES_DIR):
+         name = filename[:-3]
+         try:
+             tag = identifierToTag(name)  # may contain trailing spaces, e.g. "cvt "

dev-python/fonttools/fonttools-4.63.0-r1.ebuild

@@ -0,0 +1,67 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{12..15} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="
+	https://github.com/fonttools/fonttools/
+	https://pypi.org/project/fonttools/
+"
+SRC_URI="
+	https://github.com/fonttools/fonttools/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+native-extensions"
+
+BDEPEND="
+	native-extensions? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_USEDEP}]
+		' 'python*')
+	)
+	test? (
+		dev-python/brotlicffi[${PYTHON_USEDEP}]
+		dev-python/munkres[${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)
+"
+
+EPYTEST_PLUGINS=( pytest-rerunfailures )
+# woff2 tests are extremely flaky
+EPYTEST_RERUNS=20
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/fonttools/fonttools/pull/4125
+	"${FILESDIR}/${P}-py315.patch"
+)
+
+python_compile() {
+	local -x FONTTOOLS_WITH_CYTHON=$(usex native-extensions)
+	[[ ${EPYTHON} == pypy3 ]] && FONTTOOLS_WITH_CYTHON=0
+	distutils-r1_python_compile
+}
+
+src_test() {
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# nonfatal for virtx
+	nonfatal epytest Tests fontTools ||
+		die -n "Tests failed with ${EPYTHON}"
+}

dev-python/pypdf/pypdf-6.14.2.ebuild

@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit-core
-PYTHON_COMPAT=( python3_{12..14} )
+PYTHON_COMPAT=( python3_{12..15} )
 
 inherit distutils-r1
 

dev-python/wcwidth/Manifest

@@ -1,4 +1,2 @@
 DIST wcwidth-0.7.0.tar.gz 182132 BLAKE2B 97f800c3022425cfe245c5d0ec8b268aae9cadd12c7d49c2296146719158131c9f82da9be65b6e258b5c9a26f983b09c794b64e296827c5559eb7543068bb3a0 SHA512 5b8316ceb5be72e1eea2fc18ae4a237e726f6d649ef773aa6d4a3f8c75aae9bb1df83de7bbe24c97ee6dfa66b6eaa0ae462e22cc054f5965dc6c9e263fb504bc
-DIST wcwidth-0.8.0.tar.gz 1305357 BLAKE2B de06f5ced279ca7424d9ed133de0c09d70644b914da8626ddb14f499a576083bd7d382495bf63ef4073a95c90ba57a03efd9caa4376b968454616bd5f11e4c36 SHA512 8a428b56a6aa1a6cce348140486fbf21348271d0132c748c47319b29273e04255651435f4ba8c1ba70ec9d4b2e9585f9d4ec182b5f82d3e083e363c13a6f1dbf
-DIST wcwidth-0.8.1.tar.gz 1466072 BLAKE2B 8365a3965baba25700f8ea7b3ddfb09080dc3eef87f6e286246413723354305d24d396eadc0c440d335274d83aa6b96eee0a56931c11e37ccaa950c320f53045 SHA512 b8c44555efa608ee63a643e1661e41b8e8da1338446ea08b8c6c1163ece55ed52537c60f4c7d1b65cbc0a25a5896d614d473a1ffe0dbaf4d35c9f7338a773cd8
 DIST wcwidth-0.8.2.tar.gz 1466253 BLAKE2B d71edfcfe3c948090b2a8b454ddc9b701668076cba72fe888a79df06ae0b952d2329c75f27ed086c11c5aa02c68e1058c154d9f4b85f783e2ce5263a6355936d SHA512 5fa3741d4db553d1b06ed1310e01e8a21e696da3489d37a9f45997c279dea494c773e78c2c9d5ad2efb2c8b2e1217170eabc93c76d71167539a04a377595e84b

dev-python/wcwidth/wcwidth-0.8.0.ebuild

@@ -1,32 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{12..15} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Measures number of Terminal column cells of wide-character codes"
-HOMEPAGE="
-	https://pypi.org/project/wcwidth/
-	https://github.com/jquast/wcwidth/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
-
-EPYTEST_PLUGINS=()
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -o addopts=
-}
-
-python_install_all() {
-	docinto docs
-	dodoc docs/intro.rst
-	distutils-r1_python_install_all
-}

dev-python/wcwidth/wcwidth-0.8.1.ebuild

@@ -1,32 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{12..15} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Measures number of Terminal column cells of wide-character codes"
-HOMEPAGE="
-	https://pypi.org/project/wcwidth/
-	https://github.com/jquast/wcwidth/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
-
-EPYTEST_PLUGINS=()
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -o addopts=
-}
-
-python_install_all() {
-	docinto docs
-	dodoc docs/intro.rst
-	distutils-r1_python_install_all
-}