Fix the commit

3 files changed, 19 insertions, 24 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 5a41e735c1c4..c64931756ef7 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.190 2009/09/15 18:36:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.191 2009/09/15 18:42:01 scarabeus Exp $
+
+*ati-drivers-9.9-r2 (15 Sep 2009)
+
+  15 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/kernel/2.6.29.patch, -files/kernel/2.6.30-enable_msi.patch,
+  -files/kernel/2.6.30-irqreturn_t.patch,
+  -files/kernel/2.6.30-rt_compat.patch,
+  -files/kernel/2.6.30-tlb_flush.patch,
+  +files/kernel/2.6.31-fglrx_find_task_by_vpid.patch,
+  -files/kernel/9.7-smp.patch, -ati-drivers-9.8.ebuild,
+  +ati-drivers-9.9-r2.ebuild, -files/kernel/9.7-x86_32b.patch,
+  -ati-drivers-9.9-r1.ebuild:
+  Apply patch for 2.6.31 per bug #284549. Thx to Jan Psota for the work.
 
 *ati-drivers-9.9-r2 (15 Sep 2009)
 
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 937629959c3e..33ab0e38cb8a 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 09ati 75 RMD160 f4b42cfdc7deaa6fe7618e3506860a06a75de435 SHA1 01cac55ba02710dbd7d71737dd64dbec2cc081fd SHA256 5daa70f3e4c19f2b006bc7b2b22abde5404c3b498485b9ffac428eb458c32134
 AUX 8.40.4/ati-drivers-2.6.23.patch 1497 RMD160 3bcd335769ee98b2119fc62784d091000115a5bd SHA1 9328ece148ad52c048805b9c2c3a3bf0937b6d16 SHA256 6ea6385e602b9659ca01ef1d53cb53ca955f2396a2d8cc914355d3bb2a590d88
 AUX 8.40.4/ati-drivers-8.40.4-warnings.patch 3262 RMD160 158206cf638fd0f2ee34e8ff02e6a399933f844d SHA1 7b47d4d89ff80e930cd2fc66f513dbaf66de07d5 SHA256 45caca456493c23a6475bbec63df26a33ead8de59bf52e3c06c4433740dc5261
@@ -22,31 +19,16 @@ AUX ati-powermode-opt-path.patch 826 RMD160 450b5c9ecd7f4c123ce12f855b287e6b97e6
 AUX ati-powermode.sh.patch 1142 RMD160 b81cdd4d2a49c2f7b04f7e00e4391b4e0ad67a40 SHA1 eef7f658474ca8e9e66ee1955a851782eba4dd0e SHA256 050602d5e0656961c0b16a75b470a7327a9e8b16f7d0ae3228341b3a8dcc9289
 AUX atieventsd.init 533 RMD160 b9b95a8a3f32dcafba3e5fa08d6d1053e831291a SHA1 982ffdb8064785c8b96fb0213ad7892ac918b5d7 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3
 AUX atieventsd.rc6 590 RMD160 fbf8aba7ada36aed666d506d6b0f7146e1b2f4ad SHA1 b2b457a4122f0a3a5db785df46880351d795fb25 SHA256 a00aa241e53b21872218bd247bfdb6292a075d9ef641f36198d8f4e399cc025e
