diff options
19 files changed, 31 insertions, 34 deletions
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 ca290fb74bb1..6eb911c30a14 100644 --- 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 e5b69137fe9b..083344470e3c 100644 --- 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 86d198d57acd..2c2b301e60ad 100644 --- 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 c500c953e5d7..7caf29f9a2ee 100644 --- 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 e925cc23d4bc..0d5d90745b73 100644 --- 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 96361cc4c997..260b50750f98 100644 --- 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 8bf97ee3051b..1a59d99508c4 100644 --- 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 231aff9c53c4..0a0e131e0794 100644 --- 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 2fbef3de226c..f46826227e59 100644 --- 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 7d5465ee4446..8d3c3fe2dc78 100644 --- 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 d6f100c47b5d..8a7b62dca1db 100644 --- 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 925a07acbc80..261dc72e5590 100644 --- 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 1f561ed25693..141bb1135292 100644 --- 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 135458920e9d..925a0919dd8e 100644 --- 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 8f3125ae488d..887b8223af5c 100644 --- 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 8f3125ae488d..887b8223af5c 100644 --- 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 f842aa368b8c..3b9de305c879 100644 --- 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 d8808e7e2afd..f81e1979db33 100644 --- 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 eeaff05196d7..0e11f2cf8f4e 100644 --- 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 |