Build against the Mesa 6.5.2 release instead of the snapshot.

Package-Manager: portage-2.1.2_rc2-r5

4 files changed, 22 insertions, 19 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 9e07bbc346c3..dac1b5bf1edb 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.203 2006/12/07 03:38:13 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.204 2006/12/07 03:45:32 joshuabaergen Exp $
+
+  07 Dec 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.2.99.0.ebuild:
+  Build against the Mesa 6.5.2 release instead of the snapshot.
 
 *xorg-server-1.1.1-r3 (07 Dec 2006)
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 9de3c1417cb0..d4e005c47038 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -134,7 +134,6 @@ DIST 1.0.2-overlay-window.patch.bz2 6388 RMD160 f1223f88da72461585ff72e5cc3c0e15
 DIST MesaLib-6.4.2.tar.bz2 2913009 RMD160 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 SHA1 4f042bdf38c9eb62e04660bd18566e7ca50d8640 SHA256 bc84da436f9d92485dfa1c6670689c6807950a8372637c9952f689a1e1f9aa86
 DIST MesaLib-6.5.1.tar.bz2 3138257 RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 SHA1 cd3b314808534b0306c7f89e9a72c9c23dbff239 SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0
 DIST MesaLib-6.5.2.tar.bz2 3295166 RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 SHA1 ba860bb6ee57c02202342dfd5927464a068ea18f SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f
-DIST MesaLib-6.5.2_pre20061102.tar.bz2 3258845 RMD160 857f9099578cdd8dceaef779dcc5281a53eb1520 SHA1 e45bdc403001d84b91e0a4c9de0194de631f0f80 SHA256 2f1889a32bf9dbc031daa793fb919d83278b8cceb17c05d58373696e7dd14b90
 DIST MesaLib-6.5.tar.bz2 3062363 RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd SHA1 a77368901b0731b662d0858aef2c405a7ddf6014 SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd
 DIST xorg-server-1.0.2.tar.bz2 6006486 RMD160 ee47746009fa7c36e692bf4bae629ccd1bd0d4b4 SHA1 b2257e984c5111093ca80f1f63a7a9befa20b6c0 SHA256 b30c57271d147c1f45ba7f15fcc7e7917b61c6dfb97d514e25c7bc91ddd970ba
 DIST xorg-server-1.1.0.tar.bz2 6322751 RMD160 282007ba280b84701df05ef7b8d03e3f1275f8f0 SHA1 564fbe8ac534c2a0b995f88e919f0eac8dcd5224 SHA256 da1d5ce91098e1187579306275a9664ef6f1cea935fabcbd72f4c77af415a461
@@ -169,14 +168,14 @@ EBUILD xorg-server-1.1.99.903-r1.ebuild 16839 RMD160 c320b04944b3080f34559d26d8d
 MD5 33b5aa54dd4cfa685af1baad3d6d6e2d xorg-server-1.1.99.903-r1.ebuild 16839
 RMD160 c320b04944b3080f34559d26d8d7a08f902116d1 xorg-server-1.1.99.903-r1.ebuild 16839
 SHA256 90e45de7fd635ad3d2a7efffa8dc7373b9d5cae0947d9978e358b7ee5852f1cd xorg-server-1.1.99.903-r1.ebuild 16839
-EBUILD xorg-server-1.2.99.0.ebuild 16891 RMD160 4e628e20520cf47f8752982f3f98a842e5b4c0e4 SHA1 f6da71d3e28a656ae9ba5689f5346d280ceeeecc SHA256 7ebb2127a9076aec90e2d69cffc244cf7b0e401792b55dce802656c1560eb5c2
-MD5 2d36c66f6cbb5d02a9c6bf1cac1d82eb xorg-server-1.2.99.0.ebuild 16891
-RMD160 4e628e20520cf47f8752982f3f98a842e5b4c0e4 xorg-server-1.2.99.0.ebuild 16891
-SHA256 7ebb2127a9076aec90e2d69cffc244cf7b0e401792b55dce802656c1560eb5c2 xorg-server-1.2.99.0.ebuild 16891
-MISC ChangeLog 42198 RMD160 f0c224bbfd0a8c24da430fd2e03b051653c51ddb SHA1 a58182aa3c2cbd859bd3bed8d8b62734605382f5 SHA256 358a9a2a44da31b8ed9cbb06daf1ba741a6c0a57c54e2b10551dcfaac8579af5
-MD5 158b76e83387082af9dbb23f6d7cd275 ChangeLog 42198
-RMD160 f0c224bbfd0a8c24da430fd2e03b051653c51ddb ChangeLog 42198
-SHA256 358a9a2a44da31b8ed9cbb06daf1ba741a6c0a57c54e2b10551dcfaac8579af5 ChangeLog 42198
+EBUILD xorg-server-1.2.99.0.ebuild 16872 RMD160 f6237988fdbc865a570501dac3cbebe64d169c61 SHA1 8cc96925d7cd80784585c24d14f307f49d540b9d SHA256 d216d96349bb34943c7f92fda6cb1d636fb6a5f912a051a08a74c18be99ab08d
+MD5 cf7a1a9de26daa4e10c2e898537fac3a xorg-server-1.2.99.0.ebuild 16872
+RMD160 f6237988fdbc865a570501dac3cbebe64d169c61 xorg-server-1.2.99.0.ebuild 16872
+SHA256 d216d96349bb34943c7f92fda6cb1d636fb6a5f912a051a08a74c18be99ab08d xorg-server-1.2.99.0.ebuild 16872
+MISC ChangeLog 42351 RMD160 f5d123f865106071df7ce49ebe502f4eea4f6299 SHA1 863b066c4080e2413080fbd2e622e9f30024b62f SHA256 79c692be50a27c8d9363c7c6fb004fe09029032660965f29dae1ca0263fa669b
+MD5 9a20354057aec7d7dfbd4108d61f4551 ChangeLog 42351
+RMD160 f5d123f865106071df7ce49ebe502f4eea4f6299 ChangeLog 42351
+SHA256 79c692be50a27c8d9363c7c6fb004fe09029032660965f29dae1ca0263fa669b ChangeLog 42351
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -202,6 +201,6 @@ SHA256 64c42412d824c7523b5fc70a87b0624f8c18a9980e27b1bf6208103e164a508a files/di
 MD5 8203c18c558952f0a69a3fca15af4f09 files/digest-xorg-server-1.1.99.903-r1 521
 RMD160 e2db17a615b6007f008fb44ff9640f087e6879f1 files/digest-xorg-server-1.1.99.903-r1 521
 SHA256 1099d4eb491d583a636bd3b40807688de8819b9db392b88cd6bf11947195a71c files/digest-xorg-server-1.1.99.903-r1 521
