From 5c906a0e30f01cd3f41061af6adddb872cc17f8c Mon Sep 17 00:00:00 2001
From: Gerben Jan Dijkman <gjdijkman@outlook.com>
Date: Sun, 17 Oct 2021 11:47:52 +0200
Subject: [PATCH] Version Bump

---
 .../files/{config-5.14.2 => config-5.14.9}    |  3 +-
 .../pinephone-sources-5.14.9.ebuild           | 72 +++++++++++++++++++
 .../squeekboard/squeekboard-1.14.0.ebuild     |  4 +-
 3 files changed, 76 insertions(+), 3 deletions(-)
 rename sys-kernel/pinephone-sources/files/{config-5.14.2 => config-5.14.9} (99%)
 create mode 100644 sys-kernel/pinephone-sources/pinephone-sources-5.14.9.ebuild

diff --git a/sys-kernel/pinephone-sources/files/config-5.14.2 b/sys-kernel/pinephone-sources/files/config-5.14.9
similarity index 99%
rename from sys-kernel/pinephone-sources/files/config-5.14.2
rename to sys-kernel/pinephone-sources/files/config-5.14.9
index e90373b..f001b48 100644
--- a/sys-kernel/pinephone-sources/files/config-5.14.2
+++ b/sys-kernel/pinephone-sources/files/config-5.14.9
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.14.2 Kernel Configuration
+# Linux/arm64 5.14.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-unknown-linux-gnu-gcc (Gentoo 11.2.0 p1) 11.2.0"
 CONFIG_CC_IS_GCC=y
@@ -4384,6 +4384,7 @@ CONFIG_ASHMEM=y
 # CONFIG_LTE_GDM724X is not set
 # CONFIG_GS_FPGABOOT is not set
 # CONFIG_UNISYSSPAR is not set
+# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
 # CONFIG_KS7010 is not set
 # CONFIG_XIL_AXIS_FIFO is not set
 # CONFIG_FIELDBUS_DEV is not set
diff --git a/sys-kernel/pinephone-sources/pinephone-sources-5.14.9.ebuild b/sys-kernel/pinephone-sources/pinephone-sources-5.14.9.ebuild
new file mode 100644
index 0000000..990466f
--- /dev/null
+++ b/sys-kernel/pinephone-sources/pinephone-sources-5.14.9.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_SECURITY_UNSUPPORTED="1"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+KEYWORDS="~arm64"
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.5"
+
+DESCRIPTION="Full sources for the Linux kernel, with megi's patch for pinephone"
+
+MEGI_PATCH_URI="https://xff.cz/kernels/${PV:0:4}/patches/all.patch"
+SRC_URI="${KERNEL_URI} ${MEGI_PATCH_URI} -> all-${PV}.patch"
+
+PATCHES=(
+	${DISTDIR}/all-${PV}.patch
+    ${FILESDIR}/enable-hdmi-output-pinetab.patch
+    ${FILESDIR}/enable-jack-detection-pinetab.patch
+    ${FILESDIR}/pinetab-bluetooth.patch
+    ${FILESDIR}/pinetab-accelerometer.patch
+	${FILESDIR}/dts-pinephone-drop-modem-power-node.patch
+	${FILESDIR}/media-ov5640-Implement-autofocus.patch
+	${FILESDIR}/0011-dts-pinetab-hardcode-mmc-numbers.patch
+	${FILESDIR}/0107-quirk-kernel-org-bug-210681-firmware_rome_error.patch
+	${FILESDIR}/0177-leds-gpio-make-max_brightness-configurable.patch
+    ${FILESDIR}/panic-led-5.12.patch
+	#${FILESDIR}/0178-sun8i-codec-fix-headphone-jack-pin-name.patch
+	#${FILESDIR}/0179-arm64-dts-allwinner-pinephone-improve-device-tree-5.12.patch
+    #${FILESDIR}/improve-jack-button-handling-and-mic.patch
+
+	# keyboard
+    ${FILESDIR}/d1d849cae12db71aa81ceedaedc1b17a34790367.patch
+    ${FILESDIR}/2423aac2d6f5db55da99e11fd799ee66fe6f54c6.patch
+
+	# LRU
+	${FILESDIR}/Multigenerational-LRU-Framework.patch
+)
+
+src_prepare() {
+	default
+	eapply_user
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	einfo "To build the kernel use the following command:"
+	einfo "make Image Image.gz modules"
+	einfo "make DTC_FLAGS="-@" dtbs"
+	einfo "make install; make modules_intall; make dtbs_install"
+	einfo "If you use kernel config coming with this ebuild, don't forget to also copy dracut-pp.conf to /etc/dracut.conf.d/"
+	einfo "to make sure proper kernel modules are loaded into initramfs"
+	einfo "if you want to cross compile pinephone kernel on amd64 host, follow the https://wiki.gentoo.org/wiki/Cross_build_environment"
+	einfo "to setup cross toolchain environment, then create a xmake wrapper like the following, and replace make with xmake in above commands"
+	einfo "#!/bin/sh"
+	einfo "exec make ARCH='arm64' CROSS_COMPILE='aarch64-unknown-linux-gnu-' INSTALL_MOD_PATH='${SYSROOT}' '$@'"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/x11-misc/squeekboard/squeekboard-1.14.0.ebuild b/x11-misc/squeekboard/squeekboard-1.14.0.ebuild
index a095947..35800fb 100644
--- a/x11-misc/squeekboard/squeekboard-1.14.0.ebuild
+++ b/x11-misc/squeekboard/squeekboard-1.14.0.ebuild
@@ -55,8 +55,8 @@ inherit cargo gnome2-utils meson toolchain-funcs xdg
 MY_COMMIT="19630334b07d6d2949932cf05018925cb3ab9613"
 
 DESCRIPTION="Virtual keyboard supporting Wayland, built primarily for the Librem 5 phone"
-HOMEPAGE="https://source.puri.sm/Librem5/squeekboard"
-SRC_URI="https://source.puri.sm/Librem5/squeekboard/-/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://gitlab.gnome.org/World/Phosh/squeekboard"
+SRC_URI="https://gitlab.gnome.org/World/Phosh/squeekboard/-/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
 SRC_URI+=" $(cargo_crate_uris ${CRATES})"
 
 LICENSE="GPL-3"