gentoo (valentine's day) resync : 14.02.2021

3 files changed, 5 insertions, 38 deletions

diff --git a/x11-misc/xvfb-run/Manifest b/x11-misc/xvfb-run/Manifest
index 0b713d13c6a0..0e7dc025de5e 100644
--- a/x11-misc/xvfb-run/Manifest
+++ b/x11-misc/xvfb-run/Manifest
@@ -1,7 +1,5 @@
-DIST xorg-server_1.18.4-2.diff.gz 189089 BLAKE2B fa5270bb760a60fe0234a630afd55eb091a6637c696f26ba82427d8e305dbf634966c4ee5b230bab0205b48b490f810dd9838e4c26c5f11f0a7f5ed16732c904 SHA512 d76e2471a29a1fdc7a65aeb724f1d449ab58e9380acb7c0811d8d3d9962618205943b50c7a684bfc6b6432afe2521ae98356662a5437c78e7e3dd075d872248c
-DIST xorg-server_1.19.3-2.diff.gz 139662 BLAKE2B b88708c4358a121a6f7bd099b15711b10fd9b08c163fd12e9340c83234746ab47da695f40cf35f7b91caac1480c64364ade46b9753cdace9594c4591646bae3e SHA512 6e030aa132da920092e8b0ed9b414ec883878b84106964ba002e086f9beec821be0cd7a54f5647ca5c54b09198123d6210b8d5620e3fd68369b59cf818be4f85
+DIST xorg-server_1.20.10-2.diff.gz 152303 BLAKE2B beb1d07e86378a62bad956990ee210375c3cfa0135acd51e2756c0ddc2933d13092e400a53909a72755b3c1dfb31faa32a137c7ff719fdb8dcc23f11cca72e05 SHA512 c19e16764720b79df53b8032947ca64bb4ca0b9c380d4c2e3317c37b6fa2937815de01e82019ec93921919690c0a5ae1b59bf1fae189d8f7e9e80fb4860fd713
 DIST xorg-server_1.20.8-2.diff.gz 171769 BLAKE2B 5572320e4bc1de63ba221e5c9804d6676cc7c918d417b4069572fec4385d62b73e5636a4f17eebb1897f410e323e190dff68056abd888373df4ccdd688ed7c47 SHA512 89115023fc802a3cf2fc21fabed4499112b1e6f52967eb134795f041194b05d86c59b1477d8b9001c2935efdeb64e8a0dd281a43a6252802df2d19349972f7d7
-EBUILD xvfb-run-1.18.4_p2.ebuild 773 BLAKE2B f43e286a6a376a355c527990a3600eadb7ca7078ee4e9942aa43f8b6c4679e4fccf7521914065bbc77538a5ff18e64081acfa1367919e2920d414c13b6c6225e SHA512 078d5ce6b8a52c4917c61cfc287caac0400e6db5e44b6df8c67455330e400e3cfce0fd0cd497e7c2d5081ad19076c1ce38191b6668f64bc492a663cb3c9aae4e
-EBUILD xvfb-run-1.19.3_p2.ebuild 743 BLAKE2B 9bc489339913c6139369aacb2898c8f4d4f2e987283dd70029705d28942b88ae2e011ac08bfdf72603fcb98e907869edd5a9cd145f92205ad0fdf38e8555a12b SHA512 9cf5be301ecd7fb6aec136deb9fab6e595fa0bdc1dd7392a1c654675f341056e33c9d4118a4e8dc88955ed12f865a8e3c602bf948ab6b013183dd21f48d2a311
+EBUILD xvfb-run-1.20.10_p2.ebuild 757 BLAKE2B 480f78fea0fb293e3656ac40a94833c37cacb294c8dbeaddd6629e3c2ccc329b6f47277926d7435b41c35a33eadafb59bdda731ec006fa93465fd9c7c772f397 SHA512 7948f90a2716af559e6c8028898454dae4d4419e337163ba962e24a72f6d2fed11288a39cee3e0fdd921e1fcdf6ee57072646aa9dee56c2f7ee38a0c301cc5d3
 EBUILD xvfb-run-1.20.8_p2.ebuild 755 BLAKE2B b2e7dd470ff90c72d40a64f77f85de998f97c451cb6bde49d4ef00cd3d5a3dd211d6639f5beb4c0e1a728dba2cac6cb25542c4916a900fb41f1c9bce78b2d4c7 SHA512 07594ffef5bffc8c3eab48a278048e87ff3507480d28a927fb8e54ff25161f2e48f99e1717442a2206407ebfad50756359c2122565e2f26a296ad05881931ae4
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/x11-misc/xvfb-run/xvfb-run-1.18.4_p2.ebuild b/x11-misc/xvfb-run/xvfb-run-1.18.4_p2.ebuild
deleted file mode 100644
index 3a1d8f874660..000000000000
--- a/x11-misc/xvfb-run/xvfb-run-1.18.4_p2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_PN=xorg-server
-MY_PV=${PV/_p/-}
-DESCRIPTION="Run a command in a virtual X server environment"
-HOMEPAGE="https://packages.debian.org/sid/xvfb"
-SRC_URI="http://snapshot.debian.org/archive/debian/20160906T162237Z/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-util/patchutils"
-RDEPEND="x11-apps/xauth
-	x11-base/xorg-server[xvfb]"
-
-S="${WORKDIR}"/
-
-src_prepare() {
-	# Not in src_unpack to silence warning "'patch' call should be moved to src_prepare"
-	filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die
-}
-
-src_install() {
-	doman ${PN}.1
-	dobin ${PN}
-}
diff --git a/x11-misc/xvfb-run/xvfb-run-1.19.3_p2.ebuild b/x11-misc/xvfb-run/xvfb-run-1.20.10_p2.ebuild
index e0b3fcee16fd..8e246007a204 100644
--- a/x11-misc/xvfb-run/xvfb-run-1.19.3_p2.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-1.20.10_p2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 MY_PN=xorg-server
 MY_PV=${PV/_p/-}
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="dev-util/patchutils"