New snapshot. Adjust libdrm dependencies for API changes.

(Portage version: 2.2.0_alpha5/cvs/Linux x86_64)

6 files changed, 60 insertions, 9 deletions

diff --git a/x11-drivers/xf86-video-nouveau/ChangeLog b/x11-drivers/xf86-video-nouveau/ChangeLog
index b87ecdd5c368..8619f0a9fc18 100644
--- a/x11-drivers/xf86-video-nouveau/ChangeLog
+++ b/x11-drivers/xf86-video-nouveau/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-drivers/xf86-video-nouveau
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/ChangeLog,v 1.16 2010/10/22 12:33:00 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/ChangeLog,v 1.17 2010/12/11 10:22:22 chithanh Exp $
+
+*xf86-video-nouveau-0.0.16_pre20101130 (11 Dec 2010)
+
+  11 Dec 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  xf86-video-nouveau-0.0.16_pre20100615.ebuild,
+  xf86-video-nouveau-0.0.16_pre20100807.ebuild,
+  xf86-video-nouveau-0.0.16_pre20100819.ebuild,
+  xf86-video-nouveau-0.0.16_pre20101010.ebuild,
+  +xf86-video-nouveau-0.0.16_pre20101130.ebuild:
+  New snapshot. Adjust libdrm dependencies for API changes.
 
 *xf86-video-nouveau-0.0.16_pre20101010 (22 Oct 2010)
 
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20100615.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20100615.ebuild
index 1f96fecf6eea..f65a808f2216 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20100615.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20100615.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20100615.ebuild,v 1.4 2010/08/08 21:14:58 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20100615.ebuild,v 1.5 2010/12/11 10:22:22 chithanh Exp $
 
 EAPI=2
 SNAPSHOT="yes"
@@ -14,7 +14,10 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.7[-minimal]
-	>=x11-libs/libdrm-2.4.19"
+	|| (
+		=x11-libs/libdrm-2.4.20-r1
+		<x11-libs/libdrm-2.4.23[video_cards_nouveau]
+	)"
 
 DEPEND="${RDEPEND}
 	x11-proto/dri2proto
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20100807.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20100807.ebuild
index 35505b0617c2..20288c2bfd9e 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20100807.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20100807.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20100807.ebuild,v 1.3 2010/10/22 12:33:00 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20100807.ebuild,v 1.4 2010/12/11 10:22:22 chithanh Exp $
 
 EAPI=2
 SNAPSHOT="yes"
@@ -16,7 +16,7 @@ IUSE=""
 RDEPEND=">=x11-base/xorg-server-1.7[-minimal]
 	|| (
 		=x11-libs/libdrm-2.4.20-r1
-		x11-libs/libdrm[video_cards_nouveau]
+		<x11-libs/libdrm-2.4.23[video_cards_nouveau]
 	)"
 
 DEPEND="${RDEPEND}
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20100819.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20100819.ebuild
index 8134cb823d3d..53b03ab8806e 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20100819.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20100819.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20100819.ebuild,v 1.3 2010/10/22 12:33:00 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20100819.ebuild,v 1.4 2010/12/11 10:22:22 chithanh Exp $
 
 EAPI=2
 SNAPSHOT="yes"
@@ -16,7 +16,7 @@ IUSE=""
 RDEPEND=">=x11-base/xorg-server-1.7[-minimal]
 	|| (
 		=x11-libs/libdrm-2.4.20-r1
-		x11-libs/libdrm[video_cards_nouveau]
+		<x11-libs/libdrm-2.4.23[video_cards_nouveau]
 	)"
 
 DEPEND="${RDEPEND}
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20101010.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20101010.ebuild
index ead2d3d44dc3..73e091583189 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20101010.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20101010.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20101010.ebuild,v 1.1 2010/10/22 12:33:00 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20101010.ebuild,v 1.2 2010/12/11 10:22:22 chithanh Exp $
 
 EAPI=3
 XORG_EAUTORECONF="yes"
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.7[-minimal]
-	x11-libs/libdrm[video_cards_nouveau]"
+	<x11-libs/libdrm-2.4.23[video_cards_nouveau]"
 
 DEPEND="${RDEPEND}
 	x11-proto/dri2proto
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20101130.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20101130.ebuild
new file mode 100644
index 000000000000..fb9de83856f5
--- /dev/null
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20101130.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20101130.ebuild,v 1.1 2010/12/11 10:22:22 chithanh Exp $
+
+EAPI=3
+XORG_EAUTORECONF="yes"
+inherit linux-info xorg-2
+
+DESCRIPTION="Accelerated Open Source driver for nVidia cards"
+HOMEPAGE="http://nouveau.freedesktop.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.8[-minimal]
+	>=x11-libs/libdrm-2.4.23[video_cards_nouveau]"
+
+DEPEND="${RDEPEND}
+	x11-proto/dri2proto
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/videoproto
+	x11-proto/xextproto
+	x11-proto/xf86driproto
+	x11-proto/xproto"
+
+pkg_postinst() {
+	xorg-2_pkg_postinst
+	if ! has_version x11-base/nouveau-drm; then
+		if ! linux_config_exists || ! linux_chkconfig_present DRM_NOUVEAU; then
+			ewarn "Nouveau DRM not detected. If you want any kind of"
+			ewarn "acceleration with nouveau, enable CONFIG_DRM_NOUVEAU"
+			ewarn "in the kernel."
+		fi
+	fi
+}