-MD5 bc6e10d7263a5d1a2501320c797ebd3a files/digest-xorg-server-1.2.99.0 551
-RMD160 cb81e047284e4e5c83aacb7f3a89346c3b766e10 files/digest-xorg-server-1.2.99.0 551
-SHA256 fb0edf0badad1adc27c7d5f99a1b5610593c59c0e2682466da5aeb03daae7633 files/digest-xorg-server-1.2.99.0 551
+MD5 308173d8f7a2f60835b95ce92bd47e77 files/digest-xorg-server-1.2.99.0 515
+RMD160 e45f1b4e020b0cc57f5cb4ff3fd511c05e286540 files/digest-xorg-server-1.2.99.0 515
+SHA256 c1013b629f0a3186dc286d28768fdfd34261c14b07d08e52d4149a32875302c8 files/digest-xorg-server-1.2.99.0 515
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.2.99.0 b/x11-base/xorg-server/files/digest-xorg-server-1.2.99.0
index f59faf818ef8..106996355b91 100644
--- a/x11-base/xorg-server/files/digest-xorg-server-1.2.99.0
+++ b/x11-base/xorg-server/files/digest-xorg-server-1.2.99.0
@@ -1,6 +1,6 @@
-MD5 c3b4f2c9174205416997b9612f025e42 MesaLib-6.5.2_pre20061102.tar.bz2 3258845
-RMD160 857f9099578cdd8dceaef779dcc5281a53eb1520 MesaLib-6.5.2_pre20061102.tar.bz2 3258845
-SHA256 2f1889a32bf9dbc031daa793fb919d83278b8cceb17c05d58373696e7dd14b90 MesaLib-6.5.2_pre20061102.tar.bz2 3258845
+MD5 e4d894181f1859651658b3704633e10d MesaLib-6.5.2.tar.bz2 3295166
+RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 MesaLib-6.5.2.tar.bz2 3295166
+SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f MesaLib-6.5.2.tar.bz2 3295166
 MD5 b21e7262541f6d3c8c5dfdfd29238bbe xorg-server-1.2.99.0.tar.bz2 6170605
 RMD160 7c478d911c2c38de7e6fa823168a61d649e0251e xorg-server-1.2.99.0.tar.bz2 6170605
 SHA256 f45f35d33cc9bb06c7261ecf3d9cc4fee9464224543be3e4de255d65e0d347b0 xorg-server-1.2.99.0.tar.bz2 6170605
diff --git a/x11-base/xorg-server/xorg-server-1.2.99.0.ebuild b/x11-base/xorg-server/xorg-server-1.2.99.0.ebuild
index 63c4d68cfb42..21c1055e8688 100644
--- a/x11-base/xorg-server/xorg-server-1.2.99.0.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.2.99.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.2.99.0.ebuild,v 1.9 2006/12/05 20:05:25 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.2.99.0.ebuild,v 1.10 2006/12/07 03:45:32 joshuabaergen Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -10,7 +10,7 @@ inherit x-modular multilib
 OPENGL_DIR="xorg-x11"
 
 MESA_PN="Mesa"
-MESA_PV="6.5.2_pre20061102"
+MESA_PV="6.5.2"
 MESA_P="${MESA_PN}-${MESA_PV}"
 MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
 
@@ -127,7 +127,7 @@ RDEPEND="x11-libs/libXfont
 	x11-libs/libXrender
 	x11-libs/libXi
 	media-libs/freetype
-	>=media-libs/mesa-6.5.2_pre20061102
+	>=media-libs/mesa-6.5.2
 	media-fonts/font-adobe-75dpi
 	media-fonts/font-misc-misc
 	media-fonts/font-cursor-misc