15 files changed, 152 insertions, 161 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 903128a43923..3cab291d3704 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index 823838f8dc95..b47e5d1938e8 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -703,5 +703,5 @@ DIST zip-0.6.6.crate 65789 BLAKE2B acefc076297468d72cb20d8c6234fe5406875056fbf78
 DIST zip-1.1.4.crate 77910 BLAKE2B 1c6a0e14becbb43faa9510d303ab254486e97730bc741c1fa3c7a88327da0b1e8815026e319abdbeb9e6c9e0ec713d83dbb3a0ae83a32ed2d197923afa803866 SHA512 18c8e7c9246049c7be4ade2bee501da2ff7cfe45aaab88e20650246833ae3f7b492644c0f4a43aa93a7ef7bf95413c9b27d0f5f8d099f19131a682b92a6d3fc4
 EBUILD maturin-1.6.0.ebuild 12304 BLAKE2B f00ef36a7eb337dc2d7bb2cb0c9f5a0151ce87f20e262b3b992cc05b9ecd748996e60c4e572eb392dac5710b96c3d9cb937e26f9926c176f27ea8e6d0eda32d6 SHA512 fa144969049adabee32c4bc70bbc8ca83d3b4530521f17f74f32000aebb94f089fdc2878e4ec95d6b7e2063aeb369012b53845ca7980068b1998f382a3a9b249
 EBUILD maturin-1.7.1.ebuild 11628 BLAKE2B 6f9974eb6eb6b1e2aace19244fbac999793a433fbc52a0f98d577e26662e68e2600d292b0f6fd28cef9ec2767c955bc0538050a52726146f6c83ee5952fe9d1c SHA512 9ebab27d674a6276228ddbb82ff03cf8d137d7f1dd4e807c87b100aacd908159401495f1080ca1afb3ffe413d39d43cea0eb92c6e9c0b094e41a27aadaf2af08
-EBUILD maturin-1.7.4.ebuild 12459 BLAKE2B 4850cbbc9b1c39fb2b83b61ed91e24b0ab9d94a2089d92035039650d307950cddff5e7493426b033cddb500fa1b7bb296492a7fb10339cb0123c33694d1e26f8 SHA512 f74f4682c9915defffa97fdd1242275e9a7a6782d2da0cb30e4bb7506be750bb47164e07cdc34d4d7743e11f4ea00181074aa90af31a91d53efdcbc68a773327
+EBUILD maturin-1.7.4.ebuild 12458 BLAKE2B 73286aae8226ebaade66552f914db25c835ab66a6988c12dbddae3cdff3f812892374e1c63cf690c167fbc92da0ebc4f00564c238f48af85cfb945beee4d9efc SHA512 f5a3a2005487a0e9c23bface84f3c2e3f5cd80c901e141176b07997aa3757397af7f2b576dc33f7cc762b04587028085558bbed7e0c1b06b6cc55264f25ecd23
 MISC metadata.xml 431 BLAKE2B 15731479f56d8b819c60e8e5541d3c4720462c5a90b199b803097b208432b18cc0143f8cbee471ce81ffeb8b54846fdb61fad083e7507f4f6c3630ac628546ed SHA512 7431db948fd5ab520fb6cae76c7e7dbb2c7aef907d7cde21189d1bb17c686cca7f69a0b84470b1c5d90f672e80d30fbb56f37beec1da04ebfdf025015c099ae7
