[PATCH modular 10/15] jhbuild: Move font modules before drivers

Dan Nicholson dbn.lists at gmail.com
Sun Mar 6 09:29:55 PST 2011


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

Signed-off-by: Dan Nicholson <dbn.lists at gmail.com>
---
 xorg.modules | 1000 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 500 insertions(+), 500 deletions(-)

diff --git a/xorg.modules b/xorg.modules
index 07fca75..16f271f 100644
--- a/xorg.modules
+++ b/xorg.modules
@@ -1121,904 +1121,904 @@
     </dependencies>
   </metamodule>
 
-  <!-- input drivers -->
+  <!-- core font support, still required for some configurations  -->
 
-  <autotools id="xf86-input-acecad">
-    <branch module="xorg/driver/xf86-input-acecad"
-            checkoutdir="xorg/driver/xf86-input-acecad"/>
+  <autotools id="bdftopcf">
+    <branch module="xorg/app/bdftopcf"
+            checkoutdir="xorg/app/bdftopcf"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="libXfont"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-input-aiptek">
-    <branch module="xorg/driver/xf86-input-aiptek"
-            checkoutdir="xorg/driver/xf86-input-aiptek"/>
+  <autotools id="mkfontscale">
+    <branch module="xorg/app/mkfontscale"
+            checkoutdir="xorg/app/mkfontscale"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="libfontenc"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-input-evdev">
-    <branch module="xorg/driver/xf86-input-evdev"
-            checkoutdir="xorg/driver/xf86-input-evdev"/>
+  <autotools id="mkfontdir">
+    <branch module="xorg/app/mkfontdir"
+            checkoutdir="xorg/app/mkfontdir"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="mkfontscale"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-input-joystick">
-    <branch module="xorg/driver/xf86-input-joystick"
-            checkoutdir="xorg/driver/xf86-input-joystick"/>
-    <dependencies>
-      <dep package="xserver"/>
-    </dependencies>
+  <autotools id="font-util">
+    <branch module="xorg/font/util"
+            checkoutdir="xorg/font/util"/>
   </autotools>
 
