jer 14/11/14 22:42:41 Modified: nvidia-drivers-346.16.ebuild ChangeLog Log: 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)
Revision Changes Path 1.4 x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild?r1=1.3&r2=1.4 Index: nvidia-drivers-346.16.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nvidia-drivers-346.16.ebuild 14 Nov 2014 22:21:34 -0000 1.3 +++ nvidia-drivers-346.16.ebuild 14 Nov 2014 22:42:41 -0000 1.4 @@ -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 @@ 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 @@ /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 1.592 x11-drivers/nvidia-drivers/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog?rev=1.592&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog?rev=1.592&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog?r1=1.591&r2=1.592 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v retrieving revision 1.591 retrieving revision 1.592 diff -u -r1.591 -r1.592 --- ChangeLog 14 Nov 2014 22:21:34 -0000 1.591 +++ ChangeLog 14 Nov 2014 22:42:41 -0000 1.592 @@ -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 <[email protected]> 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 <[email protected]> nvidia-drivers-346.16.ebuild: Set MAKEOPTS=-j1 unconditionally (bug #529258 by thygreatswaggedone).
