Bump iwl7260-ucode to 0.10.15.23 (upstream write the version number components reversed) for kernel 3.17+ and 0.12.16.25 for kernel 3.19+. Fixes Bug 540316 - sys-firmware/iwl7260-ucode-0.10.13.23 version bump - thanks to David Flogeras for reporting.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

4 files changed, 113 insertions, 5 deletions

diff --git a/sys-firmware/iwl7260-ucode/ChangeLog b/sys-firmware/iwl7260-ucode/ChangeLog
index f66eab5db3a8..6ba64948f55e 100644
--- a/sys-firmware/iwl7260-ucode/ChangeLog
+++ b/sys-firmware/iwl7260-ucode/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-firmware/iwl7260-ucode
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl7260-ucode/ChangeLog,v 1.8 2015/01/14 12:15:50 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl7260-ucode/ChangeLog,v 1.9 2015/03/25 04:01:17 gienah Exp $
+
+*iwl7260-ucode-0.12.16.25 (25 Mar 2015)
+*iwl7260-ucode-0.10.15.23 (25 Mar 2015)
+
+  25 Mar 2015; Mark Wright <gienah@gentoo.org> +iwl7260-ucode-0.10.15.23.ebuild,
+  +iwl7260-ucode-0.12.16.25.ebuild:
+  Bump iwl7260-ucode to 0.10.15.23 (upstream write the version number components
+  reversed) for kernel 3.17+ and 0.12.16.25 for kernel 3.19+. Fixes Bug 540316 -
+  sys-firmware/iwl7260-ucode-0.10.13.23 version bump - thanks to David Flogeras
+  for reporting.
 
 *iwl7260-ucode-0.10.11.23 (14 Jan 2015)
 *iwl7260-ucode-0.7.1.22 (14 Jan 2015)
diff --git a/sys-firmware/iwl7260-ucode/Manifest b/sys-firmware/iwl7260-ucode/Manifest
index 702a03c372b3..e9a16865c3d6 100644
--- a/sys-firmware/iwl7260-ucode/Manifest
+++ b/sys-firmware/iwl7260-ucode/Manifest
@@ -2,23 +2,27 @@
 Hash: SHA256
 
 DIST iwl7260-ucode-0.10.11.23.tgz 347295 SHA256 4a1feba4436bc48c77e3494114e3b0d2a9d6e9208990c52b16c30c38da3c3cb5 SHA512 8e8e14be7e2f3f97a40bcfa16065d55418e42c10d7e4987b956a55775a8b0dfe75127296b97e6bcb9becf53133cd3f052e2691c05421804b6d3e11fc951d1a6f WHIRLPOOL cf55616de4653029bc3b178d24720d9ddfea3fa08342d0d80ac6602e3fd328cbb3540e4dffa22df243f600e214e0c6f206d5d63569ecafc48028a33ab4587319
