x11-misc/xscreensaver: add 6.07

Closes: https://bugs.gentoo.org/894700
Closes: https://bugs.gentoo.org/896440
Closes: https://bugs.gentoo.org/908509
Closes: https://bugs.gentoo.org/912075

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
Closes: https://github.com/gentoo/gentoo/pull/32628
Signed-off-by: Florian Schmaus <flow@gentoo.org>

6 files changed, 352 insertions, 0 deletions

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 890c5ea07d5b..a615956c98d6 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,3 +1,4 @@
 DIST xscreensaver-6.05.1.tar.gz 26110057 BLAKE2B 97c16c9f0b2a0b4d00ddccd711b921ca683bd233bc3d07ecad38b68ff94b149a20512246dd6bae052323f00b1b433f56469c5638a031cbc65b61c2b84a0180e3 SHA512 c659a769ff71020b9f96b7e707bd1bcc667eb304179305d56b1be45eed095d650a8aa019890a0c5d444672f9dd68516c99c53b0df94cd96196d7f30a24b987e3
 DIST xscreensaver-6.06-logind-idle-hint.patch 4036 BLAKE2B 48c2766ff5879b77f521d17f08452c84a9c926fabba932a02d02615808f6f2503ed2be4bbfd71f21152ba833c7f4cc0d672cdc219b82729963d6d357c6198682 SHA512 fd9848843c43a5eb07007e5cca21ad1517cce1e3ebecd9d678bb6287b9b7f80eee0751b5789f2ed9fb5e0cefa2430ac9d9657aade724d70c6457cce3df1f6ea3
 DIST xscreensaver-6.06.tar.gz 26334374 BLAKE2B f15a439430bbca0852926c15716d3c4b22148d8c36d60b18ab033454d4df0d981400029b32e1f30a061592273deb648453db91813994b9bc4d6c66a61774a5d1 SHA512 988e30d422ef985ac348c275e098ddfe1ee034a2e916c91690ee2836c908801c1e017e22d828aca981b0f8bfc5491cd83ab7c45aabc155ba5013df8b149cbcb5
