gentoo resync : 20.03.2021

3 files changed, 3 insertions, 49 deletions

diff --git a/x11-misc/xscreensaver-app/Manifest b/x11-misc/xscreensaver-app/Manifest
index 8d078c724e07..4e190e3ad224 100644
--- a/x11-misc/xscreensaver-app/Manifest
+++ b/x11-misc/xscreensaver-app/Manifest
@@ -1,5 +1,4 @@
 AUX xscreensaver-app-2.3-configure.ac 484 BLAKE2B 3bc48e99a411b9742d3241a6d8007382367987c64b6f7358b3f021c390aab1f3c3f7958169a6e2c2d947a2fcc9312da75998dc66bf7b820a60ce734e0903b5ff SHA512 4093fb62a68f0831cf16ed69e2fd64434c0dc5381299d52743702e6992baf016a3161a7d120ddd5b3a7859f30c2e75e0e0b88d725e519b3a69130178ac0eb60d
 DIST XScreenSaver.App-2.3.tar.gz 47566 BLAKE2B 8ba867b8bd64885f7c0ed6b86adb52b2886f5b7f99c06b3993c2eca9d9ee09bf9edeaf04fe4eebe1d3d4d175acc6c00034cf3caad8c8d2318a6f671831f92a30 SHA512 eb65cd14f70e6f152fced9f073dbc7737c855f27787472d0e7e9c4caaaf59026c0977c0f27ebd55b13391ab29491f4a96878236b78716b1f15dd9b772091f290
-EBUILD xscreensaver-app-2.3-r3.ebuild 855 BLAKE2B 32c20f91e7766bfa891b9871f53135c042b30a6dbe9ed558dc4f13392b370c28b80126731c1e341b03863e55008c0cd0e9aa95420e97760fd478d55a11753f49 SHA512 d0d37f62648a09521f0e5e994f18cff63b821ad4bbf0eaeac15eac7b75dc88a4de379f94a641331e4b950aa3b1aef0bc54f49d7ca9c2c31262b3060d8f150b67
-EBUILD xscreensaver-app-2.3-r4.ebuild 864 BLAKE2B 99b2343bf86c4fa3ed634b11179037872603b6fab765b59e874a94649a92cf630fce6b4307a7b6e16088778952be4b1b58c29b66b8ebc07768478844b6c15a60 SHA512 570f5ab06a1b36dcbd591e2c08a47be0b208fca3f17d75f0c60d57a049c976edadd93662c3e96bf3253630f5ccfb09b02ea57e206b34544f55623805d949e560
+EBUILD xscreensaver-app-2.3-r4.ebuild 862 BLAKE2B cbc936ecab61abdee597ca87aafbab4d88c7b74b838dc18278ae87b67fcacd22fd4fc76419af9478e6384fd632dcbbfa7de14c0e5fd182bfbea08273a5c609c7 SHA512 b0cb0d99d357d9d5c3ec38766591256c06205e5067bd81985d54f263614eb51e587871332895f11820b4b5ca277b5853851691a65267cebb4c1f34c9f685ca51
 MISC metadata.xml 371 BLAKE2B 5f7abb08f7add4875f3976d7ca48d0dd3523a8ad25238c38ef8ccd1a0b40855a4b12292d077726de6ef5c6dccbcb128f653e461c0878ad6faf55184bd8f2a031 SHA512 86572bcaec2a3d22274e9b4cbadfbaf731082f5be3499b024338da625d29cae3deac7000f42a8582932f9f6791f1deff9c277d590180e5842934df281c289726
diff --git a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild
deleted file mode 100644
index a4de3213fff7..000000000000
--- a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools toolchain-funcs
-
-MY_PN=${PN/-a/.A}
-MY_PN=${MY_PN/xs/XS}
-MY_PN=${MY_PN/s/S}
-
-DESCRIPTION="XScreenSaver dockapp for the Window Maker window manager"
-HOMEPAGE="http://xscreensaverapp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/xscreensaverapp/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-CDEPEND="
-	x11-libs/libdockapp
-	x11-libs/libX11
-"
-DEPEND="
-	${CDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-RDEPEND="
-	${CDEPEND}
-	x11-misc/xscreensaver
-"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_prepare() {
-	rm configure.in || die
-	cp "${FILESDIR}"/${PN}-2.3-configure.ac configure.ac || die
-
-	eautoreconf
-}
-
-src_install() {
-	dobin ${MY_PN}
-	dodoc README NEWS ChangeLog TODO AUTHORS
-}
diff --git a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild
index 02dacca65c2a..9b0667e303b8 100644
--- a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild
+++ b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/project/xscreensaverapp/${MY_PN}/${PV}/${MY_PN}-${
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CDEPEND="
 	x11-libs/libdockapp