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

["Patrice Clement" <monsieurp@gentoo.org>]

commit:     2ced6d7755e102940669b60212e90cbbf6c35d4c
Author:     kuzetsa <kuzetsa <AT> gmail <DOT> com>
AuthorDate: Sat Feb 17 19:19:44 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Feb 18 17:15:06 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ced6d77

sys-kernel/ck-sources: version bump to 4.14.20.

Package-Manager: Portage-2.3.19, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/6942
Closes: https://github.com/gentoo/gentoo/pull/7217

 sys-kernel/ck-sources/Manifest                  |  4 ++
 sys-kernel/ck-sources/ck-sources-4.14.20.ebuild | 67 +++++++++++++++++++++++++
 2 files changed, 71 insertions(+)

diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 3bc232aa1ed..503e4578c1a 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -1,3 +1,4 @@
+DIST ck-sources-4.14-blkio-fix.patch 1882 BLAKE2B b85d7d0bcc868284d60c73f26b055cfc061c7535b19ac3aac9ae6df0f086e6b2342fc3ceab878c45b2c021ffc12abf4c8793472b3db85ae32d7d6c3b917530a5 SHA512 aa1f65b505d32af70e0e3c921e477f7e0adea76204ede19ced32514598a1f369bf0897487273b2acb99290ddcd2788707f0711290b767183cecb689f6df5cfa1
 DIST ck-sources-4.9-freezer-fix.patch 684 BLAKE2B 63894db45e5653af1851c7cee2493b6717d37f50d55c3a2b41316075d0f3e0bcb8975ff1c647c764bdf088ceeb4c716657e189d1e5337a69346e6dcefac332b9 SHA512 4241ca604f928263c29a49aca076832c06469db734864ec8c648cbbc30ba63cfb0b21d076ea4a7f3c438868802feb4e369d976e9ef6e091ce7bacf1a69c2c588
 DIST deblob-4.14 143883 BLAKE2B aaad9858bf626f1495f83187fd2ab91f812504534c7294cfb6818c773229eb780096a2c78a6aa963f3826df3cfdf7a7db5238f71fa8955c21b4acd75660d2b17 SHA512 662a11c03f51d85158175a8bf35fce20f01d94659d36b97a9773304ff9c091b2a9ab72a0445065c20188457fbe174fb43334a79e17b3a9e8553bb6144a971f4c
 DIST deblob-4.9 146273 BLAKE2B 8bc593ca375e003183dc6260aab0b2f81675b0814ec50fae3afe5d4ce9ce41c1c1401ce80e1c285153f610f8f730f82d6ad03e2578c792fd4af8779f2d1e3079 SHA512 3654b28e72b343bafdb38de10ef0c3621db0539bc0e7434bc99bb8f8ed911d4c9e53ca4785fd193fcfec369328f014fa5c6f3bda51b6f1a8f98b8c37ece119a6
@@ -21,6 +22,9 @@ DIST genpatches-4.14-18.extras.tar.xz 17500 BLAKE2B c858ab443c96384fed01154b3665
 DIST genpatches-4.14-19.base.tar.xz 452160 BLAKE2B 17ea7d41932b27feb9d83d7f7e620ba681b7051d25d32ff8dc6fbaac3642473737c89ffe33564c0a5bf2cfa15ffea31fe1abd4748874a6db53bf2a6f3b457693 SHA512 7263397dbbcc508ba4242c48ad470cf34ff94e69c143cd0f0f1142a7f07dd44517620c19fcdfb6e239091c112a877c5abec5f6b4ddeb668d4054ed7204838126
 DIST genpatches-4.14-19.experimental.tar.xz 5180 BLAKE2B 5f38d5116ca27f91d4e370d5bd78efc1dc85a715cb8329cc0d19e762b6ae395b7e261b1835d5c3c69ff10457ea69ca0fe2b993c1d5ae0c161f47ec1686af998b SHA512 d60a0ed5bdb7dcd92a7e99d507d9cdd45443ac0b3e2b6cfd16d31d192120a1a8a32215041ca040ca2838978ec6ca6a8f309859a2519fd2fe305d49d1761a177b
 DIST genpatches-4.14-19.extras.tar.xz 17480 BLAKE2B e214124df420df163c22a8d904a7fff2f1b672e1f86bc259d8ddebfc374489789fa547e4bdaacc80eac2080106c84a56fbb0a418fbcebc5266a5d9b1b4f711ea SHA512 8e06e3e692c575e08c5ab8e9f3883e7f82b436cc3d2cdcb79b0e10689acb621f58a33ca7ad582fa6f14fc8545343a7d04219a845dfbb249539d10dddbde5b8be
