From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-924653-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 3E0E9139085
	for <garchives@archives.gentoo.org>; Fri, 20 Jan 2017 10:07:44 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 7EE5D21C095;
	Fri, 20 Jan 2017 10:07:41 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 5A67521C095
	for <gentoo-commits@lists.gentoo.org>; Fri, 20 Jan 2017 10:07:41 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id EF4F8341375
	for <gentoo-commits@lists.gentoo.org>; Fri, 20 Jan 2017 10:07:39 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 265062A12
	for <gentoo-commits@lists.gentoo.org>; Fri, 20 Jan 2017 10:07:38 +0000 (UTC)
From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" <jer@gentoo.org>
Message-ID: <1484906856.8ebb593eea941ca9fd730d23bb9ae9178601ee80.jer@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/
X-VCS-Repository: repo/gentoo
X-VCS-Files: x11-drivers/nvidia-drivers/nvidia-drivers-375.26-r2.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-375.26-r3.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-378.09.ebuild
X-VCS-Directories: x11-drivers/nvidia-drivers/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: 8ebb593eea941ca9fd730d23bb9ae9178601ee80
X-VCS-Branch: master
Date: Fri, 20 Jan 2017 10:07:38 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: ac116728-8ba4-40d6-9968-fd5d1b4feb6f
X-Archives-Hash: b53c0ae42668e65c139c3ba67a160949

commit:     8ebb593eea941ca9fd730d23bb9ae9178601ee80
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 20 10:07:08 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Jan 20 10:07:36 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ebb593e

x11-drivers/nvidia-drivers: Install 10_nvidia.json 10_nvidia_wayland.json by waltercool (bug #606584).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 ...a-drivers-375.26-r2.ebuild => nvidia-drivers-375.26-r3.ebuild} | 8 ++++++++
 x11-drivers/nvidia-drivers/nvidia-drivers-378.09.ebuild           | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-375.26-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-375.26-r3.ebuild
similarity index 98%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-375.26-r2.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-375.26-r3.ebuild
index e01d187..5e05f9e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-375.26-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-375.26-r3.ebuild
@@ -308,6 +308,14 @@ src_install() {
 			insinto /usr/share/X11/xorg.conf.d
 			newins {,50-}nvidia-drm-outputclass.conf
 		fi
+
+		insinto /usr/share/glvnd/egl_vendor.d
+		doins ${NV_X11}/10_nvidia.json
+	fi
+
+	if use wayland; then
+		insinto /usr/share/glvnd/egl_vendor.d
+		doins ${NV_X11}/10_nvidia_wayland.json
 	fi
 
 	# OpenCL ICD for NVIDIA

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-378.09.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-378.09.ebuild
index 1a63f66..5daae30 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-378.09.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-378.09.ebuild
@@ -306,6 +306,14 @@ src_install() {
 			insinto /usr/share/X11/xorg.conf.d
 			newins {,50-}nvidia-drm-outputclass.conf
 		fi
+
+		insinto /usr/share/glvnd/egl_vendor.d
+		doins ${NV_X11}/10_nvidia.json
+	fi
+
+	if use wayland; then
+		insinto /usr/share/glvnd/egl_vendor.d
+		doins ${NV_X11}/10_nvidia_wayland.json
 	fi
 
 	# OpenCL ICD for NVIDIA