Gentoo Archives: gentoo-commits

From: "Manuel Rüger" <mrueg@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/linux-firmware/
Date: Thu, 04 Jan 2018 13:10:18
Message-Id: 1515071395.eba2bd2d90fbe4cb680fba1ca61e90659b0e1a59.mrueg@gentoo
1 commit: eba2bd2d90fbe4cb680fba1ca61e90659b0e1a59
2 Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 4 13:09:55 2018 +0000
4 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 4 13:09:55 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eba2bd2d
7
8 sys-kernel/linux-firmware: Remove old
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 sys-kernel/linux-firmware/Manifest | 2 -
13 .../linux-firmware/linux-firmware-20171009.ebuild | 112 --------------------
14 .../linux-firmware/linux-firmware-20171123.ebuild | 114 ---------------------
15 3 files changed, 228 deletions(-)
16
17 diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
18 index 72d87c469ba..f59badc4997 100644
19 --- a/sys-kernel/linux-firmware/Manifest
20 +++ b/sys-kernel/linux-firmware/Manifest
21 @@ -1,5 +1,3 @@
22 DIST linux-firmware-20170314.tar.gz 96072698 BLAKE2B bf650b91a696d88272361c1845d0d7856e90c6d6e1d008a3d5f40bb9beb43a6047f2280d7e4fabeff25a2518c63086a331f1e1af59c458d6bec451efc4415ad2 SHA512 1e3a40d42ccd5260afd66161727e45af1de80129093f83f547f20502fce075927952629bfda4ec5b53a6f279daca0304fb462e7c6aa566bfe2b9b687688b6460
23 -DIST linux-firmware-20171009.tar.gz 106811352 BLAKE2B b4c18f3a72e16657244e77bbc39d905692cc2cc1aa95b89c0381f8948eeb6cac9b67688f6b4b2ef275eb53ee9ffd24b48b45b75f7632a7d26231fb3e92f6ea8b SHA512 3a91f05197b03e8f4e51f4fb936c68a9b7d7ead58fe489e679da8626391dfa1ed72362c857a7522f49d055e6b349b93564542658f7e9da96068b15b52f5862f4
24 -DIST linux-firmware-20171123.tar.gz 115603524 BLAKE2B cb2a4e4f849c1125f969e59104caf4abc4f195dd28d1ad7a8feb21bc29df82baea30b8236368bbc64c6dddde13aea5230763673b4580cd7c48736b64242b757b SHA512 6ac6fd05dc9b260686822d7eced94ceb2ec391626b88b68c6803224e5eb984caf8d28d446b7f348fe09f435e8f4faee716b53164d6f121dcb367e9ff753907e7
25 DIST linux-firmware-20171206.tar.gz 122782333 BLAKE2B f80f810c5544f3e7627fbfd70fdf9c725be710e1783d21e023e3d45e272a4c4521ccc12d406e204174fe10edeec7a1d06f56b09396c7952e00fb14e08b3fe3ef SHA512 1c0db1802732579c7923f0afaf0690db70f0925138ee1ea1a0eaff7f933a15fdc7d2fb3581e74883c01a75d16a285dc5467fabc7570cb378c0fa108426e7dc0f
26 DIST linux-firmware-20180103.tar.gz 138263360 BLAKE2B b7af0f94bf7111a1f4a10c7403f43dbfe837912ccf3afd4bcc362e483bcf15e02df76a37b112b2545c67bfbb2df031890dead100552e402ffc4727041409d891 SHA512 ed95205c075b47a2f30d9c96181ca0047de017abb1b5904f7c504a0afb8ea673c179980eb92d5690dd1a5cfb29815f224f384b4dcc472f80ddc90af3b2cbd4ce
27
28 diff --git a/sys-kernel/linux-firmware/linux-firmware-20171009.ebuild b/sys-kernel/linux-firmware/linux-firmware-20171009.ebuild
29 deleted file mode 100644
30 index f7a00d9f5ee..00000000000
31 --- a/sys-kernel/linux-firmware/linux-firmware-20171009.ebuild
32 +++ /dev/null
33 @@ -1,112 +0,0 @@
34 -# Copyright 1999-2017 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -inherit savedconfig
39 -
40 -if [[ ${PV} == 99999999* ]]; then
41 - inherit git-2
42 - SRC_URI=""
43 - EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
44 - KEYWORDS=""
45 -else
46 - GIT_COMMIT="bf04291309d3169c0ad3b8db52564235bbd08e30"
47 - SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
48 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
49 -fi
50 -
51 -DESCRIPTION="Linux firmware files"
52 -HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
53 -
54 -LICENSE="linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+ freedist"
55 -SLOT="0"
56 -IUSE="savedconfig"
57 -
58 -DEPEND=""
59 -RDEPEND="!savedconfig? (
60 - !sys-firmware/alsa-firmware[alsa_cards_ca0132]
61 - !sys-firmware/alsa-firmware[alsa_cards_korg1212]
62 - !sys-firmware/alsa-firmware[alsa_cards_maestro3]
63 - !sys-firmware/alsa-firmware[alsa_cards_sb16]
64 - !sys-firmware/alsa-firmware[alsa_cards_ymfpci]
65 - !media-tv/cx18-firmware
66 - !<sys-firmware/ivtv-firmware-20080701-r1
67 - !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
68 - !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
69 - !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
70 - !net-dialup/ueagle-atm
71 - !net-dialup/ueagle4-atm
72 - !net-wireless/ar9271-firmware
73 - !net-wireless/i2400m-fw
74 - !net-wireless/libertas-firmware
75 - !sys-firmware/rt61-firmware
76 - !net-wireless/rt73-firmware
77 - !net-wireless/rt2860-firmware
78 - !net-wireless/rt2870-firmware
79 - !sys-block/qla-fc-firmware
80 - !sys-firmware/amd-ucode
81 - !sys-firmware/iwl1000-ucode
82 - !sys-firmware/iwl2000-ucode
83 - !sys-firmware/iwl2030-ucode
84 - !sys-firmware/iwl3945-ucode
85 - !sys-firmware/iwl4965-ucode
86 - !sys-firmware/iwl5000-ucode
87 - !sys-firmware/iwl5150-ucode
88 - !sys-firmware/iwl6000-ucode
89 - !sys-firmware/iwl6005-ucode
90 - !sys-firmware/iwl6030-ucode
91 - !sys-firmware/iwl6050-ucode
92 - !sys-firmware/iwl3160-ucode
93 - !sys-firmware/iwl7260-ucode
94 - !sys-firmware/iwl7265-ucode
95 - !sys-firmware/iwl3160-7260-bt-ucode
96 - !sys-firmware/radeon-ucode
97 - )"
98 -#add anything else that collides to this
99 -
100 -src_unpack() {
101 - if [[ ${PV} == 99999999* ]]; then
102 - git-2_src_unpack
103 - else
104 - default
105 - # rename directory from git snapshot tarball
106 - mv ${PN}-*/ ${P} || die
107 - fi
108 -}
109 -
110 -src_prepare() {
111 - default
112 - echo "# Remove files that shall not be installed from this list." > ${PN}.conf
113 - find * \( \! -type d -and \! -name ${PN}.conf \) >> ${PN}.conf
114 -
115 - if use savedconfig; then
116 - restore_config ${PN}.conf
117 - ebegin "Removing all files not listed in config"
118 - find * \( \! -type d -and \! -name ${PN}.conf \) \
119 - | sort ${PN}.conf ${PN}.conf - \
120 - | uniq -u | xargs -r rm
121 - eend $? || die
122 - # remove empty directories, bug #396073
123 - find -type d -empty -delete || die
124 - fi
125 -}
126 -
127 -src_install() {
128 - if use !savedconfig; then
129 - save_config ${PN}.conf
130 - fi
131 - rm ${PN}.conf || die
132 - insinto /lib/firmware/
133 - doins -r *
134 -}
135 -
136 -pkg_preinst() {
137 - if use savedconfig; then
138 - ewarn "USE=savedconfig is active. You must handle file collisions manually."
139 - fi
140 -}
141 -
142 -pkg_postinst() {
143 - elog "If you are only interested in particular firmware files, edit the saved"
144 - elog "configfile and remove those that you do not want."
145 -}
146
147 diff --git a/sys-kernel/linux-firmware/linux-firmware-20171123.ebuild b/sys-kernel/linux-firmware/linux-firmware-20171123.ebuild
148 deleted file mode 100644
149 index 3ff0029ae57..00000000000
150 --- a/sys-kernel/linux-firmware/linux-firmware-20171123.ebuild
151 +++ /dev/null
152 @@ -1,114 +0,0 @@
153 -# Copyright 1999-2017 Gentoo Foundation
154 -# Distributed under the terms of the GNU General Public License v2
155 -
156 -EAPI=6
157 -inherit savedconfig
158 -
159 -if [[ ${PV} == 99999999* ]]; then
160 - inherit git-2
161 - SRC_URI=""
162 - EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
163 - KEYWORDS=""
164 -else
165 - GIT_COMMIT="90436ce9f11152483b35aac58dec7f99d52821aa"
166 - SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
167 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
168 -fi
169 -
170 -DESCRIPTION="Linux firmware files"
171 -HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
172 -
173 -LICENSE="linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+ freedist"
174 -SLOT="0"
175 -IUSE="savedconfig"
176 -
177 -DEPEND=""
178 -RDEPEND="!savedconfig? (
179 - !sys-firmware/alsa-firmware[alsa_cards_ca0132]
180 - !sys-firmware/alsa-firmware[alsa_cards_korg1212]
181 - !sys-firmware/alsa-firmware[alsa_cards_maestro3]
182 - !sys-firmware/alsa-firmware[alsa_cards_sb16]
183 - !sys-firmware/alsa-firmware[alsa_cards_ymfpci]
184 - !media-tv/cx18-firmware
185 - !<sys-firmware/ivtv-firmware-20080701-r1
186 - !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
187 - !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
188 - !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
189 - !net-dialup/ueagle-atm
190 - !net-dialup/ueagle4-atm
191 - !net-wireless/ar9271-firmware
192 - !net-wireless/i2400m-fw
193 - !net-wireless/libertas-firmware
194 - !sys-firmware/rt61-firmware
195 - !net-wireless/rt73-firmware
196 - !net-wireless/rt2860-firmware
197 - !net-wireless/rt2870-firmware
198 - !sys-block/qla-fc-firmware
199 - !sys-firmware/amd-ucode
200 - !sys-firmware/iwl1000-ucode
201 - !sys-firmware/iwl2000-ucode
202 - !sys-firmware/iwl2030-ucode
203 - !sys-firmware/iwl3945-ucode
204 - !sys-firmware/iwl4965-ucode
205 - !sys-firmware/iwl5000-ucode
206 - !sys-firmware/iwl5150-ucode
207 - !sys-firmware/iwl6000-ucode
208 - !sys-firmware/iwl6005-ucode
209 - !sys-firmware/iwl6030-ucode
210 - !sys-firmware/iwl6050-ucode
211 - !sys-firmware/iwl3160-ucode
212 - !sys-firmware/iwl7260-ucode
213 - !sys-firmware/iwl7265-ucode
214 - !sys-firmware/iwl3160-7260-bt-ucode
215 - !sys-firmware/radeon-ucode
216 - )"
217 -#add anything else that collides to this
218 -
219 -QA_PREBUILT="lib/firmware/*"
220 -
221 -src_unpack() {
222 - if [[ ${PV} == 99999999* ]]; then
223 - git-2_src_unpack
224 - else
225 - default
226 - # rename directory from git snapshot tarball
227 - mv ${PN}-*/ ${P} || die
228 - fi
229 -}
230 -
231 -src_prepare() {
232 - default
233 - echo "# Remove files that shall not be installed from this list." > ${PN}.conf
234 - find * \( \! -type d -and \! -name ${PN}.conf \) >> ${PN}.conf
235 -
236 - if use savedconfig; then
237 - restore_config ${PN}.conf
238 - ebegin "Removing all files not listed in config"
239 - find * \( \! -type d -and \! -name ${PN}.conf \) \
240 - | sort ${PN}.conf ${PN}.conf - \
241 - | uniq -u | xargs -r rm
242 - eend $? || die
243 - # remove empty directories, bug #396073
244 - find -type d -empty -delete || die
245 - fi
246 -}
247 -
248 -src_install() {
249 - if use !savedconfig; then
250 - save_config ${PN}.conf
251 - fi
252 - rm ${PN}.conf || die
253 - insinto /lib/firmware/
254 - doins -r *
255 -}
256 -
257 -pkg_preinst() {
258 - if use savedconfig; then
259 - ewarn "USE=savedconfig is active. You must handle file collisions manually."
260 - fi
261 -}
262 -
263 -pkg_postinst() {
264 - elog "If you are only interested in particular firmware files, edit the saved"
265 - elog "configfile and remove those that you do not want."
266 -}