Dropped ppc-macos keyword, see you in prefix

(Portage version: 2.1.3.19)

6 files changed, 18 insertions, 337 deletions

diff --git a/dev-libs/libsigsegv/ChangeLog b/dev-libs/libsigsegv/ChangeLog
index f1963a56901c..243ac3fbe5b7 100644
--- a/dev-libs/libsigsegv/ChangeLog
+++ b/dev-libs/libsigsegv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libsigsegv
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigsegv/ChangeLog,v 1.26 2007/12/08 16:39:18 drac Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigsegv/ChangeLog,v 1.27 2008/01/12 20:46:22 grobian Exp $
+
+  12 Jan 2008; Fabian Groffen <grobian@gentoo.org>
+  -files/libsigsegv-2.1-darwin-7.x.patch,
+  -files/libsigsegv-2.2-ppc-macos.patch, libsigsegv-2.1.ebuild,
+  libsigsegv-2.2.ebuild, libsigsegv-2.4.ebuild:
+  Dropped ppc-macos keyword, see you in prefix
 
   08 Dec 2007; Samuli Suominen <drac@gentoo.org> libsigsegv-2.4.ebuild:
   amd64 stable wrt #201216
diff --git a/dev-libs/libsigsegv/files/libsigsegv-2.1-darwin-7.x.patch b/dev-libs/libsigsegv/files/libsigsegv-2.1-darwin-7.x.patch
deleted file mode 100644
index 2637421adb45..000000000000
--- a/dev-libs/libsigsegv/files/libsigsegv-2.1-darwin-7.x.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- /var/tmp/portage/libsigsegv-2.1/work/libsigsegv-2.1/configure	Thu Aug 21 21:27:56 2003
-+++ configure	Mon Aug  9 19:54:50 2004
-@@ -10986,9 +10986,9 @@
- 
- #include <signal.h>
- #include "$srcdir/src/fault-macos-powerpc.c"
--void sigsegv_handler (int sig, int code, struct sigcontext *scp)
-+void sigsegv_handler (int sig, siginfo_t *sip, struct sigcontext *scp)
- {
--  void *fault_address = (void *) (get_fault_addr (scp));
-+  void *fault_address = (void *) (get_fault_addr (scp, sip->si_addr));
- }
- 
- int
-@@ -11037,6 +11037,7 @@
- #if HAVE_SYS_SIGNAL_H
- # include <sys/signal.h>
- #endif
-+#include <sys/ucontext.h>
- #include "$srcdir/src/fault-macos-powerpc.c"
- #include <sys/types.h>
- #include <sys/mman.h>
-@@ -11061,9 +11062,9 @@
- #endif
- unsigned long page;
- int handler_called = 0;
--void sigsegv_handler (int sig, int code, struct sigcontext *scp)
-+void sigsegv_handler (int sig, siginfo_t *sip, struct sigcontext *scp)
- {
--  void *fault_address = (void *) (get_fault_addr (scp));
-+  void *fault_address = (void *) (get_fault_addr (scp, sip->si_addr));
-   handler_called++;
-   if (handler_called == 10)
-     exit (4);
-@@ -11102,7 +11103,7 @@
-   sigemptyset(&action.sa_mask);
- 
-   action.sa_handler = (void (*) (int)) &sigsegv_handler;
--  action.sa_flags = 0;
-+  action.sa_flags = SA_SIGINFO;
- 
-   sigaction (SIGSEGV, &action, (struct sigaction *) NULL);
-   sigaction (SIGBUS, &action, (struct sigaction *) NULL);
---- /var/tmp/portage/libsigsegv-2.1/work/libsigsegv-2.1/src/fault-macos-powerpc.c	Mon Sep 30 20:46:54 2002
-+++ fault-macos-powerpc.c	Mon Aug  9 19:58:53 2004
-@@ -31,10 +31,11 @@
- #define EXTRACT_DISP(iw)    ((short *) &(iw))[1]
- 
- static void *
--get_fault_addr (struct sigcontext *scp)
-+get_fault_addr (struct sigcontext *scp,unsigned int *ir)
- {
--  unsigned int instr = *((unsigned int *) scp->sc_ir);
--  unsigned int *regs = &((unsigned int *) scp->sc_regs)[2];
-+  unsigned int instr = *ir;
-+  unsigned int *regs = & ((struct ucontext *)scp)->uc_mcontext->ss.r0	;
-+     	
-   int disp = 0;
-   int tmp;
-   unsigned int baseA = 0;
-@@ -42,6 +43,7 @@
-   unsigned int addr;
-   unsigned int alignmask = 0xFFFFFFFF;
- 
-+
-   switch (EXTRACT_OP1 (instr))
-     {
-     case 38:   /* stb */
-@@ -56,8 +58,10 @@
-     case 36:   /* stw */
-     case 37:   /* stwu */
-       tmp = EXTRACT_REGA (instr);
-+
-+
-       if (tmp > 0)
--	baseA = regs[tmp];
-+		baseA = regs[tmp];
-       disp = EXTRACT_DISP (instr);
-       break;
-     case 31:
-@@ -120,5 +124,6 @@
- 
-   addr = (baseA + baseB) + disp;
-   addr &= alignmask;
-+
-   return (void *) addr;
- }
---- /var/tmp/portage/libsigsegv-2.1/work/libsigsegv-2.1/src/fault-macos-powerpc.h	Thu Apr  3 06:56:20 2003
-+++ fault-macos-powerpc.h	Mon Aug  9 20:17:16 2004
-@@ -15,12 +15,14 @@
-    along with this program; if not, write to the Free Software Foundation,
-    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
- 
-+#include <sys/ucontext.h>
- #include "fault-macos-powerpc.c"
- 
--#define SIGSEGV_FAULT_HANDLER_ARGLIST  int sig, int code, struct sigcontext *scp
--#define SIGSEGV_FAULT_ADDRESS  (unsigned long) get_fault_addr (scp)
-+#define SIGSEGV_FAULT_HANDLER_ARGLIST  int sig, siginfo_t *sip, struct sigcontext *scp
-+#define SIGSEGV_FAULT_ADDRESS  (unsigned long) get_fault_addr (scp, sip->si_addr)
- #define SIGSEGV_FAULT_CONTEXT  scp
- #if 0
- #define SIGSEGV_FAULT_STACKPOINTER  (&((unsigned int *) scp->sc_regs)[2])[1]
- #endif
- #define SIGSEGV_FAULT_STACKPOINTER  (scp->sc_regs ? ((unsigned int *) scp->sc_regs)[3] : scp->sc_sp)
-+#define SIGSEGV_FAULT_ADDRESS_FROM_SIGINFO
diff --git a/dev-libs/libsigsegv/files/libsigsegv-2.2-ppc-macos.patch b/dev-libs/libsigsegv/files/libsigsegv-2.2-ppc-macos.patch
deleted file mode 100644
index 79df2fc162fa..000000000000
--- a/dev-libs/libsigsegv/files/libsigsegv-2.2-ppc-macos.patch
+++ /dev/null
@@ -1,209 +0,0 @@
---- libsigsegv-2.2/configure.orig	2005-09-02 09:57:18.000000000 +0200
-+++ libsigsegv-2.2/configure	2005-09-02 09:58:06.000000000 +0200
-@@ -22882,206 +22882,6 @@
- echo "${ECHO_T}$sv_cv_fault_macosdarwin7_ppc" >&6
- 
- 
--if test "$sv_cv_fault_macosdarwin7_ppc" != yes; then
--
--
--
--
--  echo "$as_me:$LINENO: checking whether a fault handler according to MacOSX/Darwin5 PowerPC works" >&5
--echo $ECHO_N "checking whether a fault handler according to MacOSX/Darwin5 PowerPC works... $ECHO_C" >&6
--if test "${sv_cv_fault_macosdarwin5_ppc+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
--    if test "$cross_compiling" = yes; then
--  case "$host" in
--         powerpc-*-darwin5*) sv_cv_fault_macosdarwin5_ppc=yes ;;
--         *)
--           cat >conftest.$ac_ext <<_ACEOF
--
--             /* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--#include <signal.h>
--#include "$srcdir/src/fault-macosdarwin5-powerpc.c"
--void sigsegv_handler (int sig, int code, struct sigcontext *scp)
--{
--  void *fault_address = (void *) (get_fault_addr (scp));
--}
--
--int
--main ()
--{
--struct sigaction action;
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  sv_cv_fault_macosdarwin5_ppc="guessing no"
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--sv_cv_fault_macosdarwin5_ppc=no
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--           ;;
--       esac
--
--else
--  cat >conftest.$ac_ext <<_ACEOF
--
--      /* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--#include <stdlib.h>
--#include <signal.h>
--#if HAVE_SYS_SIGNAL_H
--# include <sys/signal.h>
--#endif
--#include "$srcdir/src/fault-macosdarwin5-powerpc.c"
--#include <sys/types.h>
--#include <sys/mman.h>
--#if HAVE_MMAP_DEVZERO
--# include <fcntl.h>
--# ifndef MAP_FILE
--#  define MAP_FILE 0
--# endif
--#endif
--#ifndef PROT_NONE
--# define PROT_NONE 0
--#endif
--#if HAVE_MMAP_ANON
--# define zero_fd -1
--# define map_flags MAP_ANON | MAP_PRIVATE
--#elif HAVE_MMAP_ANONYMOUS
--# define zero_fd -1
--# define map_flags MAP_ANONYMOUS | MAP_PRIVATE
--#elif HAVE_MMAP_DEVZERO
--static int zero_fd;
--# define map_flags MAP_FILE | MAP_PRIVATE
--#endif
--unsigned long page;
--int handler_called = 0;
--void sigsegv_handler (int sig, int code, struct sigcontext *scp)
--{
--  void *fault_address = (void *) (get_fault_addr (scp));
--  handler_called++;
--  if (handler_called == 10)
--    exit (4);
--  if (fault_address != (void*)(page + 0x678))
--    exit (3);
--  if (mprotect ((void *) page, 0x10000, PROT_READ | PROT_WRITE) < 0)
--    exit (2);
--}
--void crasher (unsigned long p)
--{
--  *(int *) (p + 0x678) = 42;
--}
--int main ()
--{
--  void *p;
--  struct sigaction action;
--  /* Preparations.  */
--#if !HAVE_MMAP_ANON && !HAVE_MMAP_ANONYMOUS && HAVE_MMAP_DEVZERO
--  zero_fd = open ("/dev/zero", O_RDONLY, 0644);
--#endif
--  /* Setup some mmaped memory.  */
--#ifdef __hpux
--  /* HP-UX 10 mmap() often fails when given a hint.  So give the OS complete
--     freedom about the address range.  */
--  p = mmap ((void *) 0,          0x10000, PROT_READ | PROT_WRITE, map_flags, zero_fd, 0);
--#else
--  p = mmap ((void *) 0x12340000, 0x10000, PROT_READ | PROT_WRITE, map_flags, zero_fd, 0);
--#endif
--  if (p == (void *)(-1))
--    exit (2);
--  page = (unsigned long) p;
--  /* Make it read-only.  */
--  if (mprotect ((void *) page, 0x10000, PROT_READ) < 0)
--    exit (2);
--  /* Install the SIGSEGV handler.  */
--  sigemptyset(&action.sa_mask);
--
--  action.sa_handler = (void (*) (int)) &sigsegv_handler;
--  action.sa_flags = 0;
--
--  sigaction (SIGSEGV, &action, (struct sigaction *) NULL);
--  sigaction (SIGBUS, &action, (struct sigaction *) NULL);
--  /* The first write access should invoke the handler and then complete.  */
--  crasher (page);
--  /* The second write access should not invoke the handler.  */
--  crasher (page);
--  /* Check that the handler was called only once.  */
--  if (handler_called != 1)
--    exit (1);
--  /* Test passed!  */
--  return 0;
--}
--_ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  sv_cv_fault_macosdarwin5_ppc=yes
--else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--sv_cv_fault_macosdarwin5_ppc=no
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--
--fi
--echo "$as_me:$LINENO: result: $sv_cv_fault_macosdarwin5_ppc" >&5
--echo "${ECHO_T}$sv_cv_fault_macosdarwin5_ppc" >&6
--
--fi
--
--
--
--
--
-   echo "$as_me:$LINENO: checking whether a fault handler according to Hurd works" >&5
- echo $ECHO_N "checking whether a fault handler according to Hurd works... $ECHO_C" >&6
- if test "${sv_cv_fault_hurd+set}" = set; then
diff --git a/dev-libs/libsigsegv/libsigsegv-2.1.ebuild b/dev-libs/libsigsegv/libsigsegv-2.1.ebuild
index 77b0a1c736cd..6ab9b2a39a7a 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.1.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigsegv/libsigsegv-2.1.ebuild,v 1.8 2007/04/07 16:36:15 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigsegv/libsigsegv-2.1.ebuild,v 1.9 2008/01/12 20:46:22 grobian Exp $
 
 inherit eutils
 