-  <autotools id="xf86-input-keyboard">
-    <branch module="xorg/driver/xf86-input-keyboard"
-            checkoutdir="xorg/driver/xf86-input-keyboard"/>
+  <autotools id="encodings">
+    <branch module="xorg/font/encodings"
+            checkoutdir="xorg/font/encodings"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="mkfontscale"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-input-mouse">
-    <branch module="xorg/driver/xf86-input-mouse"
-            checkoutdir="xorg/driver/xf86-input-mouse"/>
+  <autotools id="font-adobe-100dpi">
+    <branch module="xorg/font/adobe-100dpi"
+            checkoutdir="xorg/font/adobe-100dpi"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+      <dep package="fonts-util"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-input-synaptics">
-    <branch module="xorg/driver/xf86-input-synaptics"
-            checkoutdir="xorg/driver/xf86-input-synaptics"/>
+  <autotools id="font-adobe-75dpi">
+    <branch module="xorg/font/adobe-75dpi"
+            checkoutdir="xorg/font/adobe-75dpi"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+      <dep package="fonts-util"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-input-vmmouse">
-    <branch module="xorg/driver/xf86-input-vmmouse"
-            checkoutdir="xorg/driver/xf86-input-vmmouse"/>
+  <autotools id="font-adobe-utopia-100dpi">
+    <branch module="xorg/font/adobe-utopia-100dpi"
+            checkoutdir="xorg/font/adobe-utopia-100dpi"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+      <dep package="fonts-util"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-input-void">
-    <branch module="xorg/driver/xf86-input-void"
-            checkoutdir="xorg/driver/xf86-input-void"/>
+  <autotools id="font-adobe-utopia-75dpi">
+    <branch module="xorg/font/adobe-utopia-75dpi"
+            checkoutdir="xorg/font/adobe-utopia-75dpi"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+      <dep package="fonts-util"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-apm">
-    <branch module="xorg/driver/xf86-video-apm"
-            checkoutdir="xorg/driver/xf86-video-apm"/>
+  <autotools id="font-adobe-utopia-type1">
+    <branch module="xorg/font/adobe-utopia-type1"
+            checkoutdir="xorg/font/adobe-utopia-type1"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+      <dep package="fonts-util"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-ark">
-    <branch module="xorg/driver/xf86-video-ark"
-            checkoutdir="xorg/driver/xf86-video-ark"/>
+  <autotools id="font-arabic-misc">
+    <branch module="xorg/font/font-arabic-misc"
+            checkoutdir="xorg/font/font-arabic-misc"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-ast">
-    <branch module="xorg/driver/xf86-video-ast"
-            checkoutdir="xorg/driver/xf86-video-ast"/>
+  <autotools id="font-bh-100dpi">
+    <branch module="xorg/font/font-bh-100dpi"
+            checkoutdir="xorg/font/font-bh-100dpi"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-ati">
-    <branch module="xorg/driver/xf86-video-ati"
-            checkoutdir="xorg/driver/xf86-video-ati"/>
+  <autotools id="font-bh-75dpi">
+    <branch module="xorg/font/font-bh-75dpi"
+            checkoutdir="xorgfont/font-bh-75dpi"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-chips">
-    <branch module="xorg/driver/xf86-video-chips"
-            checkoutdir="xorg/driver/xf86-video-chips"/>
+  <autotools id="font-bh-lucidatypewriter-100dpi">
+    <branch module="xorg/font/font-bh-lucidatypewriter-100dpi"
+            checkoutdir="xorgfont/font-bh-lucidatypewriter-100dpi"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-cirrus">
-    <branch module="xorg/driver/xf86-video-cirrus"
-            checkoutdir="xorg/driver/xf86-video-cirrus"/>
+  <autotools id="font-bh-lucidatypewriter-75dpi">
+    <branch module="xorg/font/font-bh-lucidatypewriter-75dpi"
+            checkoutdir="xorgfont/font-bh-lucidatypewriter-75dpi"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-dummy">
-    <branch module="xorg/driver/xf86-video-dummy"
-            checkoutdir="xorg/driver/xf86-video-dummy"/>
+  <autotools id="font-bh-ttf">
+    <branch module="xorg/font/font-bh-ttf"
+            checkoutdir="xorgfont/font-bh-ttf"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-fbdev">
-    <branch module="xorg/driver/xf86-video-fbdev"
-            checkoutdir="xorg/driver/xf86-video-fbdev"/>
+  <autotools id="font-bh-type1">
+    <branch module="xorg/font/font-bh-type1"
+            checkoutdir="xorgfont/font-bh-type1"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-geode">
-    <branch module="xorg/driver/xf86-video-geode"
-            checkoutdir="xorg/driver/xf86-video-geode"/>
+  <autotools id="font-bitstream-100dpi">
+    <branch module="xorg/font/bitstream-100dpi"
+            checkoutdir="xorg/font/bitstream-100dpi"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-glide">
-    <branch module="xorg/driver/xf86-video-glide"
-            checkoutdir="xorg/driver/xf86-video-glide"/>
+  <autotools id="font-bitstream-75dpi">
+    <branch module="xorg/font/bitstream-75dpi"
+            checkoutdir="xorg/font/bitstream-75dpi"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-glint">
-    <branch module="xorg/driver/xf86-video-glint"
-            checkoutdir="xorg/driver/xf86-video-glint"/>
+  <autotools id="font-bitstream-type1">
+    <branch module="xorg/font/bitstream-type1"
+            checkoutdir="xorg/font/bitstream-type1"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-i128">
-    <branch module="xorg/driver/xf86-video-i128"
-            checkoutdir="xorg/driver/xf86-video-i128"/>
+  <autotools id="font-cronyx-cyrillic">
+    <branch module="xorg/font/font-cronyx-cyrillic"
+            checkoutdir="xorg/font/font-cronyx-cyrillic"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-i740">
-    <branch module="xorg/driver/xf86-video-i740"
-            checkoutdir="xorg/driver/xf86-video-i740"/>
+  <autotools id="font-cursor-misc">
+    <branch module="xorg/font/cursor-misc"
+            checkoutdir="xorg/font/cursor-misc"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-impact">
-    <branch module="xorg/driver/xf86-video-impact"
-            checkoutdir="xorg/driver/xf86-video-impact"/>
+  <autotools id="font-daewoo-misc">
+    <branch module="xorg/font/font-daewoo-misc"
+            checkoutdir="xorgfont/font-daewoo-misc"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-intel">
-    <branch module="xorg/driver/xf86-video-intel"
-            checkoutdir="xorg/driver/xf86-video-intel"/>
+  <autotools id="font-dec-misc">
+    <branch module="xorg/font/font-dec-misc"
+            checkoutdir="xorgfont/font-dec-misc"/>
     <dependencies>
