From 3e76749f64c51daff5349715df8623de05b7b830 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:29:22 +0100
Subject: drop xorg drivers

---
 xorg/xf86-input-libinput/build     |  7 -------
 xorg/xf86-input-libinput/checksums |  2 --
 xorg/xf86-input-libinput/depends   |  2 --
 xorg/xf86-input-libinput/meta      |  3 ---
 xorg/xf86-input-libinput/sources   |  1 -
 xorg/xf86-input-libinput/version   |  1 -
 xorg/xf86-video-amdgpu/build       |  9 ---------
 xorg/xf86-video-amdgpu/checksums   |  2 --
 xorg/xf86-video-amdgpu/depends     |  7 -------
 xorg/xf86-video-amdgpu/meta        |  3 ---
 xorg/xf86-video-amdgpu/sources     |  1 -
 xorg/xf86-video-amdgpu/version     |  1 -
 xorg/xf86-video-ati/build          |  9 ---------
 xorg/xf86-video-ati/checksums      |  1 -
 xorg/xf86-video-ati/depends        |  6 ------
 xorg/xf86-video-ati/meta           |  3 ---
 xorg/xf86-video-ati/sources        |  1 -
 xorg/xf86-video-ati/version        |  1 -
 xorg/xf86-video-intel/build        | 17 -----------------
 xorg/xf86-video-intel/checksums    |  2 --
 xorg/xf86-video-intel/depends      |  7 -------
 xorg/xf86-video-intel/meta         |  3 ---
 xorg/xf86-video-intel/sources      |  1 -
 xorg/xf86-video-intel/version      |  1 -
 xorg/xf86-video-nouveau/build      |  9 ---------
 xorg/xf86-video-nouveau/checksums  |  1 -
 xorg/xf86-video-nouveau/depends    |  3 ---
 xorg/xf86-video-nouveau/meta       |  3 ---
 xorg/xf86-video-nouveau/sources    |  1 -
 xorg/xf86-video-nouveau/version    |  1 -
 xorg/xf86-video-vesa/build         |  9 ---------
 xorg/xf86-video-vesa/checksums     |  2 --
 xorg/xf86-video-vesa/depends       |  4 ----
 xorg/xf86-video-vesa/meta          |  3 ---
 xorg/xf86-video-vesa/sources       |  1 -
 xorg/xf86-video-vesa/version       |  1 -
 36 files changed, 129 deletions(-)
 delete mode 100755 xorg/xf86-input-libinput/build
 delete mode 100644 xorg/xf86-input-libinput/checksums
 delete mode 100644 xorg/xf86-input-libinput/depends
 delete mode 100644 xorg/xf86-input-libinput/meta
 delete mode 100644 xorg/xf86-input-libinput/sources
 delete mode 100644 xorg/xf86-input-libinput/version
 delete mode 100755 xorg/xf86-video-amdgpu/build
 delete mode 100644 xorg/xf86-video-amdgpu/checksums
 delete mode 100644 xorg/xf86-video-amdgpu/depends
 delete mode 100644 xorg/xf86-video-amdgpu/meta
 delete mode 100644 xorg/xf86-video-amdgpu/sources
 delete mode 100644 xorg/xf86-video-amdgpu/version
 delete mode 100755 xorg/xf86-video-ati/build
 delete mode 100644 xorg/xf86-video-ati/checksums
 delete mode 100644 xorg/xf86-video-ati/depends
 delete mode 100644 xorg/xf86-video-ati/meta
 delete mode 100644 xorg/xf86-video-ati/sources
 delete mode 100644 xorg/xf86-video-ati/version
 delete mode 100755 xorg/xf86-video-intel/build
 delete mode 100644 xorg/xf86-video-intel/checksums
 delete mode 100644 xorg/xf86-video-intel/depends
 delete mode 100644 xorg/xf86-video-intel/meta
 delete mode 100644 xorg/xf86-video-intel/sources
 delete mode 100644 xorg/xf86-video-intel/version
 delete mode 100755 xorg/xf86-video-nouveau/build
 delete mode 100644 xorg/xf86-video-nouveau/checksums
 delete mode 100644 xorg/xf86-video-nouveau/depends
 delete mode 100644 xorg/xf86-video-nouveau/meta
 delete mode 100644 xorg/xf86-video-nouveau/sources
 delete mode 100644 xorg/xf86-video-nouveau/version
 delete mode 100755 xorg/xf86-video-vesa/build
 delete mode 100644 xorg/xf86-video-vesa/checksums
 delete mode 100644 xorg/xf86-video-vesa/depends
 delete mode 100644 xorg/xf86-video-vesa/meta
 delete mode 100644 xorg/xf86-video-vesa/sources
 delete mode 100644 xorg/xf86-video-vesa/version

diff --git a/xorg/xf86-input-libinput/build b/xorg/xf86-input-libinput/build
deleted file mode 100755
index 6daf22f8..00000000
--- a/xorg/xf86-input-libinput/build
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/xf86-input-libinput/checksums b/xorg/xf86-input-libinput/checksums
deleted file mode 100644
index faa3e294..00000000
--- a/xorg/xf86-input-libinput/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-d4ec8673e75f8364c150f6b63a81f2dc5092acb9001f283c90adfaea248462a6  xf86-input-libinput-1.2.1.tar.gz
diff --git a/xorg/xf86-input-libinput/depends b/xorg/xf86-input-libinput/depends
deleted file mode 100644
index b958d854..00000000
--- a/xorg/xf86-input-libinput/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-libinput
-xorg-server make
diff --git a/xorg/xf86-input-libinput/meta b/xorg/xf86-input-libinput/meta
deleted file mode 100644
index 76f290d6..00000000
--- a/xorg/xf86-input-libinput/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: libinput input driver for X
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/xf86-input-libinput/sources b/xorg/xf86-input-libinput/sources
deleted file mode 100644
index 1a53f9ea..00000000
--- a/xorg/xf86-input-libinput/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/driver/xf86-input-libinput-1.2.1.tar.gz
diff --git a/xorg/xf86-input-libinput/version b/xorg/xf86-input-libinput/version
deleted file mode 100644
index cd3d02bc..00000000
--- a/xorg/xf86-input-libinput/version
+++ /dev/null
@@ -1 +0,0 @@
-1.2.1 1
diff --git a/xorg/xf86-video-amdgpu/build b/xorg/xf86-video-amdgpu/build
deleted file mode 100755
index 3054c8be..00000000
--- a/xorg/xf86-video-amdgpu/build
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-export LDFLAGS="-Wl,-z,lazy"
-
-./configure \
-    --prefix=/usr
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/xf86-video-amdgpu/checksums b/xorg/xf86-video-amdgpu/checksums
deleted file mode 100644
index 321920de..00000000
--- a/xorg/xf86-video-amdgpu/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-ec85f454fd5d2b5f5877cdc8d664f60bf2ff58d6a2fd449d284f4d9f849bc96f  xf86-video-amdgpu-22.0.0.tar.xz
diff --git a/xorg/xf86-video-amdgpu/depends b/xorg/xf86-video-amdgpu/depends
deleted file mode 100644
index aba33f59..00000000
--- a/xorg/xf86-video-amdgpu/depends
+++ /dev/null
@@ -1,7 +0,0 @@
-eudev
-expat
-libdrm
-libpciaccess
-mesa
-xorgproto   make
-xorg-server make
diff --git a/xorg/xf86-video-amdgpu/meta b/xorg/xf86-video-amdgpu/meta
deleted file mode 100644
index 28375eaa..00000000
--- a/xorg/xf86-video-amdgpu/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: Xorg AMD Radeon video driver (amdgpu kernel module)
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/xf86-video-amdgpu/sources b/xorg/xf86-video-amdgpu/sources
deleted file mode 100644
index a09555ac..00000000
--- a/xorg/xf86-video-amdgpu/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/driver/xf86-video-amdgpu-22.0.0.tar.xz
diff --git a/xorg/xf86-video-amdgpu/version b/xorg/xf86-video-amdgpu/version
deleted file mode 100644
index 607bb538..00000000
--- a/xorg/xf86-video-amdgpu/version
+++ /dev/null
@@ -1 +0,0 @@
-22.0.0 1
diff --git a/xorg/xf86-video-ati/build b/xorg/xf86-video-ati/build
deleted file mode 100755
index 3054c8be..00000000
--- a/xorg/xf86-video-ati/build
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-export LDFLAGS="-Wl,-z,lazy"
-
-./configure \
-    --prefix=/usr
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/xf86-video-ati/checksums b/xorg/xf86-video-ati/checksums
deleted file mode 100644
index 740c30d6..00000000
--- a/xorg/xf86-video-ati/checksums
+++ /dev/null
@@ -1 +0,0 @@
-c05c6e0c396a0148113f1836cfab7f2e43f784c9b7041f11e9cab40a4bc0c90f  xf86-video-ati-19.1.0.tar.gz
diff --git a/xorg/xf86-video-ati/depends b/xorg/xf86-video-ati/depends
deleted file mode 100644
index 0d1c94e3..00000000
--- a/xorg/xf86-video-ati/depends
+++ /dev/null
@@ -1,6 +0,0 @@
-eudev
-expat
-libdrm
-libpciaccess
-mesa
-xorgproto
diff --git a/xorg/xf86-video-ati/meta b/xorg/xf86-video-ati/meta
deleted file mode 100644
index a1feae34..00000000
--- a/xorg/xf86-video-ati/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: Xorg ATI Radeon video driver
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/xf86-video-ati/sources b/xorg/xf86-video-ati/sources
deleted file mode 100644
index b1a4fb8b..00000000
--- a/xorg/xf86-video-ati/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://x.org/releases/individual/driver/xf86-video-ati-19.1.0.tar.gz
diff --git a/xorg/xf86-video-ati/version b/xorg/xf86-video-ati/version
deleted file mode 100644
index 119d7b4b..00000000
--- a/xorg/xf86-video-ati/version
+++ /dev/null
@@ -1 +0,0 @@
-19.1.0 1
diff --git a/xorg/xf86-video-intel/build b/xorg/xf86-video-intel/build
deleted file mode 100755
index 8bfc3d73..00000000
--- a/xorg/xf86-video-intel/build
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh -e
-
-export DESTDIR="$1"
-export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-export CFLAGS="$CFLAGS -fcommon"
-
-cl-meson \
-    -Ddefault-dri=3 \
-    -Dxvmc=false \
-    -Dvalgrind=false \
-    . build
-
-ninja -C build
-ninja -C build install
-
-# Remove policy kit files.
-rm -rf "$1/usr/share/polkit-1"
diff --git a/xorg/xf86-video-intel/checksums b/xorg/xf86-video-intel/checksums
deleted file mode 100644
index e06cc56d..00000000
--- a/xorg/xf86-video-intel/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-1d5cffdda1c5ba06b00c01d065ccd2051e5525c0ff02e589798aad464865b4e8  xf86-video-intel-31486f40f8e8f8923ca0799aea84b58799754564.tar.gz
diff --git a/xorg/xf86-video-intel/depends b/xorg/xf86-video-intel/depends
deleted file mode 100644
index d502f757..00000000
--- a/xorg/xf86-video-intel/depends
+++ /dev/null
@@ -1,7 +0,0 @@
-libXScrnSaver
-libXcursor
-libXinerama
-libXrandr
-libXtst
-meson make
-xorg-server make
diff --git a/xorg/xf86-video-intel/meta b/xorg/xf86-video-intel/meta
deleted file mode 100644
index d88c5c91..00000000
--- a/xorg/xf86-video-intel/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: Xorg Intel video driver
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/xf86-video-intel/sources b/xorg/xf86-video-intel/sources
deleted file mode 100644
index 0024d532..00000000
--- a/xorg/xf86-video-intel/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/archive/31486f40f8e8f8923ca0799aea84b58799754564/xf86-video-intel-31486f40f8e8f8923ca0799aea84b58799754564.tar.gz
diff --git a/xorg/xf86-video-intel/version b/xorg/xf86-video-intel/version
deleted file mode 100644
index b6e8f110..00000000
--- a/xorg/xf86-video-intel/version
+++ /dev/null
@@ -1 +0,0 @@
-31486f40f8e8f8923ca0799aea84b58799754564 1
diff --git a/xorg/xf86-video-nouveau/build b/xorg/xf86-video-nouveau/build
deleted file mode 100755
index 3054c8be..00000000
--- a/xorg/xf86-video-nouveau/build
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-export LDFLAGS="-Wl,-z,lazy"
-
-./configure \
-    --prefix=/usr
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/xf86-video-nouveau/checksums b/xorg/xf86-video-nouveau/checksums
deleted file mode 100644
index 730fcebe..00000000
--- a/xorg/xf86-video-nouveau/checksums
+++ /dev/null
@@ -1 +0,0 @@
-499322e27a55c8183166bf2dd1e47d085eb834143e0d7036baba8427b90c156b  xf86-video-nouveau-1.0.17.tar.bz2
diff --git a/xorg/xf86-video-nouveau/depends b/xorg/xf86-video-nouveau/depends
deleted file mode 100644
index 4000b008..00000000
--- a/xorg/xf86-video-nouveau/depends
+++ /dev/null
@@ -1,3 +0,0 @@
-eudev
-libdrm
-xorgproto
diff --git a/xorg/xf86-video-nouveau/meta b/xorg/xf86-video-nouveau/meta
deleted file mode 100644
index 9e12b5a8..00000000
--- a/xorg/xf86-video-nouveau/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: Xorg NVIDIA video driver (nouveau kernel module)
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/xf86-video-nouveau/sources b/xorg/xf86-video-nouveau/sources
deleted file mode 100644
index 23c93aaa..00000000
--- a/xorg/xf86-video-nouveau/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/driver/xf86-video-nouveau-1.0.17.tar.bz2
diff --git a/xorg/xf86-video-nouveau/version b/xorg/xf86-video-nouveau/version
deleted file mode 100644
index 8e6a7c9c..00000000
--- a/xorg/xf86-video-nouveau/version
+++ /dev/null
@@ -1 +0,0 @@
-1.0.17 1
diff --git a/xorg/xf86-video-vesa/build b/xorg/xf86-video-vesa/build
deleted file mode 100755
index 3054c8be..00000000
--- a/xorg/xf86-video-vesa/build
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-export LDFLAGS="-Wl,-z,lazy"
-
-./configure \
-    --prefix=/usr
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/xf86-video-vesa/checksums b/xorg/xf86-video-vesa/checksums
deleted file mode 100644
index d30612cf..00000000
--- a/xorg/xf86-video-vesa/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-ad80f88905426e59c5b683a262d0ad97689e6e32a08aa2455b2938f9971b731a  xf86-video-vesa-2.6.0.tar.gz
diff --git a/xorg/xf86-video-vesa/depends b/xorg/xf86-video-vesa/depends
deleted file mode 100644
index f0962d5c..00000000
--- a/xorg/xf86-video-vesa/depends
+++ /dev/null
@@ -1,4 +0,0 @@
-libXi
-xorg-server      make
-xorg-util-macros make
-xorgproto        make
diff --git a/xorg/xf86-video-vesa/meta b/xorg/xf86-video-vesa/meta
deleted file mode 100644
index 55ba6408..00000000
--- a/xorg/xf86-video-vesa/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: Xorg VESA video driver
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/xf86-video-vesa/sources b/xorg/xf86-video-vesa/sources
deleted file mode 100644
index ada22a5a..00000000
--- a/xorg/xf86-video-vesa/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-2.6.0.tar.gz
diff --git a/xorg/xf86-video-vesa/version b/xorg/xf86-video-vesa/version
deleted file mode 100644
index 9922898f..00000000
--- a/xorg/xf86-video-vesa/version
+++ /dev/null
@@ -1 +0,0 @@
-2.6.0 1
-- 
cgit v1.2.3


From 7d4bcb0d9f05e0b36137b05b1992a7eed971c0a5 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:30:21 +0100
Subject: xorg-server: drop from repository

---
 xorg/xorg-server/build                             | 27 ----------------------
 xorg/xorg-server/checksums                         |  3 ---
 xorg/xorg-server/depends                           | 24 -------------------
 xorg/xorg-server/message                           |  9 --------
 xorg/xorg-server/meta                              |  3 ---
 .../xorg-server/patches/rootless_modesetting.patch | 14 -----------
 xorg/xorg-server/sources                           |  2 --
 xorg/xorg-server/version                           |  1 -
 8 files changed, 83 deletions(-)
 delete mode 100755 xorg/xorg-server/build
 delete mode 100644 xorg/xorg-server/checksums
 delete mode 100644 xorg/xorg-server/depends
 delete mode 100644 xorg/xorg-server/message
 delete mode 100644 xorg/xorg-server/meta
 delete mode 100644 xorg/xorg-server/patches/rootless_modesetting.patch
 delete mode 100644 xorg/xorg-server/sources
 delete mode 100644 xorg/xorg-server/version

diff --git a/xorg/xorg-server/build b/xorg/xorg-server/build
deleted file mode 100755
index 2b7dfa07..00000000
--- a/xorg/xorg-server/build
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh -e
-
-export DESTDIR="$1"
-
-patch -p1 < rootless_modesetting.patch
-
-cl-meson \
-    --auto-features=auto \
-    -Ddefault_font_path=/usr/share/fonts \
-    -Dsystemd_logind=false \
-    -Dxorg=true \
-    -Dglamor=true \
-    -Dglx=true \
-    -Ddri1=true \
-    -Ddri2=true \
-    -Ddri3=true \
-    -Dxdmcp=false \
-    -Dsecure-rpc=false \
-    -Dvendor_name="Carbs Linux" \
-    -Dvendor_name_short="carbs" \
-    -Dvendor_web="https://carbslinux.org" \
-    . output
-
-ninja -C output
-ninja -C output install
-
-rm -f "$1/usr/share/X11/xorg.conf.d/10-evdev.conf"
diff --git a/xorg/xorg-server/checksums b/xorg/xorg-server/checksums
deleted file mode 100644
index 4c9ed04d..00000000
--- a/xorg/xorg-server/checksums
+++ /dev/null
@@ -1,3 +0,0 @@
-%BLAKE3
-31a9641a04c6952802987726ba77ad8cf7863d878b725d5538ac9b57094406e5  xorg-server-21.1.6.tar.xz
-c2e28cedb8528795b222d50b3d49bf833f5c56211dc34d830f3aa83665dbba8f  rootless_modesetting.patch
diff --git a/xorg/xorg-server/depends b/xorg/xorg-server/depends
deleted file mode 100644
index 786ec1d2..00000000
--- a/xorg/xorg-server/depends
+++ /dev/null
@@ -1,24 +0,0 @@
-bzip2
-freetype-harfbuzz
-libX11
-libXau
-libXdamage
-libXext
-libXfixes
-libXfont2
-libXxf86vm
-libdrm
-libepoxy
-libfontenc
-libpciaccess
-libressl
-libxcb
-libxcvt make
-libxkbfile
-libxshmfence
-mesa
-meson make
-pixman
-xkeyboard-config
-xtrans make
-zlib
diff --git a/xorg/xorg-server/message b/xorg/xorg-server/message
deleted file mode 100644
index 1fcb5f53..00000000
--- a/xorg/xorg-server/message
+++ /dev/null
@@ -1,9 +0,0 @@
-NOTE: You must be a part of the video group
-      for rootless xorg-server to work.
-
-NOTE: This groups based permissions model may not
-      be suitable if Carbs Linux will be used as a multi
-      user system. Further configuration can be
-      done at your own discretion.
-
--> addgroup USER video
diff --git a/xorg/xorg-server/meta b/xorg/xorg-server/meta
deleted file mode 100644
index 420c6090..00000000
--- a/xorg/xorg-server/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: X11 server
-license: MIT, BSD-3-Clause
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/xorg-server/patches/rootless_modesetting.patch b/xorg/xorg-server/patches/rootless_modesetting.patch
deleted file mode 100644
index d578208d..00000000
--- a/xorg/xorg-server/patches/rootless_modesetting.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- xorg-server-1.20.3/hw/xfree86/drivers/modesetting/driver.c
-+++ xorg-server-1.20.3/hw/xfree86/drivers/modesetting/driver.c
-@@ -1528,6 +1528,10 @@
-     if (ms->fd_passed)
-         return TRUE;
-
-+    ret = drmIsMaster(ms->fd);
-+    if (ret)
-+      return TRUE;
-+
-     ret = drmSetMaster(ms->fd);
-     if (ret)
-         xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "drmSetMaster failed: %s\n",
-
diff --git a/xorg/xorg-server/sources b/xorg/xorg-server/sources
deleted file mode 100644
index 6878f044..00000000
--- a/xorg/xorg-server/sources
+++ /dev/null
@@ -1,2 +0,0 @@
-https://www.x.org/releases/individual/xserver/xorg-server-21.1.6.tar.xz
-patches/rootless_modesetting.patch
diff --git a/xorg/xorg-server/version b/xorg/xorg-server/version
deleted file mode 100644
index f0c493ca..00000000
--- a/xorg/xorg-server/version
+++ /dev/null
@@ -1 +0,0 @@
-21.1.6 1
-- 
cgit v1.2.3


From 0d6820a195d8b4cde26843e3c5abe53c277f17b8 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:30:59 +0100
Subject: libICE: move to extra

---
 extra/libICE/build     | 7 +++++++
 extra/libICE/checksums | 2 ++
 extra/libICE/depends   | 2 ++
 extra/libICE/meta      | 3 +++
 extra/libICE/sources   | 1 +
 extra/libICE/version   | 1 +
 xorg/libICE/build      | 7 -------
 xorg/libICE/checksums  | 2 --
 xorg/libICE/depends    | 2 --
 xorg/libICE/meta       | 3 ---
 xorg/libICE/sources    | 1 -
 xorg/libICE/version    | 1 -
 12 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100755 extra/libICE/build
 create mode 100644 extra/libICE/checksums
 create mode 100644 extra/libICE/depends
 create mode 100644 extra/libICE/meta
 create mode 100644 extra/libICE/sources
 create mode 100644 extra/libICE/version
 delete mode 100755 xorg/libICE/build
 delete mode 100644 xorg/libICE/checksums
 delete mode 100644 xorg/libICE/depends
 delete mode 100644 xorg/libICE/meta
 delete mode 100644 xorg/libICE/sources
 delete mode 100644 xorg/libICE/version

