Merge branch 'master' into 'master'

Master

See merge request src_prepare/src_prepare-overlay!94

sys-kernel/liquorix-sources/Manifest

@@ -5,6 +5,6 @@ DIST v5.8.10-lqx1.patch.xz 565844 BLAKE2B a76cf664b9dc92a9bf4d13e006e07928c23d91
 DIST v5.8.11-lqx1.patch.xz 592264 BLAKE2B 7dcdf7c776c02d989a1283d02cf9cc4f7d8733b01d1347dfa6c607c3863cfa72b9d6493184083f31966db5f354b72632a4d53899be3f90927c6e2aca2d5fa7c4 SHA512 719a062bb59bfe0fb914b38a3812d3400e15abd55e23697b5875d92ed628ab8fd03e08933de4cabe959b730f2d516872c18d7e088ac58f842d4421a2bcd3a94e
 DIST v5.8.12-lqx1.patch.xz 607876 BLAKE2B 199d0714584359185232587e86fdd581d11ec1abbabcd12380f93dd5259a0c273793de9d11225f633f09f736e6abd68cc43e3d9455ae0a4086e014a5fd8f1185 SHA512 83b9ef100137503f93916c257d48c76354367a56053161d932d19b377b569418b0e9beefd52e706dc7c66eac6f416282b5639b68950f3f5a0393d4606dcdcd2f
 DIST v5.8.12-lqx2.patch.xz 622948 BLAKE2B 1c62349b118ae08427ca75c0dd6d7069b5923ff15747c0fb1eef440f226723e04f597cbec8f7f10c920e1b1f71a128886493f548d00bd91a551123af19532e84 SHA512 8e088aae0c107489621280907e43564b7886b1174e2145e9fb1a4b8a87df120611d18963eef5afff4b44759a3cc013f91d45b3bbdfe6a594ebb50ff14f986815
-DIST v5.8.7-lqx1.patch.xz 465048 BLAKE2B 71dec82cc1d4a9be914d934c3a4deaacb208b874534e60beea3ec8586d25c1d55a5a29cc48c8a54acfa3a56cd23ad7f02dc6cb23cc18694453a2158bd8daa6d2 SHA512 c9da6480fa1ef4ca6bb5cf1ef56e748b60c56e4b24662906ed01e74ada4d888872c4b1616ebb31ec8543f0ed7ce0d8c658f073b0a6f1a9f4ac1ef37a38ee0e05
+DIST v5.8.13-lqx1.patch.xz 632464 BLAKE2B 6a01cb602036e59756a8f3be73bfbed0e66f07a4bc28a1fdb1844ea8cd791c20e61fcad54e513e2f1fa4f79339bf35869a014faa71749e8f888432426b8e23f3 SHA512 cca5352d509d85d20eaa4658db1959ddfb936a5cd7968133fdd086cae0a81647f4196fde07b0cdda0738499115010b66b6e65759d868597a1859542ed8a14b10
 DIST v5.8.8-lqx1.patch.xz 515048 BLAKE2B 57de4e07fe051ee89cbbff18c6b7cbbd3441bcfc021b28f2641593c2b49725f6eb24966b9b9eb5df490f1df8b9012bd3eef57058d0fb995792748a6f9fe48eb8 SHA512 dcc59a14bb6a82c69847becd821381bcc664f74b474ae314d2cfc9dd314f843d09ee5c85c65c17b55d0c96eab27681c1afdcfcf1c1d4f2c62dc6d8d1b2fb2aa7
 DIST v5.8.9-lqx2.patch.xz 520432 BLAKE2B 3348b41614879f55df72932c215caadbf0c30e951e8848a1a5554e5a3dcf93115a6a879bb1face7746d4d6828cfda6759621d1c79df853032e51144f1c54d5a0 SHA512 245d38a3943ae36d5e75b871972e70bce6098b53b37b3f65066eb60209b68dc28135437a0afc55e3fd09931171368a6f212a18a75fdc0ce48e33907770f61535

sys-kernel/liquorix-sources/liquorix-sources-5.8.13.ebuild

@@ -7,6 +7,7 @@ K_WANT_GENPATCHES="base extras"
 K_GENPATCHES_VER="1"
 K_SECURITY_UNSUPPORTED="1"
 K_NOSETEXTRAVERSION="1"
+LQX_VERSION="1"
 
 inherit kernel-2-src-prepare-overlay
 detect_version
@@ -17,8 +18,16 @@ HOMEPAGE="https://github.com/zen-kernel"
 IUSE=""
 
 DESCRIPTION="Liquorix sources including the Gentoo patchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-LIQUORIX_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-lqx1/v${PV}-lqx1.patch.xz"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${LIQUORIX_URI}"
 
-UNIPATCH_LIST="${DISTDIR}/v${PV}-lqx1.patch.xz"
+LQX_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-lqx${LQX_VERSION}/v${PV}-lqx${LQX_VERSION}.patch.xz"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${LQX_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/v${PV}-lqx${LQX_VERSION}.patch.xz"
 UNIPATCH_STRICTORDER="yes"
+
+K_EXTRAEINFO="For more info on liquorix-sources, and for how to report problems, see: \
+${HOMEPAGE}, also go to #zen-sources on freenode"
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}

