From fc000e530b451ade12408867c3f599f0be5b423b Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 6 Jan 2018 05:36:30 +0000
Subject: x11-drivers/nvidia-drivers : version bump

---
 sys-kernel/nvidia-drivers-dkms/Manifest            |  2 +-
 .../files/nvidia-drivers-dkms-384.111-conf.patch   | 28 +++++++++++++
 ...nvidia-drivers-dkms-384.111-kernel-4.14.9.patch | 14 +++++++
 .../files/nvidia-drivers-dkms-384.98-conf.patch    | 28 -------------
 .../nvidia-drivers-dkms-384.98-kernel-4.14.9.patch | 14 -------
 .../nvidia-drivers-dkms-384.111.ebuild             | 47 ++++++++++++++++++++++
 .../nvidia-drivers-dkms-384.98-r3.ebuild           | 47 ----------------------
 7 files changed, 90 insertions(+), 90 deletions(-)
 create mode 100644 sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.111-conf.patch
 create mode 100644 sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.111-kernel-4.14.9.patch
 delete mode 100644 sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.98-conf.patch
 delete mode 100644 sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.98-kernel-4.14.9.patch
 create mode 100644 sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-384.111.ebuild
 delete mode 100644 sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-384.98-r3.ebuild

(limited to 'sys-kernel/nvidia-drivers-dkms')

