[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
@ 2022-10-30  9:40 Sam James
  0 siblings, 0 replies; 19+ messages in thread
From: Sam James @ 2022-10-30  9:40 UTC (permalink / raw
  To: gentoo-commits

commit:     79d3bbef1b508c36bf1f88481a9d791098b438cd
Author:     Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Sun Oct 16 17:14:35 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 09:37:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79d3bbef

x11-misc/xscreensaver: version bump to 6.05

* New patch for handsys manners
* Building with USE="-opengl" is not supported anymore
* Also added a patch for -gtk builds, set GTK_SHAREDIR because when build
  with USE="-gtk" it is not set and then installs .service file into /
* Building with USE="-xft" is not supported anymore
* Delete .service file when USE="-systemd"

Closes: https://bugs.gentoo.org/869218
Closes: https://bugs.gentoo.org/851057
Closes: https://bugs.gentoo.org/834593
Closes: https://bugs.gentoo.org/851834
Closes: https://bugs.gentoo.org/830777
Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-misc/xscreensaver/Manifest                     |   1 +
 .../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.05.ebuild     | 243 +++++++++++++++++++++
 6 files changed, 336 insertions(+), 1 deletion(-)

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index cb133020e650..fd4388280ff6 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -2,3 +2,4 @@ DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B b2c90b47fb65db79d2473c1e396717156
 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

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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>pascal.jaeger@leimstift.de</email>
+		<name>Pascal Jäger</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<maintainer>
 			<email>jwz@jwz.org</email>

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
+}


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
@ 2023-09-06 10:51 Florian Schmaus
  0 siblings, 0 replies; 19+ messages in thread
From: Florian Schmaus @ 2023-09-06 10:51 UTC (permalink / raw
  To: gentoo-commits

commit:     b0c684e2e738b135418c214badafa93a7b02ea4c
Author:     Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Tue Sep  5 12:29:59 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Sep  6 10:49:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0c684e2

x11-misc/xscreensaver: add 6.07

Closes: https://bugs.gentoo.org/894700
Closes: https://bugs.gentoo.org/896440
Closes: https://bugs.gentoo.org/908509
Closes: https://bugs.gentoo.org/912075

Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>
Closes: https://github.com/gentoo/gentoo/pull/32628
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 x11-misc/xscreensaver/Manifest                     |   1 +
 .../files/xscreensaver-6.07-allow-no-pam.patch     |  18 ++
 .../xscreensaver-6.07-fix-desktop-files.patch      |  31 +++
 .../xscreensaver/files/xscreensaver-6.07-gcc.patch |  24 ++
 ...7-service-remove-Alias-org.jwz.xscreensav.patch |  13 +
 x11-misc/xscreensaver/xscreensaver-6.07.ebuild     | 265 +++++++++++++++++++++
 6 files changed, 352 insertions(+)

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 890c5ea07d5b..a615956c98d6 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,3 +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.tar.gz 26365057 BLAKE2B b0fc24e34713dd5591cff2ff871ec05deae089d7d76fe1239dd59ec1addf97eb764a583d01685953ae6409a7193ca97bc201a20dcf86d5244cf898e4eb9b1221 SHA512 abbf75faa49bb23d35985a7bf269891d168c87fe8939ad5acf6857398dfb056815d79dcf39bba9a33808e2717a47635fa84282c03ed9efeeeb449763253179a5

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..54e9257d24bc
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-6.07.ebuild
@@ -0,0 +1,265 @@
+# 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
+	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
+}


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
@ 2023-05-29 18:21 Sam James
  0 siblings, 0 replies; 19+ messages in thread
From: Sam James @ 2023-05-29 18:21 UTC (permalink / raw
  To: gentoo-commits

commit:     22193401fc34ccd8ac8556e4e400cd264336de16
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 29 17:21:42 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 29 18:19:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22193401

x11-misc/xscreensaver: drop dead prefix targets

Half the patch didn't make sense nowadays anyway as sync() was commented out.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/xscreensaver-6.01-interix.patch          | 30 ----------------------
 x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild  |  3 +--
 x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild  |  1 -
 x11-misc/xscreensaver/xscreensaver-6.06.ebuild     |  1 -
 4 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-interix.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-interix.patch
deleted file mode 100644
index 72aa6535f139..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-6.01-interix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nru a/driver/prefsw.c b/driver/prefsw.c
---- a/driver/prefsw.c	2021-02-19 02:52:32.000000000 +0100
-+++ b/driver/prefsw.c	2021-05-07 15:20:09.280321274 +0200
-@@ -798,7 +798,10 @@
- 	     sure that the bits actually land on the disk right away. */
-           /* Update 2020: Apparently here in the future, this sometimes takes
-              3+ seconds, so let's not. */
-+/* Interix has no sync() or alike. */
-+#ifndef __INTERIX
- 	  /* sync(); */
-+#endif
- 
-           status = 0;    /* wrote and renamed successfully! */
- 	}
-diff -Nru a/driver/setuid.c b/driver/setuid.c
---- a/driver/setuid.c	2021-02-05 16:16:23.000000000 +0100
-+++ b/driver/setuid.c	2021-05-07 15:21:05.987949943 +0200
-@@ -104,9 +104,12 @@
-   if (uid == (uid_t) -1) uid = (uid_t) -2;
- 
-   errno = 0;
-+  
-+#ifndef __INTERIX
-   if (setgroups_needed_p (gid) &&
-       setgroups (1, &gid) < 0)
-     sgs_errno = errno ? errno : -1;
-+#endif
- 
-   errno = 0;
-   if (setgid (gid) != 0)

diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
index c724289feed1..8b77e00352a5 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -77,7 +77,6 @@ BDEPEND="
 	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

diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
index 7dbfa69b04f5..53580375256b 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
@@ -78,7 +78,6 @@ BDEPEND="
 	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

diff --git a/x11-misc/xscreensaver/xscreensaver-6.06.ebuild b/x11-misc/xscreensaver/xscreensaver-6.06.ebuild
index 4b4247e5340a..02ae75c68a51 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.06.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.06.ebuild
@@ -75,7 +75,6 @@ BDEPEND="
 	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


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
@ 2022-12-25 22:26 Ulrich Müller
  0 siblings, 0 replies; 19+ messages in thread
From: Ulrich Müller @ 2022-12-25 22:26 UTC (permalink / raw
  To: gentoo-commits

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 <sebastian@pipping.org>
-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
-}


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
@ 2022-12-16 20:19 Sebastian Pipping
  0 siblings, 0 replies; 19+ messages in thread
From: Sebastian Pipping @ 2022-12-16 20:19 UTC (permalink / raw
  To: gentoo-commits

commit:     f4662bc9b410044c7f4a2118efb479b1523d591f
Author:     Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Thu Dec 15 11:25:01 2022 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Dec 16 20:18:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4662bc9

x11-misc/xscreensaver: revbump, fix bugs

Closes: https://bugs.gentoo.org/885441
Closes: https://bugs.gentoo.org/885479
Closes: https://bugs.gentoo.org/885989
Closes: https://github.com/gentoo/gentoo/pull/28671

Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>

 ...xscreensaver-6.05-r2-configure-exit-codes.patch |  43 ++++
 x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild  | 248 +++++++++++++++++++++
 2 files changed, 291 insertions(+)

diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.05-r2-configure-exit-codes.patch b/x11-misc/xscreensaver/files/xscreensaver-6.05-r2-configure-exit-codes.patch
new file mode 100644
index 000000000000..d69e5965ca2f
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.05-r2-configure-exit-codes.patch
@@ -0,0 +1,43 @@
+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.
+
+Bug: https://bugs.gentoo.org/885441
+
+Pascal Jäger <pascal.jaeger@leimstift.de> (2022-12-15)
+
+--- 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
+@@ -4714,7 +4712,6 @@ if test "$have_jpeg" = no ; then
+     warn2 "This means that it won't be possible for the image-manipulating"
+     warn2 "display modes to load files from disk; and it also means that"
+     warn2 "the \`webcollage' program will be much slower."
+-    CONF_STATUS=1
+   else
+     warn2 "This means the \`webcollage' program will be much slower."
+   fi
+@@ -4733,7 +4730,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/xscreensaver-6.05-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
new file mode 100644
index 000000000000..a8c07d03c410
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
@@ -0,0 +1,248 @@
+# 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 )
+	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
+	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-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
+}


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
@ 2022-03-12  0:10 Sam James
  0 siblings, 0 replies; 19+ messages in thread
From: Sam James @ 2022-03-12  0:10 UTC (permalink / raw
  To: gentoo-commits

commit:     6566d4988d100cbbfb4fec194576e69bc53d7386
Author:     Hank Leininger <hlein <AT> korelogic <DOT> com>
AuthorDate: Fri Mar  4 18:34:20 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 12 00:09:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6566d498

x11-misc/xscreensaver: fix configure with USE=-opengl

Deliberately disabling opengl became a fatal error in configure.

Signed-off-by: Hank Leininger <hlein <AT> korelogic.com>
Closes: https://bugs.gentoo.org/834582
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Closes: https://github.com/gentoo/gentoo/pull/24404
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/xscreensaver-6.03-without-gl-configure.patch        | 11 +++++++++++
 x11-misc/xscreensaver/xscreensaver-6.03.ebuild                |  1 +
 2 files changed, 12 insertions(+)

diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.03-without-gl-configure.patch b/x11-misc/xscreensaver/files/xscreensaver-6.03-without-gl-configure.patch
new file mode 100644
index 000000000000..9d741072f4e1
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.03-without-gl-configure.patch
@@ -0,0 +1,11 @@
+diff -urP xscreensaver-6.03.orig/configure.ac xscreensaver-6.03/configure.ac
+--- xscreensaver-6.03.orig/configure.ac	2022-03-04 11:23:24.415172769 -0700
++++ xscreensaver-6.03/configure.ac	2022-03-04 11:27:40.419205257 -0700
+@@ -4737,7 +4737,6 @@
+     CONF_STATUS=1
+   elif test "$with_gl_req" = no ; then
+     noteL 'The OpenGL 3D library is not being used.'
+-    CONF_STATUS=1
+   else
+     noteL 'The OpenGL 3D library was not found.'
+     CONF_STATUS=1

diff --git a/x11-misc/xscreensaver/xscreensaver-6.03.ebuild b/x11-misc/xscreensaver/xscreensaver-6.03.ebuild
index 815313c79b32..c56932d1468c 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.03.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.03.ebuild
@@ -91,6 +91,7 @@ PATCHES=(
 	"${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} )


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
@ 2021-09-05  5:16 Jakov Smolić
  0 siblings, 0 replies; 19+ messages in thread
From: Jakov Smolić @ 2021-09-05  5:16 UTC (permalink / raw
  To: gentoo-commits

commit:     39272b109329f6eb7dc4b1bd217cfcccdcda8b96
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  5 05:14:32 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sun Sep  5 05:14:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39272b10

x11-misc/xscreensaver: Remove old 5.45

Bug: https://bugs.gentoo.org/810679
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 x11-misc/xscreensaver/Manifest                     |   1 -
 .../xscreensaver-5.44-blurb-hndl-test-passwd.patch |  10 --
 .../files/xscreensaver-5.44-gentoo.patch           |  47 ------
 .../xscreensaver-5.45-configure.ac-sandbox.patch   | 146 ------------------
 .../files/xscreensaver-5.45-cve-2021-34557.patch   |  40 -----
 .../files/xscreensaver-5.45-interix.patch          |  32 ----
 ...xscreensaver-5.45-remove-libXxf86misc-dep.patch |  49 ------
 x11-misc/xscreensaver/xscreensaver-5.45-r4.ebuild  | 169 ---------------------
 8 files changed, 494 deletions(-)

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 237089b7aff..b90a0a6ec0d 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,2 +1 @@
-DIST xscreensaver-5.45.tar.gz 27729147 BLAKE2B 132301dd6645a21e04cd6f8b2f85e4b2454f5281e8cca3c5a89d50e16fee7f7e79d0b323e639bf7a18ddbcae0b4c8e7e5c9a84409bfe9f57253062cdaab30880 SHA512 1b21418c591fd99f3caaea9d31ca49abdb94b8e89f33e661c464299bc81bf4ff13fd99a187070fce19b3843c28a1f2a2a7b94bd6949d2b3b06bba730cae59f14
 DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052 SHA512 3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.44-blurb-hndl-test-passwd.patch b/x11-misc/xscreensaver/files/xscreensaver-5.44-blurb-hndl-test-passwd.patch
deleted file mode 100644
index cf95cf105b0..00000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.44-blurb-hndl-test-passwd.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/driver/test-passwd.c
-+++ b/driver/test-passwd.c
-@@ -69,6 +69,7 @@
- char *timestring (time_t when) { return ""; }
- 
- const char *blurb(void) { return progname; }
-+Bool in_signal_handler_p = 0;
- Atom XA_SCREENSAVER, XA_DEMO, XA_PREFS;
- 
- void

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.44-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.44-gentoo.patch
deleted file mode 100644
index 279a19cf638..00000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.44-gentoo.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/driver/XScreenSaver.ad.in
-+++ b/driver/XScreenSaver.ad.in
-@@ -31,21 +31,21 @@
- *mode:			random
- *timeout:		0:10:00
- *cycle:			0:10:00
--*lockTimeout:		0:00:00
-+*lockTimeout:		0:30:00
- *passwdTimeout:		0:00:30
--*dpmsEnabled:		False
-+*dpmsEnabled:		True
- *dpmsQuickoffEnabled:	False
- *dpmsStandby:		2:00:00
- *dpmsSuspend:		2:00:00
- *dpmsOff:		4:00:00
--*grabDesktopImages:	True
-+*grabDesktopImages:	False
- *grabVideoFrames:	False
- *chooseRandomImages:	@DEFAULT_IMAGES_P@
- ! This can be a local directory name, or the URL of an RSS or Atom feed.
- *imageDirectory:	@DEFAULT_IMAGE_DIRECTORY@
- *nice:			10
- *memoryLimit:		0
--*lock:			False
-+*lock:			True
- *verbose:		False
- *timestamp:		True
- *fade:			True
-@@ -63,7 +63,7 @@
- *textLiteral:		XScreenSaver
- *textFile:		@DEFAULT_TEXT_FILE@
- *textProgram:		fortune
--*textURL:		https://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss
-+*textURL:		https://planet.gentoo.org/rss20.xml
- 
- ! When a saver writes an error message to stdout/stderr, it can be printed
- ! on the screen.
-@@ -124,7 +124,8 @@
- 
- ! The format used for printing the date and time in the password dialog box
- ! (see the strftime(3) manual page for details.)
--*dateFormat:		%d-%b-%y (%a); %I:%M %p
-+!*dateFormat:		%d-%b-%y (%a); %I:%M %p
-+*dateFormat:		%x %X
- ! For day month date:
- ! *dateFormat:		%a %b %d, %I:%M %p
- ! To show the time only:

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.45-configure.ac-sandbox.patch b/x11-misc/xscreensaver/files/xscreensaver-5.45-configure.ac-sandbox.patch
deleted file mode 100644
index cee3a30897f..00000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.45-configure.ac-sandbox.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 6e4e7c657f6628109c9809561f2c5d7bf51c8c8e Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Tue, 16 Mar 2021 00:55:54 +0100
-Subject: [PATCH] configure.ac: Stop asking rpm and dpkg things, we're on
- Gentoo
-
----
- configure.ac | 115 ---------------------------------------------------
- 1 file changed, 115 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 603b993..6ef2631 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3917,25 +3917,6 @@ for d in /usr/share/fonts/X11 \
- done
- AC_MSG_RESULT($have_bitmap_fonts)
- 
--# In case we didn't guess the font directory properly, check RPMs and DEBs too.
--if test $have_bitmap_fonts != yes ; then
--  for r in 100dpi 75dpi ; do
--    for f in xfonts-$r \
--             xorg-x11-fonts-$r \
--             xorg-x11-fonts-ISO8859-1-$r \
--      ; do
--      if test $have_bitmap_fonts != yes ; then
--        AC_MSG_CHECKING(for $f)
--        if ( rpm -q "$f"  2>&- >&- ) ||
--           ( dpkg -s "$f" 2>&- | grep -q '^Status:.*installed' ) ; then
--          have_bitmap_fonts=yes
--        fi
--        AC_MSG_RESULT($have_bitmap_fonts)
--      fi
--    done
--  done
--fi
--
- 
- ###############################################################################
- #
-@@ -4876,102 +4857,6 @@ for bad_choice in xscreensaver xscreensaver-demo xscreensaver-command ; do
-   fi
- done
- 
--
--# Now let's warn if there's a previous RPM version already installed.
--# But don't bother with this test if we are currently *building* an RPM.
--
--if test -z "$RPM_PACKAGE_VERSION" ; then
--
--  rpmnames="xscreensaver xscreensaver-base xscreensaver-extras"
--
--  # M4 sucks!!
--  changequote(X,Y)
--  rpmv=`(rpm -qv $rpmnames) 2>/dev/null | \
--        sed -n 's/^[-a-z]*-\([0-9][0-9]*[.][0-9][0-9a-z]*\)-.*$/\1/p' | \
--        head -1`
--  changequote([,])
--
--  if test \! -z "$rpmv" ; then
--
--    # M4 sucks!!
--    changequote(A,B)
--    rpmbdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)xscreensaver-demo$@\1@p'`
--    rpmhdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares$@\1@p'`
--    rpmcdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'`
--    rpmadir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)XScreenSaver$@\1@p'`
--    changequote([,])
--
--    err=" (DIFFERS)"
--    if test -z "$rpmbdir" ; then rpmbdir='???'
--    elif test "$rpmbdir" != "${bindir}/"       ; then rpmbdir="$rpmbdir$err";fi
--
--    if test -z "$rpmhdir" ; then rpmhdir='???'
--    elif test "$rpmhdir" != "${HACKDIR}/"      ; then rpmhdir="$rpmhdir$err";fi
--
--    if test -z "$rpmcdir" ; then rpmcdir='???'
--    elif test "$rpmcdir" != "${HACK_CONF_DIR}/"; then rpmcdir="$rpmcdir$err";fi
--
--    if test -z "$rpmadir" ; then rpmadir='???'
--    elif test "$rpmadir" != "${APPDEFAULTS}/"  ; then rpmadir="$rpmadir$err";fi
--
--    warning=no
--    warnL "There is already an installed RPM of xscreensaver"
--    warn2 "version \"$rpmv\" on this system."
--    echo ""
--    warn2 "It is currently installed in these directories:"
--    echo ""
--    warn2 "User programs: $rpmbdir$berr"
--    warn2 "Screen savers: $rpmhdir$herr"
--    warn2 "Configuration: $rpmcdir$cerr"
--    warn2 "App Defaults:  $rpmadir$aerr"
--  fi
--fi
--
--# Also warn if there's a Debian package installed.
--#
--debnames="xscreensaver xscreensaver-data xscreensaver-data-extra"
--debv=''
--for dpkg in $debnames ; do
--  if test -z "$debv"; then
--    debv=`dpkg -s $dpkg 2>/dev/null | sed -n 's/^Version: \(.*\)$/\1/p'`
--  fi
--done
--
--if test \! -z "$debv" ; then
--
--  # M4 sucks!!
--  changequote(A,B)
--  debbdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/bin/\)xscreensaver$@\1@p'`
--  debhdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares$@\1@p'`
--  debcdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'`
--  debadir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)XScreenSaver[^/]*$@\1@p'`
--  changequote([,])
--
--  err=" (DIFFERS)"
--  if test -z "$debbdir" ; then debbdir='???'
--  elif test "$debbdir" != "${bindir}/"        ; then debbdir="$debbdir$err"; fi
--
--  if test -z "$debhdir" ; then debhdir='???'
--  elif test "$debhdir" != "${HACKDIR}/"       ; then debhdir="$debhdir$err"; fi
--
--  if test -z "$debcdir" ; then debcdir='???'
--  elif test "$debcdir" != "${HACK_CONF_DIR}/" ; then debcdir="$debcdir$err"; fi
--
--  if test -z "$debadir" ; then debadir='???'
--  elif test "$debadir" != "${APPDEFAULTS}/"   ; then debadir="$debadir$err"; fi
--
--  warning=no
--  warnL "There is already an installed dpkg of xscreensaver"
--  warn2 "version \"$debv\" on this system."
--  echo ""
--  warn2 "It is currently installed in these directories:"
--  echo ""
--  warn2 "User programs: $debbdir$berr"
--  warn2 "Screen savers: $debhdir$herr"
--  warn2 "Configuration: $debcdir$cerr"
--  warn2 "App Defaults:  $debadir$aerr"
--fi
--
- echo ""
- echo "$warnsep"
- echo ""
--- 
-2.30.2
-

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.45-cve-2021-34557.patch b/x11-misc/xscreensaver/files/xscreensaver-5.45-cve-2021-34557.patch
deleted file mode 100644
index 3d002b40877..00000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.45-cve-2021-34557.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From c1e43f7fa01b7536bc90ad5a9b61c568f4db4dd1 Mon Sep 17 00:00:00 2001
-From: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
-Date: Tue, 18 May 2021 15:41:55 +0200
-Subject: [PATCH] Fix updating outputs info
-
-When an output is disconnected, update_screen_layout() will try to unset
-a property on window assigned to that output. It does that by iterating
-si->screens up to 'count', while 'good_count' signifies how many outputs
-are currently connected (good_count <= count). si->screens has few more
-entries allocated (at start 10), but if there are more disconnected
-outputs, the iteration will go beyond si->screens array.
-The only out of bound access there is reading window ID to delete
-property from, which in most cases will be a bogus number -> crashing
-xscreensaver with BadWindow error.
-
-Fix this by allocating array up to full 'count' entries, even if much
-fewer outputs are connected at the moment.
----
- driver/screens.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/driver/screens.c b/driver/screens.c
-index 5aeb55d..16d6ec3 100644
---- a/driver/screens.c
-+++ b/driver/screens.c
-@@ -1020,9 +1020,9 @@ update_screen_layout (saver_info *si)
-         calloc (sizeof(*si->screens), si->ssi_count);
-     }
- 
--  if (si->ssi_count <= good_count)
-+  if (si->ssi_count <= count)
-     {
--      si->ssi_count = good_count + 10;
-+      si->ssi_count = count;
-       si->screens = (saver_screen_info *)
-         realloc (si->screens, sizeof(*si->screens) * si->ssi_count);
-       memset (si->screens + si->nscreens, 0, 
--- 
-2.31.1
-

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.45-interix.patch b/x11-misc/xscreensaver/files/xscreensaver-5.45-interix.patch
deleted file mode 100644
index f9841a49b74..00000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.45-interix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/driver/prefs.c b/driver/prefs.c
-index ab97ffa..cc04cc9 100644
---- a/driver/prefs.c
-+++ b/driver/prefs.c
-@@ -969,7 +969,10 @@ write_init_file (Display *dpy,
- 	     sure that the bits actually land on the disk right away. */
-           /* Update 2020: Apparently here in the future, this sometimes takes
-              3+ seconds, so let's not. */
-+/* Interix has no sync() or alike. */
-+#ifndef __INTERIX
- 	  /* sync(); */
-+#endif
- 
-           status = 0;    /* wrote and renamed successfully! */
- 	}
-diff --git a/driver/setuid.c b/driver/setuid.c
-index 3ac78e4..a2b9e15 100644
---- a/driver/setuid.c
-+++ b/driver/setuid.c
-@@ -136,9 +136,12 @@ set_ids_by_number (uid_t uid, gid_t gid, char **message_ret)
-   if (uid == (uid_t) -1) uid = (uid_t) -2;
- 
-   errno = 0;
-+
-+#ifndef __INTERIX
-   if (setgroups_needed_p (gid) &&
-       setgroups (1, &gid) < 0)
-     sgs_errno = errno ? errno : -1;
-+#endif
- 
-   errno = 0;
-   if (setgid (gid) != 0)

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.45-remove-libXxf86misc-dep.patch b/x11-misc/xscreensaver/files/xscreensaver-5.45-remove-libXxf86misc-dep.patch
deleted file mode 100644
index 9a2ac62036a..00000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.45-remove-libXxf86misc-dep.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-libXxf86misc is the client-side code of an X extension that has not been
-supported by the Xserver in more than 10 years. Since xscreensaver's dependency
-on it is automagic, we have to patch configure.in to safely remove it.
-
-https://bugs.gentoo.org/720158
-
-diff -ruN xscreensaver.orig/configure.ac xscreensaver/configure.ac
---- xscreensaver.orig/configure.ac	2020-05-02 18:09:23.169324761 -0700
-+++ xscreensaver/configure.ac	2020-05-02 18:09:52.578233240 -0700
-@@ -104,12 +104,6 @@
- 	    (It's available if the file /usr/include/X11/extensions/XInput.h
- 	    exists.)])
- 
--AH_TEMPLATE([HAVE_XF86MISCSETGRABKEYSSTATE],
--	    [Define this if you have the XF86MiscSetGrabKeysState function
--	    (which allows the Ctrl-Alt-KP_star and Ctrl-Alt-KP_slash key
--	    sequences to be temporarily disabled.  Sadly, it doesn't affect
--	    Ctrl-Alt-BS or Ctrl-Alt-F1.)])
--
- AH_TEMPLATE([HAVE_RANDR],
- 	    [Define this if you have the Resize and Rotate extension.
- 	    This is standard on sufficiently-recent XFree86 systems, and
-@@ -1888,25 +1882,6 @@
- fi
- 
- 
--###############################################################################
--#
--#       Check for XF86MiscSetGrabKeysState (but only bother if we are already
--#	using other XF86 stuff.)
--#
--###############################################################################
--
--have_xf86miscsetgrabkeysstate=no
--if test "$have_xf86gamma" = yes -o "$have_xf86vmode" = yes; then
--  AC_CHECK_X_LIB(Xxf86misc, XF86MiscSetGrabKeysState,
--                [have_xf86miscsetgrabkeysstate=yes],
--                [true], -lXext -lX11)
--  if test "$have_xf86miscsetgrabkeysstate" = yes ; then
--    SAVER_LIBS="$SAVER_LIBS -lXxf86misc"
--    AC_DEFINE(HAVE_XF86MISCSETGRABKEYSSTATE)
--  fi
--fi
--
--
- ###############################################################################
- #
- #       Check for HP XHPDisableReset and XHPEnableReset.
-

diff --git a/x11-misc/xscreensaver/xscreensaver-5.45-r4.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45-r4.ebuild
deleted file mode 100644
index 2b7ec105703..00000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.45-r4.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic multilib optfeature pam strip-linguas
-
-DESCRIPTION="modular screen saver and locker for the X Window System"
-HOMEPAGE="https://www.jwz.org/xscreensaver/"
-SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama"
-REQUIRED_USE="
-	gdk-pixbuf? ( gtk )
-"
-
-COMMON_DEPEND="
-	>=gnome-base/libglade-2
-	dev-libs/libxml2
-	media-libs/netpbm
-	virtual/libcrypt:=
-	x11-apps/appres
-	x11-apps/xwininfo
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXt
-	x11-libs/libXxf86vm
-	caps? ( sys-libs/libcap )
-	gdk-pixbuf? (
-		x11-libs/gdk-pixbuf-xlib
-		>=x11-libs/gdk-pixbuf-2.42.0:2
-	)
-	gtk? ( x11-libs/gtk+:2 )
-	jpeg? ( virtual/jpeg:0 )
-	new-login? (
-		gdm? ( gnome-base/gdm )
-		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
-		)
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	pam? ( sys-libs/pam )
-	systemd? ( >=sys-apps/systemd-221 )
-	xinerama? ( x11-libs/libXinerama )
-"
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		dev-lang/perl
-		dev-perl/libwww-perl
-		virtual/perl-Digest-MD5
-	)
-	selinux? ( sec-policy/selinux-xscreensaver )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/bc
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.45-remove-libXxf86misc-dep.patch
-	"${FILESDIR}"/${PN}-5.45-interix.patch
-	"${FILESDIR}"/${PN}-5.31-pragma.patch
-	"${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch
-	"${FILESDIR}"/${PN}-5.44-gentoo.patch
-	"${FILESDIR}"/${PN}-5.45-gcc.patch
-	"${FILESDIR}"/${PN}-5.45-configure.ac-sandbox.patch
-	"${FILESDIR}"/${P}-cve-2021-34557.patch  # bug 794475
-)
-
-src_prepare() {
-	sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die
-	strip-linguas -i po/
-	export ALL_LINGUAS="${LINGUAS}"
-
-	if use new-login && ! use gdm; then #392967
-		sed -i \
-			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
-			configure{,.ac} || die
-	fi
-
-	default
-
-	if ! use offensive; then
-		sed -i \
-			-e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \
-			hacks/barcode.c || die
-		sed -i \
-			-e 's|erect penis|shuffle board|g' \
-			-e 's|flaccid penis|flaccid anchor|g' \
-			-e 's|vagina|engagement ring|g' \
-			-e 's|Penis|Shuttle|g' \
-			hacks/glx/glsnake.c || break
-	fi
-
-	eapply_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use ppc || use ppc64; then
-		filter-flags -maltivec -mabi=altivec
-		append-flags -U__VEC__
-	fi
-
-	unset BC_ENV_ARGS #24568
-	export RPM_PACKAGE_VERSION=no #368025
-
-	econf \
-		$(use_enable locking) \
-		$(use_with caps setcap-hacks) \
-		$(use_with gdk-pixbuf pixbuf) \
-		$(use_with gtk) \
-		$(use_with jpeg) \
-		$(use_with new-login login-manager) \
-		$(use_with opengl gl) \
-		$(use_with pam) \
-		$(use_with suid setuid-hacks) \
-		$(use_with systemd) \
-		$(use_with xinerama xinerama-ext) \
-		--with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
-		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
-		--with-dpms-ext \
-		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
-		--with-proc-interrupts \
-		--with-randr-ext \
-		--with-text-file="${EPREFIX}"/etc/gentoo-release \
-		--with-xdbe-ext \
-		--with-xf86gamma-ext \
-		--with-xf86vmode-ext \
-		--with-xinput-ext \
-		--with-xshm-ext \
-		--without-gle \
-		--without-kerberos \
-		--without-motif \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
-	emake install_prefix="${D}" install
-
-	dodoc README{,.hacking}
-
-	if use pam; then
-		fperms 755 /usr/bin/${PN}
-		pamd_mimic_system ${PN} auth
-	fi
-
-	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}
-
-pkg_postinst() {
-	optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi
-	optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi
-}


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
@ 2021-07-25  7:08 Ulrich Müller
  0 siblings, 0 replies; 19+ messages in thread
