[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, profiles/base/

[Sam James]

commit:     04d2168265f0c2cbd77529e53cb4d1860a7ab28b
Author:     Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Sun Oct 16 23:23:15 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 09:38:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04d21682

x11-misc/xscreensaver: drop old unstable versions

Last stable version 6.01 will be kept around until 6.05 is stabilized

Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>
Closes: https://github.com/gentoo/gentoo/pull/27807
Signed-off-by: Sam James <sam <AT> gentoo.org>

 profiles/base/package.use.force                   |   4 -
 x11-misc/xscreensaver/Manifest                    |   3 -
 x11-misc/xscreensaver/xscreensaver-6.02-r1.ebuild | 239 ---------------------
 x11-misc/xscreensaver/xscreensaver-6.03.ebuild    | 247 ----------------------
 x11-misc/xscreensaver/xscreensaver-6.04.ebuild    | 247 ----------------------
 5 files changed, 740 deletions(-)

diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 7393b9660566..f19dbdaf80c5 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -21,10 +21,6 @@ sys-devel/clang pie
 dev-java/openjdk:11 system-bootstrap
 dev-java/openjdk:17 system-bootstrap
 
-# Joonas Niilola <juippis@g.o> (2022-01-08)
-# -xft broken, investigate in bug #830777
-~x11-misc/xscreensaver-6.02 xft
-
 # Michał Górny <mgorny@g.o> (2021-11-04)
 # Enable all LLVM targets unconditionally.  Unfortunately, disabling
 # targets tend to break reverse dependencies (e.g. Rust) and we are yet

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index fd4388280ff6..4a0d19e2f771 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,5 +1,2 @@
 DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052 SHA512 3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a
-DIST xscreensaver-6.02.tar.gz 22672643 BLAKE2B 2d931fe93230e8c7344abd9180e26ab8775f82604e6f4804c82821c486203be567708cf50f7a11276a6b39df493fe5652b4198765ecb3bc5afc8cbc5a01d4801 SHA512 2291ec6ca2d2a24dae975f7f3a8e1733c06f289eb74955db5b3344c7ddcc1d72f82d380df984ef9199f2ed7ab8a7bc920da57d98f589ae5fd1cee082755ba1ff
-DIST xscreensaver-6.03.tar.gz 25703584 BLAKE2B 1276e469e8f4116fac5d434aeacbc16ff8243b56095d39ff4fcbb390abad935e70d308d2a3ecfebaa453f2dd19944ecc2edb18a229248c02f2e3997f30436bce SHA512 4aa30824c972a73dc09aeba478cad074f273839a4c7641cddd292da38fc75db10a3f6243cbe8619c5e39cad54c27d33e1e271dfed167458faa7747fb0a090630
-DIST xscreensaver-6.04.tar.gz 26112437 BLAKE2B 42411d5f63a99d4aaccbc3bc34f8c31a1f25f1806eaf513a1ba59c2f24722e27fa2a7b1970c82a591502627224c4b4269176bda3475aba58bb945d5cd9a9464b SHA512 7e8f01853b3d9252ce0120894db7dd4fa3cd19114602a09aa770ec750e2f3742585ca4daf19b009e97386f8c0e3cc89330fe760148c6388f41de8cc1f48f8071
 DIST xscreensaver-6.05.1.tar.gz 26110057 BLAKE2B 97c16c9f0b2a0b4d00ddccd711b921ca683bd233bc3d07ecad38b68ff94b149a20512246dd6bae052323f00b1b433f56469c5638a031cbc65b61c2b84a0180e3 SHA512 c659a769ff71020b9f96b7e707bd1bcc667eb304179305d56b1be45eed095d650a8aa019890a0c5d444672f9dd68516c99c53b0df94cd96196d7f30a24b987e3

diff --git a/x11-misc/xscreensaver/xscreensaver-6.02-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-6.02-r1.ebuild
deleted file mode 100644
index b7f191412b75..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-6.02-r1.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic font optfeature pam strip-linguas
-
-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"
-
-# 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 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login offensive opengl pam +perl +png selinux suid systemd +xft xinerama"
-REQUIRED_USE="
-	gdk-pixbuf? ( gtk )
-	gles? ( !glx opengl )
-	glx? ( opengl )
-	gtk? ( png )
-	opengl? ( png )
-	?? ( elogind systemd )
-"
-
-COMMON_DEPEND="
-	dev-libs/libxml2
-	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 )
-	gdk-pixbuf? (
-		x11-libs/gdk-pixbuf-xlib
-		>=x11-libs/gdk-pixbuf-2.42.0:2
-	)
-	gtk? ( x11-libs/gtk+:2 )
-	jpeg? ( virtual/jpeg:0 )
-	locking? ( virtual/libcrypt:= )
-	new-login? (
-		gdm? ( gnome-base/gdm )
-		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
-	)
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	pam? ( sys-libs/pam )
-	png? ( media-libs/libpng:= )
-	systemd? ( >=sys-apps/systemd-221 )
-	xft? ( x11-libs/libXft )
-	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}-6.01-interix.patch
-	"${FILESDIR}"/${PN}-5.31-pragma.patch
-	"${FILESDIR}"/${PN}-6.01-gentoo.patch
-	"${FILESDIR}"/${PN}-5.45-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-gtk-detection.patch
-	"${FILESDIR}"/${PN}-6.01-configure-install_sh.patch
-)
-
-DOCS=( README{,.hacking} )
-
-src_prepare() {
-	default
-
-	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
-	fi
-
-	# 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
-
-	# Works similarly to -Werror,
-	# https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wimplicit-function-declaration
-	filter-flags -pedantic-errors
-
-	# 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)
-		$(use_with gdk-pixbuf pixbuf)
-		$(use_with gles)
-		$(use_with glx)
-		$(use_with gtk)
-		$(use_with new-login login-manager)
-		$(use_with opengl gl)
-		$(use_with pam)
-		$(use_with suid setuid-hacks)
-		$(use_with systemd)
-		$(use_with xinerama xinerama-ext)
-		--with-jpeg=$(usex jpeg yes no)
-		--with-png=$(usex png yes no)
-		--with-xft=$(usex xft yes no)
-		--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}" 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 -v "${ED}${FONTDIR}"/*.{ttf,otf} || die
-		rmdir -v "${ED}${FONTDIR}" || die #812473
-	fi
-
-	einstalldocs
-
-	if use pam; then
-		fperms 755 /usr/bin/${PN}
-		pamd_mimic_system ${PN} auth
-	fi
-
-	# bugs #809599, #828869
-	if ! use gtk; then
-		rm "${ED}/usr/bin/xscreensaver-demo" || die
-	fi
-}
-
-pkg_postinst() {
-	use fonts && font_pkg_postinst
-
-	# bug #811885
-	if ! use glx && use opengl; 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
-}
-
-pkg_postrm() {
-	use fonts && font_pkg_postrm
-}

