gentoo auto-resync : 11:03:2025 - 01:49:36HEADmaster

11 files changed, 115 insertions, 69 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 73475b6c12f9..14d66ac2a7e0 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index 2f6b06dd76a1..b2a24a2e7fb3 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1,5 +1,7 @@
 DIST libX11-1.8.10.tar.xz 1839380 BLAKE2B 72ff400e1aad5bcb04e5dd3fb43f7767fad47e38cf628382cd5ffd5a204efc4de4f626027dddbbc7e10f80f8eaee0bcdf9792d9d012256366920f7ae0cffcb15 SHA512 f801f5b77cbc55074f73dc95b29fff7b5e1b13b99641f6e397788ad9f31a29793ed4e8e5bd373122c790ef90627e8f9d6d5e271051c1767a479a85c55cd82bc1
 DIST libX11-1.8.11.tar.xz 1817652 BLAKE2B e557548d6acaa417a87600c10f1e295ae0fbb13460f7641260f59fc175e9b7de76b4c398981d76b11a52a055f26b233a2ceb44ebb8076d793eb047c2d178573a SHA512 4e2191258039ad0ea7fe5d22b8b0ab5e1d101b20fa4cd0fb44c5e1ac8b2ffbb3a0ad80ac3a67a3803ca30b972476b739a0c244b2ac8b7de6a32b06dc4e2c674b
+DIST libX11-1.8.12.tar.xz 1895256 BLAKE2B f4bdb69abb2add723ca84832ef35f239659228c1f5a3f53631f0d4d4afa7030512b9ba65479464f3efecca0e09d1f758e3b92b139dd5e716fac1b8caaf5bb98d SHA512 cb7a284d9081a8b67f7d8568d56dc403a4b787e46ac497b07768d236084c01f80f4ea2ebd814f950ac9738adc3baea3912932fc333858195c4f8217744b6f730
 EBUILD compose-tables-1.8.10.ebuild 994 BLAKE2B 22c9275efabffb0e4694f77998b355d5f527ab7dba5a023f868aafde0a4bc4599540faee6b10a8c0c4869ff046dc74f487a59232536f376043f426d603df67c9 SHA512 633767ff4b236e31e428b6f7c2c8e8e9b3ae0659f3060e60f91f91e243e55e9c48f97c5eb485a116ad9d618cbd6f2fcf1544d924e13ba64a981cb72635aafe80
 EBUILD compose-tables-1.8.11.ebuild 1002 BLAKE2B ba0c848a73866f293d1f783fd11fe30dbd04681920564583c85dfcdc93a3ce783a485ee320fe96b57e1b012e00790b0789a929e55b64d49d91a741790ca8ce02 SHA512 9d6745c421b577ac42ed34f45c81fd49e1834baf749c23e1687b7635946ab025a06f102fa58737d8245d82f907b9d73ac3fcb88a5715752475a152cc381b96fd
+EBUILD compose-tables-1.8.12.ebuild 1002 BLAKE2B ba0c848a73866f293d1f783fd11fe30dbd04681920564583c85dfcdc93a3ce783a485ee320fe96b57e1b012e00790b0789a929e55b64d49d91a741790ca8ce02 SHA512 9d6745c421b577ac42ed34f45c81fd49e1834baf749c23e1687b7635946ab025a06f102fa58737d8245d82f907b9d73ac3fcb88a5715752475a152cc381b96fd
 MISC metadata.xml 395 BLAKE2B 7912fcccfd8d8a4c9c1e5601783a0668679506638511ee719bf7bb95f99415fe95a417343060cf5ca3fe918ab1f9847f74861af36d3c712afa321272cd13cf66 SHA512 c2956ef519fe59d0f713732059224568b9d7c34579654b71993b02227a512c1ac3057dc7f81c6bc93834fd4fee212f1ae26f4055ea92f3eb7524da7d9e690f8f
