gentoo auto-resync : 05:01:2023 - 12:08:57

6 files changed, 106 insertions, 58 deletions

diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 6df2faefb83a..7084d1ed176b 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 427529534331..2e7bb918f5d8 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -15,6 +15,7 @@ DIST linux-6.0-pf4.tar.gz 218368702 BLAKE2B d6585d02938abd1bc587dc5d6c3597bc8b96
 DIST linux-6.0-pf5.tar.gz 218385127 BLAKE2B 21dcb503b10decda6c02f6613f022d0f300be6366afcc205cd8b84f929f384822801d1eabe69a7b88b81218ade4d465e977fd2eb9a7d41d9c5665cbf43d8c08b SHA512 1711d15dbcd77d838a2b7c710debbb0c9ddcbee16922c35df85169dd61d028b6a2e62ca202488350dc4f4f512d6d2b2a3c70a6c269d114e2886c892be4caf327
 DIST linux-6.0-pf6.tar.gz 218406147 BLAKE2B b084ffd751a3be9043ab0c306623c2ede6597fa024d72e959778a6185c83410aae7e165bd008bbbd0eddc5066d65ad342afaa4f66669190995ea1ab5a3f0b0e8 SHA512 99b766969216a0692d475a15dd6ecf36c29852e6702585c8c47f4d18516301f98c8f1aed3515ba65872e5628118fc84ddcbc8bdc816e7f4e94ce139dbe6c5035
 DIST linux-6.1-pf1.tar.gz 220692376 BLAKE2B 4d5eb13df0d433057a7b7a6c347c44f42f3edbd8cf714258d274f8c65226e9ac09b80d583088678b25865dc73c2c29085949731b425e8529a5022c590d94220e SHA512 8b54d6b79e21fd89e64faac7502d846f9b1a1f6a1ad52f3bb3ead6074f7fe8e9fa531b8fa06a22372127a66da0c0234fb114a9f707e6512e3643328173ec1729
+DIST linux-6.1-pf2.tar.gz 220718450 BLAKE2B 54ce340573f6c0144db3a77355553a49607b83ef7fe5fda308d4eb4d04c5b5014ea9241f8e17e7c2bd89b7f10567a14814d027fe1826d78f4182127a1ebfa825 SHA512 db7d28834ea60e38873823c3a83e1f6a128d34f0a698a728052cde50cee7c5f40a8b41e0ec53e069887fe4b72ea3837a5adc4deee4036e8c6bda084cac0d806b
 DIST prjc-519-r1-vd-test.patch 274504 BLAKE2B 87950689ffe97134100aa91d0ff89acd6f4e93b626ad7ab08af464a49457f16526cae7b863d53213dd129d47b6f97b3407ae7027b02656d9eba85942241e8d3f SHA512 d652b6060400329d051257fedee5d9f37a70554ab722e93a15f294d1c6229bfa227941461147e0128178b02875cdf838e0d71e89884d8c01e7549ee482213b71
 DIST prjc_v5.18-r2.patch 270353 BLAKE2B 15d7ed7a0eb6f7ad37feaf52ab7c383e1c7c3e72fb41a767c8d1151a0ad41255c216ede1e4938a041f3b628874ed61398c61dd7b0e0b62090730f2fd0f6a70db SHA512 25c558bd6281a09bb611c6cca68084b27d0f2e290d2c0575e88b6a94322fad86de6dbeda30eb77919edd5adff921ad445593d9478f115ec93fa2e4c7ed6b5c1e
 EBUILD pf-sources-5.18_p5.ebuild 2781 BLAKE2B a377fa1820f637bcab95c220e00375dc8a0f009ad728088a37e1f46c5c4c3931c9a4b9fa86d05130440d12e29534468adb488b54f8b7c1975546594d16f7a28d SHA512 4e0acd60313555185dc11e1d6310c3c4d7bdea8acb4256e9ffd985a001c72949a3065fbfa7830bc66827d56961fa523300827613bf5653ac359420f08172a62e
