5 files changed, 286 insertions, 6 deletions
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 5735777c0491..b119dc9a9cf8 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -15,7 +15,9 @@ DIST xscreensaver-6.06-logind-idle-hint.patch 4036 BLAKE2B 48c2766ff5879b77f521d
 DIST xscreensaver-6.07-xscreensaver.service-start-with-no-splash.patch 834 BLAKE2B 57c509e370ba79c4197a2a51188e09c2a48cc172f889c8876c0fb1af995b87465ddc390b3e704cb572c29c1537f3d05b065365d6357c51047c910124b7c8f6c4 SHA512 6e7dcfbe0e687719f3f5579790a48544bb8728231cd7ac1c8b82f5814da0be1e67f2308de7f0354a2ba20ac098c2d5ae8c212b9a3a7b84177bc4bb10739378c3
 DIST xscreensaver-6.07.tar.gz 26365057 BLAKE2B b0fc24e34713dd5591cff2ff871ec05deae089d7d76fe1239dd59ec1addf97eb764a583d01685953ae6409a7193ca97bc201a20dcf86d5244cf898e4eb9b1221 SHA512 abbf75faa49bb23d35985a7bf269891d168c87fe8939ad5acf6857398dfb056815d79dcf39bba9a33808e2717a47635fa84282c03ed9efeeeb449763253179a5
 DIST xscreensaver-6.08.tar.gz 19990058 BLAKE2B 1dd13a656471335663738e677dd1b367ab1114ba91e65868ad2a1d8ebe95b16ff0311c2b69a2a5409ebdea68451d5e6cb507a66a5fb641921a469b8e69ec6b2d SHA512 a333d4921ed3a8219f3b672dd68543aea31fcd64ea6766143f1c7f6e5ed3bc7122355635d5afba1632457ad71a11cabdc7b2756431e4f1dc7e0426ae0896e6db
-EBUILD xscreensaver-6.07-r2.ebuild 7835 BLAKE2B af291f0dc7de2ecd49b4f3cb6fdbcaeb052d6dad2a04272e683743d5531557cc5851d6a69e963e4c5d4176121822a179fae68a8dd9fb640872ed2ff8e0926cbd SHA512 d973d66276a95e78244738e35ac83100fd8fb276955f54cc2cb2189e9481afba9d4395eca11c1157e9819873859b41aa3c2d1395bbb8763d4e3b60265b594664
-EBUILD xscreensaver-6.08-r1.ebuild 7771 BLAKE2B a912dc05987f3cf5709baaf7328c6d0d5ab51859d6ec784f2caaabbcc035e2575eba3f627bae9b6e026e6055953db79f90aabfbe73e8e59a64e5defb49295da6 SHA512 a4d179cac63f4a7353dd833f5290e2a9d12b9689ad4dca68228ff33312fc953628b8b68f3b3d4c4963431b4e78e6e6471043eab63e23e76fdb8de38eb527e983
-EBUILD xscreensaver-6.08.ebuild 7835 BLAKE2B af291f0dc7de2ecd49b4f3cb6fdbcaeb052d6dad2a04272e683743d5531557cc5851d6a69e963e4c5d4176121822a179fae68a8dd9fb640872ed2ff8e0926cbd SHA512 d973d66276a95e78244738e35ac83100fd8fb276955f54cc2cb2189e9481afba9d4395eca11c1157e9819873859b41aa3c2d1395bbb8763d4e3b60265b594664
+DIST xscreensaver-6.09.tar.gz 22026182 BLAKE2B 34e3bf5b3affbfc6ef0aabaf9889c4b76ce27b09974d6c84a9b342b2267a3268fa1558a9bf0e0e487fce84ef218c3152fca4216268e15e40f82fef91021160da SHA512 6002c1879e3f9c509b4f6b645146978da82def0ed7b9e9c421b11dadf0116380c63403c30167fa70a289321928abe39795a96f1a796afb920bd0e3ac416d3653
+EBUILD xscreensaver-6.07-r2.ebuild 7829 BLAKE2B dffe6479ec2824fd91916abf175d5976c1e4ac787fe739026a64a40a555755e69e804b8ebb9df71f5a99a5471e8e872f31e419ebe67bde2b6f1c90a19b214eea SHA512 51a4445ccc64292aa4ce46b34e4fe3c0d0c611c7d5d98b40dc6c1c968501ce2c0037120d130ea77af77374a3f8d2ad4453c462590a2c2e7d8b086181a4178f8e
+EBUILD xscreensaver-6.08-r1.ebuild 7765 BLAKE2B 42e776afb650cb29d4451da034f610a30dbe679eecb6fb48e0a505af483d7d9e3d4d469a52f6c177915c280d29141e8d0a31c54185d1ce8bcb0eaab27e833831 SHA512 1d272d88cae10939191f17c53f246b325dc349a262211e448bbc060c119b95696e87e9fb1f29d435342787b4c7dacce048eb51105f910605a4b642fd4c171fca
+EBUILD xscreensaver-6.08.ebuild 7829 BLAKE2B dffe6479ec2824fd91916abf175d5976c1e4ac787fe739026a64a40a555755e69e804b8ebb9df71f5a99a5471e8e872f31e419ebe67bde2b6f1c90a19b214eea SHA512 51a4445ccc64292aa4ce46b34e4fe3c0d0c611c7d5d98b40dc6c1c968501ce2c0037120d130ea77af77374a3f8d2ad4453c462590a2c2e7d8b086181a4178f8e
+EBUILD xscreensaver-6.09.ebuild 7760 BLAKE2B 87666d62b6ad76bc1b87318f6d080de105ca0d253cf17decc4c70c779d83694821744cf8e0ba2ced45ccc2296e136740a5e583c8693396253ef9e7fbf7099334 SHA512 1aebfebd707ee026ffd38121cd57ab73cd6498b749a77cd91421b47af0774dc90591e9c017b3fdc82804740efe84777f1c6b2f83698801f9c52169e5415c0291
 MISC metadata.xml 1262 BLAKE2B 3800cee01a975dc0d79d1576fbe11910ac6233eda87b285aaa612c030786ea06697383e82d88707dbcb4d26b54a7df018ffb905351dd3d9bd81eb991abbc1774 SHA512 4e7c2ee2c57e76f3fbb51329f41151f7f8a2fb8dfd25d06161a0a85a6a3bfad253233935de40eff29b1b78a52202443dc1e5c962b09f922712f8ee76f6904abc
