gentoo resync : 14.05.2020

3 files changed, 2 insertions, 123 deletions

diff --git a/mate-extra/mate-screensaver/Manifest b/mate-extra/mate-screensaver/Manifest
index cfc242b3f2e8..2b8651bd63c2 100644
--- a/mate-extra/mate-screensaver/Manifest
+++ b/mate-extra/mate-screensaver/Manifest
@@ -1,8 +1,6 @@
 AUX xss-conversion.txt 1026 BLAKE2B 4675ecb7d7ce45b28183ff503739b5d3853e8a68adfb8e4bf92274944c034d4f043c8854cc54a801ad72160bf452c645dfc5a0d35a71b967c9094f2a8464e59a SHA512 149d28bf7ff9dffe75f0a59408d91eff6537ec27a9457bf2419efe78e9b39a11796b341176e6ba4b1a183cc3ead080abe0ba85f51a3d57b0ff54dae8a3ec312a
-DIST mate-screensaver-1.22.1.tar.xz 4942928 BLAKE2B e82b6482ed9ec655bb8bea2795b0e2559cbdfcb2be5f27a2264486a2013b8234cb02292b6ca547f8812e6dc0c74646f51af8a2f8d7baf2f28bf1b688508350d5 SHA512 7ffb94d88095ff5580862fe9c958a2e4af7a424d40dc5e0f3c1da49a258035179573721fc7052710624916678e953a6347a898b53ff872a49e022987b8c02904
 DIST mate-screensaver-1.22.2.tar.xz 4943380 BLAKE2B 20d28ee7496af9fd9ac23d4f083eaee716eb97e1c3a9b921fc6b3655cfe4c6dc6e482827eb7fad40fbfd5dfb705bcac57aff3bf60e232b84562e496a7a56c354 SHA512 6d28f7261556d59af0bdb8c59ac13fc042c9c5b4cce47e7f6d4148041eb7f05d5cb062f85f05dddb51d009e4aebac31c21fc1243c0e07813adc050fede134ef3
 DIST mate-screensaver-1.24.0.tar.xz 5075860 BLAKE2B f669cb9ce1c84cdd2dd84b1c88b668ad1910102ae5d9765117d313b6ece03e535b5fdaae600d8f3315346ac1109d1316e15c0dcac5bd4a637b682fa7b5d1e22b SHA512 8947b85ab8b006a1756649131a9184e4eb8f44c563f5a1b55840aa8280820713bca1ce46fece92b5ac44a73193bfe965e8ef0d17e8e403a751807ee72c674cc0
