xorg-x11: Sync with upstream.

Pull in fun dependency fixes pushed to gentoo without a revision bump.

diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 26c8fdbbf1d9cc33cda7783f9d6ebeb5da4d0f33..d2306658650fb4c4e67a4459ad9897f69c03e8bf 100644 (file)
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,2 +1,2 @@
-EBUILD xorg-x11-7.4-r3.ebuild 3726 BLAKE2B 2ea33df5d00ad4ec7f0da1b71084fe593a411ff1f52ff088248112f50c8a316227b105cbf4163a4a3ab1d09cdda6f5500ebb20e2cb92271c8cd14d9b886e2067 SHA512 92b0056b981f45490fb555780b5c080ea4c52276f7c943cc021a9b52fe5f8e68d0545236f690063ef01829afe57f539791a77915041dac4c21e5caa5bfba8a97
+EBUILD xorg-x11-7.4-r3.ebuild 3797 BLAKE2B d87d8f37f7440d5171695c698a723c34bc85c24ec9565f112733e3b8de064d54fd7d94238957daca7f7f066c228dc68cbe4669c54029f79aae31c7e3e9d1db2a SHA512 1a8c057764d50bbe7ca90d2a6915409157a17d79c7e43a446421099a2803255293b57f00e92b9970044f26f9ca90f0ced1b76d01fcc0d7fb1d8e3541878db258
 MISC metadata.xml 233 BLAKE2B 275dfed53b44f8c976a9b718cfbdb421c28ad80097e632173f27a3400ce32f2eaf7f686929b486626b9aa23afa40cd49f61b975a3876a8e61e1577c3c1db9405 SHA512 a06995e9f52455988091f273b40be5bbfa56c864d45f5fe73f731f0aaa9a317804305bd87c36eaa39ffd6b6d096c1fc54559221a0e11fa56ac2f01e0b959e12e

diff --git a/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild b/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
index dc8b3b16444ce91318765f1aaf7930d192fe6e6e..d9a447ff5442fde2ac78fb3aadeee10cae0ea594 100644 (file)
--- a/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
@@ -1,11 +1,12 @@
-# Copyright © 2014,2017-2018 Nick Bowler
-# License GPLv2+: GNU General Public License version 2 or later.
+# Copyright © 2014,2017-2018,2020 Nick Bowler
+# License GPLv2+: GNU General Public License version 2 or any later version.
+# This is free software: you are free to change and redistribute it.
 # There is NO WARRANTY, to the extent permitted by law.
 #
 # This a modified version of the original ebuild from Gentoo GNU/Linux,
 # covered by the following copyright and permission notice:
 #
-#   Copyright 1999-2018 Gentoo Foundation
+#   Copyright 1999-2020 Gentoo Authors
 #   Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,8 +31,7 @@ RDEPEND="${RDEPEND}
        x11-apps/bitmap
        x11-apps/iceauth
        x11-apps/luit
-       x11-apps/mkfontdir
-       x11-apps/mkfontscale
+       >=x11-apps/mkfontscale-1.2.0
        x11-apps/sessreg
        x11-apps/setxkbmap
        x11-apps/smproxy