Bump xorg-server for 7.1RC1. Change Mesa dependencies on all servers to

account for the changed paths in Mesa 6.5-r2.
(Portage version: 2.1_pre7-r5)

6 files changed, 31 insertions, 23 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 3fca9de123f7..33f2b70e849a 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,14 @@
 # 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.101 2006/04/12 03:41:37 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.102 2006/04/14 16:04:12 joshuabaergen Exp $
+
+*xorg-server-1.0.99.901 (14 Apr 2006)
+
+  14 Apr 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.0.2-r3.ebuild, -xorg-server-1.0.99.2.ebuild,
+  +xorg-server-1.0.99.901.ebuild:
+  Bump xorg-server for 7.1RC1.  Change Mesa dependencies on all servers to
+  account for the changed paths in Mesa 6.5-r2.
 
 *xorg-server-1.0.99.2 (12 Apr 2006)
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index eb1fcdb02baf..12315670f471 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,6 +1,6 @@
-MD5 ff79e0d4cd8417375bf3afd2c7a51175 ChangeLog 20914
-RMD160 f542cfe0d8a0f8651189c10d34c948702421dbeb ChangeLog 20914
-SHA256 c7637ff8fb27321b7f8586946ac806d84ea5b911fc477fdbad8ffd46c2276d60 ChangeLog 20914
+MD5 c5204e865ca7d32485988b8b86300bab ChangeLog 21229
+RMD160 8cd82db702c64c244a025d7f10e91a665373016c ChangeLog 21229
+SHA256 7c13fb356ed32de49551b89e997743fa3b88bb371316a7b289e88b6a6efcde14 ChangeLog 21229
 MD5 6d3ecb7a2b6736047a08447cda7f8ed6 files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021
 RMD160 5cffbd24fc7d3d817b050de268ce23e64ed83b5d files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021
 SHA256 6c32348b9c8460250b2600ae8672c5cadce4b5cca5577b9937a703afbfc57620 files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021
@@ -10,9 +10,9 @@ SHA256 65193968dffac2127626ef9e05aa8da9ec32d39703e4c3530e89bab059dfed74 files/1.
 MD5 a36a121279d71c130aefdf8f84e432cf files/digest-xorg-server-1.0.2-r3 771
 RMD160 1e76b7ca2a6430d0901f036dc90692bb1bf14546 files/digest-xorg-server-1.0.2-r3 771
 SHA256 8d9ab78da2938d08246fae35c4f61a04a7b9932cd722a549707731c9d9a87ab8 files/digest-xorg-server-1.0.2-r3 771
-MD5 2c19dfdb77621385755288fe88c4e0d8 files/digest-xorg-server-1.0.99.2 509
-RMD160 20bdd7703966bd67540349089d6853b62e2405e5 files/digest-xorg-server-1.0.99.2 509
-SHA256 29dee5a695cc7d935fe1f2cccaf449f3255f8ba6e9d17a490ee234da128f2351 files/digest-xorg-server-1.0.99.2 509
+MD5 35cf82436f552d3077d2bf7db5258ff9 files/digest-xorg-server-1.0.99.901 515
+RMD160 7b0015585596fe2e1ab85b3a8a51662a92eaed69 files/digest-xorg-server-1.0.99.901 515
+SHA256 b4209c7a80d882cc5c256ced8527eb7c8c4a873b920fb051699e1dda54e0d0b6 files/digest-xorg-server-1.0.99.901 515
 MD5 900d8194df467de2c86276d446522062 files/xorg-server-1.0.2-64bit-fix-for-glx.patch 414
 RMD160 17732b6ebe06e1533ce8f9b97e6ca8d7e4347a88 files/xorg-server-1.0.2-64bit-fix-for-glx.patch 414
 SHA256 1b2337fa0438c72fc8a17d710133f79ed17d49650efd9bc530bbb97b116427c4 files/xorg-server-1.0.2-64bit-fix-for-glx.patch 414
