summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2013-12-31 16:01:26 +0000
committerJeroen Roovers <jer@gentoo.org>2013-12-31 16:01:26 +0000
commitf6b9b453e4967d4a860aa56181889e2f337658ce (patch)
tree2bf7b8fd3339ea60d690eb4308106d92dadd306d /x11-drivers/nvidia-drivers
parentCall python-any-r1_pkg_setup to avoid breaking binpkgs. (diff)
downloadgentoo-2-f6b9b453e4967d4a860aa56181889e2f337658ce.tar.gz
gentoo-2-f6b9b453e4967d4a860aa56181889e2f337658ce.tar.bz2
gentoo-2-f6b9b453e4967d4a860aa56181889e2f337658ce.zip
Do not die when something in FILESDIR is missing.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'x11-drivers/nvidia-drivers')
-rw-r--r--x11-drivers/nvidia-drivers/ChangeLog6
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-319.76.ebuild5
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild5
3 files changed, 9 insertions, 7 deletions
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 3bc0f9a3ba89..d0fe5e4b1504 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,10 @@
# 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.508 2013/12/31 01:19:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.509 2013/12/31 16:01:26 jer Exp $
+
+ 31 Dec 2013; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-96.43.23.ebuild,
+ nvidia-drivers-319.76.ebuild:
+ Do not die when something in FILESDIR is missing.
31 Dec 2013; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-331.20.ebuild:
Revert xorg-server version change (bug #494460).
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-319.76.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-319.76.ebuild
index 289d7cd4bf93..971d25a2fa69 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-319.76.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-319.76.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-319.76.ebuild,v 1.3 2013/12/31 00:39:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-319.76.ebuild,v 1.4 2013/12/31 16:01:26 jer Exp $
EAPI=5
@@ -248,10 +248,9 @@ src_install() {
fi
# Add the aliases
- [ -f "${FILESDIR}/nvidia-169.07" ] || die "nvidia missing in FILESDIR"
sed -e 's:PACKAGE:'${PF}':g' \
-e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-169.07 > \
- "${WORKDIR}"/nvidia
+ "${WORKDIR}"/nvidia || die
insinto /etc/modprobe.d
newins "${WORKDIR}"/nvidia nvidia.conf
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild
index 2599ff110bcd..8dbf00b94f82 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.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-96.43.23.ebuild,v 1.18 2013/12/18 14:06:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild,v 1.19 2013/12/31 16:01:26 jer Exp $
EAPI=5
inherit eutils flag-o-matic linux-mod multilib nvidia-driver portability unpacker user versionator
@@ -315,10 +315,9 @@ src_install() {
fi
# Add the aliases
- [ -f "${FILESDIR}/nvidia-169.07" ] || die "nvidia missing in FILESDIR"
sed -e 's:PACKAGE:'${PF}':g' \
-e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-169.07 > \
- "${WORKDIR}"/nvidia
+ "${WORKDIR}"/nvidia || die
insinto /etc/modprobe.d
newins "${WORKDIR}"/nvidia nvidia.conf
elif use x86-fbsd; then