gentoo resync : 18.08.2019

4 files changed, 151 insertions, 80 deletions

diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 1dabf3e73930..46c96b0bfb00 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -2,17 +2,18 @@ DIST genpatches-5.1-1.base.tar.xz 3876 BLAKE2B 8a96597cf4283fe084a35789ba39038b5
 DIST genpatches-5.1-1.extras.tar.xz 1724 BLAKE2B 9308d8f6b1bce24978e5b04934152b5de718806f271dfffc7f465ee1f44b08e4e28bc52e26dd5e005a0da05f53f1c9b36d8a9099dbfdac6ed0f90ffa8978cb5c SHA512 50bc26985b51ff1293aa96d8d20466a6ad07388b117e81bd67fd96675f04bd0ac97e2c16ad24a3e2a451e4de79a8d64c2d96643851878590366ddd366ba17696
 DIST genpatches-5.2-1.base.tar.xz 4564 BLAKE2B a1cf9d0b529fb29a07b689af0d1f65baac3f2b660f5401b31279a966b163ee3116121458cdacaf771e738145a2529df6f1d34d98006b8e615f105f7b496adb45 SHA512 eb96e3090080ceb83c8a06bf1c6aef1e1a2b198ab8dae621b9124afabdc723e3e878004d54ee6d22c50f2d924525261494ee8f4c8db02bbd89bc17e35c1b7d62
 DIST genpatches-5.2-1.extras.tar.xz 1724 BLAKE2B 01fb9ba93bbf8bb81c36abc51c06383ae1a51051e8e2c6fbf2089bc61a0f353e713fd2e09f1609459bb57fce54c91a3a376a753132677f0550dcec628ccca9b6 SHA512 7dcc433cae296b666a7d12b05ee4f470f5f1c4ab978c8045000649dc285b2c45559e8be199d107d8fc9e8155895bd6c1c1f3d03776e9ab8a7562d5c110139f79
-DIST linux-4.13.tar.xz 100579888 BLAKE2B 2f8be07d403071b097b019c43fa332bc7d4805dee633a6fdffe5a99d5475015ca9e4881e7f4cbfd36f8c451bacf423436364ea3d9f25b8723a29a178dededb2b SHA512 a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2
 DIST linux-5.1.tar.xz 106244476 BLAKE2B ae3c63ced819737e34f8ec3a78138f87704a2f2956454411e3a4830ec8c0aaf2c288af6ca080f1892540e50f4a422482360010be8641afdeeeaf7231e7d8da97 SHA512 ae96f347badc95f1f3acf506c52b6cc23c0bd09ce8f4ce6705d4b4058b62593059bba1bc603c8d8b00a2f19131e7e56c31ac62b45883a346fa61d655e178f236
 DIST linux-5.2.tar.xz 107029708 BLAKE2B f0cf6e3a15a4bd019edbfa33cb4556d0672e807f7d139eff3ab053d0ad7649198b229475955a1f51eb90d0e9f8268cafb782f6312793fdf38472f3c6d7c2d7ee SHA512 5a28f8a34c4e0470617f5638b7112e6252109b78f23b1eed484a228530970c7ef5c130d6e5a09cf25ea2f6a0329602dcc1ec66ce893182e15b27d99bd228789c
