[bug#30763] [PATCH core-updates 08/27] gnu: Switch from inputproto to xorgproto.

[Marius Bakke]

* gnu/packages/gl.scm (freeglut)[inputs]: Replace INPUTPROTO with XORGPROTO.
* gnu/packages/ratpoison.scm (ratpoison)[inputs]: Remove INPUTPROTO.
* gnu/packages/xdisorg.scm (xautomation)[native-inputs]: Likewise.
* gnu/packages/xnee.scm (xnee)[inputs]: Likewise.
* gnu/packages/xorg.scm (inputproto)[properties]: Mark as superseded by 
XORGPROTO.
(xdpyinfo, xinput, libxtst)[inputs]: Replace INPUTPROTO with XORGPROTO.
(libxi, xorg-server)[propagated-inputs]: Remove INPUTPROTO.
(xkbutils, libx11)[inputs]: Likewise.
---
 gnu/packages/gl.scm        |  2 +-
 gnu/packages/ratpoison.scm |  3 +--
 gnu/packages/xdisorg.scm   |  3 +--
 gnu/packages/xnee.scm      |  1 -
 gnu/packages/xorg.scm      | 21 ++++++++-------------
 5 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 0e416a9ef..68ce10673 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -105,7 +105,7 @@ as ASCII text.")
               ("libxi" ,libxi)
               ("libxrandr" ,libxrandr)
               ("libxxf86vm" ,libxxf86vm)
-              ("inputproto" ,inputproto)
+              ("xorgproto" ,xorgproto)
               ("xinput" ,xinput)))
     (propagated-inputs
      ;; Headers from Mesa and GLU are needed.
diff --git a/gnu/packages/ratpoison.scm b/gnu/packages/ratpoison.scm
index 4c83d0f67..b1f012eb7 100644
--- a/gnu/packages/ratpoison.scm
+++ b/gnu/packages/ratpoison.scm
@@ -66,8 +66,7 @@
                         (copy-file (assoc-ref inputs rpd)
                                    (string-append dst rpd))))))))
     (inputs
-     `(("inputproto" ,inputproto)
-       ("fontconfig" ,fontconfig)
+     `(("fontconfig" ,fontconfig)
        ("freetype" ,freetype)
        ("libXft" ,libxft)
        ("libXi" ,libxi)
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 2d3a60a86..72a4da0b8 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -627,8 +627,7 @@ things less distracting.")
        ("libxi" ,libxi)
        ("libxtst" ,libxtst)))
     (native-inputs
-     `(("inputproto" ,inputproto)
-       ("xorgproto" ,xorgproto)))
+     `(("xorgproto" ,xorgproto)))
     (synopsis "Tools to automate tasks in X such as detecting on screen 
images")
     (description
      "Xautomation can control X from the command line for scripts, and
diff --git a/gnu/packages/xnee.scm b/gnu/packages/xnee.scm
index 207a11c63..025dc2185 100644
--- a/gnu/packages/xnee.scm
+++ b/gnu/packages/xnee.scm
@@ -40,7 +40,6 @@
     (build-system gnu-build-system)
     (inputs
      `(("gtk+" ,gtk+-2)
-       ("inputproto" ,inputproto)
        ("libx11" ,libx11)
        ("libxext" ,libxext)
        ("libxi" ,libxi)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 21a65e7ec..3bec70a0c 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -986,8 +986,8 @@ authentication records.")
     (description
      "Input Extension defines a protocol to provide additional input
 devices management such as graphic tablets.")
-    (license license:x11)))
-
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 (define-public kbproto
   (package
@@ -2271,7 +2271,7 @@ X server: 'handhelds', 'redglass' and 'whiteglass'.")
             "0ldgrj4w2fa8jng4b3f3biaj0wyn8zvya88pnk70d7k12pcqw8rh"))))
     (build-system gnu-build-system)
     (inputs
-      `(("inputproto" ,inputproto)
+      `(("xorgproto" ,xorgproto)
         ("libx11" ,libx11)
         ("libxxf86vm" ,libxxf86vm)
         ("libxxf86dga" ,libxxf86dga)
@@ -3715,7 +3715,7 @@ alternative implementations like XRandR or TwinView.")
         ("libxext" ,libxext)
         ("libxi" ,libxi)
         ("libx11" ,libx11)
-        ("inputproto" ,inputproto)))
+        ("xorgproto" ,xorgproto)))
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/";)
@@ -3820,9 +3820,8 @@ requested commands if they occur.")
     (build-system gnu-build-system)
     (inputs
       `(("libxt" ,libxt)
-        ("xorgproto" ,xorgproto)
         ("libxaw" ,libxaw)
-        ("inputproto" ,inputproto)))
+        ("xorgproto" ,xorgproto)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/";)
@@ -4675,7 +4674,7 @@ cannot be adequately worked around on the client side of 
the wire.")
         ("libxi" ,libxi)))
     (inputs
       `(("libx11" ,libx11)
-        ("inputproto" ,inputproto)))
+        ("xorgproto" ,xorgproto)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/";)
@@ -4935,12 +4934,10 @@ new API's in libXft, or the legacy API's in libX11.")
             "0idg1wc01hndvaa820fvfs7phvd1ymf0lldmq6386i7rhkzvirn2"))))
     (build-system gnu-build-system)
     (propagated-inputs
-      `(("inputproto" ,inputproto)
+      `(("xorgproto" ,xorgproto)
         ("libx11" ,libx11)
         ("libxext" ,libxext)
         ("libxfixes" ,libxfixes)))
-    (inputs
-      `(("xorgproto" ,xorgproto)))
     (native-inputs
        `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/";)
@@ -5115,7 +5112,6 @@ over Xlib, including:
       `(("dri2proto" ,dri2proto)
         ("dri3proto" ,dri3proto)
         ("fontsproto" ,fontsproto)
-        ("inputproto" ,inputproto)
         ("libpciaccess" ,libpciaccess)
         ("mesa" ,mesa)
         ("pixman" ,pixman)
@@ -5294,8 +5290,7 @@ draggable titlebars and borders.")
       `(("xorgproto" ,xorgproto)
         ("libxcb" ,libxcb)))
     (inputs
-      `(("inputproto" ,inputproto)
-        ("xtrans" ,xtrans)))
+      `(("xtrans" ,xtrans)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/";)
-- 
2.16.2