diff --git a/temp/xkeyboard-config/0001-Add-model-for-Pine64-PinePhone-keyboard.patch b/temp/xkeyboard-config/0001-Add-model-for-Pine64-PinePhone-keyboard.patch
deleted file mode 100644
index 3448987c2..000000000
--- a/temp/xkeyboard-config/0001-Add-model-for-Pine64-PinePhone-keyboard.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 29caecafe108436ffdc947bd36844f5e3e056d7e Mon Sep 17 00:00:00 2001
-From: undef <gitlab@undef.tools>
-Date: Thu, 14 Apr 2022 08:54:12 +0000
-Subject: [PATCH] Add model for Pine64 PinePhone keyboard
-
-This adds a model for the Pine64 PinePhone Keyboard
-(https://wiki.pine64.org/wiki/PinePhone_(Pro)_Keyboard).
-Specifically, it implements the symbols listed on the top
-row of the keyboard as a third layer which are not
-available in the kernel driver.
-
-Backport by ollieparanoid from:
-https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/322
----
- rules/0002-base.lists.part |  2 +-
- rules/base.xml             |  7 +++++++
- symbols/inet               | 15 +++++++++++++++
- 3 files changed, 23 insertions(+), 1 deletion(-)
-
-diff --git a/rules/0002-base.lists.part b/rules/0002-base.lists.part
-index 75059447..8c9eaf82 100644
---- a/rules/0002-base.lists.part
-+++ b/rules/0002-base.lists.part
-@@ -37,7 +37,7 @@
-               sven sven303 symplon \
-               teck227 teck229 \
-               toshiba_s3000 trust trustda \
--              unitekkb1925 yahoo \
-+              unitekkb1925 yahoo ppkb \
-               apex300
- 
- ! $inetmediakbds = acer_ferrari4k acer_laptop btc5090 btc9019u cherryblueb \
-diff --git a/rules/base.xml b/rules/base.xml
-index 8bc0447a..ef5fe221 100644
---- a/rules/base.xml
-+++ b/rules/base.xml
-@@ -1333,6 +1333,13 @@
-        <vendor>Google</vendor>
-      </configItem>
-     </model>
-+    <model>
-+      <configItem>
-+       <name>ppkb</name>
-+       <description>PinePhone Keyboard</description>
-+       <vendor>Pine64</vendor>
-+     </configItem>
-+    </model>
-   </modelList>
-   <layoutList>
-     <layout>
-diff --git a/symbols/inet b/symbols/inet
-index 518d846e..18fa9eb5 100644
---- a/symbols/inet
-+++ b/symbols/inet
-@@ -2071,3 +2071,18 @@ xkb_symbols "teck229" {
-     include "inet(teck227)"
- };
- 
-+
-+partial alphanumeric_keys
-+xkb_symbols "ppkb" {
-+
-+    key <AE01> {        [         1,    exclam,         bar             ]       };
-+    key <AE02> {        [         2,    at,             backslash       ]       };
-+    key <AE03> {        [         3,    numbersign,     sterling        ]       };
-+    key <AE04> {        [         4,    dollar,         EuroSign        ]       };
-+    key <AE05> {        [         5,    percent,        asciitilde      ]       };
-+    key <AE06> {        [         6,    asciicircum,    grave           ]       };
-+    key <AE07> {        [         7,    ampersand,      minus           ]       };
-+    key <AE08> {        [         8,    asterisk,       equal           ]       };
-+    key <AE09> {        [         9,    parenleft,      underscore      ]       };
-+    key <AE10> {        [         0,    parenright,     plus            ]       };
-+};
--- 
-2.34.1
-
diff --git a/temp/xkeyboard-config/0002-Add-evdev-rule-for-Pine64-PinePhone-keyboard.patch b/temp/xkeyboard-config/0002-Add-evdev-rule-for-Pine64-PinePhone-keyboard.patch
deleted file mode 100644
index 5c06fbac2..000000000
--- a/temp/xkeyboard-config/0002-Add-evdev-rule-for-Pine64-PinePhone-keyboard.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 438cac05e445bbe8ef5937f25d26d99591d659dc Mon Sep 17 00:00:00 2001
-From: undef <gitlab@undef.tools>
-Date: Sat, 23 Apr 2022 02:52:20 +0000
-Subject: [PATCH] Add evdev rule for ppkb model
-
-This allows the keyboard model to be picked up automatically on wayland
-based systems.
-
-Backported by elagost from:
-https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/325
----
- rules/0026-evdev.m_s.part | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/rules/0026-evdev.m_s.part b/rules/0026-evdev.m_s.part
-index c79a02e2..2dd72051 100644
---- a/rules/0026-evdev.m_s.part
-+++ b/rules/0026-evdev.m_s.part
-@@ -1,5 +1,6 @@
- ! model		=	symbols
-   $evdevkbds    =   +inet(evdev)+inet(%m)
-   chromebook    =   +inet(evdev)+inet(chromebook)
-+  ppkb          =   +inet(evdev)+inet(ppkb)
-   applealu_jis  =   +inet(evdev)+macintosh_vndr/jp(alujiskeys)
-   *             =   +inet(evdev)
--- 
diff --git a/temp/xkeyboard-config/APKBUILD b/temp/xkeyboard-config/APKBUILD
deleted file mode 100644
index 8df03e2a5..000000000
--- a/temp/xkeyboard-config/APKBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Forked from Alpine, so we can extend the keyboard layouts
-pkgname=xkeyboard-config
-pkgver=9999
-_pkgver=2.35.1
-pkgrel=5
-pkgdesc="X keyboard configuration files"
-url="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-arch="noarch"
-license="MIT"
-subpackages="$pkgname-doc"
-makedepends="meson perl libxslt"
-source="$pkgname-$_pkgver.tar.gz::https://github.com/freedesktop/xkeyboard-config/archive/refs/tags/xkeyboard-config-$_pkgver.tar.gz
-	0001-Add-model-for-Pine64-PinePhone-keyboard.patch
-	0002-Add-evdev-rule-for-Pine64-PinePhone-keyboard.patch
-	"
-builddir="$srcdir/xkeyboard-config-xkeyboard-config-$_pkgver"
-
-build() {
-	abuild-meson . output
-	meson compile ${JOBS:+-j ${JOBS}} -C output
-}
-
-check() {
-	meson test --no-rebuild -v -C output
-}
-
-package() {
-	DESTDIR="$pkgdir" meson install --no-rebuild -C output
-}
-sha512sums="
-2016e126dd807c07cdec045089a83b5b8c2e6eac8255a80c4e5976a0defc7ad55144186457a3109765f3bfb775270296d980366fee3826ee0e3bcd957e60aa5b  xkeyboard-config-2.35.1.tar.gz
-363ac31d24d419d66be51ea22564864813c9b982779181d804707b1c3ee9507846c5061f6cf006af92faa0c0f17e39f50798baedc7d7d2ed3a69386d13602b39  0001-Add-model-for-Pine64-PinePhone-keyboard.patch
-1119257dbcaa14f005b95275a1e20e27eea70e6be09db2b2f4adf1092325eb044ac2ce02773cfcd3cedee46f50c9898e63a967d5e9b4bf538e4a993663d4bcd8  0002-Add-evdev-rule-for-Pine64-PinePhone-keyboard.patch
-"