diff --git a/x11-misc/compose-tables/compose-tables-1.8.12.ebuild b/x11-misc/compose-tables/compose-tables-1.8.12.ebuild
new file mode 100644
index 000000000000..12dfb3da5e72
--- /dev/null
+++ b/x11-misc/compose-tables/compose-tables-1.8.12.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_MULTILIB=no
+inherit xorg-3
+
+# Note: please bump this with x11-libs/libX11
+DESCRIPTION="X.Org Compose Key tables from libX11"
+# xorg-3.eclass would attempt to fetch a tarball with a matching name to this package
+SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
+S="${WORKDIR}/libX11-${PV}/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+# Only needed by configure
+DEPEND="
+	x11-base/xorg-proto
+	>=x11-libs/libxcb-1.11.1
+	x11-libs/xtrans"
+# RDEPEND=""
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		--without-xmlto
+		--without-fop
+		--disable-specs
+		--disable-xkb
+		--with-keysymdefdir="${ESYSROOT}/usr/include/X11"
+	)
+	xorg-3_src_configure
+}
+
+src_compile() {
+	emake -C nls
+}
+
+src_test() {
+	:;
+}
+
+src_install() {
+	emake DESTDIR="${D}" -C nls install
+}
diff --git a/x11-misc/vym/Manifest b/x11-misc/vym/Manifest
index 66af19f395d4..e146ed855695 100644
--- a/x11-misc/vym/Manifest
+++ b/x11-misc/vym/Manifest
@@ -1,5 +1,7 @@
-AUX vym-2.9.562-docdir.patch 787 BLAKE2B cebd12f15551bf7853637d819ceed6ac4cd73f93c7b53e7bfd482274f31d1c991e5779ba041df4490299f48b7b19a469b79cd4a3c16041e3db5dc8871e7db430 SHA512 f9eff8bbb7f58fe78bfdc67e7e61c86c39ecb8c42122c2b16f8e6737b02b784d2d5227787329e6e06ce603f9b3e50526ca525188fa2569c00caa835d1148731c
+AUX vym-2.9-docdir.patch 787 BLAKE2B cebd12f15551bf7853637d819ceed6ac4cd73f93c7b53e7bfd482274f31d1c991e5779ba041df4490299f48b7b19a469b79cd4a3c16041e3db5dc8871e7db430 SHA512 f9eff8bbb7f58fe78bfdc67e7e61c86c39ecb8c42122c2b16f8e6737b02b784d2d5227787329e6e06ce603f9b3e50526ca525188fa2569c00caa835d1148731c
 DIST vym-2.7.1.tar.bz2 6718924 BLAKE2B d7be8f2d40cedabb1bfaa3b89aac64de5e579f56ebfd757c22d4393ee712c4c4f5bf4747037683e4c6640ab0556ce4ef34bac5b27ecb747a15e58443d57f229f SHA512 985dbf18f743c36b484050ae24e4392eeae701c6c72fca6bd3dc5b70b38a283211946e279804c66253b5a394a642683ca4e3a66a7288400a9193fbcbfd8c9582
+DIST vym-2.9.568.tar.gz 9256371 BLAKE2B d87a4c8ab7dae7f4232b333fe3b14c2283a2ac40e5e92614c459a79a41657221600384961fef6a4276fbff7039fc62ab365c6ad438a52ae24b81626dd462bd8e SHA512 05f0492b7068524d052d75b387eb0183d2ac630b5692ce4b9088fd8a2f29ca21a5b1b3810acc2618a5b672ecfd22bf815b7ae1c287a1e1ceb4154e2a14c3daab
 EBUILD vym-2.7.1.ebuild 1485 BLAKE2B 4cc2724618c943c9d275ac312ef103c2486e94d6cd61e16d4b1a1aa4f30a0784b663f507e77a8134e4be0d5b4979cbd77a89c7b70e3102a4138804422b48685a SHA512 7a07e73c358b1e41aa00091cc832ff0f87357056e6076866454d20d8a0671d8e92c8805b167163f386f3f9ca5b17a45c984040be48c32ff6f1d01f39be1d988a