-      <dep package="xserver"/>
-      <dep package="x11proto"/>
-      <dep package="libXvMC"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-mach64">
-    <branch module="xorg/driver/xf86-video-mach64"
-            checkoutdir="xorg/driver/xf86-video-mach64"/>
-    <dependencies>
-      <dep package="xserver"/>
+  <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="xf86-video-mga">
-    <branch module="xorg/driver/xf86-video-mga"
-            checkoutdir="xorg/driver/xf86-video-mga"/>
+  <autotools id="font-isas-misc">
+    <branch module="xorg/font/font-isas-misc"
+            checkoutdir="xorgfont/font-isas-misc"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-neomagic">
-    <branch module="xorg/driver/xf86-video-neomagic"
-            checkoutdir="xorg/driver/xf86-video-neomagic"/>
+  <autotools id="font-jis-misc">
+    <branch module="xorg/font/font-jis-misc"
+            checkoutdir="xorgfont/font-jis-misc"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-newport">
-    <branch module="xorg/driver/xf86-video-newport"
-            checkoutdir="xorg/driver/xf86-video-newport"/>
+  <autotools id="font-micro-misc">
+    <branch module="xorg/font/font-micro-misc"
+            checkoutdir="xorgfont/font-micro-misc"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-nouveau">
-    <branch module="nouveau/xf86-video-nouveau"
-            checkoutdir="xorg/driver/xf86-video-nouveau"/>
+  <autotools id="font-misc-cyrillic">
+    <branch module="xorg/font/font-misc-cyrillic"
+            checkoutdir="xorgfont/font-misc-cyrillic"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-nv">
-    <branch module="xorg/driver/xf86-video-nv"
-            checkoutdir="xorg/driver/xf86-video-nv"/>
+  <autotools id="font-misc-ethiopic">
+    <branch module="xorg/font/font-misc-ethiopic"
+            checkoutdir="xorgfont/font-misc-ethiopic"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-openchrome">
-    <branch module="svn" repo="svn.openchrome.org"
-            checkoutdir="xorg/driver/xf86-video-openchrome"/>
+  <autotools id="font-misc-meltho">
+    <branch module="xorg/font/font-misc-meltho"
+            checkoutdir="xorgfont/font-misc-meltho"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-r128">
-    <branch module="xorg/driver/xf86-video-r128"
-            checkoutdir="xorg/driver/xf86-video-r128"/>
+  <autotools id="font-misc-misc">
+    <branch module="xorg/font/misc-misc"
+            checkoutdir="xorg/font/misc-misc"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
+      <dep package="fonts-util"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-rendition">
-    <branch module="xorg/driver/xf86-video-rendition"
-            checkoutdir="xorg/driver/xf86-video-rendition"/>
+  <autotools id="font-mutt-misc">
+    <branch module="xorg/font/font-mutt-misc"
+            checkoutdir="xorgfont/font-mutt-misc"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-s3">
-    <branch module="xorg/driver/xf86-video-s3"
-            checkoutdir="xorg/driver/xf86-video-s3"/>
+  <autotools id="font-schumacher-misc">
+    <branch module="xorg/font/font-schumacher-misc"
+            checkoutdir="xorgfont/font-schumacher-misc"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-s3virge">
-    <branch module="xorg/driver/xf86-video-s3virge"
-            checkoutdir="xorg/driver/xf86-video-s3virge"/>
+  <autotools id="font-screen-cyrillic">
+    <branch module="xorg/font/font-screen-cyrillic"
+            checkoutdir="xorgfont/font-screen-cyrillic"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-savage">
-    <branch module="xorg/driver/xf86-video-savage"
-            checkoutdir="xorg/driver/xf86-video-savage"/>
+  <autotools id="font-sony-misc">
+    <branch module="xorg/font/font-sony-misc"
+            checkoutdir="xorgfont/font-sony-misc"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-siliconmotion">
-    <branch module="xorg/driver/xf86-video-siliconmotion"
-            checkoutdir="xorg/driver/xf86-video-siliconmotion"/>
+  <autotools id="font-sun-misc">
+    <branch module="xorg/font/font-sun-misc"
+            checkoutdir="xorgfont/font-sun-misc"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-sis">
-    <branch module="xorg/driver/xf86-video-sis"
-            checkoutdir="xorg/driver/xf86-video-sis"/>
+  <autotools id="font-winitzki-cyrillic">
+    <branch module="xorg/font/font-winitzki-cyrillic"
+            checkoutdir="xorgfont/font-winitzki-cyrillic"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-sisusb">
-    <branch module="xorg/driver/xf86-video-sisusb"
-            checkoutdir="xorg/driver/xf86-video-sisusb"/>
+  <autotools id="font-xfree86-type1">
+    <branch module="xorg/font/font-xfree86-type1"
+            checkoutdir="xorgfont/font-xfree86-type1"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="bdftopcf"/>
+      <dep package="mkfontscale"/>
+      <dep package="mkfontdir"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-sunbw2">
-    <branch module="xorg/driver/xf86-video-sunbw2"
-            checkoutdir="xorg/driver/xf86-video-sunbw2"/>
+  <autotools id="font-alias">
+    <branch module="xorg/font/alias"
+            checkoutdir="xorg/font/alias"/>
+  </autotools>
+
+  <metamodule id="xorg-fonts">
     <dependencies>
