Version bump. Includes quite a few bugfixes.

Package-Manager: portage-2.1_pre10

4 files changed, 307 insertions, 7 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 90bdccfd8ea7..e2ac31229c60 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.109 2006/04/24 20:07:53 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.110 2006/04/29 16:38:38 joshuabaergen Exp $
+
+*xorg-server-1.0.99.902 (29 Apr 2006)
+
+  29 Apr 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xorg-server-1.0.99.902.ebuild:
+  Version bump.  Includes quite a few bugfixes.
 
   24 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-server-1.0.99.901-r1.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 05ee193e47af..326a5861b641 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -59,6 +59,7 @@ DIST MesaLib-6.4.2.tar.bz2 2913009 RMD160 6bf1afc0d3bd3f5e3b5c1a019838f406034465
 DIST MesaLib-6.5.tar.bz2 3062363 RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd size 3062363
 DIST xorg-server-1.0.2.tar.bz2 6006486 RMD160 ee47746009fa7c36e692bf4bae629ccd1bd0d4b4 SHA256 b30c57271d147c1f45ba7f15fcc7e7917b61c6dfb97d514e25c7bc91ddd970ba size 6006486
 DIST xorg-server-1.0.99.901.tar.bz2 6317980 RMD160 7824f82b876d207ba5363f02e6dde1d0ec40e407 SHA256 c0d029ebf35bc1f1039a2ac57e97958857c5bda86bc9792164cdc08815259898 size 6317980
+DIST xorg-server-1.0.99.902.tar.bz2 6318145 RMD160 72437131b4dedc281b247c984bd29d1b74d2fe56 SHA256 28af7877dc6b3fcf90d61947f36c30ef0e2a504026872fd50d9e766f332c448c size 6318145
 EBUILD xorg-server-1.0.2-r3.ebuild 5676 RMD160 bd3d7175771e0301511bdb18f8ff2dc61b7e0d74 SHA1 c22b9c76db8a9fd0b372bff65425362c72de80c0 SHA256 01652c5b184d6dae6ed4121e53c126fc174d8ef42dd19e391308e438208fdc5c size 5676
 MD5 af32676eaa7ddc9861e6d36e14eb4620 xorg-server-1.0.2-r3.ebuild 5676
 RMD160 bd3d7175771e0301511bdb18f8ff2dc61b7e0d74 xorg-server-1.0.2-r3.ebuild 5676
@@ -67,10 +68,14 @@ EBUILD xorg-server-1.0.99.901-r1.ebuild 7932 RMD160 ef34c4ed8c42aebccd127c8fbb2a
 MD5 141998be253621e023240ccdd21a274a xorg-server-1.0.99.901-r1.ebuild 7932
 RMD160 ef34c4ed8c42aebccd127c8fbb2a03a65d326376 xorg-server-1.0.99.901-r1.ebuild 7932
 SHA256 f149083d1471d936b294e60209f8519a499963798c04fb82fe07e2f34c5f49a6 xorg-server-1.0.99.901-r1.ebuild 7932
