x11-base/xorg-server: don't change the font path, the default is perfectly fine now (should fix bug #264054)

Package-Manager: portage-2.2_rc33/cvs/Linux i686

3 files changed, 465 insertions, 12 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index f2d48b407c9c..bdd99798dc0e 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.406 2009/05/22 12:35:02 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.407 2009/05/22 15:01:28 remi Exp $
+
+*xorg-server-1.6.1.901-r2 (22 May 2009)
+
+  22 May 2009; Rémi Cardona <remi@gentoo.org>
+  +xorg-server-1.6.1.901-r2.ebuild:
+  don't change the font path, the default is perfectly fine now (should fix
+  bug #264054)
 
   22 May 2009; Christian Faulhammer <fauli@gentoo.org>
   xorg-server-1.5.3-r6.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 701505ae373f..a7631b0d7e87 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.2.0-fix-amd-cpu-detection.patch 1715 RMD160 7290fd57dc2a9e2dd8edbe08da5074a30815486c SHA1 b749e5ac35fad295fd7a1f13cfee2e42a2a06035 SHA256 0126a880eb5f21eb8dbbd119a425e7412b37689e1321c2b9ff63c5dc8de47f6a
 AUX 1.2.0-properly-free-device-devprivates-memory-leak-fix.patch 1199 RMD160 c55891ff6797d1b161524cd5c3e9a4382ec0bcad SHA1 98e07d5a542bc1e990921234f8f6399120ae5a63 SHA256 ba60d2fbb7944da45344f5ffc1431bf0e812ab861f4455522592ecb0c475138c
 AUX 1.2.0-typo-fix.patch 1321 RMD160 237c072869df15afbc2b35dfd8cc6e5143cb59f9 SHA1 3a22190fde5487b84c0d9a8862421f102bf41c63 SHA256 9dbf526f9cb3bf2596ffdc1795eda16181384db33562daf4fd1ddb359b5a77bd
@@ -67,13 +64,7 @@ EBUILD xorg-server-1.5.3-r4.ebuild 16847 RMD160 138b4d01c414af00202ed4c862a8ab32
 EBUILD xorg-server-1.5.3-r5.ebuild 17002 RMD160 47d9dd7d6af789f22208ce906e8facde51c328b7 SHA1 2e5b9383f9cd9fed0a8d260e3521ca121a79358b SHA256 f513aaa4adbff8cbee7b0a24d54b4227624b700197123184bbd369c3787a0ce9
 EBUILD xorg-server-1.5.3-r6.ebuild 17006 RMD160 26bb9941d1a3ca5da6d7cd8bc5184bffdf41edca SHA1 55086d319908aa60dbf75ebf0cfa39e2a988c4e9 SHA256 58d0ac68c817482cad6df67bc199f225270aa23fcb2afffeb3d0261480a28519
 EBUILD xorg-server-1.6.1.901-r1.ebuild 14272 RMD160 07180ca74b971cd82a430f5646884d4456c3a72e SHA1 06cde8feb670b889d4c4ebc6f7a4e2215a3f19ab SHA256 e8f2698066b561a0a3c2b1b79af0fdd4a5306415ba675d7f7ac03d3b77e7ddd4
+EBUILD xorg-server-1.6.1.901-r2.ebuild 14235 RMD160 82d2de2b011b6949e9335ffb86a814b0cba01d8a SHA1 2332d96abdb0f585a48a0a192f8ce4163a496ddc SHA256 4cd5d38f71b748856a76ee0e8bc0b4339e370e209abc0ea6b3735ef9d487d1b6
 EBUILD xorg-server-1.6.1.901.ebuild 14269 RMD160 978ba5aae1a04ffb4b2dacd203121cb2af2c49ec SHA1 8837b057ac9bdc49f8590bc9e42aa3f6d3b09aca SHA256 4fd2d1ef8c902e3850875a1088073a2eb020289ca0623beb0326a1e58e6cf8c7