diff --git a/dev-util/maturin/maturin-1.7.4.ebuild b/dev-util/maturin/maturin-1.7.4.ebuild
index 6e76f6201b80..271355cbba38 100644
--- a/dev-util/maturin/maturin-1.7.4.ebuild
+++ b/dev-util/maturin/maturin-1.7.4.ebuild
@@ -454,7 +454,7 @@ LICENSE+="
 	Unicode-DFS-2016
 " # crates
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc +ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index ab18bc5f59a9..03280709b8fd 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,7 +1,9 @@
+AUX meld-3.22.2-py3.13.patch 1119 BLAKE2B 037386c5ae418b211b56d0d9f580f2eabe70280e2e9c778a19c3e5591c64ae2ec44ac3f0667e4899632f0cc9806abc252042586c21723a99b405d59f39136315 SHA512 e2792df3112c5e720714f98e3f6f0b351d53afd68a1ba27f9677fbce3dcaca922b697c0438191c1ead99a710e1b3a0ebb2d9ff101a665b9e1a3d7ab6ea439051
 DIST meld-3.22.0.tar.xz 674212 BLAKE2B 1d5af5fa9943c46fd150bd1e1c74003579a0017dea56178e92c4ba0dd1ba0bc3348a6f2625bfe5191fe4d8394b06462a30f2173ae623ffd32c637642f9c36183 SHA512 4cc1c9a76379401c1f116292bb4730301ec0f2413cdab7b463ed519ea7ee0ee86143a9c83a13f1ef09860aad192c04769d111bfb1eb10b5e1bc81fb44c530526
 DIST meld-3.22.1.tar.xz 675984 BLAKE2B 47ad8cc0b3f55e2ab8066bd811a925eb12446d041b26220d56a11eedc727042357c8bbec26a5b9f1a9e220357753968acbc43dd257fe48013a3fcf7ef4243364 SHA512 7cb4c64a8134d02ee629c5459d5361c8ee1b1fb80efb02b9f3d2c577ecb69dca2ff66b90affb479682b7fceda41c60717ef859d93e3b93070a84901ae772b2cd
 DIST meld-3.22.2.tar.xz 676376 BLAKE2B 5e592e378ac2c942dd98df6d9ac4f9af7a1eee552af1691aade2e0f453a5ddf649ca09c38191b2c2ffdb7b6fa165012b4d8372e9e99c33052f612e2ab8ca8670 SHA512 fd8b12567cd8dcf77f265d831c9ac9ba33d13fb78c95b01b496b016308ff4159963b4610a68f41d04a52cc5bcc13bb4568d24bbade5bd79246111e463e413284
 EBUILD meld-3.22.0-r2.ebuild 1634 BLAKE2B 6afc6de6ab3e4d77b54e31df56499075c99b441dd11e64c2fad6364a30e708cd991354049459c6b0aa6a897efe86f3f24f499dc8860bcebdbaf5d823d874490c SHA512 c31a520fd62e7acef6552d39a83eaff1c393e74e73bb0497f8f4b2c6cc63a226c94fafde068e5202a619b3d5169a073c61f4be7a592b42a4af2c0325738e20a2
 EBUILD meld-3.22.1.ebuild 1636 BLAKE2B fac8143352238568e67a0de52a257b09503f37c45edd07ef234bfa7727138940b976e04218c62be61ca7a33a878dd94729ae31a8e5d39554e7884a0a69640b20 SHA512 b017c5b3830759336231afefef360a363f683865f298902002ec7251004951f54de2e3898ab6f0ced14726269bea53427e59ce5cba2e6521a44e991ae426dbad
-EBUILD meld-3.22.2.ebuild 1637 BLAKE2B 092f789a491ce944da2406b16870228b6d703274be196bd341b70925c20cbff64f3807ff89b99f0b1ca380363070ba66d78ed308bcd7f643c50e4545f6a87f23 SHA512 2c551805df2acb723c9e5769b5974844b3efbc2fec0e06c052a6c8ee6c8f759cf26a38a3ea0b8327ec70850b6baec778412b203fd069749e0c0081dc93373452
+EBUILD meld-3.22.2-r1.ebuild 1690 BLAKE2B 68527ea07ddb78a463e9c5a565f7fff1886d9febc7ad6360c1b9c56270425d3a9910bd2fd658de9116062b61822e52392e81914401bd03fb5606a0c51b92d63f SHA512 e075b2072d0edb765a5fb2c6e72436d88b8ec3018c5f55870c859f4a3d1f53cc6e766cdb61de3364b3a36ad6dd7e07ab1f13f779ffd0b075f312daa60f7f4fe7
+EBUILD meld-3.22.2.ebuild 1696 BLAKE2B b0ea2edab600b7554b9ee007190c1069131840a0266f8205d0fd0b7e7c4717c6657eeaba72fea1efe777a305c2e53557c744d004541980c61e85c128273d266e SHA512 04371106de7cfb1de93b70eb349a9d519e00b2c692b8d3266f8027c28d47f7112ea2a61bd6487c207c1a912a821d323227a0809fb36ba677ce35f78ce6637d04
 MISC metadata.xml 345 BLAKE2B 3983c99529677ef9ca8365596b512eb33383219b31af470e3721379d6cd0975a9550200ee154549973849f7cc0ed16333cb91cb387e1e23dca2047faa1e0f91b SHA512 b04c508f3924cf28491c83f1cdb797332abe85bd016434805abfd082722f5a1d5616db3cdf9bbc139e2f66f91c81ccb9f4cfc0b1ce7708d06cd13e624ba11c89
