gentoo auto-resync : 26:12:2022 - 02:06:21

3 files changed, 0 insertions, 252 deletions

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 78539d281909..3b9a7c226501 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -3,7 +3,6 @@ AUX xscreensaver-5.45-gcc.patch 549 BLAKE2B c762b7792d2e597893b7156e1b12e52a03c8
 AUX xscreensaver-6.01-configure-install_sh.patch 307 BLAKE2B 23448fd5be2ea322bd5696026d175ca9f167835e9badd3cd9f2069187571d7d2a45e6d5a73596d3291bf7739f8288c2becda5d7a8c9c95c78c74a70bea63422d SHA512 4d4169546f316902846921c05d733d2a956eaf53b700ecdd6127825576d0e6be6ec0eeb51f49a3a80bd14e7753328783448d33f1ffb1a67fca0c39c676ff9ec4
 AUX xscreensaver-6.01-configure.ac-sandbox.patch 4010 BLAKE2B 8df5adba88e04594b18e12080be0624daccdfd6e101a762e6b3ce42f8fd8405c1c02f7beaf07405f979c959d79e804daade57cd1e087cc9adb4e96aca851ca4b SHA512 2c033fed2a48a8dae46a394624f4174ebfc33ed944ad568327823290b803a2d8812767654d7bec084bf861b731dc56840fe74286473d364ee580b48708e40549
 AUX xscreensaver-6.01-gentoo.patch 1303 BLAKE2B 8ae9f4e545eed146c08f34fe9c56a9e73721c6cbcc361792c1b3b1c529da409e6f75b8727049d83a34be40747e516ab4e86efaf15bd027651dcdbdd64fe25ef5 SHA512 60f0f841e77c42f8b8afe3c94c6ec86c72e80bc2fb771979b798e7bc8428cb1d903c72a6176f60a3c5b98e850f4bb82cec01bae87eddeb42e99ba8099a1223aa
-AUX xscreensaver-6.01-gtk-detection.patch 792 BLAKE2B c941ea71b795af827034196150732848f2c63dde71fef3c87a090da5b652336c4b3220ad4ddeaf50ad80b54ead12632515495acc9ffea31897cd03dc68684aed SHA512 0de9b48fe74964ecd9ceb9421c1a48b15e168e4b89d412162f625d3423a12b20ed8662c6893226aeaeadfc455611e1856049086b9a84625c1b38559e6e2af056
 AUX xscreensaver-6.01-interix.patch 946 BLAKE2B e5a61a4de1373195747abb8f6e6580278bb9418bc17943422969f6571d4913f27347b088aa9404b11c14662de5b6144ef555521b1cb506b4ba8cde440aa63e78 SHA512 491e2861f2fb59b9c60f2321fd7e47f8cccaa8b2e69b5e9bb56ddb7893a6304983cefbed6ac6baf984f31ddf3b85e7354fc68ecac88058bfac79c9fac16deb44
 AUX xscreensaver-6.01-non-gtk-install.patch 1780 BLAKE2B 38d2a71fb9d35d1694fac4d92b60860e9a4e53b48cbb80d22981d4cf1d76b838538e19fb390a30fb5783023c66e5aa14b03e7f9ab3ca857c1fe29c7709afb6e1 SHA512 d949fe410df79833b112f1cd7442a1ab11d68f10b2415a39feb51229b0b067612d6970e6909cafd89b28081959754c98c35f0776be2e6069771bdb9f2310bdfd
 AUX xscreensaver-6.01-without-gl-makefile.patch 862 BLAKE2B 9762e84d535b4e913c0e4da6818605d8ff6fc0c9d184ff2cdc60969fab977b603bc18b16dfab7b1124948e814d230a50cd384bfabe785ad1e38e735a5e063d0c SHA512 8b445ca766d24b23904423c8d3a561a0558eca6d4b70b242d05df4949c371e455251be5a473b07fa837505550e00ea13c3154e2efda239468bf7a2a73a063c1f
