Merge branch 'master' into 'master'

Master

See merge request src_prepare/src_prepare-overlay!150

net-libs/libquotient/metadata.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<maintainer type="person">
+<email>hedmoo@yahoo.com</email>
+<name>Andreas Westman Dorcsak</name>
+</maintainer>
   <upstream>
     <remote-id type="github">quotient-im/libQuotient</remote-id>
   </upstream>

sys-kernel/liquorix-sources/Manifest

@@ -7,6 +7,6 @@ DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d451
 DIST v5.10.3-lqx1.patch.xz 133084 BLAKE2B a69e2a0635acbcba9cc7b8f63afb80614d49284b2b42c8aad06c2a9eb3041d1d420f096e734b1ec7bbc35f1286c38ce643a42c953e7d6f000babdd97e36830ac SHA512 661f7d716b8e34ef093138cb143a871233aba772e12bd49698f27479965003f244ecec566148275e5115942b656fdde2de3132e68652cd410c91082816bdeba5
 DIST v5.10.5-lqx1.patch.xz 334676 BLAKE2B b0cd14cd7a0bb373583bbb6e114b8c9cc9be2bc2bfd4ba76dbdcecc1a9005283969e06d0e49cdb7450a9be0b848ff73b0d3ac66030e5cc8082a398eb1abb536f SHA512 c3e8b51b77df1e8a2c76f63cf9e92b202b6ea0fa3499869ec3d8eb7cc38f7dbcc77654aa6af6749e14615128a706fa6b8607db31c046537c55cf8c69d3eec8b7
 DIST v5.10.6-lqx1.patch.xz 350852 BLAKE2B 1a49c3f8c7e1d0d18271f43c748decc61ed6b64fe70fda7ade63f860fd3fd385fb34efaea88f2a671ad4d3d67bca7ad9bbfbeaca96e83577c94655e2ba37f4b6 SHA512 6603808dd11b82a04988fa335e4b640101d70ddccc32fd9b1c112cc25ac59649d315df5d67b3a1b3362e8beb260882605d25659447bbaac0cd1c8d7dd50cdc84
-DIST v5.9.13-lqx2.patch.xz 743624 BLAKE2B 4f21723e1b6a57c070611eae06c43dd09c55e38c344e1477633181f6a4c2a12b1bfd1acdf1dc8e989c22ebff429e770e0465ba5933aec15058ac2a44693505c5 SHA512 5dbc6db35776607b1f625f62324b3ed99fe09677a9016b1c259e51b5163f78ec358b94c62fe2878e1efa39c8bfbc9fd673188573b7149d17a773e8fde6eaec91
+DIST v5.10.9-lqx1.patch.xz 473408 BLAKE2B 3d92b4a85e0f2b1b1a3f7d46e1ce4e26821ddb171542d9e586ddf9ad1d7fe317b8d4c7b1ae6ccc1344cadbfb7734aacf90eac0e8b01cd228979b9ec341362892 SHA512 d44f1a77313b73837e5a499f5dc406404700cde3e9c3beac58028c590bfb94579901d8da055f4c6324fcef4d65772bbc0a4b322ea5f7a319326c66cf73f0dd7f
 DIST v5.9.15-lqx1.patch.xz 777072 BLAKE2B fde54a06c99f463d44865d99d17d0062bbc9b3d3b2bd341a0add0f13d9b53defe9180d50f5e7d5238f4b593c58a111d750c1f28232f5cd78325a03cee5068e4c SHA512 e48cdc3a9761559d4e1c529c5db57ae5cd624792f8fc56d7279c1c0f19306f7661ce410998f8eaf29028942d3224b1f669b88ea7f6b5aa6d6b956cc8a9019f32
 DIST v5.9.16-lqx1.patch.xz 790204 BLAKE2B cb03edf4fd2326dd063562d36967c18bb68f94e669be47ea010389c87a78eaac147c5727c715e2fdf5e22aeba8c1b5c242d8fe54052e5bd8882ea58dbe5c07a7 SHA512 13388a2e68b3300641d670a08ecebcec1128d8419e3b04cc6ac84ddfb30043e9ee2803b6d1b27b858201b9a73c2536cce6743ba2f08e33a1987c3454065c67f8

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

