x11-drivers/nvidia-drivers : v390.xx (revision bump); v470.xx && v525.xx (version bump); v515.xx && v530.xx (drop SLOT); v535.xx (new SLOT)

6 files changed, 11 insertions, 113 deletions

diff --git a/x11-misc/nvidia-settings/Manifest b/x11-misc/nvidia-settings/Manifest
index 8786730e..475c434e 100644
--- a/x11-misc/nvidia-settings/Manifest
+++ b/x11-misc/nvidia-settings/Manifest
@@ -1,5 +1,4 @@
 DIST nvidia-settings-390.157.tar.gz 1297247 BLAKE2B 3a2791f8b35131f2036333d31117f5315b4b79720bfbd7724f893caa9daabb5a813bda580f1f4c1df25260393e9c315b1aa362c489e9462ce395a8d58a695bc0 SHA512 03b8cfa287612eaa1699845136283fe1ec4a43212fb0b9d3d0682ce6dd51702fbdfc53c29ea9ebe914034d2c20abb35af7667e0314948842152efd746773771a
-DIST nvidia-settings-470.182.03.tar.gz 1235188 BLAKE2B fdec34ae5c0b0de41af053879c0a5b815de6d38a04ffe83ce820e9361c6414fd08c98a15f2a1a7f64fb4233bc32867b767d11884f0a9ae1e3b084ac644c00dc5 SHA512 c61c7aa72eef7d16e5fa1f71450980610b8a1ecf606f611646d654632035d46011f9d45958de94ea84ef889132e7cffe528362484789322ed8b7e6be689169a1
-DIST nvidia-settings-515.105.01.tar.gz 1255154 BLAKE2B d287daf814f242a27588fc959cce7ba509b380bcb71e7ac77bc049cb639cb712b1c87860fbef91b284f02c5a8c44f226c7996047adf77de0285e14a7c355285c SHA512 7d22293990c161df0082770629a6084bd315b278655e6297158656a6eca2197b730b1ec08faa92f33ffe497c925e56aa460ec7a163588578e799c176c06e64b8
-DIST nvidia-settings-525.116.03.tar.gz 1264440 BLAKE2B 201c1ff22538a3f0cea837a6e3344a8b5a8c88bf65238a1c51203fd170201faff09d310a6d5244fcc72f861207b0e76d208f5da83a7a11b16584281574c02afa SHA512 f31d4578d3b83a1fd763ae5ab086534960a48f4c70f427ff2fb0612a789614bc68da256e975916ba7d8cafc4efcd8d0a3c806e2c0caf09e738dfc39706ded291
-DIST nvidia-settings-530.41.03.tar.gz 1264991 BLAKE2B f7fcff76eb0c43b45d3097d7ae635fe31a374639ccc3430ea8cea9a0ffbb471e5b1ca35ea3d19d6fad65a8c5b3f1c088cfe5074e051f61050be84e64bc8af1f1 SHA512 486a5a326b28d6907c2596c980b37994b2f559a3eb389b0fb464df6d4e598ae1220355e88a943e1678f7f7c0d003ea0b8141acf09b86c425b36e8241361e1c6e
+DIST nvidia-settings-470.199.02.tar.gz 1235155 BLAKE2B 06069632b0eb8197a78a73c3b4dbbb3d66ac160d8272add7ec1245f59112e7bbc9e294eca2af3f5a79c77f10abe3229d847ad90fdb3d48b26230acafc0ba1820 SHA512 d0e43b8e0ef4298ce92be63d6a985e6ba3e1b9133c52f21254435d79ff20e78b195b16a75b34c7ba1ec659529c67e617a2fe40e2f573f6f2ab26ddba7bf203ad
+DIST nvidia-settings-525.116.04.tar.gz 1264460 BLAKE2B 0af5695b4916af5ebb6083db186d78db81b5f27efee68af6c7fa24ae3af752de8b1f0a18b33c64e898dc9eba106104625debbe069adc7171af5e338cb3042566 SHA512 ff63dc50479022866f2e9bc8fba798b88fc819595517d839125dac1fb7e4c20f0027640c4dc7f7b0c544eba984190d4b204b4306ef36c55740681621be4e6fb3
+DIST nvidia-settings-535.54.03.tar.gz 1271785 BLAKE2B d9c2e668dde0efd6322bd3a39288076fc3fd8f58390772c896885ab13a4689565ed7e7cc1870b355ef5a5ca9f109cc71ea9de00678cedda700da3ca77af6ae09 SHA512 4e196d61513cf042e677c07a1ad062ebef743a17ffe0be4c3d9ad22064d67e63d7818c9f60331a842a8959f54808d5f9e45f13fa7c5f84046986392ee8f70dbb
diff --git a/x11-misc/nvidia-settings/nvidia-settings-390.157-r2.ebuild b/x11-misc/nvidia-settings/nvidia-settings-390.157-r4.ebuild
index 0bde22dc..9eccfde7 100644
--- a/x11-misc/nvidia-settings/nvidia-settings-390.157-r2.ebuild
+++ b/x11-misc/nvidia-settings/nvidia-settings-390.157-r4.ebuild
@@ -34,10 +34,9 @@ COMMON_DEPEND="
 
 RDEPEND="${COMMON_DEPEND}
 	!!x11-misc/nvidia-settings:470
-	!!x11-misc/nvidia-settings:515
 	!!x11-misc/nvidia-settings:525
