gentoo resync : 13.10.2019

3 files changed, 48 insertions, 31 deletions

diff --git a/sys-firmware/iwl6050-ucode/Manifest b/sys-firmware/iwl6050-ucode/Manifest
index 271e01b51a0b..6594ed6aca01 100644
--- a/sys-firmware/iwl6050-ucode/Manifest
+++ b/sys-firmware/iwl6050-ucode/Manifest
@@ -1,5 +1,5 @@
 DIST iwlwifi-6050-ucode-41.28.5.1.tgz 223378 BLAKE2B 091e97f80f4159d241fc2e334d50653e287a57e17181787d0fe9c174a7a8f628aa8669df3a12e45276ff81b5b862d7e706a2a840c3f7d1e267943a97211a52f6 SHA512 16b618ef6b6c4e68d4a27d36e6f56e334528c00db62e6acbeb243257dc25ea373dd5be15a7f12acf06dd780ab706a08841419b2273bdab9cddd62601646afeb8
 DIST iwlwifi-6050-ucode-9.201.4.1.tgz 217685 BLAKE2B 9d1cfbfde9b9b80badb4cf9e44272376ddee616d0f20af089080cc424a91f012b021cd7a61a96168f4d08807293c25218b2fcb42975978ca1abc9835cdcff9dd SHA512 66aa8df5eec92ca29cd92a944b26c164f393784edea99e1b855aaf372e404794e47cd5fe763a47e445e776b324d7a87c221e439d9fe4a9366635f36d93c1272a
-EBUILD iwl6050-ucode-41.28.5.1.ebuild 890 BLAKE2B b5aef8e0de9f64551a06f92a63263b6676c4e27b0d5ba3e7900ab9128a8addd4bcbe3e92cb741a136c0fb90ec2ea0691afa2516db720081a984f757abd3ddadc SHA512 c9be76c9f73d34e8e380888912af84ea93b86d013b2b470109b9dc2df0def63e6ffe0280a448e9e81508d11392a1c85db824f7e7c336480dc9402b4f12af585b
-EBUILD iwl6050-ucode-9.201.4.1.ebuild 558 BLAKE2B 5d605c1f2908b9ba54b8010b487e922e8a9de86e6ef919424b5dfbc7ca139a18db31e1120d583b7e412eb384f598c52518805576cb2d0d667feff47a024fc476 SHA512 5aff4624d19458b071507bd248282e6659b812cfe20cf19e0ed36ba768d056b3d8983823691a8459c40af286f4a65215961c051e2c38ff2b3883843b312f8582
+EBUILD iwl6050-ucode-41.28.5.1.ebuild 911 BLAKE2B dbeba43af64b0faaf7a9967c1a5c9478b1a41b67ad1073f39c62b44ad108eb3ab65da8463fcf7f9dd4d032cec1dac2ecf666ab26222d4e4f5885770b7c11748d SHA512 9442182aa046d71926c9f43a6320f81fd9941b74078b807b1588900a2257ed6722647163d2b3eb30fe47a72ce8cce05e5af90bf800e1a2d7088b49e256a6d6fc
+EBUILD iwl6050-ucode-9.201.4.1.ebuild 911 BLAKE2B 819f08a06a040b814f965445245bbc31f9c86d56f554026221dbc2cbc5e5fa928b88ca6fb317f289c1c8f1415010b1af05f2a3361ec8ddb1a0c7dbc20c0209bd SHA512 1cac0b70ce75b5b724c5592256b3b8c5c56263dc7690aa126e165297645337fbd4cf40f2748f1b492d89f5bb6b26e449c1a2375e0b73bf67cfa6a04be22ee873
 MISC metadata.xml 222 BLAKE2B 5192d31072923545c8f760f9c3b3274f610b7a94a53cf55bc85c5c20a953b227b7cdb64cb5f5921b8b2822ec6563479b5d4883ec2b569a066d8ab569713fa8be SHA512 3d793038a1abf5bb86eeb23fee623f27db1d8e529372adc51eb4ffd1d0c2deb6df1c4d637954cc68e07d590c25e3d74a8437d02c1864a21c96f63597192cfef9
