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

["Alice Ferrazzi" <alicef@gentoo.org>]

commit:     3b612e0f6c3640a2453ddf89ce1ba0d54887c446
Author:     kuzetsa <kuzetsa <AT> gmail <DOT> com>
AuthorDate: Thu Jun  8 01:01:04 2017 +0000
Commit:     Alice Ferrazzi <alicef <AT> gentoo <DOT> org>
CommitDate: Thu Jun  8 15:17:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b612e0f

sys-kernel/ck-sources: v.bump (4.9.31 & 4.11.4)

Package-Manager: Portage-2.3.5, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/4883

 sys-kernel/ck-sources/Manifest                 |  6 ++
 sys-kernel/ck-sources/ck-sources-4.11.4.ebuild | 60 ++++++++++++++++
 sys-kernel/ck-sources/ck-sources-4.9.31.ebuild | 96 ++++++++++++++++++++++++++
 3 files changed, 162 insertions(+)

diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 91ee4c10079..b4b11af9c85 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -15,6 +15,9 @@ DIST genpatches-4.11-3.extras.tar.xz 17356 SHA256 2b3449f4785ab494255e1c97ca2ca8
 DIST genpatches-4.11-5.base.tar.xz 116796 SHA256 04c22c62a78cf69eb56fba64056a1aa8cff5823f92490b0b88e1294340ff711b SHA512 ab264f6f31ed06f9c657af48ec4402c327ea9c920917032eab19ec78d915fe46fe1d9d46eaf891204e8e61974ff135c2de1d1a36cfb11d7760aa030641cde010 WHIRLPOOL 95dce90b089e20331b3837c428fe23d3a728427f54abaa6a66cda9147d407c95cf359ee1287eae070a6db64252a2c40a8613227fd16fb1364014beacafdcc3e7
 DIST genpatches-4.11-5.experimental.tar.xz 106560 SHA256 21f69bf8dd8b650a8263f4dbe4651caab5f161a68796fa712b48d7871e6621f4 SHA512 093d9cf7ef3de734ca98e5650637d785e4624dad91abaadc478f530571c3eef742d4a77f8dcd4071acd0e46d89dc0ecb2ffeddd34348cf172ce63a6d353ecf4a WHIRLPOOL cecbeab2078719098ea8fe88c07f980da6051419c631a686d21ebc2c8da3ed5bcb457a36f05fc453ebbed757fce687215388b8174bf1dddd4dec79aff6e73f82
 DIST genpatches-4.11-5.extras.tar.xz 17356 SHA256 1253db807bbf0ed52f5b2aed8e629e6c4ff0ae8ee08a1c7585576b6c71ccb939 SHA512 b61a4efb99a90ca9d177521b3d093d69f41d80b287b9307915e4c6f0c82d11ccd644755f1c28a9c97e54738c6cfced870e26d05d48b84c0c9ab6548949d618a0 WHIRLPOOL a74e7daef98d211f2fb8be2a2ef6bb2d2e493069d6bbdcb141a1e8eec6f7df7e4e57a71e538ea0c6a7e6ecc90ade79d78c22485e987361b43ba8ceb694c284f6
+DIST genpatches-4.11-6.base.tar.xz 156192 SHA256 55f3d9b55a76cfe0713ef7fe989ba2d4cbe13301c959ba7f24670f1936351ce2 SHA512 1712bed5e996fdcdb043ffe01a2c8892b5d87288c00888aed99af456c6a4f2ba08030b8fc9e609c50a08cfadfede260d6f7564bbad61d39e8f96cae1c5494c40 WHIRLPOOL 606961d2ef3ef0762bb848fa8b8f0f863fe013110f6f1aef80b71f03e97a4095fffed56fe25a3b65314c6f6fa71133c54972c63a2ac7c40fc2f70f2ff42a11dd
+DIST genpatches-4.11-6.experimental.tar.xz 106540 SHA256 35d717c319f63dc7eab86c08d8b7493b81a381e4c80dc3cee211ea88f6216a33 SHA512 00ba0fcf356410848b03680973076e557c60ad61ba2f55470920d8629f9e7080b582ae9272d5a32260ced48b1825efe6b52638e837614d4c3e74232cf528c0c5 WHIRLPOOL bad82f3c5a5bdaf3ce0a6d167a1a643f600e503365f9e09c3a124779f7eec900fbbcaa43baf31acd522f78a7678610645f529c123ca50267973d146de8324fb4
+DIST genpatches-4.11-6.extras.tar.xz 17356 SHA256 5917d197fbd1aacd0fa365dc576a0590cec1ac51f5e7f920db5ae35366913899 SHA512 5de95eaf2adc5437fd2fe71ee96b2987b2f4b726a14fa062d08f60e9d3b9fb012ebffc39b63a53b3c287256e9c96d1062a26922b72f2534f75ba7d1373257b24 WHIRLPOOL 0f19c09f2ddaffd053eff6244e539efff8ddee6afa541e053b580a986c218493d5684f844840c31bc8c4736002f1d227d66fd457721829af7278f0cb5bc9d60f
 DIST genpatches-4.9-28.base.tar.xz 581556 SHA256 a72e384dd4e3e835099bd430a89497e2d8ec9e1592262c887a705ad7f8c71160 SHA512 d6f04d54da3e57a8fa500063c215353d8a5d25122dcbca56443f35a13c833bc18fb499463df5c995818998df8b0b68167954a55682d7dbd44e5d2a97c5be5fe7 WHIRLPOOL dcdcfede3ec09b81277e337b4eca75e214395f73a8096ed103df88b0867c56774a3cc00637de0846e05f6a1835133be73012b57757b4ba5f92d569be9ad7948f
 DIST genpatches-4.9-28.experimental.tar.xz 106388 SHA256 cef686eb8c86e5f867d4c30d0203441da2138339e53b14de06cbef3673e460eb SHA512 8de1f97455be9519cd5320cfbf395cbf2f3be6a307d0b435f149da6c14d3461aabd04599fb122c013bac7ad0118f79c36bfaf7f6b71acf2d7323de25468dba04 WHIRLPOOL 82da257449bc0447244d05dfecf099eab7301b2c1cdadb1801b7e5a1ce00b06b1c63de5ed88c052cb944e2dc7579e50b20485220486e70c7a0c500ab2adaf224
 DIST genpatches-4.9-28.extras.tar.xz 17348 SHA256 9b8d40db773ce13feedd5ccb2ac7e88236d997c72d1adac7d0ba41fd2a432292 SHA512 5fa4001147c6a276a93896ea6d55f7ff24f4f0606b0cfbc2122d65dc685f9656b6146547000428b1940dc9cca434bd00880639b39bbd5e1f35331e2337842ab3 WHIRLPOOL 419bcba4c2e9fb26cceaede2bb70fbfeb41fdbb98ab1ccd49967a9e4daf1c75692f78ae35f70e8758031e94c7dfa52f27ad5a337c25a933df8aca36450a2fd83
