Version bump.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

3 files changed, 274 insertions, 12 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 6203517ee719..c5ff731cac6e 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.479 2009/12/27 17:58:33 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.480 2009/12/27 23:42:03 scarabeus Exp $
+
+*xorg-server-1.7.3.902 (27 Dec 2009)
+
+  27 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +xorg-server-1.7.3.902.ebuild:
+  Version bump.
 
   27 Dec 2009; Joseph Jezak <josejx@gentoo.org> xorg-server-1.6.5-r1.ebuild:
   Marked ppc stable for bug #294958.
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 9e8b83e72759..55c21368ecf4 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.4-fix-kdrive-automake.patch 382 RMD160 78062824a416a2b452866d50592cc71bf34b13be SHA1 f21a54aed8eae1e718f2f0c262c37c36ccccd152 SHA256 126b67332c902802da506970acf253030004e4f7e17b3b6d2e68dd6b7bb0db81
 AUX 1.4-fpic-libxf86config.patch 374 RMD160 614d69f83b7f4d4999efa906f2059b7f287e22c1 SHA1 1f113823c03f69e79b10965908945df629b73474 SHA256 017e7ba2954dcc2281f8626977d47fd8bd037f05e680e51b8e4ae7316455a237
 AUX 1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch 3303 RMD160 69966b78924cc4f03df8ff0edc1666370a6b9e67 SHA1 a95b2e0ec5f47e91769b596872c4a7700101d730 SHA256 8f24228cf93819a59f016b42d31cd1d4c6d4b014a24d690dd3b5e88e0040563f
@@ -11,16 +8,11 @@ DIST xorg-server-1.6.3.901.tar.bz2 4678171 RMD160 45421fdb4524ffd1b247569a1c7dc7
 DIST xorg-server-1.6.5-gentoo-patches-01.tar.bz2 5482 RMD160 4e415d7aeb24172035f648ae14776aad33f7a441 SHA1 81d59f957f13c30cdcecc3bca0adb58befb26c0e SHA256 10a2184a63eafba51846b96833acd4b67c0524b1338bd4ef0218686d7f8e7414
 DIST xorg-server-1.6.5.tar.bz2 4678406 RMD160 702970358a5643dbc9205f42e39c5b8ed2ff845a SHA1 c57c80dd15d3ca492e58ae993b9015d085ec6ea6 SHA256 f3c0e43cf73e7d438350016cabd9957dc000ded9c5fdeebf84a02df61963b2ce
 DIST xorg-server-1.7.3.901.tar.bz2 4919082 RMD160 b8dcd713910068dadad74781c1f90419bc622361 SHA1 648ed22d03b5d8d68c2f6ee1b91b438b2dd920ac SHA256 5cbae8a6f90e47b33b07a060b110f8ca4f40b94c989c9b8cc910fa55cbba2f48
+DIST xorg-server-1.7.3.902.tar.bz2 4920314 RMD160 81f33b7fa734d887db316e9fe617ff6cf4ef9c41 SHA1 176defecb42912ebae187c347ca2168a3139bc0b SHA256 4ccab4a1dc3290fef3b84687eebffc037c926356711bbfd05981e39c53078741
 EBUILD xorg-server-1.5.3-r6.ebuild 15605 RMD160 732f7b45d94b65ecc3458e4fb3dc4eea979f35d4 SHA1 92dc0563740107701664442e9273a65399b6f604 SHA256 d6250ae0808d1819ee15c6556a67dacf5c21dee751e35dd0405792fa89745603
 EBUILD xorg-server-1.6.3.901-r2.ebuild 7070 RMD160 40962a553d576ae3ac9532fc9a720332b4888fc7 SHA1 33b960b320284ac47d977239f8592749d109edef SHA256 18cf9beffe49b82375512a96a20626fd8a53144d8e3cdeb3d4145c1d64b704c2
 EBUILD xorg-server-1.6.5-r1.ebuild 6847 RMD160 d89bf72920dde1f9a04e91968cee88d2062636b4 SHA1 e5860fdba0daf68ab4bafbc6f10497169614ae78 SHA256 73d7fcf739ab43b8458378daba481323c104cf599691bdebeb2295c1ce29a518
 EBUILD xorg-server-1.7.3.901-r1.ebuild 7011 RMD160 263f722d922874bafdef6835af03cfa1bd4c62fb SHA1 5ebf0f0f70340fb4f7cbf0705bbf0c7efda6d4fd SHA256 96ae668e6aa9aa7ec2d37fdbbeb32ccda1cda27c819e449a8027ace95cb7779a
-MISC ChangeLog 109093 RMD160 9bbe53f9d2002b868e8a018068cbbb6caf956e4d SHA1 d93b0ad8d9259c8f38bb45dfd37ec74d7e0e40a8 SHA256 1230481f2be9de8c03dcea5cf599cb14d135ea77900b1dbb2dbc119e4bf73b13
+EBUILD xorg-server-1.7.3.902.ebuild 7012 RMD160 d55c319138d367a12aaedfde18c738036974bd79 SHA1 7c6ab5263c3c055b842d11044005ea659d0abe67 SHA256 9361f8db6c77581a543c3c7156dc2ae5be8635ad2f05915aa016b41310fe97eb
+MISC ChangeLog 109239 RMD160 8bb22f3f2419fb248972e0a1a52dfe197f6d37b5 SHA1 a931349a9e098a0823f08013b92643e52031fb39 SHA256 1d3034a9bfa93e009c6c4ea899a8f98b1d0001f08a5d323dbb6e602f1cbde94d
 MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAks3n/cACgkQcsIHjyDViGTBTwCdEozoO7sBtpIzAhIQxoLAjUXW
