jhbuild: Move font modules before drivers

The driver metamodule was separated from the module definitions by the
font section.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Dirk Wallenstein <halsmit@t-online.de>

1 files changed, 439 insertions, 439 deletions

diff --git a/xorg.modules b/xorg.modules
index 5747ed1..4d6b344 100644
--- a/xorg.modules
+++ b/xorg.modules
@@ -1120,6 +1120,445 @@
     </dependencies>
   </metamodule>
 
+  <!-- core font support, still required for some configurations  -->
+
+  <autotools id="bdftopcf">
+    <branch module="xorg/app/bdftopcf"
+            checkoutdir="xorg/app/bdftopcf"/>
+    <dependencies>
+      <dep package="libXfont"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="mkfontscale">
+    <branch module="xorg/app/mkfontscale"
+            checkoutdir="xorg/app/mkfontscale"/>
+    <dependencies>
+      <dep package="libfontenc"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="mkfontdir">
+    <branch module="xorg/app/mkfontdir"
+            checkoutdir="xorg/app/mkfontdir"/>
+    <dependencies>
+      <dep package="mkfontscale"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-util">
+    <branch module="xorg/font/util"
+            checkoutdir="xorg/font/util"/>
+  </autotools>
+
+  <autotools id="encodings">
+    <branch module="xorg/font/encodings"
+            checkoutdir="xorg/font/encodings"/>
+    <dependencies>
+      <dep package="mkfontscale"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-adobe-100dpi">
+    <branch module="xorg/font/adobe-100dpi"
+            checkoutdir="xorg/font/adobe-100dpi"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+      <dep package="font-util"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-adobe-75dpi">
+    <branch module="xorg/font/adobe-75dpi"
+            checkoutdir="xorg/font/adobe-75dpi"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+      <dep package="font-util"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-adobe-utopia-100dpi">
+    <branch module="xorg/font/adobe-utopia-100dpi"
+            checkoutdir="xorg/font/adobe-utopia-100dpi"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+      <dep package="font-util"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-adobe-utopia-75dpi">
+    <branch module="xorg/font/adobe-utopia-75dpi"
+            checkoutdir="xorg/font/adobe-utopia-75dpi"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+      <dep package="font-util"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-adobe-utopia-type1">
+    <branch module="xorg/font/adobe-utopia-type1"
+            checkoutdir="xorg/font/adobe-utopia-type1"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+      <dep package="font-util"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-arabic-misc">
+    <branch module="xorg/font/font-arabic-misc"
+            checkoutdir="xorg/font/font-arabic-misc"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-bh-100dpi">
+    <branch module="xorg/font/font-bh-100dpi"
+            checkoutdir="xorg/font/font-bh-100dpi"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-bh-75dpi">
+    <branch module="xorg/font/font-bh-75dpi"
+            checkoutdir="xorgfont/font-bh-75dpi"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-bh-lucidatypewriter-100dpi">
+    <branch module="xorg/font/font-bh-lucidatypewriter-100dpi"
+            checkoutdir="xorgfont/font-bh-lucidatypewriter-100dpi"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-bh-lucidatypewriter-75dpi">
+    <branch module="xorg/font/font-bh-lucidatypewriter-75dpi"
+            checkoutdir="xorgfont/font-bh-lucidatypewriter-75dpi"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-bh-ttf">
+    <branch module="xorg/font/font-bh-ttf"
+            checkoutdir="xorgfont/font-bh-ttf"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-bh-type1">
+    <branch module="xorg/font/font-bh-type1"
+            checkoutdir="xorgfont/font-bh-type1"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-bitstream-100dpi">
+    <branch module="xorg/font/bitstream-100dpi"
+            checkoutdir="xorg/font/bitstream-100dpi"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-bitstream-75dpi">
+    <branch module="xorg/font/bitstream-75dpi"
+            checkoutdir="xorg/font/bitstream-75dpi"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-bitstream-type1">
+    <branch module="xorg/font/bitstream-type1"
+            checkoutdir="xorg/font/bitstream-type1"/>
+    <dependencies>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-cronyx-cyrillic">
+    <branch module="xorg/font/font-cronyx-cyrillic"
+            checkoutdir="xorg/font/font-cronyx-cyrillic"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-cursor-misc">
+    <branch module="xorg/font/cursor-misc"
+            checkoutdir="xorg/font/cursor-misc"/>
+    <dependencies>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-daewoo-misc">
+    <branch module="xorg/font/font-daewoo-misc"
+            checkoutdir="xorgfont/font-daewoo-misc"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-dec-misc">
+    <branch module="xorg/font/font-dec-misc"
+            checkoutdir="xorgfont/font-dec-misc"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-ibm-type1">
+    <branch module="xorg/font/font-ibm-type1"
+            checkoutdir="xorgfont/font-ibm-type1"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-isas-misc">
+    <branch module="xorg/font/font-isas-misc"
+            checkoutdir="xorgfont/font-isas-misc"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-jis-misc">
+    <branch module="xorg/font/font-jis-misc"
+            checkoutdir="xorgfont/font-jis-misc"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-micro-misc">
+    <branch module="xorg/font/font-micro-misc"
+            checkoutdir="xorgfont/font-micro-misc"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-misc-cyrillic">
+    <branch module="xorg/font/font-misc-cyrillic"
+            checkoutdir="xorgfont/font-misc-cyrillic"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-misc-ethiopic">
+    <branch module="xorg/font/font-misc-ethiopic"
+            checkoutdir="xorgfont/font-misc-ethiopic"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-misc-meltho">
+    <branch module="xorg/font/font-misc-meltho"
+            checkoutdir="xorgfont/font-misc-meltho"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-misc-misc">
+    <branch module="xorg/font/misc-misc"
+            checkoutdir="xorg/font/misc-misc"/>
+    <dependencies>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+      <dep package="font-util"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-mutt-misc">
+    <branch module="xorg/font/font-mutt-misc"
+            checkoutdir="xorgfont/font-mutt-misc"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-schumacher-misc">
+    <branch module="xorg/font/font-schumacher-misc"
+            checkoutdir="xorgfont/font-schumacher-misc"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-screen-cyrillic">
+    <branch module="xorg/font/font-screen-cyrillic"
+            checkoutdir="xorgfont/font-screen-cyrillic"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-sony-misc">
+    <branch module="xorg/font/font-sony-misc"
+            checkoutdir="xorgfont/font-sony-misc"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-sun-misc">
+    <branch module="xorg/font/font-sun-misc"
+            checkoutdir="xorgfont/font-sun-misc"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-winitzki-cyrillic">
+    <branch module="xorg/font/font-winitzki-cyrillic"
+            checkoutdir="xorgfont/font-winitzki-cyrillic"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-xfree86-type1">
+    <branch module="xorg/font/font-xfree86-type1"
+            checkoutdir="xorgfont/font-xfree86-type1"/>
+    <dependencies>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-alias">
+    <branch module="xorg/font/alias"
+            checkoutdir="xorg/font/alias"/>
+  </autotools>
+
+  <metamodule id="xorg-fonts">
+    <dependencies>
+      <dep package="font-util"/>
+      <dep package="encodings"/>
+      <dep package="font-adobe-100dpi"/>
+      <dep package="font-adobe-75dpi"/>
+      <dep package="font-adobe-utopia-100dpi"/>
+      <dep package="font-adobe-utopia-75dpi"/>
+      <dep package="font-adobe-utopia-type1"/>
+      <dep package="font-bitstream-100dpi"/>
+      <dep package="font-bitstream-75dpi"/>
+      <dep package="font-bitstream-type1"/>
+      <dep package="font-cursor-misc"/>
+      <dep package="font-misc-misc"/>
+      <dep package="font-alias"/>
+    </dependencies>
+  </metamodule>
+
   <!-- input drivers -->
 
   <autotools id="xf86-input-acecad">
