From 42361d99bf12c157e6aea513c22c41323809176d Mon Sep 17 00:00:00 2001
From: Kolan Sh <backbone@backbone.ws>
Date: Tue, 24 Feb 2015 19:29:28 +0300
Subject: [PATCH] nvidia-drivers 331.89 for Linux =3.18.x added.

---
 x11-drivers/nvidia-drivers/Manifest           |  8 +++---
 .../nvidia-drivers/files/3.18_kernel.patch    | 24 ++++++++++++++++++
 .../files/nvidia-persistenced.conf            |  8 ++++++
 .../files/nvidia-persistenced.init            | 25 +++++++++++++++++++
 ...9.ebuild => nvidia-drivers-331.113.ebuild} | 19 +++++++++-----
 5 files changed, 74 insertions(+), 10 deletions(-)
 create mode 100644 x11-drivers/nvidia-drivers/files/3.18_kernel.patch
 create mode 100644 x11-drivers/nvidia-drivers/files/nvidia-persistenced.conf
 create mode 100755 x11-drivers/nvidia-drivers/files/nvidia-persistenced.init
 rename x11-drivers/nvidia-drivers/{nvidia-drivers-331.89.ebuild => nvidia-drivers-331.113.ebuild} (95%)

diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 480b2312..f27ecaee 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,4 +1,4 @@
-DIST NVIDIA-FreeBSD-x86-331.89.tar.gz 56039270 SHA256 c6c8dc05b7d47dc612494ecec12b24a0baf4b4323b2865426c98c63c5346a1ee SHA512 bc5f792b86a8faff5a7811d4931709b8cc93de0688bc849f4ebb0e970aff8430a0f7e8c8a7878e12c6f54c83298f2c690c8e5e203d537bc1f417fbe6f4af6c9e WHIRLPOOL efe8da8b1a45aa82d7bf636561484a04cf80dbd511796faf4891f0311c8f0a5a834aace0f4bf763378596e1e6e7fc387994d9d243b5cf68e545dd2b131be1726
-DIST NVIDIA-FreeBSD-x86_64-331.89.tar.gz 47156745 SHA256 78d78d02cbafb7538a981263748026c533fd052dac861e270f2a8b259c8c4f07 SHA512 e3e34abeda9a7c0a13558d6d32106dc59b2d6341c28352e002616883059c60bba943f6eacffb0fb4b77d413ebb8e17b52d39e7bf645f8858bc043b69f3a3dd01 WHIRLPOOL f7a0cf3f78002d2396ad8c7335497627d14e8ff624a39acde9f5425986d1b75d3d282d616343fd6cd743d80191059157bddc77bdbfda023d26f20dfce6fcc463
-DIST NVIDIA-Linux-x86-331.89.run 37023195 SHA256 608c5555933fd8738f9263e569ae31acff0a9ef93390aa61889ab0606182c942 SHA512 b6afc4212687fb8ffa6256c23088d3eb98bae39486b9d2886075483fbfa97bc4fbfd5da1de5072ae4f309b64201dc176e38351cbe18b8b7a7339d1d957e3ca67 WHIRLPOOL b10567f54eb6f63aca997f8df6cb9e1c303186e9e853a463318f43904edf719d3beba4f3e5d7b480cbc7576078302ec92f711cb1cfccaa511d376de00b7f83de
-DIST NVIDIA-Linux-x86_64-331.89.run 60300634 SHA256 e7f51a6c7abfe3ba8f03dbb284e2ade7430cc909b2241ff7703b17beff0dd237 SHA512 0216d291c810f1e304d06129eca3d28b67bc587f395626ed201e18e341dc7386b938fae2b75c694f4ed14bcf5a262b468d0919253bde4c9a6898656ae54125f0 WHIRLPOOL fd968f627471256be3bd842fd3d1f36d39d7da2296525e5aac518e5cd678e1c39851d4441851566912108c50baf611bc52d887e9fc828e3db415d13ae3c635f3
+DIST NVIDIA-FreeBSD-x86-331.113.tar.gz 56371300 SHA256 f3b4b5ddf5977223646d2cdb0617ea8a5f667814ca23b29cb225c5685eacd9d7 SHA512 5c45142807a5b8ecb5e037921e4e449f4710a65358579087429e14ee50124863e6a65fbf8cc73efec22bd8ca85d3eb5a815c7301403dd3236e0bb0b177e5f3e8 WHIRLPOOL 97240066b1c45c887770bfe8539b733a2957fdc1511af5b08de4149b0ce9fedc87b6aa8ee8d243793d225c98c09681e4cca93dd1c5f601389637644e659d7863
+DIST NVIDIA-FreeBSD-x86_64-331.113.tar.gz 47509194 SHA256 c848e187c79064ea3f52406312aa09d06f0aaef5063be7522b2b2319c43c872c SHA512 4e206719afcee47179e0756ac67fc4e61d513efb1cd0264b28726d6de16846feee873a2df362bf645b0527d395b6d82f5b54dbc447bccb74128d7bff37bb7b1b WHIRLPOOL a51b0bd9f7301d9bb76b54ffa44337ad4d875125281c4b9921e66a76d434879832f542df9c6ba436ef83fb3fa0afe5197f3425f1b7aa16274aca5080259f343d
+DIST NVIDIA-Linux-x86-331.113.run 37300924 SHA256 42535a99ab68452d30d9c3fad2fb162db01d1f6821115a3c1733ed203efd588b SHA512 bc820609e0379cc5805a5428cc364795b8a5d9e5a2a4395a1ddaa1dda85e6acc59368f87f5974a39fb42bd272458627b2c742fbf1f7fedddb17102439883b111 WHIRLPOOL 1d7b5cb8be5bb76dbe1b238aab4e39ccda0e5b07da268f0652966e79d5e0d2192773316d8f22a2d6a551305b17b610242918822e94e43263c9dbfba8a48bf49b
+DIST NVIDIA-Linux-x86_64-331.113.run 60509547 SHA256 e9d5eb4394ef31825f7a86290b19b522851d1b599284095d81bac0f33a996219 SHA512 f71f3d20016bebe4e7f83704a7539f0d53c92a2598a34f9f48ad421e5743ef554aa97315f2a762f132b730b1f37c5811aa617fed3c5a90d3e2e9cc5320e366b7 WHIRLPOOL 2f06c45cb4750eb5c7d6a2ff4e4c3abaf813df135da13691f30238baf89c2fa1477d5694088f268d8681cf719889b9e2644fc1d707785113703cd2e4d7c0b27f
diff --git a/x11-drivers/nvidia-drivers/files/3.18_kernel.patch b/x11-drivers/nvidia-drivers/files/3.18_kernel.patch
new file mode 100644
index 00000000..6be2fbe5
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/3.18_kernel.patch
@@ -0,0 +1,24 @@
+--- kernel/nv-drm.c	2015-02-24 19:23:26.392658708 +0300
++++ kernel/nv-drm.c	2015-02-24 19:22:16.653237994 +0300
+@@ -18,6 +18,10 @@
+ 
+ #include <drm/drmP.h>
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
++#include <drm/drm_gem.h>
++#endif
++
+ extern nv_linux_state_t *nv_linux_devices;
+ 
+ struct nv_gem_object {
+@@ -124,6 +128,10 @@
+     .gem_prime_vmap = nv_gem_prime_vmap,
+     .gem_prime_vunmap = nv_gem_prime_vunmap,
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
++ .set_busid = drm_pci_set_busid,
++#endif
++
+     .name = "nvidia-drm",
+     .desc = "NVIDIA DRM driver",
+     .date = "20130102",
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-persistenced.conf b/x11-drivers/nvidia-drivers/files/nvidia-persistenced.conf
new file mode 100644
index 00000000..637ac1af
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-persistenced.conf
@@ -0,0 +1,8 @@
+# run-time configuration file for /etc/init.d/nvidia-persistenced
+
+# NVPD_USER: The user nvidia-persistenced is intended to run for
+NVPD_USER=""
+
+# ARGS: Additional arguments to set the default persistence mode
+# (see nvidia-persistenced(1))
+ARGS=""
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-persistenced.init b/x11-drivers/nvidia-drivers/files/nvidia-persistenced.init
new file mode 100755
index 00000000..e712514a
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-persistenced.init
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/nvidia-persistenced.init,v 1.2 2014/09/19 22:09:28 jer Exp $
+
+pidfile="/var/run/nvidia-persistenced/nvidia-persistenced.pid"
+
+start() {
+	if ! [ "${NVPD_USER}x" = x ]; then
+		ebegin "Starting nvidia-persistenced for ${NVPD_USER}"
+		NVPD_USER_ARG="--user ${NVPD_USER}"
+	else
+		ebegin "Starting nvidia-persistenced"
+	fi
+	start-stop-daemon --start --quiet --pidfile ${pidfile} \
+		--background --exec /opt/bin/nvidia-persistenced \
+		-- ${NVPD_USER_ARG} ${ARGS}
+	eend $?	
+}
+
+stop() {
+	ebegin "Stopping nvidia-persistenced"
+	start-stop-daemon --stop --quiet --pidfile ${pidfile}
+	eend $?
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-331.89.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-331.113.ebuild
similarity index 95%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-331.89.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-331.113.ebuild
index 47ca7342..6fe13af4 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-331.89.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-331.113.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-331.89.ebuild,v 1.4 2014/08/08 12:29:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-331.113.ebuild,v 1.3 2015/02/09 07:35:58 jer Exp $
 
 EAPI=5
 
@@ -54,7 +54,7 @@ RDEPEND="
 		x11-libs/pango[X]
 	)
 	X? (
-		<x11-base/xorg-server-1.16.99
+		<x11-base/xorg-server-1.17.99:=
 		>=x11-libs/libvdpau-0.3-r1
 		multilib? (
 			|| (
@@ -82,11 +82,11 @@ pkg_pretend() {
 		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
 	fi
 
-	if use kernel_linux && kernel_is ge 3 16 ; then
+	if use kernel_linux && kernel_is ge 3 18 ; then
 		ewarn "Gentoo supports kernels which are supported by NVIDIA"
 		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-3.16"
-		ewarn "<sys-kernel/vanilla-sources-3.16"
+		ewarn "<sys-kernel/gentoo-sources-3.18"
+		ewarn "<sys-kernel/vanilla-sources-3.18"
 		ewarn ""
 		ewarn "You are free to utilize epatch_user to provide whatever"
 		ewarn "support you feel is appropriate, but will not receive"
@@ -172,6 +172,10 @@ src_prepare() {
 			eerror "You must build this against 2.6.9 or higher kernels."
 		fi
 
+		if kernel_is gt 2 18 0 ; then
+			epatch "${FILESDIR}"/3.18_kernel.patch
+		fi
+
 		# If greater than 2.6.5 use M= instead of SUBDIR=
 #		convert_to_m "${NV_SRC}"/Makefile.kbuild
 	fi
@@ -181,6 +185,7 @@ src_prepare() {
 		ewarn "use a standard kernel should you have issues. Should you"
 		ewarn "need support with these patches, contact the PaX team."
 		epatch "${FILESDIR}"/${PN}-331.13-pax-usercopy.patch
+		epatch "${FILESDIR}"/${PN}-337.12-pax-constify.patch
 	fi
 
 	# Allow user patches so they can support RC kernels and whatever else
@@ -337,6 +342,8 @@ src_install() {
 		doman nvidia-modprobe.1.gz
 		doman nvidia-persistenced.1.gz
 		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
 	fi
 
 	if use tools; then