@@ -26,4 +27,5 @@ EBUILD pf-sources-6.0_p4.ebuild 2525 BLAKE2B 75aa743f70c2eebbf98fec6b047c40da783
 EBUILD pf-sources-6.0_p5.ebuild 2525 BLAKE2B 75aa743f70c2eebbf98fec6b047c40da783064f773ded51d04f5d90e1130956e5201a7f5892b0bbc877839b28d77c91fce37519d2fb385da63373b8edd41c20f SHA512 4d41c9ef99a4e163ca57501fc70504b84583a3b218a28a7a3b18d9da94d10835f67be2b4d41b20063176d4493c738c60ddc652685f36c84fa7fda89fe12befb7
 EBUILD pf-sources-6.0_p6.ebuild 2525 BLAKE2B 75aa743f70c2eebbf98fec6b047c40da783064f773ded51d04f5d90e1130956e5201a7f5892b0bbc877839b28d77c91fce37519d2fb385da63373b8edd41c20f SHA512 4d41c9ef99a4e163ca57501fc70504b84583a3b218a28a7a3b18d9da94d10835f67be2b4d41b20063176d4493c738c60ddc652685f36c84fa7fda89fe12befb7
 EBUILD pf-sources-6.1_p1.ebuild 2525 BLAKE2B 75aa743f70c2eebbf98fec6b047c40da783064f773ded51d04f5d90e1130956e5201a7f5892b0bbc877839b28d77c91fce37519d2fb385da63373b8edd41c20f SHA512 4d41c9ef99a4e163ca57501fc70504b84583a3b218a28a7a3b18d9da94d10835f67be2b4d41b20063176d4493c738c60ddc652685f36c84fa7fda89fe12befb7
+EBUILD pf-sources-6.1_p2.ebuild 2525 BLAKE2B b65bde480d4c533212cdede619cb66b90f884fa3d8b800f4b41ce35074c572fabf7d909ed92a2fc43424e5da21b902fcbd526a34fc7281b2d3c993b5b65aad79 SHA512 ead6cb42e0415447414fe1856e536fe8512ef5d6b18afc6cd1fdbabd9650bf1ce32ba4fabcdb6a84254e97ded5f21692115842ba328f3b12152700eb9a5d10d4
 MISC metadata.xml 346 BLAKE2B aac642a4971d6bc11e22a4885e5a4cfdaa36287a97883ed22368729e1db9bbe1baa382fc542d6f89582a0e4f43d2e78419d09716f6d215477454b72dc365e2ec SHA512 94e6a97663111931e68e8af0656691776c39b4e8cc4e96c4a257a9617413ea238400096b15729b1e3b91d60e030c6eae3789401c444692d3bf7daa7c80e78a72
