Version bump to have working env with eselect-opengl 1.0.8

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

3 files changed, 280 insertions, 2 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 71069c44c904..886076f24de8 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.442 2009/09/04 23:51:31 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.443 2009/09/15 10:07:13 scarabeus Exp $
+
+*xorg-server-1.6.3.901-r2 (15 Sep 2009)
+
+  15 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +xorg-server-1.6.3.901-r2.ebuild:
+  Version bump to have working env with eselect-opengl 1.0.8
 
   04 Sep 2009; Rémi Cardona <remi@gentoo.org>
   xorg-server-1.6.3.901-r1.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index af0653387ccd..0784a97329d6 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -61,7 +64,15 @@ EBUILD xorg-server-1.4.2.ebuild 15793 RMD160 807356c35f65f972314ba24f545e3ccf97e
 EBUILD xorg-server-1.5.3-r6.ebuild 15742 RMD160 15f17e5a2d049b22ab65233cb3b21fbf6e552c5b SHA1 4c488dbca8ece22fe77351f0e8903c4df0c73c6c SHA256 c76acc8407c599e059db64ea415f443f8f94f0d84c3a757974ea6fee590fc25f
 EBUILD xorg-server-1.5.3-r7.ebuild 15844 RMD160 57c4e16c9ea3428501be56dab5c2c3ef2c73f423 SHA1 4c6b51ca73c0c3be469f3277ac866d0251723f27 SHA256 2d900456b555b64a91f137a100f91987787a8db3aa7f8b94e5fc8fa6b6d03b0a
 EBUILD xorg-server-1.6.3.901-r1.ebuild 7086 RMD160 c6ddb229b31c5db28fce1b9af3668ee37c0b5491 SHA1 db1e058bdad49bcd49ebad49784a2951b21dd6fa SHA256 6694f4151536a62df0060e4ba6a7cba16218aa60d602257c7d16453abcc117b0
+EBUILD xorg-server-1.6.3.901-r2.ebuild 7096 RMD160 d27a89d9416094d9d57ea0e5f65a3910c458e5ca SHA1 0686c1cd2f088779c6ba871a27a5e99c8f6f4dc7 SHA256 6d40d5ccd638569383854233f0d564d904c28468aace544fb3c2cd1d013807d3
 EBUILD xorg-server-1.6.3.901.ebuild 12784 RMD160 22f11ea05d5da259c9d11b842780e11ea1799692 SHA1 a3c4c9b1f478eddd4498e8aecfba1db28260c989 SHA256 86bfd572fb3c4956a4db71681c8d8aceed340a55ef4ede217fffa33cea6eb06c
 EBUILD xorg-server-1.6.3.ebuild 12812 RMD160 fcae061f498feb043107350d3fd22e9c5e66aec6 SHA1 c86c5e3334573234e779cfda850c80d80d8b13f7 SHA256 eac04208643edae469630d04641d516746d1a8f9edf3e192c113b6e4e0fe5caa
-MISC ChangeLog 100919 RMD160 778af7ff71318a4b3928eeff04b05333ea3f0d3d SHA1 244f0598276302e8fd9630abc159124a83fead4c SHA256 a0c58fb81c9f77be347032ed092306dcf91ff081c0247449728666c32b5e8317
+MISC ChangeLog 101118 RMD160 39a21484785328d12b7ada022638ccd815e89710 SHA1 8aa6be7cc5e5da1ea503134018c1f02cefbac2c7 SHA256 7596898db539388ecbce1120fdc193b4c613844c7bb885baacb8822ce2504198
 MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqvZ34ACgkQHB6c3gNBRYcOTwCaAgmDZ5RrGsg0pwoaoT/VozLS
+qqMAoMxYFacTY6d31xo+UQhgNpuvdiNZ
+=QxUq
+-----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.6.3.901-r2.ebuild b/x11-base/xorg-server/xorg-server-1.6.3.901-r2.ebuild
new file mode 100644
index 000000000000..ccf1032f7a69
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.6.3.901-r2.ebuild
@@ -0,0 +1,261 @@
+# 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.3.901-r2.ebuild,v 1.1 2009/09/15 10:07:13 scarabeus Exp $
+
+EAPI="2"
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular multilib versionator
+
+SRC_URI="${SRC_URI}"
+#	mirror://gentoo/${P}-gentoo-patches-01.tar.bz2
+
+OPENGL_DIR="xorg-x11"
+
+DESCRIPTION="X.Org X servers"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+
+IUSE_SERVERS="dmx kdrive xorg"
+IUSE="${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-1.0.8
+	>=x11-libs/libXaw-1.0.5
+	>=x11-libs/libXpm-3.5.7
+	>=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-2.1
+		>=x11-libs/libdrm-2.3
+	)"
+
+PDEPEND="xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
+LICENSE="${LICENSE} MIT"
+
+EPATCH_FORCE="yes"
+EPATCH_SUFFIX="patch"
+
+# Local customizations, unsuitable for upstream
+GENTOO_PATCHES=(
+	"${FILESDIR}/1.4-fpic-libxf86config.patch"
+	"${FILESDIR}/${PV}-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.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-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_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/lib{glx,dri,dri2}*; 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."
+}