Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--x11-misc/xscreensaver/Manifest2
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-5.45-gcc.patch16
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch27
-rw-r--r--x11-misc/xscreensaver/metadata.xml1
-rw-r--r--x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild243
-rw-r--r--x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild247
-rw-r--r--x11-misc/xscreensaver/xscreensaver-6.08-r1.ebuild (renamed from x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild)46
7 files changed, 29 insertions, 553 deletions
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index da4b46865a29..141e72c223b5 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,6 +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-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
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.45-gcc.patch b/x11-misc/xscreensaver/files/xscreensaver-5.45-gcc.patch
deleted file mode 100644
index b62fd1f309e3..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.45-gcc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -468,11 +468,11 @@
-
- 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
-- if ( ( gcc -c [$2] conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \
-+ if ( ( $CC -c [$2] conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \
- grep unrecognized >/dev/null ); then
- ac_cv_gcc_accepts_[$1]=no
- else
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch b/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch
deleted file mode 100644
index 4147540e1189..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Even though xscreensaver now uses GTK+3 instead of GTK+2 since version 6.05
-it still gets its directories from GTK+2 which results in an empty prefix
-when GTK+2 is not installed.
-
-Bug: https://bugs.gentoo.org/878875
-
-Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -2822,7 +2822,7 @@ if test "$with_gtk" = yes; then
-
- GTK_DATADIR=""
- if test "$have_gtk" = yes; then
-- GTK_DATADIR=`$pkg_config --variable=prefix gtk+-2.0`
-+ GTK_DATADIR=`$pkg_config --variable=prefix gtk+-3.0`
- GTK_DATADIR="$GTK_DATADIR/share"
- fi
-
-@@ -4282,6 +4282,6 @@ AC_MSG_CHECKING([for locale directory])
- if test -n "$GTK_DATADIR" ; then
- PO_DATADIR="$GTK_DATADIR"
- elif test "$have_gtk" = yes; then
-- PO_DATADIR=`$pkg_config --variable=prefix gtk+-2.0`
-+ PO_DATADIR=`$pkg_config --variable=prefix gtk+-3.0`
- PO_DATADIR="$PO_DATADIR/share"
- fi
diff --git a/x11-misc/xscreensaver/metadata.xml b/x11-misc/xscreensaver/metadata.xml
index 9963b899eb86..68803a1d6b15 100644
--- a/x11-misc/xscreensaver/metadata.xml
+++ b/x11-misc/xscreensaver/metadata.xml
@@ -17,7 +17,6 @@
</upstream>
<use>
<flag name="fonts">Install the fonts shipped with XScreenSaver that have clear licensing</flag>
- <flag name="gdk-pixbuf">Include support for the <pkg>x11-libs/gdk-pixbuf</pkg> library in some demos, which will make it possible for them to read GIF, JPEG, and PNG files as well</flag>
<flag name="gdm">Use gdmflexiserver from <pkg>gnome-base/gdm</pkg> instead of <pkg>x11-misc/lightdm</pkg></flag>
<flag name="gles" restrict="&gt;=x11-misc/xscreensaver-6.0.2">Emulate OpenGL 1.3 in terms of OpenGL ES 1.x</flag>
<flag name="glx" restrict="&gt;=x11-misc/xscreensaver-6.0.2">Use GLX to interface OpenGL and X11 instead of EGL</flag>
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
deleted file mode 100644
index a5ae58707410..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# 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
-
-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}.1.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 pam +perl +png selinux suid systemd xinerama"
-REQUIRED_USE="
- gles? ( !glx )
- ?? ( elogind systemd )
- gtk? ( || ( gdk-pixbuf png ) )
-"
-
-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 )
- gdk-pixbuf? (
- x11-libs/gdk-pixbuf-xlib
- >=x11-libs/gdk-pixbuf-2.42.0:2
- )
- gtk? ( >=x11-libs/gtk+-2.22.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 )
- png? ( 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}-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-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-configure-exit-codes.patch
- "${FILESDIR}"/${PN}-6.05-get-dirs-from-gtk3.0-in-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
- eapply "${FILESDIR}/xscreensaver-6.05-teach-handsy-some-manners.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)
- $(use_with gdk-pixbuf pixbuf)
- $(use_with gles)
- $(use_with glx)
- $(use_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=$(usex png yes no)
- --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 -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
- # Makefile installs xscreensaver.service regardless of --without-systemd
- if ! use systemd; then
- rm "${ED}/usr/share/${PN}/xscreensaver.service" || die
- fi
-}
-
-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
-}
-
-pkg_postrm() {
- use fonts && font_pkg_postrm
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
deleted file mode 100644
index 8d3e14908a05..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# 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
-
-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}.1.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 pam +perl +png selinux suid systemd xinerama"
-REQUIRED_USE="
- gles? ( !glx )
- ?? ( elogind systemd )
- gtk? ( gdk-pixbuf )
- pam? ( locking )
-"
-
-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 )
- gdk-pixbuf? (
- x11-libs/gdk-pixbuf-xlib
- >=x11-libs/gdk-pixbuf-2.42.0:2
- )
- gtk? ( >=x11-libs/gtk+-2.22.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 )
- png? ( 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}-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-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
-)
-
-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
- eapply "${FILESDIR}/xscreensaver-6.05-teach-handsy-some-manners.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)
- $(use_with gdk-pixbuf pixbuf)
- $(use_with gles)
- $(use_with glx)
- $(use_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=$(usex png yes no)
- --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 -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
- # Makefile installs xscreensaver.service regardless of --without-systemd
- if ! use systemd; then
- rm "${ED}/usr/share/${PN}/xscreensaver.service" || die
- fi
-
- # 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
-}
-
-pkg_postrm() {
- use fonts && font_pkg_postrm
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.08-r1.ebuild
index fc7dab387fcf..a044a8b3bf9b 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.08-r1.ebuild
@@ -13,6 +13,10 @@ SRC_URI="
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:
@@ -21,9 +25,9 @@ SRC_URI="
# 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 )"
+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 ~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 )
@@ -84,17 +88,16 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-5.31-pragma.patch
"${FILESDIR}"/${PN}-6.01-gentoo.patch
- "${FILESDIR}"/${PN}-5.45-gcc.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-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.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.06-service-remove-Alias-org.jwz.xscreensav.patch
- "${FILESDIR}"/${PN}-6.06-service-start-xscreensaver-with-no-splash.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} )
@@ -105,7 +108,21 @@ 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}"
@@ -211,15 +228,14 @@ src_install() {
if use fonts; then
# Do not install fonts with unclear licensing
- rm -v "${ED}${FONTDIR}"/{gallant12x22.ttf,OCRAStd.otf} || die
+ 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 -v "${ED}${FONTDIR}"/*.{ttf,otf} || die
- rmdir -v "${ED}${FONTDIR}" || die #812473
+ rm -rfv "${ED}${FONTDIR}" || die #812473
fi
einstalldocs
@@ -229,10 +245,6 @@ src_install() {
pamd_mimic_system ${PN} auth
fi
- # bugs #809599, #828869
- #if ! use gtk; then
- # rm "${ED}/usr/bin/xscreensaver-demo" || die
- #fi
if use systemd; then
systemd_douserunit "${ED}/usr/share/${PN}/xscreensaver.service"
fi