10 files changed, 18 insertions, 43 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 8b69593350b1..d12aa624a0e1 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest
index 720ca95b7347..233a0e444a15 100644
--- a/x11-misc/util-macros/Manifest
+++ b/x11-misc/util-macros/Manifest
@@ -1,5 +1,5 @@
 DIST util-macros-1.20.1.tar.xz 83124 BLAKE2B f80f6dd5823bd4264b4a6d50cb01cb0fca739a4d9c164d45fa5f9367f9ab7f6181c654859a3dcbea1e666ce12a1402b984eb028b47d71ce6c7b9bc95ce61474e SHA512 5f44d73c18ff87459cd94a68a961465b3970a36f0b55be65c0ec228320a675561eb24a1b1359745124302446a1a3fadc2f50d3378f439df5bd3e866cb8015286
 DIST util-macros-1.20.2.tar.xz 83592 BLAKE2B e1e0b78248ecf889aa8d0bad2e98ad26377ab7d559b4b7f82a63be53052b615983220ce6fac18c44ee26d550a650795672d0b0a4d545cf77174bfeb7d7314c83 SHA512 7d5ae8dbb6c1977e40c024f63d1405e7d5a40a38b90b01208d8dc1f1548e309734d1dec177b68bbf342a4d7d56ab0cfb4c8c36575c6a774b5a76a88d926c6d7b
 EBUILD util-macros-1.20.1.ebuild 643 BLAKE2B 94294d0303bf8bcc9791fcbc5605e2f37c4cefd287bce2d3e59021440ef30e760f6b300e467028fc29fb9fbaa8f63539c912defd32c697d6aa9ff8628a49a76c SHA512 a3ee56dcc5fa5c66f5ecf33fdd4273460977be49c2ac95e66f44f3008d07628dbd4554f679db6d96d58ca91869fbffaa74074eef91c6756e1117c72327d26828
-EBUILD util-macros-1.20.2.ebuild 651 BLAKE2B 50d24198ee45a8a81f9c3dec1995f23c6710b9b6d96e487b16d4a0028ec059f9e7a153c97fac938efbf3bef247e5eef8909e9afe65e74fcb5fc46dc65ca25433 SHA512 8b089b3e6935d582b421b41c3561fd8b0dea15631404fe9ecc0245fc0920bfd5ea09334ac8cd9611e10490049cf9534b878af1a06a4a33a23c7c02318412095e
+EBUILD util-macros-1.20.2.ebuild 645 BLAKE2B 0ab2a8c40e7aeef513069dddb679f31f7eec25e9d7f63999a9d35926f0dec1cd86f86c22a85f3985cd8b178210bae081ba94bf35d8e056f5c8e514707a2bf825 SHA512 8888b110b91e91914800f35e20c8549a369948532f9e09843cd14384f67360ade35e2d7839fc6f4e7670b1ae5f867fcdfa665a03327d5516c885c6c8cb1379a7
 MISC metadata.xml 338 BLAKE2B dcc620ca4e58f9d0464530f7915fb50e995dcae1b334b7d0fb3044cbaee39592ba7d86ed925d9ff3e72f1236ef378887deb41e9102a4c3d543f43aebeaa2e105 SHA512 d3be3477539efb8765b1249e87ed842f7c1db9b10799a9569c68d6ec1bd0386ddd192556265a43eb401aeee30f52c8906c05871877814de9d9cf7c9ef5187c36
diff --git a/x11-misc/util-macros/util-macros-1.20.2.ebuild b/x11-misc/util-macros/util-macros-1.20.2.ebuild
index 0c4fec863e9d..16583cd19dd7 100644
--- a/x11-misc/util-macros/util-macros-1.20.2.ebuild
+++ b/x11-misc/util-macros/util-macros-1.20.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 # there is nothing to compile for this package, all its contents are produced by
 # configure. the only make job that matters is make install
