diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-09-06 16:26:18 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-09-06 16:26:18 +0100 |
commit | 3221bf225fb68a31e281fcdbfde4cea0d576d946 (patch) | |
tree | 63e4f978840b705bebc18062b4d599ae75fd32e1 /x11-misc | |
parent | 64b277f858d171900cba8a53e675ef8c3ff893fc (diff) |
gentoo auto-resync : 06:09:2023 - 16:26:18
Diffstat (limited to 'x11-misc')
-rw-r--r-- | x11-misc/Manifest.gz | bin | 47002 -> 47000 bytes | |||
-rw-r--r-- | x11-misc/xscreensaver/Manifest | 6 | ||||
-rw-r--r-- | x11-misc/xscreensaver/files/xscreensaver-6.07-allow-no-pam.patch | 18 | ||||
-rw-r--r-- | x11-misc/xscreensaver/files/xscreensaver-6.07-fix-desktop-files.patch | 31 | ||||
-rw-r--r-- | x11-misc/xscreensaver/files/xscreensaver-6.07-gcc.patch | 24 | ||||
-rw-r--r-- | x11-misc/xscreensaver/files/xscreensaver-6.07-service-remove-Alias-org.jwz.xscreensav.patch | 13 | ||||
-rw-r--r-- | x11-misc/xscreensaver/xscreensaver-6.07.ebuild | 271 |
7 files changed, 363 insertions, 0 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz Binary files differindex 8ec7af2ff433..9ea690ce27b2 100644 --- a/x11-misc/Manifest.gz +++ b/x11-misc/Manifest.gz diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index ccb241ff3473..0283db3db652 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -13,10 +13,16 @@ AUX xscreensaver-6.05-remove-update-icon-cache.patch 368 BLAKE2B a595875f69e339a AUX xscreensaver-6.05-teach-handsy-some-manners.patch 1820 BLAKE2B c94dbe895479b301d4bc57cf4a830b604c6b51fdf512656536c04a234e7be8f77c78ff4f91bec603ce70036b294c18d736c3b0ad9d3a14b49a627e5d1ccd6dd5 SHA512 06cbe07674a6902ca1467a72bf06f677693da0a030ecca7b880949406cfbf946ee42f5bb9daeefe4869cdad850d28b749e798b66ea890daf8c6f35c90eab9688 AUX xscreensaver-6.06-service-remove-Alias-org.jwz.xscreensav.patch 548 BLAKE2B bda7487c4db12d26cd8aa65bc9954553a1d7a49e22b86993d8abaa5fe0a523457ad358564df8ba11712e0b1340f1e8882edab8b7fe4d7c7f0bb31a37b21aea26 SHA512 1134298f2e3a34b1c4d770b9a3d6d8346fbb479cab27ab63503961a9bd9608d072fd033fda4ea5af5ec77c39c603486f3c6afab94b7ad43bed01d1eb6dd045c1 AUX xscreensaver-6.06-service-start-xscreensaver-with-no-splash.patch 654 BLAKE2B d9b5d56334f16e9e59beda2599edd92c69f9a4bec6e9aba125ccebcfa09af6aeb025986fd14e77b67d5b1d961ed2b749f3bcc9655579a00438cc3d661271c5c4 SHA512 38dd0174a86b150bdfd565eb371ec2fb944f30aeb9c5d4e1b33d96ce5c47aef9e700da0e41fb75c015792361d121b570ec189ff246b5930ac427aac6fdbf4ce8 +AUX xscreensaver-6.07-allow-no-pam.patch 646 BLAKE2B dc73fbc96ff644e7604ef6abe89ee7bd4b965ebb6adb0d16694e519ef51ab453670f21773ae7359fb278f39dd1c52ea3bb09b74ab4410a81815fe6a1f6e2d56c SHA512 66206825f17795820e8bee9c96c059ab7f09b80c2e15b780d5815628302e95083d5d12acc85affdeba3d794013952782fa89cd72b6f0419a232c772482a290af +AUX xscreensaver-6.07-fix-desktop-files.patch 1399 BLAKE2B 20af65a4aef251ddd93e519486d6c85a1be1d93bbd42f32a117098e872fbe067356d36caed2ed6dc158742e85ff9d20d492080839fe43722f5d7d8b999f74247 SHA512 0091e8b56b37609b86648b638ce7cf91a8166072fb00cb5e267be5dd694ed3acd44f1df13bec73bab458229ae20ede249615b22708b405475b2a99031d3c16ae +AUX xscreensaver-6.07-gcc.patch 814 BLAKE2B aa313e5bf454cdd750cf37a1792057f7cb39667fab94ed04f319c17b28896fe42532cd9c10c53659c82993cee3ec62aa6b8aec7f8cdcdccde3eb7ab8bcdd54d0 SHA512 af0d4edaec1cc00feb78a1aa3522b0daec7f5df4ead084ef49e66ea67d0b04f54933ed4240879bb278b44f586016a529dc93b3575caaa79dfe20fc2a869ab96c +AUX xscreensaver-6.07-service-remove-Alias-org.jwz.xscreensav.patch 385 BLAKE2B 25452e7f75517e6e9ed2f9516c918128d665c18a66013f779e3d44c77d2ca1e85b782cc0eded84ae357ec0c252ed83a3447625e8e4419da0bfb9539f8fcb91f0 SHA512 79a1acccf728ba7776922e8e88675b87a6a40f033c7a9e502f7747528146406ff251d8e6e9d9730aa553b93c96ac6048a3a0287a9652fbfa3a0dbe2edb083a3e 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 EBUILD xscreensaver-6.05-r1.ebuild 6649 BLAKE2B 891003977a93c676505dcba1f38f4ee8225752cadcebd7c33c92a12a2df12c8950c86e16c2a756eb4dd9ec4b065ff061b65f993e0e71ddc06cd2b3974b45e118 SHA512 16f0aaf70d59747e0666fb3e0e3f5c4b69d672050ed2fcdcc57e90fea5530be416257245a7c1c352929522800204b436e81f97630b264afb993b571535de9c3e EBUILD xscreensaver-6.05-r2.ebuild 6744 BLAKE2B a7409658c267346f93d40ce61a1d186e0797f911ebf8c7700f95ef95e8b08f2e4238b9b2ff7f5d5cb6b2819b26c8d0d8c1061812d11554b14a5a33fbc8792e77 SHA512 20ccf63d1b987d9a969d121dded4bc55f6daa4a597ad3f0cb162ee4a94fa24239c17b9493d2112f42e805a89d5872d03df154865ee7d09a45f9e7dfef86dba4a EBUILD xscreensaver-6.06-r2.ebuild 7384 BLAKE2B 1a4ca56b92ba448cfd4084a67f0a92ada82408b82eb6de2659a50a0de7929210092f9df9b4561e6f159ba0199f86bea9b24a3248a1a7a20a4a64232f023fe831 SHA512 c57322877f5b47d1a84af869bdcf86f035e07436c81524b670762164210eb41170ae1d41f7198b648c50d3043f70e7c7cbfdf4b2edd607fc52dd048a11c087bc +EBUILD xscreensaver-6.07.ebuild 7560 BLAKE2B 1c3a41642c98db572c6b88004b1e2059430c69666d0c85efb8e7ff5b54fb9dda82feb133dac5ce039c0cf952c8548e485a2cbffdd8e89b08a0fe0e69979beb29 SHA512 4e0c3895d717085d8f2c559f2988280f5222af754f079581a446704e907d88013facd687ad509bcb7fa812d0c11639145850f05694b786943fb62fb9cceea7e6 MISC metadata.xml 1451 BLAKE2B 052182f01632e8179ad1d6fe358a823384284776cc90eaa6413b809744783b31f7d8fc8ddefa03e66a691ad11aab967db3fb400290f813cb7eff2dab149f45cb SHA512 d4abaebc08315a90d2c68baf08b307989d4fc8efc4606b151ae3d94311c64ebe13253f572845cc5a8e1e30d1bbccf3d0b16c74376d5ff61de1f1ecb1030099a8 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..f163bb2f64b9 --- /dev/null +++ b/x11-misc/xscreensaver/xscreensaver-6.07.ebuild @@ -0,0 +1,271 @@ +# 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 + + # 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 + + 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 +} |