-DIST patch-4.13-pf4.xz 173732 BLAKE2B 990defc1eb15ca509f922381dc5f7726265caeccd9a9b639989a3e6dc56c4cb3b6076a2588ef93cc39aa4f36e403f654a2c580aac50be61d74dde429ef69f1fc SHA512 6b6fdbb26ec1053c0b3fb0223b2e1cbfb28d88b172ffa8d110a5e7a37f3b0bf377d5957d47007c3468dc42b8c33aad1acbc89c44027c8f7326dcbf940d7de88f
 DIST pf-sources-5.1_p7.patch 2206844 BLAKE2B 542a9c09aa1e9def85afafe4f6275aa62c178a7e60af157bdef0fe6ed659bc7ce96f30e3b05cb750bfa2f5e92e354064848b3a1d0f0c2894a07970cd2edc6bb4 SHA512 22ca39aa667fee4a75a470bffa86905191b3550ca82e3e1554bdd8ae3d5255053d8f650e781ae713b99e9b3cf1070e60f3f5df751fb7a70fe6d52e538a798a37
 DIST pf-sources-5.2_p1.patch 365922 BLAKE2B dee7af932e0e220b4493a09adc21b210439705a615333e0fef91ffb577aa489f133864742f50b926266c9e939d9780ac5f587c4c518e15669cad866c38d90a34 SHA512 b518678bbabedc25e72716ebbe1afa4599ebc46d4eb3ee3ed8ae815ecbf64ea0cafe1dde9e5b5b72898b17758972ed5fca37f71a45f774a2922ce7deead15f2d
 DIST pf-sources-5.2_p2.patch 556688 BLAKE2B cbcfc2b0949386e72a5bfe2a7e4eb5fe56a38c2a451e631509f31b61e3492150f5177e97390d1945959026188ef62c5e90a7474f9d26b5a63d920a1136b350f3 SHA512 2a74dac88e2e5828e44576041223e3168ac980fa6ff01819bdbd5f626cd233d4571641bffe176c0738fbfb2d8aefbe1f8e91990e4aa95e6587eea91983582db7
 DIST pf-sources-5.2_p3.patch 1101135 BLAKE2B f56ff7a269e48513ac2d8360531eef0b60b0d86ec3af223729870c3461746aef1f7370a6448558e921bfacf345043ca4f97d56c1f8069d5a6f607f9cb615e096 SHA512 0b81cf9927bcec69910f18046ccfead4ad3072e8926315f7eed122edd09ca87c43d345402051249f55de2f98c12b04bd87096653051eb1dc77e27fe24c2e85f3
-EBUILD pf-sources-4.13_p4.ebuild 1970 BLAKE2B f3e2a4b1d772d397204e98065c7f70163b84e9d3f305df1fdff828552ddc6918988888f6669fc6216a639cfe5d623afa3011eb67aceff3a10e96c2b30bdbb717 SHA512 e9c31c053bc53aff13032b743f40fb754cc451b28abfd6297643bbd43a3ec6f5b5ceaf89808a42089174cc8ec25bd59d86cf0dceede8867cddea6bf8d6c1277d
+DIST pf-sources-5.2_p4.patch 1370761 BLAKE2B 54a489784bdfa42879931eb5f05d4ee91bccb9b8b755bc4a3a1221259f5d16df12b1bb240518f8ee86b93383f8ec2f5eb29541548c5d4ca6d4d3aa41b1b92dc2 SHA512 4489218cd370cb38cda5c79b05d26e7150ac8ce97eaf0a03013743f9507fff82cd1024e0f95e226bd5d1f3c4741a5ab8934002e4a0c0e13fc2666513b41b6491
+DIST pf-sources-5.2_p5.patch 1632051 BLAKE2B 71fe6365e1e8fee65480bc3b6081f410516dcd6cecdffe0ad03b95c63b8aa2f59dc7357190aa49d9c10637ef7ae5516588c27140afe594eaa1282f565ea4bf70 SHA512 27eff105625ce917e009d5e29ba991682731bb6b7e77ae16948456b820a78271ca666634ee30ef6ebf7d8d1dd13aa9999dfc68acead55eaecca4081746cbba5f
 EBUILD pf-sources-5.1_p7.ebuild 1943 BLAKE2B b21d2989f5532ddc528ec7996b1f447fe78e8106fd540816e5e77fac684f044e20dd119ee4e57aec04948662485e4565c23202ea06ee632a1f43ccb336e76f20 SHA512 9e31de214070b8a7e9d4b0358859efe7361bf881c045520cfe1b841efafba5e64c7ddc5d6a3641dfde92b2f37d31ae85f53fa4a3832b77139bda458632c756f8
 EBUILD pf-sources-5.2_p1.ebuild 1902 BLAKE2B 0481e16f025f088eb9c5a0417f229709e4a36e63283e8addbf3547f4bfd27b2ebba8b3fcba1192224ae9165767300250b00380286e6a612e17c7161570e4584a SHA512 c9e76fb9a4c2d0a4ca53dc0c8d27060e213e0347187c0fd439d82c4e8ad4fdb84700800a48426cf0fd032b2cbd86522f1cc06fe5a73da4c3e59b8b6b9e05f71c
 EBUILD pf-sources-5.2_p2.ebuild 1902 BLAKE2B 0481e16f025f088eb9c5a0417f229709e4a36e63283e8addbf3547f4bfd27b2ebba8b3fcba1192224ae9165767300250b00380286e6a612e17c7161570e4584a SHA512 c9e76fb9a4c2d0a4ca53dc0c8d27060e213e0347187c0fd439d82c4e8ad4fdb84700800a48426cf0fd032b2cbd86522f1cc06fe5a73da4c3e59b8b6b9e05f71c
 EBUILD pf-sources-5.2_p3.ebuild 1902 BLAKE2B 0481e16f025f088eb9c5a0417f229709e4a36e63283e8addbf3547f4bfd27b2ebba8b3fcba1192224ae9165767300250b00380286e6a612e17c7161570e4584a SHA512 c9e76fb9a4c2d0a4ca53dc0c8d27060e213e0347187c0fd439d82c4e8ad4fdb84700800a48426cf0fd032b2cbd86522f1cc06fe5a73da4c3e59b8b6b9e05f71c