sys-kernel/zen-sources/Manifest

@@ -7,6 +7,6 @@ DIST v5.8-zen1.patch.xz 48796 BLAKE2B b87018182422e68d637f89ef6d2a4695509d5bdda8
 DIST v5.8.10-zen1.patch.xz 624720 BLAKE2B 37c8853799aecba279b1e68f9de732e7ed03fe2a064017cf47c9ca8e7ff5156e94fb8c4a9502007ce93c52d022a0de1f2ee96b4edd9a95520f06192dd88b8d4a SHA512 4ad6d4db4233896c29a5785be76280f0ca07cfc5db8c8b6519b74238d6cddec3cb7cdd3cf2d0ba3d440df2411a917b5a2ed0933e72ea81beab163d1cae3bd11d
 DIST v5.8.11-zen1.patch.xz 654112 BLAKE2B 154ce5e608d584e881948388c78ebc4a222c2b63ddf5ccf898eaffc361479280920a6270142694c279b7fbd170d35aad9dc09e8f92ccc465fecd92ced940cbb0 SHA512 5cf8507b1c35ab2049330124014508ce80d6a524dedaad12a95fc398f2c5e33ee23bab35a1a306ed58185921aed425f55c4b9059744bddb53fb8af71daef5d9a
 DIST v5.8.12-zen1.patch.xz 672060 BLAKE2B 86cf8d1cc9142b6519d89a2b9d12498658f1e20193c3a629e9c89b858e7d6fbbd0460cff97437f9d4a35c69b3d875505a9e184288302fbdfc289cac2a20cf165 SHA512 9de0173b456f23df3dbd0db0274ff1c2b383ecc1ab4043a6405d871e7a567b4292483ec768d15f424cc4d78aef93db5d2a5e602781538a767e06af3b32b34b12
-DIST v5.8.6-zen1.patch.xz 507440 BLAKE2B 70708ab72b17c887c5fdf2cdcc4fc867e243c887c8a7d0ff2166384c00e72e8d9d500b40fd341e8cbcd1b73e5f7ab31a7784dc9d931b7e84234e751b13d8fd09 SHA512 cbfaa2b3d5cfef1da9bba128660d8c7aa37ad89611e38324248d3344bf0355b0185564603903de90d0030ad25f1b2df672025610431e83b0e480e4adf449681c
+DIST v5.8.13-zen1.patch.xz 698624 BLAKE2B 7c91324015da999b12e097a1cbdbc1fc1919b3a97f1550652a9459334ed963d098c883ce841126d80374621e53a0403fd0e91ffd8410c0d9f73aef900e554c89 SHA512 9bd11bf06fc295f0518cafcf95570c123f3a3ad0aa57d2e654bbc82add78bdb6cc3a10669540de0a06b3a932d06c069e37ed177c978443629ee50d1c35a5e8b1
 DIST v5.8.8-zen1.patch.xz 568664 BLAKE2B a46ac53b10fb566b43e266a5afce1ebd8eb0ec9f05549db594fcbf94a21ca22af114b7abb6f9252fac447b3389d5f39849feb1adf6cb1736a8ed53302da439bc SHA512 b2f423d48d23741ce2be317cff17564e2e0dc0183aa738e8e49592cdbac90b6c690c74e3d0dac3aa2f7defc375f3465e4b8ae21ca026cec00b1585d6d152f859
 DIST v5.8.9-zen1.patch.xz 574576 BLAKE2B 3d68f784bd6b3af9abd2388f591a5e656c84178c4144a282abbee65002b8e61db73a153fa5d2c832ecbb5cfb3e7f82a5927cbcf85fc3abaf8ea877c8ef24ee64 SHA512 903f53ba4f8cd9b9856793601c229de48e204e607235d85bb62ec0682a689761d09e4a085d3ae5a28c40a3299ef78b45fee761d602a7257b9b54da082d564b4d

sys-kernel/zen-sources/zen-sources-5.8.13.ebuild

@@ -7,7 +7,7 @@ K_WANT_GENPATCHES="base extras"
 K_GENPATCHES_VER="1"
 K_SECURITY_UNSUPPORTED="1"
 K_NOSETEXTRAVERSION="1"
-
+ZEN_VERSION="1"
 inherit kernel-2-src-prepare-overlay
 detect_version
 detect_arch
@@ -18,8 +18,15 @@ IUSE=""
 
 DESCRIPTION="Zen sources including the Gentoo patchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
 
-ZEN_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-zen1/v${PV}-zen1.patch.xz"
+ZEN_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-zen${ZEN_VERSION}/v${PV}-zen${ZEN_VERSION}.patch.xz"
 SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${ZEN_URI}"
 
-UNIPATCH_LIST="${DISTDIR}/v${PV}-zen1.patch.xz"
+UNIPATCH_LIST="${DISTDIR}/v${PV}-zen${ZEN_VERSION}.patch.xz"
 UNIPATCH_STRICTORDER="yes"
+
+K_EXTRAEINFO="For more info on zen-sources, and for how to report problems, see: \
+${HOMEPAGE}, also go to #zen-sources on freenode"
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}