diff --git a/sys-kernel/nvidia-drivers-dkms/Manifest b/sys-kernel/nvidia-drivers-dkms/Manifest
index 858e871a..4141e8d7 100644
--- a/sys-kernel/nvidia-drivers-dkms/Manifest
+++ b/sys-kernel/nvidia-drivers-dkms/Manifest
@@ -1 +1 @@
-DIST NVIDIA-Linux-x86_64-384.98.run 80981256 SHA256 fb10b66d9a835c8a5fca9bf2aeb2a240732108b1d6fd11dea19c326463c6b6bb SHA512 cd337d538d5a35f52b90a4437f44146f4982484c68171ee3570c2ff44b4bd96e0a65223a141770fbe3a7794e68832386a1d2bbaf66cff7f4cafba8462ef402b5 WHIRLPOOL 638700b0c209b27e99267b90c5e6e674946c1fef3dc65233195a3cca580a1bcc6684dd6a8c42f1a0ca1641784c4edf0db941e9c9b1cbcff57c01b116911660ff
+DIST NVIDIA-Linux-x86_64-384.111.run 81005322 SHA256 85886d52d37ff03ba84946a407638f43171e409a50aed52149e1b67b92e017b1 SHA512 ddfe787a37f2a0e5409b302b13da16bd32a4a018958aa6f3b046eae7bf06d140f8d8f496e04726c57057139ebfce40811240b13d6a4ac6412655af6b257a0c5e WHIRLPOOL 43a75bbe6853e3189f8e2a93a5523be7782ae05e1f4a0774c581c1b77b221edef5014e921c80bd0418be9dbdd74a3ceca16f806c2a7857518670915c283df43d
diff --git a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.111-conf.patch b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.111-conf.patch
new file mode 100644
index 00000000..01052415
--- /dev/null
+++ b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.111-conf.patch
@@ -0,0 +1,28 @@
+diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
+--- a/kernel/dkms.conf	2016-09-02 02:32:09.000000000 +0100
++++ b/kernel/dkms.conf	2016-10-23 17:36:01.946597121 +0100
+@@ -1,12 +1,20 @@
+-PACKAGE_NAME="nvidia"
+-PACKAGE_VERSION="__VERSION_STRING"
++PACKAGE_NAME="nvidia-drivers-dkms"
++PACKAGE_VERSION="384.98"
+ AUTOINSTALL="yes"
+ 
+ # By default, DKMS will add KERNELRELEASE to the make command line; however,
+ # this will cause the kernel module build to infer that it was invoked via
+ # Kbuild directly instead of DKMS. The dkms(8) manual page recommends quoting
+ # the 'make' command name to suppress this behavior.
+-MAKE[0]="'make' -j__JOBS NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} modules"
++MAKE[0]="'make' -j`nproc` NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} modules"
+ 
+ # The list of kernel modules will be generated by nvidia-installer at runtime.
+-__DKMS_MODULES
++BUILT_MODULE_NAME[0]="nvidia"
++DEST_MODULE_LOCATION[0]="/extra/dkms"
++BUILT_MODULE_NAME[1]="nvidia-uvm"
++DEST_MODULE_LOCATION[1]="/extra/dkms"
++BUILT_MODULE_NAME[2]="nvidia-modeset"
++DEST_MODULE_LOCATION[2]="/extra/dkms"
++BUILT_MODULE_NAME[3]="nvidia-drm"
++DEST_MODULE_LOCATION[3]="/extra/dkms"
++
diff --git a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.111-kernel-4.14.9.patch b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.111-kernel-4.14.9.patch
new file mode 100644
index 00000000..89ad2df3
--- /dev/null
+++ b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.111-kernel-4.14.9.patch
@@ -0,0 +1,14 @@
+diff -durN a/kernel/nvidia-uvm/uvm8_va_block.c b/kernel/nvidia-uvm/uvm8_va_block.c
+--- a/kernel/nvidia-uvm/uvm8_va_block.c	2017-12-26 11:20:17.097715622 +0100
++++ b/kernel/nvidia-uvm/uvm8_va_block.c	2017-12-26 11:20:29.674381760 +0100
+@@ -36,6 +36,10 @@
+ #include "uvm8_perf_prefetch.h"
+ #include "uvm8_mem.h"
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,9)
++#include <linux/sched/task_stack.h>
++#endif
++
+ typedef enum
+ {
+     BLOCK_PTE_OP_MAP,
diff --git a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.98-conf.patch b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.98-conf.patch
deleted file mode 100644
index 01052415..00000000
--- a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.98-conf.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
---- a/kernel/dkms.conf	2016-09-02 02:32:09.000000000 +0100
-+++ b/kernel/dkms.conf	2016-10-23 17:36:01.946597121 +0100
-@@ -1,12 +1,20 @@
--PACKAGE_NAME="nvidia"
--PACKAGE_VERSION="__VERSION_STRING"
-+PACKAGE_NAME="nvidia-drivers-dkms"
-+PACKAGE_VERSION="384.98"
- AUTOINSTALL="yes"
- 
- # By default, DKMS will add KERNELRELEASE to the make command line; however,
- # this will cause the kernel module build to infer that it was invoked via
- # Kbuild directly instead of DKMS. The dkms(8) manual page recommends quoting
- # the 'make' command name to suppress this behavior.
--MAKE[0]="'make' -j__JOBS NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} modules"
-+MAKE[0]="'make' -j`nproc` NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} modules"
- 
- # The list of kernel modules will be generated by nvidia-installer at runtime.
--__DKMS_MODULES
-+BUILT_MODULE_NAME[0]="nvidia"
-+DEST_MODULE_LOCATION[0]="/extra/dkms"
-+BUILT_MODULE_NAME[1]="nvidia-uvm"
-+DEST_MODULE_LOCATION[1]="/extra/dkms"
-+BUILT_MODULE_NAME[2]="nvidia-modeset"
-+DEST_MODULE_LOCATION[2]="/extra/dkms"
-+BUILT_MODULE_NAME[3]="nvidia-drm"
-+DEST_MODULE_LOCATION[3]="/extra/dkms"
-+
diff --git a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.98-kernel-4.14.9.patch b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.98-kernel-4.14.9.patch
deleted file mode 100644
index 89ad2df3..00000000
--- a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-384.98-kernel-4.14.9.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -durN a/kernel/nvidia-uvm/uvm8_va_block.c b/kernel/nvidia-uvm/uvm8_va_block.c
---- a/kernel/nvidia-uvm/uvm8_va_block.c	2017-12-26 11:20:17.097715622 +0100
-+++ b/kernel/nvidia-uvm/uvm8_va_block.c	2017-12-26 11:20:29.674381760 +0100
-@@ -36,6 +36,10 @@
- #include "uvm8_perf_prefetch.h"
- #include "uvm8_mem.h"
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,9)
-+#include <linux/sched/task_stack.h>
-+#endif
-+
- typedef enum
- {
-     BLOCK_PTE_OP_MAP,
diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-384.111.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-384.111.ebuild
new file mode 100644
index 00000000..6c7d4f2c
--- /dev/null
+++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-384.111.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+NV_URI="http://us.download.nvidia.com/XFree86/"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+
+DESCRIPTION="NVIDIA driver sources for linux"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/${PV}"
+KEYWORDS="amd64"
+IUSE=""
+
+DEPEND="sys-kernel/dkms"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${AMD64_NV_PACKAGE}"
+
+src_unpack() {
+	sh ${DISTDIR}/${AMD64_NV_PACKAGE}.run --extract-only
+}
+
+src_prepare() {
+	epatch ""${FILESDIR}"/"${P}"-conf.patch"
+	epatch ""${FILESDIR}"/"${P}"-kernel-4.14.9.patch"
+}
+
+src_install() {
+	dodir /usr/src/${P}
+	insinto /usr/src/${P}
+	doins -r "${S}"/kernel/*
+}
+
+pkg_postinst() {
+	dkms add ${PN}/${PV}
+}
+
+pkg_prerm() {
+	dkms remove ${PN}/${PV} --all
+}
diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-384.98-r3.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-384.98-r3.ebuild
deleted file mode 100644
index 6c7d4f2c..00000000
--- a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-384.98-r3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA driver sources for linux"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )"
-
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0/${PV}"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="sys-kernel/dkms"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${AMD64_NV_PACKAGE}"
-
-src_unpack() {
-	sh ${DISTDIR}/${AMD64_NV_PACKAGE}.run --extract-only
-}
-
-src_prepare() {
-	epatch ""${FILESDIR}"/"${P}"-conf.patch"
-	epatch ""${FILESDIR}"/"${P}"-kernel-4.14.9.patch"
-}
-
-src_install() {
-	dodir /usr/src/${P}
-	insinto /usr/src/${P}
-	doins -r "${S}"/kernel/*
-}
-
-pkg_postinst() {
-	dkms add ${PN}/${PV}
-}
-
-pkg_prerm() {
-	dkms remove ${PN}/${PV} --all
-}
-- 
cgit v1.2.3