Version bump for xorg-server 1.7.

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

4 files changed, 316 insertions, 2 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index f300e8934d20..2b6d6cc4c167 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.449 2009/10/02 14:10:00 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.450 2009/10/03 16:05:24 scarabeus Exp $
+
+*xorg-server-1.7.0 (03 Oct 2009)
+
+  03 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/1.7.0-xkb-check-permissions-on-XKM_OUTPUT_DIR.patch,
+  +xorg-server-1.7.0.ebuild:
+  Version bump for xorg-server 1.7.
 
   02 Oct 2009; Rémi Cardona <remi@gentoo.org>
   +files/1.6.4-re-fix-DGA-removal.patch, xorg-server-1.6.4.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index f08143408933..bf7ebffa2c00 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -2,13 +2,16 @@ AUX 1.4-fix-kdrive-automake.patch 382 RMD160 78062824a416a2b452866d50592cc71bf34
 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
 AUX 1.6.4-re-fix-DGA-removal.patch 4991 RMD160 568b6250606e4022182aa36e16a4cd4bf15f293b SHA1 53972ea3a706ea0b117f7f170d4874e3df8313f6 SHA256 d254b01d56fd708c6c3ce863902b28113b5de71a18ece365d4ea59c1e1a1d2b8
+AUX 1.7.0-xkb-check-permissions-on-XKM_OUTPUT_DIR.patch 1371 RMD160 66e798ff629128eb7f8581d371b0562f537f37e6 SHA1 ec942c327edc35922156af748969a73d900823a3 SHA256 019f50bb9cc2ae1dbe627115f2d4d21a5e41fc2e3e6024e4e0f94af7e5db96c5
 DIST xorg-server-1.5.3-gentoo-patches-08.tar.bz2 60521 RMD160 5b6572450dd8379a0a932c7eb4762fbd58874ab1 SHA1 e269009caeb536e35f58e4a2ab7963eb9b5070ec SHA256 3ac1f99e5c9e21ddbcdd08ecd9687ad64dda8916282f951b74fadabb68e4badc
 DIST xorg-server-1.5.3.tar.bz2 5622625 RMD160 dc0c552e031963070b7a315ea4499810021d0eed SHA1 177529b6d7191a73df6abf2990cd7708398a8d81 SHA256 a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
 DIST xorg-server-1.6.3.901.tar.bz2 4678171 RMD160 45421fdb4524ffd1b247569a1c7dc728bd0cf965 SHA1 09e3d46178701ce76911553ee53309686822bb31 SHA256 1b8b9c40fc3da9268b03143cb4fc518baa9fcf88da73c7645c2d572bf23dbd50
 DIST xorg-server-1.6.4.tar.bz2 4679094 RMD160 96a0b8467749d45827557e7b3e6fce3fec6b43c1 SHA1 9d37f9c14984568afddf0aa84f8409f895277255 SHA256 9c736d4c0246a6f2214a2f2c1a6fa9e2bf860f7785bf469de575529851fc1145
+DIST xorg-server-1.7.0.tar.bz2 4885401 RMD160 69c9126a0f7fcf8c84c2c544338f5a5b66a272fb SHA1 8b44511702f79ab9502d7b0936a6a19b392ba223 SHA256 e55996b1e4217f84c61fd8d1126d7171295d83ddfaa63c5c516c63bf4703a6c4
 EBUILD xorg-server-1.5.3-r6.ebuild 15760 RMD160 82e5a893c835ef0b3b9cad8e20cd2f388a4cfa75 SHA1 f0b3fc71cf84b5868756f4240c9e323be1d65010 SHA256 2e1c52b41126b59c5de2e806a2fde726fb7d673956c628af51b47b6841002de8
 EBUILD xorg-server-1.5.3-r7.ebuild 15862 RMD160 90ff9fcc140d8578531418669607bdb042af144b SHA1 44d104f7b8f415eb50505ff83c292a087ef34caf SHA256 7762b1b300f0648c479d1e265e9431052a081d641d32ab3541e9e8b44d2498d8
 EBUILD xorg-server-1.6.3.901-r2.ebuild 7095 RMD160 c9a18fbd39b3b6f9b234b672f22b474ab1e135dd SHA1 f3e4afbdbd85734e5624d83af15f7d1fb92db0b4 SHA256 17697b795c210248f0e9699c76095497fc28c982aa9e3ab30d74a16d658967d9
 EBUILD xorg-server-1.6.4.ebuild 6908 RMD160 8ae1016f592701b383c37416a55c0eaeaec9a42d SHA1 8e0dc15c81c5cde1a9b980fbba291f96c4906113 SHA256 4b9f18c849e0f9641864668ec362369fa28e4c3f00ba2f16d8b3d1925d3d40c6