@@ -13,9 +12,7 @@ AUX xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch 891 BLAKE2B cbf7d7
 AUX xscreensaver-6.05-r2-configure-exit-codes.patch 1649 BLAKE2B 3846edb722f7b59d349d89608ca446971ec59d4179c461a28e9bb9cffd8c956c560993502d83564db49ca234cad7ce0a8dd978beae8016f07128e60db2c03746 SHA512 12e122672fbe6ee7058fb031300978a48501f21e69ad9bcd8fe745ce29f870d94524900dbc82bf8ba30f2989e1c6b8d380649ac26744b92536f1697e81fd4d90
 AUX xscreensaver-6.05-remove-update-icon-cache.patch 368 BLAKE2B a595875f69e339a52f415e664be0524929c1b64ddfa8c80bb797379c08df0ef9860e6a5f3047d069084542eb81aff40470dfcf1db3dcb7e3515a0b986495a926 SHA512 7b797ae8b0cb8ec437f968e575bb3d9fdeab6bdf1f289302c1dabffad7276d4e73c8f03f10a4d8f8a0bedd223269e03c661187ea7c018f42cd11594454350d1d
 AUX xscreensaver-6.05-teach-handsy-some-manners.patch 1820 BLAKE2B c94dbe895479b301d4bc57cf4a830b604c6b51fdf512656536c04a234e7be8f77c78ff4f91bec603ce70036b294c18d736c3b0ad9d3a14b49a627e5d1ccd6dd5 SHA512 06cbe07674a6902ca1467a72bf06f677693da0a030ecca7b880949406cfbf946ee42f5bb9daeefe4869cdad850d28b749e798b66ea890daf8c6f35c90eab9688
-DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052 SHA512 3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a
 DIST xscreensaver-6.05.1.tar.gz 26110057 BLAKE2B 97c16c9f0b2a0b4d00ddccd711b921ca683bd233bc3d07ecad38b68ff94b149a20512246dd6bae052323f00b1b433f56469c5638a031cbc65b61c2b84a0180e3 SHA512 c659a769ff71020b9f96b7e707bd1bcc667eb304179305d56b1be45eed095d650a8aa019890a0c5d444672f9dd68516c99c53b0df94cd96196d7f30a24b987e3
-EBUILD xscreensaver-6.01-r4.ebuild 5884 BLAKE2B e6e2b8f44c38c9c22181262b227bccc4fe16339c283de394de919670010ed1b0690681da990792162760ff93ff5090f9ffb2a01547c9abe25686d5726586ace9 SHA512 ded2ad6cf75c380f343b33d64ac2f3540b55fb3a91f640dd49d6f2cabae4634b17c124637e38a6ebd6425f1aeaf54092eb75f3787fbdf7f690e211f4960f3900
 EBUILD xscreensaver-6.05-r1.ebuild 6689 BLAKE2B 47b8ac61a1a7d0bd241108f3880c01f21746f8e289dac08ff7a03320f5d6f477574ae4ffb2d4d0c1e0b8ebd55b6a84280e1239ca3d0ebfa8b3ff998bd5c6a854 SHA512 797f95a790c2a8aa4b216e19eb2b41b0204f953217b97c270e516dae60bda717aacdbba93b7c1f5792a46bf1295857c8c4577bc54f480dae13f7a71b7075db5a
 EBUILD xscreensaver-6.05-r2.ebuild 6790 BLAKE2B ed364c43ae523df1f13c2050bdc18dcfcfe42abc5d886f4d143fdc302391d166d14d14a79b9994c5ec2bf04133254cc8c955d08bbc68d6e202d87bda569fdc25 SHA512 28dd09f6749bea6a11ca19ef0376ef1fafa6e335da127ce2561c718b75e07d97692ca575b53875845853e7d3a011eea928681e3d413c88434582199ce4dcc82c
 MISC metadata.xml 1346 BLAKE2B 1f3f0467a85b78d87dd72ab29c606e466ea903cfeedb2ee94e091ab628ad223ca40c5bfd1ccfe2652a561ad95904214963932f368b190affbe3aeccb8ea4a501 SHA512 918888b3144ba3dcab6469985279dc017420d1d8ede1a9e8509d97fef38513b7a828b4c298016270870e940f649a181f25e036d80352e05521300a89dbd28c7d
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
-}