-      <dep package="xserver"/>
+      <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>
-  </autotools>
+  </metamodule>
 
-  <autotools id="xf86-video-suncg14">
-    <branch module="xorg/driver/xf86-video-suncg14"
-            checkoutdir="xorg/driver/xf86-video-suncg14"/>
+  <!-- input drivers -->
+
+  <autotools id="xf86-input-acecad">
+    <branch module="xorg/driver/xf86-input-acecad"
+            checkoutdir="xorg/driver/xf86-input-acecad"/>
     <dependencies>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-suncg3">
-    <branch module="xorg/driver/xf86-video-suncg3"
-            checkoutdir="xorg/driver/xf86-video-suncg3"/>
+  <autotools id="xf86-input-aiptek">
+    <branch module="xorg/driver/xf86-input-aiptek"
+            checkoutdir="xorg/driver/xf86-input-aiptek"/>
     <dependencies>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-suncg6">
-    <branch module="xorg/driver/xf86-video-suncg6"
-            checkoutdir="xorg/driver/xf86-video-suncg6"/>
+  <autotools id="xf86-input-evdev">
+    <branch module="xorg/driver/xf86-input-evdev"
+            checkoutdir="xorg/driver/xf86-input-evdev"/>
     <dependencies>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-sunffb">
-    <branch module="xorg/driver/xf86-video-sunffb"
-            checkoutdir="xorg/driver/xf86-video-sunffb"/>
+  <autotools id="xf86-input-joystick">
+    <branch module="xorg/driver/xf86-input-joystick"
+            checkoutdir="xorg/driver/xf86-input-joystick"/>
     <dependencies>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-sunleo">
-    <branch module="xorg/driver/xf86-video-sunleo"
-            checkoutdir="xorg/driver/xf86-video-sunleo"/>
+  <autotools id="xf86-input-keyboard">
+    <branch module="xorg/driver/xf86-input-keyboard"
+            checkoutdir="xorg/driver/xf86-input-keyboard"/>
     <dependencies>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-suntcx">
-    <branch module="xorg/driver/xf86-video-suntcx"
-            checkoutdir="xorg/driver/xf86-video-suntcx"/>
+  <autotools id="xf86-input-mouse">
+    <branch module="xorg/driver/xf86-input-mouse"
+            checkoutdir="xorg/driver/xf86-input-mouse"/>
     <dependencies>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-tdfx">
-    <branch module="xorg/driver/xf86-video-tdfx"
-            checkoutdir="xorg/driver/xf86-video-tdfx"/>
+  <autotools id="xf86-input-synaptics">
+    <branch module="xorg/driver/xf86-input-synaptics"
+            checkoutdir="xorg/driver/xf86-input-synaptics"/>
     <dependencies>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-tga">
-    <branch module="xorg/driver/xf86-video-tga"
-            checkoutdir="xorg/driver/xf86-video-tga"/>
+  <autotools id="xf86-input-vmmouse">
+    <branch module="xorg/driver/xf86-input-vmmouse"
+            checkoutdir="xorg/driver/xf86-input-vmmouse"/>
     <dependencies>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-trident">
