update pkg_postinst() checks

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 18 insertions, 17 deletions

diff --git a/x11-drivers/xf86-video-nouveau/ChangeLog b/x11-drivers/xf86-video-nouveau/ChangeLog
index e090fbf8808b..061931a00f1a 100644
--- a/x11-drivers/xf86-video-nouveau/ChangeLog
+++ b/x11-drivers/xf86-video-nouveau/ChangeLog
@@ -1,6 +1,11 @@
 # 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.5 2010/04/03 16:25:35 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/ChangeLog,v 1.6 2010/04/27 23:47:16 chithanh Exp $
+
+  27 Apr 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  xf86-video-nouveau-0.0.15_pre20100213.ebuild,
+  xf86-video-nouveau-0.0.15_pre20100329.ebuild:
+  update pkg_postinst() checks
 
   03 Apr 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   xf86-video-nouveau-0.0.15_pre20100213.ebuild,
diff --git a/x11-drivers/xf86-video-nouveau/Manifest b/x11-drivers/xf86-video-nouveau/Manifest
index 36fbbfbe5c5e..816d73cccffa 100644
--- a/x11-drivers/xf86-video-nouveau/Manifest
+++ b/x11-drivers/xf86-video-nouveau/Manifest
@@ -1,6 +1,6 @@
 DIST xf86-video-nouveau-0.0.15_pre20100213.tar.bz2 73648 RMD160 e92e5e67750101d19de48a4acb788852a93f4926 SHA1 eed1e5e7554bd91fb25496540235e5ad19892c9d SHA256 370144495606f9cfd21185393a66be2618978c3e8487fb5c0638ccf78f2e73ec
 DIST xf86-video-nouveau-0.0.15_pre20100329.tar.bz2 73500 RMD160 a3e55bac93cbc7f8be456cf6a24bef0a50dbd6e6 SHA1 a046dd68959aab175dd5270cb0bf33277004a713 SHA256 8b37f5825069c7a634b74a504c53b1ffdaa5ea5d1dd73c25b0eec7621214a464
-EBUILD xf86-video-nouveau-0.0.15_pre20100213.ebuild 1579 RMD160 5d82997d99742c234f2a32d47b15407391629870 SHA1 74f4d3c840535274fb6d1f562338108f81aac677 SHA256 696ddeb4cb53775327a26126bcb8e6f305aadafdd28906f8773088e2a75c6cc2
-EBUILD xf86-video-nouveau-0.0.15_pre20100329.ebuild 1554 RMD160 ed8addfc669017f11cb476d74ac132faeaac8a4f SHA1 5170f501321263e6097d69a34e9721c75b7b02a7 SHA256 6790c3f19b1744b28cb5e2bebb9d3c33b5f2d911b27713d34a09868fc0fa9c33
-MISC ChangeLog 1164 RMD160 b7bb0e04aa81913297c93265c6b674606b522e20 SHA1 87e63c5a42e6abe7418d88ae7ce3f8c4dc8b2a1b SHA256 e4f8457b72340d6cfbb1f0cdc05117f920f8ff89fa4945d3dde2a58cd3c52f85
+EBUILD xf86-video-nouveau-0.0.15_pre20100213.ebuild 1606 RMD160 a9708fee81151b98172e0a322e9310cc03ce954c SHA1 fd2bb8557a200c11d354db5e7f02de8a5c2dccdf SHA256 3cbed22f1deb833d47bad89e23837256e3967a88d40be78d6c0d129871dc5950
+EBUILD xf86-video-nouveau-0.0.15_pre20100329.ebuild 1274 RMD160 98fc75d71e6ed2244fc55b09061e394eefbc4f68 SHA1 ace2d6b6045085c0a5e5dddc485ac6191d330ef9 SHA256 0054ffe865681cc533216bb6b6a44be2d745a357832a364c0959f89c942f11c4
+MISC ChangeLog 1361 RMD160 058252141e0c693b0e806659ec748aba32b6f02d SHA1 4ac96a11c4b80e2ff0300845e6057d969a24e008 SHA256 11f604ea2306c860f4a3e50055527d6842cf0d7541e0c1f80dc458f7c3952164
 MISC metadata.xml 265 RMD160 24a368e280b83393abb1cda7b15e7888e1570a04 SHA1 b60c32aece47cc1c4febe46e54786494a3b913bf SHA256 1240cc1d6dda0bc1a42ca2bffe70aa6a1d34f85f28112615ceb327f58a594a16
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.15_pre20100213.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.15_pre20100213.ebuild
index 1ac53ce1c60f..37b58f80375a 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.15_pre20100213.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.15_pre20100213.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.15_pre20100213.ebuild,v 1.4 2010/04/03 16:25:35 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.15_pre20100213.ebuild,v 1.5 2010/04/27 23:47:16 chithanh Exp $
 
 EAPI=2
 SNAPSHOT="yes"
@@ -37,11 +37,11 @@ pkg_postinst() {
 		if kernel_is 2 6 33 && has_version ">=x11-libs/libdrm-2.4.18"; then
 			ewarn "Nouveau DRM in kernel 2.6.33 is API incompatible to"
 			ewarn ">=x11-libs/libdrm-2.4.18, please use x11-base/nouveau-drm"
-			ewarn "or x11-libs/libdrm-2.4.18_pre20100211 instead."
+			ewarn "or x11-libs/libdrm-2.4.18_pre20100211-r1 instead."
+		fi
+		if kernel_is 2 6 33 && ! has_version x11-drivers/nouveau-firmware; then
+			ewarn "Nouveau firmware not detected, for acceleration on NV50 (G80)"
+			ewarn "and newer chipsets, emerge x11-drivers/nouveau-firmware."
 		fi
-	fi
-	if ! has_version x11-drivers/nouveau-firmware; then
-		ewarn "Nouveau firmware not detected, for acceleration on NV50 (G80)"
-		ewarn "and newer chipsets, emerge x11-drivers/nouveau-firmware."
 	fi
 }
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.15_pre20100329.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.15_pre20100329.ebuild
index ca0727c79931..b44c531c0a21 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.15_pre20100329.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.15_pre20100329.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.15_pre20100329.ebuild,v 1.2 2010/04/03 16:25:35 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.15_pre20100329.ebuild,v 1.3 2010/04/27 23:47:16 chithanh Exp $
 
 EAPI=2
 SNAPSHOT="yes"
@@ -33,14 +33,10 @@ pkg_postinst() {
 			ewarn "acceleration with nouveau, emerge x11-base/nouveau-drm or"
 			ewarn "enable CONFIG_DRM_NOUVEAU in the kernel."
 		fi
-		if kernel_is 2 6 33 && has_version ">=x11-libs/libdrm-2.4.18"; then
+		if kernel_is 2 6 33; then
 			ewarn "Nouveau DRM in kernel 2.6.33 is API incompatible to"
 			ewarn ">=x11-libs/libdrm-2.4.18, please use x11-base/nouveau-drm"
-			ewarn "or x11-libs/libdrm-2.4.18_pre20100211 instead."
-		fi
-		if ! has_version x11-drivers/nouveau-firmware; then
-			ewarn "Nouveau firmware not detected, for acceleration on NV50 (G80)"
-			ewarn "and newer chipsets, emerge x11-drivers/nouveau-firmware."
+			ewarn "instead."
 		fi
 	fi
 }