diff --git a/dev-util/meld/files/meld-3.22.2-py3.13.patch b/dev-util/meld/files/meld-3.22.2-py3.13.patch
new file mode 100644
index 000000000000..b49499f63ce2
--- /dev/null
+++ b/dev-util/meld/files/meld-3.22.2-py3.13.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/941526
+https://gitlab.gnome.org/GNOME/meld/-/issues/873
+https://gitlab.gnome.org/GNOME/meld/-/commit/aa817dce6bb0667fc6ef38163c213803dc8b37b3
+
+From aa817dce6bb0667fc6ef38163c213803dc8b37b3 Mon Sep 17 00:00:00 2001
+From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
+Date: Fri, 29 Sep 2023 04:23:22 -0400
+Subject: [PATCH] Don't use deprecated pipes module
+
+Only `pipes.quote()` was being used in Meld, and that symbol in
+pipes is just an import of `shlex.quote()` anyway. Switch to calling
+`shlex.quote()` directly, since pipes will be removed in Python 3.13.
+--- a/meld/melddoc.py
++++ b/meld/melddoc.py
+@@ -17,7 +17,6 @@
+ import enum
+ import logging
+ import os
+-import pipes
+ import shlex
+ import string
+ import subprocess
+@@ -45,7 +44,7 @@ def make_custom_editor_command(path: str, line: int = 0) -> Sequence[str]:
+         log.error("Unsupported fields found")
+         return [custom_command, path]
+     else:
+-        cmd = custom_command.format(file=pipes.quote(path), line=line)
++        cmd = custom_command.format(file=shlex.quote(path), line=line)
+     return shlex.split(cmd)
+ 
+ 
+-- 
+GitLab
diff --git a/dev-util/meld/meld-3.22.2-r1.ebuild b/dev-util/meld/meld-3.22.2-r1.ebuild
new file mode 100644
index 000000000000..f9be686638ec
--- /dev/null
+++ b/dev-util/meld/meld-3.22.2-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=x11-libs/gtk+-3.20:3[introspection]
+	>=dev-libs/glib-2.48:2
+	>=x11-libs/gtksourceview-4.0.0:4[introspection]
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.30:3[cairo,${PYTHON_USEDEP}]
+	')
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/pango-1.34[introspection]
+	x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-util/desktop-file-utils
+		dev-libs/appstream-glib
+	)
+"
+BDEPEND="
+	dev-util/intltool
+	dev-util/itstool
+	sys-devel/gettext
+	$(python_gen_cond_dep 'dev-python/distro[${PYTHON_USEDEP}]')
+"
+# dev-python/distro is soft-required in BDEPEND for python3.8 and onwards,
+# but it's mainly needed for debian and derivatives - seems the fallback
+# works fine, as we aren't a special_case, just an annoying warning.
+
+PATCHES=(
+	"${FILESDIR}"/meld-3.22.2-py3.13.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dprofile=''
+		-Dbyte-compile=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+	python_fix_shebang "${ED}"/usr/bin/meld
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/dev-util/meld/meld-3.22.2.ebuild b/dev-util/meld/meld-3.22.2.ebuild
index c3cc3c0d9d2c..be87de18466d 100644
--- a/dev-util/meld/meld-3.22.2.ebuild
+++ b/dev-util/meld/meld-3.22.2.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{10..13} )
+# py3.13: https://gitlab.gnome.org/GNOME/meld/-/issues/873
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit gnome.org gnome2-utils meson python-single-r1 xdg
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 3fc33b6c670e..90b30328c5be 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -4,6 +4,6 @@ DIST pkgcheck-0.10.30.tar.gz 378098 BLAKE2B f80224d707f7656ca45f58932936e1ce780d
 DIST pkgcheck-0.10.31.tar.gz 379079 BLAKE2B b3e308a8d496c954d649677a41394b1fe1fbab43ce6c629616249306fafaad8e5c2cfa38fc9c838117f7abc381a0c04cea60ba5a2b3ab6a1612bbfc68d858832 SHA512 539cf262c950547dbd85441a7b40e76fcdc0810fdd633ab9042a13c7b19db4826c05ea1bbacf64b50c68884e31fff6a88e6b2baf94b2e6a4b2738123441da6ec
 EBUILD pkgcheck-0.10.29-r1.ebuild 2259 BLAKE2B 0106d3f25f757ae7c9e65cbf78c56411baab534885e67bbf8b368c5425f555e4be0cd8ce992725d53923a3014277d19d3658919d1dc038d9db2c0a6248ad23d3 SHA512 7e18f3e52ce912f0a9d267f3b1482bec81aee58609958f9699015ea22339aa153fcd2a8d49bf62c29e0901b317ea4dfd9c70454acedb176b7875095f5497950d
 EBUILD pkgcheck-0.10.30-r1.ebuild 2254 BLAKE2B 94e3ff89fcc6a8b08b35ad9c46f1e1d54e5f548da3a8b1e7c941d0315852d405a0a6e3c6f9260ac0bc4bbc7f374d94cbd3394c3db098dc7e194152d1c8eb282a SHA512 9e0488bf01869d88c8ac2978bba0cffe8ff96b331b94b2f8ce242fa4e84ba80f98271979fdf3f50bbbb0191fea4d1ee22be92f96fbcdc365f27631b5e79aa27a
