From 2d03009860cbe003431ce561aed7b74b89b1014f Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Sat, 10 Mar 2018 13:10:59 +0100
Subject: gnu: Switch from kbproto to xorgproto.

* gnu/packages/mate.scm (mate-control-center, mate-screensaver)[inputs]:
Remove KBPROTO.
* gnu/packages/xorg.scm (kbproto)[properties]: Mark as superseded by XORGPROTO.
(xorg-server)[inputs]: Remove KBPROTO.
(libx11)[propated-inputs]: Replace KBPROTO with XORGPROTO.
[inputs]: Remove XORGPROTO.
---
 gnu/packages/mate.scm | 2 --
 gnu/packages/xorg.scm | 8 +++-----
 2 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index d39711b6db..8c3ea160df 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -923,7 +923,6 @@ (define-public mate-control-center
        ("intltool" ,intltool)
        ("yelp-tools" ,yelp-tools)
        ("desktop-file-utils" ,desktop-file-utils)
-       ("kbproto" ,kbproto)
        ("renderproto" ,renderproto)
        ("scrnsaverproto" ,scrnsaverproto)
        ("xorgproto" ,xorgproto)
@@ -1192,7 +1191,6 @@ (define-public mate-screensaver
        ("autoconf" ,autoconf-wrapper)
        ("gettext" ,gettext-minimal)
        ("intltool" ,intltool)
-       ("kbproto" ,kbproto)
        ("mate-common" ,mate-common)
        ("pkg-config" ,pkg-config)
        ("renderproto" ,renderproto)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index bd84fecc0e..82817f7a59 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1012,8 +1012,8 @@ (define-public kbproto
     (description
      "X Keyboard (XKB) Extension defines a protocol to provide a number
 of new capabilities and controls for text keyboards.")
-    (license license:x11)))
-
+    (license license:x11)
+    (properties `((superseded . ,xorgproto)))))
 
 ;; requires applewmproto, which compiles only on macos
 ;; (define-public libapplewm
@@ -5106,7 +5106,6 @@ (define-public xorg-server
         ("dri3proto" ,dri3proto)
         ("fontsproto" ,fontsproto)
         ("inputproto" ,inputproto)
-        ("kbproto" ,kbproto)
         ("libpciaccess" ,libpciaccess)
         ("mesa" ,mesa)
         ("pixman" ,pixman)
@@ -5282,11 +5281,10 @@ (define-public libx11
                                               (assoc-ref %outputs "doc")
                                               "/share/man"))))
     (propagated-inputs
-      `(("kbproto" ,kbproto)
+      `(("xorgproto" ,xorgproto)
         ("libxcb" ,libxcb)))
     (inputs
       `(("inputproto" ,inputproto)
-        ("xorgproto" ,xorgproto)
         ("xtrans" ,xtrans)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
-- 
cgit v1.2.3