diff --git a/x11-misc/xcompmgr/Manifest b/x11-misc/xcompmgr/Manifest
index 3130f3c27ee3..a7ac983735ed 100644
--- a/x11-misc/xcompmgr/Manifest
+++ b/x11-misc/xcompmgr/Manifest
@@ -1,5 +1,5 @@
 DIST xcompmgr-1.1.10.tar.xz 133224 BLAKE2B 277f81cde9ae6a79b81e58754c4dc7baeec5b7e6b47abae044a13be5973b4c30968e7961720e831ad86e0a2b1d282d8529a607a2e510c7090658a1b288cf315b SHA512 6dd5c72d6859489580dabdb96e3b572931cec7c426022213007c92df2d805a8f01a7f3dc5e8493f6e550bb809f71a50ca1630f50555d47b8d5b4b2726d7b8b12
 DIST xcompmgr-1.1.9.tar.xz 132676 BLAKE2B ece3717d582df62dcaaabb347d07ffda373f9660a74688b9637ea824eb9ac32003bddf323d9b1478f3abdf51b68005abb4c024720a75689d1ed70b45a8e026c2 SHA512 699117492af7fd84b36d317dcbf422d5ec86a7f21e29370caa737cd940d8ff866a5c8704ba2e7bd17a64e085d77fd23b628263d619813dead85cd669ff5b860e
-EBUILD xcompmgr-1.1.10.ebuild 430 BLAKE2B 487a3f1b5a36eae18c0595b2f741fab1ad7273681f15229ab9c6e47a8db8f39d3fba4b453d384e61fac4ffc161ca5505a2f3b28509d9a417a049b3279d03a6b6 SHA512 01423b2fec1ac209388f522114d9b6e7768cbc56fbde32599308e56856491ca3907f7191fdc239c377bab4955382c7620b4560790580717fbd604ce4991d0297
+EBUILD xcompmgr-1.1.10.ebuild 426 BLAKE2B b593fcde28b748d86f2e58fe23bd2a80d2c3252c04ccb235329ce8b145c7931bbe6aa2f9705e959ab8ae90ad95e6ff4826020069167ee89e8b62116496f10f29 SHA512 004a325c2b13fed1417620063fc6a48e2adf3bc8d075b88bafcca19e17a186728d6d5c55a56da4f547c849aa2a6f412b677aeca6c4ea51ed83cba6a78a9c17b3
 EBUILD xcompmgr-1.1.9.ebuild 424 BLAKE2B 9baabe1ecd674e28dc1bdde6dacd362182760a4dc929aeaddde4ef49a72cd2580a724eb6a41584e5180217235e6be507995d945af67298f75045022b0fbc9066 SHA512 25f51c20c693aa2b363a85ca32205e8db797efdea66df92da51ef26559fbe2a944d5b9b29bdc92c941935ce71a3d3d580222df7f19b726848331297fc8be1f70
 MISC metadata.xml 339 BLAKE2B 344267991a80cdfd83e7f2b4dc747eff82e4ec48ca3a90bb38114c290793c5987ec5ebff932b2473fddaf6ae3cbbe20e4323566dc9fc81ab09599aee7b9ff515 SHA512 f808390c96e49240f17fd38ca76503560ea8e80bf3dbb96d9c213c6a5a818513a171572234160053912cddafecff1b45920b023d48a1acc3c541194d3ded340c
