Drop unused patch.

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

4 files changed, 10 insertions, 77 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index cc6c2eef8cb4..9bfc9af62ba6 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.222 2010/08/01 08:33:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.223 2010/08/10 12:44:48 scarabeus Exp $
+
+  10 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/ati-drivers-xen.patch:
+  Drop unused patch.
 
   01 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   ati-drivers-10.4.ebuild, ati-drivers-10.5.ebuild,
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-xen.patch b/x11-drivers/ati-drivers/files/ati-drivers-xen.patch
deleted file mode 100644
index a1b88df7fa84..000000000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-xen.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- common/lib/modules/fglrx/build_mod/firegl_public.c	2008-12-09 15:17:27.000000000 +0000
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c	2008-12-09 15:12:34.000000000 +0000
-@@ -31,6 +31,9 @@
- #include <linux/autoconf.h>
- 
- #if !defined(CONFIG_X86_PC) 
-+#if !defined(CONFIG_X86_PC_XEN)
-+#if !defined(CONFIG_X86_XEN)
-+#if !defined(CONFIG_X86_64_XEN)
- #if !defined(CONFIG_X86_64)
- #if !defined(CONFIG_X86_VOYAGER)
- #if !defined(CONFIG_X86_NUMAQ)
-@@ -47,6 +50,9 @@
- #endif
- #endif
- #endif
-+#endif
-+#endif
-+#endif
- 
- /* The dirty-page-tracking patch included in NLD 9 SMP kernels defines
-  * a static inline function that uses a GPL-only symbol in a header
---- common/lib/modules/fglrx/build_mod/firegl_public.h	2008-12-09 15:17:27.000000000 +0000
-+++ common/lib/modules/fglrx/build_mod/firegl_public.h	2008-12-09 15:15:45.000000000 +0000
-@@ -30,9 +30,13 @@
- #endif
- 
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
--
-+#ifdef CONFIG_XEN
-+#define REMAP_PAGE_RANGE_FN io_remap_pfn_range
-+#define REMAP_PAGE_RANGE_STR "io_remap_pfn_range"
-+#else
- #define REMAP_PAGE_RANGE_FN remap_pfn_range
- #define REMAP_PAGE_RANGE_STR "remap_pfn_range"
-+#endif
- #define REMAP_PAGE_RANGE_OFF(offset) ((offset) >> PAGE_SHIFT)
- 
- #else /* LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,9) */
-@@ -43,13 +47,21 @@
- 
- #endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) */
- 
-+#ifdef CONFIG_XEN
-+#define REMAP_PAGE_RANGE(vma,offset) \
-+    REMAP_PAGE_RANGE_FN((vma), \
-+                        (vma)->vm_start,       \
-+                        REMAP_PAGE_RANGE_OFF(offset), \
-+                        (vma)->vm_end - (vma)->vm_start, \
-+                        (vma)->vm_page_prot)
-+#else
- #define REMAP_PAGE_RANGE(vma,offset) \
-     REMAP_PAGE_RANGE_FN(FGL_VMA_API_PASS \
-                         (vma)->vm_start,	\
-                         REMAP_PAGE_RANGE_OFF(offset), \
-                         (vma)->vm_end - (vma)->vm_start, \
-                         (vma)->vm_page_prot)
--
-+#endif
- 
- /* Page table macros */
- 
diff --git a/x11-drivers/xf86-input-wacom/ChangeLog b/x11-drivers/xf86-input-wacom/ChangeLog
index c571d93bfaa5..b1e55613d327 100644
--- a/x11-drivers/xf86-input-wacom/ChangeLog
+++ b/x11-drivers/xf86-input-wacom/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-input-wacom
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/ChangeLog,v 1.22 2010/08/04 15:48:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/ChangeLog,v 1.23 2010/08/10 12:46:27 scarabeus Exp $
+
+  10 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/0.10.3-protocol-4.patch:
+  Drop unused patch.
 
   04 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   xf86-input-wacom-0.10.8.ebuild:
diff --git a/x11-drivers/xf86-input-wacom/files/0.10.3-protocol-4.patch b/x11-drivers/xf86-input-wacom/files/0.10.3-protocol-4.patch
deleted file mode 100644
index 1559a44e11a3..000000000000
--- a/x11-drivers/xf86-input-wacom/files/0.10.3-protocol-4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/wcmUSB.c b/src/wcmUSB.c
-index 7d72473..954af06 100644
---- a/src/wcmUSB.c
-+++ b/src/wcmUSB.c
-@@ -888,7 +888,7 @@ static void usbParseEvent(LocalDevicePtr local,
- 	}
-
- 	/* ignore events without information */
--	if (common->wcmEventCnt <= 2)
-+	if ((common->wcmEventCnt <= 2) && common->wcmLastToolSerial)
- 	{
- 		DBG(3, common, "%s: dropping empty event"
- 			" for serial %d\n", local->name, common->wcmLastToolSerial);