Emacs 22.

(Portage version: 2.1.2.9)

4 files changed, 134 insertions, 0 deletions

diff --git a/app-editors/emacs/files/digest-emacs-22.1 b/app-editors/emacs/files/digest-emacs-22.1
new file mode 100644
index 000000000000..44943fdbcd94
--- /dev/null
+++ b/app-editors/emacs/files/digest-emacs-22.1
@@ -0,0 +1,3 @@
+MD5 6949df37caec2d7a2e0eee3f1b422726 emacs-22.1.tar.gz 38172226
+RMD160 da5360871db8b1d473ff7f0b0937ee6c278c0b19 emacs-22.1.tar.gz 38172226
+SHA256 1ec43bef7127e572f92d7c3a846951cf8e263e27445c62c867035f94681c3ed0 emacs-22.1.tar.gz 38172226
diff --git a/app-editors/emacs/files/emacs-22.1-Xaw3d-headers.patch b/app-editors/emacs/files/emacs-22.1-Xaw3d-headers.patch
new file mode 100644
index 000000000000..0e6be8910334
--- /dev/null
+++ b/app-editors/emacs/files/emacs-22.1-Xaw3d-headers.patch
@@ -0,0 +1,76 @@
+*** emacs/src/xfns.c.~1.681.~	2007-03-24 11:49:48.000000000 -0400
+--- emacs/src/xfns.c	2007-04-18 01:18:52.000000000 -0400
+***************
+*** 72,79 ****
+--- 72,84 ----
+  #include <X11/Shell.h>
+  
+  #ifndef USE_MOTIF
++ #ifdef HAVE_XAW3D
++ #include <X11/Xaw3d/Paned.h>
++ #include <X11/Xaw3d/Label.h>
++ #else  /* !HAVE_XAW3D */
+  #include <X11/Xaw/Paned.h>
+  #include <X11/Xaw/Label.h>
++ #endif /* HAVE_XAW3D */
+  #endif /* USE_MOTIF */
+  
+  #ifdef USG
+*** emacs/src/xmenu.c.~1.317.~	2007-01-20 23:18:14.000000000 -0500
+--- emacs/src/xmenu.c	2007-04-18 01:15:43.000000000 -0400
+***************
+*** 82,88 ****
+--- 82,92 ----
+  #include <X11/StringDefs.h>
+  #include <X11/Shell.h>
+  #ifdef USE_LUCID
++ #ifdef HAVE_XAW3D
++ #include <X11/Xaw3d/Paned.h>
++ #else  /* !HAVE_XAW3D */
+  #include <X11/Xaw/Paned.h>
++ #endif /* HAVE_XAW3D */
+  #endif /* USE_LUCID */
+  #include "../lwlib/lwlib.h"
+  #else /* not USE_X_TOOLKIT */
+*** emacs/lwlib/lwlib.c.~1.55.~	2007-02-27 23:25:05.000000000 -0500
+--- emacs/lwlib/lwlib.c	2007-04-18 01:21:44.000000000 -0400
+***************
+*** 48,54 ****
+--- 48,58 ----
+  #endif /* not USE_MOTIF && USE_LUCID */
+  #endif
+  #if defined (USE_XAW)
++ #ifdef HAVE_XAW3D
++ #include <X11/Xaw3d/Paned.h>
++ #else  /* !HAVE_XAW3D */
+  #include <X11/Xaw/Paned.h>
++ #endif /* HAVE_XAW3D */
+  #include "lwlib-Xaw.h"
+  #endif
+  
+*** emacs/lwlib/lwlib-Xaw.c.~1.25.~	2007-02-26 22:07:08.000000000 -0500
+--- emacs/lwlib/lwlib-Xaw.c	2007-04-18 01:22:33.000000000 -0400
+***************
+*** 35,46 ****
+--- 35,55 ----
+  #include <X11/CoreP.h>
+  #include <X11/Shell.h>
+  
++ #ifdef HAVE_XAW3D
++ #include <X11/Xaw3d/Scrollbar.h>
++ #include <X11/Xaw3d/Paned.h>
++ #include <X11/Xaw3d/Dialog.h>
++ #include <X11/Xaw3d/Form.h>
++ #include <X11/Xaw3d/Command.h>
++ #include <X11/Xaw3d/Label.h>
++ #else /* !HAVE_XAW3D */
+  #include <X11/Xaw/Scrollbar.h>
+  #include <X11/Xaw/Paned.h>
+  #include <X11/Xaw/Dialog.h>
+  #include <X11/Xaw/Form.h>
+  #include <X11/Xaw/Command.h>
+  #include <X11/Xaw/Label.h>
++ #endif /* HAVE_XAW3D */
+  
+  #include <X11/Xatom.h>
+  
diff --git a/app-editors/emacs/files/emacs-22.1-disable_alsa_detection.patch b/app-editors/emacs/files/emacs-22.1-disable_alsa_detection.patch
new file mode 100644
index 000000000000..d4b630f362a8
--- /dev/null
+++ b/app-editors/emacs/files/emacs-22.1-disable_alsa_detection.patch
@@ -0,0 +1,42 @@
+--- configure.in	22 May 2007 15:54:32 -0000	1.448
++++ configure.in	30 May 2007 13:19:39 -0000
+@@ -1590,39 +1590,6 @@
+   # Emulation library used on NetBSD.
+   AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=)
+   AC_SUBST(LIBSOUND)
+-
+-  ALSA_REQUIRED=1.0.0
+-  ALSA_MODULES="alsa >= $ALSA_REQUIRED"
+-  dnl Check if --with-pkg-config-prog has been given.
+-  if test "X${with_pkg_config_prog}" != X; then
+-    PKG_CONFIG="${with_pkg_config_prog}"
+-  fi
+-  PKG_CHECK_MODULES(ALSA, $ALSA_MODULES, HAVE_ALSA=yes, HAVE_ALSA=no)
+-  if test $HAVE_ALSA = yes; then
+-    SAVE_CFLAGS="$CFLAGS"
+-    SAVE_LDFLAGS="$LDFLAGS"
+-    CFLAGS="$ALSA_CFLAGS $CFLAGS"
+-    LDFLAGS="$ALSA_LIBS $LDFLAGS"
+-    AC_TRY_COMPILE([#include <asoundlib.h>], [snd_lib_error_set_handler (0);],
+-                    emacs_alsa_normal=yes,
+-	            emacs_alsa_normal=no)
+-    if test "$emacs_alsa_normal" != yes; then
+-      AC_TRY_COMPILE([#include <alsa/asoundlib.h>],
+-                     [snd_lib_error_set_handler (0);],
+-                     emacs_alsa_subdir=yes,
+-	             emacs_alsa_subdir=no)
+-      if test "$emacs_alsa_subdir" != yes; then
+-        AC_MSG_ERROR([pkg-config found alsa, but it does not compile.  See config.log for error messages.])
+-      fi
+-      ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE"
+-    fi
+-
+-    CFLAGS="$SAVE_CFLAGS"
+-    LDFLAGS="$SAVE_LDFLAGS"
+-    LIBSOUND="$LIBSOUND $ALSA_LIBS"
+-    CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"
+-    AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if ALSA is available.])
+-  fi
+   AC_SUBST(CFLAGS_SOUND)
+ fi
+ 
diff --git a/app-editors/emacs/files/emacs-22.1-freebsd-sparc.patch b/app-editors/emacs/files/emacs-22.1-freebsd-sparc.patch
new file mode 100644
index 000000000000..d5e0793aa3de
--- /dev/null
+++ b/app-editors/emacs/files/emacs-22.1-freebsd-sparc.patch
@@ -0,0 +1,13 @@
+Index: emacs/src/alloc.c
+===================================================================
+--- emacs.orig/src/alloc.c
++++ emacs/src/alloc.c
+@@ -4522,7 +4522,7 @@ mark_stack ()
+   /* Fixme: Code in the Boehm GC suggests flushing (with `flushrs') is
+      needed on ia64 too.  See mach_dep.c, where it also says inline
+      assembler doesn't work with relevant proprietary compilers.  */
+-#ifdef sparc
++#if defined(sparc) && !defined(__FreeBSD__)
+   asm ("ta 3");
+ #endif
+