gentoo resync : 16.02.1018

4 files changed, 4 insertions, 78 deletions

diff --git a/media-gfx/nvidia-texture-tools/Manifest b/media-gfx/nvidia-texture-tools/Manifest
index 9b42ad3ce052..d1b945c35738 100644
--- a/media-gfx/nvidia-texture-tools/Manifest
+++ b/media-gfx/nvidia-texture-tools/Manifest
@@ -6,6 +6,5 @@ AUX nvidia-texture-tools-2.0.8-gcc-4.7.patch 406 BLAKE2B 8c17ed5fd7158f118b450f8
 AUX nvidia-texture-tools-2.0.8-openexr.patch 2558 BLAKE2B 55694c275548dd9177991e008fe9a9c37c290d4e8b17e4dd91a0ec241dc75900e4b6f29f8650780af112ebffcc7ca04c617456b5e2186e590f3e2da705960a1e SHA512 f17a4f009298c65a06e536a434033db9735b0574c3fc2225bde2c86841c1ad8b35c6d9f5988a98285eb9e7b2e9832e8c9495a1a36e3dcf398101b08d59e87ade
 DIST nvidia-texture-tools-2.0.8-1.tar.gz 935227 BLAKE2B aef1801795f6102ac7c96df236de0e8534bfacfc72d297ff3bcd13b530829e8848f33065477a1fb2ffaa35d75bd9e34913d3551469aa814cab8cb76f2f04e721 SHA512 8e7ac79daaa10a2b1b64cfc8d6b37b37698e2a46f925cc33cdfd8e4b36705db8836edec6f98c5d6da475d7773f4a5826b5cebc120b7c5a6f9515906e2e4fae9d
 DIST nvidia-texture-tools-2.0.8-patchset-1-r1.tar.xz 9604 BLAKE2B b93c9586688dd690668c9d57d533c3460b008cf357a202cc6dc315ab6d24cd3d796d8596024d193bdd9100fab52970b323f03dc16b4f72b3e551167bb46513b5 SHA512 988ea0731b7f98f804a715404fc8cb8a8956a6c6b795f0ce8570f800dac3319f222bac8f12ab6fde50bbec3d68926ed3b24516931f9aebe2a7ce0fcae0dc8e13
-EBUILD nvidia-texture-tools-2.0.8-r3.ebuild 1681 BLAKE2B 88fdd941f337ab64dcdf72d0b2fc3a7c32a15663184a95a2f5cd10ca3f5eb281a0f7659f8ac67981addf0378c4f8d23ac850cd6788db45463d013888cb11cab8 SHA512 1bf6962600946737990963fa96031984ebd2604c50d33c7d857053e89ef3e964d81595f23939784362f2c64d465ef80fccd8ca5594376f770830d79d836c0fff
-EBUILD nvidia-texture-tools-2.0.8-r4.ebuild 1511 BLAKE2B a6e61a96f95a10b97b3e26d06bdaf77f557be92ac53392ed9681eeadc8a1591415ecd781a3c67cff1df9ee762b36b3dd9c2a47c6be2c5b6a5dbfab59930ca34b SHA512 45793be3ebafacf462b2c7697e44b2786a6f73788dcae7b3f3ac17633d11661a5121f127b3b22ebab11d039c2af23a22dbfb5fe8c47f29e1a403039e17e49719
-MISC metadata.xml 432 BLAKE2B 61cdc841e0492423330339399f620001ae3a7b176631dcfed14345e39bb02aaf28225bd5a469ad1da9341003a0a12f28d5dc0ed48bea94fc15c90711e56d0b27 SHA512 04ae34b58e838041211dfbb73bc88dd3f9d53f8eb6c8f8736e148790d5b3e50498c3e135c8333c37ca996378d0fc50d21b9e5ac8f7664cac868841fd66adbd0c
+EBUILD nvidia-texture-tools-2.0.8-r4.ebuild 1506 BLAKE2B fa68fcb7198d50acf90bfe8973e1cb7e7a657dcbaadf65c35640de3d7b999259ca6771ed5de15a512bbf493076c9efc895c03d75a77a60cce7e31dfa76618fcd SHA512 f7e293b826a9a0e1b9993b5046ebcb2b44fe0008340fb4ad5ce00ed69fe693a6a60301b60829a9fe2b62f05f5d5b4fafa31735b767fea2d3f9f3abaa08641591
+MISC metadata.xml 370 BLAKE2B b516169c99bf0f8fd79fcb152c6dccc702b037f94483232fd3dee83d96f4a8b71abf82e19c72df9ebed4f95aabe8c26af44b0449961c31619e4e4ec474a69c78 SHA512 11a9aee676f6834be3333dc43e91d2c4980c65cba6d2fcbbb0a8c5d1eaea9e0ee78956905fed45724e465bdda93ce28d65c66de5b92be539a5f5f80afde924bc
diff --git a/media-gfx/nvidia-texture-tools/metadata.xml b/media-gfx/nvidia-texture-tools/metadata.xml
index 0d4c55828138..20324d728bf0 100644
--- a/media-gfx/nvidia-texture-tools/metadata.xml
+++ b/media-gfx/nvidia-texture-tools/metadata.xml
@@ -4,7 +4,6 @@
 	<!-- maintainer-needed -->
 	<use>
 		<flag name="cg">Enable NVIDIA C graphics compiler toolkit plug-in</flag>
