internal/pkg: check exec substitution

This relies on the testtool having ident as relevant input to assert successful substitution.

Signed-off-by: Ophestra <cat@gensokyo.uk>

internal/rosa/all.go

@@ -56,8 +56,6 @@ const (
 	Fakeroot
 	Findutils
 	Flex
-	FontUtil
-	Freetype
 	Fuse
 	GMP
 	GLib
@@ -79,10 +77,7 @@ const (
 	LIT
 	LibX11
 	LibXau
-	LibXdmcp
 	LibXext
-	LibXfixes
-	LibXfont2
 	LibXrandr
 	LibXrender
 	LibXxf86vm
@@ -92,11 +87,9 @@ const (
 	Libconfig
 	LibdisplayInfo
 	Libdrm
-	Libepoxy
 	Libev
 	Libexpat
 	Libffi
-	Libfontenc
 	Libgd
 	Libglvnd
 	Libiconv
@@ -108,28 +101,17 @@ const (
 	Libpsl
 	Libseccomp
 	Libtasn1
-	Libtirpc
 	Libtool
 	Libucontext
 	Libunistring
-	Libva
-	LibxcbRenderUtil
-	LibxcbUtil
-	LibxcbUtilImage
-	LibxcbUtilKeysyms
-	LibxcbUtilWM
-	Libxcvt
-	Libxkbfile
-	Libxml2
 	Libxshmfence
+	Libxml2
 	Libxslt
 	Libxtrans
-	LMSensors
 	M4
 	MPC
 	MPFR
 	Make
-	Mesa
 	Meson
 	Mksh
 	MuslFts
@@ -151,12 +133,10 @@ const (
 	PerlPodParser
 	PerlSGMLS
 	PerlTermReadKey
-	PerlTestCmd
 	PerlTextCharWidth
 	PerlTextWrapI18N
 	PerlUnicodeLineBreak
 	PerlYAMLTiny
-	Pixman
 	PkgConfig
 	Procps
 	Python
@@ -199,12 +179,10 @@ const (
 	WaylandProtocols
 	XCB
 	XCBProto
+	XCBUtilKeysyms
 	XDGDBusProxy
 	XZ
-	Xkbcomp
-	XkeyboardConfig
 	XorgProto
-	Xserver
 	Zlib
 	Zstd
 

internal/rosa/freetype.go

@@ -1,27 +0,0 @@
-package rosa
-
-import "hakurei.app/internal/pkg"
-
-func (t Toolchain) newFreetype() (pkg.Artifact, string) {
-	const (
-		version  = "2.14.3"
-		checksum = "-WfLv8fVJNyCHpP_lriiDzOcVbBL9ajdQ3tl8AzIIUa9-8sVpU9irxOmSMgRHWYz"
-	)
-	return t.NewPackage("freetype", version, newTar(
-		"https://download.savannah.gnu.org/releases/freetype/"+
-			"freetype-"+version+".tar.gz",
-		checksum,
-		pkg.TarGzip,
-	), nil, (*MakeHelper)(nil)), version
-}
-func init() {
-	artifactsM[Freetype] = Metadata{
-		f: Toolchain.newFreetype,
-
-		Name:        "freetype",
-		Description: "a freely available software library to render fonts",
-		Website:     "http://www.freetype.org/",
-
-		ID: 854,
-	}
-}

internal/rosa/glslang.go

@@ -189,18 +189,9 @@ func (t Toolchain) newSPIRVLLVMTranslator() (pkg.Artifact, string) {
 	), &PackageAttr{
 		Patches: []KV{
 			{"remove-early-prefix", `diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c000a77e..f18f3fde 100644
+index c000a77e..86f79b03 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -164,7 +164,7 @@ install(
-     ${LLVM_SPIRV_INCLUDE_DIRS}/LLVMSPIRVOpts.h
-     ${LLVM_SPIRV_INCLUDE_DIRS}/LLVMSPIRVExtensions.inc
-   DESTINATION
--    ${CMAKE_INSTALL_PREFIX}/include/LLVMSPIRVLib
-+    include/LLVMSPIRVLib
- )
- 
- configure_file(LLVMSPIRVLib.pc.in ${CMAKE_BINARY_DIR}/LLVMSPIRVLib.pc @ONLY)
 @@ -172,5 +172,5 @@ install(
    FILES
      ${CMAKE_BINARY_DIR}/LLVMSPIRVLib.pc
@@ -208,7 +199,7 @@ index c000a77e..f18f3fde 100644
 -    ${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}/pkgconfig
 +    lib${LLVM_LIBDIR_SUFFIX}/pkgconfig
  )
-;`},
+`},
 		},
 
 		// litArgs emits shell syntax

internal/rosa/libepoxy.go

@@ -1,33 +0,0 @@
-package rosa
-
-import "hakurei.app/internal/pkg"
-
-func (t Toolchain) newLibepoxy() (pkg.Artifact, string) {
-	const (
-		version  = "1.5.10"
-		checksum = "OHI8wshrlGw6BMGrmSyejJtwzM2gPhyFJrTsKxULyKMmYrfgcOe7Iw2ibVoUND_Q"
-	)
-	return t.NewPackage("libepoxy", version, newFromGitHub(
-		"anholt/libepoxy",
-		version,
-		checksum,
-	), nil, &MesonHelper{
-		Setup: []KV{
-			{"Dglx", "no"},
-			{"Degl", "no"},
-		},
-	},
-		LibX11,
-	), version
-}
-func init() {
-	artifactsM[Libepoxy] = Metadata{
-		f: Toolchain.newLibepoxy,
-
-		Name:        "libepoxy",
-		Description: "a library for handling OpenGL function pointer management",
-		Website:     "https://github.com/anholt/libepoxy",
-
-		ID: 6090,
-	}
-}

internal/rosa/libtirpc.go

@@ -1,44 +0,0 @@
-package rosa
-
-import (
-	"strings"
-
-	"hakurei.app/internal/pkg"
-)
-
-func (t Toolchain) newLibtirpc() (pkg.Artifact, string) {
-	const (
-		version  = "1.3.7"
-		checksum = "nzFfu7LNvnSNiNAryD1vtnNWnU-Xqee8KqfXUKoBf5yjb5-dkeRkYuRijdCoYLof"
-	)
-	return t.NewPackage("libtirpc", version, t.newTagRemote(
-		"git://linux-nfs.org/~steved/libtirpc",
-		"libtirpc-"+
-			strings.Join(strings.SplitN(version, ".", 3), "-"),
-		checksum,
-	), nil, &MakeHelper{
-		Generate: "sh -e ./bootstrap",
-		Configure: []KV{
-			{"CFLAGS", `"$(pkg-config --cflags libbsd-overlay) ${CFLAGS:-}"`},
-			{"disable-gssapi"},
-		},
-	},
-		Automake,
-		Libtool,
-		PkgConfig,
-
-		Libbsd,
-		KernelHeaders,
-	), version
-}
-func init() {
-	artifactsM[Libtirpc] = Metadata{
-		f: Toolchain.newLibtirpc,
-
-		Name:        "libtirpc",
-		Description: "a port of Suns Transport-Independent RPC library to Linux",
-		Website:     "https://sourceforge.net/projects/libtirpc/",
-
-		ID: 1740,
-	}
-}

internal/rosa/lm-sensors.go

@@ -1,59 +0,0 @@
-package rosa
-
-import "hakurei.app/internal/pkg"
-
-func (t Toolchain) newLMSensors() (pkg.Artifact, string) {
-	const (
-		version  = "3-6-2"
-		checksum = "7JYNutrihe-FP6r3ftf96uFZJJWPfxnBHL0ALSMA-vovaXVRr-sAjlLitw7WWpCI"
-	)
-	return t.NewPackage("lm_sensors", version, newFromGitHub(
-		"lm-sensors/lm-sensors",
-		"V"+version,
-		checksum,
-	), &PackageAttr{
-		Writable:    true,
-		Chmod:       true,
-		EnterSource: true,
-
-		ScriptEarly: `
-ln -s \
-	../../system/bin/perl \
-	/usr/bin/
-`,
-	}, &MakeHelper{
-		InPlace:       true,
-		SkipConfigure: true,
-
-		Make: []string{
-			"CC=cc",
-			"ETCDIR=/system/etc",
-			"PREFIX=/system",
-		},
-
-		Check: []string{
-			"CC=cc",
-			"check",
-		},
-
-		Install: "make DESTDIR=/work PREFIX=/system install",
-	},
-		Perl,
-		PerlTestCmd,
-
-		M4,
-		Bison,
-		Flex,
-	), version
-}
-func init() {
-	artifactsM[LMSensors] = Metadata{
-		f: Toolchain.newLMSensors,
-
-		Name:        "lm_sensors",
-		Description: "user-space support for hardware monitoring drivers",
-		Website:     "https://hwmon.wiki.kernel.org/lm_sensors",
-
-		ID: 1831,
-	}
-}

internal/rosa/mesa.go

@@ -1,10 +1,6 @@
 package rosa
 
-import (
-	"strings"
-
-	"hakurei.app/internal/pkg"
-)
+import "hakurei.app/internal/pkg"
 
 func (t Toolchain) newLibglvnd() (pkg.Artifact, string) {
 	const (
@@ -16,22 +12,8 @@ func (t Toolchain) newLibglvnd() (pkg.Artifact, string) {
 		"glvnd/libglvnd",
 		"v"+version,
 		checksum,
-	), nil, &MesonHelper{
-		Setup: []KV{
-			{"Dx11", "enabled"},
-			{"Dglx", "enabled"},
-		},
-		ScriptCompiled: `
-export DISPLAY=':0'
-Xvfb &
-XVFB_PID="$!"
-trap 'kill $XVFB_PID && wait $XVFB_PID' EXIT
-`,
-	},
+	), nil, (*MesonHelper)(nil),
 		Binutils, // symbols check fail with llvm nm
-		Xserver,  // test suite wants X server
-
-		LibXext,
 	), version
 }
 func init() {
@@ -42,10 +24,6 @@ func init() {
 		Description: "The GL Vendor-Neutral Dispatch library",
 		Website:     "https://gitlab.freedesktop.org/glvnd/libglvnd",
 
-		Dependencies: P{
-			LibXext,
-		},
-
 		ID: 12098,
 	}
 }
@@ -86,180 +64,3 @@ func init() {
 		ID: 1596,
 	}
 }
-
-func (t Toolchain) newLibva() (pkg.Artifact, string) {
-	const (
-		version  = "2.23.0"
-		checksum = "UmF5tPyWIG_w5kiR3KFpoYbF7UUcaak5tyc-RhOheNTwQlLkPlifreFYCM9FQxbq"
-	)
-	return t.NewPackage("libva", version, newFromGitHub(
-		"intel/libva",
-		version,
-		checksum,
-	), nil, &MesonHelper{
-		Setup: []KV{
-			{"Dwith_x11", "yes"},
-			{"Dwith_glx", "yes"},
-			{"Dwith_wayland", "yes"},
-		},
-	},
-		Libdrm,
-		LibXfixes,
-		Libglvnd,
-		Wayland,
-		KernelHeaders,
-	), version
-}
-func init() {
-	artifactsM[Libva] = Metadata{
-		f: Toolchain.newLibva,
-
-		Name:        "libva",
-		Description: "an implementation for VA-API (Video Acceleration API)",
-		Website:     "https://01.org/vaapi",
-
-		Dependencies: P{
-			Libdrm,
-			LibXfixes,
-			Libglvnd,
-			Wayland,
-		},
-
-		ID: 1752,
-	}
-}
-
-func (t Toolchain) newMesa() (pkg.Artifact, string) {
-	const (
-		version  = "26.1.0"
-		checksum = "zU0fjqevySBaoi_5SLW3e2UffmGeBdxOuHmAHTH68n2hV-sjYoqg30koLqFXuk5y"
-	)
-	return t.NewPackage("mesa", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"mesa/mesa",
-		"mesa-"+version,
-		checksum,
-	), nil, &MesonHelper{
-		Setup: []KV{
-			{"Dplatforms", "x11,wayland"},
-			{"Dvideo-codecs", "all"},
-
-			{"Dglvnd", "enabled"},
-			{"Dgbm", "enabled"},
-
-			{"Dgallium-drivers", strings.Join([]string{
-				"asahi",     // Apple AGX
-				"crocus",    // Intel legacy
-				"etnaviv",   // Vivante GPU designs (mostly NXP/Marvell SoCs)
-				"freedreno", // Qualcomm Adreno (all Qualcomm SoCs)
-				"i915",      // Intel extra legacy
-				"iris",      // new Intel (Broadwell+)
-				"lima",      // ARM Mali 4xx
-				"llvmpipe",  // software renderer
-				"nouveau",   // Nvidia
-				"panfrost",  // ARM Mali Midgard and up (T/G series)
-				"r300",      // very old AMD
-				"r600",      // less old AMD
-				"radeonsi",  // new AMD (GCN+)
-				"softpipe",  // older software renderer
-				"svga",      // VMWare virtualized GPU
-				"tegra",     // Nvidia Tegra SoCs
-				"v3d",       // Broadcom VC5 (Raspberry Pi 4)
-				"vc4",       // Broadcom VC4 (Raspberry Pi 0-3)
-				"virgl",     // QEMU virtualized GPU (aka VirGL)
-				"zink",      // generic OpenGL over Vulkan, experimental
-
-				// d3d12: WSL emulated GPU (aka Dozen)
-				// ethosu: accelerator
-				// rocket: accelerator
-			}, ",")},
-
-			{"Dvulkan-drivers", strings.Join([]string{
-				"amd",         // AMD (aka RADV)
-				"broadcom",    // Broadcom VC5 (Raspberry Pi 4, aka V3D)
-				"freedreno",   // Qualcomm Adreno (all Qualcomm SoCs)
-				"intel",       // new Intel (aka ANV)
-				"intel_hasvk", // Intel Haswell/Broadwell, "legacy" Vulkan driver (https://www.phoronix.com/news/Intel-HasVK-Drop-Dead-Code)
-				"panfrost",    // ARM Mali Midgard and up (T/G series)
-				"swrast",      // software renderer (aka Lavapipe)
-				"virtio",      // QEMU virtualized GPU (aka VirGL)
-				"imagination", // PowerVR Rogue
-				"asahi",       // Apple AGX
-				"gfxstream",   // Android virtualized GPU
-
-				// nouveau: Nouveau (aka NVK), requires rust
-				// microsoft-experimental: WSL virtualized GPU (aka DZN/Dozen)
-				// kosmickrisp: macOS-specific
-			}, ",")},
-			{"Dvulkan-layers", strings.Join([]string{
-				"device-select",
-				"intel-nullhw",
-				"overlay",
-				"screenshot",
-				"anti-lag",
-				"vram-report-limit",
-			}, ",")},
-
-			{"Dfreedreno-kmds", "msm,virtio"},
-			{"Damdgpu-virtio", "true"},
-		},
-	},
-		M4,
-		PythonPackaging,
-		PythonMako,
-		PythonPyYAML,
-		PythonPycparser,
-		Glslang,
-		SPIRVLLVMTranslator,
-
-		Zlib,
-		Zstd,
-		Gzip,
-		Ncurses,
-		Libglvnd,
-		Libexpat,
-		Libva,
-		Libdrm,
-		Elfutils,
-		Bison,
-		Flex,
-		LMSensors,
-		Libconfig,
-		LibdisplayInfo,
-		Wayland,
-		WaylandProtocols,
-		Libxshmfence,
-		LibXxf86vm,
-		LibXrandr,
-		LibxcbUtilKeysyms,
-		Libpng,
-		Libarchive,
-		KernelHeaders,
-	), version
-}
-func init() {
-	artifactsM[Mesa] = Metadata{
-		f: Toolchain.newMesa,
-
-		Name:        "mesa",
-		Description: "open source implementations of OpenGL, OpenGL ES, Vulkan, OpenCL, and more",
-		Website:     "https://mesa3d.org",
-
-		Dependencies: P{
-			Libdrm,
-			Elfutils,
-			LMSensors,
-			LibdisplayInfo,
-			Wayland,
-			Libxshmfence,
-			LibXxf86vm,
-			LibXrandr,
-			LibxcbUtilKeysyms,
-			Libpng,
-		},
-
-		ID: 1970,
-
-		latest: (*Versions).getStable,
-	}
-}

internal/rosa/perl.go

@@ -382,27 +382,3 @@ func init() {
 		ID: 3549,
 	}
 }
-
-func (t Toolchain) newPerlTestCmd() (pkg.Artifact, string) {
-	const (
-		version  = "1.09"
-		checksum = "gpGUwyC9IozDiYSgW_kXARNfXsTPFa6cTowJmmCBbPqcs2-pONZca_SB06FGy-7H"
-	)
-	return t.newViaPerlMakeMaker("Test::Cmd", version, newFromCPAN(
-		"NEILB",
-		"Test-Cmd",
-		version,
-		checksum,
-	), nil), version
-}
-func init() {
-	artifactsM[PerlTestCmd] = Metadata{
-		f: Toolchain.newPerlTestCmd,
-
-		Name:        "perl-Test::Cmd",
-		Description: "portable testing of commands and scripts",
-		Website:     "https://metacpan.org/release/Test-Cmd",
-
-		ID: 6014,
-	}
-}

internal/rosa/pixman.go

@@ -1,31 +0,0 @@
-package rosa
-
-import "hakurei.app/internal/pkg"
-
-func (t Toolchain) newPixman() (pkg.Artifact, string) {
-	const (
-		version  = "0.46.4"
-		checksum = "iECDxLG9SxUrvGHqeDoaBa-b3uqdT5DC4zudjtrwb8Wodq82pyacmFNEAo4SDsiE"
-	)
-	return t.NewPackage("pixman", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"pixman/pixman",
-		"pixman-"+version,
-		checksum,
-	), nil, &MesonHelper{
-		Setup: []KV{
-			{"Dtests", "enabled"},
-		},
-	}), version
-}
-func init() {
-	artifactsM[Pixman] = Metadata{
-		f: Toolchain.newPixman,
-
-		Name:        "pixman",
-		Description: "a low-level software library for pixel manipulation",
-		Website:     "https://pixman.org/",
-
-		ID: 3648,
-	}
-}

internal/rosa/x.go

@@ -186,12 +186,12 @@ func init() {
 	}
 }
 
-func (t Toolchain) newLibxcbUtilKeysyms() (pkg.Artifact, string) {
+func (t Toolchain) newXCBUtilKeysyms() (pkg.Artifact, string) {
 	const (
 		version  = "0.4.1"
 		checksum = "-EEje12UEjtFBuIjb6Fy4cxEghV20BXwQ1BLvhtvSuVcrFkp_X-ZHRM48wAspXZ4"
 	)
-	return t.NewPackage("libxcb-util-keysyms", version, newTar(
+	return t.NewPackage("xcb-util-keysyms", version, newTar(
 		"https://xcb.freedesktop.org/dist/xcb-util-keysyms-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -202,10 +202,10 @@ func (t Toolchain) newLibxcbUtilKeysyms() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[LibxcbUtilKeysyms] = Metadata{
-		f: Toolchain.newLibxcbUtilKeysyms,
+	artifactsM[XCBUtilKeysyms] = Metadata{
+		f: Toolchain.newXCBUtilKeysyms,
 
-		Name:        "libxcb-util-keysyms",
+		Name:        "xcb-util-keysyms",
 		Description: "standard X key constants and conversion to/from keycodes",
 		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms",
 
@@ -217,135 +217,6 @@ func init() {
 	}
 }
 
-func (t Toolchain) newLibxcbUtilImage() (pkg.Artifact, string) {
-	const (
-		version  = "0.4.1"
-		checksum = "47pvXmFwaUBZIrJ4CE9xjTQIFyxeqoNAL-DshlB11GZ_jjI3G1a6KF0K7mtBQ1E7"
-	)
-	return t.NewPackage("libxcb-util-image", version, newTar(
-		"https://xcb.freedesktop.org/dist/xcb-util-image-"+version+".tar.gz",
-		checksum,
-		pkg.TarGzip,
-	), nil, (*MakeHelper)(nil),
-		PkgConfig,
-
-		LibxcbUtil,
-	), version
-}
-func init() {
-	artifactsM[LibxcbUtilImage] = Metadata{
-		f: Toolchain.newLibxcbUtilImage,
-
-		Name:        "libxcb-util-image",
-		Description: "XCB port of Xlib's XImage and XShmImage functions",
-		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxcb-image",
-
-		Dependencies: P{
-			LibxcbUtil,
-		},
-
-		ID: 5168,
-	}
-}
-
-func (t Toolchain) newLibxcbUtilWM() (pkg.Artifact, string) {
-	const (
-		version  = "0.4.2"
-		checksum = "g0VZgMU9hcIgyXb3XxBR9xqsvUMBd9qt_Dbmwoj2h5y24pODr_S_D0DhRsuXUNjF"
-	)
-	return t.NewPackage("libxcb-util-wm", version, newTar(
-		"https://xcb.freedesktop.org/dist/xcb-util-wm-"+version+".tar.gz",
-		checksum,
-		pkg.TarGzip,
-	), nil, (*MakeHelper)(nil),
-		M4,
-		PkgConfig,
-
-		XCB,
-	), version
-}
-func init() {
-	artifactsM[LibxcbUtilWM] = Metadata{
-		f: Toolchain.newLibxcbUtilWM,
-
-		Name:        "libxcb-util-wm",
-		Description: "XCB client and window-manager helpers for ICCCM & EWMH",
-		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxcb-wm",
-
-		Dependencies: P{
-			XCB,
-		},
-
-		ID: 5170,
-	}
-}
-
-func (t Toolchain) newLibxcbUtil() (pkg.Artifact, string) {
-	const (
-		version  = "0.4.1"
-		checksum = "YMXGQUQbF6PoEAGflvYnJYsLWjti6sL_ifY47wIXTNGVM3tQ8u41nkBYN4K1D5CD"
-	)
-	return t.NewPackage("libxcb-util", version, newTar(
-		"https://www.x.org/releases/individual/xcb/"+
-			"xcb-util-"+version+".tar.gz",
-		checksum,
-		pkg.TarGzip,
-	), nil, (*MakeHelper)(nil),
-		PkgConfig,
-
-		utilMacros,
-		XCB,
-	), version
-}
-func init() {
-	artifactsM[LibxcbUtil] = Metadata{
-		f: Toolchain.newLibxcbUtil,
-
-		Name:        "libxcb-util",
-		Description: "XCB utility libraries",
-		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxcb-util",
-
-		Dependencies: P{
-			XCB,
-		},
-
-		ID: 5165,
-	}
-}
-
-func (t Toolchain) newLibxcbRenderUtil() (pkg.Artifact, string) {
-	const (
-		version  = "0.3.10"
-		checksum = "n08L8PyCoOd7v2vb6fSVq5Pq6JtteXVh9K2wrQMTNwGMf_Fjpi6i3HWF-TMFSVTI"
-	)
-	return t.NewPackage("libxcb-render-util", version, newTar(
-		"https://www.x.org/releases/individual/xcb/"+
-			"xcb-util-renderutil-"+version+".tar.gz",
-		checksum,
-		pkg.TarGzip,
-	), nil, (*MakeHelper)(nil),
-		PkgConfig,
-
-		utilMacros,
-		XCB,
-	), version
-}
-func init() {
-	artifactsM[LibxcbRenderUtil] = Metadata{
-		f: Toolchain.newLibxcbRenderUtil,
-
-		Name:        "libxcb-render-util",
-		Description: "XCB convenience functions for the Render extension",
-		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util",
-
-		Dependencies: P{
-			XCB,
-		},
-
-		ID: 5169,
-	}
-}
-
 func (t Toolchain) newLibX11() (pkg.Artifact, string) {
 	const (
 		version  = "1.8.13"
@@ -427,44 +298,6 @@ func init() {
 	}
 }
 
-func (t Toolchain) newLibXfixes() (pkg.Artifact, string) {
-	const (
-		version  = "6.0.2"
-		checksum = "_-kJfKZ7cE3NNeMr6NLSXCmsyP7MVEHVPLNfxatz2qBy3_fZJvPMQwZNOC9y6V5L"
-	)
-	return t.NewPackage("libXfixes", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"xorg/lib/libxfixes",
-		"libXfixes-"+version,
-		checksum,
-	), nil, &MakeHelper{
-		Generate: "NOCONFIGURE=1 ./autogen.sh",
-	},
-		Automake,
-		Libtool,
-		PkgConfig,
-
-		utilMacros,
-		XorgProto,
-		LibX11,
-	), version
-}
-func init() {
-	artifactsM[LibXfixes] = Metadata{
-		f: Toolchain.newLibXfixes,
-
-		Name:        "libXfixes",
-		Description: "Xlib-based library for the XFIXES Extension",
-		Website:     "https://www.freedesktop.org/wiki/Software/FixesExt/",
-
-		Dependencies: P{
-			LibX11,
-		},
-
-		ID: 1775,
-	}
-}
-
 func (t Toolchain) newLibXrender() (pkg.Artifact, string) {
 	const (
 		version  = "0.9.12"
@@ -613,264 +446,6 @@ func init() {
 	}
 }
 
-func (t Toolchain) newFontUtil() (pkg.Artifact, string) {
-	const (
-		version  = "1.4.2"
-		checksum = "YWiaIxkq-N2yNdbGa_RF1S0UkQq6xsgoRT73WZP2DOmyH_CJ0TAkpQjId657MQmh"
-	)
-	return t.NewPackage("font-util", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"xorg/font/util",
-		"font-util-"+version,
-		checksum,
-	), nil, &MakeHelper{
-		Generate: "NOCONFIGURE=1 ./autogen.sh",
-	},
-		Automake,
-		Libtool,
-		PkgConfig,
-
-		utilMacros,
-	), version
-}
-func init() {
-	artifactsM[FontUtil] = Metadata{
-		f: Toolchain.newFontUtil,
-
-		Name:        "font-util",
-		Description: "X.Org font package creation/installation utilities",
-		Website:     "https://gitlab.freedesktop.org/xorg/font/util",
-
-		ID: 15055,
-	}
-}
-
-func (t Toolchain) newLibfontenc() (pkg.Artifact, string) {
-	const (
-		version  = "1.1.9"
-		checksum = "XqosXfbVwaoYzG9vVyRCl3eatwjASoJdLZsxQ37NN8S_jTyqNmbxpRSJGImJj7RS"
-	)
-	return t.NewPackage("libfontenc", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"xorg/lib/libfontenc",
-		"libfontenc-"+version,
-		checksum,
-	), nil, &MakeHelper{
-		Generate: "NOCONFIGURE=1 ./autogen.sh",
-	},
-		Automake,
-		Libtool,
-		PkgConfig,
-
-		utilMacros,
-		FontUtil,
-		XorgProto,
-	), version
-}
-func init() {
-	artifactsM[Libfontenc] = Metadata{
-		f: Toolchain.newLibfontenc,
-
-		Name:        "libfontenc",
-		Description: "X font encoding library",
-		Website:     "https://gitlab.freedesktop.org/xorg/lib/libfontenc",
-
-		ID: 1613,
-	}
-}
-
-func (t Toolchain) newLibxkbfile() (pkg.Artifact, string) {
-	const (
-		version  = "1.2.0"
-		checksum = "WUtph1ab0AyATahlwljchBxZJcpjYrjyhCK9DW2VO0uXEXaN22GWmUaibcA83i_B"
-	)
-	return t.NewPackage("libxkbfile", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"xorg/lib/libxkbfile",
-		"libxkbfile-"+version,
-		checksum,
-	), nil, (*MesonHelper)(nil),
-		LibX11,
-	), version
-}
-func init() {
-	artifactsM[Libxkbfile] = Metadata{
-		f: Toolchain.newLibxkbfile,
-
-		Name:        "libxkbfile",
-		Description: "XKB file handling routines",
-		Website:     "http://www.x.org/wiki/XKB",
-
-		Dependencies: P{
-			LibX11,
-		},
-
-		ID: 1781,
-	}
-}
-
-func (t Toolchain) newXkbcomp() (pkg.Artifact, string) {
-	const (
-		version  = "1.5.0"
-		checksum = "ttICW8ZPbljI-nw2kknvxFhwFoDK40iAMBeZDLAHYsHf3B6UPO_zc9TpzZYRRyZH"
-	)
-	return t.NewPackage("xkbcomp", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"xorg/app/xkbcomp",
-		"xkbcomp-"+version,
-		checksum,
-	), nil, &MakeHelper{
-		Generate: "NOCONFIGURE=1 ./autogen.sh",
-	},
-		Automake,
-		Libtool,
-		PkgConfig,
-		Bison,
-
-		utilMacros,
-		Libxkbfile,
-	), version
-}
-func init() {
-	artifactsM[Xkbcomp] = Metadata{
-		f: Toolchain.newXkbcomp,
-
-		Name:        "xkbcomp",
-		Description: "XKB keyboard description compiler",
-		Website:     "http://www.x.org/wiki/XKB",
-
-		Dependencies: P{
-			Libxkbfile,
-		},
-
-		ID: 15018,
-	}
-}
-
-func (t Toolchain) newLibXfont2() (pkg.Artifact, string) {
-	const (
-		version  = "2.0.7"
-		checksum = "jv9BZNA02493KB8j1lfAErF5SA3ZFcAhm3_UVJ--Bp1maz-vNprl_wXpkHApBi9M"
-	)
-	return t.NewPackage("libXfont2", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"xorg/lib/libxfont",
-		"libXfont2-"+version,
-		checksum,
-	), nil, &MakeHelper{
-		Generate: "NOCONFIGURE=1 ./autogen.sh",
-	},
-		Automake,
-		Libtool,
-		PkgConfig,
-
-		utilMacros,
-		Freetype,
-		XorgProto,
-		Libxtrans,
-		Libfontenc,
-	), version
-}
-func init() {
-	artifactsM[LibXfont2] = Metadata{
-		f: Toolchain.newLibXfont2,
-
-		Name:        "libXfont2",
-		Description: "X font handling library for server & utilities",
-		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxfont",
-
-		Dependencies: P{
-			Freetype,
-			Libfontenc,
-		},
-
-		ID: 17165,
-	}
-}
-
-func (t Toolchain) newLibxcvt() (pkg.Artifact, string) {
-	const (
-		version  = "0.1.3"
-		checksum = "IfIA7SxlHMWh681e1AgYmZcRAfkZd5LlzmqcMRifNY5nNVRrUx_wnoaidAv0Yu03"
-	)
-	return t.NewPackage("libxcvt", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"xorg/lib/libxcvt",
-		"libxcvt-"+version,
-		checksum,
-	), nil, (*MesonHelper)(nil)), version
-}
-func init() {
-	artifactsM[Libxcvt] = Metadata{
-		f: Toolchain.newLibxcvt,
-
-		Name:        "libxcvt",
-		Description: "VESA CVT standard timing modeline generation library & utility",
-		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxcvt",
-
-		ID: 235147,
-	}
-}
-
-func (t Toolchain) newLibXdmcp() (pkg.Artifact, string) {
-	const (
-		version  = "1.1.5"
-		checksum = "N6AJSv9pmeBedFn8KuSIOUGvTken4rkypNWVE2KfPlliwkfIbhfXrt5YHZkBMUHp"
-	)
-	return t.NewPackage("libXdmcp", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"xorg/lib/libxdmcp",
-		"libXdmcp-"+version,
-		checksum,
-	), nil, &MakeHelper{
-		Generate: "NOCONFIGURE=1 ./autogen.sh",
-	},
-		Automake,
-		Libtool,
-		PkgConfig,
-
-		utilMacros,
-		XorgProto,
-	), version
-}
-func init() {
-	artifactsM[LibXdmcp] = Metadata{
-		f: Toolchain.newLibXdmcp,
-
-		Name:        "libXdmcp",
-		Description: "X Display Manager Control Protocol library",
-		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxdmcp",
-
-		ID: 1772,
-	}
-}
-
-func (t Toolchain) newXkeyboardConfig() (pkg.Artifact, string) {
-	const (
-		version  = "2.47"
-		checksum = "E03PsPIaRrxPAuKgDGSQyPiJB49wXtyyvdV0lVx3_G-pelMMlaFLkoTDHTHG_qgA"
-	)
-	return t.NewPackage("xkeyboard-config", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"xkeyboard-config/xkeyboard-config",
-		"xkeyboard-config-"+version,
-		checksum,
-	), nil, (*MesonHelper)(nil),
-		Perl,
-	), version
-}
-func init() {
-	artifactsM[XkeyboardConfig] = Metadata{
-		f: Toolchain.newXkeyboardConfig,
-
-		Name:        "xkeyboard-config",
-		Description: "the non-arch keyboard configuration database for X Window",
-		Website:     "https://www.freedesktop.org/wiki/Software/XKeyboardConfig/",
-
-		ID: 5191,
-	}
-}
-
 func (t Toolchain) newLibpciaccess() (pkg.Artifact, string) {
 	const (
 		version  = "0.19"
@@ -902,87 +477,3 @@ func init() {
 		ID: 1703,
 	}
 }
-
-func (t Toolchain) newXserver() (pkg.Artifact, string) {
-	const (
-		version  = "21.1.22"
-		checksum = "prLT2wKecBu5m9w1ThgIt0GvenNpjKXoOyvTiMA1oQTlP0QHh6QiWsdvH3OmUwNo"
-	)
-	return t.NewPackage("xserver", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"xorg/xserver",
-		"xorg-server-"+version,
-		checksum,
-	), nil, &MesonHelper{
-		Setup: []KV{
-			{"Dxorg", "true"},
-			{"Dxephyr", "true"},
-			{"Dxnest", "true"},
-			{"Dipv6", "false"},
-
-			{"Dudev", "false"},
-			{"Dudev_kms", "false"},
-			{"Dglx", "false"},
-			// ../../usr/src/xserver/glamor/glamor_glx.c:24:10: fatal error: 'epoxy/glx.h' file not found
-			{"Dglamor", "false"},
-		},
-	},
-		Gawk,
-
-		XorgProto,
-		Libxtrans,
-		Libxshmfence,
-		Pixman,
-		Libbsd,
-		Xkbcomp,
-		XkeyboardConfig,
-		LibXfont2,
-		DBus,
-		FontUtil,
-		Libxcvt,
-		LibXext,
-		Libmd,
-		LibXdmcp,
-		Libtirpc,
-		Libepoxy,
-		LibxcbUtil,
-		LibxcbUtilImage,
-		LibxcbUtilWM,
-		LibxcbUtilKeysyms,
-		LibxcbRenderUtil,
-		Libpciaccess,
-		KernelHeaders,
-	), version
-}
-func init() {
-	artifactsM[Xserver] = Metadata{
-		f: Toolchain.newXserver,
-
-		Name:        "xserver",
-		Description: "X server",
-		Website:     "https://gitlab.freedesktop.org/xorg/xserver",
-
-		Dependencies: P{
-			Xkbcomp,
-			XkeyboardConfig,
-
-			XCB,
-			Pixman,
-			Libmd,
-			Libbsd,
-			Libtirpc,
-			Libxcvt,
-			LibXdmcp,
-			LibXfont2,
-			Libpciaccess,
-
-			// Xephyr
-			LibxcbUtilImage,
-			LibxcbUtilWM,
-			LibxcbUtilKeysyms,
-			LibxcbRenderUtil,
-		},
-
-		ID: 5250,
-	}
-}