diff options
| author |   Kristopher Kersey <augustus@gentoo.org> | 2006-07-07 14:04:56 +0000 |
|---|---|---|
| committer | Kristopher Kersey <augustus@gentoo.org> | 2006-07-07 14:04:56 +0000 |
| commit | 4daaedab6529d275cf94d64d12665094769a1800 (patch) | |
| tree | 046e20691eaaf0c89b7606fd66e58c003b640b4a | |
| parent | Stable on x86 and amd64 for bug #139505. (diff) | |
| download | historical-4daaedab6529d275cf94d64d12665094769a1800.tar.gz historical-4daaedab6529d275cf94d64d12665094769a1800.tar.bz2 historical-4daaedab6529d275cf94d64d12665094769a1800.zip | |
Added || dependancy on x11-drivers/nvidia-drivers or x11-drivers/nvidia-legacy-drivers when nvidia is specified.
Package-Manager: portage-2.1.1_pre1-r2
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-base/xorg-x11/Manifest | 16 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild | 6 |
3 files changed, 18 insertions, 11 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index 98d7061a50cb..1411f8eba0e9 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-base/xorg-x11 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.560 2006/07/07 02:39:04 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.561 2006/07/07 14:04:56 augustus Exp $ + + 07 Jul 2006; Kristopher Kersey <augustus@gentoo.org> + xorg-x11-7.0-r1.ebuild: + Added || dependancy on x11-drivers/nvidia-drivers or + x11-drivers/nvidia-legacy-drivers when nvidia is specified. 07 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>; ChangeLog: Update to my new email address. diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest index 225bc036e106..342a5970a1d5 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -36,18 +36,18 @@ EBUILD xorg-x11-6.9.0-r3.ebuild 53626 RMD160 d3ed8c7913076185cb5a120f763d8777d88 MD5 532e3485f2f5cc136219407f60175165 xorg-x11-6.9.0-r3.ebuild 53626 RMD160 d3ed8c7913076185cb5a120f763d8777d88a69e8 xorg-x11-6.9.0-r3.ebuild 53626 SHA256 8978e3332937096af58e2c9b481ceab4f61c60cd6dcb63a4733c7d34dda17614 xorg-x11-6.9.0-r3.ebuild 53626 -EBUILD xorg-x11-7.0-r1.ebuild 17005 RMD160 a473df8f74a85be2e654efea1edb11dde1bb66ba SHA1 337bc4ff65005e4facac568de4eed2e7dca495d2 SHA256 81b6a9996c624dc31c900f67f7060d0f7a4984ab5577386dc1364240253825cc -MD5 bffc32eead77fdd98defe25a6b50ed79 xorg-x11-7.0-r1.ebuild 17005 -RMD160 a473df8f74a85be2e654efea1edb11dde1bb66ba xorg-x11-7.0-r1.ebuild 17005 -SHA256 81b6a9996c624dc31c900f67f7060d0f7a4984ab5577386dc1364240253825cc xorg-x11-7.0-r1.ebuild 17005 +EBUILD xorg-x11-7.0-r1.ebuild 17087 RMD160 79a95783c65c64fb6d76210084be10b5dae513e6 SHA1 eb73115891dfd71fd8d59870fff5ff1af30df9b1 SHA256 1786634e483b051c682201338a0729cf972ac48088cc54e5f0906018ade899af +MD5 e790cb83f8d4c7a692521c3ea157b4d7 xorg-x11-7.0-r1.ebuild 17087 +RMD160 79a95783c65c64fb6d76210084be10b5dae513e6 xorg-x11-7.0-r1.ebuild 17087 +SHA256 1786634e483b051c682201338a0729cf972ac48088cc54e5f0906018ade899af xorg-x11-7.0-r1.ebuild 17087 EBUILD xorg-x11-7.1.ebuild 3981 RMD160 c8b2dabe153c34f99cd2f55a56f26d40e437f784 SHA1 ec7b25481dfd48bf1d80832c77eba8fe4215eca5 SHA256 f207c94bde224cedfbe4b707394b9bf4556fd4359788ea996d272fd6408b1f15 MD5 72be3f55ebcd72173517a9f1376e4e82 xorg-x11-7.1.ebuild 3981 RMD160 c8b2dabe153c34f99cd2f55a56f26d40e437f784 xorg-x11-7.1.ebuild 3981 SHA256 f207c94bde224cedfbe4b707394b9bf4556fd4359788ea996d272fd6408b1f15 xorg-x11-7.1.ebuild 3981 -MISC ChangeLog 122134 RMD160 6d5f43e0bad9ee52a210044c868606c096551bad SHA1 24eb7e10114345223f37c20866f4c5f5daac3ddb SHA256 35395ef98b8361d255c9c1633886d11149ac73ef2a6d6009525321d1fc31c952 -MD5 fff1e1196e12224c0b609dd470c35589 ChangeLog 122134 -RMD160 6d5f43e0bad9ee52a210044c868606c096551bad ChangeLog 122134 -SHA256 35395ef98b8361d255c9c1633886d11149ac73ef2a6d6009525321d1fc31c952 ChangeLog 122134 +MISC ChangeLog 122332 RMD160 943160f9e497396eba21ca1fa2e9b46749ceae4b SHA1 e32064bfba5aab3a8a3cafdc07beea8aec8dcc5c SHA256 88e89f8c7002d97a85a14e4b4906499d98c574d5f13acd651649bf3fe8a9371c +MD5 6ac684deb3c869a26dd02da6c7dcf227 ChangeLog 122332 +RMD160 943160f9e497396eba21ca1fa2e9b46749ceae4b ChangeLog 122332 +SHA256 88e89f8c7002d97a85a14e4b4906499d98c574d5f13acd651649bf3fe8a9371c ChangeLog 122332 MISC metadata.xml 230 RMD160 a293db25b0a2b203eb1b788ee62601190618066e SHA1 c54cfbf65124c6abed943e76d0e3e6c976fc4f12 SHA256 92ca18d8e0533e35b2537904c3d02051148894ef05496a26db29fecc0066a6e0 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230 RMD160 a293db25b0a2b203eb1b788ee62601190618066e metadata.xml 230 diff --git a/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild b/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild index 5bfee0fc6b30..240883bf613b 100644 --- a/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild +++ b/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild,v 1.25 2006/06/30 15:05:03 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild,v 1.26 2006/07/07 14:04:56 augustus Exp $ inherit eutils @@ -281,7 +281,9 @@ RDEPEND="${RDEPEND} video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) video_cards_3dfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) ) - video_cards_nvidia? ( media-video/nvidia-glx ) + video_cards_nvidia? ( || ( media-video/nvidia-glx + x11-drivers/nvidia-drivers + x11-drivers/nvidia-legacy-drivers ) ) video_cards_fglrx? ( x11-drivers/ati-drivers ) ) ( |