Re-add ebuild that was mistakenly removed and instead delete the one that should have been removed.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 45 insertions, 23 deletions

diff --git a/x11-drivers/xf86-video-nouveau/ChangeLog b/x11-drivers/xf86-video-nouveau/ChangeLog
index 860d1a089b1e..0e2a72a20396 100644
--- a/x11-drivers/xf86-video-nouveau/ChangeLog
+++ b/x11-drivers/xf86-video-nouveau/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-drivers/xf86-video-nouveau
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/ChangeLog,v 1.59 2013/01/07 22:55:58 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/ChangeLog,v 1.60 2013/01/08 16:59:15 chithanh Exp $
+
+*xf86-video-nouveau-0.0.16_pre20120322 (08 Jan 2013)
+
+  08 Jan 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xf86-video-nouveau-0.0.16_pre20120322.ebuild,
+  -xf86-video-nouveau-1.0.3.ebuild:
+  Re-add ebuild that was mistakenly removed and instead delete the one that
+  should have been removed.
 
 *xf86-video-nouveau-1.0.6 (07 Jan 2013)
 
diff --git a/x11-drivers/xf86-video-nouveau/Manifest b/x11-drivers/xf86-video-nouveau/Manifest
index 78dd46375521..96c6e2ae37e2 100644
--- a/x11-drivers/xf86-video-nouveau/Manifest
+++ b/x11-drivers/xf86-video-nouveau/Manifest
@@ -1,8 +1,8 @@
-DIST xf86-video-nouveau-1.0.3.tar.bz2 558848 SHA256 a2ae34046324e1ec620f5a8dee3c8fe5a295acbb5d51825604c8ad28fb75a559 SHA512 22b3eacc377ec93700369fe1d8616b38877742be32d9dfb8e289c0e6ad1be88ba261d0a5f8af8369380116df1c9bc4593154aa2625b3ad8a1961fc451d41815e WHIRLPOOL 30c5aaf42e262ffcfbc150a14e50987d8231f5b603165f258fee1e2ea7504095001e00de0ced611a3e0bd4d44849b6d971624ee33036f3e09ea1c92e4966346c
+DIST xf86-video-nouveau-0.0.16_pre20120322.tar.bz2 133789 SHA256 5cd902e8986baecdf1acdf7b4834fe2dd81aaf2b350a17736040a590d10c7930 SHA512 3b0f6dcbf772b5816c7ea24fbd44ea038b833f5044acf0d80e09b87ab76508d86dfb739c17c87bcdfeb05f47383a2838af3b29fe10fb7bf1419c9a4ef21aa483 WHIRLPOOL f4a0a02ad4c71d8ebe3afe60bb954162a42a275d56cceab05e40e601f81ea1aa4e847642257c81321921f91173f2aed2de5719f1758e765c7f929c36a1540342
 DIST xf86-video-nouveau-1.0.4.tar.bz2 555169 SHA256 1a8290489cf4f48d2094a541ec9a6b68beb80299741d047e322e650c30ceb7c1 SHA512 49a85cc93674e5988e9a0ee59150e1e4ca8df13575182798025fc015069663cb8d2a4b129804199ff0eff9f984e00097fdd545d9fc5c6be6bfdc82e72f85d30f WHIRLPOOL e0fe34e664b5717aab58f0eb4fa2c5ca9843e63327f1983ff8c5565194d075f7f05d098c562fbf3484061c3990dd9864cf967a1b3521c1b7591acee5abf6f95e
 DIST xf86-video-nouveau-1.0.6.tar.bz2 553757 SHA256 e3e1522d08134da74cb1796e8863fd3ad3caad9eb5e9d27f4cee3dfa7c75341f SHA512 b8e593a4999ff31fbdaaa01d69753e0d32a83d85078cb77285fb3991db036330d3f4ab9d503437f8252e22a5a2a40bf771719c52619f0e0b3a55dbd32c7a127e WHIRLPOOL a46f1690d14ad7043fd951c7892058be8b9a7ba61987f1ef39895bb3b529951af00ed988e3ee7e11a91348c844b3743ad01c9573ea6c1b97c5af39bd611461a1