diff --git a/extra/libICE/build b/extra/libICE/build
new file mode 100755
index 00000000..6daf22f8
--- /dev/null
+++ b/extra/libICE/build
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr
+
+make
+make DESTDIR="$1" install
diff --git a/extra/libICE/checksums b/extra/libICE/checksums
new file mode 100644
index 00000000..c74cdc45
--- /dev/null
+++ b/extra/libICE/checksums
@@ -0,0 +1,2 @@
+%BLAKE3
+7b4ac3d3e4b41cce7c6a0e5b2b6f338b0172d2458563cf2b8e8e7a207657ffa7  libICE-1.1.1.tar.xz
diff --git a/extra/libICE/depends b/extra/libICE/depends
new file mode 100644
index 00000000..ebbf4b36
--- /dev/null
+++ b/extra/libICE/depends
@@ -0,0 +1,2 @@
+xorgproto make
+xtrans    make
diff --git a/extra/libICE/meta b/extra/libICE/meta
new file mode 100644
index 00000000..2cf033ad
--- /dev/null
+++ b/extra/libICE/meta
@@ -0,0 +1,3 @@
+description: Intel Client Exchange library for X
+license: MIT
+maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/extra/libICE/sources b/extra/libICE/sources
new file mode 100644
index 00000000..858883b9
--- /dev/null
+++ b/extra/libICE/sources
@@ -0,0 +1 @@
+https://www.x.org/releases/individual/lib/libICE-1.1.1.tar.xz
diff --git a/extra/libICE/version b/extra/libICE/version
new file mode 100644
index 00000000..e343e3f8
--- /dev/null
+++ b/extra/libICE/version
@@ -0,0 +1 @@
+1.1.1 1
diff --git a/xorg/libICE/build b/xorg/libICE/build
deleted file mode 100755
index 6daf22f8..00000000
--- a/xorg/libICE/build
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/libICE/checksums b/xorg/libICE/checksums
deleted file mode 100644
index c74cdc45..00000000
--- a/xorg/libICE/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-7b4ac3d3e4b41cce7c6a0e5b2b6f338b0172d2458563cf2b8e8e7a207657ffa7  libICE-1.1.1.tar.xz
diff --git a/xorg/libICE/depends b/xorg/libICE/depends
deleted file mode 100644
index ebbf4b36..00000000
--- a/xorg/libICE/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-xorgproto make
-xtrans    make
diff --git a/xorg/libICE/meta b/xorg/libICE/meta
deleted file mode 100644
index 2cf033ad..00000000
--- a/xorg/libICE/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: Intel Client Exchange library for X
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/libICE/sources b/xorg/libICE/sources
deleted file mode 100644
index 858883b9..00000000
--- a/xorg/libICE/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/lib/libICE-1.1.1.tar.xz
diff --git a/xorg/libICE/version b/xorg/libICE/version
deleted file mode 100644
index e343e3f8..00000000
--- a/xorg/libICE/version
+++ /dev/null
@@ -1 +0,0 @@
-1.1.1 1
-- 
cgit v1.2.3


From de49825e7c150165b04f363aabf14284486cca97 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:32:25 +0100
Subject: feh: drop from repository

---
 xorg/feh/build     | 13 -------------
 xorg/feh/checksums |  2 --
 xorg/feh/depends   |  6 ------
 xorg/feh/meta      |  3 ---
 xorg/feh/sources   |  1 -
 xorg/feh/version   |  1 -
 6 files changed, 26 deletions(-)
 delete mode 100755 xorg/feh/build
 delete mode 100644 xorg/feh/checksums
 delete mode 100644 xorg/feh/depends
 delete mode 100644 xorg/feh/meta
 delete mode 100644 xorg/feh/sources
 delete mode 100644 xorg/feh/version

diff --git a/xorg/feh/build b/xorg/feh/build
deleted file mode 100755
index 468b0c88..00000000
--- a/xorg/feh/build
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh -e
-
-mk() {
-    make \
-        PREFIX=/usr \
-        exif=1 \
-        help=1 \
-        stat64=1 \
-        "$@"
-}
-
-mk
-mk DESTDIR="$1" install
diff --git a/xorg/feh/checksums b/xorg/feh/checksums
deleted file mode 100644
index 00ee31e3..00000000
--- a/xorg/feh/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-e33c25e3668988dfee48981f16fbae44f7bdde26c63d67f3a7d72dec5dc58334  feh-3.9.1.tar.bz2
diff --git a/xorg/feh/depends b/xorg/feh/depends
deleted file mode 100644
index 88e994aa..00000000
--- a/xorg/feh/depends
+++ /dev/null
@@ -1,6 +0,0 @@
-curl
-imlib2
-libexif
-libjpeg-turbo
-libXt
-libXinerama
diff --git a/xorg/feh/meta b/xorg/feh/meta
deleted file mode 100644
index d29e3792..00000000
--- a/xorg/feh/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: Light-weight, configurable and versatile image viewer
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/feh/sources b/xorg/feh/sources
deleted file mode 100644
index e9875201..00000000
--- a/xorg/feh/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://feh.finalrewind.org/feh-3.9.1.tar.bz2
diff --git a/xorg/feh/version b/xorg/feh/version
deleted file mode 100644
index 0059660b..00000000
--- a/xorg/feh/version
+++ /dev/null
@@ -1 +0,0 @@
-3.9.1 1
-- 
cgit v1.2.3


From 80478c023b28e1a060659b664db0dc85aad71ef0 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:34:57 +0100
Subject: st: drop from repository

---
 xorg/st/build     | 6 ------
 xorg/st/checksums | 2 --
 xorg/st/depends   | 4 ----
 xorg/st/meta      | 3 ---
 xorg/st/sources   | 1 -
 xorg/st/version   | 1 -
 6 files changed, 17 deletions(-)
 delete mode 100755 xorg/st/build
 delete mode 100644 xorg/st/checksums
 delete mode 100644 xorg/st/depends
 delete mode 100644 xorg/st/meta
 delete mode 100644 xorg/st/sources
 delete mode 100644 xorg/st/version

diff --git a/xorg/st/build b/xorg/st/build
deleted file mode 100755
index 343b2ed8..00000000
--- a/xorg/st/build
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh -e
-
-sed 's|Liberation Mono|Monospace|g' config.def.h > config.h
-
-make
-make PREFIX=/usr DESTDIR="$1" install
diff --git a/xorg/st/checksums b/xorg/st/checksums
deleted file mode 100644
index 067bb8b5..00000000
--- a/xorg/st/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-b61834181186c9c7b740b2feb8a0d39c99d6c15b5076a29862fc0bb3c89f27aa  st-0.9.tar.gz
diff --git a/xorg/st/depends b/xorg/st/depends
deleted file mode 100644
index 5e3e4972..00000000
--- a/xorg/st/depends
+++ /dev/null
@@ -1,4 +0,0 @@
-fontconfig
-libX11
-libXft
-ncurses    make
diff --git a/xorg/st/meta b/xorg/st/meta
deleted file mode 100644
index ac5c46e9..00000000
--- a/xorg/st/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: Simple Terminal
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/st/sources b/xorg/st/sources
deleted file mode 100644
index 6e54588f..00000000
--- a/xorg/st/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://dl.suckless.org/st/st-0.9.tar.gz
diff --git a/xorg/st/version b/xorg/st/version
deleted file mode 100644
index 90989118..00000000
--- a/xorg/st/version
+++ /dev/null
@@ -1 +0,0 @@
-0.9 1
-- 
cgit v1.2.3


From 15faac6241b0be7cd680e518bff1593fbe3533bb Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:34:57 +0100
Subject: xbanish: drop from repository

---
 xorg/xbanish/build     | 4 ----
 xorg/xbanish/checksums | 2 --
 xorg/xbanish/depends   | 1 -
 xorg/xbanish/meta      | 3 ---
 xorg/xbanish/sources   | 1 -
 xorg/xbanish/version   | 1 -
 6 files changed, 12 deletions(-)
 delete mode 100755 xorg/xbanish/build
 delete mode 100644 xorg/xbanish/checksums
 delete mode 100644 xorg/xbanish/depends
 delete mode 100644 xorg/xbanish/meta
 delete mode 100644 xorg/xbanish/sources
 delete mode 100644 xorg/xbanish/version

diff --git a/xorg/xbanish/build b/xorg/xbanish/build
deleted file mode 100755
index 7ce5dada..00000000
--- a/xorg/xbanish/build
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh -e
-
-make
-make DESTDIR="$1" PREFIX=/usr MANDIR=/usr/share/man/man1 install
diff --git a/xorg/xbanish/checksums b/xorg/xbanish/checksums
deleted file mode 100644
index 03c1ad45..00000000
--- a/xorg/xbanish/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-05e45806bf467f3077e5cf1985b567a1c6a66b08de94a1ff35ac46646756c6c0  v1.8.tar.gz
diff --git a/xorg/xbanish/depends b/xorg/xbanish/depends
deleted file mode 100644
index 1903bba6..00000000
--- a/xorg/xbanish/depends
+++ /dev/null
@@ -1 +0,0 @@
-libX11
diff --git a/xorg/xbanish/meta b/xorg/xbanish/meta
deleted file mode 100644
index 21c66a3c..00000000
--- a/xorg/xbanish/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: Banish the mouse cursor when typing, show it again when the mouse moves
-license: ISC
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/xbanish/sources b/xorg/xbanish/sources
deleted file mode 100644
index 3e0ba784..00000000
--- a/xorg/xbanish/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/jcs/xbanish/archive/v1.8.tar.gz
diff --git a/xorg/xbanish/version b/xorg/xbanish/version
deleted file mode 100644
index 33fba2c3..00000000
--- a/xorg/xbanish/version
+++ /dev/null
@@ -1 +0,0 @@
-1.8 1
-- 
cgit v1.2.3


From a8df9669a9d08c9e481a5a6a44b39157a4aa61ad Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:34:57 +0100
Subject: sxiv: drop from repository

---
 xorg/sxiv/build     | 3 ---
 xorg/sxiv/checksums | 1 -
 xorg/sxiv/depends   | 3 ---
 xorg/sxiv/meta      | 3 ---
 xorg/sxiv/sources   | 1 -
 xorg/sxiv/version   | 1 -
 6 files changed, 12 deletions(-)
 delete mode 100755 xorg/sxiv/build
 delete mode 100644 xorg/sxiv/checksums
 delete mode 100644 xorg/sxiv/depends
 delete mode 100644 xorg/sxiv/meta
 delete mode 100644 xorg/sxiv/sources
 delete mode 100644 xorg/sxiv/version

diff --git a/xorg/sxiv/build b/xorg/sxiv/build
deleted file mode 100755
index 08374058..00000000
--- a/xorg/sxiv/build
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh -e
-
-make PREFIX=/usr DESTDIR="$1" install
diff --git a/xorg/sxiv/checksums b/xorg/sxiv/checksums
deleted file mode 100644
index 572005a6..00000000
--- a/xorg/sxiv/checksums
+++ /dev/null
@@ -1 +0,0 @@
-a382ad57734243818e828ba161fc0357b48d8f3a7f8c29cac183492b46b58949  v26.tar.gz
diff --git a/xorg/sxiv/depends b/xorg/sxiv/depends
deleted file mode 100644
index 6360225e..00000000
--- a/xorg/sxiv/depends
+++ /dev/null
@@ -1,3 +0,0 @@
-giflib
-imlib2
-libexif
diff --git a/xorg/sxiv/meta b/xorg/sxiv/meta
deleted file mode 100644
index e1f2d598..00000000
--- a/xorg/sxiv/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: Simple X Image Viewer
-license: GPL-2.0-or-later
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/sxiv/sources b/xorg/sxiv/sources
deleted file mode 100644
index 4594ac04..00000000
--- a/xorg/sxiv/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/muennich/sxiv/archive/v26.tar.gz
diff --git a/xorg/sxiv/version b/xorg/sxiv/version
deleted file mode 100644
index 0bfbf8a3..00000000
--- a/xorg/sxiv/version
+++ /dev/null
@@ -1 +0,0 @@
-26 2
-- 
cgit v1.2.3


From 4a62151f8411b43cb52cf680e96ee61f504141f4 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:35:28 +0100
Subject: sowm: drop from repository

---
 xorg/sowm/build     | 4 ----
 xorg/sowm/checksums | 1 -
 xorg/sowm/depends   | 1 -
 xorg/sowm/meta      | 3 ---
 xorg/sowm/sources   | 1 -
 xorg/sowm/version   | 1 -
 6 files changed, 11 deletions(-)
 delete mode 100755 xorg/sowm/build
 delete mode 100644 xorg/sowm/checksums
 delete mode 100644 xorg/sowm/depends
 delete mode 100644 xorg/sowm/meta
 delete mode 100644 xorg/sowm/sources
 delete mode 100644 xorg/sowm/version

diff --git a/xorg/sowm/build b/xorg/sowm/build
deleted file mode 100755
index ba7b2819..00000000
--- a/xorg/sowm/build
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh -e
-
-make CC="${CC:-cc}"
-make DESTDIR="$1" install
diff --git a/xorg/sowm/checksums b/xorg/sowm/checksums
deleted file mode 100644
index 03a1d107..00000000
--- a/xorg/sowm/checksums
+++ /dev/null
@@ -1 +0,0 @@
-7e1d1391f8cf8d1b04458d0b4bb3b61684b535dddcc1dd7d37266e81efd57e02  1.6.tar.gz
diff --git a/xorg/sowm/depends b/xorg/sowm/depends
deleted file mode 100644
index 1903bba6..00000000
--- a/xorg/sowm/depends
+++ /dev/null
@@ -1 +0,0 @@
-libX11
diff --git a/xorg/sowm/meta b/xorg/sowm/meta
deleted file mode 100644
index 259cff70..00000000
--- a/xorg/sowm/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: Tiny floating window manager
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/sowm/sources b/xorg/sowm/sources
deleted file mode 100644
index 052b0b80..00000000
--- a/xorg/sowm/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/dylanaraps/sowm/archive/1.6.tar.gz
diff --git a/xorg/sowm/version b/xorg/sowm/version
deleted file mode 100644
index d1ad7a00..00000000
--- a/xorg/sowm/version
+++ /dev/null
@@ -1 +0,0 @@
-1.6 1
-- 
cgit v1.2.3


From 64aed67ecc2b32f527544b9d655834d2a20ad768 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:35:28 +0100
Subject: xauth: drop from repository

---
 xorg/xauth/build     | 9 ---------
 xorg/xauth/checksums | 2 --
 xorg/xauth/depends   | 2 --
 xorg/xauth/meta      | 3 ---
 xorg/xauth/sources   | 1 -
 xorg/xauth/version   | 1 -
 6 files changed, 18 deletions(-)
 delete mode 100755 xorg/xauth/build
 delete mode 100644 xorg/xauth/checksums
 delete mode 100644 xorg/xauth/depends
 delete mode 100644 xorg/xauth/meta
 delete mode 100644 xorg/xauth/sources
 delete mode 100644 xorg/xauth/version

diff --git a/xorg/xauth/build b/xorg/xauth/build
deleted file mode 100755
index 373bceed..00000000
--- a/xorg/xauth/build
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr \
-    --mandir=/usr/share/man \
-    --localstatedir=/var
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/xauth/checksums b/xorg/xauth/checksums
deleted file mode 100644
index ad9213fd..00000000
--- a/xorg/xauth/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-6b4c7704e1fa898e1abebfb31fda72b4c61ee5d7fbe9e65884042a7b28e7da37  xauth-1.1.2.tar.xz
diff --git a/xorg/xauth/depends b/xorg/xauth/depends
deleted file mode 100644
index 16c5c7f9..00000000
--- a/xorg/xauth/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-libXmu
-xorg-util-macros make
diff --git a/xorg/xauth/meta b/xorg/xauth/meta
deleted file mode 100644
index bd4f7890..00000000
--- a/xorg/xauth/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: X authentication utility
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/xauth/sources b/xorg/xauth/sources
deleted file mode 100644
index 36b635f3..00000000
--- a/xorg/xauth/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://x.org/releases/individual/app/xauth-1.1.2.tar.xz
diff --git a/xorg/xauth/version b/xorg/xauth/version
deleted file mode 100644
index 909c7076..00000000
--- a/xorg/xauth/version
+++ /dev/null
@@ -1 +0,0 @@
-1.1.2 1
-- 
cgit v1.2.3


From 0b1d76a70c50ca7ae6310416962aabc70a5400c2 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:35:28 +0100
Subject: xcape: drop from repository

---
 xorg/xcape/build     | 4 ----
 xorg/xcape/checksums | 1 -
 xorg/xcape/depends   | 2 --
 xorg/xcape/meta      | 3 ---
 xorg/xcape/sources   | 1 -
 xorg/xcape/version   | 1 -
 6 files changed, 12 deletions(-)
 delete mode 100755 xorg/xcape/build
 delete mode 100644 xorg/xcape/checksums
 delete mode 100644 xorg/xcape/depends
 delete mode 100644 xorg/xcape/meta
 delete mode 100644 xorg/xcape/sources
 delete mode 100644 xorg/xcape/version

diff --git a/xorg/xcape/build b/xorg/xcape/build
deleted file mode 100755
index 0e6af0f2..00000000
--- a/xorg/xcape/build
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh -e
-
-make
-make MANDIR=/share/man/man1 DESTDIR="$1" install
diff --git a/xorg/xcape/checksums b/xorg/xcape/checksums
deleted file mode 100644
index 937b7db2..00000000
--- a/xorg/xcape/checksums
+++ /dev/null
@@ -1 +0,0 @@
-a27ed884fd94f03058af65a39edfe3af3f2f8fbb76ba9920002a76be07fb2821  v1.2.tar.gz
diff --git a/xorg/xcape/depends b/xorg/xcape/depends
deleted file mode 100644
index 7b44152d..00000000
--- a/xorg/xcape/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-libXtst
-libXi
diff --git a/xorg/xcape/meta b/xorg/xcape/meta
deleted file mode 100644
index 71a2a8e0..00000000
--- a/xorg/xcape/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: Configure modifier keys to act as other keys when pressed and released
-license: GPL-3.0-or-later
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/xcape/sources b/xorg/xcape/sources
deleted file mode 100644
index 688a2ab5..00000000
--- a/xorg/xcape/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/alols/xcape/archive/v1.2.tar.gz
diff --git a/xorg/xcape/version b/xorg/xcape/version
deleted file mode 100644
index f76d8346..00000000
--- a/xorg/xcape/version
+++ /dev/null
@@ -1 +0,0 @@
-1.2 1
-- 
cgit v1.2.3


From 7294fac99eecbf5ba9fabd6f65bde04de51255f3 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:37:47 +0100
Subject: xclip: drop from repository

---
 xorg/xclip/build     | 7 -------
 xorg/xclip/checksums | 1 -
 xorg/xclip/depends   | 3 ---
 xorg/xclip/meta      | 3 ---
 xorg/xclip/sources   | 1 -
 xorg/xclip/version   | 1 -
 6 files changed, 16 deletions(-)
 delete mode 100755 xorg/xclip/build
 delete mode 100644 xorg/xclip/checksums
 delete mode 100644 xorg/xclip/depends
 delete mode 100644 xorg/xclip/meta
 delete mode 100644 xorg/xclip/sources
 delete mode 100644 xorg/xclip/version

diff --git a/xorg/xclip/build b/xorg/xclip/build
deleted file mode 100755
index 6daf22f8..00000000
--- a/xorg/xclip/build
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/xclip/checksums b/xorg/xclip/checksums
deleted file mode 100644
index 289e9c6c..00000000
--- a/xorg/xclip/checksums
+++ /dev/null
@@ -1 +0,0 @@
-3c3419f936b6973adc13ba2e83cfbf82e3351c690f2d8ee52a0ca0c80219139e  xclip-0.13.tar.gz
diff --git a/xorg/xclip/depends b/xorg/xclip/depends
deleted file mode 100644
index 8fceb325..00000000
--- a/xorg/xclip/depends
+++ /dev/null
@@ -1,3 +0,0 @@
-libX11
-libXt
-libXmu
diff --git a/xorg/xclip/meta b/xorg/xclip/meta
deleted file mode 100644
index 8e870e6e..00000000
--- a/xorg/xclip/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: Command line interface to the X11 clipboard
-license: GPL-2.0-or-later
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/xclip/sources b/xorg/xclip/sources
deleted file mode 100644
index f242192a..00000000
--- a/xorg/xclip/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/cemkeylan/xclip/releases/download/0.13/xclip-0.13.tar.gz
diff --git a/xorg/xclip/version b/xorg/xclip/version
deleted file mode 100644
index 2b240897..00000000
--- a/xorg/xclip/version
+++ /dev/null
@@ -1 +0,0 @@
-0.13 1
-- 
cgit v1.2.3


From f833e3253a08439b8bb1c34f215db54683f4740f Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:38:50 +0100
Subject: xrdb: drop from repository

---
 xorg/xrdb/build     | 9 ---------
 xorg/xrdb/checksums | 1 -
 xorg/xrdb/depends   | 3 ---
 xorg/xrdb/meta      | 3 ---
 xorg/xrdb/sources   | 1 -
 xorg/xrdb/version   | 1 -
 6 files changed, 18 deletions(-)
 delete mode 100755 xorg/xrdb/build
 delete mode 100644 xorg/xrdb/checksums
 delete mode 100644 xorg/xrdb/depends
 delete mode 100644 xorg/xrdb/meta
 delete mode 100644 xorg/xrdb/sources
 delete mode 100644 xorg/xrdb/version

diff --git a/xorg/xrdb/build b/xorg/xrdb/build
deleted file mode 100755
index 373bceed..00000000
--- a/xorg/xrdb/build
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr \
-    --mandir=/usr/share/man \
-    --localstatedir=/var
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/xrdb/checksums b/xorg/xrdb/checksums
deleted file mode 100644
index 761c961e..00000000
--- a/xorg/xrdb/checksums
+++ /dev/null
@@ -1 +0,0 @@
-4f5d031c214ffb88a42ae7528492abde1178f5146351ceb3c05f3b8d5abee8b4  xrdb-1.2.1.tar.bz2
diff --git a/xorg/xrdb/depends b/xorg/xrdb/depends
deleted file mode 100644
index ea62ae5b..00000000
--- a/xorg/xrdb/depends
+++ /dev/null
@@ -1,3 +0,0 @@
-libX11
-libXmu
-xorg-util-macros make
diff --git a/xorg/xrdb/meta b/xorg/xrdb/meta
deleted file mode 100644
index 1b8d77f7..00000000
--- a/xorg/xrdb/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: X resources database program
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/xrdb/sources b/xorg/xrdb/sources
deleted file mode 100644
index d912f764..00000000
--- a/xorg/xrdb/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/app/xrdb-1.2.1.tar.bz2
diff --git a/xorg/xrdb/version b/xorg/xrdb/version
deleted file mode 100644
index cd3d02bc..00000000
--- a/xorg/xrdb/version
+++ /dev/null
@@ -1 +0,0 @@
-1.2.1 1
-- 
cgit v1.2.3


