x11-drivers/nvidia-drivers : reorganise things so we support multiple versions

8 files changed, 109 insertions, 40 deletions

diff --git a/x11-misc/nvidia-settings-legacy/Manifest b/x11-misc/nvidia-settings-legacy/Manifest
deleted file mode 100644
index b4a55135..00000000
--- a/x11-misc/nvidia-settings-legacy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nvidia-settings-legacy-390.154.tar.gz 1297258 BLAKE2B 16abb2f306684871d7a603b637086f37bc80391f60fd4b3bdb16aca1c5394daf5ddd126d18eb55948ee9e384f144431648d3a6a1d5e4d2e7dff3ce00edbab62b SHA512 cbb6b5f69784f66155a08da786b98de1de8659aa1b42af1a5baca02031e8e21c5d001292188994e01986dd4fca24ec9b7b5fb56491bfab889e7448cdde55f8ba
diff --git a/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy-linker.patch b/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy-linker.patch
deleted file mode 100644
index de65a598..00000000
--- a/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy-linker.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/utils.mk
-+++ b/utils.mk
-@@ -475,7 +475,7 @@
- define READ_ONLY_OBJECT_FROM_FILE_RULE
-   $$(OUTPUTDIR)/$$(notdir $(1)).o: $(1)
- 	$(at_if_quiet)cd $$(dir $(1)); \
--	$$(call quiet_cmd_no_at,LD) -r -z noexecstack --format=binary \
-+	$$(call quiet_cmd_no_at,NVLD) -r -z noexecstack --format=binary \
- 	    $$(notdir $(1)) -o $$(OUTPUTDIR_ABSOLUTE)/$$(notdir $$@)
- 	$$(call quiet_cmd,OBJCOPY) \
- 	    --rename-section .data=.rodata,contents,alloc,load,data,readonly \
---- a/src/libXNVCtrl/utils.mk
-+++ b/src/libXNVCtrl/utils.mk
-@@ -475,7 +475,7 @@
- define READ_ONLY_OBJECT_FROM_FILE_RULE
-   $$(OUTPUTDIR)/$$(notdir $(1)).o: $(1)
- 	$(at_if_quiet)cd $$(dir $(1)); \
--	$$(call quiet_cmd_no_at,LD) -r -z noexecstack --format=binary \
-+	$$(call quiet_cmd_no_at,NVLD) -r -z noexecstack --format=binary \
- 	    $$(notdir $(1)) -o $$(OUTPUTDIR_ABSOLUTE)/$$(notdir $$@)
- 	$$(call quiet_cmd,OBJCOPY) \
- 	    --rename-section .data=.rodata,contents,alloc,load,data,readonly \
diff --git a/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy.desktop b/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy.desktop
deleted file mode 100644
index 35f8aeee..00000000
--- a/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=NVIDIA X Server Settings
-Type=Application
-Comment=NVIDIA Linux X11 Settings Utility
-Exec=nvidia-settings
-TryExec=nvidia-settings
-Icon=nvidia-settings
-Categories=Settings;System;
diff --git a/x11-misc/nvidia-settings/Manifest b/x11-misc/nvidia-settings/Manifest
index 441985ec..641c1527 100644
--- a/x11-misc/nvidia-settings/Manifest
+++ b/x11-misc/nvidia-settings/Manifest
@@ -1 +1,3 @@
+DIST nvidia-settings-390.154.tar.gz 1297258 BLAKE2B 16abb2f306684871d7a603b637086f37bc80391f60fd4b3bdb16aca1c5394daf5ddd126d18eb55948ee9e384f144431648d3a6a1d5e4d2e7dff3ce00edbab62b SHA512 cbb6b5f69784f66155a08da786b98de1de8659aa1b42af1a5baca02031e8e21c5d001292188994e01986dd4fca24ec9b7b5fb56491bfab889e7448cdde55f8ba
 DIST nvidia-settings-470.141.03.tar.gz 1235217 BLAKE2B 721377ad4431395cfd2989e8d21a1245892aafae5e37393750f6ae90e86f4ac768785fc38100f2295fc1ebdc7d2d1d823d72f8379232b3b28100f94c5a1a4a86 SHA512 3576b6296b5cc30dbca0158d0ca9691dc2e6b819aebe0dde0f0a6ff3e8672a1189e37f68fc7eefc4fd0b105131f7d644c7d27b0ed860c555e4b8fe7f4f60a625