-		<flag name="cuda">Enable NVIDIA CUDA toolkit support</flag>
 		<flag name="glew">Enable support for The OpenGL Extension Wrangler Library (<pkg>media-libs/glew</pkg>)</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r3.ebuild b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r3.ebuild
deleted file mode 100644
index d8f2a464d7e0..000000000000
--- a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils
-
-DESCRIPTION="A set of cuda-enabled texture tools and compressors"
-HOMEPAGE="http://developer.nvidia.com/object/texture_tools.html"
-SRC_URI="https://${PN}.googlecode.com/files/${P}-1.tar.gz
-	https://dev.gentoo.org/~soap/distfiles/${P}-patchset-1-r1.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cg cuda glew glut openexr"
-
-RDEPEND="
-	media-libs/ilmbase:=
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/libX11
-	cg? ( media-gfx/nvidia-cg-toolkit )
-	cuda? ( dev-util/nvidia-cuda-toolkit )
-	glew? ( media-libs/glew:0= )
-	glut? ( media-libs/freeglut )
-	openexr? ( media-libs/openexr:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cg.patch" # fix bug #414509
-	"${FILESDIR}/${P}-gcc-4.7.patch" # fix bug #423965
-	"${FILESDIR}/${P}-openexr.patch" # fix bug #462494
-	"${FILESDIR}/${P}-clang.patch" # fix clang build
-	"${FILESDIR}/${P}-cpp14.patch" # fix bug #594938
-	"${WORKDIR}/patches"
-)
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	if use cuda; then
-		if [[ $(( $(gcc-major-version) * 10 + $(gcc-minor-version) )) -gt 44 ]] ; then
-			eerror "gcc 4.5 and up are not supported for useflag cuda!"
-			die "gcc 4.5 and up are not supported for useflag cuda!"
-		fi
-	fi
-}
-
-src_prepare() {
-	edos2unix cmake/*
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIBDIR=$(get_libdir)
-		-DNVTT_SHARED=TRUE
-		-DCG=$(usex cg)
-		-DCUDA=$(usex cuda)
-		-DGLEW=$(usex glew)
-		-DGLUT=$(usex glut)
-		-DOPENEXR=$(usex openexr)
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild
index a334693dbd29..c71aa223a894 100644
--- a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild
+++ b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}-1.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cg glew glut openexr"
 
 RDEPEND="