From 8abcf060061b20e6a20549fced3962de580bf07f Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:38:50 +0100
Subject: xset: drop from repository

---
 xorg/xset/build     | 10 ----------
 xorg/xset/checksums |  2 --
 xorg/xset/depends   |  2 --
 xorg/xset/meta      |  3 ---
 xorg/xset/sources   |  1 -
 xorg/xset/version   |  1 -
 6 files changed, 19 deletions(-)
 delete mode 100755 xorg/xset/build
 delete mode 100644 xorg/xset/checksums
 delete mode 100644 xorg/xset/depends
 delete mode 100644 xorg/xset/meta
 delete mode 100644 xorg/xset/sources
 delete mode 100644 xorg/xset/version

diff --git a/xorg/xset/build b/xorg/xset/build
deleted file mode 100755
index 80ce93e8..00000000
--- a/xorg/xset/build
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --mandir=/usr/share/man \
-    --localstatedir=/var
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/xset/checksums b/xorg/xset/checksums
deleted file mode 100644
index 47755fca..00000000
--- a/xorg/xset/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-18f8a870e8c1f0dbdb1d66173da0a6d08bea283fade48d19b2d27abc4d1304d6  xset-1.2.5.tar.xz
diff --git a/xorg/xset/depends b/xorg/xset/depends
deleted file mode 100644
index 16c5c7f9..00000000
--- a/xorg/xset/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-libXmu
-xorg-util-macros make
diff --git a/xorg/xset/meta b/xorg/xset/meta
deleted file mode 100644
index 66432c3c..00000000
--- a/xorg/xset/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: X11 settings utility
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/xset/sources b/xorg/xset/sources
deleted file mode 100644
index 4faa16b3..00000000
--- a/xorg/xset/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://x.org/releases/individual/app/xset-1.2.5.tar.xz
diff --git a/xorg/xset/version b/xorg/xset/version
deleted file mode 100644
index be660e42..00000000
--- a/xorg/xset/version
+++ /dev/null
@@ -1 +0,0 @@
-1.2.5 1
-- 
cgit v1.2.3


From 8387575a68b9bd1d4b6edacdc15f3187c777afa3 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:38:50 +0100
Subject: xsetroot: drop from repository

---
 xorg/xsetroot/build     | 9 ---------
 xorg/xsetroot/checksums | 2 --
 xorg/xsetroot/depends   | 5 -----
 xorg/xsetroot/meta      | 3 ---
 xorg/xsetroot/sources   | 1 -
 xorg/xsetroot/version   | 1 -
 6 files changed, 21 deletions(-)
 delete mode 100755 xorg/xsetroot/build
 delete mode 100644 xorg/xsetroot/checksums
 delete mode 100644 xorg/xsetroot/depends
 delete mode 100644 xorg/xsetroot/meta
 delete mode 100644 xorg/xsetroot/sources
 delete mode 100644 xorg/xsetroot/version

diff --git a/xorg/xsetroot/build b/xorg/xsetroot/build
deleted file mode 100755
index 373bceed..00000000
--- a/xorg/xsetroot/build
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr \
-    --mandir=/usr/share/man \
-    --localstatedir=/var
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/xsetroot/checksums b/xorg/xsetroot/checksums
deleted file mode 100644
index e3c776c8..00000000
--- a/xorg/xsetroot/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-e888590bd65462ad3c987262ae008bd9d66274d35572a0a8712d16c8d2541830  xsetroot-1.1.3.tar.gz
diff --git a/xorg/xsetroot/depends b/xorg/xsetroot/depends
deleted file mode 100644
index 9640b489..00000000
--- a/xorg/xsetroot/depends
+++ /dev/null
@@ -1,5 +0,0 @@
-libXmu
-libXrender
-libXfixes
-libXcursor
-xbitmaps
diff --git a/xorg/xsetroot/meta b/xorg/xsetroot/meta
deleted file mode 100644
index 1bcbf15c..00000000
--- a/xorg/xsetroot/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: X root window parameter setting program
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/xsetroot/sources b/xorg/xsetroot/sources
deleted file mode 100644
index eafc05ac..00000000
--- a/xorg/xsetroot/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/archive//individual/app/xsetroot-1.1.3.tar.gz
diff --git a/xorg/xsetroot/version b/xorg/xsetroot/version
deleted file mode 100644
index 035474a2..00000000
--- a/xorg/xsetroot/version
+++ /dev/null
@@ -1 +0,0 @@
-1.1.3 1
-- 
cgit v1.2.3


From 5a3884da2c987a8f328a0faa9d77fee31fb0fc80 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:39:05 +0100
Subject: xtrans: move to extra

---
 extra/xtrans/build     | 7 +++++++
 extra/xtrans/checksums | 1 +
 extra/xtrans/meta      | 3 +++
 extra/xtrans/sources   | 1 +
 extra/xtrans/version   | 1 +
 xorg/xtrans/build      | 7 -------
 xorg/xtrans/checksums  | 1 -
 xorg/xtrans/meta       | 3 ---
 xorg/xtrans/sources    | 1 -
 xorg/xtrans/version    | 1 -
 10 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100755 extra/xtrans/build
 create mode 100644 extra/xtrans/checksums
 create mode 100644 extra/xtrans/meta
 create mode 100644 extra/xtrans/sources
 create mode 100644 extra/xtrans/version
 delete mode 100755 xorg/xtrans/build
 delete mode 100644 xorg/xtrans/checksums
 delete mode 100644 xorg/xtrans/meta
 delete mode 100644 xorg/xtrans/sources
 delete mode 100644 xorg/xtrans/version

diff --git a/extra/xtrans/build b/extra/xtrans/build
new file mode 100755
index 00000000..6daf22f8
--- /dev/null
+++ b/extra/xtrans/build
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr
+
+make
+make DESTDIR="$1" install
diff --git a/extra/xtrans/checksums b/extra/xtrans/checksums
new file mode 100644
index 00000000..7d58cadb
--- /dev/null
+++ b/extra/xtrans/checksums
@@ -0,0 +1 @@
+377c4491593c417946efcd2c7600d1e62639f7a8bbca391887e2c4679807d773  xtrans-1.4.0.tar.bz2
diff --git a/extra/xtrans/meta b/extra/xtrans/meta
new file mode 100644
index 00000000..df85b143
--- /dev/null
+++ b/extra/xtrans/meta
@@ -0,0 +1,3 @@
+description: Network API translation layer for X
+license: MIT
+maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/extra/xtrans/sources b/extra/xtrans/sources
new file mode 100644
index 00000000..8bba05b4
--- /dev/null
+++ b/extra/xtrans/sources
@@ -0,0 +1 @@
+https://www.x.org/releases/individual/lib/xtrans-1.4.0.tar.bz2
diff --git a/extra/xtrans/version b/extra/xtrans/version
new file mode 100644
index 00000000..7f14d8f6
--- /dev/null
+++ b/extra/xtrans/version
@@ -0,0 +1 @@
+1.4.0 2
diff --git a/xorg/xtrans/build b/xorg/xtrans/build
deleted file mode 100755
index 6daf22f8..00000000
--- a/xorg/xtrans/build
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/xtrans/checksums b/xorg/xtrans/checksums
deleted file mode 100644
index 7d58cadb..00000000
--- a/xorg/xtrans/checksums
+++ /dev/null
@@ -1 +0,0 @@
-377c4491593c417946efcd2c7600d1e62639f7a8bbca391887e2c4679807d773  xtrans-1.4.0.tar.bz2
diff --git a/xorg/xtrans/meta b/xorg/xtrans/meta
deleted file mode 100644
index df85b143..00000000
--- a/xorg/xtrans/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: Network API translation layer for X
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/xtrans/sources b/xorg/xtrans/sources
deleted file mode 100644
index 8bba05b4..00000000
--- a/xorg/xtrans/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/lib/xtrans-1.4.0.tar.bz2
diff --git a/xorg/xtrans/version b/xorg/xtrans/version
deleted file mode 100644
index 7f14d8f6..00000000
--- a/xorg/xtrans/version
+++ /dev/null
@@ -1 +0,0 @@
-1.4.0 2
-- 
cgit v1.2.3


From 0bf411e5e11a53d7a96b8d8bd9c2fb04cba0c804 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:39:34 +0100
Subject: xinit: drop from repository

---
 xorg/xinit/build     | 11 -----------
 xorg/xinit/checksums |  2 --
 xorg/xinit/depends   |  1 -
 xorg/xinit/meta      |  3 ---
 xorg/xinit/sources   |  1 -
 xorg/xinit/version   |  1 -
 6 files changed, 19 deletions(-)
 delete mode 100755 xorg/xinit/build
 delete mode 100644 xorg/xinit/checksums
 delete mode 100644 xorg/xinit/depends
 delete mode 100644 xorg/xinit/meta
 delete mode 100644 xorg/xinit/sources
 delete mode 100644 xorg/xinit/version

diff --git a/xorg/xinit/build b/xorg/xinit/build
deleted file mode 100755
index f374273f..00000000
--- a/xorg/xinit/build
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr \
-    --with-xinitdir=/etc/X11/xinit
-
-make
-make DESTDIR="$1" install
-
-sed 's/enable_xauth=1/enable_xauth=0/' "$1/usr/bin/startx" >_
-cat _ > "$1/usr/bin/startx"
diff --git a/xorg/xinit/checksums b/xorg/xinit/checksums
deleted file mode 100644
index 57da4f77..00000000
--- a/xorg/xinit/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-b0812aefd6ea23067d8284163aa650e4324d52782c2b2de75d2de3153913fe1b  xinit-1.4.2.tar.xz
diff --git a/xorg/xinit/depends b/xorg/xinit/depends
deleted file mode 100644
index 54034cdd..00000000
--- a/xorg/xinit/depends
+++ /dev/null
@@ -1 +0,0 @@
-libX11 make
diff --git a/xorg/xinit/meta b/xorg/xinit/meta
deleted file mode 100644
index d23c0f39..00000000
--- a/xorg/xinit/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: Program to startup X server
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/xinit/sources b/xorg/xinit/sources
deleted file mode 100644
index da1cf18e..00000000
--- a/xorg/xinit/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/app/xinit-1.4.2.tar.xz
diff --git a/xorg/xinit/version b/xorg/xinit/version
deleted file mode 100644
index 4ff136af..00000000
--- a/xorg/xinit/version
+++ /dev/null
@@ -1 +0,0 @@
-1.4.2 1
-- 
cgit v1.2.3


From a5e6995cceeedb74139ca64488282293991b7124 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:39:39 +0100
Subject: xinput: drop from repository

---
 xorg/xinput/build     | 9 ---------
 xorg/xinput/checksums | 1 -
 xorg/xinput/depends   | 3 ---
 xorg/xinput/meta      | 3 ---
 xorg/xinput/sources   | 1 -
 xorg/xinput/version   | 1 -
 6 files changed, 18 deletions(-)
 delete mode 100755 xorg/xinput/build
 delete mode 100644 xorg/xinput/checksums
 delete mode 100644 xorg/xinput/depends
 delete mode 100644 xorg/xinput/meta
 delete mode 100644 xorg/xinput/sources
 delete mode 100644 xorg/xinput/version

diff --git a/xorg/xinput/build b/xorg/xinput/build
deleted file mode 100755
index 373bceed..00000000
--- a/xorg/xinput/build
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr \
-    --mandir=/usr/share/man \
-    --localstatedir=/var
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/xinput/checksums b/xorg/xinput/checksums
deleted file mode 100644
index ffc3d73f..00000000
--- a/xorg/xinput/checksums
+++ /dev/null
@@ -1 +0,0 @@
-9f29f9bfe387c5a3d582f9edc8c5a753510ecc6fdfb154c03b5cea5975b10ce4  xinput-1.6.3.tar.gz
diff --git a/xorg/xinput/depends b/xorg/xinput/depends
deleted file mode 100644
index c022859f..00000000
--- a/xorg/xinput/depends
+++ /dev/null
@@ -1,3 +0,0 @@
-libX11
-libXmu
-libXi
diff --git a/xorg/xinput/meta b/xorg/xinput/meta
deleted file mode 100644
index 350d93e8..00000000
--- a/xorg/xinput/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: Utility to configure X input devices
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/xinput/sources b/xorg/xinput/sources
deleted file mode 100644
index 5cafdf91..00000000
--- a/xorg/xinput/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/app/xinput-1.6.3.tar.gz
diff --git a/xorg/xinput/version b/xorg/xinput/version
deleted file mode 100644
index 05465e05..00000000
--- a/xorg/xinput/version
+++ /dev/null
@@ -1 +0,0 @@
-1.6.3 1
-- 
cgit v1.2.3


From a5ae77f45fc983e01e0953bffc702a80aecc94aa Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:41:01 +0100
Subject: libXScrnSaver: drop from repository

---
 xorg/libXScrnSaver/build     | 8 --------
 xorg/libXScrnSaver/checksums | 2 --
 xorg/libXScrnSaver/depends   | 3 ---
 xorg/libXScrnSaver/meta      | 3 ---
 xorg/libXScrnSaver/sources   | 1 -
 xorg/libXScrnSaver/version   | 1 -
 6 files changed, 18 deletions(-)
 delete mode 100755 xorg/libXScrnSaver/build
 delete mode 100644 xorg/libXScrnSaver/checksums
 delete mode 100644 xorg/libXScrnSaver/depends
 delete mode 100644 xorg/libXScrnSaver/meta
 delete mode 100644 xorg/libXScrnSaver/sources
 delete mode 100644 xorg/libXScrnSaver/version

diff --git a/xorg/libXScrnSaver/build b/xorg/libXScrnSaver/build
deleted file mode 100755
index 105ed0c2..00000000
--- a/xorg/libXScrnSaver/build
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr \
-    --enable-malloc0returnsnull
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/libXScrnSaver/checksums b/xorg/libXScrnSaver/checksums
deleted file mode 100644
index aa515cd3..00000000
--- a/xorg/libXScrnSaver/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-35ea09d2ebb75aa8f0c0094fbb3e31dbe2026b4c62c9a7953ce0d5fe5db5feca  libXScrnSaver-1.2.4.tar.xz
diff --git a/xorg/libXScrnSaver/depends b/xorg/libXScrnSaver/depends
deleted file mode 100644
index 320e15fd..00000000
--- a/xorg/libXScrnSaver/depends
+++ /dev/null
@@ -1,3 +0,0 @@
-libX11    make
-libXext   make
-xorgproto make
diff --git a/xorg/libXScrnSaver/meta b/xorg/libXScrnSaver/meta
deleted file mode 100644
index 4c8a5bf9..00000000
--- a/xorg/libXScrnSaver/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: X11 Screen Saver Library
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/libXScrnSaver/sources b/xorg/libXScrnSaver/sources
deleted file mode 100644
index ff1aba7c..00000000
--- a/xorg/libXScrnSaver/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/lib/libXScrnSaver-1.2.4.tar.xz
diff --git a/xorg/libXScrnSaver/version b/xorg/libXScrnSaver/version
deleted file mode 100644
index d66671c6..00000000
--- a/xorg/libXScrnSaver/version
+++ /dev/null
@@ -1 +0,0 @@
-1.2.4 1
-- 
cgit v1.2.3


From fbe67346c5df12ef1b7b6482e0f718803ee44c41 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:41:59 +0100
Subject: libXaw: drop from repository

---
 xorg/libXaw/build     | 8 --------
 xorg/libXaw/checksums | 1 -
 xorg/libXaw/depends   | 4 ----
 xorg/libXaw/meta      | 3 ---
 xorg/libXaw/sources   | 1 -
 xorg/libXaw/version   | 1 -
 6 files changed, 18 deletions(-)
 delete mode 100755 xorg/libXaw/build
 delete mode 100644 xorg/libXaw/checksums
 delete mode 100644 xorg/libXaw/depends
 delete mode 100644 xorg/libXaw/meta
 delete mode 100644 xorg/libXaw/sources
 delete mode 100644 xorg/libXaw/version

diff --git a/xorg/libXaw/build b/xorg/libXaw/build
deleted file mode 100755
index 60c90749..00000000
--- a/xorg/libXaw/build
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr \
-    --without-xmlto
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/libXaw/checksums b/xorg/libXaw/checksums
deleted file mode 100644
index 79d7b08a..00000000
--- a/xorg/libXaw/checksums
+++ /dev/null
@@ -1 +0,0 @@
-76aef98ea3df92615faec28004b5ce4e5c6855e716fa16de40c32030722a6f8e  libXaw-1.0.14.tar.bz2
diff --git a/xorg/libXaw/depends b/xorg/libXaw/depends
deleted file mode 100644
index 06f0c5b9..00000000
--- a/xorg/libXaw/depends
+++ /dev/null
@@ -1,4 +0,0 @@
-libXext
-libXmu
-libXpm
-libXt
diff --git a/xorg/libXaw/meta b/xorg/libXaw/meta
deleted file mode 100644
index e5188872..00000000
--- a/xorg/libXaw/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: X Athena Widgets Library
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/libXaw/sources b/xorg/libXaw/sources
deleted file mode 100644
index 6b8ee47f..00000000
--- a/xorg/libXaw/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/lib/libXaw-1.0.14.tar.bz2
diff --git a/xorg/libXaw/version b/xorg/libXaw/version
deleted file mode 100644
index 0954fc97..00000000
--- a/xorg/libXaw/version
+++ /dev/null
@@ -1 +0,0 @@
-1.0.14 1
-- 
cgit v1.2.3


From 238d3abd17ee168766ce991b718c6b9dc55411a9 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:42:34 +0100
Subject: libXpm: drop from repository

---
 xorg/libXpm/build     | 13 -------------
 xorg/libXpm/checksums |  2 --
 xorg/libXpm/depends   |  3 ---
 xorg/libXpm/meta      |  3 ---
 xorg/libXpm/sources   |  1 -
 xorg/libXpm/version   |  1 -
 6 files changed, 23 deletions(-)
 delete mode 100755 xorg/libXpm/build
 delete mode 100644 xorg/libXpm/checksums
 delete mode 100644 xorg/libXpm/depends
 delete mode 100644 xorg/libXpm/meta
 delete mode 100644 xorg/libXpm/sources
 delete mode 100644 xorg/libXpm/version

diff --git a/xorg/libXpm/build b/xorg/libXpm/build
deleted file mode 100755
index c5c4cbd1..00000000
--- a/xorg/libXpm/build
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh -e
-
-# Patch out gettext dependency
-for dir in sxpm cxpm; do
-    sed 's/xgettext/true/g' "$dir/Makefile.in" > "$dir/m.bak"
-    mv "$dir/m.bak" "$dir/Makefile.in"
-done
-
-./configure \
-    --prefix=/usr
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/libXpm/checksums b/xorg/libXpm/checksums
deleted file mode 100644
index a0af2cf1..00000000
--- a/xorg/libXpm/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-6c1ecd9e79a3d2e3ed4512461912feea271225a7b4b6c216ed257d28f982f06f  libXpm-3.5.14.tar.xz
diff --git a/xorg/libXpm/depends b/xorg/libXpm/depends
deleted file mode 100644
index c0a123cc..00000000
--- a/xorg/libXpm/depends
+++ /dev/null
@@ -1,3 +0,0 @@
-libX11
-libXext
-libXt
diff --git a/xorg/libXpm/meta b/xorg/libXpm/meta
deleted file mode 100644
index 0b14c20f..00000000
--- a/xorg/libXpm/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: X PixMap library
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/libXpm/sources b/xorg/libXpm/sources
deleted file mode 100644
index 496d8926..00000000
--- a/xorg/libXpm/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/lib/libXpm-3.5.14.tar.xz
diff --git a/xorg/libXpm/version b/xorg/libXpm/version
deleted file mode 100644
index c32e5ed9..00000000
--- a/xorg/libXpm/version
+++ /dev/null
@@ -1 +0,0 @@
-3.5.14 1
-- 
cgit v1.2.3


From 21bdbe0c9689c20028c9bd238239f73874fb2786 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:44:17 +0100
Subject: xdpyinfo: drop from repository

---
 xorg/xdpyinfo/build     | 7 -------
 xorg/xdpyinfo/checksums | 2 --
 xorg/xdpyinfo/depends   | 6 ------
 xorg/xdpyinfo/meta      | 3 ---
 xorg/xdpyinfo/sources   | 1 -
 xorg/xdpyinfo/version   | 1 -
 6 files changed, 20 deletions(-)
 delete mode 100755 xorg/xdpyinfo/build
 delete mode 100644 xorg/xdpyinfo/checksums
 delete mode 100644 xorg/xdpyinfo/depends
 delete mode 100644 xorg/xdpyinfo/meta
 delete mode 100644 xorg/xdpyinfo/sources
 delete mode 100644 xorg/xdpyinfo/version

diff --git a/xorg/xdpyinfo/build b/xorg/xdpyinfo/build
deleted file mode 100755
index 6daf22f8..00000000
--- a/xorg/xdpyinfo/build
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/xdpyinfo/checksums b/xorg/xdpyinfo/checksums
deleted file mode 100644
index cab495f7..00000000
--- a/xorg/xdpyinfo/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-7d00ecd175a1dca15eb626516eb3497f8bd653b81bb1afadaf0d8d467aecfd0f  xdpyinfo-1.3.3.tar.xz
diff --git a/xorg/xdpyinfo/depends b/xorg/xdpyinfo/depends
deleted file mode 100644
index 59c493ea..00000000
--- a/xorg/xdpyinfo/depends
+++ /dev/null
@@ -1,6 +0,0 @@
-libXcomposite
-libXext
-libXinerama
-libXrender
-libXtst
-libXxf86vm
diff --git a/xorg/xdpyinfo/meta b/xorg/xdpyinfo/meta
deleted file mode 100644
index d8886e70..00000000
--- a/xorg/xdpyinfo/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: Display information utility for X
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/xdpyinfo/sources b/xorg/xdpyinfo/sources
deleted file mode 100644
index c2f05fd6..00000000
--- a/xorg/xdpyinfo/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://xorg.freedesktop.org/releases/individual/app/xdpyinfo-1.3.3.tar.xz
diff --git a/xorg/xdpyinfo/version b/xorg/xdpyinfo/version
deleted file mode 100644
index bdd8f5bd..00000000
--- a/xorg/xdpyinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-1.3.3 1
-- 
cgit v1.2.3


From f512d266d51c61c8cd8e4ca1947cc7ba454a1688 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:44:31 +0100
Subject: libXtst: drop from repository

