gentoo resync : 23.09.2020

3 files changed, 16 insertions, 61 deletions

diff --git a/sys-firmware/nvidia-firmware/Manifest b/sys-firmware/nvidia-firmware/Manifest
index 1090d38cfb34..b27d17b29bbd 100644
--- a/sys-firmware/nvidia-firmware/Manifest
+++ b/sys-firmware/nvidia-firmware/Manifest
@@ -1,7 +1,4 @@
-DIST NVIDIA-Linux-x86-325.15.run 27409286 BLAKE2B cb6de2c7a95cdeab18b3c5c61d7b99f73cc767c052900d927d37d1688fc971de3347cab98401197d2e6cadc1950feeb4fc9f63a84bc80a0fbf5031bcba3beb93 SHA512 48052c3daa8748a7c43de1c24e00fdd3f94cebbe7f5efbb185a0472a1d0bbab8adfe377359ccdc6cd8e437a80506fdd551408237b0842c194a3497c43cf3487e
 DIST NVIDIA-Linux-x86-340.32.run 38587515 BLAKE2B d7ebf5ece0f01c132c91e1f45cbfe8bd8354cf8a97e64820938c0cd0d3f3091a1ff778950f25b53c863a8e95d31b1656efbd516293c75a0e5395b264d95b8af1 SHA512 a67e57a1bd70a9cd5ae2bed70403920ed94d8eac9d08dcd380f6065cd597d5824e26ae25a0bcd56626190124c07d128f3b0429040794c8e8d3ead85860fcb646
-DIST nvidia_extract_firmware-325.15.py 12715 BLAKE2B 996d6cfcc87cb8d6f1d3f3a93bd2cf6af24df6aba403cccf0f3ca0e04b9bbe43cf069f9a6b4430e52b0d3502c2f8d4210e74e61b0fa1a4786b80575301e0f5e3 SHA512 ede9bed14bdae0684a5091fbaa1edcd5ed57463a19a4aee72633167ade5490f8de1d373ebf541678fa53d952da5cd9251c429329aa487578083d9622e6b926a4
-DIST nvidia_extract_firmware-340.32.py 13097 BLAKE2B 7c50734a8f6a9b94f3c111ca0eef055a5a638e2498b2dcb93a6d47547c202606783bcc3f1fba7cdba88d4f204abb173fc50fd52a3d23198f415588330710607b SHA512 a90a8907288ee841dc063a80afb1fea02e0034becddd75e367cf8fbdc065f321746e0d1bb77f158f7b011cfc03ad517e658ad1cc7a1b596e1452363862528b89
-EBUILD nvidia-firmware-325.15.ebuild 1087 BLAKE2B 380a4200f9ab347f96f810869b097ca983471860f44cf512846a74a0341204b2c32427f76873dfe9491c8938bd2a3394562214069e8584adba7bc95b2def3248 SHA512 bc81df26cabf3f04c0d8ae274b72c6156a57be32a92e3f12ab3621304f2ab8a7565784ce4cd38932ecda76b97fb6092a26cd8290c2bd722f9788b10c9fdb31ee
-EBUILD nvidia-firmware-340.32.ebuild 1092 BLAKE2B 9abfb68d1cbfa44600c7463065c92d79a57375979e8da0b3a3eca8a9993252d67c31ca9ece1c9f57317364c2414f665f3d6bf487f2485465371bb7c8cd2064dc SHA512 70f1c906733ae08b5a2da3afba498787c5504aa2ccf8d4549bdef3d79639b9091ab331130846b6c1fba5ae9e3567141bbacfc4048e11a5bba31fc2e90eba1b4c
+DIST nvidia_extract_firmware-a0b9f9be0efad90cc84b8b2eaf587c3d7d350ea9.py 13869 BLAKE2B 1e59322523c5ec3162dca9792b3cc63c7e71f88dd32650141ffaab49e694022ba155b3691261df96f838e6c80f86c7e42b2a46103baa27a93bd8b9525e839f59 SHA512 1b3fbf2e09cd4cbd63d8f86fde88560e1be2e187abd086a8737e69d66a21fc33079be2ab161186f76f42e2e54881325528e425b1f6f350ea3c37222f4e0d1a47
+EBUILD nvidia-firmware-340.32-r1.ebuild 1126 BLAKE2B a028d94af40ffb2bb70cdf1cf59157f3d2135c84581e1cc7f9b46da45456f0e470795de3751c5dc87cd02bc42e87fc507d458eaf065d4383976926cd8e05dd4f SHA512 5954500918a67cac3f7eff0b2ad9ccef9d812131ffca104bd67cba7aec1fc0b597b4b9d68ab2361bf3ac97398f540639900f8b536d89b1a9142dd1636b0eaa58
 MISC metadata.xml 249 BLAKE2B f870f9dc7bc1a515f782f4c1c544b6473b3ec16235b88a9930783ed8f7aa7f010838c37e225840b61a56c5f01c70ac3b50560fc2f5bc908418c341f51620ffe7 SHA512 1723b9b2663814b898832e18aea1a02520775e545e256fb70a8829e2b0515e59b5abab985c995b9ae2f509d95ea4601ac0085ab0d1653cdda0ebe90f775f6e5b
