Require older libXrender here too (backport from 1.3.0.0-r2) (Martin MOKREJŠ).

Package-Manager: portage-2.1.3.17

5 files changed, 31 insertions, 26 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 702bad6dcbb8..ea0a4ecc497c 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.291 2007/10/29 06:49:48 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.292 2007/11/05 18:42:34 dberkholz Exp $
+
+  05 Nov 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.2.0-r3.ebuild, xorg-server-1.3.0.0.ebuild,
+  xorg-server-1.3.0.0-r1.ebuild:
+  Require older libXrender here too (backport from 1.3.0.0-r2) (Martin MOKREJŠ).
 
   29 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   xorg-server-1.4-r2.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 600b77bb1fc6..b7d52bcd2452 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -118,30 +118,30 @@ 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 16353 RMD160 373592caea44293626fb163fff454f5cb2a36843 SHA1 0c590948abe7d4a4e43b257d7f8d592ee4670f85 SHA256 96dded74038b786df0978b36a491d33632ddf1ec6d1093a86e3a77065a734212
-MD5 2a497ace96850dbcec7e07116f218335 xorg-server-1.2.0-r3.ebuild 16353
-RMD160 373592caea44293626fb163fff454f5cb2a36843 xorg-server-1.2.0-r3.ebuild 16353
-SHA256 96dded74038b786df0978b36a491d33632ddf1ec6d1093a86e3a77065a734212 xorg-server-1.2.0-r3.ebuild 16353
-EBUILD xorg-server-1.3.0.0-r1.ebuild 16790 RMD160 f81b009d3e0f8dbfd51e9ed83427aeece44c8a9d SHA1 fc5259c13e870c0f9c27bea4b54d9a5d1da33b59 SHA256 b03556cff7f94c596bd1de3067f8d0d32e0d5753da786a52667e380754577da7
-MD5 6fee9ee5182263360b01fda4605f934c xorg-server-1.3.0.0-r1.ebuild 16790
-RMD160 f81b009d3e0f8dbfd51e9ed83427aeece44c8a9d xorg-server-1.3.0.0-r1.ebuild 16790
-SHA256 b03556cff7f94c596bd1de3067f8d0d32e0d5753da786a52667e380754577da7 xorg-server-1.3.0.0-r1.ebuild 16790
+EBUILD xorg-server-1.2.0-r3.ebuild 16360 RMD160 b8998103e3d7e2e630e64ddea5e0cfcbbfe08ff0 SHA1 df6074d4da869007ef7ec09f45e5135d84c2b3fa SHA256 948edf3702ef276bfce84216a484183550c93d85a6876496df1180a3fb073145
+MD5 1547129fa95c9bc6e151ffbe8a1514bf xorg-server-1.2.0-r3.ebuild 16360
+RMD160 b8998103e3d7e2e630e64ddea5e0cfcbbfe08ff0 xorg-server-1.2.0-r3.ebuild 16360
+SHA256 948edf3702ef276bfce84216a484183550c93d85a6876496df1180a3fb073145 xorg-server-1.2.0-r3.ebuild 16360
+EBUILD xorg-server-1.3.0.0-r1.ebuild 16798 RMD160 155e9858788c18d07bcc4135b95e1f2132fcc6cb SHA1 bfde2953fa00f75e34a15426c5f70f5120d59790 SHA256 5c51b50263cc1debac7d25cc8a88d488f52874015037d9c3ef6af0984bcd3022
+MD5 eba5f806b50e89cd09d76be10a7ee75f xorg-server-1.3.0.0-r1.ebuild 16798
+RMD160 155e9858788c18d07bcc4135b95e1f2132fcc6cb xorg-server-1.3.0.0-r1.ebuild 16798
+SHA256 5c51b50263cc1debac7d25cc8a88d488f52874015037d9c3ef6af0984bcd3022 xorg-server-1.3.0.0-r1.ebuild 16798
 EBUILD xorg-server-1.3.0.0-r2.ebuild 17020 RMD160 a1c9a669653e73f7e17ea81ad3c3e5f8e25a496b SHA1 cbd7115b217f993362363d04e65f52a1eb6e35d5 SHA256 c3a8699e5d609b6e51a910ec0553c69920f2b2b0d2aee09822c03347f345f5c3
 MD5 97e673ef04f18cc31e93371e184099f6 xorg-server-1.3.0.0-r2.ebuild 17020
 RMD160 a1c9a669653e73f7e17ea81ad3c3e5f8e25a496b xorg-server-1.3.0.0-r2.ebuild 17020
 SHA256 c3a8699e5d609b6e51a910ec0553c69920f2b2b0d2aee09822c03347f345f5c3 xorg-server-1.3.0.0-r2.ebuild 17020
