1.2.99.0:

- xprint is broken (bug #154067, Cyrill Helg)
- fix install location of dbus configuration file
Package-Manager: portage-2.1.2_rc1-r3

3 files changed, 33 insertions, 22 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 0653dcfef618..95c4ac8633c1 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,12 @@
 # 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.192 2006/11/04 06:39:27 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.193 2006/11/04 23:43:13 joshuabaergen Exp $
+
+  04 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.2.99.0.ebuild:
+  1.2.99.0:
+  - xprint is broken (bug #154067, Cyrill Helg)
+  - fix install location of dbus configuration file
 
   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 2c7ece2ceaf6..43c404288b2a 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 16778 RMD160 ae602a5f50fb64bb02e3b6ff87bfab8e4ccd21c5 SHA1 e9f104182ad5b16d85450635b02809707281efbb SHA256 579c5608992dd4a526d8266ba39ab7dbd8b416b5faaeee1a475560de61b39999
-MD5 f545564c606efa411b43ee09ef88fc8d xorg-server-1.2.99.0.ebuild 16778
-RMD160 ae602a5f50fb64bb02e3b6ff87bfab8e4ccd21c5 xorg-server-1.2.99.0.ebuild 16778
-SHA256 579c5608992dd4a526d8266ba39ab7dbd8b416b5faaeee1a475560de61b39999 xorg-server-1.2.99.0.ebuild 16778
-MISC ChangeLog 39706 RMD160 f10cfe59acebfcf9d8d6d757166bf0b822017ffb SHA1 7ccb5ce5aa77d81ab2716ce61d877cccf4c4e9d6 SHA256 2858dc32d9934a9fbe8062920f8b73e5a40c51c04e456260e344e25a039b050d
-MD5 83b8d907e631455d6d2d479887f5a2e3 ChangeLog 39706
-RMD160 f10cfe59acebfcf9d8d6d757166bf0b822017ffb ChangeLog 39706
-SHA256 2858dc32d9934a9fbe8062920f8b73e5a40c51c04e456260e344e25a039b050d ChangeLog 39706
+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
 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 fad021501468..141d0b9c12e9 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.6 2006/11/04 06:39:27 joshuabaergen Exp $
+# $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 $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -105,13 +105,15 @@ IUSE_VIDEO_CARDS="
 # dmx doesn't currently work
 # dmx
 IUSE_SERVERS="kdrive xorg"
+# xprint is broken too
+# xprint
 IUSE="${IUSE_VIDEO_CARDS}
 	${IUSE_INPUT_DEVICES}
 	${IUSE_SERVERS}
 	3dfx
 	aiglx
 	dbus
-	dri ipv6 minimal nptl sdl xprint"
+	dri ipv6 minimal nptl sdl"
 RDEPEND="x11-libs/libXfont
 	x11-libs/xtrans
 	x11-libs/libXau
@@ -179,11 +181,12 @@ DEPEND="${RDEPEND}
 	x11-proto/xcmiscproto
 	>=x11-proto/glproto-1.4.8
 	dri? ( x11-proto/xf86driproto
-		>=x11-libs/libdrm-2.2 )
-	xprint? ( x11-proto/printproto
-		x11-apps/mkfontdir
-		x11-apps/mkfontscale
-		x11-apps/xplsprinters )"
+		>=x11-libs/libdrm-2.2 )"
+	# xprint is currently broken
+#	xprint? ( x11-proto/printproto
+#		x11-apps/mkfontdir
+#		x11-apps/mkfontscale
+#		x11-apps/xplsprinters )"
 	#dmx is currently broken
 	# dmx? ( x11-proto/dmxproto )
 
@@ -280,6 +283,8 @@ LICENSE="${LICENSE} MIT"
 pkg_setup() {
 	use minimal || ensure_a_server_is_building
 
+	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"
@@ -295,10 +300,10 @@ pkg_setup() {
 
 	# localstatedir is used for the log location; we need to override the default
 	# from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
 	# --enable-install-setuid needed because sparcs default off
-	# dmx is currently broken
+	# broken:
 	#	$(use_enable dmx)
+	#	$(use_enable xprint)
 	CONFIGURE_OPTIONS="
 		$(use_enable ipv6)
 		$(use_enable kdrive)
@@ -309,10 +314,9 @@ pkg_setup() {
 		$(use_enable dbus)
 		$(use_enable dri)
 		$(use_enable xorg)
-		$(use_enable xprint)
 		$(use_enable nptl glx-tls)
 		--disable-dmx
-		--sysconfdir=/etc/X11
+		--disable-xprint
 		--localstatedir=/var
 		--enable-install-setuid
 		--with-fontdir=/usr/share/fonts
@@ -348,7 +352,8 @@ src_unpack() {
 	# Make sure eautoreconf gets run if we need the autoconf/make
 	# changes.
 	if [[ ${SNAPSHOT} != "yes" ]]; then
-		if use kdrive || use xprint; then
+#		if use kdrive || use xprint; then
+		if use kdrive; then
 			eautoreconf
 		fi
 	fi
@@ -497,7 +502,7 @@ dynamic_libgl_install() {
 }
 
 server_based_install() {
-	use xprint && xprint_src_install
+#	use xprint && xprint_src_install
 
 	if ! use xorg; then
 		rm ${D}/usr/share/man/man1/Xserver.1x \