gentoo auto-resync : 20:02:2025 - 00:15:26

4 files changed, 66 insertions, 2 deletions

diff --git a/x11-misc/xkbset/Manifest b/x11-misc/xkbset/Manifest
index 6c78631860ac..a4ef2dbca222 100644
--- a/x11-misc/xkbset/Manifest
+++ b/x11-misc/xkbset/Manifest
@@ -1,5 +1,8 @@
 AUX xkbset-0.5-ldflags.patch 412 BLAKE2B f42d74ab24dd14348bdcddb83aa16ce732a9b912aa4b52283026ea55c2f546b76a89dd0d57f0c21495bab95b9b81b6ee8b9d080217bfc07ca88ac27c432a438f SHA512 594eb6ff7f812633d4e7c3e8ab1a90f3f71856556680ba3643d40eb75602a0e9b09cee129929f7d7aabc70d009f3b511c0fafb8dfe6943b4456b9da95a9eba39
+AUX xkbset-0.8-clarify-errors.patch 846 BLAKE2B 2024bb7ce3dd77732ae8fcc4d703c3d129a7f336fbf8e374e2f94ca52051c51ed3c471669380f8d53b2f9d9fe609eb9d878be8cfde52709b40290d72e2fe0e8b SHA512 32ee06dde3dea3f6748d2eb2cbc99f7577691f83be55176c5e278ce8778b0372985acb641a4bb8bd1d9f434cc5b32bb11549debc2f56464e3f58c06a249c2731
 DIST xkbset-0.5.tar.gz 13933 BLAKE2B f889bbf527e6ee808d970796815445cfa4803f315916c412d540eaac778f8cfdfa6e3d00e171cb21de589a61e5320de2af4f8b8c19c4c2a45c3cf837da38a0e7 SHA512 64de1a18076c0e0fd3e3189444b6033880028f53777566286caf935bfafcf062ccbd408d20926e2a4febb77d15b026349e0288f2aa93c815ddd9437b96589d8c
+DIST xkbset-0.8.tar.gz 13866 BLAKE2B da0d797dceb2600c9629160528b68bc03a0adb256c48a8a8065974b6aff83458cbae07b0407e80319c6d0db323123377fe9d6e1cebc907eefb3390997a8b2d9d SHA512 a3e304f63ee4b369a535ddbe561169d3877f3b5b74da5936339eba696554b42e55a82b4ef730d3e94c5fa659252cb65b29f350a2841d42e0be2e551a3dd37e72
 DIST xkbset_0.5-7.1.debian.tar.xz 4336 BLAKE2B 48de493553add438ccce22567d1e8b706418a6db8a70aaeb83835c33662c8ebc22f8e3250a8b87d521a02c41e44f7252dce774525a1fa5c4bfbf57f876dd728f SHA512 f927cc1fde5b3d0658d28a8fc1cdaa0c366826f7a8eab19404dda6a66a0e91ce3c262da1e783169a7521eb10a3470e9c75c01e60728daea737ad1319bc0b946f
 EBUILD xkbset-0.5_p7_p1.ebuild 916 BLAKE2B 24e1a4addb26c3dd3dbeede0d499a76074132fa1f51863a4f38fc594bd152bd7a42a52222392260a4a6bca5ed4fa8c479a2c609d4b252c6926c627d8d3f4fa74 SHA512 67ca9ca9bf30eae6950609131a097b6f5aa52b0d41c039dac74f00d483ab985aed03d8a9d9e2bfbd3408e225e0ee866f137e917a44b1b3d39885eb14a4a5adaa