-EBUILD vym-9999.ebuild 1106 BLAKE2B 8af75767170cb45aaadfc46c21cfc7799757c811d4722db8729b2733c7aa0ea4241e3cd95337999819d70fa4646c8b2fa9af9f0aa7ab54bb708acf02380c9c1c SHA512 025b60b30fbfab53ad7323132c3bd1742df7dd4b40d6fc9d672a25eb5029d615939748eb68dcba90a54102a05204e48f3676ffeb20b417f120a79020c52ee428
+EBUILD vym-2.9.568.ebuild 1142 BLAKE2B 32449744e792af13e687b81a57f188fa42ff598a1e8f7fa9db24f1d0b4d2509fc9a72f04c10ef005bd45388dfc6a419790e1096859f11be2470f68fc8f111e04 SHA512 981a626b431bbdee5c61864cbc48ae2627b9571a1270844eee68e766e3e55177a33c095cf7cbf0b6ccb524fc01d5eddd7ce77cb35fd559fb5329c0d6abc1f06b
+EBUILD vym-9999.ebuild 1102 BLAKE2B 03aad08901607b17d5293733dd8293f7929c225365021c9dec54ff4eae9751e8291a335a18aaadbc0a6db198558166a972333294e2d0a32de724e7873d4f714a SHA512 5c16cc9096cbe16f0dbc7aea4259ca7966cb504a341a151f18affc10bbe8482177d31887ca6d3d8c6a116d0f6e07ea3cdaac58d1ea475c70da35a58aa315acac
 MISC metadata.xml 421 BLAKE2B 981af077c6c28d2f3a3c58a6e6bf029c0ecf17c62d68a384ddaada4c3f715bcca5be5f4ef0830787d2002e342c6b9dc12c61208d871d687f7ae8e8d9465a0c23 SHA512 b8fe57c75b023865e0c42de2085d6ff2cde47307e7a8288035b637166f0e5552475b080e86ed19090d36715eb5675843eb6eec25414cc7f0f288b073503ba305
diff --git a/x11-misc/vym/files/vym-2.9.562-docdir.patch b/x11-misc/vym/files/vym-2.9-docdir.patch
index fffe2bfb64ef..fffe2bfb64ef 100644
--- a/x11-misc/vym/files/vym-2.9.562-docdir.patch
+++ b/x11-misc/vym/files/vym-2.9-docdir.patch
diff --git a/x11-misc/vym/vym-2.9.568.ebuild b/x11-misc/vym/vym-2.9.568.ebuild
new file mode 100644
index 000000000000..1fb05e096102
--- /dev/null
+++ b/x11-misc/vym/vym-2.9.568.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+if [[ ${PV} = *9999* ]] ; then
+	EGIT_BRANCH="develop"
+	EGIT_REPO_URI="https://github.com/insilmaril/${PN}.git"
+	inherit git-r3
+else
+	COMMIT="d1ba122d89c1c580f26f3535d264250a4d5d6b64"
+	SRC_URI="https://github.com/insilmaril/${PN}/archive/develop/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-develop"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="View Your Mind, a mindmap tool"
+HOMEPAGE="https://www.insilmaril.de/vym/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dbus"
+
+RDEPEND="
+	dev-qt/qtbase:6[dbus?,gui,network,ssl,widgets,xml]
+	dev-qt/qtdeclarative:6
+	dev-qt/qtsvg:6
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/qttools:6[linguist]"
+
+PATCHES=(
+	# fix install dir for doc, remove gzipped man, set VYM_DOCDIR
+	"${FILESDIR}"/${PN}-2.9-docdir.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	gunzip doc/vym.1.gz || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package dbus DBus1)
+		-DCMAKE_INSTALL_DATAROOTDIR="share/${PN}"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	doman doc/vym.1
+
+	cmake_src_install
+}
diff --git a/x11-misc/vym/vym-9999.ebuild b/x11-misc/vym/vym-9999.ebuild
index fb39e0dab9b8..c5ce74392d71 100644
--- a/x11-misc/vym/vym-9999.ebuild
+++ b/x11-misc/vym/vym-9999.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 IUSE="dbus"
 
 RDEPEND="
-	dev-qt/qtbase:6[dbus?,gui,network,ssl,xml,widgets]
+	dev-qt/qtbase:6[dbus?,gui,network,ssl,widgets,xml]
 	dev-qt/qtdeclarative:6
 	dev-qt/qtsvg:6
 "