-    <branch module="xorg/driver/xf86-video-trident"
-            checkoutdir="xorg/driver/xf86-video-trident"/>
+  <autotools id="xf86-input-void">
+    <branch module="xorg/driver/xf86-input-void"
+            checkoutdir="xorg/driver/xf86-input-void"/>
     <dependencies>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-tseng">
-    <branch module="xorg/driver/xf86-video-tseng"
-            checkoutdir="xorg/driver/xf86-video-tseng"/>
+  <autotools id="xf86-video-apm">
+    <branch module="xorg/driver/xf86-video-apm"
+            checkoutdir="xorg/driver/xf86-video-apm"/>
     <dependencies>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-v4l">
-    <branch module="xorg/driver/xf86-video-v4l"
-            checkoutdir="xorg/driver/xf86-video-v4l"/>
+  <autotools id="xf86-video-ark">
+    <branch module="xorg/driver/xf86-video-ark"
+            checkoutdir="xorg/driver/xf86-video-ark"/>
     <dependencies>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-vesa">
-    <branch module="xorg/driver/xf86-video-vesa"
-            checkoutdir="xorg/driver/xf86-video-vesa"/>
+  <autotools id="xf86-video-ast">
+    <branch module="xorg/driver/xf86-video-ast"
+            checkoutdir="xorg/driver/xf86-video-ast"/>
     <dependencies>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-vmware">
-    <branch module="xorg/driver/xf86-video-vmware"
-            checkoutdir="xorg/driver/xf86-video-vmware"/>
+  <autotools id="xf86-video-ati">
+    <branch module="xorg/driver/xf86-video-ati"
+            checkoutdir="xorg/driver/xf86-video-ati"/>
     <dependencies>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-voodoo">
-    <branch module="xorg/driver/xf86-video-voodoo"
-            checkoutdir="xorg/driver/xf86-video-voodoo"/>
+  <autotools id="xf86-video-chips">
+    <branch module="xorg/driver/xf86-video-chips"
+            checkoutdir="xorg/driver/xf86-video-chips"/>
     <dependencies>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-wsfb">
-    <branch module="xorg/driver/xf86-video-wsfb"
-            checkoutdir="xorg/driver/xf86-video-wsfb"/>
+  <autotools id="xf86-video-cirrus">
+    <branch module="xorg/driver/xf86-video-cirrus"
+            checkoutdir="xorg/driver/xf86-video-cirrus"/>
     <dependencies>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-xgi">
-    <branch module="xorg/driver/xf86-video-xgi"
-            checkoutdir="xorg/driver/xf86-video-xgi"/>
+  <autotools id="xf86-video-dummy">
+    <branch module="xorg/driver/xf86-video-dummy"
+            checkoutdir="xorg/driver/xf86-video-dummy"/>
     <dependencies>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-xgixp">
-    <branch module="xorg/driver/xf86-video-xgixp"
-            checkoutdir="xorg/driver/xf86-video-xgixp"/>
+  <autotools id="xf86-video-fbdev">
+    <branch module="xorg/driver/xf86-video-fbdev"
+            checkoutdir="xorg/driver/xf86-video-fbdev"/>
     <dependencies>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <!-- core font support, still required for some configurations  -->
-
-  <autotools id="bdftopcf">
-    <branch module="xorg/app/bdftopcf"
-            checkoutdir="xorg/app/bdftopcf"/>
+  <autotools id="xf86-video-geode">
+    <branch module="xorg/driver/xf86-video-geode"
+            checkoutdir="xorg/driver/xf86-video-geode"/>
     <dependencies>
-      <dep package="libXfont"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="mkfontscale">
-    <branch module="xorg/app/mkfontscale"
-            checkoutdir="xorg/app/mkfontscale"/>
+  <autotools id="xf86-video-glide">
+    <branch module="xorg/driver/xf86-video-glide"
+            checkoutdir="xorg/driver/xf86-video-glide"/>
     <dependencies>
-      <dep package="libfontenc"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="mkfontdir">
-    <branch module="xorg/app/mkfontdir"
-            checkoutdir="xorg/app/mkfontdir"/>
+  <autotools id="xf86-video-glint">
+    <branch module="xorg/driver/xf86-video-glint"
+            checkoutdir="xorg/driver/xf86-video-glint"/>
     <dependencies>
-      <dep package="mkfontscale"/>
+      <dep package="xserver"/>
     </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"/>
