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

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

commit:     f9f8735f634e3d66b5a61aeed7570894a2871ee5
Author:     kuzetsa <kuzetsa <AT> gmail <DOT> com>
AuthorDate: Wed Nov 15 22:43:43 2017 +0000
Commit:     Alice Ferrazzi <alicef <AT> gentoo <DOT> org>
CommitDate: Thu Nov 16 04:12:32 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9f8735f

sys-kernel/ck-sources: v.bump (4.9.62 & 4.13.13)

Package-Manager: Portage-2.3.8, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/6198

 sys-kernel/ck-sources/Manifest                  |  6 +++
 sys-kernel/ck-sources/ck-sources-4.13.13.ebuild | 60 +++++++++++++++++++++++
 sys-kernel/ck-sources/ck-sources-4.9.62.ebuild  | 65 +++++++++++++++++++++++++
 3 files changed, 131 insertions(+)

diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 21f68669720..7d13ad428f9 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -23,6 +23,9 @@ DIST genpatches-4.13-13.extras.tar.xz 17396 SHA256 dc3c9d2b5c8c5f95af5e3da9463e0
 DIST genpatches-4.13-14.base.tar.xz 243120 SHA256 7ab50617a0dd9661b8e23db22d3be8d20c39715b9dee8b2ab7b9a19ecca2b1fb SHA512 c885d59f4d301b1ef71d40e3b35758914b669e25a15a64826454b3f46f5b45a49850971ddf11cd1d5db41d1c0fc5d814158dd02f14d9eb0c97af208865c44dd2 WHIRLPOOL 36f0972a3ff9f58100603faf6a7086e03a32cfdef42d903df5e202734c0d56eace42d7c1242712e764aa5b87f1eb9fe1c78070a05cff6eafc2150d05f35ffde2
 DIST genpatches-4.13-14.experimental.tar.xz 5184 SHA256 6734f0f0fdf33b648f7af28252e17b72e9345a483ef0714fa45e192cb33e2b7c SHA512 c220d229f4dffaf7bf09b9d4cb1a73d61b7646191d715098e5eb51808c66d38827729edcc9999f1252d7b1bfaaed7d2d2566add7b6cbadad1db246379334dee1 WHIRLPOOL 307fe32b1492096547eca0af6de818d81724ee58f2594d4c537b1a6bf797ef45b96a51a25b5e92d279e78398f5104bb28bb20a2c2980bab779e5f292017de246
 DIST genpatches-4.13-14.extras.tar.xz 17396 SHA256 dc3c9d2b5c8c5f95af5e3da9463e0fc3d9c83b8c40d992f6381ac3d4523d0287 SHA512 67a4cf48502378663c5277e5d6c2d98d195d7f7b3a7fe0e79a5118c7e910e19c9882807cd7d80f73c08f28d702b83e4af9248597af751dc3cf923eee40a5c0ab WHIRLPOOL 8aa276bb0617a876fea012e15ee8e1877ae6921b386e846c60881410ff565960e9c5b82e88e62e39c85439a79bf1561e2834912358f754a274870e224381ce8d
