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

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

commit:     7fa0e1942bdeef01d97d6a37972f8575f584bea0
Author:     kuzetsa <kuzetsa <AT> gmail <DOT> com>
AuthorDate: Sat Jun 24 18:29:38 2017 +0000
Commit:     Alice Ferrazzi <alicef <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 18:40:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fa0e194

sys-kernel/ck-sources: v.bump (4.9.34 & 4.11.7)

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

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

diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 1f7e2c1117c..58a96dfb37f 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -24,6 +24,9 @@ DIST genpatches-4.11-7.extras.tar.xz 17360 SHA256 ce281a78992568afc67c8cef12ce80
 DIST genpatches-4.11-8.base.tar.xz 201408 SHA256 5cf255d4cad81d70345b6a21a8d92d1510bc0653cfe93d15f48acbe6d0f0ebaa SHA512 5caecea78f44b55289229ce38955015865dc06e09799ce9b2ce84ae9386d3d0797e973fdf6a7da03355db748dc7dd27b49d18eb37c2c3b857abe07ae366c354a WHIRLPOOL d84c78b05086fd4ea48ba87a0abb74b82eebe035f3ba1878244b4acfd8e0ad3c93d4e29fa001738ddcdbc54a96de0cd7d99eb027b1779a7e870427cab4448cff
 DIST genpatches-4.11-8.experimental.tar.xz 106556 SHA256 9450673572ae6b0645bf7771a786024dc5e803bb5ebe0d8e7f57fd1c5e90b954 SHA512 54e306a60f0efc2cd885bdddac4004ee6bdbae4b56bf18ba9b164f8cf5e85ef223340962bc73912e2c8cdd76bbdf1f278dfe6f8fef695819b7ed6ddd9a5b2648 WHIRLPOOL 1e0f188af0b4b7a9147cc9779ee34674dc8bb4d0dca14891ef7827c95b7d32f3271b788b6cc63d5c9a497a2dca20ffff155054816fb92c67d345dc6ce4721b58
 DIST genpatches-4.11-8.extras.tar.xz 17352 SHA256 b3e0339269dc41fbf08c0c602951442c8dbd4b887a6532fe904ee49108f947b1 SHA512 aef25f7897538b0a4c47545dc40254e415d950cde15165ce7de423adb12a3ebcf5f6a92a9d8113ada15e069be73f1f9e7e306bf5908d40c0a20c5001f8707144 WHIRLPOOL f82e1127748e6dcd1793592f39183f9ebedd08199767b0e6f4777ddee9d2874689f4db4ec51032e4193b9f2141f2ad5f6e5a1523bb1057c69edcf07d56206f70
+DIST genpatches-4.11-9.base.tar.xz 228412 SHA256 094cf6debebc1a5d5615bc099de2fe4772b873ffc6e5b117cf721d04e5fbdb43 SHA512 dc2201c845fe68ad9ef35c960eb15aa8b3fd2b45084c15303fd1527a3e2b2095132d80a41511e9a50034c776b9f2951a13984b36a178f281c6fe89e3aa15e1e8 WHIRLPOOL 12cf8556f66f84d5c33fca23f4645b49f5c2686037627c2a74c48a463c56525ef8d6b90e4f41104c5d30da149cc69e26615be55bf3067f766ef0896dc2c11d81
+DIST genpatches-4.11-9.experimental.tar.xz 106600 SHA256 e2aac36f6efd04cea03c35a73187b246ae42d56c6657b922057636f9f198f12c SHA512 731647428003123688ace6a9053d8b48f4c5d8ce96b7c6077b2727864b27e5dab0344c7bbcfd996c668518d68c6171d679fe367d25a6af8278133fdc7ec660db WHIRLPOOL 7315f7c419ddc202b167cc145e90d7ff07d8b60a441ee1145b176e0b6425580a9273f17a788bb781ae67071f3c46ca2f50180ae1d18755a9117c3c8a36827eb5
+DIST genpatches-4.11-9.extras.tar.xz 17352 SHA256 f7691170d75d64dc6c10c851f6e63bfda22f971a104be8e67b53887328aa3fe9 SHA512 39a64e21fb3968aafe2f71cacaccb2f300f6da202db38021a44c82382eb894c548c422402153d98768c58da0bf16efda4ee62436b065e0819f81a42fbb8382ca WHIRLPOOL ba3b71c896b9423bf4b9f0b4a5401641008910f7dad89f891737cf11cbfb62fabe4e9874c345b0bcb1b0d78b5ead44f32738e74417902cbb4111fd0c2e62e077
 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