@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -7,7 +7,7 @@ K_WANT_GENPATCHES="base extras"
 K_GENPATCHES_VER="1"
 K_SECURITY_UNSUPPORTED="1"
 K_NOSETEXTRAVERSION="1"
-LQX_VERSION="2"
+LQX_VERSION="1"
 
 inherit kernel-2-src-prepare-overlay
 detect_version

sys-kernel/xanmod-sources/Manifest

@@ -11,3 +11,5 @@ DIST patch-5.10.5-xanmod1-cacule.xz 338976 BLAKE2B 327af0edc5d62efdda58490dac449
 DIST patch-5.10.5-xanmod1.xz 331808 BLAKE2B d081db46f12e6c5a49865a2170f458910212b643c6a423c47910077259ebc897a54baaa7e4a3034d06a173260539a25b51ab6cedc1bfe54f63cf7430c8a2d71a SHA512 83e93bb6f424ee4fd53303c6432649a64ed44b4cc1a14af82b23a4593aa97a1404e847df51a9dfa8195c52e546683dbc9989904fdcbb2aee943c073a435dd9ac
 DIST patch-5.10.6-xanmod1-cacule.xz 349164 BLAKE2B cb54f0e2c9a4a6a0f7066b3c0e0cbb561633eb74307f333bd44d98b41db77fca4b981d85ddf22adce6f2eff8b7a2fd46e72e1f11a59b643e1f169f0f114ec325 SHA512 3f3cba4e8eafbd1d9c05d86f8e1c6675a42d52b85c57be581c046d57cd6ae1a3095a07a482fd3b77f3f52299dd5508c4744bc5d92cd67aacf1a04740fc9cf206
 DIST patch-5.10.6-xanmod1.xz 342188 BLAKE2B 93cca375086b5a081cdcef69189a0bdbe710cad97755c91c823221aeefcf3ec4d514036460e49cd9e3939633e9cc96e0723d4673d3dfdf68d25fe8cc14e171ef SHA512 d421447f793661b72c676731c32c78a7c2c0873a891cc660566b6247ac0e1c7c3985cc37ead7edd7a89ffef51927e09e61c850f238277032974ebf517e99730c
+DIST patch-5.10.9-xanmod1-cacule.xz 449056 BLAKE2B 902dea113a915ed564e4975a18e6510e88bfc8df169ea1924df15f52cfee2d0d8235b6558ef2350656dfa7f0cb756151870ebef66b45828578c12674f450b972 SHA512 e87209e3a50e20590b5173f145c5d3fd9f43c69f6c94f80c6bc84f39201d790eb95785323f10af5f4d50f806f05d1ab59f7ce6fef8e40d19fdc7ea5f6c034d0c
+DIST patch-5.10.9-xanmod1.xz 441992 BLAKE2B 7eec9aacdc7611355b519f9e06ddd9ebd029e666924bc6d03cd153029b474c72039cf730d1a1150b9505c757e0da37d1787aefb9ada1960c9457a478ec00f1af SHA512 2fff3f5918d41810f993b9f5669059818f60bd83ebcd99985d576a9521f4005929a42e8eca0001e2a9cc358159a1603e6d2d76617352c8be0644caecfbe9f1b2

sys-kernel/xanmod-sources/xanmod-sources-5.10.9.ebuild

