diff options
author | Donnie Berkholz <spyderous@gentoo.org> | 2006-01-25 09:29:38 +0000 |
---|---|---|
committer | Donnie Berkholz <spyderous@gentoo.org> | 2006-01-25 09:29:38 +0000 |
commit | 8918892f306ddab8ad9cbbf56e5ade7a1d09893d (patch) | |
tree | 5a62be73cf01222f1ee737f69ac1f8c42838a025 /x11-base/xorg-x11 | |
parent | updated to original script with only path change (diff) | |
download | gentoo-2-8918892f306ddab8ad9cbbf56e5ade7a1d09893d.tar.gz gentoo-2-8918892f306ddab8ad9cbbf56e5ade7a1d09893d.tar.bz2 gentoo-2-8918892f306ddab8ad9cbbf56e5ade7a1d09893d.zip |
Change conditional PROVIDEs to standard DEPEND structure. Hopefully everyone's got new enough portage that this works now, since the new virtual/x11 should force it anyway. Prompted by ciaranm.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'x11-base/xorg-x11')
-rw-r--r-- | x11-base/xorg-x11/ChangeLog | 9 | ||||
-rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild | 8 | ||||
-rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.8.2-r6.ebuild | 6 | ||||
-rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.8.99.15-r4.ebuild | 8 |
4 files changed, 19 insertions, 12 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index d0680fda779e..dc2e498e5d43 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,13 @@ # 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.507 2006/01/10 05:59:06 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.508 2006/01/25 09:29:38 spyderous Exp $ + + 25 Jan 2006; Donnie Berkholz <spyderous@gentoo.org>; + xorg-x11-6.8.2-r4.ebuild, xorg-x11-6.8.2-r6.ebuild, + xorg-x11-6.8.99.15-r4.ebuild: + Change conditional PROVIDEs to standard DEPEND structure. Hopefully + everyone's got new enough portage that this works now, since the new + virtual/x11 should force it anyway. Prompted by ciaranm. 10 Jan 2006; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-7.0.ebuild: Change to new URL for modular X HOWTO, reported by Obz. diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild index 2cc63789285a..8bec3e0e1b5b 100644 --- a/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# 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-6.8.2-r4.ebuild,v 1.7 2005/12/14 18:24:30 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild,v 1.8 2006/01/25 09:29:38 spyderous Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -116,8 +116,8 @@ PDEPEND="x86? ( x11-terms/xterm" PROVIDE="virtual/x11 - opengl? virtual/opengl - opengl? virtual/glu + opengl? ( virtual/opengl + virtual/glu ) virtual/xft" DESCRIPTION="An X11 implementation maintained by the X.Org Foundation" diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2-r6.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2-r6.ebuild index ea2a23fbd770..0be9d5865fc5 100644 --- a/x11-base/xorg-x11/xorg-x11-6.8.2-r6.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.8.2-r6.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-6.8.2-r6.ebuild,v 1.11 2006/01/07 08:03:25 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r6.ebuild,v 1.12 2006/01/25 09:29:38 spyderous Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -116,8 +116,8 @@ PDEPEND="x86? ( x11-terms/xterm" PROVIDE="virtual/x11 - opengl? virtual/opengl - opengl? virtual/glu + opengl? ( virtual/opengl + virtual/glu ) virtual/xft" DESCRIPTION="An X11 implementation maintained by the X.Org Foundation" diff --git a/x11-base/xorg-x11/xorg-x11-6.8.99.15-r4.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.99.15-r4.ebuild index 491ad8e8f659..d16edc5aadc3 100644 --- a/x11-base/xorg-x11/xorg-x11-6.8.99.15-r4.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.8.99.15-r4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# 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-6.8.99.15-r4.ebuild,v 1.6 2005/12/14 18:24:30 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.99.15-r4.ebuild,v 1.7 2006/01/25 09:29:38 spyderous Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -118,8 +118,8 @@ PDEPEND="x86? ( x11-terms/xterm" PROVIDE="virtual/x11 - opengl? virtual/opengl - opengl? virtual/glu + opengl? ( virtual/opengl + virtual/glu ) virtual/xft" DESCRIPTION="An X11 implementation maintained by the X.Org Foundation" |