---
 xorg/libXtst/build     | 8 --------
 xorg/libXtst/checksums | 2 --
 xorg/libXtst/depends   | 3 ---
 xorg/libXtst/meta      | 3 ---
 xorg/libXtst/sources   | 1 -
 xorg/libXtst/version   | 1 -
 6 files changed, 18 deletions(-)
 delete mode 100755 xorg/libXtst/build
 delete mode 100644 xorg/libXtst/checksums
 delete mode 100644 xorg/libXtst/depends
 delete mode 100644 xorg/libXtst/meta
 delete mode 100644 xorg/libXtst/sources
 delete mode 100644 xorg/libXtst/version

diff --git a/xorg/libXtst/build b/xorg/libXtst/build
deleted file mode 100755
index ffd10172..00000000
--- a/xorg/libXtst/build
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-	--prefix=/usr \
-	--enable-static
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/libXtst/checksums b/xorg/libXtst/checksums
deleted file mode 100644
index df6f1be0..00000000
--- a/xorg/libXtst/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-997c601f69fc33fa2e90c49610a75c5ac062acef278b0b3e63b4759d1f11fd78  libXtst-1.2.4.tar.xz
diff --git a/xorg/libXtst/depends b/xorg/libXtst/depends
deleted file mode 100644
index b12927a3..00000000
--- a/xorg/libXtst/depends
+++ /dev/null
@@ -1,3 +0,0 @@
-libXi
-libXext
-xorgproto
diff --git a/xorg/libXtst/meta b/xorg/libXtst/meta
deleted file mode 100644
index 6fc46768..00000000
--- a/xorg/libXtst/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: X Tst library
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/libXtst/sources b/xorg/libXtst/sources
deleted file mode 100644
index 3a0a6f92..00000000
--- a/xorg/libXtst/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/lib/libXtst-1.2.4.tar.xz
diff --git a/xorg/libXtst/version b/xorg/libXtst/version
deleted file mode 100644
index d66671c6..00000000
--- a/xorg/libXtst/version
+++ /dev/null
@@ -1 +0,0 @@
-1.2.4 1
-- 
cgit v1.2.3


From 9a92843088cef87ea9b843c4d1d6a982b98deab4 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:45:19 +0100
Subject: xrandr: drop from repository

---
 xorg/xrandr/build     | 9 ---------
 xorg/xrandr/checksums | 2 --
 xorg/xrandr/depends   | 2 --
 xorg/xrandr/meta      | 3 ---
 xorg/xrandr/sources   | 1 -
 xorg/xrandr/version   | 1 -
 6 files changed, 18 deletions(-)
 delete mode 100755 xorg/xrandr/build
 delete mode 100644 xorg/xrandr/checksums
 delete mode 100644 xorg/xrandr/depends
 delete mode 100644 xorg/xrandr/meta
 delete mode 100644 xorg/xrandr/sources
 delete mode 100644 xorg/xrandr/version

diff --git a/xorg/xrandr/build b/xorg/xrandr/build
deleted file mode 100755
index 373bceed..00000000
--- a/xorg/xrandr/build
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr \
-    --mandir=/usr/share/man \
-    --localstatedir=/var
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/xrandr/checksums b/xorg/xrandr/checksums
deleted file mode 100644
index e46511a0..00000000
--- a/xorg/xrandr/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-a374a1c18aad22d1a2bf6236f58e6db48aee76ac09aaa1140b66b41adf998319  xrandr-1.5.2.tar.xz
diff --git a/xorg/xrandr/depends b/xorg/xrandr/depends
deleted file mode 100644
index 6a84a73f..00000000
--- a/xorg/xrandr/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-libXrandr
-xorg-util-macros make
diff --git a/xorg/xrandr/meta b/xorg/xrandr/meta
deleted file mode 100644
index 1247242b..00000000
--- a/xorg/xrandr/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: RandR command line utility
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/xrandr/sources b/xorg/xrandr/sources
deleted file mode 100644
index aed2949d..00000000
--- a/xorg/xrandr/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/app/xrandr-1.5.2.tar.xz
diff --git a/xorg/xrandr/version b/xorg/xrandr/version
deleted file mode 100644
index 5b702ae2..00000000
--- a/xorg/xrandr/version
+++ /dev/null
@@ -1 +0,0 @@
-1.5.2 1
-- 
cgit v1.2.3


From 5d8740e6aa89987fb622476190afa776094d55cf Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:45:56 +0100
Subject: xprop: drop from repository

---
 xorg/xprop/build     | 9 ---------
 xorg/xprop/checksums | 2 --
 xorg/xprop/depends   | 2 --
 xorg/xprop/meta      | 3 ---
 xorg/xprop/sources   | 1 -
 xorg/xprop/version   | 1 -
 6 files changed, 18 deletions(-)
 delete mode 100755 xorg/xprop/build
 delete mode 100644 xorg/xprop/checksums
 delete mode 100644 xorg/xprop/depends
 delete mode 100644 xorg/xprop/meta
 delete mode 100644 xorg/xprop/sources
 delete mode 100644 xorg/xprop/version

diff --git a/xorg/xprop/build b/xorg/xprop/build
deleted file mode 100755
index 373bceed..00000000
--- a/xorg/xprop/build
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr \
-    --mandir=/usr/share/man \
-    --localstatedir=/var
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/xprop/checksums b/xorg/xprop/checksums
deleted file mode 100644
index 4731a1a2..00000000
--- a/xorg/xprop/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-3f1026630fef1d2be430e0c37f80a1b3c78cf134c8cb07e8dfcae9392fdd0b04  xprop-1.2.6.tar.xz
diff --git a/xorg/xprop/depends b/xorg/xprop/depends
deleted file mode 100644
index 4118e164..00000000
--- a/xorg/xprop/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-libX11
-libXmu
diff --git a/xorg/xprop/meta b/xorg/xprop/meta
deleted file mode 100644
index c11734bb..00000000
--- a/xorg/xprop/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: X property displayer
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/xprop/sources b/xorg/xprop/sources
deleted file mode 100644
index ac0ba1b7..00000000
--- a/xorg/xprop/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/app/xprop-1.2.6.tar.xz
diff --git a/xorg/xprop/version b/xorg/xprop/version
deleted file mode 100644
index 815496e6..00000000
--- a/xorg/xprop/version
+++ /dev/null
@@ -1 +0,0 @@
-1.2.6 1
-- 
cgit v1.2.3


From 5121e275bc8824d35fe53d8ece838d27031fe3ca Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:46:09 +0100
Subject: xmenu: drop from repository

---
 xorg/xmenu/build     | 4 ----
 xorg/xmenu/checksums | 1 -
 xorg/xmenu/depends   | 5 -----
 xorg/xmenu/meta      | 3 ---
 xorg/xmenu/sources   | 1 -
 xorg/xmenu/version   | 1 -
 6 files changed, 15 deletions(-)
 delete mode 100755 xorg/xmenu/build
 delete mode 100644 xorg/xmenu/checksums
 delete mode 100644 xorg/xmenu/depends
 delete mode 100644 xorg/xmenu/meta
 delete mode 100644 xorg/xmenu/sources
 delete mode 100644 xorg/xmenu/version

diff --git a/xorg/xmenu/build b/xorg/xmenu/build
deleted file mode 100755
index 88032b7b..00000000
--- a/xorg/xmenu/build
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh -e
-
-make PREFIX=/usr
-make PREFIX=/usr DESTDIR="$1" install
diff --git a/xorg/xmenu/checksums b/xorg/xmenu/checksums
deleted file mode 100644
index 30021a1c..00000000
--- a/xorg/xmenu/checksums
+++ /dev/null
@@ -1 +0,0 @@
-13fda8068d3886a590365d19d6ff84f04c0a4c9a516d79569000514067b4e77b  v4.5.5.tar.gz
diff --git a/xorg/xmenu/depends b/xorg/xmenu/depends
deleted file mode 100644
index b053c51b..00000000
--- a/xorg/xmenu/depends
+++ /dev/null
@@ -1,5 +0,0 @@
-fontconfig
-imlib2
-libX11
-libXft
-libXinerama
diff --git a/xorg/xmenu/meta b/xorg/xmenu/meta
deleted file mode 100644
index 1692e30b..00000000
--- a/xorg/xmenu/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: Generic X11 menu utility
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/xmenu/sources b/xorg/xmenu/sources
deleted file mode 100644
index e8642787..00000000
--- a/xorg/xmenu/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/phillbush/xmenu/archive/v4.5.5.tar.gz
diff --git a/xorg/xmenu/version b/xorg/xmenu/version
deleted file mode 100644
index 871dcbe8..00000000
--- a/xorg/xmenu/version
+++ /dev/null
@@ -1 +0,0 @@
-4.5.5 1
-- 
cgit v1.2.3


From 39c9ff6fef2136b058c4240f51b0ec5738f528c6 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:46:22 +0100
Subject: setxkbmap: drop from repository

---
 xorg/setxkbmap/build     | 9 ---------
 xorg/setxkbmap/checksums | 2 --
 xorg/setxkbmap/depends   | 2 --
 xorg/setxkbmap/meta      | 3 ---
 xorg/setxkbmap/sources   | 1 -
 xorg/setxkbmap/version   | 1 -
 6 files changed, 18 deletions(-)
 delete mode 100755 xorg/setxkbmap/build
 delete mode 100644 xorg/setxkbmap/checksums
 delete mode 100644 xorg/setxkbmap/depends
 delete mode 100644 xorg/setxkbmap/meta
 delete mode 100644 xorg/setxkbmap/sources
 delete mode 100644 xorg/setxkbmap/version

diff --git a/xorg/setxkbmap/build b/xorg/setxkbmap/build
deleted file mode 100755
index 373bceed..00000000
--- a/xorg/setxkbmap/build
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr \
-    --mandir=/usr/share/man \
-    --localstatedir=/var
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/setxkbmap/checksums b/xorg/setxkbmap/checksums
deleted file mode 100644
index 5a1ee5ea..00000000
--- a/xorg/setxkbmap/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-857dc3ae99e61253bd661e73f1621a6cc5a41198e00b00bf8c5b2b7155478c34  setxkbmap-1.3.3.tar.gz
diff --git a/xorg/setxkbmap/depends b/xorg/setxkbmap/depends
deleted file mode 100644
index 0c497a66..00000000
--- a/xorg/setxkbmap/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-libX11
-libxkbfile
diff --git a/xorg/setxkbmap/meta b/xorg/setxkbmap/meta
deleted file mode 100644
index ddf5fe16..00000000
--- a/xorg/setxkbmap/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: Command line utilitiy to set keyboard map on X server
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/setxkbmap/sources b/xorg/setxkbmap/sources
deleted file mode 100644
index 82a171e8..00000000
--- a/xorg/setxkbmap/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/archive//individual/app/setxkbmap-1.3.3.tar.gz
diff --git a/xorg/setxkbmap/version b/xorg/setxkbmap/version
deleted file mode 100644
index bdd8f5bd..00000000
--- a/xorg/setxkbmap/version
+++ /dev/null
@@ -1 +0,0 @@
-1.3.3 1
-- 
cgit v1.2.3


From 8686adf8e0427d833f5f4871c48d22c4a4ca8fe7 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:46:32 +0100
Subject: xbitmaps: drop from repository

---
 xorg/xbitmaps/build     | 10 ----------
 xorg/xbitmaps/checksums |  1 -
 xorg/xbitmaps/depends   |  1 -
 xorg/xbitmaps/meta      |  3 ---
 xorg/xbitmaps/sources   |  1 -
 xorg/xbitmaps/version   |  1 -
 6 files changed, 17 deletions(-)
 delete mode 100755 xorg/xbitmaps/build
 delete mode 100644 xorg/xbitmaps/checksums
 delete mode 100644 xorg/xbitmaps/depends
 delete mode 100644 xorg/xbitmaps/meta
 delete mode 100644 xorg/xbitmaps/sources
 delete mode 100644 xorg/xbitmaps/version

diff --git a/xorg/xbitmaps/build b/xorg/xbitmaps/build
deleted file mode 100755
index 80ce93e8..00000000
--- a/xorg/xbitmaps/build
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --mandir=/usr/share/man \
-    --localstatedir=/var
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/xbitmaps/checksums b/xorg/xbitmaps/checksums
deleted file mode 100644
index 69278b0e..00000000
--- a/xorg/xbitmaps/checksums
+++ /dev/null
@@ -1 +0,0 @@
-b9f0c71563125937776c8f1f25174ae9685314cbd130fb4c2efce811981e07ee  xbitmaps-1.1.2.tar.bz2
diff --git a/xorg/xbitmaps/depends b/xorg/xbitmaps/depends
deleted file mode 100644
index 8c98a973..00000000
--- a/xorg/xbitmaps/depends
+++ /dev/null
@@ -1 +0,0 @@
-xorg-util-macros make
diff --git a/xorg/xbitmaps/meta b/xorg/xbitmaps/meta
deleted file mode 100644
index 560fd714..00000000
--- a/xorg/xbitmaps/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: X11 bitmaps
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/xbitmaps/sources b/xorg/xbitmaps/sources
deleted file mode 100644
index 6b03aaeb..00000000
--- a/xorg/xbitmaps/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/pub/individual/data/xbitmaps-1.1.2.tar.bz2
diff --git a/xorg/xbitmaps/version b/xorg/xbitmaps/version
deleted file mode 100644
index 909c7076..00000000
--- a/xorg/xbitmaps/version
+++ /dev/null
@@ -1 +0,0 @@
-1.1.2 1
-- 
cgit v1.2.3


From 60e23906960f50f6a296ef6ca7d1e31dc6395fb5 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:47:26 +0100
Subject: libSM: move to extra

---
 extra/libSM/build     | 7 +++++++
 extra/libSM/checksums | 2 ++
 extra/libSM/depends   | 3 +++
 extra/libSM/meta      | 3 +++
 extra/libSM/sources   | 1 +
 extra/libSM/version   | 1 +
 xorg/libSM/build      | 7 -------
 xorg/libSM/checksums  | 2 --
 xorg/libSM/depends    | 3 ---
 xorg/libSM/meta       | 3 ---
 xorg/libSM/sources    | 1 -
 xorg/libSM/version    | 1 -
 12 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100755 extra/libSM/build
 create mode 100644 extra/libSM/checksums
 create mode 100644 extra/libSM/depends
 create mode 100644 extra/libSM/meta
 create mode 100644 extra/libSM/sources
 create mode 100644 extra/libSM/version
 delete mode 100755 xorg/libSM/build
 delete mode 100644 xorg/libSM/checksums
 delete mode 100644 xorg/libSM/depends
 delete mode 100644 xorg/libSM/meta
 delete mode 100644 xorg/libSM/sources
 delete mode 100644 xorg/libSM/version

diff --git a/extra/libSM/build b/extra/libSM/build
new file mode 100755
index 00000000..6daf22f8
--- /dev/null
+++ b/extra/libSM/build
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr
+
+make
+make DESTDIR="$1" install
diff --git a/extra/libSM/checksums b/extra/libSM/checksums
new file mode 100644
index 00000000..3048569d
--- /dev/null
+++ b/extra/libSM/checksums
@@ -0,0 +1,2 @@
+%BLAKE3
+1af23c9ec72e2ebe1feb876d8ea4d751f1366db9ce59a5e9aec689e1162ed44e  libSM-1.2.4.tar.xz
diff --git a/extra/libSM/depends b/extra/libSM/depends
new file mode 100644
index 00000000..faa771bd
--- /dev/null
+++ b/extra/libSM/depends
@@ -0,0 +1,3 @@
+util-linux
+libICE
+pkgconf make
diff --git a/extra/libSM/meta b/extra/libSM/meta
new file mode 100644
index 00000000..585a3c84
--- /dev/null
+++ b/extra/libSM/meta
@@ -0,0 +1,3 @@
+description: X Session Management Library
+license: MIT
+maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/extra/libSM/sources b/extra/libSM/sources
new file mode 100644
index 00000000..1ae2bfc0
--- /dev/null
+++ b/extra/libSM/sources
@@ -0,0 +1 @@
+https://www.x.org/releases/individual/lib/libSM-1.2.4.tar.xz
diff --git a/extra/libSM/version b/extra/libSM/version
new file mode 100644
index 00000000..d66671c6
--- /dev/null
+++ b/extra/libSM/version
@@ -0,0 +1 @@
+1.2.4 1
diff --git a/xorg/libSM/build b/xorg/libSM/build
deleted file mode 100755
index 6daf22f8..00000000
--- a/xorg/libSM/build
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/libSM/checksums b/xorg/libSM/checksums
deleted file mode 100644
index 3048569d..00000000
--- a/xorg/libSM/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-1af23c9ec72e2ebe1feb876d8ea4d751f1366db9ce59a5e9aec689e1162ed44e  libSM-1.2.4.tar.xz
diff --git a/xorg/libSM/depends b/xorg/libSM/depends
deleted file mode 100644
index faa771bd..00000000
--- a/xorg/libSM/depends
+++ /dev/null
@@ -1,3 +0,0 @@
-util-linux
-libICE
-pkgconf make
diff --git a/xorg/libSM/meta b/xorg/libSM/meta
deleted file mode 100644
index 585a3c84..00000000
--- a/xorg/libSM/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: X Session Management Library
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/libSM/sources b/xorg/libSM/sources
deleted file mode 100644
index 1ae2bfc0..00000000
--- a/xorg/libSM/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/lib/libSM-1.2.4.tar.xz
diff --git a/xorg/libSM/version b/xorg/libSM/version
deleted file mode 100644
index d66671c6..00000000
--- a/xorg/libSM/version
+++ /dev/null
@@ -1 +0,0 @@
-1.2.4 1
-- 
cgit v1.2.3


From abaea72b4a295d4845cf8f227cd82808733fcc5e Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:47:26 +0100
Subject: libX11: move to extra

---
 extra/libX11/build     | 13 +++++++++++++
 extra/libX11/checksums |  2 ++
 extra/libX11/depends   |  4 ++++
 extra/libX11/meta      |  3 +++
 extra/libX11/sources   |  1 +
 extra/libX11/version   |  1 +
 xorg/libX11/build      | 13 -------------
 xorg/libX11/checksums  |  2 --
 xorg/libX11/depends    |  4 ----
 xorg/libX11/meta       |  3 ---
 xorg/libX11/sources    |  1 -
 xorg/libX11/version    |  1 -
 12 files changed, 24 insertions(+), 24 deletions(-)
 create mode 100755 extra/libX11/build
 create mode 100644 extra/libX11/checksums
 create mode 100644 extra/libX11/depends
 create mode 100644 extra/libX11/meta
 create mode 100644 extra/libX11/sources
 create mode 100644 extra/libX11/version
 delete mode 100755 xorg/libX11/build
 delete mode 100644 xorg/libX11/checksums
 delete mode 100644 xorg/libX11/depends
 delete mode 100644 xorg/libX11/meta
 delete mode 100644 xorg/libX11/sources
 delete mode 100644 xorg/libX11/version

diff --git a/extra/libX11/build b/extra/libX11/build
new file mode 100755
index 00000000..a7d53475
--- /dev/null
+++ b/extra/libX11/build
@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+CFLAGS_FOR_BUILD=-fPIC \
+./configure \
+    --prefix=/usr \
+    --enable-static
+
+make
+make DESTDIR="$1" install
+
+# This will be removed once 'xorgproto' 2019.2
+# is released.
+rm -f "$1/usr/include/X11/extensions/XKBgeom.h"
diff --git a/extra/libX11/checksums b/extra/libX11/checksums
new file mode 100644
index 00000000..8ac9913b
--- /dev/null
+++ b/extra/libX11/checksums
@@ -0,0 +1,2 @@
+%BLAKE3
+6a202c737779fe53673c90ee972cf0301114dd8dd31f8f9c79d4c271bdaac3ce  libX11-1.8.3.tar.xz
diff --git a/extra/libX11/depends b/extra/libX11/depends
new file mode 100644
index 00000000..dd5bf5e3
--- /dev/null
+++ b/extra/libX11/depends
@@ -0,0 +1,4 @@
+libXau
+libxcb
+xorgproto
+xtrans    make
diff --git a/extra/libX11/meta b/extra/libX11/meta
new file mode 100644
index 00000000..898cab96
--- /dev/null
+++ b/extra/libX11/meta
@@ -0,0 +1,3 @@
+description: Base X libraries
+license: MIT
+maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/extra/libX11/sources b/extra/libX11/sources
new file mode 100644
index 00000000..5b898453
--- /dev/null
+++ b/extra/libX11/sources
@@ -0,0 +1 @@
+https://www.x.org/releases/individual/lib/libX11-1.8.3.tar.xz
diff --git a/extra/libX11/version b/extra/libX11/version
new file mode 100644
index 00000000..bab0ba79
--- /dev/null
+++ b/extra/libX11/version
@@ -0,0 +1 @@
+1.8.3 1
diff --git a/xorg/libX11/build b/xorg/libX11/build
deleted file mode 100755
index a7d53475..00000000
--- a/xorg/libX11/build
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh -e
-
-CFLAGS_FOR_BUILD=-fPIC \
-./configure \
-    --prefix=/usr \
-    --enable-static
-
-make
-make DESTDIR="$1" install
-
-# This will be removed once 'xorgproto' 2019.2
-# is released.
-rm -f "$1/usr/include/X11/extensions/XKBgeom.h"
diff --git a/xorg/libX11/checksums b/xorg/libX11/checksums
deleted file mode 100644
index 8ac9913b..00000000
--- a/xorg/libX11/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-6a202c737779fe53673c90ee972cf0301114dd8dd31f8f9c79d4c271bdaac3ce  libX11-1.8.3.tar.xz
diff --git a/xorg/libX11/depends b/xorg/libX11/depends
deleted file mode 100644
index dd5bf5e3..00000000
--- a/xorg/libX11/depends
+++ /dev/null
@@ -1,4 +0,0 @@
-libXau
-libxcb
-xorgproto
-xtrans    make
diff --git a/xorg/libX11/meta b/xorg/libX11/meta
deleted file mode 100644
index 898cab96..00000000
--- a/xorg/libX11/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: Base X libraries
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/libX11/sources b/xorg/libX11/sources
deleted file mode 100644
index 5b898453..00000000
--- a/xorg/libX11/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/lib/libX11-1.8.3.tar.xz
diff --git a/xorg/libX11/version b/xorg/libX11/version
deleted file mode 100644
index bab0ba79..00000000
--- a/xorg/libX11/version
+++ /dev/null
@@ -1 +0,0 @@
-1.8.3 1
-- 
cgit v1.2.3


From 452cc8b602c96bdd56ec16a0833067a7a04e404e Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:47:26 +0100
Subject: libXau: move to extra