@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="1"
+K_SECURITY_UNSUPPORTED="1"
+K_NOSETEXTRAVERSION="1"
+ETYPE="sources"
+inherit kernel-2-src-prepare-overlay
+detect_version
+
+DESCRIPTION="Full XanMod sources with cacule option and including the Gentoo patchset "
+HOMEPAGE="https://xanmod.org"
+LICENSE+=" CDDL"
+KEYWORDS="~amd64"
+IUSE="cacule experimental"
+XANMOD_VERSION="1"
+XANMOD_URI="https://github.com/xanmod/linux/releases/download/"
+SRC_URI="
+	${KERNEL_BASE_URI}/linux-${KV_MAJOR}.${KV_MINOR}.tar.xz
+	cacule? ( ${XANMOD_URI}/${OKV}-xanmod${XANMOD_VERSION}-cacule/patch-${OKV}-xanmod${XANMOD_VERSION}-cacule.xz  )
+	!cacule? ( ${XANMOD_URI}/${OKV}-xanmod${XANMOD_VERSION}/patch-${OKV}-xanmod${XANMOD_VERSION}.xz  )
+	${GENPATCHES_URI}
+"
+
+src_unpack() {
+UNIPATCH_LIST_DEFAULT=""
+	if use cacule; then
+		UNIPATCH_LIST="${DISTDIR}/patch-${OKV}-xanmod${XANMOD_VERSION}-cacule.xz "
+	else
+		UNIPATCH_LIST="${DISTDIR}/patch-${OKV}-xanmod${XANMOD_VERSION}.xz "
+	fi
+	kernel-2-src-prepare-overlay_src_unpack
+}
+
+src_prepare() {
+
+	if use cacule; then
+		eapply "${FILESDIR}/localversion.patch"
+	fi
+
+	if use experimental ; then
+		eapply "${FILESDIR}/no_reset_on_migration.patch"
+	fi
+
+	kernel-2-src-prepare-overlay_src_prepare
+
+	rm "${S}"/.config || die
+
+}
+
+pkg_postinst() {
+	elog "MICROCODES"
+	elog "Use xanmod-sources with microcodes"
+	elog "Read https://wiki.gentoo.org/wiki/Intel_microcode"
+}

sys-kernel/zen-sources/Manifest

@@ -1,12 +1,8 @@
 DIST genpatches-5.10-1.base.tar.xz 3840 BLAKE2B 08ac1f83dc9a1cfc1d4cf0a3a5ab4c9d4686a80348247ec7cd1da6e49db92d6932a1864113f2631d5528a4ba732945b2afe73d03061bd3c532b3d1e4d9571999 SHA512 04356093c4df6a7ee0876b89be5b90f8bc90c920628e5fe69b5787ce82e003be05eaac142310f10f32d0549a6676af846734ae4ac188c2b96c2eca2cb0a6f4b0
 DIST genpatches-5.10-1.extras.tar.xz 1768 BLAKE2B e99d5d2137d5752845ba8284a0dd57620851c3620603e871973af5841b54e9bfdde92ea2408ddedb55355f2c954c80641b06098060043916d2483e10cfb8293a SHA512 0034e5ab57cccb2e969a3b9e1f674614ca853779c552c37be9c5afb0a37112bf8f2c30e1b21832d56320c70c1d622081b60369c6a86fa737a23c3ed953267453