From: Ulrich Müller @ 2021-07-25  7:08 UTC (permalink / raw
  To: gentoo-commits

commit:     4bc0d6dbbda9ba1edb52d90a5320f83ef8d61a68
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 25 07:07:51 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 25 07:07:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bc0d6db

x11-misc/xscreensaver: Replace src_prepare weirdness

Add an AM_PROG_INSTALL_SH line to configure.ac instead.

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 .../files/xscreensaver-6.01-configure-install_sh.patch     | 12 ++++++++++++
 x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild          | 14 ++------------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-configure-install_sh.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-configure-install_sh.patch
new file mode 100644
index 00000000000..490e32f6817
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-configure-install_sh.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/803479
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1062,6 +1062,7 @@
+ AC_PROG_INSTALL
+ AC_PROG_INSTALL_DIRS
+ AC_PROG_MAKE_SET
++AM_PROG_INSTALL_SH
+ 
+ # By default, autoconf sets INSTALL_SCRIPT to '${INSTALL_PROGRAM}'.
+ # That's wrong: it should be set to '${INSTALL}', so that one can

diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
index fc75283e450..609e6c132c7 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
@@ -2,6 +2,7 @@
 # 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"
@@ -87,6 +88,7 @@ PATCHES=(
 	"${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() {
@@ -125,19 +127,7 @@ src_prepare() {
 	eapply_user
 
 	# Must be eauto*re*conf, to force the rebuild
-	# it is NOT an entirely normal autoconf so there is weirdness!
 	eautoreconf
-	eautoheader
-
-	# Afterwards, fix the linguas
-	# doesn't populate @install_sh@ properly
-	# https://bugs.gentoo.org/803479
-	# requires LINGUAS to trigger
-	sed -i.orig \
-		-e "/^install_sh = /s!=.*!= ${S}/install-sh!g" \
-		"${S}/po/Makefile.in.in" || die
-	grep -e install_sh \
-		"${S}/po/Makefile.in.in" || die
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
@ 2021-07-17 22:17 Sebastian Pipping
  0 siblings, 0 replies; 19+ messages in thread
From: Sebastian Pipping @ 2021-07-17 22:17 UTC (permalink / raw
  To: gentoo-commits

commit:     4f17f639d8be68fb6b66b2bc14a6003aa9e8ef75
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 17 22:01:27 2021 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Jul 17 22:17:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f17f639

x11-misc/xscreensaver: Fix USE="-gtk" and USE="-gdk-pixbuf"

Closes: https://bugs.gentoo.org/796992
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-3.0.20, Repoman-3.0.3

 .../files/xscreensaver-6.01-gtk-detection.patch    |  25 +++
 .../files/xscreensaver-6.01-non-gtk-install.patch  |  56 ++++++
 x11-misc/xscreensaver/xscreensaver-6.01-r2.ebuild  | 202 +++++++++++++++++++++
 3 files changed, 283 insertions(+)

diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-gtk-detection.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-gtk-detection.patch
new file mode 100644
index 00000000000..1f70ad29dbb
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-gtk-detection.patch
@@ -0,0 +1,25 @@
+From 9ff9a74152ebd8c04df12d340ab6e7c726690a82 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+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/files/xscreensaver-6.01-non-gtk-install.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-non-gtk-install.patch
new file mode 100644
index 00000000000..cb8b6e45db2
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-non-gtk-install.patch
@@ -0,0 +1,56 @@
+From 25b22d16fabbdb3e7a6afcd6cd8d1a25afaaa252 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 17 Jul 2021 23:44:44 +0200
+Subject: [PATCH 1/2] Fix install for --without-motif --without-gtk
+
+Related to https://bugs.gentoo.org/796992
+---
+ configure.ac       | 4 ++++
+ driver/Makefile.in | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2eaea28..4cb3385 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4148,13 +4148,16 @@ fi
+ 
+ PREFERRED_DEMO_PROGRAM=''
+ ALL_DEMO_PROGRAMS=
++SETTINGS_PROGRAM_OR_NOT=
+ if test "$have_motif" = yes; then
+   PREFERRED_DEMO_PROGRAM=xscreensaver-settings-Xm
+   ALL_DEMO_PROGRAMS="$PREFERRED_DEMO_PROGRAM $ALL_DEMO_PROGRAMS"
++  SETTINGS_PROGRAM_OR_NOT=xscreensaver-settings
+ fi
+ if test "$have_gtk" = yes; then
+   PREFERRED_DEMO_PROGRAM=xscreensaver-settings-Gtk
+   ALL_DEMO_PROGRAMS="$PREFERRED_DEMO_PROGRAM $ALL_DEMO_PROGRAMS"
++  SETTINGS_PROGRAM_OR_NOT=xscreensaver-settings
+ fi
+ 
+ 
+@@ -4306,6 +4309,7 @@ AC_SUBST(INCLUDES)
+ 
+ AC_SUBST(PREFERRED_DEMO_PROGRAM)
+ AC_SUBST(ALL_DEMO_PROGRAMS)
++AC_SUBST(SETTINGS_PROGRAM_OR_NOT)
+ AC_SUBST(SAVER_LIBS)
+ AC_SUBST(MOTIF_LIBS)
+ AC_SUBST(GTK_LIBS)
+diff --git a/driver/Makefile.in b/driver/Makefile.in
+index 0e986a9..1877d8a 100644
+--- a/driver/Makefile.in
++++ b/driver/Makefile.in
+@@ -212,7 +212,7 @@ TEST_EXES	= test-passwd   test-uid        test-xdpms      test-grab     \
+ 		  xdpyinfo      test-screens    test-yarandom   test-xinput   \
+ 	          test-xkb
+ 
+-EXES		= xscreensaver xscreensaver-command xscreensaver-settings
++EXES		= xscreensaver xscreensaver-command @SETTINGS_PROGRAM_OR_NOT@
+ UTIL_EXES	= xscreensaver-gfx @EXES_SYSTEMD@
+ SETUID_EXES	= xscreensaver-auth
+ DEMO_EXES	= @ALL_DEMO_PROGRAMS@
+-- 
+2.32.0
+

diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.01-r2.ebuild
new file mode 100644
index 00000000000..628041e77c8
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-6.01-r2.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic font multilib optfeature pam
+
+DESCRIPTION="modular screen saver and locker for the X Window System"
+HOMEPAGE="https://www.jwz.org/xscreensaver/"
+SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
+
+# Font license mapping for folder ./hacks/fonts/ as following:
+#   clacon.ttf       -- MIT
+#   gallant12x22.ttf -- unclear, hence dropped
+#   luximr.ttf       -- bh-luxi (package media-fonts/font-bh-ttf)
+#   OCRAStd.otf      -- unclear, hence dropped
+#   SpecialElite.ttf -- Apache-2.0
+LICENSE="BSD fonts? ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="elogind fonts +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama"
+REQUIRED_USE="
+	gdk-pixbuf? ( gtk )
+	elogind? ( !systemd )
+"
+
+COMMON_DEPEND="
+	dev-libs/libxml2
+	media-libs/netpbm
+	virtual/libcrypt:=
+	x11-apps/appres
+	x11-apps/xwininfo
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/libXxf86vm
+	elogind? ( sys-auth/elogind )
+	gdk-pixbuf? (
+		x11-libs/gdk-pixbuf-xlib
+		>=x11-libs/gdk-pixbuf-2.42.0:2
+	)
+	gtk? ( x11-libs/gtk+:2 )
+	jpeg? ( virtual/jpeg:0 )
+	new-login? (
+		gdm? ( gnome-base/gdm )
+		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
+		)
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	pam? ( sys-libs/pam )
+	systemd? ( >=sys-apps/systemd-221 )
+	xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
+RDEPEND="
+	${COMMON_DEPEND}
+	media-gfx/fbida
+	perl? (
+		dev-lang/perl
+		dev-perl/libwww-perl
+		virtual/perl-Digest-MD5
+	)
+	selinux? ( sec-policy/selinux-xscreensaver )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/bc
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.01-interix.patch
+	"${FILESDIR}"/${PN}-5.31-pragma.patch
+	"${FILESDIR}"/${PN}-6.01-gentoo.patch
+	"${FILESDIR}"/${PN}-5.45-gcc.patch
+	"${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch
+	"${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
+	"${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
+	"${FILESDIR}"/${PN}-6.01-gtk-detection.patch
+)
+
+src_prepare() {
+	sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die
+	strip-linguas -i po/
+	export ALL_LINGUAS="${LINGUAS}"
+
+	if use new-login && ! use gdm; then #392967
+		sed -i \
+			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
+			configure{,.ac} || die
+	fi
+
+	default
+
+	# We are patching driver/XScreenSaver.ad.in, so let's delete the
+	# header generated from it so that it gets back in sync during build:
+	rm driver/XScreenSaver_ad.h || die
+
+	if ! use offensive; then
+		sed -i \
+			-e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \
+			hacks/barcode.c || die
+		sed -i \
+			-e 's|erect penis|shuffle board|g' \
+			-e 's|flaccid penis|flaccid anchor|g' \
+			-e 's|vagina|engagement ring|g' \
+			-e 's|Penis|Shuttle|g' \
+			hacks/glx/glsnake.c || die
+		sed -i \
+			's| Stay.*fucking mask\.$||' \
+			hacks/glx/covid19.man \
+			hacks/config/covid19.xml || die
+	fi
+
+	eapply_user
+
+	eautoconf
+	eautoheader
+}
+
+src_configure() {
+	if use ppc || use ppc64; then
+		filter-flags -maltivec -mabi=altivec
+		append-flags -U__VEC__
+	fi
+
+	unset BC_ENV_ARGS #24568
+
+	econf \
+		$(use_enable locking) \
+		$(use_with elogind) \
+		$(use_with gdk-pixbuf pixbuf) \
+		$(use_with gtk) \
+		$(use_with jpeg) \
+		$(use_with new-login login-manager) \
+		$(use_with opengl gl) \
+		$(use_with pam) \
+		$(use_with suid setuid-hacks) \
+		$(use_with systemd) \
+		$(use_with xinerama xinerama-ext) \
+		--with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
+		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
+		--with-dpms-ext \
+		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
+		--with-proc-interrupts \
+		--with-randr-ext \
+		--with-text-file="${EPREFIX}"/etc/gentoo-release \
+		--with-xdbe-ext \
+		--with-xf86gamma-ext \
+		--with-xf86vmode-ext \
+		--with-xinput-ext \
+		--with-xshm-ext \
+		--without-gle \
+		--without-kerberos \
+		--without-motif \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	emake install_prefix="${D}" install
+
+	if use fonts; then
+		# Do not install fonts with unclear licensing
+		rm -v "${ED}${FONTDIR}"/{gallant12x22.ttf,OCRAStd.otf} || die
+
+		# Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf)
+		rm -v "${ED}${FONTDIR}"/luximr.ttf || die
+
+		font_xfont_config
+	else
+		rm -v "${ED}${FONTDIR}"/*.{ttf,otf} || die
+	fi
+
+	dodoc README{,.hacking}
+
+	if use pam; then
+		fperms 755 /usr/bin/${PN}
+		pamd_mimic_system ${PN} auth
+	fi
+
+	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}
+
+pkg_postinst() {
+	use fonts && font_pkg_postinst
+
+	optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi
+	optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi
+	optfeature 'Truetype font Luxi Mono' media-fonts/font-bh-ttf
+}
+
+pkg_postrm() {
+	use fonts && font_pkg_postrm
+}


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
@ 2021-06-13 11:44 Sebastian Pipping
  0 siblings, 0 replies; 19+ messages in thread
From: Sebastian Pipping @ 2021-06-13 11:44 UTC (permalink / raw
  To: gentoo-commits

commit:     b2d720ae5fc226fac1e8ce032c4126984b8c377e
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 13 11:42:23 2021 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jun 13 11:42:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2d720ae

x11-misc/xscreensaver: Drop vulnerable

Bug: https://bugs.gentoo.org/794475
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-3.0.19, Repoman-3.0.3

 x11-misc/xscreensaver/Manifest                     |   1 -
 .../files/xscreensaver-5.05-interix.patch          |  32 ----
 .../xscreensaver/files/xscreensaver-5.44-gcc.patch |  16 --
 x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild  | 160 --------------------
 x11-misc/xscreensaver/xscreensaver-5.45.ebuild     | 167 ---------------------
 5 files changed, 376 deletions(-)

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index f3efd33ba39..2a8cc3823af 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,2 +1 @@
-DIST xscreensaver-5.44.tar.gz 27001826 BLAKE2B 102025aa2f57672ed3547f0e9bab989566fb8e50ecae8b9e4078ec5ee5de3cad09fec107695335ef236ad9fe19b2638978366a180a998d77b0ce8a2a5d1ebde3 SHA512 9d9144dec6f075c2d6a1c3cd45123a98d6d0cd732d6c3e3389e97b3f802b8f8765a188d1e35f97f123ca0a64661ea616b7b710577063c311da3d99d8439f1dae
 DIST xscreensaver-5.45.tar.gz 27729147 BLAKE2B 132301dd6645a21e04cd6f8b2f85e4b2454f5281e8cca3c5a89d50e16fee7f7e79d0b323e639bf7a18ddbcae0b4c8e7e5c9a84409bfe9f57253062cdaab30880 SHA512 1b21418c591fd99f3caaea9d31ca49abdb94b8e89f33e661c464299bc81bf4ff13fd99a187070fce19b3843c28a1f2a2a7b94bd6949d2b3b06bba730cae59f14

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch b/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch
deleted file mode 100644
index 2a5eead4879..00000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ru xscreensaver-5.05.orig/driver/prefs.c xscreensaver-5.05/driver/prefs.c
---- xscreensaver-5.05.orig/driver/prefs.c	2006-05-24 00:03:47 +0200
-+++ xscreensaver-5.05/driver/prefs.c	2008-03-11 09:20:58 +0100
-@@ -951,9 +951,12 @@
- 	{
- 	  p->init_file_date = write_date;
- 
-+/* Interix has no sync() or alike. */
-+#ifndef __INTERIX
- 	  /* Since the .xscreensaver file is used for IPC, let's try and make
- 	     sure that the bits actually land on the disk right away. */
- 	  sync ();
-+#endif
- 
-           status = 0;    /* wrote and renamed successfully! */
- 	}
-diff -ru xscreensaver-5.05.orig/driver/setuid.c xscreensaver-5.05/driver/setuid.c
---- xscreensaver-5.05.orig/driver/setuid.c	2006-02-09 03:33:29 +0100
-+++ xscreensaver-5.05/driver/setuid.c	2008-03-11 09:22:59 +0100
-@@ -136,9 +136,12 @@
-   if (uid == (uid_t) -1) uid = (uid_t) -2;
- 
-   errno = 0;
-+
-+#ifndef __INTERIX
-   if (setgroups_needed_p (gid) &&
-       setgroups (1, &gid) < 0)
-     sgs_errno = errno ? errno : -1;
-+#endif
- 
-   errno = 0;
-   if (setgid (gid) != 0)

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch b/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch
deleted file mode 100644
index 16493e1fd1d..00000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -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/xscreensaver-5.44-r4.ebuild b/x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild
deleted file mode 100644
index 12806ff149d..00000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild
+++ /dev/null
@@ -1,160 +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 l10n multilib 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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid xinerama"
-REQUIRED_USE="
-	gdk-pixbuf? ( gtk )
-"
-
-COMMON_DEPEND="
-	>=gnome-base/libglade-2
-	dev-libs/libxml2
-	media-libs/netpbm
-	x11-apps/appres
-	x11-apps/xwininfo
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXt
-	x11-libs/libXxf86vm
-	caps? ( sys-libs/libcap )
-	gdk-pixbuf? (
-		x11-libs/gdk-pixbuf-xlib
-		>=x11-libs/gdk-pixbuf-2.42.0:2
-	)
-	gtk? ( x11-libs/gtk+:2 )
-	jpeg? ( virtual/jpeg:0 )
-	new-login? (
-		gdm? ( gnome-base/gdm )
-		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
-		)
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	pam? ( sys-libs/pam )
-	xinerama? ( x11-libs/libXinerama )
-"
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
-RDEPEND="
-	${COMMON_DEPEND}
-	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}-remove-libXxf86misc-dep.patch
-	"${FILESDIR}"/${PN}-5.05-interix.patch
-	"${FILESDIR}"/${PN}-5.31-pragma.patch
-	"${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch
-	"${FILESDIR}"/${PN}-5.44-gentoo.patch
-	"${FILESDIR}"/${PN}-5.44-gcc.patch
-)
-
-src_prepare() {
-	sed -i configure.in -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{,.in} || die
-	fi
-
-	default
-
-	if ! use offensive; then
-		sed -i \
-			-e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \
-			hacks/barcode.c || die
-		sed -i \
-			-e 's|erect penis|shuffle board|g' \
-			-e 's|flaccid penis|flaccid anchor|g' \
-			-e 's|vagina|engagement ring|g' \
-			-e 's|Penis|Shuttle|g' \
-			hacks/glx/glsnake.c || break
-	fi
-
-	eapply_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use ppc || use ppc64; then
-		filter-flags -maltivec -mabi=altivec
-		append-flags -U__VEC__
-	fi
-
-	unset BC_ENV_ARGS #24568
-	export RPM_PACKAGE_VERSION=no #368025
-
-	econf \
-		$(use_enable locking) \
-		$(use_with caps setcap-hacks) \
-		$(use_with gdk-pixbuf pixbuf) \
-		$(use_with gtk) \
-		$(use_with jpeg) \
-		$(use_with new-login login-manager) \
-		$(use_with opengl gl) \
-		$(use_with pam) \
-		$(use_with suid setuid-hacks) \
-		$(use_with xinerama xinerama-ext) \
-		--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-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
-		--with-xdbe-ext \
-		--with-xf86gamma-ext \
-		--with-xf86vmode-ext \
-		--with-xinput-ext \
-		--with-xshm-ext \
-		--without-gle \
-		--without-kerberos \
-		--without-motif \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
-	emake install_prefix="${D}" install
-
-	dodoc README{,.hacking}
-
-	if use pam; then
-		fperms 755 /usr/bin/${PN}
-		pamd_mimic_system ${PN} auth
-	fi
-
-	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}

diff --git a/x11-misc/xscreensaver/xscreensaver-5.45.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45.ebuild
deleted file mode 100644
index 424a629aec6..00000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.45.ebuild
+++ /dev/null
@@ -1,167 +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 l10n 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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama"
-REQUIRED_USE="
-	gdk-pixbuf? ( gtk )
-"
-
-COMMON_DEPEND="
-	>=gnome-base/libglade-2
-	dev-libs/libxml2
-	media-libs/netpbm
-	x11-apps/appres
-	x11-apps/xwininfo
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXt
-	x11-libs/libXxf86vm
-	caps? ( sys-libs/libcap )
-	gdk-pixbuf? (
-		x11-libs/gdk-pixbuf-xlib
-		>=x11-libs/gdk-pixbuf-2.42.0:2
-	)
-	gtk? ( x11-libs/gtk+:2 )
-	jpeg? ( virtual/jpeg:0 )
-	new-login? (
-		gdm? ( gnome-base/gdm )
-		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
-		)
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	pam? ( sys-libs/pam )
-	systemd? ( >=sys-apps/systemd-221 )
-	xinerama? ( x11-libs/libXinerama )
-"
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		dev-lang/perl
-		dev-perl/libwww-perl
-		virtual/perl-Digest-MD5
-	)
-	selinux? ( sec-policy/selinux-xscreensaver )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/bc
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.45-remove-libXxf86misc-dep.patch
-	"${FILESDIR}"/${PN}-5.45-interix.patch
-	"${FILESDIR}"/${PN}-5.31-pragma.patch
-	"${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch
-	"${FILESDIR}"/${PN}-5.44-gentoo.patch
-	"${FILESDIR}"/${PN}-5.45-gcc.patch
-	"${FILESDIR}"/${PN}-5.45-configure.ac-sandbox.patch
-)
-
-src_prepare() {
-	sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die
-	strip-linguas -i po/
-	export ALL_LINGUAS="${LINGUAS}"
-
-	if use new-login && ! use gdm; then #392967
-		sed -i \
-			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
-			configure{,.ac} || die
-	fi
-
-	default
-
-	if ! use offensive; then
-		sed -i \
-			-e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \
-			hacks/barcode.c || die
-		sed -i \
-			-e 's|erect penis|shuffle board|g' \
-			-e 's|flaccid penis|flaccid anchor|g' \
-			-e 's|vagina|engagement ring|g' \
-			-e 's|Penis|Shuttle|g' \
-			hacks/glx/glsnake.c || break
-	fi
-
-	eapply_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use ppc || use ppc64; then
-		filter-flags -maltivec -mabi=altivec
-		append-flags -U__VEC__
-	fi
-
-	unset BC_ENV_ARGS #24568
-	export RPM_PACKAGE_VERSION=no #368025
-
-	econf \
-		$(use_enable locking) \
-		$(use_with caps setcap-hacks) \
-		$(use_with gdk-pixbuf pixbuf) \
-		$(use_with gtk) \
-		$(use_with jpeg) \
-		$(use_with new-login login-manager) \
-		$(use_with opengl gl) \
-		$(use_with pam) \
-		$(use_with suid setuid-hacks) \
-		$(use_with systemd) \
-		$(use_with xinerama xinerama-ext) \
-		--with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
-		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
-		--with-dpms-ext \
-		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
-		--with-proc-interrupts \
-		--with-randr-ext \
-		--with-text-file="${EPREFIX}"/etc/gentoo-release \
-		--with-xdbe-ext \
-		--with-xf86gamma-ext \
-		--with-xf86vmode-ext \
-		--with-xinput-ext \
-		--with-xshm-ext \
-		--without-gle \
-		--without-kerberos \
-		--without-motif \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
-	emake install_prefix="${D}" install
-
-	dodoc README{,.hacking}
-
-	if use pam; then
-		fperms 755 /usr/bin/${PN}
-		pamd_mimic_system ${PN} auth
-	fi
-
-	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}
-
-pkg_postinst() {
-	optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi
-	optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi
-}


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
@ 2021-06-11 15:36 Sebastian Pipping
  0 siblings, 0 replies; 19+ messages in thread
