gentoo auto-resync : 15:04:2024 - 12:04:02

14 files changed, 18 insertions, 376 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index a144e93ee7d9..ba25a6d44f79 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/alacarte/Manifest b/x11-misc/alacarte/Manifest
index 694000eef9b5..150bdf840f21 100644
--- a/x11-misc/alacarte/Manifest
+++ b/x11-misc/alacarte/Manifest
@@ -1,5 +1,3 @@
-DIST alacarte-3.44.3.tar.xz 248692 BLAKE2B bb418aebb595935028b5bec9b08b516d90c6488ef4201b184f51420c5918f986d3dda20c2eb8d7666bb3fa7d4249af59afb00777d93d5715ef54d604943ef952 SHA512 2e10b79527b3343379f7b58efa9ae3a4428d05fee11279ae95e0514712ec97489b1152cabcdf2abcaa3d1e396218e2708b0c47e20e6e55e2d34b848e7e2d9ee2
 DIST alacarte-3.50.0.tar.xz 255404 BLAKE2B c22aeb83f707e4860c9a84311da2bf87e79db8b8859b8c45d5c1d0f6ead896f15b83cd112ac248fbb83b2bf839afbc90d2a24685c767ebaaaa850dfab8b26d35 SHA512 12578c35e8e68c83b46d81edc59444a92dc672a4a91bb4b443bbc0b26d94a3badf5598602dfc62dfbbabce7e3392c081c39055a201d60d4813b23e061014ee17
-EBUILD alacarte-3.44.3.ebuild 763 BLAKE2B 9a8a508497991bd14874cdd1ac7376522415c999ca50943dbdd6456bea9778dfe5dfc413c9a1d79de76c9d1d30ac76ebf0f3fe0b9a89013a67ae260ed2aed673 SHA512 a7ae155d2d717964c2d67147c5aeba9837928528bcd7c348e8bef4f078a0510810257beff01668a22c24e88172df2f226c49b5e6cb124c133a106ee6ec5a788e
 EBUILD alacarte-3.50.0.ebuild 763 BLAKE2B ddadbb3cac1e53a25aae21dcf20d7e96e15d9413d3b0952a4a6f2a27ea3d4725215356f6ebdb1cf4cc3ba7d614ec42009556ae805de82b27e8eb39ff8fa6d35b SHA512 229338f52eb2697a68f1c47c7290d66fb6a5c2cc768a94ffa9db21faf5e2fea584c02d09e66dbb70eaccd7971e64e29f14a07c2dc1d24b59825b9b44e4fba306
 MISC metadata.xml 349 BLAKE2B ae2cfe74f06d4c6aa4143f187cd3ed6934e6e131e4a997330c9d6ca11a2cd45b2835ef2b1bfab8570e5554fcce81237b025fc0683a74eaf62076e7c4f2cd2914 SHA512 7426942c020db80792d9d382763a005dc0956e6f7c02bb0e3a58e56cb69c37ce643da77524ac7273b8302bb0efb2e2c80dbb621d06809a7091395756e0f0cd06
