New snapshot. Adjust libdrm dependencies for API changes.

Package-Manager: portage-2.2.0_alpha5/cvs/Linux x86_64

7 files changed, 67 insertions, 14 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/Manifest b/x11-drivers/xf86-video-nouveau/Manifest
index f74d3a4d81ab..f56f024c5f02 100644
--- a/x11-drivers/xf86-video-nouveau/Manifest
+++ b/x11-drivers/xf86-video-nouveau/Manifest
@@ -2,9 +2,11 @@ DIST xf86-video-nouveau-0.0.16_pre20100615.tar.bz2 119843 RMD160 37b73b4338cf30c
 DIST xf86-video-nouveau-0.0.16_pre20100807.tar.bz2 119874 RMD160 281860ea4556b254b0cf17bbacd42a669bb716ea SHA1 98fc0572b9e1cd5c03fef8cfe6e8b3c4305c7469 SHA256 f38ada8e2dfa3f62c47efcadb33b7e7bb97fa6a40f261b9b8c546580b868c9a7
 DIST xf86-video-nouveau-0.0.16_pre20100819.tar.bz2 119875 RMD160 61380d675303b6f5c731a238d73637eecb03ef9e SHA1 2e5ca60be0dae630e9dd9e88d80700871fbbc2b8 SHA256 08dbe4b1e1e9032031e2e2952c5654d1200bcc0c785b39ece539ed3704821bf5
 DIST xf86-video-nouveau-0.0.16_pre20101010.tar.bz2 120270 RMD160 ec636fafc71b897cdaf2abd2c8192cd9064586fb SHA1 6ac12ea2035712d7180b1dd096a0e8ba34c30863 SHA256 d82528d9246091efe8f03637309e04dfbb1253160ae7647321472c5b7301583e
-EBUILD xf86-video-nouveau-0.0.16_pre20100615.ebuild 1310 RMD160 c936150cec8c2f8f412b4028727211cb62d461ad SHA1 fde0fe95ac83642859c22648d801e50fe38b9e83 SHA256 10653d3d36f541afd1727c81ee66dd4add2512f9a061b4fe05792a4553e43b85
-EBUILD xf86-video-nouveau-0.0.16_pre20100807.ebuild 1329 RMD160 75c5758753282bfea0c59a44ef71b06c4331528a SHA1 021166356dfde702fb0132ad5beefa00d87b43d4 SHA256 9b751568e328ce1ec132ebe4d072385025422331f2ad2ac07f21d5aae935c5eb
-EBUILD xf86-video-nouveau-0.0.16_pre20100819.ebuild 1329 RMD160 40060957eaaf622905bde902eff34f3648e60392 SHA1 16fe974481bf624561ae36c6acfd6e5fc896a564 SHA256 fe1e5fd4dbcbecb7d8c6aefde5ef67aea7d4a00fba85d705cb13639145bf9bc1
-EBUILD xf86-video-nouveau-0.0.16_pre20101010.ebuild 1093 RMD160 808af3d9d4fc696ee54ee9c430f3082e4ecc55dc SHA1 4a5dafe99677fd5bd0d82a549ef7c888f69ccc89 SHA256 207675e783f9dc6bf6d2c8ab31d5923874c808e6651374b6e1f01449d25da3a7
-MISC ChangeLog 3453 RMD160 030d8931b202e63dc9c1340f4555ea09fba2a4ed SHA1 b74680e8066a173fe6ef58484fc7523d0e656c30 SHA256 11128e0c33b202bb19d4f8abbdcd5b5df01212f6305c62f759ec8b31b23e3a51
+DIST xf86-video-nouveau-0.0.16_pre20101130.tar.bz2 123072 RMD160 02b4836a0c1d463492215d7e155a1f4c16166e92 SHA1 822c2501d268ceab11c0d3830c6a6afcd98d807c SHA256 ea308eb90ae228f1305918a26aa036ce5d67641d5a50d09e18284c1df44968be
+EBUILD xf86-video-nouveau-0.0.16_pre20100615.ebuild 1369 RMD160 dba665a695b149d3bd7363248690dd2446b8a260 SHA1 ac1dc8ac313dbb74e9d5362d293bb1d135a4e414 SHA256 7fc851c018c42f775e843b533bca9a51e4a7b5ead87eef9c0a44d98b515008fb
+EBUILD xf86-video-nouveau-0.0.16_pre20100807.ebuild 1337 RMD160 c62c5e5fa90ae1150aac8fae2d78613c25a33600 SHA1 96686a5dcd04bc3646617584b5ab52b473db867d SHA256 6fa2db5dc6789673234e6dd216cd629596b406059f089d962505eed10208c7c2
+EBUILD xf86-video-nouveau-0.0.16_pre20100819.ebuild 1337 RMD160 81737f08ab8ba29fa71157794a398955c2b05e15 SHA1 9fc4bcc7ebccdca77ae91d162fe581ee3f150885 SHA256 3e275a32984abf9f1d767301109912482df26518b9e5376870a049a958ce5968
+EBUILD xf86-video-nouveau-0.0.16_pre20101010.ebuild 1101 RMD160 8347fb8c97dbaa1e6cb56a5e1b86df79b4d7a9f9 SHA1 648f317270d93509698062d0ea7f77b3db8e66ff SHA256 f291ab70d236f5f6ac3bfab4377c1070218cdaca37d9772918f757831b328247
+EBUILD xf86-video-nouveau-0.0.16_pre20101130.ebuild 1102 RMD160 c8cc6a506d30baa1a463b528e2af991028b12f60 SHA1 ba0cbe7eaaba913ed724591eddc03d62e3d2c0f1 SHA256 033fa00b4f6ec75c113baf748454b7570b3b002a649ee3581b28387581847fe4
+MISC ChangeLog 3878 RMD160 215c3382ad39154cd98846bac936e70cdad49ce1 SHA1 280e0425433cd436c0885968b782065596d9d135 SHA256 29647f902279af99b2cbe3451e0ff56cdc10ab1040ea4e0aa52bebbea0f5fe34
 MISC metadata.xml 265 RMD160 24a368e280b83393abb1cda7b15e7888e1570a04 SHA1 b60c32aece47cc1c4febe46e54786494a3b913bf SHA256 1240cc1d6dda0bc1a42ca2bffe70aa6a1d34f85f28112615ceb327f58a594a16
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
+}