5 files changed, 68 insertions, 93 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 40d890405519..e9d4b62ca38b 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index 1cbba6cdb533..ce7a79127deb 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -1,5 +1,3 @@
-DIST shutter-0.99.4.tar.gz 1734992 BLAKE2B 410e73f784f0d83638867132669a00fe89c06af622f3024e52b5b5700c1a431b4ad50f9066c267cd76f9be48ce6ff88eab4348d2d4dff28b4ae7e0267eb7bc41 SHA512 57f7fdc1066375942bd1a9db381a8ba6f24fafbd5e0853a4dd19016438ec2f3cb039ebe90038d282bc07f6e45af9cdbb6f180f55e43357231b41818b8555347b
 DIST shutter-0.99.5.tar.gz 1736757 BLAKE2B b861d4c71295ceb1e8a2d268e57babccb8a832245ffb18410c19b20bb5aca56358e00cb4e578f3b8dfcd15e4c318beb7ed873a86094de522deed7f4b2e33b58c SHA512 524e135191a324f7da890922c98646c7cd83a714a3b1dc14f2ba9910f8a90f5c6c527a5c857888c2be93120a7b242e435664c8af45792d36b66d7642fda50371
-EBUILD shutter-0.99.4-r1.ebuild 2302 BLAKE2B 9bd01a4036778fb79aa8c6ca7f0700b434cd5f602d0339e56ee9561bb49fd227c3f7e86d6cc82708ecc906e73e0dc70157f3ba60503c1d2a8bbeb4caaf0e8a14 SHA512 3b7d219e6a929fded3fba4d87c7ed44dd0a7bb4c1f59e3bf3cb6a4d7ae67cd1c6efd73f5f27a741dd57662e8c8cb6939bc42ed5e501800a48fd9736c78de7b3f
 EBUILD shutter-0.99.5.ebuild 2361 BLAKE2B 246d71cf8cb630cb0f25f7bf70849f78ee5e8a1efd321720b9bcaf14bd3f2a2fad7c12f0b5a79d1c6cae384dedeb2fbf0a63093fa4d400cdca4aaa0865d4a064 SHA512 4c32073ed541040a778b51a19e34c1ad4812e1d551f748314caaac67aa2a20331fb37bbb1759dff5b1bb8f6b2b52b03142f04714eddda3055a02ba0e7cb2f2d6
 MISC metadata.xml 492 BLAKE2B 3e3bf1dc04748435e212469e84d12040db18041c65e432a4ca994fef361bc100bfb7e5f284067ae7ff63cc090ce10b2e05d38a7c4bfbdd0e8fe673f77f3fae4e SHA512 bba85636de4594323daf1be7648c76ad3323b03ce8d093842ff61e95e1f2023094d0d707985d14d99dae6f346d9624eb4e9fb17b72c0e2507f93e61bb26fec7b
diff --git a/x11-misc/shutter/shutter-0.99.4-r1.ebuild b/x11-misc/shutter/shutter-0.99.4-r1.ebuild
deleted file mode 100644
index c2b4f443b835..000000000000
--- a/x11-misc/shutter/shutter-0.99.4-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop optfeature prefix xdg
-
-DESCRIPTION="Feature-rich screenshot program"
-HOMEPAGE="https://shutter-project.org/"
-SRC_URI="https://github.com/shutter-project/shutter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lang/perl
-	dev-libs/libayatana-appindicator
-	dev-perl/Carp-Always
-	dev-perl/libxml-perl
-	dev-perl/Glib-Object-Introspection
-	dev-perl/GooCanvas2
-	dev-perl/GooCanvas2-CairoTypes
-	dev-perl/Gtk3
-	dev-perl/Gtk3-ImageView
-	dev-perl/File-DesktopEntry
-	dev-perl/File-HomeDir
-	dev-perl/File-Which
-	dev-perl/JSON
-	dev-perl/File-Copy-Recursive
-	dev-perl/File-MimeInfo
-	dev-perl/Locale-gettext
-	dev-perl/Moo
-	dev-perl/Net-DBus
-	dev-perl/Number-Bytes-Human
-	dev-perl/Pango
-	dev-perl/Proc-Simple
-	dev-perl/Proc-ProcessTable
-	dev-perl/Sort-Naturally
-	dev-perl/X11-Protocol
-	dev-perl/XML-Simple
-	virtual/imagemagick-tools[perl]
-	x11-libs/libwnck:3[introspection]
-"
-BDEPEND="
-	sys-devel/gettext
-	test? ( dev-perl/Test-MockModule )
-"
-
-src_prepare() {
-	hprefixify bin/shutter
-	default
-}
-
-src_test() {
-	prove -I share/shutter/resources/modules/ -I t/lib t -r || die
-}
-
-src_install() {
-	dobin bin/shutter
-	dodoc README
-	domenu share/applications/shutter.desktop
-	doicon share/pixmaps/shutter.png
-	doman share/man/man1/shutter.1
-
-	insinto /usr/share
-	doins -r share/shutter
-	doins -r share/locale
-	doins -r share/icons
-
-	insinto /usr/share/metainfo
-	doins share/metainfo/shutter.metainfo.xml
-
-	# .po doesn't belong to installed system, only .mo
-	rm -r "${ED}"/usr/share/shutter/resources/po || die
-
-	# shutter executes perl scripts as standalone scripts, and after that "require"s them.
-	find "${ED}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod +x {} + \
-		|| die "failed to make plugins executables"
-	find "${ED}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \
-		-name "*.pm" -exec chmod +x {} + || die "failed to make upload plugins executables"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "writing Exif information" media-libs/exiftool
-	optfeature "image hostings uploading" "dev-perl/JSON-MaybeXS dev-perl/Path-Class"
-}
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 72c9f0965d41..88064832b33a 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,4 +1,6 @@
 DIST xkeyboard-config-2.43.tar.xz 925424 BLAKE2B 89cf4872305ce3358185ed63f0ff2f0dc90205d50d51b4b881256e0762b12a74f30d0905a75e5feff2f0fef09d94bee778a8cbe83cdf6e048653e8eb42f53087 SHA512 6daf885bf8794cf03d5b447b90ca1666f87e9c609a344e02bb90edca360eb64b24f80a92ed570aa75b4ea62245b3998f6df3757f7e02c4015cdfecee5378a0d4
