Update deps related to xf86-video-ati split out of mach64/r128 drivers. Pull in the latest versions of each.

Package-Manager: portage-2.1.5.6

4 files changed, 20 insertions, 15 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 18a596524b84..875b29a379df 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.342 2008/06/24 13:08:49 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.343 2008/06/27 05:24:48 dberkholz Exp $
+
+  27 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.4.2.ebuild, xorg-server-1.4.99.902.ebuild:
+  Update deps related to xf86-video-ati split out of mach64/r128 drivers.
+  Pull in the latest versions of each.
 
   24 Jun 2008; <chainsaw@gentoo.org> xorg-server-1.4.99.902.ebuild:
   As of 173.14.09 we can stop blocking the nVidia proprietary drivers for
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index c03e1e787f9d..1027a5f83d27 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -58,14 +58,14 @@ EBUILD xorg-server-1.3.0.0-r4.ebuild 17872 RMD160 caf61a35a2486a3248dab00dc2a928
 EBUILD xorg-server-1.3.0.0-r5.ebuild 18114 RMD160 e6fffcc39506db21aafee5e70b8bb043026d5290 SHA1 3e716d92bc096757eb29c3e1e7ae9365a1925f07 SHA256 bb90fb9650d061d42625d99aefefe4de9e032c0b8e517be7c19a5b9ea15a742d
 EBUILD xorg-server-1.3.0.0-r6.ebuild 18354 RMD160 a57fa1536d234597e58abb1a0cb5d93cb2182219 SHA1 da43242a5568a9c93e88b3e27532eb1eb67f1120 SHA256 818a5b480a0e5940ae01e81707d7600580ba495b4a42b76df021f95562a1894d
 EBUILD xorg-server-1.4.0.90-r3.ebuild 19023 RMD160 6e6f374d79d0fb7ca2404e33314816829766085b SHA1 0c3707ddbf15604cf887843a52dcccc43c94db70 SHA256 3530c253f1087d4c7c782a2260294b0ca0d1bdd0eb11e4b1553ce93c68a1f319
-EBUILD xorg-server-1.4.2.ebuild 17995 RMD160 242b87a67d78e8d3f5fc4aae106b67b2a805d6f2 SHA1 a5dcd57c60c631dd2d6ab02dfb2e45f3e2289760 SHA256 2921025f5625f9dc05bb7fe469197f595335d6f1738b712c2dde43b5ea19da46
-EBUILD xorg-server-1.4.99.902.ebuild 17627 RMD160 4d32fb15206134af7973c5f1883ec1c11553946d SHA1 cd492ea3233765ca59af3ef0b79234511e7a3de8 SHA256 0d5d83f08b2a4f22eb767bbb51069f558e58f40ff3f9f0a97bddffe7e7399f7a
-MISC ChangeLog 84080 RMD160 b13591f6e246cfbf73c329f00cad1ee3fe2544c2 SHA1 56ad216df74b76f60e7d332d2c92ae20a703cd10 SHA256 842299031459180263bbed840871be1d2c19b93f37676a42d8fca32ec7e42dda
+EBUILD xorg-server-1.4.2.ebuild 18001 RMD160 8ebbdca88ae961af16a642f46046b5cfa337a90b SHA1 c6d3c44366520af39321a8d65a8d08f588108637 SHA256 5fec5c15098f6095552e58839bff3c930ce2cb7f19976a7d9d76c8700a09ae7a
+EBUILD xorg-server-1.4.99.902.ebuild 17623 RMD160 4cd0504ad9601e46eaacde8aa284ff8c9051e74b SHA1 1a444b65e3604354a7e5b9f1f470b4e8ce23ba83 SHA256 f2fd80ca4797a24b70d571884a9424159b1b8828ab91135873f5866db994d96a
+MISC ChangeLog 84309 RMD160 9b6576ac2cb53d68489f104382ad8e1497a7cd2a SHA1 8a6492e0cb5309a0b491f02fdecb5d3675444c20 SHA256 dc0971c1a9462f06a578762a06e9a7cab00b922f1432776eaa5116b6189b01d0
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhg8aoACgkQp5vW4rUFj5py3gCffNgbl2IL+WVXCR4iyRPsU541
-BjgAn0jlrnCx2Iy0G7AMKkIO8aYq1Po1
-=KRsy
+iEYEARECAAYFAkhkeacACgkQXVaO67S1rtt4IQCghT44dT2WBJyOVpChPUqIUakR
+khwAn3ZBKzQggxO5E+/o5/64laSTW3ar
+=CtMR
 -----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.4.2.ebuild b/x11-base/xorg-server/xorg-server-1.4.2.ebuild
index 7b27bce6cd1b..a2d66e65aa42 100644
--- a/x11-base/xorg-server/xorg-server-1.4.2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.2.ebuild,v 1.3 2008/06/15 14:21:40 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.2.ebuild,v 1.4 2008/06/27 05:24:48 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -231,14 +231,14 @@ PDEPEND="
 		video_cards_i810? ( >=x11-drivers/xf86-video-i810-1.6.0 )
 		video_cards_impact? ( >=x11-drivers/xf86-video-impact-0.2.0 )
 		video_cards_imstt? ( >=x11-drivers/xf86-video-imstt-1.1.0 )
-		video_cards_mach64? ( >=x11-drivers/xf86-video-ati-6.6.0 )
+		video_cards_mach64? ( >=x11-drivers/xf86-video-mach64-6.8.0 )
 		video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.1 )
 		video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.1.1 )
 		video_cards_newport? ( >=x11-drivers/xf86-video-newport-0.2.0 )
 		video_cards_nsc? ( >=x11-drivers/xf86-video-nsc-2.8.1 )
 		video_cards_nv? ( >=x11-drivers/xf86-video-nv-1.1.1 )
-		video_cards_r128? ( >=x11-drivers/xf86-video-ati-6.6.0 )
-		video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.6.0 )
+		video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.8.0 )
+		video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.9.0 )
 		video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.1.0 )
 		video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.4.1 )
 		video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.9.1 )
diff --git a/x11-base/xorg-server/xorg-server-1.4.99.902.ebuild b/x11-base/xorg-server/xorg-server-1.4.99.902.ebuild
index 435059dc898c..4bad747ac3ee 100644
--- a/x11-base/xorg-server/xorg-server-1.4.99.902.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.4.99.902.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.99.902.ebuild,v 1.3 2008/06/24 13:08:49 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.99.902.ebuild,v 1.4 2008/06/27 05:24:48 dberkholz Exp $
 
 ### Designed for use with mesa 7.1_rc1 and with patches to pull in the
 ### swrast dri driver from the master branch.
@@ -229,13 +229,13 @@ PDEPEND="
 		video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.3.0 )
 		video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.2.0 )
 		video_cards_i810? ( >=x11-drivers/xf86-video-i810-2.3.1-r1 )
-		video_cards_mach64? ( >=x11-drivers/xf86-video-ati-6.8.0-r1 )
+		video_cards_mach64? ( >=x11-drivers/xf86-video-mach64-6.8.0 )
 		video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.8 )
 		video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.2.1 )
 		video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.9 )
 		video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-173.14.09 )
-		video_cards_r128? ( >=x11-drivers/xf86-video-ati-6.8.0-r1 )
-		video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.8.0-r1 )
+		video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.8.0 )
+		video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.9.0 )
 		video_cards_radeonhd? ( >=x11-drivers/xf86-video-radeonhd-1.2.1 )
 		video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.2.0 )
 		video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.6.0 )