gentoo resync : 25.09.2021

4 files changed, 2 insertions, 70 deletions

diff --git a/x11-misc/xdotool/Manifest b/x11-misc/xdotool/Manifest
index 5c46a9461035..1ba61edcfca3 100644
--- a/x11-misc/xdotool/Manifest
+++ b/x11-misc/xdotool/Manifest
@@ -1,10 +1,7 @@
-AUX xdotool-3.20210804.2-allow_xwayland.patch 412 BLAKE2B b7ffff2fb547c1caea8558fb5985afcff1c636f0f64a36f0c02a78cd6b813405fe7d4a8fad9eba368ac03566f840ae53a5520f33e033fd0f16f98825b73990b8 SHA512 b0d187ecbc3af463844ccb7e1ac5029302437d5b00ac8a356261d458936c524159fbd04550a33ad2ec3cd8d85a22ff89fbc76753ace1d02ad90c34cc6f1b139d
 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
 DIST xdotool-3.20160805.1.tar.gz 105388 BLAKE2B b836bd9c408bc4f7de562a1dd1fe18142155dc486b01912462b6d1cebc5f3f4094a407556c9f50cafb4ca3a17149e6f69303706730aabdaf94abc6d4b817d351 SHA512 e27b1029ee954ea17643ed489a00a1856e5687b03772c0f10a8e50cde3c3c957b57a3ba9890005474a744a228ef4827a83770d6890479c37a1f98f4fd7b1ff6c
-DIST xdotool-3.20210804.2.tar.gz 114644 BLAKE2B 7002f87061bae21968ba5bd37e0974ca0f2000d6d54c400da491ecdf37110e0990fc7eb6d2500a3838b5bb969c7ea2394b2f65194bc64ece32f8fb65feead257 SHA512 45eaa0a2bdff0bdbd8bbe1374e72d58beccdc908581d40867dbacb4209a6273b040b332a6b95ddc8e7fa8d018734c016c1687f1d6963395da3f100799ffa079d
 DIST xdotool-3.20210903.1.tar.gz 115051 BLAKE2B d1be4fc2f5c86991804b63b85c95748dc04098f85a515b3427d980dac3d355133da0408d3e91a39e5363ae6242b02d268a8b5bc014fdd5faf51e43e24fb54176 SHA512 446ba8d354031df6a21957df92220c7dcaae5bacbb8878568a57f31097db72a88701717ec8bcd35cca3f5356bfaf47eb3ed65d2159f03b0c7a7ae5550a9b1dce
 EBUILD xdotool-3.20160805.1.ebuild 1329 BLAKE2B 53992c6c31b1ee1c710b53e4a0119e47c3ffed95621ad6fe68073321ad880ee5f3d190c33825b27d8422ea096d8c1ad67eb3ad63a85861554041e5eac5d83126 SHA512 ce2fe778428e897074ed7cf69d3fe68d08492fc67224c1a8e88ed3365adefe87ce037ed732c30256dd516976a660012f62b090d2a30685cfe6eea8620cfe0e6d
-EBUILD xdotool-3.20210804.2.ebuild 1468 BLAKE2B d5ddf37749b1f8c69b55c1529ed6a5dfb8e99cd5daae286893ad04697a6b65b54fb2a70be01928c4a4d885c2b97a8564ed50c38b1161891cc210e204429ced12 SHA512 bc41cc2ffee4ce55f46ba4f552f6ec40db4fcc6e39645003c991bf6d3593d51fc75bcd0656fcca9b2c85acfa2f9b4dc1d78c1e30b2106e65f678f79af0f170e6
-EBUILD xdotool-3.20210903.1.ebuild 1413 BLAKE2B 2bbdba603db2fad15f8357c8ed6f12b8d6db37059e0880c707a4cfb75801b566f20da0c1adbd9306c3a2f66a50972df8ebb6f5faab5488a67c46b208f779b8bb SHA512 68e60ae90b640a7446632a0deb04773aa3ad4dafa05bd39f499373e1d7bf8d4792eeab9cd9fc9048e17455d3808182329ebb6c04a5c55726c3a8c7ce29340b3e
+EBUILD xdotool-3.20210903.1.ebuild 1409 BLAKE2B 60c3ffe87b7caf08a942d90065c7b2a104d0b95eeecc2520893598e0cb7ea914f4b9ecefc9d15fdda0ea7784fdb0fc39c225786ade596a5f1b597d7d980c8076 SHA512 bb919f202e75ba5611a8efe7b146033340195d49774c3036e1d4646790b60ab08a8203ff02621c89787936d8e3e33bf9ffd2282f9a5cfd78efad53192c7a6d21
 MISC metadata.xml 560 BLAKE2B 9977cd6c5efe52174f07e4ef10141b7742c904c86afb7305ee82f9f222b2cf62a5b052f171f13d69cf3a7b00bf53f759f4cd108e7b285fafec5f5995828c0888 SHA512 381d5c1933c426b1847d2f239de60c68ec4877b482e6c33b60dffa74c7ff729cd5c62f852adcdf92b830ae8081f0b4c1a498b58416022f49bbae2013ca82ee74
diff --git a/x11-misc/xdotool/files/xdotool-3.20210804.2-allow_xwayland.patch b/x11-misc/xdotool/files/xdotool-3.20210804.2-allow_xwayland.patch
deleted file mode 100644
index efb1ccf13410..000000000000
--- a/x11-misc/xdotool/files/xdotool-3.20210804.2-allow_xwayland.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-See
-https://github.com/jordansissel/xdotool/issues/346
-for details.
-
---- a/xdo.c
-+++ b/xdo.c
-@@ -121,7 +121,6 @@
-   // Try to detect XWayland and warn the user about problems.
-   if (appears_to_be_wayland(xdpy)) {
-     fprintf(stderr, "The X server at %s appears to be XWayland. Unfortunately, XWayland does not correctly support the features used by libxdo and xdotool.\n", display);
--    return NULL;
-   }
- 
- 
diff --git a/x11-misc/xdotool/xdotool-3.20210804.2.ebuild b/x11-misc/xdotool/xdotool-3.20210804.2.ebuild
deleted file mode 100644
index eb3af11dd2b9..000000000000
--- a/x11-misc/xdotool/xdotool-3.20210804.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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-allow_xwayland.patch
-	"${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
-}
diff --git a/x11-misc/xdotool/xdotool-3.20210903.1.ebuild b/x11-misc/xdotool/xdotool-3.20210903.1.ebuild
index 63cc8018aa42..35ad1026e943 100644
--- a/x11-misc/xdotool/xdotool-3.20210903.1.ebuild
+++ b/x11-misc/xdotool/xdotool-3.20210903.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jordansissel/xdotool/releases/download/v${PV}/${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="examples"
 
 # Many the tests want to manually start Xvfb regardless of whether there