[gentoo-commits] repo/gentoo:master commit in: sys-kernel/ck-sources/

["Aaron Bauman" <bman@gentoo.org>]

commit:     71b13873e13c394ac841d903a0b23a0afb1d8042
Author:     kuzetsa <kuzetsa <AT> gmail <DOT> com>
AuthorDate: Mon May 21 05:32:12 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon May 21 17:06:34 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71b13873

sys-kernel/ck-sources: genpatches-4.14-46

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-kernel/ck-sources/Manifest                  |  3 ++
 sys-kernel/ck-sources/ck-sources-4.14.42.ebuild | 67 +++++++++++++++++++++++++
 2 files changed, 70 insertions(+)

diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 771b3e05458..dc2775cf5cb 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -20,6 +20,9 @@ DIST genpatches-4.14-45.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0da
 DIST genpatches-4.14-46.base.tar.xz 1190412 BLAKE2B cf4c875da660153fdc018e10a208d0277ca7e9645aa3ced2a6331f182a9eb50ad3f459d94680f0749cff6cf2e2900930a169873b0e3076d54b4155a4718aba5b SHA512 8704a4855b85b5ae151cbf66300ba7b0f546e7283fb58cfa8db32c038b32d00481770d9152e6a616f90010709215d7c07fcebd7ddfabd2978397b669894d794d
 DIST genpatches-4.14-46.experimental.tar.xz 5184 BLAKE2B 501c9b838f5e44380043ceaa9f8a5d9097bcd97c9113874cd8c9959224d1556e64867605c803e02ba92f70e250cb8f96728dee728e52b97feaf43eeb75a95fdd SHA512 907a896f768ac555d04c7d5278c632bf9a89c556a1ba863d01ba73cfa98f20c5b12742cd057bcb6037b41d12420069ac7a2453774d1a79a4e68e1216c188192b
 DIST genpatches-4.14-46.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0daac855515544d54a286dc90791e8318ef172771665ce132872351da9e26a0231f0b3e356cf9380c59ea52358ece117a23157e SHA512 eba699a9b0615b096358e967c1ee68989f1374ba9a4f281f232aca8ea459b30446551346a081b4a61067a4e94fedfbe2e470708801a4e9bc3049b69f6558fa14
+DIST genpatches-4.14-47.base.tar.xz 1200752 BLAKE2B 4e52afb8c85a9d2f162dec0d0e6ef557a66a6b899d47fd7578a350d65ad30bab32daa514d1305cf3a7faf66ce43f74c6a4525c8b987846bc92c2ec14405ec9cf SHA512 c2a46c73d999a199b406a712e79b74d1c33c1a3d0963d43a69f8fd32b9e52beb715867cd064639c842f2395993e789de42b18973932a042061be03957ee81b1a
+DIST genpatches-4.14-47.experimental.tar.xz 5184 BLAKE2B 12a3437d97cd8f7779e158f6e376ba41cada33db4fdbad8c803baaba01e5e459738b155fec1352e3354020f5b43846bb479fe2682dee5fa296d498e41b67af58 SHA512 885fc8f8b127f792426b575dc87d4c8d5655ef514eee7d8a77e065415db674fd995f6eb91c0f23ad0f03a26b01dfa67f2d474bd5a8e7753922cb9387be2d184c
+DIST genpatches-4.14-47.extras.tar.xz 17504 BLAKE2B 5f364e68c663c7ef6d5bf5cded7fc304d806adde306d25294996063efc6c9d3134e4d8da1839cc4fccb2da4d0781b2a9ab926351ce6bf4b4c0bae9cd955233b4 SHA512 6d17fdfa3228377120147e43f7a53700c8d3f25c6f2a09c82818558bce493e09db4a7405c42f1b4697a4424ababc607128d98d88301f825a266c802fd18cd78c
 DIST genpatches-4.15-20.base.tar.xz 464468 BLAKE2B b3c30e02819663b31b4ed83794d57c4521fe13015a4419088664f017f4753117bbc88a5600e310092d8eaf8b132b0757d59fb7b503abef046db0249ed7ae96e6 SHA512 cf79c85b65f3a68d3d721d2425fb6e498df808097bd8b1c610023d0c36c0378ec0f92d33ee0dc39592730d87f4a1df52931ea9608be2d56d5543a201f9d1d658
 DIST genpatches-4.15-20.experimental.tar.xz 5184 BLAKE2B 96ab38624869b7ca2caddceea1be6701c6a9df489dda0be4736765a6546909d522f5b32a44506875270485606797357bf44e044ed61ee40f6171670a5956bdbb SHA512 673083672ca1758f0b3dcc4507bd18c3ea1c024c86f1f8e0bcafe6117f33e226ad981fa123f1b3317858b93f5a17b5f56924e5e5eefb6c0980fc8572626010da
 DIST genpatches-4.15-20.extras.tar.xz 17492 BLAKE2B a610729f55d64e3ef6dee6129879f5ae27f31bb2738b0d8d3270f3502eaa19024323a741f0ac3325ba72342ae9e3c7fc9b4dbd56f8763a4be29e825d98a17b18 SHA512 304fa9e1f83f5b8e2fe10905799badc8bd8e9ac981fd59b3568f9d9d208dc671ec4dc1b88163351322d047596db4d2c8f9a261dbefa3351cf25f321b84beca9e

diff --git a/sys-kernel/ck-sources/ck-sources-4.14.42.ebuild b/sys-kernel/ck-sources/ck-sources-4.14.42.ebuild
new file mode 100644
index 00000000000..e6c63746647
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.14.42.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://kernel.kolivas.org/"
+
+IUSE="experimental"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="47"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 kernel-2
+detect_version
+detect_arch
+
+DEPEND="deblob? ( ${PYTHON_DEPS} )"
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
+
+CK_VERSION="1"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+
+# Fix for: https://github.com/gentoo/gentoo/pull/6942
+BLKIO_HASH="25849740d77dfc089fdbfb53623e50d38a972aff"
+BLKIO_FILE="${PN}-4.14-blkio-fix.patch"
+BLKIO_URI="https://github.com/ckolivas/linux/commit/${BLKIO_HASH}.patch -> ${BLKIO_FILE}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${BLKIO_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${CK_FILE} ${DISTDIR}/${BLKIO_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+pkg_setup() {
+	use deblob && python-any-r1_pkg_setup
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	# linux-info eclass cannot handle recursively expanded variables in Makefile #490328
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die
+
+	kernel-2_src_prepare
+}
+
+pkg_postinst() {
+	elog "ck-sources previously enabled CPU optimizations by default."
+	elog "USE=\"experimental\" is now required to enable this patch."
+	elog "this can be set in /etc/portage/package.use (or make.conf)"
+}