diff --git a/x11-misc/alacarte/alacarte-3.44.3.ebuild b/x11-misc/alacarte/alacarte-3.44.3.ebuild
deleted file mode 100644
index 84a1d5ce0b1d..000000000000
--- a/x11-misc/alacarte/alacarte-3.44.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Simple GNOME menu editor"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/alacarte"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	>=gnome-base/gnome-menus-3.5.3:3[introspection]
-"
-RDEPEND="${DEPEND}
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/gtk+:3[introspection]
-"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_install() {
-	gnome2_src_install
-	python_optimize
-}
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index dec8ff9bffb0..880da29ef660 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,9 +1,4 @@
-AUX colord-1.4.6-FILE_OFFSET_BITS.patch 1390 BLAKE2B 9b6050d23e5b9ee17a04c29dc599012b114c6581922d907e08398c6e67efdf918b2de678a9b81ae93fcf9d43ccff3a33684e6c28aee73536b99abc72d5dd41a3 SHA512 f327f2f2709057b32b74ce2460ef81ee7a2fddca4fcdd39bfbf27f76756b3244d29c718eb2f2c2bd2e412f3526e0324572a13927cbd0617f536dc8378a3a808f
-AUX colord-1.4.6-lcms2-corruption.patch 1183 BLAKE2B 67dae6de961d67cb7893087cf8e40a5ecbe37629decbfdb5803ae2c08078f1327ee53b5f4d61ae9d6290a87dbce19db8a26c838292f1f92fd6c66387e9b787ff SHA512 153c3cc2adacb1d9fb424f597cbfdd5c0bef80122efa00852ca26a3f3e603f977687e037f5e6afcc42b37469fd9cc5280afd8f76a772bed1d3246d9b125ccdcf
-AUX colord-1.4.6-time_t-ptr-truncation.patch 1415 BLAKE2B b5b71b785fd2c966366efa7c05322a0704f447c644fe6469600018a219414f2c51ebfbd625d08aa18ffc8b789efa8e33afa2da9a1675c4bc1fdc7bee9bdc8eae SHA512 3004a789c3e78e87457434077c6d762e824b0c4b4f0b1adf2f66373f6854b81a48697610b76f593b44e9cd8de48a37bed97659011872416d3957ec9374252931
 AUX colord-1.4.7-systemd-permissions.patch 2163 BLAKE2B 72989d782458153d7bb8356d9c7c8179b61e2be31b59d73fe49d9a0c6bfcfc0d18dfe021547eea1ee2cbf54dce9d98b875a5adf9ea23ac8cc5b757d98afac16a SHA512 3aecb442c68669ad0b297d621c5ea845652b021585b3fa6554eba5ec7ad80f149a4cef5f081ae7f029819c919453e7f34e64907fb8015d023c338cc8d5896d8e
-DIST colord-1.4.6.tar.xz 1872528 BLAKE2B bf87ed1abe0a827ad81b5467847975d70e4cb83c1973fac3bcb1650875b7a0b375d48633bb1b01c7da1e8acd62cc4cf19f0efe9722e12bde3d8ec4833800ef2c SHA512 d55d3322199d0bfee74eee9e183c9246ec33e755f0144d96087acb3c43ab5a3d872086fcef9f29cdd2295be71daac703cdf90ad10bf183622fdd84347e7af123
 DIST colord-1.4.7.tar.xz 1799168 BLAKE2B f4434ec817fc2afc1ade144f533d2c3b98117356677b5962ff95b566a8c66b6b8ce95ec8f76b3ae849a6468000dc08b8f8fc207c2cc9c85a966157fb1612078e SHA512 d8a23899c038af980f1b257eace68b682c3f5592d19e2ae1044da749371694052c00e58e4754ebb6ee2f7900b0ef44c01be5fcf857294813c07af94ffbf6d0be
-EBUILD colord-1.4.6-r2.ebuild 3586 BLAKE2B ddfee20fe98bb069a5d61d5a88fabe156145ddb33bf47fd933f3f55330a11142de1018055e0b713a0a7d4ae02533d5a53a93ddca24d2ffa52c08120ced86256a SHA512 6d44b8683e4335c7bf09eae166024562b8d676e4027a6437f0ba90632ab3b8438ff1e643d1d81707661069b07ae88af56eb8421e4b232b1ba6c4d22f4f04946d
 EBUILD colord-1.4.7-r1.ebuild 3505 BLAKE2B 668be20a1519ca1bbe5ef7ce730fb83f30f74080f34772555a63ba46f3dca409e057dfa9ac683e1711618ada23a00ae2e9fa8d6f838d33da84c17a0b882f695f SHA512 fdcf6e2fa274f5e5f12e6144e004117f44f9297ab6e9d31f6ac79eca51e7db565dea37236bbe3749a8be805b488c01d67c4f42d9d8ab8ce59b6b0c67f4896e2a
 MISC metadata.xml 538 BLAKE2B 314dc50e426cb4abb2cab8ea3f1ca221d1543820587fac02747c198c034ff468d13273ae573f30ee852489c22ebabf80b5d62d409b32bcedf9de45e768d6600c SHA512 10e907a1f38a40acebfb32ff8ecb58b074147ce29947a31272fca5de1d8de99935fab05dffbaa271aea0b4981c36ce0c8ef19879d3796360ecdf3b2143f7dbd4
