SDL is also currently broken in 1.2.99.0 according to Daniel Stone.

Package-Manager: portage-2.1.2_rc1-r3

3 files changed, 24 insertions, 16 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 95c4ac8633c1..aca282cff9fe 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.193 2006/11/04 23:43:13 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.194 2006/11/04 23:54:49 joshuabaergen Exp $
+
+  04 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.2.99.0.ebuild:
+  SDL is also currently broken in 1.2.99.0 according to Daniel Stone.
 
   04 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
   xorg-server-1.2.99.0.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 43c404288b2a..18c319068d03 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -140,14 +140,14 @@ EBUILD xorg-server-1.1.99.901.ebuild 16659 RMD160 15feb46ec0a687773a0bd912c8f3dc
 MD5 c3187c715edddcc948bccb3fa622a3c6 xorg-server-1.1.99.901.ebuild 16659
 RMD160 15feb46ec0a687773a0bd912c8f3dc77d1742d5d xorg-server-1.1.99.901.ebuild 16659
 SHA256 bdd94a2ad799ef7af51d37a82efc207383146599f3beaf43e66e1c7bd3d8cb4f xorg-server-1.1.99.901.ebuild 16659
-EBUILD xorg-server-1.2.99.0.ebuild 16841 RMD160 d9c4fb40185c907760764df6c5b08330056d1a28 SHA1 20f5246afda200fe8a0e8018649a33b30a1db72d SHA256 0c7beb758414c12d83903904f627e1e830199cf627f7b69f919bd6c9e795b2aa
-MD5 e47e37403c1e27e0495d6488540ebdde xorg-server-1.2.99.0.ebuild 16841
-RMD160 d9c4fb40185c907760764df6c5b08330056d1a28 xorg-server-1.2.99.0.ebuild 16841
-SHA256 0c7beb758414c12d83903904f627e1e830199cf627f7b69f919bd6c9e795b2aa xorg-server-1.2.99.0.ebuild 16841
-MISC ChangeLog 39907 RMD160 04b54e7a077535626cde56628cb66b8ace3d0ed4 SHA1 32ed9153ca2f25477411a08a217e4ef63863541e SHA256 beb44f13ec45837a0ecaad93922ea6d61ba59bc829b02250a029493af9188ca8
-MD5 8d9082f09663a985e5c06845d7fa1659 ChangeLog 39907
-RMD160 04b54e7a077535626cde56628cb66b8ace3d0ed4 ChangeLog 39907
-SHA256 beb44f13ec45837a0ecaad93922ea6d61ba59bc829b02250a029493af9188ca8 ChangeLog 39907
+EBUILD xorg-server-1.2.99.0.ebuild 16896 RMD160 a8ae75b0da9cda05098ad5eb63264f4f416e4f5f SHA1 cd9dec071fb01a82bf5cef68369331d92adbced9 SHA256 8a1999f3fe8a936ae8f1e0e172237cc869d83fceb3c9c04359795c7e9c718efe
+MD5 4356e12095e735444acdc5493d3b342e xorg-server-1.2.99.0.ebuild 16896
+RMD160 a8ae75b0da9cda05098ad5eb63264f4f416e4f5f xorg-server-1.2.99.0.ebuild 16896
+SHA256 8a1999f3fe8a936ae8f1e0e172237cc869d83fceb3c9c04359795c7e9c718efe xorg-server-1.2.99.0.ebuild 16896
+MISC ChangeLog 40066 RMD160 058f09e5541465ed2d08c5d46641f608124207d3 SHA1 df9ef8e6fcfb75d767adcc2fd306e8e9a77c108f SHA256 392715bdacd85bf90ea783ea62cb97d67522f14a998f02bc95b2586e042a72cd
+MD5 214ac219e3da3826b464ad4b69262698 ChangeLog 40066
+RMD160 058f09e5541465ed2d08c5d46641f608124207d3 ChangeLog 40066
+SHA256 392715bdacd85bf90ea783ea62cb97d67522f14a998f02bc95b2586e042a72cd ChangeLog 40066
 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.99.0.ebuild b/x11-base/xorg-server/xorg-server-1.2.99.0.ebuild
index 141d0b9c12e9..3d29e05ab89a 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.7 2006/11/04 23:43:13 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.2.99.0.ebuild,v 1.8 2006/11/04 23:54:49 joshuabaergen Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -107,13 +107,15 @@ IUSE_VIDEO_CARDS="
 IUSE_SERVERS="kdrive xorg"
 # xprint is broken too
 # xprint
+# so is sdl...
+# sdl
 IUSE="${IUSE_VIDEO_CARDS}
 	${IUSE_INPUT_DEVICES}
 	${IUSE_SERVERS}
 	3dfx
 	aiglx
 	dbus
-	dri ipv6 minimal nptl sdl"
+	dri ipv6 minimal nptl"
 RDEPEND="x11-libs/libXfont
 	x11-libs/xtrans
 	x11-libs/libXau
@@ -144,10 +146,11 @@ RDEPEND="x11-libs/libXfont
 		x11-libs/libXres )
 	>=x11-libs/libxkbui-1.0.2
 	x11-libs/liblbxutil
-	kdrive? ( sdl? ( media-libs/libsdl ) )
 	dbus? ( sys-apps/dbus )"
 	# dmx is currently broken
 	# dmx? ( x11-libs/libdmx )
+	# and so is sdl
+	# kdrive? ( sdl? ( media-libs/libsdl ) )
 
 	# Xres is dmx-dependent, xkbui is xorgcfg-dependent
 	# Xaw is dmx- and xorgcfg-dependent
@@ -286,11 +289,12 @@ pkg_setup() {
 	PATCHES="${FILESDIR}/${PV}-fix-sysconfdir-references.patch"
 
 	# SDL only available in kdrive build
-	if use kdrive && use sdl; then
-		conf_opts="${conf_opts} --enable-xsdl"
-	else
+	# SDL broken!
+#	if use kdrive && use sdl; then
+#		conf_opts="${conf_opts} --enable-xsdl"
+#	else
 		conf_opts="${conf_opts} --disable-xsdl"
-	fi
+#	fi
 
 	# Only Xorg and Xgl support this, and we won't build Xgl
 	# until it merges to trunk