---
 extra/libXau/build     | 7 +++++++
 extra/libXau/checksums | 2 ++
 extra/libXau/depends   | 1 +
 extra/libXau/meta      | 3 +++
 extra/libXau/sources   | 1 +
 extra/libXau/version   | 1 +
 xorg/libXau/build      | 7 -------
 xorg/libXau/checksums  | 2 --
 xorg/libXau/depends    | 1 -
 xorg/libXau/meta       | 3 ---
 xorg/libXau/sources    | 1 -
 xorg/libXau/version    | 1 -
 12 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100755 extra/libXau/build
 create mode 100644 extra/libXau/checksums
 create mode 100644 extra/libXau/depends
 create mode 100644 extra/libXau/meta
 create mode 100644 extra/libXau/sources
 create mode 100644 extra/libXau/version
 delete mode 100755 xorg/libXau/build
 delete mode 100644 xorg/libXau/checksums
 delete mode 100644 xorg/libXau/depends
 delete mode 100644 xorg/libXau/meta
 delete mode 100644 xorg/libXau/sources
 delete mode 100644 xorg/libXau/version

diff --git a/extra/libXau/build b/extra/libXau/build
new file mode 100755
index 00000000..6daf22f8
--- /dev/null
+++ b/extra/libXau/build
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr
+
+make
+make DESTDIR="$1" install
diff --git a/extra/libXau/checksums b/extra/libXau/checksums
new file mode 100644
index 00000000..61babd28
--- /dev/null
+++ b/extra/libXau/checksums
@@ -0,0 +1,2 @@
+%BLAKE3
+d6d4a87ec6148e9cbcc395e3d0969a7e5c68840d2993d1ea7c49b663777e22ff  libXau-1.0.11.tar.xz
diff --git a/extra/libXau/depends b/extra/libXau/depends
new file mode 100644
index 00000000..32e0e265
--- /dev/null
+++ b/extra/libXau/depends
@@ -0,0 +1 @@
+xorgproto make
diff --git a/extra/libXau/meta b/extra/libXau/meta
new file mode 100644
index 00000000..9d257cb5
--- /dev/null
+++ b/extra/libXau/meta
@@ -0,0 +1,3 @@
+description: Authorization Protocol for X
+license: MIT
+maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/extra/libXau/sources b/extra/libXau/sources
new file mode 100644
index 00000000..2120161e
--- /dev/null
+++ b/extra/libXau/sources
@@ -0,0 +1 @@
+https://www.x.org/releases/individual/lib/libXau-1.0.11.tar.xz
diff --git a/extra/libXau/version b/extra/libXau/version
new file mode 100644
index 00000000..baf9f53d
--- /dev/null
+++ b/extra/libXau/version
@@ -0,0 +1 @@
+1.0.11 1
diff --git a/xorg/libXau/build b/xorg/libXau/build
deleted file mode 100755
index 6daf22f8..00000000
--- a/xorg/libXau/build
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/libXau/checksums b/xorg/libXau/checksums
deleted file mode 100644
index 61babd28..00000000
--- a/xorg/libXau/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-d6d4a87ec6148e9cbcc395e3d0969a7e5c68840d2993d1ea7c49b663777e22ff  libXau-1.0.11.tar.xz
diff --git a/xorg/libXau/depends b/xorg/libXau/depends
deleted file mode 100644
index 32e0e265..00000000
--- a/xorg/libXau/depends
+++ /dev/null
@@ -1 +0,0 @@
-xorgproto make
diff --git a/xorg/libXau/meta b/xorg/libXau/meta
deleted file mode 100644
index 9d257cb5..00000000
--- a/xorg/libXau/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: Authorization Protocol for X
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/libXau/sources b/xorg/libXau/sources
deleted file mode 100644
index 2120161e..00000000
--- a/xorg/libXau/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/lib/libXau-1.0.11.tar.xz
diff --git a/xorg/libXau/version b/xorg/libXau/version
deleted file mode 100644
index baf9f53d..00000000
--- a/xorg/libXau/version
+++ /dev/null
@@ -1 +0,0 @@
-1.0.11 1
-- 
cgit v1.2.3


From aa9d9fbaa77c306e65f06bd1b102b1656326e373 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:47:26 +0100
Subject: libXcomposite: move to extra

---
 extra/libXcomposite/build     | 7 +++++++
 extra/libXcomposite/checksums | 2 ++
 extra/libXcomposite/depends   | 2 ++
 extra/libXcomposite/meta      | 3 +++
 extra/libXcomposite/sources   | 1 +
 extra/libXcomposite/version   | 1 +
 xorg/libXcomposite/build      | 7 -------
 xorg/libXcomposite/checksums  | 2 --
 xorg/libXcomposite/depends    | 2 --
 xorg/libXcomposite/meta       | 3 ---
 xorg/libXcomposite/sources    | 1 -
 xorg/libXcomposite/version    | 1 -
 12 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100755 extra/libXcomposite/build
 create mode 100644 extra/libXcomposite/checksums
 create mode 100644 extra/libXcomposite/depends
 create mode 100644 extra/libXcomposite/meta
 create mode 100644 extra/libXcomposite/sources
 create mode 100644 extra/libXcomposite/version
 delete mode 100755 xorg/libXcomposite/build
 delete mode 100644 xorg/libXcomposite/checksums
 delete mode 100644 xorg/libXcomposite/depends
 delete mode 100644 xorg/libXcomposite/meta
 delete mode 100644 xorg/libXcomposite/sources
 delete mode 100644 xorg/libXcomposite/version

diff --git a/extra/libXcomposite/build b/extra/libXcomposite/build
new file mode 100755
index 00000000..6daf22f8
--- /dev/null
+++ b/extra/libXcomposite/build
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr
+
+make
+make DESTDIR="$1" install
diff --git a/extra/libXcomposite/checksums b/extra/libXcomposite/checksums
new file mode 100644
index 00000000..6e61c52a
--- /dev/null
+++ b/extra/libXcomposite/checksums
@@ -0,0 +1,2 @@
+%BLAKE3
+7e02026864066869aefc1d688415b1e8c6ab0b639556f93b6f5e86063aa1bbac  libXcomposite-0.4.6.tar.xz
diff --git a/extra/libXcomposite/depends b/extra/libXcomposite/depends
new file mode 100644
index 00000000..9cf42339
--- /dev/null
+++ b/extra/libXcomposite/depends
@@ -0,0 +1,2 @@
+xorgproto make
+libXfixes
diff --git a/extra/libXcomposite/meta b/extra/libXcomposite/meta
new file mode 100644
index 00000000..28217ac7
--- /dev/null
+++ b/extra/libXcomposite/meta
@@ -0,0 +1,3 @@
+description: X Composite library
+license: X11
+maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/extra/libXcomposite/sources b/extra/libXcomposite/sources
new file mode 100644
index 00000000..87c22fd1
--- /dev/null
+++ b/extra/libXcomposite/sources
@@ -0,0 +1 @@
+https://www.x.org/releases/individual/lib/libXcomposite-0.4.6.tar.xz
diff --git a/extra/libXcomposite/version b/extra/libXcomposite/version
new file mode 100644
index 00000000..5a233460
--- /dev/null
+++ b/extra/libXcomposite/version
@@ -0,0 +1 @@
+0.4.6 1
diff --git a/xorg/libXcomposite/build b/xorg/libXcomposite/build
deleted file mode 100755
index 6daf22f8..00000000
--- a/xorg/libXcomposite/build
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/libXcomposite/checksums b/xorg/libXcomposite/checksums
deleted file mode 100644
index 6e61c52a..00000000
--- a/xorg/libXcomposite/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-7e02026864066869aefc1d688415b1e8c6ab0b639556f93b6f5e86063aa1bbac  libXcomposite-0.4.6.tar.xz
diff --git a/xorg/libXcomposite/depends b/xorg/libXcomposite/depends
deleted file mode 100644
index 9cf42339..00000000
--- a/xorg/libXcomposite/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-xorgproto make
-libXfixes
diff --git a/xorg/libXcomposite/meta b/xorg/libXcomposite/meta
deleted file mode 100644
index 28217ac7..00000000
--- a/xorg/libXcomposite/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: X Composite library
-license: X11
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/libXcomposite/sources b/xorg/libXcomposite/sources
deleted file mode 100644
index 87c22fd1..00000000
--- a/xorg/libXcomposite/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/lib/libXcomposite-0.4.6.tar.xz
diff --git a/xorg/libXcomposite/version b/xorg/libXcomposite/version
deleted file mode 100644
index 5a233460..00000000
--- a/xorg/libXcomposite/version
+++ /dev/null
@@ -1 +0,0 @@
-0.4.6 1
-- 
cgit v1.2.3


From 756715619d6d0cfc6268a309aed5f87ec0e5d550 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:47:26 +0100
Subject: libXcursor: move to extra

---
 extra/libXcursor/build     | 7 +++++++
 extra/libXcursor/checksums | 2 ++
 extra/libXcursor/depends   | 3 +++
 extra/libXcursor/meta      | 3 +++
 extra/libXcursor/sources   | 1 +
 extra/libXcursor/version   | 1 +
 xorg/libXcursor/build      | 7 -------
 xorg/libXcursor/checksums  | 2 --
 xorg/libXcursor/depends    | 3 ---
 xorg/libXcursor/meta       | 3 ---
 xorg/libXcursor/sources    | 1 -
 xorg/libXcursor/version    | 1 -
 12 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100755 extra/libXcursor/build
 create mode 100644 extra/libXcursor/checksums
 create mode 100644 extra/libXcursor/depends
 create mode 100644 extra/libXcursor/meta
 create mode 100644 extra/libXcursor/sources
 create mode 100644 extra/libXcursor/version
 delete mode 100755 xorg/libXcursor/build
 delete mode 100644 xorg/libXcursor/checksums
 delete mode 100644 xorg/libXcursor/depends
 delete mode 100644 xorg/libXcursor/meta
 delete mode 100644 xorg/libXcursor/sources
 delete mode 100644 xorg/libXcursor/version

diff --git a/extra/libXcursor/build b/extra/libXcursor/build
new file mode 100755
index 00000000..6daf22f8
--- /dev/null
+++ b/extra/libXcursor/build
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr
+
+make
+make DESTDIR="$1" install
diff --git a/extra/libXcursor/checksums b/extra/libXcursor/checksums
new file mode 100644
index 00000000..284fa48f
--- /dev/null
+++ b/extra/libXcursor/checksums
@@ -0,0 +1,2 @@
+%BLAKE3
+f1bfdd6d1fdd191fc7caa8c2b118a8a8d082fd74cdf4b2cc89059e41a79fecbd  libXcursor-1.2.1.tar.xz
diff --git a/extra/libXcursor/depends b/extra/libXcursor/depends
new file mode 100644
index 00000000..0f2bada9
--- /dev/null
+++ b/extra/libXcursor/depends
@@ -0,0 +1,3 @@
+xorgproto  make
+libXrender
+libXfixes
diff --git a/extra/libXcursor/meta b/extra/libXcursor/meta
new file mode 100644
index 00000000..8139ddd5
--- /dev/null
+++ b/extra/libXcursor/meta
@@ -0,0 +1,3 @@
+description: X cursor library
+license: MIT
+maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/extra/libXcursor/sources b/extra/libXcursor/sources
new file mode 100644
index 00000000..790f12c3
--- /dev/null
+++ b/extra/libXcursor/sources
@@ -0,0 +1 @@
+https://www.x.org/releases/individual/lib/libXcursor-1.2.1.tar.xz
diff --git a/extra/libXcursor/version b/extra/libXcursor/version
new file mode 100644
index 00000000..cd3d02bc
--- /dev/null
+++ b/extra/libXcursor/version
@@ -0,0 +1 @@
+1.2.1 1
diff --git a/xorg/libXcursor/build b/xorg/libXcursor/build
deleted file mode 100755
index 6daf22f8..00000000
--- a/xorg/libXcursor/build
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/libXcursor/checksums b/xorg/libXcursor/checksums
deleted file mode 100644
index 284fa48f..00000000
--- a/xorg/libXcursor/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-f1bfdd6d1fdd191fc7caa8c2b118a8a8d082fd74cdf4b2cc89059e41a79fecbd  libXcursor-1.2.1.tar.xz
diff --git a/xorg/libXcursor/depends b/xorg/libXcursor/depends
deleted file mode 100644
index 0f2bada9..00000000
--- a/xorg/libXcursor/depends
+++ /dev/null
@@ -1,3 +0,0 @@
-xorgproto  make
-libXrender
-libXfixes
diff --git a/xorg/libXcursor/meta b/xorg/libXcursor/meta
deleted file mode 100644
index 8139ddd5..00000000
--- a/xorg/libXcursor/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: X cursor library
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/libXcursor/sources b/xorg/libXcursor/sources
deleted file mode 100644
index 790f12c3..00000000
--- a/xorg/libXcursor/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/lib/libXcursor-1.2.1.tar.xz
diff --git a/xorg/libXcursor/version b/xorg/libXcursor/version
deleted file mode 100644
index cd3d02bc..00000000
--- a/xorg/libXcursor/version
+++ /dev/null
@@ -1 +0,0 @@
-1.2.1 1
-- 
cgit v1.2.3


From 7dd993b4d88c5c5a3eeeba497664b55322f66414 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:47:26 +0100
Subject: libXdamage: move to extra

---
 extra/libXdamage/build     | 7 +++++++
 extra/libXdamage/checksums | 2 ++
 extra/libXdamage/depends   | 3 +++
 extra/libXdamage/meta      | 3 +++
 extra/libXdamage/sources   | 1 +
 extra/libXdamage/version   | 1 +
 xorg/libXdamage/build      | 7 -------
 xorg/libXdamage/checksums  | 2 --
 xorg/libXdamage/depends    | 3 ---
 xorg/libXdamage/meta       | 3 ---
 xorg/libXdamage/sources    | 1 -
 xorg/libXdamage/version    | 1 -
 12 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100755 extra/libXdamage/build
 create mode 100644 extra/libXdamage/checksums
 create mode 100644 extra/libXdamage/depends
 create mode 100644 extra/libXdamage/meta
 create mode 100644 extra/libXdamage/sources
 create mode 100644 extra/libXdamage/version
 delete mode 100755 xorg/libXdamage/build
 delete mode 100644 xorg/libXdamage/checksums
 delete mode 100644 xorg/libXdamage/depends
 delete mode 100644 xorg/libXdamage/meta
 delete mode 100644 xorg/libXdamage/sources
 delete mode 100644 xorg/libXdamage/version

diff --git a/extra/libXdamage/build b/extra/libXdamage/build
new file mode 100755
index 00000000..6daf22f8
--- /dev/null
+++ b/extra/libXdamage/build
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr
+
+make
+make DESTDIR="$1" install
diff --git a/extra/libXdamage/checksums b/extra/libXdamage/checksums
new file mode 100644
index 00000000..1be3ffe6
--- /dev/null
+++ b/extra/libXdamage/checksums
@@ -0,0 +1,2 @@
+%BLAKE3
+d3d75f2656027288f87b9ddda8bf019862c63c6e4aeadd92f45870df6c2a7ce9  libXdamage-1.1.6.tar.xz
diff --git a/extra/libXdamage/depends b/extra/libXdamage/depends
new file mode 100644
index 00000000..e218970a
--- /dev/null
+++ b/extra/libXdamage/depends
@@ -0,0 +1,3 @@
+xorgproto make
+libX11
+libXfixes
diff --git a/extra/libXdamage/meta b/extra/libXdamage/meta
new file mode 100644
index 00000000..de67d030
--- /dev/null
+++ b/extra/libXdamage/meta
@@ -0,0 +1,3 @@
+description: Xdamage extension library
+license: X11
+maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/extra/libXdamage/sources b/extra/libXdamage/sources
new file mode 100644
index 00000000..0be1bf3b
--- /dev/null
+++ b/extra/libXdamage/sources
@@ -0,0 +1 @@
+https://www.x.org/releases/individual/lib/libXdamage-1.1.6.tar.xz
diff --git a/extra/libXdamage/version b/extra/libXdamage/version
new file mode 100644
index 00000000..e17b92d7
--- /dev/null
+++ b/extra/libXdamage/version
@@ -0,0 +1 @@
+1.1.6 1
diff --git a/xorg/libXdamage/build b/xorg/libXdamage/build
deleted file mode 100755
index 6daf22f8..00000000
--- a/xorg/libXdamage/build
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/libXdamage/checksums b/xorg/libXdamage/checksums
deleted file mode 100644
index 1be3ffe6..00000000
--- a/xorg/libXdamage/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-d3d75f2656027288f87b9ddda8bf019862c63c6e4aeadd92f45870df6c2a7ce9  libXdamage-1.1.6.tar.xz
diff --git a/xorg/libXdamage/depends b/xorg/libXdamage/depends
deleted file mode 100644
index e218970a..00000000
--- a/xorg/libXdamage/depends
+++ /dev/null
@@ -1,3 +0,0 @@
-xorgproto make
-libX11
-libXfixes
diff --git a/xorg/libXdamage/meta b/xorg/libXdamage/meta
deleted file mode 100644
index de67d030..00000000
--- a/xorg/libXdamage/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: Xdamage extension library
-license: X11
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/libXdamage/sources b/xorg/libXdamage/sources
deleted file mode 100644
index 0be1bf3b..00000000
--- a/xorg/libXdamage/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/lib/libXdamage-1.1.6.tar.xz
diff --git a/xorg/libXdamage/version b/xorg/libXdamage/version
deleted file mode 100644
index e17b92d7..00000000
--- a/xorg/libXdamage/version
+++ /dev/null
@@ -1 +0,0 @@
-1.1.6 1
-- 
cgit v1.2.3


From 12c524feb3e78f807b300e363925f1d9a0dce649 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:47:26 +0100
Subject: libXext: move to extra

---
 extra/libXext/build     | 7 +++++++
 extra/libXext/checksums | 2 ++
 extra/libXext/depends   | 2 ++
 extra/libXext/meta      | 3 +++
 extra/libXext/sources   | 1 +
 extra/libXext/version   | 1 +
 xorg/libXext/build      | 7 -------
 xorg/libXext/checksums  | 2 --
 xorg/libXext/depends    | 2 --
 xorg/libXext/meta       | 3 ---
 xorg/libXext/sources    | 1 -
 xorg/libXext/version    | 1 -
 12 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100755 extra/libXext/build
 create mode 100644 extra/libXext/checksums
 create mode 100644 extra/libXext/depends
 create mode 100644 extra/libXext/meta
 create mode 100644 extra/libXext/sources
 create mode 100644 extra/libXext/version
 delete mode 100755 xorg/libXext/build
 delete mode 100644 xorg/libXext/checksums
 delete mode 100644 xorg/libXext/depends
 delete mode 100644 xorg/libXext/meta
 delete mode 100644 xorg/libXext/sources
 delete mode 100644 xorg/libXext/version

diff --git a/extra/libXext/build b/extra/libXext/build
new file mode 100755
index 00000000..6daf22f8
--- /dev/null
+++ b/extra/libXext/build
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr
+
+make
+make DESTDIR="$1" install
diff --git a/extra/libXext/checksums b/extra/libXext/checksums
new file mode 100644
index 00000000..58b1dd1a
--- /dev/null
+++ b/extra/libXext/checksums
@@ -0,0 +1,2 @@
+%BLAKE3
+8c0c77a43488855ec939e730bba8a9b9f8a3e3196cfb7cd1b8ed7c32a2634d3e  libXext-1.3.5.tar.xz
diff --git a/extra/libXext/depends b/extra/libXext/depends
new file mode 100644
index 00000000..cdecd8b9
--- /dev/null
+++ b/extra/libXext/depends
@@ -0,0 +1,2 @@
+xorgproto make
+libX11    make
diff --git a/extra/libXext/meta b/extra/libXext/meta
new file mode 100644
index 00000000..52d9fcb0
--- /dev/null
+++ b/extra/libXext/meta
@@ -0,0 +1,3 @@
+description: X extension library
+license: MIT
+maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/extra/libXext/sources b/extra/libXext/sources
new file mode 100644
index 00000000..1af516d4
--- /dev/null
+++ b/extra/libXext/sources
@@ -0,0 +1 @@
+https://www.x.org/releases/individual/lib/libXext-1.3.5.tar.xz
diff --git a/extra/libXext/version b/extra/libXext/version
new file mode 100644
index 00000000..a06f6a21
--- /dev/null
+++ b/extra/libXext/version
@@ -0,0 +1 @@
+1.3.5 1
diff --git a/xorg/libXext/build b/xorg/libXext/build
deleted file mode 100755
index 6daf22f8..00000000
--- a/xorg/libXext/build
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/libXext/checksums b/xorg/libXext/checksums
deleted file mode 100644
index 58b1dd1a..00000000
--- a/xorg/libXext/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-8c0c77a43488855ec939e730bba8a9b9f8a3e3196cfb7cd1b8ed7c32a2634d3e  libXext-1.3.5.tar.xz
diff --git a/xorg/libXext/depends b/xorg/libXext/depends
deleted file mode 100644
index cdecd8b9..00000000
--- a/xorg/libXext/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-xorgproto make
-libX11    make
diff --git a/xorg/libXext/meta b/xorg/libXext/meta
deleted file mode 100644
index 52d9fcb0..00000000
--- a/xorg/libXext/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: X extension library
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/libXext/sources b/xorg/libXext/sources
deleted file mode 100644
index 1af516d4..00000000
--- a/xorg/libXext/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/lib/libXext-1.3.5.tar.xz
diff --git a/xorg/libXext/version b/xorg/libXext/version
deleted file mode 100644
index a06f6a21..00000000
--- a/xorg/libXext/version
+++ /dev/null
@@ -1 +0,0 @@
-1.3.5 1
-- 
cgit v1.2.3


From cb8f3bfaf7eeffcb1247af4c2b7943fc6cd5cff7 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:47:26 +0100
Subject: libXfixes: move to extra

---
 extra/libXfixes/build     | 7 +++++++
 extra/libXfixes/checksums | 1 +
 extra/libXfixes/meta      | 3 +++
 extra/libXfixes/sources   | 1 +
 extra/libXfixes/version   | 1 +
 xorg/libXfixes/build      | 7 -------
 xorg/libXfixes/checksums  | 1 -
 xorg/libXfixes/meta       | 3 ---
 xorg/libXfixes/sources    | 1 -
 xorg/libXfixes/version    | 1 -
 10 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100755 extra/libXfixes/build
 create mode 100644 extra/libXfixes/checksums
 create mode 100644 extra/libXfixes/meta
 create mode 100644 extra/libXfixes/sources
 create mode 100644 extra/libXfixes/version
 delete mode 100755 xorg/libXfixes/build
 delete mode 100644 xorg/libXfixes/checksums
 delete mode 100644 xorg/libXfixes/meta
 delete mode 100644 xorg/libXfixes/sources
 delete mode 100644 xorg/libXfixes/version

