gentoo resync : 25.08.2020

3 files changed, 2 insertions, 78 deletions

diff --git a/xfce-extra/xfce4-screensaver/Manifest b/xfce-extra/xfce4-screensaver/Manifest
index a1b52d4a43a7..77a2cc2274d7 100644
--- a/xfce-extra/xfce4-screensaver/Manifest
+++ b/xfce-extra/xfce4-screensaver/Manifest
@@ -1,5 +1,3 @@
 DIST xfce4-screensaver-0.1.10.tar.bz2 665624 BLAKE2B 9af4a821bcbb461462cf620dbd2c064a32b904f0d6887095cd00939f857244d69612e18559c0cf0be93e9044047d0e3dba8c756acc16fe9e3e136a718beb3942 SHA512 a04842697c7a8f84ee937f0371b3d1413163b59d1a54b9adf0b904dd501d6328ab645160567ff79afbe063cc113a488567ec5d8df4d6ed2db354738275c00b2e
-DIST xfce4-screensaver-0.1.8.tar.bz2 593968 BLAKE2B 693fe6e057bc1f5f1abff67c8a0a99244d5c270ab9c9afd7945f21b6eeb2bea027448d1485dea9a9f912b5f231211878a92a882bac56f28696557e44215ce283 SHA512 4cb76272f2f94f5e265a86d3fa58de8da6167da013466a4dd2a08a2e94fafe14816ce6c5a1e635a8c07e91497ede0650c014d21b0bbac666b8a72bc5f4645f69
-EBUILD xfce4-screensaver-0.1.10.ebuild 1722 BLAKE2B 09ddd1731f79cf51e01888c2fc686fdb4e83ee49b3f9f17e566eac3096baf3e08946d19f5479b244c75d2cd0dbd2695178b7ee8035fb136a8dd5af7c7e2a81f7 SHA512 2bf42c1ed2d1a21ead341be63c0311f3f063a201d56317a0e6db5bc1c616f340b89faf599a8feb2b643370fb591e7e03645ecdd2f31fa9427014d4cf8525e322
-EBUILD xfce4-screensaver-0.1.8.ebuild 1722 BLAKE2B 70065cd642c22986718d33bae0ed0f97b08c43d71490e8c7fc6924e6d7d1b9339bbb5eedfe52926c84f3eeb585ce6d08710881a020afa456da70dfd3fe5ea988 SHA512 fae41f934f7ac0bcaedb326b813ab12def44df1cd39fb1fdd9e01fa0db41d0e2231759b74fc263ec5c2228198f19372ae9d60ebc1c54cc42d6d8637a2397a8b0
+EBUILD xfce4-screensaver-0.1.10.ebuild 1729 BLAKE2B c3b3fbe262b1b62b1cea549e320066ec28800d4c466b75d8ebd698e3222e3ed8cb1775ed3e22e77d031ef08eecbced0aad6441bf1ca479c94ca8ac0b90c70242 SHA512 8f1adef3c5dd461e2c971551260a1aafc8a5d8c3662061e66b3dfc3834fb6ce5ca0b37b4075239d15d0304ba9e190b4b4ba32d276c0e1043d3342459d9b397ee
 MISC metadata.xml 350 BLAKE2B ac551b0c67875b795ea6640c67d2a5968a7c7ad19cb12c0103a900fbca8adde364eb32110d92150b677d1fb8089fdd35dfb7cee6fc40d30633a663191d77321d SHA512 88f3dbe07292eae938727232450e5b6a2b7b54766dc095541e6afa451d1261bc0a657467a90f0815c7a3cc4db11cf667cbc5e41f7ba3cefa6354630019fd1742
diff --git a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.10.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.10.ebuild
index 53db08eb6cd7..e06a050f578c 100644
--- a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.10.ebuild
+++ b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE="consolekit elogind +locking opengl pam systemd"
 
 # Xrandr: optional but automagic
diff --git a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.8.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.8.ebuild
deleted file mode 100644
index 69e7f57368e9..000000000000
--- a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.8.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~ppc ~ppc64 x86"
-IUSE="consolekit 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:=
-	consolekit? ( sys-auth/consolekit )
-	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
-
-		$(use_with opengl libgl)
-		$(use_enable locking)
-		$(use_enable pam)
-		$(use_with consolekit console-kit)
-		$(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
-}