(#191709) Require older renderproto as a workaround to make this build again until we get a proper fix.

Package-Manager: portage-2.1.3.6

4 files changed, 22 insertions, 17 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 9c74d56a1382..fc3d41961837 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.264 2007/09/09 16:01:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.265 2007/09/09 19:49:42 dberkholz Exp $
+
+  09 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.2.0-r3.ebuild, xorg-server-1.3.0.0.ebuild:
+  (#191709) Require older renderproto as a workaround to make this build again
+  until we get a proper fix.
 
   09 Sep 2007; Raúl Porcel <armin76@gentoo.org> xorg-server-1.3.0.0.ebuild:
   alpha/ia64 stable wrt #191615
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 85aa44c7e5fe..e633f3506105 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -91,22 +91,22 @@ DIST MesaLib-7.0.1.tar.bz2 3343538 RMD160 b44fd8ebffd17aa72c3b6cca1c2924e66787aa
 DIST xorg-server-1.2.0.tar.bz2 6014596 RMD160 0bbc5ccb5cbbe7627b4f09f17848b188e8be2a50 SHA1 85fa0e8fa7d6bea6f1a73c66a57488ea68dffa17 SHA256 e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85
 DIST xorg-server-1.3.0.0.tar.bz2 5968263 RMD160 1a4fecd73aed0d5adabe84066c24ce69dc2c2dc1 SHA1 6f9645fe70da5b6a121f3e8fa6c2fc1e4307390c SHA256 93c656f142f37607c15372dd24c5de9eab82cd79c5d60449174a928d345c2975
 DIST xorg-server-1.4.tar.bz2 6179392 RMD160 74a274c880a9508be26b76acdb504a8e88b63a46 SHA1 3aa6327f4def4d33ce2a8d6d7587295db231ab6d SHA256 51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2
-EBUILD xorg-server-1.2.0-r3.ebuild 16308 RMD160 de3c5e95502b49fae895b2bff4a0e9506c5c00ec SHA1 404b1fd2d2c851008eeb9fa886a2f66b4acb60a6 SHA256 d13300b617a9764e29d7a56f056824782af729809ed0c55615f4b6a9c44abd8d
-MD5 0e6a6dea9469469e13aea640d599c734 xorg-server-1.2.0-r3.ebuild 16308
-RMD160 de3c5e95502b49fae895b2bff4a0e9506c5c00ec xorg-server-1.2.0-r3.ebuild 16308
-SHA256 d13300b617a9764e29d7a56f056824782af729809ed0c55615f4b6a9c44abd8d xorg-server-1.2.0-r3.ebuild 16308
-EBUILD xorg-server-1.3.0.0.ebuild 16689 RMD160 688742fc879be226e87fb49c5c83e896be459597 SHA1 881fb707463003aafbb73d90dcbd0a1ae5141419 SHA256 aaa8431e884d2950efa061c974ad26edb20058ef1471371a98c56397bd7b998b
-MD5 1ffa375cb31d94bf01b12000e7559312 xorg-server-1.3.0.0.ebuild 16689
-RMD160 688742fc879be226e87fb49c5c83e896be459597 xorg-server-1.3.0.0.ebuild 16689
-SHA256 aaa8431e884d2950efa061c974ad26edb20058ef1471371a98c56397bd7b998b xorg-server-1.3.0.0.ebuild 16689
+EBUILD xorg-server-1.2.0-r3.ebuild 16315 RMD160 704271e9625ff11d39a1eebff4ab8206b7b2b3ac SHA1 48d72f227218765e3d1f83a9b9df54d682bc1e58 SHA256 4063bc0c6692be5a660763acbeaf75082b3271616d2fecf3d80f08f21608da11
+MD5 478fd3eab69c594525beb5f187fd6a2a xorg-server-1.2.0-r3.ebuild 16315
+RMD160 704271e9625ff11d39a1eebff4ab8206b7b2b3ac xorg-server-1.2.0-r3.ebuild 16315
+SHA256 4063bc0c6692be5a660763acbeaf75082b3271616d2fecf3d80f08f21608da11 xorg-server-1.2.0-r3.ebuild 16315
+EBUILD xorg-server-1.3.0.0.ebuild 16698 RMD160 658feeaf77806ce7b050b4738f4ca22f001ff680 SHA1 a872691c38f390c4931bd6d2f065350f351fba76 SHA256 2bb596d9e1cd6226a698fd2ca424324d1fb308c7714719c533ed193d2b34297a
+MD5 2c9ac637c0e79f1e4c5c2df5628be005 xorg-server-1.3.0.0.ebuild 16698
+RMD160 658feeaf77806ce7b050b4738f4ca22f001ff680 xorg-server-1.3.0.0.ebuild 16698
+SHA256 2bb596d9e1cd6226a698fd2ca424324d1fb308c7714719c533ed193d2b34297a xorg-server-1.3.0.0.ebuild 16698
 EBUILD xorg-server-1.4.ebuild 17160 RMD160 48a35b9ecb5cc099c2e1c037bea5a1c54ad6dfc6 SHA1 6061360c0c215e7e1999db8b346a3ae36ed6155f SHA256 47b145ba6b73355a40cfab1029e808e8db2354f7a921e9f7aee869ef1a20d9d6
 MD5 17bad4fbfef3e0501601f49c2b441cde xorg-server-1.4.ebuild 17160
 RMD160 48a35b9ecb5cc099c2e1c037bea5a1c54ad6dfc6 xorg-server-1.4.ebuild 17160
 SHA256 47b145ba6b73355a40cfab1029e808e8db2354f7a921e9f7aee869ef1a20d9d6 xorg-server-1.4.ebuild 17160
-MISC ChangeLog 56285 RMD160 542a7bb47637432b49da0d504bb1945903e981ea SHA1 d27590afb96c29e61430e6acf138c82c79e07003 SHA256 c77f1af951dcdd07ec167213fae58b095e52bce7dd7a54237bc9352c1f1da263
-MD5 825e8c76cdabcdd0a15bc1f38c5218b2 ChangeLog 56285
-RMD160 542a7bb47637432b49da0d504bb1945903e981ea ChangeLog 56285
-SHA256 c77f1af951dcdd07ec167213fae58b095e52bce7dd7a54237bc9352c1f1da263 ChangeLog 56285
+MISC ChangeLog 56510 RMD160 c3f1ac3790d7a083c6345c1ad7328eac520f893a SHA1 c7a9259d236ec21634a614b66b93a49c4f605248 SHA256 a764571ec93c255a402ee4008f70d4e088e2fa446da7ecbed0e89b54290d3c02
+MD5 0b274c6caf0ab85bc5c6cec06cdceeda ChangeLog 56510
+RMD160 c3f1ac3790d7a083c6345c1ad7328eac520f893a ChangeLog 56510
+SHA256 a764571ec93c255a402ee4008f70d4e088e2fa446da7ecbed0e89b54290d3c02 ChangeLog 56510
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
diff --git a/x11-base/xorg-server/xorg-server-1.2.0-r3.ebuild b/x11-base/xorg-server/xorg-server-1.2.0-r3.ebuild
index ff7b876fba9b..b09d7ab01676 100644
--- a/x11-base/xorg-server/xorg-server-1.2.0-r3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.2.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.0-r3.ebuild,v 1.13 2007/09/09 07:37:23 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.2.0-r3.ebuild,v 1.14 2007/09/09 19:49:42 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -145,7 +145,7 @@ RDEPEND=">=x11-libs/libXfont-1.2.5
 	# liblbxutil is lbx- dependent
 DEPEND="${RDEPEND}
 	x11-proto/randrproto
-	x11-proto/renderproto
+	<x11-proto/renderproto-0.9.3
 	>=x11-proto/fixesproto-4
 	x11-proto/damageproto
 	x11-proto/xextproto
diff --git a/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild b/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild
index 472cc68496ee..28316aa003ef 100644
--- a/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.3.0.0.ebuild,v 1.24 2007/09/09 16:01:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild,v 1.25 2007/09/09 19:49:42 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -145,7 +145,7 @@ RDEPEND=">=x11-libs/libXfont-1.2.5
 	# liblbxutil is lbx- dependent
 DEPEND="${RDEPEND}
 	>=x11-proto/randrproto-1.2.1
-	x11-proto/renderproto
+	<x11-proto/renderproto-0.9.3
 	>=x11-proto/fixesproto-4
 	>=x11-proto/damageproto-1.1
 	x11-proto/xextproto