-EBUILD pkgcheck-0.10.31.ebuild 2229 BLAKE2B 9f9d10a9bf6e422e8b9db3ded98d0871cc5ae874ac6ca4ec2f55a655fe378b98035d9d978a3c01eef9732237567499c6f25092a42181c8d9021b6bc4a013191b SHA512 78bf7b1e1f5c23be22fb900c22ecfd39d1a3ef2eaa1cd1c0139b175a43966b2167fdbc763c454881f124206f7d04018371493f48877f83b80a7cb0a600829c46
+EBUILD pkgcheck-0.10.31.ebuild 2228 BLAKE2B 5a41d09c61cd64cce4769650c690795deebbb72e997ed7e14eacc28a4970f77196cd101b953a1190e0639a67dab2fb04af76b35e3b01ed34a9fc5c225bdb77aa SHA512 95075f73eb4d0a1fe6aa70ba236185281160e8117bbf74d3b48322df160d0cbb4ef2f1d274e207c8badec6fcff0cb517beaaeafef19da1a638da128c787c2827
 EBUILD pkgcheck-9999.ebuild 2223 BLAKE2B 664fee3e5ed354eea1f55e852a6c8038f5eff0fb93ee2efaa3c24103e52246e9737df512f5a86af703174a22fe467aabcad7232701e13bab2423cd7cc2b50553 SHA512 a246781aeed620aa012da683f5969576a7069451ccdc0f036fdbf05c4765527a6169b04afc9f5942b3c6878508430a5117435dd57c1f1ac55cb4c63339a20f75
 MISC metadata.xml 455 BLAKE2B b544db3532ef1da966833d5edbc79988cc1fd85b6d6276476684b49d4485814d6e2d969e742d3633c8176e7f37cae6614dae1654fd1424d71475f022166f6e6a SHA512 5abd1584f486e88992bab8c51c191b4915a5854752130f8a591147ff4b2af2102fdc8ab182e7358c3e4bbb3fdc8400563a250e2dba1793d365f0edc7c5f7c33a
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.31.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.31.ebuild
index 37ce36b372ed..5babef749b7e 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.31.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.31.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 		https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 	inherit pypi
 fi
 
diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest
index 0ff65ee377dc..d566dde5300f 100644
--- a/dev-util/quilt/Manifest
+++ b/dev-util/quilt/Manifest
@@ -1,10 +1,7 @@
 AUX 50quilt-gentoo.el 294 BLAKE2B e70d8e48f600246989c7007a139cd09e2453b07618170735cda7e836cb89ca985d22cd1e02bc1291adc9b66a9fe8b291bffd7c1be58ca25fb0862d873b961881 SHA512 02e74d02102e852c0f72a73dd897c29dd13bae4722d3bb543119bfd42c3e52b0ad78074657c7435e7a6cc0251484577a1a145cc567fc827749538fe8bceeaece
 AUX quilt-0.66-no-graphviz.patch 1464 BLAKE2B b1a67706f29f3986de0202a4ea68aa2f001989354bf9ab91996cb4f5dbb6578baf28fc1ac781a18525d04fb92d9f6d554efcc598dabbdf1a35b0f63b93c3cd8d SHA512 3f935a6e137998f7d0391ef87f5324c8882490001b37333de22efc068bda8a7e84ccefc3e85616c3aa93894acb8a0841a2b089c59c6a658d1157298d4132707c
 AUX quilt-el-0.45.4-header-window.patch 348 BLAKE2B 88c8f73cc51d49d0a1c5f15f3d8642cf8a8062fe03a0e99a1d8928279bfcdeeb95bba6787292cdf9919cadd4ca81fce96eeddff02efec47753e75fa5abe214ed SHA512 d57bda92c8196d71154aea4d48a3595c624aeb87b340272552a83f57d3429c55d02431f2cf9f20a122013d2baa60346988f3448a992db4d535d9961b71d7ac51