From: Sebastian Pipping @ 2021-06-11 15:36 UTC (permalink / raw
  To: gentoo-commits

commit:     fbfd1bffe2e7f0c68efb06aa292ed7ebcb796239
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 11 15:35:34 2021 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Jun 11 15:36:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbfd1bff

x11-misc/xscreensaver: CVE-2021-34557

Bug: https://bugs.gentoo.org/794475
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-3.0.19, Repoman-3.0.3

 .../files/xscreensaver-5.45-cve-2021-34557.patch   |  40 +++++
 x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild  | 168 +++++++++++++++++++++
 2 files changed, 208 insertions(+)

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.45-cve-2021-34557.patch b/x11-misc/xscreensaver/files/xscreensaver-5.45-cve-2021-34557.patch
new file mode 100644
index 00000000000..3d002b40877
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.45-cve-2021-34557.patch
@@ -0,0 +1,40 @@
+From c1e43f7fa01b7536bc90ad5a9b61c568f4db4dd1 Mon Sep 17 00:00:00 2001
+From: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
+Date: Tue, 18 May 2021 15:41:55 +0200
+Subject: [PATCH] Fix updating outputs info
+
+When an output is disconnected, update_screen_layout() will try to unset
+a property on window assigned to that output. It does that by iterating
+si->screens up to 'count', while 'good_count' signifies how many outputs
+are currently connected (good_count <= count). si->screens has few more
+entries allocated (at start 10), but if there are more disconnected
+outputs, the iteration will go beyond si->screens array.
+The only out of bound access there is reading window ID to delete
+property from, which in most cases will be a bogus number -> crashing
+xscreensaver with BadWindow error.
+
+Fix this by allocating array up to full 'count' entries, even if much
+fewer outputs are connected at the moment.
+---
+ driver/screens.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/driver/screens.c b/driver/screens.c
+index 5aeb55d..16d6ec3 100644
+--- a/driver/screens.c
++++ b/driver/screens.c
+@@ -1020,9 +1020,9 @@ update_screen_layout (saver_info *si)
+         calloc (sizeof(*si->screens), si->ssi_count);
+     }
+ 
+-  if (si->ssi_count <= good_count)
++  if (si->ssi_count <= count)
+     {
+-      si->ssi_count = good_count + 10;
++      si->ssi_count = count;
+       si->screens = (saver_screen_info *)
+         realloc (si->screens, sizeof(*si->screens) * si->ssi_count);
+       memset (si->screens + si->nscreens, 0, 
+-- 
+2.31.1
+

diff --git a/x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild
new file mode 100644
index 00000000000..9a996f52f7a
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic l10n 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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama"
+REQUIRED_USE="
+	gdk-pixbuf? ( gtk )
+"
+
+COMMON_DEPEND="
+	>=gnome-base/libglade-2
+	dev-libs/libxml2
+	media-libs/netpbm
+	x11-apps/appres
+	x11-apps/xwininfo
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/libXxf86vm
+	caps? ( sys-libs/libcap )
+	gdk-pixbuf? (
+		x11-libs/gdk-pixbuf-xlib
+		>=x11-libs/gdk-pixbuf-2.42.0:2
+	)
+	gtk? ( x11-libs/gtk+:2 )
+	jpeg? ( virtual/jpeg:0 )
+	new-login? (
+		gdm? ( gnome-base/gdm )
+		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
+		)
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	pam? ( sys-libs/pam )
+	systemd? ( >=sys-apps/systemd-221 )
+	xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		dev-lang/perl
+		dev-perl/libwww-perl
+		virtual/perl-Digest-MD5
+	)
+	selinux? ( sec-policy/selinux-xscreensaver )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/bc
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.45-remove-libXxf86misc-dep.patch
+	"${FILESDIR}"/${PN}-5.45-interix.patch
+	"${FILESDIR}"/${PN}-5.31-pragma.patch
+	"${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch
+	"${FILESDIR}"/${PN}-5.44-gentoo.patch
+	"${FILESDIR}"/${PN}-5.45-gcc.patch
+	"${FILESDIR}"/${PN}-5.45-configure.ac-sandbox.patch
+	"${FILESDIR}"/${P}-cve-2021-34557.patch  # bug 794475
+)
+
+src_prepare() {
+	sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die
+	strip-linguas -i po/
+	export ALL_LINGUAS="${LINGUAS}"
+
+	if use new-login && ! use gdm; then #392967
+		sed -i \
+			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
+			configure{,.ac} || die
+	fi
+
+	default
+
+	if ! use offensive; then
+		sed -i \
+			-e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \
+			hacks/barcode.c || die
+		sed -i \
+			-e 's|erect penis|shuffle board|g' \
+			-e 's|flaccid penis|flaccid anchor|g' \
+			-e 's|vagina|engagement ring|g' \
+			-e 's|Penis|Shuttle|g' \
+			hacks/glx/glsnake.c || break
+	fi
+
+	eapply_user
+
+	eautoconf
+	eautoheader
+}
+
+src_configure() {
+	if use ppc || use ppc64; then
+		filter-flags -maltivec -mabi=altivec
+		append-flags -U__VEC__
+	fi
+
+	unset BC_ENV_ARGS #24568
+	export RPM_PACKAGE_VERSION=no #368025
+
+	econf \
+		$(use_enable locking) \
+		$(use_with caps setcap-hacks) \
+		$(use_with gdk-pixbuf pixbuf) \
+		$(use_with gtk) \
+		$(use_with jpeg) \
+		$(use_with new-login login-manager) \
+		$(use_with opengl gl) \
+		$(use_with pam) \
+		$(use_with suid setuid-hacks) \
+		$(use_with systemd) \
+		$(use_with xinerama xinerama-ext) \
+		--with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
+		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
+		--with-dpms-ext \
+		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
+		--with-proc-interrupts \
+		--with-randr-ext \
+		--with-text-file="${EPREFIX}"/etc/gentoo-release \
+		--with-xdbe-ext \
+		--with-xf86gamma-ext \
+		--with-xf86vmode-ext \
+		--with-xinput-ext \
+		--with-xshm-ext \
+		--without-gle \
+		--without-kerberos \
+		--without-motif \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	emake install_prefix="${D}" install
+
+	dodoc README{,.hacking}
+
+	if use pam; then
+		fperms 755 /usr/bin/${PN}
+		pamd_mimic_system ${PN} auth
+	fi
+
+	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}
+
+pkg_postinst() {
+	optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi
+	optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi
+}


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
@ 2021-03-12 20:33 Sebastian Pipping
  0 siblings, 0 replies; 19+ messages in thread