@@ -27,6 +30,9 @@ DIST genpatches-4.9-30.extras.tar.xz 17356 SHA256 2b3449f4785ab494255e1c97ca2ca8
 DIST genpatches-4.9-31.base.tar.xz 671048 SHA256 678b5669505c3e3ccab876fe08bd9b7ddde05fb3e18098a490dd9e3151f6282a SHA512 8f682c48b24eb3839c69c001906be28f5ad0e8ae4512f3d080416d040b86b689e21338441af9aa601bf0e14979eafd933556a9bb7c36318bb14a7f29b0844904 WHIRLPOOL 98a16b8987b751eb173c908529c9e80149b048077b9cbec1a075d359f3f3a38f4cb0f67681ee977357fe627b80cf6b296b150f6187c71b873033505389603215
 DIST genpatches-4.9-31.experimental.tar.xz 106368 SHA256 f9f25811412ec2b5f0c4b9873b9a9bbbebecd3e720a97c85c8ea9e0906e064b1 SHA512 a4237937e5057cdeae443bf28bf0902e8e2d5c9a2b5767f3b538a3babcb13f7cf29895b42f34e4d4af892243945a59430bf0ffff48c1f06407fd1bab9009aeec WHIRLPOOL e27eb58ed55e855f4419a4100cb0256de41276268dc4d17362316c4286076096fea149088b6696b35ef4c96b52c732dedc03cfd09c9f35d99bc4f93914f4b025
 DIST genpatches-4.9-31.extras.tar.xz 17356 SHA256 1253db807bbf0ed52f5b2aed8e629e6c4ff0ae8ee08a1c7585576b6c71ccb939 SHA512 b61a4efb99a90ca9d177521b3d093d69f41d80b287b9307915e4c6f0c82d11ccd644755f1c28a9c97e54738c6cfced870e26d05d48b84c0c9ab6548949d618a0 WHIRLPOOL a74e7daef98d211f2fb8be2a2ef6bb2d2e493069d6bbdcb141a1e8eec6f7df7e4e57a71e538ea0c6a7e6ecc90ade79d78c22485e987361b43ba8ceb694c284f6
