From ec0088a9c5bb40e63672cb9f0328a3b4172b04c2 Mon Sep 17 00:00:00 2001
From: Luca Barbato <lu_zero@gentoo.org>
Date: Fri, 20 Aug 2004 14:12:40 +0000
Subject: Minor fix

---
 app-emulation/qemu/ChangeLog                        |  6 +++++-
 app-emulation/qemu/Manifest                         |  5 +++--
 app-emulation/qemu/files/qemu-0.6.0-sigaction.patch | 21 +++++++++++++++++++++
 app-emulation/qemu/qemu-0.6.0.ebuild                |  3 ++-
 4 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 app-emulation/qemu/files/qemu-0.6.0-sigaction.patch

(limited to 'app-emulation')

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index 333b9b5b3a61..c62d08b80c64 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/qemu
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.14 2004/07/13 14:03:12 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.15 2004/08/20 14:12:40 lu_zero Exp $
+
+  20 Aug 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/qemu-0.6.0-sigaction.patch, qemu-0.6.0.ebuild:
+  Remove ancient glibc workaround
 
 *qemu-0.6.0 (13 Jul 2004)
 
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index a32159d1ce4d..ecc3f9d62246 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,12 +1,13 @@
-MD5 0e65c5cc5f17f5e00f4c219e3782a0de qemu-0.6.0.ebuild 1530
+MD5 a86bd5375862c04145842f5467e25738 qemu-0.6.0.ebuild 1571
 MD5 db6c35fa4ad6e21c959cab27a63e0e84 qemu-0.5.3.ebuild 1129
-MD5 c0e76c3bb735fad7c61a3904652adcd2 ChangeLog 1752
+MD5 0ea7bb6e5f1ce60ececaa11997b6ed80 ChangeLog 1892
 MD5 be42bb328ff24160549960a145f53d42 qemu-0.5.5-r1.ebuild 1515
 MD5 898131aae735c3477ff2f9c6882f1178 metadata.xml 223
 MD5 4cb86c404627f57c95e561741dda268f qemu-0.5.5.ebuild 1475
 MD5 b320f3f8c9b4c5695af93a4b8a65ed2e qemu-0.5.4.ebuild 1233
 MD5 4b86f5b59feacd176698e9ecb59e7040 qemu-0.5.1.ebuild 1257
 MD5 18dca85a7af16809c4aa1c7c0053e611 qemu-0.5.2.ebuild 1257
+MD5 0b85ac42eaa41830ac9b4eccf4a118bd files/qemu-0.6.0-sigaction.patch 677
 MD5 f6094ee9cd2ee3a38404680796df2b75 files/qemu-0.6.0-typo.patch 528
 MD5 9052eb692ddc0cbb296d7712b0cc6f44 files/digest-qemu-0.6.0 62
 MD5 ed6b8235e3ff239ab99ca1d1a27bb3a3 files/digest-qemu-0.5.5 62
diff --git a/app-emulation/qemu/files/qemu-0.6.0-sigaction.patch b/app-emulation/qemu/files/qemu-0.6.0-sigaction.patch
new file mode 100644
index 000000000000..4f40e51635ff
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-0.6.0-sigaction.patch
@@ -0,0 +1,21 @@
+diff -ruN qemu-0.6.0.orig/vl.c qemu-0.6.0/vl.c
+--- qemu-0.6.0.orig/vl.c	2004-08-20 15:18:08.238568392 +0200
++++ qemu-0.6.0/vl.c	2004-08-20 15:18:44.294087120 +0200
+@@ -68,17 +68,6 @@
+ #ifdef __APPLE__
+ #include <SDL/SDL.h>
+ #endif
+-#if defined(__linux__)
+-/* SDL use the pthreads and they modify sigaction. We don't
+-   want that. */
+-#if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2))
+-extern void __libc_sigaction();
+-#define sigaction(sig, act, oact) __libc_sigaction(sig, act, oact)
+-#else
+-extern void __sigaction();
+-#define sigaction(sig, act, oact) __sigaction(sig, act, oact)
+-#endif
+-#endif /* __linux__ */
+ #endif /* CONFIG_SDL */
+ 
+ #include "disas.h"
diff --git a/app-emulation/qemu/qemu-0.6.0.ebuild b/app-emulation/qemu/qemu-0.6.0.ebuild
index 797b0218b42c..b9e999e510fa 100644
--- a/app-emulation/qemu/qemu-0.6.0.ebuild
+++ b/app-emulation/qemu/qemu-0.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.6.0.ebuild,v 1.1 2004/07/13 14:03:12 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.6.0.ebuild,v 1.2 2004/08/20 14:12:40 lu_zero Exp $
 
 inherit eutils
 
@@ -30,6 +30,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-typo.patch
+	epatch ${FILESDIR}/${P}-sigaction.patch
 }
 
 src_compile() {
-- 
cgit v1.2.3-65-gdbad