diff --git a/x11-misc/xscreensaver/xscreensaver-6.03.ebuild b/x11-misc/xscreensaver/xscreensaver-6.03.ebuild
deleted file mode 100644
index c56932d1468c..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-6.03.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic font optfeature pam strip-linguas
-
-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"
-
-# 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 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login offensive opengl pam +perl +png selinux suid systemd +xft xinerama"
-REQUIRED_USE="
-	gdk-pixbuf? ( gtk )
-	gles? ( !glx opengl )
-	glx? ( opengl )
-	gtk? ( png )
-	opengl? ( png )
-	?? ( elogind systemd )
-"
-
-COMMON_DEPEND="
-	dev-libs/libxml2
-	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 )
-	gdk-pixbuf? (
-		x11-libs/gdk-pixbuf-xlib
-		>=x11-libs/gdk-pixbuf-2.42.0:2
-	)
-	gtk? ( x11-libs/gtk+:2 )
-	jpeg? ( virtual/jpeg:0 )
-	locking? ( virtual/libcrypt:= )
-	new-login? (
-		gdm? ( gnome-base/gdm )
-		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
-	)
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	pam? ( sys-libs/pam )
-	png? ( media-libs/libpng:= )
-	systemd? ( >=sys-apps/systemd-221 )
-	xft? ( x11-libs/libXft )
-	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}-6.01-interix.patch
-	"${FILESDIR}"/${PN}-5.31-pragma.patch
-	"${FILESDIR}"/${PN}-6.01-gentoo.patch
-	"${FILESDIR}"/${PN}-5.45-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-gtk-detection.patch
-	"${FILESDIR}"/${PN}-6.01-configure-install_sh.patch
-	"${FILESDIR}"/${PN}-6.03-without-gl-configure.patch
-)
-
-DOCS=( README{,.hacking} )
-
-src_prepare() {
-	default
-
-	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
-	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
-
-	# Works similarly to -Werror,
-	# https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wimplicit-function-declaration
-	filter-flags -pedantic-errors
-
-	# /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)
-		$(use_with gdk-pixbuf pixbuf)
-		$(use_with gles)
-		$(use_with glx)
-		$(use_with gtk)
-		$(use_with new-login login-manager)
-		$(use_with opengl gl)
-		$(use_with pam)
-		$(use_with suid setuid-hacks)
-		$(use_with systemd)
-		$(use_with xinerama xinerama-ext)
-		--with-jpeg=$(usex jpeg yes no)
-		--with-png=$(usex png yes no)
-		--with-xft=$(usex xft yes no)
-		--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}" 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 -v "${ED}${FONTDIR}"/*.{ttf,otf} || die
-		rmdir -v "${ED}${FONTDIR}" || die #812473
-	fi
-
-	einstalldocs
-
-	if use pam; then
-		fperms 755 /usr/bin/${PN}
-		pamd_mimic_system ${PN} auth
-	fi
-
-	# bugs #809599, #828869
-	if ! use gtk; then
-		rm "${ED}/usr/bin/xscreensaver-demo" || die
-	fi
-}
-
-pkg_postinst() {
-	use fonts && font_pkg_postinst
-
-	# bug #811885
-	if ! use glx && use opengl; 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
-}
-
-pkg_postrm() {
-	use fonts && font_pkg_postrm
-}