-AUX kernel/2.6.29.patch 3100 RMD160 de5b5bfde76db36c38f23a661ae9b0d47e9474d6 SHA1 f5cca133c14f0ecf26adb8f3f8202500b2f9cf27 SHA256 2121d1b1f2b4812f474aaab7c183228394491816f8ccd5fd59e73f11ff238bb5
-AUX kernel/2.6.30-enable_msi.patch 436 RMD160 062143c5ba22af7a29427700c34cc7b765db13e9 SHA1 0b5166f9b32db750595c8c74d0a46dd5d08ec87b SHA256 daef926490864450167e8d32c7d99f3eb6522f90f1140c32f34c529dba7abef0
-AUX kernel/2.6.30-irqreturn_t.patch 699 RMD160 ccec86703a6732fa056ce6f9eafb94d943dbbca8 SHA1 6999e43f308a0e4f969982727124188ac8073e42 SHA256 5603a0c18078168bf065481fe3127d5ed6878a2c7f85e361454f4e40da2cdd59
-AUX kernel/2.6.30-rt_compat.patch 610 RMD160 35b0d9cb270546e7ff6f49b412d0c2db1752c629 SHA1 e38f5b6330b65909b708a1f1b4ccdfabb5da9263 SHA256 3c48164a82efea71056c589c42f2ea6af60901d8affd1df8ec26b85f3b412593
-AUX kernel/2.6.30-tlb_flush.patch 585 RMD160 3719ae8b430e9e5fc92ff98a81e9a1ccd8934153 SHA1 2fef393a42f4d486c8e2065c153dbe7b7aa5c4b2 SHA256 12679ac19a4cf77bc7aff6ce7e2d1becf7a23930e7bc6fc7443752408650a9bd
-AUX kernel/9.7-smp.patch 349 RMD160 d799328b35ff298684e56aae478b1c81a9377283 SHA1 0d5f5d44203b009f48b68d3150a43decbfb670ba SHA256 e81979f6c6d69fc5e911c853366fada4dacdfc493133d23bd2397e130adb365e
-AUX kernel/9.7-x86_32b.patch 522 RMD160 088d4337d249f4a4aafc2eea16e05318c52e2121 SHA1 4bdd79702d5aafbc652d70be62a2983521dddd56 SHA256 dab63289f6549d01ecec66bbac8b0a03c3a4a8fa9c576a468b9535d78e489f9d
+AUX kernel/2.6.31-fglrx_find_task_by_vpid.patch 581 RMD160 2da3e760a41b967f16e92e94d7ac7d5fc841f60e SHA1 a7c9f836b302cc8bd708b0c266a60baea2f5560d SHA256 4e95b588e894cfb89270168cd771c67bf270c805f30481fceebe47aac3f36980
 AUX libGL.la.in 749 RMD160 b2eb11cd123cb0e789adb1e22dffdbfc03542f69 SHA1 be41cc2eb1754a44134a95475be5f0cb894e24bc SHA256 a7b4b58b1311f8e1caf83222cb020dfbc48e2881a8deef21eddefa23b3992f13
 DIST ati-driver-installer-8-11-x86.x86_64.run 75818703 RMD160 7fdda8fc18f6b19b8ce526c0a136291c873a7907 SHA1 75f9775f3df412617aa2897ef8d75e10c9fc9017 SHA256 d63d1a2d16eff0160d9007b6a1b6323d1b3ff34841afaa36a490c5bd6c813cee
 DIST ati-driver-installer-9-3-x86.x86_64.run 84841550 RMD160 76d4aa6ec575403190b8feadce99000b69d64d14 SHA1 ceefdfd2f8ecee4998a4ce4b7b87a45f1851e8d0 SHA256 5efec58f92f2fbb90b0d9a9059eb27c9cfffcea0a4ba64f3c8f24fc5dbf8053e
-DIST ati-driver-installer-9-8-x86.x86_64.run 96243549 RMD160 c5d2a3a724f1d04eb2040669d4f9a039ec529310 SHA1 75456facf8492b40354f2eaf6863e2929ec692ee SHA256 a3cdfa12f44455506f95274b1bb3b5abae6ad7663daecbd173a4ac65e0d10547
 DIST ati-driver-installer-9-9-x86.x86_64.run 98115301 RMD160 ab5fca036c3e5b3b4926ed16f24822596441cda6 SHA1 22e2adb9c4fdec4647927acec0410e43cb246a4d SHA256 66be4f4aa377cd22a45596c2e3fb5f1a0fbcdd3db5412478175d777572edc483
 DIST fglrx-installer_8.660.orig.tar.gz 60964800 RMD160 f50e58cec30c22ad84914b2ec02d04450a885fa1 SHA1 0846f65bba364e3e4145513cf8be42aec9668504 SHA256 181fb2065a16cc75e279b229ac850fe30b8dd7899679117a0d9b815e85c38e66
 EBUILD ati-drivers-8.552-r2.ebuild 15132 RMD160 08693686e3a767576533c9625b6efaa0e727f5de SHA1 3f41f7bfc6e95f6520d5f38dbb6b05001db6b767 SHA256 059888be71be3759d9cd63cc4fa3300227ba9d99fcea1f32eb065ed5761aec79
 EBUILD ati-drivers-8.593.ebuild 15028 RMD160 b5c4cef44e3bc8de4d08860cf7032a0c83204d72 SHA1 c2a68ca3a777bc4851cedc7c3e78369fe4575d73 SHA256 09edac6fe290ef0ac6580e54ebea64d3bf80a317547e127bb73230f91b3dc08c
 EBUILD ati-drivers-8.660.ebuild 18437 RMD160 91ec954f7b75128c2f04ac15dbe6165c50ce8996 SHA1 1d994bf0e6b01df1c892fa54500c07e8a61def01 SHA256 95ce6c2c5492302c42d474418a1288b1a4e2ec8643a30873797fe66db5b8abb2