diff --git a/x11-misc/colord/colord-1.4.6-r2.ebuild b/x11-misc/colord/colord-1.4.6-r2.ebuild
deleted file mode 100644
index f15ba9e3d9ee..000000000000
--- a/x11-misc/colord/colord-1.4.6-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-VALA_USE_DEPEND="vapigen"
-
-inherit bash-completion-r1 meson-multilib tmpfiles udev vala
-
-DESCRIPTION="System service to accurately color manage input and output devices"
-HOMEPAGE="https://www.freedesktop.org/software/colord/"
-SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/2" # subslot = libcolord soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="gtk-doc argyllcms examples extra-print-profiles +introspection scanner selinux systemd test vala"
-RESTRICT="!test? ( test ) test" # Tests try to read and write files in /tmp
-REQUIRED_USE="vala? ( introspection )"
-
-DEPEND="
-	>=dev-libs/glib-2.58.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}]
-	dev-db/sqlite:3=[${MULTILIB_USEDEP}]
-	>=dev-libs/libgusb-0.2.7[introspection?,${MULTILIB_USEDEP}]
-
-	dev-libs/libgudev:=[${MULTILIB_USEDEP}]
-	virtual/libudev:=[${MULTILIB_USEDEP}]
-	virtual/udev
-
-	systemd? ( >=sys-apps/systemd-44:0= )
-	scanner? (
-		media-gfx/sane-backends
-		sys-apps/dbus
-	)
-	>=sys-auth/polkit-0.114
-	argyllcms? ( media-gfx/argyllcms )
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-"
-RDEPEND="${DEPEND}
-	acct-group/colord
-	acct-user/colord
-	selinux? ( sec-policy/selinux-colord )
-"
-BDEPEND="
-	acct-group/colord
-	acct-user/colord
-	app-text/docbook-xsl-ns-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	extra-print-profiles? ( media-gfx/argyllcms )
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-lcms2-corruption.patch
-	"${FILESDIR}"/${P}-time_t-ptr-truncation.patch
-	"${FILESDIR}"/${P}-FILE_OFFSET_BITS.patch
-)
-
-pkg_setup() {
-	use vala && vala_setup
-}
-
-src_prepare() {
-	default
-
-	# Test requires a running session
-	# https://github.com/hughsie/colord/issues/94
-	sed -i -e "/test('colord-test-daemon'/d" lib/colord/meson.build || die
-
-	# Adapt to Gentoo paths
-	sed -i \
-		-e "s|find_program('spotread'|find_program('argyll-spotread'|" \
-		-e "s|find_program('colprof'|find_program('argyll-colprof'|" \
-		meson.build || die
-
-	# meson gnome.generate_vapi properly handles VAPIGEN and other vala
-	# environment variables. It is counter-productive to check for an
-	# unversioned vapigen, as that breaks versioned VAPIGEN usages.
-	sed -i -e "/find_program('vapigen')/d" meson.build || die
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_native_true daemon)
-		-Dbash_completion=false
-		$(meson_native_true udev_rules) # Install udev rules only from native build
-		$(meson_native_use_bool systemd)
-		-Dlibcolordcompat=true
-		$(meson_native_use_bool argyllcms argyllcms_sensor)
-		$(meson_native_use_bool scanner sane)
-		$(meson_native_use_bool introspection)
-		$(meson_native_use_bool vala vapi)
-		$(meson_native_use_bool extra-print-profiles print_profiles)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-		-Ddaemon_user=colord
-		$(meson_native_true man)
-		$(meson_use gtk-doc docs)
-		--localstatedir="${EPREFIX}"/var
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	newbashcomp data/colormgr colormgr
-
-	# Ensure config and profile directories exist and /var/lib/colord/*
-	# is writable by colord user
-	keepdir /var/lib/color{,d}/icc
-	fowners colord:colord /var/lib/colord{,/icc}
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.c
-	fi
-}
-
-pkg_postinst() {
-	udev_reload
-	tmpfiles_process colord.conf
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/x11-misc/colord/files/colord-1.4.6-FILE_OFFSET_BITS.patch b/x11-misc/colord/files/colord-1.4.6-FILE_OFFSET_BITS.patch
deleted file mode 100644
index c41f73e4eb8a..000000000000
--- a/x11-misc/colord/files/colord-1.4.6-FILE_OFFSET_BITS.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://github.com/hughsie/colord/pull/159
-
-From 72cc7bb299de09ec53aa4ce125af370158127d0e Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 2 Dec 2023 05:07:46 +0000
-Subject: [PATCH] meson.build: set FILE_OFFSET_BITS explicitly
-
-This is needed if building introspection because:
-a) Meson's own setting of FILE_OFFSET_BITS (which it does by default) doesn't
-affect the introspection tooling;
-
-b) glibc's headers seem to react poorly to _just_ _TIME_BITS being set, even
-though in this cas, the failure was for a 64-bit ABI anyway.
-
-Fixes: ce9732a87bc2a0ddca841b49b9b9e24351ea78c8
-Signed-off-by: Sam James <sam@gentoo.org>
----
- meson.build | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 072a612..b0b1af8 100644
---- a/meson.build
-+++ b/meson.build
-@@ -215,7 +215,9 @@ add_project_arguments('-DCD_COMPILATION', language: 'c')
- # Needed for realpath() and PATH_MAX
- add_project_arguments('-D_XOPEN_SOURCE=700', language : 'c')
- # Needed to opt-in to 64-bit time_t on glibc. We pass 64-bit pointers into
--# gmtime_r.
-+# gmtime_r. We have to set F_O_B here despite Meson defaulting to it because
-+# it doesn't get passed down to introspection otherwise.
-+add_project_arguments('-D_FILE_OFFSET_BITS=64', language : 'c')
- add_project_arguments('-D_TIME_BITS=64', language : 'c')
- 
- prefix = get_option('prefix')
--- 
-2.43.0
-
diff --git a/x11-misc/colord/files/colord-1.4.6-lcms2-corruption.patch b/x11-misc/colord/files/colord-1.4.6-lcms2-corruption.patch
deleted file mode 100644
index 4df6773cfb4b..000000000000
--- a/x11-misc/colord/files/colord-1.4.6-lcms2-corruption.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/880865
-
-https://github.com/mm2/Little-CMS/issues/344
-https://github.com/hughsie/colord/issues/145
-
-https://github.com/hughsie/colord/commit/91a3cc2e994be587def3b70762f15461101d43a1
-
-From 91a3cc2e994be587def3b70762f15461101d43a1 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 15 Nov 2022 17:03:37 +0000
-Subject: [PATCH] lib: avoid destructing LCMS plugin twice with lcms 2.14
-
-lcms 2.14 contains a change to avoid a memory leak, but that change
-assumes correct API usage. It's not necessary to both cmsUnregisterPluginsTHR()
-and then cmsDeleteContext() -- we can just straight up delete the LCMS
-context instead (cmsDeleteContext()).
-
-So, follow upstream's suggestion & do that. This fixes memory corruption
-when building colord on x86, for example.
-
-Bug: https://github.com/mm2/Little-CMS/issues/344
-Fixes: https://github.com/hughsie/colord/issues/145
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/lib/colord/cd-context-lcms.c
-+++ b/lib/colord/cd-context-lcms.c
-@@ -163,7 +163,6 @@ cd_context_lcms_free (gpointer ctx)
- 	g_clear_error (error_ctx);
- 	g_free (error_ctx);
- 
--	cmsUnregisterPluginsTHR (ctx);
- 	cmsDeleteContext (ctx);
- }
- 
diff --git a/x11-misc/colord/files/colord-1.4.6-time_t-ptr-truncation.patch b/x11-misc/colord/files/colord-1.4.6-time_t-ptr-truncation.patch
deleted file mode 100644
index 687b595feca5..000000000000
--- a/x11-misc/colord/files/colord-1.4.6-time_t-ptr-truncation.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://bugs.gentoo.org/918990
-https://github.com/hughsie/colord/issues/157
-https://github.com/hughsie/colord/commit/ce9732a87bc2a0ddca841b49b9b9e24351ea78c8
-
-From ce9732a87bc2a0ddca841b49b9b9e24351ea78c8 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 1 Dec 2023 22:20:17 +0000
-Subject: [PATCH] meson.build: use 64-bit time_t
-
-We call `gmtime_r` (which expects `time_t`) with a 64-bit pointer (`gint64*`).
-
-On 32-bit systems, `time_t` is 32-bit unless you opt-in to a 64-bit wide version
-(at least on glibc). To avoid truncation and -Wincompatible-pointer-types,
-opt-in to 64-bit `time_t` for glibc with `-D_TIME_BITS=64` in meson.
-
-This should be fine ABI wise because the time is only passed down into lcms2
-into `_cmsEncodeDateTimeNumber` where it seems to decompose it and it worked already
-for 64-bit systems. Plus, they use their own types like `cmsUInt16Number` to ensure
-they're wide enough.
-
-Fixes: https://github.com/hughsie/colord/issues/157
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/meson.build
-+++ b/meson.build
-@@ -214,6 +214,9 @@ add_project_arguments('-DCD_COMPILATION', language: 'c')
- 
- # Needed for realpath() and PATH_MAX
- add_project_arguments('-D_XOPEN_SOURCE=700', language : 'c')
-+# Needed to opt-in to 64-bit time_t on glibc. We pass 64-bit pointers into
-+# gmtime_r.
-+add_project_arguments('-D_TIME_BITS=64', language : 'c')
- 
- prefix = get_option('prefix')
- 
-
diff --git a/x11-misc/screenkey/Manifest b/x11-misc/screenkey/Manifest
index 97a6b33044ef..3510249f6d5c 100644
--- a/x11-misc/screenkey/Manifest
+++ b/x11-misc/screenkey/Manifest
@@ -1,4 +1,4 @@
 DIST screenkey-1.5_p20230109.tar.bz2 77229 BLAKE2B 8b6d089bdecbbd0d9057ccad12d72321de5b9c6df60785398e15e9196b21fec2b88e27b2e068c53caf5c699ed7b7dcd3bacfbdf86d14b3c4c4a3b2125dfa66c7 SHA512 b6b5121c2b4f68cd8df409176e32019b0747da637c6baa7f45d6268c1605144d32cb099aa16a91748ae672d6386be2579af1bef167488bcdc5e1b452d39d2eee