-MISC ChangeLog 104442 RMD160 776dd4885f89e7d18e438e342889a969f38b647f SHA1 be832f53e0ea021c0427efa56b4580e2d3c5575e SHA256 dcbccc1c463719e149200795721a8dea32e834d74e3a0ba25b3c5cac7041f462
+EBUILD xorg-server-1.7.0.ebuild 6948 RMD160 75622c4444245485130bde9579ec62738b081e7d SHA1 a3444a852366833a5ff75d8eef71da146bc2e4e7 SHA256 a6b5d0bb356ecfe5464c9873960f6a1a8b6d3ad5b0c2e605a2b6c5c0fa0c371d
+MISC ChangeLog 104664 RMD160 00d267333c110691fc875cad4cc0d4c1bc4f91b9 SHA1 4b16b533d2b27454cfa42022930ebeb8453f823e SHA256 69ca48e6c14a0ccc473f7a27c4e4a142d923d910e200afb090678a2bbc0309d9
 MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b
diff --git a/x11-base/xorg-server/files/1.7.0-xkb-check-permissions-on-XKM_OUTPUT_DIR.patch b/x11-base/xorg-server/files/1.7.0-xkb-check-permissions-on-XKM_OUTPUT_DIR.patch
new file mode 100644
index 000000000000..deff5e6fe950
--- /dev/null
+++ b/x11-base/xorg-server/files/1.7.0-xkb-check-permissions-on-XKM_OUTPUT_DIR.patch
@@ -0,0 +1,41 @@
+From 9bc7cbf9c02656982c2525836b5498993f708e02 Mon Sep 17 00:00:00 2001
+From: Nirbheek Chauhan <nirbheek@gentoo.org>
+Date: Tue, 29 Sep 2009 22:35:06 +0530
+Subject: [PATCH 01/10] xkb: check permissions on XKM_OUTPUT_DIR
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Checking just for root is insufficient since that does not guarantee write/read
+permissions in XKM_OUTPUT_DIR (for example with sandbox).
+
+Check if we can write a file, as well as read it later. Otherwise, invoke the
+fallback to /tmp
+
+Signed-off-by: Nirbheek Chauhan <nirbheek@gentoo.org>
+Signed-off-by: Rémi Cardona <remi@gentoo.org>
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ xkb/ddxLoad.c |    5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
+index 6954dd1..ba8d50b 100644
+--- a/xkb/ddxLoad.c
++++ b/xkb/ddxLoad.c
+@@ -158,10 +158,9 @@ OutputDirectory(
+     size_t size)
+ {
+ #ifndef WIN32
+-    if (getuid() == 0 && (strlen(XKM_OUTPUT_DIR) < size))
++    /* Can we write an xkm and then open it too? */
++    if (access(XKM_OUTPUT_DIR, W_OK | X_OK) == 0 && (strlen(XKM_OUTPUT_DIR) < size))
+     {
+-	/* if server running as root it *may* be able to write */
+-	/* FIXME: check whether directory is writable at all */
+ 	(void) strcpy (outdir, XKM_OUTPUT_DIR);
+     } else
+ #else
+-- 
+1.6.5.rc1
+
diff --git a/x11-base/xorg-server/xorg-server-1.7.0.ebuild b/x11-base/xorg-server/xorg-server-1.7.0.ebuild
new file mode 100644
index 000000000000..8a6ca8eec69c
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.7.0.ebuild
@@ -0,0 +1,263 @@
+# 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.0.ebuild,v 1.1 2009/10/03 16:05:24 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.2
+		>=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.2 )
+	!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/"
+	# Merged for 1.7.1
+	"${FILESDIR}/${PV}-xkb-check-permissions-on-XKM_OUTPUT_DIR.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 --impl-headers ${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."
+}