diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-11-14 22:42:43 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-11-14 22:42:43 +0000 |
| commit | d6ec7b3e8b1d5f4af8d3191225f49e6d31c5382c (patch) | |
| tree | 037fd4f6c1687c590a4df47a756703dde49c0e34 /x11-drivers/nvidia-drivers | |
| parent | Set MAKEOPTS=-j1 unconditionally (bug #529258 by thygreatswaggedone). (diff) | |
| download | historical-d6ec7b3e8b1d5f4af8d3191225f49e6d31c5382c.tar.gz historical-d6ec7b3e8b1d5f4af8d3191225f49e6d31c5382c.tar.bz2 historical-d6ec7b3e8b1d5f4af8d3191225f49e6d31c5382c.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).
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'x11-drivers/nvidia-drivers')
| -rw-r--r-- | x11-drivers/nvidia-drivers/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/Manifest | 10 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild | 10 |
3 files changed, 17 insertions, 10 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/Manifest b/x11-drivers/nvidia-drivers/Manifest index e5450f9f0c20..c3b593146667 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -58,15 +58,15 @@ EBUILD nvidia-drivers-334.21-r3.ebuild 13315 SHA256 ee8cd0c24a72f4395eb6cede21e5 EBUILD nvidia-drivers-337.25.ebuild 13317 SHA256 f9f5fecd012f654fd61fd17f9c956f601bca94312953c2c3202bc746e124e5c1 SHA512 91a1013a62caab896cc883e665daa3348b78912a9bde8cbc79ca5c61067e8088c0b17d61297dd85b366ad159f5fcdf813a04f7607516edce7006db03e5ac9443 WHIRLPOOL a24b560c281d948fc33cbd0a4e30509313dbe79aec0434c099f24e4b7403891ee41a20d659f1e413939744c7eb4c11abb07d4ea3b00acd2a00c90f84d0a5d449 EBUILD nvidia-drivers-340.58.ebuild 13645 SHA256 4c43560a2d3c374245881814d2923ecdd6b7f4d31f926dfc8a8d7a15e1a64277 SHA512 a57e6c3a76939859794344648ce7726479659177cb7bfb245c7007953fe4e448e1792a145e1216f349b4323941b35e60ba7f41ba182a0d0be038e90ff22ec659 WHIRLPOOL 03bae423784ec37ebc59a86821bafebe476122e15221d8d72d618d82e3684455f407d31cb3652b72bec538a8c6680b282e2cda2612d8fe27b31282b1d4929fa6 EBUILD nvidia-drivers-343.22-r2.ebuild 13648 SHA256 d7d1e6fe4d3aa1a4afe9ca439fb26cb2313dfd608821ffed8719db2369b658c6 SHA512 64203caf5906242a554332ac4ac598b4df24afa318e84eaa700e4cb391109044c9ac447b7ed81fa0c613c53586dfd8f486d2ba2d31ab25eccad316cddbf7dd53 WHIRLPOOL 30df7202d6e4f0c20d968b435468b98dcd585f2eb4d8f9799408f2c8b4b997cf12d87670660f77b871c315b8290295986c8fae7db280ee0739ddb0793f76fddc -EBUILD nvidia-drivers-346.16.ebuild 13908 SHA256 8f94ec82d629df8f255e0f7d44e1b2db4a6b04958674a8fe7b90de9c0cfadf9b SHA512 20a215b3ae1a878ce1133ebfb152f078c4b8089835009acf8c5692cd8502bb8c8f31966dab52e5e582f0fffa7821f2b9d1456b4eb5d8b1e40ee3002dc1bb47d5 WHIRLPOOL 893f0acf0b3f52d6054d75622b5e504ccc50c414573b476a9098732c87c927d1ec8d64988e33e4f38fbda836a4c66b0e142c735c14405f92a685c467cd5a0914 +EBUILD nvidia-drivers-346.16.ebuild 13970 SHA256 854d8ae6ea015a572680bfa87d38a583d7832cc1b1d74ff9015758ccd969332e SHA512 e7115c99cb07eee192dc82ca04b2d0a3440d3e96bd8939b79adf2f50c3356f26441e526e11598a6d475d65c7923ee0f2d3ab5e3757a12680126788c8d5196e84 WHIRLPOOL 854ade29980511e3cfc588a2a5ecfb54b87bc76f9a9d847823bb238bb1fbe54c78628f50a53e7fd08bbe624cfbc2863d37f6989f5b4439fbadc77d6fab8cba51 EBUILD nvidia-drivers-96.43.23.ebuild 14866 SHA256 c55816dd14847c8a211368805f92779628340bfa28ab198f0f8d2487d0df9fbf SHA512 cc79ee87dbf72c81e1267b10ade0bd4300a1bf84bfeb184e8cede0fe0861f57edee59b782329da791a4d066dfcc925c5087cb180c5dea603b9e1d5abf43a5695 WHIRLPOOL 7e4727e6b4a6b3845c97240a252fc4e784dd85ed7f22773ab54cd21a9cd78bc88f0948f6a7ba885042a4c1635942a3933281a7805335d25620decad7589e59b8 -MISC ChangeLog 14253 SHA256 bf40e366d62c61a2572d65fbbd479983b10c54c4d19fd61f3cb885718b379aa7 SHA512 d8a1bf5e8b1c23665185fcb76881196bc2ddc83e6d563330ace6d69eecdfd667c15a0c1b59e962756d168a0b3633a8a46beb27a35724a9af92015bacac01a5cf WHIRLPOOL 8fc9fd446ac145e518cbdf9510105d3c68377ae3e4b21b2e9e9c4373cad98746aa7ad56a6fc7fd070425705e0dcd79a99158f70cd1aad8ea6eaf9e29b2afcae5 +MISC ChangeLog 14496 SHA256 926417b934058db9a0d3506a696bf85b385a9b1be1bb1fff4350ae46c45250ba SHA512 cb1858d91b1b47079d9a81244feb837d41a8bc48dc5e55bae6307356c3375081ecea49e39a1718ec1c1ab4d13620b38bf6e00da06f7acb2c2372d7efb573bdb0 WHIRLPOOL a3e23a379782ebbdeca4506a73264226a8e2c906e795b4e84dd2b94a94a6e151b715166fed32095e34967382c1e0ca91d191298dfa63cc4badd9381b9ab23f03 MISC ChangeLog-2013 103100 SHA256 e8474a573b3e0082e71ed55094cb9298a631b76f415210e573b6db8b9a9fe6ce SHA512 706f2be5243cfe7ea2a850f8d3555d7d83d06c1341b8a8deb3ec9776970ed78fbcb2e99612dbb8205e4f553fcc564c187309d1b9013aecddbdc0cb9dc29cdb00 WHIRLPOOL ca71c3c53156cd722c6cdc2117358cdbb6cba8209bda6b3cbc59e4e84fbd9c4e278f108c06e80057a5af1a40993f24eb9cba542dd5e9518506f9ae6766fa56ba MISC metadata.xml 739 SHA256 f455845cee6b0247e229d7635f300565411d8e5f7462c8833a4ecad2a4ddf343 SHA512 f1a87a421415e988f96a597247eefd24285bb9709b81ff446e2056bf9ea99c170216c92b43605cdd0e238697989031bc72f8aa104231b1e36fc2338677312bda WHIRLPOOL 95199a2e4e10954ce93daddb0802e608fb4425ae73e57cea61882960ec4916b556b7ef7a87b315a2c6687e98c603e049003948f7388a9a8f8cf8714a16ba6734 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlRmgHAACgkQVWmRsqeSphOpMgCeOWmaewg4Nq5G79lQ8ydQsa5u -J2EAn2oR7JdWChmpvUBOaHovUMKBF/8r -=k2nz +iEYEAREIAAYFAlRmhWMACgkQVWmRsqeSphPICACfVlMWUyXCtCC7D/q/cWpNStUB +uvoAniTRU3gdPFqv6mnofOAeeX59gYTW +=RAAs -----END PGP SIGNATURE----- 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 |