6 files changed, 67 insertions, 78 deletions
diff --git a/x11-misc/xdotool/Manifest b/x11-misc/xdotool/Manifest
index 40fe0a83a9a3..ea901817ca99 100644
--- a/x11-misc/xdotool/Manifest
+++ b/x11-misc/xdotool/Manifest
@@ -1,5 +1,4 @@
-AUX xdotool-3.20210804.2-no_hardcoded_pkg-config.patch 1073 BLAKE2B 570221beabbad51f324bded0398afd68e9d3d4f30216b7a643dc9f8c76163721bd32778137fd322faffc2edafbc63d10cc036ec5311496b24410c737735f6482 SHA512 cb206c2b708835d8f3c656778edb07f08faafe3f9c1b407526e45321dc44b59981617b0c7b96865d6c1b968c855d40c0302ce888e8a1f57719b87ee9e774449e
-AUX xdotool-3.20210804.2-no_ldconfig.patch 493 BLAKE2B 044f6896b2f1279795a4263107309886518698125a818522a771374f3a1f2242f00446e87eaaff3b5eead3840459fc249405d49d47e7cd6568f5c923e096fb34 SHA512 7b3d4fe4a532e81358d81ebe9fd6e212bcceb08700df37d7d4c7fc16d95177c8f39ec8ef5a986eb6a08e7c6d209efaa8426483732dcedec39617b203de2faac5
+AUX xdotool-3.20210804.2-no_hardcoded_pkg-config.patch 964 BLAKE2B cbedb1caa6517f77d5c445ce13388f4faa23b4d45c21969c2b4cdc56117c19310068be9c1f8c76a8617a29f953a53acdfd8358973d40f8e39d09998ef5512052 SHA512 a9f0886af865a8fe2125ce9af18b045ed730dff1cae60567d93fa832efe243f33cf7d6e30a2f45bf1d0c0f8cc18007c19c5f05a4a28330866411cfffb2826e18
 DIST xdotool-3.20211022.1.tar.gz 115237 BLAKE2B 1269775848905253936b113ac45e2a5126f1414eeacb5dd91aea6dc0cb6993f9fa0da969f30c83e0e03d435894a31ba633dc02269b38f9056772b513f0c86889 SHA512 f11d7b079f19d1650adfb549ecc96e840805935bf4925beefc3238154ad0afbff36b134c78bfc73a9dc07fc869ab75676575d6de50cfd54484d2c35d6913ea27
-EBUILD xdotool-3.20211022.1.ebuild 1481 BLAKE2B 3f39303386e3c5c26ec173ac1ebdfe3aa84b0e3b2f4aa37f78abc94e89f4308b2f285aa6b23d42f8ed7b0a50102b07fb2881d35a6e36562bab0cf76c2753ed53 SHA512 e822678177914a9792b9be963b08e3f67acb75c7db9538fb7d021c610498300c3453a8129704778d06543571b5400b3d970f3e51ca0396f73abf3504c2f69cad
-MISC metadata.xml 482 BLAKE2B 19e91d74efe4df15b546ea51325064f1b268552b0111ee8702001b3e4b0659dc386bbe8d0a44bea879bd9d20dd2c40d1ae3a9ce3be89dc8859d8768a185d322e SHA512 5950aa0c3bc4482bfd35993ce0c3e0819b87d9031332b06c511cadf0140e60df037006006c51df9513831c353751ee6d99f84028490ecc0ae2eefd187693e100
+EBUILD xdotool-3.20211022.1-r1.ebuild 1086 BLAKE2B 6820273b30a47bf3cddca8b5a388999d00ebe48abeba562600f3f22e838e89c57ae83e9197d9dde08b872079b3f8cfa0e8511f6fa0ae3138d753d54c70dbe8dd SHA512 abaa5ac3d5216f89f67d03a6dfb967c9f3d93c7fd3d844e675c7f9c1055613673a2659b1d458e0a7c56d5ab395e5d8a56082086b07805416e79a3bfb38ff7bfe
+MISC metadata.xml 568 BLAKE2B 880702ca50c08b4a9312c2b42ae5af10601a423c4ceee111e96857a65070b3703c0bf35a09849e5c06c90fa45440d863a8c5db562662e05770a37121600db2eb SHA512 4fb47a1680f0882502b1947f1c9a21a7f75471f662c90181ea04f66caff8fd4fa02ecc5db99d2a02aba33d88670e8e16d773eb31519ef6a4e65706e17441773c
diff --git a/x11-misc/xdotool/files/xdotool-3.20210804.2-no_hardcoded_pkg-config.patch b/x11-misc/xdotool/files/xdotool-3.20210804.2-no_hardcoded_pkg-config.patch
index d43784deaa3d..561132ec1d1a 100644
--- a/x11-misc/xdotool/files/xdotool-3.20210804.2-no_hardcoded_pkg-config.patch
+++ b/x11-misc/xdotool/files/xdotool-3.20210804.2-no_hardcoded_pkg-config.patch
@@ -1,6 +1,5 @@
-diff -ur a/Makefile b/Makefile
---- a/Makefile	2021-08-04 17:14:19.000000000 +0100
-+++ b/Makefile	2021-08-05 22:13:20.509655072 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -35,9 +35,9 @@
  DEFAULT_LIBS=-L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst -lXinerama -lxkbcommon
  DEFAULT_INC=-I/usr/X11R6/include -I/usr/local/include
@@ -9,8 +8,8 @@ diff -ur a/Makefile b/Makefile
 -LIBXDO_LIBS=$(shell pkg-config --libs xi x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_LIBS)")
 -INC=$(shell pkg-config --cflags xi x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_INC)")
 +XDOTOOL_LIBS=$(shell $(PKG_CONFIG) --libs x11 2> /dev/null || echo "$(DEFAULT_LIBS)")  $(shell sh platform.sh extralibs)
