1 |
commit: 147873f303be20acf22ea1415e9c1795fd681b5c |
2 |
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 10 15:16:20 2019 +0000 |
4 |
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 10 15:16:31 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=147873f3 |
7 |
|
8 |
sys-firmware/iwl6050-ucode: EAPI bump and clean-up |
9 |
|
10 |
Package-Manager: Portage-2.3.76, Repoman-2.3.16 |
11 |
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> |
12 |
|
13 |
.../iwl6050-ucode/iwl6050-ucode-41.28.5.1.ebuild | 40 ++++++++++++---------- |
14 |
.../iwl6050-ucode/iwl6050-ucode-9.201.4.1.ebuild | 35 +++++++++++++------ |
15 |
2 files changed, 46 insertions(+), 29 deletions(-) |
16 |
|
17 |
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 |
18 |
index 97c8dfc4a23..e3b0b43e03d 100644 |
19 |
--- a/sys-firmware/iwl6050-ucode/iwl6050-ucode-41.28.5.1.ebuild |
20 |
+++ b/sys-firmware/iwl6050-ucode/iwl6050-ucode-41.28.5.1.ebuild |
21 |
@@ -1,35 +1,39 @@ |
22 |
-# Copyright 1999-2018 Gentoo Foundation |
23 |
+# Copyright 1999-2019 Gentoo Authors |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
|
26 |
-EAPI=0 |
27 |
+EAPI=6 |
28 |
|
29 |
inherit linux-info |
30 |
|
31 |
-MY_PN="iwlwifi-6050-ucode" |
32 |
+MY_P="iwlwifi-${P#iwl}" |
33 |
|
34 |
DESCRIPTION="Intel (R) Wireless WiFi Link 6250-AGN ucode" |
35 |
-HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi" |
36 |
-SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz" |
37 |
+HOMEPAGE="https://intellinuxwireless.org/?p=iwlwifi" |
38 |
+SRC_URI="https://intellinuxwireless.org/iwlwifi/downloads/${MY_P}.tgz" |
39 |
|
40 |
LICENSE="ipw3945" |
41 |
SLOT="0" |
42 |
-KEYWORDS="amd64 x86" |
43 |
-IUSE="" |
44 |
+KEYWORDS="~amd64 ~x86" |
45 |
|
46 |
-S="${WORKDIR}/${MY_PN}-${PV}" |
47 |
+DEPEND="" |
48 |
+RDEPEND=" |
49 |
+ !sys-kernel/linux-firmware[-savedconfig] |
50 |
+" |
51 |
|
52 |
-src_compile() { :; } |
53 |
+CONFIG_CHECK="~IWLMVM" |
54 |
+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" |
55 |
|
56 |
-src_install() { |
57 |
- insinto /lib/firmware |
58 |
- doins iwlwifi-6050-5.ucode || die |
59 |
- |
60 |
- dodoc README* || die "dodoc failed" |
61 |
+S="${WORKDIR}/${MY_P}" |
62 |
|
63 |
+pkg_pretend() { |
64 |
if kernel_is lt 2 6 37; then |
65 |
- ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" |
66 |
- ewarn "This microcode image requires a kernel >= 2.6.37 or a 2.6.36 " |
67 |
- ewarn "kernel using >= genpatches-2.6.36-8 which is included" |
68 |
- ewarn "in gentoo-sources >= 2.6.36-r6 or any kernel version >= 2.6.37." |
69 |
+ eerror "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}." |
70 |
+ eerror "This microcode image requires a kernel >= 2.6.37." |
71 |
fi |
72 |
} |
73 |
+ |
74 |
+src_install() { |
75 |
+ insinto /lib/firmware |
76 |
+ doins iwlwifi-6050-5.ucode |
77 |
+ dodoc README* |
78 |
+} |
79 |
|
80 |
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 |
81 |
index 847b3019fea..da558b03962 100644 |
82 |
--- a/sys-firmware/iwl6050-ucode/iwl6050-ucode-9.201.4.1.ebuild |
83 |
+++ b/sys-firmware/iwl6050-ucode/iwl6050-ucode-9.201.4.1.ebuild |
84 |
@@ -1,26 +1,39 @@ |
85 |
-# Copyright 1999-2018 Gentoo Foundation |
86 |
+# Copyright 1999-2019 Gentoo Authors |
87 |
# Distributed under the terms of the GNU General Public License v2 |
88 |
|
89 |
-EAPI=0 |
90 |
+EAPI=6 |
91 |
|
92 |
-MY_PN="iwlwifi-6050-ucode" |
93 |
+inherit linux-info |
94 |
+ |
95 |
+MY_P="iwlwifi-${P#iwl}" |
96 |
|
97 |
DESCRIPTION="Intel (R) Wireless WiFi Link 6250-AGN ucode" |
98 |
-HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi" |
99 |
-SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz" |
100 |
+HOMEPAGE="https://intellinuxwireless.org/?p=iwlwifi" |
101 |
+SRC_URI="https://intellinuxwireless.org/iwlwifi/downloads/${MY_P}.tgz" |
102 |
|
103 |
LICENSE="ipw3945" |
104 |
SLOT="0" |
105 |
KEYWORDS="~amd64 ~x86" |
106 |
-IUSE="" |
107 |
|
108 |
-S="${WORKDIR}/${MY_PN}-${PV}" |
109 |
+DEPEND="" |
110 |
+RDEPEND=" |
111 |
+ !sys-kernel/linux-firmware[-savedconfig] |
112 |
+" |
113 |
+ |
114 |
+CONFIG_CHECK="~IWLMVM" |
115 |
+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" |
116 |
|
117 |
-src_compile() { :; } |
118 |
+S="${WORKDIR}/${MY_P}" |
119 |
+ |
120 |
+pkg_pretend() { |
121 |
+ if kernel_is lt 2 6 30; then |
122 |
+ eerror "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}." |
123 |
+ eerror "This microcode image requires a kernel >= 2.6.30." |
124 |
+ fi |
125 |
+} |
126 |
|
127 |
src_install() { |
128 |
insinto /lib/firmware |
129 |
- doins iwlwifi-6050-4.ucode || die |
130 |
- |
131 |
- dodoc README* || die "dodoc failed" |
132 |
+ doins iwlwifi-6050-4.ucode |
133 |
+ dodoc README* |
134 |
} |