+DIST genpatches-4.13-15.base.tar.xz 254132 SHA256 42f1e2ba1ea6218492b7aa39553aec4497955eea9cca383ee757d30aaa5f58c0 SHA512 7d38c30f213a1bc0a38d2bb8e97f1f6b86ecff60779aa36cd1c9bd9cd2726c16b8bd3067364cae716d38e22d8f34dd34cac3072d5fe2c8256de229b99cb9a4b3 WHIRLPOOL 0457c37dae998872a21a84ae5e07259afa759f27cc61a27bd2b29fe4a530330ccce9acdf2f48c9b95af4f38a3e67c551d4f1f09afbedfdafc27f00e454db930b
+DIST genpatches-4.13-15.experimental.tar.xz 5184 SHA256 86e11d4000233f7832090f20771cb0b9b5fb68f630ded53e0492da79a54ae4ac SHA512 4c5416bdfa602ae083a9058d04d2dede66bef95e5c589dd211aa82264c044a1102b63459dc384e7bdd6c10678b440542db2b274ebeb4456aeef93f09aea4693f WHIRLPOOL d13f518bb332ff5c5daa9a4ec1e949ed93936d69c248f62b596e8426ace5a00b27cd907d40e2610d46fcc3ef6dace2a56d15969762645d8406b8c0d8e9d3ba47
+DIST genpatches-4.13-15.extras.tar.xz 17400 SHA256 28a3431e5d8aca353b9d763c67261ccf3f07209d3f622d118b6025c7b1b31f38 SHA512 4e41c0780bc7c37fa5e13847ee203cefc6e1676921d1560fef9a198ffcb948c7df38acb642098a1266661bf5ddeb022510aa0ab6863e654e29400eeccf093cc9 WHIRLPOOL d0ef7f5de7f12f94030676c9b9c94834b95dcf23d4607c1e33ee2c1a87830d136ae184ec61e27410b6cdab716b21959d681ddcb90f34b3599b51a8272d46146d
 DIST genpatches-4.9-54.base.tar.xz 1053504 SHA256 ad6728a6e84a45aa9a84215f72ba1daed8c9681b61d9470b0fed24c285aec82a SHA512 3e64d39f3d7d0c1d68cca6b27df1e374970f0b42f47ff6bc900a1a12d1305093efafdccc28a1ba89404397ad285298058e882329f651e8d1031ddc86dbf06c40 WHIRLPOOL 7c22db4217a2604a05e8f4a9817fceabf865b00c7c33df95cfc5a09af6ffa84d809930c221f55cb9b500cc8d57b2e43f70f80e622a19fb73e0d068f2ec2be18d
 DIST genpatches-4.9-54.experimental.tar.xz 106360 SHA256 9c5b4ec4005bf50556163cebe4a4e577cffc3ed0ab06a40cd79bc7e9e33a964d SHA512 ace1650a90d70f1ab6d938d2509c44ff1911178161bfa6f060f5eb078b9c83d031709dc483f3481afc82c34b705cd9dd653c95c9b53817c79b0e632f970dad10 WHIRLPOOL 50c40e6160a92d98e568b3d55b336c4400cb8faff7fcfa5c71a8172e5149468b0483874c8531270f6f15b48f84fb3c47dee8ec01870c3331a150226c748b16ac
 DIST genpatches-4.9-54.extras.tar.xz 17356 SHA256 70314b113191df3bcf461537c5c5789ce990311affcb41e9d00b4a4d1f674659 SHA512 894f37761c80304fd12e20d9b2a11a56475484dd2a4504f4aada6b48854e752228256d56dfc328c7633996a16f4653af0105698b6a230619d9a3364b9d08a265 WHIRLPOOL 3fddbc03354fcb2b3c72caa7462a36d16a0595304da2ff9df0614925e252e3c15c38138b4f07789333c118dde992569c7cbbeb019b5052bc0ff18e87fb08cf6b
@@ -53,6 +56,9 @@ DIST genpatches-4.9-62.extras.tar.xz 17356 SHA256 6a9eb1e797afee5006c2d11435f9b0
 DIST genpatches-4.9-63.base.tar.xz 1183404 SHA256 8e5ad88a7a26df4c64b92a9fc6650ea753db6f7876034bfc4bf054d917db7eb0 SHA512 cb8e7ee1e8cf88e08bad0ec7078667f8cb044a5369a7bda6db68846ac56696d888125527b3dc0d4b5fc90bc072cbd31a75c327c6317036ba697ffa235c1c074e WHIRLPOOL b079cd9151f22140a9b1774159d28f430f7cc2a26816c1d7e58b9781c1b6f58635412eb308ad01a0fba90633cd582bb936fce8f44a970d70c5a7e8ab44d1dae3
 DIST genpatches-4.9-63.experimental.tar.xz 106440 SHA256 f4b1d833cd7f827cd36a0354c52065a08a495436adfafe0c6f3c4643ff7e4d79 SHA512 3c03fadd3a532cf0db5e3b7a319f8ffa6a96e3d304f31cf017baba5766da4af619daacb08749ec12bf8d62ce7439d2087de05b07f42ae0a41d81540f130a615a WHIRLPOOL 255dbef473aca9748358a34d535335fab5a11db1614db80d10edde5b8e4970f2ae48680fe1d3812d0f9e280dced7c58f8cee7840eeea2bfdd3b892037cbef970
 DIST genpatches-4.9-63.extras.tar.xz 17348 SHA256 28408ae0b16962f032f994635723a65d1dc2a4ad1fa41f36e2f3d18091e9e5eb SHA512 26e91da7d56177e7d0ec5c0c58e1acdddb99432978551a60cd48b58800c6f286054fbfabb87cf15b56ac4b7102c12f2c3edc2865f8fecce89e7eb0e7191ef1fa WHIRLPOOL 56313feff208263f6239237c3b177b8bf755d3b1a3ecfca7a42e71c5799836b7fbb9faf68d8a02ad9f93b2bef29fa33a834adcb2a7f7198d81e357c96b727769