@@ -45,6 +48,9 @@ DIST genpatches-4.9-33.extras.tar.xz 17360 SHA256 ce281a78992568afc67c8cef12ce80
 DIST genpatches-4.9-34.base.tar.xz 767768 SHA256 10ea926b9bd98ba6185ddd4c4eea5407a39f3eda1d8ae94e63559b0db2f7f5ec SHA512 e5dabcf6f28ca9df91ee12bf3a98a75cc219622e386b31d414d685b853de06cbd243d4bb114f079024e370050f23b47d2018845f3ff223ead3648ffacad227ef WHIRLPOOL 1538614ea77c934fe7b9cc126adc31f12054fdbe87d62f801fa4a348b393e98ab85f56c4acd27edc8584b0067bacdb8b0f1180c9675a8daa3a9b02ada5860e24
 DIST genpatches-4.9-34.experimental.tar.xz 106412 SHA256 57d8d91b926cabd586c7e0f252663d5eca1fa450e6decc9da1676ce4c5ff7850 SHA512 5066a6dfcaf606898faf12c87a59e4b32a45889eb2194c2def0b3a3daeb7e780ae42064307075d56a7175566e8a467bddc3aad8785c0d4ebd488f143fca70b67 WHIRLPOOL 5c25659b9dfbcef9215a18c22f30e3ff7a1b0e82228364dc5c109948593d4637d955feb00c3141969ae7a81df9b281c7422a3d765322fa35b3c685f758a26bcd
 DIST genpatches-4.9-34.extras.tar.xz 17352 SHA256 8bf0e588ebc9f5b7ed63f7cf1de2708d46bb8fc9bee08deffa5116f0603a17e0 SHA512 f90a20a615d8cbb75a55f1fc2776a7738606139988297aa448d7066a03cad4ef6c541cbe668ea262befa540149a5a54abd8d51aab38df6482d903f7fadc6de2b WHIRLPOOL 3391dad625e2cf48debea2551e671ca9379ca24f570eeb7832b13fe073448127380dd8ddfe57da399d6bb18bd544b473137a2249e138bf10aa3a670c871194fb
+DIST genpatches-4.9-35.base.tar.xz 784760 SHA256 8af30b82a2065351a1339a2ee4ee68483f09723b9d227e3f8dc211198ae6aac3 SHA512 d75c36e17fc32ed8cbde8747e77045cb41a365e5276a11861ee2b7255b5f41b9e1435859452227d19591c1387a56ca18f07305e3c70aaaefb596961ee0473c2a WHIRLPOOL 014ed90fd4d6046b0983d5389fabf7436c5b5333deeab64f7e78f6aa2d44817b93a3404ede2411910cb36ceb45b1e5fddec656de2f4a4e6b6a986bd3f1a03211
+DIST genpatches-4.9-35.experimental.tar.xz 106392 SHA256 7d37afac8eac9662881206341b11c9a0c3c0705a9c5a805fc57acad796bf6fb8 SHA512 8c5e920875d7390a1168172a6deeb54c09100f82b4536eb890df93ed32f031664e9e340f2db7d84f014f1b88bc97eae66adb554115e20dbade9d9d856e8bcd65 WHIRLPOOL d23d1d18b97aefed1972d3a0c4c6272ec669eafc6866f63a4f1c88b37500054c5f2dc97a12c93a33201e3a9eef0914a4c76369155e332aa5da90ef5ef6c67a1f
+DIST genpatches-4.9-35.extras.tar.xz 17348 SHA256 33e2bb26e7d22e95ac9cbdbee17a237ce9e07fcf249aad12ed6ebdcf3d9d0a98 SHA512 abaccadd70bbb34f1a7f28f332f38a54e035afa96be6b0d3d3e1daa16898743d4cf004225bf52287e0a6ea305492d59d76f8f40871dcf00de7ff965ce0d97f10 WHIRLPOOL f1ec67a941fc6bf31cd1e3290fe67bf136c23881ed4c835e623afdb6a9d05c2f662fe53113215a019bd7b0217cdb40d9dd328b4dfcb2b6c1525656d870579f59
 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.7.ebuild b/sys-kernel/ck-sources/ck-sources-4.11.7.ebuild
new file mode 100644
index 00000000000..ee22075d31b
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.11.7.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="9"
+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.34.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.34.ebuild
new file mode 100644
index 00000000000..53d4bd30361
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.9.34.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="35"
+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
+}