@@ -33,7 +33,7 @@ BDEPEND="dev-qt/qttools:6[linguist]"
 
 PATCHES=(
 	# fix install dir for doc, remove gzipped man, set VYM_DOCDIR
-	"${FILESDIR}"/${PN}-2.9.562-docdir.patch
+	"${FILESDIR}"/${PN}-2.9-docdir.patch
 )
 
 src_prepare() {
diff --git a/x11-misc/xkbset/Manifest b/x11-misc/xkbset/Manifest
index a4ef2dbca222..d9117481950a 100644
--- a/x11-misc/xkbset/Manifest
+++ b/x11-misc/xkbset/Manifest
@@ -1,8 +1,4 @@
-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
 EBUILD xkbset-0.8.ebuild 760 BLAKE2B 13f7166094e75a52a1234f783fe58a646fa47c1cd39ede591d44fe0324512713dff122c457ac60b2095fb30fafc76da9a894823b40a04f2fd040b6ce5fc0a1a6 SHA512 5ecc95919080f44ad317ce55bffe0c282d21442737bd88665cc0790a5195d981d0be1f818887ceddcfaed45cd347a203a59d318613abbd2de4c00dd676993e95
-MISC metadata.xml 265 BLAKE2B 6119943ce290acb84e264cb46d1f7594e7f2cc39cd4c0c5881681abdb157ffcfde380d483e3f978846224834512c1438619349e8893b26776b5d4cd74434b438 SHA512 833a622b42bb4f4174d0a4d8ee2226692585df7512bd1943c78f04c4780ed04cb51dcefd1fc00af1777b146066bd346ab886e99114e0b886adf22a99981b8dfc
+MISC metadata.xml 357 BLAKE2B 5d74cbd13ece187881b86734a24b39982ed716d29b87972b3a0da11a01ac1eaf7ae1033c61bd53eee65912a58aacba8a725bae239b32db3ffe19b32153346c32 SHA512 a6e6ca0f06c5721c2c35966db5c4ac455528f4955898832df9edd0184a19e31d2c3610e4319774a1fc151c7a38206559b909ff7eb906ec5c1a5407645e598ea8
diff --git a/x11-misc/xkbset/files/xkbset-0.5-ldflags.patch b/x11-misc/xkbset/files/xkbset-0.5-ldflags.patch
deleted file mode 100644
index 440d428b7a68..000000000000
--- a/x11-misc/xkbset/files/xkbset-0.5-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -11,7 +11,7 @@
- all: xkbset xkbset.1
- 
- xkbset: getargs.o print.o usage.o main.o misc.o
--	${CC} ${CFLAGS} ${INC_PATH} ${LIB_PATH} getargs.o print.o usage.o main.o misc.o -o $@ ${LIBS}
-+	${CC} ${CFLAGS} ${LDFLAGS} ${INC_PATH} ${LIB_PATH} getargs.o print.o usage.o main.o misc.o -o $@ ${LIBS}
- 
- getargs.o: getargs.c xkbset.h
- 	${CC} ${CFLAGS} ${INC_PATH} ${LIB_PATH} -c getargs.c
diff --git a/x11-misc/xkbset/metadata.xml b/x11-misc/xkbset/metadata.xml
index 74fe06a5ffe1..02165c427702 100644
--- a/x11-misc/xkbset/metadata.xml
+++ b/x11-misc/xkbset/metadata.xml
@@ -5,4 +5,7 @@
 <use>
   <flag name="tk">Install the <pkg>dev-perl/Tk</pkg> based xkbset-gui utility</flag>
 </use>
+<upstream>
+  <remote-id type="github">stephenmontgomerysmith/xkbset</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/x11-misc/xkbset/xkbset-0.5_p7_p1.ebuild b/x11-misc/xkbset/xkbset-0.5_p7_p1.ebuild
deleted file mode 100644
index 125b8f843a53..000000000000
--- a/x11-misc/xkbset/xkbset-0.5_p7_p1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DEBIAN_P=${PV#*_p}
-DEBIAN_P=${DEBIAN_P/_p/.}
-
-DESCRIPTION="User preference utility for XKB extensions for X"
-HOMEPAGE="https://faculty.missouri.edu/~stephen/software/#xkbset"
-SRC_URI="
-	https://faculty.missouri.edu/~stephen/software/${PN}/${P/_p*/}.tar.gz
-	mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEBIAN_P}.debian.tar.xz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tk"
-
-CDEPEND="
-	x11-libs/libX11
-"
-DEPEND="
-	${CDEPEND}
-"
-RDEPEND="
-	${CDEPEND}
-	tk? ( dev-perl/Tk )
-"
-
-S=${WORKDIR}/${P/_p*/}
-
-PATCHES=(
-	"${FILESDIR}"/${P/_p*/}-ldflags.patch
-	"${WORKDIR}"/debian/patches/02-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
-}