From 88ee93f917194a6b027a972c302bfbe4824b8825 Mon Sep 17 00:00:00 2001
From: Andreas Enge <andreas@enge.fr>
Date: Mon, 25 Feb 2013 22:52:48 +0100
Subject: [PATCH] gnu: xorg: Transform propagated into normal inputs.

* gnu/packages/xorg.scm: Transform propagated into normal inputs;
     allows to keep packages in alphabetical order.
---
 gnu/packages/xorg.scm | 97 ++++++++++++++++++-------------------------
 1 file changed, 41 insertions(+), 56 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 1b6d607a54..e2137154a4 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -121,9 +121,9 @@
           (base32
             "1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4"))))
     (build-system gnu-build-system)
-    (inputs `(("pkg-config" ,pkg-config)))
-    (propagated-inputs
-      `(("fixesproto" ,fixesproto)))
+    (inputs
+      `(("fixesproto" ,fixesproto)
+        ("pkg-config" ,pkg-config)))
     (home-page #f)
     (synopsis #f)
     (description #f)
@@ -1287,8 +1287,6 @@
         ("util-linux" ,util-linux)
         ("libice" ,libice)
         ("pkg-config" ,pkg-config)))
-    (propagated-inputs
-      `(("libice" ,libice)))
     (home-page #f)
     (synopsis #f)
     (description #f)
@@ -1417,8 +1415,6 @@
         ("libxext" ,libxext)
         ("libx11" ,libx11)
         ("pkg-config" ,pkg-config)))
-    (propagated-inputs
-      `(("libxmu" ,libxmu)))
     (home-page #f)
     (synopsis #f)
     (description #f)
@@ -1446,8 +1442,6 @@
         ("libx11" ,libx11)
         ("compositeproto" ,compositeproto)
         ("pkg-config" ,pkg-config)))
-    (propagated-inputs
-      `(("libxfixes" ,libxfixes)))
     (home-page #f)
     (synopsis #f)
     (description #f)
@@ -1555,8 +1549,6 @@
         ("xextproto" ,xextproto)
         ("libx11" ,libx11)
         ("pkg-config" ,pkg-config)))
-    (propagated-inputs
-      `(("xproto" ,xproto)))
     (home-page #f)
     (synopsis #f)
     (description #f)
@@ -1644,10 +1636,6 @@
         ("freetype" ,freetype)
         ("fontconfig" ,fontconfig)
         ("pkg-config" ,pkg-config)))
-    (propagated-inputs
-      `(("fontconfig" ,fontconfig)
-        ("freetype" ,freetype)
-        ("libxrender" ,libxrender)))
     (home-page #f)
     (synopsis #f)
     (description #f)
@@ -1899,8 +1887,6 @@
         ("kbproto" ,kbproto)
         ("libice" ,libice)
         ("pkg-config" ,pkg-config)))
-    (propagated-inputs
-      `(("libsm" ,libsm)))
     (home-page #f)
     (synopsis #f)
     (description #f)
@@ -4081,51 +4067,50 @@
     (build-system gnu-build-system)
     (inputs
       `(("bigreqsproto" ,bigreqsproto)
-        ("xtrans" ,xtrans)
-        ("xcmiscproto" ,xcmiscproto)
+        ("compositeproto" ,compositeproto)
         ("damageproto" ,damageproto)
-        ("libxfont" ,libxfont)
-;;         ("pixman" ,pixman)
-        ("libxext" ,libxext)
-        ("recordproto" ,recordproto)
-        ("xf86vidmodeproto" ,xf86vidmodeproto)
-        ("libdmx" ,libdmx)
+        ("dbus" ,dbus)
         ("dmxproto" ,dmxproto)
-        ("xf86dgaproto" ,xf86dgaproto)
-        ("xineramaproto" ,xineramaproto)
+        ("dri2proto" ,dri2proto)
+        ("glproto" ,glproto)
+        ("inputproto" ,inputproto)
+        ("kbproto" ,kbproto)
+        ("libdmx" ,libdmx)
+;;        ("libdrm" ,libdrm)
+        ("libpciaccess" ,libpciaccess)
+        ("libx11" ,libx11)
+        ("libxau" ,libxau)
+        ("libxaw" ,libxaw)
+        ("libxdmcp" ,libxdmcp)
+        ("libxext" ,libxext)
+        ("libxfixes" ,libxfixes)
+        ("libxfont" ,libxfont)
+        ("libxkbfile" ,libxkbfile)
+        ("libxmu" ,libxmu)
+        ("libxpm" ,libxpm)
+        ("libxrender" ,libxrender)
+        ("libxres" ,libxres)
+        ("libxt" ,libxt)
+        ("libxv" ,libxv)
+;;        ("mesa" ,mesa)
+        ("openssl" ,openssl)
+;;        ("pixman" ,pixman)
+        ("pkg-config" ,pkg-config)
+        ("recordproto" ,recordproto)
+        ("randrproto" ,randrproto)
+        ("renderproto" ,renderproto)
         ("resourceproto" ,resourceproto)
         ("scrnsaverproto" ,scrnsaverproto)
-        ("compositeproto" ,compositeproto)
-        ("xf86driproto" ,xf86driproto)
-        ("glproto" ,glproto)
-        ("xf86bigfontproto" ,xf86bigfontproto)
-        ("dbus" ,dbus)
-;;         ("mesa" ,mesa)
 ;;        ("systemd" ,systemd)
-        ("zlib" ,zlib)
-        ("libxv" ,libxv)
-        ("libxt" ,libxt)
-        ("libxres" ,libxres)
-        ("libxrender" ,libxrender)
-        ("libxpm" ,libxpm)
-        ("libxmu" ,libxmu)
-        ("libxkbfile" ,libxkbfile)
-        ("libxfixes" ,libxfixes)
-        ("libxdmcp" ,libxdmcp)
-        ("libxaw" ,libxaw)
-        ("libxau" ,libxau)
-        ("libx11" ,libx11)
-        ("openssl" ,openssl)
-;;         ("libdrm" ,libdrm)
-        ("renderproto" ,renderproto)
-        ("pkg-config" ,pkg-config)))
-    (propagated-inputs
-      `(("kbproto" ,kbproto)
-        ("dri2proto" ,dri2proto)
-        ("randrproto" ,randrproto)
+        ("xcmiscproto" ,xcmiscproto)
         ("xextproto" ,xextproto)
-        ("inputproto" ,inputproto)
-        ("libpciaccess" ,libpciaccess)))
+        ("xf86bigfontproto" ,xf86bigfontproto)
+        ("xf86dgaproto" ,xf86dgaproto)
+        ("xf86driproto" ,xf86driproto)
+        ("xf86vidmodeproto" ,xf86vidmodeproto)
+        ("xineramaproto" ,xineramaproto)
+        ("xtrans" ,xtrans)
+        ("zlib" ,zlib)))
     (home-page #f)
     (synopsis #f)
     (description #f)