summaryrefslogtreecommitdiff
path: root/x11-misc/xscreensaver
diff options
context:
space:
mode:
Diffstat (limited to 'x11-misc/xscreensaver')
-rw-r--r--x11-misc/xscreensaver/Manifest6
-rw-r--r--x11-misc/xscreensaver/xscreensaver-5.45-r5.ebuild169
-rw-r--r--x11-misc/xscreensaver/xscreensaver-5.45-r6.ebuild173
-rw-r--r--x11-misc/xscreensaver/xscreensaver-6.01-r1.ebuild200
-rw-r--r--x11-misc/xscreensaver/xscreensaver-6.01-r2.ebuild202
-rw-r--r--x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild2
6 files changed, 2 insertions, 750 deletions
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index de6c89c94a8a..f3e295e7efba 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -16,9 +16,5 @@ AUX xscreensaver-6.01-without-gl-makefile.patch 862 BLAKE2B 9762e84d535b4e913c0e
DIST xscreensaver-5.45.tar.gz 27729147 BLAKE2B 132301dd6645a21e04cd6f8b2f85e4b2454f5281e8cca3c5a89d50e16fee7f7e79d0b323e639bf7a18ddbcae0b4c8e7e5c9a84409bfe9f57253062cdaab30880 SHA512 1b21418c591fd99f3caaea9d31ca49abdb94b8e89f33e661c464299bc81bf4ff13fd99a187070fce19b3843c28a1f2a2a7b94bd6949d2b3b06bba730cae59f14
DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052 SHA512 3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a
EBUILD xscreensaver-5.45-r4.ebuild 4160 BLAKE2B fdcff85c0e4754ca0363275cf395c132f612b1e7372ae88d21474d077c5c94c9e6aadcd6f214f3d1bb4f8f544a801c96f2d555c9eabc79b5adf925f9743d60f3 SHA512 4f2a0a833641abc2546088d87fcb6094b6d19b5857b840fdb07301135f45b856e95ead0dd466cfc12f9e84197ddfaae6e76b406dada3328a225432d376bffe79
-EBUILD xscreensaver-5.45-r5.ebuild 4159 BLAKE2B 479874f5e3823dbf1b8570d8285a868d7296935d3205a3d090f8ba2bef4491590ddaf7d838fccaf5f1f513aa7de8f09cc7ac62e25f4c9dd13ed5974e5c32b5b0 SHA512 c57b913d19031492a487f22a998fcbc790886cc7b96d238e84e16d57acc0305f587ae03bc9292b9f499c3ebd326ab51de2b5614d0519785b53708dfe5abd1662
-EBUILD xscreensaver-5.45-r6.ebuild 4264 BLAKE2B 2b8226f3b3695ded5884327e557a8bc9741a78ead7a526a5d7a2bea3fd2ac157f9c741802f1352ea6cdf130d5a3c3a147ecf6c934cd74099f336b92eea75c5ef SHA512 b670776352e96fc33ca2223e2f5d164e179015abc52afdd303c2f5782ac983ed60d12f7e1582e3d9bef05d4ce508a2e3ccf2fb586b7435873510c2b3e1cf8d21
-EBUILD xscreensaver-6.01-r1.ebuild 5084 BLAKE2B 3d62384d1c574228b0237effd608229d4b2d740a0d886320eb49226857372a60781f44a84e547cdabaf90863501ea6f10994b5e19b8837c54373d7fa9ff1c670 SHA512 92cd7a2adbf50dbdc474e10201ee04e699261d29759edf25c22e987608578df7916562c872b48384f579accd7bd0ba4d6eed1840ef6b09eaabfc34cee40d0b43
-EBUILD xscreensaver-6.01-r2.ebuild 5178 BLAKE2B 980f127f3238072282a7441308f9814860bd613bc5e530c8aeb7a378d2b0f6b983003e5667b5416542402359cfd37b0aadcd0b6b21e2b3ad3f21364c52909842 SHA512 fb7a433a13ec93c90f59dca6fa4bec80227a7c7e284f2d70c181bb8f50e24439ab5c3fddadad49c0edea51e853c475cff7a023552294993866aae27ee67f52d0
-EBUILD xscreensaver-6.01-r3.ebuild 5847 BLAKE2B 9675cdf7ec5644fed780c848d2e3e36ca237b3f376979288f480b928b2d0ede9833169f74103d53616ea729570aa3c0af6d88b718e318673a1dfab7fcca0efb7 SHA512 88997efcb4840c76671a7ef4d715a8a85cd41ecd2185d6326a8493f9f835ec5e641dc50672281cb3290d9c2c784bc7216da7c71dabc4c149908533dbf70d3617
+EBUILD xscreensaver-6.01-r3.ebuild 5842 BLAKE2B 88a2df9f0043523154eab4783fdf239a56aa44b2bd26917fef1cc89580537acc9f7cc31bab5ba02fd07c3c588d79c74a884dd7e8fb8d34c04816b1bd2c0ee95a SHA512 4f08e5c41aefc38252bdb3e9a4aef1d7d04178813b90196da2a5687b9853bd71c50d018d262505fdad846d25ce1cf09d9a0967c21a763557a6f21545be96158a
MISC metadata.xml 887 BLAKE2B c24cdade56b44dad279fd6353c3e42f5c9992d2328a3aa29e003eee4d4051fc2505b35c01031041cc87cd033a93796e05aec9bf9379329f5c1a315b2702d295c SHA512 5b62ff9b4fae658f906a040ccea03f9df0fca1b5b6b5a5c5a47c7649de814f0ec443c81baa80d7d089b295ffb9bf15665ff47374e2be166d02fbbee57dba55b1
diff --git a/x11-misc/xscreensaver/xscreensaver-5.45-r5.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45-r5.ebuild
deleted file mode 100644
index 5f2c0843d64b..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.45-r5.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic multilib 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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama"
-REQUIRED_USE="
- gdk-pixbuf? ( gtk )
-"
-
-COMMON_DEPEND="
- dev-libs/libxml2
- media-libs/netpbm
- virtual/libcrypt:=
- x11-apps/appres
- x11-apps/xwininfo
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXft
- x11-libs/libXi
- x11-libs/libXmu
- x11-libs/libXrandr
- x11-libs/libXt
- x11-libs/libXxf86vm
- caps? ( sys-libs/libcap )
- gdk-pixbuf? (
- x11-libs/gdk-pixbuf-xlib
- >=x11-libs/gdk-pixbuf-2.42.0:2
- )
- gtk? ( x11-libs/gtk+:2 )
- jpeg? ( virtual/jpeg:0 )
- new-login? (
- gdm? ( gnome-base/gdm )
- !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
- )
- opengl? (
- virtual/glu
- virtual/opengl
- )
- pam? ( sys-libs/pam )
- systemd? ( >=sys-apps/systemd-221 )
- 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}
- dev-util/intltool
- sys-devel/bc
- sys-devel/gettext
- virtual/pkgconfig
- x11-base/xorg-proto
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-5.45-remove-libXxf86misc-dep.patch
- "${FILESDIR}"/${PN}-5.45-interix.patch
- "${FILESDIR}"/${PN}-5.31-pragma.patch
- "${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch
- "${FILESDIR}"/${PN}-5.44-gentoo.patch
- "${FILESDIR}"/${PN}-5.45-gcc.patch
- "${FILESDIR}"/${PN}-5.45-configure.ac-sandbox.patch
- "${FILESDIR}"/${P}-cve-2021-34557.patch # bug 794475
-)
-
-src_prepare() {
- 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
-
- default
-
- 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 || break
- fi
-
- eapply_user
-
- eautoconf
- eautoheader
-}
-
-src_configure() {
- if use ppc || use ppc64; then
- filter-flags -maltivec -mabi=altivec
- append-flags -U__VEC__
- fi
-
- unset BC_ENV_ARGS #24568
- export RPM_PACKAGE_VERSION=no #368025
-
- econf \
- $(use_enable locking) \
- $(use_with caps setcap-hacks) \
- $(use_with gdk-pixbuf pixbuf) \
- $(use_with gtk) \
- $(use_with jpeg) \
- $(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-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-xshm-ext \
- --without-gle \
- --without-kerberos \
- --without-motif \
- --x-includes="${EPREFIX}"/usr/include \
- --x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
- emake install_prefix="${D}" install
-
- dodoc README{,.hacking}
-
- if use pam; then
- fperms 755 /usr/bin/${PN}
- pamd_mimic_system ${PN} auth
- fi
-
- rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}
-
-pkg_postinst() {
- optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi
- optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-5.45-r6.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45-r6.ebuild
deleted file mode 100644
index 55cef2250346..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.45-r6.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic multilib 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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama"
-REQUIRED_USE="
- gdk-pixbuf? ( gtk )
-"
-
-COMMON_DEPEND="
- dev-libs/libxml2
- media-libs/netpbm
- virtual/libcrypt:=
- x11-apps/appres
- x11-apps/xwininfo
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXft
- x11-libs/libXi
- x11-libs/libXmu
- x11-libs/libXrandr
- x11-libs/libXt
- x11-libs/libXxf86vm
- caps? ( sys-libs/libcap )
- gdk-pixbuf? (
- x11-libs/gdk-pixbuf-xlib
- >=x11-libs/gdk-pixbuf-2.42.0:2
- )
- gtk? ( x11-libs/gtk+:2 )
- jpeg? ( virtual/jpeg:0 )
- new-login? (
- gdm? ( gnome-base/gdm )
- !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
- )
- opengl? (
- virtual/glu
- virtual/opengl
- )
- pam? ( sys-libs/pam )
- systemd? ( >=sys-apps/systemd-221 )
- 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}
- dev-util/intltool
- sys-devel/bc
- sys-devel/gettext
- virtual/pkgconfig
- x11-base/xorg-proto
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-5.45-remove-libXxf86misc-dep.patch
- "${FILESDIR}"/${PN}-5.45-interix.patch
- "${FILESDIR}"/${PN}-5.31-pragma.patch
- "${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch
- "${FILESDIR}"/${PN}-5.44-gentoo.patch
- "${FILESDIR}"/${PN}-5.45-gcc.patch
- "${FILESDIR}"/${PN}-5.45-configure.ac-sandbox.patch
- "${FILESDIR}"/${P}-cve-2021-34557.patch # bug 794475
-)
-
-src_prepare() {
- 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
-
- default
-
- 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
-
- eapply_user
-
- eautoconf
- eautoheader
-}
-
-src_configure() {
- if use ppc || use ppc64; then
- filter-flags -maltivec -mabi=altivec
- append-flags -U__VEC__
- fi
-
- unset BC_ENV_ARGS #24568
- export RPM_PACKAGE_VERSION=no #368025
-
- econf \
- $(use_enable locking) \
- $(use_with caps setcap-hacks) \
- $(use_with gdk-pixbuf pixbuf) \
- $(use_with gtk) \
- $(use_with jpeg) \
- $(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-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-xshm-ext \
- --without-gle \
- --without-kerberos \
- --without-motif \
- --x-includes="${EPREFIX}"/usr/include \
- --x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
- emake install_prefix="${D}" install
-
- dodoc README{,.hacking}
-
- if use pam; then
- fperms 755 /usr/bin/${PN}
- pamd_mimic_system ${PN} auth
- fi
-
- rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}
-
-pkg_postinst() {
- optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi
- optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-6.01-r1.ebuild
deleted file mode 100644
index dc3965228e89..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-6.01-r1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic font multilib optfeature pam
-
-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 +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama"
-REQUIRED_USE="
- gdk-pixbuf? ( gtk )
- elogind? ( !systemd )
-"
-
-COMMON_DEPEND="
- dev-libs/libxml2
- media-libs/netpbm
- virtual/libcrypt:=
- x11-apps/appres
- x11-apps/xwininfo
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXft
- x11-libs/libXi
- x11-libs/libXmu
- 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 )
- new-login? (
- gdm? ( gnome-base/gdm )
- !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
- )
- opengl? (
- virtual/glu
- virtual/opengl
- )
- pam? ( sys-libs/pam )
- systemd? ( >=sys-apps/systemd-221 )
- 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}
- dev-util/intltool
- sys-devel/bc
- sys-devel/gettext
- virtual/pkgconfig
- x11-base/xorg-proto
-"
-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
-)
-
-src_prepare() {
- 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
-
- default
-
- # 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
-
- eapply_user
-
- eautoconf
- eautoheader
-}
-
-src_configure() {
- if use ppc || use ppc64; then
- filter-flags -maltivec -mabi=altivec
- append-flags -U__VEC__
- fi
-
- unset BC_ENV_ARGS #24568
-
- econf \
- $(use_enable locking) \
- $(use_with elogind) \
- $(use_with gdk-pixbuf pixbuf) \
- $(use_with gtk) \
- $(use_with jpeg) \
- $(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-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-xshm-ext \
- --without-gle \
- --without-kerberos \
- --without-motif \
- --x-includes="${EPREFIX}"/usr/include \
- --x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
- emake install_prefix="${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
- fi
-
- dodoc README{,.hacking}
-
- if use pam; then
- fperms 755 /usr/bin/${PN}
- pamd_mimic_system ${PN} auth
- fi
-
- rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}
-
-pkg_postinst() {
- use fonts && font_pkg_postinst
-
- 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.01-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.01-r2.ebuild
deleted file mode 100644
index 628041e77c80..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-6.01-r2.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic font multilib optfeature pam
-
-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 +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama"
-REQUIRED_USE="
- gdk-pixbuf? ( gtk )
- elogind? ( !systemd )
-"
-
-COMMON_DEPEND="
- dev-libs/libxml2
- media-libs/netpbm
- virtual/libcrypt:=
- x11-apps/appres
- x11-apps/xwininfo
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXft
- x11-libs/libXi
- x11-libs/libXmu
- 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 )
- new-login? (
- gdm? ( gnome-base/gdm )
- !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
- )
- opengl? (
- virtual/glu
- virtual/opengl
- )
- pam? ( sys-libs/pam )
- systemd? ( >=sys-apps/systemd-221 )
- 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}
- dev-util/intltool
- sys-devel/bc
- sys-devel/gettext
- virtual/pkgconfig
- x11-base/xorg-proto
-"
-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
-)
-
-src_prepare() {
- 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
-
- default
-
- # 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
-
- eapply_user
-
- eautoconf
- eautoheader
-}
-
-src_configure() {
- if use ppc || use ppc64; then
- filter-flags -maltivec -mabi=altivec
- append-flags -U__VEC__
- fi
-
- unset BC_ENV_ARGS #24568
-
- econf \
- $(use_enable locking) \
- $(use_with elogind) \
- $(use_with gdk-pixbuf pixbuf) \
- $(use_with gtk) \
- $(use_with jpeg) \
- $(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-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-xshm-ext \
- --without-gle \
- --without-kerberos \
- --without-motif \
- --x-includes="${EPREFIX}"/usr/include \
- --x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
- emake install_prefix="${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
- fi
-
- dodoc README{,.hacking}
-
- if use pam; then
- fperms 755 /usr/bin/${PN}
- pamd_mimic_system ${PN} auth
- fi
-
- rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}
-
-pkg_postinst() {
- use fonts && font_pkg_postinst
-
- 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.01-r3.ebuild b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
index 609e6c132c7f..7f884228e1ae 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
# 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="elogind fonts +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl +png selinux suid systemd +xft xinerama"
REQUIRED_USE="
gdk-pixbuf? ( gtk )