-EBUILD ati-drivers-9.8.ebuild 17950 RMD160 eda2cbb5e73877b5865939e29ee78d8cf1eb4326 SHA1 2f48f61d3125ebed8c7c76e862fcf9c64eb1fa20 SHA256 38c6147980dbe97cf3bebc118a818a82d66885a3a2a0781e2c0a955451ddbd43
-EBUILD ati-drivers-9.9-r1.ebuild 18442 RMD160 1d2145409bcd85d16059ecc678438f80f65ee2f8 SHA1 f47b9f17fbbc654d2140203a10b4128bf12ab744 SHA256 60e095c7d85b8348f65eef083fb7dc6dfdedbdef5f944c24f5b965f0ce11da0a
+EBUILD ati-drivers-9.9-r2.ebuild 18550 RMD160 fb228f87fcf96d75fa15a50f685707d681a54464 SHA1 f80eb555bed3bbc2e0f96b57fdd5f3ce744fda6d SHA256 8a8893897e1f53a99181013d15906eb4231799cc9bca7a27e37c61b92d86833a
 EBUILD ati-drivers-9.9.ebuild 18435 RMD160 876fb240cf2c4c8d76d0dc8097a4a82d9faaaf04 SHA1 782c3a9ecf1c3cc20f71773647ff9f9f0a611a95 SHA256 b592275e6c0b142dc953771cdeb090e09adb3fe50a39017f7d1690ace1fb6047
-MISC ChangeLog 58777 RMD160 6845383e0606ab3b84452c8f41189e01b1443ddc SHA1 866a0d34b9c4f27822d4db2ad1953752617bde17 SHA256 a6703ec76050f690d591c970310b5b85bad509ff34891b93bb8fa2f669212584
+MISC ChangeLog 59893 RMD160 de77dd420f1c03ce5a59ac86ff4768400bd18d5a SHA1 dff16637978adf611ad02a62118ad9a73277257a SHA256 66f7fca8789b146da09e5a21869da7c7eb4cd294bb84f485962d25cdb01c0b2e
 MISC metadata.xml 359 RMD160 ece931b7435755393a605d11de0b9276a7a61785 SHA1 e8fe2ec8e95714ae50c71cadfa63cb92f85a1c5d SHA256 9dcb0fd39cbf80a8ef47d64e0a038f6bdcb49f106c0f810db1008e2bc56ee39b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqvZxIACgkQHB6c3gNBRYfB6gCeJAX/B6Pd27xwiC0oqzvVpDcO
-F6cAn3icyqYNXNjDob+6tGP/xqot3Fkp
-=r/kC
------END PGP SIGNATURE-----
diff --git a/x11-drivers/ati-drivers/ati-drivers-9.9-r2.ebuild b/x11-drivers/ati-drivers/ati-drivers-9.9-r2.ebuild
index 4c6d378b8f83..5ee23abd86b1 100644
--- a/x11-drivers/ati-drivers/ati-drivers-9.9-r2.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-9.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.9-r2.ebuild,v 1.1 2009/09/15 18:36:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.9-r2.ebuild,v 1.2 2009/09/15 18:42:01 scarabeus Exp $
 
 EAPI="2"
 
@@ -234,7 +234,7 @@ src_prepare() {
 	fi
 
 	# Kernel patches
-	kernel_is ge 2 6 31 && epatch ${FILESDIR}/kernel/2.6.31-fglrx_find_task_by_vpid.patch
+	kernel_is ge 2 6 31 && epatch "${FILESDIR}"/kernel/2.6.31-fglrx_find_task_by_vpid.patch
 
 	# These are the userspace utilities that we also have source for.
 	# We rebuild these later.