add ia64 patch and mark stable on ia64

(Portage version: 2.0.51-r13)

3 files changed, 110 insertions, 3 deletions

diff --git a/dev-util/strace/ChangeLog b/dev-util/strace/ChangeLog
index 8a2501cdaf3a..cdd907ecf90b 100644
--- a/dev-util/strace/ChangeLog
+++ b/dev-util/strace/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/strace
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.52 2005/02/05 10:37:35 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.53 2005/02/08 19:20:19 agriffis Exp $
+
+  08 Feb 2005; Aron Griffis <agriffis@gentoo.org>
+  +files/strace-4.5.8-ia64.patch, strace-4.5.8.ebuild:
+  add ia64 patch and mark stable on ia64
 
   05 Feb 2005; Michael Hanselmann <hansmi@gentoo.org> strace-4.5.7.ebuild:
   Stable on ppc.
diff --git a/dev-util/strace/files/strace-4.5.8-ia64.patch b/dev-util/strace/files/strace-4.5.8-ia64.patch
new file mode 100644
index 000000000000..8e8c35a173af
--- /dev/null
+++ b/dev-util/strace/files/strace-4.5.8-ia64.patch
@@ -0,0 +1,99 @@
+diff -urN strace-4.5.8/process.c /tmp/strace-4.5.8/process.c
+--- strace-4.5.8/process.c	2004-10-19 19:33:47.000000000 -0400
++++ /tmp/strace-4.5.8/process.c	2005-02-07 22:14:35.115449874 -0500
+@@ -82,14 +82,10 @@
+ 
+ #ifdef HAVE_LINUX_PTRACE_H
+ #undef PTRACE_SYSCALL
+-# ifdef HAVE_STRUCT_IA64_FPREG
+-#  define ia64_fpreg XXX_ia64_fpreg
+-# endif
+ # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
+ #  define pt_all_user_regs XXX_pt_all_user_regs
+ # endif
+ #include <linux/ptrace.h>
+-# undef ia64_fpreg
+ # undef pt_all_user_regs
+ #endif
+ 
+diff -urN strace-4.5.8/signal.c /tmp/strace-4.5.8/signal.c
+--- strace-4.5.8/signal.c	2004-10-06 18:11:54.000000000 -0400
++++ /tmp/strace-4.5.8/signal.c	2005-02-07 23:24:18.020091998 -0500
+@@ -53,14 +53,10 @@
+ #endif
+ #elif defined(HAVE_LINUX_PTRACE_H)
+ #undef PTRACE_SYSCALL
+-# ifdef HAVE_STRUCT_IA64_FPREG
+-#  define ia64_fpreg XXX_ia64_fpreg
+-# endif
+ # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
+ #  define pt_all_user_regs XXX_pt_all_user_regs
+ # endif
+ #include <linux/ptrace.h>
+-# undef ia64_fpreg
+ # undef pt_all_user_regs
+ #endif
+ 
+diff -urN strace-4.5.8/syscall.c /tmp/strace-4.5.8/syscall.c
+--- strace-4.5.8/syscall.c	2004-09-04 00:20:43.000000000 -0400
++++ /tmp/strace-4.5.8/syscall.c	2005-02-07 22:10:36.002631398 -0500
+@@ -63,14 +63,10 @@
+ #endif
+ #elif defined(HAVE_LINUX_PTRACE_H)
+ #undef PTRACE_SYSCALL
+-# ifdef HAVE_STRUCT_IA64_FPREG
+-#  define ia64_fpreg XXX_ia64_fpreg
+-# endif
+ # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
+ #  define pt_all_user_regs XXX_pt_all_user_regs
+ # endif
+ #include <linux/ptrace.h>
+-# undef ia64_fpreg
+ # undef pt_all_user_regs
+ #endif
+ 
+diff -urN strace-4.5.8/system.c /tmp/strace-4.5.8/system.c
+--- strace-4.5.8/system.c	2004-09-03 23:39:20.000000000 -0400
++++ /tmp/strace-4.5.8/system.c	2005-02-07 22:26:16.747331515 -0500
+@@ -32,6 +32,23 @@
+ 
+ #include "defs.h"
+ 
++#ifdef HAVE_SYS_REG_H
++# include <sys/reg.h>
++# ifndef PTRACE_PEEKUSR
++#  define PTRACE_PEEKUSR PTRACE_PEEKUSER
++# endif
++# ifndef PTRACE_POKEUSR
++#  define PTRACE_POKEUSR PTRACE_POKEUSER
++# endif
++#elif defined(HAVE_LINUX_PTRACE_H)
++# undef PTRACE_SYSCALL
++# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
++#  define pt_all_user_regs XXX_pt_all_user_regs
++# endif
++# include <linux/ptrace.h>
++# undef pt_all_user_regs
++#endif
++
+ #ifdef LINUX
+ #define _LINUX_SOCKET_H
+ #define _LINUX_FS_H
+diff -urN strace-4.5.8/util.c /tmp/strace-4.5.8/util.c
+--- strace-4.5.8/util.c	2004-10-06 18:06:28.000000000 -0400
++++ /tmp/strace-4.5.8/util.c	2005-02-07 22:14:11.382807120 -0500
+@@ -63,14 +63,10 @@
+ # define PTRACE_PEEKUSR PTRACE_PEEKUSER
+ #elif defined(HAVE_LINUX_PTRACE_H)
+ #undef PTRACE_SYSCALL
+-# ifdef HAVE_STRUCT_IA64_FPREG
+-#  define ia64_fpreg XXX_ia64_fpreg
+-# endif
+ # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
+ #  define pt_all_user_regs XXX_pt_all_user_regs
+ # endif
+ #include <linux/ptrace.h>
+-# undef ia64_fpreg
+ # undef pt_all_user_regs
+ #endif
+ 
diff --git a/dev-util/strace/strace-4.5.8.ebuild b/dev-util/strace/strace-4.5.8.ebuild
index 1ff37ae58e80..418cd3fb2bb6 100644
--- a/dev-util/strace/strace-4.5.8.ebuild
+++ b/dev-util/strace/strace-4.5.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.8.ebuild,v 1.3 2005/02/05 10:37:35 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.8.ebuild,v 1.4 2005/02/08 19:20:19 agriffis Exp $
 
 inherit flag-o-matic
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="as-is"
 SLOT="0"
 #-sparc: 4.5.8 - eradicator - compilation errors on sparc
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 -sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 -sparc ~x86"
 IUSE="static"
 
 DEPEND="virtual/libc"
@@ -20,6 +20,10 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
+	# Remove some obsolete ia64-related hacks from the strace source
+	# (08 Feb 2005 agriffis)
+	epatch ${FILESDIR}/strace-4.5.8-ia64.patch
+
 	# Compile fails with -O3 on sparc but works on x86
 	[ "${ARCH}" == "sparc" ] && replace-flags -O[3-9] -O2
 	filter-lfs-flags