-EBUILD screenkey-1.5_p20230109.ebuild 1374 BLAKE2B c31ccf51ec8b3d9763ed8d6d658ae4cf2e8159908afc896cdb582a68ce6a6c7e89dfd5a76af144da6b654fd56fd96bdfb52c011a19f59ba3507cfcffbf3572ac SHA512 3e35d591a208f62e8dc6431731479d64a97bd58ae255aa92102fbdce175a174564d900d6291fdd5020d117337a577ee7844644d3fb70c48a8e11158f2b594a6f
-EBUILD screenkey-9999.ebuild 1135 BLAKE2B b65651d64929280dba1f59bb31a1f2128ca7d4fb52103e8bcfbf001f6eb42fb738a415edc94270336d71c31dcfc7a486f38829734a1bad839de36e631a7805d4 SHA512 b1ebda18b3f28afbaffa0c12e77e4ebd4dba528f126cbf2ab1c129c8b7f59685ad21a3810652bf932ac6b11e5447b733cde36848b203ed4ed2395c8f391c8c76
+EBUILD screenkey-1.5_p20230109-r1.ebuild 1381 BLAKE2B 2bdc717911a5f1154297b5b7aaedf0760dae4757064c7de60691670ffc6b89fb0433c369f5ee43f8b4511ec5f68fafb16380120a3314b90edcf93cc788890b46 SHA512 ea6ea973cd08f6b3f68f00800b703a044120e2323ab0e2f9beabfed5b75b30a9b9dc96f7c72ddf09365d68a26455ee3622d6625bb4cf6ccae732d478fb3fd27b
+EBUILD screenkey-9999.ebuild 1140 BLAKE2B da8149c8c4ce970449e3a34732beb185d6a091f69c60e6547f6413bdbdd69b9da840b7ab0337a1b4220f5652e09a47c2fbd73a5acf5d0561c530496df3690f19 SHA512 a28629dacf0e0990061cd0a45ea2138e87441a14dbd6d03f4b55768dc4e984e8361dc4a2e46591c9b7a975670b3dd13a300ad7c98fc093e635284c0fbae42cd9
 MISC metadata.xml 1039 BLAKE2B 8d865eabd3cd2beacb23070e8f7b772882eeb0f58e466cafd27c023ef9a4a2a1743be1879c34d229e0885d38f22b6a6d95db0146c3021f75bf81ba9acce36e4d SHA512 6a806533a30cc14e5a19924417d4caa70d1fe0921bc91dd62039fe74478a6c65a33722cb6dcae074819ff07c89f93fc1289bfae7a89f2d0ba9ab316512574e4c