+DIST nvidia-settings-515.65.01.tar.gz 1254045 BLAKE2B a2f572ac72d7a1c073d5ba3db713f6c8dea01728610232b478f297413492fe650617238c6c3a5008a72b1c897d52310e3a5955a5ee08499ac00835e6b230dffb SHA512 c7b6c1b9acdd9e4daa601fb27199946d48d1d59e1483f3187e93ee887a27027ef29f274ae068089b1abdf089b5c106aa09bd1c87bc7ace41606b019393106ea9
diff --git a/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy-fno-common.patch b/x11-misc/nvidia-settings/files/nvidia-settings-fno-common.patch
index be03fa27..be03fa27 100644
--- a/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy-fno-common.patch
+++ b/x11-misc/nvidia-settings/files/nvidia-settings-fno-common.patch
diff --git a/x11-misc/nvidia-settings-legacy/nvidia-settings-legacy-390.154.ebuild b/x11-misc/nvidia-settings/nvidia-settings-390.154.ebuild
index dd128301..90ab9567 100644
--- a/x11-misc/nvidia-settings-legacy/nvidia-settings-legacy-390.154.ebuild
+++ b/x11-misc/nvidia-settings/nvidia-settings-390.154.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.nvidia.com/"
 SRC_URI="https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="390"
 KEYWORDS="-* amd64"
 IUSE=""
 
@@ -33,8 +33,9 @@ COMMON_DEPEND="
 	>=x11-libs/libvdpau-1.0"
 
 RDEPEND="${COMMON_DEPEND}
-	!!x11-misc/nvidia-settings
-	~x11-drivers/nvidia-drivers-legacy-${PV}:${SLOT}"
+	!!x11-misc/nvidia-settings:470
+	!!x11-misc/nvidia-settings:515
+	~x11-drivers/nvidia-drivers-${PV}:${SLOT}"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	x11-base/xorg-proto"
@@ -88,8 +89,8 @@ src_install() {
 	insinto /usr/include/NVCtrl
 	doins src/libXNVCtrl/*.h
 
-	doicon doc/nvidia-settings.png
-	domenu ${FILESDIR}/${PN}.desktop
+	doicon doc/nvidia-settings.png || die
+	domenu ${FILESDIR}/${PN}.desktop || die
 
 	dodoc doc/*.txt
 
diff --git a/x11-misc/nvidia-settings/nvidia-settings-470.141.03-r1.ebuild b/x11-misc/nvidia-settings/nvidia-settings-470.141.03-r2.ebuild
index 61a6c330..6e773e3b 100644
--- a/x11-misc/nvidia-settings/nvidia-settings-470.141.03-r1.ebuild
+++ b/x11-misc/nvidia-settings/nvidia-settings-470.141.03-r2.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="0"
+SLOT="470"
 KEYWORDS="-* amd64"
 IUSE=""
 
@@ -33,7 +33,9 @@ COMMON_DEPEND="
 	>=x11-libs/libvdpau-1.0"
 
 RDEPEND="${COMMON_DEPEND}
-	!!x11-misc/nvidia-settings-legacy"
+	!!x11-misc/nvidia-settings:390
+	!!x11-misc/nvidia-settings:515
+	~x11-drivers/nvidia-drivers-${PV}:${SLOT}"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	x11-base/xorg-proto"
@@ -84,8 +86,8 @@ src_install() {
 	insinto /usr/include/NVCtrl
 	doins src/libXNVCtrl/*.h
 
-	doicon doc/${PN}.png
-	domenu ${FILESDIR}/${PN}.desktop
+	doicon doc/${PN}.png || die
+	domenu ${FILESDIR}/${PN}.desktop || die
 
 	dodoc doc/*.txt
 
diff --git a/x11-misc/nvidia-settings/nvidia-settings-515.65.01.ebuild b/x11-misc/nvidia-settings/nvidia-settings-515.65.01.ebuild
new file mode 100644
index 00000000..25ad942d
--- /dev/null
+++ b/x11-misc/nvidia-settings/nvidia-settings-515.65.01.ebuild
@@ -0,0 +1,95 @@
+# 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-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}
+}