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.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

3 files changed, 105 insertions, 1 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/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*
+}