diff --git a/extra/libXfixes/build b/extra/libXfixes/build
new file mode 100755
index 00000000..6daf22f8
--- /dev/null
+++ b/extra/libXfixes/build
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr
+
+make
+make DESTDIR="$1" install
diff --git a/extra/libXfixes/checksums b/extra/libXfixes/checksums
new file mode 100644
index 00000000..1ceba82c
--- /dev/null
+++ b/extra/libXfixes/checksums
@@ -0,0 +1 @@
+a7c1a24da53e0b46cac5aea79094b4b2257321c621b258729bc3139149245b4c  libXfixes-6.0.0.tar.bz2
diff --git a/extra/libXfixes/meta b/extra/libXfixes/meta
new file mode 100644
index 00000000..a681612d
--- /dev/null
+++ b/extra/libXfixes/meta
@@ -0,0 +1,3 @@
+description: X fixes library
+license: MIT
+maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/extra/libXfixes/sources b/extra/libXfixes/sources
new file mode 100644
index 00000000..df0f6a02
--- /dev/null
+++ b/extra/libXfixes/sources
@@ -0,0 +1 @@
+https://www.x.org/releases/individual/lib/libXfixes-6.0.0.tar.bz2
diff --git a/extra/libXfixes/version b/extra/libXfixes/version
new file mode 100644
index 00000000..dd00d5d8
--- /dev/null
+++ b/extra/libXfixes/version
@@ -0,0 +1 @@
+6.0.0 1
diff --git a/xorg/libXfixes/build b/xorg/libXfixes/build
deleted file mode 100755
index 6daf22f8..00000000
--- a/xorg/libXfixes/build
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/libXfixes/checksums b/xorg/libXfixes/checksums
deleted file mode 100644
index 1ceba82c..00000000
--- a/xorg/libXfixes/checksums
+++ /dev/null
@@ -1 +0,0 @@
-a7c1a24da53e0b46cac5aea79094b4b2257321c621b258729bc3139149245b4c  libXfixes-6.0.0.tar.bz2
diff --git a/xorg/libXfixes/meta b/xorg/libXfixes/meta
deleted file mode 100644
index a681612d..00000000
--- a/xorg/libXfixes/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: X fixes library
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/libXfixes/sources b/xorg/libXfixes/sources
deleted file mode 100644
index df0f6a02..00000000
--- a/xorg/libXfixes/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/lib/libXfixes-6.0.0.tar.bz2
diff --git a/xorg/libXfixes/version b/xorg/libXfixes/version
deleted file mode 100644
index dd00d5d8..00000000
--- a/xorg/libXfixes/version
+++ /dev/null
@@ -1 +0,0 @@
-6.0.0 1
-- 
cgit v1.2.3


From aea9a9a6a82f9345dfea012511e4c4227e02a170 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:47:26 +0100
Subject: libXfont2: move to extra

---
 extra/libXfont2/build     | 7 +++++++
 extra/libXfont2/checksums | 2 ++
 extra/libXfont2/depends   | 4 ++++
 extra/libXfont2/meta      | 3 +++
 extra/libXfont2/sources   | 1 +
 extra/libXfont2/version   | 1 +
 xorg/libXfont2/build      | 7 -------
 xorg/libXfont2/checksums  | 2 --
 xorg/libXfont2/depends    | 4 ----
 xorg/libXfont2/meta       | 3 ---
 xorg/libXfont2/sources    | 1 -
 xorg/libXfont2/version    | 1 -
 12 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100755 extra/libXfont2/build
 create mode 100644 extra/libXfont2/checksums
 create mode 100644 extra/libXfont2/depends
 create mode 100644 extra/libXfont2/meta
 create mode 100644 extra/libXfont2/sources
 create mode 100644 extra/libXfont2/version
 delete mode 100755 xorg/libXfont2/build
 delete mode 100644 xorg/libXfont2/checksums
 delete mode 100644 xorg/libXfont2/depends
 delete mode 100644 xorg/libXfont2/meta
 delete mode 100644 xorg/libXfont2/sources
 delete mode 100644 xorg/libXfont2/version

diff --git a/extra/libXfont2/build b/extra/libXfont2/build
new file mode 100755
index 00000000..6daf22f8
--- /dev/null
+++ b/extra/libXfont2/build
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr
+
+make
+make DESTDIR="$1" install
diff --git a/extra/libXfont2/checksums b/extra/libXfont2/checksums
new file mode 100644
index 00000000..54379a43
--- /dev/null
+++ b/extra/libXfont2/checksums
@@ -0,0 +1,2 @@
+%BLAKE3
+26ee84ebd2f2557d3ef992df3ccda68e5fb4be745fda8901125558056d19efdf  libXfont2-2.0.6.tar.xz
diff --git a/extra/libXfont2/depends b/extra/libXfont2/depends
new file mode 100644
index 00000000..d9d2b7d7
--- /dev/null
+++ b/extra/libXfont2/depends
@@ -0,0 +1,4 @@
+freetype-harfbuzz
+libfontenc
+xorgproto         make
+xtrans            make
diff --git a/extra/libXfont2/meta b/extra/libXfont2/meta
new file mode 100644
index 00000000..98770c41
--- /dev/null
+++ b/extra/libXfont2/meta
@@ -0,0 +1,3 @@
+description: X font 2 library
+license: MIT
+maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/extra/libXfont2/sources b/extra/libXfont2/sources
new file mode 100644
index 00000000..782d3850
--- /dev/null
+++ b/extra/libXfont2/sources
@@ -0,0 +1 @@
+https://www.x.org/releases/individual/lib/libXfont2-2.0.6.tar.xz
diff --git a/extra/libXfont2/version b/extra/libXfont2/version
new file mode 100644
index 00000000..7493c3d1
--- /dev/null
+++ b/extra/libXfont2/version
@@ -0,0 +1 @@
+2.0.6 1
diff --git a/xorg/libXfont2/build b/xorg/libXfont2/build
deleted file mode 100755
index 6daf22f8..00000000
--- a/xorg/libXfont2/build
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/libXfont2/checksums b/xorg/libXfont2/checksums
deleted file mode 100644
index 54379a43..00000000
--- a/xorg/libXfont2/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-26ee84ebd2f2557d3ef992df3ccda68e5fb4be745fda8901125558056d19efdf  libXfont2-2.0.6.tar.xz
diff --git a/xorg/libXfont2/depends b/xorg/libXfont2/depends
deleted file mode 100644
index d9d2b7d7..00000000
--- a/xorg/libXfont2/depends
+++ /dev/null
@@ -1,4 +0,0 @@
-freetype-harfbuzz
-libfontenc
-xorgproto         make
-xtrans            make
diff --git a/xorg/libXfont2/meta b/xorg/libXfont2/meta
deleted file mode 100644
index 98770c41..00000000
--- a/xorg/libXfont2/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: X font 2 library
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/libXfont2/sources b/xorg/libXfont2/sources
deleted file mode 100644
index 782d3850..00000000
--- a/xorg/libXfont2/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/lib/libXfont2-2.0.6.tar.xz
diff --git a/xorg/libXfont2/version b/xorg/libXfont2/version
deleted file mode 100644
index 7493c3d1..00000000
--- a/xorg/libXfont2/version
+++ /dev/null
@@ -1 +0,0 @@
-2.0.6 1
-- 
cgit v1.2.3


From 49f9d1f68ae9c0f0d16d18c9e2b4771567f9cfe4 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:47:26 +0100
Subject: libXft: move to extra

---
 extra/libXft/build     | 7 +++++++
 extra/libXft/checksums | 2 ++
 extra/libXft/depends   | 4 ++++
 extra/libXft/meta      | 3 +++
 extra/libXft/sources   | 1 +
 extra/libXft/version   | 1 +
 xorg/libXft/build      | 7 -------
 xorg/libXft/checksums  | 2 --
 xorg/libXft/depends    | 4 ----
 xorg/libXft/meta       | 3 ---
 xorg/libXft/sources    | 1 -
 xorg/libXft/version    | 1 -
 12 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100755 extra/libXft/build
 create mode 100644 extra/libXft/checksums
 create mode 100644 extra/libXft/depends
 create mode 100644 extra/libXft/meta
 create mode 100644 extra/libXft/sources
 create mode 100644 extra/libXft/version
 delete mode 100755 xorg/libXft/build
 delete mode 100644 xorg/libXft/checksums
 delete mode 100644 xorg/libXft/depends
 delete mode 100644 xorg/libXft/meta
 delete mode 100644 xorg/libXft/sources
 delete mode 100644 xorg/libXft/version

diff --git a/extra/libXft/build b/extra/libXft/build
new file mode 100755
index 00000000..6daf22f8
--- /dev/null
+++ b/extra/libXft/build
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr
+
+make
+make DESTDIR="$1" install
diff --git a/extra/libXft/checksums b/extra/libXft/checksums
new file mode 100644
index 00000000..c5eaba75
--- /dev/null
+++ b/extra/libXft/checksums
@@ -0,0 +1,2 @@
+%BLAKE3
+f1f95b8c1a0f21300bbc8854ddfbb3bf5e8af322e27bc86155c0d4a22c295978  libXft-2.3.7.tar.xz
diff --git a/extra/libXft/depends b/extra/libXft/depends
new file mode 100644
index 00000000..57d955e8
--- /dev/null
+++ b/extra/libXft/depends
@@ -0,0 +1,4 @@
+fontconfig        make
+freetype-harfbuzz make
+libXrender        make
+xorgproto         make
diff --git a/extra/libXft/meta b/extra/libXft/meta
new file mode 100644
index 00000000..f9109363
--- /dev/null
+++ b/extra/libXft/meta
@@ -0,0 +1,3 @@
+description: Font access configuration library
+license: MIT
+maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/extra/libXft/sources b/extra/libXft/sources
new file mode 100644
index 00000000..ae55a3d8
--- /dev/null
+++ b/extra/libXft/sources
@@ -0,0 +1 @@
+https://www.x.org/releases/individual/lib/libXft-2.3.7.tar.xz
diff --git a/extra/libXft/version b/extra/libXft/version
new file mode 100644
index 00000000..fc94c06b
--- /dev/null
+++ b/extra/libXft/version
@@ -0,0 +1 @@
+2.3.7 1
diff --git a/xorg/libXft/build b/xorg/libXft/build
deleted file mode 100755
index 6daf22f8..00000000
--- a/xorg/libXft/build
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/libXft/checksums b/xorg/libXft/checksums
deleted file mode 100644
index c5eaba75..00000000
--- a/xorg/libXft/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-f1f95b8c1a0f21300bbc8854ddfbb3bf5e8af322e27bc86155c0d4a22c295978  libXft-2.3.7.tar.xz
diff --git a/xorg/libXft/depends b/xorg/libXft/depends
deleted file mode 100644
index 57d955e8..00000000
--- a/xorg/libXft/depends
+++ /dev/null
@@ -1,4 +0,0 @@
-fontconfig        make
-freetype-harfbuzz make
-libXrender        make
-xorgproto         make
diff --git a/xorg/libXft/meta b/xorg/libXft/meta
deleted file mode 100644
index f9109363..00000000
--- a/xorg/libXft/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: Font access configuration library
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/libXft/sources b/xorg/libXft/sources
deleted file mode 100644
index ae55a3d8..00000000
--- a/xorg/libXft/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/lib/libXft-2.3.7.tar.xz
diff --git a/xorg/libXft/version b/xorg/libXft/version
deleted file mode 100644
index fc94c06b..00000000
--- a/xorg/libXft/version
+++ /dev/null
@@ -1 +0,0 @@
-2.3.7 1
-- 
cgit v1.2.3


From 7360fecf24c1d344c27d1ef2668923497d41f698 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:47:26 +0100
Subject: libXi: move to extra

---
 extra/libXi/build     | 8 ++++++++
 extra/libXi/checksums | 2 ++
 extra/libXi/depends   | 3 +++
 extra/libXi/meta      | 3 +++
 extra/libXi/sources   | 1 +
 extra/libXi/version   | 1 +
 xorg/libXi/build      | 8 --------
 xorg/libXi/checksums  | 2 --
 xorg/libXi/depends    | 3 ---
 xorg/libXi/meta       | 3 ---
 xorg/libXi/sources    | 1 -
 xorg/libXi/version    | 1 -
 12 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100755 extra/libXi/build
 create mode 100644 extra/libXi/checksums
 create mode 100644 extra/libXi/depends
 create mode 100644 extra/libXi/meta
 create mode 100644 extra/libXi/sources
 create mode 100644 extra/libXi/version
 delete mode 100755 xorg/libXi/build
 delete mode 100644 xorg/libXi/checksums
 delete mode 100644 xorg/libXi/depends
 delete mode 100644 xorg/libXi/meta
 delete mode 100644 xorg/libXi/sources
 delete mode 100644 xorg/libXi/version

diff --git a/extra/libXi/build b/extra/libXi/build
new file mode 100755
index 00000000..105ed0c2
--- /dev/null
+++ b/extra/libXi/build
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr \
+    --enable-malloc0returnsnull
+
+make
+make DESTDIR="$1" install
diff --git a/extra/libXi/checksums b/extra/libXi/checksums
new file mode 100644
index 00000000..f2f2127c
--- /dev/null
+++ b/extra/libXi/checksums
@@ -0,0 +1,2 @@
+%BLAKE3
+bea75ac21f2d08f34a7524d9c47905ba10028c4aec1f1d820203db932324b357  libXi-1.8.tar.bz2
diff --git a/extra/libXi/depends b/extra/libXi/depends
new file mode 100644
index 00000000..e648cf9a
--- /dev/null
+++ b/extra/libXi/depends
@@ -0,0 +1,3 @@
+libXext
+libXfixes
+xorgproto make
diff --git a/extra/libXi/meta b/extra/libXi/meta
new file mode 100644
index 00000000..224d0d82
--- /dev/null
+++ b/extra/libXi/meta
@@ -0,0 +1,3 @@
+description: X input extension library
+license: MIT
+maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/extra/libXi/sources b/extra/libXi/sources
new file mode 100644
index 00000000..9cce0435
--- /dev/null
+++ b/extra/libXi/sources
@@ -0,0 +1 @@
+https://www.x.org/releases/individual/lib/libXi-1.8.tar.bz2
diff --git a/extra/libXi/version b/extra/libXi/version
new file mode 100644
index 00000000..33fba2c3
--- /dev/null
+++ b/extra/libXi/version
@@ -0,0 +1 @@
+1.8 1
diff --git a/xorg/libXi/build b/xorg/libXi/build
deleted file mode 100755
index 105ed0c2..00000000
--- a/xorg/libXi/build
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr \
-    --enable-malloc0returnsnull
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/libXi/checksums b/xorg/libXi/checksums
deleted file mode 100644
index f2f2127c..00000000
--- a/xorg/libXi/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-bea75ac21f2d08f34a7524d9c47905ba10028c4aec1f1d820203db932324b357  libXi-1.8.tar.bz2
diff --git a/xorg/libXi/depends b/xorg/libXi/depends
deleted file mode 100644
index e648cf9a..00000000
--- a/xorg/libXi/depends
+++ /dev/null
@@ -1,3 +0,0 @@
-libXext
-libXfixes
-xorgproto make
diff --git a/xorg/libXi/meta b/xorg/libXi/meta
deleted file mode 100644
index 224d0d82..00000000
--- a/xorg/libXi/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: X input extension library
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/libXi/sources b/xorg/libXi/sources
deleted file mode 100644
index 9cce0435..00000000
--- a/xorg/libXi/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/lib/libXi-1.8.tar.bz2
diff --git a/xorg/libXi/version b/xorg/libXi/version
deleted file mode 100644
index 33fba2c3..00000000
--- a/xorg/libXi/version
+++ /dev/null
@@ -1 +0,0 @@
-1.8 1
-- 
cgit v1.2.3


From 970043469fb51ec85a2852073716185380f5276c Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:47:27 +0100
Subject: libXinerama: move to extra

---
 extra/libXinerama/build     | 8 ++++++++
 extra/libXinerama/checksums | 2 ++
 extra/libXinerama/depends   | 2 ++
 extra/libXinerama/meta      | 3 +++
 extra/libXinerama/sources   | 1 +
 extra/libXinerama/version   | 1 +
 xorg/libXinerama/build      | 8 --------
 xorg/libXinerama/checksums  | 2 --
 xorg/libXinerama/depends    | 2 --
 xorg/libXinerama/meta       | 3 ---
 xorg/libXinerama/sources    | 1 -
 xorg/libXinerama/version    | 1 -
 12 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100755 extra/libXinerama/build
 create mode 100644 extra/libXinerama/checksums
 create mode 100644 extra/libXinerama/depends
 create mode 100644 extra/libXinerama/meta
 create mode 100644 extra/libXinerama/sources
 create mode 100644 extra/libXinerama/version
 delete mode 100755 xorg/libXinerama/build
 delete mode 100644 xorg/libXinerama/checksums
 delete mode 100644 xorg/libXinerama/depends
 delete mode 100644 xorg/libXinerama/meta
 delete mode 100644 xorg/libXinerama/sources
 delete mode 100644 xorg/libXinerama/version

diff --git a/extra/libXinerama/build b/extra/libXinerama/build
new file mode 100755
index 00000000..105ed0c2
--- /dev/null
+++ b/extra/libXinerama/build
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr \
+    --enable-malloc0returnsnull
+
+make
+make DESTDIR="$1" install
diff --git a/extra/libXinerama/checksums b/extra/libXinerama/checksums
new file mode 100644
index 00000000..307a0a65
--- /dev/null
+++ b/extra/libXinerama/checksums
@@ -0,0 +1,2 @@
+%BLAKE3
+58b4020c8a8fb62707f5073f967bf8abbc8dc7cff35c5750fabe097f46a924b4  libXinerama-1.1.5.tar.xz
diff --git a/extra/libXinerama/depends b/extra/libXinerama/depends
new file mode 100644
index 00000000..ae44963c
--- /dev/null
+++ b/extra/libXinerama/depends
@@ -0,0 +1,2 @@
+libXext
+xorgproto
diff --git a/extra/libXinerama/meta b/extra/libXinerama/meta
new file mode 100644
index 00000000..a9f3eec4
--- /dev/null
+++ b/extra/libXinerama/meta
@@ -0,0 +1,3 @@
+description: X Panoramix extension library
+license: MIT
+maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/extra/libXinerama/sources b/extra/libXinerama/sources
new file mode 100644
index 00000000..9730d637
--- /dev/null
+++ b/extra/libXinerama/sources
@@ -0,0 +1 @@
+https://www.x.org/releases/individual/lib/libXinerama-1.1.5.tar.xz
diff --git a/extra/libXinerama/version b/extra/libXinerama/version
new file mode 100644
index 00000000..3d29560a
--- /dev/null
+++ b/extra/libXinerama/version
@@ -0,0 +1 @@
+1.1.5 1
diff --git a/xorg/libXinerama/build b/xorg/libXinerama/build
deleted file mode 100755
index 105ed0c2..00000000
--- a/xorg/libXinerama/build
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr \
-    --enable-malloc0returnsnull
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/libXinerama/checksums b/xorg/libXinerama/checksums
deleted file mode 100644
index 307a0a65..00000000
--- a/xorg/libXinerama/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-58b4020c8a8fb62707f5073f967bf8abbc8dc7cff35c5750fabe097f46a924b4  libXinerama-1.1.5.tar.xz
diff --git a/xorg/libXinerama/depends b/xorg/libXinerama/depends
deleted file mode 100644
index ae44963c..00000000
--- a/xorg/libXinerama/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-libXext
-xorgproto
diff --git a/xorg/libXinerama/meta b/xorg/libXinerama/meta
deleted file mode 100644
index a9f3eec4..00000000
--- a/xorg/libXinerama/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: X Panoramix extension library
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/libXinerama/sources b/xorg/libXinerama/sources
deleted file mode 100644
index 9730d637..00000000
--- a/xorg/libXinerama/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/lib/libXinerama-1.1.5.tar.xz
diff --git a/xorg/libXinerama/version b/xorg/libXinerama/version
deleted file mode 100644
index 3d29560a..00000000
--- a/xorg/libXinerama/version
+++ /dev/null
@@ -1 +0,0 @@
-1.1.5 1
-- 
cgit v1.2.3


From 71dddcc66d6e4ca000d55fa90db7d834395174fb Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:47:27 +0100
Subject: libXmu: move to extra

---
 extra/libXmu/build     | 8 ++++++++
 extra/libXmu/checksums | 2 ++
 extra/libXmu/depends   | 3 +++
 extra/libXmu/meta      | 3 +++
 extra/libXmu/sources   | 1 +
 extra/libXmu/version   | 1 +
 xorg/libXmu/build      | 8 --------
 xorg/libXmu/checksums  | 2 --
 xorg/libXmu/depends    | 3 ---
 xorg/libXmu/meta       | 3 ---
 xorg/libXmu/sources    | 1 -
 xorg/libXmu/version    | 1 -
 12 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100755 extra/libXmu/build
 create mode 100644 extra/libXmu/checksums
 create mode 100644 extra/libXmu/depends
 create mode 100644 extra/libXmu/meta
 create mode 100644 extra/libXmu/sources
 create mode 100644 extra/libXmu/version
 delete mode 100755 xorg/libXmu/build
 delete mode 100644 xorg/libXmu/checksums
 delete mode 100644 xorg/libXmu/depends
 delete mode 100644 xorg/libXmu/meta
 delete mode 100644 xorg/libXmu/sources
 delete mode 100644 xorg/libXmu/version

