Xorg proto: type build -> link (#20685)

var/spack/repos/builtin/packages/appres/package.py

@@ -20,6 +20,6 @@ class Appres(AutotoolsPackage, XorgPackage):
     depends_on('libx11')
     depends_on('libxt')
 
-    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xproto@7.0.17:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/bdftopcf/package.py

@@ -22,6 +22,6 @@ class Bdftopcf(AutotoolsPackage, XorgPackage):
     depends_on('libxfont')
 
     depends_on('pkgconfig', type='build')
-    depends_on('xproto', type='build')
+    depends_on('xproto')
-    depends_on('fontsproto', type='build')
+    depends_on('fontsproto')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/bitmap/package.py

@@ -20,7 +20,7 @@ class Bitmap(AutotoolsPackage, XorgPackage):
     depends_on('libxmu')
     depends_on('libxt')
 
-    depends_on('xbitmaps', type='build')
+    depends_on('xbitmaps')
-    depends_on('xproto@7.0.25:', type='build')
+    depends_on('xproto@7.0.25:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/cbtf-krell/package.py

@@ -51,7 +51,7 @@ class CbtfKrell(CMakePackage):
     depends_on("cmake@3.0.2:", type='build')
 
     # For rpcgen
-    depends_on("rpcsvc-proto", type='build')
+    depends_on("rpcsvc-proto")
 
     # For rpc
     depends_on("libtirpc", type='link')

var/spack/repos/builtin/packages/cbtf/package.py

@@ -35,7 +35,7 @@ class Cbtf(CMakePackage):
     depends_on("cmake@3.0.2:", type='build')
 
     # for rpcgen
-    depends_on("rpcsvc-proto", type='build')
+    depends_on("rpcsvc-proto")
 
     # for rpc
     depends_on("libtirpc", type='link')

var/spack/repos/builtin/packages/fonttosfnt/package.py

@@ -17,6 +17,6 @@ class Fonttosfnt(AutotoolsPackage, XorgPackage):
     depends_on('freetype')
     depends_on('libfontenc')
 
-    depends_on('xproto', type='build')
+    depends_on('xproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/fslsfonts/package.py

@@ -16,6 +16,6 @@ class Fslsfonts(AutotoolsPackage, XorgPackage):
 
     depends_on('libfs')
 
-    depends_on('xproto@7.0.25:', type='build')
+    depends_on('xproto@7.0.25:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/fstobdf/package.py

@@ -20,6 +20,6 @@ class Fstobdf(AutotoolsPackage, XorgPackage):
     depends_on('libx11')
     depends_on('libfs')
 
-    depends_on('xproto@7.0.25:', type='build')
+    depends_on('xproto@7.0.25:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/iceauth/package.py

@@ -18,6 +18,6 @@ class Iceauth(AutotoolsPackage, XorgPackage):
 
     depends_on('libice')
 
-    depends_on('xproto@7.0.22:', type='build')
+    depends_on('xproto@7.0.22:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/ico/package.py

@@ -19,6 +19,6 @@ class Ico(AutotoolsPackage, XorgPackage):
 
     depends_on('libx11@0.99.1:')
 
-    depends_on('xproto@7.0.22:', type='build')
+    depends_on('xproto@7.0.22:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/imake/package.py

@@ -14,5 +14,5 @@ class Imake(AutotoolsPackage, XorgPackage):
 
     version('1.0.7', sha256='6bda266a07eb33445d513f1e3c82a61e4822ccb94d420643d58e1be5f881e5cb')
 
-    depends_on('xproto', type='build')
+    depends_on('xproto')
     depends_on('pkgconfig', type='build')

var/spack/repos/builtin/packages/lbxproxy/package.py

@@ -26,8 +26,8 @@ class Lbxproxy(AutotoolsPackage, XorgPackage):
     depends_on('libx11')
     depends_on('libice')
 
-    depends_on('xtrans', type='build')
+    depends_on('xtrans')
-    depends_on('xproxymanagementprotocol', type='build')
+    depends_on('xproxymanagementprotocol')
-    depends_on('bigreqsproto', type='build')
+    depends_on('bigreqsproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libapplewm/package.py

@@ -19,8 +19,8 @@ class Libapplewm(AutotoolsPackage, XorgPackage):
     depends_on('libx11')
     depends_on('libxext')
 
-    depends_on('xextproto', type='build')
+    depends_on('xextproto')
-    depends_on('applewmproto@1.4:', type='build')
+    depends_on('applewmproto@1.4:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 

var/spack/repos/builtin/packages/libdmx/package.py

@@ -18,7 +18,7 @@ class Libdmx(AutotoolsPackage, XorgPackage):
     depends_on('libx11')
     depends_on('libxext')
 
-    depends_on('xextproto', type='build')
+    depends_on('xextproto')
-    depends_on('dmxproto@2.2.99.1:', type='build')
+    depends_on('dmxproto@2.2.99.1:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libfontenc/package.py

@@ -16,6 +16,6 @@ class Libfontenc(AutotoolsPackage, XorgPackage):
 
     depends_on('zlib')
 
-    depends_on('xproto', type='build')
+    depends_on('xproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libfs/package.py

@@ -17,8 +17,8 @@ class Libfs(AutotoolsPackage, XorgPackage):
 
     version('1.0.7', sha256='91bf1c5ce4115b7dbf4e314fdbee54052708e8f7b6a2ec6e82c309bcbe40ef3d')
 
-    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xproto@7.0.17:')
-    depends_on('fontsproto', type='build')
+    depends_on('fontsproto')
-    depends_on('xtrans', type='build')
+    depends_on('xtrans')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libice/package.py

@@ -14,7 +14,7 @@ class Libice(AutotoolsPackage, XorgPackage):
 
     version('1.0.9', sha256='7812a824a66dd654c830d21982749b3b563d9c2dfe0b88b203cefc14a891edc0')
 
-    depends_on('xproto', type='build')
+    depends_on('xproto')
-    depends_on('xtrans', type='build')
+    depends_on('xtrans')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/liblbxutil/package.py

@@ -14,8 +14,8 @@ class Liblbxutil(AutotoolsPackage, XorgPackage):
 
     version('1.1.0', sha256='285c1bc688cc71ec089e9284f2566d1780cc5d90816e9997890af8689f386951')
 
-    depends_on('xextproto@7.0.99.1:', type='build')
+    depends_on('xextproto@7.0.99.1:')
-    depends_on('xproto', type='build')
+    depends_on('xproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
     depends_on('zlib', type='link')

var/spack/repos/builtin/packages/libsm/package.py

@@ -18,7 +18,7 @@ class Libsm(AutotoolsPackage, XorgPackage):
     depends_on('libice@1.0.5:')
     depends_on('uuid')
 
-    depends_on('xproto', type='build')
+    depends_on('xproto')
-    depends_on('xtrans', type='build')
+    depends_on('xtrans')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libwindowswm/package.py

@@ -22,7 +22,7 @@ class Libwindowswm(AutotoolsPackage, XorgPackage):
     depends_on('libx11')
     depends_on('libxext')
 
-    depends_on('xextproto', type='build')
+    depends_on('xextproto')
-    depends_on('windowswmproto', type='build')
+    depends_on('windowswmproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libx11/package.py

@@ -19,12 +19,12 @@ class Libx11(AutotoolsPackage, XorgPackage):
 
     depends_on('libxcb@1.1.92:')
 
-    depends_on('xproto@7.0.25:', type='build', when='@1.7.0:')
+    depends_on('xproto@7.0.25:', when='@1.7.0:')
-    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xproto@7.0.17:')
-    depends_on('xextproto', type=('build', 'link'))
+    depends_on('xextproto')
-    depends_on('xtrans', type='build')
+    depends_on('xtrans')
-    depends_on('kbproto', type=('build', 'link'))
+    depends_on('kbproto')
-    depends_on('inputproto', type='build')
+    depends_on('inputproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
     depends_on('perl', type='build')

var/spack/repos/builtin/packages/libxau/package.py

@@ -16,6 +16,6 @@ class Libxau(AutotoolsPackage, XorgPackage):
 
     version('1.0.8', sha256='c343b4ef66d66a6b3e0e27aa46b37ad5cab0f11a5c565eafb4a1c7590bc71d7b')
 
-    depends_on('xproto', type=('build', 'link'))
+    depends_on('xproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libxaw/package.py

@@ -22,7 +22,7 @@ class Libxaw(AutotoolsPackage, XorgPackage):
     depends_on('libxmu')
     depends_on('libxpm')
 
-    depends_on('xproto', type='build')
+    depends_on('xproto')
-    depends_on('xextproto', type='build')
+    depends_on('xextproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libxcb/package.py

@@ -26,11 +26,11 @@ class Libxcb(AutotoolsPackage):
     depends_on('libxdmcp')
 
     # libxcb 1.X requires xcb-proto >= 1.X
-    depends_on('xcb-proto', type='build')
+    depends_on('xcb-proto')
-    depends_on('xcb-proto@1.14:', when='@1.14:1.14.999', type='build')
+    depends_on('xcb-proto@1.14:', when='@1.14:1.14.999')
-    depends_on('xcb-proto@1.13:', when='@1.13:1.13.999', type='build')
+    depends_on('xcb-proto@1.13:', when='@1.13:1.13.999')
-    depends_on('xcb-proto@1.12:', when='@1.12:1.12.999', type='build')
+    depends_on('xcb-proto@1.12:', when='@1.12:1.12.999')
-    depends_on('xcb-proto@1.11:', when='@1.11:1.11.999', type='build')
+    depends_on('xcb-proto@1.11:', when='@1.11:1.11.999')
 
     # TODO: uncomment once build deps can be resolved separately
     # See #7646, #4145, #4063, and #2548 for details

var/spack/repos/builtin/packages/libxcomposite/package.py

@@ -17,7 +17,7 @@ class Libxcomposite(AutotoolsPackage, XorgPackage):
 
     depends_on('libx11')
     depends_on('libxfixes')
-    depends_on('fixesproto@0.4:', type='build')
+    depends_on('fixesproto@0.4:')
-    depends_on('compositeproto@0.4:', type='build')
+    depends_on('compositeproto@0.4:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libxcursor/package.py

@@ -18,6 +18,6 @@ class Libxcursor(AutotoolsPackage, XorgPackage):
     depends_on('libxfixes')
     depends_on('libx11')
 
-    depends_on('fixesproto', type='build')
+    depends_on('fixesproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libxdamage/package.py

@@ -17,8 +17,8 @@ class Libxdamage(AutotoolsPackage, XorgPackage):
     depends_on('libxfixes')
     depends_on('libx11')
 
-    depends_on('damageproto@1.1:', type='build')
+    depends_on('damageproto@1.1:')
-    depends_on('fixesproto', type='build')
+    depends_on('fixesproto')
-    depends_on('xextproto', type='build')
+    depends_on('xextproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libxdmcp/package.py

@@ -14,7 +14,7 @@ class Libxdmcp(AutotoolsPackage, XorgPackage):
 
     version('1.1.2', sha256='6f7c7e491a23035a26284d247779174dedc67e34e93cc3548b648ffdb6fc57c0')
 
-    depends_on('xproto', type='build')
+    depends_on('xproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
     depends_on('libbsd', when='platform=linux')

var/spack/repos/builtin/packages/libxevie/package.py

@@ -17,8 +17,8 @@ class Libxevie(AutotoolsPackage, XorgPackage):
     depends_on('libx11')
     depends_on('libxext')
 
-    depends_on('xproto', type='build')
+    depends_on('xproto')
-    depends_on('xextproto', type='build')
+    depends_on('xextproto')
-    depends_on('evieext', type='build')
+    depends_on('evieext')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libxext/package.py

@@ -16,7 +16,7 @@ class Libxext(AutotoolsPackage, XorgPackage):
 
     depends_on('libx11@1.6:')
 
-    depends_on('xproto@7.0.13:', type='build')
+    depends_on('xproto@7.0.13:')
-    depends_on('xextproto@7.1.99:', type='build')
+    depends_on('xextproto@7.1.99:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libxfixes/package.py

@@ -17,8 +17,8 @@ class Libxfixes(AutotoolsPackage, XorgPackage):
 
     depends_on('libx11@1.6:')
 
-    depends_on('xproto', type='build')
+    depends_on('xproto')
-    depends_on('fixesproto@5.0:', type='build')
+    depends_on('fixesproto@5.0:')
-    depends_on('xextproto', type='build')
+    depends_on('xextproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libxfont/package.py

@@ -22,8 +22,8 @@ class Libxfont(AutotoolsPackage, XorgPackage):
     depends_on('libfontenc')
     depends_on('freetype')
 
-    depends_on('xtrans', type='build')
+    depends_on('xtrans')
-    depends_on('xproto', type='build')
+    depends_on('xproto')
-    depends_on('fontsproto@2.1.3:', type='build')
+    depends_on('fontsproto@2.1.3:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libxfont2/package.py

@@ -22,8 +22,8 @@ class Libxfont2(AutotoolsPackage, XorgPackage):
     depends_on('libfontenc')
     depends_on('freetype')
 
-    depends_on('xtrans', type='build')
+    depends_on('xtrans')
-    depends_on('xproto', type='build')
+    depends_on('xproto')
-    depends_on('fontsproto@2.1.3:', type='build')
+    depends_on('fontsproto@2.1.3:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libxfontcache/package.py

@@ -17,7 +17,7 @@ class Libxfontcache(AutotoolsPackage, XorgPackage):
     depends_on('libx11')
     depends_on('libxext')
 
-    depends_on('xextproto', type='build')
+    depends_on('xextproto')
-    depends_on('fontcacheproto', type='build')
+    depends_on('fontcacheproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libxi/package.py

@@ -18,13 +18,10 @@ class Libxi(AutotoolsPackage, XorgPackage):
     depends_on('libx11@1.6:')
     depends_on('libxext@1.0.99.1:')
     depends_on('libxfixes@5:')
-
+    depends_on('fixesproto@5.0:')
-    # transient build dependency (from libxfixes), i.e. shouldn't be needed?
+    depends_on('xproto@7.0.13:')
-    depends_on('fixesproto@5.0:', type='build')
+    depends_on('xextproto@7.0.3:')
-
+    depends_on('inputproto@2.2.99.1:')
-    depends_on('xproto@7.0.13:', type='build')
-    depends_on('xextproto@7.0.3:', type='build')
-    depends_on('inputproto@2.2.99.1:', type='build')
 
     @property
     def libs(self):

var/spack/repos/builtin/packages/libxinerama/package.py

@@ -17,7 +17,7 @@ class Libxinerama(AutotoolsPackage, XorgPackage):
     depends_on('libx11')
     depends_on('libxext')
 
-    depends_on('xextproto', type='build')
+    depends_on('xextproto')
-    depends_on('xineramaproto@1.1.99.1:', type='build')
+    depends_on('xineramaproto@1.1.99.1:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libxkbfile/package.py

@@ -16,6 +16,6 @@ class Libxkbfile(AutotoolsPackage, XorgPackage):
 
     depends_on('libx11')
 
-    depends_on('kbproto', type='build')
+    depends_on('kbproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libxmu/package.py

@@ -21,6 +21,6 @@ class Libxmu(AutotoolsPackage, XorgPackage):
     depends_on('libxext')
     depends_on('libx11')
 
-    depends_on('xextproto', type='build')
+    depends_on('xextproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libxp/package.py

@@ -18,7 +18,7 @@ class Libxp(AutotoolsPackage, XorgPackage):
     depends_on('libxext')
     depends_on('libxau')
 
-    depends_on('xextproto', type='build')
+    depends_on('xextproto')
-    depends_on('printproto', type='build')
+    depends_on('printproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libxpm/package.py

@@ -22,7 +22,7 @@ class Libxpm(AutotoolsPackage, XorgPackage):
     depends_on('gettext')
     depends_on('libx11')
 
-    depends_on('xproto', type='build')
+    depends_on('xproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 

var/spack/repos/builtin/packages/libxpresent/package.py

@@ -20,10 +20,10 @@ class Libxpresent(AutotoolsPackage, XorgPackage):
     depends_on('libxfixes', type='link')
     depends_on('libxrandr', type='link')
 
-    depends_on('xproto', type='link')
+    depends_on('xproto')
-    depends_on('presentproto@1.0:', type='link')
+    depends_on('presentproto@1.0:')
-    depends_on('xextproto', type='link')
+    depends_on('xextproto')
-    depends_on('fixesproto', type='link')
+    depends_on('fixesproto')
-    depends_on('randrproto', type='link')
+    depends_on('randrproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libxprintapputil/package.py

@@ -19,6 +19,6 @@ class Libxprintapputil(AutotoolsPackage, XorgPackage):
     depends_on('libxprintutil')
     depends_on('libxau')
 
-    depends_on('printproto', type='build')
+    depends_on('printproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libxprintutil/package.py

@@ -19,6 +19,6 @@ class Libxprintutil(AutotoolsPackage, XorgPackage):
     depends_on('libxt')
     depends_on('libxau')
 
-    depends_on('printproto', type='build')
+    depends_on('printproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libxrandr/package.py

@@ -18,9 +18,9 @@ class Libxrandr(AutotoolsPackage, XorgPackage):
     depends_on('libxext')
     depends_on('libxrender')
 
-    depends_on('randrproto@1.5:', type='build')
+    depends_on('randrproto@1.5:')
-    depends_on('xextproto', type='build')
+    depends_on('xextproto')
-    depends_on('renderproto', type='build')
+    depends_on('renderproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 

var/spack/repos/builtin/packages/libxrender/package.py

@@ -17,6 +17,6 @@ class Libxrender(AutotoolsPackage, XorgPackage):
 
     depends_on('libx11@1.6:')
 
-    depends_on('renderproto@0.9:', type=('build', 'link'))
+    depends_on('renderproto@0.9:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libxres/package.py

@@ -17,7 +17,7 @@ class Libxres(AutotoolsPackage, XorgPackage):
     depends_on('libx11')
     depends_on('libxext')
 
-    depends_on('xextproto', type='build')
+    depends_on('xextproto')
-    depends_on('resourceproto@1.0:', type='build')
+    depends_on('resourceproto@1.0:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libxscrnsaver/package.py

@@ -17,7 +17,7 @@ class Libxscrnsaver(AutotoolsPackage, XorgPackage):
     depends_on('libx11')
     depends_on('libxext')
 
-    depends_on('xextproto', type='build')
+    depends_on('xextproto')
     depends_on('scrnsaverproto@1.2:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libxshmfence/package.py

@@ -19,6 +19,6 @@ class Libxshmfence(AutotoolsPackage, XorgPackage):
     version('1.3', sha256='b884300d26a14961a076fbebc762a39831cb75f92bed5ccf9836345b459220c7')
     version('1.2', sha256='d21b2d1fd78c1efbe1f2c16dae1cb23f8fd231dcf891465b8debe636a9054b0c')
 
-    depends_on('xproto', type='build')
+    depends_on('xproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libxt/package.py

@@ -18,8 +18,8 @@ class Libxt(AutotoolsPackage, XorgPackage):
     depends_on('libice')
     depends_on('libx11')
 
-    depends_on('xproto', type='build')
+    depends_on('xproto')
-    depends_on('kbproto', type='build')
+    depends_on('kbproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 

var/spack/repos/builtin/packages/libxtrap/package.py

@@ -27,7 +27,7 @@ class Libxtrap(AutotoolsPackage, XorgPackage):
     depends_on('libxt')
     depends_on('libxext')
 
-    depends_on('trapproto', type='build')
+    depends_on('trapproto')
-    depends_on('xextproto', type='build')
+    depends_on('xextproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libxtst/package.py

@@ -27,9 +27,9 @@ class Libxtst(AutotoolsPackage, XorgPackage):
     depends_on('libxext@1.0.99.4:')
     depends_on('libxi')
 
-    depends_on('recordproto@1.13.99.1:', type='build')
+    depends_on('recordproto@1.13.99.1:')
-    depends_on('xextproto@7.0.99.3:', type='build')
+    depends_on('xextproto@7.0.99.3:')
-    depends_on('inputproto', type='build')
+    depends_on('inputproto')
-    depends_on('fixesproto', type='build')
+    depends_on('fixesproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libxv/package.py

@@ -18,7 +18,7 @@ class Libxv(AutotoolsPackage, XorgPackage):
     depends_on('libx11@1.6:')
     depends_on('libxext')
 
-    depends_on('xextproto', type='build')
+    depends_on('xextproto')
     depends_on('videoproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libxvmc/package.py

@@ -18,7 +18,7 @@ class Libxvmc(AutotoolsPackage, XorgPackage):
     depends_on('libxext')
     depends_on('libxv')
 
-    depends_on('xextproto', type='build')
+    depends_on('xextproto')
-    depends_on('videoproto', type='build')
+    depends_on('videoproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libxxf86dga/package.py

@@ -17,8 +17,8 @@ class Libxxf86dga(AutotoolsPackage, XorgPackage):
     depends_on('libx11')
     depends_on('libxext')
 
-    depends_on('xproto', type='build')
+    depends_on('xproto')
-    depends_on('xextproto', type='build')
+    depends_on('xextproto')
-    depends_on('xf86dgaproto@2.0.99.2:', type='build')
+    depends_on('xf86dgaproto@2.0.99.2:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libxxf86misc/package.py

@@ -17,8 +17,8 @@ class Libxxf86misc(AutotoolsPackage, XorgPackage):
     depends_on('libx11')
     depends_on('libxext')
 
-    depends_on('xproto', type='build')
+    depends_on('xproto')
-    depends_on('xextproto', type='build')
+    depends_on('xextproto')
-    depends_on('xf86miscproto', type='build')
+    depends_on('xf86miscproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/libxxf86vm/package.py

@@ -17,9 +17,9 @@ class Libxxf86vm(AutotoolsPackage, XorgPackage):
     depends_on('libx11@1.6:')
     depends_on('libxext')
 
-    depends_on('xproto', type='build')
+    depends_on('xproto')
-    depends_on('xextproto', type='build')
+    depends_on('xextproto')
-    depends_on('xf86vidmodeproto@2.2.99.1:', type='build')
+    depends_on('xf86vidmodeproto@2.2.99.1:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 

var/spack/repos/builtin/packages/listres/package.py

@@ -19,6 +19,6 @@ class Listres(AutotoolsPackage, XorgPackage):
     depends_on('libxt')
     depends_on('libxmu')
 
-    depends_on('xproto', type='build')
+    depends_on('xproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/lndir/package.py

@@ -15,5 +15,5 @@ class Lndir(AutotoolsPackage, XorgPackage):
 
     version('1.0.3', sha256='95b2d26fb3cbe702f828146c7a4c7c48001d2da52b062580227b7b68180be902')
 
-    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xproto@7.0.17:')
     depends_on('pkgconfig', type='build')

var/spack/repos/builtin/packages/makedepend/package.py

@@ -14,5 +14,5 @@ class Makedepend(AutotoolsPackage, XorgPackage):
 
     version('1.0.5', sha256='503903d41fb5badb73cb70d7b3740c8b30fe1cc68c504d3b6a85e6644c4e5004')
 
-    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xproto@7.0.17:')
     depends_on('pkgconfig', type='build')

var/spack/repos/builtin/packages/mesa/package.py

@@ -71,7 +71,7 @@ class Mesa(MesonPackage):
     depends_on('libxext', when='+glx')
     depends_on('libxt',  when='+glx')
     depends_on('xrandr', when='+glx')
-    depends_on('glproto@1.4.14:', when='+glx', type='build')
+    depends_on('glproto@1.4.14:', when='+glx')
 
     # Require at least 1 front-end
     # TODO: Add egl to this conflict once made available

var/spack/repos/builtin/packages/mesa18/package.py

@@ -65,7 +65,7 @@ class Mesa18(AutotoolsPackage):
     depends_on('libx11',  when='+glx')
     depends_on('libxcb',  when='+glx')
     depends_on('libxext', when='+glx')
-    depends_on('glproto@1.4.14:', when='+glx', type='build')
+    depends_on('glproto@1.4.14:', when='+glx')
 
     # Require at least 1 front-end
     conflicts('~osmesa ~glx')

var/spack/repos/builtin/packages/mkfontscale/package.py

@@ -18,6 +18,6 @@ class Mkfontscale(AutotoolsPackage, XorgPackage):
     depends_on('libfontenc')
     depends_on('freetype')
 
-    depends_on('xproto@7.0.25:', type='build')
+    depends_on('xproto@7.0.25:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/percona-server/package.py

@@ -26,4 +26,4 @@ class PerconaServer(CMakePackage):
     depends_on('curl')
     depends_on('bison', type='build')
     depends_on('flex',  type='build')
-    depends_on('rpcsvc-proto', type='build')
+    depends_on('rpcsvc-proto')

var/spack/repos/builtin/packages/proxymngr/package.py

@@ -21,7 +21,7 @@ class Proxymngr(AutotoolsPackage, XorgPackage):
     depends_on('libxt')
     depends_on('lbxproxy')
 
-    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xproto@7.0.17:')
-    depends_on('xproxymanagementprotocol', type='build')
+    depends_on('xproxymanagementprotocol')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/py-xpyb/package.py

@@ -19,4 +19,4 @@ class PyXpyb(AutotoolsPackage):
 
     depends_on('libxcb@1.5:')
 
-    depends_on('xcb-proto@1.7.1:', type='build')
+    depends_on('xcb-proto@1.7.1:')

var/spack/repos/builtin/packages/rendercheck/package.py

@@ -18,6 +18,6 @@ class Rendercheck(AutotoolsPackage, XorgPackage):
     depends_on('libxrender')
     depends_on('libx11')
 
-    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xproto@7.0.17:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/rgb/package.py

@@ -22,4 +22,4 @@ class Rgb(AutotoolsPackage, XorgPackage):
 
     depends_on('xorg-server')
 
-    depends_on('xproto', type='build')
+    depends_on('xproto')

var/spack/repos/builtin/packages/rstart/package.py

@@ -19,6 +19,6 @@ class Rstart(AutotoolsPackage, XorgPackage):
 
     version('1.0.5', sha256='5271c0c2675b4ad09aace7edddfdd137af10fc754afa6260d8eb5d0bba7098c7')
 
-    depends_on('xproto', type='build')
+    depends_on('xproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/sessreg/package.py

@@ -16,7 +16,7 @@ class Sessreg(AutotoolsPackage, XorgPackage):
 
     version('1.1.0', sha256='e561edb48dfc3b0624554169c15f9dd2c3139e83084cb323b0c712724f2b6043')
 
-    depends_on('xproto@7.0.25:', type='build')
+    depends_on('xproto@7.0.25:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 

var/spack/repos/builtin/packages/transset/package.py

@@ -16,6 +16,6 @@ class Transset(AutotoolsPackage, XorgPackage):
 
     depends_on('libx11')
 
-    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xproto@7.0.17:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/twm/package.py

@@ -24,7 +24,7 @@ class Twm(AutotoolsPackage, XorgPackage):
     depends_on('libice')
     depends_on('libsm')
 
-    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xproto@7.0.17:')
     depends_on('bison', type='build')
     depends_on('flex', type='build')
     depends_on('pkgconfig', type='build')

var/spack/repos/builtin/packages/x11perf/package.py

@@ -19,6 +19,6 @@ class X11perf(AutotoolsPackage, XorgPackage):
     depends_on('libxrender')
     depends_on('libxft')
 
-    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xproto@7.0.17:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/xbiff/package.py

@@ -21,6 +21,6 @@ class Xbiff(AutotoolsPackage, XorgPackage):
     depends_on('libxext')
     depends_on('libx11')
 
-    depends_on('xbitmaps', type='build')
+    depends_on('xbitmaps')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/xcalc/package.py

@@ -19,6 +19,6 @@ class Xcalc(AutotoolsPackage, XorgPackage):
     depends_on('libxt')
     depends_on('libx11')
 
-    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xproto@7.0.17:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/xcb-util-errors/package.py

@@ -21,5 +21,5 @@ class XcbUtilErrors(AutotoolsPackage):
 
     depends_on('libxcb@1.4:')
 
-    depends_on('xcb-proto', type='build')
+    depends_on('xcb-proto')
     depends_on('pkgconfig', type='build')

var/spack/repos/builtin/packages/xcb-util-image/package.py

@@ -22,5 +22,5 @@ class XcbUtilImage(AutotoolsPackage):
     depends_on('libxcb@1.4:')
     depends_on('xcb-util')
 
-    depends_on('xproto@7.0.8:', type='build')
+    depends_on('xproto@7.0.8:')
     depends_on('pkgconfig', type='build')

var/spack/repos/builtin/packages/xcb-util-keysyms/package.py

@@ -21,5 +21,5 @@ class XcbUtilKeysyms(AutotoolsPackage):
 
     depends_on('libxcb@1.4:')
 
-    depends_on('xproto@7.0.8:', type='build')
+    depends_on('xproto@7.0.8:')
     depends_on('pkgconfig', type='build')

var/spack/repos/builtin/packages/xclipboard/package.py

@@ -23,6 +23,6 @@ class Xclipboard(AutotoolsPackage, XorgPackage):
     depends_on('libx11')
     depends_on('libxkbfile')
 
-    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xproto@7.0.17:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/xclock/package.py

@@ -24,6 +24,6 @@ class Xclock(AutotoolsPackage, XorgPackage):
     depends_on('libxkbfile')
     depends_on('libxt')
 
-    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xproto@7.0.17:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/xdpyinfo/package.py

@@ -24,9 +24,9 @@ class Xdpyinfo(AutotoolsPackage, XorgPackage):
     depends_on('libxtst')
     depends_on('libxcb')
 
-    depends_on('xproto@7.0.22:', type='build')
+    depends_on('xproto@7.0.22:')
-    depends_on('recordproto', type='build')
+    depends_on('recordproto')
-    depends_on('inputproto', type='build')
+    depends_on('inputproto')
-    depends_on('fixesproto', type='build')
+    depends_on('fixesproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/xdriinfo/package.py

@@ -22,6 +22,6 @@ class Xdriinfo(AutotoolsPackage, XorgPackage):
     depends_on('libxfixes')
     depends_on('pcre')
 
-    depends_on('glproto', type='build')
+    depends_on('glproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/xev/package.py

@@ -23,6 +23,6 @@ class Xev(AutotoolsPackage, XorgPackage):
     depends_on('libxrandr@1.2:')
     depends_on('libx11')
 
-    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xproto@7.0.17:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/xfd/package.py

@@ -24,7 +24,7 @@ class Xfd(AutotoolsPackage, XorgPackage):
     depends_on('libxmu')
     depends_on('libxt')
 
-    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xproto@7.0.17:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 

var/spack/repos/builtin/packages/xfindproxy/package.py

@@ -22,7 +22,7 @@ class Xfindproxy(AutotoolsPackage, XorgPackage):
     depends_on('libice')
     depends_on('libxt')
 
-    depends_on('xproto', type='build')
+    depends_on('xproto')
-    depends_on('xproxymanagementprotocol', type='build')
+    depends_on('xproxymanagementprotocol')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/xfs/package.py

@@ -17,8 +17,8 @@ class Xfs(AutotoolsPackage, XorgPackage):
     depends_on('libxfont@1.4.5:')
     depends_on('font-util')
 
-    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xproto@7.0.17:')
-    depends_on('fontsproto', type='build')
+    depends_on('fontsproto')
-    depends_on('xtrans', type='build')
+    depends_on('xtrans')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/xfsinfo/package.py

@@ -20,6 +20,6 @@ class Xfsinfo(AutotoolsPackage, XorgPackage):
 
     depends_on('libfs')
 
-    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xproto@7.0.17:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/xfwp/package.py

@@ -16,8 +16,8 @@ class Xfwp(AutotoolsPackage, XorgPackage):
 
     depends_on('libice')
 
-    depends_on('xproto', type='build')
+    depends_on('xproto')
-    depends_on('xproxymanagementprotocol', type='build')
+    depends_on('xproxymanagementprotocol')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')
 

var/spack/repos/builtin/packages/xgamma/package.py

@@ -18,6 +18,6 @@ class Xgamma(AutotoolsPackage, XorgPackage):
     depends_on('libx11')
     depends_on('libxxf86vm')
 
-    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xproto@7.0.17:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/xhost/package.py

@@ -19,6 +19,6 @@ class Xhost(AutotoolsPackage, XorgPackage):
     depends_on('libxmu')
     depends_on('libxau')
 
-    depends_on('xproto@7.0.22:', type='build')
+    depends_on('xproto@7.0.22:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/xinit/package.py

@@ -18,6 +18,6 @@ class Xinit(AutotoolsPackage, XorgPackage):
 
     depends_on('libx11')
 
-    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xproto@7.0.17:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/xinput/package.py

@@ -20,9 +20,9 @@ class Xinput(AutotoolsPackage, XorgPackage):
     depends_on('libxrandr')
     depends_on('libxinerama')
 
-    depends_on('inputproto@2.1.99.1:', type='build')
+    depends_on('inputproto@2.1.99.1:')
-    depends_on('fixesproto', type='build')
+    depends_on('fixesproto')
-    depends_on('randrproto', type='build')
+    depends_on('randrproto')
-    depends_on('xineramaproto', type='build')
+    depends_on('xineramaproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/xkbcomp/package.py

@@ -22,7 +22,7 @@ class Xkbcomp(AutotoolsPackage, XorgPackage):
     depends_on('libx11')
     depends_on('libxkbfile')
 
-    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xproto@7.0.17:')
     depends_on('bison', type='build')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/xkbprint/package.py

@@ -18,6 +18,6 @@ class Xkbprint(AutotoolsPackage, XorgPackage):
     depends_on('libxkbfile')
     depends_on('libx11')
 
-    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xproto@7.0.17:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/xkbutils/package.py

@@ -19,7 +19,7 @@ class Xkbutils(AutotoolsPackage, XorgPackage):
     depends_on('libxt')
     depends_on('libx11')
 
-    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xproto@7.0.17:')
-    depends_on('inputproto', type='build')
+    depends_on('inputproto')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/xkeyboard-config/package.py

@@ -21,7 +21,7 @@ class XkeyboardConfig(AutotoolsPackage, XorgPackage):
     depends_on('libxslt', type='build')
     depends_on('pkgconfig', type='build')
     depends_on('intltool@0.30:', type='build')
-    depends_on('xproto@7.0.20:', type='build')
+    depends_on('xproto@7.0.20:')
 
     # TODO: missing dependencies
     # xgettext

var/spack/repos/builtin/packages/xkill/package.py

@@ -19,6 +19,6 @@ class Xkill(AutotoolsPackage, XorgPackage):
     depends_on('libx11')
     depends_on('libxmu')
 
-    depends_on('xproto@7.0.22:', type='build')
+    depends_on('xproto@7.0.22:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/xload/package.py

@@ -20,6 +20,6 @@ class Xload(AutotoolsPackage, XorgPackage):
     depends_on('libxt')
     depends_on('libx11')
 
-    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xproto@7.0.17:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/xlsfonts/package.py

@@ -17,6 +17,6 @@ class Xlsfonts(AutotoolsPackage, XorgPackage):
 
     depends_on('libx11')
 
-    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xproto@7.0.17:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/xman/package.py

@@ -18,6 +18,6 @@ class Xman(AutotoolsPackage, XorgPackage):
     depends_on('libxaw')
     depends_on('libxt')
 
-    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xproto@7.0.17:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')

var/spack/repos/builtin/packages/xmh/package.py

@@ -21,6 +21,6 @@ class Xmh(AutotoolsPackage, XorgPackage):
     depends_on('libxt')
     depends_on('libx11')
 
-    depends_on('xbitmaps@1.1.0:', type='build')
+    depends_on('xbitmaps@1.1.0:')
     depends_on('pkgconfig', type='build')
     depends_on('util-macros', type='build')