+DIST iwl7260-ucode-0.10.15.23.tgz 348549 SHA256 8ad0c1457b694a6a84754619a40d826e6755de65efed8b8d1b273eb6560777e5 SHA512 a40efc2610a981b1e0de2a88d16afa760f5bcb116987034769a1a9adcc716b1ea84103e9a7c372172e98690e729c4d6e34b5857e2c9097439184b3b473f168a8 WHIRLPOOL 3836fb407fcec2b9e9ce64a83d18ccb40f1c031f166820f8921b06df7828bb94aad3e02eef11d159a41bc236c1d0f0f63829759a5671744acab5967fe5056e2b
+DIST iwl7260-ucode-0.12.16.25.tgz 353537 SHA256 d747e20bf4127357b162b583dbbf2067d2c034fadba1a2063de7aa94885b4f3e SHA512 efedee8f6d4078865b45962a8297c6c1022504653360ee6a23cc7f1eb4cfb1a34c5ee6685cf9819a61f439d445579e1eb14da84f3e28bcf45f89a5a66fbdfa07 WHIRLPOOL b4f913e9a4e92f61bb557da2254de8dc5c7c0d293c0d1948c2f84760a34dec56243e179e90aed74380bd8cdaed031994d193b8f62cb38d8e7c286831a99dcbd6
 DIST iwl7260-ucode-0.7.1.22.tgz 341956 SHA256 1ecc335e2a81a4f6d19422a5e707a93ef56351030a4e95d698e064fe51ba6154 SHA512 c6ae43ec84e5d0df85b6fc1962c5d6052be9352e453b53807a3c45eebc334892dae51c84a053fd197afa66a77bac5b5c349de8d566c071f15f2e76c370a36880 WHIRLPOOL 91ed3469604377462701ac921f06bd0269e032f04a1523ecc9e550d94cfd0fc1fee5caa484f0d46cd5d41ad25bc041fe953a7cd6c2dc0b8e3cbd39705b08119d
 DIST iwl7260-ucode-0.8.15.22.tgz 342953 SHA256 7ef7010705b26ab182c45f3810243cc814c0bec7a0c3dad21f0cdd22019ee7ec SHA512 7f6105c547dde559280444e1d729928c33d55ca4f5df1036d40ced735d7863277f2291a27c36ac544bb0c4278883b345be087268124d22af85155b0b4a57bb96 WHIRLPOOL 2ceea1c21749af78748652c8ce12df520621e0f54eff3c80307f0e038b23f730c9eccbadd1a4152276b8e99a447e7f1e38641d161334c197a5e86c5ce9e9e37e
 DIST iwl7260-ucode-0.8.24.22.tgz 346691 SHA256 11ef671652ade65fc6c7c843f56d19873b5a91b2e65676bd6df9ec39642b7cff SHA512 a8a81030bdec074b6370a6bb7f3b22fd8389b76c00b9b27902acfb34be2263662adf5b7eee6e8817c22dead54528607ccb93194073bd509191561a15ce88a3e8 WHIRLPOOL 205af365e22f9f28a95a5e3bef0cff59d301d03f60a21daac79a0f039c35fadfcbaca97b68082ecebead3396576d93bd372655c730cef87524a1dc382331a8d5
 DIST iwl7260-ucode-0.9.214.23.tgz 347695 SHA256 a3124e3c03405dacae6782ce7bc5b71c38c20e3528413a9ab571a0ce4e2418ad SHA512 d3ffaacc2827d088cbc1086b4d736e158dafde981e10a01442ede3003f8ccc66bb7ca6ca62c4f3c03fce4cc3cba56141c9144024ecfdaaf52ea3c7cdfbdbf074 WHIRLPOOL 81af9b1967a7f30da7bb60d068fe0c0242bffaf6ff80b00f6c7691f2c9e27243cde0f70b10581d3fbacd814ed369b9c39ca3ba30c677fed552496cc51f56dd6d
 DIST iwl7260-ucode-0.9.228.25.tgz 348138 SHA256 66781ba55a121889c3a2f0433d99c7bffc7699f08437d5de53890a362f4dfd5e SHA512 f2d6d5fa859e0f7680f695e6ae4fe2c2a56eb7dd26430b61520f7ab95322601bceafff33038945bbf07c8e6691b9a19cd5a5e7ae3e349bd89b72d11d09a9bfdc WHIRLPOOL 261edbed0edffaa78fb64515d1ae0f7fdf43a9f859e57e1a35120c8bda2f273b1be60f8ac4b4fc41b242cf1fa8771ae9e63f35c0be2049b506ae7da491c2a0d4
 EBUILD iwl7260-ucode-0.10.11.23.ebuild 1547 SHA256 acb39bd4dd2bfd8c93f322d2f230800fad05c76edae42fa1f06e9aaf3208bc71 SHA512 33145f03769a17f46ef6bccb03f5105dee969af856fafe0929ddd65de3cbca0b50845cde0b37a32bf53d79b6072e352cabd7fb55a6a3b5d25cc5913b2f633c8f WHIRLPOOL 9310b198800da22ae38eb6f81996461550945721bca2690b48ad46043a9991b573ad8b72f871fde83da7f8d2de978ab03c3aec8667a8538ab8717f707503083d
