New snapshot, clean up old. Adjust dependencies for nouveau API change.

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

8 files changed, 26 insertions, 118 deletions

diff --git a/x11-drivers/xf86-video-nouveau/ChangeLog b/x11-drivers/xf86-video-nouveau/ChangeLog
index feb081904cda..b0ce3e3ad7e0 100644
--- a/x11-drivers/xf86-video-nouveau/ChangeLog
+++ b/x11-drivers/xf86-video-nouveau/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for x11-drivers/xf86-video-nouveau
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/ChangeLog,v 1.44 2012/03/22 21:27:54 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/ChangeLog,v 1.45 2012/05/11 00:35:39 chithanh Exp $
+
+*xf86-video-nouveau-0.0.16_pre20120508 (11 May 2012)
+
+  11 May 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xf86-video-nouveau-0.0.16_pre20120508.ebuild,
+  -xf86-video-nouveau-0.0.16_pre20101130.ebuild,
+  -xf86-video-nouveau-0.0.16_pre20110323.ebuild,
+  -xf86-video-nouveau-0.0.16_pre20110711.ebuild,
+  -xf86-video-nouveau-0.0.16_pre20110801.ebuild,
+  xf86-video-nouveau-0.0.16_pre20111109.ebuild,
+  xf86-video-nouveau-0.0.16_pre20120305.ebuild,
+  xf86-video-nouveau-0.0.16_pre20120322.ebuild:
+  New snapshot, clean up old. Adjust dependencies for nouveau API change.
 
 *xf86-video-nouveau-0.0.16_pre20120322 (22 Mar 2012)
 
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
deleted file mode 100644
index 220b6e575317..000000000000
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20101130.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 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.6 2011/04/24 03:08:42 josejx 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 ppc ppc64 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
-}
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20110323.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20110323.ebuild
deleted file mode 100644
index 0acf02aaba6b..000000000000
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20110323.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 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_pre20110323.ebuild,v 1.5 2011/07/15 17:18:41 xarthisius 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 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.8[-minimal]
-	>=x11-libs/libdrm-2.4.24[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
-}
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20110801.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20110801.ebuild
deleted file mode 100644
index 48aed00027c6..000000000000
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20110801.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 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_pre20110801.ebuild,v 1.4 2011/10/03 18:04:42 josejx Exp $
-
-EAPI=4
-XORG_EAUTORECONF="yes"
-XORG_DRI="always"
-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 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/libdrm-2.4.24[video_cards_nouveau]"
-DEPEND="${RDEPEND}
-	x11-proto/glproto
-	x11-proto/xf86driproto
-	x11-proto/dri2proto"
-
-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
-}
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20111109.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20111109.ebuild
index f3ea111e8cdf..e65a4a90fa0a 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20111109.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20111109.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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_pre20111109.ebuild,v 1.5 2012/03/03 16:30:11 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20111109.ebuild,v 1.6 2012/05/11 00:35:39 chithanh Exp $
 
 EAPI=4
 XORG_EAUTORECONF="yes"
@@ -14,7 +14,8 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
-RDEPEND=">=x11-libs/libdrm-2.4.24[video_cards_nouveau]"
+RDEPEND=">=x11-libs/libdrm-2.4.24[video_cards_nouveau]
+	<x11-libs/libdrm-2.4.34[video_cards_nouveau]"
 DEPEND="${RDEPEND}
 	x11-proto/glproto
 	x11-proto/xf86driproto
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120305.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120305.ebuild
index 4a0757871c76..4dc91682f3c3 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120305.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120305.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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_pre20120305.ebuild,v 1.1 2012/03/19 23:57:27 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120305.ebuild,v 1.2 2012/05/11 00:35:39 chithanh Exp $
 
 EAPI=4
 XORG_EAUTORECONF="yes"
@@ -14,7 +14,8 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
-RDEPEND=">=x11-libs/libdrm-2.4.24[video_cards_nouveau]"
+RDEPEND=">=x11-libs/libdrm-2.4.24[video_cards_nouveau]
+	<x11-libs/libdrm-2.4.34[video_cards_nouveau]"
 DEPEND="${RDEPEND}
 	x11-proto/glproto
 	x11-proto/xf86driproto
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120322.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120322.ebuild
index e7b2f0d05fb7..ca1d747de0e8 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120322.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120322.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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_pre20120322.ebuild,v 1.1 2012/03/22 21:27:54 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120322.ebuild,v 1.2 2012/05/11 00:35:39 chithanh Exp $
 
 EAPI=4
 XORG_EAUTORECONF="yes"
@@ -14,7 +14,8 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
-RDEPEND=">=x11-libs/libdrm-2.4.24[video_cards_nouveau]"
+RDEPEND=">=x11-libs/libdrm-2.4.24[video_cards_nouveau]
+	<x11-libs/libdrm-2.4.34[video_cards_nouveau]"
 DEPEND="${RDEPEND}
 	x11-proto/glproto
 	x11-proto/xf86driproto
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20110711.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120508.ebuild
index 7bb2025a4622..5b238e081aaa 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20110711.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120508.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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_pre20110711.ebuild,v 1.2 2011/07/19 15:59:14 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120508.ebuild,v 1.1 2012/05/11 00:35:39 chithanh Exp $
 
 EAPI=4
 XORG_EAUTORECONF="yes"
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
-RDEPEND=">=x11-libs/libdrm-2.4.24[video_cards_nouveau]"
+RDEPEND=">=x11-libs/libdrm-2.4.34[video_cards_nouveau]"
 DEPEND="${RDEPEND}
 	x11-proto/glproto
 	x11-proto/xf86driproto