From 5f1d0fb08562cbdc94216ff39b4cb28b6eb357e3 Mon Sep 17 00:00:00 2001
From: Andreas Enge <andreas@enge.fr>
Date: Mon, 25 Feb 2013 22:24:25 +0100
Subject: gnu: xorg: Add and remove packages to mirror X11R7.7/src/everything

* gnu/packages/xorg.scm: Remove packages not from
     ftp://ftp.freedesktop.org/pub/xorg/X11R7.7/src/everything/ .
     Add missing packages, for the time being with a 0 hash and
     without dependencies.
     Correct spelling (all lower case for package names).
---
 gnu/packages/xorg.scm | 3253 +++++++++++++++++++++++++++++++------------------
 1 file changed, 2039 insertions(+), 1214 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index bbbd7a943a..1b6d607a54 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -35,7 +35,8 @@
   #:use-module (gnu packages openssl)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages python))
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages xml))
 
 (define-public applewmproto
   (package
@@ -81,8 +82,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public bigreqsproto
   (package
     (name "bigreqsproto")
@@ -103,8 +104,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public compositeproto
   (package
     (name "compositeproto")
@@ -127,8 +128,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public damageproto
   (package
     (name "damageproto")
@@ -149,8 +150,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public dmxproto
   (package
     (name "dmxproto")
@@ -171,8 +172,29 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
+(define-public dri2proto
+  (package
+    (name "dri2proto")
+    (version "2.3.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/dri2proto-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "0000000000000000000000000000000000000000000000000000"))))
+    (build-system gnu-build-system)
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
 (define-public encodings
   (package
     (name "encodings")
@@ -193,8 +215,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public fixesproto
   (package
     (name "fixesproto")
@@ -217,170 +239,149 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public font-alias
+
+
+(define-public font-adobe-100dpi
   (package
-    (name "font-alias")
+    (name "font-adobe-100dpi")
     (version "1.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/font-alias-"
+               "mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs `(("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public font-arabic-misc
+
+
+(define-public font-adobe-75dpi
   (package
-    (name "font-arabic-misc")
+    (name "font-adobe-75dpi")
     (version "1.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/font-arabic-misc-"
+               "mirror://xorg/X11R7.7/src/everything/font-adobe-75dpi-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("mkfontdir" ,mkfontdir)
-        ("bdftopcf" ,bdftopcf)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public font-bh-ttf
+
+
+(define-public font-adobe-utopia-100dpi
   (package
-    (name "font-bh-ttf")
-    (version "1.0.3")
+    (name "font-adobe-utopia-100dpi")
+    (version "1.0.4")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/font-bh-ttf-"
+               "mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-100dpi-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("mkfontscale" ,mkfontscale)
-        ("mkfontdir" ,mkfontdir)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public font-cronyx-cyrillic
+
+
+(define-public font-adobe-utopia-75dpi
   (package
-    (name "font-cronyx-cyrillic")
-    (version "1.0.3")
+    (name "font-adobe-utopia-75dpi")
+    (version "1.0.4")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/font-cronyx-cyrillic-"
+               "mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-75dpi-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("mkfontdir" ,mkfontdir)
-        ("bdftopcf" ,bdftopcf)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public font-cursor-misc
+
+
+(define-public font-adobe-utopia-type1
   (package
-    (name "font-cursor-misc")
-    (version "1.0.3")
+    (name "font-adobe-utopia-type1")
+    (version "1.0.4")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/font-cursor-misc-"
+               "mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-type1-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("mkfontscale" ,mkfontscale)
-        ("mkfontdir" ,mkfontdir)
-        ("bdftopcf" ,bdftopcf)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public font-daewoo-misc
+
+
+(define-public font-alias
   (package
-    (name "font-daewoo-misc")
+    (name "font-alias")
     (version "1.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/font-daewoo-misc-"
+               "mirror://xorg/X11R7.7/src/everything/font-alias-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw"))))
+            "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("mkfontdir" ,mkfontdir)
-        ("bdftopcf" ,bdftopcf)
-        ("pkg-config" ,pkg-config)))
+    (inputs `(("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public font-dec-misc
+
+
+(define-public font-arabic-misc
   (package
-    (name "font-dec-misc")
+    (name "font-arabic-misc")
     (version "1.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/font-dec-misc-"
+               "mirror://xorg/X11R7.7/src/everything/font-arabic-misc-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1"))))
+            "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah"))))
     (build-system gnu-build-system)
     (inputs
       `(("mkfontdir" ,mkfontdir)
@@ -390,122 +391,106 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public font-isas-misc
+
+
+(define-public font-bh-100dpi
   (package
-    (name "font-isas-misc")
+    (name "font-bh-100dpi")
     (version "1.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/font-isas-misc-"
+               "mirror://xorg/X11R7.7/src/everything/font-bh-100dpi-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("mkfontdir" ,mkfontdir)
-        ("bdftopcf" ,bdftopcf)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public font-jis-misc
+
+
+(define-public font-bh-75dpi
   (package
-    (name "font-jis-misc")
+    (name "font-bh-75dpi")
     (version "1.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/font-jis-misc-"
+               "mirror://xorg/X11R7.7/src/everything/font-bh-75dpi-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("mkfontdir" ,mkfontdir)
-        ("bdftopcf" ,bdftopcf)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public font-micro-misc
+
+
+(define-public font-bh-lucidatypewriter-100dpi
   (package
-    (name "font-micro-misc")
+    (name "font-bh-lucidatypewriter-100dpi")
     (version "1.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/font-micro-misc-"
+               "mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-100dpi-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("mkfontdir" ,mkfontdir)
-        ("bdftopcf" ,bdftopcf)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public font-misc-cyrillic
+
+
+(define-public font-bh-lucidatypewriter-75dpi
   (package
-    (name "font-misc-cyrillic")
+    (name "font-bh-lucidatypewriter-75dpi")
     (version "1.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/font-misc-cyrillic-"
+               "mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-75dpi-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("mkfontdir" ,mkfontdir)
-        ("bdftopcf" ,bdftopcf)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public font-misc-ethiopic
+
+
+(define-public font-bh-type1
   (package
-    (name "font-misc-ethiopic")
+    (name "font-bh-type1")
     (version "1.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/font-misc-ethiopic-"
+               "mirror://xorg/X11R7.7/src/everything/font-bh-ttf-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"))))
+            "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"))))
     (build-system gnu-build-system)
     (inputs
       `(("mkfontscale" ,mkfontscale)
@@ -515,22 +500,22 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public font-misc-meltho
+
+
+(define-public font-bitstream-100dpi
   (package
-    (name "font-misc-meltho")
+    (name "font-bitstream-100dpi")
     (version "1.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/font-misc-meltho-"
+               "mirror://xorg/X11R7.7/src/everything/font-bh-ttf-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p"))))
+            "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"))))
     (build-system gnu-build-system)
     (inputs
       `(("mkfontscale" ,mkfontscale)
@@ -540,126 +525,123 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public font-misc-misc
+
+
+(define-public font-bitstream-75dpi
   (package
-    (name "font-misc-misc")
-    (version "1.1.2")
+    (name "font-bitstream-75dpi")
+    (version "1.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/font-misc-misc-"
+               "mirror://xorg/X11R7.7/src/everything/font-bh-ttf-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"))))
+            "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"))))
     (build-system gnu-build-system)
     (inputs
       `(("mkfontscale" ,mkfontscale)
         ("mkfontdir" ,mkfontdir)
-        ("font-util" ,font-util)
-        ("bdftopcf" ,bdftopcf)
         ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public font-mutt-misc
+
+
+(define-public font-bitstream-type1
   (package
-    (name "font-mutt-misc")
+    (name "font-bitstream-type1")
     (version "1.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/font-mutt-misc-"
+               "mirror://xorg/X11R7.7/src/everything/font-bh-ttf-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx"))))
+            "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"))))
     (build-system gnu-build-system)
     (inputs
-      `(("mkfontdir" ,mkfontdir)
-        ("bdftopcf" ,bdftopcf)
+      `(("mkfontscale" ,mkfontscale)
+        ("mkfontdir" ,mkfontdir)
         ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public font-schumacher-misc
+
+
+(define-public font-cronyx-cyrillic
   (package
-    (name "font-schumacher-misc")
-    (version "1.1.2")
+    (name "font-cronyx-cyrillic")
+    (version "1.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-"
+               "mirror://xorg/X11R7.7/src/everything/font-cronyx-cyrillic-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"))))
+            "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf"))))
     (build-system gnu-build-system)
     (inputs
-      `(("mkfontscale" ,mkfontscale)
-        ("mkfontdir" ,mkfontdir)
-        ("font-util" ,font-util)
+      `(("mkfontdir" ,mkfontdir)
         ("bdftopcf" ,bdftopcf)
         ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public font-screen-cyrillic
+
+
+(define-public font-cursor-misc
   (package
-    (name "font-screen-cyrillic")
-    (version "1.0.4")
+    (name "font-cursor-misc")
+    (version "1.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-"
+               "mirror://xorg/X11R7.7/src/everything/font-cursor-misc-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2"))))
+            "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp"))))
     (build-system gnu-build-system)
     (inputs
-      `(("mkfontdir" ,mkfontdir)
+      `(("mkfontscale" ,mkfontscale)
+        ("mkfontdir" ,mkfontdir)
         ("bdftopcf" ,bdftopcf)
         ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public font-sony-misc
+
+
+(define-public font-daewoo-misc
   (package
-    (name "font-sony-misc")
+    (name "font-daewoo-misc")
     (version "1.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/font-sony-misc-"
+               "mirror://xorg/X11R7.7/src/everything/font-daewoo-misc-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0"))))
+            "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw"))))
     (build-system gnu-build-system)
     (inputs
       `(("mkfontdir" ,mkfontdir)
@@ -669,44 +651,47 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public fontsproto
+
+
+(define-public font-dec-misc
   (package
-    (name "fontsproto")
-    (version "2.1.2")
+    (name "font-dec-misc")
+    (version "1.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/fontsproto-"
+               "mirror://xorg/X11R7.7/src/everything/font-dec-misc-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1ab8mbqxdwvdz4k5x4xb9c4n5w7i1xw276cbpk4z7a1nlpjrg746"))))
+            "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1"))))
     (build-system gnu-build-system)
-    (inputs `(("pkg-config" ,pkg-config)))
+    (inputs
+      `(("mkfontdir" ,mkfontdir)
+        ("bdftopcf" ,bdftopcf)
+        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public font-sun-misc
+
+
+(define-public font-ibm-type1
   (package
-    (name "font-sun-misc")
+    (name "font-ibm-type1")
     (version "1.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/font-sun-misc-"
+               "mirror://xorg/X11R7.7/src/everything/font-cronyx-cyrillic-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
     (inputs
       `(("mkfontdir" ,mkfontdir)
@@ -716,44 +701,47 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public font-util
+
+
+(define-public font-isas-misc
   (package
-    (name "font-util")
-    (version "1.3.0")
+    (name "font-isas-misc")
+    (version "1.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/font-util-"
+               "mirror://xorg/X11R7.7/src/everything/font-isas-misc-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "15cijajwhjzpy3ydc817zz8x5z4gbkyv3fps687jbq544mbfbafz"))))
+            "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q"))))
     (build-system gnu-build-system)
-    (inputs `(("pkg-config" ,pkg-config)))
+    (inputs
+      `(("mkfontdir" ,mkfontdir)
+        ("bdftopcf" ,bdftopcf)
+        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public font-winitzki-cyrillic
+
+
+(define-public font-jis-misc
   (package
-    (name "font-winitzki-cyrillic")
+    (name "font-jis-misc")
     (version "1.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-"
+               "mirror://xorg/X11R7.7/src/everything/font-jis-misc-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb"))))
+            "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b"))))
     (build-system gnu-build-system)
     (inputs
       `(("mkfontdir" ,mkfontdir)
@@ -763,2086 +751,2997 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public gccmakedep
+
+
+(define-public font-micro-misc
   (package
-    (name "gccmakedep")
-    (version "1.0.2")
+    (name "font-micro-misc")
+    (version "1.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/individual/util/gccmakedep-"
+               "mirror://xorg/X11R7.7/src/everything/font-micro-misc-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "04dfamx3fvkvqfgs6xy2a6yqbxjrj4777ylxp38g60hhbdl4jg86"))))
+            "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws"))))
     (build-system gnu-build-system)
-    (inputs `(("pkg-config" ,pkg-config)))
+    (inputs
+      `(("mkfontdir" ,mkfontdir)
+        ("bdftopcf" ,bdftopcf)
+        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public glproto
+
+
+(define-public font-misc-cyrillic
   (package
-    (name "glproto")
-    (version "1.4.16")
+    (name "font-misc-cyrillic")
+    (version "1.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/individual/proto/glproto-"
+               "mirror://xorg/X11R7.7/src/everything/font-misc-cyrillic-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "13arnb4bz5pn89bxbh3shr8gihkhyznpjnq3zzr05msygwx6dpal"))))
+            "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4"))))
     (build-system gnu-build-system)
-    (inputs `(("pkg-config" ,pkg-config)))
+    (inputs
+      `(("mkfontdir" ,mkfontdir)
+        ("bdftopcf" ,bdftopcf)
+        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public iceauth
+
+
+(define-public font-misc-ethiopic
   (package
-    (name "iceauth")
-    (version "1.0.5")
+    (name "font-misc-ethiopic")
+    (version "1.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/iceauth-"
+               "mirror://xorg/X11R7.7/src/everything/font-misc-ethiopic-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1aq6v671s2x5rc6zn0rgxb4wddg4vq94mckw3cpwl7ccrjjvd5hl"))))
+            "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xproto" ,xproto)
-        ("libICE" ,libICE)
+      `(("mkfontscale" ,mkfontscale)
+        ("mkfontdir" ,mkfontdir)
         ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public imake
+
+
+(define-public font-misc-meltho
   (package
-    (name "imake")
-    (version "1.0.5")
+    (name "font-misc-meltho")
+    (version "1.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/individual/util/imake-"
+               "mirror://xorg/X11R7.7/src/everything/font-misc-meltho-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1h8ww97aymm10l9qn21n1b9x5ypjrqr10qpf48jjcbc9fg77gklr"))))
+            "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xproto" ,xproto) ("pkg-config" ,pkg-config)))
+      `(("mkfontscale" ,mkfontscale)
+        ("mkfontdir" ,mkfontdir)
+        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public inputproto
+
+
+(define-public font-misc-misc
   (package
-    (name "inputproto")
-    (version "2.2")
+    (name "font-misc-misc")
+    (version "1.1.2")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/inputproto-"
+               "mirror://xorg/X11R7.7/src/everything/font-misc-misc-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1c5wqamfsd8g5i8kya5pjfmcac8q5zq1l3vclh6p96f24nmicxfy"))))
+            "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"))))
     (build-system gnu-build-system)
-    (inputs `(("pkg-config" ,pkg-config)))
+    (inputs
+      `(("mkfontscale" ,mkfontscale)
+        ("mkfontdir" ,mkfontdir)
+        ("font-util" ,font-util)
+        ("bdftopcf" ,bdftopcf)
+        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public kbproto
+
+
+(define-public font-mutt-misc
   (package
-    (name "kbproto")
-    (version "1.0.6")
+    (name "font-mutt-misc")
+    (version "1.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/kbproto-"
+               "mirror://xorg/X11R7.7/src/everything/font-mutt-misc-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0yal11hhpiisy3w8wmacsdzzzcnc3xwnswxz8k7zri40xc5aqz03"))))
+            "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx"))))
     (build-system gnu-build-system)
-    (inputs `(("pkg-config" ,pkg-config)))
+    (inputs
+      `(("mkfontdir" ,mkfontdir)
+        ("bdftopcf" ,bdftopcf)
+        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libAppleWM
+
+
+(define-public font-schumacher-misc
   (package
-    (name "libAppleWM")
-    (version "1.4.1")
+    (name "font-schumacher-misc")
+    (version "1.1.2")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libAppleWM-"
+               "mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y"))))
+            "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xextproto" ,xextproto)
-        ("libxext" ,libxext)
-        ("libx11" ,libx11)
-        ("applewmproto" ,applewmproto)
+      `(("mkfontscale" ,mkfontscale)
+        ("mkfontdir" ,mkfontdir)
+        ("font-util" ,font-util)
+        ("bdftopcf" ,bdftopcf)
         ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libFS
+
+
+(define-public font-screen-cyrillic
   (package
-    (name "libFS")
+    (name "font-screen-cyrillic")
     (version "1.0.4")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libFS-"
+               "mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "05c3bqgn5m7j4kx8wvy0p36faq6f9jv5yq12m6033m4lflg7cwvh"))))
+            "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xtrans" ,xtrans)
-        ("xproto" ,xproto)
-        ("fontsproto" ,fontsproto)
+      `(("mkfontdir" ,mkfontdir)
+        ("bdftopcf" ,bdftopcf)
         ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libICE
+
+
+(define-public font-sony-misc
   (package
-    (name "libICE")
-    (version "1.0.8")
+    (name "font-sony-misc")
+    (version "1.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libICE-"
+               "mirror://xorg/X11R7.7/src/everything/font-sony-misc-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "07mp13pb3s73kj7y490gnx619znzwk91mlf8kdw0rzq29ll93a94"))))
+            "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xtrans" ,xtrans)
-        ("xproto" ,xproto)
+      `(("mkfontdir" ,mkfontdir)
+        ("bdftopcf" ,bdftopcf)
         ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libSM
+
+
+(define-public font-sun-misc
   (package
-    (name "libSM")
-    (version "1.2.1")
+    (name "font-sun-misc")
+    (version "1.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libSM-"
+               "mirror://xorg/X11R7.7/src/everything/font-sun-misc-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "07bzi6xwlhq36f60qfspjbz0qjj7zcgayi1vp4ihgx34kib1vhck"))))
+            "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xtrans" ,xtrans)
-        ("xproto" ,xproto)
-        ("util-linux" ,util-linux)
-        ("libICE" ,libICE)
+      `(("mkfontdir" ,mkfontdir)
+        ("bdftopcf" ,bdftopcf)
         ("pkg-config" ,pkg-config)))
-    (propagated-inputs
-      `(("libICE" ,libICE)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libWindowsWM
+
+
+(define-public font-util
   (package
-    (name "libWindowsWM")
-    (version "1.0.1")
+    (name "font-util")
+    (version "1.3.0")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libWindowsWM-"
+               "mirror://xorg/X11R7.7/src/everything/font-util-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15"))))
+            "15cijajwhjzpy3ydc817zz8x5z4gbkyv3fps687jbq544mbfbafz"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("xextproto" ,xextproto)
-        ("libxext" ,libxext)
-        ("libx11" ,libx11)
-        ("windowswmproto" ,windowswmproto)
-        ("pkg-config" ,pkg-config)))
+    (inputs `(("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libxScrnSaver
+
+
+(define-public font-winitzki-cyrillic
   (package
-    (name "libxScrnSaver")
-    (version "1.2.2")
+    (name "font-winitzki-cyrillic")
+    (version "1.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libxScrnSaver-"
+               "mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg"))))
+            "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xextproto" ,xextproto)
-        ("libxext" ,libxext)
-        ("libx11" ,libx11)
-        ("scrnsaverproto" ,scrnsaverproto)
+      `(("mkfontdir" ,mkfontdir)
+        ("bdftopcf" ,bdftopcf)
         ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libxau
+
+
+(define-public font-xfree86-type1
   (package
-    (name "libxau")
-    (version "1.0.7")
+    (name "font-xfree86-type1")
+    (version "1.0.4")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libxau-"
+               "mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "12d4f7sdv2pjxhk0lcay0pahccddszkw579dc59daqi37r8bllvi"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("xproto" ,xproto) ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libxaw
+
+
+(define-public fontsproto
   (package
-    (name "libxaw")
-    (version "1.0.11")
+    (name "fontsproto")
+    (version "2.1.2")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libxaw-"
+               "mirror://xorg/X11R7.7/src/everything/fontsproto-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "14ll7ndf5njc30hz2w197qvwp7fqj7y14wq4p1cyxlbipfn79a47"))))
+            "1ab8mbqxdwvdz4k5x4xb9c4n5w7i1xw276cbpk4z7a1nlpjrg746"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("libxt" ,libxt)
-        ("xproto" ,xproto)
-        ("libxpm" ,libxpm)
-        ("libxmu" ,libxmu)
-        ("xextproto" ,xextproto)
-        ("libxext" ,libxext)
-        ("libx11" ,libx11)
-        ("pkg-config" ,pkg-config)))
-    (propagated-inputs
-      `(("libxmu" ,libxmu)))
+    (inputs `(("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libxcomposite
+
+
+(define-public glproto
   (package
-    (name "libxcomposite")
-    (version "0.4.3")
+    (name "glproto")
+    (version "1.4.16")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libxcomposite-"
+               "mirror://xorg/X11R7.7/src/everything/glproto-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1b8sniijb85v4my6v30ma9yqnwl4hkclci9l1hqxnipfyhl4sa9j"))))
+            "13arnb4bz5pn89bxbh3shr8gihkhyznpjnq3zzr05msygwx6dpal"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("xproto" ,xproto)
-        ("libxfixes" ,libxfixes)
-        ("libx11" ,libx11)
-        ("compositeproto" ,compositeproto)
-        ("pkg-config" ,pkg-config)))
-    (propagated-inputs
-      `(("libxfixes" ,libxfixes)))
+    (inputs `(("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libxcursor
+
+
+(define-public iceauth
   (package
-    (name "libxcursor")
-    (version "1.1.13")
+    (name "iceauth")
+    (version "1.0.5")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libxcursor-"
+               "mirror://xorg/X11R7.7/src/everything/iceauth-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "13xd1dyb06gwdwb0bxb22fkgdlmis6wrljm2xk6fhz0v9bg2g27p"))))
+            "1aq6v671s2x5rc6zn0rgxb4wddg4vq94mckw3cpwl7ccrjjvd5hl"))))
     (build-system gnu-build-system)
     (inputs
-      `(("libxrender" ,libxrender)
-        ("xproto" ,xproto)
-        ("libxfixes" ,libxfixes)
-        ("libx11" ,libx11)
-        ("fixesproto" ,fixesproto)
+      `(("xproto" ,xproto)
+        ("libice" ,libice)
         ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libxdamage
+
+
+(define-public inputproto
   (package
-    (name "libxdamage")
-    (version "1.1.3")
+    (name "inputproto")
+    (version "2.2")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libxdamage-"
+               "mirror://xorg/X11R7.7/src/everything/inputproto-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1a678bwap74sqczbr2z4y4fvbr35km3inkm8bi1igjyk4v46jqdw"))))
+            "1c5wqamfsd8g5i8kya5pjfmcac8q5zq1l3vclh6p96f24nmicxfy"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("xproto" ,xproto)
-        ("libxfixes" ,libxfixes)
-        ("xextproto" ,xextproto)
-        ("libx11" ,libx11)
-        ("fixesproto" ,fixesproto)
-        ("damageproto" ,damageproto)
-        ("pkg-config" ,pkg-config)))
+    (inputs `(("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libxdmcp
+
+
+(define-public kbproto
   (package
-    (name "libxdmcp")
-    (version "1.1.1")
+    (name "kbproto")
+    (version "1.0.6")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libxdmcp-"
+               "mirror://xorg/X11R7.7/src/everything/kbproto-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "13highx4xpgkiwykpcl7z2laslrjc4pzi4h617ny9p7r6116vkls"))))
+            "0yal11hhpiisy3w8wmacsdzzzcnc3xwnswxz8k7zri40xc5aqz03"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("xproto" ,xproto) ("pkg-config" ,pkg-config)))
+    (inputs `(("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libxext
+
+
+(define-public libapplewm
   (package
-    (name "libxext")
-    (version "1.3.1")
+    (name "libapplewm")
+    (version "1.4.1")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libxext-"
+               "mirror://xorg/X11R7.7/src/everything/libAppleWM-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0ng8clhn7srbkadxjc7ih3z3v27v9ny0aa0dqkgddgxpgrhrq8jn"))))
+            "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y"))))
     (build-system gnu-build-system)
     (inputs
-      `(("libxau" ,libxau)
-        ("xproto" ,xproto)
-        ("xextproto" ,xextproto)
+      `(("xextproto" ,xextproto)
+        ("libxext" ,libxext)
         ("libx11" ,libx11)
+        ("applewmproto" ,applewmproto)
         ("pkg-config" ,pkg-config)))
-    (propagated-inputs
-      `(("xproto" ,xproto)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libxfixes
+
+
+(define-public libfs
   (package
-    (name "libxfixes")
-    (version "5.0")
+    (name "libfs")
+    (version "1.0.4")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libxfixes-"
+               "mirror://xorg/X11R7.7/src/everything/libFS-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1qx2rmwhmca2n7rgafy0arp15k5vwhdhhh6v6mx76hlj29328yjk"))))
+            "05c3bqgn5m7j4kx8wvy0p36faq6f9jv5yq12m6033m4lflg7cwvh"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xproto" ,xproto)
-        ("xextproto" ,xextproto)
-        ("libx11" ,libx11)
-        ("fixesproto" ,fixesproto)
+      `(("xtrans" ,xtrans)
+        ("xproto" ,xproto)
+        ("fontsproto" ,fontsproto)
         ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libxfont
+
+
+(define-public libice
   (package
-    (name "libxfont")
-    (version "1.4.5")
+    (name "libice")
+    (version "1.0.8")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libxfont-"
+               "mirror://xorg/X11R7.7/src/everything/libICE-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0w3irg00k6b6mziddnacln9q2rkf5848b04nvjqwv5bb1fw6zydv"))))
+            "07mp13pb3s73kj7y490gnx619znzwk91mlf8kdw0rzq29ll93a94"))))
     (build-system gnu-build-system)
     (inputs
-      `(("zlib" ,zlib)
-        ("xtrans" ,xtrans)
+      `(("xtrans" ,xtrans)
         ("xproto" ,xproto)
-        ("freetype" ,freetype)
-        ("fontsproto" ,fontsproto)
-        ("libfontenc" ,libfontenc)
         ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libxft
+
+
+(define-public libsm
   (package
-    (name "libxft")
-    (version "2.3.1")
+    (name "libsm")
+    (version "1.2.1")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libxft-"
+               "mirror://xorg/X11R7.7/src/everything/libSM-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1gdv6559cdz1lfw73x7wsvax1fkvphmayrymprljhyyb5nwk5kkz"))))
+            "07bzi6xwlhq36f60qfspjbz0qjj7zcgayi1vp4ihgx34kib1vhck"))))
     (build-system gnu-build-system)
     (inputs
-      `(("renderproto" ,renderproto)
-        ("libx11" ,libx11)
-        ("xproto" ,xproto)
-        ("libxrender" ,libxrender)
+      `(("xtrans" ,xtrans)
         ("xproto" ,xproto)
-        ("libx11" ,libx11)
-        ("freetype" ,freetype)
-        ("fontconfig" ,fontconfig)
+        ("util-linux" ,util-linux)
+        ("libice" ,libice)
         ("pkg-config" ,pkg-config)))
     (propagated-inputs
-      `(("fontconfig" ,fontconfig)
-        ("freetype" ,freetype)
-        ("libxrender" ,libxrender)))
+      `(("libice" ,libice)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libxi
+
+
+(define-public libwindowswm
   (package
-    (name "libxi")
-    (version "1.6.1")
+    (name "libwindowswm")
+    (version "1.0.1")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libxi-"
+               "mirror://xorg/X11R7.7/src/everything/libWindowsWM-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "029ihw4jq8mng8rx7a3jdvq64jm1zdkqidca93zmxv4jf9yn5qzj"))))
+            "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xproto" ,xproto)
-        ("xextproto" ,xextproto)
+      `(("xextproto" ,xextproto)
         ("libxext" ,libxext)
         ("libx11" ,libx11)
-        ("inputproto" ,inputproto)
+        ("windowswmproto" ,windowswmproto)
         ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libxinerama
+
+
+(define-public libx11
   (package
-    (name "libxinerama")
-    (version "1.1.2")
+    (name "libx11")
+    (version "1.5.0")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libxinerama-"
+               "mirror://xorg/X11R7.7/src/everything/libX11-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1b3aq1762hxzchd9ndavdjlksq93991s0g2z6spf8wl3v0pprrx4"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("xineramaproto" ,xineramaproto)
-        ("xextproto" ,xextproto)
-        ("libxext" ,libxext)
-        ("libx11" ,libx11)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libxmu
+
+
+(define-public libxscrnsaver
   (package
-    (name "libxmu")
-    (version "1.1.1")
+    (name "libxscrnsaver")
+    (version "1.2.2")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libxmu-"
+               "mirror://xorg/X11R7.7/src/everything/libXScrnSaver-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1pbym8rrznxqd60zwf7w4xpf27sa72bky2knginqcfnca32q343h"))))
+            "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg"))))
     (build-system gnu-build-system)
     (inputs
-      `(("libxt" ,libxt)
-        ("xproto" ,xproto)
-        ("xextproto" ,xextproto)
+      `(("xextproto" ,xextproto)
         ("libxext" ,libxext)
         ("libx11" ,libx11)
+        ("scrnsaverproto" ,scrnsaverproto)
         ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libxp
+
+
+(define-public libxau
   (package
-    (name "libxp")
-    (version "1.0.1")
+    (name "libxau")
+    (version "1.0.7")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/individual/lib/libxp-"
+               "mirror://xorg/X11R7.7/src/everything/libXau-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1lj3cjg9ygbmclxvayy5v88kkndpy9jq6y68p13dc5jn01hg5lbi"))))
+            "12d4f7sdv2pjxhk0lcay0pahccddszkw579dc59daqi37r8bllvi"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xextproto" ,xextproto)
-        ("libxext" ,libxext)
-        ("libxau" ,libxau)
-        ("libx11" ,libx11)
-        ("printproto" ,printproto)
-        ("pkg-config" ,pkg-config)))
+      `(("xproto" ,xproto) ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libxpm
+
+
+(define-public libxaw
   (package
-    (name "libxpm")
-    (version "3.5.10")
+    (name "libxaw")
+    (version "1.0.11")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libxpm-"
+               "mirror://xorg/X11R7.7/src/everything/libXaw-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0dd737ch4q9gr151wff1m3q2j7wf3pip4y81601xdrsh8wipxnx6"))))
+            "14ll7ndf5njc30hz2w197qvwp7fqj7y14wq4p1cyxlbipfn79a47"))))
     (build-system gnu-build-system)
     (inputs
       `(("libxt" ,libxt)
         ("xproto" ,xproto)
+        ("libxpm" ,libxpm)
+        ("libxmu" ,libxmu)
         ("xextproto" ,xextproto)
         ("libxext" ,libxext)
         ("libx11" ,libx11)
         ("pkg-config" ,pkg-config)))
+    (propagated-inputs
+      `(("libxmu" ,libxmu)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libxrandr
+
+
+(define-public libxcomposite
   (package
-    (name "libxrandr")
-    (version "1.4.0")
+    (name "libxcomposite")
+    (version "0.4.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/individual/lib/libxrandr-"
+               "mirror://xorg/X11R7.7/src/everything/libXcomposite-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1hzm2ndra4nf8xxzm4lzd225zj05hzbzcq464q2znah15ynd0fh3"))))
+            "1b8sniijb85v4my6v30ma9yqnwl4hkclci9l1hqxnipfyhl4sa9j"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("xproto" ,xproto)
+        ("libxfixes" ,libxfixes)
+        ("libx11" ,libx11)
+        ("compositeproto" ,compositeproto)
+        ("pkg-config" ,pkg-config)))
+    (propagated-inputs
+      `(("libxfixes" ,libxfixes)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public libxcursor
+  (package
+    (name "libxcursor")
+    (version "1.1.13")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/libXcursor-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "13xd1dyb06gwdwb0bxb22fkgdlmis6wrljm2xk6fhz0v9bg2g27p"))))
     (build-system gnu-build-system)
     (inputs
       `(("libxrender" ,libxrender)
         ("xproto" ,xproto)
-        ("xextproto" ,xextproto)
-        ("libxext" ,libxext)
+        ("libxfixes" ,libxfixes)
         ("libx11" ,libx11)
-        ("renderproto" ,renderproto)
-        ("randrproto" ,randrproto)
+        ("fixesproto" ,fixesproto)
         ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libxrender
+
+
+(define-public libxdamage
   (package
-    (name "libxrender")
-    (version "0.9.7")
+    (name "libxdamage")
+    (version "1.1.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libxrender-"
+               "mirror://xorg/X11R7.7/src/everything/libXdamage-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1rmvja2gkf5v0k2n1bcghw8v98m2kfn3af0rbmsda5dwr69npd7r"))))
+            "1a678bwap74sqczbr2z4y4fvbr35km3inkm8bi1igjyk4v46jqdw"))))
     (build-system gnu-build-system)
     (inputs
       `(("xproto" ,xproto)
+        ("libxfixes" ,libxfixes)
+        ("xextproto" ,xextproto)
         ("libx11" ,libx11)
-        ("renderproto" ,renderproto)
+        ("fixesproto" ,fixesproto)
+        ("damageproto" ,damageproto)
         ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libxres
+
+
+(define-public libxdmcp
   (package
-    (name "libxres")
-    (version "1.0.6")
+    (name "libxdmcp")
+    (version "1.1.1")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libxres-"
+               "mirror://xorg/X11R7.7/src/everything/libXdmcp-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1478pm70gdi6l70r4jpkyyg2am9wv6xh53z9ibwq5cg84p4n31pz"))))
+            "13highx4xpgkiwykpcl7z2laslrjc4pzi4h617ny9p7r6116vkls"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xproto" ,xproto)
+      `(("xproto" ,xproto) ("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public libxext
+  (package
+    (name "libxext")
+    (version "1.3.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/libXext-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "0ng8clhn7srbkadxjc7ih3z3v27v9ny0aa0dqkgddgxpgrhrq8jn"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("libxau" ,libxau)
+        ("xproto" ,xproto)
         ("xextproto" ,xextproto)
-        ("libxext" ,libxext)
         ("libx11" ,libx11)
-        ("resourceproto" ,resourceproto)
         ("pkg-config" ,pkg-config)))
+    (propagated-inputs
+      `(("xproto" ,xproto)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libxt
+
+
+(define-public libxfixes
   (package
-    (name "libxt")
-    (version "1.1.3")
+    (name "libxfixes")
+    (version "5.0")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libxt-"
+               "mirror://xorg/X11R7.7/src/everything/libXfixes-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1g85gwnhs7lg5f01gfi1cpb916xc3spm1fjlv2f4xz2zzk1r7dcd"))))
+            "1qx2rmwhmca2n7rgafy0arp15k5vwhdhhh6v6mx76hlj29328yjk"))))
     (build-system gnu-build-system)
     (inputs
       `(("xproto" ,xproto)
+        ("xextproto" ,xextproto)
         ("libx11" ,libx11)
-        ("libSM" ,libSM)
-        ("kbproto" ,kbproto)
-        ("libICE" ,libICE)
+        ("fixesproto" ,fixesproto)
+        ("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public libxfont
+  (package
+    (name "libxfont")
+    (version "1.4.5")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/libXfont-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "0w3irg00k6b6mziddnacln9q2rkf5848b04nvjqwv5bb1fw6zydv"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("zlib" ,zlib)
+        ("xtrans" ,xtrans)
+        ("xproto" ,xproto)
+        ("freetype" ,freetype)
+        ("fontsproto" ,fontsproto)
+        ("libfontenc" ,libfontenc)
+        ("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public libxft
+  (package
+    (name "libxft")
+    (version "2.3.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/libXft-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "1gdv6559cdz1lfw73x7wsvax1fkvphmayrymprljhyyb5nwk5kkz"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("renderproto" ,renderproto)
+        ("libx11" ,libx11)
+        ("xproto" ,xproto)
+        ("libxrender" ,libxrender)
+        ("xproto" ,xproto)
+        ("libx11" ,libx11)
+        ("freetype" ,freetype)
+        ("fontconfig" ,fontconfig)
         ("pkg-config" ,pkg-config)))
     (propagated-inputs
-      `(("libSM" ,libSM)))
+      `(("fontconfig" ,fontconfig)
+        ("freetype" ,freetype)
+        ("libxrender" ,libxrender)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libxtst
+
+
+(define-public libxi
   (package
-    (name "libxtst")
-    (version "1.2.1")
+    (name "libxi")
+    (version "1.6.1")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libxtst-"
+               "mirror://xorg/X11R7.7/src/everything/libXi-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1q750hjplq1rfyxkr4545z1y2a1wfnc828ynvbws7b4jwdk3xsky"))))
+            "029ihw4jq8mng8rx7a3jdvq64jm1zdkqidca93zmxv4jf9yn5qzj"))))
     (build-system gnu-build-system)
     (inputs
-      `(("libxi" ,libxi)
+      `(("xproto" ,xproto)
         ("xextproto" ,xextproto)
         ("libxext" ,libxext)
         ("libx11" ,libx11)
-        ("recordproto" ,recordproto)
         ("inputproto" ,inputproto)
         ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libxv
+
+
+(define-public libxinerama
+  (package
+    (name "libxinerama")
+    (version "1.1.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/libXinerama-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "1b3aq1762hxzchd9ndavdjlksq93991s0g2z6spf8wl3v0pprrx4"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("xineramaproto" ,xineramaproto)
+        ("xextproto" ,xextproto)
+        ("libxext" ,libxext)
+        ("libx11" ,libx11)
+        ("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public libxmu
+  (package
+    (name "libxmu")
+    (version "1.1.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/libXmu-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "1pbym8rrznxqd60zwf7w4xpf27sa72bky2knginqcfnca32q343h"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("libxt" ,libxt)
+        ("xproto" ,xproto)
+        ("xextproto" ,xextproto)
+        ("libxext" ,libxext)
+        ("libx11" ,libx11)
+        ("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public libxp
+  (package
+    (name "libxp")
+    (version "1.0.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/libXp-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "1lj3cjg9ygbmclxvayy5v88kkndpy9jq6y68p13dc5jn01hg5lbi"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("xextproto" ,xextproto)
+        ("libxext" ,libxext)
+        ("libxau" ,libxau)
+        ("libx11" ,libx11)
+;;        ("printproto" ,printproto)
+        ("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public libxpm
+  (package
+    (name "libxpm")
+    (version "3.5.10")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/libXpm-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "0dd737ch4q9gr151wff1m3q2j7wf3pip4y81601xdrsh8wipxnx6"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("libxt" ,libxt)
+        ("xproto" ,xproto)
+        ("xextproto" ,xextproto)
+        ("libxext" ,libxext)
+        ("libx11" ,libx11)
+        ("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public libxrandr
+  (package
+    (name "libxrandr")
+    (version "1.4.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/XqqR7.7/src/everything/libXrandr-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "1hzm2ndra4nf8xxzm4lzd225zj05hzbzcq464q2znah15ynd0fh3"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("libxrender" ,libxrender)
+        ("xproto" ,xproto)
+        ("xextproto" ,xextproto)
+        ("libxext" ,libxext)
+        ("libx11" ,libx11)
+        ("renderproto" ,renderproto)
+        ("randrproto" ,randrproto)
+        ("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public libxrender
+  (package
+    (name "libxrender")
+    (version "0.9.7")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/libXrender-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "1rmvja2gkf5v0k2n1bcghw8v98m2kfn3af0rbmsda5dwr69npd7r"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("xproto" ,xproto)
+        ("libx11" ,libx11)
+        ("renderproto" ,renderproto)
+        ("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public libxres
+  (package
+    (name "libxres")
+    (version "1.0.6")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/libXres-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "1478pm70gdi6l70r4jpkyyg2am9wv6xh53z9ibwq5cg84p4n31pz"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("xproto" ,xproto)
+        ("xextproto" ,xextproto)
+        ("libxext" ,libxext)
+        ("libx11" ,libx11)
+        ("resourceproto" ,resourceproto)
+        ("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public libxt
+  (package
+    (name "libxt")
+    (version "1.1.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/libXt-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "1g85gwnhs7lg5f01gfi1cpb916xc3spm1fjlv2f4xz2zzk1r7dcd"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("xproto" ,xproto)
+        ("libx11" ,libx11)
+        ("libsm" ,libsm)
+        ("kbproto" ,kbproto)
+        ("libice" ,libice)
+        ("pkg-config" ,pkg-config)))
+    (propagated-inputs
+      `(("libsm" ,libsm)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public libxtst
+  (package
+    (name "libxtst")
+    (version "1.2.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/libXtst-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "1q750hjplq1rfyxkr4545z1y2a1wfnc828ynvbws7b4jwdk3xsky"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("libxi" ,libxi)
+        ("xextproto" ,xextproto)
+        ("libxext" ,libxext)
+        ("libx11" ,libx11)
+        ("recordproto" ,recordproto)
+        ("inputproto" ,inputproto)
+        ("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public libxv
+  (package
+    (name "libxv")
+    (version "1.0.7")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/libXv-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "044hllz013afhzywwpxz007l4zjy99bv9im065rqd30zckmllrjx"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("xproto" ,xproto)
+        ("xextproto" ,xextproto)
+        ("libxext" ,libxext)
+        ("libx11" ,libx11)
+        ("videoproto" ,videoproto)
+        ("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public libxvmc
+  (package
+    (name "libxvmc")
+    (version "1.0.7")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/libXvMC-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "18yf6ysc01pqkbk9704914ghalq1sl2hfdjmwggxm8qqhpy8bw18"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("libxv" ,libxv)
+        ("xproto" ,xproto)
+        ("xextproto" ,xextproto)
+        ("libxext" ,libxext)
+        ("libx11" ,libx11)
+        ("videoproto" ,videoproto)
+        ("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public libxxf86dga
+  (package
+    (name "libxxf86dga")
+    (version "1.1.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/libXxf86dga-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "0000000000000000000000000000000000000000000000000000"))))
+    (build-system gnu-build-system)
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public libxxf86vm
+  (package
+    (name "libxxf86vm")
+    (version "1.1.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/libXxf86vm-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "0000000000000000000000000000000000000000000000000000"))))
+    (build-system gnu-build-system)
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public libdmx
+  (package
+    (name "libdmx")
+    (version "1.1.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/libdmx-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "1fiq73sfxcbyjval118ialwrzxhzb08xsxmg69adcs47i9j0p1x7"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("xextproto" ,xextproto)
+        ("libxext" ,libxext)
+        ("libx11" ,libx11)
+        ("dmxproto" ,dmxproto)
+        ("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public libfontenc
+  (package
+    (name "libfontenc")
+    (version "1.1.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/libfontenc-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "0zq1483xy31sssq0h3xxf8y1v4q14cp8rv164ayn7fsn30pq2wny"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("zlib" ,zlib)
+        ("xproto" ,xproto)
+        ("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public libpciaccess
+  (package
+    (name "libpciaccess")
+    (version "0.13.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/libpciaccess-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "11509lkgd5j4g5wy0g13z4sf31h50hqx3jfwb2i4q6k98pv6iar7"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("zlib" ,zlib) ("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public libpthread-stubs
+  (package
+    (name "libpthread-stubs")
+    (version "0.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/libpthread-stubs-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim"))))
+    (build-system gnu-build-system)
+    (inputs `(("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public libxcb
+  (package
+    (name "libxcb")
+    (version "1.9")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/libxcb-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "15icn78x610dvvgnji6b3pyn8nd88lz68hq0w73pcadf78mycmw8"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("xproto" ,xproto)
+        ("libxdmcp" ,libxdmcp)
+        ("xcb-proto" ,xcb-proto)
+        ("libxau" ,libxau)
+        ("libpthread-stubs" ,libpthread-stubs)
+        ("libxslt" ,libxslt)
+        ("pkg-config" ,pkg-config)
+        ("python" ,python)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public libxkbfile
+  (package
+    (name "libxkbfile")
+    (version "1.0.8")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/libxkbfile-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "0flg5arw6n3njagmsi4i4l0zl5bfx866a1h9ydc3bi1pqlclxaca"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("libx11" ,libx11)
+        ("kbproto" ,kbproto)
+        ("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public luit
+  (package
+    (name "luit")
+    (version "1.1.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/luit-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("libfontenc" ,libfontenc)
+        ("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public makedepend
+  (package
+    (name "makedepend")
+    (version "1.0.4")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/makedepend-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "1zpp2b9dfvlnfj2i1mzdyn785rpl7vih5lap7kcpiv80xspbhmmb"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("xproto" ,xproto) ("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public mkfontdir
+  (package
+    (name "mkfontdir")
+    (version "1.0.7")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/mkfontdir-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman"))))
+    (build-system gnu-build-system)
+    (inputs `(("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public mkfontscale
+  (package
+    (name "mkfontscale")
+    (version "1.1.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/mkfontscale-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "1539h3ws66vcql6sf2831bcs0r4d9b05lcgpswkw33lvcxighmff"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("zlib" ,zlib)
+        ("xproto" ,xproto)
+        ("freetype" ,freetype)
+        ("libfontenc" ,libfontenc)
+        ("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public randrproto
+  (package
+    (name "randrproto")
+    (version "1.4.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/randrproto-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "1kq9h93qdnniiivry8jmhlgwn9fbx9xp5r9cmzfihlx5cs62xi45"))))
+    (build-system gnu-build-system)
+    (inputs `(("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public recordproto
+  (package
+    (name "recordproto")
+    (version "1.14.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/recordproto-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7"))))
+    (build-system gnu-build-system)
+    (inputs `(("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public renderproto
+  (package
+    (name "renderproto")
+    (version "0.11.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/renderproto-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6"))))
+    (build-system gnu-build-system)
+    (inputs `(("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public resourceproto
+  (package
+    (name "resourceproto")
+    (version "1.2.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/resourceproto-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw"))))
+    (build-system gnu-build-system)
+    (inputs `(("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public scrnsaverproto
+  (package
+    (name "scrnsaverproto")
+    (version "1.2.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/scrnsaverproto-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb"))))
+    (build-system gnu-build-system)
+    (inputs `(("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public sessreg
+  (package
+    (name "sessreg")
+    (version "1.0.7")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/sessreg-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "0lifgjxdvc6lwyjk90slddnr12fsv88ldy6qhklr5av409cfwd47"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("xproto" ,xproto) ("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public setxkbmap
+  (package
+    (name "setxkbmap")
+    (version "1.3.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/setxkbmap-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "1inygpvlgc6vr5h9laxw9lnvafnccl3fy0g5n9ll28iq3yfmqc1x"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("libxkbfile" ,libxkbfile)
+        ("libx11" ,libx11)
+        ("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public smproxy
+  (package
+    (name "smproxy")
+    (version "1.0.5")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/smproxy-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "02fn5wa1gs2jap6sr9j9yk6zsvz82j8l61pf74iyqwa99q4wnb67"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("libxt" ,libxt)
+        ("libxmu" ,libxmu)
+        ("libsm" ,libsm)
+        ("libice" ,libice)
+        ("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public util-macros
+  (package
+    (name "util-macros")
+    (version "1.17")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/util-macros-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "1vbmrcn5n3wp4pyw0n4c3pyvzlc4yf7jzgngavfdq5zwfbgfsybx"))))
+    (build-system gnu-build-system)
+    (inputs `(("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public videoproto
+  (package
+    (name "videoproto")
+    (version "2.3.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/videoproto-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "0nk3i6gwkqq1w8zwn7bxz344pi1dwcjrmf6hr330h7hxjcj6viry"))))
+    (build-system gnu-build-system)
+    (inputs `(("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public windowswmproto
+  (package
+    (name "windowswmproto")
+    (version "1.0.4")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/windowswmproto-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0"))))
+    (build-system gnu-build-system)
+    (inputs `(("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public x11perf
+  (package
+    (name "x11perf")
+    (version "1.5.4")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/x11perf-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "0000000000000000000000000000000000000000000000000000"))))
+    (build-system gnu-build-system)
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public xauth
+  (package
+    (name "xauth")
+    (version "1.0.7")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/xauth-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "1382wdfiakgckbw1xxavzh1nm34q21b1zzy96qp7ws66xc48rxw4"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("libxmu" ,libxmu)
+        ("libxext" ,libxext)
+        ("libxau" ,libxau)
+        ("libx11" ,libx11)
+        ("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public xbacklight
+  (package
+    (name "xbacklight")
+    (version "1.2.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/xbacklight-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "199n9qszjiz82nbjz6ychh0xl15igm535mv0830wk4m59w9xclji"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("libxrender" ,libxrender)
+;;        ("xcb-util" ,xcb-util)
+        ("libxcb" ,libxcb)
+        ("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public xbitmaps
+  (package
+    (name "xbitmaps")
+    (version "1.1.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/xbitmaps-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n"))))
+    (build-system gnu-build-system)
+    (inputs `(("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public xcb-proto
+  (package
+    (name "xcb-proto")
+    (version "1.8")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/xcb-proto-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "1c11652h9sjynw3scm1pn5z3a6ci888pq7hij8q5n8qrl33icg93"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("pkg-config" ,pkg-config) ("python" ,python)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public xcmiscproto
+  (package
+    (name "xcmiscproto")
+    (version "1.2.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/xcmiscproto-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi"))))
+    (build-system gnu-build-system)
+    (inputs `(("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public xcmsdb
+  (package
+    (name "xcmsdb")
+    (version "1.0.4")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/xcmsdb-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "03ms731l3kvaldq7ycbd30j6134b61i3gbll4b2gl022wyzbjq74"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("libx11" ,libx11)
+        ("pkg-config" ,pkg-config)))
+    (home-page #f)
+    (synopsis #f)
+    (description #f)
+    (license #f)))
+
+
+(define-public xcursor-themes
   (package
-    (name "libxv")
-    (version "1.0.7")
+    (name "xcursor-themes")
+    (version "1.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libxv-"
+               "mirror://xorg/X11R7.7/src/everything/xcursor-themes-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "044hllz013afhzywwpxz007l4zjy99bv9im065rqd30zckmllrjx"))))
+            "1is4bak0qkkhv63mfa5l7492r475586y52yzfxyv3psppn662ilr"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xproto" ,xproto)
-        ("xextproto" ,xextproto)
-        ("libxext" ,libxext)
-        ("libx11" ,libx11)
-        ("videoproto" ,videoproto)
+      `(("libxcursor" ,libxcursor)
         ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libxvMC
+
+
+(define-public xcursorgen
   (package
-    (name "libxvMC")
-    (version "1.0.7")
+    (name "xcursorgen")
+    (version "1.0.5")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libxvMC-"
+               "mirror://xorg/X11R7.7/src/everything/xcursorgen-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "18yf6ysc01pqkbk9704914ghalq1sl2hfdjmwggxm8qqhpy8bw18"))))
+            "10f5wk1326mm45gvgpf4m2p0j80fcd0i4c52zikahb91zah72wdw"))))
     (build-system gnu-build-system)
     (inputs
-      `(("libxv" ,libxv)
-        ("xproto" ,xproto)
-        ("xextproto" ,xextproto)
-        ("libxext" ,libxext)
+      `(("libxcursor" ,libxcursor)
         ("libx11" ,libx11)
-        ("videoproto" ,videoproto)
+        ("libpng" ,libpng)
         ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libdmx
+
+
+(define-public xdpyinfo
   (package
-    (name "libdmx")
-    (version "1.1.2")
+    (name "xdpyinfo")
+    (version "1.3.0")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libdmx-"
+               "mirror://xorg/X11R7.7/src/everything/xdpyinfo-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1fiq73sfxcbyjval118ialwrzxhzb08xsxmg69adcs47i9j0p1x7"))))
+            "0gypsvpmay3lsh3b1dg29pjxv95pkrr21d4w6ys02mrbld24kvi3"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xextproto" ,xextproto)
+      `(("libxxf86vm" ,libxxf86vm)
+;;         ("libxxf86misc" ,libxxf86misc)
+        ("libxxf86dga" ,libxxf86dga)
+        ("libxtst" ,libxtst)
+        ("libxrender" ,libxrender)
+        ("libxinerama" ,libxinerama)
+        ("libxi" ,libxi)
         ("libxext" ,libxext)
+        ("libxcomposite" ,libxcomposite)
+        ("libxcb" ,libxcb)
         ("libx11" ,libx11)
-        ("dmxproto" ,dmxproto)
+        ("libdmx" ,libdmx)
         ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libfontenc
+
+
+(define-public xdriinfo
   (package
-    (name "libfontenc")
-    (version "1.1.1")
+    (name "xdriinfo")
+    (version "1.0.4")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libfontenc-"
+               "mirror://xorg/X11R7.7/src/everything/xdriinfo-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0zq1483xy31sssq0h3xxf8y1v4q14cp8rv164ayn7fsn30pq2wny"))))
+            "076bjix941znyjmh3j5jjsnhp2gv2iq53d0ks29mvvv87cyy9iim"))))
     (build-system gnu-build-system)
     (inputs
-      `(("zlib" ,zlib)
-        ("xproto" ,xproto)
+      `(;;("mesa" ,mesa)
+        ("glproto" ,glproto)
+        ("libx11" ,libx11)
+        ("glproto" ,glproto)
         ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libpciaccess
+
+
+(define-public xev
   (package
-    (name "libpciaccess")
-    (version "0.13.1")
+    (name "xev")
+    (version "1.2.0")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libpciaccess-"
+               "mirror://xorg/X11R7.7/src/everything/xev-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "11509lkgd5j4g5wy0g13z4sf31h50hqx3jfwb2i4q6k98pv6iar7"))))
+            "13xk5z7vy87rnn4574z0jfzymdivyc7pl4axim81sx0pmdysg1ip"))))
     (build-system gnu-build-system)
     (inputs
-      `(("zlib" ,zlib) ("pkg-config" ,pkg-config)))
+      `(("libxrender" ,libxrender)
+        ("libxrandr" ,libxrandr)
+        ("xproto" ,xproto)
+        ("libx11" ,libx11)
+        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libpthread-stubs
+
+
+(define-public xextproto
   (package
-    (name "libpthread-stubs")
-    (version "0.3")
+    (name "xextproto")
+    (version "7.2.1")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libpthread-stubs-"
+               "mirror://xorg/X11R7.7/src/everything/xextproto-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim"))))
+            "06kdanbnprxvgl56l5h0lqj4b0f1fbb1ndha33mv5wvy802v2lvw"))))
     (build-system gnu-build-system)
     (inputs `(("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libxcb
+
+
+(define-public xf86-input-evdev
   (package
-    (name "libxcb")
-    (version "1.9")
+    (name "xf86-input-evdev")
+    (version "2.7.0")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/individual/xcb/libxcb-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-input-evdev-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "15icn78x610dvvgnji6b3pyn8nd88lz68hq0w73pcadf78mycmw8"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("xproto" ,xproto)
-        ("libxdmcp" ,libxdmcp)
-        ("xcb-proto" ,xcb-proto)
-        ("libxau" ,libxau)
-        ("libpthread-stubs" ,libpthread-stubs)
-        ("libxslt" ,libxslt)
-        ("pkg-config" ,pkg-config)
-        ("python" ,python)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public libxkbfile
+
+
+(define-public xf86-input-joystick
   (package
-    (name "libxkbfile")
-    (version "1.0.8")
+    (name "xf86-input-joystick")
+    (version "1.6.1")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libxkbfile-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-input-joystick-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0flg5arw6n3njagmsi4i4l0zl5bfx866a1h9ydc3bi1pqlclxaca"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("libx11" ,libx11)
-        ("kbproto" ,kbproto)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public lndir
+
+
+(define-public xf86-input-keyboard
   (package
-    (name "lndir")
-    (version "1.0.3")
+    (name "xf86-input-keyboard")
+    (version "1.6.1")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/individual/util/lndir-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-input-keyboard-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("xproto" ,xproto) ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public luit
+
+
+(define-public xf86-input-mouse
   (package
-    (name "luit")
-    (version "1.1.1")
+    (name "xf86-input-mouse")
+    (version "1.7.2")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/luit-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-input-mouse-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("libfontenc" ,libfontenc)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public makedepend
+
+
+(define-public xf86-input-synaptics
   (package
-    (name "makedepend")
-    (version "1.0.4")
+    (name "xf86-input-synaptics")
+    (version "1.6.1")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/makedepend-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-input-synaptics-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1zpp2b9dfvlnfj2i1mzdyn785rpl7vih5lap7kcpiv80xspbhmmb"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("xproto" ,xproto) ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public mkfontdir
+
+
+(define-public xf86-input-vmmouse
   (package
-    (name "mkfontdir")
-    (version "1.0.7")
+    (name "xf86-input-vmmouse")
+    (version "12.8.0")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/mkfontdir-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-input-vmmouse-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs `(("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public mkfontscale
+
+
+(define-public xf86-input-void
   (package
-    (name "mkfontscale")
-    (version "1.1.0")
+    (name "xf86-input-void")
+    (version "1.4.0")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/mkfontscale-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-input-void-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1539h3ws66vcql6sf2831bcs0r4d9b05lcgpswkw33lvcxighmff"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("zlib" ,zlib)
-        ("xproto" ,xproto)
-        ("freetype" ,freetype)
-        ("libfontenc" ,libfontenc)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public pixman
+
+
+(define-public xf86-video-ark
   (package
-    (name "pixman")
-    (version "0.26.2")
+    (name "xf86-video-ark")
+    (version "0.7.4")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/individual/lib/pixman-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-ark-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0z34jb75wpbyj3gxn34icd8j81fk5d6s6qnwp2ncz7m8icf6afqr"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("pkg-config" ,pkg-config) ("perl" ,perl)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public printproto
+
+
+(define-public xf86-video-ast
   (package
-    (name "printproto")
-    (version "1.0.5")
+    (name "xf86-video-ast")
+    (version "0.93.10")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/individual/proto/printproto-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-ast-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "06liap8n4s25sgp27d371cc7yg9a08dxcr3pmdjp761vyin3360j"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("libxau" ,libxau) ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public randrproto
+
+
+(define-public xf86-video-ati
   (package
-    (name "randrproto")
-    (version "1.4.0")
+    (name "xf86-video-ati")
+    (version "6.14.4")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/individual/proto/randrproto-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-ati-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1kq9h93qdnniiivry8jmhlgwn9fbx9xp5r9cmzfihlx5cs62xi45"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs `(("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public recordproto
+
+
+(define-public xf86-video-cirrus
   (package
-    (name "recordproto")
-    (version "1.14.2")
+    (name "xf86-video-cirrus")
+    (version "1.4.0")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/recordproto-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-cirrus-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs `(("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public renderproto
+
+
+(define-public xf86-video-dummy
   (package
-    (name "renderproto")
-    (version "0.11.1")
+    (name "xf86-video-dummy")
+    (version "0.3.5")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/renderproto-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-dummy-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs `(("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public resourceproto
+
+
+(define-public xf86-video-fbdev
   (package
-    (name "resourceproto")
-    (version "1.2.0")
+    (name "xf86-video-fbdev")
+    (version "0.4.2")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/resourceproto-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-fbdev-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs `(("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public scrnsaverproto
+
+
+(define-public xf86-video-geode
   (package
-    (name "scrnsaverproto")
-    (version "1.2.2")
+    (name "xf86-video-geode")
+    (version "2.11.13")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/scrnsaverproto-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-geode-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs `(("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public sessreg
+
+
+(define-public xf86-video-glide
   (package
-    (name "sessreg")
-    (version "1.0.7")
+    (name "xf86-video-glide")
+    (version "1.2.0")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/sessreg-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-glide"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0lifgjxdvc6lwyjk90slddnr12fsv88ldy6qhklr5av409cfwd47"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("xproto" ,xproto) ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public setxkbmap
+
+
+(define-public xf86-video-glint
   (package
-    (name "setxkbmap")
-    (version "1.3.0")
+    (name "xf86-video-glint")
+    (version "1.2.7")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/setxkbmap-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-glint-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1inygpvlgc6vr5h9laxw9lnvafnccl3fy0g5n9ll28iq3yfmqc1x"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("libxkbfile" ,libxkbfile)
-        ("libx11" ,libx11)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public smproxy
+
+
+(define-public xf86-video-i128
   (package
-    (name "smproxy")
-    (version "1.0.5")
+    (name "xf86-video-i128")
+    (version "1.3.5")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/smproxy-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-i128-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "02fn5wa1gs2jap6sr9j9yk6zsvz82j8l61pf74iyqwa99q4wnb67"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("libxt" ,libxt)
-        ("libxmu" ,libxmu)
-        ("libSM" ,libSM)
-        ("libICE" ,libICE)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public twm
+
+
+(define-public xf86-video-intel
   (package
-    (name "twm")
-    (version "1.0.7")
+    (name "xf86-video-intel")
+    (version "2.19.0")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/individual/app/twm-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-intel-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0i6dbf5vafi5hm4bcmnj6r412cncjlv9hkkbr6bzlh15qvg56p8g"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("libxt" ,libxt)
-        ("xproto" ,xproto)
-        ("libxmu" ,libxmu)
-        ("libxext" ,libxext)
-        ("libx11" ,libx11)
-        ("libSM" ,libSM)
-        ("libICE" ,libICE)
-        ("pkg-config" ,pkg-config)
-        ("flex" ,flex)
-        ("bison" ,bison)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public util-macros
+
+
+(define-public xf86-video-mach64
   (package
-    (name "util-macros")
-    (version "1.17")
+    (name "xf86-video-mach64")
+    (version "6.9.1")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/util-macros-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-mach64-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1vbmrcn5n3wp4pyw0n4c3pyvzlc4yf7jzgngavfdq5zwfbgfsybx"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs `(("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public videoproto
+
+
+(define-public xf86-video-mga
   (package
-    (name "videoproto")
-    (version "2.3.1")
+    (name "xf86-video-mga")
+    (version "1.5.0")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/videoproto-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-mga-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0nk3i6gwkqq1w8zwn7bxz344pi1dwcjrmf6hr330h7hxjcj6viry"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs `(("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public windowswmproto
+
+
+(define-public xf86-video-neomagic
   (package
-    (name "windowswmproto")
-    (version "1.0.4")
+    (name "xf86-video-neomagic")
+    (version "1.2.6")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/windowswmproto-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-neomagic-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs `(("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public xauth
+
+
+(define-public xf86-video-newport
   (package
-    (name "xauth")
-    (version "1.0.7")
+    (name "xf86-video-newport")
+    (version "0.2.4")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/xauth-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-newport-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1382wdfiakgckbw1xxavzh1nm34q21b1zzy96qp7ws66xc48rxw4"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("libxmu" ,libxmu)
-        ("libxext" ,libxext)
-        ("libxau" ,libxau)
-        ("libx11" ,libx11)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public xbacklight
+
+
+(define-public xf86-video-nv
   (package
-    (name "xbacklight")
-    (version "1.2.0")
+    (name "xf86-video-nv")
+    (version "2.1.18")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/individual/app/xbacklight-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-nv-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "199n9qszjiz82nbjz6ychh0xl15igm535mv0830wk4m59w9xclji"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("libxrender" ,libxrender)
-        ("xcb-util" ,xcb-util)
-        ("libxcb" ,libxcb)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public xbitmaps
+
+
+(define-public xf86-video-openchrome
   (package
-    (name "xbitmaps")
-    (version "1.1.1")
+    (name "xf86-video-openchrome")
+    (version "0.2.906")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/xbitmaps-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-openchrome-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs `(("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public xcb-proto
+
+
+(define-public xf86-video-r128
   (package
-    (name "xcb-proto")
-    (version "1.8")
+    (name "xf86-video-r128")
+    (version "6.8.2")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/individual/xcb/xcb-proto-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-r128-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1c11652h9sjynw3scm1pn5z3a6ci888pq7hij8q5n8qrl33icg93"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("pkg-config" ,pkg-config) ("python" ,python)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public xcb-util
+
+
+(define-public xf86-video-savage
   (package
-    (name "xcb-util")
-    (version "0.3.9")
+    (name "xf86-video-savage")
+    (version "2.3.4")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/individual/xcb/xcb-util-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-savage-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1i0qbhqkcdlbbsj7ifkyjsffl61whj24d3zlg5pxf3xj1af2a4f6"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("xproto" ,xproto)
-        ("libxcb" ,libxcb)
-        ("gperf" ,gperf)
-        ("m4" ,m4)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public xcb-util-image
+
+
+(define-public xf86-video-siliconmotion
   (package
-    (name "xcb-util-image")
-    (version "0.3.9")
+    (name "xf86-video-siliconmotion")
+    (version "1.7.6")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/individual/xcb/xcb-util-image-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-siliconmotion-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1pr1l1nkg197gyl9d0fpwmn72jqpxjfgn9y13q4gawg1m873qnnk"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("xproto" ,xproto)
-        ("xcb-util" ,xcb-util)
-        ("libxcb" ,libxcb)
-        ("m4" ,m4)
-        ("gperf" ,gperf)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public xcb-util-keysyms
+
+
+(define-public xf86-video-sis
   (package
-    (name "xcb-util-keysyms")
-    (version "0.3.9")
+    (name "xf86-video-sis")
+    (version "0.10.4")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/individual/xcb/xcb-util-keysyms-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-sis-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0vjwk7vrcfnlhiadv445c6skfxmdrg5v4qf81y8s2s5xagqarqbv"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("xproto" ,xproto)
-        ("libxcb" ,libxcb)
-        ("m4" ,m4)
-        ("gperf" ,gperf)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public xcb-util-renderutil
+
+
+(define-public xf86-video-suncg6
   (package
-    (name "xcb-util-renderutil")
-    (version "0.3.8")
+    (name "xf86-video-suncg6")
+    (version "1.1.1")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/individual/xcb/xcb-util-renderutil-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-suncg6-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0lkl9ij9b447c0br2qc5qsynjn09c4fdz7sd6yp7pyi8az2sb2cp"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("xproto" ,xproto)
-        ("libxcb" ,libxcb)
-        ("m4" ,m4)
-        ("gperf" ,gperf)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public xcb-util-wm
+
+
+(define-public xf86-video-sunffb
   (package
-    (name "xcb-util-wm")
-    (version "0.3.9")
+    (name "xf86-video-sunffb")
+    (version "1.2.1")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/individual/xcb/xcb-util-wm-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-sunffb-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0c30fj33gvwzwhyz1dhsfwni0ai16bxpvxb4l6c6s7vvj7drp3q3"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("xproto" ,xproto)
-        ("libxcb" ,libxcb)
-        ("m4" ,m4)
-        ("gperf" ,gperf)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public xclock
+
+
+(define-public xf86-video-tdfx
   (package
-    (name "xclock")
-    (version "1.0.6")
+    (name "xf86-video-tdfx")
+    (version "1.4.4")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/individual/app/xclock-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-tdfx-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1l1zxr69p0734fnx9rdqw79ahr273hr050sm8xdc0n51n1bnzfr1"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("libxt" ,libxt)
-        ("libxrender" ,libxrender)
-        ("libxmu" ,libxmu)
-        ("libxkbfile" ,libxkbfile)
-        ("libxft" ,libxft)
-        ("libxaw" ,libxaw)
-        ("libx11" ,libx11)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public xcmiscproto
+
+
+(define-public xf86-video-tga
   (package
-    (name "xcmiscproto")
-    (version "1.2.2")
+    (name "xf86-video-tga")
+    (version "1.2.1")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/xcmiscproto-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-tga-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs `(("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public xcmsdb
+
+
+(define-public xf86-video-trident
   (package
-    (name "xcmsdb")
-    (version "1.0.4")
+    (name "xf86-video-trident")
+    (version "1.3.5")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/xcmsdb-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-trident-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "03ms731l3kvaldq7ycbd30j6134b61i3gbll4b2gl022wyzbjq74"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("libx11" ,libx11)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public xcursorgen
+
+
+(define-public xf86-video-v4l
   (package
-    (name "xcursorgen")
-    (version "1.0.5")
+    (name "xf86-video-v4l")
+    (version "0.2.0")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/xcursorgen-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "10f5wk1326mm45gvgpf4m2p0j80fcd0i4c52zikahb91zah72wdw"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("libxcursor" ,libxcursor)
-        ("libx11" ,libx11)
-        ("libpng" ,libpng)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public xcursor-themes
+
+
+(define-public xf86-video-vesa
   (package
-    (name "xcursor-themes")
-    (version "1.0.3")
+    (name "xf86-video-vesa")
+    (version "2.3.1")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/xcursor-themes-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-vesa-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1is4bak0qkkhv63mfa5l7492r475586y52yzfxyv3psppn662ilr"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("libxcursor" ,libxcursor)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public xdm
+
+
+(define-public xf86-video-vmware
   (package
-    (name "xdm")
-    (version "1.1.11")
+    (name "xf86-video-vmware")
+    (version "12.0.2")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/individual/app/xdm-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-vmware-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0iqw11977lpr9nk1is4fca84d531vck0mq7jldwl44m0vrnl5nnl"))))
-    (build-system gnu-build-system)
-    (inputs
-      `(("libxt" ,libxt)
-        ("libxpm" ,libxpm)
-        ("libxmu" ,libxmu)
-        ("libxinerama" ,libxinerama)
-        ("libxft" ,libxft)
-        ("libxext" ,libxext)
-        ("libxdmcp" ,libxdmcp)
-        ("libxaw" ,libxaw)
-        ("libxau" ,libxau)
-        ("libx11" ,libx11)
-        ("pkg-config" ,pkg-config)))
+            "0000000000000000000000000000000000000000000000000000"))))
+    (build-system gnu-build-system)
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public xdpyinfo
+
+
+(define-public xf86-video-voodoo
   (package
-    (name "xdpyinfo")
-    (version "1.3.0")
+    (name "xf86-video-voodoo")
+    (version "1.2.4")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/xdpyinfo-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-voodoo-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0gypsvpmay3lsh3b1dg29pjxv95pkrr21d4w6ys02mrbld24kvi3"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("libxxf86vm" ,libxxf86vm)
-        ("libxxf86misc" ,libxxf86misc)
-        ("libxxf86dga" ,libxxf86dga)
-        ("libxtst" ,libxtst)
-        ("libxrender" ,libxrender)
-        ("libxinerama" ,libxinerama)
-        ("libxi" ,libxi)
-        ("libxext" ,libxext)
-        ("libxcomposite" ,libxcomposite)
-        ("libxcb" ,libxcb)
-        ("libx11" ,libx11)
-        ("libdmx" ,libdmx)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public xdriinfo
+
+
+(define-public xf86-video-wsfb
   (package
-    (name "xdriinfo")
-    (version "1.0.4")
+    (name "xf86-video-wsfb")
+    (version "0.4.0")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/xdriinfo-"
+               "mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "076bjix941znyjmh3j5jjsnhp2gv2iq53d0ks29mvvv87cyy9iim"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("mesa" ,mesa)
-        ("glproto" ,glproto)
-        ("libx11" ,libx11)
-        ("glproto" ,glproto)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public xev
+
+
+(define-public xf86bigfontproto
   (package
-    (name "xev")
+    (name "xf86bigfontproto")
     (version "1.2.0")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/xev-"
+               "mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "13xk5z7vy87rnn4574z0jfzymdivyc7pl4axim81sx0pmdysg1ip"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("libxrender" ,libxrender)
-        ("libxrandr" ,libxrandr)
-        ("xproto" ,xproto)
-        ("libx11" ,libx11)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public xextproto
+
+
+(define-public xf86dgaproto
   (package
-    (name "xextproto")
-    (version "7.2.1")
+    (name "xf86dgaproto")
+    (version "2.1")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/xextproto-"
+               "mirror://xorg/X11R7.7/src/everything/xf86dgaproto-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "06kdanbnprxvgl56l5h0lqj4b0f1fbb1ndha33mv5wvy802v2lvw"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs `(("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public xeyes
+
+
+(define-public xf86driproto
   (package
-    (name "xeyes")
-    (version "1.1.1")
+    (name "xf86driproto")
+    (version "2.1.1")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/individual/app/xeyes-"
+               "mirror://xorg/X11R7.7/src/everything/xf86driproto-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "08d5x2kar5kg4yammw6hhk10iva6jmh8cqq176a1z7nm1il9hplp"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("libxt" ,libxt)
-        ("libxrender" ,libxrender)
-        ("libxmu" ,libxmu)
-        ("libxext" ,libxext)
-        ("libx11" ,libx11)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public xfs
+
+
+(define-public xf86vidmodeproto
   (package
-    (name "xfs")
-    (version "1.1.2")
+    (name "xf86vidmodeproto")
+    (version "2.3.1")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/individual/app/xfs-"
+               "mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "17g34yq789grnic83cqj5khq0knda1w2rgabhjflsyw9wg663shd"))))
+            "0000000000000000000000000000000000000000000000000000"))))
     (build-system gnu-build-system)
-    (inputs
-      `(("xtrans" ,xtrans)
-        ("xproto" ,xproto)
-        ("libxfont" ,libxfont)
-        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public xgamma
   (package
     (name "xgamma")
@@ -2866,8 +3765,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public xhost
   (package
     (name "xhost")
@@ -2892,8 +3791,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public xineramaproto
   (package
     (name "xineramaproto")
@@ -2914,34 +3813,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public xinit
-  (package
-    (name "xinit")
-    (version "1.3.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (string-append
-               "mirror://xorg/individual/app/xinit-"
-               version
-               ".tar.bz2"))
-        (sha256
-          (base32
-            "0d821rlqwyn2js7bkzicyp894n9gqv1hahxs285pas1zm3d7z1m1"))))
-    (build-system gnu-build-system)
-    (inputs
-      `(("libx11" ,libx11)
-        ("pkg-config" ,pkg-config)))
-    (propagated-inputs
-      `(("xauth" ,xauth)))
-    (home-page #f)
-    (synopsis #f)
-    (description #f)
-    (license #f)))
-  
-  
+
+
 (define-public xinput
   (package
     (name "xinput")
@@ -2970,8 +3843,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public xkbcomp
   (package
     (name "xkbcomp")
@@ -2996,8 +3869,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public xkbevd
   (package
     (name "xkbevd")
@@ -3021,8 +3894,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public xkbutils
   (package
     (name "xkbutils")
@@ -3049,8 +3922,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public xkeyboard-config
   (package
     (name "xkeyboard-config")
@@ -3071,8 +3944,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public xkill
   (package
     (name "xkill")
@@ -3096,8 +3969,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public xlsatoms
   (package
     (name "xlsatoms")
@@ -3119,8 +3992,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public xlsclients
   (package
     (name "xlsclients")
@@ -3142,33 +4015,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public xmessage
-  (package
-    (name "xmessage")
-    (version "1.0.3")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (string-append
-               "mirror://xorg/individual/app/xmessage-"
-               version
-               ".tar.bz2"))
-        (sha256
-          (base32
-            "0nrxidff0pcd1ampfzj91ai74j6mx613j5kqk3j0c4xdshx5v8yg"))))
-    (build-system gnu-build-system)
-    (inputs
-      `(("libxt" ,libxt)
-        ("libxaw" ,libxaw)
-        ("pkg-config" ,pkg-config)))
-    (home-page #f)
-    (synopsis #f)
-    (description #f)
-    (license #f)))
-  
-  
+
+
 (define-public xmodmap
   (package
     (name "xmodmap")
@@ -3192,30 +4040,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
-(define-public xorg-cf-files
-  (package
-    (name "xorg-cf-files")
-    (version "1.0.4")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (string-append
-               "mirror://xorg/individual/util/xorg-cf-files-"
-               version
-               ".tar.bz2"))
-        (sha256
-          (base32
-            "0s86h66b3w4623m88fg2csp41cnr08qc8i3gkj85k3wpwj1wxs9n"))))
-    (build-system gnu-build-system)
-    (inputs `(("pkg-config" ,pkg-config)))
-    (home-page #f)
-    (synopsis #f)
-    (description #f)
-    (license #f)))
-  
-  
+
+
 (define-public xorg-docs
   (package
     (name "xorg-docs")
@@ -3236,8 +4062,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public xorg-server
   (package
     (name "xorg-server")
@@ -3246,7 +4072,7 @@
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/individual/xserver/xorg-server-"
+               "mirror://xorg/X11R7.7/src/everything/xorg-server-"
                version
                ".tar.bz2"))
         (sha256
@@ -3259,7 +4085,7 @@
         ("xcmiscproto" ,xcmiscproto)
         ("damageproto" ,damageproto)
         ("libxfont" ,libxfont)
-        ("pixman" ,pixman)
+;;         ("pixman" ,pixman)
         ("libxext" ,libxext)
         ("recordproto" ,recordproto)
         ("xf86vidmodeproto" ,xf86vidmodeproto)
@@ -3274,8 +4100,8 @@
         ("glproto" ,glproto)
         ("xf86bigfontproto" ,xf86bigfontproto)
         ("dbus" ,dbus)
-        ("mesa" ,mesa)
-        ("systemd" ,systemd)
+;;         ("mesa" ,mesa)
+;;        ("systemd" ,systemd)
         ("zlib" ,zlib)
         ("libxv" ,libxv)
         ("libxt" ,libxt)
@@ -3290,7 +4116,7 @@
         ("libxau" ,libxau)
         ("libx11" ,libx11)
         ("openssl" ,openssl)
-        ("libdrm" ,libdrm)
+;;         ("libdrm" ,libdrm)
         ("renderproto" ,renderproto)
         ("pkg-config" ,pkg-config)))
     (propagated-inputs
@@ -3304,8 +4130,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public xorg-sgml-doctools
   (package
     (name "xorg-sgml-doctools")
@@ -3326,8 +4152,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public xpr
   (package
     (name "xpr")
@@ -3352,8 +4178,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public xprop
   (package
     (name "xprop")
@@ -3377,8 +4203,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public xproto
   (package
     (name "xproto")
@@ -3399,8 +4225,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public xrandr
   (package
     (name "xrandr")
@@ -3426,8 +4252,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public xrdb
   (package
     (name "xrdb")
@@ -3451,8 +4277,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public xrefresh
   (package
     (name "xrefresh")
@@ -3475,8 +4301,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public xset
   (package
     (name "xset")
@@ -3493,7 +4319,7 @@
             "1s61mvscd0h7y6anljarj7nkii6plhs8ndx1fm8b1f1h00a1qdv1"))))
     (build-system gnu-build-system)
     (inputs
-      `(("libxxf86misc" ,libxxf86misc)
+      `(;;("libxxf86misc" ,libxxf86misc)
         ("xproto" ,xproto)
         ("libxmu" ,libxmu)
         ("libxext" ,libxext)
@@ -3503,8 +4329,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public xsetroot
   (package
     (name "xsetroot")
@@ -3530,8 +4356,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public xtrans
   (package
     (name "xtrans")
@@ -3552,8 +4378,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public xvinfo
   (package
     (name "xvinfo")
@@ -3578,8 +4404,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public xwd
   (package
     (name "xwd")
@@ -3604,8 +4430,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public xwininfo
   (package
     (name "xwininfo")
@@ -3630,8 +4456,8 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
-  
+
+
 (define-public xwud
   (package
     (name "xwud")
@@ -3655,4 +4481,3 @@
     (synopsis #f)
     (description #f)
     (license #f)))
-  
\ No newline at end of file
-- 
cgit v1.2.3