*/*: Depend on >=x11-apps/mkfontscale-1.2.0 instead of x11-apps/mkfontdir.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Signed-off-by: Matt Turner <mattst88@gentoo.org>

diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
index ca290fb74bb19b2550c126def27f05e7e723901d..6eb911c30a14955393f9ec1aa8fb9432c1c9ccb5 100644 (file)
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
@@ -28,7 +28,7 @@ RDEPEND="X? ( x11-libs/libX11
                x11-apps/xset
                x11-apps/xlsfonts
                x11-apps/bdftopcf
-               x11-apps/mkfontdir )
+               >=x11-apps/mkfontscale-1.2.0 )
        svga? ( media-libs/svgalib )
        gpm? ( sys-libs/gpm )
        alsa? ( media-libs/alsa-lib )

diff --git a/app-emulation/vice/vice-3.1.ebuild b/app-emulation/vice/vice-3.1.ebuild
index e5b69137fe9b87af18a06408eb8bbe2fd56ef0ef..083344470e3c0302ae2ad402ee1b079de3605995 100644 (file)
--- a/app-emulation/vice/vice-3.1.ebuild
+++ b/app-emulation/vice/vice-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -72,7 +72,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
        media-libs/fontconfig
        x11-apps/bdftopcf
-       x11-apps/mkfontdir
+       >=x11-apps/mkfontscale-1.2.0
        x11-base/xorg-proto
        virtual/pkgconfig
        nls? ( sys-devel/gettext )

diff --git a/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild b/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild
index 86d198d57acd80137291e83a5bb80331b8905c30..2c2b301e60adf6dace5508e18a3ab5c384bdd690 100644 (file)
--- a/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild
+++ b/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 IUSE="X"
 
 DEPEND="
-       X? ( x11-apps/mkfontdir )
+       X? ( >=x11-apps/mkfontscale-1.2.0 )
        sys-libs/ncurses:0="
 
 RDEPEND="${DEPEND}"

diff --git a/app-misc/cmatrix/cmatrix-1.2a-r4.ebuild b/app-misc/cmatrix/cmatrix-1.2a-r4.ebuild
index c500c953e5d717e4927692b05428adbcc0fdf6a5..7caf29f9a2ee179777e9445ba9077269a2074d92 100644 (file)
--- a/app-misc/cmatrix/cmatrix-1.2a-r4.ebuild
+++ b/app-misc/cmatrix/cmatrix-1.2a-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="X"
 
 DEPEND="
-       X? ( x11-apps/mkfontdir )
+       X? ( >=x11-apps/mkfontscale-1.2.0 )
        sys-libs/ncurses:0="
 
 RDEPEND="${DEPEND}"

diff --git a/games-roguelike/nethack/nethack-3.6.0-r3.ebuild b/games-roguelike/nethack/nethack-3.6.0-r3.ebuild
index e925cc23d4bcf62e9591e2467bbd26bd7a899266..0d5d90745b732ba76857f6298719d2fbab06570f 100644 (file)
--- a/games-roguelike/nethack/nethack-3.6.0-r3.ebuild
+++ b/games-roguelike/nethack/nethack-3.6.0-r3.ebuild
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}
        X? (
                x11-base/xorg-proto
                x11-apps/bdftopcf
-               x11-apps/mkfontdir
+               >=x11-apps/mkfontscale-1.2.0
        )"
 
 BINDIR="/usr/bin"

diff --git a/games-roguelike/nethack/nethack-3.6.1.ebuild b/games-roguelike/nethack/nethack-3.6.1.ebuild
index 96361cc4c9974314d3c07fc4f58925cb41305b45..260b50750f985c0f354dc756781542a79053fcc9 100644 (file)
--- a/games-roguelike/nethack/nethack-3.6.1.ebuild
+++ b/games-roguelike/nethack/nethack-3.6.1.ebuild
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 BDEPEND="virtual/pkgconfig
        X? (
                x11-apps/bdftopcf
-               x11-apps/mkfontdir
+               >=x11-apps/mkfontscale-1.2.0
        )"
 
 src_prepare() {

diff --git a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.1-r2.ebuild b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.1-r2.ebuild
index 8bf97ee3051bea32c0d5a8e49efab5df5b834a86..1a59d99508c4165b2a4b3a8329dd513851ab762f 100644 (file)
--- a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.1-r2.ebuild
+++ b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -10,7 +10,7 @@ SRC_URI="http://koi8.pp.ru/dist/x6rus-${PV}-bin.tgz"
 KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
 SLOT="0"
 LICENSE="freedist"
-DEPEND="x11-apps/mkfontdir"
+DEPEND=">=x11-apps/mkfontscale-1.2.0"
 RDEPEND=""
 IUSE=""
 

diff --git a/media-fonts/dejavu/dejavu-2.35.ebuild b/media-fonts/dejavu/dejavu-2.35.ebuild
index 231aff9c53c40d2134db03bc0dc230f4bc087339..0a0e131e07942db4807dbe01907f6b8b01674e60 100644 (file)
--- a/media-fonts/dejavu/dejavu-2.35.ebuild
+++ b/media-fonts/dejavu/dejavu-2.35.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -28,9 +28,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="fontforge"
 
-DEPEND="fontforge? ( x11-apps/mkfontscale
+DEPEND="fontforge? ( >=x11-apps/mkfontscale-1.2.0
                >=media-gfx/fontforge-20080429
-               x11-apps/mkfontdir
                dev-perl/Font-TTF
                app-i18n/unicode-data
                >media-libs/fontconfig-2.6.0 )"

diff --git a/media-fonts/dejavu/dejavu-2.37.ebuild b/media-fonts/dejavu/dejavu-2.37.ebuild
index 2fbef3de226c67d82e6737c49c5357e9e1a5c462..f46826227e591fe43d2598a024915cf6cf4c66bf 100644 (file)
--- a/media-fonts/dejavu/dejavu-2.37.ebuild
+++ b/media-fonts/dejavu/dejavu-2.37.ebuild
@@ -29,9 +29,8 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~am
 IUSE="fontforge"
 
 DEPEND="fontforge? (
-               x11-apps/mkfontscale
+               >=x11-apps/mkfontscale-1.2.0
                >=media-gfx/fontforge-20080429
-               x11-apps/mkfontdir
                dev-perl/Font-TTF
                app-i18n/unicode-data
                >media-libs/fontconfig-2.6.0:1.0 )

diff --git a/media-fonts/intlfonts/intlfonts-1.2.1.ebuild b/media-fonts/intlfonts/intlfonts-1.2.1.ebuild
index 7d5465ee4446fb30c7cddd59dd7f6909bccd59f5..8d3c3fe2dc78f352ff1d5ddca7880a9ebb2389c2 100644 (file)
--- a/media-fonts/intlfonts/intlfonts-1.2.1.ebuild
+++ b/media-fonts/intlfonts/intlfonts-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 
 DEPEND="x11-apps/bdftopcf
-               x11-apps/mkfontdir"
+               >=x11-apps/mkfontscale-1.2.0"
 RDEPEND=""
 
 src_compile() {

diff --git a/media-fonts/monafont/monafont-2.90-r2.ebuild b/media-fonts/monafont/monafont-2.90-r2.ebuild
index d6f100c47b5d63dd34970e00e8096f8beae7ac92..8a7b62dca1db4802b23ca37c841a718cb52dc996 100644 (file)
--- a/media-fonts/monafont/monafont-2.90-r2.ebuild
+++ b/media-fonts/monafont/monafont-2.90-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -18,7 +18,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE="truetype"
 
 DEPEND="x11-apps/bdftopcf
-               x11-apps/mkfontdir
+               >=x11-apps/mkfontscale-1.2.0
                dev-lang/perl
                >=sys-apps/sed-4
                app-arch/unzip"

diff --git a/media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild b/media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild
index 925a07acbc80612d42c44589835a7e958e8de5a4..261dc72e5590d2784c6363fa427759ba651580e0 100644 (file)
--- a/media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild
+++ b/media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="X"
 
-DEPEND="x11-apps/mkfontdir
+DEPEND=">=x11-apps/mkfontscale-1.2.0
        x11-apps/bdftopcf"
 RDEPEND=""
 

diff --git a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild
index 1f561ed25693c273ffe087e1f1eea1b8e380a4a2..141bb113529251f45dfede0a4bebff7d49436c09 100644 (file)
--- a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild
+++ b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -16,7 +16,7 @@ KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
 IUSE=""
 
 DEPEND="x11-misc/imake
-       x11-apps/mkfontdir
+       >=x11-apps/mkfontscale-1.2.0
        x11-apps/bdftopcf"
 RDEPEND=""
 

diff --git a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
index 135458920e9d9437e1e7971fa75fdde2c5fce703..925a0919dd8ebcbeae609031b3119da296507a7a 100644 (file)
--- a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
+++ b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~alpha amd64 ~arm ~ia64 ppc s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND="x11-misc/imake
-       x11-apps/mkfontdir
+       >=x11-apps/mkfontscale-1.2.0
        x11-apps/bdftopcf"
 RDEPEND=""
 

diff --git a/net-misc/suite3270/suite3270-3.5_p10.ebuild b/net-misc/suite3270/suite3270-3.5_p10.ebuild
index 8f3125ae488de991bb2eb5894411112b846e8b95..887b8223af5c750d020aa96cada37ec508476e3e 100644 (file)
--- a/net-misc/suite3270/suite3270-3.5_p10.ebuild
+++ b/net-misc/suite3270/suite3270-3.5_p10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -41,7 +41,7 @@ DEPEND="${RDEPEND}
                x11-base/xorg-proto
                x11-misc/xbitmaps
                app-text/rman
-               x11-apps/mkfontdir
+               >=x11-apps/mkfontscale-1.2.0
                x11-apps/bdftopcf
        )"
 

diff --git a/net-misc/suite3270/suite3270-3.5_p12.ebuild b/net-misc/suite3270/suite3270-3.5_p12.ebuild
index 8f3125ae488de991bb2eb5894411112b846e8b95..887b8223af5c750d020aa96cada37ec508476e3e 100644 (file)
--- a/net-misc/suite3270/suite3270-3.5_p12.ebuild
+++ b/net-misc/suite3270/suite3270-3.5_p12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -41,7 +41,7 @@ DEPEND="${RDEPEND}
                x11-base/xorg-proto
                x11-misc/xbitmaps
                app-text/rman
-               x11-apps/mkfontdir
+               >=x11-apps/mkfontscale-1.2.0
                x11-apps/bdftopcf
        )"
 

diff --git a/net-misc/suite3270/suite3270-3.6_p4.ebuild b/net-misc/suite3270/suite3270-3.6_p4.ebuild
index f842aa368b8c9849f16d4a5a2bb2608bd2115264..3b9de305c879634ee364c072c26fe016f03b98a5 100644 (file)
--- a/net-misc/suite3270/suite3270-3.6_p4.ebuild
+++ b/net-misc/suite3270/suite3270-3.6_p4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -41,7 +41,7 @@ DEPEND="${RDEPEND}
                x11-base/xorg-proto
                x11-misc/xbitmaps
                app-text/rman
-               x11-apps/mkfontdir
+               >=x11-apps/mkfontscale-1.2.0
                x11-apps/bdftopcf
        )"
 

diff --git a/net-misc/suite3270/suite3270-3.6_p8.ebuild b/net-misc/suite3270/suite3270-3.6_p8.ebuild
index d8808e7e2afd4a9fc4dd8eaf3c2e095bf7ff7df5..f81e1979db336c171ce46e75b50e7506fa7e2170 100644 (file)
--- a/net-misc/suite3270/suite3270-3.6_p8.ebuild
+++ b/net-misc/suite3270/suite3270-3.6_p8.ebuild
@@ -41,7 +41,7 @@ DEPEND="${RDEPEND}
                x11-base/xorg-proto
                x11-misc/xbitmaps
                app-text/rman
-               x11-apps/mkfontdir
+               >=x11-apps/mkfontscale-1.2.0
                x11-apps/bdftopcf
        )"
 

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 eeaff05196d76d11d0632a81e8848613e18e2fe2..0e11f2cf8f4e7536caf74101979ea43997bf7ce3 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,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,8 +21,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