diff --git a/extra/libXmu/build b/extra/libXmu/build
new file mode 100755
index 00000000..6b0a232c
--- /dev/null
+++ b/extra/libXmu/build
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc
+
+make
+make DESTDIR="$1" install
diff --git a/extra/libXmu/checksums b/extra/libXmu/checksums
new file mode 100644
index 00000000..3a43531b
--- /dev/null
+++ b/extra/libXmu/checksums
@@ -0,0 +1,2 @@
+%BLAKE3
+0e7ea27e4accb589a81bacff70f74d1e1a1f04d6d85fd795d49dda9708e37e06  libXmu-1.1.4.tar.xz
diff --git a/extra/libXmu/depends b/extra/libXmu/depends
new file mode 100644
index 00000000..7ca7df15
--- /dev/null
+++ b/extra/libXmu/depends
@@ -0,0 +1,3 @@
+libXext
+libXt
+xorg-util-macros make
diff --git a/extra/libXmu/meta b/extra/libXmu/meta
new file mode 100644
index 00000000..21de9e2f
--- /dev/null
+++ b/extra/libXmu/meta
@@ -0,0 +1,3 @@
+description: X Miscellaneous Utilities library
+license: MIT
+maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/extra/libXmu/sources b/extra/libXmu/sources
new file mode 100644
index 00000000..0fa856ef
--- /dev/null
+++ b/extra/libXmu/sources
@@ -0,0 +1 @@
+https://x.org/releases/individual/lib/libXmu-1.1.4.tar.xz
diff --git a/extra/libXmu/version b/extra/libXmu/version
new file mode 100644
index 00000000..b01ca96f
--- /dev/null
+++ b/extra/libXmu/version
@@ -0,0 +1 @@
+1.1.4 1
diff --git a/xorg/libXmu/build b/xorg/libXmu/build
deleted file mode 100755
index 6b0a232c..00000000
--- a/xorg/libXmu/build
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/libXmu/checksums b/xorg/libXmu/checksums
deleted file mode 100644
index 3a43531b..00000000
--- a/xorg/libXmu/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-0e7ea27e4accb589a81bacff70f74d1e1a1f04d6d85fd795d49dda9708e37e06  libXmu-1.1.4.tar.xz
diff --git a/xorg/libXmu/depends b/xorg/libXmu/depends
deleted file mode 100644
index 7ca7df15..00000000
--- a/xorg/libXmu/depends
+++ /dev/null
@@ -1,3 +0,0 @@
-libXext
-libXt
-xorg-util-macros make
diff --git a/xorg/libXmu/meta b/xorg/libXmu/meta
deleted file mode 100644
index 21de9e2f..00000000
--- a/xorg/libXmu/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: X Miscellaneous Utilities library
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/libXmu/sources b/xorg/libXmu/sources
deleted file mode 100644
index 0fa856ef..00000000
--- a/xorg/libXmu/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://x.org/releases/individual/lib/libXmu-1.1.4.tar.xz
diff --git a/xorg/libXmu/version b/xorg/libXmu/version
deleted file mode 100644
index b01ca96f..00000000
--- a/xorg/libXmu/version
+++ /dev/null
@@ -1 +0,0 @@
-1.1.4 1
-- 
cgit v1.2.3


From 53fc24a825185071526b38d69c658694b7dae4b3 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:47:27 +0100
Subject: libXrandr: move to extra

---
 extra/libXrandr/build     | 7 +++++++
 extra/libXrandr/checksums | 2 ++
 extra/libXrandr/depends   | 3 +++
 extra/libXrandr/meta      | 3 +++
 extra/libXrandr/sources   | 1 +
 extra/libXrandr/version   | 1 +
 xorg/libXrandr/build      | 7 -------
 xorg/libXrandr/checksums  | 2 --
 xorg/libXrandr/depends    | 3 ---
 xorg/libXrandr/meta       | 3 ---
 xorg/libXrandr/sources    | 1 -
 xorg/libXrandr/version    | 1 -
 12 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100755 extra/libXrandr/build
 create mode 100644 extra/libXrandr/checksums
 create mode 100644 extra/libXrandr/depends
 create mode 100644 extra/libXrandr/meta
 create mode 100644 extra/libXrandr/sources
 create mode 100644 extra/libXrandr/version
 delete mode 100755 xorg/libXrandr/build
 delete mode 100644 xorg/libXrandr/checksums
 delete mode 100644 xorg/libXrandr/depends
 delete mode 100644 xorg/libXrandr/meta
 delete mode 100644 xorg/libXrandr/sources
 delete mode 100644 xorg/libXrandr/version

diff --git a/extra/libXrandr/build b/extra/libXrandr/build
new file mode 100755
index 00000000..6daf22f8
--- /dev/null
+++ b/extra/libXrandr/build
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr
+
+make
+make DESTDIR="$1" install
diff --git a/extra/libXrandr/checksums b/extra/libXrandr/checksums
new file mode 100644
index 00000000..9c2ec42f
--- /dev/null
+++ b/extra/libXrandr/checksums
@@ -0,0 +1,2 @@
+%BLAKE3
+2314d3ac7992756a3bd9dd2c08694fc52b86018824bc0339cfbb1f38fc971b63  libXrandr-1.5.3.tar.xz
diff --git a/extra/libXrandr/depends b/extra/libXrandr/depends
new file mode 100644
index 00000000..d6cc170c
--- /dev/null
+++ b/extra/libXrandr/depends
@@ -0,0 +1,3 @@
+xorgproto  make
+libXext    make
+libXrender make
diff --git a/extra/libXrandr/meta b/extra/libXrandr/meta
new file mode 100644
index 00000000..54d0e26c
--- /dev/null
+++ b/extra/libXrandr/meta
@@ -0,0 +1,3 @@
+description: X RandR library
+license: MIT
+maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/extra/libXrandr/sources b/extra/libXrandr/sources
new file mode 100644
index 00000000..7ea73371
--- /dev/null
+++ b/extra/libXrandr/sources
@@ -0,0 +1 @@
+https://www.x.org/releases/individual/lib/libXrandr-1.5.3.tar.xz
diff --git a/extra/libXrandr/version b/extra/libXrandr/version
new file mode 100644
index 00000000..dae12545
--- /dev/null
+++ b/extra/libXrandr/version
@@ -0,0 +1 @@
+1.5.3 1
diff --git a/xorg/libXrandr/build b/xorg/libXrandr/build
deleted file mode 100755
index 6daf22f8..00000000
--- a/xorg/libXrandr/build
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/libXrandr/checksums b/xorg/libXrandr/checksums
deleted file mode 100644
index 9c2ec42f..00000000
--- a/xorg/libXrandr/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-2314d3ac7992756a3bd9dd2c08694fc52b86018824bc0339cfbb1f38fc971b63  libXrandr-1.5.3.tar.xz
diff --git a/xorg/libXrandr/depends b/xorg/libXrandr/depends
deleted file mode 100644
index d6cc170c..00000000
--- a/xorg/libXrandr/depends
+++ /dev/null
@@ -1,3 +0,0 @@
-xorgproto  make
-libXext    make
-libXrender make
diff --git a/xorg/libXrandr/meta b/xorg/libXrandr/meta
deleted file mode 100644
index 54d0e26c..00000000
--- a/xorg/libXrandr/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: X RandR library
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/libXrandr/sources b/xorg/libXrandr/sources
deleted file mode 100644
index 7ea73371..00000000
--- a/xorg/libXrandr/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/lib/libXrandr-1.5.3.tar.xz
diff --git a/xorg/libXrandr/version b/xorg/libXrandr/version
deleted file mode 100644
index dae12545..00000000
--- a/xorg/libXrandr/version
+++ /dev/null
@@ -1 +0,0 @@
-1.5.3 1
-- 
cgit v1.2.3


From 90ff1580f9601691f4bd4d89ecf56ae4195e97cd Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:47:27 +0100
Subject: libXrender: move to extra

---
 extra/libXrender/build     | 7 +++++++
 extra/libXrender/checksums | 2 ++
 extra/libXrender/depends   | 2 ++
 extra/libXrender/meta      | 3 +++
 extra/libXrender/sources   | 1 +
 extra/libXrender/version   | 1 +
 xorg/libXrender/build      | 7 -------
 xorg/libXrender/checksums  | 2 --
 xorg/libXrender/depends    | 2 --
 xorg/libXrender/meta       | 3 ---
 xorg/libXrender/sources    | 1 -
 xorg/libXrender/version    | 1 -
 12 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100755 extra/libXrender/build
 create mode 100644 extra/libXrender/checksums
 create mode 100644 extra/libXrender/depends
 create mode 100644 extra/libXrender/meta
 create mode 100644 extra/libXrender/sources
 create mode 100644 extra/libXrender/version
 delete mode 100755 xorg/libXrender/build
 delete mode 100644 xorg/libXrender/checksums
 delete mode 100644 xorg/libXrender/depends
 delete mode 100644 xorg/libXrender/meta
 delete mode 100644 xorg/libXrender/sources
 delete mode 100644 xorg/libXrender/version

diff --git a/extra/libXrender/build b/extra/libXrender/build
new file mode 100755
index 00000000..6daf22f8
--- /dev/null
+++ b/extra/libXrender/build
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr
+
+make
+make DESTDIR="$1" install
diff --git a/extra/libXrender/checksums b/extra/libXrender/checksums
new file mode 100644
index 00000000..38212cd5
--- /dev/null
+++ b/extra/libXrender/checksums
@@ -0,0 +1,2 @@
+%BLAKE3
+8cdf98296589bb996f2c7bdd6136677c8e187d8497768cf09809d8472e331b52  libXrender-0.9.11.tar.xz
diff --git a/extra/libXrender/depends b/extra/libXrender/depends
new file mode 100644
index 00000000..5c4191a2
--- /dev/null
+++ b/extra/libXrender/depends
@@ -0,0 +1,2 @@
+xorgproto make
+libXext   make
diff --git a/extra/libXrender/meta b/extra/libXrender/meta
new file mode 100644
index 00000000..7f3628ac
--- /dev/null
+++ b/extra/libXrender/meta
@@ -0,0 +1,3 @@
+description: X render library
+license: MIT
+maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/extra/libXrender/sources b/extra/libXrender/sources
new file mode 100644
index 00000000..370bdc26
--- /dev/null
+++ b/extra/libXrender/sources
@@ -0,0 +1 @@
+https://www.x.org/releases/individual/lib/libXrender-0.9.11.tar.xz
diff --git a/extra/libXrender/version b/extra/libXrender/version
new file mode 100644
index 00000000..0f12b448
--- /dev/null
+++ b/extra/libXrender/version
@@ -0,0 +1 @@
+0.9.11 1
diff --git a/xorg/libXrender/build b/xorg/libXrender/build
deleted file mode 100755
index 6daf22f8..00000000
--- a/xorg/libXrender/build
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/libXrender/checksums b/xorg/libXrender/checksums
deleted file mode 100644
index 38212cd5..00000000
--- a/xorg/libXrender/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-8cdf98296589bb996f2c7bdd6136677c8e187d8497768cf09809d8472e331b52  libXrender-0.9.11.tar.xz
diff --git a/xorg/libXrender/depends b/xorg/libXrender/depends
deleted file mode 100644
index 5c4191a2..00000000
--- a/xorg/libXrender/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-xorgproto make
-libXext   make
diff --git a/xorg/libXrender/meta b/xorg/libXrender/meta
deleted file mode 100644
index 7f3628ac..00000000
--- a/xorg/libXrender/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: X render library
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/libXrender/sources b/xorg/libXrender/sources
deleted file mode 100644
index 370bdc26..00000000
--- a/xorg/libXrender/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/lib/libXrender-0.9.11.tar.xz
diff --git a/xorg/libXrender/version b/xorg/libXrender/version
deleted file mode 100644
index 0f12b448..00000000
--- a/xorg/libXrender/version
+++ /dev/null
@@ -1 +0,0 @@
-0.9.11 1
-- 
cgit v1.2.3


From 3a3efdbde1f75e8e33ab101e18b93709eecbb378 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:47:27 +0100
Subject: libXt: move to extra

---
 extra/libXt/build     | 8 ++++++++
 extra/libXt/checksums | 1 +
 extra/libXt/depends   | 3 +++
 extra/libXt/meta      | 3 +++
 extra/libXt/sources   | 1 +
 extra/libXt/version   | 1 +
 xorg/libXt/build      | 8 --------
 xorg/libXt/checksums  | 1 -
 xorg/libXt/depends    | 3 ---
 xorg/libXt/meta       | 3 ---
 xorg/libXt/sources    | 1 -
 xorg/libXt/version    | 1 -
 12 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100755 extra/libXt/build
 create mode 100644 extra/libXt/checksums
 create mode 100644 extra/libXt/depends
 create mode 100644 extra/libXt/meta
 create mode 100644 extra/libXt/sources
 create mode 100644 extra/libXt/version
 delete mode 100755 xorg/libXt/build
 delete mode 100644 xorg/libXt/checksums
 delete mode 100644 xorg/libXt/depends
 delete mode 100644 xorg/libXt/meta
 delete mode 100644 xorg/libXt/sources
 delete mode 100644 xorg/libXt/version

diff --git a/extra/libXt/build b/extra/libXt/build
new file mode 100755
index 00000000..105ed0c2
--- /dev/null
+++ b/extra/libXt/build
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr \
+    --enable-malloc0returnsnull
+
+make
+make DESTDIR="$1" install
diff --git a/extra/libXt/checksums b/extra/libXt/checksums
new file mode 100644
index 00000000..179c17d2
--- /dev/null
+++ b/extra/libXt/checksums
@@ -0,0 +1 @@
+679cc08f1646dbd27f5e48ffe8dd49406102937109130caab02ca32c083a3d60  libXt-1.2.1.tar.bz2
diff --git a/extra/libXt/depends b/extra/libXt/depends
new file mode 100644
index 00000000..f33f2ce9
--- /dev/null
+++ b/extra/libXt/depends
@@ -0,0 +1,3 @@
+libSM
+libX11
+xorgproto make
diff --git a/extra/libXt/meta b/extra/libXt/meta
new file mode 100644
index 00000000..2b11d35f
--- /dev/null
+++ b/extra/libXt/meta
@@ -0,0 +1,3 @@
+description: X toolkit library
+license: MIT
+maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/extra/libXt/sources b/extra/libXt/sources
new file mode 100644
index 00000000..c521187e
--- /dev/null
+++ b/extra/libXt/sources
@@ -0,0 +1 @@
+https://www.x.org/releases/individual/lib/libXt-1.2.1.tar.bz2
diff --git a/extra/libXt/version b/extra/libXt/version
new file mode 100644
index 00000000..cd3d02bc
--- /dev/null
+++ b/extra/libXt/version
@@ -0,0 +1 @@
+1.2.1 1
diff --git a/xorg/libXt/build b/xorg/libXt/build
deleted file mode 100755
index 105ed0c2..00000000
--- a/xorg/libXt/build
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr \
-    --enable-malloc0returnsnull
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/libXt/checksums b/xorg/libXt/checksums
deleted file mode 100644
index 179c17d2..00000000
--- a/xorg/libXt/checksums
+++ /dev/null
@@ -1 +0,0 @@
-679cc08f1646dbd27f5e48ffe8dd49406102937109130caab02ca32c083a3d60  libXt-1.2.1.tar.bz2
diff --git a/xorg/libXt/depends b/xorg/libXt/depends
deleted file mode 100644
index f33f2ce9..00000000
--- a/xorg/libXt/depends
+++ /dev/null
@@ -1,3 +0,0 @@
-libSM
-libX11
-xorgproto make
diff --git a/xorg/libXt/meta b/xorg/libXt/meta
deleted file mode 100644
index 2b11d35f..00000000
--- a/xorg/libXt/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: X toolkit library
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/libXt/sources b/xorg/libXt/sources
deleted file mode 100644
index c521187e..00000000
--- a/xorg/libXt/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/lib/libXt-1.2.1.tar.bz2
diff --git a/xorg/libXt/version b/xorg/libXt/version
deleted file mode 100644
index cd3d02bc..00000000
--- a/xorg/libXt/version
+++ /dev/null
@@ -1 +0,0 @@
-1.2.1 1
-- 
cgit v1.2.3


From 968a7a3c3473e7ac13c7e6ae300e0618040ec944 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:47:27 +0100
Subject: libXxf86vm: move to extra

---
 extra/libXxf86vm/build     | 7 +++++++
 extra/libXxf86vm/checksums | 2 ++
 extra/libXxf86vm/depends   | 2 ++
 extra/libXxf86vm/meta      | 3 +++
 extra/libXxf86vm/sources   | 1 +
 extra/libXxf86vm/version   | 1 +
 xorg/libXxf86vm/build      | 7 -------
 xorg/libXxf86vm/checksums  | 2 --
 xorg/libXxf86vm/depends    | 2 --
 xorg/libXxf86vm/meta       | 3 ---
 xorg/libXxf86vm/sources    | 1 -
 xorg/libXxf86vm/version    | 1 -
 12 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100755 extra/libXxf86vm/build
 create mode 100644 extra/libXxf86vm/checksums
 create mode 100644 extra/libXxf86vm/depends
 create mode 100644 extra/libXxf86vm/meta
 create mode 100644 extra/libXxf86vm/sources
 create mode 100644 extra/libXxf86vm/version
 delete mode 100755 xorg/libXxf86vm/build
 delete mode 100644 xorg/libXxf86vm/checksums
 delete mode 100644 xorg/libXxf86vm/depends
 delete mode 100644 xorg/libXxf86vm/meta
 delete mode 100644 xorg/libXxf86vm/sources
 delete mode 100644 xorg/libXxf86vm/version

diff --git a/extra/libXxf86vm/build b/extra/libXxf86vm/build
new file mode 100755
index 00000000..6daf22f8
--- /dev/null
+++ b/extra/libXxf86vm/build
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr
+
+make
+make DESTDIR="$1" install
diff --git a/extra/libXxf86vm/checksums b/extra/libXxf86vm/checksums
new file mode 100644
index 00000000..ada65f1a
--- /dev/null
+++ b/extra/libXxf86vm/checksums
@@ -0,0 +1,2 @@
+%BLAKE3
+a6e597f40efecad35fd497b4f19dc39772087d108c321561ddb2614f6bfe2c21  libXxf86vm-1.1.5.tar.xz
diff --git a/extra/libXxf86vm/depends b/extra/libXxf86vm/depends
new file mode 100644
index 00000000..5c4191a2
--- /dev/null
+++ b/extra/libXxf86vm/depends
@@ -0,0 +1,2 @@
+xorgproto make
+libXext   make
diff --git a/extra/libXxf86vm/meta b/extra/libXxf86vm/meta
new file mode 100644
index 00000000..2a7d8e6d
--- /dev/null
+++ b/extra/libXxf86vm/meta
@@ -0,0 +1,3 @@
+description: XFree86-Vidmode extension library
+license: MIT
+maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/extra/libXxf86vm/sources b/extra/libXxf86vm/sources
new file mode 100644
index 00000000..c3e75ea6
--- /dev/null
+++ b/extra/libXxf86vm/sources
@@ -0,0 +1 @@
+https://www.x.org/releases/individual/lib/libXxf86vm-1.1.5.tar.xz
diff --git a/extra/libXxf86vm/version b/extra/libXxf86vm/version
new file mode 100644
index 00000000..3d29560a
--- /dev/null
+++ b/extra/libXxf86vm/version
@@ -0,0 +1 @@
+1.1.5 1
diff --git a/xorg/libXxf86vm/build b/xorg/libXxf86vm/build
deleted file mode 100755
index 6daf22f8..00000000
--- a/xorg/libXxf86vm/build
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/libXxf86vm/checksums b/xorg/libXxf86vm/checksums
deleted file mode 100644
index ada65f1a..00000000
--- a/xorg/libXxf86vm/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-a6e597f40efecad35fd497b4f19dc39772087d108c321561ddb2614f6bfe2c21  libXxf86vm-1.1.5.tar.xz
diff --git a/xorg/libXxf86vm/depends b/xorg/libXxf86vm/depends
deleted file mode 100644
index 5c4191a2..00000000
--- a/xorg/libXxf86vm/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-xorgproto make
-libXext   make
diff --git a/xorg/libXxf86vm/meta b/xorg/libXxf86vm/meta
deleted file mode 100644
index 2a7d8e6d..00000000
--- a/xorg/libXxf86vm/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: XFree86-Vidmode extension library
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/libXxf86vm/sources b/xorg/libXxf86vm/sources
deleted file mode 100644
index c3e75ea6..00000000
--- a/xorg/libXxf86vm/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/lib/libXxf86vm-1.1.5.tar.xz
diff --git a/xorg/libXxf86vm/version b/xorg/libXxf86vm/version
deleted file mode 100644
index 3d29560a..00000000
--- a/xorg/libXxf86vm/version
+++ /dev/null
@@ -1 +0,0 @@
-1.1.5 1
-- 
cgit v1.2.3


From 1fd5c31953a27c954c9a37a2857e6eaefe7d00da Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:47:27 +0100
Subject: libxshmfence: move to extra

---
 extra/libxshmfence/build     | 8 ++++++++
 extra/libxshmfence/checksums | 2 ++
 extra/libxshmfence/depends   | 1 +
 extra/libxshmfence/meta      | 3 +++
 extra/libxshmfence/sources   | 1 +
 extra/libxshmfence/version   | 1 +
 xorg/libxshmfence/build      | 8 --------
 xorg/libxshmfence/checksums  | 2 --
 xorg/libxshmfence/depends    | 1 -
 xorg/libxshmfence/meta       | 3 ---
 xorg/libxshmfence/sources    | 1 -
 xorg/libxshmfence/version    | 1 -
 12 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100755 extra/libxshmfence/build
 create mode 100644 extra/libxshmfence/checksums
 create mode 100644 extra/libxshmfence/depends
 create mode 100644 extra/libxshmfence/meta
 create mode 100644 extra/libxshmfence/sources
 create mode 100644 extra/libxshmfence/version
 delete mode 100755 xorg/libxshmfence/build
 delete mode 100644 xorg/libxshmfence/checksums
 delete mode 100644 xorg/libxshmfence/depends
 delete mode 100644 xorg/libxshmfence/meta
 delete mode 100644 xorg/libxshmfence/sources
 delete mode 100644 xorg/libxshmfence/version

