commit: dedfd970f095f3775e8fdd87c1384a22344db334 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Thu Dec 22 18:38:07 2022 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Sun Dec 25 22:25:35 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dedfd970
x11-misc/xscreensaver: drop 6.01-r4 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> x11-misc/xscreensaver/Manifest | 1 - .../files/xscreensaver-6.01-gtk-detection.patch | 25 --- x11-misc/xscreensaver/xscreensaver-6.01-r4.ebuild | 224 --------------------- 3 files changed, 250 deletions(-) diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index 4a0d19e2f771..34ec3cfca174 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -1,2 +1 @@ -DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052 SHA512 3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a DIST xscreensaver-6.05.1.tar.gz 26110057 BLAKE2B 97c16c9f0b2a0b4d00ddccd711b921ca683bd233bc3d07ecad38b68ff94b149a20512246dd6bae052323f00b1b433f56469c5638a031cbc65b61c2b84a0180e3 SHA512 c659a769ff71020b9f96b7e707bd1bcc667eb304179305d56b1be45eed095d650a8aa019890a0c5d444672f9dd68516c99c53b0df94cd96196d7f30a24b987e3 diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-gtk-detection.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-gtk-detection.patch deleted file mode 100644 index 1f70ad29dbb1..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-6.01-gtk-detection.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9ff9a74152ebd8c04df12d340ab6e7c726690a82 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <[email protected]> -Date: Sat, 17 Jul 2021 23:50:16 +0200 -Subject: [PATCH 2/2] Fix detection of GTK+ for systems without gdk-pixbuf - ---- - configure.ac | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4cb3385..bef0d1e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2819,8 +2819,6 @@ if test "$with_gtk" = yes; then - pkg_check_version gtk+-2.0 2.22.0 ; ac_gtk_version_string="$vers" - pkg_check_version gmodule-2.0 2.0.0 - pkg_check_version libxml-2.0 2.4.6 -- pkg_check_version gdk-pixbuf-2.0 2.0.0 -- pkg_check_version gdk-pixbuf-xlib-2.0 2.0.0 - have_gtk="$ok" - - if test "$have_gtk" = no; then --- -2.32.0 - diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r4.ebuild b/x11-misc/xscreensaver/xscreensaver-6.01-r4.ebuild deleted file mode 100644 index f09ec976e77c..000000000000 --- a/x11-misc/xscreensaver/xscreensaver-6.01-r4.ebuild +++ /dev/null @@ -1,224 +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 +png selinux suid systemd +xft xinerama" -REQUIRED_USE=" - gdk-pixbuf? ( gtk ) - gtk? ( png ) - opengl? ( png ) - elogind? ( !systemd ) -" - -COMMON_DEPEND=" - dev-libs/libxml2 - media-libs/netpbm - virtual/libcrypt:= - x11-apps/appres - x11-apps/xwininfo - x11-libs/libX11 - x11-libs/libXext - xft? ( 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 ) - png? ( media-libs/libpng:= ) - 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 - "${FILESDIR}"/${PN}-6.01-configure-install_sh.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 - - # 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 - - # 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 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 - - dodoc README{,.hacking} - - if use pam; then - rm -f "${ED}/etc/pam.d/xscreensaver" # install our version instead - 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 -}