diff --git a/sys-firmware/iwl6050-ucode/iwl6050-ucode-41.28.5.1.ebuild b/sys-firmware/iwl6050-ucode/iwl6050-ucode-41.28.5.1.ebuild
index 97c8dfc4a233..e3b0b43e03d2 100644
--- a/sys-firmware/iwl6050-ucode/iwl6050-ucode-41.28.5.1.ebuild
+++ b/sys-firmware/iwl6050-ucode/iwl6050-ucode-41.28.5.1.ebuild
@@ -1,35 +1,39 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
 inherit linux-info
 
-MY_PN="iwlwifi-6050-ucode"
+MY_P="iwlwifi-${P#iwl}"
 
 DESCRIPTION="Intel (R) Wireless WiFi Link 6250-AGN ucode"
-HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi"
-SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz"
+HOMEPAGE="https://intellinuxwireless.org/?p=iwlwifi"
+SRC_URI="https://intellinuxwireless.org/iwlwifi/downloads/${MY_P}.tgz"
 
 LICENSE="ipw3945"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
+DEPEND=""
+RDEPEND="
+	!sys-kernel/linux-firmware[-savedconfig]
+"
 
-src_compile() { :; }
+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"
 
-src_install() {
-	insinto /lib/firmware
-	doins iwlwifi-6050-5.ucode || die
-
-	dodoc README* || die "dodoc failed"
+S="${WORKDIR}/${MY_P}"
 
+pkg_pretend() {
 	if kernel_is lt 2 6 37; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This microcode image requires a kernel >= 2.6.37 or a 2.6.36 "
-		ewarn "kernel using >= genpatches-2.6.36-8 which is included"
-		ewarn "in gentoo-sources >= 2.6.36-r6 or any kernel version >= 2.6.37."
+		eerror "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		eerror "This microcode image requires a kernel >= 2.6.37."
 	fi
 }
+
+src_install() {
+	insinto /lib/firmware
+	doins iwlwifi-6050-5.ucode
+	dodoc README*
+}
diff --git a/sys-firmware/iwl6050-ucode/iwl6050-ucode-9.201.4.1.ebuild b/sys-firmware/iwl6050-ucode/iwl6050-ucode-9.201.4.1.ebuild
index 847b3019fea8..da558b039628 100644
--- a/sys-firmware/iwl6050-ucode/iwl6050-ucode-9.201.4.1.ebuild
+++ b/sys-firmware/iwl6050-ucode/iwl6050-ucode-9.201.4.1.ebuild
@@ -1,26 +1,39 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
-MY_PN="iwlwifi-6050-ucode"
+inherit linux-info
+
+MY_P="iwlwifi-${P#iwl}"
 
 DESCRIPTION="Intel (R) Wireless WiFi Link 6250-AGN ucode"
-HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi"
-SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz"
+HOMEPAGE="https://intellinuxwireless.org/?p=iwlwifi"
+SRC_URI="https://intellinuxwireless.org/iwlwifi/downloads/${MY_P}.tgz"
 
 LICENSE="ipw3945"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-S="${WORKDIR}/${MY_PN}-${PV}"
+DEPEND=""
+RDEPEND="
+	!sys-kernel/linux-firmware[-savedconfig]
+"
+
+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"
 
-src_compile() { :; }
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if kernel_is lt 2 6 30; then
+		eerror "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		eerror "This microcode image requires a kernel >= 2.6.30."
+	fi
+}
 
 src_install() {
 	insinto /lib/firmware
-	doins iwlwifi-6050-4.ucode || die
-
-	dodoc README* || die "dodoc failed"
+	doins iwlwifi-6050-4.ucode
+	dodoc README*
 }