-+LIBXDO_LIBS=$(shell $(PKG_CONFIG) --libs xi x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_LIBS)")
-+INC=$(shell $(PKG_CONFIG) --cflags xi x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_INC)")
++LIBXDO_LIBS=$(shell $(PKG_CONFIG) --libs x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_LIBS)")
++INC=$(shell $(PKG_CONFIG) --cflags x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_INC)")
  CFLAGS+=-std=c99 $(INC)
  
  CMDOBJS= cmd_click.o cmd_mousemove.o cmd_mousemove_relative.o cmd_mousedown.o \
diff --git a/x11-misc/xdotool/files/xdotool-3.20210804.2-no_ldconfig.patch b/x11-misc/xdotool/files/xdotool-3.20210804.2-no_ldconfig.patch
deleted file mode 100644
index 42051da88a38..000000000000
--- a/x11-misc/xdotool/files/xdotool-3.20210804.2-no_ldconfig.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/Makefile b/Makefile
---- a/Makefile	2021-08-04 17:14:19.000000000 +0100
-+++ b/Makefile	2021-08-05 22:10:47.713611624 +0100
-@@ -71,7 +71,7 @@
- 	$(CC) -o xdotool.static xdotool.o xdo.o xdo_search.o $(CMDOBJS) $(LDFLAGS)  -lm $(XDOTOOL_LIBS) $(LIBXDO_LIBS)
- 
- .PHONY: install
--install: pre-install installlib installprog installman installheader installpc post-install
-+install: pre-install installlib installprog installman installheader installpc
- 
- .PHONY: pre-install
- pre-install:
diff --git a/x11-misc/xdotool/metadata.xml b/x11-misc/xdotool/metadata.xml
index 43dc6c0e6d6d..dd36d08bca63 100644
--- a/x11-misc/xdotool/metadata.xml
+++ b/x11-misc/xdotool/metadata.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
 	<longdescription>
-This tool lets you programatically (or manually) simulate keyboard input and
-mouse activity, move and resize windows, etc. It does this using X11's XTEST
-extension and other Xlib functions.
+		This tool lets you programatically (or manually) simulate
+		keyboard input and mouse activity, move and resize windows,
+		etc. It does this using X11's XTEST extension and other Xlib
+		functions.
 	</longdescription>
 	<upstream>
 		<remote-id type="github">jordansissel/xdotool</remote-id>
diff --git a/x11-misc/xdotool/xdotool-3.20211022.1-r1.ebuild b/x11-misc/xdotool/xdotool-3.20211022.1-r1.ebuild
new file mode 100644
index 000000000000..dfa6b299086f
--- /dev/null
+++ b/x11-misc/xdotool/xdotool-3.20211022.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+inherit docs toolchain-funcs
+
+DESCRIPTION="Simulate keyboard input and mouse activity, move and resize windows"
+HOMEPAGE="https://www.semicomplete.com/projects/xdotool/"
+SRC_URI="https://github.com/jordansissel/xdotool/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
+IUSE="examples"
+
+# tests have various troublesome requirements
+RESTRICT="test"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXinerama
+	x11-libs/libXtst
+	x11-libs/libxkbcommon
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.20210804.2-no_hardcoded_pkg-config.patch
+)
+
+src_compile() {
+	tc-export CC LD PKG_CONFIG
+
+	emake PREFIX="${EPREFIX}"/usr
+	docs_compile
+}
+
+src_install() {
+	emake PREFIX="${ED}"/usr INSTALLMAN="${ED}"/usr/share/man \
+		INSTALLLIB="${ED}"/usr/$(get_libdir) LDCONFIG=: install
+
+	dodoc -r CHANGELIST $(usev examples)
+	einstalldocs
+}
diff --git a/x11-misc/xdotool/xdotool-3.20211022.1.ebuild b/x11-misc/xdotool/xdotool-3.20211022.1.ebuild
deleted file mode 100644
index 7119c75e4647..000000000000
--- a/x11-misc/xdotool/xdotool-3.20211022.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DOCS_BUILDER="doxygen"
-
-inherit docs toolchain-funcs
-
-DESCRIPTION="Simulate keyboard input and mouse activity, move and resize windows"
-HOMEPAGE="https://www.semicomplete.com/projects/xdotool/"
-SRC_URI="https://github.com/jordansissel/xdotool/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
-IUSE="examples"
-
-# Many the tests want to manually start Xvfb regardless of whether there
-# is an X server running or not (i.e. does not play nicely with virtualx),
-# some tests require x11-wm/openbox, some try to run a complete Gnome
-# session. All of them require a Ruby interpreter with dev-ruby/minitest
-# installed. In short, supporting tests here will need MUCH work.
-RESTRICT="test"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXtst
-	x11-libs/libxkbcommon"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.20210804.2-no_hardcoded_pkg-config.patch
-	"${FILESDIR}"/${PN}-3.20210804.2-no_ldconfig.patch
-)
-
-DOCS=( CHANGELIST README.md )
-
-src_compile() {
-	tc-export CC LD PKG_CONFIG
-	emake PREFIX="${EPREFIX}/usr"
-	use doc && docs_compile
-}
-
-src_install() {
-	emake PREFIX="${ED}/usr" INSTALLMAN="${ED}/usr/share/man" INSTALLLIB="${ED}/usr/$(get_libdir)" install
-
-	use examples && DOCS+=( examples )
-	einstalldocs
-}