diff --git a/x11-misc/screenkey/screenkey-1.5_p20230109.ebuild b/x11-misc/screenkey/screenkey-1.5_p20230109-r1.ebuild
index d9ae207590c5..379af07f4cf6 100644
--- a/x11-misc/screenkey/screenkey-1.5_p20230109.ebuild
+++ b/x11-misc/screenkey/screenkey-1.5_p20230109-r1.ebuild
@@ -1,30 +1,32 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 xdg
 
 DESCRIPTION="A screencast tool to display your keys inspired by Screenflick"
 HOMEPAGE="https://www.thregr.org/~wavexx/software/screenkey/"
 
-if [[ ${PV} == *9999* ]]; then
+if [[ "${PV}" == *9999* ]]; then
 	inherit git-r3
+
 	EGIT_REPO_URI="https://gitlab.com/screenkey/${PN}.git"
 else
-	if [[ ${PV} == *_p20230109 ]] ; then
+	if [[ "${PV}" == *_p20230109 ]] ; then
 		COMMIT=7bdba66574244061c6e1934c4f204d02d570f182
 		SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/${COMMIT}/${PN}-${COMMIT}.tar.bz2
 			-> ${P}.tar.bz2"
-		S="${WORKDIR}"/${PN}-${COMMIT}
+		S="${WORKDIR}/${PN}-${COMMIT}"
 	else
 		SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2
 			-> ${P}.tar.bz2"