diff --git a/sys-firmware/nvidia-firmware/nvidia-firmware-325.15.ebuild b/sys-firmware/nvidia-firmware/nvidia-firmware-340.32-r1.ebuild
index dd9d399df59c..a14bd980768a 100644
--- a/sys-firmware/nvidia-firmware/nvidia-firmware-325.15.ebuild
+++ b/sys-firmware/nvidia-firmware/nvidia-firmware-340.32-r1.ebuild
@@ -1,40 +1,41 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
 
-PYTHON_COMPAT=( python2_7 )
 inherit python-any-r1 unpacker
 
 NV_URI="http://us.download.nvidia.com/XFree86/"
 X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
 
-EXTRACT_FIRMWARE_REV="845a51ab607df85fc0ed01f0b5b6d57850e37662"
+FIRMWARE_REV="a0b9f9be0efad90cc84b8b2eaf587c3d7d350ea9"
 
 DESCRIPTION="Kernel and mesa firmware for nouveau (video accel and pgraph)"
 HOMEPAGE="https://nouveau.freedesktop.org/wiki/VideoAcceleration/"
 SRC_URI="${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run
-	https://raw.github.com/imirkin/re-vp2/${EXTRACT_FIRMWARE_REV}/extract_firmware.py -> nvidia_extract_firmware-${PV}.py"
+	https://raw.githubusercontent.com/envytools/firmware/${FIRMWARE_REV}/extract_firmware.py
+		-> nvidia_extract_firmware-${FIRMWARE_REV}.py"
 
 LICENSE="MIT NVIDIA-r2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND=""
-
+KEYWORDS="~amd64 ~arm64 ~x86"
 RESTRICT="bindist mirror"
 
+BDEPEND="${PYTHON_DEPS}"
+
 S="${WORKDIR}"
 
 src_unpack() {
-	mkdir "${S}/${X86_NV_PACKAGE}"
-	cd "${S}/${X86_NV_PACKAGE}"
+	mkdir "${S}/${X86_NV_PACKAGE}" || die
+	cd "${S}/${X86_NV_PACKAGE}" || die
 	unpack_makeself "${X86_NV_PACKAGE}.run"
 }
 
 src_compile() {
-	"${PYTHON}" "${DISTDIR}"/nvidia_extract_firmware-${PV}.py || die "Extracting firmwares failed..."
+	"${EPYTHON}" "${DISTDIR}/nvidia_extract_firmware-${FIRMWARE_REV}.py" \
+		|| die "Extracting firmwares failed"
 }
 
 src_install() {
diff --git a/sys-firmware/nvidia-firmware/nvidia-firmware-340.32.ebuild b/sys-firmware/nvidia-firmware/nvidia-firmware-340.32.ebuild
deleted file mode 100644
index 1bccd47aec5c..000000000000
--- a/sys-firmware/nvidia-firmware/nvidia-firmware-340.32.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 unpacker
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-
-EXTRACT_FIRMWARE_REV="96641bfebb2547402b2145fcf0e3116410f0da87"
-
-DESCRIPTION="Kernel and mesa firmware for nouveau (video accel and pgraph)"
-HOMEPAGE="https://nouveau.freedesktop.org/wiki/VideoAcceleration/"
-SRC_URI="${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run
-	https://raw.github.com/imirkin/re-vp2/${EXTRACT_FIRMWARE_REV}/extract_firmware.py -> nvidia_extract_firmware-${PV}.py"
-
-LICENSE="MIT NVIDIA-r2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND=""
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	mkdir "${S}/${X86_NV_PACKAGE}"
-	cd "${S}/${X86_NV_PACKAGE}"
-	unpack_makeself "${X86_NV_PACKAGE}.run"
-}
-
-src_compile() {
-	"${PYTHON}" "${DISTDIR}"/nvidia_extract_firmware-${PV}.py || die "Extracting firmwares failed..."
-}
-
-src_install() {
-	insinto /lib/firmware/nouveau
-	doins nv* vuc-*
-}