xorg pkgs: update versions and homepage cgit -> gitlab (#44420)

* xorg libs: new versions * xorg pkgs: update homepage from cgit to gitlab * xorgs pkgs: fix homepage since, yeah, I did edit those 122 files by hand... * libxmu: don't need the .0 patch version here --------- Co-authored-by: Tamara Dahlgren <35777542+tldahlgren@users.noreply.github.com>
2024-06-13 22:12:17 -02:30
parent d4a7582955
commit 72d7c2d558
122 changed files with 141 additions and 121 deletions
--- a/var/spack/repos/builtin/packages/libx11/package.py
+++ b/var/spack/repos/builtin/packages/libx11/package.py
@@ -11,11 +11,14 @@ class Libx11(AutotoolsPackage, XorgPackage):

    homepage = "https://www.x.org/"
    xorg_mirror_path = "lib/libX11-1.6.7.tar.gz"
+    git = "https://gitlab.freedesktop.org/xorg/lib/libx11.git"

    license("X11")

    maintainers("wdconinc")

+    version("1.8.9", sha256="57ca5f07d263788ad661a86f4139412e8b699662e6b60c20f1f028c25a935e48")
+    version("1.8.8", sha256="26997a2bc48c03df7d670f8a4ee961d1d6b039bf947475e5fec6b7635b4efe72")
    version("1.8.7", sha256="793ebebf569f12c864b77401798d38814b51790fce206e01a431e5feb982e20b")
    version("1.8.6", sha256="5ff0d26c94d82ebb94a944b9f1f55cd01b9713fd461fe93f62f3527ce14ad94e")
    version("1.8.5", sha256="d84a35c324d5a1724692eafc1ed76f1689c833021e0062933773ec437f91a56b")
--- a/var/spack/repos/builtin/packages/libxau/package.py
+++ b/var/spack/repos/builtin/packages/libxau/package.py
@@ -11,7 +11,7 @@ class Libxau(AutotoolsPackage, XorgPackage):
    Authorization Protocol. This is useful for restricting client
    access to the display."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXau/"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXau/"
    xorg_mirror_path = "lib/libXau-1.0.8.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/libxaw/package.py
+++ b/var/spack/repos/builtin/packages/libxaw/package.py
@@ -10,13 +10,14 @@ class Libxaw(AutotoolsPackage, XorgPackage):
    """Xaw is the X Athena Widget Set.
    Xaw is a widget set based on the X Toolkit Intrinsics (Xt) Library."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXaw"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXaw"
    xorg_mirror_path = "lib/libXaw-1.0.13.tar.gz"

    license("MIT")

    maintainers("wdconinc")

+    version("1.0.16", sha256="012f90adf8739f2f023d63a5fee1528949cf2aba92ef7ac1abcfc2ae9cf28798")
    version("1.0.15", sha256="ca8a613884c922985202075b3cc8ee8821bfa83a5eb066189ae3cca131e63972")
    version("1.0.14", sha256="59cfed2712cc80bbfe62dd1aacf24f58d74a76dd08329a922077b134a8d8048f")
    version("1.0.13", sha256="7e74ac3e5f67def549722ff0333d6e6276b8becd9d89615cda011e71238ab694")
--- a/var/spack/repos/builtin/packages/libxaw3d/package.py
+++ b/var/spack/repos/builtin/packages/libxaw3d/package.py
@@ -10,13 +10,15 @@ class Libxaw3d(AutotoolsPackage, XorgPackage):
    """Xaw3d is the X 3D Athena Widget Set.
    Xaw3d is a widget set based on the X Toolkit Intrinsics (Xt) Library."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXaw3d"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXaw3d"
    xorg_mirror_path = "lib/libXaw3d-1.6.2.tar.gz"

    license("MIT")

    maintainers("wdconinc")

+    version("1.6.6", sha256="0cdb8f51c390b0f9f5bec74454e53b15b6b815bc280f6b7c969400c9ef595803")
+    version("1.6.5", sha256="1123d80c58f45616ef18502081eeec5e92f20c7e7dd82a24f9e2e4f3c0e86dc7")
    version("1.6.4", sha256="09fecfdab9d7d5953567883e2074eb231bc7a122a06e5055f9c119090f1f76a7")
    version("1.6.2", sha256="847dab01aeac1448916e3b4edb4425594b3ac2896562d9c7141aa4ac6c898ba9")

@@ -25,6 +27,7 @@ class Libxaw3d(AutotoolsPackage, XorgPackage):
    depends_on("libxmu")
    depends_on("libxext")
    depends_on("libxpm")
+    depends_on("xproto@7.0.22:")

    depends_on("pkgconfig", type="build")
    depends_on("util-macros", type="build")
--- a/var/spack/repos/builtin/packages/libxcomposite/package.py
+++ b/var/spack/repos/builtin/packages/libxcomposite/package.py
@@ -10,7 +10,7 @@ class Libxcomposite(AutotoolsPackage, XorgPackage):
    """libXcomposite - client library for the Composite extension to the
    X11 protocol."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXcomposite"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXcomposite"
    xorg_mirror_path = "lib/libXcomposite-0.4.4.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/libxcursor/package.py
+++ b/var/spack/repos/builtin/packages/libxcursor/package.py
@@ -9,13 +9,14 @@
 class Libxcursor(AutotoolsPackage, XorgPackage):
    """libXcursor - X Window System Cursor management library."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXcursor"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXcursor"
    xorg_mirror_path = "lib/libXcursor-1.1.14.tar.gz"

    license("MIT")

    maintainers("wdconinc")

+    version("1.2.2", sha256="98c3a30a3f85274c167d1ac5419d681ce41f14e27bfa5fe3003c8172cd8af104")
    version("1.2.1", sha256="77f96b9ad0a3c422cfa826afabaf1e02b9bfbfc8908c5fa1a45094faad074b98")
    version("1.1.14", sha256="be0954faf274969ffa6d95b9606b9c0cfee28c13b6fc014f15606a0c8b05c17b")

--- a/var/spack/repos/builtin/packages/libxdamage/package.py
+++ b/var/spack/repos/builtin/packages/libxdamage/package.py
@@ -9,7 +9,7 @@
 class Libxdamage(AutotoolsPackage, XorgPackage):
    """This package contains the library for the X Damage extension."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXdamage"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXdamage"
    xorg_mirror_path = "lib/libXdamage-1.1.4.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/libxdmcp/package.py
+++ b/var/spack/repos/builtin/packages/libxdmcp/package.py
@@ -9,13 +9,14 @@
 class Libxdmcp(AutotoolsPackage, XorgPackage):
    """libXdmcp - X Display Manager Control Protocol library."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXdmcp"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXdmcp"
    xorg_mirror_path = "lib/libXdmcp-1.1.2.tar.gz"

    license("MIT")

    maintainers("wdconinc")

+    version("1.1.5", sha256="31a7abc4f129dcf6f27ae912c3eedcb94d25ad2e8f317f69df6eda0bc4e4f2f3")
    version("1.1.4", sha256="55041a8ff8992ab02777478c4b19c249c0f8399f05a752cb4a1a868a9a0ccb9a")
    version("1.1.3", sha256="2ef9653d32e09d1bf1b837d0e0311024979653fe755ad3aaada8db1aa6ea180c")
    version("1.1.2", sha256="6f7c7e491a23035a26284d247779174dedc67e34e93cc3548b648ffdb6fc57c0")
--- a/var/spack/repos/builtin/packages/libxevie/package.py
+++ b/var/spack/repos/builtin/packages/libxevie/package.py
@@ -9,7 +9,7 @@
 class Libxevie(AutotoolsPackage, XorgPackage):
    """Xevie - X Event Interception Extension (XEvIE)."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXevie"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXevie"
    xorg_mirror_path = "lib/libXevie-1.0.3.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/libxext/package.py
+++ b/var/spack/repos/builtin/packages/libxext/package.py
@@ -9,13 +9,14 @@
 class Libxext(AutotoolsPackage, XorgPackage):
    """libXext - library for common extensions to the X11 protocol."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXext"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXext"
    xorg_mirror_path = "lib/libXext-1.3.3.tar.gz"

    license("MIT")

    maintainers("wdconinc")

+    version("1.3.6", sha256="1a0ac5cd792a55d5d465ced8dbf403ed016c8e6d14380c0ea3646c4415496e3d")
    version("1.3.5", sha256="1a3dcda154f803be0285b46c9338515804b874b5ccc7a2b769ab7fd76f1035bd")
    version("1.3.4", sha256="8ef0789f282826661ff40a8eef22430378516ac580167da35cc948be9041aac1")
    version("1.3.3", sha256="eb0b88050491fef4716da4b06a4d92b4fc9e76f880d6310b2157df604342cfe5")
--- a/var/spack/repos/builtin/packages/libxfixes/package.py
+++ b/var/spack/repos/builtin/packages/libxfixes/package.py
@@ -10,7 +10,7 @@ class Libxfixes(AutotoolsPackage, XorgPackage):
    """This package contains header files and documentation for the XFIXES
    extension.  Library and server implementations are separate."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXfixes"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXfixes"
    xorg_mirror_path = "lib/libXfixes-5.0.2.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/libxfont/package.py
+++ b/var/spack/repos/builtin/packages/libxfont/package.py
@@ -14,7 +14,7 @@ class Libxfont(AutotoolsPackage, XorgPackage):
    but should not be used by normal X11 clients.  X11 clients access fonts
    via either the new API's in libXft, or the legacy API's in libX11."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXfont"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXfont"
    xorg_mirror_path = "lib/libXfont-1.5.2.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/libxfont2/package.py
+++ b/var/spack/repos/builtin/packages/libxfont2/package.py
@@ -14,7 +14,7 @@ class Libxfont2(AutotoolsPackage, XorgPackage):
    but should not be used by normal X11 clients.  X11 clients access fonts
    via either the new API's in libXft, or the legacy API's in libX11."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXfont"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXfont"
    xorg_mirror_path = "lib/libXfont2-2.0.1.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/libxfontcache/package.py
+++ b/var/spack/repos/builtin/packages/libxfontcache/package.py
@@ -9,7 +9,7 @@
 class Libxfontcache(AutotoolsPackage, XorgPackage):
    """Xfontcache - X-TrueType font cache extension client library."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXfontcache"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXfontcache"
    xorg_mirror_path = "lib/libXfontcache-1.0.5.tar.gz"

    license("BSD-2-Clause")
--- a/var/spack/repos/builtin/packages/libxft/package.py
+++ b/var/spack/repos/builtin/packages/libxft/package.py
@@ -13,7 +13,7 @@ class Libxft(AutotoolsPackage, XorgPackage):
    connects X applications with the FreeType font rasterization library. Xft
    uses fontconfig to locate fonts so it has no configuration files."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXft"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXft"
    xorg_mirror_path = "lib/libXft-2.3.2.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/libxi/package.py
+++ b/var/spack/repos/builtin/packages/libxi/package.py
@@ -9,7 +9,7 @@
 class Libxi(AutotoolsPackage, XorgPackage):
    """libXi - library for the X Input Extension."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXi"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXi"
    xorg_mirror_path = "lib/libXi-1.7.6.tar.gz"

    license("MIT AND X11")
--- a/var/spack/repos/builtin/packages/libxinerama/package.py
+++ b/var/spack/repos/builtin/packages/libxinerama/package.py
@@ -9,7 +9,7 @@
 class Libxinerama(AutotoolsPackage, XorgPackage):
    """libXinerama - API for Xinerama extension to X11 Protocol."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXinerama"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXinerama"
    xorg_mirror_path = "lib/libXinerama-1.1.3.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/libxkbfile/package.py
+++ b/var/spack/repos/builtin/packages/libxkbfile/package.py
@@ -9,13 +9,14 @@
 class Libxkbfile(AutotoolsPackage, XorgPackage):
    """XKB file handling routines."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libxkbfile"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxkbfile"
    xorg_mirror_path = "lib/libxkbfile-1.0.9.tar.gz"

    license("MIT")

    maintainers("wdconinc")

+    version("1.1.3", sha256="c4c2687729d1f920f165ebb96557a1ead2ef655809ab5eaa66a1ad36dc31050d")
    version("1.1.2", sha256="d1a7e659bc7ae1aa1fc1ecced261c734df5ad5d86af1ef7a946be0e2d841e51d")
    version("1.1.1", sha256="87faee6d4873c5631e8bb53e85134084b862185da682de8617f08ca18d82e216")
    version("1.1.0", sha256="2a92adda3992aa7cbad758ef0b8dfeaedebb49338b772c64ddf369d78c1c51d3")
--- a/var/spack/repos/builtin/packages/libxkbui/package.py
+++ b/var/spack/repos/builtin/packages/libxkbui/package.py
@@ -9,7 +9,7 @@
 class Libxkbui(AutotoolsPackage, XorgPackage):
    """X.org libxkbui library."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libxkbui/"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxkbui/"
    xorg_mirror_path = "lib/libxkbui-1.0.2.tar.gz"

    version("1.0.2", sha256="196ab4867f3754caae34e51a663cbce26b4af819db3960f1fc4fb42c6a3c535d")
--- a/var/spack/repos/builtin/packages/libxmu/package.py
+++ b/var/spack/repos/builtin/packages/libxmu/package.py
@@ -12,17 +12,20 @@ class Libxmu(AutotoolsPackage, XorgPackage):
    that it may be layered on top of any proprietary implementation of Xlib
    or Xt."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXmu"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXmu"
    xorg_mirror_path = "lib/libXmu-1.1.2.tar.gz"

    license("MIT")

    maintainers("wdconinc")

+    version("1.2.1", sha256="bf0902583dd1123856c11e0a5085bd3c6e9886fbbd44954464975fd7d52eb599")
+    version("1.2.0", sha256="b4686c4b4570044bcfc35bfaa3edbe68185ddf8e3250387f74a140c8e45afb2f")
    version("1.1.4", sha256="3091d711cdc1d8ea0f545a13b90d1464c3c3ab64778fd121f0d789b277a80289")
    version("1.1.2", sha256="e5fd4bacef068f9509b8226017205040e38d3fba8d2de55037200e7176c13dba")

    depends_on("libxt")
+    depends_on("libxt@1.1:", when="@1.2:")
    depends_on("libxext")
    depends_on("libx11")

--- a/var/spack/repos/builtin/packages/libxp/package.py
+++ b/var/spack/repos/builtin/packages/libxp/package.py
@@ -9,7 +9,7 @@
 class Libxp(AutotoolsPackage, XorgPackage):
    """libXp - X Print Client Library."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXp"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXp"
    xorg_mirror_path = "lib/libXp-1.0.3.tar.gz"

    maintainers("wdconinc")
--- a/var/spack/repos/builtin/packages/libxpm/package.py
+++ b/var/spack/repos/builtin/packages/libxpm/package.py
@@ -9,7 +9,7 @@
 class Libxpm(AutotoolsPackage, XorgPackage):
    """libXpm - X Pixmap (XPM) image file format library."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXpm"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXpm"
    xorg_mirror_path = "lib/libXpm-3.5.12.tar.gz"

    license("X11")
--- a/var/spack/repos/builtin/packages/libxpresent/package.py
+++ b/var/spack/repos/builtin/packages/libxpresent/package.py
@@ -10,7 +10,7 @@ class Libxpresent(AutotoolsPackage, XorgPackage):
    """This package contains header files and documentation for the Present
    extension.  Library and server implementations are separate."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXpresent/"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXpresent/"
    xorg_mirror_path = "lib/libXpresent-1.0.0.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/libxprintapputil/package.py
+++ b/var/spack/repos/builtin/packages/libxprintapputil/package.py
@@ -9,7 +9,7 @@
 class Libxprintapputil(AutotoolsPackage, XorgPackage):
    """Xprint application utility routines."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXprintAppUtil/"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXprintAppUtil/"
    xorg_mirror_path = "lib/libXprintAppUtil-1.0.1.tar.gz"

    version("1.0.1", sha256="5af3939ffe15508b942bc1e325a29a95b1c85e8900a5f65a896101e63048bbf7")
--- a/var/spack/repos/builtin/packages/libxprintutil/package.py
+++ b/var/spack/repos/builtin/packages/libxprintutil/package.py
@@ -9,7 +9,7 @@
 class Libxprintutil(AutotoolsPackage, XorgPackage):
    """Xprint application utility routines."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXprintUtil/"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXprintUtil/"
    xorg_mirror_path = "lib/libXprintUtil-1.0.1.tar.gz"

    version("1.0.1", sha256="220924216f98ef8f7aa4cff33629edb1171ad10f8ea302a1eb85055545d4d195")
--- a/var/spack/repos/builtin/packages/libxrandr/package.py
+++ b/var/spack/repos/builtin/packages/libxrandr/package.py
@@ -9,7 +9,7 @@
 class Libxrandr(AutotoolsPackage, XorgPackage):
    """libXrandr - X Resize, Rotate and Reflection extension library."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXrandr"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXrandr"
    xorg_mirror_path = "lib/libXrandr-1.5.0.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/libxrender/package.py
+++ b/var/spack/repos/builtin/packages/libxrender/package.py
@@ -9,7 +9,7 @@
 class Libxrender(AutotoolsPackage, XorgPackage):
    """libXrender - library for the Render Extension to the X11 protocol."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXrender"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXrender"
    xorg_mirror_path = "lib/libXrender-0.9.10.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/libxres/package.py
+++ b/var/spack/repos/builtin/packages/libxres/package.py
@@ -9,7 +9,7 @@
 class Libxres(AutotoolsPackage, XorgPackage):
    """libXRes - X-Resource extension client library."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXRes"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXRes"
    xorg_mirror_path = "lib/libXres-1.0.7.tar.gz"

    license("custom")
--- a/var/spack/repos/builtin/packages/libxscrnsaver/package.py
+++ b/var/spack/repos/builtin/packages/libxscrnsaver/package.py
@@ -9,7 +9,7 @@
 class Libxscrnsaver(AutotoolsPackage, XorgPackage):
    """XScreenSaver - X11 Screen Saver extension client library"""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXScrnSaver"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXScrnSaver"
    xorg_mirror_path = "lib/libXScrnSaver-1.2.2.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/libxt/package.py
+++ b/var/spack/repos/builtin/packages/libxt/package.py
@@ -9,7 +9,7 @@
 class Libxt(AutotoolsPackage, XorgPackage):
    """libXt - X Toolkit Intrinsics library."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXt"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXt"
    xorg_mirror_path = "lib/libXt-1.1.5.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/libxtrap/package.py
+++ b/var/spack/repos/builtin/packages/libxtrap/package.py
@@ -18,7 +18,7 @@ class Libxtrap(AutotoolsPackage, XorgPackage):
    As X11R6 was released in 1994, XTrap has now been deprecated for over
    15 years, and uses of it should be quite rare."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXTrap"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXTrap"
    xorg_mirror_path = "lib/libXTrap-1.0.1.tar.gz"

    version("1.0.1", sha256="db748e299dcc9af68428795b898a4a96cf806f79b75786781136503e4fce5e17")
--- a/var/spack/repos/builtin/packages/libxtst/package.py
+++ b/var/spack/repos/builtin/packages/libxtst/package.py
@@ -18,7 +18,7 @@ class Libxtst(AutotoolsPackage, XorgPackage):
    The RECORD extension supports the recording and reporting of all
    core X protocol and arbitrary X extension protocol."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXtst"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXtst"
    xorg_mirror_path = "lib/libXtst-1.2.2.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/libxv/package.py
+++ b/var/spack/repos/builtin/packages/libxv/package.py
@@ -10,7 +10,7 @@ class Libxv(AutotoolsPackage, XorgPackage):
    """libXv - library for the X Video (Xv) extension to the
    X Window System."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXv"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXv"
    xorg_mirror_path = "lib/libXv-1.0.10.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/libxvmc/package.py
+++ b/var/spack/repos/builtin/packages/libxvmc/package.py
@@ -9,13 +9,14 @@
 class Libxvmc(AutotoolsPackage, XorgPackage):
    """X.org libXvMC library."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXvMC"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXvMC"
    xorg_mirror_path = "lib/libXvMC-1.0.9.tar.gz"

    license("MIT")

    maintainers("wdconinc")

+    version("1.0.14", sha256="3ad5d2b991219e2bf9b2f85d40b12c16f1afec038715e462f6058af73a9b5ef8")
    version("1.0.13", sha256="e630b4373af8c67a7c8f07ebe626a1269a613d262d1f737b57231a06f7c34b4e")
    version("1.0.12", sha256="024c9ec4f001f037eeca501ee724c7e51cf287eb69ced8c6126e16e7fa9864b5")
    version("1.0.11", sha256="0b931d216b23b95df87cc65f7bb7acef4120d9263adb0a4d90856ba1f7a390da")
--- a/var/spack/repos/builtin/packages/libxxf86dga/package.py
+++ b/var/spack/repos/builtin/packages/libxxf86dga/package.py
@@ -9,7 +9,7 @@
 class Libxxf86dga(AutotoolsPackage, XorgPackage):
    """libXxf86dga - Client library for the XFree86-DGA extension."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXxf86dga"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXxf86dga"
    xorg_mirror_path = "lib/libXxf86dga-1.1.4.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/libxxf86misc/package.py
+++ b/var/spack/repos/builtin/packages/libxxf86misc/package.py
@@ -9,7 +9,7 @@
 class Libxxf86misc(AutotoolsPackage, XorgPackage):
    """libXxf86misc - Extension library for the XFree86-Misc X extension."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXxf86misc"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXxf86misc"
    xorg_mirror_path = "lib/libXxf86misc-1.0.3.tar.gz"

    maintainers("wdconinc")
--- a/var/spack/repos/builtin/packages/libxxf86vm/package.py
+++ b/var/spack/repos/builtin/packages/libxxf86vm/package.py
@@ -9,7 +9,7 @@
 class Libxxf86vm(AutotoolsPackage, XorgPackage):
    """libXxf86vm - Extension library for the XFree86-VidMode X extension."""

-    homepage = "https://cgit.freedesktop.org/xorg/lib/libXxf86vm"
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libXxf86vm"
    xorg_mirror_path = "lib/libXxf86vm-1.1.4.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/x11perf/package.py
+++ b/var/spack/repos/builtin/packages/x11perf/package.py
@@ -9,7 +9,7 @@
 class X11perf(AutotoolsPackage, XorgPackage):
    """Simple X server performance benchmarker."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/x11perf"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/x11perf"
    xorg_mirror_path = "app/x11perf-1.6.0.tar.gz"

    version("1.6.1", sha256="a1874618df0e30ae1a9b2470fb50e77a40c4a6f6ddf87a5c154f7a3b913ac0b3")
--- a/var/spack/repos/builtin/packages/xauth/package.py
+++ b/var/spack/repos/builtin/packages/xauth/package.py
@@ -10,7 +10,7 @@ class Xauth(AutotoolsPackage, XorgPackage):
    """The xauth program is used to edit and display the authorization
    information used in connecting to the X server."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xauth"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xauth"
    xorg_mirror_path = "app/xauth-1.0.9.tar.gz"

    license("custom")
--- a/var/spack/repos/builtin/packages/xbacklight/package.py
+++ b/var/spack/repos/builtin/packages/xbacklight/package.py
@@ -12,7 +12,7 @@ class Xbacklight(AutotoolsPackage, XorgPackage):
    supporting backlight brightness control and changes them all in the
    same way."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xbacklight"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xbacklight"
    xorg_mirror_path = "app/xbacklight-1.2.1.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/xbiff/package.py
+++ b/var/spack/repos/builtin/packages/xbiff/package.py
@@ -11,7 +11,7 @@ class Xbiff(AutotoolsPackage, XorgPackage):
    It only handles mail stored in a filesystem accessible file,
    not via IMAP, POP or other remote access protocols."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xbiff"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xbiff"
    xorg_mirror_path = "app/xbiff-1.0.3.tar.gz"

    license("X11")
--- a/var/spack/repos/builtin/packages/xbitmaps/package.py
+++ b/var/spack/repos/builtin/packages/xbitmaps/package.py
@@ -10,7 +10,7 @@ class Xbitmaps(AutotoolsPackage, XorgPackage):
    """The xbitmaps package contains bitmap images used by multiple
    applications built in Xorg."""

-    homepage = "https://cgit.freedesktop.org/xorg/data/bitmaps/"
+    homepage = "https://gitlab.freedesktop.org/xorg/data/bitmaps/"
    xorg_mirror_path = "data/xbitmaps-1.1.1.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/xcalc/package.py
+++ b/var/spack/repos/builtin/packages/xcalc/package.py
@@ -10,7 +10,7 @@ class Xcalc(AutotoolsPackage, XorgPackage):
    """xcalc is a scientific calculator X11 client that can emulate a TI-30
    or an HP-10C."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xcalc"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xcalc"
    xorg_mirror_path = "app/xcalc-1.0.6.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/xclipboard/package.py
+++ b/var/spack/repos/builtin/packages/xclipboard/package.py
@@ -12,7 +12,7 @@ class Xclipboard(AutotoolsPackage, XorgPackage):
    CLIPBOARD selections for later use.  It stores each CLIPBOARD
    selection as a separate string, each of which can be selected."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xclipboard"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xclipboard"
    xorg_mirror_path = "app/xclipboard-1.1.3.tar.gz"

    version("1.1.4", sha256="c40cb97f6c8597ba74a3de5c188d4429f686e4d395b85dac0ec8c7311bdf3d10")
--- a/var/spack/repos/builtin/packages/xclock/package.py
+++ b/var/spack/repos/builtin/packages/xclock/package.py
@@ -11,7 +11,7 @@ class Xclock(AutotoolsPackage, XorgPackage):
    the time in analog or digital form, continuously updated at a
    frequency which may be specified by the user."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xclock"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xclock"
    xorg_mirror_path = "app/xclock-1.0.7.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/xcmiscproto/package.py
+++ b/var/spack/repos/builtin/packages/xcmiscproto/package.py
@@ -12,7 +12,7 @@ class Xcmiscproto(AutotoolsPackage, XorgPackage):
    This extension defines a protocol that provides Xlib two ways to query
    the server for available resource IDs."""

-    homepage = "https://cgit.freedesktop.org/xorg/proto/xcmiscproto"
+    homepage = "https://gitlab.freedesktop.org/xorg/proto/xcmiscproto"
    xorg_mirror_path = "proto/xcmiscproto-1.2.2.tar.gz"

    version("1.2.2", sha256="48013cfbe4bd5580925a854a43e2bccbb4c7a5a31128070644617b6dc7f8ef85")
--- a/var/spack/repos/builtin/packages/xcmsdb/package.py
+++ b/var/spack/repos/builtin/packages/xcmsdb/package.py
@@ -12,7 +12,7 @@ class Xcmsdb(AutotoolsPackage, XorgPackage):
    specified in section 7, Device Color Characterization, of the
    X11 Inter-Client Communication Conventions Manual (ICCCM)."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xcmsdb"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xcmsdb"
    xorg_mirror_path = "app/xcmsdb-1.0.5.tar.gz"

    license("custom")
--- a/var/spack/repos/builtin/packages/xcompmgr/package.py
+++ b/var/spack/repos/builtin/packages/xcompmgr/package.py
@@ -11,7 +11,7 @@ class Xcompmgr(AutotoolsPackage, XorgPackage):
    XFIXES, DAMAGE, RENDER, and COMPOSITE extensions.  It enables basic
    eye-candy effects."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xcompmgr"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xcompmgr"
    xorg_mirror_path = "app/xcompmgr-1.1.7.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/xconsole/package.py
+++ b/var/spack/repos/builtin/packages/xconsole/package.py
@@ -10,7 +10,7 @@ class Xconsole(AutotoolsPackage, XorgPackage):
    """xconsole displays in a X11 window the messages which are usually sent
    to /dev/console."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xconsole"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xconsole"
    xorg_mirror_path = "app/xconsole-1.0.6.tar.gz"

    version("1.1.0", sha256="fe5d2ba99b754909b2a04ce4abf054cd1e3134a830d69aea82e8465cc9f73942")
--- a/var/spack/repos/builtin/packages/xcursor-themes/package.py
+++ b/var/spack/repos/builtin/packages/xcursor-themes/package.py
@@ -11,9 +11,12 @@ class XcursorThemes(Package, XorgPackage):
    originally created for the XFree86 Project, and now shipped as part
    of the X.Org software distribution."""

-    homepage = "https://cgit.freedesktop.org/xorg/data/cursors"
+    homepage = "https://gitlab.freedesktop.org/xorg/data/cursors"
    xorg_mirror_path = "data/xcursor-themes-1.0.4.tar.gz"

+    version("1.0.7", sha256="dcb68b6265235db3064a4427e2bc5ae0d30f21f7468dd7534553715d1c39d009")
+    version("1.0.6", sha256="22638f7bd6257adf889d25af9c8a7b2cfdcf5a5e18339d25fbb092dbf6c663c1")
+    version("1.0.5", sha256="85636a3774debe830a15b9cd3c438171356fb451d7e3667212777a55d88f7897")
    version("1.0.4", sha256="8ed23bab13a4010fe4e95b37eefb634e31ac7cb8240b8b3b7d919c3a2db09503")

    depends_on("libxcursor")
@@ -21,6 +24,7 @@ class XcursorThemes(Package, XorgPackage):
    depends_on("xcursorgen", type="build")
    depends_on("pkgconfig", type="build")
    depends_on("util-macros", type="build")
+    depends_on("util-macros@1.20:", type="build", when="@1.0.7:")

    def install(self, spec, prefix):
        configure("--prefix={0}".format(prefix))
--- a/var/spack/repos/builtin/packages/xcursorgen/package.py
+++ b/var/spack/repos/builtin/packages/xcursorgen/package.py
@@ -9,7 +9,7 @@
 class Xcursorgen(AutotoolsPackage, XorgPackage):
    """xcursorgen prepares X11 cursor sets for use with libXcursor."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xcursorgen"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xcursorgen"
    xorg_mirror_path = "app/xcursorgen-1.0.6.tar.gz"

    version("1.0.8", sha256="b8bb2756918343b8bc15a4ce875e9efb6c4e7777adba088280e53dd09753b6ac")
--- a/var/spack/repos/builtin/packages/xdbedizzy/package.py
+++ b/var/spack/repos/builtin/packages/xdbedizzy/package.py
@@ -10,7 +10,7 @@ class Xdbedizzy(AutotoolsPackage, XorgPackage):
    """xdbedizzy is a demo of the X11 Double Buffer Extension (DBE)
    creating a double buffered spinning scene."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xdbedizzy"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xdbedizzy"
    xorg_mirror_path = "app/xdbedizzy-1.1.0.tar.gz"

    version("1.1.0", sha256="810e88b087b76f8b5993db4fc5165de3e5d29b0d4bf0e893750ee408fc7a5c0a")
--- a/var/spack/repos/builtin/packages/xditview/package.py
+++ b/var/spack/repos/builtin/packages/xditview/package.py
@@ -9,7 +9,7 @@
 class Xditview(AutotoolsPackage, XorgPackage):
    """xditview displays ditroff output on an X display."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xditview"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xditview"
    xorg_mirror_path = "app/xditview-1.0.4.tar.gz"

    license("X11")
--- a/var/spack/repos/builtin/packages/xdm/package.py
+++ b/var/spack/repos/builtin/packages/xdm/package.py
@@ -9,7 +9,7 @@
 class Xdm(AutotoolsPackage, XorgPackage):
    """X Display Manager / XDMCP server."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xdm"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xdm"
    xorg_mirror_path = "app/xdm-1.1.11.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/xdpyinfo/package.py
+++ b/var/spack/repos/builtin/packages/xdpyinfo/package.py
@@ -14,7 +14,7 @@ class Xdpyinfo(AutotoolsPackage, XorgPackage):
    and the server, and the different types of screens, visuals, and X11
    protocol extensions that are available."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xdpyinfo"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xdpyinfo"
    xorg_mirror_path = "app/xdpyinfo-1.3.2.tar.gz"

    license("custom")
--- a/var/spack/repos/builtin/packages/xdriinfo/package.py
+++ b/var/spack/repos/builtin/packages/xdriinfo/package.py
@@ -9,7 +9,7 @@
 class Xdriinfo(AutotoolsPackage, XorgPackage):
    """xdriinfo - query configuration information of X11 DRI drivers."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xdriinfo"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xdriinfo"
    xorg_mirror_path = "app/xdriinfo-1.0.5.tar.gz"

    license("custom")
--- a/var/spack/repos/builtin/packages/xedit/package.py
+++ b/var/spack/repos/builtin/packages/xedit/package.py
@@ -9,7 +9,7 @@
 class Xedit(AutotoolsPackage, XorgPackage):
    """Xedit is a simple text editor for X."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xedit"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xedit"
    xorg_mirror_path = "app/xedit-1.2.2.tar.gz"

    license("BSD-3-Clause")
--- a/var/spack/repos/builtin/packages/xev/package.py
+++ b/var/spack/repos/builtin/packages/xev/package.py
@@ -15,7 +15,7 @@ class Xev(AutotoolsPackage, XorgPackage):
    debugging and development tool, and should not be needed in normal
    usage."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xev"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xev"
    xorg_mirror_path = "app/xev-1.2.2.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/xextproto/package.py
+++ b/var/spack/repos/builtin/packages/xextproto/package.py
@@ -9,7 +9,7 @@
 class Xextproto(AutotoolsPackage, XorgPackage):
    """X Protocol Extensions."""

-    homepage = "https://cgit.freedesktop.org/xorg/proto/xextproto"
+    homepage = "https://gitlab.freedesktop.org/xorg/proto/xextproto"
    xorg_mirror_path = "proto/xextproto-7.3.0.tar.gz"

    version("7.3.0", sha256="1b1bcdf91221e78c6c33738667a57bd9aaa63d5953174ad8ed9929296741c9f5")
--- a/var/spack/repos/builtin/packages/xeyes/package.py
+++ b/var/spack/repos/builtin/packages/xeyes/package.py
@@ -9,7 +9,7 @@
 class Xeyes(AutotoolsPackage, XorgPackage):
    """xeyes - a follow the mouse X demo, using the X SHAPE extension"""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xeyes"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xeyes"
    xorg_mirror_path = "app/xeyes-1.1.1.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/xf86bigfontproto/package.py
+++ b/var/spack/repos/builtin/packages/xf86bigfontproto/package.py
@@ -9,7 +9,7 @@
 class Xf86bigfontproto(AutotoolsPackage, XorgPackage):
    """X.org XF86BigFontProto protocol headers."""

-    homepage = "https://cgit.freedesktop.org/xorg/proto/xf86bigfontproto"
+    homepage = "https://gitlab.freedesktop.org/xorg/proto/xf86bigfontproto"
    xorg_mirror_path = "proto/xf86bigfontproto-1.2.0.tar.gz"

    version("1.2.0", sha256="d190e6462b2bbbac6ee9a007fb8eccb9ad9f5f70544154f388266f031d4bbb23")
--- a/var/spack/repos/builtin/packages/xf86dga/package.py
+++ b/var/spack/repos/builtin/packages/xf86dga/package.py
@@ -9,7 +9,7 @@
 class Xf86dga(AutotoolsPackage, XorgPackage):
    """dga is a simple test client for the XFree86-DGA extension."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xf86dga"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xf86dga"
    xorg_mirror_path = "app/xf86dga-1.0.3.tar.gz"

    version("1.0.3", sha256="acbf89f60a99b18c161d2beb0e4145a0fdf6c516f7f45fa52e547d88491f75c9")
--- a/var/spack/repos/builtin/packages/xf86dgaproto/package.py
+++ b/var/spack/repos/builtin/packages/xf86dgaproto/package.py
@@ -9,7 +9,7 @@
 class Xf86dgaproto(AutotoolsPackage, XorgPackage):
    """X.org XF86DGAProto protocol headers."""

-    homepage = "https://cgit.freedesktop.org/xorg/proto/xf86dgaproto"
+    homepage = "https://gitlab.freedesktop.org/xorg/proto/xf86dgaproto"
    xorg_mirror_path = "proto/xf86dgaproto-2.1.tar.gz"

    version("2.1", sha256="73bc6fc830cce5a0ec9c750d4702601fc0fca12d6353ede8b4c0092c9c4ca2af")
--- a/var/spack/repos/builtin/packages/xf86driproto/package.py
+++ b/var/spack/repos/builtin/packages/xf86driproto/package.py
@@ -13,7 +13,7 @@ class Xf86driproto(AutotoolsPackage, XorgPackage):
    the video hardware without requiring data to be passed through the X
    server."""

-    homepage = "https://cgit.freedesktop.org/xorg/proto/xf86driproto"
+    homepage = "https://gitlab.freedesktop.org/xorg/proto/xf86driproto"
    xorg_mirror_path = "proto/xf86driproto-2.1.1.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/xf86miscproto/package.py
+++ b/var/spack/repos/builtin/packages/xf86miscproto/package.py
@@ -12,7 +12,7 @@ class Xf86miscproto(AutotoolsPackage, XorgPackage):
    supported by the XFree86 X server and versions of the Xorg X server
    prior to Xorg 1.6."""

-    homepage = "https://cgit.freedesktop.org/xorg/proto/xf86miscproto"
+    homepage = "https://gitlab.freedesktop.org/xorg/proto/xf86miscproto"
    xorg_mirror_path = "proto/xf86miscproto-0.9.3.tar.gz"

    version("0.9.3", sha256="1b05cb76ac165c703b82bdd270b86ebbc4d42a7d04d299050b07ba2099c31352")
--- a/var/spack/repos/builtin/packages/xf86rushproto/package.py
+++ b/var/spack/repos/builtin/packages/xf86rushproto/package.py
@@ -9,7 +9,7 @@
 class Xf86rushproto(AutotoolsPackage, XorgPackage):
    """X.org XF86RushProto protocol headers."""

-    homepage = "https://cgit.freedesktop.org/xorg/proto/xf86rushproto"
+    homepage = "https://gitlab.freedesktop.org/xorg/proto/xf86rushproto"
    xorg_mirror_path = "proto/xf86rushproto-1.1.2.tar.gz"

    version("1.1.2", sha256="7d420ae7e5f0dd94c6010c764c66acc93eed7df7f81bcf93d2a57739970ec841")
--- a/var/spack/repos/builtin/packages/xf86vidmodeproto/package.py
+++ b/var/spack/repos/builtin/packages/xf86vidmodeproto/package.py
@@ -12,7 +12,7 @@ class Xf86vidmodeproto(AutotoolsPackage, XorgPackage):
    This extension defines a protocol for dynamically configuring modelines
    and gamma."""

-    homepage = "https://cgit.freedesktop.org/xorg/proto/xf86vidmodeproto"
+    homepage = "https://gitlab.freedesktop.org/xorg/proto/xf86vidmodeproto"
    xorg_mirror_path = "proto/xf86vidmodeproto-2.3.1.tar.gz"

    version("2.3.1", sha256="c3512b11cefa7558576551f8582c6e7071c8a24d78176059d94b84b48b262979")
--- a/var/spack/repos/builtin/packages/xfd/package.py
+++ b/var/spack/repos/builtin/packages/xfd/package.py
@@ -10,7 +10,7 @@ class Xfd(AutotoolsPackage, XorgPackage):
    """xfd - display all the characters in a font using either the
    X11 core protocol or libXft2."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xfd"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xfd"
    xorg_mirror_path = "app/xfd-1.1.2.tar.gz"

    license("X11")
--- a/var/spack/repos/builtin/packages/xfindproxy/package.py
+++ b/var/spack/repos/builtin/packages/xfindproxy/package.py
@@ -14,7 +14,7 @@ class Xfindproxy(AutotoolsPackage, XorgPackage):
    services, starts new proxies when necessary, and makes sure that
    proxies are shared whenever possible."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xfindproxy"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xfindproxy"
    xorg_mirror_path = "app/xfindproxy-1.0.4.tar.gz"

    version("1.0.4", sha256="fa6152fcf9c16fbb2ef52259731df5df899a39a86894b0508456613f26ff924a")
--- a/var/spack/repos/builtin/packages/xfontsel/package.py
+++ b/var/spack/repos/builtin/packages/xfontsel/package.py
@@ -11,7 +11,7 @@ class Xfontsel(AutotoolsPackage, XorgPackage):
    protocol fonts known to your X server, examine samples of each, and
    retrieve the X Logical Font Description ("XLFD") full name for a font."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xfontsel"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xfontsel"
    xorg_mirror_path = "app/xfontsel-1.0.5.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/xfs/package.py
+++ b/var/spack/repos/builtin/packages/xfs/package.py
@@ -9,7 +9,7 @@
 class Xfs(AutotoolsPackage, XorgPackage):
    """X Font Server."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xfs"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xfs"
    xorg_mirror_path = "app/xfs-1.1.4.tar.gz"

    license("X11")
--- a/var/spack/repos/builtin/packages/xfsinfo/package.py
+++ b/var/spack/repos/builtin/packages/xfsinfo/package.py
@@ -13,7 +13,7 @@ class Xfsinfo(AutotoolsPackage, XorgPackage):
    clients and the server, and the font catalogues and alternate servers
    that are available."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xfsinfo"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xfsinfo"
    xorg_mirror_path = "app/xfsinfo-1.0.5.tar.gz"

    version("1.0.7", sha256="df874933710c9c38640496a2121d73272501b9620bdb95784e9e67b913788151")
--- a/var/spack/repos/builtin/packages/xfwp/package.py
+++ b/var/spack/repos/builtin/packages/xfwp/package.py
@@ -9,7 +9,7 @@
 class Xfwp(AutotoolsPackage, XorgPackage):
    """xfwp proxies X11 protocol connections, such as through a firewall."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xfwp"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xfwp"
    xorg_mirror_path = "app/xfwp-1.0.3.tar.gz"

    version("1.0.3", sha256="6fe243bde0374637e271a3f038b5d6d79a04621fc18162727782392069c5c04d")
--- a/var/spack/repos/builtin/packages/xgamma/package.py
+++ b/var/spack/repos/builtin/packages/xgamma/package.py
@@ -10,7 +10,7 @@ class Xgamma(AutotoolsPackage, XorgPackage):
    """xgamma allows X users to query and alter the gamma correction of a
    monitor via the X video mode extension (XFree86-VidModeExtension)."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xgamma"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xgamma"
    xorg_mirror_path = "app/xgamma-1.0.6.tar.gz"

    license("custom")
--- a/var/spack/repos/builtin/packages/xgc/package.py
+++ b/var/spack/repos/builtin/packages/xgc/package.py
@@ -10,7 +10,7 @@ class Xgc(AutotoolsPackage, XorgPackage):
    """xgc is an X11 graphics demo that shows various features of the X11
    core protocol graphics primitives."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xgc"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xgc"
    xorg_mirror_path = "app/xgc-1.0.5.tar.gz"

    version("1.0.6", sha256="8b5cfc547c04a2bd0807be700349522c0e717e34387019dd209eefa83cfa74f0")
--- a/var/spack/repos/builtin/packages/xhost/package.py
+++ b/var/spack/repos/builtin/packages/xhost/package.py
@@ -10,7 +10,7 @@ class Xhost(AutotoolsPackage, XorgPackage):
    """xhost is used to manage the list of host names or user names
    allowed to make connections to the X server."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xhost"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xhost"
    xorg_mirror_path = "app/xhost-1.0.7.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/xineramaproto/package.py
+++ b/var/spack/repos/builtin/packages/xineramaproto/package.py
@@ -12,7 +12,7 @@ class Xineramaproto(AutotoolsPackage, XorgPackage):
    This is an X extension that allows multiple physical screens controlled
    by a single X server to appear as a single screen."""

-    homepage = "https://cgit.freedesktop.org/xorg/proto/xineramaproto"
+    homepage = "https://gitlab.freedesktop.org/xorg/proto/xineramaproto"
    xorg_mirror_path = "proto/xineramaproto-1.2.1.tar.gz"

    version("1.2.1", sha256="d99e121edf7b310008d7371ac5dbe3aa2810996d476b754dc78477cc26e5e7c1")
--- a/var/spack/repos/builtin/packages/xinit/package.py
+++ b/var/spack/repos/builtin/packages/xinit/package.py
@@ -11,7 +11,7 @@ class Xinit(AutotoolsPackage, XorgPackage):
    first client program on systems that are not using a display manager
    such as xdm."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xinit"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xinit"
    xorg_mirror_path = "app/xinit-1.3.4.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/xinput/package.py
+++ b/var/spack/repos/builtin/packages/xinput/package.py
@@ -9,7 +9,7 @@
 class Xinput(AutotoolsPackage, XorgPackage):
    """xinput is a utility to configure and test XInput devices."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xinput"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xinput"
    xorg_mirror_path = "app/xinput-1.6.2.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/xkbcomp/package.py
+++ b/var/spack/repos/builtin/packages/xkbcomp/package.py
@@ -14,13 +14,14 @@ class Xkbcomp(AutotoolsPackage, XorgPackage):
    keyboard. It also includes a number of keyboard controls designed to
    make keyboards more accessible to people with physical impairments."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xkbcomp"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xkbcomp"
    xorg_mirror_path = "app/xkbcomp-1.3.1.tar.gz"

    license("MIT")

    maintainers("wdconinc")

+    version("1.4.7", sha256="00cecc490fcbe2f789cf13c408c459673c2c33ab758d802677321cffcda35373")
    version("1.4.6", sha256="b216a2c8c0eab83f3dc4a3d5ee2bdf7827b30e49c8907035d0f222138eca0987")
    version("1.4.5", sha256="e88a4d86b9925ea1e8685dd5ea29c815abafb8ddf19bf5f1a1e0650839252c23")
    version("1.4.4", sha256="159fba6b62ef4a3fb16ef7fc4eb4fc26f3888652471ceb604c495783dda020bc")
--- a/var/spack/repos/builtin/packages/xkbevd/package.py
+++ b/var/spack/repos/builtin/packages/xkbevd/package.py
@@ -9,7 +9,7 @@
 class Xkbevd(AutotoolsPackage, XorgPackage):
    """XKB event daemon demo."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xkbevd"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xkbevd"
    xorg_mirror_path = "app/xkbevd-1.1.4.tar.gz"

    version("1.1.5", sha256="5d6b65a417be57e19a76277601da83271b19de6e71cb0e8821441f6fb9973c47")
--- a/var/spack/repos/builtin/packages/xkbprint/package.py
+++ b/var/spack/repos/builtin/packages/xkbprint/package.py
@@ -10,7 +10,7 @@ class Xkbprint(AutotoolsPackage, XorgPackage):
    """xkbprint generates a printable or encapsulated PostScript description
    of an XKB keyboard description."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xkbprint"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xkbprint"
    xorg_mirror_path = "app/xkbprint-1.0.4.tar.gz"

    version("1.0.6", sha256="0d4602034cde190ca3d8f5c1051d34cebff5c0d92f7a32422a4de9d2313698ad")
--- a/var/spack/repos/builtin/packages/xkbutils/package.py
+++ b/var/spack/repos/builtin/packages/xkbutils/package.py
@@ -10,7 +10,7 @@ class Xkbutils(AutotoolsPackage, XorgPackage):
    """xkbutils is a collection of small utilities utilizing the XKeyboard
    (XKB) extension to the X11 protocol."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xkbutils"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xkbutils"
    xorg_mirror_path = "app/xkbutils-1.0.4.tar.gz"

    version("1.0.6", sha256="d747d4ce5c390223e3bfdb13a1f673d3e19ae46ded25838cb8b28b1bafe1b9bd")
--- a/var/spack/repos/builtin/packages/xkill/package.py
+++ b/var/spack/repos/builtin/packages/xkill/package.py
@@ -11,7 +11,7 @@ class Xkill(AutotoolsPackage, XorgPackage):
    clients.  This program is very dangerous, but is useful for aborting
    programs that have displayed undesired windows on a user's screen."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xkill"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xkill"
    xorg_mirror_path = "app/xkill-1.0.4.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/xload/package.py
+++ b/var/spack/repos/builtin/packages/xload/package.py
@@ -10,7 +10,7 @@ class Xload(AutotoolsPackage, XorgPackage):
    """xload displays a periodically updating histogram of the
    system load average."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xload"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xload"
    xorg_mirror_path = "app/xload-1.1.3.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/xlogo/package.py
+++ b/var/spack/repos/builtin/packages/xlogo/package.py
@@ -9,7 +9,7 @@
 class Xlogo(AutotoolsPackage, XorgPackage):
    """The xlogo program simply displays the X Window System logo."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xlogo"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xlogo"
    xorg_mirror_path = "app/xlogo-1.0.4.tar.gz"

    version("1.0.6", sha256="0b0dbd90f53103b9241cc3a68c232213cec5c1d9a839604e59d128e4d81d1a4d")
--- a/var/spack/repos/builtin/packages/xlsatoms/package.py
+++ b/var/spack/repos/builtin/packages/xlsatoms/package.py
@@ -9,7 +9,7 @@
 class Xlsatoms(AutotoolsPackage, XorgPackage):
    """xlsatoms lists the interned atoms defined on an X11 server."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xlsatoms"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xlsatoms"
    xorg_mirror_path = "app/xlsatoms-1.1.2.tar.gz"

    version("1.1.4", sha256="e3b4dce0e6bf3b60bc308ed184d2dc201ea4af6ce03f0126aa303ccd1ccb1237")
--- a/var/spack/repos/builtin/packages/xlsclients/package.py
+++ b/var/spack/repos/builtin/packages/xlsclients/package.py
@@ -10,7 +10,7 @@ class Xlsclients(AutotoolsPackage, XorgPackage):
    """xlsclients is a utility for listing information about the client
    applications running on a X11 server."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xlsclients"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xlsclients"
    xorg_mirror_path = "app/xlsclients-1.1.3.tar.gz"

    version("1.1.5", sha256="225d75e4c0b0929f16f974e20931ab85204b40098d92a5479b0b9379120637e5")
--- a/var/spack/repos/builtin/packages/xlsfonts/package.py
+++ b/var/spack/repos/builtin/packages/xlsfonts/package.py
@@ -10,7 +10,7 @@ class Xlsfonts(AutotoolsPackage, XorgPackage):
    """xlsfonts lists fonts available from an X server via the X11
    core protocol."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xlsfonts"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xlsfonts"
    xorg_mirror_path = "app/xlsfonts-1.0.5.tar.gz"

    version("1.0.7", sha256="b92d4954eaf525674ff83f7e85240ef166c240a774277f71c30674f9f7794171")
--- a/var/spack/repos/builtin/packages/xmag/package.py
+++ b/var/spack/repos/builtin/packages/xmag/package.py
@@ -9,7 +9,7 @@
 class Xmag(AutotoolsPackage, XorgPackage):
    """xmag displays a magnified snapshot of a portion of an X11 screen."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xmag"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xmag"
    xorg_mirror_path = "app/xmag-1.0.6.tar.gz"

    license("custom")
--- a/var/spack/repos/builtin/packages/xman/package.py
+++ b/var/spack/repos/builtin/packages/xman/package.py
@@ -10,7 +10,7 @@ class Xman(AutotoolsPackage, XorgPackage):
    """xman is a graphical manual page browser using the Athena Widgets (Xaw)
    toolkit."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xman"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xman"
    xorg_mirror_path = "app/xman-1.1.4.tar.gz"

    license("X11")
--- a/var/spack/repos/builtin/packages/xmessage/package.py
+++ b/var/spack/repos/builtin/packages/xmessage/package.py
@@ -11,7 +11,7 @@ class Xmessage(AutotoolsPackage, XorgPackage):
    on an "okay" button to dismiss it or can select one of several buttons
    to answer a question.  xmessage can also exit after a specified time."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xmessage"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xmessage"
    xorg_mirror_path = "app/xmessage-1.0.4.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/xmh/package.py
+++ b/var/spack/repos/builtin/packages/xmh/package.py
@@ -11,7 +11,7 @@ class Xmh(AutotoolsPackage, XorgPackage):
    MH Message Handling System.  To actually do things with your
    mail, it makes calls to the MH package."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xmh"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xmh"
    xorg_mirror_path = "app/xmh-1.0.3.tar.gz"

    version("1.0.5", sha256="3ab74096031ba89bcc88a46dbfa652837c4aeb6a36168ff9799782efe88128b8")
--- a/var/spack/repos/builtin/packages/xmodmap/package.py
+++ b/var/spack/repos/builtin/packages/xmodmap/package.py
@@ -13,7 +13,7 @@ class Xmodmap(AutotoolsPackage, XorgPackage):
    session startup script to configure the keyboard according to personal
    tastes."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xmodmap"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xmodmap"
    xorg_mirror_path = "app/xmodmap-1.0.9.tar.gz"

    license("MIT")
--- a/var/spack/repos/builtin/packages/xmore/package.py
+++ b/var/spack/repos/builtin/packages/xmore/package.py
@@ -9,7 +9,7 @@
 class Xmore(AutotoolsPackage, XorgPackage):
    """xmore - plain text display program for the X Window System."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xmore"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xmore"
    xorg_mirror_path = "app/xmore-1.0.2.tar.gz"

    version("1.0.3", sha256="00e2f55ce4d2699a97f70060d309898c92ed2a42b9e16f21047a3654432a92b6")
--- a/var/spack/repos/builtin/packages/xorg-cf-files/package.py
+++ b/var/spack/repos/builtin/packages/xorg-cf-files/package.py
@@ -12,7 +12,7 @@ class XorgCfFiles(AutotoolsPackage, XorgPackage):
    have not been verified or tested in over a decade), and for many of the
    libraries formerly delivered in the X.Org monolithic releases."""

-    homepage = "https://cgit.freedesktop.org/xorg/util/cf"
+    homepage = "https://gitlab.freedesktop.org/xorg/util/cf"
    xorg_mirror_path = "util/xorg-cf-files-1.0.6.tar.gz"

    license("custom")
--- a/var/spack/repos/builtin/packages/xorg-sgml-doctools/package.py
+++ b/var/spack/repos/builtin/packages/xorg-sgml-doctools/package.py
@@ -11,7 +11,7 @@ class XorgSgmlDoctools(AutotoolsPackage, XorgPackage):
    sheets used in building/formatting the documentation provided in other
    X.Org packages."""

