Fixing #70992 and declaring latest stable for x86.

5 files changed, 30 insertions, 7 deletions

diff --git a/media-video/alevt/ChangeLog b/media-video/alevt/ChangeLog
index 614f309a1c9d..d7debe2c205b 100644
--- a/media-video/alevt/ChangeLog
+++ b/media-video/alevt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/alevt
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/ChangeLog,v 1.11 2004/08/14 14:45:46 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/ChangeLog,v 1.12 2004/11/15 10:35:04 phosphan Exp $
+
+  15 Nov 2004; Patrick Kursawe <phosphan@gentoo.org> +files/xio_timer.patch,
+  alevt-1.6.0-r3.ebuild, alevt-1.6.1.ebuild:
+  Applying user-provided patch for gcc 3.4 problems (bug #70992), declaring
+  latest version stable.
 
   14 Aug 2004; Sven Wegener <swegener@gentoo.org> alevt-1.6.0-r3.ebuild,
   alevt-1.6.1.ebuild:
diff --git a/media-video/alevt/Manifest b/media-video/alevt/Manifest
index bb4fb2aad58e..18add809ed07 100644
--- a/media-video/alevt/Manifest
+++ b/media-video/alevt/Manifest
@@ -1,7 +1,8 @@
-MD5 338613e199fe269f3dcf8ae8fbbbb739 alevt-1.6.1.ebuild 999
-MD5 753bd2d2ff5577ccfd00d678c516c6b4 alevt-1.6.0-r3.ebuild 934
-MD5 dbaea31be637d31cafcf3033c8f55723 ChangeLog 1721
+MD5 6e22184d319fb42e9b96d6943da42384 alevt-1.6.1.ebuild 998
+MD5 0bf4828269ee8559adc44df0f5bcdfe0 alevt-1.6.0-r3.ebuild 971
+MD5 0b16c1d2c7012b12c0c3db6f42a27530 ChangeLog 1945
 MD5 5ef11878179d451985ee7157a416c27e metadata.xml 222
+MD5 9a3fcfb347b9abd5f81f793a18727c86 files/xio_timer.patch 382
 MD5 2eee39ac17210c63326ffee22c2cffb1 files/alevt.desktop 159
 MD5 4b33a59a4f04a8a1edaf6d18f71e7101 files/digest-alevt-1.6.1 63
 MD5 9b2908a22bc1aeee2713dd6447f077e4 files/alevt-1.6.0-gentoo.diff 1430
diff --git a/media-video/alevt/alevt-1.6.0-r3.ebuild b/media-video/alevt/alevt-1.6.0-r3.ebuild
index 4a18fb2eeecc..fd593f27fb0a 100644
--- a/media-video/alevt/alevt-1.6.0-r3.ebuild
+++ b/media-video/alevt/alevt-1.6.0-r3.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/media-video/alevt/alevt-1.6.0-r3.ebuild,v 1.9 2004/08/14 14:45:46 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/alevt-1.6.0-r3.ebuild,v 1.10 2004/11/15 10:35:04 phosphan Exp $
 
 inherit eutils
 
@@ -20,6 +20,7 @@ DEPEND="virtual/x11
 src_unpack() {
 	unpack ${P}.tar.gz
 	epatch ${FILESDIR}/${P}-gentoo.diff # Parallel make patch
+	epatch ${FILESDIR}/xio_timer.patch
 }
 
 src_compile() {
diff --git a/media-video/alevt/alevt-1.6.1.ebuild b/media-video/alevt/alevt-1.6.1.ebuild
index 4d13e0ea2f53..feb7057ab63a 100644
--- a/media-video/alevt/alevt-1.6.1.ebuild
+++ b/media-video/alevt/alevt-1.6.1.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/media-video/alevt/alevt-1.6.1.ebuild,v 1.4 2004/08/14 14:45:46 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/alevt-1.6.1.ebuild,v 1.5 2004/11/15 10:35:04 phosphan Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.ibiblio.org/pub/Linux/apps/video/${P}.tar.gz
 IUSE="gnome"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
 DEPEND="virtual/x11
 	>=media-libs/libpng-1.0.12"
diff --git a/media-video/alevt/files/xio_timer.patch b/media-video/alevt/files/xio_timer.patch
new file mode 100644
index 000000000000..18df73e07804
--- /dev/null
+++ b/media-video/alevt/files/xio_timer.patch
@@ -0,0 +1,16 @@
+--- alevt-1.6.0.orig/xio.c	2000-10-11 19:49:10.000000000 +0200
++++ alevt-1.6.0/xio.c	2004-11-12 20:51:51.388897944 +0100
+@@ -31,11 +31,12 @@
+ 
+ static struct dl_head dpys[1];		/* list of all displays */
+ 
++static void
++xio_timer(void *data, int fd);
+ 
+ static int
+ timer_init(int argc, char **argv)
+ {
+-    static xio_timer();
+     int p[2], timer_pid, i;
+ 
+     if (pipe(p) == -1)