[gentoo-commits] proj/x11:master commit in: x11-drivers/xf86-video-nouveau/, x11-drivers/xf86-video-intel/, ...

[Tomas Chvatal]

commit:     0d76f7da87b64ba1e87ca658416712ff933828ec
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 24 14:30:57 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 14:30:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=0d76f7da

Drivers adapt the new model of handling deps in the eclass.

---
 .../xf86-video-ati/xf86-video-ati-9999.ebuild      |   20 ++++++--------------
 .../xf86-video-displaylink-0.3.ebuild              |    7 -------
 .../xf86-video-intel/xf86-video-intel-9999.ebuild  |   15 ++-------------
 .../xf86-video-nouveau-9999.ebuild                 |   12 +++---------
 .../xf86-video-vmware-9999.ebuild                  |   11 ++---------
 5 files changed, 13 insertions(+), 52 deletions(-)

diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild
index 0adc591..45e04f0 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild
@@ -8,24 +8,16 @@ inherit xorg-2
 DESCRIPTION="ATI video driver"
 
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
+IUSE="dri"
 
-RDEPEND=">=x11-base/xorg-server-1.6.3[-minimal]"
-DEPEND="${RDEPEND}
-	>=x11-libs/libdrm-2.4.17[video_cards_radeon]
-	x11-proto/fontsproto
-	x11-proto/glproto
-	x11-proto/randrproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xf86driproto
-	x11-proto/xf86miscproto
-	x11-proto/xproto"
+RDEPEND="dri? ( x11-libs/libdrm[video_cards_radeon] )"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	xorg-2_pkg_setup
 	CONFIGURE_OPTIONS="
-		--enable-dri
-		--enable-kms
+		$(use_enable dri)
+		$(use_enable dri kms)
+		--enable-exa
 	"
 }

diff --git a/x11-drivers/xf86-video-displaylink/xf86-video-displaylink-0.3.ebuild b/x11-drivers/xf86-video-displaylink/xf86-video-displaylink-0.3.ebuild
index efc4214..0a46255 100644
--- a/x11-drivers/xf86-video-displaylink/xf86-video-displaylink-0.3.ebuild
+++ b/x11-drivers/xf86-video-displaylink/xf86-video-displaylink-0.3.ebuild
@@ -15,12 +15,5 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 S="${WORKDIR}/${PN}"
-RDEPEND="x11-base/xorg-server"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xproto"
 
 PATCHES=( "${FILESDIR}/${P}-xorg-abi-fix.patch" )

diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
index 823aaa0..8612472 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
@@ -11,22 +11,11 @@ DESCRIPTION="X.Org driver for Intel cards"
 KEYWORDS="~amd64 ~ia64 ~x86 -x86-fbsd"
 IUSE="dri"
 
-RDEPEND=">=x11-base/xorg-server-1.6
-	>=x11-libs/libdrm-2.4.22[video_cards_intel]
-	x11-libs/libpciaccess
-	x11-libs/libXext
+RDEPEND="x11-libs/libXext
 	x11-libs/libXfixes
 	x11-libs/libXvMC
 	>=x11-libs/libxcb-1.5"
-DEPEND="${RDEPEND}
-	>=x11-proto/dri2proto-1.99.3
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	dri? ( x11-proto/xf86driproto
-	       x11-proto/glproto )"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	xorg-2_pkg_setup

diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-9999.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-9999.ebuild
index d3dc146..b913ce0 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-9999.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-9999.ebuild
@@ -14,17 +14,11 @@ SRC_URI=""
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=x11-base/xorg-server-1.7[-minimal]
-	>=x11-libs/libdrm-2.4.24[video_cards_nouveau]"
-
+RDEPEND=">=x11-libs/libdrm-2.4.24[video_cards_nouveau]"
 DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
+	x11-proto/glproto
 	x11-proto/xf86driproto
-	x11-proto/xproto"
+	x11-proto/dri2proto"
 
 pkg_postinst() {
 	xorg-2_pkg_postinst

diff --git a/x11-drivers/xf86-video-vmware/xf86-video-vmware-9999.ebuild b/x11-drivers/xf86-video-vmware/xf86-video-vmware-9999.ebuild
index 8d96b8d..10330e9 100644
--- a/x11-drivers/xf86-video-vmware/xf86-video-vmware-9999.ebuild
+++ b/x11-drivers/xf86-video-vmware/xf86-video-vmware-9999.ebuild
@@ -9,12 +9,5 @@ DESCRIPTION="VMware SVGA video driver"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=x11-base/xorg-server-1.0.99.901
-	x11-libs/libdrm[libkms,video_cards_vmware]"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto"
+RDEPEND="x11-libs/libdrm[libkms,video_cards_vmware]"
+DEPEND="${RDEPEND}"