+DIST genpatches-4.9-64.base.tar.xz 1203336 SHA256 218a08e0f85e6cadfddaf34cfb187b3eaf3f7aeed6f78f932a6ecb197196e07a SHA512 34bfbd0f72570d6f50b6d22b10dc2aa742b9554e467cbe82fad8c9fb463baaaaf7cad9acb46a4f65f44c3d720af539fa5923647afb144363110ec0cc3928bf65 WHIRLPOOL 331e3c21cc59e62f9f7d287fc2e441ca602affb828ba4cc59487ce2ba2af84de53e4820bf6a332c3fc1f5858e89f526ea07a321cfeb6041780b6c13e77de170f
+DIST genpatches-4.9-64.experimental.tar.xz 106388 SHA256 88279fabd32a49fce437d4dcc1c16539db18211e3ddba3dbfe29e02409cefaf9 SHA512 9ba6da1ae2a618b5c766a1b9cabb459d5e3296643ede83fc9a2eb3991030abcd37652e1cdcfa9f1756f42b386b2fccdfd498ccd6e7b54f87e7c953cd05faa8a7 WHIRLPOOL 16f76f83c2d91b7648b435308b27335734247402d36b1113b8fe1b7f4a47917a19c8d636b49e36a73879ba39a8b0175ba50f3b890ccad8d496ea8b225c451619
+DIST genpatches-4.9-64.extras.tar.xz 17356 SHA256 91388a8444f98a0535cade4b901a9480e6802f0895696c62b19377ec667d2d67 SHA512 2788478d0f659ab53b9fb5569cb6286b7db457520b2257db19ba8b9e2ef08be7e20e1901fe6d09069da09c8504507b2c1ea8ef3483ea5fda5272902ad49c18fe WHIRLPOOL 7c86180c55b4ebe26b93b4d8f1b280ec54c56d55b106109a614cfec211222f1c4e17803b1537c3179760a12dc12483951698c81bd2f7bf8deefcd5f454453180
 DIST linux-4.12.tar.xz 99186576 SHA256 a45c3becd4d08ce411c14628a949d08e2433d8cdeca92036c7013980e93858ab SHA512 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728 WHIRLPOOL 3b97da251c2ba4ace4a27b708f2b1dcf94cb1b59aaeded6acb74bd98f0d3e33f1df83670665e4186d99a55daa84c88d539d93e20f0ff18a6d46ef326c48dd375
 DIST linux-4.13.tar.xz 100579888 SHA256 2db3d6066c3ad93eb25b973a3d2951e022a7e975ee2fa7cbe5bddf84d9a49a2c SHA512 a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2 WHIRLPOOL d3d332e02cd3c5056c76c28cf1f81504c6f7b8f2caed7238e7dd7866747fb03154b88d8d7aec4d0eddf5760624bc7d6c5485fb52a3e32d098a2742eba96c0d05
 DIST linux-4.9.tar.xz 93192404 SHA256 029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a WHIRLPOOL 072505b29972ad120eb25a074217847c9c2813416c4903e605a0433574f5f87616dbea0b1454e4b19acc48107f11274b682958b1d773373156e99f8163e6606a

diff --git a/sys-kernel/ck-sources/ck-sources-4.13.13.ebuild b/sys-kernel/ck-sources/ck-sources-4.13.13.ebuild
new file mode 100644
index 00000000000..63131d566de
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.13.13.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="15"
+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}"
+
+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.62.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.62.ebuild
new file mode 100644
index 00000000000..1a2b0d3038c
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.9.62.ebuild
@@ -0,0 +1,65 @@
+# 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="64"
+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}"
+
+# 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}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${FRZR_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${CK_FILE} ${DISTDIR}/${FRZR_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
+}