diff --git a/x11-misc/xcompmgr/xcompmgr-1.1.10.ebuild b/x11-misc/xcompmgr/xcompmgr-1.1.10.ebuild
index 7b2bb795adf3..da5daf9a3e3f 100644
--- a/x11-misc/xcompmgr/xcompmgr-1.1.10.ebuild
+++ b/x11-misc/xcompmgr/xcompmgr-1.1.10.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 DESCRIPTION="X Compositing manager"
 
 LICENSE="HPND"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	x11-libs/libXrender
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 2460a384e555..d3c002267977 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -1,8 +1,7 @@
 AUX xlockmore-5.46-freetype261.patch 561 BLAKE2B f5fde1a8984784a2892363b85413728b86082f8bdd3303358643bcd634a80bc6064fce930aabca92624897fddf71c0647a6202e7e0debb02b4127d275c99b57e SHA512 58b75f4509f4762f4009fce797b5f0420ac3bee79a3fa4444a90603b1522c5f60deb9a1ce94ecacb025d27ac6272f2b431075af912b121f6e5cfa541b696caca
 AUX xlockmore-5.47-CXX.patch 613 BLAKE2B ace9eb868bcdf4fa7fda07d5a0dfc316f992fd176616c531aa71ff5d051169165f991dd8a586685b5a0b8e1a66b0da247a441fd7a56ecd24cc39bd58f2267e8b SHA512 4eef79a2b791401433ae0c6e55179975f88b74c4e57cd64ca81df48a232723e5edaccbd7045c9f67ba81ba159e70257d5e070ea59808f52430ac08539ea91087
 AUX xlockmore-5.47-strip.patch 2048 BLAKE2B 0f0f00a38e1d3b5edebf40416698ad3b87323ce9167e7a3e0a44ca2fca853b16e9c1ff59ff74b0bf50b3484e25722a3ee840b312f2f249644614aef55095bfcc SHA512 2de24cbacab2a54e7a41f4604625096030763ad6212ec30b34be2c2fc4035b44f146bfb9d0a34df9c9ce4fa96a0eb1c9c7701b512a917fdf3eb56a5195c8585e
-AUX xlockmore-5.64_alpha0-LDFLAGS.patch 906 BLAKE2B 477e2fa3b3e74ef3bcb93d0f87f82f05f05dbd0b8fe395a2be3540986df74acff7650dcaaae84809f2cef9d5da7ff8360cd40e261328d2f404b58338e7353b13 SHA512 ae42b30b37eeccbf767e6e44a557611ae8bd549778b1b4671355d0cd4c3fbb195c23a6b3dfac7b4aa2563cfba86ddbafa791bc3786b9c8c1b84ae057e625e2b5
 AUX xlockmore-5.71-fix-build-for-clang16.patch 1243 BLAKE2B 23ab604a955f36464c9657a28db7f76a767838b96c4f01c4430485f020379cf83acffd89e0af69d236ce8c1d8c6b69348328ec0b1f9b669a8d2a4ebb4131670f SHA512 db5cf5dcb49cdd972ab7152f6005ad6affaec18fcc7807ccbda7a39464976d751217875ac1359750e411827f74968415e82426d9b4beb0fdf38260940439d926
 DIST xlockmore-5.71.tar.xz 2048496 BLAKE2B 417bd4175a483d350cfa098c8a2488f81df9758874c1b53c36a6c2ae23f3b17c942c089d8ecce432f8db244cd8c4df7e79854ff9f2156153ee838ac98f2778ad SHA512 d09cd28dbca37db5e8fa7a388f4d797369b82a856b509414dd6dca5b586506c466b0fb112947a6a0c71e8c8de7cc125ef19c0fa358edc2a521ad38c255946e58
-EBUILD xlockmore-5.71.ebuild 2571 BLAKE2B 30708ee7fa50ebf772fc5c6908e3d4b33df6fe040be89868cb8b5b97ab6f631809f634112d29f8993cf644560a37b7b3e00648643d80e535c0dec82955cf3949 SHA512 1a44c7a34294e4fd2e3c7ea5c6781a3c0aa9d35d7474f0f43a9ac0db260aacc21e832f384ff220f7ec726784fc58947ee6ed4b58550e6b1f3fe2fd262d3813b8
+EBUILD xlockmore-5.71.ebuild 2523 BLAKE2B 0e7ae8cf66fabd0fdc6e3289a0f0272a6f12f660beaeb642a63691619c2b44702ecc9df0777dc3ddbd8ca9fbe35198aacfe87fef225e00ec7518165eeea96d40 SHA512 e0ccedef985821c7601a078d180cb47a38eebc640b238ae37dfa18860418da9bc8963ef76d91bb25caca5ee0bb3ce011d571258f0c533f81e0411e7bafdc2cbf
 MISC metadata.xml 326 BLAKE2B 933c62f987014fd25320e5b9d231747e4fe9ddcf24109f34b1d5df2a186695305b4d3778d4f0b1132e73e79dc483f62bce3b08338ef69f4829998339d29d10fc SHA512 cea9a5ef5e3bbc00c784c65877a67dc10cfb2e97d6280f87defba6f3bea2afec972f1e761aac9b55acaa7e8cc8930e81ab9182d2b2b07fec01ad0ad1525c2c41