-		S="${WORKDIR}"/${PN}-v${PV}
+		S="${WORKDIR}/${PN}-v${PV}"
 	fi
+
 	KEYWORDS="amd64"
 fi
 
diff --git a/x11-misc/screenkey/screenkey-9999.ebuild b/x11-misc/screenkey/screenkey-9999.ebuild
index dcc404244124..bbfbe5b4cae5 100644
--- a/x11-misc/screenkey/screenkey-9999.ebuild
+++ b/x11-misc/screenkey/screenkey-9999.ebuild
@@ -1,23 +1,25 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 xdg
 
 DESCRIPTION="A screencast tool to display your keys inspired by Screenflick"
 HOMEPAGE="https://www.thregr.org/~wavexx/software/screenkey/"
 
-if [[ ${PV} == *9999* ]]; then
+if [[ "${PV}" == *9999* ]]; then
 	inherit git-r3
+
 	EGIT_REPO_URI="https://gitlab.com/screenkey/${PN}.git"
 else
 	SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2
 		-> ${P}.tar.bz2"
-	S="${WORKDIR}"/${PN}-v${PV}
+	S="${WORKDIR}/${PN}-v${PV}"
+
 	KEYWORDS="~amd64"
 fi
 
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 77fc0457e8d8..0d66333fea47 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,6 +1,4 @@
 AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd031096cf2bcbd4d4cb86b31ceff18dda880b5cf1f8441e452642dd28275c9ce6e20c7da0a3a77b4157da13d5d4bbe9b6a30a9086 SHA512 a2e202986c77490898c15f6c4e647667fd6662422e8bbd638624a52a33989cd4259f95b37f488ff4a947f04354704ee9df7b9d60aae2fcc928f1f3186955ea1a
-DIST zim-0.75.1.tar.gz 3212424 BLAKE2B 8db33315a8852b4efc5506cf94576f9b7cfa8574e77798d4e8bb61930a0d9ede5ea0bd2fc8c1ae479f49caee265981d70902b149e151e5f295cdcc5bbe98b131 SHA512 207d40af2342f16ba713a3809b06ddc6656bce22386fcaace65b0e04894218590d4c03b9c65d6eeb3c4edc46e85e103cfcf112e4298be07ba1f126d7732333c5
 DIST zim-0.75.2.tar.gz 3257345 BLAKE2B 452716cbc6c149645c5146d8fcef2449c7c316ac57da9870dbe26b9fec13b6827a6368295277dc3b2b7a7874a7c930da27612a8e8e00b295ae9ecb3942d0e65b SHA512 ea6f361047690dfb314a3510d34880a4831d142c94fc0ca08e1c29869fd42d5fd1182c47edc241edeb512fed601a474af6d9970f819e8a8b67135c7589ae461a
