version bump

Package-Manager: portage-2.2.19/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!

3 files changed, 130 insertions, 16 deletions

diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index 15c07b2599f5..6828ccdf0f27 100644
--- a/sys-kernel/ck-sources/ChangeLog
+++ b/sys-kernel/ck-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/ck-sources
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.248 2015/05/16 02:44:45 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.249 2015/05/19 12:28:01 yngwin Exp $
+
+*ck-sources-4.0.4 (19 May 2015)
+
+  19 May 2015; Ben de Groot <yngwin@gentoo.org> +ck-sources-4.0.4.ebuild:
+  version bump
 
 *ck-sources-3.19.8 (16 May 2015)
 *ck-sources-3.14.42 (16 May 2015)
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 1b352ef9cd9e..a0e6f5d5b017 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -67,6 +67,9 @@ DIST genpatches-4.0-4.extras.tar.xz 16280 SHA256 f0b77c7754741f000933a1450c39027
 DIST genpatches-4.0-5.base.tar.xz 97864 SHA256 ab7495373dccfb2c3977fd52af4b2c3fc364b4d602e0d893320b4518542ffb79 SHA512 fe39613740e753a7c45dc1e5efbcbd8759a983c7ee076e520645bfe69a4f0f6a893a7fa7b7ddcb86759226c76c2be18caf372a6dbbe592b28a0990e2b899a857 WHIRLPOOL 8f7dabc6c12e7e0cd9a6f2a25e1d3cfc90a42d7a480781663c966c973e08d6b2cd0c05921ab4c8f5cf23aaae12135d54928c0318e09165efbad932f204cbfb07
 DIST genpatches-4.0-5.experimental.tar.xz 61652 SHA256 9b810a3b50e13ec8a289ee75bea9030a50bc7ebf847f2206a8e461ae0d153655 SHA512 3c5f092d21f7b8cbd02dcac39327bda03603e9075ea9507726908c94e7b2dfbf7ad7cc4f2c743737c39dd6da6e58a973451946c952dd328305e9b1963621e852 WHIRLPOOL 6d16adff806d15cd083a2bbb934bdd74b7bff7fa6fe5ca9401e9b0522d4b8406e609a5180f33606e523db5aea6cd6e10f12aeefefc426f518a782eb88500cb36
 DIST genpatches-4.0-5.extras.tar.xz 16276 SHA256 813ed84f4ed97ba09c2f8a59196c19250dd5e12891d6616f41168017f82b94c0 SHA512 23ecde7bc34fc6b58f05feb38d79eba48732d493231737271b70f1533bac18d77d1b0f36e0c275818f98d7249d032684f5fbd13dbf4254ffc535f410c431446f WHIRLPOOL 9202e028db421ab53c44e40e045ed8f1c52fba938ea2c3bd4498edd1478f53da8c9e28ad664ef061dcb28ddbac48b1f1c811f8d5437e31a8d3910efb14a349f3
+DIST genpatches-4.0-6.base.tar.xz 118672 SHA256 228c38e1e691fc3b3862a5de627c71ba9bcf1aafd10317a9ece83a13e041ed24 SHA512 02c3cbe7982173121f03ca9424e5fa04b27f985c2f81b7469559eda4d8824e4bb348a0b9b341a9e34c7803ea341161ff306aee5d6cb73617e01fe7aad327e05f WHIRLPOOL 685c62001c6e29efbf800471ed95f8413368c6dc194689c04dea44c5b9148e09d3d79e026f91a2054a84a991bd741dc8de08838c3cd9b9c94fb8dc981db9e953
+DIST genpatches-4.0-6.experimental.tar.xz 61620 SHA256 ea7359c8a3e4e8c53ccfa0573158f080e4ed2a458f6de654097cf21134c0910d SHA512 69b0f51e43c2a5712fd8eff3f8292fe31109e33a24b51bb0e637d15bbf2329767896d6c56f3f178ad6e9d1f69ebe6875108941f18a4a10747405be385e47ce86 WHIRLPOOL 657758e5a8b7a9c764f1d8a875be71ee079907aa6ab79c90ae2632c4ab8445a86ad97cb3ef70e424a6bd62d4c937de577cf44a10aeea4a41d8dd6d1bcf803952
+DIST genpatches-4.0-6.extras.tar.xz 16280 SHA256 205c87c3d133a57d6ca42e2ce107cf64cbedd64fd356c601ca0af29248af5c1e SHA512 61cea7f5a8919418bbea96599f7decf804d97d9e6b8729e7e5dc4f077d54c86db7b0087f70b87183420798f16c1036242f1b857ff2598edf0902ff4fa6bd2890 WHIRLPOOL fde8c4c909a26d7bf2d00e35d1ee45e03c4710871f0a2cffdfbcd1109aac0b4f3215bf0ef5dc6562e9fb9d7447c1330f91a08ffa78912b3857cd3ddab5d10a3b
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
 DIST linux-3.18.tar.xz 80934708 SHA256 becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 WHIRLPOOL 81634af631b7d30ccd1f4798f96f44d9aa0ba6609b73f2747eb6aebaf7a99487fb2dbd45767605186182533cb222bfd9236e8dd5e11a04fdb67c211e4e0a91d6
