From a1f58b735bda0f08016d654fd76f3af57c36058e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
Date: Fri, 17 Oct 2025 22:49:23 +0200
Subject: [PATCH] x11-misc/xsnow: remove 3.6.0, 3.7.5; add 3.8.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
---
 x11-misc/xsnow/Manifest                       |  3 +-
 x11-misc/xsnow/xsnow-3.7.5.ebuild             | 54 -------------------
 ...now-3.6.0-r1.ebuild => xsnow-3.8.5.ebuild} | 12 ++++-
 3 files changed, 12 insertions(+), 57 deletions(-)
 delete mode 100644 x11-misc/xsnow/xsnow-3.7.5.ebuild
 rename x11-misc/xsnow/{xsnow-3.6.0-r1.ebuild => xsnow-3.8.5.ebuild} (85%)

diff --git a/x11-misc/xsnow/Manifest b/x11-misc/xsnow/Manifest
index d144de6a85e6f..58039d5bfc3ef 100644
--- a/x11-misc/xsnow/Manifest
+++ b/x11-misc/xsnow/Manifest
@@ -1,3 +1,2 @@
-DIST xsnow-3.6.0.tar.gz 495875 BLAKE2B 9ebc87254ce81b7fd051bbc0170faa7198390679a8dbaccdfa3674b1f584ad298fa73506b7eb8ff63fe04f168ebafcd30bc2101510c4e912e029edefe4813c65 SHA512 e2684e6d011a8add8819e16b6b649f8d501525c41a4baa0ef32d90b7603e30910a77093c2d21f52a7adb72f0ba18076f9265557e70dc246b365e0fd2b8ed4ab1
-DIST xsnow-3.7.5.tar.gz 1375177 BLAKE2B 7ee2100abcff7d5224315f0fe1ce906c0d1cc24f0e695e3d3914d5eb58f50ab39c0d8e2dc89185c887175a018c3732ef3c943c3184fb10b87106105612bb37bb SHA512 68683d0de9380d990580049b300f326bd9ee6a3debbc3cb0323a21a26a2eda07e6475596070a7cbe8946074b781bc3b374ec3a5fdd587b851d9cdf55d768bffb
 DIST xsnow-3.8.1.tar.gz 1414930 BLAKE2B 67cfbf91697cebd23c85beb2d8439c7a965424377e9278eb5687f3fb11537bbdc80e4b7455edfc882e3e7963d3d65ad86d2eefa794e7840d45bc24c1b4a638d4 SHA512 6c20d56356da0da53cf2f8dcce28ac3776d48fe94bcc85f14e847d4278d319f661366d0c5effc56fa1866d35d183c8425d8822822dcb07d6aa8ac6363b3d3678
+DIST xsnow-3.8.5.tar.gz 1423250 BLAKE2B 74ffd4bf0e75d5bda66518006fd2e5dcbaec64538d49f5ff7690c7e4098c935d10f71c9a294f1ba95f30f81b8f11179b66030bac27f6658c14197f24f91d1b03 SHA512 f19614544724875995f2e232bfb8f7a853da4763f72f8c6e95cbaa0e28d433f0975ae8bb496758bfe19867809117a481b093723e027955c499ffe3b8525deafc
diff --git a/x11-misc/xsnow/xsnow-3.7.5.ebuild b/x11-misc/xsnow/xsnow-3.7.5.ebuild
deleted file mode 100644
index 8ec22036f7a30..0000000000000
--- a/x11-misc/xsnow/xsnow-3.7.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# 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"
-HOMEPAGE="https://www.ratrabbit.nl/ratrabbit/xsnow/"
-SRC_URI="https://www.ratrabbit.nl/downloads/xsnow/${P}.tar.gz"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ppc64 ~sparc ~x86"
-
-RDEPEND="
-	dev-libs/glib:2
-	sci-libs/gsl:=
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXpm
-	x11-libs/libXtst
-	x11-libs/libxkbcommon
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.7-gamesdir.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	# Install xscreensaver hack, which calls xsnow with the correct
-	# arguments. xscreensaver calls all hacks with --root, however xsnow
-	# only understands -root and will exit with an error if an unknown
-	# argument (--root) is provided.
-	exeinto usr/$(get_libdir)/misc/xscreensaver
-	newexe - xsnow <<-EOF
-	#/usr/bin/env bash
-	exec "${EPREFIX}/usr/bin/xsnow" -nomenu -root
-EOF
-}
diff --git a/x11-misc/xsnow/xsnow-3.6.0-r1.ebuild b/x11-misc/xsnow/xsnow-3.8.5.ebuild
similarity index 85%
rename from x11-misc/xsnow/xsnow-3.6.0-r1.ebuild
rename to x11-misc/xsnow/xsnow-3.8.5.ebuild
index 8ec22036f7a30..ca9dc684c7a65 100644
--- a/x11-misc/xsnow/xsnow-3.6.0-r1.ebuild
+++ b/x11-misc/xsnow/xsnow-3.8.5.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 ~sparc ~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