+DIST xscreensaver-6.07.tar.gz 26365057 BLAKE2B b0fc24e34713dd5591cff2ff871ec05deae089d7d76fe1239dd59ec1addf97eb764a583d01685953ae6409a7193ca97bc201a20dcf86d5244cf898e4eb9b1221 SHA512 abbf75faa49bb23d35985a7bf269891d168c87fe8939ad5acf6857398dfb056815d79dcf39bba9a33808e2717a47635fa84282c03ed9efeeeb449763253179a5
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.07-allow-no-pam.patch b/x11-misc/xscreensaver/files/xscreensaver-6.07-allow-no-pam.patch
new file mode 100644
index 000000000000..dd2ea676d443
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.07-allow-no-pam.patch
@@ -0,0 +1,18 @@
+The use flag combination -pam +locking is not possible with that configure.ac.
+Having a pam conf and a /etc/pam.d could be remnants from a previous installation
+of pam and don't tell us for sure that the user does not want this.
+
+Bug: https://bugs.gentoo.org/908509
+
+# Pascal Jäger <pascal.jaeger@leimstift.de>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -4971,7 +4971,6 @@ elif test "$have_pam" = no -a "$enable_locking" = yes ; then
+   if test -d /etc/pam.d -o -f /etc/pam.conf ; then
+     warn  "Your system seems to have PAM, but PAM is not being used."
+     warn2 "That is probably not going to work out well."
+-    CONF_STATUS=1
+   fi
+ fi
+ 
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.07-fix-desktop-files.patch b/x11-misc/xscreensaver/files/xscreensaver-6.07-fix-desktop-files.patch
new file mode 100644
index 000000000000..07474aec689b
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.07-fix-desktop-files.patch
@@ -0,0 +1,31 @@
+* xscreensaver-settings.desktop: error: value item "Screensaver" in key
+* "Categories" in group "Desktop Entry" is a reserved category, so a
+* "OnlyShowIn" key must be included
+* xscreensaver.desktop: error: value item "Screensaver" in key "Categories"
+* in group "Desktop Entry" is a reserved category, so a "OnlyShowIn" key
+* must be included
+
+We just remove the category Screensaver then. 
+
+Bug: https://bugs.gentoo.org/894700
+
+# Pascal Jäger <pascal.jaeger@leimstift.de>
+
+--- a/driver/xscreensaver-settings.desktop.in
++++ b/driver/xscreensaver-settings.desktop.in
+@@ -5,5 +5,5 @@ Icon=xscreensaver
+ _Name=XScreenSaver Settings
+ _Comment=Change screensaver properties
+ Type=Application
+-Categories=Settings;DesktopSettings;Screensaver;Security;GNOME;GTK;KDE;Motif;Qt;X-GNOME-Settings-Panel;X-GNOME-SystemSettings;X-Unity-Settings-Panel;X-XFCE-SettingsDialog;X-XFCE-SystemSettings
++Categories=Settings;DesktopSettings;Security;GNOME;GTK;KDE;Motif;Qt;X-GNOME-Settings-Panel;X-GNOME-SystemSettings;X-Unity-Settings-Panel;X-XFCE-SettingsDialog;X-XFCE-SystemSettings
+ Terminal=false
+--- a/driver/xscreensaver.desktop.in
++++ b/driver/xscreensaver.desktop.in
+@@ -5,5 +5,5 @@ Icon=xscreensaver
+ _Name=XScreenSaver
+ _Comment=XScreenSaver daemon: screen saver and locker
+ Type=Application
+-Categories=Screensaver;Security;GNOME;GTK;KDE;Motif;Qt
++Categories=Security;GNOME;GTK;KDE;Motif;Qt
+ Terminal=false
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.07-gcc.patch b/x11-misc/xscreensaver/files/xscreensaver-6.07-gcc.patch
new file mode 100644
index 000000000000..05c0c014f412
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.07-gcc.patch
@@ -0,0 +1,24 @@
+We want it to be possible to bulid with clang, so also check against that.
+
+# Pascal Jäger <pascal.jaeger@leimstift.de>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -303,7 +303,7 @@ done
+ 
+ AC_DEFUN([AC_CHECK_GCC_ARG],
+  [if test -n "$GCC"; then
+-   AC_CACHE_CHECK([whether gcc accepts [$2]],
++   AC_CACHE_CHECK([whether $[$CC] accepts [$2]],
+      ac_cv_gcc_accepts_[$1],
+     [rm -rf conftest.$ac_ext
+      touch conftest.$ac_ext
+@@ -316,7 +316,7 @@ AC_DEFUN([AC_CHECK_GCC_ARG],
+      # earlier diagnostics".
+      #
+      without_no=`echo $2 | sed s/Wno-/W/`
+-     if ( ( gcc -c $without_no conftest.$ac_ext -o/dev/null >/dev/null ) \
++     if ( ( $CC -c $without_no conftest.$ac_ext -o/dev/null >/dev/null ) \
+           2>&1 | \
+           grep unrecognized >/dev/null ); then
+        ac_cv_gcc_accepts_[$1]=no
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.07-service-remove-Alias-org.jwz.xscreensav.patch b/x11-misc/xscreensaver/files/xscreensaver-6.07-service-remove-Alias-org.jwz.xscreensav.patch
new file mode 100644
index 000000000000..988ab22bff78
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.07-service-remove-Alias-org.jwz.xscreensav.patch
@@ -0,0 +1,13 @@
+$ systemctl --user enable xscreensaver
+Failed to enable unit: Cannot alias xscreensaver.service as org.jwz.xscreensaver.
+
+# Pascal Jäger <pascal.jaeger@leimstift.de>
+
+--- a/driver/xscreensaver.service.in
++++ b/driver/xscreensaver.service.in
+@@ -14,5 +14,4 @@ Restart=on-failure
+ OOMScoreAdjust=-1000
+ 
+ [Install]
+-Alias=org.jwz.xscreensaver.service
+ WantedBy=graphical-session.target
diff --git a/x11-misc/xscreensaver/xscreensaver-6.07.ebuild b/x11-misc/xscreensaver/xscreensaver-6.07.ebuild
new file mode 100644
index 000000000000..54e9257d24bc
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-6.07.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2023 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
+	)
+"
+
+# 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 ~ia64 ~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
+	sys-devel/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.05-get-dirs-from-gtk3.0-in-configure.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
+	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,OCRAStd.otf} || 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
+}