sys-kernel/linux-firmware: update SRC_URI

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

5 files changed, 44 insertions, 77 deletions

diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 08d6c97f6690..b529eb8d8a15 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,5 +1,5 @@
-DIST linux-firmware-20200316.tar.gz 221745284 BLAKE2B 6ab4944927420dd8c50d3a97beb32aff22917ab13b283c3358de9f5331479c2a4353dde68a221ac221e9ff5202e46cdaaab9b65cd0431a3984877ab44e2bd0ab SHA512 2fb16fcc474753902ab0236cbb116cdd5de10080d5ad5fc19a015ad3881a203c42beeccf5745e18346fc028a5c743d3d6439f0a04b86b2e0abf9f32aa5f55bad
-DIST linux-firmware-20200421.tar.gz 223307272 BLAKE2B 0f598acd7e88b4dbe275509a6cd7709ee8f6dddf79b262be3967b0ec19f4b51e1deb7bd4be8b392af42a7dcf31e978126b3390b2748ee71fd0172318d5252ccf SHA512 3f8ec2150f9895381e71cb0d0d403694784c4a50f164da59d338dbb37bb643150bed2c6de4729d37f25989b8e799475a53319882c05a06d3eadcc4c349082162
-DIST linux-firmware-20200519.tar.gz 234290201 BLAKE2B 00852b1e035f28aae5532d6ba92d547857ac6445e17b9f29b0954a460a1af9a98b348ad1700cd9f78baa83a2c63b657b6c10a8944188c6d4edf85c2336cc5763 SHA512 9724cf3d1aea73f264d53564ef160a62e90bb35766f3300bbbeaf7c7c6a356ef50c7d17bfa01197e8e991ff72b1aeef002bb78f5dc78243b2792cafbf1139dff
-DIST linux-firmware-20200619.tar.gz 250595335 BLAKE2B 9bb010b6600d02c536caf17502e54c5225934706eff747d7edaf55774f3c78841d3ff235b7eed037ff117e6e29e7ac11fec498fcace5c52f8b0ddd6b553b96f8 SHA512 9ee615f7d458e453ac53294cb920f322fa29c84255d127cd5f47fad178b0983e7e3fcd6be0b80bc6878c01258bdf75a1356ff6b6766279b10f352bfdb2e4b9a5
+DIST linux-firmware-20200316.tar.xz 97897640 BLAKE2B ea6256b4aa29a08c9a156a035dd618af0c80189f39a2deeec81a1da22e4e3414f3ebb2ddbe878adb757b48a5b46a2374b4a47d1d9d87aa169a10fe5840a268e6 SHA512 0579660568eee6cc36ccf84782632291a1b301df8131e3a33e38aa346043a8cc2ed4a5a6e5906b427e1fb70a9333018f250d24cbe79399d0aa13646aaf986313
+DIST linux-firmware-20200421.tar.xz 98988760 BLAKE2B 171c8fdbf0724d1cf851a6daa444f12216cf6224badaa39c651e81840dd840441f67faa3d2bcb99b62404e9d2d6ae119831906ae3961033262ce188c61e54738 SHA512 03498cf14befaf4d209aad5ab66695f83a5a6cdec9aa7f4de04737b27682ce344e48fe5954933a7f6455b97f396068b495237ec84b3425ca5184a6dacb90f391
+DIST linux-firmware-20200519.tar.xz 101137720 BLAKE2B b73744d4f8d0fc74fb1388ee13c04e44db8ee68f51ceb0c5ad363b2dfa4b381806b18c3f2a926b6ee13e290db874ea41b3388d647a662f462eebfe93051bd95b SHA512 88fad2a87cfad329d89e266eee3f5afcf6d0b3bc29510e6ba7ca96a9e18ff9e8e15a7895d600d289bf2ba0c73a908affdd68697fd3f1753e22d9920f9d859e81
+DIST linux-firmware-20200619.tar.xz 117836800 BLAKE2B 09312c70f81791f91547cf815ca0f07297c7ea4c527996504008e4c9dcc9d17c1eea192a646efc89146de62e886ccbf916a041247d642265ca375252e6af825e SHA512 8433646f2837fb5f52b2303316329f7c05423642085288f219d9955588441d50d6901cd31e0705a08453bda1882596ae6d8f8f922520579695f1b36b774b404b
 DIST linux-firmware-20200721.tar.xz 118013188 BLAKE2B 648f22d63e8e8a791e3243f9afb2d097fb206cfa1c1fd37fede0fd555d4b7cf6af6b27f4d67e4dc32a6c70fc25c6aee813dc330b4861dbd13373f703a04edd1a SHA512 1dbbf92efd1ac282a72e2f7483c9b35fe3ec348ab3f6062edb34b7922b6c1a007851a87b1835ece16d3cf147fb20ce8602a0262b0c8c94902728ac2f108796e9