+  <autotools id="xf86-video-i128">
+    <branch module="xorg/driver/xf86-video-i128"
+            checkoutdir="xorg/driver/xf86-video-i128"/>
     <dependencies>
-      <dep package="mkfontscale"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-adobe-100dpi">
-    <branch module="xorg/font/adobe-100dpi"
-            checkoutdir="xorg/font/adobe-100dpi"/>
+  <autotools id="xf86-video-i740">
+    <branch module="xorg/driver/xf86-video-i740"
+            checkoutdir="xorg/driver/xf86-video-i740"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-      <dep package="font-util"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-adobe-75dpi">
-    <branch module="xorg/font/adobe-75dpi"
-            checkoutdir="xorg/font/adobe-75dpi"/>
+  <autotools id="xf86-video-impact">
+    <branch module="xorg/driver/xf86-video-impact"
+            checkoutdir="xorg/driver/xf86-video-impact"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-      <dep package="font-util"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-adobe-utopia-100dpi">
-    <branch module="xorg/font/adobe-utopia-100dpi"
-            checkoutdir="xorg/font/adobe-utopia-100dpi"/>
+  <autotools id="xf86-video-intel">
+    <branch module="xorg/driver/xf86-video-intel"
+            checkoutdir="xorg/driver/xf86-video-intel"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-      <dep package="font-util"/>
+      <dep package="xserver"/>
+      <dep package="x11proto"/>
+      <dep package="libXvMC"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-adobe-utopia-75dpi">
-    <branch module="xorg/font/adobe-utopia-75dpi"
-            checkoutdir="xorg/font/adobe-utopia-75dpi"/>
+  <autotools id="xf86-video-mach64">
+    <branch module="xorg/driver/xf86-video-mach64"
+            checkoutdir="xorg/driver/xf86-video-mach64"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-      <dep package="font-util"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-adobe-utopia-type1">
-    <branch module="xorg/font/adobe-utopia-type1"
-            checkoutdir="xorg/font/adobe-utopia-type1"/>
+  <autotools id="xf86-video-mga">
+    <branch module="xorg/driver/xf86-video-mga"
+            checkoutdir="xorg/driver/xf86-video-mga"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-      <dep package="font-util"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-arabic-misc">
-    <branch module="xorg/font/font-arabic-misc"
-            checkoutdir="xorg/font/font-arabic-misc"/>
+  <autotools id="xf86-video-neomagic">
+    <branch module="xorg/driver/xf86-video-neomagic"
+            checkoutdir="xorg/driver/xf86-video-neomagic"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-bh-100dpi">
-    <branch module="xorg/font/font-bh-100dpi"
-            checkoutdir="xorg/font/font-bh-100dpi"/>
+  <autotools id="xf86-video-newport">
+    <branch module="xorg/driver/xf86-video-newport"
+            checkoutdir="xorg/driver/xf86-video-newport"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-bh-75dpi">
-    <branch module="xorg/font/font-bh-75dpi"
-            checkoutdir="xorgfont/font-bh-75dpi"/>
+  <autotools id="xf86-video-nouveau">
+    <branch module="nouveau/xf86-video-nouveau"
+            checkoutdir="xorg/driver/xf86-video-nouveau"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-bh-lucidatypewriter-100dpi">
-    <branch module="xorg/font/font-bh-lucidatypewriter-100dpi"
-            checkoutdir="xorgfont/font-bh-lucidatypewriter-100dpi"/>
+  <autotools id="xf86-video-nv">
+    <branch module="xorg/driver/xf86-video-nv"
+            checkoutdir="xorg/driver/xf86-video-nv"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-bh-lucidatypewriter-75dpi">
-    <branch module="xorg/font/font-bh-lucidatypewriter-75dpi"
-            checkoutdir="xorgfont/font-bh-lucidatypewriter-75dpi"/>
+  <autotools id="xf86-video-openchrome">
+    <branch module="svn" repo="svn.openchrome.org"
+            checkoutdir="xorg/driver/xf86-video-openchrome"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-bh-ttf">
-    <branch module="xorg/font/font-bh-ttf"
-            checkoutdir="xorgfont/font-bh-ttf"/>
+  <autotools id="xf86-video-r128">
+    <branch module="xorg/driver/xf86-video-r128"
+            checkoutdir="xorg/driver/xf86-video-r128"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-bh-type1">
-    <branch module="xorg/font/font-bh-type1"
-            checkoutdir="xorgfont/font-bh-type1"/>
+  <autotools id="xf86-video-rendition">
+    <branch module="xorg/driver/xf86-video-rendition"
+            checkoutdir="xorg/driver/xf86-video-rendition"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-bitstream-100dpi">
-    <branch module="xorg/font/bitstream-100dpi"
-            checkoutdir="xorg/font/bitstream-100dpi"/>
+  <autotools id="xf86-video-s3">
+    <branch module="xorg/driver/xf86-video-s3"
+            checkoutdir="xorg/driver/xf86-video-s3"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-bitstream-75dpi">
-    <branch module="xorg/font/bitstream-75dpi"
-            checkoutdir="xorg/font/bitstream-75dpi"/>
+  <autotools id="xf86-video-s3virge">
+    <branch module="xorg/driver/xf86-video-s3virge"
+            checkoutdir="xorg/driver/xf86-video-s3virge"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-bitstream-type1">
-    <branch module="xorg/font/bitstream-type1"
-            checkoutdir="xorg/font/bitstream-type1"/>
+  <autotools id="xf86-video-savage">
+    <branch module="xorg/driver/xf86-video-savage"
+            checkoutdir="xorg/driver/xf86-video-savage"/>
     <dependencies>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-cronyx-cyrillic">
