diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-11-14 22:42:41 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-11-14 22:42:41 +0000 |
| commit | 0e4e791017c3aeb2f4fc276e322a7c0e270c8232 (patch) | |
| tree | a7273b8eb680004244bc348b0a9aaf2ee413616f /x11-drivers | |
| parent | Set MAKEOPTS=-j1 unconditionally (bug #529258 by thygreatswaggedone). (diff) | |
| download | gentoo-2-0e4e791017c3aeb2f4fc276e322a7c0e270c8232.tar.gz gentoo-2-0e4e791017c3aeb2f4fc276e322a7c0e270c8232.tar.bz2 gentoo-2-0e4e791017c3aeb2f4fc276e322a7c0e270c8232.zip | |
Set sub-SLOT dependency on x11-base/xorg-server. Install nvidia-drm-outputclass.conf only when >x11-base/xorg-server-1.16 (bug #529254 by Oliver Freyermuth).
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'x11-drivers')
| -rw-r--r-- | x11-drivers/nvidia-drivers/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog index a8700b86c79b..7462006b2a8f 100644 --- a/x11-drivers/nvidia-drivers/ChangeLog +++ b/x11-drivers/nvidia-drivers/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-drivers/nvidia-drivers # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.591 2014/11/14 22:21:34 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.592 2014/11/14 22:42:41 jer Exp $ + + 14 Nov 2014; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-346.16.ebuild: + Set sub-SLOT dependency on x11-base/xorg-server. Install nvidia-drm- + outputclass.conf only when >x11-base/xorg-server-1.16 (bug #529254 by Oliver + Freyermuth). 14 Nov 2014; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-346.16.ebuild: Set MAKEOPTS=-j1 unconditionally (bug #529258 by thygreatswaggedone). diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild index 12c9fcd77728..8c56463037b7 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild @@ -1,6 +1,6 @@ # 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/nvidia-drivers-346.16.ebuild,v 1.3 2014/11/14 22:21:34 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild,v 1.4 2014/11/14 22:42:41 jer Exp $ EAPI=5 @@ -55,7 +55,7 @@ RDEPEND=" x11-libs/pango[X] ) X? ( - <x11-base/xorg-server-1.16.99 + <x11-base/xorg-server-1.16.99:= >=x11-libs/libvdpau-0.3-r1 multilib? ( || ( @@ -287,8 +287,10 @@ src_install() { /usr/$(get_libdir)/opengl/nvidia/extensions # Xorg nvidia.conf - insinto /usr/share/X11/xorg.conf.d - newins {,50-}nvidia-drm-outputclass.conf + if has_version '>=x11-base/xorg-server-1.16'; then + insinto /usr/share/X11/xorg.conf.d + newins {,50-}nvidia-drm-outputclass.conf + fi fi # OpenCL ICD for NVIDIA |