xorg-x11: Sync with upstream.

[gentoo-fixes.git] / x11-base / xorg-x11 / xorg-x11-7.4-r3.ebuild

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