-EBUILD mate-screensaver-1.22.1.ebuild 3101 BLAKE2B f8d6c42a50c258f13abcf4ac2d113013e521752eb63a3cae040b1464925a7eebe359de2d54bd64690dda2c4053e1fd529a348d57d6d7def5300db23c9cc5cc38 SHA512 27c2ca64c3e3840f816c5bedd27a113d62c7f0123304b0e9c0da248f263203586c7d4fe9ce83f197ae7b4af49f470af18142d345903af7084898747e035a9675
-EBUILD mate-screensaver-1.22.2.ebuild 3080 BLAKE2B 2a34a2b7a4c520a91c18d5b2e6c9840823486b7fe77f4c5ab064199c2eded10e0e1eae05e1910d2328049169bb2f03b0b0c37defed7da571a20e6e720eaa26ba SHA512 8d8e64351000e69d2d1659b708048b4b2b9f1588b01e5ef71f163046702ca2a8de4188949173ec2d9b8ebf0711e7344b75c837fbc23639670b11c5a9c0d2bc5f
+EBUILD mate-screensaver-1.22.2.ebuild 3078 BLAKE2B db76628a7d0d7b8aa85237676cfeb96d67094296b6f6b049651c96bd8eeefef6c12715f918980f332bced324ff66eff8479c0599b8c5ea48be7b39063cd4fdc7 SHA512 f3903815084ff470b88a62e3bde2a33a4c7607194bbc962cad894c4197b9485780c3d849390815a745d7b312ec3ba918a12b15d69a39c917d4b29a536d2d6f19
 EBUILD mate-screensaver-1.24.0.ebuild 3082 BLAKE2B daed17d9278b42deaa10f4aceda36ce782c5428296b2babad40dd8f865b2ca9420a9943031ee2c3ad955f876ed120f0dc7b73b1e29f66bc0d6be973e4b2ce4d0 SHA512 de201878ec7f161f77a5354c38a181609e8b92a85d679851e920c2133be6df4318ac59306bde9e59ecf5b5c690d2a5fab97e14e7969d0abb3133efbcfddd0047
 MISC metadata.xml 447 BLAKE2B febc277d7b427ae9a48c3c6e318b779f8a3fb9e27f896b17a3ebafec9bc8b03c4af3f30de7881fcc7feff674fdc0106d0b46f91d72d7267d4c4eeffb1dbe341a SHA512 29d7b99ddd69b2503d91f185679e1811403ba34443e20e2b17782878ee509565dcd62c2e3339709b3d29f568168c9c5c5a9284823d0187392220e781792b73e8
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.22.1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.22.1.ebuild
deleted file mode 100644
index 07f6449a78d0..000000000000
--- a/mate-extra/mate-screensaver/mate-screensaver-1.22.1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate readme.gentoo-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"
-
-LICENSE="GPL-2+ HPND LGPL-2+"
-SLOT="0"
-IUSE="X debug consolekit elogind kernel_linux libnotify opengl pam systemd"
-REQUIRED_USE="?? ( elogind systemd )"
-
-DOC_CONTENTS="
-	Information for converting screensavers is located in
-	/usr/share/doc/${PF}/xss-conversion.txt*
-"
-
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.71:0
-	>=dev-libs/glib-2.50:2
-	gnome-base/dconf
-	>=mate-base/libmatekbd-1.17.0
-	>=mate-base/mate-desktop-1.17.0
-	>=mate-base/mate-menus-1.21.0
-	>=sys-apps/dbus-0.30
-	>=x11-libs/gdk-pixbuf-2.14:2
-	>=x11-libs/libX11-1
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	x11-libs/libxklavier
-	x11-libs/pango
-	virtual/libintl
-	consolekit? ( sys-auth/consolekit )
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	opengl? ( virtual/opengl )
-	pam? ( gnome-base/gnome-keyring sys-libs/pam )
-	!pam? ( kernel_linux? ( sys-apps/shadow ) )
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd:= )
-	!!<gnome-extra/gnome-screensaver-3"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-session-manager-1.6"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext:*
-	x11-base/xorg-proto
-	virtual/pkgconfig:*"
-
-src_configure() {
-	local myconf=(
-		--enable-locking
-		--with-kbd-layout-indicator
-		--with-xf86gamma-ext
-		--with-xscreensaverdir=/usr/share/xscreensaver/config
-		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
-		$(use_with X x)
-		$(use_with consolekit console-kit)
-		$(use_with elogind)
-		$(use_with libnotify)
-		$(use_with opengl libgl)
-		$(use_with systemd)
-		$(use_enable debug)
-		$(use_enable pam)
-	)
-
-	mate_src_configure "${myconf[@]}"
-}
-
-src_install() {
-	mate_src_install
-
-	# Install the conversion script in the documentation.
-	dodoc "${S}"/data/migrate-xscreensaver-config.sh
-	dodoc "${S}"/data/xscreensaver-config.xsl
-	dodoc "${FILESDIR}"/xss-conversion.txt
-
-	# Non PAM users will need this suid to read the password hashes.
-	# OpenPAM users will probably need this too when
-	# https://bugzilla.gnome.org/show_bug.cgi?id=370847
-	# is fixed.
-	if ! use pam ; then
-		fperms u+s /usr/libexec/mate-screensaver-dialog
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	if has_version "<x11-base/xorg-server-1.5.3-r4" ; then
-		ewarn "You have a too old xorg-server installation. This will cause"
-		ewarn "mate-screensaver to eat up your CPU. Please consider upgrading."
-		echo
-	fi
-
-	if has_version "<x11-misc/xscreensaver-4.22-r2" ; then
-		ewarn "You have xscreensaver installed, you probably want to disable it."
-		ewarn "To prevent a duplicate screensaver entry in the menu, you need to"
-		ewarn "build xscreensaver with -gnome in the USE flags."
-		ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
-		echo
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.22.2.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.22.2.ebuild
index 5c25978f5d74..fbe8e82d393e 100644
--- a/mate-extra/mate-screensaver/mate-screensaver-1.22.2.ebuild
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.22.2.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate readme.gentoo-r1
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"