diff --git a/sys-kernel/pf-sources/pf-sources-6.1_p2.ebuild b/sys-kernel/pf-sources/pf-sources-6.1_p2.ebuild
new file mode 100644
index 000000000000..e15753e77d30
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-6.1_p2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Define what default functions to run
+ETYPE="sources"
+
+# No 'experimental' USE flag provided, but we still want to use genpatches
+K_EXP_GENPATCHES_NOUSE="1"
+
+# Just get basic genpatches, -pf patch set already includes vanilla-linux updates
+K_GENPATCHES_VER="1"
+
+# -pf already sets EXTRAVERSION to kernel Makefile
+K_NOSETEXTRAVERSION="1"
+
+# Not supported by the Gentoo security team
+K_SECURITY_UNSUPPORTED="1"
+
+# We want the very basic patches from gentoo-sources, experimental patch is
+# already included in pf-sources
+K_WANT_GENPATCHES="base extras"
+
+# major kernel version, e.g. 5.14
+SHPV="${PV/_p*/}"
+
+# Replace "_p" with "-pf"
+PFPV="${PV/_p/-pf}"
+
+inherit kernel-2 optfeature
+detect_version
+
+DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
+HOMEPAGE="https://pfkernel.natalenko.name/
+	https://dev.gentoo.org/~mpagano/genpatches/"
+SRC_URI="https://codeberg.org/pf-kernel/linux/archive/v${PFPV}.tar.gz -> linux-${PFPV}.tar.gz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.extras.tar.xz"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/linux-${PFPV}"
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+	see: ${HOMEPAGE}."
+
+pkg_setup() {
+	ewarn ""
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the pf developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn ""
+
+	kernel-2_pkg_setup
+}
+
+src_unpack() {
+	# Since the Codeberg-hosted pf-sources include full kernel sources, we need to manually override
+	# the src_unpack phase because kernel-2_src_unpack() does a lot of unwanted magic here.
+	unpack ${A}
+
+	mv linux linux-${PFPV} || die "Failed to move source directory"
+}
+
+src_prepare() {
+	# kernel-2_src_prepare doesn't apply PATCHES(). After pf-sources moved to Codeberg, we need
+	# to manually eapply the genpatches too.
+	eapply "${WORKDIR}"/*.patch
+	default
+}
+
+pkg_postinst() {
+	# Fixes "wrongly" detected directory name, bgo#862534.
+	local KV_FULL="${PFPV}"
+	kernel-2_pkg_postinst
+
+	optfeature "userspace KSM helper" sys-process/uksmd
+}
+
+pkg_postrm() {
+	# Same here, bgo#862534.
+	local KV_FULL="${PFPV}"
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/raspberrypi-sources/Manifest b/sys-kernel/raspberrypi-sources/Manifest
index e2c55204019f..c555b6548507 100644
--- a/sys-kernel/raspberrypi-sources/Manifest
+++ b/sys-kernel/raspberrypi-sources/Manifest
@@ -1,13 +1,10 @@
 AUX raspberrypi-sources-5.15.32-gentoo-kconfig.patch 14618 BLAKE2B d2b6bb66b8ddf7b17fff2b7e6d55cdd8360d6d4f0f033e513e34f5474c0078f21bd49ba6e8d28794ba1468e50f0e463fd79d64aa64f5d50025097e4fe733a2ac SHA512 6cd674d3dce0cd0565f28f903ff7d1b0beb492c4fa5c8f8c52c9b99c5da6f7d15e77e42d78b8671a73451033602815b3b858d59638c22a3c7c69d0e43d6ff4e1
-DIST genpatches-5.15-1.base.tar.xz 515540 BLAKE2B 245520300cb9ea1a0803dd4497b3f98bad3ddd29851f8f1273e3b51a3479c03a4915f601f1df216593a36b6f7593ba852dbbb7f106a40260c14b4590201b8fb9 SHA512 baa107fdd1c893ba977391cc429542b90de96d0cf4e6a671e392ef8e0f795d5ce1e4d2e74c214a907c9bf35fbdcfcec220785a4e66322b6191f097eabadeb567
-DIST genpatches-5.15-1.extras.tar.xz 1772 BLAKE2B e4c9b0ccfcdade38239cbf0e8db14e46b394b3da9a08c2538f81c602e9c8f52ffaeac0b441831ac771e6a19314a8a7d61b5411e1762c7705c555bea5a478dd68 SHA512 59290f7ea30bebb5137829a1d69b22b2170ff06a794e06b334f03312174e31ed9be9c8372396b482a936283a79e557f813755b5fed77a5485b2144d1d4b0e52a
 DIST genpatches-5.15-22.base.tar.xz 986832 BLAKE2B 48fcd267e6e28850d226693b902fd66696024e75db6a75bb78ec79c7ac8afdac62643c4113ff205c301024d245f075716e0bf8083f97917dcfc8b1fcd71b674e SHA512 e8c64bd91caedc3dcd98301dbcbd2003b4aceb5a9713bd908a69448eaa2aea945fa8162e57442862b03daa0e1a4e7642e4504701b1f34a6edb127692e582e0e0
 DIST genpatches-5.15-22.extras.tar.xz 3876 BLAKE2B 95daac6c95b82d628c0551b4e18e7c3ad9a5722b5ab8f087889b15bdeea8c6f5e232ee8b365bfb4a7c6730207d4735a0fb648b389626f35cda2593caa83ff3e2 SHA512 0616c4a976d22a5491039a6bc3babdd7e9095a2c53e2a1530d1ecfcf50a2dbfca637c1b6771078efc92e3371ac15f332f85f653d267ea8e6262ffd305be2723a
 DIST linux-5.10.63_p20211029-raspberrypi.tar.gz 186550447 BLAKE2B 44e04467a63c5761c252280c5fbff48c3fa058891ff03623ed7fb872f0a22883ed2e3b8703847e30c1a6f5cf523db1248f027c89ce1558280f1012fa300308a7 SHA512 b050f74b5a62d355cd630d41f2f63df285662347048ed97db1bac2a74f1cefeddb31b7b352aa509e90d7f03832ad2ca8e1e476d8eac62b334132a3ab308559fc
-DIST linux-5.15.32_p20220331-raspberrypi.tar.gz 199328000 BLAKE2B 06bfd61bfa94666101e0092246bfc3449ad6278f2a85104511320b27c76e5677011c7ee723f4af7f445d21dccd02ff40e73d7bfcf2fdd2f287465e2f0ff586f5 SHA512 bf20a5ea32975de8b88842f639f3e4bd2e92c51846fc00ddfca9cc4040590983d9820cfa19836bf54061780f9e8c0a1293e8aa74a7da20e2e7edd84b3932f8d7
 DIST linux-5.15.61_p20220830-raspberrypi.tar.gz 199608883 BLAKE2B 53754553129f866ab27eb3e4f2d8720bddfba3a642fe505b9d5a0c819fdb8c714082de9c94d833719385b956b8463dbb0a0a4c6a63cfe322539652d44df7a96b SHA512 4c6711ef4999c7e5a5df96bebdcc67b3f1fca274f0b3b3081543df11711cf000cc507044a4d86e607b7c015aafbbd3b3e92d7ee459429b7254f6222e9a6aa7e8
+DIST linux-5.15.76_p20221104-raspberrypi.tar.gz 199660690 BLAKE2B 899714102e52904b7a37d155e42e94ed4b0e6c6600ac40fbd3cf66d15f84bb6d06afa7acf5c9624f44e9888d03d101823b419547d7ad8e566b4e55aaa077f11b SHA512 648262937e0afdb331678e0b2f913ad22788f1373f9ecd0d495e748a78399d6a69e93024268e1c0567acb4b1c9242b3ca6bd060e73b91a77529a93e4e29181c6
 EBUILD raspberrypi-sources-5.10.63_p20211029.ebuild 660 BLAKE2B c918c09e564133f0c8cf3e3a7db2929e0680f5f14a2309393ff6db8abebf722910d40db7fc6e23cc0e4b6b149f9438dda9e44d84f78683f314ac4c96dafbc6f6 SHA512 966ec8d04f608f454e3844b8d0ff5a450068c7d3a79a29b386ef6928d456b08d9abf98333ca50af1b6f7c9c738109e321d73528dc8c69c86d88070e2b51d74da
-EBUILD raspberrypi-sources-5.10.9999.ebuild 619 BLAKE2B 666cfcf5d01afa20c059ae948226ef4d398bb1acfc8129236b19f8ac3cc01670f5907c56661171c00f5b4ab4e98760c6c60b5823ba5483cfe1984b1c5c60ba00 SHA512 bc0073fd236770da2502321d32ca6df3614ea189a30a28b1d22f46dd84f9c5d416a9ea554178695e0253a7b0dc6d2ee9f3bc76d4876b16e8a6676f8ef448413c
-EBUILD raspberrypi-sources-5.15.32_p20220331-r1.ebuild 2023 BLAKE2B d2a6ac6a34295bbaa2ccc020ec597feaa7396c5c2ee9aa0fbffb309ef4bf743c00d4cb22a96a47967df0bd0595139e8bfdab35b12ee4eef58205d86ed0a24f6a SHA512 e0e8d0bb9b0294aaef42ab89b4aa26f41b08fecc99fe7d53f17b826298e1a15c44e83536f4cca12262a51a7bf63e65e63a3f5594bb8e185f972d316f1187811d
 EBUILD raspberrypi-sources-5.15.61_p20220830.ebuild 1495 BLAKE2B 35ad3a9f08575ece72beb567a13f9b4df986a190466f41af7ce94029efc288d907755282ed585a143ce4a3d8db5de2d24b772bb70b7f665b672a21e49763f399 SHA512 5435d2c115cea859400048fb74ea9f0f67fd660f1ff2e7efec5c3ebe68f71e93dbdfe2cab80e13763ad1a581749e75e53dd38bc5f41217113ffdb2aa7283c524
+EBUILD raspberrypi-sources-5.15.76_p20221104.ebuild 1495 BLAKE2B 35ad3a9f08575ece72beb567a13f9b4df986a190466f41af7ce94029efc288d907755282ed585a143ce4a3d8db5de2d24b772bb70b7f665b672a21e49763f399 SHA512 5435d2c115cea859400048fb74ea9f0f67fd660f1ff2e7efec5c3ebe68f71e93dbdfe2cab80e13763ad1a581749e75e53dd38bc5f41217113ffdb2aa7283c524
 MISC metadata.xml 582 BLAKE2B 1fd65837f58fbd7cb5661e3f9f28c6dcdf45d9b83b59fe026c1532fc0a6d71fd44ea74fe1036c5a8ac93bcb4b3497fb0687f322e5ec687ca52dd298f5aef5022 SHA512 15bd3a4efcde129b4542793134434292dbbfa1297f06392c175f6beb4ccf9e2b85274bc75a090be7414b6480e401cb455c86f8d2937acc6e008335038ad199fb
diff --git a/sys-kernel/raspberrypi-sources/raspberrypi-sources-5.10.9999.ebuild b/sys-kernel/raspberrypi-sources/raspberrypi-sources-5.10.9999.ebuild
deleted file mode 100644
index a5a986f7c865..000000000000
--- a/sys-kernel/raspberrypi-sources/raspberrypi-sources-5.10.9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ETYPE=sources
-K_DEFCONFIG="bcmrpi_defconfig"
-K_SECURITY_UNSUPPORTED=1
-EXTRAVERSION="-${PN}/-*"
-inherit kernel-2
-detect_version
-detect_arch
-
-inherit git-r3
-EGIT_REPO_URI="https://github.com/raspberrypi/linux.git -> raspberrypi-linux.git"
-EGIT_BRANCH="rpi-$(ver_cut 1-2).y"
-EGIT_CHECKOUT_DIR="${WORKDIR}/linux-${PV}-raspberrypi"
-EGIT_CLONE_TYPE="shallow"
-
-DESCRIPTION="Raspberry Pi kernel sources"
-HOMEPAGE="https://github.com/raspberrypi/linux"
-
-src_unpack() {
-	git-r3_src_unpack
-	unpack_set_extraversion
-}
diff --git a/sys-kernel/raspberrypi-sources/raspberrypi-sources-5.15.32_p20220331-r1.ebuild b/sys-kernel/raspberrypi-sources/raspberrypi-sources-5.15.76_p20221104.ebuild
index 6c29a00f58a0..d77c92e734f6 100644
--- a/sys-kernel/raspberrypi-sources/raspberrypi-sources-5.15.32_p20220331-r1.ebuild
+++ b/sys-kernel/raspberrypi-sources/raspberrypi-sources-5.15.76_p20221104.ebuild
@@ -4,12 +4,13 @@
 EAPI=8
 
 ETYPE=sources
-K_EXP_GENPATCHES_NOUSE=1
-K_GENPATCHES_VER=2
-K_DEBLOB_AVAILABLE=0
 K_DEFCONFIG="bcmrpi_defconfig"
-K_GENPATCHES_VER=1
 K_SECURITY_UNSUPPORTED=1
+EXTRAVERSION="-${PN}/-*"
+
+K_EXP_GENPATCHES_NOUSE=1
+K_GENPATCHES_VER=22
+K_DEBLOB_AVAILABLE=0
 K_WANT_GENPATCHES="base extras"
 
 inherit kernel-2 linux-info
@@ -22,17 +23,21 @@ MY_P="1.${MY_P/p/}"
 DESCRIPTION="Raspberry Pi kernel sources"
 HOMEPAGE="https://github.com/raspberrypi/linux"
 SRC_URI="
-	https://github.com/raspberrypi/linux/archive/${MY_P}.tar.gz -> linux-${OKV}_$(ver_cut 4-)-raspberrypi.tar.gz
+	https://github.com/raspberrypi/linux/archive/${MY_P}.tar.gz -> linux-${KV_FULL}.tar.gz
 	${GENPATCHES_URI}
 "
 
 KEYWORDS="~arm ~arm64"
 
-PATCHES=("${FILESDIR}"/${PN}-$(ver_cut 1-3)-gentoo-kconfig.patch)
+PATCHES=("${FILESDIR}"/${PN}-5.15.32-gentoo-kconfig.patch)
 
 UNIPATCH_EXCLUDE="
 	10*
-	4567_distro-Gentoo-Kconfig.patch"
+	15*
+	2000
+	29*
+	3000
+	4567"
 
 pkg_setup() {
 	ewarn ""
@@ -45,36 +50,20 @@ pkg_setup() {
 	kernel-2_pkg_setup
 }
 
-src_unpack() {
-	local OKV_ARRAY
-	IFS="." read -r -a OKV_ARRAY <<<"${OKV}"
-
-	cd "${WORKDIR}" || die
-	unpack linux-${PV}-raspberrypi.tar.gz
+universal_unpack() {
+	unpack linux-${KV_FULL}.tar.gz
 
 	# We want to rename the unpacked directory to a nice normalised string
 	# bug #762766
-	mv linux-${MY_P} linux-${KV_FULL} || die "Unable to move source tree to ${KV_FULL}."
+	mv "${WORKDIR}"/linux-${MY_P} "${WORKDIR}"/linux-${KV_FULL} || die
 
 	# remove all backup files
 	find . -iname "*~" -exec rm {} \; 2>/dev/null
 }
 
 src_prepare() {
-	# kernel-2_src_prepare doesn't apply PATCHES().
 	default
-
-	cd "${WORKDIR}/linux-${KV_FULL}" || die
-
-	handle_genpatches --set-unipatch-list
-	[[ -n ${UNIPATCH_LIST} || -n ${UNIPATCH_LIST_DEFAULT} || -n ${UNIPATCH_LIST_GENPATCHES} ]] && \
-		unipatch "${UNIPATCH_LIST_DEFAULT} ${UNIPATCH_LIST_GENPATCHES} ${UNIPATCH_LIST}"
-
-	unpack_fix_install_path
-
-	# Setup xmakeopts and cd into sourcetree.
-	env_setup_xmakeopts
-	cd "${S}" || die
+	kernel-2_src_prepare
 }
 
 pkg_postinst() {