+EBUILD pf-sources-5.2_p4.ebuild 1902 BLAKE2B 0481e16f025f088eb9c5a0417f229709e4a36e63283e8addbf3547f4bfd27b2ebba8b3fcba1192224ae9165767300250b00380286e6a612e17c7161570e4584a SHA512 c9e76fb9a4c2d0a4ca53dc0c8d27060e213e0347187c0fd439d82c4e8ad4fdb84700800a48426cf0fd032b2cbd86522f1cc06fe5a73da4c3e59b8b6b9e05f71c
+EBUILD pf-sources-5.2_p5.ebuild 2030 BLAKE2B 607fd965a08b6be56cca4e3b7f6e511588117c2aa9e522601a212fce05cef7522f9e3943f8b3f17bda291550908f587c7ef9cfaac619437ea483ee2fc29e6a1d SHA512 fccc06bb103b959768227faeece80b29c81eacb958fb4b1a3d18bf7a3ea825fe8ae9bdd670c72bc4b98747e763946bb3b6f4840098ef02c22c0227ec9e972692
 MISC metadata.xml 345 BLAKE2B 26083da0607ae4e301d8dd622cd9b0016630e1e70dd6197fb8b95912578015a13da38c8434df3cebdf13f22566a132ffa9ac2ee4a32ed482cf780c55327316da SHA512 4bbc43612402fe253b02894ae6bf290ae44082c98a48d31e3d822946a8709752d3c4fb9d338fdb6779d6b421e73073c67f5f951ef423728aaa5cc18ac7958b2e
