media-video/nvidia-settings: Remove last-rited pkg

Closes: https://bugs.gentoo.org/664638
Signed-off-by: Michał Górny <mgorny@gentoo.org>

9 files changed, 2 insertions, 339 deletions

diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest
deleted file mode 100644
index 991a5063c59d..000000000000
--- a/media-video/nvidia-settings/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST nvidia-settings-340.58.tar.bz2 1549850 BLAKE2B 3b526854c231a999c6072b1251f9cc542fc7ddead7ad07cbf702dbacea584d99f3e8f7e8a3f2246b53cfff409f4d0b8a93f7260c170446d8cf2008fdd6ce99d0 SHA512 4c581a940c99fac28564ab6154f47cae496ebfda6339b7f10c5decf8fea52b6c12e5b63dfcf78f8365909e49539560a50338edb17117881b6a03c196bd51836c
-DIST nvidia-settings-355.11.tar.bz2 1570699 BLAKE2B 8eafd72d71d7469420b4b0e916dcdc876f3a2b84e3f49749465825de674cec8bcb40d1ea50efc757b0c8c8c9bf96c7bccd521f9f264482c3ef4e9ca674d08707 SHA512 7565e3d809c5f27ec9ca092a6369cf89ca7571e0cb1b1285c50192cc1cc763e95316d9c71d06ed2333077b97946318e825c6d672f48549b58bd41faa673fb49c
-DIST nvidia-settings-358.16.tar.bz2 1571104 BLAKE2B 0d56d4f54279712a2f8f549539e9cb6953dce9cc35784d4aea9d13f45a477dfab3afa5b622ea877413e80b8c57a14c392d0309e38815c8da02b3bd1ef6c9635c SHA512 0438aa2599e98f68a04c9f663f4ef9b05092df512fbca40ad0fe17e25ca4d940d02cc55e9fd44a2551950a2a30782d1e48553c4bebd071bfff280869a6dde556
diff --git a/media-video/nvidia-settings/metadata.xml b/media-video/nvidia-settings/metadata.xml
deleted file mode 100644
index c2b094fe3acf..000000000000
--- a/media-video/nvidia-settings/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="gtk3">Additionally build the GTK 3 library</flag>
-	</use>
-</pkgmetadata>
diff --git a/media-video/nvidia-settings/nvidia-settings-340.58-r1.ebuild b/media-video/nvidia-settings/nvidia-settings-340.58-r1.ebuild
deleted file mode 100644
index 10851bb2c8f2..000000000000
--- a/media-video/nvidia-settings/nvidia-settings-340.58-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="examples"
-
-COMMON_DEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/gtk+:2
-	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"
-
-RDEPEND="
-	x11-drivers/nvidia-drivers:0/340
-	${COMMON_DEPEND}
-	x11-libs/libvdpau"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		build-xnvctrl
-
-	einfo "Building nvidia-settings..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		STRIP_CMD="$(type -P true)" \
-		NV_VERBOSE=1 \
-		NV_USE_BUNDLED_LIBJANSSON=0
-}
-
-src_install() {
-	emake -C src/ DESTDIR="${D}" PREFIX=/usr NV_USE_BUNDLED_LIBJANSSON=0 install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-#	doicon doc/${PN}.png # Installed through nvidia-drivers
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
-
-	# bug 412569 - Installed through nvidia-drivers
-#	rm -rf "${D}"/usr/share/man
-
-	dodoc doc/*.txt
-
-	if use examples; then
-		docinto examples/
-		dodoc samples/*.c
-		dodoc samples/README
-	fi
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-340.58.ebuild b/media-video/nvidia-settings/nvidia-settings-340.58.ebuild
deleted file mode 100644
index 5e890a832b15..000000000000
--- a/media-video/nvidia-settings/nvidia-settings-340.58.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86 ~x86-fbsd"
-IUSE="examples"
-
-COMMON_DEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/gtk+:2
-	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"
-
-RDEPEND="
-	~x11-drivers/nvidia-drivers-340.93
-	${COMMON_DEPEND}
-	x11-libs/libvdpau"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		build-xnvctrl
-
-	einfo "Building nvidia-settings..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		STRIP_CMD="$(type -P true)" \
-		NV_VERBOSE=1 \
-		NV_USE_BUNDLED_LIBJANSSON=0
-}
-
-src_install() {
-	emake -C src/ DESTDIR="${D}" PREFIX=/usr NV_USE_BUNDLED_LIBJANSSON=0 install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-#	doicon doc/${PN}.png # Installed through nvidia-drivers
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
-
-	# bug 412569 - Installed through nvidia-drivers
-#	rm -rf "${D}"/usr/share/man
-
-	dodoc doc/*.txt
-
-	if use examples; then
-		docinto examples/
-		dodoc samples/*.c
-		dodoc samples/README
-	fi
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-355.11.ebuild b/media-video/nvidia-settings/nvidia-settings-355.11.ebuild
deleted file mode 100644
index 8225afc77a3e..000000000000
--- a/media-video/nvidia-settings/nvidia-settings-355.11.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="examples gtk3"
-
-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-drivers/nvidia-drivers:0/355"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		build-xnvctrl
-
-	einfo "Building nvidia-settings..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		STRIP_CMD="$(type -P true)" \
-		NV_VERBOSE=1 \
-		NV_USE_BUNDLED_LIBJANSSON=0 \
-		NVML_AVAILABLE=0 \
-		GTK3_AVAILABLE=$(usex gtk3 1 0)
-}
-
-src_install() {
-	emake -C src/ DESTDIR="${D}" PREFIX=/usr NV_USE_BUNDLED_LIBJANSSON=0 GTK3_AVAILABLE=$(usex gtk3 1 0) install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-#	doicon doc/${PN}.png # Installed through nvidia-drivers
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
-
-	# bug 412569 - Installed through nvidia-drivers
-#	rm -rf "${D}"/usr/share/man
-
-	dodoc doc/*.txt
-
-	if use examples; then
-		docinto examples/
-		dodoc samples/*.c
-		dodoc samples/README
-	fi
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-358.16.ebuild b/media-video/nvidia-settings/nvidia-settings-358.16.ebuild
deleted file mode 100644
index 1ef8e7edc4b8..000000000000
--- a/media-video/nvidia-settings/nvidia-settings-358.16.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="examples gtk3"
-
-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-drivers/nvidia-drivers:0/358"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		build-xnvctrl
-
-	einfo "Building nvidia-settings..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		STRIP_CMD="$(type -P true)" \
-		NV_VERBOSE=1 \
-		NV_USE_BUNDLED_LIBJANSSON=0 \
-		NVML_AVAILABLE=0 \
-		GTK3_AVAILABLE=$(usex gtk3 1 0)
-}
-
-src_install() {
-	emake -C src/ DESTDIR="${D}" PREFIX=/usr NV_USE_BUNDLED_LIBJANSSON=0 GTK3_AVAILABLE=$(usex gtk3 1 0) install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-#	doicon doc/${PN}.png # Installed through nvidia-drivers
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
-
-	# bug 412569 - Installed through nvidia-drivers
-#	rm -rf "${D}"/usr/share/man
-
-	dodoc doc/*.txt
-
-	if use examples; then
-		docinto examples/
-		dodoc samples/*.c
-		dodoc samples/README
-	fi
-}
diff --git a/profiles/hardened/linux/amd64/package.mask b/profiles/hardened/linux/amd64/package.mask
index 33e09b35488a..d4ef19634383 100644
--- a/profiles/hardened/linux/amd64/package.mask
+++ b/profiles/hardened/linux/amd64/package.mask
@@ -1,10 +1,6 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Magnus Granberg <zorry@gentoo.org> (20 Nov 2012)
-# Need X
-media-video/nvidia-settings
-
 # Depends on x11-drivers/nvidia-drivers
 #dev-python/pyopencl
 
diff --git a/profiles/hardened/linux/x86/package.mask b/profiles/hardened/linux/x86/package.mask
index 6312ebcd3402..5b60d78864ce 100644
--- a/profiles/hardened/linux/x86/package.mask
+++ b/profiles/hardened/linux/x86/package.mask
@@ -1,9 +1,5 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Rick Farina <zerochaos@gentoo.org> (26 Nov 2012)
-# Need X
-media-video/nvidia-settings
-
 # Depends on x11-drivers/nvidia-drivers
 #dev-python/pyopencl
diff --git a/profiles/package.mask b/profiles/package.mask
index 8c630c09ea16..a55ecc710b9d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -511,12 +511,6 @@ media-plugins/gst-plugins-ffmpeg
 # Needs openssl-1.1
 >=dev-libs/opencryptoki-3.6
 
-# Jeroen Roovers <jer@gentoo.org> (12 Jan 2017)
-# Use x11-drivers/nvidia-drivers[tools] instead.
-# Michał Górny <mgorny@gentoo.org> (26 Aug 2018)
-# Removal in 30 days.  Bug #664638.
-media-video/nvidia-settings
-
 # Michael Orlitzky <mjo@gentoo.org> (07 Jan 2017)
 # This package has some dangerous quality and security issues, but
 # people may still find it useful. It is masked to prevent accidental