diff --git a/sys-kernel/linux-firmware/linux-firmware-20200316.ebuild b/sys-kernel/linux-firmware/linux-firmware-20200316.ebuild
index 814bbfb764de..736bd9493455 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20200316.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20200316.ebuild
@@ -4,12 +4,20 @@
 EAPI=7
 inherit mount-boot savedconfig
 
+# In case this is a real snapshot, fill in commit below.
+# For normal, tagged releases, leave blank
+MY_COMMIT=
+
 if [[ ${PV} == 99999999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
 else
-	GIT_COMMIT="20200316"
-	SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	if [[ -n "${MY_COMMIT}" ]]; then
+		SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+	else
+		SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
+	fi
+
 	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 fi
 
@@ -33,38 +41,16 @@ BDEPEND="initramfs? ( app-arch/cpio )"
 RDEPEND="!savedconfig? (
 		redistributable? (
 			!sys-firmware/alsa-firmware[alsa_cards_ca0132]
-			!media-tv/cx18-firmware
-			!<sys-firmware/ivtv-firmware-20080701-r1
-			!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
-			!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
-			!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
 			!net-dialup/ueagle-atm
 			!net-dialup/ueagle4-atm
-			!net-wireless/ar9271-firmware
-			!net-wireless/i2400m-fw
-			!net-wireless/libertas-firmware
-			!sys-firmware/rt61-firmware
-			!net-wireless/rt73-firmware
-			!net-wireless/rt2860-firmware
-			!net-wireless/rt2870-firmware
 			!sys-block/qla-fc-firmware
-			!sys-firmware/amd-ucode
 			!sys-firmware/iwl1000-ucode
-			!sys-firmware/iwl2000-ucode
-			!sys-firmware/iwl2030-ucode
-			!sys-firmware/iwl3945-ucode
-			!sys-firmware/iwl4965-ucode
-			!sys-firmware/iwl5000-ucode
-			!sys-firmware/iwl5150-ucode
-			!sys-firmware/iwl6000-ucode
 			!sys-firmware/iwl6005-ucode
 			!sys-firmware/iwl6030-ucode
 			!sys-firmware/iwl6050-ucode
 			!sys-firmware/iwl3160-ucode
 			!sys-firmware/iwl7260-ucode
-			!sys-firmware/iwl7265-ucode
 			!sys-firmware/iwl3160-7260-bt-ucode
-			!sys-firmware/radeon-ucode
 		)
 		unknown-license? (
 			!sys-firmware/alsa-firmware[alsa_cards_korg1212]
diff --git a/sys-kernel/linux-firmware/linux-firmware-20200421.ebuild b/sys-kernel/linux-firmware/linux-firmware-20200421.ebuild
index 7b9e26ea90d6..736bd9493455 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20200421.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20200421.ebuild
@@ -4,12 +4,20 @@
 EAPI=7
 inherit mount-boot savedconfig
 
+# In case this is a real snapshot, fill in commit below.
+# For normal, tagged releases, leave blank
+MY_COMMIT=
+
 if [[ ${PV} == 99999999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
 else
-	GIT_COMMIT="20200421"
-	SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	if [[ -n "${MY_COMMIT}" ]]; then
+		SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+	else
+		SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
+	fi
+
 	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 fi
 
@@ -33,38 +41,16 @@ BDEPEND="initramfs? ( app-arch/cpio )"
 RDEPEND="!savedconfig? (
 		redistributable? (
 			!sys-firmware/alsa-firmware[alsa_cards_ca0132]
-			!media-tv/cx18-firmware
-			!<sys-firmware/ivtv-firmware-20080701-r1
-			!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
-			!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
-			!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
 			!net-dialup/ueagle-atm
 			!net-dialup/ueagle4-atm
-			!net-wireless/ar9271-firmware
-			!net-wireless/i2400m-fw
-			!net-wireless/libertas-firmware
-			!sys-firmware/rt61-firmware
-			!net-wireless/rt73-firmware
-			!net-wireless/rt2860-firmware
-			!net-wireless/rt2870-firmware
 			!sys-block/qla-fc-firmware
-			!sys-firmware/amd-ucode
 			!sys-firmware/iwl1000-ucode
-			!sys-firmware/iwl2000-ucode
-			!sys-firmware/iwl2030-ucode
-			!sys-firmware/iwl3945-ucode
-			!sys-firmware/iwl4965-ucode
-			!sys-firmware/iwl5000-ucode
-			!sys-firmware/iwl5150-ucode
-			!sys-firmware/iwl6000-ucode
 			!sys-firmware/iwl6005-ucode
 			!sys-firmware/iwl6030-ucode
 			!sys-firmware/iwl6050-ucode
 			!sys-firmware/iwl3160-ucode
 			!sys-firmware/iwl7260-ucode
-			!sys-firmware/iwl7265-ucode
 			!sys-firmware/iwl3160-7260-bt-ucode
-			!sys-firmware/radeon-ucode
 		)
 		unknown-license? (
 			!sys-firmware/alsa-firmware[alsa_cards_korg1212]
diff --git a/sys-kernel/linux-firmware/linux-firmware-20200519.ebuild b/sys-kernel/linux-firmware/linux-firmware-20200519.ebuild
index a9d99fd514d0..736bd9493455 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20200519.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20200519.ebuild
@@ -4,12 +4,20 @@
 EAPI=7
 inherit mount-boot savedconfig
 
+# In case this is a real snapshot, fill in commit below.
+# For normal, tagged releases, leave blank
+MY_COMMIT=
+
 if [[ ${PV} == 99999999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
 else
-	GIT_COMMIT="20200519"
-	SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	if [[ -n "${MY_COMMIT}" ]]; then
+		SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+	else
+		SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
+	fi
+
 	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 fi
 
@@ -33,38 +41,16 @@ BDEPEND="initramfs? ( app-arch/cpio )"
 RDEPEND="!savedconfig? (
 		redistributable? (
 			!sys-firmware/alsa-firmware[alsa_cards_ca0132]
-			!media-tv/cx18-firmware
-			!<sys-firmware/ivtv-firmware-20080701-r1
-			!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
-			!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
-			!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
 			!net-dialup/ueagle-atm
 			!net-dialup/ueagle4-atm
-			!net-wireless/ar9271-firmware
-			!net-wireless/i2400m-fw
-			!net-wireless/libertas-firmware
-			!sys-firmware/rt61-firmware
-			!net-wireless/rt73-firmware
-			!net-wireless/rt2860-firmware
-			!net-wireless/rt2870-firmware
 			!sys-block/qla-fc-firmware
-			!sys-firmware/amd-ucode
 			!sys-firmware/iwl1000-ucode
-			!sys-firmware/iwl2000-ucode
-			!sys-firmware/iwl2030-ucode
-			!sys-firmware/iwl3945-ucode
-			!sys-firmware/iwl4965-ucode
-			!sys-firmware/iwl5000-ucode
-			!sys-firmware/iwl5150-ucode
-			!sys-firmware/iwl6000-ucode
 			!sys-firmware/iwl6005-ucode
 			!sys-firmware/iwl6030-ucode
 			!sys-firmware/iwl6050-ucode
 			!sys-firmware/iwl3160-ucode
 			!sys-firmware/iwl7260-ucode
-			!sys-firmware/iwl7265-ucode
 			!sys-firmware/iwl3160-7260-bt-ucode
-			!sys-firmware/radeon-ucode
 		)
 		unknown-license? (
 			!sys-firmware/alsa-firmware[alsa_cards_korg1212]
diff --git a/sys-kernel/linux-firmware/linux-firmware-20200619.ebuild b/sys-kernel/linux-firmware/linux-firmware-20200619.ebuild
index 29a17fd934b9..736bd9493455 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20200619.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20200619.ebuild
@@ -4,11 +4,20 @@
 EAPI=7
 inherit mount-boot savedconfig
 
+# In case this is a real snapshot, fill in commit below.
+# For normal, tagged releases, leave blank
+MY_COMMIT=
+
 if [[ ${PV} == 99999999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
 else
-	SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${PV}.tar.gz"
+	if [[ -n "${MY_COMMIT}" ]]; then
+		SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+	else
+		SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
+	fi
+
 	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 fi