summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2013-12-02 02:43:07 +0000
committerMike Gilbert <floppym@gentoo.org>2013-12-02 02:43:07 +0000
commit965af47b251071e20a8050dc5671d54320ef7ca7 (patch)
treefe04ea25754604987ef37f34743690ddf4864ebb /x11-drivers
parentVersion bump for Rubicon (bug #492396, thanks to Denis Misiurca). Add live gi... (diff)
downloadgentoo-2-965af47b251071e20a8050dc5671d54320ef7ca7.tar.gz
gentoo-2-965af47b251071e20a8050dc5671d54320ef7ca7.tar.bz2
gentoo-2-965af47b251071e20a8050dc5671d54320ef7ca7.zip
Restore pax-usercopy patch; passing ${P} to epatch is stupid.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/nvidia-drivers/ChangeLog5
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-331.20.ebuild14
2 files changed, 11 insertions, 8 deletions
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 8be258490381..4a1243d8493a 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-drivers/nvidia-drivers
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.497 2013/11/18 19:39:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.498 2013/12/02 02:43:07 floppym Exp $
+
+ 02 Dec 2013; Mike Gilbert <floppym@gentoo.org> nvidia-drivers-331.20.ebuild:
+ Restore pax-usercopy patch; passing ${P} to epatch is stupid.
18 Nov 2013; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-304.116.ebuild,
nvidia-drivers-331.20.ebuild:
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-331.20.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-331.20.ebuild
index e2605b6e2593..a5e44198b9ba 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-331.20.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-331.20.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.20.ebuild,v 1.4 2013/11/18 19:39:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-331.20.ebuild,v 1.5 2013/12/02 02:43:07 floppym Exp $
EAPI=5
@@ -169,12 +169,12 @@ src_prepare() {
# convert_to_m "${NV_SRC}"/Makefile.kbuild
fi
- #if use pax_kernel; then
- # ewarn "Using PAX patches is not supported. You will be asked to"
- # ewarn "use a standard kernel should you have issues. Should you"
- # ewarn "need support with these patches, contact the PaX team."
- # epatch "${FILESDIR}"/${P}-pax-usercopy.patch
- #fi
+ if use pax_kernel; then
+ ewarn "Using PAX patches is not supported. You will be asked to"
+ 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
+ fi
# Allow user patches so they can support RC kernels and whatever else
epatch_user