-    homepage = "https://cgit.freedesktop.org/xorg/doc/xorg-sgml-doctools"
+    homepage = "https://gitlab.freedesktop.org/xorg/doc/xorg-sgml-doctools"
    xorg_mirror_path = "doc/xorg-sgml-doctools-1.11.tar.gz"

    maintainers("wdconinc")
--- a/var/spack/repos/builtin/packages/xphelloworld/package.py
+++ b/var/spack/repos/builtin/packages/xphelloworld/package.py
@@ -9,7 +9,7 @@
 class Xphelloworld(AutotoolsPackage, XorgPackage):
    """Xprint sample applications."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xphelloworld"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xphelloworld"
    xorg_mirror_path = "app/xphelloworld-1.0.1.tar.gz"

    version("1.0.1", sha256="ead6437c4dc9540698a41e174c9d1ac792de07baeead81935d72cb123196f866")
--- a/var/spack/repos/builtin/packages/xplsprinters/package.py
+++ b/var/spack/repos/builtin/packages/xplsprinters/package.py
@@ -9,7 +9,7 @@
 class Xplsprinters(AutotoolsPackage, XorgPackage):
    """List Xprint printers."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xplsprinters"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xplsprinters"
    xorg_mirror_path = "app/xplsprinters-1.0.1.tar.gz"

    version("1.0.1", sha256="33377e499429ce3e100fbd7b59153c87ad79bf55872561db08419f69cac4fbfd")
--- a/var/spack/repos/builtin/packages/xpr/package.py
+++ b/var/spack/repos/builtin/packages/xpr/package.py
@@ -10,7 +10,7 @@ class Xpr(AutotoolsPackage, XorgPackage):
    """xpr takes as input a window dump file produced by xwd
    and formats it for output on various types of printers."""

-    homepage = "https://cgit.freedesktop.org/xorg/app/xpr"
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xpr"
    xorg_mirror_path = "app/xpr-1.0.4.tar.gz"

    version("1.1.0", sha256="fabd02fb1a52358d521f1be7422738bc8c9b511a8d82a163888f628db6f6cb18")
--- a/Show More
+++ b/Show More