+DIST genpatches-4.9-32.base.tar.xz 698888 SHA256 e38f1d295ac46aac873115492f54e7863b982a161cf79c6f631b3964d6f59f62 SHA512 5e9d2e70167874b62c264b0ab6d2cc7684379724b3b520639f70160bb2bac4e732ba561d6c45a590cee0756fa03cc0b01ca5b17c765587390b338495abd6b5e1 WHIRLPOOL 8cac4cd54d814d99a8508bccf67738394c6d06adb81c3ec507b8fc06f2ed38047f4172db4f9c5ff39013fea322a9c8a527a75310de2ac78247081ac086f799b6
+DIST genpatches-4.9-32.experimental.tar.xz 106344 SHA256 19dc55bb156cc7493c81fc0d6a5a26a82769c28b199de13eea91bac7513ac268 SHA512 7cb599729840f51d23c38ddd46e8956148a2dbeb6cdb3ab313c106d8593ffbe343676bc9f08da23cfc446b028e505bb0073059e4a5e0081114a6048d418aa231 WHIRLPOOL adb7f9edec29afc9c5c005528ea7c23072366da52b570c78d555737781b14a47799c40f6af35bec0cce7de45206bb3d7fb121d88c7caf98297969e7cc51403d6
+DIST genpatches-4.9-32.extras.tar.xz 17348 SHA256 0c25f8f637ac315d78020d83ef3c2c9a4cc6f42f89f4ab465e099b242119ae30 SHA512 181257e0639370a8774ba06979f57b4a69e11e248a45eeb706e1dddc14885bb345571b59d5809875359ce188b90b95d27952f701fc032eb9ab39b780cbc40d94 WHIRLPOOL e7d83c30f292216e4073d74bc645d92e7bf53236b99379a85026481a8a24bdb7537ccabcd1038476ec0b72f70d7bb957cebdd5b46f20c5118a9bd6cb181f3fae
 DIST linux-4.11.tar.xz 95447768 SHA256 b67ecafd0a42b3383bf4d82f0850cbff92a7e72a215a6d02f42ddbafcf42a7d6 SHA512 6610eed97ffb7207c71771198c36179b8244ace7222bebb109507720e26c5f17d918079a56d5febdd8605844d67fb2df0ebe910fa2f2f53690daf6e2a8ad09c3 WHIRLPOOL f577b7c5c209cb8dfef2f1d56d77314fbd53323743a34b900e2559ab0049b7c2d6262bda136dd3d005bc0527788106e0484e46558448a8720dac389a969e5886
 DIST linux-4.9.tar.xz 93192404 SHA256 029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a WHIRLPOOL 072505b29972ad120eb25a074217847c9c2813416c4903e605a0433574f5f87616dbea0b1454e4b19acc48107f11274b682958b1d773373156e99f8163e6606a
 DIST patch-4.11-ck1.xz 148444 SHA256 d5903ed77b33984720e2178d34f8db287f6c274b7f1a30b4f28306b71a0bc3f1 SHA512 ce99c7da1d42f08da149099d8f365414c1f4dbb1cc0464547cb17c42a20b4112281657ec69c47fc97859900aaf780edcf56f3779bd6e715f04376f606e137513 WHIRLPOOL 865ce1dfb09712760e09b2658a8048ed019a2902f5c72e0ba78ba3b48d520aea5aa091d27c6802afcbeac52cf4dcc62d15b5b4dc68872d064e59a90871637033

diff --git a/sys-kernel/ck-sources/ck-sources-4.11.4.ebuild b/sys-kernel/ck-sources/ck-sources-4.11.4.ebuild
new file mode 100644
index 00000000000..a3408a3bb9f
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.11.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 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://users.tpg.com.au/ckolivas/kernel/"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_EXP_GENPATCHES_PULL="1"
+K_EXP_GENPATCHES_NOUSE="1"
+K_GENPATCHES_VER="6"
+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="2"
+
+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}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${CK_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+# ck-patches already includes BFQ (similar version as genpatches "experimental" USE flag)
+# what's not included is: "additional cpu optimizations" (5010) from genpatches experimental
+
+K_EXP_GENPATCHES_LIST="5010_*.patch*"
+
+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
+}

diff --git a/sys-kernel/ck-sources/ck-sources-4.9.31.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.31.ebuild
new file mode 100644
index 00000000000..3bd6ecaa18a
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.9.31.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://users.tpg.com.au/ckolivas/kernel/"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_EXP_GENPATCHES_PULL="1"
+K_EXP_GENPATCHES_NOUSE="1"
+K_GENPATCHES_VER="32"
+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}"
+
+#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
+
+XTRA_INCP_MIN=""
+XTRA_INCP_MAX=""
+
+#--
+
+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}"
+
+# solves bug #606866 (Fix build for CONFIG_FREEZER disabled.x)
+FRZR_HASH="7de569950716147ed436b27936628ee3ab5b45cc"
+FRZR_FILE="${PN}-4.9-freezer-fix.patch"
+FRZR_URI="https://github.com/ckolivas/linux/commit/${FRZR_HASH}.patch -> ${FRZR_FILE}"
+
+#-- Build extra incremental patches list --------------------------------------
+
+LX_INCP_URI=""
+LX_INCP_LIST=""
+if [ -n "${XTRA_INCP_MIN}" ]; then
+	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
+	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
+		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
+		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
+		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
+	done
+fi
+
+#-- CK needs sometimes to patch itself... ---------------------------
+
+CK_INCP_URI=""
+CK_INCP_LIST=""
+
+#-- Local patches needed for the ck-patches to apply smoothly -------
+
+PRE_CK_FIX=""
+POST_CK_FIX=""
+
+#--
+
+SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI} ${CK_URI} ${FRZR_URI}"
+
+UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}/${CK_FILE} ${CK_INCP_LIST} ${POST_CK_FIX} ${DISTDIR}/${FRZR_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+#-- Starting with 4.8, CK patches include BFQ, so exclude genpatches experimental BFQ patches -
+
+K_EXP_GENPATCHES_LIST="5010_*.patch*"
+
+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
+}