-    <branch module="xorg/font/font-cronyx-cyrillic"
-            checkoutdir="xorg/font/font-cronyx-cyrillic"/>
+  <autotools id="xf86-video-siliconmotion">
+    <branch module="xorg/driver/xf86-video-siliconmotion"
+            checkoutdir="xorg/driver/xf86-video-siliconmotion"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-cursor-misc">
-    <branch module="xorg/font/cursor-misc"
-            checkoutdir="xorg/font/cursor-misc"/>
+  <autotools id="xf86-video-sis">
+    <branch module="xorg/driver/xf86-video-sis"
+            checkoutdir="xorg/driver/xf86-video-sis"/>
     <dependencies>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-daewoo-misc">
-    <branch module="xorg/font/font-daewoo-misc"
-            checkoutdir="xorgfont/font-daewoo-misc"/>
+  <autotools id="xf86-video-sisusb">
+    <branch module="xorg/driver/xf86-video-sisusb"
+            checkoutdir="xorg/driver/xf86-video-sisusb"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-dec-misc">
-    <branch module="xorg/font/font-dec-misc"
-            checkoutdir="xorgfont/font-dec-misc"/>
+  <autotools id="xf86-video-sunbw2">
+    <branch module="xorg/driver/xf86-video-sunbw2"
+            checkoutdir="xorg/driver/xf86-video-sunbw2"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-ibm-type1">
-    <branch module="xorg/font/font-ibm-type1"
-            checkoutdir="xorgfont/font-ibm-type1"/>
+  <autotools id="xf86-video-suncg14">
+    <branch module="xorg/driver/xf86-video-suncg14"
+            checkoutdir="xorg/driver/xf86-video-suncg14"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-isas-misc">
-    <branch module="xorg/font/font-isas-misc"
-            checkoutdir="xorgfont/font-isas-misc"/>
+  <autotools id="xf86-video-suncg3">
+    <branch module="xorg/driver/xf86-video-suncg3"
+            checkoutdir="xorg/driver/xf86-video-suncg3"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-jis-misc">
-    <branch module="xorg/font/font-jis-misc"
-            checkoutdir="xorgfont/font-jis-misc"/>
+  <autotools id="xf86-video-suncg6">
+    <branch module="xorg/driver/xf86-video-suncg6"
+            checkoutdir="xorg/driver/xf86-video-suncg6"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-micro-misc">
-    <branch module="xorg/font/font-micro-misc"
-            checkoutdir="xorgfont/font-micro-misc"/>
+  <autotools id="xf86-video-sunffb">
+    <branch module="xorg/driver/xf86-video-sunffb"
+            checkoutdir="xorg/driver/xf86-video-sunffb"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-misc-cyrillic">
-    <branch module="xorg/font/font-misc-cyrillic"
-            checkoutdir="xorgfont/font-misc-cyrillic"/>
+  <autotools id="xf86-video-sunleo">
+    <branch module="xorg/driver/xf86-video-sunleo"
+            checkoutdir="xorg/driver/xf86-video-sunleo"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-misc-ethiopic">
-    <branch module="xorg/font/font-misc-ethiopic"
-            checkoutdir="xorgfont/font-misc-ethiopic"/>
+  <autotools id="xf86-video-suntcx">
+    <branch module="xorg/driver/xf86-video-suntcx"
+            checkoutdir="xorg/driver/xf86-video-suntcx"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-misc-meltho">
-    <branch module="xorg/font/font-misc-meltho"
-            checkoutdir="xorgfont/font-misc-meltho"/>
+  <autotools id="xf86-video-tdfx">
+    <branch module="xorg/driver/xf86-video-tdfx"
+            checkoutdir="xorg/driver/xf86-video-tdfx"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-misc-misc">
-    <branch module="xorg/font/misc-misc"
-            checkoutdir="xorg/font/misc-misc"/>
+  <autotools id="xf86-video-tga">
+    <branch module="xorg/driver/xf86-video-tga"
+            checkoutdir="xorg/driver/xf86-video-tga"/>
     <dependencies>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-      <dep package="font-util"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-mutt-misc">
