gentoo resync : 03.03.2021

3 files changed, 2 insertions, 87 deletions

diff --git a/xfce-extra/xfce4-screensaver/Manifest b/xfce-extra/xfce4-screensaver/Manifest
index 1d2562e88702..9ffebd033df8 100644
--- a/xfce-extra/xfce4-screensaver/Manifest
+++ b/xfce-extra/xfce4-screensaver/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-screensaver-0.1.11.tar.bz2 699642 BLAKE2B 5fbb5b5c923e82070e429fcf65c8c5b5b9b0d78cba9fd128c84490a6a0927a0620b41af7ffb7356cd13ccfe48f2e1841f90e980c4bfbd15fa8f50e0f1fed7e75 SHA512 f692e31cba00d65887b90857eb4c1075000859f85db7dac7f421cc0d9812c6e8d517fcdfcac7546a6818375f9a7222a2afb80ae7076e62953bc8dcc7af9be174
 DIST xfce4-screensaver-4.16.0.tar.bz2 687978 BLAKE2B 1656027af61a50ab97fd3d5744f0ab5f1a81353c64a2fd935a6113dbe2fce5c4b2a22c5f81f15d06d09c3b292f82afa95ce34a07facb5fffef7e6fef712cae63 SHA512 5fa0381395b48fdfb5bdd9b4cafe1ec625d0b7fb9600d59c22c42fe0248fb4b99dd18a94045df3ecdc77635f7271676329c658f25003a9d8d6f9a9a66739dbe9
-EBUILD xfce4-screensaver-0.1.11.ebuild 1771 BLAKE2B 2eebc7d87e3d6b2927414d6e227b5581ff80ad5b6b2a782e126bdf0e8ce64a0181284f52d36c8b124864d7942985222ec820a248abb215cb9a96e76f71f3e2c6 SHA512 8cdb8ae31e190e3dd55e2211bf4759b21458c239cf5afd6e3145c8612e7507e04e7eb170b38d4d326468dbdea246e9b4a416da20c5a8b1dd14141904e3da7642
-EBUILD xfce4-screensaver-4.16.0.ebuild 1782 BLAKE2B 2e1047f925629e43631ca3724fed9d0179093a836720088f26bcf5a2fede980e90ffe32d273ded1fa35a5080fb32dc82a77641f4311ed2a98fe02673ba907403 SHA512 35d81b63c433152e57683aa30e59565c3aa44d1790b867c93b1dbd7aba494d0166a9ad242f986706a07e0e2475ebeef83961153eb44b8d25d82b0c1af7e87035
+EBUILD xfce4-screensaver-4.16.0.ebuild 1781 BLAKE2B 7ceb7b284ebfb37a78ba21b76a2c281a27673729936664ba0c94b56b5d9e45d1af0e1befda4a61e326c1a6bb087221a0e157496e6680933999114306307ffcdc SHA512 23a21a6f89b7a166c0848f7123b9152712e2eaa81d75c243e2b14c51a6634223cdd4f5a4e186f858ef459a3c31e7f395a9d9d5a7aaabd812eecb4a8821701034
 MISC metadata.xml 291 BLAKE2B 533c3c70954a738e8b239f8ab6ce7b45702bf87d7151e8182ae6142cf8a1611c9d24ab4e6e95ad8d71606e802369536a669e313493e3527d6daa8d1e5a61ecdd SHA512 f86de2f82f08b0a0372ec018cdbebbf87e6c0e7e4f4e4c78c1cbeba0a2cc6ef26f17a8f84b85195961af8a690bf3eb2b45bf415be43e3d9a791e296d7f4a74e1
diff --git a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.11.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.11.ebuild
deleted file mode 100644
index 00be17a32e50..000000000000
--- a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.11.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="Screen saver and locker (port of MATE screensaver)"
-HOMEPAGE="https://git.xfce.org/apps/xfce4-screensaver/about/"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 x86"
-IUSE="elogind +locking opengl pam systemd"
-
-# Xrandr: optional but automagic
-RDEPEND="
-	>=dev-libs/dbus-glib-0.30
-	>=dev-libs/glib-2.50:2
-	>=x11-libs/gtk+-3.22:3
-	>=x11-libs/libwnck-3.20:3
-	x11-libs/libICE:=
-	x11-libs/libX11:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXext:=
-	x11-libs/libXxf86vm:=
-	>=x11-libs/libXrandr-1.3:=
-	>=x11-libs/libxklavier-5.2:=
-	>=xfce-base/garcon-0.5.0:=
-	>=xfce-base/libxfce4ui-4.12.1:=
-	>=xfce-base/libxfce4util-4.12.1:=
-	>=xfce-base/xfconf-4.12.1:=
-	elogind? ( sys-auth/elogind )
-	locking? (
-		pam? ( sys-libs/pam )
-	)
-	opengl? ( virtual/opengl )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/intltool
-	sys-apps/dbus
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		# disable docbook for now
-		ac_cv_path_XMLTO=no
-
-		# xscreensaver dirs autodetection doesn't seem to work
-		--with-xscreensaverdir=/usr/share/xscreensaver/config
-		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
-		--without-console-kit
-
-		$(use_with opengl libgl)
-		$(use_enable locking)
-		$(use_enable pam)
-		$(use_with elogind)
-		$(use_with systemd)
-	)
-
-	if use pam; then
-		myconf+=( --with-pam-auth-type=system )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-screensaver/xfce4-screensaver-4.16.0.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-4.16.0.ebuild
index 4b296841c5bb..454ebd874731 100644
--- a/xfce-extra/xfce4-screensaver/xfce4-screensaver-4.16.0.ebuild
+++ b/xfce-extra/xfce4-screensaver/xfce4-screensaver-4.16.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm64 ppc ~ppc64 x86"
 IUSE="elogind +locking opengl pam systemd"
 
 # Xrandr: optional but automagic