From 3c61e2b717e61973d89017fb04c0c3e1935eed21 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 30 Apr 2025 19:36:43 -0400 Subject: [PATCH] x11-misc/xdotool: tidy ebuild and patches Just style changes except for dropping (unused) libXi RDEPEND and moving xorg-proto from BDEPEND to DEPEND. Signed-off-by: Ionen Wolkens --- ...3.20210804.2-no_hardcoded_pkg-config.patch | 5 ++- .../xdotool-3.20210804.2-no_ldconfig.patch | 5 ++- ....ebuild => xdotool-3.20211022.1-r1.ebuild} | 36 +++++++++---------- 3 files changed, 22 insertions(+), 24 deletions(-) rename x11-misc/xdotool/{xdotool-3.20211022.1.ebuild => xdotool-3.20211022.1-r1.ebuild} (51%) 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 d43784deaa3d4..c27e66692f695 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 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 index 42051da88a389..45c81a7bdc2e4 100644 --- a/x11-misc/xdotool/files/xdotool-3.20210804.2-no_ldconfig.patch +++ b/x11-misc/xdotool/files/xdotool-3.20210804.2-no_ldconfig.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:10:47.713611624 +0100 +--- a/Makefile ++++ b/Makefile @@ -71,7 +71,7 @@ $(CC) -o xdotool.static xdotool.o xdo.o xdo_search.o $(CMDOBJS) $(LDFLAGS) -lm $(XDOTOOL_LIBS) $(LIBXDO_LIBS) diff --git a/x11-misc/xdotool/xdotool-3.20211022.1.ebuild b/x11-misc/xdotool/xdotool-3.20211022.1-r1.ebuild similarity index 51% rename from x11-misc/xdotool/xdotool-3.20211022.1.ebuild rename to x11-misc/xdotool/xdotool-3.20211022.1-r1.ebuild index 7119c75e4647c..f7df107135391 100644 --- a/x11-misc/xdotool/xdotool-3.20211022.1.ebuild +++ b/x11-misc/xdotool/xdotool-3.20211022.1-r1.ebuild @@ -4,7 +4,6 @@ EAPI=8 DOCS_BUILDER="doxygen" - inherit docs toolchain-funcs DESCRIPTION="Simulate keyboard input and mouse activity, move and resize windows" @@ -16,38 +15,39 @@ 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. +# tests have various troublesome requirements RESTRICT="test" -RDEPEND="x11-libs/libX11 - x11-libs/libXi +RDEPEND=" + x11-libs/libX11 x11-libs/libXinerama x11-libs/libXtst - x11-libs/libxkbcommon" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig - x11-base/xorg-proto" + x11-libs/libxkbcommon +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + virtual/pkgconfig +" 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 + + emake PREFIX="${EPREFIX}"/usr + docs_compile } src_install() { - emake PREFIX="${ED}/usr" INSTALLMAN="${ED}/usr/share/man" INSTALLLIB="${ED}/usr/$(get_libdir)" install + emake PREFIX="${ED}"/usr INSTALLMAN="${ED}"/usr/share/man \ + INSTALLLIB="${ED}"/usr/$(get_libdir) install - use examples && DOCS+=( examples ) + dodoc -r CHANGELIST $(usev examples) einstalldocs }