-DIST genpatches-5.9-1.base.tar.xz 4004 BLAKE2B 8a4577d42262fa901186acc60d28221d00e5c9140886705f018d9989f818d96ee4d9a6586b292e7b1d945bea9e2408e3161a73e0999defe1b7f99d0a339eb7be SHA512 d6ba1051f9561aa30d7b196336c34930285d613e8119b152f1d6cc447cb22db5ac07c25f89d4ceddf58c9370c42699d0250a31449be2da3c591896b0c87d8718
-DIST genpatches-5.9-1.extras.tar.xz 1764 BLAKE2B 32d29f0448aef113ba9c9591c5d3b671d00d07abde9f35f365b48168887913bb2da95a8a52b852453307cabb111115a26178be4cbcc016e53a26a31f783a9df7 SHA512 df007dc98c1acdd31773f7dcf8aeb22812aa55e5593e8509b6a8762f2dcf06c95d69ad7cdce992e7a5fe730754bef26242acdc4e4da51ee29206fabb86c9cb0e
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
-DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
-DIST v5.10.1-zen1.patch.xz 35268 BLAKE2B 69b75dc5eb69cf4a57941d429e42416b2720634e2700915e3872cd24c1597a3f6c13ca8efd2e0bbeba85fcf174ac50f39787a07f21fad94dba2a9c60bfdcaf40 SHA512 e1bb633354946ba92a4f358f9f42328843ae3450d4f5c5439da8a90bf1a1ea2aae49821643d0302b032c90ff8165cc0609b777ae31294610578c535c55f55cbf
 DIST v5.10.2-zen1.patch.xz 38964 BLAKE2B 8596998d6cb2362b71194f6c8091fe61669698efea857f9438e4afebb521c9c3be298f94a280401109b9ba75f75245a751453fcb5ab8571aca7a2317c434bad5 SHA512 9b9eb8e9453efb6404933cc44264762790e79b6fabc56cee14cc7d8659b6be8089100d4ebb3af3e414fea2db2aa6de9118c5366ea171e02265c7fb2afe2a7605
 DIST v5.10.3-zen1.patch.xz 52312 BLAKE2B 157e08bc74a55c6e6e86895100ef09380251d86be436cd19ea06c7d6a49ad8dced5e128e863bf3f63c8334191c3e460617b4d9c68cbee49cf9781ede77dcf3a0 SHA512 8b274276a6b5c64a105e36a5456edef6a5a2a4419c4fcb6a2b6548bd8fca2f0ffa523e3105bd2486f17cb8460ae22226bc34b18783298da4b9cb322e92ef7356
 DIST v5.10.4-zen1.patch.xz 349804 BLAKE2B bb50930e24ed9028bd2518056e4e5eea503f4d3d6153d65e04adb22c660cd42e10c64a13a7c10248c7bfc51f4ef36350c7f7f8aeb2c434fed750d9c8175252bb SHA512 cbec1f3e12a0601bd018d90a52e16dd9b225e4d8675435722afa613ea98eb33c1bcce3d631dcc18b7a6f046c0fa12be0acf2bbb9a09d5e259f2ab325ada46148
 DIST v5.10.6-zen1.patch.xz 387460 BLAKE2B 0e42109335d0c8d7344b8afc3addbe20c92952eea536df4db0152607dcc97d7de142124f9cb0c22c52af01bd6c117cdc69c51f36725c0f2ab2d51165a2390a28 SHA512 3ba03f703521083e629911ebf980545daa34d73aba30aed8e7355eb315d89728f322df0a3791663fa5fbe398bbd1d10951518d81126e077cf50c9fa1d34563dd
-DIST v5.9.13-zen1.patch.xz 806084 BLAKE2B 93706195979daad6037fdb3be9c1dbad516fb4db2c59076e0e80f43092c25e950b53e8e315cd748a4c235968a4aa6653f182ecce86fb38193666a4cc2484e086 SHA512 6b78e36f222cd756a42f66017999d128c0b5fc9ebce929548d5812f0dd0284ec2f097d53f680e24ec81cfdd437361a894955851e037c32f415f0578afc2b401c
+DIST v5.10.9-zen1.patch.xz 524672 BLAKE2B a2145e593589ab4133326f8c41714fa941d029bc85c26305ce850910fc191e849d03108a6c0cafc4673540eae4625d1a82e3e325dab9c0efc725863a86b657b9 SHA512 2f37da67143d950d693fa5d4e244d7f465aecb4d22191d252676cfd51d02388ea1206b3fe3eb0f2592a00993fbcefffc91cf70408583b5eace15de996362bc96

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

@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"

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

@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-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
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-HOMEPAGE="https://github.com/zen-kernel"
-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}-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}-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
-}