summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Väth <martin@mvath.de>2015-11-29 08:29:52 +0100
committerMartin Väth <martin@mvath.de>2015-11-29 08:29:52 +0100
commit08d759cd0d30319dad072e50db3a50f77be89acf (patch)
tree6de0b848ddfbf7abd05fb47b8bdd1c2edcdab701 /x11-drivers
parentapp-shells/zshrc-mv: Version bump (diff)
downloadmv-08d759cd0d30319dad072e50db3a50f77be89acf.tar.gz
mv-08d759cd0d30319dad072e50db3a50f77be89acf.tar.bz2
mv-08d759cd0d30319dad072e50db3a50f77be89acf.zip
Bump to EAPI=6
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/nvidia-drivers/Manifest6
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r1.ebuild33
2 files changed, 17 insertions, 22 deletions
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index d26f875f..fb25e597 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,3 +1,3 @@
-DIST NVIDIA-FreeBSD-x86-173.14.39.tar.gz 20038266 SHA256 63a922ce4c5b676b4cb1ace98094dace4cc5408f2553e183df7b2127777a238b SHA512 96982fe7e0751c52fbef534193de09d187b99c1984c05e791223eb804719d8b3ba72efd983f227661ded4b71569bdbb914f1f629ab73a8bc9b8172832ccf3ec6 WHIRLPOOL 21f5906f42adf0064c7a7f81ac8e323de488e6d36356ee42c31a15c31ebb64335d5e2cff0ff022d41de480f9e0a57b3b96387f17151c7b59eceba2c61a7a102b
-DIST NVIDIA-Linux-x86-173.14.39-pkg0.run 15134997 SHA256 a09935f37121ed3db8ae3da63a0d8e9d4348a19c859811c9fe44d6ce8e3eab23 SHA512 e24e15ccec725d3cbca502c2b77061776a81ef92917a950adec4ff6bdc34f10903aa654433177ea74be0dade4af81c5380d5710d375a5ea445940d06154bde93 WHIRLPOOL fce3d8e4f6cdf698f5a057514b6fe220bb1011025bdce5bd4cf0e424fb4d306d38251b6726bda03f290ea8137d5a95ed418cf8751722879f9042462abd9181b6
-DIST NVIDIA-Linux-x86_64-173.14.39-pkg2.run 21100833 SHA256 15a953666d5681ba54c97498b578ffd286a1dc96d605f3b02110f3f99813100e SHA512 a65cd496e6ed57f771c3d99f37f616a1242d97844f6faef7a807825ad899c0e536a99fde397020839f0857883b934032f9491024f3047a6b06d3eea1f5d77713 WHIRLPOOL dc5f243b7d1de7e2d1b7f005e018a2940d63335b11a7c83c234b348b7a1839e9131169d2ea928bd8c2f549a4535149b03e16e6c94d59dfa745f7f904ff790a45
+DIST NVIDIA-FreeBSD-x86-173.14.39.tar.gz 20038266 SHA256 63a922ce4c5b676b4cb1ace98094dace4cc5408f2553e183df7b2127777a238b
+DIST NVIDIA-Linux-x86-173.14.39-pkg0.run 15134997 SHA256 a09935f37121ed3db8ae3da63a0d8e9d4348a19c859811c9fe44d6ce8e3eab23
+DIST NVIDIA-Linux-x86_64-173.14.39-pkg2.run 21100833 SHA256 15a953666d5681ba54c97498b578ffd286a1dc96d605f3b02110f3f99813100e
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r1.ebuild
index c452bbfe..dde9bf03 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r1.ebuild
@@ -2,10 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
inherit eutils flag-o-matic linux-mod multilib nvidia-driver portability \
- unpacker user versionator
+ unpacker user versionator readme.gentoo
X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
@@ -270,9 +270,9 @@ src_prepare() {
use x86-fbsd && cd doc
# Use the correct defines to make gtkglext build work
- epatch "${FILESDIR}"/NVIDIA_glx-defines.patch
+ eapply "${FILESDIR}"/NVIDIA_glx-defines.patch
# Use some more sensible gl headers and make way for new glext.h
- epatch "${FILESDIR}"/NVIDIA_glx-glheader.patch
+ eapply -p0 "${FILESDIR}"/NVIDIA_glx-glheader.patch
if use kernel_linux; then
# Quiet down warnings the user does not need to see
@@ -287,7 +287,7 @@ src_prepare() {
if use pax_kernel ; then
einfo "Enabling unofficial patches for hardened-sources/grsecurity"
- epatch "${FILESDIR}/${PV}-grsecurity.patch"
+ eapply "${FILESDIR}/${PV}-grsecurity.patch"
fi
if use kernel3-17 ; then
@@ -298,16 +298,16 @@ src_prepare() {
einfo "Enabling unofficial patches for linux-3.13 and newer"
fi
if use kernel3-17 || use kernel3-14 || use kernel3-13 ; then
- epatch "${FILESDIR}/${PV}-kernel-3.13.patch"
+ eapply "${FILESDIR}/${PV}-kernel-3.13.patch"
if use kernel3-17 || use kernel3-14 ; then
- epatch "${FILESDIR}/${PV}-kernel-3.14.patch"
+ eapply "${FILESDIR}/${PV}-kernel-3.14.patch"
if use kernel3-17 ; then
- epatch "${FILESDIR}/${PV}-kernel-3.17.patch"
+ eapply -p2 "${FILESDIR}/${PV}-kernel-3.17.patch"
fi
fi
fi
- epatch_user
+ eapply_user
}
src_compile() {
@@ -357,11 +357,9 @@ src_install() {
# Xorg GLX driver
insinto /usr/$(get_libdir)/opengl/nvidia/extensions
- doins ${NV_X11_EXT}/libglx.so.${NV_SOVER} || \
- die "failed to install libglx.so"
+ doins ${NV_X11_EXT}/libglx.so.${NV_SOVER}
dosym /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so.${NV_SOVER} \
- /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so || \
- die "failed to create libglx.so symlink"
+ /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so
# XvMC driver
dolib.a ${NV_X11}/libXvMCNVIDIA.a || \
@@ -369,14 +367,11 @@ src_install() {
dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER} || \
die "failed to install libXvMCNVIDIA.so"
dosym libXvMCNVIDIA.so.${NV_SOVER} \
- /usr/$(get_libdir)/libXvMCNVIDIA.so.1 || \
- die "failed to create libXvMCNVIDIA.so.1 symlink"
+ /usr/$(get_libdir)/libXvMCNVIDIA.so.1
dosym libXvMCNVIDIA.so.1 \
- /usr/$(get_libdir)/libXvMCNVIDIA.so || \
- die "failed to create libXvMCNVIDIA.so symlink"
+ /usr/$(get_libdir)/libXvMCNVIDIA.so
dosym libXvMCNVIDIA.so.${NV_SOVER} \
- /usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 || \
- die "failed to create libXvMCNVIDIA_dynamic.so.1 symlink"
+ /usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1
# CUDA headers (driver to come)
if use kernel_linux && [[ -d ${S}/usr/include/cuda ]]; then