Version bup xorg-server 1.7. Remove old one.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

3 files changed, 9 insertions, 45 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 2e726384b708..2cdf5c1e7974 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.454 2009/10/12 08:19:07 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.455 2009/10/14 12:22:54 scarabeus Exp $
+
+*xorg-server-1.7.0.901 (14 Oct 2009)
+
+  14 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, +xorg-server-1.7.0.901.ebuild:
+  Version bup xorg-server 1.7. Remove old one.
 
 *xorg-server-1.6.5 (12 Oct 2009)
 
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
deleted file mode 100644
index deff5e6fe950..000000000000
--- a/x11-base/xorg-server/files/1.7.0-xkb-check-permissions-on-XKM_OUTPUT_DIR.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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.901.ebuild
index 8a6ca8eec69c..bcc0deca182d 100644
--- a/x11-base/xorg-server/xorg-server-1.7.0.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.7.0.901.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.0.901.ebuild,v 1.1 2009/10/14 12:22:54 scarabeus Exp $
 
 EAPI="2"
 
@@ -121,8 +121,6 @@ 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=(