@@ -9,18 +9,13 @@ HOMEPAGE="ftp://ftp.gnu.org/pub/gnu/libsigsegv/"
 SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc ~ppc-macos"
+KEYWORDS="x86 ppc"
 IUSE=""
 
 DEPEND="virtual/libc"
 
 src_compile() {
-	if use ppc-macos ; then
-		epatch ${FILESDIR}/libsigsegv-2.1-darwin-7.x.patch || die
-		./configure --enable-shared || die
-	else
-		econf --enable-shared || die
-	fi
+	econf --enable-shared || die
 	emake || die
 }
 
diff --git a/dev-libs/libsigsegv/libsigsegv-2.2.ebuild b/dev-libs/libsigsegv/libsigsegv-2.2.ebuild
index c08597d8f84b..7704e9291cd6 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.2.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigsegv/libsigsegv-2.2.ebuild,v 1.6 2007/04/07 16:36:15 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigsegv/libsigsegv-2.2.ebuild,v 1.7 2008/01/12 20:46:22 grobian Exp $
 
 inherit eutils
 
@@ -9,16 +9,11 @@ HOMEPAGE="ftp://ftp.gnu.org/pub/gnu/libsigsegv/"
 SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc-macos ~sparc ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="virtual/libc"
 
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-ppc-macos.patch
-}
-
 src_compile() {
 	econf --enable-shared || die
 	emake || die
diff --git a/dev-libs/libsigsegv/libsigsegv-2.4.ebuild b/dev-libs/libsigsegv/libsigsegv-2.4.ebuild
index c7b9d25375fc..993c3aba54b4 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.4.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigsegv/libsigsegv-2.4.ebuild,v 1.8 2007/12/08 16:39:18 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigsegv/libsigsegv-2.4.ebuild,v 1.9 2008/01/12 20:46:22 grobian Exp $
 
 inherit eutils autotools
 
@@ -9,7 +9,7 @@ HOMEPAGE="ftp://ftp.gnu.org/pub/gnu/libsigsegv/"
 SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc-macos ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="virtual/libc"