-DIST quilt-0.67.tar.gz 543713 BLAKE2B 691b42378a862bfaa8ac9ca042d03d149aaada05894e1d9b92ad4ddf213bf13674c08b72788626ed49c8ccbc792c31e5bc827f8911bf7b0e23733fbc75fca1d1 SHA512 2dcf9396444484e1664f3dc9bf6a024d11fbaac4e984a295b269bab2649e254dafe3dd89d8f79cfaf1c33d2aa80a803ea55eef4debbc1ebc8d3459ecfa52e4ec
 DIST quilt-0.68.tar.gz 551096 BLAKE2B b012d0ccc0efaa2b645eafe9279a511a9fbd7546f22f35aebdb5488bde433e841472b907cacdd5f451e20a15b348f651028591f9a2d5b195613948f754c06cb5 SHA512 a2a58b330ccb3dd55b1f280310d506c605166bceedf7439582cdf8a198ca4aa34a375fd8bfd4027c540481bcdf5e6175eafd19707aaabe194b01cf7caa40572e
-EBUILD quilt-0.67.ebuild 1635 BLAKE2B bf9eddd2db8cb9af9071fc56190f1e39f33059ff13e1573168b4761d0d1b0a4cad152b8615188cc3e08ff4b97fd4b18a0041a0509b1f8cfc77b55ebf32a0bc64 SHA512 90b9a56938b6a9a69a96806adc294b924bed0588582bf115cbfb4805829df1d7fbfb2d677e94645558d01884c1463c33524d032825adc5858b2f3f7affec116a
 EBUILD quilt-0.68-r1.ebuild 1938 BLAKE2B f826b943348854e7b996a328637b32005a71357b23362185d3e7699d29e61e151890c9ad4670e4f90144df2c515e4582faf572a3442bd63c01805214d34cf18e SHA512 fbb71f33d986aa33c0118e23222e7c863d0e5c0f4402fc24aa38157c73c148644445c8dd38b7290468a74049a7f38f77ab5cbfed24df19f2910dec21f0d0fb31
-EBUILD quilt-0.68.ebuild 1671 BLAKE2B c1d76aedf1e97189ba961d2b5f3f3bafba9449381444af8447aebc2bb71a56708ff6674f9ff9fd79742a65edb842008f4e5ede9f776a15eaa10eb0c107093ba6 SHA512 60636a6fdb8b07dd22388b672b0fdc43519a45872eddd78df48dfaa70c27d02db65c876cc5e25e2e84c5b518799defaf84c9e9138f52e513a8bd8a65d6b6e63d
-EBUILD quilt-9999.ebuild 1783 BLAKE2B 620a0cfac832d96aea589e0838d87159d20f3145ce3b1359871a9f0772804ce29992d204896c806ce979fedc30694163a56976e934fe250abe2b4b8e6fe7e3b1 SHA512 933d14a132b5d4c40f3678149d620699a166744883ea7eae0287799028e46cc39e5cee6861f61efd4b9a8e6bbf6d079ca049ea5373f52a3adf7734c901209d4c
+EBUILD quilt-9999.ebuild 1949 BLAKE2B 9b8f33dbb4109a51974abc76e1465da799f72bdb86cfd989031147f939b86c37e18627964637ce3e7c683022431d5a89a380182097e57051adfa80f89fe999d2 SHA512 3859445b1c7a62cfd7ec537baff0619de90b8608867346c51d4932fc2737dce19a479c330a0324aa934ea84c049edf67a27dbb2f8a5df27204ff5f80b32588d2
 MISC metadata.xml 298 BLAKE2B a42ceb6cf539b835364f7e18417130c37e774dbe59786a7224e5eed1d0938d06630255f4959b8d250c3e436bdb098dcea460ccec48d737b67e838c9ff64ba48e SHA512 8ff3ddf90a99f6b142859c3c2cfca2f1049b71e29f8aff55bee07e8352b523c236c8a515e7c8f4259e6abfb950a22d1b5e1085a4a6b36e313d88d4af9a6254f9