diff --git a/x11-misc/xlockmore/files/xlockmore-5.64_alpha0-LDFLAGS.patch b/x11-misc/xlockmore/files/xlockmore-5.64_alpha0-LDFLAGS.patch
deleted file mode 100644
index f36e3ab0b7a2..000000000000
--- a/x11-misc/xlockmore/files/xlockmore-5.64_alpha0-LDFLAGS.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/modes/Makefile.in
-+++ b/modes/Makefile.in
-@@ -344,7 +344,7 @@
- CXXFLAGS = @CXXFLAGS@
- #CFLAGS = -O
- #CFLAGS = -g
--XLOCKLDFLAGS = @XLOCKLDFLAGS@ $(CHECKLDFLAG)
-+XLOCKLDFLAGS = $(LDFLAGS) @XLOCKLDFLAGS@ $(CHECKLDFLAG)
- XLIBS = @XLIBS@
- XLOCKLIBS = $(MODULELIB) @XLOCKLIBS@
- 
---- a/xmlock/Makefile.in
-+++ b/xmlock/Makefile.in
-@@ -94,7 +94,7 @@
- CFLAGS = @CFLAGS@
- #CFLAGS = -O
- #CFLAGS = -g
--XMLOCKLDFLAGS = @XMLOCKLDFLAGS@
-+XMLOCKLDFLAGS = $(LDFLAGS) @XMLOCKLDFLAGS@
- XLIBS = @XLIBS@
- XMLOCKLIBS = @XMLOCKLIBS@
- #If you have purify, and want to use it, uncomment this definition or
---- a/xglock/Makefile.in
-+++ b/xglock/Makefile.in
-@@ -92,7 +92,7 @@
- CFLAGS = @GTK_CFLAGS@ @CFLAGS@
- #CFLAGS = -O
- #CFLAGS = -g
--XGLOCKLDFLAGS = @XGLOCKLDFLAGS@
-+XGLOCKLDFLAGS = $(LDFLAGS) @XGLOCKLDFLAGS@
- XLIBS = @XLIBS@
- XGLOCKLIBS = @XGLOCKLIBS@
- #If you have purify, and want to use it, uncomment this definition or
diff --git a/x11-misc/xlockmore/xlockmore-5.71.ebuild b/x11-misc/xlockmore/xlockmore-5.71.ebuild
index b774e8bccb86..6eb3c404333e 100644
--- a/x11-misc/xlockmore/xlockmore-5.71.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.71.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -53,7 +53,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.46-freetype261.patch
 	"${FILESDIR}"/${PN}-5.47-CXX.patch
 	"${FILESDIR}"/${PN}-5.47-strip.patch
-	#"${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch
 	"${FILESDIR}"/${PN}-5.71-fix-build-for-clang16.patch
 )
 
