From c9388864702fdd7b0b56c049eddb41bdb9054dcb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 30 Oct 2022 15:03:33 +0000 Subject: gentoo auto-resync : 30:10:2022 - 15:03:33 --- x11-misc/Manifest.gz | Bin 47377 -> 47370 bytes x11-misc/qtfm/Manifest | 1 - x11-misc/qtfm/files/qtfm-6.2.0-qt-5.15.patch | 38 ---- x11-misc/xscreensaver/Manifest | 13 +- .../xscreensaver-6.05-configure-exit-codes.patch | 29 +++ ...screensaver-6.05-remove-update-icon-cache.patch | 13 ++ ...creensaver-6.05-teach-handsy-some-manners.patch | 42 ++++ x11-misc/xscreensaver/metadata.xml | 9 +- 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 --------------------- x11-misc/xscreensaver/xscreensaver-6.05.ebuild | 243 ++++++++++++++++++++ 12 files changed, 341 insertions(+), 780 deletions(-) delete mode 100644 x11-misc/qtfm/files/qtfm-6.2.0-qt-5.15.patch create mode 100644 x11-misc/xscreensaver/files/xscreensaver-6.05-configure-exit-codes.patch create mode 100644 x11-misc/xscreensaver/files/xscreensaver-6.05-remove-update-icon-cache.patch create mode 100644 x11-misc/xscreensaver/files/xscreensaver-6.05-teach-handsy-some-manners.patch delete mode 100644 x11-misc/xscreensaver/xscreensaver-6.02-r1.ebuild delete mode 100644 x11-misc/xscreensaver/xscreensaver-6.03.ebuild delete mode 100644 x11-misc/xscreensaver/xscreensaver-6.04.ebuild create mode 100644 x11-misc/xscreensaver/xscreensaver-6.05.ebuild (limited to 'x11-misc') diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz index fc863ea6f762..95342283f7ac 100644 Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ diff --git a/x11-misc/qtfm/Manifest b/x11-misc/qtfm/Manifest index 3c010b18b067..cea42461b8f9 100644 --- a/x11-misc/qtfm/Manifest +++ b/x11-misc/qtfm/Manifest @@ -1,4 +1,3 @@ -AUX qtfm-6.2.0-qt-5.15.patch 1037 BLAKE2B cb48575cb9097b84ed1bb739c0f6254d1bf88196d08e5ceee7b43ebae71f45dd0bf68dadfd0dce7b7f94958453d9d40f1750f291049a6c2936d24c79d2943ebe SHA512 19ffb3a4d322b1fce676819c75e13ef2952dd50182e3162c55dde26badf90f29cb4db1f388b894699cf55f7c123b6bb810864f2f603ab6c01116ceac78bfabba DIST qtfm-6.2.1.tar.gz 410958 BLAKE2B fe542b935dfa0d16198f9a0dc3fb5e0b43718056ebc0987ef73ff8c56258e8ba660ef7f294cc424aab397cd26a2aba37048806d9175fe86004298129443c707b SHA512 911c90a6f9bcfe539aaacf3476d660116f2dc18821b23cc420615be649bbffd530abf640ebf77d80ee85b61779e4844e0bc10f8fd3f3b0686366e6b5372f9f2c EBUILD qtfm-6.2.1.ebuild 910 BLAKE2B 2b2a4d59a5e992994661a74b5b35332dcb18a317bd75059391c080a76e69c4c304dbb1d7f6468f2c1cd8c21641f087c22102d7efef06e9fb85ab497a89793637 SHA512 768027180fc575bdd2f5e61dfdbabfea970a744b295d839c06d8d29dc92d18618a0592830605a20d2ee1bf7c65c5bf82bf8cef7ce8a9bfef7c9a363e8f5a9ab8 EBUILD qtfm-99999.ebuild 817 BLAKE2B e3f980a4939b1a2328666868f68d4e62543b22fdfcc0e86c21c67bfd0306891685a0d620cc07bb6ab88002ebcedce9e7474a4b8e502dc97987ce27cb5e6ff037 SHA512 631beccfbe339420ccc7224e94c184a65dfc09fef5aef813f58d18148834d3e819c3f01902077e1d04ca639e4b6f7ecb5e544685594c6ad2427647d8181f954e diff --git a/x11-misc/qtfm/files/qtfm-6.2.0-qt-5.15.patch b/x11-misc/qtfm/files/qtfm-6.2.0-qt-5.15.patch deleted file mode 100644 index 783d33d42328..000000000000 --- a/x11-misc/qtfm/files/qtfm-6.2.0-qt-5.15.patch +++ /dev/null @@ -1,38 +0,0 @@ -From c80a7f7e89f5810fab889dc2660d078438727c05 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 14 Jun 2020 20:25:46 +0200 -Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include) - -Signed-off-by: Andreas Sturmlechner ---- - libfm/iconlist.cpp | 2 ++ - libfm/iconview.cpp | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/libfm/iconlist.cpp b/libfm/iconlist.cpp -index ca72f2e..9b25dd2 100644 ---- a/libfm/iconlist.cpp -+++ b/libfm/iconlist.cpp -@@ -1,5 +1,7 @@ - #include "iconlist.h" - -+#include -+ - QSize IconListDelegate::sizeHint(const QStyleOptionViewItem &option, - const QModelIndex &index) const - { -diff --git a/libfm/iconview.cpp b/libfm/iconview.cpp -index 7b72bfb..f1abbd2 100644 ---- a/libfm/iconview.cpp -+++ b/libfm/iconview.cpp -@@ -1,5 +1,7 @@ - #include "iconview.h" - -+#include -+ - bool IconViewDelegate::eventFilter(QObject *object, - QEvent *event) - { --- -2.27.0 - diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index c5fe02730f00..54dd1eea3d8e 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -8,12 +8,11 @@ AUX xscreensaver-6.01-interix.patch 946 BLAKE2B e5a61a4de1373195747abb8f6e658027 AUX xscreensaver-6.01-non-gtk-install.patch 1780 BLAKE2B 38d2a71fb9d35d1694fac4d92b60860e9a4e53b48cbb80d22981d4cf1d76b838538e19fb390a30fb5783023c66e5aa14b03e7f9ab3ca857c1fe29c7709afb6e1 SHA512 d949fe410df79833b112f1cd7442a1ab11d68f10b2415a39feb51229b0b067612d6970e6909cafd89b28081959754c98c35f0776be2e6069771bdb9f2310bdfd AUX xscreensaver-6.01-without-gl-makefile.patch 862 BLAKE2B 9762e84d535b4e913c0e4da6818605d8ff6fc0c9d184ff2cdc60969fab977b603bc18b16dfab7b1124948e814d230a50cd384bfabe785ad1e38e735a5e063d0c SHA512 8b445ca766d24b23904423c8d3a561a0558eca6d4b70b242d05df4949c371e455251be5a473b07fa837505550e00ea13c3154e2efda239468bf7a2a73a063c1f AUX xscreensaver-6.03-without-gl-configure.patch 541 BLAKE2B 42818f7ad82513cde5317c1c41c6d54a60a4abe14c98bfa3350b9b5be38141ab7b6c569eb03527ebdab577c87cbe91e1c7197b4bf49613e2a0a94f31420a018c SHA512 bd1b57143eb0a923b41c0d513649735700edd884d39bcb3f00f886d62c2bf94c1349327797008f5698cb8b44952b7517f218d03a12a7e6128c2790005752fd88 +AUX xscreensaver-6.05-configure-exit-codes.patch 1179 BLAKE2B 7ed0bd31730bdf35278e5dc26ce9c96db6b56a094b246ce2ac0a5172a390033f00de2b8e6b25fcb0ea75131151ed19d26a7c8e2da275f1a337f15eda4ee402b3 SHA512 2db1841f485a4933837fc66d275b3516218a7c0757aad4f28cf38016aca2d4fd88138d3f94f86fb6fa42a487d10e7458760562a02fe8d2e5c534e2171cb9ca85 +AUX xscreensaver-6.05-remove-update-icon-cache.patch 368 BLAKE2B a595875f69e339a52f415e664be0524929c1b64ddfa8c80bb797379c08df0ef9860e6a5f3047d069084542eb81aff40470dfcf1db3dcb7e3515a0b986495a926 SHA512 7b797ae8b0cb8ec437f968e575bb3d9fdeab6bdf1f289302c1dabffad7276d4e73c8f03f10a4d8f8a0bedd223269e03c661187ea7c018f42cd11594454350d1d +AUX xscreensaver-6.05-teach-handsy-some-manners.patch 1820 BLAKE2B c94dbe895479b301d4bc57cf4a830b604c6b51fdf512656536c04a234e7be8f77c78ff4f91bec603ce70036b294c18d736c3b0ad9d3a14b49a627e5d1ccd6dd5 SHA512 06cbe07674a6902ca1467a72bf06f677693da0a030ecca7b880949406cfbf946ee42f5bb9daeefe4869cdad850d28b749e798b66ea890daf8c6f35c90eab9688 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 EBUILD xscreensaver-6.01-r4.ebuild 5884 BLAKE2B e6e2b8f44c38c9c22181262b227bccc4fe16339c283de394de919670010ed1b0690681da990792162760ff93ff5090f9ffb2a01547c9abe25686d5726586ace9 SHA512 ded2ad6cf75c380f343b33d64ac2f3540b55fb3a91f640dd49d6f2cabae4634b17c124637e38a6ebd6425f1aeaf54092eb75f3787fbdf7f690e211f4960f3900 -EBUILD xscreensaver-6.02-r1.ebuild 6208 BLAKE2B 73c3fe81451df69263624479a6729da783a89618ebbcac9199bc6623ff56b3a7ada878d21185052d45dd3512618e3603a8d4acd2c2be45e1d8432a76acbfa5bf SHA512 15f08b0b0a41363b6f20206741eaf1dcb6d320f6f84df3a6d6ef76bf91e80607043481ef4b2a31e9a6018724213d3fde17a658c9843663ad09ace60a52969e7a -EBUILD xscreensaver-6.03.ebuild 6519 BLAKE2B 3714eb6a47f0f4673b5e1e01169d36f50df8a8374f68b080bde5916dcc448100beac6cd09e203d1c42e88bd0f6cc7da574f3f5b9d4b243e5078ed156ecd719b0 SHA512 dacfd2604e1774cd53870c7af26db910f123449c360351e43ae6d2b0eabf64d5001e011c72a5362f9c61312d7bf44fe4cc679eed29e84e9c492b9a74fd483beb -EBUILD xscreensaver-6.04.ebuild 6545 BLAKE2B 79c1dcc84e092b2e69247623f7957f09c2c604f4cf99d30be1fd19ce162966278df708220a61b278d67fc3211e6550ce5329c5de0d0acc125c8e6b85d6554712 SHA512 c6a2244af5d6714feea6f04637e5c04406860b96bacd891f84f4423ebe154f50cbafa9b905e9c4c8460aaa6bc1f73ebb930b60eae0bdd156eb48d5fd50fdf3a6 -MISC metadata.xml 1125 BLAKE2B a1ac7ece845498dceb98238023472300253798ca00e14a278479e0fad6d91dd37e8cbe205f59ba3080b4cd942bb503a8f3c20ec4513d9b88b397f23b7eaf91a1 SHA512 045d8161087ba016fbfc0bf3ba82b3018e93f0be9467e44b9707818084adb110fce2c94f59f2623a2c4ec3ecadb99a91ebb7f1beb31c16565582da37bb6d582c +EBUILD xscreensaver-6.05.ebuild 6624 BLAKE2B c5d235591b88c8dfce8161e6c8018c91f2802c796fa5819d8f75352a601a3236664f2c27f0056084d65820bdd472ccf8898c36edfb9e49488c524f426889a254 SHA512 bd1ab33a2d88ea27a4750f21b3c8c1e490a717c65da30de0d5b8eff72b2b3655f92e922904d6485e7a824b0c85145549a557b414792b0df35335f56e5185fb93 +MISC metadata.xml 1346 BLAKE2B 1f3f0467a85b78d87dd72ab29c606e466ea903cfeedb2ee94e091ab628ad223ca40c5bfd1ccfe2652a561ad95904214963932f368b190affbe3aeccb8ea4a501 SHA512 918888b3144ba3dcab6469985279dc017420d1d8ede1a9e8509d97fef38513b7a828b4c298016270870e940f649a181f25e036d80352e05521300a89dbd28c7d diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.05-configure-exit-codes.patch b/x11-misc/xscreensaver/files/xscreensaver-6.05-configure-exit-codes.patch new file mode 100644 index 000000000000..a8ef464d2db0 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.05-configure-exit-codes.patch @@ -0,0 +1,29 @@ +The configure scripts exits on a non zero exit code even with a warning. Even +though for upstream this is just a warning, for portage this means failure and +it will exit. +We therefore alter the exit codes where neccesary. + +--- a/configure.ac ++++ b/configure.ac +@@ -4588,7 +4588,6 @@ if test "$have_motif" = no -a "$have_gtk" = no; then + else + warnL "The GTK libraries do not seem to be available; the" + warn2 "\`xscreensaver-settings' program requires them." +- CONF_STATUS=1 + # echo '' + # warn2 'You can use Motif or Lesstif instead of GTK (use the' + # warn2 "\`--with-motif' option) but that is NOT recommended." +@@ -4615,7 +4614,6 @@ if test "$have_gtk" = yes -a "$have_gdk_pixbuf" = no ; then + warn "GTK is being used, but the GDK-Pixbuf library and/or" + warn2 "headers were not found. That can't be good. Please" + warn2 "install the GDK-Pixbuf development kit and re-configure." +- CONF_STATUS=1 + fi + + if test "$have_motif" = yes -a "$have_lesstif" = yes ; then +@@ -4733,7 +4731,6 @@ if test "$have_png" = no ; then + + if test "$png_halfassed" = yes ; then halfassery ; fi + warn2 "Many things aren't going to work right." +- CONF_STATUS=1 + fi diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.05-remove-update-icon-cache.patch b/x11-misc/xscreensaver/files/xscreensaver-6.05-remove-update-icon-cache.patch new file mode 100644 index 000000000000..7d9ffdfae4d7 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.05-remove-update-icon-cache.patch @@ -0,0 +1,13 @@ +Remove update icon cache as it is a sandbox access violation. +We do this in the ebuild by ourselves instead. + +--- a/driver/Makefile.in ++++ b/driver/Makefile.in +@@ -564,7 +564,6 @@ install-gnome:: $(LOGO) + fi + + install-gnome:: uninstall-old-gnome-icons +-install-gnome:: update-icon-caches + + update-icon-caches:: + @for f in /usr/share/icons/index.theme diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.05-teach-handsy-some-manners.patch b/x11-misc/xscreensaver/files/xscreensaver-6.05-teach-handsy-some-manners.patch new file mode 100644 index 000000000000..0f09d970a920 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.05-teach-handsy-some-manners.patch @@ -0,0 +1,42 @@ +This is to teach handly some good manners and get his mind out of the gutter. He let himself go quite a bit lately. +Fixes: https://bugs.gentoo.org/869218 + + +--- a/hacks/glx/handsy_anim.h ++++ b/hacks/glx/handsy_anim.h +@@ -770,7 +770,6 @@ static const hand_anim goatse_anim[] = { + /**************************************************************************/ + + static const hand_anim_pair all_hand_anims[] = { +- {{ middle_anim, middle_anim }, 0.2 }, + {{ tap_anim, tap_anim }, 0.7 }, + {{ tap_anim, tap_anim }, 0.7 }, + {{ tap_anim, tap_anim }, 0.7 }, +@@ -778,15 +777,12 @@ static const hand_anim_pair all_hand_anims[] = { + {{ spock_anim, hidden_anim}, 0 }, + {{ horns_anim, horns_anim}, 0 }, + {{ horns_anim, horns_anim}, 0 }, +- {{ bs1_anim, bs2_anim }, 0 }, +- {{ upyours_anim, hidden_anim }, 0 }, + {{ peace_anim, hidden_anim }, 0 }, + {{ scissor1_anim, scissor2_anim }, 0 }, + {{ wave_anim, hidden_anim }, 0 }, + {{ wave2_anim, hidden_anim }, 0 }, + {{ jazzhands_anim, jazzhands_anim }, 0 }, + {{ ok_anim, ok_anim }, 0 }, +- {{ inout1_anim, inout2_anim }, 0 }, + {{ clap_anim, clap_anim }, 0 }, + {{ slow_clap_anim, slow_clap_anim }, 0 }, + {{ pray_anim, pray_anim }, 0 }, +@@ -795,11 +791,9 @@ static const hand_anim_pair all_hand_anims[] = { + {{ thumbsup_anim, thumbsup_anim }, 0 }, + {{ thumbsdn_anim, thumbsdn_anim }, 0 }, + {{ thisguy_anim, thisguy_anim }, 0 }, +- {{ outtahere_anim, hidden_anim }, 0 }, + {{ stahhhp_anim, stahhhp_anim }, 0 }, + {{ gun_anim, gun_anim }, 0.25 }, + {{ walk_anim, walk_anim }, 0.3 }, +- {{ goatse_anim, goatse_anim }, 0 }, + {{ 0, }}}; + + #endif /* __HANDSY_ANIM__ */ diff --git a/x11-misc/xscreensaver/metadata.xml b/x11-misc/xscreensaver/metadata.xml index e6446e8ce0e8..11a85b2711e6 100644 --- a/x11-misc/xscreensaver/metadata.xml +++ b/x11-misc/xscreensaver/metadata.xml @@ -1,7 +1,14 @@ - + + pascal.jaeger@leimstift.de + Pascal Jäger + + + proxy-maint@gentoo.org + Proxy Maintainers + jwz@jwz.org 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 -} diff --git a/x11-misc/xscreensaver/xscreensaver-6.05.ebuild b/x11-misc/xscreensaver/xscreensaver-6.05.ebuild new file mode 100644 index 000000000000..5e6910a7f3ff --- /dev/null +++ b/x11-misc/xscreensaver/xscreensaver-6.05.ebuild @@ -0,0 +1,243 @@ +# 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}.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 + 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-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 +) + +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/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 +} -- cgit v1.2.3