+DIST xkeyboard-config-2.44.tar.xz 906060 BLAKE2B 6abb485ef5c9cb1292afaed22ac72026dc22c0a08c3bf04ca29f8dd61d68cbf06e511fe095628a0ab6dec7766374318c4b5bddeb2c4da8a8a692bbbbf4b4e83b SHA512 1bd6c594c132d262863e9911cfe4e70936c82a87c118b302d032cc900767653abd6db3ee5bc8220dafa8cf65aba15e3ceae9cbd88c318dd404d3c432c8ed9c00
 EBUILD xkeyboard-config-2.43.ebuild 1574 BLAKE2B 4df791258d0e27e3ed44b945937cead2943368dbed65736ad95a8281576a8f8b6d1fad6753b03e9f3aea30b2e5a17fdce31c532a10105d922951f87f61b7aa7b SHA512 dec214d7129c5621b3d3d0454b4bedf4e85b46bd3bfa84e885bb4a495c6e5122c7d5b03db38ea8bda53251aa6b46071d39848edfeb9021877209c9952514186b
+EBUILD xkeyboard-config-2.44.ebuild 1582 BLAKE2B 35647d07ef8f92782a57d817430dfa77d37f915cecef2180f84cc157a882e2959a6204e18bf076f07375d6eaae5607897feba6f86c8b73adff7b513229a0adc0 SHA512 18c0dfe0769f89a7611835abd0816f8fbcb5b09bf11de6e1fef44e108d5c4bc700be2a0c26b21f1e3418f0610d9d09f2e48bb0084bd97acc08bf4636746f75ea
 EBUILD xkeyboard-config-9999.ebuild 1582 BLAKE2B beee2bce78e8c6616cc3d8eac2fe050dd1eb243e03a24d3f3102cc00e7b2732afe7da5b54d33c7a5f8eb79a4ad445b6e89e63b12eb2746ab9587b9ae9cc95745 SHA512 0ad649e9dfa09364a57bb8f93a0bad356d3d8ab6c0aa3adf7766c8aa18907e6d43e0ff9990dbfdf7d1e967e8f299d288ea7d1f7cf564fdb206a333a0b3ff7761
 MISC metadata.xml 442 BLAKE2B 3e7e6564b3aa17ef958ae6aed94b6d28156d743ad2782b0c2c08429adff128a7a7ea549e2f5fcece91cdc0f498d341790d0694b193dae16b60a63966bbb581b8 SHA512 0c32c580abc07b3141fa3b9137eba130654e0701b4c9e49be10a801c5c068d67881a74dc0e5d45dc34e8964364e0516bbc5e1b854ae0d7d8ff12bf1ec1ec2986
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.44.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.44.ebuild
new file mode 100644
index 000000000000..4ebef64ae30a
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.44.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+inherit meson python-any-r1
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig/ https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-lang/perl
+	dev-libs/libxslt
+	sys-devel/gettext
+	${PYTHON_DEPS}
+	test? (
+		x11-apps/xkbcomp
+		x11-libs/libxkbcommon
+		$(python_gen_any_dep '
+			dev-python/pycountry[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+python_check_deps() {
+	use test || return 0
+	python_has_version \
+		"dev-python/pycountry[${PYTHON_USEDEP}]" \
+		"dev-python/pytest-xdist[${PYTHON_USEDEP}]" \
+		"dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply_user
+
+	# Remove pytest timeout
+	sed -i -e "/test('pytest'/,/)$/ { s/timeout: [0-9]*/timeout: 0/ }" meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dxkb-base="${EPREFIX}/usr/share/X11/xkb"
+		-Dcompat-rules=true
+	)
+	meson_src_configure
+}