old

(Portage version: 2.2.0_alpha23/cvs/Linux x86_64)

3 files changed, 6 insertions, 68 deletions

diff --git a/x11-drivers/xf86-video-neomagic/ChangeLog b/x11-drivers/xf86-video-neomagic/ChangeLog
index 470f65e01a8b..db4c7571afb7 100644
--- a/x11-drivers/xf86-video-neomagic/ChangeLog
+++ b/x11-drivers/xf86-video-neomagic/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-neomagic
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-neomagic/ChangeLog,v 1.39 2011/02/12 19:26:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-neomagic/ChangeLog,v 1.40 2011/02/13 18:59:53 scarabeus Exp $
+
+  13 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-neomagic-1.2.4.ebuild,
+  -files/xf86-video-neomagic-1.2.4-fix-build-with-xserver-1.7.1.patch:
+  old
 
   12 Feb 2011; Raúl Porcel <armin76@gentoo.org>
   xf86-video-neomagic-1.2.5.ebuild:
diff --git a/x11-drivers/xf86-video-neomagic/files/xf86-video-neomagic-1.2.4-fix-build-with-xserver-1.7.1.patch b/x11-drivers/xf86-video-neomagic/files/xf86-video-neomagic-1.2.4-fix-build-with-xserver-1.7.1.patch
deleted file mode 100644
index c1cddb0b8606..000000000000
--- a/x11-drivers/xf86-video-neomagic/files/xf86-video-neomagic-1.2.4-fix-build-with-xserver-1.7.1.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Patch from upstream; caused due to removal of xf86UDelay()
-
-Fixes http://bugs.gentoo.org/291825
----
-From 4e2afb88212582df60bca3ec8c447965a5a66fd5 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Mon, 26 Oct 2009 19:43:50 +0000
-Subject: s/xf86UDelay/usleep/g
-
-cf. https://bugzilla.redhat.com/show_bug.cgi?id=523800
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/neo_driver.c b/src/neo_driver.c
-index ddb6812..e4c60f2 100644
---- a/src/neo_driver.c
-+++ b/src/neo_driver.c
-@@ -114,6 +114,8 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #include <X11/extensions/xf86dgastr.h>
- #endif
- 
-+#include <unistd.h>
-+
- /* Mandatory functions */
- static const OptionInfoRec *	NEOAvailableOptions(int chipid, int busid);
- static void     NEOIdentify(int flags);
-@@ -2489,7 +2491,7 @@ neoRestore(ScrnInfoPtr pScrn, vgaRegPtr VgaReg, NeoRegPtr restore,
-      * In some rare cases a lockup might occur if we don't delay
-      * here. (Reported by Miles Lane)
-      */
--    xf86UDelay(200000);
-+    usleep(200000);
-     /*
-      * Disable horizontal and vertical graphics and text expansions so
-      * that vgaHWRestore works properly.
-@@ -2502,7 +2504,7 @@ neoRestore(ScrnInfoPtr pScrn, vgaRegPtr VgaReg, NeoRegPtr restore,
-      * Sleep for 200ms to make sure that the two operations above have
-      * had time to take effect.
-      */
--    xf86UDelay(200000);
-+    usleep(200000);
-     /*
-      * This function handles restoring the generic VGA registers.  */
-     vgaHWRestore(pScrn, VgaReg,
---
-cgit v0.8.2
diff --git a/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.4.ebuild b/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.4.ebuild
deleted file mode 100644
index 37297059e06a..000000000000
--- a/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.4.ebuild,v 1.5 2009/12/15 15:39:54 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Neomagic video driver"
-KEYWORDS="amd64 ia64 x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xf86dgaproto
-	x11-proto/xproto"
-PATCHES=("${FILESDIR}/${P}-fix-build-with-xserver-1.7.1.patch")