-EBUILD xorg-server-1.3.0.0.ebuild 16734 RMD160 64194fe284000f152297038a84a5df8749e0c516 SHA1 4849de6930ed3e054a83c6101e3bf13a477821ae SHA256 ee210ec662271dcce3b4f26f39b11cf2055b16cd8d88be5e8fb6996ce76b79da
-MD5 80b678732506d66c8b3efc58da6bb835 xorg-server-1.3.0.0.ebuild 16734
-RMD160 64194fe284000f152297038a84a5df8749e0c516 xorg-server-1.3.0.0.ebuild 16734
-SHA256 ee210ec662271dcce3b4f26f39b11cf2055b16cd8d88be5e8fb6996ce76b79da xorg-server-1.3.0.0.ebuild 16734
+EBUILD xorg-server-1.3.0.0.ebuild 16741 RMD160 d3cb647edd67c7a2311f464d0281e0bee05fc98a SHA1 d2c44e6aa6764e35be3f09ad8e1ff865800d2f15 SHA256 a89d684f5337f7f493fce75297efe188745b6c3bfb99d454d445878583c3088c
+MD5 54c624664c04ea0b08473aa2e0eeff60 xorg-server-1.3.0.0.ebuild 16741
+RMD160 d3cb647edd67c7a2311f464d0281e0bee05fc98a xorg-server-1.3.0.0.ebuild 16741
+SHA256 a89d684f5337f7f493fce75297efe188745b6c3bfb99d454d445878583c3088c xorg-server-1.3.0.0.ebuild 16741
 EBUILD xorg-server-1.4-r2.ebuild 18440 RMD160 5e01ca3ca369dac876d3d85ec24aefa6d7618d77 SHA1 b3d1cba7b5effe103e84d58942dacda0d7708f65 SHA256 34a3153d9b66d2555fdbe0deebf6a301ee700277bb0e1d8c8e487e9680b3133f
 MD5 b408416cadb61a4c78b81f15f80faaf2 xorg-server-1.4-r2.ebuild 18440
 RMD160 5e01ca3ca369dac876d3d85ec24aefa6d7618d77 xorg-server-1.4-r2.ebuild 18440
 SHA256 34a3153d9b66d2555fdbe0deebf6a301ee700277bb0e1d8c8e487e9680b3133f xorg-server-1.4-r2.ebuild 18440
-MISC ChangeLog 61957 RMD160 ffd3b8d057cd8f4fd9fd6f71129c999eca711fb4 SHA1 05d93115d30fb44b795fd640386e7f7365b6c985 SHA256 f558d06c4fc5e649b78247581ad1db1f8554043f565b1edb7595ea6cbfb7e130
-MD5 5c6face8e9581d75a642939d7966d26e ChangeLog 61957
-RMD160 ffd3b8d057cd8f4fd9fd6f71129c999eca711fb4 ChangeLog 61957
-SHA256 f558d06c4fc5e649b78247581ad1db1f8554043f565b1edb7595ea6cbfb7e130 ChangeLog 61957
+MISC ChangeLog 62187 RMD160 a7f0d5282767dfd90368fe912cf2b7d5d0dba633 SHA1 6126b93921e2092d6afe462d09cbf6d7594cbdf0 SHA256 04187a283ead882831c9786861e427c8a85a6a002442a15386748aa6ee3cd4d5
+MD5 c78830a9a3fb8b971b94d9461a4fcc62 ChangeLog 62187
+RMD160 a7f0d5282767dfd90368fe912cf2b7d5d0dba633 ChangeLog 62187
+SHA256 04187a283ead882831c9786861e427c8a85a6a002442a15386748aa6ee3cd4d5 ChangeLog 62187
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -164,7 +164,7 @@ SHA256 5ab16a882768bd84a26edb98b129ddd5ed9171f22e1fdfcc19ab97402d0cbcbe files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHJYKZXVaO67S1rtsRAnc/AKDQuMcgXWcT8tCHO0Xjp93xoHOOfgCfTUGL
-cmavSpOgKvW5fl+bbnxnRF4=
-=pvF5
+iD8DBQFHL2QjXVaO67S1rtsRApG5AJ9DBUW5xJ2sjyRS2d4M5ODzqvPafwCfdS60
+b/rN+Rh8WMgUocp7uI7a3z4=
+=ZADC
 -----END PGP SIGNATURE-----
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 8a228d5d1e45..8628fd1f7bf8 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.15 2007/10/09 07:22:49 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.2.0-r3.ebuild,v 1.16 2007/11/05 18:42:34 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -114,7 +114,7 @@ RDEPEND=">=x11-libs/libXfont-1.2.5
 	x11-libs/libxkbfile
 	x11-libs/libXdmcp
 	x11-libs/libXmu
-	x11-libs/libXrender
+	<x11-libs/libXrender-0.9.3
 	x11-libs/libXi
 	media-libs/freetype
 	>=media-libs/mesa-6.5.2
diff --git a/x11-base/xorg-server/xorg-server-1.3.0.0-r1.ebuild b/x11-base/xorg-server/xorg-server-1.3.0.0-r1.ebuild
index 50008e4aa546..1988f441a089 100644
--- a/x11-base/xorg-server/xorg-server-1.3.0.0-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.3.0.0-r1.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-r1.ebuild,v 1.9 2007/10/09 07:22:49 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0-r1.ebuild,v 1.10 2007/11/05 18:42:34 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -113,7 +113,7 @@ RDEPEND=">=x11-libs/libXfont-1.2.5
 	x11-libs/libxkbfile
 	x11-libs/libXdmcp
 	x11-libs/libXmu
-	x11-libs/libXrender
+	<x11-libs/libXrender-0.9.3
 	x11-libs/libXi
 	media-libs/freetype
 	>=media-libs/mesa-6.5.2
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 bc790a3dc2b6..9c3109db4edb 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.28 2007/10/09 07:22:49 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild,v 1.29 2007/11/05 18:42:34 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -113,7 +113,7 @@ RDEPEND=">=x11-libs/libXfont-1.2.5
 	x11-libs/libxkbfile
 	x11-libs/libXdmcp
 	x11-libs/libXmu
-	x11-libs/libXrender
+	<x11-libs/libXrender-0.9.3
 	x11-libs/libXi
 	media-libs/freetype
 	>=media-libs/mesa-6.5.2