-EBUILD xf86-video-nouveau-1.0.3.ebuild 578 SHA256 e8cac002bb349f87b35e82d3277b395790ebe82e34e538393e5da23d38e72449 SHA512 2f804230b0f4b2734f355bd98755f58e09f6740a4d5c06205b47e4758e9cff788f65d4ad4ec4a2da0e5ee00cef85c4cddf4a3d811d5783331220c6ddeb000dd5 WHIRLPOOL 9fc2549f8ee8a7c445b70e830baa7665d2342fac61c059fa57fe46ca96a3b3a80c7520732f79c61c1b717eb6343240461c4a4f168163241952548bfaf3d8769b
+EBUILD xf86-video-nouveau-0.0.16_pre20120322.ebuild 1026 SHA256 190f92cd0ca853f00dea7c0522a533a8dc2c0f8c2f58019bb2afc51d0b357c48 SHA512 d8f6c5379ab67b74808185d13787db1621b027f0f872554d7e3f4e71cd3be75b2740b785a58a27dd895610bbdac785f995efc0353e5a74b048dd8d0d693010bf WHIRLPOOL 5a352b6644c665ee9f9c186ecd66b486f4d4de80e47d9cc233761fababfbff244f6bc5913a66679bbda33ba930b45b5dee2e9467484d013fa4184803eacdfe77
 EBUILD xf86-video-nouveau-1.0.4.ebuild 569 SHA256 372a82b15b987d42a6e8e3e9af517adda4beab05a8b8e98434850158aa2fe4a7 SHA512 083dbbf51d98f458a9b04ae9dbfca852bd09b033256822cc3ca042efaeec4c6942f14ff4d8a23f5bd38ad22d1851331d695db62b779bedb3c33e84ba033a8b02 WHIRLPOOL 8d2858c058cc789c6f8ff49e6d46fe8e8fcb911ea42990e23cfccaf5c0233e5cb4a579e3fd390ff6ef53d0cdeefe98ee048962ac74c0560b6eef382a8929b5fd
 EBUILD xf86-video-nouveau-1.0.6.ebuild 578 SHA256 928b6ac9495e2790b0a3eb2c023ae3b18f8610e1f48ebb5f55c5ab03e9cb4b70 SHA512 acb0eac199cc4f20c638965f341edec6e08ed8151aa25bb470f92b8742f96bf75c8a4c4fb80575a5e41384ef7eea128cf1d882893df4cec7d6f5a8d06b258ed9 WHIRLPOOL ae77ac8647ae284b450aefac1cc1be0a63bb3297166a7ec061c04629e12e98c4510cd9849a3d45e2911e1f2747267b93e0b502399a1a6d42b41423db83e2929b
-MISC ChangeLog 11086 SHA256 1b78b73d1b1b776e10534250cb1195a699f1d307de299e97f4e46fd6cf891545 SHA512 467ea4ec55851677f936acb3739934cca357cf70e378b131b49b6a4e29087edc17127b50b07d4b3b3e94dcc4ae15d79abf40107b156f9c9105e827008fafed1c WHIRLPOOL d72889d09d7f5d65b2c9298300a21c078376ca5f1a1d2ed6278dbe3249c3b3823e6bc859692f5eb5f435450e561999ee2f3752d73ea1eb40cf330f082f422e61
+MISC ChangeLog 11399 SHA256 2a8778965f62b4263e1c0f280bd2b70350295001a4aeb7949e1efff7ad0c4ee5 SHA512 b5e13caa34df2322d94edff4f21aa0f7edf7fd9b5a1e7067bc0d4092f4f19fd6c2c9874f98a3061de0acb24368cf08e8b4f4b2ea3479acc875a23946cff76467 WHIRLPOOL 2c01495934cefed60f1e1a6c49f7ff4b628de622c3e5a33e64dff94c2c32d762f2056787213d8b74982599281f7986608ac4765268353317ecb54240431a2ebc
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
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
new file mode 100644
index 000000000000..7bf9475a9792
--- /dev/null
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120322.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 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.8 2013/01/08 16:59:15 chithanh 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]
+	<x11-libs/libdrm-2.4.34[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-1.0.3.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.3.ebuild
deleted file mode 100644
index ff0862a1677d..000000000000
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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-1.0.3.ebuild,v 1.1 2012/10/25 00:17:19 chithanh Exp $
-
-EAPI=4
-XORG_DRI="always"
-inherit xorg-2
-
-DESCRIPTION="Accelerated Open Source driver for nVidia cards"
-HOMEPAGE="http://nouveau.freedesktop.org/"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/libdrm-2.4.34[video_cards_nouveau]"
-DEPEND="${RDEPEND}
-	x11-proto/glproto
-	x11-proto/xf86driproto
-	x11-proto/dri2proto"