-MISC ChangeLog 94719 RMD160 0f4879eb36414d6b8e09582a7f2188b21e847341 SHA1 d207babb469a781d22cfe30423fa03e844b3656b SHA256 3029c3b36a5d829eb2cc12f128768990d203ccd9f7665d95132f3223e07ee3f0
+MISC ChangeLog 94934 RMD160 ac380fb96295fa20a4ab5fc8090cd9bdde99b0f5 SHA1 c980c4e9b68fff6e164c0e6c019bcf984587e077 SHA256 027344ef13d5d4918463ce405f6514b2d33424ff19aec557040efebce7645813
 MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoWnAYACgkQNQqtfCuFneNiGgCfSXc055yXSDjlYL+bdbemG6tN
-1jEAoJv/foREs7ebzlEMh+BwxF7SFfma
-=OpL7
------END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.6.1.901-r2.ebuild b/x11-base/xorg-server/xorg-server-1.6.1.901-r2.ebuild
new file mode 100644
index 000000000000..72e269856776
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.6.1.901-r2.ebuild
@@ -0,0 +1,455 @@
+# Copyright 1999-2009 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.6.1.901-r2.ebuild,v 1.1 2009/05/22 15:01:28 remi Exp $
+
+EAPI="2"
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular multilib
+
+# keithp put this one in archive/ instead of releases/ for unknown reasons
+BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/archive/individual"
+SRC_URI="${SRC_URI}
+	${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2
+	mirror://gentoo/${P}-gentoo-patches-02.tar.bz2"
+
+OPENGL_DIR="xorg-x11"
+
+DESCRIPTION="X.Org X servers"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE_INPUT_DEVICES="
+	input_devices_acecad
+	input_devices_aiptek
+	input_devices_calcomp
+	input_devices_citron
+	input_devices_digitaledge
+	input_devices_dmc
+	input_devices_dynapro
+	input_devices_elo2300
+	input_devices_elographics
+	input_devices_evdev
+	input_devices_fpit
+	input_devices_hyperpen
+	input_devices_jamstudio
+	input_devices_joystick
+	input_devices_keyboard
+	input_devices_magellan
+	input_devices_microtouch
+	input_devices_mouse
+	input_devices_mutouch
+	input_devices_palmax
+	input_devices_penmount
+	input_devices_spaceorb
+	input_devices_summa
+	input_devices_tek4957
+	input_devices_tslib
+	input_devices_ur98
+	input_devices_virtualbox
+	input_devices_vmmouse
+	input_devices_void
+
+	input_devices_synaptics
+	input_devices_wacom"
+IUSE_VIDEO_CARDS="
+	video_cards_apm
+	video_cards_ark
+	video_cards_ast
+	video_cards_chips
+	video_cards_cirrus
+	video_cards_dummy
+	video_cards_epson
+	video_cards_fbdev
+	video_cards_geode
+	video_cards_glint
+	video_cards_i128
+	video_cards_i740
+	video_cards_intel
+	video_cards_impact
+	video_cards_imstt
+	video_cards_mach64
+	video_cards_mga
+	video_cards_neomagic
+	video_cards_nv
+	video_cards_r128
+	video_cards_radeon
+	video_cards_radeonhd
+	video_cards_rendition
+	video_cards_s3
+	video_cards_s3virge
+	video_cards_savage
+	video_cards_siliconmotion
+	video_cards_sis
+	video_cards_sisusb
+	video_cards_sunbw2
+	video_cards_suncg14
+	video_cards_suncg3
+	video_cards_suncg6
+	video_cards_sunffb
+	video_cards_sunleo
+	video_cards_suntcx
+	video_cards_tdfx
+	video_cards_tga
+	video_cards_trident
+	video_cards_tseng
+	video_cards_v4l
+	video_cards_vermilion
+	video_cards_vesa
+	video_cards_via
+	video_cards_virtualbox
+	video_cards_vmware
+	video_cards_voodoo
+	video_cards_xgi
+	video_cards_fglrx
+	video_cards_nvidia"
+IUSE_SERVERS="dmx kdrive xorg"
+IUSE="${IUSE_VIDEO_CARDS}
+	${IUSE_INPUT_DEVICES}
+	${IUSE_SERVERS}
+	tslib hal ipv6 minimal nptl sdl"
+RDEPEND="hal? ( sys-apps/hal )
+	tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
+	dev-libs/openssl
+	>=x11-libs/libXfont-1.4.0
+	>=x11-libs/xtrans-1.2.3
+	>=x11-libs/libXau-1.0.4
+	>=x11-libs/libXext-1.0.4
+	>=x11-libs/libX11-1.1.5
+	>=x11-libs/libxkbfile-1.0.4
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXmu-1.0.3
+	>=x11-libs/libXrender-0.9.4
+	>=x11-libs/libXi-1.2.1
+	>=x11-libs/pixman-0.14.0
+	media-libs/freetype
+	>=x11-misc/xbitmaps-1.0.1
+	>=x11-misc/xkeyboard-config-1.4
+	x11-apps/xkbcomp
+	>=x11-apps/iceauth-1.0.2
+	>=x11-apps/rgb-1.0.3
+	>=x11-apps/xauth-1.0.3
+	>=x11-apps/xinit-1.0.8-r3
+	app-admin/eselect-opengl
+	>=x11-libs/libXaw-1.0.5
+	>=x11-libs/libXpm-3.5.7
+	>=x11-libs/libXinerama-1.0.3
+	>=x11-libs/libpciaccess-0.10.3
+	dmx? (
+		>=x11-libs/libdmx-1.0.2
+		>=x11-libs/libXfixes-4.0.3
+	)
+	!minimal? (
+		>=x11-libs/libXtst-1.0.3
+		>=x11-libs/libXres-1.0.3
+		>=media-libs/mesa-7.3_rc1[nptl=]
+	)
+	>=x11-libs/libxkbui-1.0.2
+	kdrive? ( sdl? ( media-libs/libsdl ) )"
+	# Xres is dmx-dependent
+	# Xaw is dmx-dependent
+	# Xpm is dmx-dependent, pulls in Xt
+	# xkbcomp is launched at startup but not checked by ./configure
+DEPEND="${RDEPEND}
+	!net-dialup/dtrace
+	sys-devel/flex
+	>=x11-proto/randrproto-1.2.99.4
+	>=x11-proto/renderproto-0.9.3
+	>=x11-proto/fixesproto-4
+	>=x11-proto/damageproto-1.1
+	>=x11-proto/xextproto-7.0.4
+	>=x11-proto/xproto-7.0.14
+	>=x11-proto/xf86dgaproto-2.0.3
+	>=x11-proto/xf86rushproto-1.1.2
+	>=x11-proto/xf86vidmodeproto-2.2.2
+	>=x11-proto/compositeproto-0.4
+	>=x11-proto/recordproto-1.13.2
+	>=x11-proto/resourceproto-1.0.2
+	>=x11-proto/videoproto-2.2.2
+	>=x11-proto/scrnsaverproto-1.1.0
+	>=x11-proto/trapproto-3.4.3
+	>=x11-proto/xineramaproto-1.1.2
+	>=x11-proto/fontsproto-2.0.2
+	>=x11-proto/kbproto-1.0.3
+	>=x11-proto/inputproto-1.5.0
+	>=x11-proto/bigreqsproto-1.0.2
+	>=x11-proto/xcmiscproto-1.1.2
+	>=x11-proto/glproto-1.4.9
+	dmx? ( >=x11-proto/dmxproto-2.2.2 )
+	!minimal? (
+		>=x11-proto/xf86driproto-2.0.4
+		>=x11-proto/dri2proto-1.99.3
+		>=x11-libs/libdrm-2.3
+	)"
+
+# Drivers
+PDEPEND="
+	xorg? (
+		input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.3.0 )
+		input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.2.0 )
+		input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.2 )
+		input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.1 )
+		input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.1 )
+		input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.2 )
+		input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.2 )
+		input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.2 )
+		input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.2.3 )
+		input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-2.1.3 )
+		input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.3.0 )
+		input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.2.0 )
+		input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.2.0 )
+		input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.4.0 )
+		input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.3.2 )
+		input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.2.0 )
+		input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.2.0 )
+		input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.4.0 )
+		input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.2.1 )
+		input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.2.0 )
+		input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.4.0 )
+		input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.1 )
+		input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.2.0 )
+		input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.2.0 )
+		input_devices_tslib? ( x11-drivers/xf86-input-tslib )
+		input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
+		input_devices_virtualbox? ( x11-drivers/xf86-input-virtualbox )
+		input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.6.3 )
+		input_devices_void? ( >=x11-drivers/xf86-input-void-1.2.0 )
+		input_devices_synaptics? ( >=x11-drivers/xf86-input-synaptics-0.15.0 )
+		input_devices_wacom? ( x11-drivers/linuxwacom )
+
+		video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.2.1 )
+		video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.7.1 )
+		video_cards_ast? ( >=x11-drivers/xf86-video-ast-0.87.0 )
+		video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.2.1 )
+		video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.2.1 )
+		video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.3.1 )
+		video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.4.0 )
+		video_cards_geode? ( >=x11-drivers/xf86-video-geode-2.9.0  )
+		video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.2 )
+		video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.3.1 )
+		video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.2.0 )
+		video_cards_intel? ( >=x11-drivers/xf86-video-intel-2.4.2-r1 )
+		video_cards_mach64? ( >=x11-drivers/xf86-video-mach64-6.8.0 )
+		video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.9 )
+		video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.2.2 )
+		video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.12 )
+		video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-173.14.09 )
+		video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.552-r2 )
+		video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.8.0 )
+		video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.11.0 )
+		video_cards_radeonhd? ( >=x11-drivers/xf86-video-radeonhd-1.2.1 )
+		video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.2.1 )
+		video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.6.1 )
+		video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.10.2 )
+		video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.2.1 )
+		video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.0 )
+		video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.10.1 )
+		video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.9.1 )
+		video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.2.0 )
+		video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.2.0 )
+		video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.4.1 )
+		video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.2.0 )
+		video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.3.1 )
+		video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.2.1 )
+		video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.2.0 )
+		video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-2.2.0 )
+		video_cards_via? ( >=x11-drivers/xf86-video-openchrome-0.2.903 )
+		video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox )
+		video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.16.5 )
+		video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.2.1 )
+		video_cards_xgi? ( >=x11-drivers/xf86-video-xgi-1.5.0 )
+
+		!x11-drivers/xf86-video-impact
+		!x11-drivers/xf86-video-imstt
+		!x11-drivers/xf86-video-newport
+		!x11-drivers/xf86-video-sunbw2
+		!x11-drivers/xf86-video-suncg14
+		!x11-drivers/xf86-video-suncg3
+		!x11-drivers/xf86-video-suncg6
+		!x11-drivers/xf86-video-suntcx
+		!x11-drivers/xf86-video-vermilion
+
+		!x11-drivers/xf86-video-cyrix
+		!x11-drivers/xf86-video-nsc
+		!x11-drivers/xf86-video-vga
+	)"
+LICENSE="${LICENSE} MIT"
+
+EPATCH_FORCE="yes"
+EPATCH_SUFFIX="patch"
+
+# Local customizations, unsuitable for upstream
+GENTOO_PATCHES=(
+	"${FILESDIR}/1.4-fpic-libxf86config.patch"
+	)
+
+# These have been sent upstream
+UPSTREAMED_PATCHES=(
+	"${WORKDIR}/patches/"
+	)
+
+PATCHES=(
+	"${GENTOO_PATCHES[@]}"
+	"${UPSTREAMED_PATCHES[@]}"
+	)
+
+pkg_setup() {
+	use minimal || ensure_a_server_is_building
+
+	# 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
+
+	# 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
+	CONFIGURE_OPTIONS="
+		$(use_enable ipv6)
+		$(use_enable dmx)
+		$(use_enable kdrive)
+		$(use_enable tslib)
+		$(use_enable tslib xcalibrate)
+		$(use_enable !minimal xvfb)
+		$(use_enable !minimal xnest)
+		$(use_enable !minimal record)
+		$(use_enable !minimal xfree86-utils)
+		$(use_enable !minimal install-libxf86config)
+		$(use_enable !minimal dri)
+		$(use_enable !minimal dri2)
+		$(use_enable !minimal glx)
+		$(use_enable xorg)
+		$(use_enable nptl glx-tls)
+		$(use_enable hal config-dbus)
+		$(use_enable hal config-hal)
+		--sysconfdir=/etc/X11
+		--localstatedir=/var
+		--enable-install-setuid
+		--with-fontdir=/usr/share/fonts
+		--with-xkb-output=/var/lib/xkb
+		--without-dtrace
+		${conf_opts}"
+
+	# (#121394) Causes window corruption
+	filter-flags -fweb
+
+	# Incompatible with GCC 3.x SSP on x86, bug #244352
+	if use x86 ; then
+		if [[ $(gcc-major-version) -lt 4 ]]; then
+			filter-flags -fstack-protector
+		fi
+	fi
+
+	OLD_IMPLEM="$(eselect opengl show)"
+	eselect opengl set --impl-headers ${OPENGL_DIR}
+}
+
+src_prepare() {
+	x-modular_patch_source
+
+	if use hal; then
+		sed -i \
+			-e "s:^\(dbusconfigdir = \).*\(dbus-1.*\):\1/etc/\2:g" \
+			"${S}"/config/Makefile.am \
+			|| die "failed to fix DBUS config directory"
+		SNAPSHOT="yes"
+	fi
+
+	x-modular_reconf_source
+}
+
+src_install() {
+	x-modular_src_install
+
+	dynamic_libgl_install
+
+	server_based_install
+
+	# Install video mode files for system-config-display
+	insinto /usr/share/xorg
+	doins hw/xfree86/common/{extra,vesa}modes \
+		|| die "couldn't install extra modes"
+
+	# Bug #151421 - this file is not built with USE="minimal"
+	# Bug #151670 - this file is also not build if USE="-xorg"
+	if ! use minimal &&	use xorg; then
+		# Install xorg.conf.example
+		insinto /etc/X11
+		doins hw/xfree86/xorg.conf.example \
+			|| die "couldn't install xorg.conf.example"
+	fi
+}
+
+pkg_postinst() {
+	switch_opengl_implem
+
+	# Bug #135544
+	ewarn "Users of reduced blanking now need:"
+	ewarn "   Option \"ReducedBlanking\""
+	ewarn "In the relevant Monitor section(s)."
+	ewarn "Make sure your reduced blanking modelines are safe!"
+
+	echo
+	ewarn "You must rebuild all drivers if upgrading from xorg-server 1.5"
+	ewarn "or earlier, because the ABI changed. If you cannot start X because"
+	ewarn "of module version mismatch errors, this is your problem."
+
+	echo
+	ewarn "You can generate a list of all installed packages in the x11-drivers"
+	ewarn "category using this command:"
+	ewarn "emerge portage-utils; qlist -I -C x11-drivers/"
+
+	ebeep 5
+	epause 10
+}
+
+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() {
+	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 ${OLD_IMPLEM}
+}
+
+ensure_a_server_is_building() {
+	for server in ${IUSE_SERVERS}; do
+		use ${server} && return;
+	done
+	eerror "You need to specify at least one server to build."
+	eerror "Valid servers are: ${IUSE_SERVERS}."
+	die "No servers were specified to build."
+}