diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2007-05-01 07:45:22 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2007-05-01 07:45:22 +0000 |
| commit | eada3383bf911f9b98fa63fd985b431b04c37933 (patch) | |
| tree | 36ce6a85ca8455032306a6ece541d5385b1faeb0 /x11-base/xorg-server | |
| parent | Fixing up FEATURES=test, backporting vapier's changes to quilt-0.45-r1. (diff) | |
| download | historical-eada3383bf911f9b98fa63fd985b431b04c37933.tar.gz historical-eada3383bf911f9b98fa63fd985b431b04c37933.tar.bz2 historical-eada3383bf911f9b98fa63fd985b431b04c37933.zip | |
Allow nvidia-drivers-1.0.9755-r1 with xorg-server-1.3.0.0 as it works and blocking them is annoying for users.
Package-Manager: portage-2.1.2.5
Diffstat (limited to 'x11-base/xorg-server')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-server/Manifest | 16 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.3.0.0.ebuild | 8 |
3 files changed, 18 insertions, 12 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index f97eff472594..daefde7782b2 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.233 2007/05/01 05:44:20 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.234 2007/05/01 07:45:22 drac Exp $ + + 01 May 2007; Samuli Suominen <drac@gentoo.org> xorg-server-1.3.0.0.ebuild: + Allow nvidia-drivers-1.0.9755-r1 with xorg-server-1.3.0.0 as it works and + blocking them is annoying for users. 01 May 2007; Donnie Berkholz <dberkholz@gentoo.org>; xorg-server-1.3.0.0.ebuild: diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 10d7c72226de..329c19957f50 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -124,14 +124,14 @@ EBUILD xorg-server-1.2.99.0.ebuild 16872 RMD160 f6237988fdbc865a570501dac3cbebe6 MD5 cf7a1a9de26daa4e10c2e898537fac3a xorg-server-1.2.99.0.ebuild 16872 RMD160 f6237988fdbc865a570501dac3cbebe64d169c61 xorg-server-1.2.99.0.ebuild 16872 SHA256 d216d96349bb34943c7f92fda6cb1d636fb6a5f912a051a08a74c18be99ab08d xorg-server-1.2.99.0.ebuild 16872 -EBUILD xorg-server-1.3.0.0.ebuild 16219 RMD160 7f9dfc1551bbcd7dbd0f06a505a7313d4dd0d3b7 SHA1 d2ecfb165a4f287692d0351191782620ce871e91 SHA256 efc8d687c153ba75a74aee7ac9f2b0273eee04c8c83a10d3b2a4f4aad3f51dfe -MD5 1c0a99bb730621c7a977d49ddfba0aa3 xorg-server-1.3.0.0.ebuild 16219 -RMD160 7f9dfc1551bbcd7dbd0f06a505a7313d4dd0d3b7 xorg-server-1.3.0.0.ebuild 16219 -SHA256 efc8d687c153ba75a74aee7ac9f2b0273eee04c8c83a10d3b2a4f4aad3f51dfe xorg-server-1.3.0.0.ebuild 16219 -MISC ChangeLog 49587 RMD160 db3555443ba0baffb49baeede95601bb4fe57688 SHA1 4da6624adb4d89a0979a1dcf1c6b0f854cf266e7 SHA256 e78fd4fd577043a4990ffc81b8677ca988d4e827fa08e40895b10e143dafd26f -MD5 60aaa24a019b1ead5586cda338f99301 ChangeLog 49587 -RMD160 db3555443ba0baffb49baeede95601bb4fe57688 ChangeLog 49587 -SHA256 e78fd4fd577043a4990ffc81b8677ca988d4e827fa08e40895b10e143dafd26f ChangeLog 49587 +EBUILD xorg-server-1.3.0.0.ebuild 16292 RMD160 61a12368c27abdb2269ae4c7ac31ea91d01aa46f SHA1 6f5590d84e17eb59578f59f9f24fbe7b2eac0530 SHA256 a36d3474e7a51a941b2957389701c2f9e2d1e72d7febd0ab218686d67f9ce5e6 +MD5 a2209041046aa391ce5ced8914fc49d0 xorg-server-1.3.0.0.ebuild 16292 +RMD160 61a12368c27abdb2269ae4c7ac31ea91d01aa46f xorg-server-1.3.0.0.ebuild 16292 +SHA256 a36d3474e7a51a941b2957389701c2f9e2d1e72d7febd0ab218686d67f9ce5e6 xorg-server-1.3.0.0.ebuild 16292 +MISC ChangeLog 49775 RMD160 1eb4f114eb1c05669235227eca31f91b0506b01e SHA1 70f437ed77c00d099dfdc54ad6c575203bb5771a SHA256 21021374efe9ebbdb32762a6ec9caa04904f6a9b2f154ccfebf7c49410ad7e00 +MD5 aac34b7707d9337d06a6e92cf0667160 ChangeLog 49775 +RMD160 1eb4f114eb1c05669235227eca31f91b0506b01e ChangeLog 49775 +SHA256 21021374efe9ebbdb32762a6ec9caa04904f6a9b2f154ccfebf7c49410ad7e00 ChangeLog 49775 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156 diff --git a/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild b/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild index 2de9d86d1944..6e53272b47b2 100644 --- a/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild +++ b/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild,v 1.3 2007/05/01 05:44:20 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild,v 1.4 2007/05/01 07:45:22 drac Exp $ # Must be before x-modular eclass is inherited #SNAPSHOT="yes" @@ -98,7 +98,8 @@ IUSE_VIDEO_CARDS=" video_cards_vga video_cards_via video_cards_vmware - video_cards_voodoo" + video_cards_voodoo + video_cards_nvidia" IUSE_SERVERS="dmx kdrive xorg" IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES} @@ -258,9 +259,10 @@ PDEPEND=" video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) ) video_cards_nvidia? ( || ( + >=x11-drivers/nvidia-drivers-1.0.9755-r1 ) ) - !x11-drivers/nvidia-drivers + !<x11-drivers/nvidia-drivers-1.0.9755-r1 !x11-drivers/nvidia-legacy-drivers !x11-drivers/ati-drivers )" |