move : x11-drivers/nvidia-legacy-drivers -> x11-drivers/nvidia-drivers-legacy, fix eselect-opencl (now deprecated) conflict

5 files changed, 0 insertions, 148 deletions

diff --git a/x11-misc/nvidia-legacy-settings/Manifest b/x11-misc/nvidia-legacy-settings/Manifest
deleted file mode 100644
index c41d5ee0..00000000
--- a/x11-misc/nvidia-legacy-settings/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nvidia-legacy-settings-390.132.tar.gz 1297258 BLAKE2B cfbb749d65478c0312a62246cd02397121d0717c4b9a7b0c6d6e5a4129db24fdda7e4b578a35ca77b14c5f36edf8616b4d2890398c44432ead24edda582265fa SHA512 ad6836c8b002478fe7b76fb7df6b685686e73ba0849533f5d2c6cc0ca489f212556f309bc67870b2844921bfdb2c3c49300f35ee4d32e3d4c7f29c1ac9b0dd9a
diff --git a/x11-misc/nvidia-legacy-settings/files/nvidia-legacy-settings-fno-common.patch b/x11-misc/nvidia-legacy-settings/files/nvidia-legacy-settings-fno-common.patch
deleted file mode 100644
index be03fa27..00000000
--- a/x11-misc/nvidia-legacy-settings/files/nvidia-legacy-settings-fno-common.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/gtk+-2.x/ctkvdpau.c
-+++ b/src/gtk+-2.x/ctkvdpau.c
-@@ -103,6 +103,8 @@
- const gchar* __video_mixer_attribute_help =
- "This shows the video mixer attributes and any applicable ranges.";
- 
-+struct VDPAUDeviceImpl VDPAUDeviceFunctions;
-+
- static int queryOutputSurface(CtkVDPAU *ctk_vdpau, VdpDevice device,
-                               VdpGetProcAddress *getProcAddress);
- 
---- a/src/gtk+-2.x/ctkvdpau.h
-+++ b/src/gtk+-2.x/ctkvdpau.h
-@@ -46,7 +46,7 @@
-     (G_TYPE_INSTANCE_GET_CLASS ((obj), CTK_TYPE_VDPAU, CtkVDPAUClass))
- 
- 
--struct VDPAUDeviceImpl {
-+extern struct VDPAUDeviceImpl {
- 
-     VdpGetErrorString *GetErrorString;
-     VdpGetProcAddress *GetProcAddress;
diff --git a/x11-misc/nvidia-legacy-settings/files/nvidia-legacy-settings-linker.patch b/x11-misc/nvidia-legacy-settings/files/nvidia-legacy-settings-linker.patch
deleted file mode 100644
index de65a598..00000000
--- a/x11-misc/nvidia-legacy-settings/files/nvidia-legacy-settings-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-legacy-settings/files/nvidia-legacy-settings.desktop b/x11-misc/nvidia-legacy-settings/files/nvidia-legacy-settings.desktop
deleted file mode 100644
index 35f8aeee..00000000
--- a/x11-misc/nvidia-legacy-settings/files/nvidia-legacy-settings.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-legacy-settings/nvidia-legacy-settings-390.132-r2.ebuild b/x11-misc/nvidia-legacy-settings/nvidia-legacy-settings-390.132-r2.ebuild
deleted file mode 100644
index e5c660a1..00000000
--- a/x11-misc/nvidia-legacy-settings/nvidia-legacy-settings-390.132-r2.ebuild
+++ /dev/null
@@ -1,95 +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/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64"
-IUSE="gtk3"
-
-QA_PREBUILT=
-
-COMMON_DEPEND="
-	x11-libs/gtk+:2
-	gtk3? ( x11-libs/gtk+:3 )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/gdk-pixbuf[X]
-	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
-	~x11-drivers/nvidia-legacy-drivers-${PV}:${SLOT}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-S=${WORKDIR}/nvidia-settings-${PV}
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/"${PN}"-linker.patch
-	eapply "${FILESDIR}"/"${PN}"-fno-common.patch
-}
-
-src_compile() {
-	emake -C src/ \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		DO_STRIP= \
-		LD="$(tc-getCC)" \
-		LIBDIR="$(get_libdir)" \
-		NVLD="$(tc-getLD)" \
-		NV_VERBOSE=1 \
-		RANLIB="$(tc-getRANLIB)" \
-		build-xnvctrl
-
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		DO_STRIP= \
-		GTK3_AVAILABLE=$(usex gtk3 1 0) \
-		LD="$(tc-getCC)" \
-		LIBDIR="$(get_libdir)" \
-		NVLD="$(tc-getLD)" \
-		NVML_ENABLED=0 \
-		NV_USE_BUNDLED_LIBJANSSON=0 \
-		NV_VERBOSE=1
-}
-
-src_install() {
-	emake -C src/ \
-		DESTDIR="${D}" \
-		GTK3_AVAILABLE=$(usex gtk3 1 0) \
-		LIBDIR="${D}/usr/$(get_libdir)" \
-		NV_USE_BUNDLED_LIBJANSSON=0 \
-		NV_VERBOSE=1 \
-		PREFIX=/usr \
-		DO_STRIP= \
-		install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-	doicon doc/nvidia-settings.png
-	domenu ${FILESDIR}/${PN}.desktop
-
-	dodoc doc/*.txt
-}