diff --git a/x11-misc/xsnow/Manifest b/x11-misc/xsnow/Manifest
index e6337b1fec44..5607a9962f50 100644
--- a/x11-misc/xsnow/Manifest
+++ b/x11-misc/xsnow/Manifest
@@ -4,5 +4,5 @@ DIST xsnow-3.7.5.tar.gz 1375177 BLAKE2B 7ee2100abcff7d5224315f0fe1ce906c0d1cc24f
 DIST xsnow-3.8.1.tar.gz 1414930 BLAKE2B 67cfbf91697cebd23c85beb2d8439c7a965424377e9278eb5687f3fb11537bbdc80e4b7455edfc882e3e7963d3d65ad86d2eefa794e7840d45bc24c1b4a638d4 SHA512 6c20d56356da0da53cf2f8dcce28ac3776d48fe94bcc85f14e847d4278d319f661366d0c5effc56fa1866d35d183c8425d8822822dcb07d6aa8ac6363b3d3678
 EBUILD xsnow-3.6.0-r1.ebuild 1156 BLAKE2B a76244ccb0d26d73ae9f4571ca504539f09c9bf4805c7b26d27a359c8de18a293760eb9202cf9c59eefc361cd8074c33f6609a2b74566b5a5bfddd8210c6c4c0 SHA512 58e56708fea83b91c50316e22480df46843ab4bc1c45b16c5c694157a8db70e81f9b520eaf4cdc1deed9de0c2b5f24070aee80c97bb661f518eabeaab30896cc
 EBUILD xsnow-3.7.5.ebuild 1157 BLAKE2B fb198e4e8b036eee46e99746643cc4aae6bcfed9a11da543ff28916bfa4f3f069c20859385c5faa948370d42b3117d06a0188284fc32733a3665f3fc8c50a333 SHA512 84373419a12fdc19143aabeda5a00b355b888c8584b48967d49cc8d4190e9366bb2d7adaa9bb7441cd3865a693446ff8ac5f1de8e336e06d5bfd2b02524a0108
-EBUILD xsnow-3.8.1.ebuild 1159 BLAKE2B 3440dfdf94a0e9d0b57d15b1f8931745af50b8c80df6930017fad2619bcb18563f00b1781bdc01705381eb5efc9934ec2221a8e1943a0d10f6ba4a2cc77a3e6b SHA512 aecf2d49331d165449bc1864ea60766f20a18649187a2b817fd5c196805e772a4ee6451f383437eb37d4d087bf49d8541b1fbb881ed95c2426b02320485a6600
+EBUILD xsnow-3.8.1.ebuild 1291 BLAKE2B 6356c867df1f6edb85329c91b946721d0008f4d120d677904ed547c8a2ae36eda132aaead7411cc890de5e25f74c0ee730d29874b64c8ba6ca638b2927b48b35 SHA512 e7c1c8421528ca8ff3abac135290e9b2ab5ce6ca69785ca7228b308d632f41d9e9260d15bb748626edc5db7085dc9867a80318e8db40b72fb670827b368e7278
 MISC metadata.xml 373 BLAKE2B d9280b6bc0bad5e39677a061df43990382ff0d50851b06f0720a2daaa0c21e7948f9297ac418ce06661988a69df15087fb52b98b9f5aa4f9c98b44c722fb4b6c SHA512 efcc32cea44cd86a80cf12fe09f0e91e9f8f3c3e90fda67ae8032d0465efe6343fbbe73898967af0ea0f29d3f5083ec7f4c0d042a6ba65f3044194845e2dec6a
diff --git a/x11-misc/xsnow/xsnow-3.8.1.ebuild b/x11-misc/xsnow/xsnow-3.8.1.ebuild
index 6964d729ff1c..101e3112470c 100644
--- a/x11-misc/xsnow/xsnow-3.8.1.ebuild
+++ b/x11-misc/xsnow/xsnow-3.8.1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 inherit autotools xdg
 
 DESCRIPTION="let it snow on your desktop and windows"
@@ -10,7 +11,10 @@ SRC_URI="https://www.ratrabbit.nl/downloads/xsnow/${P}.tar.gz"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/glib:2
@@ -29,6 +33,12 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto
+	test? (
+		media-gfx/scrot
+		x11-apps/xdpyinfo
+		x11-base/xorg-server[xvfb]
+		x11-misc/xdotool
+	)
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.7-gamesdir.patch