-MISC metadata.xml 263 BLAKE2B 9ba9469ad9b41de189f6dab68b26c1dc96974503f40c6219fc2ea2fb44ba60323b66e4347c7959193966345c186b702121c4393a7e947fb1a487de801146e4be SHA512 ffb77d6366cd3d4bdb1bb28aa419ab549b834370359e8e6d6810165129ac937ca96c4aac2527fd20c13bb26d139c2876edbbf595118378dcfbabd98420032708
+EBUILD xkbset-0.8.ebuild 760 BLAKE2B 13f7166094e75a52a1234f783fe58a646fa47c1cd39ede591d44fe0324512713dff122c457ac60b2095fb30fafc76da9a894823b40a04f2fd040b6ce5fc0a1a6 SHA512 5ecc95919080f44ad317ce55bffe0c282d21442737bd88665cc0790a5195d981d0be1f818887ceddcfaed45cd347a203a59d318613abbd2de4c00dd676993e95
+MISC metadata.xml 265 BLAKE2B 6119943ce290acb84e264cb46d1f7594e7f2cc39cd4c0c5881681abdb157ffcfde380d483e3f978846224834512c1438619349e8893b26776b5d4cd74434b438 SHA512 833a622b42bb4f4174d0a4d8ee2226692585df7512bd1943c78f04c4780ed04cb51dcefd1fc00af1777b146066bd346ab886e99114e0b886adf22a99981b8dfc
diff --git a/x11-misc/xkbset/files/xkbset-0.8-clarify-errors.patch b/x11-misc/xkbset/files/xkbset-0.8-clarify-errors.patch
new file mode 100644
index 000000000000..1e2d4a5359b0
--- /dev/null
+++ b/x11-misc/xkbset/files/xkbset-0.8-clarify-errors.patch
@@ -0,0 +1,23 @@
+From: Rene Engelhard <rene@debian.org>
+Subject: Check version of server
+
+diff -urNad /home/rene/xkbset-0.3/main.c xkbset-0.3/main.c
+--- /home/rene/xkbset-0.3/main.c	2000-08-17 06:36:15.000000000 +0200
++++ xkbset-0.3/main.c	2003-10-17 04:14:31.000000000 +0200
+@@ -79,10 +79,14 @@
+   if (reason_rtrn != XkbOD_Success) {
+     switch(reason_rtrn) {
+       case XkbOD_BadLibraryVersion:
+-      case XkbOD_BadServerVersion:
+-      case XkbOD_NonXkbServer:
+         fprintf(stderr,"Non-existent or incompatible XKB library version\n");
+         break;
++      case XkbOD_BadServerVersion:
++        fprintf(stderr,"Bad X server version\n");
++	 break;
++      case XkbOD_NonXkbServer:
++	 fprintf(stderr,"X Server does not support XKB...");
++	 break;
+       case XkbOD_ConnectionRefused:
+         fprintf(stderr, "Unable to open display\n");
+         break;
diff --git a/x11-misc/xkbset/metadata.xml b/x11-misc/xkbset/metadata.xml
index ae24bbc4f2af..74fe06a5ffe1 100644
--- a/x11-misc/xkbset/metadata.xml
+++ b/x11-misc/xkbset/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <!-- maintainer-needed -->
 <use>
-<flag name="tk">Install the <pkg>dev-perl/Tk</pkg> based xkbset-gui utility</flag>
+  <flag name="tk">Install the <pkg>dev-perl/Tk</pkg> based xkbset-gui utility</flag>
 </use>
 </pkgmetadata>
diff --git a/x11-misc/xkbset/xkbset-0.8.ebuild b/x11-misc/xkbset/xkbset-0.8.ebuild
new file mode 100644
index 000000000000..a869e058bd52
--- /dev/null
+++ b/x11-misc/xkbset/xkbset-0.8.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="User preference utility for XKB extensions for X"
+HOMEPAGE="https://github.com/stephenmontgomerysmith/xkbset"
+SRC_URI="https://github.com/stephenmontgomerysmith/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${P/_p*/}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="tk"
+
+DEPEND="x11-libs/libX11"
+RDEPEND="
+	${DEPEND}
+	tk? ( dev-perl/Tk )
+"
+BDEPEND="dev-lang/perl"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-clarify-errors.patch
+)
+
+src_compile() {
+	emake CC="$(tc-getCC)" INC_PATH= LIB_PATH=
+}
+
+src_install() {
+	dobin xkbset
+	use tk && dobin xkbset-gui
+	doman xkbset.1
+	dodoc README TODO
+}