@@ -95,24 +98,25 @@ EBUILD ck-sources-4.0.0.ebuild 2732 SHA256 f405296a1fcefd862572136c254632368b8ed
 EBUILD ck-sources-4.0.1.ebuild 2732 SHA256 ddc5a30c12c02fc37632c6bdca64d3ea992ca0fd4653d25746b71f13ecb526bd SHA512 32e5416cd287e8f2ee31b2085b15cfc17b42d430c4f32ddd79e740e62f6de10602a93f2526de4b2a7f07a48e337c7d82457973c38ffe0449dfd42afbc72e2fbe WHIRLPOOL 2400ea108f4cc7d126c961574922d1ced612999b7b0a276e022302b25d38268b14e46a0fee8d5c09fb1a8c65b2138d3228054c3f29220dd17bee92637b384802
 EBUILD ck-sources-4.0.2.ebuild 2732 SHA256 7da5be38882cb829c37bd666e2ec2bd6129fff9f1df255a7ab9f092020e65b7b SHA512 8dbed1d74b441afe01c9959d9bfd14edd3adb574999f2b4bdec687c24ed2071452907769e66e6bdc575d19410a5a4be15f9f5141873bdade576dc201ef85242d WHIRLPOOL 233cf4d15512389fd1160d909fca899e8cf79c3de1766455e979a7d7ea0ed7993e0b7da3e2c47c589f258af2d7ea80ecab2df4f4b79c916d37d138f973ad4060
 EBUILD ck-sources-4.0.3.ebuild 2732 SHA256 5e335c47475b91de8485429112f175583a08d152bb974a4006cb12998cd6e124 SHA512 70ba685838904baeb9ea93b0072ccab516ab09e6b08f440c9c33154835849f33da9cb9b3e064d8f5363e1e4a6a0d71763341b4794fee907aaed8f31deab1b12b WHIRLPOOL e271b5c29eb51a94fa232ae9dc22261947dfe0928049c7727a415944a848ba002e87c8f7c74d1e2c1189e1be552b489cc3dc795c72ff231188f7c78c7ed56a38
-MISC ChangeLog 20835 SHA256 b2a5a664b296a6677245b714e9bc607b5ef2a40d5f89b2b316b12a023cc6efe3 SHA512 ba6dab452f871f61035e2e1b4f34fc95eaff251b8cd1fe17d736bdd29db4ffae9f7162f0f201eb7de93ca5d9ee9fd65162530d23108bba70a54f9a9c64ab1a05 WHIRLPOOL 47b3261c362ab353fa5b4a35e41cdf52617cad1abf3f0c707f6630dd9f26b367aece80c8f482e6bc1cc47877546b70148c9b7587bae8693db7013771726857ed
+EBUILD ck-sources-4.0.4.ebuild 2732 SHA256 d940ff03e934d65998ac78efadaa8499af2418caaf182d99eadefb0a6ac86382 SHA512 5787fdf96338b38acd66fbb55cd9f8fd9dbd748d08cae7c4f1a6dd7e1c04c9b7d49b28570f1be9ba9b0c180ee0a716e00bdaf45a6ac5ca324c554c001289e238 WHIRLPOOL fa07d2145e4a29c14906a734ea00f49edbe88166958d8d84cf013b40f2db8b21a7bc869dc8629b221d11382c8baa221d6caa16879a2adefc783eec391e008f1c
+MISC ChangeLog 20958 SHA256 688c481aaf59dd532d6b86c9d4abbb923d3ddb14fe65945378a8f430f806dc0c SHA512 8f8aceac0f5403ca09967630e0bdd3c1b3ed565f50827412f451437163e040255eafd2f6b6e2028dbcc9732606d3ee0ffcb86df81caffc177120e9d5ec3a7a4c WHIRLPOOL d07d102f5413ee044c4ec22095ff0ff3ff17954a3efcd9d47068dea49953e6de4a7f6dc9eaeb779d54718f505061fc2c629017a105cd3658066e26231615f2ab
 MISC metadata.xml 746 SHA256 cdb769127ff81a6751bf7d136623372e65aad8e925171285223347199a592d42 SHA512 b35fc76a91efd3ac384034d1c2c99b28899952c1deba0bc396b215bc760502574d5c7e565998819414436962e3e7d2badc7f6c93ef13e025ac36c8d671819346 WHIRLPOOL 32cb16fd7e2988bc78e0afd55b904e1fbdd7ab64dd57e465409e7ec2e5ce4e951dd8d9d2d6b3c561afbbc3cd95d7123d56b41d1f714c0af797258d2e7498940c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVVq8iXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVWyxVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
-RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOmgQP/A9AGtX2pNSG1iHX7EOZLQ4J
-Y90grLEG6oH6o918pQQkbz00iZfL/VhJcIzSxnJvUZmuJRS7addSfKkM97jgeAXg
-sIRiYrCBzFbDH4NKG2I+JdiKZlSKDTODvY9g0rvDWXWanKv+tUNfiGSrN4RW+Ph9
-IyK4ZyPIctV6JRItKHxFYnW8nzOctvJI1LdjPtbkXDYonIDI0HdDDm5SDj0aeQPC
-PwTavhbyqZOgOZN6dbfvAnAqIzMLJkSb/150NLbNhdw1xH2RjNczywh0JHkuJsnj
-dYrt/exo1L3xQjeFVErE8O7YaCWltBoNR13vo45IL56LrkxroZsjwSXeefmAx3Av
-nZ9bcqzTzyxDkW6m9VQexu9grZWjr2ozBTXrAk32wqbHj1R7psWn2UUSQiftHnob
-XTz7aTcd19DSJv6aVIJx5FqFuSSLN27I08Dw7lz+gFczGONvF1B1VZJdnZSZxPva
-QvFvvSZnoeBrMK9Zms7ZaVRDIwOl50FhurJEYLQCT2pq+DOx50glWbee4uxlUNWo
-oTdh37IotAJgUZB8LDdchI5w65hshIF9ITrtxacU65XQ574ZMPlDv2bnGOhLrWCx
-Jk9ZkPNy8c2SKfefW27gRF2JdRwTfJtj/6rcOLylyJbiXXTayt1bWr9CVdIDd6BQ
-xozud5q7cVCHHqKONAbB
-=SmYg
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOLfQP/iRSK5+dc9+mA4TGcVAGU2Np
+RXu/YOsIf39CpRe7xusWPyqilkop/00/NJ5rRyMRbDiF0gUxKwhl5NU+sQJh2ejD
+qUCija6BJR4MwdCfglYOlRnBBm7jCag6cahNYOtyZaIaCDF3IjdCjF5X+V2AbMLv
+mbgPZd5nU1nkKIdVeKaRHFOMejkhq8hn/mYZcDGRNzchnkmwW9rN+dBKZ1mLtUvy
+26cbz9l1arOIGMQdiJMP3j/ruTAB6yQkigug/DN3WarIx/Nnce/yXdYHQuzXWx5+
+cwgxBNC7eknf8j6ThNoJwmHU2ky438W+N2eiScu/Kiqd16SszslJOa+sEkRK249u
+aGSlDzRsH+8cBCc1lhBK1m9hyGhvrfbgvkQRGeqQ/Rn2Iwkrztb4CyNM3D08RtuB
+v1FHqWJD8d8Kwh4dwM49ss9S4BaknuUxJDCFuylgHNybyyiQi1mGmqpWM+tHWCx9
+MPXBJpyHQil+TEzrxNJyvMlAWG2sGP4OEEUGo0nWavLtI5//Y5If80/rORWXOShx
+aD4bx/0U/rdH3I+RL+sWFW+WcVDenOIevqYazagZuah0Pe05AValD99Ud99v3yLH
+tnvVNGsvVePwTzlwy7sVut+7a688aBclseEG53oQxo/sguP/Vw6fTuWr6gdQKGeU
+ZBGrv+unr3KqM+1xZOX9
+=+D03
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/ck-sources/ck-sources-4.0.4.ebuild b/sys-kernel/ck-sources/ck-sources-4.0.4.ebuild
new file mode 100644
index 000000000000..90abeb577b8b
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.0.4.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-4.0.4.ebuild,v 1.1 2015/05/19 12:28:01 yngwin Exp $
+
+EAPI="5"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+IUSE="bfsonly"
+
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/
+	http://users.on.net/~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"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
+
+#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
+
+XTRA_INCP_MIN=""
+XTRA_INCP_MAX=""
+
+#--
+
+CK_VERSION="1"
+BFS_VERSION="462"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
+BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
+
+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}"
+BFS_URI="${CK_LVER_URL}/patches/${BFS_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... (3.7/3.13)---------------------------
+
+CK_INCP_URI=""
+CK_INCP_LIST=""
+
+#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) -------
+
+PRE_CK_FIX=""
+POST_CK_FIX=""
+
+#--
+
+SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
+	!bfsonly? ( ${CK_URI} )
+	bfsonly? ( ${BFS_URI} )"
+
+UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
+
+if ! use bfsonly ; then
+	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
+else
+	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
+fi
+
+UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
+
+UNIPATCH_STRICTORDER="yes"
+
+#-- Since experimental genpatches && we want BFQ irrespective of experimental -
+
+K_EXP_GENPATCHES_LIST="50*_*.patch*"
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
+}
+
+pkg_postinst() {
+
+	kernel-2_pkg_postinst
+
+	elog
+	elog "For more info on this patchset, see: http://forums.gentoo.org/viewtopic-t-941030-start-0.html"
+	elog
+}