+DIST genpatches-4.14-25.base.tar.xz 638040 BLAKE2B 162d2117d125b277ae0d4557d203e5aca666b478c20ce46341fed43dcfca01aaa6727669f8f1eb851806c3838dd535da90f4f1a673aad9c439a1e7ac4f7505b1 SHA512 3cfcfed1389bea5a0341bebfc41552b0a9cc1b87099efca83fc32700a0cfb43dd4bd04b6e6a964ac8e4d23bab02707d3614025a6bce4bb614639f5d34bcb0854
+DIST genpatches-4.14-25.experimental.tar.xz 5184 BLAKE2B d1b0ae6d6e27920a91f230dd6768741fcbc2f3c3f45c94dd764ca33e08edc4d6f9a52caf8c0e8cfc5431fe49dc189710208d9f1fcf4199d51cf66f0578c6430f SHA512 dcb81b7063be6b19eb64bfe72f07d51762f3693b087e6feee118993d524bc48caa4ca6843ca45de7b017e30907c58b7f383f1a5efdc67f801f06d1ea8380474f
+DIST genpatches-4.14-25.extras.tar.xz 17480 BLAKE2B efcbfd671a8d34546dec1077c6e4033b04f5babd596a1d673bc4aa98b73b98c11b75f47288f8f1f9a89bbc5f0c053ba852d170bdd513f7d8e2747371cac213f5 SHA512 a78ee7bc750f0c41b526b95c63d9124aeabde8c4544fec7b76a8145e045b1106dc619d36d73d6e8bb262447f0f232a5b364028945f7251a29cd45e46f4612fd9
 DIST genpatches-4.14-4.base.tar.xz 87480 BLAKE2B 753bc9a5145ae32f1d4562862449f798ac9c78111819c7c279327039f74142fd0ae6955d559801736b6d2a0b074cae56d53226e5745cb8c85e76b0bd42ea0673 SHA512 8c0d8d864dea85f6730cc8c5bb1bcefefc8ef3ee5254ba62f0d4e90c5787ea6423988f4c303e0e32aa41fc9e5d4fc01103136556daa826a57403522066c3c949
 DIST genpatches-4.14-4.experimental.tar.xz 5184 BLAKE2B f1d9938a476a958a5fb42b60589234df5c85211b2ebfe59316dd32036ce2a93fdd405f02976ed8eb9312841a4853bac0baec4df52cfc09278b7cdd1fe76e0718 SHA512 85f3055ce8ee187fc7105bf338dc18fbbf02e9cec27aedec10a6fde4db89dec70e666e63dd24497decfefb4b1f59c74789079614025304df67484d80f81d7ede
 DIST genpatches-4.14-4.extras.tar.xz 17488 BLAKE2B ddab5ff81dc6cfe85ce3805846d8d74ce1eb8a2c79b2156e4363fa9592d1a0edec9f9812b9f41bd9ed955ac7030188776a7da5ff4a59408a0d5cf74bf0e629d6 SHA512 7ab148e3db28367ac7d8e56f75e65cafc3b80fd0932018d5ebd1ba1ba1b97521c94e30055fd653803806825bbc8be65e4fff2924907f9144b5ccdb48a53b00c8

diff --git a/sys-kernel/ck-sources/ck-sources-4.14.20.ebuild b/sys-kernel/ck-sources/ck-sources-4.14.20.ebuild
new file mode 100644
index 00000000000..8dacf4accda
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.14.20.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="25"
+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)"
+}