From ffbf4acfe9b800c0c3d8135fcf037dda62cfcd3e Mon Sep 17 00:00:00 2001
From: Gerben Jan Dijkman <gjdijkman@outlook.com>
Date: Wed, 8 Dec 2021 17:58:34 +0100
Subject: [PATCH] Updated to 5.15.0 for the pinephone pro

---
 sys-kernel/pinephone-sources/Manifest         |  4 +--
 ...ld => pinephone-sources-5.16.0_rc2.ebuild} | 34 ++++++++-----------
 2 files changed, 15 insertions(+), 23 deletions(-)
 rename sys-kernel/pinephone-sources/{pinephone-sources-5.15.2.ebuild => pinephone-sources-5.16.0_rc2.ebuild} (66%)

diff --git a/sys-kernel/pinephone-sources/Manifest b/sys-kernel/pinephone-sources/Manifest
index ae95694..37fbad6 100644
--- a/sys-kernel/pinephone-sources/Manifest
+++ b/sys-kernel/pinephone-sources/Manifest
@@ -1,6 +1,4 @@
 DIST all-5.12.17.patch 15073524 BLAKE2B bd085b619a3bc1190cbfdc6bfd74cd6606f67f55106f89e0522619aaf69b672d68a7e93d843d7a4680529532e654d71becf4a7378d453fcc72978ee24d415b57 SHA512 e4bae86407767b685b3ec47f383d2db44281fe6a58914e4a117449c2ff96fe3c6341a7b59d1a92790c1565ecc3c14dacbbdc96fbc1b718ec7402c27c2dc37d0d
-DIST all-5.15.2.patch 15521358 BLAKE2B 3979612d6c0b949cd1cc3a915a590d91ade30913b3daf9bbf3794a58c2139abf46e407ddee6641308d0265ebbeb675b051697a3cc18ec7b028cd7da9e06748b6 SHA512 3bcb9774c126fb704c028775856c5ba92760c313ade8301e99e46fed10a0e3848b5982d4ba4d989ed7f4a29a2e2d9c679105ea108719e87f18307e6f636a3a3c
 DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
-DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST patch-5.12.17.xz 889940 BLAKE2B 78c10887c9c28261f5a99c3ed19c9390d8af92ee49dd4dd13092493e71c446fa58b9025eecb3ea8f605f1c3644c5ef85a25c056a4fbe143eb91f49eb9b2b866b SHA512 1c42b4efa3d26fb4bdc96c422a32646b2d9018cb84d231ccae4c64e1cdd342ed43828c6da3eb40cbe80550734254b8e824cec98cb1635d47baef75bae37bfd31
-DIST patch-5.15.2.xz 17244 BLAKE2B 769ef83b6613d865b420d048c25ac1df4c2f88f7ae580b373f874d312720bad877e561756943c9833535a94e5621922bba24cb1b804a1540f2e67cfa23f1a1aa SHA512 5f0123bdc7c9875e7b3f02a89496a8a1e0808d77dc58fb725e250d93d69510a1ef6462cfb38cb38e78e20ca34fd7446f58327cad5e67fc68ec36d15777048edf
+DIST {pinephone-sources-5.16.0_rc2}.tar.gz 203356941 BLAKE2B 3de66138a7436b71009c3a3243c7a99aa72b8ba9fda58396cbde23e3f8f1c711c2a15f95b4cbfc5c5a07fcfd24d51be00b4b94d73a09149cd95f4582026c8134 SHA512 3f1982f07bd54b78e556799c13e2fa9e06f9633491e036d4190144f3c193c9bd5b9c3da5d4f84ee394552ddaa4bad10589fab0d86d35e7a3db443c660a21ab3e
diff --git a/sys-kernel/pinephone-sources/pinephone-sources-5.15.2.ebuild b/sys-kernel/pinephone-sources/pinephone-sources-5.16.0_rc2.ebuild
similarity index 66%
rename from sys-kernel/pinephone-sources/pinephone-sources-5.15.2.ebuild
rename to sys-kernel/pinephone-sources/pinephone-sources-5.16.0_rc2.ebuild
index 59d095b..be98af7 100644
--- a/sys-kernel/pinephone-sources/pinephone-sources-5.15.2.ebuild
+++ b/sys-kernel/pinephone-sources/pinephone-sources-5.16.0_rc2.ebuild
@@ -1,39 +1,33 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="8"
+EAPI="6"
+UNIPATCH_STRICTORDER="yes"
 K_NOUSENAME="yes"
 K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
 K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="5.12"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
 ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
 inherit kernel-2
 detect_version
 
-KEYWORDS="~arm64"
 
 DEPEND="${RDEPEND}
 	>=sys-devel/patch-2.7.5"
 
 DESCRIPTION="Full sources for the Linux kernel, with megi's patch for pinephone"
+HOMEPAGE="https://www.kernel.org"
 
-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}/ccu-sun50i-a64-reparent-clocks-to-lower-speed-oscillator.patch
-	#${FILESDIR}/dts-pinephone-drop-modem-power-node.patch
-	#${FILESDIR}/media-ov5640-Implement-autofocus.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
-
-	# keyboard
-	#${FILESDIR}/d1d849cae12db71aa81ceedaedc1b17a34790367.patch
-    	#${FILESDIR}/2423aac2d6f5db55da99e11fd799ee66fe6f54c6.patch
-
-)
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KERNEL_URI="https://github.com/megous/linux/archive/c6fda0a09217b8c183cf1ef4782746fcfcf055f1.tar.gz -> {$P}.tar.gz"
+SRC_URI="${KERNEL_URI}"
 
 src_prepare() {
 	default