-	!!x11-misc/nvidia-settings:530
-	~x11-drivers/nvidia-drivers-${PV}:${SLOT}"
+	!!x11-misc/nvidia-settings:535
+	x11-drivers/nvidia-drivers:${SLOT}"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	x11-base/xorg-proto"
diff --git a/x11-misc/nvidia-settings/nvidia-settings-470.182.03-r1.ebuild b/x11-misc/nvidia-settings/nvidia-settings-470.199.02-r2.ebuild
index aa4a66f8..8b541fce 100644
--- a/x11-misc/nvidia-settings/nvidia-settings-470.182.03-r1.ebuild
+++ b/x11-misc/nvidia-settings/nvidia-settings-470.199.02-r2.ebuild
@@ -34,10 +34,9 @@ COMMON_DEPEND="
 
 RDEPEND="${COMMON_DEPEND}
 	!!x11-misc/nvidia-settings:390
-	!!x11-misc/nvidia-settings:515
 	!!x11-misc/nvidia-settings:525
-	!!x11-misc/nvidia-settings:530
-	~x11-drivers/nvidia-drivers-${PV}:${SLOT}"
+	!!x11-misc/nvidia-settings:535
+	x11-drivers/nvidia-drivers:${SLOT}"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	x11-base/xorg-proto"
diff --git a/x11-misc/nvidia-settings/nvidia-settings-515.105.01-r1.ebuild b/x11-misc/nvidia-settings/nvidia-settings-515.105.01-r1.ebuild
deleted file mode 100644
index 7a8fdf75..00000000
--- a/x11-misc/nvidia-settings/nvidia-settings-515.105.01-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/${PV}.tar.gz -> nvidia-settings-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="515"
-KEYWORDS="-* amd64"
-IUSE=""
-
-QA_PREBUILT=
-
-COMMON_DEPEND="
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/gdk-pixbuf-xlib
-	media-libs/mesa
-	x11-libs/pango[X]
-	x11-libs/libXv
-	x11-libs/libXrandr
-	dev-libs/glib:2
-	dev-libs/jansson
-	x11-libs/cairo
-	>=x11-libs/libvdpau-1.0"
-
-RDEPEND="${COMMON_DEPEND}
-	!!x11-misc/nvidia-settings:390
-	!!x11-misc/nvidia-settings:470
-	!!x11-misc/nvidia-settings:525
-	!!x11-misc/nvidia-settings:530
-	~x11-drivers/nvidia-drivers-${PV}:${SLOT}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/"${PN}"-linker.patch
-}
-
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	emake -C src/libXNVCtrl \
-		DO_STRIP= \
-		LIBDIR="$(get_libdir)" \
-		NVLD="$(tc-getLD)" \
-		NV_VERBOSE=1 \
-		OUTPUTDIR=. \
-		RANLIB="$(tc-getRANLIB)"
-
-	einfo "Building nvidia-settings..."
-	emake -C src/ \
-		DO_STRIP= \
-		GTK3_AVAILABLE=1 \
-		LIBDIR="$(get_libdir)" \
-		NVLD="$(tc-getLD)" \
-		NVML_ENABLED=0 \
-		NV_USE_BUNDLED_LIBJANSSON=0 \
-		NV_VERBOSE=1 \
-		OUTPUTDIR=.
-}
-
-src_install() {
-	emake -C src/ \
-		DESTDIR="${D}" \
-		DO_STRIP= \
-		GTK3_AVAILABLE=1 \
-		LIBDIR="${D}/usr/$(get_libdir)" \
-		NV_USE_BUNDLED_LIBJANSSON=0 \
-		NV_VERBOSE=1 \
-		OUTPUTDIR=. \
-		PREFIX=/usr \
-		install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-	doicon doc/${PN}.png || die
-	domenu ${FILESDIR}/${PN}.desktop || die
-
-	dodoc doc/*.txt
-
-	rm -rvf ${D}usr/$(get_libdir)/libnvidia-gtk2.so.${PV}
-}
diff --git a/x11-misc/nvidia-settings/nvidia-settings-525.116.03-r1.ebuild b/x11-misc/nvidia-settings/nvidia-settings-525.116.04-r2.ebuild
index 247366a8..8cf0064d 100644
--- a/x11-misc/nvidia-settings/nvidia-settings-525.116.03-r1.ebuild
+++ b/x11-misc/nvidia-settings/nvidia-settings-525.116.04-r2.ebuild
@@ -35,9 +35,8 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	!!x11-misc/nvidia-settings:390
 	!!x11-misc/nvidia-settings:470
-	!!x11-misc/nvidia-settings:515
-	!!x11-misc/nvidia-settings:530
-	~x11-drivers/nvidia-drivers-${PV}:${SLOT}"
+	!!x11-misc/nvidia-settings:535
+	x11-drivers/nvidia-drivers:${SLOT}"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	x11-base/xorg-proto"
diff --git a/x11-misc/nvidia-settings/nvidia-settings-530.41.03.ebuild b/x11-misc/nvidia-settings/nvidia-settings-535.54.03.ebuild
index 6340fe8a..00eed032 100644
--- a/x11-misc/nvidia-settings/nvidia-settings-530.41.03.ebuild
+++ b/x11-misc/nvidia-settings/nvidia-settings-535.54.03.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.nvidia.com/"
 SRC_URI="https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/${PV}.tar.gz -> nvidia-settings-${PV}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="530"
+SLOT="535"
 KEYWORDS="-* amd64"
 IUSE=""
 
@@ -35,9 +35,8 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	!!x11-misc/nvidia-settings:390
 	!!x11-misc/nvidia-settings:470
-	!!x11-misc/nvidia-settings:515
 	!!x11-misc/nvidia-settings:525
-	~x11-drivers/nvidia-drivers-${PV}:${SLOT}"
+	x11-drivers/nvidia-drivers:${SLOT}"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	x11-base/xorg-proto"