@@ -1580,445 +2019,6 @@
     </dependencies>
   </autotools>
 
-  <!-- core font support, still required for some configurations  -->
-
-  <autotools id="bdftopcf">
-    <branch module="xorg/app/bdftopcf"
-            checkoutdir="xorg/app/bdftopcf"/>
-    <dependencies>
-      <dep package="libXfont"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="mkfontscale">
-    <branch module="xorg/app/mkfontscale"
-            checkoutdir="xorg/app/mkfontscale"/>
-    <dependencies>
-      <dep package="libfontenc"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="mkfontdir">
-    <branch module="xorg/app/mkfontdir"
-            checkoutdir="xorg/app/mkfontdir"/>
-    <dependencies>
-      <dep package="mkfontscale"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-util">
-    <branch module="xorg/font/util"
-            checkoutdir="xorg/font/util"/>
-  </autotools>
-
-  <autotools id="encodings">
-    <branch module="xorg/font/encodings"
-            checkoutdir="xorg/font/encodings"/>
-    <dependencies>
-      <dep package="mkfontscale"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-adobe-100dpi">
-    <branch module="xorg/font/adobe-100dpi"
-            checkoutdir="xorg/font/adobe-100dpi"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-      <dep package="font-util"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-adobe-75dpi">
-    <branch module="xorg/font/adobe-75dpi"
-            checkoutdir="xorg/font/adobe-75dpi"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-      <dep package="font-util"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-adobe-utopia-100dpi">
-    <branch module="xorg/font/adobe-utopia-100dpi"
-            checkoutdir="xorg/font/adobe-utopia-100dpi"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-      <dep package="font-util"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-adobe-utopia-75dpi">
-    <branch module="xorg/font/adobe-utopia-75dpi"
-            checkoutdir="xorg/font/adobe-utopia-75dpi"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-      <dep package="font-util"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-adobe-utopia-type1">
-    <branch module="xorg/font/adobe-utopia-type1"
-            checkoutdir="xorg/font/adobe-utopia-type1"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-      <dep package="font-util"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-arabic-misc">
-    <branch module="xorg/font/font-arabic-misc"
-            checkoutdir="xorg/font/font-arabic-misc"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-bh-100dpi">
-    <branch module="xorg/font/font-bh-100dpi"
-            checkoutdir="xorg/font/font-bh-100dpi"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-bh-75dpi">
-    <branch module="xorg/font/font-bh-75dpi"
-            checkoutdir="xorgfont/font-bh-75dpi"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-bh-lucidatypewriter-100dpi">
-    <branch module="xorg/font/font-bh-lucidatypewriter-100dpi"
-            checkoutdir="xorgfont/font-bh-lucidatypewriter-100dpi"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-bh-lucidatypewriter-75dpi">
-    <branch module="xorg/font/font-bh-lucidatypewriter-75dpi"
-            checkoutdir="xorgfont/font-bh-lucidatypewriter-75dpi"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-bh-ttf">
-    <branch module="xorg/font/font-bh-ttf"
-            checkoutdir="xorgfont/font-bh-ttf"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-bh-type1">
-    <branch module="xorg/font/font-bh-type1"
-            checkoutdir="xorgfont/font-bh-type1"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-bitstream-100dpi">
-    <branch module="xorg/font/bitstream-100dpi"
-            checkoutdir="xorg/font/bitstream-100dpi"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-bitstream-75dpi">
-    <branch module="xorg/font/bitstream-75dpi"
-            checkoutdir="xorg/font/bitstream-75dpi"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-bitstream-type1">
-    <branch module="xorg/font/bitstream-type1"
-            checkoutdir="xorg/font/bitstream-type1"/>
-    <dependencies>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-cronyx-cyrillic">
-    <branch module="xorg/font/font-cronyx-cyrillic"
-            checkoutdir="xorg/font/font-cronyx-cyrillic"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-cursor-misc">
-    <branch module="xorg/font/cursor-misc"
-            checkoutdir="xorg/font/cursor-misc"/>
-    <dependencies>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-daewoo-misc">
-    <branch module="xorg/font/font-daewoo-misc"
-            checkoutdir="xorgfont/font-daewoo-misc"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-dec-misc">
-    <branch module="xorg/font/font-dec-misc"
-            checkoutdir="xorgfont/font-dec-misc"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-ibm-type1">
-    <branch module="xorg/font/font-ibm-type1"
-            checkoutdir="xorgfont/font-ibm-type1"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-isas-misc">
-    <branch module="xorg/font/font-isas-misc"
-            checkoutdir="xorgfont/font-isas-misc"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-jis-misc">
-    <branch module="xorg/font/font-jis-misc"
-            checkoutdir="xorgfont/font-jis-misc"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-micro-misc">
-    <branch module="xorg/font/font-micro-misc"
-            checkoutdir="xorgfont/font-micro-misc"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-misc-cyrillic">
-    <branch module="xorg/font/font-misc-cyrillic"
-            checkoutdir="xorgfont/font-misc-cyrillic"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-misc-ethiopic">
-    <branch module="xorg/font/font-misc-ethiopic"
-            checkoutdir="xorgfont/font-misc-ethiopic"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-misc-meltho">
-    <branch module="xorg/font/font-misc-meltho"
-            checkoutdir="xorgfont/font-misc-meltho"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-misc-misc">
-    <branch module="xorg/font/misc-misc"
-            checkoutdir="xorg/font/misc-misc"/>
-    <dependencies>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-      <dep package="font-util"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-mutt-misc">
-    <branch module="xorg/font/font-mutt-misc"
-            checkoutdir="xorgfont/font-mutt-misc"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-schumacher-misc">
-    <branch module="xorg/font/font-schumacher-misc"
-            checkoutdir="xorgfont/font-schumacher-misc"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-screen-cyrillic">
-    <branch module="xorg/font/font-screen-cyrillic"
-            checkoutdir="xorgfont/font-screen-cyrillic"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-sony-misc">
-    <branch module="xorg/font/font-sony-misc"
-            checkoutdir="xorgfont/font-sony-misc"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-sun-misc">
-    <branch module="xorg/font/font-sun-misc"
-            checkoutdir="xorgfont/font-sun-misc"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-winitzki-cyrillic">
-    <branch module="xorg/font/font-winitzki-cyrillic"
-            checkoutdir="xorgfont/font-winitzki-cyrillic"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-xfree86-type1">
-    <branch module="xorg/font/font-xfree86-type1"
-            checkoutdir="xorgfont/font-xfree86-type1"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-alias">
-    <branch module="xorg/font/alias"
-            checkoutdir="xorg/font/alias"/>
-  </autotools>
-
-  <metamodule id="xorg-fonts">
-    <dependencies>
-      <dep package="font-util"/>
-      <dep package="encodings"/>
-      <dep package="font-adobe-100dpi"/>
-      <dep package="font-adobe-75dpi"/>
-      <dep package="font-adobe-utopia-100dpi"/>
-      <dep package="font-adobe-utopia-75dpi"/>
-      <dep package="font-adobe-utopia-type1"/>
-      <dep package="font-bitstream-100dpi"/>
-      <dep package="font-bitstream-75dpi"/>
-      <dep package="font-bitstream-type1"/>
-      <dep package="font-cursor-misc"/>
-      <dep package="font-misc-misc"/>
-      <dep package="font-alias"/>
-    </dependencies>
-  </metamodule>
-
   <!-- These drivers are marked unmaintained in xorg/doc/xorg-docs/MAINTAINERS and are also broken -->
   <metamodule id="xorg-unmaintained-broken-drivers">
     <dependencies>