-MISC ChangeLog 23438 RMD160 c66cec40366d43585e8b40aba26c0f9bb17e658a SHA1 c280850ee576e4793ef7790b2be98f91d972cbf0 SHA256 c29cbec8eae157576c431b7d25291d748f489d0b35e899483dd6efeeebf08f44 size 23438
-MD5 7ddc19c2d741fb782ecff214987f29fa ChangeLog 23438
-RMD160 c66cec40366d43585e8b40aba26c0f9bb17e658a ChangeLog 23438
-SHA256 c29cbec8eae157576c431b7d25291d748f489d0b35e899483dd6efeeebf08f44 ChangeLog 23438
+EBUILD xorg-server-1.0.99.902.ebuild 7752 RMD160 70c41a9ddad82c0d166c1feaa38290a80f5f9218 SHA1 d15a89f977de5c5b2c870b90c0e2e2a01ca2184d SHA256 31bdffd795b62625c4825759a201c62777735ce3546ff42b9393e84708162e2b size 7752
+MD5 96e769249413dc86972f980c64c83ea6 xorg-server-1.0.99.902.ebuild 7752
+RMD160 70c41a9ddad82c0d166c1feaa38290a80f5f9218 xorg-server-1.0.99.902.ebuild 7752
+SHA256 31bdffd795b62625c4825759a201c62777735ce3546ff42b9393e84708162e2b xorg-server-1.0.99.902.ebuild 7752
+MISC ChangeLog 23621 RMD160 b0cb521bd9f5cfb3b63bec219beb3607576f2d36 SHA1 42370308158173fc44a37882f588a6c5dfc5452d SHA256 ba993767a11d003edede1e7784a0f41f524f558e7a9343e59448e12ca9c98e65 size 23621
+MD5 b396ac08c1a732742def4f3259a7efbd ChangeLog 23621
+RMD160 b0cb521bd9f5cfb3b63bec219beb3607576f2d36 ChangeLog 23621
+SHA256 ba993767a11d003edede1e7784a0f41f524f558e7a9343e59448e12ca9c98e65 ChangeLog 23621
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 size 156
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -78,8 +83,9 @@ SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata
 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
-size 771 files/digest-xorg-server-1.0.2-r3 771
 MD5 35cf82436f552d3077d2bf7db5258ff9 files/digest-xorg-server-1.0.99.901-r1 515
 RMD160 7b0015585596fe2e1ab85b3a8a51662a92eaed69 files/digest-xorg-server-1.0.99.901-r1 515
 SHA256 b4209c7a80d882cc5c256ced8527eb7c8c4a873b920fb051699e1dda54e0d0b6 files/digest-xorg-server-1.0.99.901-r1 515