-Re4AoJ4992omp4v3sAXBZk9/KlSn8cwA
-=s32Z
------END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.7.3.902.ebuild b/x11-base/xorg-server/xorg-server-1.7.3.902.ebuild
new file mode 100644
index 000000000000..37b80f912efc
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.7.3.902.ebuild
@@ -0,0 +1,264 @@
+# 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.7.3.902.ebuild,v 1.1 2009/12/27 23:42:03 scarabeus Exp $
+
+EAPI="2"
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular multilib versionator
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
+
+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.3.3
+	>=x11-libs/xtrans-1.2.2
+	>=x11-libs/libXau-1.0.4
+	>=x11-libs/libxkbfile-1.0.4
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libpciaccess-0.10.3
+	>=x11-libs/pixman-0.15.20
+	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
+	dmx? (
+		x11-libs/libXt
+		>=x11-libs/libdmx-1.0.99.1
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXaw-1.0.4
+		>=x11-libs/libXext-1.0.5
+		>=x11-libs/libXfixes-4.0.3
+		>=x11-libs/libXi-1.2.99.1
+		>=x11-libs/libXmu-1.0.3
+		>=x11-libs/libXtst-1.0.3
+	)
+	!minimal? (
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXext-1.0.5
+		>=x11-libs/libXres-1.0.3
+		>=media-libs/mesa-7.4[nptl=]
+	)
+	>=x11-libs/libxkbui-1.0.2
+	kdrive? (
+		>=x11-libs/libXext-1.0.5
+		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
+
+## Deps that don't have a version in configure.ac but do here:
+# x11-proto/resourceproto
+# x11-proto/fontsproto
+# x11-libs/libXau
+# x11-libs/libXfont
+# x11-libs/libXdmcp
+# x11-libs/libXext
+# x11-libs/libX11
+# x11-libs/libXrender
+# x11-libs/libXmu
+# x11-libs/libXfixes
+# x11-libs/libXtst
+# x11-proto/xineramaproto
+# x11-proto/dmxproto
+## Deps that are larger here than in configure.ac
+# x11-libs/libpciaccess-0.8.0
+#
+
+DEPEND="${RDEPEND}
+	!!net-dialup/dtrace
+	sys-devel/flex
+	>=x11-proto/randrproto-1.2.99.3
+	>=x11-proto/renderproto-0.11
+	>=x11-proto/fixesproto-4.1
+	>=x11-proto/damageproto-1.1
+	>=x11-proto/xextproto-7.0.99.3
+	>=x11-proto/xproto-7.0.13
+	>=x11-proto/xf86dgaproto-2.0.99.1
+	>=x11-proto/xf86rushproto-1.1.2
+	>=x11-proto/xf86vidmodeproto-2.2.99.1
+	>=x11-proto/compositeproto-0.4
+	>=x11-proto/recordproto-1.13.99.1
+	>=x11-proto/resourceproto-1.0.2
+	>=x11-proto/videoproto-2.2.2
+	>=x11-proto/scrnsaverproto-1.1
+	>=x11-proto/trapproto-3.4.3
+	>=x11-proto/xineramaproto-1.1.3
+	>=x11-proto/fontsproto-2.0.2
+	>=x11-proto/kbproto-1.0.3
+	>=x11-proto/inputproto-1.9.99.902
+	>=x11-proto/bigreqsproto-1.1.0
+	>=x11-proto/xcmiscproto-1.2.0
+	>=x11-proto/glproto-1.4.9
+	dmx? ( >=x11-proto/dmxproto-2.2.99.1 )
+	!minimal? (
+		>=x11-proto/xf86driproto-2.1.0
+		>=x11-proto/dri2proto-2.1
+		>=x11-libs/libdrm-2.3.0
+	)"
+
+PDEPEND="xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
+
+EPATCH_FORCE="yes"
+EPATCH_SUFFIX="patch"
+
+# These have been sent upstream
+UPSTREAMED_PATCHES=(
+	#"${WORKDIR}/patches/"
+
+	# Fix from bug http://bugs.freedesktop.org/show_bug.cgi?id=25400
+	"${FILESDIR}/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch"
+	)
+
+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 ${OPENGL_DIR}
+}
+
+src_install() {
+	x-modular_src_install
+
+	dynamic_libgl_install
+
+	server_based_install
+
+	if ! use minimal &&	use xorg; then
+		# Install xorg.conf.example (see bugs #151421 and #151670)
+		insinto /etc/X11
+		doins hw/xfree86/xorg.conf.example \
+			|| die "couldn't install xorg.conf.example"
+	fi
+}
+
+pkg_postinst() {
+	switch_opengl_implem
+
+	echo
+	ewarn "You must rebuild all drivers if upgrading from xorg-server 1.6"
+	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."
+}