Re-add, this time with a huge patch on the mirror.

(Portage version: 2.0.51.22-r2)

6 files changed, 185 insertions, 13 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index da8e2931b475..881de399dd67 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.13 2005/08/12 09:05:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.14 2005/08/12 17:12:12 spyderous Exp $
+
+  12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/check-for-glproto.patch, +files/fix-xf86misc-typo.patch,
+  +xorg-server-0.99.1-r2.ebuild:
+  Re-add, this time with a huge patch on the mirror.
 
   12 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
   -files/check-for-glproto.patch, -files/fix-xf86misc-typo.patch,
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 1fe1da34494a..14aebef3054d 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,16 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ec452e2538f37ff40b4483917033a03c ChangeLog 2714
 MD5 df5ff89b3c13c5675d9ab657f295f58a xorg-server-0.99.1-r1.ebuild 3021
+MD5 ec452e2538f37ff40b4483917033a03c ChangeLog 2714
 MD5 c0a77bd0dcd1c32a59067a8ddf824ba3 xorg-server-0.99.1.ebuild 2888
-MD5 44296a07d7ed76922dd604d93b00ab18 files/digest-xorg-server-0.99.1 137
+MD5 fb0ac3aadb6742323561411855516015 xorg-server-0.99.1-r2.ebuild 3226
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFC/GZuj5H05b2HAEkRAjuQAKCGtuuqD2FGUJCTQaPW3nvnt55XmgCgiN3e
-o92+IDGCX870/uW+a4+vV9Q=
-=ByjD
------END PGP SIGNATURE-----
+MD5 cda95e8d1c7c9540a7619dbe007c125d files/fix-xf86misc-typo.patch 615
+MD5 b74f0fa343d7769d89aec580ae334f4d files/check-for-glproto.patch 876
+MD5 3abbcfd99744a692a4a89836a43402db files/digest-xorg-server-0.99.1-r2 237
diff --git a/x11-base/xorg-server/files/check-for-glproto.patch b/x11-base/xorg-server/files/check-for-glproto.patch
new file mode 100644
index 000000000000..c769c9f50e0c
--- /dev/null
+++ b/x11-base/xorg-server/files/check-for-glproto.patch
@@ -0,0 +1,27 @@
+Index: xorg/configure.ac
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/configure.ac,v
+retrieving revision 1.30
+diff -u -b -B -r1.30 configure.ac
+--- xorg/configure.ac	27 Jul 2005 08:11:26 -0000	1.30
++++ xorg/configure.ac	28 Jul 2005 20:49:35 -0000
+@@ -221,6 +221,9 @@
+ if test "$DMX" = yes; then
+ 	PKG_CHECK_MODULES([DMXMODULES],
+                           [xmuu xext x11 xrender xfont xi dmxproto])
++	if test "$GLX" = yes; then
++		PKG_CHECK_MODULES([GL],[glproto])
++	fi
+ fi
+ AM_CONDITIONAL(DMX, [test x$DMX = xyes])
+ 
+@@ -404,6 +407,9 @@
+ 	AC_SUBST(DRIPROTO_CFLAGS)
+ 	PKG_CHECK_MODULES([LIBDRM], [libdrm])
+ 	AC_SUBST(LIBDRM_CFLAGS)
++	if test "$GLX" = yes; then
++		PKG_CHECK_MODULES([GL],[glproto])
++	fi
+ fi
+ AC_DEFINE(XINPUT,1,[Support X Input extension])
+ EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/Xi/libXi.la'
diff --git a/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r2 b/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r2
new file mode 100644
index 000000000000..3ca5643950ac
--- /dev/null
+++ b/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r2
@@ -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 1f874cf8925651a6b984b467b03e4c94 xorg-server-0.99.1-update-to-CVS-HEAD-20050811.patch.gz 406495
diff --git a/x11-base/xorg-server/files/fix-xf86misc-typo.patch b/x11-base/xorg-server/files/fix-xf86misc-typo.patch
new file mode 100644
index 000000000000..6c1f0ef140d1
--- /dev/null
+++ b/x11-base/xorg-server/files/fix-xf86misc-typo.patch
@@ -0,0 +1,16 @@
+Index: xorg/configure.ac
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/configure.ac,v
+retrieving revision 1.30
+diff -u -b -B -r1.30 configure.ac
+--- xorg/configure.ac	27 Jul 2005 08:11:26 -0000	1.30
++++ xorg/configure.ac	28 Jul 2005 20:49:35 -0000
+@@ -541,7 +547,7 @@
+ if test x$XF86VIDMODE = xyes; then
+   AC_DEFINE(XF86VIDMODE,1,[Support XFree86 Video Mode extension])
+ fi
+-if test x$XF86MIS = xyes; then
++if test x$XF86MISC = xyes; then
+   AC_DEFINE(XF86MISC,1,[Support XFree86 miscellaneous extensions])
+ fi
+ # must come first as it uses stuff in Shape -d
diff --git a/x11-base/xorg-server/xorg-server-0.99.1-r2.ebuild b/x11-base/xorg-server/xorg-server-0.99.1-r2.ebuild
new file mode 100644
index 000000000000..f6f2675d49bd
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-0.99.1-r2.ebuild
@@ -0,0 +1,127 @@
+# 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-r2.ebuild,v 1.3 2005/08/12 17:12:12 spyderous Exp $
+
+# Must be before x-modular eclass is inherited
+# Hack to make sure autoreconf gets run
+SNAPSHOT="yes"
+
+inherit x-modular
+
+OPENGL_DIR="xorg-x11"
+
+MESA_PN="Mesa"
+MESA_PV="6.3.1.1"
+MESA_P="${MESA_PN}-${MESA_PV}"
+
+PATCHES="${FILESDIR}/xorg-server-0.99.1-update-to-CVS-HEAD-20050811.patch
+	${FILESDIR}/check-for-glproto.patch
+	${FILESDIR}/fix-xf86misc-typo.patch"
+
+SRC_URI="${SRC_URI}
+	glx? ( 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-20050811.patch.gz"
+DESCRIPTION="X.Org X servers"
+KEYWORDS="~sparc ~x86"
+IUSE="glx dri xinerama ipv6 minimal"
+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
+	glx? ( >=media-libs/mesa-6
+		>=x11-base/opengl-update-2.2.2 )"
+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/panoramixproto
+	x11-proto/fontsproto
+	x11-proto/kbproto
+	x11-proto/inputproto
+	x11-proto/bigreqsproto
+	x11-proto/xcmiscproto
+	glx? ( x11-proto/glproto )
+	dri? ( x11-proto/xf86driproto
+		x11-libs/libdrm )"
+
+pkg_setup() {
+	if use glx; then
+		confopts="${confopts} --with-mesa-source=${WORKDIR}/${MESA_P}"
+	fi
+
+	# 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 xinerama)
+		$(use_enable ipv6)
+		$(use_enable !minimal dmx)
+		$(use_enable !minimal xvfb)
+		$(use_enable !minimal xnest)
+		$(use_enable glx)
+		$(use_enable dri)
+		--enable-xorg
+		--enable-composite
+		--enable-xtrap
+		--enable-xevie
+		--sysconfdir=/etc/X11
+		--localstatedir=/var
+		${confopts}"
+}
+
+src_install() {
+	x-modular_src_install
+
+	dynamic_libgl_install
+
+	dosym Xorg /usr/bin/X
+}
+
+pkg_postinst() {
+	switch_opengl_implem
+}
+
+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}
+}