From: Sebastian Pipping @ 2021-03-12 20:33 UTC (permalink / raw
  To: gentoo-commits

commit:     f5f7bd0d572d6d0f2ed37ca774a1d070e951b468
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 12 20:32:28 2021 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Mar 12 20:33:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5f7bd0d

x11-misc/xscreensaver: Drop old

Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-3.0.17, Repoman-3.0.2

 x11-misc/xscreensaver/Manifest                     |   2 -
 .../xscreensaver-5.20-blurb-hndl-test-passwd.patch |  12 --
 .../xscreensaver-5.20-test-passwd-segv-tty.patch   |  13 --
 .../files/xscreensaver-5.20-tests-miscfix.patch    |  23 ----
 .../files/xscreensaver-5.28-comment-style.patch    |  21 ---
 .../files/xscreensaver-5.35-gentoo.patch           |  47 -------
 .../files/xscreensaver-5.35-offensive.patch        |  59 ---------
 .../files/xscreensaver-5.43-gentoo.patch           |  47 -------
 .../files/xscreensaver-5.43-offensive.patch        |  68 ----------
 x11-misc/xscreensaver/xscreensaver-5.38-r3.ebuild  | 143 --------------------
 x11-misc/xscreensaver/xscreensaver-5.43-r5.ebuild  | 146 ---------------------
 11 files changed, 581 deletions(-)

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 9483460aca9..f3efd33ba39 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,4 +1,2 @@
-DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561
-DIST xscreensaver-5.43-r1.tar.gz 26973508 BLAKE2B 67b57214e8a41ba895df6e9efcac3e712f24be06ee7914b38d3a8e639d4945c927c4ac28469d2180bc4a3999a4b89d2a60e633799ac5204c42fa17ad76dd21fc SHA512 7ccaf30fb05ae2110f742f1a5c99f83cd4c8e6749124066b5a418cf3e0ba1b8ff09858eeec29c11b0c8ea428b95b2916481c50cee6a5d952ec941b3ad1b6adcd
 DIST xscreensaver-5.44.tar.gz 27001826 BLAKE2B 102025aa2f57672ed3547f0e9bab989566fb8e50ecae8b9e4078ec5ee5de3cad09fec107695335ef236ad9fe19b2638978366a180a998d77b0ce8a2a5d1ebde3 SHA512 9d9144dec6f075c2d6a1c3cd45123a98d6d0cd732d6c3e3389e97b3f802b8f8765a188d1e35f97f123ca0a64661ea616b7b710577063c311da3d99d8439f1dae
 DIST xscreensaver-5.45.tar.gz 27729147 BLAKE2B 132301dd6645a21e04cd6f8b2f85e4b2454f5281e8cca3c5a89d50e16fee7f7e79d0b323e639bf7a18ddbcae0b4c8e7e5c9a84409bfe9f57253062cdaab30880 SHA512 1b21418c591fd99f3caaea9d31ca49abdb94b8e89f33e661c464299bc81bf4ff13fd99a187070fce19b3843c28a1f2a2a7b94bd6949d2b3b06bba730cae59f14

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-blurb-hndl-test-passwd.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-blurb-hndl-test-passwd.patch
deleted file mode 100644
index 1f249536355..00000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.20-blurb-hndl-test-passwd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.17-blurb-hndl-test-passwd.patch
-
---- a/driver/test-passwd.c
-+++ b/driver/test-passwd.c
-@@ -66,6 +66,7 @@
- Bool update_screen_layout (saver_info *si) { return 0; }
- 
- const char *blurb(void) { return progname; }
-+Bool in_signal_handler_p = 0;
- Atom XA_SCREENSAVER, XA_DEMO, XA_PREFS;
- 
- void

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-test-passwd-segv-tty.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-test-passwd-segv-tty.patch
deleted file mode 100644
index bc7f58b4085..00000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.20-test-passwd-segv-tty.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.12-test-passwd-segv-tty.patch
-
---- a/driver/passwd.c
-+++ b/driver/passwd.c
-@@ -205,7 +205,7 @@
- {
- # ifdef HAVE_SYSLOG
-   struct passwd *pw = getpwuid (getuid ());
--  char *d = DisplayString (si->dpy);
-+  char *d = (si->dpy ? DisplayString (si->dpy) : 0);
-   char *u = (pw && pw->pw_name ? pw->pw_name : "???");
-   int opt = 0;
-   int fac = 0;

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-tests-miscfix.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-tests-miscfix.patch
deleted file mode 100644
index 32fb638afa0..00000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.20-tests-miscfix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.12-tests-miscfix.patch
-
---- a/driver/test-xdpms.c
-+++ a/driver/test-xdpms.c
-@@ -29,7 +29,6 @@
- 
- #include <X11/Xproto.h>
- #include <X11/extensions/dpms.h>
--#include <X11/extensions/dpmsstr.h>
- 
- extern Bool DPMSQueryExtension (Display *dpy, int *event_ret, int *error_ret);
- extern Bool DPMSCapable (Display *dpy);
---- a/driver/Makefile.in
-+++ a/driver/Makefile.in
-@@ -850,7 +850,7 @@
- test-mlstring: test-mlstring.o
- 	$(CC) -DTEST $(LDFLAGS) -o $@ test-mlstring.o $(SAVER_LIBS)
- 
--TEST_FADE_OBJS = test-fade.o $(UTILS_SRC)/fade.o $(DEMO_UTIL_OBJS)
-+TEST_FADE_OBJS = test-fade.o $(UTILS_BIN)/fade.o $(DEMO_UTIL_OBJS)
- test-fade: test-fade.o $(UTILS_BIN)/fade.o
- 	$(CC) $(LDFLAGS) -o $@ $(TEST_FADE_OBJS) $(SAVER_LIBS)
- 

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.28-comment-style.patch b/x11-misc/xscreensaver/files/xscreensaver-5.28-comment-style.patch
deleted file mode 100644
index 6c3143d758b..00000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.28-comment-style.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/hacks/tessellimage.c
-+++ b/hacks/tessellimage.c
-@@ -507,15 +507,15 @@
-       out[i].p = (n > 0
-                   ? (XPoint *) calloc (out[i].npoints + 1, sizeof (*out[i].p))
-                   : 0);
--//printf("%d: ", i);
-+/*printf("%d: ", i);*/
-       for (j = 0; j < out[i].npoints; j++)
-         {
-           ITRIANGLE *tt = &v[t->tri[j]];
-           out[i].p[j].x = (p[tt->p1].x + p[tt->p2].x + p[tt->p3].x) / 3;
-           out[i].p[j].y = (p[tt->p1].y + p[tt->p2].y + p[tt->p3].y) / 3;
--//printf(" [%d: %d %d]", j, out[i].p[j].x, out[i].p[j].y);
-+/*printf(" [%d: %d %d]", j, out[i].p[j].x, out[i].p[j].y);*/
-         }
--//printf("\n");
-+/*printf("\n");*/
-     }
- 
-   free (vert_to_tri);

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.35-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.35-gentoo.patch
deleted file mode 100644
index 881869fb463..00000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.35-gentoo.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/driver/XScreenSaver.ad.in
-+++ b/driver/XScreenSaver.ad.in
-@@ -31,21 +31,21 @@
- *mode:			random
- *timeout:		0:10:00
- *cycle:			0:10:00
--*lockTimeout:		0:00:00
-+*lockTimeout:		0:30:00
- *passwdTimeout:		0:00:30
--*dpmsEnabled:		False
-+*dpmsEnabled:		True
- *dpmsQuickoffEnabled:	False
- *dpmsStandby:		2:00:00
- *dpmsSuspend:		2:00:00
- *dpmsOff:		4:00:00
--*grabDesktopImages:	True
-+*grabDesktopImages:	False
- *grabVideoFrames:	False
- *chooseRandomImages:	@DEFAULT_IMAGES_P@
- ! This can be a local directory name, or the URL of an RSS or Atom feed.
- *imageDirectory:	@DEFAULT_IMAGE_DIRECTORY@
- *nice:			10
- *memoryLimit:		0
--*lock:			False
-+*lock:			True
- *verbose:		False
- *timestamp:		True
- *fade:			True
-@@ -63,7 +63,7 @@
- *textLiteral:		XScreenSaver
- *textFile:		@DEFAULT_TEXT_FILE@
- *textProgram:		fortune
--*textURL:		https://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss
-+*textURL:		https://planet.gentoo.org/rss20.xml
- 
- *overlayTextForeground:	#FFFF00
- *overlayTextBackground:	#000000
-@@ -123,7 +123,8 @@
- 
- ! The format used for printing the date and time in the password dialog box
- ! (see the strftime(3) manual page for details.)
--*dateFormat:		%d-%b-%y (%a); %I:%M %p
-+!*dateFormat:		%d-%b-%y (%a); %I:%M %p
-+*dateFormat:		%x %X
- ! To show the time only:
- ! *dateFormat:		%I:%M %p
- ! For 24 hour time:

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.35-offensive.patch b/x11-misc/xscreensaver/files/xscreensaver-5.35-offensive.patch
deleted file mode 100644
index 91ce780aea3..00000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.35-offensive.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/hacks/barcode.c
-+++ a/hacks/barcode.c
-@@ -131,7 +131,6 @@
-   "children",
-   "chocolate",
-   "CLONE",
--  "cock",
-   "constriction",
-   "contrition",
-   "cop",
-@@ -265,7 +264,6 @@
-   "punishment",
-   "punk rock",
-   "punk",
--  "pussy",
-   "quagmire",
-   "quarantine",
-   "quartz",
-@@ -333,8 +331,6 @@
-   "vegetarian",
-   "venom",
-   "verifiability",
--  "viagra",
--  "vibrator",
-   "victim",
-   "vignette",
-   "villainy",
---- a/hacks/glx/glsnake.c
-+++ a/hacks/glx/glsnake.c
-@@ -565,17 +565,17 @@
- 	ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, PIN, ZERO }
-     },
--    { "erect penis",     /* thanks benno */
-+    { "shuffle board",     /* thanks benno */
-       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
- 	PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, ZERO }
-     },
--    { "flaccid penis",
-+    { "flaccid anchor",
-       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
- 	PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, ZERO }
-     },
--    { "vagina",
-+    { "engagement ring",
-       { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO,
- 	LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT,
- 	PIN, RIGHT, ZERO }
-@@ -995,7 +995,7 @@
-     { "Parrot",
-         { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO }
-     },
--    { "Penis",
-+    { "Shuttle",
-         { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO }
-     },
-     { "PictureComingSoon",

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.43-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.43-gentoo.patch
deleted file mode 100644
index a6978a58e68..00000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.43-gentoo.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/driver/XScreenSaver.ad.in
-+++ b/driver/XScreenSaver.ad.in
-@@ -31,21 +31,21 @@
- *mode:			random
- *timeout:		0:10:00
- *cycle:			0:10:00
--*lockTimeout:		0:00:00
-+*lockTimeout:		0:30:00
- *passwdTimeout:		0:00:30
--*dpmsEnabled:		False
-+*dpmsEnabled:		True
- *dpmsQuickoffEnabled:	False
- *dpmsStandby:		2:00:00
- *dpmsSuspend:		2:00:00
- *dpmsOff:		4:00:00
--*grabDesktopImages:	True
-+*grabDesktopImages:	False
- *grabVideoFrames:	False
- *chooseRandomImages:	@DEFAULT_IMAGES_P@
- ! This can be a local directory name, or the URL of an RSS or Atom feed.
- *imageDirectory:	@DEFAULT_IMAGE_DIRECTORY@
- *nice:			10
- *memoryLimit:		0
--*lock:			False
-+*lock:			True
- *verbose:		False
- *timestamp:		True
- *fade:			True
-@@ -63,7 +63,7 @@
- *textLiteral:		XScreenSaver
- *textFile:		@DEFAULT_TEXT_FILE@
- *textProgram:		fortune
--*textURL:		https://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss
-+*textURL:		https://planet.gentoo.org/rss20.xml
- 
- *overlayTextForeground:	#FFFF00
- *overlayTextBackground:	#000000
-@@ -124,7 +124,8 @@
- 
- ! The format used for printing the date and time in the password dialog box
- ! (see the strftime(3) manual page for details.)
--*dateFormat:		%d-%b-%y (%a); %I:%M %p
-+!*dateFormat:		%d-%b-%y (%a); %I:%M %p
-+*dateFormat:		%x %X
- ! For day month date:
- ! *dateFormat:		%a %b %d, %I:%M %p
- ! To show the time only:

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.43-offensive.patch b/x11-misc/xscreensaver/files/xscreensaver-5.43-offensive.patch
deleted file mode 100644
index 25ee7a96ec7..00000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.43-offensive.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/hacks/barcode.c
-+++ a/hacks/barcode.c
-@@ -118,8 +118,6 @@
-   "belly",
-   "bliss",
-   "bogosity",
--  "boobies",
--  "boobs",
-   "booty",
-   "bread",
-   "bubba",
-@@ -132,7 +130,6 @@
-   "children",
-   "chocolate",
-   "CLONE",
--  "cock",
-   "constriction",
-   "contrition",
-   "cop",
-@@ -266,7 +263,6 @@
-   "punishment",
-   "punk rock",
-   "punk",
--  "pussy",
-   "quagmire",
-   "quarantine",
-   "quartz",
-@@ -334,8 +330,6 @@
-   "vegetarian",
-   "venom",
-   "verifiability",
--  "viagra",
--  "vibrator",
-   "victim",
-   "vignette",
-   "villainy",
---- a/hacks/glx/glsnake.c
-+++ a/hacks/glx/glsnake.c
-@@ -565,17 +565,17 @@
- 	ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, PIN, ZERO }
-     },
--    { "erect penis",     /* thanks benno */
-+    { "shuffle board",     /* thanks benno */
-       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
- 	PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, ZERO }
-     },
--    { "flaccid penis",
-+    { "flaccid anchor",
-       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
- 	PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, ZERO }
-     },
--    { "vagina",
-+    { "engagement ring",
-       { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO,
- 	LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT,
- 	PIN, RIGHT, ZERO }
-@@ -995,7 +995,7 @@
-     { "Parrot",
-         { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO }
-     },
--    { "Penis",
-+    { "Shuttle",
-         { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO }
-     },
-     { "PictureComingSoon",

diff --git a/x11-misc/xscreensaver/xscreensaver-5.38-r3.ebuild b/x11-misc/xscreensaver/xscreensaver-5.38-r3.ebuild
deleted file mode 100644
index 01313f497ec..00000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.38-r3.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic multilib pam
-
-DESCRIPTION="A modular screen saver and locker for the X Window System"
-HOMEPAGE="https://www.jwz.org/xscreensaver/"
-SRC_URI="
-	https://www.jwz.org/xscreensaver/${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
-
-COMMON_DEPEND="
-	>=gnome-base/libglade-2
-	dev-libs/libxml2
-	media-libs/netpbm
-	x11-apps/appres
-	x11-apps/xwininfo
-	x11-libs/gdk-pixbuf-xlib
-	>=x11-libs/gdk-pixbuf-2.42.0:2
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXt
-	x11-libs/libXxf86vm
-	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 )
-	xinerama? ( x11-libs/libXinerama )
-"
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
-RDEPEND="
-	${COMMON_DEPEND}
-	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
-"
-
-src_prepare() {
-	sed -i configure.in -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{,.in} || die
-	fi
-
-	eapply \
-		"${FILESDIR}"/${PN}-remove-libXxf86misc-dep.patch \
-		"${FILESDIR}"/${PN}-5.05-interix.patch \
-		"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \
-		"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \
-		"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \
-		"${FILESDIR}"/${PN}-5.28-comment-style.patch \
-		"${FILESDIR}"/${PN}-5.31-pragma.patch \
-		"${FILESDIR}"/${PN}-5.35-gentoo.patch
-
-	use offensive || eapply "${FILESDIR}"/${PN}-5.35-offensive.patch
-
-	eapply_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use ppc || use ppc64; then
-		filter-flags -maltivec -mabi=altivec
-		append-flags -U__VEC__
-	fi
-
-	unset BC_ENV_ARGS #24568
-	export RPM_PACKAGE_VERSION=no #368025
-
-	econf \
-		$(use_with jpeg) \
-		$(use_with new-login login-manager) \
-		$(use_with opengl gl) \
-		$(use_with pam) \
-		$(use_with suid setuid-hacks) \
-		$(use_with xinerama xinerama-ext) \
-		--enable-locking \
-		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
-		--with-dpms-ext \
-		--with-gtk \
-		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
-		--with-pixbuf \
-		--with-proc-interrupts \
-		--with-randr-ext \
-		--with-text-file="${EPREFIX}"/etc/gentoo-release \
-		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
-		--with-xdbe-ext \
-		--with-xf86gamma-ext \
-		--with-xf86vmode-ext \
-		--with-xinput-ext \
-		--with-xshm-ext \
-		--without-gle \
-		--without-kerberos \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
-	emake install_prefix="${D}" install
-
-	dodoc README{,.hacking}
-
-	if use pam; then
-		fperms 755 /usr/bin/${PN}
-		pamd_mimic_system ${PN} auth
-	fi
-
-	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}

diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r5.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43-r5.ebuild
deleted file mode 100644
index 1ef07b385bf..00000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.43-r5.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop eutils flag-o-matic multilib pam
-
-DESCRIPTION="A 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 -> ${P}-r1.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="caps gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
-
-COMMON_DEPEND="
-	>=gnome-base/libglade-2
-	dev-libs/libxml2
-	media-libs/netpbm
-	x11-apps/appres
-	x11-apps/xwininfo
-	x11-libs/gdk-pixbuf-xlib
-	>=x11-libs/gdk-pixbuf-2.42.0:2
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXt
-	x11-libs/libXxf86vm
-	caps? ( sys-libs/libcap )
-	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 )
-	xinerama? ( x11-libs/libXinerama )
-"
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
-RDEPEND="
-	${COMMON_DEPEND}
-	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}-remove-libXxf86misc-dep.patch
-	"${FILESDIR}"/${PN}-5.05-interix.patch
-	"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch
-	"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch
-	"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch
-	"${FILESDIR}"/${PN}-5.31-pragma.patch
-	"${FILESDIR}"/${PN}-5.43-gentoo.patch
-)
-
-src_prepare() {
-	sed -i configure.in -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{,.in} || die
-	fi
-
-	default
-
-	use offensive || eapply "${FILESDIR}"/${PN}-5.43-offensive.patch
-
-	eapply_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use ppc || use ppc64; then
-		filter-flags -maltivec -mabi=altivec
-		append-flags -U__VEC__
-	fi
-
-	unset BC_ENV_ARGS #24568
-	export RPM_PACKAGE_VERSION=no #368025
-
-	econf \
-		$(use_with caps setcap-hacks) \
-		$(use_with jpeg) \
-		$(use_with new-login login-manager) \
-		$(use_with opengl gl) \
-		$(use_with pam) \
-		$(use_with suid setuid-hacks) \
-		$(use_with xinerama xinerama-ext) \
-		--enable-locking \
-		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
-		--with-dpms-ext \
-		--with-gtk \
-		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
-		--with-pixbuf \
-		--with-proc-interrupts \
-		--with-randr-ext \
-		--with-text-file="${EPREFIX}"/etc/gentoo-release \
-		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
-		--with-xdbe-ext \
-		--with-xf86gamma-ext \
-		--with-xf86vmode-ext \
-		--with-xinput-ext \
-		--with-xshm-ext \
-		--without-gle \
-		--without-kerberos \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
-	emake install_prefix="${D}" install
-
-	dodoc README{,.hacking}
-
-	if use pam; then
-		fperms 755 /usr/bin/${PN}
-		pamd_mimic_system ${PN} auth
-	fi
-
-	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
@ 2021-03-12 17:14 Sebastian Pipping
  0 siblings, 0 replies; 19+ messages in thread
From: Sebastian Pipping @ 2021-03-12 17:14 UTC (permalink / raw
  To: gentoo-commits

commit:     e1151d3c7e9cebd14f2c8b071bf31e4737377808
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 12 17:10:07 2021 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Mar 12 17:13:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1151d3c

x11-misc/xscreensaver: 5.45

Patches are forward-ports of existing ones
Adds systemd support, optfeature, and a few new so-called XScreenSaver "hacks"
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-3.0.17, Repoman-3.0.2

 x11-misc/xscreensaver/Manifest                     |   1 +
 .../xscreensaver/files/xscreensaver-5.45-gcc.patch |  16 ++
 .../files/xscreensaver-5.45-interix.patch          |  32 ++++
 ...xscreensaver-5.45-remove-libXxf86misc-dep.patch |  49 ++++++
 x11-misc/xscreensaver/xscreensaver-5.45.ebuild     | 168 +++++++++++++++++++++
 5 files changed, 266 insertions(+)

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 790b47cc1b7..9483460aca9 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,3 +1,4 @@
 DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561
 DIST xscreensaver-5.43-r1.tar.gz 26973508 BLAKE2B 67b57214e8a41ba895df6e9efcac3e712f24be06ee7914b38d3a8e639d4945c927c4ac28469d2180bc4a3999a4b89d2a60e633799ac5204c42fa17ad76dd21fc SHA512 7ccaf30fb05ae2110f742f1a5c99f83cd4c8e6749124066b5a418cf3e0ba1b8ff09858eeec29c11b0c8ea428b95b2916481c50cee6a5d952ec941b3ad1b6adcd
 DIST xscreensaver-5.44.tar.gz 27001826 BLAKE2B 102025aa2f57672ed3547f0e9bab989566fb8e50ecae8b9e4078ec5ee5de3cad09fec107695335ef236ad9fe19b2638978366a180a998d77b0ce8a2a5d1ebde3 SHA512 9d9144dec6f075c2d6a1c3cd45123a98d6d0cd732d6c3e3389e97b3f802b8f8765a188d1e35f97f123ca0a64661ea616b7b710577063c311da3d99d8439f1dae
+DIST xscreensaver-5.45.tar.gz 27729147 BLAKE2B 132301dd6645a21e04cd6f8b2f85e4b2454f5281e8cca3c5a89d50e16fee7f7e79d0b323e639bf7a18ddbcae0b4c8e7e5c9a84409bfe9f57253062cdaab30880 SHA512 1b21418c591fd99f3caaea9d31ca49abdb94b8e89f33e661c464299bc81bf4ff13fd99a187070fce19b3843c28a1f2a2a7b94bd6949d2b3b06bba730cae59f14

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.45-gcc.patch b/x11-misc/xscreensaver/files/xscreensaver-5.45-gcc.patch
new file mode 100644
index 00000000000..b62fd1f309e
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.45-gcc.patch
@@ -0,0 +1,16 @@
+--- 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-5.45-interix.patch b/x11-misc/xscreensaver/files/xscreensaver-5.45-interix.patch
new file mode 100644
index 00000000000..f9841a49b74
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.45-interix.patch
@@ -0,0 +1,32 @@
+diff --git a/driver/prefs.c b/driver/prefs.c
+index ab97ffa..cc04cc9 100644
+--- a/driver/prefs.c
++++ b/driver/prefs.c
+@@ -969,7 +969,10 @@ write_init_file (Display *dpy,
+ 	     sure that the bits actually land on the disk right away. */
+           /* Update 2020: Apparently here in the future, this sometimes takes
+              3+ seconds, so let's not. */
++/* Interix has no sync() or alike. */
++#ifndef __INTERIX
+ 	  /* sync(); */
++#endif
+ 
+           status = 0;    /* wrote and renamed successfully! */
+ 	}
+diff --git a/driver/setuid.c b/driver/setuid.c
+index 3ac78e4..a2b9e15 100644
+--- a/driver/setuid.c
++++ b/driver/setuid.c
+@@ -136,9 +136,12 @@ set_ids_by_number (uid_t uid, gid_t gid, char **message_ret)
+   if (uid == (uid_t) -1) uid = (uid_t) -2;
+ 
+   errno = 0;
++
++#ifndef __INTERIX
+   if (setgroups_needed_p (gid) &&
+       setgroups (1, &gid) < 0)
+     sgs_errno = errno ? errno : -1;
++#endif
+ 
+   errno = 0;
+   if (setgid (gid) != 0)

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.45-remove-libXxf86misc-dep.patch b/x11-misc/xscreensaver/files/xscreensaver-5.45-remove-libXxf86misc-dep.patch
new file mode 100644
index 00000000000..9a2ac62036a
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.45-remove-libXxf86misc-dep.patch
@@ -0,0 +1,49 @@
+libXxf86misc is the client-side code of an X extension that has not been
+supported by the Xserver in more than 10 years. Since xscreensaver's dependency
+on it is automagic, we have to patch configure.in to safely remove it.
+
+https://bugs.gentoo.org/720158
+
+diff -ruN xscreensaver.orig/configure.ac xscreensaver/configure.ac
+--- xscreensaver.orig/configure.ac	2020-05-02 18:09:23.169324761 -0700
++++ xscreensaver/configure.ac	2020-05-02 18:09:52.578233240 -0700
+@@ -104,12 +104,6 @@
+ 	    (It's available if the file /usr/include/X11/extensions/XInput.h
+ 	    exists.)])
+ 
+-AH_TEMPLATE([HAVE_XF86MISCSETGRABKEYSSTATE],
+-	    [Define this if you have the XF86MiscSetGrabKeysState function
+-	    (which allows the Ctrl-Alt-KP_star and Ctrl-Alt-KP_slash key
+-	    sequences to be temporarily disabled.  Sadly, it doesn't affect
+-	    Ctrl-Alt-BS or Ctrl-Alt-F1.)])
+-
+ AH_TEMPLATE([HAVE_RANDR],
+ 	    [Define this if you have the Resize and Rotate extension.
+ 	    This is standard on sufficiently-recent XFree86 systems, and
+@@ -1888,25 +1882,6 @@
+ fi
+ 
+ 
+-###############################################################################
+-#
+-#       Check for XF86MiscSetGrabKeysState (but only bother if we are already
+-#	using other XF86 stuff.)
+-#
+-###############################################################################
+-
+-have_xf86miscsetgrabkeysstate=no
+-if test "$have_xf86gamma" = yes -o "$have_xf86vmode" = yes; then
+-  AC_CHECK_X_LIB(Xxf86misc, XF86MiscSetGrabKeysState,
+-                [have_xf86miscsetgrabkeysstate=yes],
+-                [true], -lXext -lX11)
+-  if test "$have_xf86miscsetgrabkeysstate" = yes ; then
+-    SAVER_LIBS="$SAVER_LIBS -lXxf86misc"
+-    AC_DEFINE(HAVE_XF86MISCSETGRABKEYSSTATE)
+-  fi
+-fi
+-
+-
+ ###############################################################################
+ #
+ #       Check for HP XHPDisableReset and XHPEnableReset.
+

diff --git a/x11-misc/xscreensaver/xscreensaver-5.45.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45.ebuild
new file mode 100644
index 00000000000..0cb931ea7de
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.45.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop eutils flag-o-matic multilib optfeature pam
+
+DESCRIPTION="A modular screen saver and locker for the X Window System"
+HOMEPAGE="https://www.jwz.org/xscreensaver/"
+SRC_URI="
+	https://www.jwz.org/xscreensaver/${P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama"
+REQUIRED_USE="
+	gdk-pixbuf? ( gtk )
+"
+
+COMMON_DEPEND="
+	>=gnome-base/libglade-2
+	dev-libs/libxml2
+	media-libs/netpbm
+	x11-apps/appres
+	x11-apps/xwininfo
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/libXxf86vm
+	caps? ( sys-libs/libcap )
+	gdk-pixbuf? (
+		x11-libs/gdk-pixbuf-xlib
+		>=x11-libs/gdk-pixbuf-2.42.0:2
+	)
+	gtk? ( x11-libs/gtk+:2 )
+	jpeg? ( virtual/jpeg:0 )
+	new-login? (
+		gdm? ( gnome-base/gdm )
+		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
+		)
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	pam? ( sys-libs/pam )
+	systemd? ( >=sys-apps/systemd-221 )
+	xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		dev-lang/perl
+		dev-perl/libwww-perl
+		virtual/perl-Digest-MD5
+	)
+	selinux? ( sec-policy/selinux-xscreensaver )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/bc
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.45-remove-libXxf86misc-dep.patch
+	"${FILESDIR}"/${PN}-5.45-interix.patch
+	"${FILESDIR}"/${PN}-5.31-pragma.patch
+	"${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch
+	"${FILESDIR}"/${PN}-5.44-gentoo.patch
+	"${FILESDIR}"/${PN}-5.45-gcc.patch
+)
+
+src_prepare() {
+	sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die
+	strip-linguas -i po/
+	export ALL_LINGUAS="${LINGUAS}"
+
+	if use new-login && ! use gdm; then #392967
+		sed -i \
+			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
+			configure{,.ac} || die
+	fi
+
+	default
+
+	if ! use offensive; then
+		sed -i \
+			-e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \
+			hacks/barcode.c || die
+		sed -i \
+			-e 's|erect penis|shuffle board|g' \
+			-e 's|flaccid penis|flaccid anchor|g' \
+			-e 's|vagina|engagement ring|g' \
+			-e 's|Penis|Shuttle|g' \
+			hacks/glx/glsnake.c || break
+	fi
+
+	eapply_user
+
+	eautoconf
+	eautoheader
+}
+
+src_configure() {
+	if use ppc || use ppc64; then
+		filter-flags -maltivec -mabi=altivec
+		append-flags -U__VEC__
+	fi
+
+	unset BC_ENV_ARGS #24568
+	export RPM_PACKAGE_VERSION=no #368025
+
+	econf \
+		$(use_enable locking) \
+		$(use_with caps setcap-hacks) \
+		$(use_with gdk-pixbuf pixbuf) \
+		$(use_with gtk) \
+		$(use_with jpeg) \
+		$(use_with new-login login-manager) \
+		$(use_with opengl gl) \
+		$(use_with pam) \
+		$(use_with suid setuid-hacks) \
+		$(use_with systemd) \
+		$(use_with xinerama xinerama-ext) \
+		--with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
+		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
+		--with-dpms-ext \
+		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
+		--with-proc-interrupts \
+		--with-randr-ext \
+		--with-text-file="${EPREFIX}"/etc/gentoo-release \
+		--with-xdbe-ext \
+		--with-xf86gamma-ext \
+		--with-xf86vmode-ext \
+		--with-xinput-ext \
+		--with-xshm-ext \
+		--without-gle \
+		--without-kerberos \
+		--without-motif \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	emake install_prefix="${D}" install
+
+	dodoc README{,.hacking}
+
+	if use pam; then
+		fperms 755 /usr/bin/${PN}
+		pamd_mimic_system ${PN} auth
+	fi
+
+	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}
+
+pkg_postinst() {
+	optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi
+	optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi
+}


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
@ 2020-07-23 10:42 Jeroen Roovers
  0 siblings, 0 replies; 19+ messages in thread
From: Jeroen Roovers @ 2020-07-23 10:42 UTC (permalink / raw
  To: gentoo-commits

commit:     ab2e1be9dfffbddf0655803679fe96249518bcb3
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 23 10:42:11 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jul 23 10:42:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab2e1be9

x11-misc/xscreensaver: Use CC in gcc AC_CHECK_GCC_ARG

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Closes: https://bugs.gentoo.org/733638
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch | 16 ++++++++++++++++
 x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild       |  1 +
 2 files changed, 17 insertions(+)

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch b/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch
new file mode 100644
index 00000000000..16493e1fd1d
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch
@@ -0,0 +1,16 @@
+--- a/configure.in
++++ b/configure.in
+@@ -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/xscreensaver-5.44-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild
index b0bea0c4919..3d15c7f3a86 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild
@@ -71,6 +71,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.31-pragma.patch
 	"${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch
 	"${FILESDIR}"/${PN}-5.44-gentoo.patch
+	"${FILESDIR}"/${PN}-5.44-gcc.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
@ 2020-05-03  1:35 Matt Turner
  0 siblings, 0 replies; 19+ messages in thread
From: Matt Turner @ 2020-05-03  1:35 UTC (permalink / raw
  To: gentoo-commits

commit:     611492b9f7ef001a3fc4e73b36ec6a3e01442103
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun May  3 01:28:51 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun May  3 01:32:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=611492b9

x11-misc/xscreensaver: Drop libXxf86misc dependency

Closes: https://bugs.gentoo.org/720158
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 .../xscreensaver-remove-libXxf86misc-dep.patch     | 49 ++++++++++++++++++++++
 ...ver-5.38.ebuild => xscreensaver-5.38-r1.ebuild} |  2 +-
 ...-5.43-r2.ebuild => xscreensaver-5.43-r3.ebuild} |  2 +-
 ...-5.44-r1.ebuild => xscreensaver-5.44-r2.ebuild} |  2 +-
 4 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/x11-misc/xscreensaver/files/xscreensaver-remove-libXxf86misc-dep.patch b/x11-misc/xscreensaver/files/xscreensaver-remove-libXxf86misc-dep.patch
new file mode 100644
index 00000000000..79ffcd7098c
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-remove-libXxf86misc-dep.patch
@@ -0,0 +1,49 @@
+libXxf86misc is the client-side code of an X extension that has not been
+supported by the Xserver in more than 10 years. Since xscreensaver's dependency
+on it is automagic, we have to patch configure.in to safely remove it.
+
+https://bugs.gentoo.org/720158
+
+diff -ruN xscreensaver.orig/configure.in xscreensaver/configure.in
+--- xscreensaver.orig/configure.in	2020-05-02 18:09:23.169324761 -0700
++++ xscreensaver/configure.in	2020-05-02 18:09:52.578233240 -0700
+@@ -104,12 +104,6 @@
+ 	    (It's available if the file /usr/include/X11/extensions/XInput.h
+ 	    exists.)])
+ 
+-AH_TEMPLATE([HAVE_XF86MISCSETGRABKEYSSTATE],
+-	    [Define this if you have the XF86MiscSetGrabKeysState function
+-	    (which allows the Ctrl-Alt-KP_star and Ctrl-Alt-KP_slash key
+-	    sequences to be temporarily disabled.  Sadly, it doesn't affect
+-	    Ctrl-Alt-BS or Ctrl-Alt-F1.)])
+-
+ AH_TEMPLATE([HAVE_RANDR],
+ 	    [Define this if you have the Resize and Rotate extension.
+ 	    This is standard on sufficiently-recent XFree86 systems, and
+@@ -1888,25 +1882,6 @@
+ fi
+ 
+ 
+-###############################################################################
+-#
+-#       Check for XF86MiscSetGrabKeysState (but only bother if we are already
+-#	using other XF86 stuff.)
+-#
+-###############################################################################
+-
+-have_xf86miscsetgrabkeysstate=no
+-if test "$have_xf86gamma" = yes -o "$have_xf86vmode" = yes; then
+-  AC_CHECK_X_LIB(Xxf86misc, XF86MiscSetGrabKeysState,
+-                [have_xf86miscsetgrabkeysstate=yes],
+-                [true], -lXext -lX11)
+-  if test "$have_xf86miscsetgrabkeysstate" = yes ; then
+-    SAVER_LIBS="$SAVER_LIBS -lXxf86misc"
+-    AC_DEFINE(HAVE_XF86MISCSETGRABKEYSSTATE)
+-  fi
+-fi
+-
+-
+ ###############################################################################
+ #
+ #       Check for HP XHPDisableReset and XHPEnableReset.
+

diff --git a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild b/x11-misc/xscreensaver/xscreensaver-5.38-r1.ebuild
similarity index 98%
rename from x11-misc/xscreensaver/xscreensaver-5.38.ebuild
rename to x11-misc/xscreensaver/xscreensaver-5.38-r1.ebuild
index 655aea06e05..9ffa8e21aea 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.38-r1.ebuild
@@ -30,7 +30,6 @@ COMMON_DEPEND="
 	x11-libs/libXmu
 	x11-libs/libXrandr
 	x11-libs/libXt
-	x11-libs/libXxf86misc
 	x11-libs/libXxf86vm
 	jpeg? ( virtual/jpeg:0 )
 	new-login? (
@@ -75,6 +74,7 @@ src_prepare() {
 	fi
 
 	eapply \
+		"${FILESDIR}"/${PN}-remove-libXxf86misc-dep.patch \
 		"${FILESDIR}"/${PN}-5.05-interix.patch \
 		"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \
 		"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \

diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43-r3.ebuild
similarity index 98%
rename from x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild
rename to x11-misc/xscreensaver/xscreensaver-5.43-r3.ebuild
index 3f0ba54893e..5a18a227934 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.43-r3.ebuild
@@ -30,7 +30,6 @@ COMMON_DEPEND="
 	x11-libs/libXmu
 	x11-libs/libXrandr
 	x11-libs/libXt
-	x11-libs/libXxf86misc
 	x11-libs/libXxf86vm
 	caps? ( sys-libs/libcap )
 	jpeg? ( virtual/jpeg:0 )
@@ -64,6 +63,7 @@ DEPEND="
 	x11-base/xorg-proto
 "
 PATCHES=(
+	"${FILESDIR}"/${PN}-remove-libXxf86misc-dep.patch
 	"${FILESDIR}"/${PN}-5.05-interix.patch
 	"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch
 	"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch

diff --git a/x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild
similarity index 98%
rename from x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild
rename to x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild
index 94909200656..5a2b2cd498b 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild
@@ -30,7 +30,6 @@ COMMON_DEPEND="
 	x11-libs/libXmu
 	x11-libs/libXrandr
 	x11-libs/libXt
-	x11-libs/libXxf86misc
 	x11-libs/libXxf86vm
 	caps? ( sys-libs/libcap )
 	jpeg? ( virtual/jpeg:0 )
@@ -64,6 +63,7 @@ DEPEND="
 	x11-base/xorg-proto
 "
 PATCHES=(
+	"${FILESDIR}"/${PN}-remove-libXxf86misc-dep.patch
 	"${FILESDIR}"/${PN}-5.05-interix.patch
 	"${FILESDIR}"/${PN}-5.31-pragma.patch
 	"${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
@ 2020-03-22  8:05 Jeroen Roovers
  0 siblings, 0 replies; 19+ messages in thread
From: Jeroen Roovers @ 2020-03-22  8:05 UTC (permalink / raw
  To: gentoo-commits

commit:     92a5fff7f88c315b7bdbeed017a090ba1d9ad79f
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 22 08:05:22 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Mar 22 08:05:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92a5fff7

x11-misc/xscreensaver: Replace patch with sed scripts

Package-Manager: Portage-2.3.94, Repoman-2.3.21
Bug: https://bugs.gentoo.org/713788
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 .../files/xscreensaver-5.44-offensive.patch        | 68 ----------------------
 x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild  | 12 +++-
 2 files changed, 11 insertions(+), 69 deletions(-)

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.44-offensive.patch b/x11-misc/xscreensaver/files/xscreensaver-5.44-offensive.patch
deleted file mode 100644
index 4b2d6189b1e..00000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.44-offensive.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/hacks/barcode.c
-+++ b/hacks/barcode.c
-@@ -121,8 +121,6 @@
-   "belly",
-   "bliss",
-   "bogosity",
--  "boobies",
--  "boobs",
-   "booty",
-   "bread",
-   "brogrammers",
-@@ -137,7 +135,6 @@
-   "chocolate",
-   "chupacabra",
-   "CLONE",
--  "cock",
-   "congress",
-   "constriction",
-   "contrition",
-@@ -280,7 +277,6 @@
-   "punishment",
-   "punk rock",
-   "punk",
--  "pussy",
-   "quagmire",
-   "quarantine",
-   "quartz",
-@@ -355,8 +351,6 @@
-   "venom",
-   "verifiability",
-   "very fine people",
--  "viagra",
--  "vibrator",
-   "victim",
-   "vignette",
-   "villainy",
---- a/hacks/glx/glsnake.c
-+++ b/hacks/glx/glsnake.c
-@@ -569,17 +569,17 @@
- 	ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, PIN, ZERO }
-     },
--    { "erect penis",     /* thanks benno */
-+    { "shuffle board",     /* thanks benno */
-       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
- 	PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, ZERO }
-     },
--    { "flaccid penis",
-+    { "flaccid anchor",
-       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
- 	PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, ZERO }
-     },
--    { "vagina",
-+    { "engagement ring",
-       { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO,
- 	LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT,
- 	PIN, RIGHT, ZERO }
-@@ -999,7 +999,7 @@
-     { "Parrot",
-         { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO }
-     },
--    { "Penis",
-+    { "Shuttle",
-         { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO }
-     },
-     { "PictureComingSoon",

diff --git a/x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild
index 0bb17e073d4..8fd4a1daa6e 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild
@@ -83,7 +83,17 @@ src_prepare() {
 
 	default
 
-	use offensive || eapply "${FILESDIR}"/${PN}-5.44-offensive.patch
+	if ! use offensive; then
+		sed -i \
+			-e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \
+			hacks/barcode.c || die
+		sed -i \
+			-e 's|erect penis|shuffle board|g' \
+			-e 's|flaccid penis|flaccid anchor|g' \
+			-e 's|vagina|engagement ring|g' \
+			-e 's|Penis|Shuttle|g' \
+			hacks/glx/glsnake.c || break
+	fi
 
 	eapply_user
 


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
@ 2020-03-21  6:39 Jeroen Roovers
  0 siblings, 0 replies; 19+ messages in thread
From: Jeroen Roovers @ 2020-03-21  6:39 UTC (permalink / raw
  To: gentoo-commits

commit:     8f09736f281ea64e3ef974b738eb121710c1acf8
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 21 06:37:15 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Mar 21 06:39:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f09736f

x11-misc/xscreensaver: Old

Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 x11-misc/xscreensaver/Manifest                     |   1 -
 .../files/xscreensaver-5.41-comments.patch         |  14 --
 x11-misc/xscreensaver/xscreensaver-5.42.ebuild     | 142 --------------------
 x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild  | 143 ---------------------
 4 files changed, 300 deletions(-)

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 73759e4f7fe..0f3ab0cdbd3 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,4 +1,3 @@
 DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561
-DIST xscreensaver-5.42.tar.gz 26903469 BLAKE2B a82716a3f1f19f85eb1bc7a8ba1981221ac2ad47c1411687f1043da7e50edada73ab9c7465d655546f8a9015db69ab4f35ef8ff2a0b3d79f5a59d3e02aa2f819 SHA512 84cde9364c933de720acd51a0bf75eb4d0642d60f62b92de89d932233eb5abb51e1edb53cd413b2dc4801a02cb68652a28d7d1f83cdaa8d8cdd1fee7d651eefd
 DIST xscreensaver-5.43-r1.tar.gz 26973508 BLAKE2B 67b57214e8a41ba895df6e9efcac3e712f24be06ee7914b38d3a8e639d4945c927c4ac28469d2180bc4a3999a4b89d2a60e633799ac5204c42fa17ad76dd21fc SHA512 7ccaf30fb05ae2110f742f1a5c99f83cd4c8e6749124066b5a418cf3e0ba1b8ff09858eeec29c11b0c8ea428b95b2916481c50cee6a5d952ec941b3ad1b6adcd
 DIST xscreensaver-5.44-r1.tar.gz 27001826 BLAKE2B 102025aa2f57672ed3547f0e9bab989566fb8e50ecae8b9e4078ec5ee5de3cad09fec107695335ef236ad9fe19b2638978366a180a998d77b0ce8a2a5d1ebde3 SHA512 9d9144dec6f075c2d6a1c3cd45123a98d6d0cd732d6c3e3389e97b3f802b8f8765a188d1e35f97f123ca0a64661ea616b7b710577063c311da3d99d8439f1dae

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.41-comments.patch b/x11-misc/xscreensaver/files/xscreensaver-5.41-comments.patch
deleted file mode 100644
index 8cef848ac7b..00000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.41-comments.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/hacks/fontglide.c
-+++ b/hacks/fontglide.c
-@@ -2421,8 +2421,9 @@
- 
-   textclient_close (s->tc);
- 
--//  if (s->b && s->b != s->window) XFreePixmap (dpy, s->b);
--//  if (s->ba && s->ba != s->b) XFreePixmap (dpy, s->ba);
-+/*  if (s->b && s->b != s->window) XFreePixmap (dpy, s->b);
-+/  if (s->ba && s->ba != s->b) XFreePixmap (dpy, s->ba);
-+*/
-   XFreeGC (dpy, s->bg_gc);
-   if (s->charset) free (s->charset);
-   if (s->font_override) free (s->font_override);

diff --git a/x11-misc/xscreensaver/xscreensaver-5.42.ebuild b/x11-misc/xscreensaver/xscreensaver-5.42.ebuild
deleted file mode 100644
index 97cd9a81944..00000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.42.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop eutils flag-o-matic multilib pam
-
-DESCRIPTION="A modular screen saver and locker for the X Window System"
-HOMEPAGE="https://www.jwz.org/xscreensaver/"
-SRC_URI="
-	https://www.jwz.org/xscreensaver/${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
-
-COMMON_DEPEND="
-	>=gnome-base/libglade-2
-	dev-libs/libxml2
-	media-libs/netpbm
-	x11-apps/appres
-	x11-apps/xwininfo
-	x11-libs/gdk-pixbuf:2[X]
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXt
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	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 )
-	xinerama? ( x11-libs/libXinerama )
-"
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		dev-lang/perl
-		dev-perl/libwww-perl
-		virtual/perl-Digest-MD5
-	)
-	selinux? ( sec-policy/selinux-xscreensaver )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/bc
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.05-interix.patch
-	"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch
-	"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch
-	"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch
-	"${FILESDIR}"/${PN}-5.31-pragma.patch
-	"${FILESDIR}"/${PN}-5.35-gentoo.patch
-	"${FILESDIR}"/${PN}-5.41-comments.patch
-)
-
-src_prepare() {
-	sed -i configure.in -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{,.in} || die
-	fi
-
-	default
-
-	use offensive || eapply "${FILESDIR}"/${PN}-5.35-offensive.patch
-
-	eapply_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use ppc || use ppc64; then
-		filter-flags -maltivec -mabi=altivec
-		append-flags -U__VEC__
-	fi
-
-	unset BC_ENV_ARGS #24568
-	export RPM_PACKAGE_VERSION=no #368025
-
-	econf \
-		$(use_with jpeg) \
-		$(use_with new-login login-manager) \
-		$(use_with opengl gl) \
-		$(use_with pam) \
-		$(use_with suid setuid-hacks) \
-		$(use_with xinerama xinerama-ext) \
-		--enable-locking \
-		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
-		--with-dpms-ext \
-		--with-gtk \
-		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
-		--with-pixbuf \
-		--with-proc-interrupts \
-		--with-randr-ext \
-		--with-text-file="${EPREFIX}"/etc/gentoo-release \
-		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
-		--with-xdbe-ext \
-		--with-xf86gamma-ext \
-		--with-xf86vmode-ext \
-		--with-xinput-ext \
-		--with-xshm-ext \
-		--without-gle \
-		--without-kerberos \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
-	emake install_prefix="${D}" install
-
-	dodoc README{,.hacking}
-
-	use pam && fperms 755 /usr/bin/${PN}
-	pamd_mimic_system ${PN} auth
-
-	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}

diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild
deleted file mode 100644
index 13597378983..00000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop eutils flag-o-matic multilib pam
-
-DESCRIPTION="A 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 -> ${PF}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="caps gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
-
-COMMON_DEPEND="
-	>=gnome-base/libglade-2
-	dev-libs/libxml2
-	media-libs/netpbm
-	x11-apps/appres
-	x11-apps/xwininfo
-	x11-libs/gdk-pixbuf:2[X]
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXt
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	caps? ( sys-libs/libcap )
-	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 )
-	xinerama? ( x11-libs/libXinerama )
-"
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		dev-lang/perl
-		dev-perl/libwww-perl
-		virtual/perl-Digest-MD5
-	)
-	selinux? ( sec-policy/selinux-xscreensaver )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/bc
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.05-interix.patch
-	"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch
-	"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch
-	"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch
-	"${FILESDIR}"/${PN}-5.31-pragma.patch
-	"${FILESDIR}"/${PN}-5.43-gentoo.patch
-)
-
-src_prepare() {
-	sed -i configure.in -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{,.in} || die
-	fi
-
-	default
-
-	use offensive || eapply "${FILESDIR}"/${PN}-5.35-offensive.patch
-
-	eapply_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use ppc || use ppc64; then
-		filter-flags -maltivec -mabi=altivec
-		append-flags -U__VEC__
-	fi
-
-	unset BC_ENV_ARGS #24568
-	export RPM_PACKAGE_VERSION=no #368025
-
-	econf \
-		$(use_with caps setcap-hacks) \
-		$(use_with jpeg) \
-		$(use_with new-login login-manager) \
-		$(use_with opengl gl) \
-		$(use_with pam) \
-		$(use_with suid setuid-hacks) \
-		$(use_with xinerama xinerama-ext) \
-		--enable-locking \
-		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
-		--with-dpms-ext \
-		--with-gtk \
-		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
-		--with-pixbuf \
-		--with-proc-interrupts \
-		--with-randr-ext \
-		--with-text-file="${EPREFIX}"/etc/gentoo-release \
-		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
-		--with-xdbe-ext \
-		--with-xf86gamma-ext \
-		--with-xf86vmode-ext \
-		--with-xinput-ext \
-		--with-xshm-ext \
-		--without-gle \
-		--without-kerberos \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
-	emake install_prefix="${D}" install
-
-	dodoc README{,.hacking}
-
-	use pam && fperms 755 /usr/bin/${PN}
-	pamd_mimic_system ${PN} auth
-
-	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
@ 2016-08-13  8:18 Jeroen Roovers
  0 siblings, 0 replies; 19+ messages in thread
From: Jeroen Roovers @ 2016-08-13  8:18 UTC (permalink / raw
  To: gentoo-commits

commit:     6582e5f33b96f915ab2ff92aadec6bc46c0c5741
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 13 08:17:19 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 08:18:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6582e5f3

x11-misc/xscreensaver: Add USE=offensive (bug #591146 by godzil).

Package-Manager: portage-2.3.0

 .../xscreensaver-5.20-blurb-hndl-test-passwd.patch |   4 +-
 .../xscreensaver-5.20-test-passwd-segv-tty.patch   |   4 +-
 .../files/xscreensaver-5.20-tests-miscfix.patch    |   8 +-
 .../files/xscreensaver-5.35-gentoo.patch           |  47 +++++++
 .../files/xscreensaver-5.35-offensive.patch        |  59 +++++++++
 x11-misc/xscreensaver/xscreensaver-5.35-r1.ebuild  | 145 +++++++++++++++++++++
 6 files changed, 259 insertions(+), 8 deletions(-)

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-blurb-hndl-test-passwd.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-blurb-hndl-test-passwd.patch
index bfd48d1..1f24953 100644
--- a/x11-misc/xscreensaver/files/xscreensaver-5.20-blurb-hndl-test-passwd.patch
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.20-blurb-hndl-test-passwd.patch
@@ -1,7 +1,7 @@
 http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.17-blurb-hndl-test-passwd.patch
 
---- driver/test-passwd.c
-+++ driver/test-passwd.c
+--- a/driver/test-passwd.c
++++ b/driver/test-passwd.c
 @@ -66,6 +66,7 @@
  Bool update_screen_layout (saver_info *si) { return 0; }
  

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-test-passwd-segv-tty.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-test-passwd-segv-tty.patch
index ab5deeb..bc7f58b 100644
--- a/x11-misc/xscreensaver/files/xscreensaver-5.20-test-passwd-segv-tty.patch
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.20-test-passwd-segv-tty.patch
@@ -1,7 +1,7 @@
 http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.12-test-passwd-segv-tty.patch
 
---- driver/passwd.c
-+++ driver/passwd.c
+--- a/driver/passwd.c
++++ b/driver/passwd.c
 @@ -205,7 +205,7 @@
  {
  # ifdef HAVE_SYSLOG

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-tests-miscfix.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-tests-miscfix.patch
index 995b4ea..32fb638 100644
--- a/x11-misc/xscreensaver/files/xscreensaver-5.20-tests-miscfix.patch
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.20-tests-miscfix.patch
@@ -1,7 +1,7 @@
 http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.12-tests-miscfix.patch
 
---- driver/test-xdpms.c
-+++ driver/test-xdpms.c
+--- a/driver/test-xdpms.c
++++ a/driver/test-xdpms.c
 @@ -29,7 +29,6 @@
  
  #include <X11/Xproto.h>
@@ -10,8 +10,8 @@ http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.12-tests
  
  extern Bool DPMSQueryExtension (Display *dpy, int *event_ret, int *error_ret);
  extern Bool DPMSCapable (Display *dpy);
---- driver/Makefile.in
-+++ driver/Makefile.in
+--- a/driver/Makefile.in
++++ a/driver/Makefile.in
 @@ -850,7 +850,7 @@
  test-mlstring: test-mlstring.o
  	$(CC) -DTEST $(LDFLAGS) -o $@ test-mlstring.o $(SAVER_LIBS)

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.35-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.35-gentoo.patch
new file mode 100644
index 0000000..881869f
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.35-gentoo.patch
@@ -0,0 +1,47 @@
+--- a/driver/XScreenSaver.ad.in
++++ b/driver/XScreenSaver.ad.in
+@@ -31,21 +31,21 @@
+ *mode:			random
+ *timeout:		0:10:00
+ *cycle:			0:10:00
+-*lockTimeout:		0:00:00
++*lockTimeout:		0:30:00
+ *passwdTimeout:		0:00:30
+-*dpmsEnabled:		False
++*dpmsEnabled:		True
+ *dpmsQuickoffEnabled:	False
+ *dpmsStandby:		2:00:00
+ *dpmsSuspend:		2:00:00
+ *dpmsOff:		4:00:00
+-*grabDesktopImages:	True
++*grabDesktopImages:	False
+ *grabVideoFrames:	False
+ *chooseRandomImages:	@DEFAULT_IMAGES_P@
+ ! This can be a local directory name, or the URL of an RSS or Atom feed.
+ *imageDirectory:	@DEFAULT_IMAGE_DIRECTORY@
+ *nice:			10
+ *memoryLimit:		0
+-*lock:			False
++*lock:			True
+ *verbose:		False
+ *timestamp:		True
+ *fade:			True
+@@ -63,7 +63,7 @@
+ *textLiteral:		XScreenSaver
+ *textFile:		@DEFAULT_TEXT_FILE@
+ *textProgram:		fortune
+-*textURL:		https://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss
++*textURL:		https://planet.gentoo.org/rss20.xml
+ 
+ *overlayTextForeground:	#FFFF00
+ *overlayTextBackground:	#000000
+@@ -123,7 +123,8 @@
+ 
+ ! The format used for printing the date and time in the password dialog box
+ ! (see the strftime(3) manual page for details.)
+-*dateFormat:		%d-%b-%y (%a); %I:%M %p
++!*dateFormat:		%d-%b-%y (%a); %I:%M %p
++*dateFormat:		%x %X
+ ! To show the time only:
+ ! *dateFormat:		%I:%M %p
+ ! For 24 hour time:

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.35-offensive.patch b/x11-misc/xscreensaver/files/xscreensaver-5.35-offensive.patch
new file mode 100644
index 0000000..91ce780
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.35-offensive.patch
@@ -0,0 +1,59 @@
+--- a/hacks/barcode.c
++++ a/hacks/barcode.c
+@@ -131,7 +131,6 @@
+   "children",
+   "chocolate",
+   "CLONE",
+-  "cock",
+   "constriction",
+   "contrition",
+   "cop",
+@@ -265,7 +264,6 @@
+   "punishment",
+   "punk rock",
+   "punk",
+-  "pussy",
+   "quagmire",
+   "quarantine",
+   "quartz",
+@@ -333,8 +331,6 @@
+   "vegetarian",
+   "venom",
+   "verifiability",
+-  "viagra",
+-  "vibrator",
+   "victim",
+   "vignette",
+   "villainy",
+--- a/hacks/glx/glsnake.c
++++ a/hacks/glx/glsnake.c
+@@ -565,17 +565,17 @@
+ 	ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
+ 	ZERO, PIN, ZERO }
+     },
+-    { "erect penis",     /* thanks benno */
++    { "shuffle board",     /* thanks benno */
+       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
+ 	PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO,
+ 	ZERO, ZERO }
+     },
+-    { "flaccid penis",
++    { "flaccid anchor",
+       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
+ 	PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO,
+ 	ZERO, ZERO }
+     },
+-    { "vagina",
++    { "engagement ring",
+       { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO,
+ 	LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT,
+ 	PIN, RIGHT, ZERO }
+@@ -995,7 +995,7 @@
+     { "Parrot",
+         { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO }
+     },
+-    { "Penis",
++    { "Shuttle",
+         { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO }
+     },
+     { "PictureComingSoon",

diff --git a/x11-misc/xscreensaver/xscreensaver-5.35-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.35-r1.ebuild
new file mode 100644
index 0000000..a7554da
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.35-r1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils flag-o-matic multilib pam
+
+DESCRIPTION="A modular screen saver and locker for the X Window System"
+HOMEPAGE="http://www.jwz.org/xscreensaver/"
+SRC_URI="
+	http://www.jwz.org/xscreensaver/${P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
+
+COMMON_DEPEND="
+	>=gnome-base/libglade-2
+	dev-libs/libxml2
+	media-libs/netpbm
+	x11-apps/appres
+	x11-apps/xwininfo
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	jpeg? ( virtual/jpeg:0 )
+	new-login? (
+		gdm? ( gnome-base/gdm )
+		!gdm? ( || ( x11-misc/lightdm kde-base/kdm ) )
+		)
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	pam? ( virtual/pam )
+	xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
+RDEPEND="
+	${COMMON_DEPEND}
+	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-proto/recordproto
+	x11-proto/scrnsaverproto
+	x11-proto/xextproto
+	x11-proto/xf86miscproto
+	x11-proto/xf86vidmodeproto
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+src_prepare() {
+	sed -i configure.in -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{,.in} || die
+	fi
+
+	eapply \
+		"${FILESDIR}"/${PN}-5.05-interix.patch \
+		"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \
+		"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \
+		"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \
+		"${FILESDIR}"/${PN}-5.28-comment-style.patch \
+		"${FILESDIR}"/${PN}-5.31-pragma.patch \
+		"${FILESDIR}"/${PN}-5.35-comments.patch \
+		"${FILESDIR}"/${PN}-5.35-gentoo.patch
+
+	use offensive || eapply "${FILESDIR}"/${PN}-5.35-offensive.patch
+
+	eapply_user
+
+	eautoconf
+	eautoheader
+}
+
+src_configure() {
+	if use ppc || use ppc64; then
+		filter-flags -maltivec -mabi=altivec
+		append-flags -U__VEC__
+	fi
+
+	unset BC_ENV_ARGS #24568
+	export RPM_PACKAGE_VERSION=no #368025
+
+	econf \
+		$(use_with jpeg) \
+		$(use_with new-login login-manager) \
+		$(use_with opengl gl) \
+		$(use_with pam) \
+		$(use_with suid setuid-hacks) \
+		$(use_with xinerama xinerama-ext) \
+		--enable-locking \
+		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
+		--with-dpms-ext \
+		--with-gtk \
+		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
+		--with-pixbuf \
+		--with-proc-interrupts \
+		--with-randr-ext \
+		--with-text-file="${EPREFIX}"/etc/gentoo-release \
+		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
+		--with-xdbe-ext \
+		--with-xf86gamma-ext \
+		--with-xf86vmode-ext \
+		--with-xinput-ext \
+		--with-xshm-ext \
+		--without-gle \
+		--without-kerberos \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	emake install_prefix="${D}" install
+
+	dodoc README{,.hacking}
+
+	use pam && fperms 755 /usr/bin/${PN}
+	pamd_mimic_system ${PN} auth
+
+	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}


^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/
@ 2015-11-08  6:09 Jeroen Roovers
  0 siblings, 0 replies; 19+ messages in thread
From: Jeroen Roovers @ 2015-11-08  6:09 UTC (permalink / raw
  To: gentoo-commits

commit:     a636150b0c8803fbcf5055ef7ddec77c473d5ed6
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  8 06:08:34 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Nov  8 06:08:34 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a636150b

x11-misc/xscreensaver: Old.

Package-Manager: portage-2.2.24

 x11-misc/xscreensaver/Manifest                     |   2 -
 .../files/xscreensaver-5.21-gentoo.patch           | 106 ---------------
 x11-misc/xscreensaver/xscreensaver-5.32.ebuild     | 142 ---------------------
 x11-misc/xscreensaver/xscreensaver-5.33.ebuild     | 142 ---------------------
 4 files changed, 392 deletions(-)

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index af968c0..18776af 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,3 +1 @@
-DIST xscreensaver-5.32.tar.gz 10571502 SHA256 4252a6079d2d2f5b342e8bdd172cbad5f0af73daf4e412b61a68344d91ca93bd SHA512 0d7f3d283998cdb2aec10c8f5e94c9cc6e28a72785c36759cee988f3592a5f8aae20ba593c8363eab8fe61f7caf325376a887cac42ecf300c60894bf20d2f75b WHIRLPOOL 1a99e36ac89cf7f3121d499da6bf06e02808465b7b500e0fc371a97df0d8e1b729bc20c57cd7fe560e151e1051e46dafc0b034cf72c343a185b1fddcf8fdb749
-DIST xscreensaver-5.33.tar.gz 10725482 SHA256 d4a0c1619219f2843fa8b68d4ae337ab0e9fcb79a6d231540adeb16b3d313f4d SHA512 a8126b165e96d89ada38c4bce0b6c6ef5769667477301f5388633d22b9aed7fa6defcd07b8768c1197556c565b8f220f75c1937e0151d66c3b8e05fbadf37d1d WHIRLPOOL d9210589b1b8263b46740b27c6fc5a64b4d2d5c69c8a7267d4650cf7ed54de1dc927e007ecb37110ead5229e0f9742181ce40b104478c9e0ec488caec07d5231
 DIST xscreensaver-5.34.tar.gz 10788657 SHA256 6fff7ec4be743e5c042647ea9687dd0cdf48d1dd5e8e15098e5018bbd02e5e27 SHA512 58d0beb6556ee77122feb04090ceed80f9ffa67070f28305a00cc42adeae678305d43594c38d00539d2f13f2474311cb82cda6fdafc2bdc918a28438d6b51e75 WHIRLPOOL c7969e5b762cbeabd0564328aefdb895acfcd1c37e2b84c628718b613ca309f4c1222103c0d6ab0fd046eb355f02ee36b11fb57b55eb72e65944ea72e4fa7419

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.21-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.21-gentoo.patch
deleted file mode 100644
index b69e197..0000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.21-gentoo.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- xscreensaver-5.21/driver/XScreenSaver.ad.in
-+++ xscreensaver-5.21/driver/XScreenSaver.ad.in
-@@ -31,21 +31,21 @@
- *mode:			random
- *timeout:		0:10:00
- *cycle:			0:10:00
--*lockTimeout:		0:00:00
-+*lockTimeout:		0:30:00
- *passwdTimeout:		0:00:30
--*dpmsEnabled:		False
-+*dpmsEnabled:		True
- *dpmsQuickoffEnabled:	False
- *dpmsStandby:		2:00:00
- *dpmsSuspend:		2:00:00
- *dpmsOff:		4:00:00
--*grabDesktopImages:	True
-+*grabDesktopImages:	False
- *grabVideoFrames:	False
- *chooseRandomImages:	@DEFAULT_IMAGES_P@
- ! This can be a local directory name, or the URL of an RSS or Atom feed.
- *imageDirectory:	@DEFAULT_IMAGE_DIRECTORY@
- *nice:			10
- *memoryLimit:		0
--*lock:			False
-+*lock:			True
- *verbose:		False
- *timestamp:		True
- *fade:			True
-@@ -62,7 +62,7 @@
- *textLiteral:		XScreenSaver
- *textFile:		@DEFAULT_TEXT_FILE@
- *textProgram:		fortune
--*textURL:		http://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss
-+*textURL:		http://planet.gentoo.org/rss20.xml
- 
- *overlayTextForeground:	#FFFF00
- *overlayTextBackground:	#000000
-@@ -122,7 +122,8 @@
- 
- ! The format used for printing the date and time in the password dialog box
- ! (see the strftime(3) manual page for details.)
--*dateFormat:		%d-%b-%y (%a); %I:%M %p
-+!*dateFormat:		%d-%b-%y (%a); %I:%M %p
-+*dateFormat:           %x %X
- ! To show the time only:
- ! *dateFormat:		%I:%M %p
- ! For 24 hour time:
---- xscreensaver-5.21/hacks/barcode.c
-+++ xscreensaver-5.21/hacks/barcode.c
-@@ -131,7 +131,6 @@
-   "children",
-   "chocolate",
-   "CLONE",
--  "cock",
-   "constriction",
-   "contrition",
-   "cop",
-@@ -265,7 +264,6 @@
-   "punishment",
-   "punk rock",
-   "punk",
--  "pussy",
-   "quagmire",
-   "quarantine",
-   "quartz",
-@@ -333,8 +331,6 @@
-   "vegetarian",
-   "venom",
-   "verifiability",
--  "viagra",
--  "vibrator",
-   "victim",
-   "vignette",
-   "villainy",
---- xscreensaver-5.21/hacks/glx/glsnake.c
-+++ xscreensaver-5.21/hacks/glx/glsnake.c
-@@ -565,17 +565,17 @@
- 	ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, PIN, ZERO }
-     },
--    { "erect penis",     /* thanks benno */
-+    { "shuffle board",     /* thanks benno */
-       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
- 	PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, ZERO }
-     },
--    { "flaccid penis",
-+    { "flaccid anchor",
-       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
- 	PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, ZERO }
-     },
--    { "vagina",
-+    { "engagement ring",
-       { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO,
- 	LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT,
- 	PIN, RIGHT, ZERO }
-@@ -995,7 +995,7 @@
-     { "Parrot",
-         { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO }
-     },
--    { "Penis",
-+    { "Shuttle",
-         { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO }
-     },
-     { "PictureComingSoon",

diff --git a/x11-misc/xscreensaver/xscreensaver-5.32.ebuild b/x11-misc/xscreensaver/xscreensaver-5.32.ebuild
deleted file mode 100644
index 9078622..0000000
--- a/x11-misc/xscreensaver/xscreensaver-5.32.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils flag-o-matic multilib pam
-
-DESCRIPTION="A modular screen saver and locker for the X Window System"
-HOMEPAGE="http://www.jwz.org/xscreensaver/"
-SRC_URI="
-	http://www.jwz.org/xscreensaver/${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="gdm jpeg new-login opengl pam +perl selinux suid xinerama"
-
-COMMON_DEPEND="
-	>=gnome-base/libglade-2
-	dev-libs/libxml2
-	media-libs/netpbm
-	x11-apps/appres
-	x11-apps/xwininfo
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXt
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	jpeg? ( virtual/jpeg:0 )
-	new-login? (
-		gdm? ( gnome-base/gdm )
-		!gdm? ( || ( x11-misc/lightdm kde-base/kdm ) )
-		)
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	pam? ( virtual/pam )
-	xinerama? ( x11-libs/libXinerama )
-"
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
-RDEPEND="
-	${COMMON_DEPEND}
-	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-proto/recordproto
-	x11-proto/scrnsaverproto
-	x11-proto/xextproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	xinerama? ( x11-proto/xineramaproto )
-"
-
-src_prepare() {
-	sed -i configure.in -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{,.in} || die
-	fi
-
-	epatch \
-		"${FILESDIR}"/${PN}-5.21-gentoo.patch \
-		"${FILESDIR}"/${PN}-5.05-interix.patch \
-		"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \
-		"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \
-		"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \
-		"${FILESDIR}"/${PN}-5.28-comment-style.patch \
-		"${FILESDIR}"/${PN}-5.31-pragma.patch
-
-	epatch_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use ppc || use ppc64; then
-		filter-flags -maltivec -mabi=altivec
-		append-flags -U__VEC__
-	fi
-
-	unset BC_ENV_ARGS #24568
-	export RPM_PACKAGE_VERSION=no #368025
-
-	econf \
-		$(use_with jpeg) \
-		$(use_with new-login login-manager) \
-		$(use_with opengl gl) \
-		$(use_with pam) \
-		$(use_with suid setuid-hacks) \
-		$(use_with xinerama xinerama-ext) \
-		--enable-locking \
-		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
-		--with-dpms-ext \
-		--with-gtk \
-		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
-		--with-pixbuf \
-		--with-proc-interrupts \
-		--with-randr-ext \
-		--with-text-file="${EPREFIX}"/etc/gentoo-release \
-		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
-		--with-xdbe-ext \
-		--with-xf86gamma-ext \
-		--with-xf86vmode-ext \
-		--with-xinput-ext \
-		--with-xshm-ext \
-		--without-gle \
-		--without-kerberos \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
-	emake install_prefix="${D}" install
-
-	dodoc README{,.hacking}
-
-	use pam && fperms 755 /usr/bin/${PN}
-	pamd_mimic_system ${PN} auth
-
-	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}

diff --git a/x11-misc/xscreensaver/xscreensaver-5.33.ebuild b/x11-misc/xscreensaver/xscreensaver-5.33.ebuild
deleted file mode 100644
index 3a4a844..0000000
--- a/x11-misc/xscreensaver/xscreensaver-5.33.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils flag-o-matic multilib pam
-
-DESCRIPTION="A modular screen saver and locker for the X Window System"
-HOMEPAGE="http://www.jwz.org/xscreensaver/"
-SRC_URI="
-	http://www.jwz.org/xscreensaver/${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="gdm jpeg new-login opengl pam +perl selinux suid xinerama"
-
-COMMON_DEPEND="
-	>=gnome-base/libglade-2
-	dev-libs/libxml2
-	media-libs/netpbm
-	x11-apps/appres
-	x11-apps/xwininfo
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXt
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	jpeg? ( virtual/jpeg:0 )
-	new-login? (
-		gdm? ( gnome-base/gdm )
-		!gdm? ( || ( x11-misc/lightdm kde-base/kdm ) )
-		)
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	pam? ( virtual/pam )
-	xinerama? ( x11-libs/libXinerama )
-"
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
-RDEPEND="
-	${COMMON_DEPEND}
-	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-proto/recordproto
-	x11-proto/scrnsaverproto
-	x11-proto/xextproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	xinerama? ( x11-proto/xineramaproto )
-"
-
-src_prepare() {
-	sed -i configure.in -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{,.in} || die
-	fi
-
-	epatch \
-		"${FILESDIR}"/${PN}-5.33-gentoo.patch \
-		"${FILESDIR}"/${PN}-5.05-interix.patch \
-		"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \
-		"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \
-		"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \
-		"${FILESDIR}"/${PN}-5.28-comment-style.patch \
-		"${FILESDIR}"/${PN}-5.31-pragma.patch
-
-	epatch_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use ppc || use ppc64; then
-		filter-flags -maltivec -mabi=altivec
-		append-flags -U__VEC__
-	fi
-
-	unset BC_ENV_ARGS #24568
-	export RPM_PACKAGE_VERSION=no #368025
-
-	econf \
-		$(use_with jpeg) \
-		$(use_with new-login login-manager) \
-		$(use_with opengl gl) \
-		$(use_with pam) \
-		$(use_with suid setuid-hacks) \
-		$(use_with xinerama xinerama-ext) \
-		--enable-locking \
-		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
-		--with-dpms-ext \
-		--with-gtk \
-		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
-		--with-pixbuf \
-		--with-proc-interrupts \
-		--with-randr-ext \
-		--with-text-file="${EPREFIX}"/etc/gentoo-release \
-		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
-		--with-xdbe-ext \
-		--with-xf86gamma-ext \
-		--with-xf86vmode-ext \
-		--with-xinput-ext \
-		--with-xshm-ext \
-		--without-gle \
-		--without-kerberos \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
-	emake install_prefix="${D}" install
-
-	dodoc README{,.hacking}
-
-	use pam && fperms 755 /usr/bin/${PN}
-	pamd_mimic_system ${PN} auth
-
-	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}


^ permalink raw reply related	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2023-09-06 10:51 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-30  9:40 [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/, x11-misc/xscreensaver/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2023-09-06 10:51 Florian Schmaus
2023-05-29 18:21 Sam James
2022-12-25 22:26 Ulrich Müller
2022-12-16 20:19 Sebastian Pipping
2022-03-12  0:10 Sam James
2021-09-05  5:16 Jakov Smolić
2021-07-25  7:08 Ulrich Müller
2021-07-17 22:17 Sebastian Pipping
2021-06-13 11:44 Sebastian Pipping
2021-06-11 15:36 Sebastian Pipping
2021-03-12 20:33 Sebastian Pipping
2021-03-12 17:14 Sebastian Pipping
2020-07-23 10:42 Jeroen Roovers
2020-05-03  1:35 Matt Turner
2020-03-22  8:05 Jeroen Roovers
2020-03-21  6:39 Jeroen Roovers
2016-08-13  8:18 Jeroen Roovers
2015-11-08  6:09 Jeroen Roovers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox