[gentoo-commits] repo/gentoo:master commit in: x11-misc/xdotool/, x11-misc/xdotool/files/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xdotool/, x11-misc/xdotool/files/

[Marek Szuba]

commit:     d038fa25e5a315da2409d2af8a427849df316c9e
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  5 21:23:45 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Aug  5 21:31:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d038fa25

x11-misc/xdotool: add 3.20210804.2

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 x11-misc/xdotool/Manifest                          |  1 +
 ...tool-3.20210804.2-no_hardcoded_pkg-config.patch | 16 +++++++
 .../files/xdotool-3.20210804.2-no_ldconfig.patch   | 12 ++++++
 x11-misc/xdotool/xdotool-3.20210804.2.ebuild       | 50 ++++++++++++++++++++++
 4 files changed, 79 insertions(+)

diff --git a/x11-misc/xdotool/Manifest b/x11-misc/xdotool/Manifest
index c38e8bdfa60..f293c7a345b 100644
--- a/x11-misc/xdotool/Manifest
+++ b/x11-misc/xdotool/Manifest
@@ -1 +1,2 @@
 DIST xdotool-3.20160805.1.tar.gz 105388 BLAKE2B b836bd9c408bc4f7de562a1dd1fe18142155dc486b01912462b6d1cebc5f3f4094a407556c9f50cafb4ca3a17149e6f69303706730aabdaf94abc6d4b817d351 SHA512 e27b1029ee954ea17643ed489a00a1856e5687b03772c0f10a8e50cde3c3c957b57a3ba9890005474a744a228ef4827a83770d6890479c37a1f98f4fd7b1ff6c
+DIST xdotool-3.20210804.2.tar.gz 114644 BLAKE2B 7002f87061bae21968ba5bd37e0974ca0f2000d6d54c400da491ecdf37110e0990fc7eb6d2500a3838b5bb969c7ea2394b2f65194bc64ece32f8fb65feead257 SHA512 45eaa0a2bdff0bdbd8bbe1374e72d58beccdc908581d40867dbacb4209a6273b040b332a6b95ddc8e7fa8d018734c016c1687f1d6963395da3f100799ffa079d

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
new file mode 100644
index 00000000000..d43784deaa3
--- /dev/null
+++ b/x11-misc/xdotool/files/xdotool-3.20210804.2-no_hardcoded_pkg-config.patch
@@ -0,0 +1,16 @@
+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
+@@ -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
+ 
+-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)")
++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)")
+ 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
new file mode 100644
index 00000000000..42051da88a3
--- /dev/null
+++ b/x11-misc/xdotool/files/xdotool-3.20210804.2-no_ldconfig.patch
@@ -0,0 +1,12 @@
+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/xdotool-3.20210804.2.ebuild b/x11-misc/xdotool/xdotool-3.20210804.2.ebuild
new file mode 100644
index 00000000000..63cc8018aa4
--- /dev/null
+++ b/x11-misc/xdotool/xdotool-3.20210804.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit 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 ~ppc ~ppc64 ~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"
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" INSTALLMAN="${ED}/usr/share/man" INSTALLLIB="${ED}/usr/$(get_libdir)" install
+
+	use examples && DOCS+=( examples )
+	einstalldocs
+}