diff --git a/sys-kernel/pf-sources/pf-sources-4.13_p4.ebuild b/sys-kernel/pf-sources/pf-sources-4.13_p4.ebuild
deleted file mode 100644
index 77364744529d..000000000000
--- a/sys-kernel/pf-sources/pf-sources-4.13_p4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit readme.gentoo-r1 toolchain-funcs versionator
-
-COMPRESSTYPE=".xz"
-K_USEPV="yes"
-UNIPATCH_STRICTORDER="yes"
-K_SECURITY_UNSUPPORTED="1"
-
-CKV="$(get_version_component_range 1-2)"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-K_NOSETEXTRAVERSION="don't_set_it"
-
-DESCRIPTION="Linux kernel fork with new features (-ck patchset (BFS), BFQ, TuxOnIce and UKSM)"
-HOMEPAGE="https://pf.natalenko.name/"
-
-PF_VERS="1"
-PF_FILE="patch-${PV/_p*/}-pf${PV/*_p/}${COMPRESSTYPE}"
-PF_URI="https://pf.natalenko.name/sources/$(get_version_component_range 1-2)/${PF_FILE}"
-SRC_URI="${KERNEL_URI} ${PF_URI}" # \${EXPERIMENTAL_URI}
-
-KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-KV_FULL="${PVR}-pf"
-S="${WORKDIR}/linux-${KV_FULL}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-${P} has the following optional runtime dependencies:
-- sys-apps/tuxonice-userui: provides minimal userspace progress
-information related to suspending and resuming process.
-- sys-power/hibernate-script or sys-power/pm-utils: runtime utilities
-for hibernating and suspending your computer."
-
-pkg_pretend() {
-	# 547868
-	if [[ $(gcc-version) < 4.9 ]]; then
-			eerror ""
-			eerror "${P} needs an active GCC 4.9+ compiler"
-			eerror ""
-			die "${P} needs an active sys-devel/gcc >= 4.9"
-	fi
-}
-
-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_prepare(){
-	epatch "${DISTDIR}/${PF_FILE}"
-
-	default
-}
-
-src_install() {
-	kernel-2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	readme.gentoo_print_elog
-}
-
-K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
-see: ${HOMEPAGE}."
diff --git a/sys-kernel/pf-sources/pf-sources-5.2_p4.ebuild b/sys-kernel/pf-sources/pf-sources-5.2_p4.ebuild
new file mode 100644
index 000000000000..9035be35ba7d
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.2_p4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+ETYPE="sources"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+
+HOMEPAGE="
+	https://gitlab.com/post-factum/pf-kernel/wikis/README
+	https://dev.gentoo.org/~mpagano/genpatches/
+"
+
+IUSE=""
+
+# No 'experimental' USE flag provided, but we still want to use genpatches
+K_EXP_GENPATCHES_NOUSE="1"
+
+# No reason to bump this number unless something new gets included in genpatches,
+# in that case we can manually remove the linux kernel patches from genpatches.
+K_GENPATCHES_VER="1"
+
+K_NOSETEXTRAVERSION="1"
+
+# Not supported by the Gentoo security crew
+K_SECURITY_UNSUPPORTED="1"
+
+K_USEPV="yes"
+
+# We want the very basic patches from gentoo-sources, experimental patch
+# is already included in pf-sources
+K_WANT_GENPATCHES="base extras"
+
+UNIPATCH_STRICTORDER="yes"
+
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
+
+PF_URI="https://github.com/pfactum/pf-kernel/compare/v${PV/_p*/}...v${PV/_p*/}-pf${PV/*_p/}.diff -> ${P}.patch"
+SRC_URI="
+	${KERNEL_URI}
+	${PF_URI}
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.extras.tar.xz
+"
+
+KV_FULL="${PVR}-pf"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+PATCHES=(
+	"${DISTDIR}/${P}.patch"
+)
+
+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_prepare() {
+	default
+	kernel-2_src_prepare
+}
diff --git a/sys-kernel/pf-sources/pf-sources-5.2_p5.ebuild b/sys-kernel/pf-sources/pf-sources-5.2_p5.ebuild
new file mode 100644
index 000000000000..827ed9e330fc
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.2_p5.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+ETYPE="sources"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/wikis/README
+	https://dev.gentoo.org/~mpagano/genpatches/"
+
+IUSE=""
+
+# No 'experimental' USE flag provided, but we still want to use genpatches
+K_EXP_GENPATCHES_NOUSE="1"
+
+# No reason to bump this number unless something new gets included in genpatches,
+# in that case we can manually remove the linux kernel patches from genpatches.
+K_GENPATCHES_VER="1"
+
+K_NOSETEXTRAVERSION="1"
+
+# Not supported by the Gentoo security crew
+K_SECURITY_UNSUPPORTED="1"
+
+K_USEPV="yes"
+
+# We want the very basic patches from gentoo-sources, experimental patch
+# is already included in pf-sources
+K_WANT_GENPATCHES="base extras"
+
+UNIPATCH_STRICTORDER="yes"
+
+inherit eutils kernel-2
+detect_version
+
+DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
+
+PF_URI="https://github.com/pfactum/pf-kernel/compare/v${PV/_p*/}...v${PV/_p*/}-pf${PV/*_p/}.diff -> ${P}.patch"
+SRC_URI="
+	${KERNEL_URI}
+	${PF_URI}
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.extras.tar.xz
+"
+
+KV_FULL="${PVR}-pf"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+PATCHES=(
+	"${DISTDIR}/${P}.patch"
+)
+
+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_prepare() {
+	default
+	kernel-2_src_prepare
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	einfo "Additional features:"
+	optfeature "Userspace KSM helper" sys-process/uksmd
+}