diff --git a/x11-misc/xscreensaver/xscreensaver-6.04.ebuild b/x11-misc/xscreensaver/xscreensaver-6.04.ebuild
deleted file mode 100644
index 300a5d4c25c8..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-6.04.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2022 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
-
-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"
-
-# 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 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login offensive opengl pam +perl +png selinux suid systemd +xft xinerama"
-REQUIRED_USE="
-	gdk-pixbuf? ( gtk )
-	gles? ( !glx opengl )
-	glx? ( opengl )
-	gtk? ( png )
-	opengl? ( png )
-	?? ( elogind systemd )
-"
-
-COMMON_DEPEND="
-	dev-libs/libxml2
-	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 )
-	gdk-pixbuf? (
-		x11-libs/gdk-pixbuf-xlib
-		>=x11-libs/gdk-pixbuf-2.42.0:2
-	)
-	gtk? ( x11-libs/gtk+:2 )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	locking? ( virtual/libcrypt:= )
-	new-login? (
-		gdm? ( gnome-base/gdm )
-		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
-	)
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	pam? ( sys-libs/pam )
-	png? ( media-libs/libpng:= )
-	systemd? ( >=sys-apps/systemd-221 )
-	xft? ( x11-libs/libXft )
-	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}-6.01-interix.patch
-	"${FILESDIR}"/${PN}-5.31-pragma.patch
-	"${FILESDIR}"/${PN}-6.01-gentoo.patch
-	"${FILESDIR}"/${PN}-5.45-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-gtk-detection.patch
-	"${FILESDIR}"/${PN}-6.01-configure-install_sh.patch
-	"${FILESDIR}"/${PN}-6.03-without-gl-configure.patch
-)
-
-DOCS=( README{,.hacking} )
-
-src_prepare() {
-	default
-
-	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
-	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
-
-	# Works similarly to -Werror,
-	# https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wimplicit-function-declaration
-	filter-flags -pedantic-errors
-
-	# /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)
-		$(use_with gdk-pixbuf pixbuf)
-		$(use_with gles)
-		$(use_with glx)
-		$(use_with gtk)
-		$(use_with new-login login-manager)
-		$(use_with opengl gl)
-		$(use_with pam)
-		$(use_with suid setuid-hacks)
-		$(use_with systemd)
-		$(use_with xinerama xinerama-ext)
-		--with-jpeg=$(usex jpeg yes no)
-		--with-png=$(usex png yes no)
-		--with-xft=$(usex xft yes no)
-		--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}" 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 -v "${ED}${FONTDIR}"/*.{ttf,otf} || die
-		rmdir -v "${ED}${FONTDIR}" || die #812473
-	fi
-
-	einstalldocs
-
-	if use pam; then
-		fperms 755 /usr/bin/${PN}
-		pamd_mimic_system ${PN} auth
-	fi
-
-	# bugs #809599, #828869
-	if ! use gtk; then
-		rm "${ED}/usr/bin/xscreensaver-demo" || die
-	fi
-}
-
-pkg_postinst() {
-	use fonts && font_pkg_postinst
-
-	# bug #811885
-	if ! use glx && use opengl; 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
-}
-
-pkg_postrm() {
-	use fonts && font_pkg_postrm
-}