-EBUILD zim-0.75.1-r1.ebuild 2036 BLAKE2B 2284e4f824be144c5f74ede177a5afe869e4f6be2c2f3299d9c98b354e65289edb7b23bd099c798bff3f44489aa4d0ae3af5dda8d62674de422d26d633d4899a SHA512 f97a678ef5635f024842b79bde998ab9d98d154129f1e00506e026a8f9fe0442f3f3bb7a4acc883e9ffcbe92d86995da4d45004062a5da00c70b1952d53d6e9f
-EBUILD zim-0.75.2-r1.ebuild 2045 BLAKE2B a98c44eae0376cdd5b3b21409b055b3800fe7c5a39eeaf90eae28787f8ecc1db54768caff0e9e27c71c747bf71a99e4a33eaa05e69425ba0c678720804b4790d SHA512 f631a5831a742eb6d3584c16d41ae21a2af8cf5ea4cb6b97503c0c2b90b63fabcaa51e597a2b6be424af084339effca958cf3ca9ce9d6b6be05351cd1c01c3bd
+EBUILD zim-0.75.2-r1.ebuild 2045 BLAKE2B c6ab0541696c25bac4e415cf19ce12051030768ae1b9cfb226cf4b6d858d0e0c38c1cc1cfea9467387aa77800071b5ee634b80d6326a5a64471ca996db2df780 SHA512 3f7e04b8b94e4ad6fa8d35cb2064933a5af47e7b43fb37386018cfb1d2e8096e36752023979390a19767347e22d5ac3ea4d5543daa1790678745cd4220dde4c3
 MISC metadata.xml 919 BLAKE2B 37f527c70451fc7a39ba04f55fcb87434de512a9250d97748a2e9e0e395dcdf0ab9ee81ba6894e104594da634ca3866b790d2916122a6380c92e011fc30187ec SHA512 e244bd3f10e24235d2072e8375255b698093aa0de8cd7720dabb8d64affcb6c91b256f0a21efef1041310be3d8680f598eca30b67813b661f5e8024ce28f24a2
diff --git a/x11-misc/zim/zim-0.75.1-r1.ebuild b/x11-misc/zim/zim-0.75.1-r1.ebuild
deleted file mode 100644
index ff6366ca8674..000000000000
--- a/x11-misc/zim/zim-0.75.1-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_SINGLE_IMPL=1
-VIRTUALX_REQUIRED=test
-inherit distutils-r1 optfeature virtualx xdg
-
-DESCRIPTION="A desktop wiki"
-HOMEPAGE="
-	https://zim-wiki.org/
-	https://github.com/zim-desktop-wiki/zim-desktop-wiki
-"
-SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-	')
-	x11-libs/gtk+:3[introspection]
-	x11-misc/xdg-utils
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
-PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
-S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
-
-python_prepare_all() {
-	if [[ ${LINGUAS} ]]; then
-		local lingua
-		for lingua in translations/*.po; do
-			lingua=${lingua/.po}
-			lingua=${lingua/translations\/}
-			has ${lingua} ${LINGUAS} || \
-				{ rm translations/${lingua}.po || die; }
-		done
-	fi
-
-	distutils-r1_python_prepare_all
-	export XDG_RUNTIME_DIR=fakethis
-}
-
-python_test() {
-	if has_version dev-vcs/git; then
-		git config --global user.email "git@example.com" || die
-		git config --global user.name "GitExample" || die
-	fi
-
-	virtx ./test.py
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	insinto /usr/share/icons
-	doins -r xdg/hicolor
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "Spell checker" app-text/gtkspell[introspection]
-	optfeature "GNU R Plot Editor" dev-lang/R
-	optfeature "Version control Bazaar support" dev-vcs/breezy
-	optfeature "Diagram Editor" media-gfx/graphviz
-	optfeature "Insert Screenshot" "media-gfx/imagemagick media-gfx/scrot"
-	optfeature "Score Editor" media-sound/lilypond
-	optfeature "Gnuplot Editor" sci-visualization/gnuplot
-	optfeature "Equation Editor" virtual/latex-base app-text/dvipng
-}
diff --git a/x11-misc/zim/zim-0.75.2-r1.ebuild b/x11-misc/zim/zim-0.75.2-r1.ebuild
index 7afe93914e99..e72df1ffba7f 100644
--- a/x11-misc/zim/zim-0.75.2-r1.ebuild
+++ b/x11-misc/zim/zim-0.75.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1