diff --git a/dev-util/quilt/quilt-0.67.ebuild b/dev-util/quilt/quilt-0.67.ebuild
deleted file mode 100644
index 5b897856526e..000000000000
--- a/dev-util/quilt/quilt-0.67.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit bash-completion-r1
-
-DESCRIPTION="quilt patch manager"
-HOMEPAGE="https://savannah.nongnu.org/projects/quilt"
-SRC_URI="https://savannah.nongnu.org/download/quilt/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-IUSE="emacs graphviz"
-# unresolved test failures
-RESTRICT="test"
-
-RDEPEND="sys-apps/ed
-	dev-util/diffstat
-	graphviz? ( media-gfx/graphviz )
-	elibc_Darwin? ( app-misc/getopt )
-	elibc_SunOS? ( app-misc/getopt )
-	>=sys-apps/coreutils-8.32-r1"
-
-PDEPEND="emacs? ( app-emacs/quilt-el )"
-
-pkg_setup() {
-	use graphviz && return 0
-	echo
-	elog "If you intend to use the folding functionality (graphical illustration of the"
-	elog "patch stack) then you'll need to remerge this package with USE=graphviz."
-	echo
-}
-
-src_prepare() {
-	# Add support for USE=graphviz
-	use graphviz || PATCHES+=( "${FILESDIR}"/${PN}-0.66-no-graphviz.patch )
-	default
-}
-
-src_configure() {
-	[[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] && \
-		myconf="${myconf} --with-getopt=${EPREFIX}/usr/bin/getopt-long"
-	econf ${myconf}
-}
-
-src_install() {
-	emake BUILD_ROOT="${D}" install
-
-	rm -rf "${ED}"/usr/share/doc/${P}
-	dodoc AUTHORS TODO "doc/README" "doc/README.MAIL" "doc/quilt.pdf"
-
-	rm -rf "${ED}"/etc/bash_completion.d
-	newbashcomp bash_completion ${PN}
-
-	# Remove the compat symlinks
-	rm -rf "${ED}"/usr/share/quilt/compat
-
-	# Remove Emacs mode; newer version is in app-emacs/quilt-el, bug 247500
-	rm -rf "${ED}"/usr/share/emacs
-}
diff --git a/dev-util/quilt/quilt-0.68.ebuild b/dev-util/quilt/quilt-0.68.ebuild
deleted file mode 100644
index f3192f796103..000000000000
--- a/dev-util/quilt/quilt-0.68.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit bash-completion-r1
-
-DESCRIPTION="quilt patch manager"
-HOMEPAGE="https://savannah.nongnu.org/projects/quilt"
-SRC_URI="https://savannah.nongnu.org/download/quilt/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-IUSE="emacs graphviz"
-# unresolved test failures
-RESTRICT="test"
-
-RDEPEND="sys-apps/ed
-	dev-util/diffstat
-	graphviz? ( media-gfx/graphviz )
-	elibc_Darwin? ( app-misc/getopt )
-	elibc_SunOS? ( app-misc/getopt )
-	>=sys-apps/coreutils-9.4-r1
-	app-arch/zstd:="
-
-PDEPEND="emacs? ( app-emacs/quilt-el )"
-
-pkg_setup() {
-	use graphviz && return 0
-	echo
-	elog "If you intend to use the folding functionality (graphical illustration of the"
-	elog "patch stack) then you'll need to remerge this package with USE=graphviz."
-	echo
-}
-
-src_prepare() {
-	# Add support for USE=graphviz
-	use graphviz || PATCHES+=( "${FILESDIR}"/${PN}-0.66-no-graphviz.patch )
-	default
-}
-
-src_configure() {
-	[[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] && \
-		myconf="${myconf} --with-getopt=${EPREFIX}/usr/bin/getopt-long"
-	econf ${myconf}
-}
-
-src_install() {
-	emake BUILD_ROOT="${D}" install
-
-	rm -rf "${ED}"/usr/share/doc/${P}
-	dodoc AUTHORS COPYING NEWS TODO "doc/README" "doc/README.MAIL" "doc/quilt.pdf"
-
-	rm -rf "${ED}"/etc/bash_completion.d
-	newbashcomp bash_completion ${PN}
-
-	# Remove the compat symlinks
-	rm -rf "${ED}"/usr/share/quilt/compat
-
-	# Remove Emacs mode; newer version is in app-emacs/quilt-el, bug 247500
-	rm -rf "${ED}"/usr/share/emacs
-}
diff --git a/dev-util/quilt/quilt-9999.ebuild b/dev-util/quilt/quilt-9999.ebuild
index 326eb8360cd1..625fa6eb02b3 100644
--- a/dev-util/quilt/quilt-9999.ebuild
+++ b/dev-util/quilt/quilt-9999.ebuild
@@ -7,19 +7,19 @@ EGIT_REPO_URI="https://git.savannah.gnu.org/git/quilt.git"
 
 [[ ${PV} == 9999 ]] && inherit git-r3
 
-inherit bash-completion-r1
+inherit bash-completion-r1 elisp-common
 
 DESCRIPTION="quilt patch manager"
 HOMEPAGE="https://savannah.nongnu.org/projects/quilt"
 [[ ${PV} == 9999 ]] || SRC_URI="https://savannah.nongnu.org/download/quilt/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 GPL-1+"  # any GPL version for quilt.el
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-IUSE="graphviz"
+IUSE="emacs graphviz"
 
-RDEPEND="
+RDEPEND="!app-emacs/quilt-el
 	dev-util/diffstat
 	mail-mta/sendmail
 	sys-apps/ed
@@ -30,42 +30,47 @@ RDEPEND="
 	app-arch/zstd:=
 "
 
-src_prepare() {
-
-	default
+PATCHES=( "${FILESDIR}"/${PN}-el-0.45.4-header-window.patch )
 
+src_prepare() {
 	# Add support for USE=graphviz
-	use graphviz || eapply "${FILESDIR}/${PN}-0.66-no-graphviz.patch"
+	use graphviz || PATCHES+=( "${FILESDIR}"/${PN}-0.66-no-graphviz.patch )
+	default
 
 	# remove failing test, because it fails on root-build
 	rm -rf test/delete.test
 }
 
 src_configure() {
-	local myconf=""
-	[[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] && \
-		myconf="${myconf} --with-getopt=${EPREFIX}/usr/bin/getopt-long"
-	econf ${myconf}
+	local myconf=()
+	[[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] \
+		&& myconf+=( "--with-getopt=${EPREFIX}/usr/bin/getopt-long" )
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile lib/quilt.el
 }
 
 src_install() {
 	emake BUILD_ROOT="${D}" install
 
-	rm -rf "${ED}"/etc/bash_completion.d
-	newbashcomp bash_completion ${PN}
-
 	rm -rf "${ED}"/usr/share/doc/${PN}
 	dodoc AUTHORS COPYING NEWS TODO "doc/README" "doc/README.MAIL" "doc/quilt.pdf"
 
-	# Remove the compat symlinks
-	rm -rf "${ED}"/usr/share/quilt/compat
+	# Remove misplaced Emacs mode
+	rm -rf "${ED}"/usr/share/emacs || die
 
-	# Remove Emacs mode; newer version is in app-emacs/quilt-el, bug 247500
-	rm -rf "${ED}"/usr/share/emacs
-}
-
-pkg_postinst() {
-	if ! has_version -r 'app-emacs/quilt-el' ; then
-		elog "If you plan to use quilt with emacs consider installing \"app-emacs/quilt-el\""
+	if use emacs; then
+		elisp-install ${PN} lib/quilt.{el,elc}
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+		dodoc doc/README.EMACS
 	fi
+
+	rm -rf "${ED}"/etc/bash_completion.d
+	newbashcomp bash_completion ${PN}
+
+	# Remove the compat symlinks
+	rm -rf "${ED}"/usr/share/quilt/compat
 }
diff --git a/dev-util/tree-sitter-cli/Manifest b/dev-util/tree-sitter-cli/Manifest
index b98434177fa8..06d0432f5045 100644
--- a/dev-util/tree-sitter-cli/Manifest
+++ b/dev-util/tree-sitter-cli/Manifest
@@ -5,6 +5,6 @@ DIST tree-sitter-cli-0.22.6-crates.tar.xz 22184056 BLAKE2B f18cfafa9a767fb1b3408
 DIST tree-sitter-cli-0.23.0-crates.tar.xz 18131480 BLAKE2B 796a05ed87ce0f248491600bee4af9d14ba6a244ce04d4cda3192226c5063be921e2a4c5e454c91f712f629481c6cca160544a457cf7635c6024d0d10291e3a0 SHA512 98472d6603d973c34f1cafc042219495228693a0fbbe9af920120d8cf27fd78e5263052fb784c79b38e8b27f9b881d18205ebb439de15945c3f10410590ed76a
 DIST tree-sitter-cli-0.23.2-crates.tar.xz 18556276 BLAKE2B 4d63a95f129b563e91970209418283b822ee9957d16be80dbd1b8b8301c6ccf6add1313854837b6883d6c19a99a833b5e8cc07896a0835340758413108bdf227 SHA512 ac3d03c2735581472bbb0e866f03ee6987f43d0cb65449777a8ee0c0c95d82d032f9e0506c878ab7ea1208a6126327c4136fcb0656ea0b2b67b789f9d07ba57b
 EBUILD tree-sitter-cli-0.22.6.ebuild 909 BLAKE2B 5a7d01cf494ae8551e36ba9b1509f5c0bd0b0b86cfaa2377750099988c2e7250924996880fea53a8e1101363646d3a543625b83b01941efc637ced4f5f074f75 SHA512 d45b4ed49fa313db416873451dab644baf65844e9985d9c91e8fa59438003283a48166b23dd73719d52a43c046ee498025daba3ee9b0c4e9349651bdf3cf2011
-EBUILD tree-sitter-cli-0.23.0.ebuild 932 BLAKE2B aaaae084f3f2f80483f5075b48ace8c81207ff3758c258c210a9f9fb269eb21a42ce0ab11cbc282c4c510dd476924afc95bd4d9ac6759ff93bcb1cc775a79052 SHA512 810e53f134a0d1fc7dbba6e086da9a1d8e5a16604dbc13098d49afcfa4f825cda7561b9ae269dd2d00ebe8c0f35f4098370fbcb6e5c0f4f0a04c509b3caaff68
+EBUILD tree-sitter-cli-0.23.0.ebuild 931 BLAKE2B a7080a4213dade542c12062079d58341c4291ba127b7410d5ac80fd3bff66fbd9ee105439ac31770bb9f500baf6396a6c3f1267a112ca5e09d4bd20159accdbe SHA512 43d12c3300d4608d14cf60edd78d29dcf778f6f7d5d52b39b856273a9dba716938da735d15f9c41e0683cd0abcef96078f134386cdc3010c6648a7d8fe165f18
 EBUILD tree-sitter-cli-0.23.2.ebuild 938 BLAKE2B 085b47f3ae6de1cd2e7d78ce04106e2a551148d7dcd014dcfdbfc7a281e55240c2283b5e586beda19222fe395d1ab47dde182767a78622dd0ca106cbbbaf78d0 SHA512 6d6fa315b57e33f0a500b13367433290c16a15225077bb925232e4d7c38e1ae9825ed5ba78e54898e70c6f79ecbba21038d3b031fb6fcc85481ec2b2a27382d7
 MISC metadata.xml 575 BLAKE2B 947ff8b1c885927a6b51e08f761706ecace1c18177e3b455ea25b1cb17eb5c1fbe5aeb6ce68bbffdf626dc968a99f8cf2792356c8e90f27ab8f0fc23d618f09e SHA512 2f19b11f3aff1313d5983697628e1df2e04505611d20d3bd0331d4265cc0f569fd2694a61edb67c6834885e2a61d7d9ef650731a72be04c96d00c574e7d9ba09
diff --git a/dev-util/tree-sitter-cli/tree-sitter-cli-0.23.0.ebuild b/dev-util/tree-sitter-cli/tree-sitter-cli-0.23.0.ebuild
index 30f2c8ed61b9..b2788d6bac28 100644
--- a/dev-util/tree-sitter-cli/tree-sitter-cli-0.23.0.ebuild
+++ b/dev-util/tree-sitter-cli/tree-sitter-cli-0.23.0.ebuild
@@ -23,7 +23,7 @@ LICENSE+="
 	Unicode-DFS-2016
 "
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # Test seems to require files (grammar definitions) that we don't have.
 RESTRICT="test"