+EBUILD iwl7260-ucode-0.10.15.23.ebuild 1520 SHA256 31bfae810fd266c6931fba670474faaec7075a778085dfeae3fb298d263992f5 SHA512 386ed00b9b9950148125e1ecc0b6f584a8bf1678a2ca8dcdc06e1e2daf4b058474f59b7b509d7bad9fd99466d1cef6ee417be056d2ac01ade709aa70217bdab9 WHIRLPOOL 28862a95ba874dcc21f0453b2f98dad9ebb5da6dd24a842daad877c1701efc999ff917e514793357a415f1495cd3b3c798abf28bb361acac2aeecd328bc9c645
+EBUILD iwl7260-ucode-0.12.16.25.ebuild 1520 SHA256 9af0fb0c86ce867311b5bed27b17cff9219f45e1f70c723726a46d1023d45512 SHA512 c7eb69782b3f9ce7dc4894b90c050f3e8557d48223eb357068788fc9bf3cddfbc04a05f0f8dd03f11f22e653a4703c20b27eb120d4963bbc21f97ec4c0aeb1f6 WHIRLPOOL b7e99fa1e4c5832502b40febe091f423fb22a1adaf173bfa25078b3edb3ae78e74244b81bb9ad38b339aef1b1bb77c1b4079ffd9a211deabeb18c75a1d8a9978
 EBUILD iwl7260-ucode-0.7.1.22.ebuild 1448 SHA256 9e0118761817f522a6a280408c47a4635f2b057c9f99dee05ee386ad667a6940 SHA512 4a142ee0fe7ff9df18a1ba5f7b4bd1450ee745fdeed371c89b3a05853c7030fd72c91e6e57a9094b5d1dc165def49ac253f70d65671c7b6e865b79420df7dbc8 WHIRLPOOL be72726461f2acb4e48250c276735e7091675db0704df08d7b8d4174dffcb7696e0a1db8a81b191d2da256ca005a25bebfb29a618ce3c9fff6b0925cdd56d9b4
 EBUILD iwl7260-ucode-0.8.15.22.ebuild 1546 SHA256 942440e2946daf13d669a8cceb73d55c29b6470de19196e4eb8a9e56955753f5 SHA512 465a615b4511157d2f7e081f6216489635dab9b93a70307fed1f590da0fee6c9f2513734417fba7397d67185212e2dc19d4dfba1e3085a89ff4d9d4cc5bb982c WHIRLPOOL 8347f1f79955912f9e09b77f6ec396f33df4ee492efa2c9a41532ebfebf47c61c07e56c43b40b1d46858d52b2bffb76e905c23f8b5743bb1b1e2969c4847e90e
 EBUILD iwl7260-ucode-0.8.24.22.ebuild 1546 SHA256 c5bcef1729fb08b72b61cd4d5640ba7605b23650eacfa88ebfe106d4ab4c13e0 SHA512 a859f362eecd1deec3cbd8f35489310d21bdd6ec24c969d5757196547c1d463436f8901593b6f9ecc911a3afa129da5afb29d0ab4f7495bf87399ba33343cba1 WHIRLPOOL dabf5461936fa90815e3490a81d3b776b7dfa2464b6c91045379bd0166b533ad86ebd936688e319f5b4378c8a228b66b3ae374019a4ef27956bb6d7dd40c6fd5
 EBUILD iwl7260-ucode-0.9.214.23.ebuild 1547 SHA256 f3e359a550d0c2fc0433eedb27c1a360d937ec86e05ab8a3e9d5ef3844a16acf SHA512 05d29fe514215eb7770f86fa537e906362640bb4ef0eadffbf58f2fa4b15ae85c974155f1457fc67258c7824d052baf359ea4123df9ac5f57d426fb834d8dad6 WHIRLPOOL 864dacb21c1f6cc5d02c4bd3e93384ed6ac3f2ac803a34b977b1975ebb4d1d04b937a90e3490d3715377615dc3c477cd6e13ef430974c44ef05c3ee00c76a43b
 EBUILD iwl7260-ucode-0.9.228.25.ebuild 1506 SHA256 1a3b6d198ddf8dec140b4245eb9fac4ae4a435a0efe88f45baf5d21b7fcee5d4 SHA512 7830054ef855e6b486f32b3d19008e8d7d7a3144e2216e3c0ba847433b7b66d87b43f96576ed0a273acbe0a7b65fe5fa58b2453e4f586af142d55ec222bdfbd8 WHIRLPOOL 109042572cb1bd2c75c2a9fa0ac66139800d134420bfd6588b55827fa597b8222941ecc2478c9fc977ae629671167dd7790f436b46f67ce566117496b090e843
