commit:     b7c8e3389a7656318546f337d0b2f83b735485eb
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue May  8 21:55:05 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue May  8 22:06:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7c8e338

x11-base/xorg-x11: Add fonts USE flag

Closes: https://bugs.gentoo.org/541762

 x11-base/xorg-x11/metadata.xml           |  3 ++
 x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild | 84 ++++++++++++++++----------------
 2 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/x11-base/xorg-x11/metadata.xml b/x11-base/xorg-x11/metadata.xml
index 61b88b3e701..a0d9b5f6d24 100644
--- a/x11-base/xorg-x11/metadata.xml
+++ b/x11-base/xorg-x11/metadata.xml
@@ -6,4 +6,7 @@
        <name>X11</name>
 </maintainer>
 <longdescription>X11 implementation by X.Org Foundation</longdescription>
+<use>
+       <flag name="fonts">Install fonts from X.Org</flag>
+</use>
 </pkgmetadata>

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 04ee6d43506..8c1be663bde 100644
--- a/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.x.org/wiki/";
 LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc 
~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
+IUSE="+fonts"
 
 # Server
 RDEPEND="${RDEPEND}
@@ -72,47 +72,49 @@ RDEPEND="${RDEPEND}
 
 # Fonts
 RDEPEND="${RDEPEND}
-       media-fonts/font-adobe-100dpi
-       media-fonts/font-adobe-75dpi
-       media-fonts/font-adobe-utopia-100dpi
-       media-fonts/font-adobe-utopia-75dpi
-       media-fonts/font-adobe-utopia-type1
-       media-fonts/font-alias
-       media-fonts/font-arabic-misc
-       media-fonts/font-bh-100dpi
-       media-fonts/font-bh-75dpi
-       media-fonts/font-bh-lucidatypewriter-100dpi
-       media-fonts/font-bh-lucidatypewriter-75dpi
-       media-fonts/font-bh-ttf
-       media-fonts/font-bh-type1
-       media-fonts/font-bitstream-100dpi
-       media-fonts/font-bitstream-75dpi
-       media-fonts/font-bitstream-speedo
-       media-fonts/font-bitstream-type1
-       media-fonts/font-cronyx-cyrillic
-       media-fonts/font-cursor-misc
-       media-fonts/font-daewoo-misc
-       media-fonts/font-dec-misc
-       media-fonts/font-ibm-type1
-       media-fonts/font-isas-misc
-       media-fonts/font-jis-misc
-       media-fonts/font-micro-misc
-       media-fonts/font-misc-cyrillic
-       media-fonts/font-misc-ethiopic
-       media-fonts/font-misc-meltho
-       media-fonts/font-misc-misc
-       media-fonts/font-mutt-misc
-       media-fonts/font-schumacher-misc
-       media-fonts/font-screen-cyrillic
-       media-fonts/font-sony-misc
-       media-fonts/font-sun-misc
-       media-fonts/font-util
-       media-fonts/font-winitzki-cyrillic
-       media-fonts/font-xfree86-type1
+       fonts? (
+               media-fonts/font-adobe-100dpi
+               media-fonts/font-adobe-75dpi
+               media-fonts/font-adobe-utopia-100dpi
+               media-fonts/font-adobe-utopia-75dpi
+               media-fonts/font-adobe-utopia-type1
+               media-fonts/font-alias
+               media-fonts/font-arabic-misc
+               media-fonts/font-bh-100dpi
+               media-fonts/font-bh-75dpi
+               media-fonts/font-bh-lucidatypewriter-100dpi
+               media-fonts/font-bh-lucidatypewriter-75dpi
+               media-fonts/font-bh-ttf
+               media-fonts/font-bh-type1
+               media-fonts/font-bitstream-100dpi
+               media-fonts/font-bitstream-75dpi
+               media-fonts/font-bitstream-speedo
+               media-fonts/font-bitstream-type1
+               media-fonts/font-cronyx-cyrillic
+               media-fonts/font-cursor-misc
+               media-fonts/font-daewoo-misc
+               media-fonts/font-dec-misc
+               media-fonts/font-ibm-type1
+               media-fonts/font-isas-misc
+               media-fonts/font-jis-misc
+               media-fonts/font-micro-misc
+               media-fonts/font-misc-cyrillic
+               media-fonts/font-misc-ethiopic
+               media-fonts/font-misc-meltho
+               media-fonts/font-misc-misc
+               media-fonts/font-mutt-misc
+               media-fonts/font-schumacher-misc
+               media-fonts/font-screen-cyrillic
+               media-fonts/font-sony-misc
+               media-fonts/font-sun-misc
+               media-fonts/font-util
+               media-fonts/font-winitzki-cyrillic
+               media-fonts/font-xfree86-type1
 
-       media-fonts/font-alias
-       media-fonts/font-util
-       media-fonts/encodings
+               media-fonts/font-alias
+               media-fonts/font-util
+               media-fonts/encodings
+       )
        "
 
 DEPEND="${RDEPEND}"

Reply via email to