diff --git a/extra/libxshmfence/build b/extra/libxshmfence/build
new file mode 100755
index 00000000..4a70bbd8
--- /dev/null
+++ b/extra/libxshmfence/build
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr \
+    --with-shared-memory-dir=/dev/shm
+
+make
+make DESTDIR="$1" install
diff --git a/extra/libxshmfence/checksums b/extra/libxshmfence/checksums
new file mode 100644
index 00000000..f617aa3c
--- /dev/null
+++ b/extra/libxshmfence/checksums
@@ -0,0 +1,2 @@
+%BLAKE3
+b3eefd5b67f263d5c83ca064f53d47148c21fb384527bf691eb2a1b879364a6b  libxshmfence-1.3.2.tar.xz
diff --git a/extra/libxshmfence/depends b/extra/libxshmfence/depends
new file mode 100644
index 00000000..32e0e265
--- /dev/null
+++ b/extra/libxshmfence/depends
@@ -0,0 +1 @@
+xorgproto make
diff --git a/extra/libxshmfence/meta b/extra/libxshmfence/meta
new file mode 100644
index 00000000..2762916b
--- /dev/null
+++ b/extra/libxshmfence/meta
@@ -0,0 +1,3 @@
+description: Shared memory SyncFence library
+license: MIT
+maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/extra/libxshmfence/sources b/extra/libxshmfence/sources
new file mode 100644
index 00000000..11f2543b
--- /dev/null
+++ b/extra/libxshmfence/sources
@@ -0,0 +1 @@
+https://www.x.org/releases/individual/lib/libxshmfence-1.3.2.tar.xz
diff --git a/extra/libxshmfence/version b/extra/libxshmfence/version
new file mode 100644
index 00000000..a8cebfe5
--- /dev/null
+++ b/extra/libxshmfence/version
@@ -0,0 +1 @@
+1.3.2 1
diff --git a/xorg/libxshmfence/build b/xorg/libxshmfence/build
deleted file mode 100755
index 4a70bbd8..00000000
--- a/xorg/libxshmfence/build
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr \
-    --with-shared-memory-dir=/dev/shm
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/libxshmfence/checksums b/xorg/libxshmfence/checksums
deleted file mode 100644
index f617aa3c..00000000
--- a/xorg/libxshmfence/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-b3eefd5b67f263d5c83ca064f53d47148c21fb384527bf691eb2a1b879364a6b  libxshmfence-1.3.2.tar.xz
diff --git a/xorg/libxshmfence/depends b/xorg/libxshmfence/depends
deleted file mode 100644
index 32e0e265..00000000
--- a/xorg/libxshmfence/depends
+++ /dev/null
@@ -1 +0,0 @@
-xorgproto make
diff --git a/xorg/libxshmfence/meta b/xorg/libxshmfence/meta
deleted file mode 100644
index 2762916b..00000000
--- a/xorg/libxshmfence/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: Shared memory SyncFence library
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/libxshmfence/sources b/xorg/libxshmfence/sources
deleted file mode 100644
index 11f2543b..00000000
--- a/xorg/libxshmfence/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/lib/libxshmfence-1.3.2.tar.xz
diff --git a/xorg/libxshmfence/version b/xorg/libxshmfence/version
deleted file mode 100644
index a8cebfe5..00000000
--- a/xorg/libxshmfence/version
+++ /dev/null
@@ -1 +0,0 @@
-1.3.2 1
-- 
cgit v1.2.3


From 24635e0d85d5af31a3c97a1dd5d76044c3574b0a Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:47:27 +0100
Subject: xkbcomp: move to extra

---
 extra/xkbcomp/build     | 10 ++++++++++
 extra/xkbcomp/checksums |  2 ++
 extra/xkbcomp/depends   |  2 ++
 extra/xkbcomp/meta      |  3 +++
 extra/xkbcomp/sources   |  1 +
 extra/xkbcomp/version   |  1 +
 xorg/xkbcomp/build      | 10 ----------
 xorg/xkbcomp/checksums  |  2 --
 xorg/xkbcomp/depends    |  2 --
 xorg/xkbcomp/meta       |  3 ---
 xorg/xkbcomp/sources    |  1 -
 xorg/xkbcomp/version    |  1 -
 12 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100755 extra/xkbcomp/build
 create mode 100644 extra/xkbcomp/checksums
 create mode 100644 extra/xkbcomp/depends
 create mode 100644 extra/xkbcomp/meta
 create mode 100644 extra/xkbcomp/sources
 create mode 100644 extra/xkbcomp/version
 delete mode 100755 xorg/xkbcomp/build
 delete mode 100644 xorg/xkbcomp/checksums
 delete mode 100644 xorg/xkbcomp/depends
 delete mode 100644 xorg/xkbcomp/meta
 delete mode 100644 xorg/xkbcomp/sources
 delete mode 100644 xorg/xkbcomp/version

diff --git a/extra/xkbcomp/build b/extra/xkbcomp/build
new file mode 100755
index 00000000..75e3546c
--- /dev/null
+++ b/extra/xkbcomp/build
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+export LDFLAGS="$LDFLAGS -static"
+export PKG_CONFIG="pkgconf --static"
+
+./configure \
+    --prefix=/usr
+
+make
+make DESTDIR="$1" install
diff --git a/extra/xkbcomp/checksums b/extra/xkbcomp/checksums
new file mode 100644
index 00000000..627389af
--- /dev/null
+++ b/extra/xkbcomp/checksums
@@ -0,0 +1,2 @@
+%BLAKE3
+4012e83cec9a3b54bd899e6d9b664275633d50d1523ff2e428e5fdf932cf3713  xkbcomp-1.4.6.tar.xz
diff --git a/extra/xkbcomp/depends b/extra/xkbcomp/depends
new file mode 100644
index 00000000..6d64af8e
--- /dev/null
+++ b/extra/xkbcomp/depends
@@ -0,0 +1,2 @@
+libX11     make
+libxkbfile make
diff --git a/extra/xkbcomp/meta b/extra/xkbcomp/meta
new file mode 100644
index 00000000..1ea9f6b5
--- /dev/null
+++ b/extra/xkbcomp/meta
@@ -0,0 +1,3 @@
+description: XKBG keymap compiler
+license: MIT
+maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/extra/xkbcomp/sources b/extra/xkbcomp/sources
new file mode 100644
index 00000000..63579cac
--- /dev/null
+++ b/extra/xkbcomp/sources
@@ -0,0 +1 @@
+https://www.x.org/releases/individual/app/xkbcomp-1.4.6.tar.xz
diff --git a/extra/xkbcomp/version b/extra/xkbcomp/version
new file mode 100644
index 00000000..ef2ab5a0
--- /dev/null
+++ b/extra/xkbcomp/version
@@ -0,0 +1 @@
+1.4.6 1
diff --git a/xorg/xkbcomp/build b/xorg/xkbcomp/build
deleted file mode 100755
index 75e3546c..00000000
--- a/xorg/xkbcomp/build
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh -e
-
-export LDFLAGS="$LDFLAGS -static"
-export PKG_CONFIG="pkgconf --static"
-
-./configure \
-    --prefix=/usr
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/xkbcomp/checksums b/xorg/xkbcomp/checksums
deleted file mode 100644
index 627389af..00000000
--- a/xorg/xkbcomp/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-4012e83cec9a3b54bd899e6d9b664275633d50d1523ff2e428e5fdf932cf3713  xkbcomp-1.4.6.tar.xz
diff --git a/xorg/xkbcomp/depends b/xorg/xkbcomp/depends
deleted file mode 100644
index 6d64af8e..00000000
--- a/xorg/xkbcomp/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-libX11     make
-libxkbfile make
diff --git a/xorg/xkbcomp/meta b/xorg/xkbcomp/meta
deleted file mode 100644
index 1ea9f6b5..00000000
--- a/xorg/xkbcomp/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: XKBG keymap compiler
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/xkbcomp/sources b/xorg/xkbcomp/sources
deleted file mode 100644
index 63579cac..00000000
--- a/xorg/xkbcomp/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/app/xkbcomp-1.4.6.tar.xz
diff --git a/xorg/xkbcomp/version b/xorg/xkbcomp/version
deleted file mode 100644
index ef2ab5a0..00000000
--- a/xorg/xkbcomp/version
+++ /dev/null
@@ -1 +0,0 @@
-1.4.6 1
-- 
cgit v1.2.3


From dcfb7a55ed9f5a41af396ae41d8327d5da348667 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:47:27 +0100
Subject: xkeyboard-config: move to extra

---
 extra/xkeyboard-config/build     | 9 +++++++++
 extra/xkeyboard-config/checksums | 2 ++
 extra/xkeyboard-config/depends   | 2 ++
 extra/xkeyboard-config/meta      | 3 +++
 extra/xkeyboard-config/sources   | 1 +
 extra/xkeyboard-config/version   | 1 +
 xorg/xkeyboard-config/build      | 9 ---------
 xorg/xkeyboard-config/checksums  | 2 --
 xorg/xkeyboard-config/depends    | 2 --
 xorg/xkeyboard-config/meta       | 3 ---
 xorg/xkeyboard-config/sources    | 1 -
 xorg/xkeyboard-config/version    | 1 -
 12 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100755 extra/xkeyboard-config/build
 create mode 100644 extra/xkeyboard-config/checksums
 create mode 100644 extra/xkeyboard-config/depends
 create mode 100644 extra/xkeyboard-config/meta
 create mode 100644 extra/xkeyboard-config/sources
 create mode 100644 extra/xkeyboard-config/version
 delete mode 100755 xorg/xkeyboard-config/build
 delete mode 100644 xorg/xkeyboard-config/checksums
 delete mode 100644 xorg/xkeyboard-config/depends
 delete mode 100644 xorg/xkeyboard-config/meta
 delete mode 100644 xorg/xkeyboard-config/sources
 delete mode 100644 xorg/xkeyboard-config/version

diff --git a/extra/xkeyboard-config/build b/extra/xkeyboard-config/build
new file mode 100755
index 00000000..20b55fd4
--- /dev/null
+++ b/extra/xkeyboard-config/build
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+export DESTDIR="$1"
+
+cl-meson \
+    . output
+
+ninja -C output
+ninja -C output install
diff --git a/extra/xkeyboard-config/checksums b/extra/xkeyboard-config/checksums
new file mode 100644
index 00000000..04c02ea6
--- /dev/null
+++ b/extra/xkeyboard-config/checksums
@@ -0,0 +1,2 @@
+%BLAKE3
+f690ca002bd7671a8e255fe1e647dd319787e5d99b6deacae3f215d6074e1cf7  xkeyboard-config-2.37.tar.xz
diff --git a/extra/xkeyboard-config/depends b/extra/xkeyboard-config/depends
new file mode 100644
index 00000000..0f146e0c
--- /dev/null
+++ b/extra/xkeyboard-config/depends
@@ -0,0 +1,2 @@
+libX11  make
+xkbcomp
diff --git a/extra/xkeyboard-config/meta b/extra/xkeyboard-config/meta
new file mode 100644
index 00000000..815fa0be
--- /dev/null
+++ b/extra/xkeyboard-config/meta
@@ -0,0 +1,3 @@
+description: X Keyboard configuration database
+license: MIT
+maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/extra/xkeyboard-config/sources b/extra/xkeyboard-config/sources
new file mode 100644
index 00000000..0ffaeb19
--- /dev/null
+++ b/extra/xkeyboard-config/sources
@@ -0,0 +1 @@
+https://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.37.tar.xz
diff --git a/extra/xkeyboard-config/version b/extra/xkeyboard-config/version
new file mode 100644
index 00000000..c304d360
--- /dev/null
+++ b/extra/xkeyboard-config/version
@@ -0,0 +1 @@
+2.37 1
diff --git a/xorg/xkeyboard-config/build b/xorg/xkeyboard-config/build
deleted file mode 100755
index 20b55fd4..00000000
--- a/xorg/xkeyboard-config/build
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-export DESTDIR="$1"
-
-cl-meson \
-    . output
-
-ninja -C output
-ninja -C output install
diff --git a/xorg/xkeyboard-config/checksums b/xorg/xkeyboard-config/checksums
deleted file mode 100644
index 04c02ea6..00000000
--- a/xorg/xkeyboard-config/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-f690ca002bd7671a8e255fe1e647dd319787e5d99b6deacae3f215d6074e1cf7  xkeyboard-config-2.37.tar.xz
diff --git a/xorg/xkeyboard-config/depends b/xorg/xkeyboard-config/depends
deleted file mode 100644
index 0f146e0c..00000000
--- a/xorg/xkeyboard-config/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-libX11  make
-xkbcomp
diff --git a/xorg/xkeyboard-config/meta b/xorg/xkeyboard-config/meta
deleted file mode 100644
index 815fa0be..00000000
--- a/xorg/xkeyboard-config/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: X Keyboard configuration database
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/xkeyboard-config/sources b/xorg/xkeyboard-config/sources
deleted file mode 100644
index 0ffaeb19..00000000
--- a/xorg/xkeyboard-config/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.37.tar.xz
diff --git a/xorg/xkeyboard-config/version b/xorg/xkeyboard-config/version
deleted file mode 100644
index c304d360..00000000
--- a/xorg/xkeyboard-config/version
+++ /dev/null
@@ -1 +0,0 @@
-2.37 1
-- 
cgit v1.2.3


From b70d8ce3b4948d0c445c9095ff8486e9abcb7ac4 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:47:27 +0100
Subject: xorg-util-macros: move to extra

---
 extra/xorg-util-macros/build     | 7 +++++++
 extra/xorg-util-macros/checksums | 1 +
 extra/xorg-util-macros/meta      | 3 +++
 extra/xorg-util-macros/sources   | 1 +
 extra/xorg-util-macros/version   | 1 +
 xorg/xorg-util-macros/build      | 7 -------
 xorg/xorg-util-macros/checksums  | 1 -
 xorg/xorg-util-macros/meta       | 3 ---
 xorg/xorg-util-macros/sources    | 1 -
 xorg/xorg-util-macros/version    | 1 -
 10 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100755 extra/xorg-util-macros/build
 create mode 100644 extra/xorg-util-macros/checksums
 create mode 100644 extra/xorg-util-macros/meta
 create mode 100644 extra/xorg-util-macros/sources
 create mode 100644 extra/xorg-util-macros/version
 delete mode 100755 xorg/xorg-util-macros/build
 delete mode 100644 xorg/xorg-util-macros/checksums
 delete mode 100644 xorg/xorg-util-macros/meta
 delete mode 100644 xorg/xorg-util-macros/sources
 delete mode 100644 xorg/xorg-util-macros/version

diff --git a/extra/xorg-util-macros/build b/extra/xorg-util-macros/build
new file mode 100755
index 00000000..6daf22f8
--- /dev/null
+++ b/extra/xorg-util-macros/build
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr
+
+make
+make DESTDIR="$1" install
diff --git a/extra/xorg-util-macros/checksums b/extra/xorg-util-macros/checksums
new file mode 100644
index 00000000..8a4223f6
--- /dev/null
+++ b/extra/xorg-util-macros/checksums
@@ -0,0 +1 @@
+0f812e6e9d2786ba8f54b960ee563c0663ddbe2434bf24ff193f5feab1f31971  util-macros-1.19.3.tar.bz2
diff --git a/extra/xorg-util-macros/meta b/extra/xorg-util-macros/meta
new file mode 100644
index 00000000..67bf6340
--- /dev/null
+++ b/extra/xorg-util-macros/meta
@@ -0,0 +1,3 @@
+description: Autotool macros for Xorg
+license: MIT
+maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/extra/xorg-util-macros/sources b/extra/xorg-util-macros/sources
new file mode 100644
index 00000000..665a9674
--- /dev/null
+++ b/extra/xorg-util-macros/sources
@@ -0,0 +1 @@
+https://www.x.org/releases/individual/util/util-macros-1.19.3.tar.bz2
diff --git a/extra/xorg-util-macros/version b/extra/xorg-util-macros/version
new file mode 100644
index 00000000..b0cd5b13
--- /dev/null
+++ b/extra/xorg-util-macros/version
@@ -0,0 +1 @@
+1.19.3 1
diff --git a/xorg/xorg-util-macros/build b/xorg/xorg-util-macros/build
deleted file mode 100755
index 6daf22f8..00000000
--- a/xorg/xorg-util-macros/build
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/xorg-util-macros/checksums b/xorg/xorg-util-macros/checksums
deleted file mode 100644
index 8a4223f6..00000000
--- a/xorg/xorg-util-macros/checksums
+++ /dev/null
@@ -1 +0,0 @@
-0f812e6e9d2786ba8f54b960ee563c0663ddbe2434bf24ff193f5feab1f31971  util-macros-1.19.3.tar.bz2
diff --git a/xorg/xorg-util-macros/meta b/xorg/xorg-util-macros/meta
deleted file mode 100644
index 67bf6340..00000000
--- a/xorg/xorg-util-macros/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: Autotool macros for Xorg
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/xorg-util-macros/sources b/xorg/xorg-util-macros/sources
deleted file mode 100644
index 665a9674..00000000
--- a/xorg/xorg-util-macros/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.x.org/releases/individual/util/util-macros-1.19.3.tar.bz2
diff --git a/xorg/xorg-util-macros/version b/xorg/xorg-util-macros/version
deleted file mode 100644
index b0cd5b13..00000000
--- a/xorg/xorg-util-macros/version
+++ /dev/null
@@ -1 +0,0 @@
-1.19.3 1
-- 
cgit v1.2.3


From 8e48549f09d3f585118b984a1065a8d803f0303d Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 12 Jan 2023 17:47:27 +0100
Subject: xorgproto: move to extra

---
 extra/xorgproto/build     | 8 ++++++++
 extra/xorgproto/checksums | 2 ++
 extra/xorgproto/meta      | 3 +++
 extra/xorgproto/sources   | 1 +
 extra/xorgproto/version   | 1 +
 xorg/xorgproto/build      | 8 --------
 xorg/xorgproto/checksums  | 2 --
 xorg/xorgproto/meta       | 3 ---
 xorg/xorgproto/sources    | 1 -
 xorg/xorgproto/version    | 1 -
 10 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100755 extra/xorgproto/build
 create mode 100644 extra/xorgproto/checksums
 create mode 100644 extra/xorgproto/meta
 create mode 100644 extra/xorgproto/sources
 create mode 100644 extra/xorgproto/version
 delete mode 100755 xorg/xorgproto/build
 delete mode 100644 xorg/xorgproto/checksums
 delete mode 100644 xorg/xorgproto/meta
 delete mode 100644 xorg/xorgproto/sources
 delete mode 100644 xorg/xorgproto/version

diff --git a/extra/xorgproto/build b/extra/xorgproto/build
new file mode 100755
index 00000000..20f084fe
--- /dev/null
+++ b/extra/xorgproto/build
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr \
+    --enable-legacy
+
+make
+make DESTDIR="$1" install
diff --git a/extra/xorgproto/checksums b/extra/xorgproto/checksums
new file mode 100644
index 00000000..94236635
--- /dev/null
+++ b/extra/xorgproto/checksums
@@ -0,0 +1,2 @@
+%BLAKE3
+4fe3d7fdc4dfdc192dee3102f8eceeeb1df96bdb2cc9b17d344e0879f897418a  xorgproto-2022.2.tar.gz
diff --git a/extra/xorgproto/meta b/extra/xorgproto/meta
new file mode 100644
index 00000000..3e267a2d
--- /dev/null
+++ b/extra/xorgproto/meta
@@ -0,0 +1,3 @@
+description: X11 Protocol headers
+license: MIT
+maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/extra/xorgproto/sources b/extra/xorgproto/sources
new file mode 100644
index 00000000..407b8f78
--- /dev/null
+++ b/extra/xorgproto/sources
@@ -0,0 +1 @@
+https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2022.2.tar.gz
diff --git a/extra/xorgproto/version b/extra/xorgproto/version
new file mode 100644
index 00000000..01ad9bad
--- /dev/null
+++ b/extra/xorgproto/version
@@ -0,0 +1 @@
+2022.2 1
diff --git a/xorg/xorgproto/build b/xorg/xorgproto/build
deleted file mode 100755
index 20f084fe..00000000
--- a/xorg/xorgproto/build
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr \
-    --enable-legacy
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/xorgproto/checksums b/xorg/xorgproto/checksums
deleted file mode 100644
index 94236635..00000000
--- a/xorg/xorgproto/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-4fe3d7fdc4dfdc192dee3102f8eceeeb1df96bdb2cc9b17d344e0879f897418a  xorgproto-2022.2.tar.gz
diff --git a/xorg/xorgproto/meta b/xorg/xorgproto/meta
deleted file mode 100644
index 3e267a2d..00000000
--- a/xorg/xorgproto/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: X11 Protocol headers
-license: MIT
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/xorg/xorgproto/sources b/xorg/xorgproto/sources
deleted file mode 100644
index 407b8f78..00000000
--- a/xorg/xorgproto/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2022.2.tar.gz
diff --git a/xorg/xorgproto/version b/xorg/xorgproto/version
deleted file mode 100644
index 01ad9bad..00000000
--- a/xorg/xorgproto/version
+++ /dev/null
@@ -1 +0,0 @@
-2022.2 1
-- 
cgit v1.2.3


From 5ee0305949e7a98eb79e4943c0af1f42e871e235 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Tue, 24 Jan 2023 15:09:11 +0100
Subject: dunst: drop from repository

---
 dbus/dunst/build     | 15 ---------------
 dbus/dunst/checksums |  2 --
 dbus/dunst/depends   | 12 ------------
 dbus/dunst/meta      |  3 ---
 dbus/dunst/sources   |  1 -
 dbus/dunst/version   |  1 -
 6 files changed, 34 deletions(-)
 delete mode 100755 dbus/dunst/build
 delete mode 100644 dbus/dunst/checksums
 delete mode 100644 dbus/dunst/depends
 delete mode 100644 dbus/dunst/meta
 delete mode 100644 dbus/dunst/sources
 delete mode 100644 dbus/dunst/version

diff --git a/dbus/dunst/build b/dbus/dunst/build
deleted file mode 100755
index 08bb2faa..00000000
--- a/dbus/dunst/build
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-
-export DESTDIR="$1"
-
-mk() { 
-    make \
-        PREFIX=/usr \
-        MANDIR=/usr/share \
-        DESTDIR="$DESTDIR" \
-        WAYLAND="$(cpt l -C wayland 1 0)" \
-        "$@" 
-}
-
-mk dunst dunstify
-mk install
diff --git a/dbus/dunst/checksums b/dbus/dunst/checksums
deleted file mode 100644
index 2436b786..00000000
--- a/dbus/dunst/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-%BLAKE3
-8274168a1cf80d3f18aa04849b31f48afb275035096707c63a89232830428c17  v1.9.0.tar.gz
diff --git a/dbus/dunst/depends b/dbus/dunst/depends
deleted file mode 100644
index 54679aa1..00000000
--- a/dbus/dunst/depends
+++ /dev/null
@@ -1,12 +0,0 @@
-cairo
-dbus
-freetype-harfbuzz
-gdk-pixbuf
-glib
-libX11
-libXScrnSaver
-libXext
-libXinerama
-libXrandr
-libnotify
-pango
diff --git a/dbus/dunst/meta b/dbus/dunst/meta
deleted file mode 100644
index 35db9e33..00000000
--- a/dbus/dunst/meta
+++ /dev/null
@@ -1,3 +0,0 @@
-description: Lightweight notification daemon
-license: BSD-3-Clause
-maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/dbus/dunst/sources b/dbus/dunst/sources
deleted file mode 100644
index 4d566f1e..00000000
--- a/dbus/dunst/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/dunst-project/dunst/archive/v1.9.0.tar.gz
diff --git a/dbus/dunst/version b/dbus/dunst/version
deleted file mode 100644
index 67fe23c8..00000000
--- a/dbus/dunst/version
+++ /dev/null
@@ -1 +0,0 @@
-1.9.0 1
-- 
cgit v1.2.3