-MISC ChangeLog 3322 SHA256 048f42d3c5825b744dd0e1871f2e481b278c5b332386f88925789da29bdbc9e1 SHA512 48358d0a5fa324eeeb597a3594e00dbf0a59c73f3bf66918746545d5a6ebc3dd7998f52f457e1b43e040bdcc9e56bd383a96a0cd887daebb23de358a6537229b WHIRLPOOL 67697c4f5c41ce7ff981dfd9cd61835cda7ec49fedf017d1f288886cd1ee43ccd4a3f9c7d52cb7344fab963fde760821d061f3824310b07354acba025ed38910
+MISC ChangeLog 3780 SHA256 1d37edbe7875ff07fbf0da5991a2044ee2ce5e3f9e8d74dc0c9532e470bc9752 SHA512 0e50381848c86e15cb0ffc02864e9719b26b0684cb87e366545155e81b1dd7310b3ac9ba67f713eb7f725cbb1b7f4f7a86b5e0a4e81da3e190179d4a7427d669 WHIRLPOOL c6e6b2f21e5f10f11092c51de050d325e345ca08123b4bf28ab13ac5a6774eb0e0dc065632be58d60758b95dc01071b631251972587e4ebcf39430519d153ba6
 MISC metadata.xml 398 SHA256 81a62e5e24503efa7492ceb936b873540ff5ffc3eb56ca64644adc3f6009ace2 SHA512 7fdd10f2f284b66d121a38fb9eec94e03c58816f90ba4633cc595e2098a3eb9e93062c80751bbc72d8bf4433e5f34b0aaee4b1efd1554a354153e973ebfadb22 WHIRLPOOL a205605aa7c313201f313b460449d6fac3c6da20e371cdad662bebd74267c23ba988211e52762980a1c24fa2a20047f9fc4062660534d84e11bb38a3f48ee380
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlS2XfwACgkQoBEVQmGOlx+TRgEA3scbqDzZotVqqR3qKYV4Vp2w
-odWUiWeoI9kPkjYFAGgBAJVNjWgDwxb6jTZwLCunHWCqSmNlQU8//3FNwqMwO7pl
-=zoqN
+iF4EAREIAAYFAlUSMxQACgkQoBEVQmGOlx/PlwEAnRlUxUxFcMxZhNCcEC2J+Nr+
+6ISNShUX0nxkPT4YKJUBAMpJtwc3j5zJTiKCGQ7Oqk4wj2HBZxDechV1lZxMg/PP
+=99rT
 -----END PGP SIGNATURE-----
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.10.15.23.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.10.15.23.ebuild
new file mode 100644
index 000000000000..c085593a86ce
--- /dev/null
+++ b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.10.15.23.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.10.15.23.ebuild,v 1.1 2015/03/25 04:01:17 gienah Exp $
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="3"
+DV_MINOR="17"
+DV_PATCH="0"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="http://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.12.16.25.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.12.16.25.ebuild
new file mode 100644
index 000000000000..c2767b528bf2
--- /dev/null
+++ b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.12.16.25.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.12.16.25.ebuild,v 1.1 2015/03/25 04:01:17 gienah Exp $
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="3"
+DV_MINOR="19"
+DV_PATCH="0"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="http://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	dodoc README*
+}