-size 515 files/digest-xorg-server-1.0.99.901-r1 515
+MD5 a4519faf6e8252b7b0eed8b16c713221 files/digest-xorg-server-1.0.99.902 515
+RMD160 5a156d372e494ed39ee9697fc2d47ac5dd16a6b2 files/digest-xorg-server-1.0.99.902 515
+SHA256 3f1ef5168a5c5ff484304cc15afb83cdaab0de9451b34f9fca5d6aa2aa43ce1b files/digest-xorg-server-1.0.99.902 515
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.0.99.902 b/x11-base/xorg-server/files/digest-xorg-server-1.0.99.902
new file mode 100644
index 000000000000..d1df5f286323
--- /dev/null
+++ b/x11-base/xorg-server/files/digest-xorg-server-1.0.99.902
@@ -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 643633bbc7038643b29a373aa3a2413e xorg-server-1.0.99.902.tar.bz2 6318145
+RMD160 72437131b4dedc281b247c984bd29d1b74d2fe56 xorg-server-1.0.99.902.tar.bz2 6318145
+SHA256 28af7877dc6b3fcf90d61947f36c30ef0e2a504026872fd50d9e766f332c448c xorg-server-1.0.99.902.tar.bz2 6318145
diff --git a/x11-base/xorg-server/xorg-server-1.0.99.902.ebuild b/x11-base/xorg-server/xorg-server-1.0.99.902.ebuild
new file mode 100644
index 000000000000..96d3ded30b3b
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.0.99.902.ebuild
@@ -0,0 +1,282 @@
+# 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.902.ebuild,v 1.1 2006/04/29 16:38:38 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+# Hack to make sure autoreconf gets run
+SNAPSHOT="yes"
+
+inherit x-modular multilib
+
+OPENGL_DIR="xorg-x11"
+
+MESA_PN="Mesa"
+MESA_PV="6.5"
+MESA_P="${MESA_PN}-${MESA_PV}"
+MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
+
+PATCHES="${FILESDIR}/${PN}-1.0.2-xprint-init.patch
+	${FILESDIR}/1.0.99.901-Xprint-xprintdir.patch"
+
+SRC_URI="${SRC_URI}
+	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
+	http://xorg.freedesktop.org/snapshots/individual/xserver/${P}.tar.bz2"
+DESCRIPTION="X.Org X servers"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE_VIDEO_CARDS="
+	video_cards_chips
+	video_cards_epson
+	video_cards_glint
+	video_cards_i810
+	video_cards_mach64
+	video_cards_mga
+	video_cards_neomagic
+	video_cards_nv
+	video_cards_r128
+	video_cards_radeon
+	video_cards_siliconmotion
+	video_cards_via"
+IUSE="${IUSE_VIDEO_CARDS}
+	dmx dri ipv6 kdrive minimal nptl sdl xorg xprint"
+RDEPEND="x11-libs/libXfont
+	x11-libs/xtrans
+	x11-libs/libXau
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	x11-libs/libXdmcp
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXi
+	media-libs/freetype
+	>=media-libs/mesa-6.5-r2
+	media-fonts/font-adobe-75dpi
+	media-fonts/font-misc-misc
+	media-fonts/font-cursor-misc
+	x11-misc/xbitmaps
+	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
+	x11-apps/iceauth
+	x11-apps/rgb
+	x11-apps/xauth
+	x11-apps/xinit
+	app-admin/eselect-opengl
+	x11-libs/libXaw
+	x11-libs/libXpm
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	!minimal? ( x11-libs/libdmx
+		x11-libs/libXtst
+		x11-libs/libXres )
+	x11-libs/libxkbui
+	x11-libs/liblbxutil
+	kdrive? ( sdl? ( media-libs/libsdl ) )"
+	# Xres is dmx-dependent, xkbui is xorgcfg-dependent
+	# Xaw is dmx- and xorgcfg-dependent
+	# Xpm is dmx- and xorgcfg-dependent, pulls in Xt
+	# Xxf86misc and Xxf86vm are xorgcfg-dependent
+	# liblbxutil is lbx- dependent
+DEPEND="${RDEPEND}
+	x11-proto/randrproto
+	x11-proto/renderproto
+	>=x11-proto/fixesproto-4
+	x11-proto/damageproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/xf86dgaproto
+	x11-proto/xf86miscproto
+	x11-proto/xf86rushproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xf86bigfontproto
+	>=x11-proto/compositeproto-0.3
+	x11-proto/recordproto
+	x11-proto/resourceproto
+	x11-proto/videoproto
+	>=x11-proto/scrnsaverproto-1.1.0
+	x11-proto/evieext
+	x11-proto/trapproto
+	>=x11-proto/xineramaproto-1.1-r1
+	x11-proto/fontsproto
+	>=x11-proto/kbproto-1.0-r1
+	x11-proto/inputproto
+	x11-proto/bigreqsproto
+	x11-proto/xcmiscproto
+	>=x11-proto/glproto-1.4.6
+	!minimal? ( x11-proto/dmxproto )
+	dri? ( x11-proto/xf86driproto
+		>=x11-libs/libdrm-2 )
+	xprint? ( x11-proto/printproto
+		x11-apps/mkfontdir
+		x11-apps/mkfontscale )"
+LICENSE="${LICENSE} MIT"
+
+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-xorg needed because darwin defaults off
+	# --enable-install-setuid needed because sparcs default off
+
+	# SDL only available in kdrive build
+	if use kdrive && use sdl; then
+		conf_opts="${conf_opts} --enable-xsdl"
+	else
+		conf_opts="${conf_opts} --disable-xsdl"
+	fi
+
+	# Only Xorg and Xgl support this, and we won't build Xgl
+	# until it merges to trunk
+	if use xorg; then
+		conf_opts="${conf_opts} --with-mesa-source=${WORKDIR}/${MESA_P}"
+	fi
+
+	CONFIGURE_OPTIONS="
+		$(use_enable ipv6)
+		$(use_enable dmx)
+		$(use_enable kdrive)
+		$(use_enable !minimal xvfb)
+		$(use_enable !minimal xnest)
+		$(use_enable dri)
+		$(use_enable xorg)
+		$(use_enable xprint)
+		$(use_enable nptl glx-tls)
+		--sysconfdir=/etc/X11
+		--localstatedir=/var
+		--enable-install-setuid
+		--with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1
+		${conf_opts}"
+
+	if built_with_use media-libs/mesa nptl; then
+		local diemsg="You must build xorg-server and mesa with the same nptl USE setting."
+		use nptl || die "${diemsg}"
+	else
+		use nptl && die "${diemsg}"
+	fi
+
+	# (#121394) Causes window corruption
+	filter-flags -fweb
+
+	# Nothing else provides new enough glxtokens.h
+	ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
+	OLD_IMPLEM="$(eselect opengl show)"
+	eselect opengl set --impl-headers ${OPENGL_DIR}
+}
+
+src_unpack() {
+	x-modular_specs_check
+	x-modular_dri_check
+	x-modular_unpack_source
+	x-modular_patch_source
+
+	# Set up kdrive servers to build
+	if use kdrive; then
+		einfo "Removing unused kdrive drivers ..."
+		for card in ${IUSE_VIDEO_CARDS}; do
+			real_card=${card#video_cards_}
+
+			# Differences between VIDEO_CARDS name and kdrive server name
+			real_card=${real_card/glint/pm2}
+			real_card=${real_card/radeon/ati}
+			real_card=${real_card/nv/nvidia}
+			real_card=${real_card/siliconmotion/smi}
+			if ! use ${card}; then
+				ebegin "  ${real_card}"
+				sed -i \
+					-e "s:${real_card}::g" \
+					${S}/hw/kdrive/Makefile.am \
+					|| die "sed of ${real_card} failed"
+				eend
+			fi
+
+		done
+
+		# smi and via are the only things on line 2. If line 2 ends up blank,
+		# we need to get rid of the backslash at the end of line 1.
+		if ! use video_cards_siliconmotion && ! use video_cards_via; then
+			sed -i \
+				-e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \
+				${S}/hw/kdrive/Makefile.am
+		fi
+
+		# Only need to reconf if we're modifying kdrive's Makefile.am
+		x-modular_reconf_source
+	fi
+}
+
+src_install() {
+	x-modular_src_install
+
+	dynamic_libgl_install
+
+	server_based_install
+}
+
+pkg_postinst() {
+	switch_opengl_implem
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if ! has_version x11-base/xorg-server; then
+		if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then
+			rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules
+		fi
+	fi
+}
+
+dynamic_libgl_install() {
+	# next section is to setup the dynamic libGL stuff
+	ebegin "Moving GL files for dynamic switching"
+		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+		local x=""
+		for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+			fi
+		done
+	eend 0
+}
+
+server_based_install() {
+	use xprint && xprint_src_install
+
+	if ! use xorg; then
+		rm ${D}/usr/share/man/man1/Xserver.1x \
+			${D}/usr/$(get_libdir)/xserver/SecurityPolicy \
+			${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			${D}/usr/share/man/man1/Xserver.1x
+	fi
+}
+
+switch_opengl_implem() {
+		# Switch to the xorg implementation.
+		# Use new opengl-update that will not reset user selected
+		# OpenGL interface ...
+		echo
+#		eselect opengl set --use-old ${OPENGL_DIR}
+		eselect opengl set ${OLD_IMPLEM}
+}
+
+xprint_src_install() {
+	# RH-style init script, we provide a wrapper
+	exeinto /usr/$(get_libdir)/misc
+	doexe ${S}/Xprint/etc/init.d/xprint
+	# Patch init script for fonts location
+	sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \
+		-i ${D}/usr/$(get_libdir)/misc/xprint
+	# Install the wrapper
+	newinitd ${FILESDIR}/xprint.init xprint
+	# Install profile scripts
+	insinto /etc/profile.d
+	doins ${S}/Xprint/etc/profile.d/xprint*
+	insinto /etc/X11/xinit/xinitrc.d
+	newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \
+		92xprint-xpserverlist.sh
+	# Patch profile scripts
+	sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
+		get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \
+		${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh
+	# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
+	dodoc ${D}/etc/profile.d/xprint*
+	rm -f ${D}/etc/profile.d/xprint*
+}