(#109467) Set a non-broken default font path so things like Xvfb actually work.

Package-Manager: portage-2.0.53_rc5

4 files changed, 155 insertions, 2 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 25445cdcf750..f7bfa2f0bebc 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.56 2005/10/15 19:25:40 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.57 2005/10/16 20:03:49 spyderous Exp $
+
+*xorg-server-0.99.1_p20051013-r1 (16 Oct 2005)
+
+  16 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-server-0.99.1_p20051013-r1.ebuild:
+  (#109467) Set a non-broken default font path so things like Xvfb actually work.
 
   15 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-server-0.99.1_p20051013.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index de42db0c3165..b150f60ba41d 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,9 +1,11 @@
-MD5 6c976c8f44036c83346abcb88f2c68cf ChangeLog 11459
+MD5 64430728f7ebd18ea27c30a95e87c9f7 ChangeLog 11688
 MD5 5a445ea35d70ce20671a49049b406680 files/0.99.1-r10-check-for-glproto.patch 911
 MD5 54ab2c693d9e7e6e09b20bb8dd7db297 files/0.99.1-r10_CAN-2005-2495.patch 4387
 MD5 21ec9868da064e8a549db3d501373dea files/digest-xorg-server-0.99.1-r10 239
 MD5 ac79344c93d0172934f99d972e3e0d44 files/digest-xorg-server-0.99.1_p20051013 149
+MD5 ac79344c93d0172934f99d972e3e0d44 files/digest-xorg-server-0.99.1_p20051013-r1 149
 MD5 7fb68ff739074f0ee643388ee39e20f8 files/fix-transparencies.patch 310
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 MD5 803e951251b6a7c0dda68d3a72fba8ad xorg-server-0.99.1-r10.ebuild 3895
+MD5 d934b07dfe38b7d9722d38063e347d4e xorg-server-0.99.1_p20051013-r1.ebuild 3668
 MD5 939f8e968c1140324bb7ddd4d17beee2 xorg-server-0.99.1_p20051013.ebuild 3912
diff --git a/x11-base/xorg-server/files/digest-xorg-server-0.99.1_p20051013-r1 b/x11-base/xorg-server/files/digest-xorg-server-0.99.1_p20051013-r1
new file mode 100644
index 000000000000..3e63045af236
--- /dev/null
+++ b/x11-base/xorg-server/files/digest-xorg-server-0.99.1_p20051013-r1
@@ -0,0 +1,2 @@
+MD5 0df27701df0924d17ddf41185efa8ce1 MesaLib-6.3.2.tar.bz2 3012145
+MD5 dde205cb7cda1a1975e951e65b38fa34 xorg-server-0.99.1_p20051013.tar.bz2 5458910
diff --git a/x11-base/xorg-server/xorg-server-0.99.1_p20051013-r1.ebuild b/x11-base/xorg-server/xorg-server-0.99.1_p20051013-r1.ebuild
new file mode 100644
index 000000000000..f247a0d6bc31
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-0.99.1_p20051013-r1.ebuild
@@ -0,0 +1,143 @@
+# 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_p20051013-r1.ebuild,v 1.1 2005/10/16 20:03:49 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 multilib
+
+OPENGL_DIR="xorg-x11"
+
+MESA_PN="Mesa"
+MESA_PV="6.3.2"
+MESA_P="${MESA_PN}-${MESA_PV}"
+MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
+
+#PATCHES="${FILESDIR}/link-xtrap-into-xprint.patch"
+
+SRC_URI="mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
+	http://dev.gentoo.org/~spyderous/xorg-x11/${P}.tar.bz2"
+DESCRIPTION="X.Org X servers"
+KEYWORDS="~amd64 ~ppc ~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
+	media-fonts/font-misc-misc
+	media-fonts/font-cursor-misc
+	x11-misc/xbitmaps
+	x11-misc/xkbdata
+	x11-apps/iceauth
+	x11-apps/rgb
+	x11-apps/xauth
+	x11-apps/xinit
+	app-admin/eselect-opengl"
+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-1.0-r1
+	x11-proto/inputproto
+	x11-proto/bigreqsproto
+	x11-proto/xcmiscproto
+	x11-proto/glproto
+	dri? ( x11-proto/xf86driproto
+		x11-libs/libdrm )
+	xprint? ( x11-proto/printproto
+		x11-apps/mkfontdir
+		x11-apps/mkfontscale )"
+
+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)
+		--enable-xcsecurity
+		--with-mesa-source=${WORKDIR}/${MESA_P}
+		--enable-xorg
+		--enable-xtrap
+		--enable-xevie
+		--sysconfdir=/etc/X11
+		--localstatedir=/var
+		--with-xkb-path=/usr/$(get_libdir)/X11/xkb
+		--disable-static
+		--with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1"
+}
+
+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
+		eselect opengl set --use-old ${OPENGL_DIR}
+}