4 files changed, 8 insertions, 41 deletions
diff --git a/x11-drivers/xf86-video-nouveau/ChangeLog b/x11-drivers/xf86-video-nouveau/ChangeLog
index ec77ec25c..261f42f3e 100644
--- a/x11-drivers/xf86-video-nouveau/ChangeLog
+++ b/x11-drivers/xf86-video-nouveau/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 May 2009; Chi-Thanh Christopher Nguyen (chithead)
+  <chithanh@cs.tu-berlin.de> -xf86-video-nouveau-0.0.20090429.ebuild,
+  +xf86-video-nouveau-0.0.20090430.ebuild, -xf86-video-nouveau-9999.ebuild:
+  new snapshot, live ebuild now lives in x11 overlay
+
   29 Apr 2009; Chi-Thanh Christopher Nguyen (chithead)
   <chithanh@cs.tu-berlin.de> -xf86-video-nouveau-0.0.20090408.ebuild,
   +xf86-video-nouveau-0.0.20090429.ebuild:
diff --git a/x11-drivers/xf86-video-nouveau/Manifest b/x11-drivers/xf86-video-nouveau/Manifest
index 98e78c1aa..b9f25e6fe 100644
--- a/x11-drivers/xf86-video-nouveau/Manifest
+++ b/x11-drivers/xf86-video-nouveau/Manifest
@@ -1,4 +1,3 @@
-EBUILD xf86-video-nouveau-0.0.20090429.ebuild 949 RMD160 3712e008a2d7a3336b37fc8b47bd507d1d09c142 SHA1 cc512eaf7975b2372f3b86e475aa34afb7a5d8d6 SHA256 f00333b716b61bfc5f6e5290a64113284a187aacd946b9de36fb300c5e73c7f4
-EBUILD xf86-video-nouveau-9999.ebuild 885 RMD160 79f3470352a38b294c5eb43c895bed7b58ea061e SHA1 be53346de23e5b721577457c1c07e045f2fe40f8 SHA256 d583de046096c23e6ddddbd85424ae5b83f1f96bd6f16fc00d21532f907aa517
-MISC ChangeLog 4365 RMD160 62f306fafe49e0984a8474718267b9a66fa5cadb SHA1 bd419b73ebfe14a154d6ccc5bfbf11ab8e02eb20 SHA256 83c76d4169873e38d4ebc1920706414073a66223d21ee57ffe16a64331a5ac62
+EBUILD xf86-video-nouveau-0.0.20090430.ebuild 949 RMD160 a5a8aa55472eea5919e1d4e829203df4189736f2 SHA1 17e4152ff48f1252d31a8d7b1b50b39c23e16232 SHA256 179eea34733155004ce9727dd35c97b9ffcaae3a3ca2ee690bbbd4803b4df295
+MISC ChangeLog 4620 RMD160 5e7816e62b20fd1aa108f35b24b7c88dd234090a SHA1 4ac755b197adfb8cedd244caaa7783585effd4ee SHA256 b9fc2e2365fdeb674af69ebaca332a2dda609d0ba6ba721401ea52e5ccceaf03
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.20090429.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.20090430.ebuild
index 99d700f2c..4bc1ded0b 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.20090429.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.20090430.ebuild
@@ -10,7 +10,7 @@ GIT_ECLASS="git"
 
 inherit x-modular
 
-EGIT_TREE="d390f9f89ba08a2b0ddb128ae748a00fe754c9e4"
+EGIT_TREE="409c13217148b0362bf063efb20b6065e550f5fb"
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/nouveau/${PN}"
 
 DESCRIPTION="Nouveau video driver"
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-9999.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-9999.ebuild
deleted file mode 100644
index 88b97399e..000000000
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-9999.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-# Must be before x-modular eclass is inherited
-SNAPSHOT="yes"
-GIT_ECLASS="git"
-
-inherit x-modular
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/nouveau/${PN}"
-
-DESCRIPTION="Nouveau video driver"
-HOMEPAGE="http://nouveau.freedesktop.org/"
-SRC_URI=""
-
-LICENSE="MIT"
-KEYWORDS=""
-IUSE=""
-
-COMMON_DEPEND=">=x11-base/xorg-server-1.5.3[-minimal]"
-DEPEND="${COMMON_DEPEND}
-	x11-misc/util-macros
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xf86driproto
-	x11-proto/xproto
-	|| ( >=x11-libs/libdrm-9999 x11-libs/libdrm_nouveau )"
-
-# need x11-base/x11-drm until nouveau drm enters the kernel
-RDEPEND="${COMMON_DEPEND}
-	|| ( x11-base/x11-drm[video_cards_nouveau] x11-base/nouveau-drm )"