-    <branch module="xorg/font/font-mutt-misc"
-            checkoutdir="xorgfont/font-mutt-misc"/>
+  <autotools id="xf86-video-trident">
+    <branch module="xorg/driver/xf86-video-trident"
+            checkoutdir="xorg/driver/xf86-video-trident"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-schumacher-misc">
-    <branch module="xorg/font/font-schumacher-misc"
-            checkoutdir="xorgfont/font-schumacher-misc"/>
+  <autotools id="xf86-video-tseng">
+    <branch module="xorg/driver/xf86-video-tseng"
+            checkoutdir="xorg/driver/xf86-video-tseng"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-screen-cyrillic">
-    <branch module="xorg/font/font-screen-cyrillic"
-            checkoutdir="xorgfont/font-screen-cyrillic"/>
+  <autotools id="xf86-video-v4l">
+    <branch module="xorg/driver/xf86-video-v4l"
+            checkoutdir="xorg/driver/xf86-video-v4l"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-sony-misc">
-    <branch module="xorg/font/font-sony-misc"
-            checkoutdir="xorgfont/font-sony-misc"/>
+  <autotools id="xf86-video-vesa">
+    <branch module="xorg/driver/xf86-video-vesa"
+            checkoutdir="xorg/driver/xf86-video-vesa"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-sun-misc">
-    <branch module="xorg/font/font-sun-misc"
-            checkoutdir="xorgfont/font-sun-misc"/>
+  <autotools id="xf86-video-vmware">
+    <branch module="xorg/driver/xf86-video-vmware"
+            checkoutdir="xorg/driver/xf86-video-vmware"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-winitzki-cyrillic">
-    <branch module="xorg/font/font-winitzki-cyrillic"
-            checkoutdir="xorgfont/font-winitzki-cyrillic"/>
+  <autotools id="xf86-video-voodoo">
+    <branch module="xorg/driver/xf86-video-voodoo"
+            checkoutdir="xorg/driver/xf86-video-voodoo"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-xfree86-type1">
-    <branch module="xorg/font/font-xfree86-type1"
-            checkoutdir="xorgfont/font-xfree86-type1"/>
+  <autotools id="xf86-video-wsfb">
+    <branch module="xorg/driver/xf86-video-wsfb"
+            checkoutdir="xorg/driver/xf86-video-wsfb"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-alias">
-    <branch module="xorg/font/alias"
-            checkoutdir="xorg/font/alias"/>
+  <autotools id="xf86-video-xgi">
+    <branch module="xorg/driver/xf86-video-xgi"
+            checkoutdir="xorg/driver/xf86-video-xgi"/>
+    <dependencies>
+      <dep package="xserver"/>
+    </dependencies>
   </autotools>
 
-  <metamodule id="xorg-fonts">
+  <autotools id="xf86-video-xgixp">
+    <branch module="xorg/driver/xf86-video-xgixp"
+            checkoutdir="xorg/driver/xf86-video-xgixp"/>
     <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"/>
+      <dep package="xserver"/>
     </dependencies>
-  </metamodule>
+  </autotools>
 
   <!-- These drivers are marked unmaintained in xorg/doc/xorg-docs/MAINTAINERS and are also broken -->
   <metamodule id="xorg-unmaintained-broken-drivers">
-- 
1.7.3.4



More information about the xorg-devel mailing list