@@ -34,9 +34,9 @@ SHA256 9474c19d125d9534b93c038cba7c4bdc7c45bf3ed51279ff2e130fe031a15c13 files/xp
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 f831e7e1ab71a0c6c60874777dd0fd32 xorg-server-1.0.2-r3.ebuild 5559
-RMD160 b1d34b43c1a06f4dbc2fbfe796278a506ed40dfb xorg-server-1.0.2-r3.ebuild 5559
-SHA256 e23394ec656136f0dfb4e1ed326f72a89e7f2d8ec7c70ba48c3d40ef59e738bb xorg-server-1.0.2-r3.ebuild 5559
-MD5 582d3c9afd5816ae8428bc4b206bbb73 xorg-server-1.0.99.2.ebuild 5343
-RMD160 376b0cabf4cd313f90fba9111433e9fbbf5f8d03 xorg-server-1.0.99.2.ebuild 5343
-SHA256 2395f5a3276c5c4b917457c99a48a8361bf53fa4cebc5ad900ff2eb7c4855e6c xorg-server-1.0.99.2.ebuild 5343
+MD5 f79d8dee7c9810e90a90519ab3d806e3 xorg-server-1.0.2-r3.ebuild 5563
+RMD160 b8797230650c1598bcfa0c2657148281d7153b8e xorg-server-1.0.2-r3.ebuild 5563
+SHA256 2eb57e29437f4d91ebfe9357f2eb6ea53e81e0edb10b84320c91d2049c60e98b xorg-server-1.0.2-r3.ebuild 5563
+MD5 c76f97275eca5162842985908194b244 xorg-server-1.0.99.901.ebuild 5346
+RMD160 5cd305aa1e4d1f6e78f27e5ced3144e737c77cea xorg-server-1.0.99.901.ebuild 5346
+SHA256 cca1bbb843949684e0243419c559e2b1a3e270ca31f0efca8a04719253f125b1 xorg-server-1.0.99.901.ebuild 5346
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.0.99.2 b/x11-base/xorg-server/files/digest-xorg-server-1.0.99.2
deleted file mode 100644
index 8a6504ed850f..000000000000
--- a/x11-base/xorg-server/files/digest-xorg-server-1.0.99.2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 61beda590bfc5b4a12e979d5f2d70d7a MesaLib-6.5.tar.bz2 3062363
-RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd MesaLib-6.5.tar.bz2 3062363
-SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd MesaLib-6.5.tar.bz2 3062363
-MD5 e19e7e7e923c6a549c0d114c3f5c498c xorg-server-1.0.99.2.tar.bz2 6348876
-RMD160 2d0ed05cf9c209aefdcf67ecc5ffe35c65cf985f xorg-server-1.0.99.2.tar.bz2 6348876
-SHA256 297daddaaf6ea8b4be78a4ae0582810e46a4d4fd56038364e0628cb4900e66f6 xorg-server-1.0.99.2.tar.bz2 6348876
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.0.99.901 b/x11-base/xorg-server/files/digest-xorg-server-1.0.99.901
new file mode 100644
index 000000000000..bf488330ebe8
--- /dev/null
+++ b/x11-base/xorg-server/files/digest-xorg-server-1.0.99.901
@@ -0,0 +1,6 @@
+MD5 61beda590bfc5b4a12e979d5f2d70d7a MesaLib-6.5.tar.bz2 3062363
+RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd MesaLib-6.5.tar.bz2 3062363
+SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd MesaLib-6.5.tar.bz2 3062363
+MD5 9100da4b892b8f8bf741db7ac371476e xorg-server-1.0.99.901.tar.bz2 6317980
+RMD160 7824f82b876d207ba5363f02e6dde1d0ec40e407 xorg-server-1.0.99.901.tar.bz2 6317980
+SHA256 c0d029ebf35bc1f1039a2ac57e97958857c5bda86bc9792164cdc08815259898 xorg-server-1.0.99.901.tar.bz2 6317980
diff --git a/x11-base/xorg-server/xorg-server-1.0.2-r3.ebuild b/x11-base/xorg-server/xorg-server-1.0.2-r3.ebuild
index 6493dba48197..69b8dab3f063 100644
--- a/x11-base/xorg-server/xorg-server-1.0.2-r3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.0.2-r3.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.0.2-r3.ebuild,v 1.2 2006/03/31 20:16:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.2-r3.ebuild,v 1.3 2006/04/14 16:04:12 joshuabaergen Exp $
 
 # Must be before x-modular eclass is inherited
 # Hack to make sure autoreconf gets run
@@ -41,7 +41,7 @@ RDEPEND="x11-libs/libXfont
 	x11-libs/libXrender
 	x11-libs/libXi
 	media-libs/freetype
-	>=media-libs/mesa-6
+	<media-libs/mesa-6.5-r2
 	media-fonts/font-adobe-75dpi
 	media-fonts/font-misc-misc
 	media-fonts/font-cursor-misc
diff --git a/x11-base/xorg-server/xorg-server-1.0.99.2.ebuild b/x11-base/xorg-server/xorg-server-1.0.99.901.ebuild
index 383690f0c247..4cf2e7f376da 100644
--- a/x11-base/xorg-server/xorg-server-1.0.99.2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.0.99.901.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.0.99.2.ebuild,v 1.1 2006/04/12 03:41:38 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.99.901.ebuild,v 1.1 2006/04/14 16:04:12 joshuabaergen Exp $
 
 # Must be before x-modular eclass is inherited
 # Hack to make sure autoreconf gets run
@@ -36,7 +36,7 @@ RDEPEND="x11-libs/libXfont
 	x11-libs/libXrender
 	x11-libs/libXi
 	media-libs/freetype
-	>=media-libs/mesa-6.5
+	>=media-libs/mesa-6.5-r2
 	media-fonts/font-adobe-75dpi
 	media-fonts/font-misc-misc
 	media-fonts/font-cursor-misc