Update to today's CVS. This adds a USE flag for xprint. Also, get rid of the glx USE flag, because everybody should get it.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 153 insertions, 2 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 8dc2d8cb9e23..fb13a34b75d8 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.27 2005/08/20 22:53:03 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.28 2005/08/21 02:39:07 spyderous Exp $
+
+*xorg-server-0.99.1-r4 (21 Aug 2005)
+
+  21 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-server-0.99.1-r4.ebuild:
+  Update to today's CVS. This adds a USE flag for xprint. Also, get rid of the
+  glx USE flag, because everybody should get it.
 
   20 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-server-0.99.1.ebuild, xorg-server-0.99.1-r1.ebuild,
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 78244c697191..f481624e63db 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,8 +1,9 @@
 MD5 933ccecdb5fe78b9be1e98c7f37330c2 xorg-server-0.99.1-r1.ebuild 3020
-MD5 0c1ce8037b5a65a3ce0db346c5b57024 ChangeLog 4975
+MD5 4d44a5ecdb79cd635dae0b34516be848 ChangeLog 5230
 MD5 ec3dcd9bb675ec4c10e298b660b200d6 xorg-server-0.99.1.ebuild 2887
 MD5 a77ae0249ac2bde41bcb938adca6b411 xorg-server-0.99.1-r2.ebuild 3228
 MD5 7ba44f65da461a86dd463bcbf984b834 xorg-server-0.99.1-r3.ebuild 3552
+MD5 fce26ca043edacc74f8c3378c12471a0 xorg-server-0.99.1-r4.ebuild 3593
 MD5 139d1af499d5fd30cbb118284544e3f6 files/xorg-composite.patch 2397
 MD5 44296a07d7ed76922dd604d93b00ab18 files/digest-xorg-server-0.99.1 137
 MD5 44296a07d7ed76922dd604d93b00ab18 files/digest-xorg-server-0.99.1-r1 137
@@ -12,3 +13,4 @@ MD5 bf2ef74202eb0877dc40a8d0f5b38430 files/digest-xorg-server-0.99.1-r2 239
 MD5 bf2ef74202eb0877dc40a8d0f5b38430 files/digest-xorg-server-0.99.1-r3 239
 MD5 15b113cf1db95c72eb12426c0f2bf9ae files/xorg-server-0.99.1-x86_64-1.patch 452
 MD5 f176158b79ddb098f9ffb61551423eb1 files/xorg-server-fbmmx-local.patch 1210
+MD5 c701b68bb6d7f5d733fc97598b9c60e6 files/digest-xorg-server-0.99.1-r4 237
diff --git a/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r4 b/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r4
new file mode 100644
index 000000000000..9d155cfa5bd7
--- /dev/null
+++ b/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r4
@@ -0,0 +1,3 @@
+MD5 ae556a5fa66cb9871cd9eb93bcc908ad xorg-server-0.99.1.tar.bz2 3602415
+MD5 9e05f987ec79f6374457bea343b063c2 Mesa-6.3.1.1.tar.gz 6379711
+MD5 c5bce228e19d2117e6f937e974b51f93 xorg-server-0.99.1-update-to-CVS-HEAD-20050820.patch.gz 269877
diff --git a/x11-base/xorg-server/xorg-server-0.99.1-r4.ebuild b/x11-base/xorg-server/xorg-server-0.99.1-r4.ebuild
new file mode 100644
index 000000000000..af5448f7af47
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-0.99.1-r4.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.1-r4.ebuild,v 1.1 2005/08/21 02:39:07 spyderous Exp $
+
+# Must be before x-modular eclass is inherited
+# Hack to make sure autoreconf gets run
+SNAPSHOT="yes"
+
+inherit flag-o-matic x-modular
+
+OPENGL_DIR="xorg-x11"
+
+MESA_PN="Mesa"
+MESA_PV="6.3.1.1"
+MESA_P="${MESA_PN}-${MESA_PV}"
+
+CVS_UPDATE_DATE="20050820"
+
+PATCHES="${WORKDIR}/${P}-update-to-CVS-HEAD-${CVS_UPDATE_DATE}.patch
+	${FILESDIR}/check-for-glproto.patch
+	${FILESDIR}/fix-xf86misc-typo.patch
+	${FILESDIR}/${P}-x86_64-1.patch"
+
+SRC_URI="${SRC_URI}
+	http://xorg.freedesktop.org/extras/${MESA_P}.tar.gz
+	http://dev.gentoo.org/~spyderous/xorg-x11/xorg-server-0.99.1-update-to-CVS-HEAD-${CVS_UPDATE_DATE}.patch.gz"
+DESCRIPTION="X.Org X servers"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="dri ipv6 minimal 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
+	>=x11-base/opengl-update-2.2.3"
+DEPEND="${RDEPEND}
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/fixesproto
+	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
+	x11-proto/recordproto
+	x11-proto/resourceproto
+	x11-proto/dmxproto
+	x11-proto/videoproto
+	x11-proto/scrnsaverproto
+	x11-proto/evieext
+	x11-proto/trapproto
+	>=x11-proto/xineramaproto-1.1-r1
+	x11-proto/fontsproto
+	x11-proto/kbproto
+	x11-proto/inputproto
+	x11-proto/bigreqsproto
+	x11-proto/xcmiscproto
+	x11-proto/glproto
+	xprint? ( x11-proto/printproto )
+	dri? ( x11-proto/xf86driproto
+		x11-libs/libdrm )"
+
+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
+	CONFIGURE_OPTIONS="
+		$(use_enable ipv6)
+		$(use_enable !minimal dmx)
+		$(use_enable !minimal xvfb)
+		$(use_enable !minimal xnest)
+		$(use_enable dri)
+		$(use_enable xprint)
+		--with-mesa-source=${WORKDIR}/${MESA_P}
+		--enable-glx
+		--enable-xorg
+		--enable-xtrap
+		--enable-xevie
+		--sysconfdir=/etc/X11
+		--localstatedir=/var"
+
+	# X won't start if -fomit-frame-pointer isn't filtered
+	filter-flags -fomit-frame-pointer
+}
+
+src_install() {
+	x-modular_src_install
+
+	dynamic_libgl_install
+
+	dosym Xorg /usr/bin/X
+	fperms 4711 /usr/bin/Xorg
+}
+
+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/libglx*; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+			fi
+		done
+	eend 0
+}
+
+switch_opengl_implem() {
+		# Switch to the xorg implementation.
+		# Use new opengl-update that will not reset user selected
+		# OpenGL interface ...
+		echo
+		local opengl_implem="$(${ROOT}/usr/sbin/opengl-update --get-implementation)"
+		${ROOT}/usr/sbin/opengl-update --use-old ${OPENGL_DIR}
+}