diff --git a/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild
index 5c68ad4c01cd..fa0e6da22cd4 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 #   SpecialElite.ttf -- Apache-2.0
 LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama"
 REQUIRED_USE="
 	gles? ( !glx )
diff --git a/x11-misc/xscreensaver/xscreensaver-6.08-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-6.08-r1.ebuild
index 27af9731dff7..45f5a50cc9a4 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.08-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.08-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 #   SpecialElite.ttf -- Apache-2.0
 LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama"
 REQUIRED_USE="
 	gles? ( !glx )
diff --git a/x11-misc/xscreensaver/xscreensaver-6.08.ebuild b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild
index 5c68ad4c01cd..fa0e6da22cd4 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.08.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 #   SpecialElite.ttf -- Apache-2.0
 LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama"
 REQUIRED_USE="
 	gles? ( !glx )
diff --git a/x11-misc/xscreensaver/xscreensaver-6.09.ebuild b/x11-misc/xscreensaver/xscreensaver-6.09.ebuild
new file mode 100644
index 000000000000..98eed42c0d1a
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-6.09.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic font optfeature pam strip-linguas systemd xdg-utils
+
+DESCRIPTION="Modular screen saver and locker for the X Window System"
+HOMEPAGE="https://www.jwz.org/xscreensaver/"
+SRC_URI="
+	https://www.jwz.org/xscreensaver/${P}.tar.gz
+	logind-idle-hint? (
+		https://github.com/Flowdalic/xscreensaver/commit/59e7974c42dc08411c9af2a3a644a582c2116f46.patch ->
+			${PN}-6.06-logind-idle-hint.patch
+	)
+	systemd? (
+		https://github.com/Flowdalic/xscreensaver/commit/376b07ec76cfe1070f498773aaec8fd7030593af.patch ->
+			${PN}-6.07-xscreensaver.service-start-with-no-splash.patch
+	)
+"
+
+# Font license mapping for folder ./hacks/fonts/ as following:
+#   clacon.ttf       -- MIT
+#   gallant12x22.ttf -- unclear, hence dropped
+#   luximr.ttf       -- bh-luxi (package media-fonts/font-bh-ttf)
+#   OCRAStd.otf      -- unclear, hence dropped
+#   SpecialElite.ttf -- Apache-2.0
+LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama"
+REQUIRED_USE="
+	gles? ( !glx )
+	?? ( elogind systemd )
+	pam? ( locking )
+	logind-idle-hint? ( || ( elogind systemd ) )
+"
+
+COMMON_DEPEND="
+	>=dev-libs/libxml2-2.4.6
+	x11-apps/appres
+	x11-apps/xwininfo
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/libXxf86vm
+	elogind? ( sys-auth/elogind )
+	x11-libs/gdk-pixbuf-xlib
+	>=x11-libs/gdk-pixbuf-2.42.0:2
+	>=x11-libs/gtk+-3.0.0:3
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	locking? ( virtual/libcrypt:= )
+	new-login? (
+		gdm? ( gnome-base/gdm )
+		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
+	)
+	virtual/glu
+	virtual/opengl
+	pam? ( sys-libs/pam )
+	media-libs/libpng:=
+	systemd? ( >=sys-apps/systemd-221:= )
+	>=x11-libs/libXft-2.1.0
+	xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
+RDEPEND="
+	${COMMON_DEPEND}
+	media-gfx/fbida
+	perl? (
+		dev-lang/perl
+		dev-perl/libwww-perl
+		virtual/perl-Digest-MD5
+	)
+	selinux? ( sec-policy/selinux-xscreensaver )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-util/intltool
+	app-alternatives/bc
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.31-pragma.patch
+	"${FILESDIR}"/${PN}-6.01-gentoo.patch
+	"${FILESDIR}"/${PN}-6.07-gcc.patch
+	"${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch
+	"${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
+	"${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
+	"${FILESDIR}"/${PN}-6.01-configure-install_sh.patch
+	"${FILESDIR}"/${PN}-6.03-without-gl-configure.patch
+	"${FILESDIR}"/${PN}-6.05-remove-update-icon-cache.patch
+	"${FILESDIR}"/${PN}-6.05-r2-configure-exit-codes.patch
+	"${FILESDIR}"/${PN}-6.07-allow-no-pam.patch
+	"${FILESDIR}"/${PN}-6.07-fix-desktop-files.patch
+)
+
+DOCS=( README{,.hacking} )
+
+# see https://bugs.gentoo.org/898328
+QA_CONFIG_IMPL_DECL_SKIP=( getspnam_shadow )
+
+src_prepare() {
+	default
+
+	# bug #896440
+	mv po/ca.po po/ca.po.old || die
+	iconv -f ISO-8859-15 -t UTF-8 po/ca.po.old >po/ca.po || die
+
+	sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die
+
+	if use systemd; then
+		# Causes "Failed to enable unit: Cannot alias xscreensaver.service as org.jwz.xscreensaver."
+		# after "systemctl --user enable xscreensaver".
+		sed -i -e '/^Alias=org.jwz.xscreensaver.service/d' \
+			driver/xscreensaver.service.in || die
+
+		eapply "${DISTDIR}/${PN}-6.07-xscreensaver.service-start-with-no-splash.patch"
+	fi
+
+	strip-linguas -i po/
+	export ALL_LINGUAS="${LINGUAS}"
+
+	if use new-login && ! use gdm; then #392967
+		sed -i \
+			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
+			configure{,.ac} || die
+	fi
+
+	# We are patching driver/XScreenSaver.ad.in, so let's delete the
+	# header generated from it so that it gets back in sync during build:
+	rm driver/XScreenSaver_ad.h || die
+
+	if ! use offensive; then
+		sed -i \
+			-e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \
+			hacks/barcode.c || die
+		sed -i \
+			-e 's|erect penis|shuffle board|g' \
+			-e 's|flaccid penis|flaccid anchor|g' \
+			-e 's|vagina|engagement ring|g' \
+			-e 's|Penis|Shuttle|g' \
+			hacks/glx/glsnake.c || die
+		sed -i \
+			's| Stay.*fucking mask\.$||' \
+			hacks/glx/covid19.man \
+			hacks/config/covid19.xml || die
+		eapply "${FILESDIR}/xscreensaver-6.05-teach-handsy-some-manners.patch"
+	fi
+
+	if use logind-idle-hint; then
+		eapply "${DISTDIR}/${PN}-6.06-logind-idle-hint.patch"
+	fi
+
+	config_rpath_update "${S}"/config.rpath
+
+	# Must be eauto*re*conf, to force the rebuild
+	eautoreconf
+}
+
+src_configure() {
+	if use ppc || use ppc64; then
+		filter-flags -maltivec -mabi=altivec
+		append-flags -U__VEC__
+	fi
+
+	unset BC_ENV_ARGS #24568
+
+	# /proc/interrupts won't always have the keyboard bits needed
+	# Not clear this does anything in 6.03+(?) but let's keep it for now in case.
+	# (See also: configure argument)
+	export ac_cv_have_proc_interrupts=yes
+
+	# WARNING: This is NOT a normal autoconf script
+	# Some of the --with options are NOT standard, and expect "--with-X=no" rather than "--without-X"
+	ECONF_OPTS=(
+		$(use_enable locking)
+		$(use_with elogind)
+		--with-pixbuf
+		$(use_with gles)
+		$(use_with glx)
+		--with-gtk
+		$(use_with new-login login-manager)
+		$(use_with pam)
+		$(use_with suid setuid-hacks)
+		$(use_with systemd)
+		$(use_with xinerama xinerama-ext)
+		--with-jpeg=$(usex jpeg yes no)
+		--with-png=yes
+		--with-xft=yes
+		--with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults
+		--with-configdir="${EPREFIX}"/usr/share/${PN}/config
+		--with-dpms-ext
+		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN}
+		--with-proc-interrupts
+		--with-randr-ext
+		--with-text-file="${EPREFIX}"/etc/gentoo-release
+		--with-xdbe-ext
+		--with-xf86gamma-ext
+		--with-xf86vmode-ext
+		--with-xinput-ext
+		--with-xkb-ext
+		--with-xshm-ext
+		--without-gle
+		--without-kerberos
+		--without-motif
+		--with-proc-oom
+		--x-includes="${EPREFIX}"/usr/include
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
+	)
+	# WARNING: This is NOT a normal autoconf script
+	econf "${ECONF_OPTS[@]}"
+}
+
+src_compile() {
+	# stock target is "default", which is broken in some releases.
+	emake all
+}
+
+src_install() {
+	use pam && dodir /etc/pam.d/
+	emake install_prefix="${D}" DESTDIR="${D}" GTK_SHAREDIR="${installprefix}"/usr/share/xscreensaver install
+
+	if use fonts; then
+		# Do not install fonts with unclear licensing
+		rm -v "${ED}${FONTDIR}"/gallant12x22.ttf || die
+
+		# Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf)
+		rm -v "${ED}${FONTDIR}"/luximr.ttf || die
+
+		font_xfont_config
+	else
+		rm -rfv "${ED}${FONTDIR}" || die #812473
+	fi
+
+	einstalldocs
+
+	if use pam; then
+		fperms 755 /usr/bin/${PN}
+		pamd_mimic_system ${PN} auth
+	fi
+
+	if use systemd; then
+		systemd_douserunit "${ED}/usr/share/${PN}/xscreensaver.service"
+	fi
+	# Makefile installs xscreensaver.service regardless of
+	# --without-systemd, and if USE=systemd, we will have installed the
+	# unit file already.
+	rm "${ED}/usr/share/${PN}/xscreensaver.service" || die
+
+	# bug #885989
+	fperms 4755 /usr/$(get_libdir)/misc/xscreensaver/xscreensaver-auth
+}
+
+pkg_postinst() {
+	use fonts && font_pkg_postinst
+
+	# bug #811885
+	if ! use glx; then
+		elog "Enable USE='glx' if OpenGL screensavers are crashing."
+	fi
+
+	optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi
+	optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi
+	optfeature 'Truetype font Luxi Mono' media-fonts/font-bh-ttf
+
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	use fonts && font_pkg_postrm
+	xdg_icon_cache_update
+}