[gentoo-commits] proj/emacs-tools:patchsets commit in: emacs/22.3/, emacs/21.4/

[Ulrich Müller]

commit:     1665a4db54d762a80602d96b5e94c512ebc3c0f4
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  7 11:49:39 2014 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jun  7 11:49:39 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=1665a4db

Remove 21.4 and 22.3 patchsets.

---
 emacs/21.4/01_all_xorg.patch                |  12 --
 emacs/21.4/02_all_amd64.patch               | 238 ----------------------------
 emacs/21.4/03_all_hppa.patch                |  98 ------------
 emacs/21.4/04_all_sh.patch                  | 175 --------------------
 emacs/21.4/05_all_libungif-gif-gentoo.patch |  34 ----
 emacs/21.4/06_ppc64_ppc64.patch             |  51 ------
 emacs/21.4/07_ppc64_fix-unexelf.patch       |  67 --------
 emacs/21.4/08_all_autosave-tmp.patch        |  12 --
 emacs/21.4/09_all_blessmail-build.patch     |  22 ---
 emacs/21.4/10_all_qa.patch                  |  92 -----------
 emacs/21.4/11_all_Xaw3d-headers.patch       |  72 ---------
 emacs/21.4/12_all_freebsd-terminfo.patch    |  16 --
 emacs/21.4/13_all_oldxmenu-malloc.patch     |  11 --
 emacs/21.4/14_all_gif-image-size.patch      |  34 ----
 emacs/21.4/15_all_format-int.patch          |  11 --
 emacs/21.4/16_all_vcdiff-tmp-race.patch     |  25 ---
 emacs/21.4/17_all_bss-heap-gap.patch        |  95 -----------
 emacs/21.4/18_all_fast-lock.patch           |  45 ------
 emacs/21.4/19_all_autoconf-2.61.patch       |  50 ------
 emacs/21.4/20_all_manpage-install.patch     |  13 --
 emacs/21.4/21_all_libpng14.patch            |  22 ---
 emacs/21.4/22_all_cpp-4.5.patch             |  25 ---
 emacs/21.4/23_all_libpng15.patch            |  22 ---
 emacs/21.4/24_all_libXaw3d-1.6.patch        |  12 --
 emacs/22.3/01_all_Xaw3d-headers.patch       | 150 ------------------
 emacs/22.3/02_all_freebsd-sparc.patch       |  17 --
 emacs/22.3/03_all_sh.patch                  |  26 ---
 emacs/22.3/04_all_linux-random-heap.patch   |  15 --
 emacs/22.3/05_all_gtk-menu.patch            | 168 --------------------
 emacs/22.3/06_all_libpng14.patch            |  49 ------
 emacs/22.3/07_all_cpp-4.5.patch             |  25 ---
 emacs/22.3/08_all_gameuser.patch            |  18 ---
 emacs/22.3/09_all_info-dir.patch            |  48 ------
 emacs/22.3/10_all_libpng15.patch            |  22 ---
 34 files changed, 1792 deletions(-)

diff --git a/emacs/21.4/01_all_xorg.patch b/emacs/21.4/01_all_xorg.patch
deleted file mode 100644
index a97bb10..0000000
--- a/emacs/21.4/01_all_xorg.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur emacs-21.3-old/src/xterm.h emacs-21.3/src/xterm.h
---- emacs-21.3-old/src/xterm.h  2002-02-22 11:41:44.000000000 +0100
-+++ emacs-21.3/src/xterm.h      2004-10-30 12:33:12.000000000 +0200
-@@ -21,8 +21,8 @@
- 
- #include <X11/Xlib.h>
- #include <X11/cursorfont.h>
--#include <X11/Xutil.h>
- #include <X11/keysym.h>
-+#include <X11/Xutil.h>
- #include <X11/Xatom.h>
- #include <X11/Xresource.h>

diff --git a/emacs/21.4/02_all_amd64.patch b/emacs/21.4/02_all_amd64.patch
deleted file mode 100644
index 9c5f5e2..0000000
--- a/emacs/21.4/02_all_amd64.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-diff -Naur emacs-21.3-old/configure emacs-21.3/configure
---- emacs-21.3-old/configure	2003-12-14 03:34:27.000000000 +0000
-+++ emacs-21.3/configure	2003-12-14 03:35:13.000000000 +0000
-@@ -1632,6 +1632,11 @@
-     machine=ia64 opsys=gnu-linux
-   ;;
- 
-+  ## X86-64
-+  x86_64*-*-linux* )
-+    machine=x86_64 opsys=gnu-linux
-+  ;;
-+
-   ## Intel 386 machines where we don't care about the manufacturer
-   i[3456]86-*-* )
-     machine=intel386
-diff -Naur emacs-21.3-old/configure.in emacs-21.3/configure.in
---- emacs-21.3-old/configure.in	2003-12-14 03:34:27.000000000 +0000
-+++ emacs-21.3/configure.in	2003-12-14 03:35:04.000000000 +0000
-@@ -1006,6 +1006,11 @@
-     machine=ia64 opsys=gnu-linux
-   ;;
- 
-+  ## X86-64
-+  x86_64*-*-linux* )
-+    machine=x86_64 opsys=gnu-linux
-+  ;;
-+
-   ## Intel 386 machines where we don't care about the manufacturer
-   i[3456]86-*-* )
-     machine=intel386
-diff -Naur emacs-21.3-old/src/m/x86_64.h emacs-21.3/src/m/x86_64.h
---- emacs-21.3-old/src/m/x86_64.h	1970-01-01 00:00:00.000000000 +0000
-+++ emacs-21.3/src/m/x86_64.h	2003-12-14 03:35:04.000000000 +0000
-@@ -0,0 +1,175 @@
-+/* machine description file for the X86-64 architecture.
-+   Copyright (C) 2000 Free Software Foundation, Inc.
-+
-+This file is part of GNU Emacs.
-+
-+GNU Emacs is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 1, or (at your option)
-+any later version.
-+
-+GNU Emacs is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GNU Emacs; see the file COPYING.  If not, write to
-+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA.  */
-+
-+#define BITS_PER_LONG		64
-+#define BITS_PER_EMACS_INT	64
-+
-+/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
-+   is the most significant byte.  */
-+
-+#undef WORDS_BIG_ENDIAN
-+
-+/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
-+   group of arguments and treat it as an array of the arguments.  */
-+
-+#define NO_ARG_ARRAY
-+
-+/* Define WORD_MACHINE if addresses and such have
-+   to be corrected before they can be used as byte counts.  */
-+
-+/* #define WORD_MACHINE */
-+
-+/* Now define a symbol for the cpu type, if your compiler
-+   does not define it automatically:
-+   Ones defined so far include vax, m68000, ns16000, pyramid,
-+   orion, tahoe, APOLLO and many others */
-+
-+/* __x86_64__ defined automatically */
-+
-+
-+/* Use type EMACS_INT rather than a union, to represent Lisp_Object */
-+/* This is desirable for most machines.  */
-+
-+#define NO_UNION_TYPE
-+
-+/* Define the type to use.  */
-+#define EMACS_INT		long
-+#define EMACS_UINT		unsigned long
-+#define SPECIAL_EMACS_INT
-+
-+/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-+   the 24-bit bit field into an int.  In other words, if bit fields
-+   are always unsigned.
-+
-+   If you use NO_UNION_TYPE, this flag does not matter.  */
-+
-+#define EXPLICIT_SIGN_EXTEND
-+
-+/* Data type of load average, as read out of kmem.  */
-+
-+#define LOAD_AVE_TYPE		long
-+
-+/* Convert that into an integer that is 100 for a load average of 1.0  */
-+
-+#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-+
-+/* Define CANNOT_DUMP on machines where unexec does not work.
-+   Then the function dump-emacs will not be defined
-+   and temacs will do (load "loadup") automatically unless told otherwise.  */
-+#if 0
-+#define CANNOT_DUMP
-+#endif
-+
-+/* Define VIRT_ADDR_VARIES if the virtual addresses of
-+   pure and impure space as loaded can vary, and even their
-+   relative order cannot be relied on.
-+
-+   Otherwise Emacs assumes that text space precedes data space,
-+   numerically.  */
-+
-+/* #define VIRT_ADDR_VARIES */
-+
-+/* Define C_ALLOCA if this machine does not support a true alloca
-+   and the one written in C should be used instead.
-+   Define HAVE_ALLOCA to say that the system provides a properly
-+   working alloca function and it should be used.
-+   Define neither one if an assembler-language alloca
-+   in the file alloca.s should be used.  */
-+
-+#define HAVE_ALLOCA
-+
-+/* Define the following if GNU malloc and the relocating allocator do
-+   not work together with X.  */
-+
-+/* #define SYSTEM_MALLOC */
-+
-+/* Define NO_REMAP if memory segmentation makes it not work well
-+   to change the boundary between the text section and data section
-+   when Emacs is dumped.  If you define this, the preloaded Lisp
-+   code will not be sharable; but that's better than failing completely.  */
-+
-+/* #define NO_REMAP */
-+
-+/* Some really obscure 4.2-based systems (like Sequent DYNIX) do not
-+   support asynchronous I/O (using SIGIO) on sockets, even though it
-+   works fine on tty's.  If you have one of these systems, define the
-+   following, and then use it in config.h (or elsewhere) to decide
-+   when (not) to use SIGIO.
-+
-+   You'd think this would go in an operating-system description file,
-+   but since it only occurs on some, but not all, BSD systems, the
-+   reasonable place to select for it is in the machine description
-+   file.  */
-+
-+/* #define NO_SOCK_SIGIO */
-+
-+#ifdef __ELF__
-+#undef UNEXEC
-+#define UNEXEC unexelf.o
-+#endif
-+
-+#define PNTR_COMPARISON_TYPE unsigned long
-+
-+/* On the 64 bit architecture, we can use 60 bits for addresses */
-+
-+#define VALBITS         60
-+
-+/* Define XINT and XUINT so that they can take arguments of type int */
-+
-+#define XINT(a)  (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS))
-+#define XUINT(a) ((long) (a) & VALMASK)
-+
-+/* Declare malloc and realloc in a way that is clean.
-+   But not in makefiles!  */
-+
-+#ifndef NOT_C_CODE
-+/* We need these because pointers are larger than the default ints.  */
-+# if !defined(__NetBSD__) && !defined(__OpenBSD__)
-+#  include <alloca.h>
-+# else
-+#  include <stdlib.h>
-+# endif
-+
-+/* We need to prototype these for the lib-src programs even if we don't
-+   use the system malloc for the Emacs proper.  */
-+#ifdef _MALLOC_INTERNAL
-+/* These declarations are designed to match the ones in gmalloc.c.  */
-+#if defined (__STDC__) && __STDC__
-+extern void *malloc (), *realloc (), *calloc ();
-+#else
-+extern char *malloc (), *realloc (), *calloc ();
-+#endif
-+#else /* not _MALLOC_INTERNAL */
-+extern void *malloc (), *realloc (), *calloc ();
-+#endif /* not _MALLOC_INTERNAL */
-+
-+#ifdef REL_ALLOC
-+#ifndef _MALLOC_INTERNAL
-+/* "char *" because ralloc.c defines it that way.  gmalloc.c thinks it
-+   is allowed to prototype these as "void *" so we don't prototype in
-+   that case.  You're right: it stinks!  */
-+extern char *r_alloc (), *r_re_alloc ();
-+extern void r_alloc_free ();
-+#endif /* not _MALLOC_INTERNAL */
-+#endif /* REL_ALLOC */
-+
-+#endif /* not NOT_C_CODE */
-+
-+#define HAVE_TEXT_START
-diff -Naur emacs-21.3-old/src/s/gnu-linux.h emacs-21.3/src/s/gnu-linux.h
---- emacs-21.3-old/src/s/gnu-linux.h	2003-12-14 03:34:28.000000000 +0000
-+++ emacs-21.3/src/s/gnu-linux.h	2003-12-14 03:35:04.000000000 +0000
-@@ -173,8 +173,12 @@
- /* GNU/Linux usually has crt0.o in a non-standard place */
- #define START_FILES pre-crt0.o /usr/lib/crt0.o
- #else
-+#if defined(__x86_64)
-+#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
-+#else
- #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
- #endif
-+#endif
- 
- #ifdef __ELF__
- /* Here is how to find X Windows.  LD_SWITCH_X_SITE_AUX gives an -R option
-@@ -225,8 +229,12 @@
- #else
- #undef LIB_GCC
- #define LIB_GCC
-+#if defined(__x86_64)
-+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
-+#else
- #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
- #endif
-+#endif
- 
- /* Don't use -g in test compiles in configure.
-    This is so we will use the same shared libs for that linking

diff --git a/emacs/21.4/03_all_hppa.patch b/emacs/21.4/03_all_hppa.patch
deleted file mode 100644
index 6955f93..0000000
--- a/emacs/21.4/03_all_hppa.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff -uNr emacs-21.3.orig/configure emacs-21.3/configure
---- emacs-21.3.orig/configure	2003-12-20 15:03:19.622159984 +0000
-+++ emacs-21.3/configure	2003-12-20 15:13:56.550332184 +0000
-@@ -1179,6 +1179,10 @@
-     machine=hp800 opsys=nextstep
-   ;;
- 
-+  hppa*-*-linux-gnu* )
-+    machine=hp800 psys=gnu-linux
-+  ;;
-+  
-   ## Orion machines
-   orion-orion-bsd* )
-     machine=orion opsys=bsd4-2
-diff -uNr emacs-21.3.orig/configure.in emacs-21.3/configure.in
---- emacs-21.3.orig/configure.in	2003-12-20 15:03:19.624159680 +0000
-+++ emacs-21.3/configure.in	2003-12-20 15:15:22.825216408 +0000
-@@ -553,6 +553,10 @@
-     machine=hp800 opsys=nextstep
-   ;;
- 
-+  hppa*-*-linux-gnu* )
-+    machine=hp800 opsys=gnu-linux
-+  ;;
-+
-   ## Orion machines
-   orion-orion-bsd* )
-     machine=orion opsys=bsd4-2
---- emacs21-21.2.orig/src/m/hp800.h
-+++ emacs21-21.2/src/m/hp800.h
-@@ -85,7 +85,7 @@
- #define bcmp		memcmp
- #endif
- 
--#ifdef __hpux
-+#if defined(__hpux) || defined(__linux__)
- /* Now define a symbol for the cpu type, if your compiler
-    does not define it automatically:
-    Ones defined so far include vax, m68000, ns16000, pyramid,
-@@ -94,6 +94,15 @@
- #     define hp9000s800
- #endif
- 
-+#ifdef __linux__
-+/* Data type of load average, as read out of kmem.  */
-+
-+#define LOAD_AVE_TYPE long
-+
-+/* Convert that into an integer that is 100 for a load average of 1.0  */
-+
-+#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-+#else
- /* Data type of load average, as read out of kmem.  */
- 
- #define LOAD_AVE_TYPE double
-@@ -101,7 +110,7 @@
- /* Convert that into an integer that is 100 for a load average of 1.0  */
- 
- #define LOAD_AVE_CVT(x) ((int) (x * 100.0))
--
-+#endif
- 
- /* Define CANNOT_DUMP on machines where unexec does not work.
-    Then the function dump-emacs will not be defined
-@@ -116,6 +125,7 @@
-    Otherwise Emacs assumes that text space precedes data space,
-    numerically.  */
- 
-+#ifdef __hpux
- #define VIRT_ADDR_VARIES
- 
- /* Define C_ALLOCA if this machine does not support a true alloca
-@@ -134,6 +144,9 @@
- 
- #define DATA_START    0x40000000
- #define TEXT_START    0x00000000
-+#else
-+#define HAVE_ALLOCA
-+#endif
- 
- #define STACK_DIRECTION 1 
- 
-@@ -147,6 +160,7 @@
- /* This machine requires completely different unexec code
-    which lives in a separate file.  Specify the file name.  */
- 
-+#ifdef __hpux
- #define UNEXEC unexhp9k800.o
- 
- #define LIBS_MACHINE
-@@ -179,5 +193,5 @@
- 
- #define index strchr
- #define rindex strrchr
--
--#endif /* __hpux */
-+#endif
-+#endif

diff --git a/emacs/21.4/04_all_sh.patch b/emacs/21.4/04_all_sh.patch
deleted file mode 100644
index 254db24..0000000
--- a/emacs/21.4/04_all_sh.patch
+++ /dev/null
@@ -1,175 +0,0 @@
---- emacs21-21.2.orig/configure.in
-+++ emacs21-21.2/configure.in
-@@ -1055,6 +1055,16 @@
-     machine=mipsel opsys=gnu-linux
-   ;;
- 
-+  ## SuperH (little endian) Linux-based GNU system
-+  sh[34]-*-linux-gnu* )
-+    machine=sh opsys=gnu-linux
-+  ;;
-+
-+  ## SuperH (big endian) Linux-based GNU system
-+  sh[34]eb-*-linux-gnu* )
-+    machine=sheb opsys=gnu-linux
-+  ;;
-+
-   ## UXP/DS
-   sparc-fujitsu-sysv4* )
-     machine=sparc opsys=uxpds
---- emacs21-21.2.orig/src/m/sh.h
-+++ emacs21-21.2/src/m/sh.h
-@@ -0,0 +1,122 @@
-+/* machine description file for Hitach SuperH.
-+   Copyright (C) 2000 Free Software Foundation, Inc.
-+
-+This file is part of GNU Emacs.
-+
-+GNU Emacs is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 2, or (at your option)
-+any later version.
-+
-+GNU Emacs is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GNU Emacs; see the file COPYING.  If not, write to
-+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA.  */
-+
-+
-+/* The following line tells the configuration script what sort of 
-+   operating system this machine is likely to run.
-+   USUAL-OPSYS="<name of system .h file here, without the s- or .h>"  */
-+
-+/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
-+   is the most significant byte.  */
-+
-+#undef WORDS_BIG_ENDIAN
-+
-+/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
-+ * group of arguments and treat it as an array of the arguments.  */
-+
-+#define NO_ARG_ARRAY
-+
-+/* Define WORD_MACHINE if addresses and such have
-+ * to be corrected before they can be used as byte counts.  */
-+
-+#undef WORD_MACHINE
-+
-+/* Now define a symbol for the cpu type, if your compiler
-+   does not define it automatically:
-+   Ones defined so far include vax, m68000, ns16000, pyramid,
-+   orion, tahoe, APOLLO and many others */
-+#define SUPERH
-+
-+/* Use type int rather than a union, to represent Lisp_Object */
-+/* This is desirable for most machines.  */
-+
-+#define NO_UNION_TYPE
-+
-+/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-+   the 24-bit bit field into an int.  In other words, if bit fields
-+   are always unsigned.
-+
-+   If you use NO_UNION_TYPE, this flag does not matter.  */
-+
-+#define EXPLICIT_SIGN_EXTEND
-+
-+/* Data type of load average, as read out of kmem.  */
-+
-+#define LOAD_AVE_TYPE long
-+
-+/* Convert that into an integer that is 100 for a load average of 1.0  */
-+
-+#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-+
-+/* Define CANNOT_DUMP on machines where unexec does not work.
-+   Then the function dump-emacs will not be defined
-+   and temacs will do (load "loadup") automatically unless told otherwise.  */
-+
-+#undef CANNOT_DUMP
-+
-+/* Define VIRT_ADDR_VARIES if the virtual addresses of
-+   pure and impure space as loaded can vary, and even their
-+   relative order cannot be relied on.
-+
-+   Otherwise Emacs assumes that text space precedes data space,
-+   numerically.  */
-+
-+#undef VIRT_ADDR_VARIES
-+
-+/* Define C_ALLOCA if this machine does not support a true alloca
-+   and the one written in C should be used instead.
-+   Define HAVE_ALLOCA to say that the system provides a properly
-+   working alloca function and it should be used.
-+   Define neither one if an assembler-language alloca
-+   in the file alloca.s should be used.  */
-+
-+#undef C_ALLOCA
-+#define HAVE_ALLOCA
-+
-+/* Define NO_REMAP if memory segmentation makes it not work well
-+   to change the boundary between the text section and data section
-+   when Emacs is dumped.  If you define this, the preloaded Lisp
-+   code will not be sharable; but that's better than failing completely.  */
-+
-+#undef NO_REMAP
-+
-+/* Some really obscure 4.2-based systems (like Sequent DYNIX)
-+ * do not support asynchronous I/O (using SIGIO) on sockets,
-+ * even though it works fine on tty's.  If you have one of
-+ * these systems, define the following, and then use it in
-+ * config.h (or elsewhere) to decide when (not) to use SIGIO.
-+ *
-+ * You'd think this would go in an operating-system description file,
-+ * but since it only occurs on some, but not all, BSD systems, the
-+ * reasonable place to select for it is in the machine description
-+ * file.
-+ */
-+
-+#undef NO_SOCK_SIGIO
-+
-+
-+/* After adding support for a new system, modify the large case
-+   statement in the `configure' script to recognize reasonable
-+   configuration names, and add a description of the system to
-+   `etc/MACHINES'.
-+
-+   If you've just fixed a problem in an existing configuration file,
-+   you should also check `etc/MACHINES' to make sure its descriptions
-+   of known problems in that configuration should be updated.  */
-only in patch2:
---- emacs21-21.2.orig/src/m/sheb.h
-+++ emacs21-21.2/src/m/sheb.h
-@@ -0,0 +1,8 @@
-+/* machine description file for sheb (SuperH big endian).  */
-+
-+#include "sh.h"
-+
-+/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
-+   is the most significant byte.  */
-+
-+#define WORDS_BIG_ENDIAN
---- emacs-21.2.orig/configure	Fri Mar 15 21:46:09 2002
-+++ emacs-21.2/configure	Mon Nov 25 16:30:19 2002
-@@ -1666,6 +1666,16 @@
-     machine=mips opsys=gnu-linux
-   ;;
- 
-+  ## SuperH (little endian) Linux-based GNU system
-+  sh[34]-*-linux-gnu* )
-+    machine=sh opsys=gnu-linux
-+  ;;
-+
-+  ## SuperH (big endian) Linux-based GNU system
-+  sh[34]eb-*-linux-gnu* )
-+    machine=sheb opsys=gnu-linux
-+  ;;
-+
-   ## UXP/DS
-   sparc-fujitsu-sysv4* )
-     machine=sparc opsys=uxpds

diff --git a/emacs/21.4/05_all_libungif-gif-gentoo.patch b/emacs/21.4/05_all_libungif-gif-gentoo.patch
deleted file mode 100644
index abae185..0000000
--- a/emacs/21.4/05_all_libungif-gif-gentoo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ur emacs-21.4.orig/configure.in emacs-21.4/configure.in
---- emacs-21.4.orig/configure.in	2003-03-16 16:06:05.000000000 -0600
-+++ emacs-21.4/configure.in	2006-08-12 17:15:44.000000000 -0500
-@@ -1927,7 +1927,7 @@
-     AC_CHECK_HEADER(gif_lib.h,
- # EGifPutExtensionLast only exists from version libungif-4.1.0b1.
- # Earlier versions can crash Emacs.
--      AC_CHECK_LIB(ungif, EGifPutExtensionLast, HAVE_GIF=yes))
-+      AC_CHECK_LIB(gif, EGifPutExtensionLast, HAVE_GIF=yes))
-   fi
- 
-   if test "${HAVE_GIF}" = "yes"; then
-@@ -2283,7 +2283,7 @@
- echo "  Does Emacs use -lXpm?                                   ${HAVE_XPM}"
- echo "  Does Emacs use -ljpeg?                                  ${HAVE_JPEG}"
- echo "  Does Emacs use -ltiff?                                  ${HAVE_TIFF}"
--echo "  Does Emacs use -lungif?                                 ${HAVE_GIF}"
-+echo "  Does Emacs use -lgif?                                   ${HAVE_GIF}"
- echo "  Does Emacs use -lpng?                                   ${HAVE_PNG}"
- echo "  Does Emacs use X toolkit scroll bars?                   ${USE_TOOLKIT_SCROLL_BARS}"
- echo
-diff -ur emacs-21.4.orig/src/Makefile.in emacs-21.4/src/Makefile.in
---- emacs-21.4.orig/src/Makefile.in	2003-01-23 04:34:06.000000000 -0600
-+++ emacs-21.4/src/Makefile.in	2006-08-12 17:23:30.000000000 -0500
-@@ -402,7 +402,7 @@
- 
- #if HAVE_GIF
- #ifndef LIBGIF
--#define LIBGIF -lungif
-+#define LIBGIF -lgif
- #endif /* not defined LIBGIF */
- #else /* not HAVE_GIF */
- #define LIBGIF
-Only in emacs-21.4/src: Makefile.in~

diff --git a/emacs/21.4/06_ppc64_ppc64.patch b/emacs/21.4/06_ppc64_ppc64.patch
deleted file mode 100644
index 7572137..0000000
--- a/emacs/21.4/06_ppc64_ppc64.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- emacs-21.3/src/m/macppc.h.sopwith	2001-10-23 02:43:33.000000000 -0400
-+++ emacs-21.3/src/m/macppc.h	2003-05-02 09:17:37.000000000 -0400
-@@ -95,11 +95,47 @@
- 
- #ifdef LINUX
- #define LINKER $(CC) -nostdlib
--#define LD_SWITCH_MACHINE -Xlinker -m -Xlinker elf32ppc
-+#ifdef __powerpc64__
-+#define LD_SWITCH_MACHINE -m64 -Xlinker -m -Xlinker elf64ppc
-+#else
-+#define LD_SWITCH_MACHINE -m32 -Xlinker -m -Xlinker elf32ppc
-+#endif
- /* s/gnu-linux.h defines this to `-z nocombreloc' which does not work here
-    because prefix-args is not used.  */
- #undef LD_SWITCH_SYSTEM_TEMACS
- #define LD_SWITCH_MACHINE_TEMACS -Xlinker -znocombreloc
-+
-+#ifdef __powerpc64__
-+/* Misc 64-bit fixups, patterned after the x86_64 file */
-+#undef BITS_PER_LONG
-+#undef BITS_PER_EMACS_INT
-+#undef VALBITS
-+#undef PNTR_COMPARISON_TYPE
-+#undef MARKBIT
-+#undef XINT
-+#undef XUINT
-+#undef XPNTR
-+#undef START_FILES
-+#undef LIB_STANDARD
-+#undef EMACS_INT
-+#undef EMACS_UINT
-+#undef SPECIAL_EMACS_INT
-+
-+#define BITS_PER_LONG 64
-+#define BITS_PER_EMACS_INT 64
-+#define VALBITS 60
-+#define PNTR_COMPARISON_TYPE unsigned long
-+#define MARKBIT         0x8000000000000000L
-+
-+#define XINT(a)  (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS))
-+#define XUINT(a) ((long) (a) & VALMASK)
-+#define XPNTR(a) XUINT (a)
-+#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
-+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
-+#define EMACS_INT               long
-+#define EMACS_UINT              unsigned long
-+#define SPECIAL_EMACS_INT
-+#endif
- #endif
- 
- #if 0  /* This breaks things on PPC GNU/Linux ecept for Yellowdog,

diff --git a/emacs/21.4/07_ppc64_fix-unexelf.patch b/emacs/21.4/07_ppc64_fix-unexelf.patch
deleted file mode 100644
index 5a812a9..0000000
--- a/emacs/21.4/07_ppc64_fix-unexelf.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Fix unexelf.c (unexec) on ppc64, backported from Emacs 22 by Chip Coldwell,
-see <http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=183304>
---- emacs-21.4/src/unexelf.c	2002-10-15 10:21:44.000000000 -0400
-+++ emacs-21.4.works/src/unexelf.c	2006-07-26 11:08:05.000000000 -0400
-@@ -697,7 +697,7 @@ unexec (new_name, old_name, data_start, 
-   ElfW(Addr) new_data2_addr;
- 
-   int n, nn;
--  int old_bss_index, old_sbss_index;
-+  int old_bss_index, old_sbss_index, old_plt_index;
-   int old_data_index, new_data2_index;
-   int old_mdebug_index;
-   struct stat stat_buf;
-@@ -759,12 +759,31 @@ unexec (new_name, old_name, data_start, 
-     if (OLD_SECTION_H (old_sbss_index).sh_type == SHT_PROGBITS)
-       old_sbss_index = -1;
- 
--  if (old_sbss_index == -1)
-+  /* PowerPC64 has .plt in the BSS section.  */
-+  old_plt_index = find_section (".plt", old_section_names,
-+				old_name, old_file_h, old_section_h, 1);
-+  if (old_plt_index != -1)
-+    if (OLD_SECTION_H (old_plt_index).sh_type != SHT_NOBITS)
-+      old_plt_index = -1;
-+
-+  if (old_sbss_index == -1 && old_plt_index == -1)
-     {
-       old_bss_addr = OLD_SECTION_H (old_bss_index).sh_addr;
-       old_bss_size = OLD_SECTION_H (old_bss_index).sh_size;
-       new_data2_index = old_bss_index;
-     }
-+  else if (old_plt_index != -1
-+	   && (old_sbss_index == -1
-+	       || (OLD_SECTION_H (old_sbss_index).sh_addr
-+		   > OLD_SECTION_H (old_plt_index).sh_addr)))
-+    {
-+      old_bss_addr = OLD_SECTION_H (old_plt_index).sh_addr;
-+      old_bss_size = OLD_SECTION_H (old_bss_index).sh_size
-+	+ OLD_SECTION_H (old_plt_index).sh_size;
-+      if (old_sbss_index != -1)
-+	old_bss_size += OLD_SECTION_H (old_sbss_index).sh_size;
-+      new_data2_index = old_plt_index;
-+    }
-   else
-     {
-       old_bss_addr = OLD_SECTION_H (old_sbss_index).sh_addr;
-@@ -955,7 +974,7 @@ unexec (new_name, old_name, data_start, 
-       if (n == old_bss_index
- 	  /* The new bss and sbss section's size is zero, and its file offset
- 	     and virtual address should be off by NEW_DATA2_SIZE.  */
--	  || n == old_sbss_index
-+	  || n == old_sbss_index || n == old_plt_index
- 	  )
- 	{
- 	  /* NN should be `old_s?bss_index + 1' at this point. */
-@@ -986,9 +1005,8 @@ unexec (new_name, old_name, data_start, 
- 	      >= OLD_SECTION_H (old_bss_index-1).sh_offset)
- 	    NEW_SECTION_H (nn).sh_offset += new_data2_size;
- #else
--	  if (round_up (NEW_SECTION_H (nn).sh_offset,
--			OLD_SECTION_H (old_bss_index).sh_addralign)
--	      >= new_data2_offset)
-+	  if (NEW_SECTION_H (nn).sh_offset + NEW_SECTION_H (nn).sh_size
-+	      > new_data2_offset)
- 	    NEW_SECTION_H (nn).sh_offset += new_data2_size;
- #endif
- 	  /* Any section that was originally placed after the section

diff --git a/emacs/21.4/08_all_autosave-tmp.patch b/emacs/21.4/08_all_autosave-tmp.patch
deleted file mode 100644
index 240439d..0000000
--- a/emacs/21.4/08_all_autosave-tmp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- emacs-21.4/lisp/startup.el~	2003-03-16 23:05:59.000000000 +0100
-+++ emacs-21.4/lisp/startup.el	2007-02-16 11:21:18.000000000 +0100
-@@ -629,6 +629,9 @@
-   (setq small-temporary-file-directory
- 	(if (eq system-type 'ms-dos)
- 	    (getenv "TMPDIR")))
-+  (setq auto-save-file-name-transforms
-+	(list (list (caar auto-save-file-name-transforms)
-+		    (expand-file-name "\\2" temporary-file-directory))))
- 
-   ;; See if we should import version-control from the environment variable.
-   (let ((vc (getenv "VERSION_CONTROL")))

diff --git a/emacs/21.4/09_all_blessmail-build.patch b/emacs/21.4/09_all_blessmail-build.patch
deleted file mode 100644
index 03b0723..0000000
--- a/emacs/21.4/09_all_blessmail-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- emacs-22.0.93/lib-src/Makefile.in~	2007-01-17 16:53:20.000000000 +0100
-+++ emacs-22.0.93/lib-src/Makefile.in	2007-02-17 11:29:06.000000000 +0100
-@@ -23,6 +23,10 @@
- # inherited from the environment.
- SHELL = /bin/sh
- 
-+# following two lines taken from ../lisp/Makefile.in
-+EMACS = ../src/emacs
-+EMACSOPT = -batch --no-site-file --multibyte
-+
- # ==================== Things `configure' will edit ====================
- 
- CC=@CC@
-@@ -279,7 +283,7 @@
- 
- #ifdef MOVEMAIL_NEEDS_BLESSING
- blessmail:
--	../src/emacs -batch -l $(srcdir)/../lisp/mail/blessmail.el
-+	$(EMACS) $(EMACSOPT) -l $(srcdir)/../lisp/mail/blessmail.el
- 	chmod +x blessmail
- #endif
- 

diff --git a/emacs/21.4/10_all_qa.patch b/emacs/21.4/10_all_qa.patch
deleted file mode 100644
index d44ddc4..0000000
--- a/emacs/21.4/10_all_qa.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -ur emacs-21.4-orig/lib-src/cvtmail.c emacs-21.4/lib-src/cvtmail.c
---- emacs-21.4-orig/lib-src/cvtmail.c	2002-02-15 13:06:48.000000000 +0100
-+++ emacs-21.4/lib-src/cvtmail.c	2007-03-19 09:02:08.000000000 +0100
-@@ -33,12 +33,15 @@
-  * Author: Larry Kolodney, 1985
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
- 
- #include <stdio.h>
- 
--char *malloc ();
--char *realloc ();
-+#ifndef HAVE_STDLIB_H
- char *getenv ();
-+#endif
- 
- char *xmalloc ();
- char *xrealloc ();
-diff -ur emacs-21.4-orig/lib-src/yow.c emacs-21.4/lib-src/yow.c
---- emacs-21.4-orig/lib-src/yow.c	1999-02-26 12:37:05.000000000 +0100
-+++ emacs-21.4/lib-src/yow.c	2007-03-19 09:03:50.000000000 +0100
-@@ -10,6 +10,10 @@
-  * With dynamic memory allocation.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include <stdio.h>
- #include <ctype.h>
- #include <../src/epaths.h>      /* For PATH_DATA.  */
-@@ -33,8 +37,6 @@
-     &res;})
- #endif
- 
--char *malloc(), *realloc();
--
- void yow();
- void setup_yow();
- 
-diff -ur emacs-21.4-orig/src/prefix-args.c emacs-21.4/src/prefix-args.c
---- emacs-21.4-orig/src/prefix-args.c	2001-02-22 02:49:37.000000000 +0100
-+++ emacs-21.4/src/prefix-args.c	2007-03-19 09:20:27.000000000 +0100
-@@ -43,6 +43,10 @@
-    If I can't write a completely portable program to do this in C,
-    I'm quitting and taking up gardening.  */
- 
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
- #include <stdio.h>
- 
- int
-diff -ur emacs-21.4-orig/src/xterm.c emacs-21.4/src/xterm.c
---- emacs-21.4-orig/src/xterm.c	2002-10-15 16:21:45.000000000 +0200
-+++ emacs-21.4/src/xterm.c	2007-03-19 09:13:01.000000000 +0100
-@@ -10899,7 +10899,7 @@
- 		    if (!tool_bar_p)
- 		      if (!dpyinfo->x_focus_frame
- 			  || f == dpyinfo->x_focus_frame)
--			construct_mouse_click (&emacs_event, &event, f);
-+			construct_mouse_click (&emacs_event, &event.xbutton, f);
- 		  }
- 		else
- 		  {
-diff -ur emacs-21.4-orig/oldXMenu/ChgPane.c emacs-21.4/oldXMenu/ChgPane.c
---- emacs-21.4-orig/oldXMenu/ChgPane.c	1999-10-03 21:34:53.000000000 +0200
-+++ emacs-21.4/oldXMenu/ChgPane.c	2007-03-19 15:10:00.000000000 +0100
-@@ -13,6 +13,7 @@
-  *
-  */
- 
-+#include <config.h>
- #include "XMenuInt.h"
- 
- int
-diff -ur emacs-21.4-orig/oldXMenu/ChgSel.c emacs-21.4/oldXMenu/ChgSel.c
---- emacs-21.4-orig/oldXMenu/ChgSel.c	1999-10-03 21:34:54.000000000 +0200
-+++ emacs-21.4/oldXMenu/ChgSel.c	2007-03-19 15:10:02.000000000 +0100
-@@ -13,6 +13,7 @@
-  *
-  */
- 
-+#include <config.h>
- #include "XMenuInt.h"
- 
- int

diff --git a/emacs/21.4/11_all_Xaw3d-headers.patch b/emacs/21.4/11_all_Xaw3d-headers.patch
deleted file mode 100644
index 26d7a85..0000000
--- a/emacs/21.4/11_all_Xaw3d-headers.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -ur emacs-21.4-orig/src/xfns.c emacs-21.4/src/xfns.c
---- emacs-21.4-orig/src/xfns.c	2002-12-06 18:05:35.000000000 +0100
-+++ emacs-21.4/src/xfns.c	2007-04-19 01:56:40.000000000 +0200
-@@ -69,8 +69,13 @@
- #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
-diff -ur emacs-21.4-orig/src/xmenu.c emacs-21.4/src/xmenu.c
---- emacs-21.4-orig/src/xmenu.c	2002-01-06 07:18:19.000000000 +0100
-+++ emacs-21.4/src/xmenu.c	2007-04-19 01:56:40.000000000 +0200
-@@ -73,7 +73,11 @@
- #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 */
-diff -ur emacs-21.4-orig/lwlib/lwlib.c emacs-21.4/lwlib/lwlib.c
---- emacs-21.4-orig/lwlib/lwlib.c	2000-09-30 19:03:27.000000000 +0200
-+++ emacs-21.4/lwlib/lwlib.c	2007-04-19 01:56:40.000000000 +0200
-@@ -49,7 +49,11 @@
- #include "lwlib-Xol.h"
- #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
- 
-diff -ur emacs-21.4-orig/lwlib/lwlib-Xaw.c emacs-21.4/lwlib/lwlib-Xaw.c
---- emacs-21.4-orig/lwlib/lwlib-Xaw.c	2001-02-28 15:55:17.000000000 +0100
-+++ emacs-21.4/lwlib/lwlib-Xaw.c	2007-04-19 01:56:40.000000000 +0200
-@@ -31,12 +31,21 @@
- #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/emacs/21.4/12_all_freebsd-terminfo.patch b/emacs/21.4/12_all_freebsd-terminfo.patch
deleted file mode 100644
index 0741dbe..0000000
--- a/emacs/21.4/12_all_freebsd-terminfo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Taken from FreeBSD Ports
-
---- src/s/freebsd.h.orig	Tue Feb 20 19:52:17 2001
-+++ src/s/freebsd.h	Mon Feb 18 11:51:50 2002
-@@ -68,6 +68,11 @@
- #define LIBS_SYSTEM -lutil
- #if __FreeBSD_version < 400000
- #define LIBS_TERMCAP -ltermcap
-+#else
-+#ifdef HAVE_LIBNCURSES
-+#define TERMINFO
-+#define LIBS_TERMCAP -lncurses
-+#endif
- #endif
- 
- #define SYSV_SYSTEM_DIR

diff --git a/emacs/21.4/13_all_oldxmenu-malloc.patch b/emacs/21.4/13_all_oldxmenu-malloc.patch
deleted file mode 100644
index c7d45e6..0000000
--- a/emacs/21.4/13_all_oldxmenu-malloc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- emacs-21.4/oldXMenu/XMakeAssoc.c~	1999-10-03 21:35:22.000000000 +0200
-+++ emacs-21.4/oldXMenu/XMakeAssoc.c	2007-05-28 22:21:57.000000000 +0200
-@@ -91,7 +91,7 @@
- 	/* If we are here then the new entry should be inserted just */
- 	/* before the current value of "Entry". */
- 	/* Create a new XAssoc and load it with new provided data. */
--	new_entry = (XAssoc *) xmalloc(sizeof(XAssoc));
-+	new_entry = (XAssoc *) malloc(sizeof(XAssoc));
- 	new_entry->display = dpy;
- 	new_entry->x_id = x_id;
- 	new_entry->data = data;

diff --git a/emacs/21.4/14_all_gif-image-size.patch b/emacs/21.4/14_all_gif-image-size.patch
deleted file mode 100644
index 506e310..0000000
--- a/emacs/21.4/14_all_gif-image-size.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- emacs21-21.4a+1.orig/src/xfns.c
-+++ emacs21-21.4a+1/src/xfns.c
-@@ -9805,8 +9805,17 @@
-       return 0;
-     }
- 
--  width = img->width = max (gif->SWidth, gif->Image.Left + gif->Image.Width);
--  height = img->height = max (gif->SHeight, gif->Image.Top + gif->Image.Height);
-+  image_top = gif->SavedImages[ino].ImageDesc.Top;
-+  image_left = gif->SavedImages[ino].ImageDesc.Left;
-+  image_width = gif->SavedImages[ino].ImageDesc.Width;
-+  image_height = gif->SavedImages[ino].ImageDesc.Height;
-+
-+  width = img->width = max (gif->SWidth,
-+			    max (gif->Image.Left + gif->Image.Width,
-+				 image_left + image_width));
-+  height = img->height = max (gif->SHeight,
-+			      max (gif->Image.Top + gif->Image.Height,
-+				   image_top + image_height));
- 
-   /* Create the X image and pixmap.  */
-   if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap))
-@@ -9839,11 +9848,6 @@
-      requires more than can be done here (see the gif89 spec,
-      disposal methods).  Let's simply assume that the part
-      not covered by a sub-image is in the frame's background color.  */
--  image_top = gif->SavedImages[ino].ImageDesc.Top;
--  image_left = gif->SavedImages[ino].ImageDesc.Left;
--  image_width = gif->SavedImages[ino].ImageDesc.Width;
--  image_height = gif->SavedImages[ino].ImageDesc.Height;
--
-   for (y = 0; y < image_top; ++y)
-     for (x = 0; x < width; ++x)
-       XPutPixel (ximg, x, y, FRAME_BACKGROUND_PIXEL (f));

diff --git a/emacs/21.4/15_all_format-int.patch b/emacs/21.4/15_all_format-int.patch
deleted file mode 100644
index b825031..0000000
--- a/emacs/21.4/15_all_format-int.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- emacs-21.4-orig/src/editfns.c	2003-01-20 12:03:33.000000000 +0100
-+++ emacs-21.4/src/editfns.c	2007-11-25 17:02:54.000000000 +0100
-@@ -3266,7 +3266,7 @@
- 		  && *format != 'i' && *format != 'X' && *format != 'c')
- 		error ("Invalid format operation %%%c", *format);
- 
--	    thissize = 30;
-+	    thissize = 30 + (precision > 0 ? precision : 0);
- 	    if (*format == 'c'
- 		&& (! SINGLE_BYTE_CHAR_P (XINT (args[n]))
- 		    || XINT (args[n]) == 0))

diff --git a/emacs/21.4/16_all_vcdiff-tmp-race.patch b/emacs/21.4/16_all_vcdiff-tmp-race.patch
deleted file mode 100644
index 7f59d6a..0000000
--- a/emacs/21.4/16_all_vcdiff-tmp-race.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Steve Grubb of Red Hat discovered that vcdiff script as shipped with Emacs
-(confirmed in versions 20.7 to 22.1.50) uses temporary files insecurely,
-which makes it possible for local attacker to conduct a symlink attack and
-make the victim overwrite arbitrary file.
-
-diff -ur emacs-21.4.orig/lib-src/vcdiff emacs-21.4/lib-src/vcdiff
---- emacs-21.4.orig/lib-src/vcdiff	2006-09-28 12:07:51.000000000 -0400
-+++ emacs-21.4/lib-src/vcdiff	2006-09-28 15:58:53.000000000 -0400
-@@ -86,14 +86,14 @@
- 	case $f in
- 	s.* | */s.*)
- 		if
--			rev1=/tmp/geta$$
-+			rev1=`mktemp /tmp/geta.XXXXXXXX`
- 			get -s -p -k $sid1 "$f" > $rev1 &&
- 			case $sid2 in
- 			'')
- 				workfile=`expr " /$f" : '.*/s.\(.*\)'`
- 				;;
- 			*)
--				rev2=/tmp/getb$$
-+				rev2=`mktemp /tmp/getb.XXXXXXXX`
- 				get -s -p -k $sid2 "$f" > $rev2
- 				workfile=$rev2
- 			esac

diff --git a/emacs/21.4/17_all_bss-heap-gap.patch b/emacs/21.4/17_all_bss-heap-gap.patch
deleted file mode 100644
index c2e0ebc..0000000
--- a/emacs/21.4/17_all_bss-heap-gap.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-http://bugs.gentoo.org/221281
-temacs segfaults in dump-emacs under Linux 2.6.25
-Patch backported from Emacs 22 and upstream bug 900.
-It comprises parts of the following changes:
-
-2008-10-21  Jan Djärv  <jan.h.d@×××××××.se>
-
-	* emacs.c (main): Unconditionally set PER_LINUX32 and exec
-	temacs when dumping if HAVE_PERSONALITY_LINUX32 is defined
-
-2005-07-01  Masatake YAMATO  <jet@××××.org>
-
-	* emacs.c (main): Passing ADD_NO_RANDOMIZE to `personality'.
-
-2004-10-20  Jan Djärv  <jan.h.d@×××××××.se>
-
-	* configure.in (HAVE_PERSONALITY_LINUX32): New test if PER_LINUX32
-	can be set.
-
---- emacs-21.4-orig/configure.in	2008-05-11 00:02:58.000000000 +0200
-+++ emacs-21.4/configure.in	2008-05-11 00:29:23.000000000 +0200
-@@ -1358,6 +1358,18 @@
- AC_CHECK_HEADERS(sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \
-   linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \
-   termcap.h stdio_ext.h fcntl.h term.h strings.h)
-+
-+AC_MSG_CHECKING(if personality LINUX32 can be set)
-+AC_TRY_COMPILE([#include <sys/personality.h>], [personality (PER_LINUX32)],
-+	       emacs_cv_personality_linux32=yes,
-+	       emacs_cv_personality_linux32=no)
-+AC_MSG_RESULT($emacs_cv_personality_linux32)
-+
-+if test $emacs_cv_personality_linux32 = yes; then
-+  AC_DEFINE(HAVE_PERSONALITY_LINUX32, 1,
-+	    [Define to 1 if personality LINUX32 can be set.])
-+fi
-+
- AC_HEADER_STDC
- AC_HEADER_TIME
- AC_DECL_SYS_SIGLIST
---- emacs-21.4-orig/src/config.in	2002-07-09 00:23:31.000000000 +0200
-+++ emacs-21.4/src/config.in	2008-05-11 00:13:38.000000000 +0200
-@@ -183,6 +183,7 @@
- #undef HAVE_UALARM
- #undef HAVE_SYS_WAIT_H
- #undef HAVE_STRINGS_H
-+#undef HAVE_PERSONALITY_LINUX32
- 
- #undef HAVE_LIBDNET
- #undef HAVE_LIBPTHREADS
---- emacs-21.4-orig/src/emacs.c	2002-08-29 21:27:07.000000000 +0200
-+++ emacs-21.4/src/emacs.c	2008-05-11 00:26:38.000000000 +0200
-@@ -61,6 +61,13 @@
- #include <sys/resource.h>
- #endif
- 
-+#ifdef HAVE_PERSONALITY_LINUX32
-+#include <sys/personality.h>
-+#ifndef ADDR_NO_RANDOMIZE
-+#define ADDR_NO_RANDOMIZE 0x0040000
-+#endif
-+#endif
-+
- #ifndef O_RDWR
- #define O_RDWR 2
- #endif
-@@ -763,6 +770,28 @@
- 	}
-     }
- 
-+#ifdef HAVE_PERSONALITY_LINUX32
-+  /* See if there is a gap between the end of BSS and the heap.
-+     In that case, set personality and exec ourself again.  */
-+  if (!initialized
-+      && (strcmp (argv[argc-1], "dump") == 0
-+	  || strcmp (argv[argc-1], "bootstrap") == 0)
-+      && !getenv ("EMACS_HEAP_EXEC"))
-+    {
-+      /* Set this so we only do this once.  */
-+      putenv ("EMACS_HEAP_EXEC=true");
-+
-+      /* A flag to turn off address randomization which is introduced
-+	 in linux kernel shipped with fedora core 4 */
-+      personality (PER_LINUX32 | ADDR_NO_RANDOMIZE);
-+
-+      execvp (argv[0], argv);
-+
-+      /* If the exec fails, try to dump anyway.  */
-+      perror ("execvp");
-+    }
-+#endif /* HAVE_PERSONALITY_LINUX32 */
-+
- /* Map in shared memory, if we are using that.  */
- #ifdef HAVE_SHM
-   if (argmatch (argv, argc, "-nl", "--no-shared-memory", 6, NULL, &skip_args))

diff --git a/emacs/21.4/18_all_fast-lock.patch b/emacs/21.4/18_all_fast-lock.patch
deleted file mode 100644
index 84ba996..0000000
--- a/emacs/21.4/18_all_fast-lock.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-http://bugs.gentoo.org/221197
-CVE-2008-2142
-
---- emacs-21.4-orig/lisp/fast-lock.el	2001-07-15 18:15:34.000000000 +0200
-+++ emacs-21.4/lisp/fast-lock.el	2008-05-12 22:43:07.000000000 +0200
-@@ -278,7 +278,7 @@
- 				      (integer :tag "size")))))
-   :group 'fast-lock)
- 
--(defcustom fast-lock-cache-directories '("." "~/.emacs-flc")
-+(defcustom fast-lock-cache-directories '("~/.emacs-flc")
- ; - `internal', keep each file's Font Lock cache file in the same file.
- ; - `external', keep each file's Font Lock cache file in the same directory.
-   "*Directories in which Font Lock cache files are saved and read.
-@@ -296,13 +296,18 @@
-  ((\"^/your/true/home/directory/\" . \".\") \"~/.emacs-flc\")
- 
- would cause a file's current directory to be used if the file is under your
--home directory hierarchy, or otherwise the absolute directory `~/.emacs-flc'."
-+home directory hierarchy, or otherwise the absolute directory `~/.emacs-flc'.
-+For security reasons, it is not advisable to use the file's current directory
-+to avoid the possibility of using the cache of another user."
-   :type '(repeat (radio (directory :tag "directory")
- 			(cons :tag "Matching"
- 			      (regexp :tag "regexp")
- 			      (directory :tag "directory"))))
-   :group 'fast-lock)
- 
-+;;;###autoload
-+(put 'fast-lock-cache-directories 'risky-local-variable t)
-+
- (defcustom fast-lock-save-events '(kill-buffer kill-emacs)
-   "*Events under which caches will be saved.
- Valid events are `save-buffer', `kill-buffer' and `kill-emacs'.
---- emacs-21.4-orig/lisp/loaddefs.el	2003-03-18 15:36:18.000000000 +0100
-+++ emacs-21.4/lisp/loaddefs.el	2008-05-12 22:47:58.000000000 +0200
-@@ -6963,6 +6963,8 @@
- ;;;;;;  "fast-lock.el" (15611 31344))
- ;;; Generated autoloads from fast-lock.el
- 
-+(put (quote fast-lock-cache-directories) (quote risky-local-variable) t)
-+
- (autoload (quote fast-lock-mode) "fast-lock" "\
- Toggle Fast Lock mode.
- With arg, turn Fast Lock mode on if and only if arg is positive and the buffer

diff --git a/emacs/21.4/19_all_autoconf-2.61.patch b/emacs/21.4/19_all_autoconf-2.61.patch
deleted file mode 100644
index 4877d86..0000000
--- a/emacs/21.4/19_all_autoconf-2.61.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Update configure.in to work with autoconf 2.61.
-
---- emacs-21.4-orig/Makefile.in
-+++ emacs-21.4/Makefile.in
-@@ -273,7 +273,7 @@
- config.status: ${srcdir}/configure
- 	./config.status --recheck
- 
--${srcdir}/configure: configure.in aclocal.m4
-+${srcdir}/configure: configure.in
- 	cd ${srcdir} && autoconf
- 
- src/Makefile: $(srcdir)/src/Makefile.in config.status
---- emacs-21.4-orig/configure.in
-+++ emacs-21.4/configure.in
-@@ -23,7 +23,7 @@
- dnl  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- dnl  Boston, MA 02111-1307, USA.
- 
--AC_PREREQ(2.8)dnl
-+AC_PREREQ(2.61)dnl
- AC_INIT(src/lisp.h)
- AC_CONFIG_HEADER(src/config.h:src/config.in)
- 
-@@ -1345,6 +1345,9 @@
-   CPPFLAGS="$c_switch_system $c_switch_machine $CPPFLAGS"
- fi
- 
-+dnl For AC_FUNC_GETLOADAVG, at least:
-+AC_CONFIG_LIBOBJ_DIR(src)
-+
- dnl Do this early because it can frob feature test macros for Unix-98 &c.
- AC_SYS_LARGEFILE
- 
-@@ -2069,11 +2072,11 @@
-     AC_CHECK_HEADERS(krb5.h)
-   else
-     AC_CHECK_HEADERS(des.h,,
--		     AC_CHECK_HEADERS(kerberosIV/des.h,,
--				      AC_CHECK_HEADERS(kerberos/des.h)))
-+		     [AC_CHECK_HEADERS(kerberosIV/des.h,,
-+				      [AC_CHECK_HEADERS(kerberos/des.h)])])
-     AC_CHECK_HEADERS(krb.h,,
--		     AC_CHECK_HEADERS(kerberosIV/krb.h,,
--				      AC_CHECK_HEADERS(kerberos/krb.h)))
-+		     [AC_CHECK_HEADERS(kerberosIV/krb.h,,
-+				      [AC_CHECK_HEADERS(kerberos/krb.h)])])
-   fi
-   AC_CHECK_HEADERS(com_err.h)
- fi

diff --git a/emacs/21.4/20_all_manpage-install.patch b/emacs/21.4/20_all_manpage-install.patch
deleted file mode 100644
index 590ace6..0000000
--- a/emacs/21.4/20_all_manpage-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/165466
-
---- emacs-21.4-orig/Makefile.in
-+++ emacs-21.4/Makefile.in
-@@ -448,7 +448,7 @@
- 	-chmod -R a+r ${datadir}/emacs ${COPYDESTS} ${infodir}
- 	thisdir=`/bin/pwd`; \
- 	cd ${srcdir}/etc; \
--	for page in emacs etags ctags gfdl ; do \
-+	for page in emacs emacsclient etags ctags ; do \
- 	  (cd $${thisdir}; \
- 	   ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${man1dir}/$${page}${manext}; \
- 	   chmod a+r ${man1dir}/$${page}${manext}); \

diff --git a/emacs/21.4/21_all_libpng14.patch b/emacs/21.4/21_all_libpng14.patch
deleted file mode 100644
index cf16275..0000000
--- a/emacs/21.4/21_all_libpng14.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix building with libpng-1.4.
-
---- emacs-21.4-orig/src/xfns.c
-+++ emacs-21.4/src/xfns.c
-@@ -8641,7 +8641,7 @@
- 
-       /* Check PNG signature.  */
-       if (fread (sig, 1, sizeof sig, fp) != sizeof sig
--	  || !png_check_sig (sig, sizeof sig))
-+	  || png_sig_cmp (sig, 0, sizeof sig))
- 	{
- 	  image_error ("Not a PNG file: `%s'", file, Qnil);
- 	  UNGCPRO;
-@@ -8658,7 +8658,7 @@
- 
-       /* Check PNG signature.  */
-       if (tbr.len < sizeof sig
--	  || !png_check_sig (tbr.bytes, sizeof sig))
-+	  || png_sig_cmp (tbr.bytes, 0, sizeof sig))
- 	{
- 	  image_error ("Not a PNG image: `%s'", img->spec, Qnil);
- 	  UNGCPRO;

diff --git a/emacs/21.4/22_all_cpp-4.5.patch b/emacs/21.4/22_all_cpp-4.5.patch
deleted file mode 100644
index 9a09909..0000000
--- a/emacs/21.4/22_all_cpp-4.5.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-http://bugs.gentoo.org/308653
-http://debbugs.gnu.org/5047
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=41748
-Fix building with GNU CPP 4.5, patch backported from upstream CVS.
-
---- emacs-21.4-orig/configure.in
-+++ emacs-21.4/configure.in
-@@ -2350,7 +2350,7 @@
-   sed -e '1,/start of cpp stuff/d'\
-       -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
-       < Makefile.c > junk.c
--  $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
-+  $CPP -P $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
-       sed -e 's/^ /	/' -e '/^#/d' -e '/^[ 	]*$/d' > junk2.c
-   cat junk1.c junk2.c > Makefile.new
-   rm -f junk.c junk1.c junk2.c
-@@ -2366,7 +2366,7 @@
-   sed -e '1,/start of cpp stuff/d'\
-       -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
-       < Makefile.c > junk.c
--  $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
-+  $CPP -P $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
-       sed -e 's/^ /	/' -e '/^#/d' -e '/^[ 	]*$/d' > junk2.c
-   cat junk1.c junk2.c > Makefile.new
-   rm -f junk.c junk1.c junk2.c

diff --git a/emacs/21.4/23_all_libpng15.patch b/emacs/21.4/23_all_libpng15.patch
deleted file mode 100644
index 4516b19..0000000
--- a/emacs/21.4/23_all_libpng15.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/384553
-
---- emacs-21.4-orig/src/xfns.c
-+++ emacs-21.4/src/xfns.c
-@@ -8546,7 +8546,7 @@
- {
-   xassert (png_ptr != NULL);
-   image_error ("PNG error: %s", build_string (msg), Qnil);
--  longjmp (png_ptr->jmpbuf, 1);
-+  longjmp (png_jmpbuf (png_ptr), 1);
- }
- 
- 
-@@ -8704,7 +8704,7 @@
- 
-   /* Set error jump-back.  We come back here when the PNG library
-      detects an error.  */
--  if (setjmp (png_ptr->jmpbuf))
-+  if (setjmp (png_jmpbuf (png_ptr)))
-     {
-     error:
-       if (png_ptr)

diff --git a/emacs/21.4/24_all_libXaw3d-1.6.patch b/emacs/21.4/24_all_libXaw3d-1.6.patch
deleted file mode 100644
index b8fdf3b..0000000
--- a/emacs/21.4/24_all_libXaw3d-1.6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Fix compilation with libXaw3d-1.6.
-
---- emacs-21.4-orig/src/xterm.c	2012-06-11 23:35:23.000000000 +0200
-+++ emacs-21.4/src/xterm.c	2012-06-11 23:37:13.000000000 +0200
-@@ -119,6 +119,7 @@
- #include <X11/Xaw3d/Simple.h>
- #include <X11/Xaw3d/Scrollbar.h>
- #define ARROW_SCROLLBAR
-+#define XAW_ARROW_SCROLLBARS
- #include <X11/Xaw3d/ScrollbarP.h>
- #else /* !HAVE_XAW3D */
- #include <X11/Xaw/Simple.h>

diff --git a/emacs/22.3/01_all_Xaw3d-headers.patch b/emacs/22.3/01_all_Xaw3d-headers.patch
deleted file mode 100644
index 8b4f332..0000000
--- a/emacs/22.3/01_all_Xaw3d-headers.patch
+++ /dev/null
@@ -1,150 +0,0 @@
---- emacs-22.1-orig/src/xfns.c	2007-06-02 06:00:11.000000000 +0200
-+++ emacs-22.1/src/xfns.c	2007-07-01 17:19:35.000000000 +0200
-@@ -72,8 +72,13 @@
- #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-22.1-orig/src/xmenu.c	2007-05-14 16:56:31.000000000 +0200
-+++ emacs-22.1/src/xmenu.c	2007-07-01 17:19:35.000000000 +0200
-@@ -82,7 +82,11 @@
- #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-22.1-orig/lwlib/lwlib.c	2007-04-20 15:27:29.000000000 +0200
-+++ emacs-22.1/lwlib/lwlib.c	2007-07-01 17:19:35.000000000 +0200
-@@ -48,7 +48,11 @@
- #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-22.1-orig/lwlib/lwlib-Xaw.c	2007-04-20 15:27:29.000000000 +0200
-+++ emacs-22.1/lwlib/lwlib-Xaw.c	2007-07-01 17:19:35.000000000 +0200
-@@ -35,12 +35,21 @@
- #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>
- 
---- emacs-22.1-orig/configure.in	2007-05-25 14:43:29.000000000 +0200
-+++ emacs-22.1/configure.in	2007-07-01 17:19:35.000000000 +0200
-@@ -2205,29 +2205,45 @@
- 
- dnl Do not put whitespace before the #include statements below.
- dnl Older compilers (eg sunos4 cc) choke on it.
-+HAVE_XAW3D=no
- if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then
--  if test x"${HAVE_X11R5}" = xyes; then
--    AC_MSG_CHECKING(X11 version 5 with Xaw)
--    AC_CACHE_VAL(emacs_cv_x11_version_5_with_xaw,
-+  if test x"${HAVE_X11R5}" != xyes; then
-+    USE_X_TOOLKIT=none
-+  else
-+    AC_MSG_CHECKING(for xaw3d)
-+    AC_CACHE_VAL(emacs_cv_xaw3d,
-     [AC_TRY_LINK([
- #include <X11/Intrinsic.h>
--#include <X11/Xaw/Simple.h>],
-+#include <X11/Xaw3d/Simple.h>],
-       [],
--      emacs_cv_x11_version_5_with_xaw=yes,
--      emacs_cv_x11_version_5_with_xaw=no)])
--    if test $emacs_cv_x11_version_5_with_xaw = yes; then
--      AC_MSG_RESULT([5 or newer, with Xaw; use toolkit by default])
-+      emacs_cv_xaw3d=yes,
-+      emacs_cv_xaw3d=no)])
-+    if test $emacs_cv_xaw3d = yes; then
-+      AC_MSG_RESULT([yes; using Lucid toolkit])
-       USE_X_TOOLKIT=LUCID
-+      HAVE_XAW3D=yes
-+      AC_DEFINE(HAVE_XAW3D, 1,
-+                [Define to 1 if you have the Xaw3d library (-lXaw3d).])
-     else
--      if test x"${USE_X_TOOLKIT}" = xLUCID; then
-+      AC_MSG_RESULT(no)
-+      AC_MSG_CHECKING(for libXaw)
-+      AC_CACHE_VAL(emacs_cv_xaw,
-+      [AC_TRY_LINK([
-+#include <X11/Intrinsic.h>
-+#include <X11/Xaw/Simple.h>],
-+        [],
-+        emacs_cv_xaw=yes,
-+        emacs_cv_xaw=no)])
-+      if test $emacs_cv_xaw = yes; then
-+        AC_MSG_RESULT([yes; using Lucid toolkit])
-+        USE_X_TOOLKIT=LUCID
-+      elif test x"${USE_X_TOOLKIT}" = xLUCID; then
-         AC_MSG_ERROR([Lucid toolkit requires X11/Xaw include files])
-       else
--        AC_MSG_RESULT(before 5 or no Xaw; do not use toolkit by default)
-+        AC_MSG_RESULT([no; do not use toolkit by default])
-         USE_X_TOOLKIT=none
-       fi
-     fi
--  else
--    USE_X_TOOLKIT=none
-   fi
- fi
- 
-@@ -2315,21 +2331,6 @@
-   fi
- fi
- 
--### Is -lXaw3d available?
--HAVE_XAW3D=no
--if test "${HAVE_X11}" = "yes"; then
--  if test "${USE_X_TOOLKIT}" != "none" && test "${with_toolkit_scroll_bars}" != "no"; then
--    dnl Fixme: determine what Scrollbar.h needs to avoid compilation
--    dnl errors from the test without the `-'.
--    AC_CHECK_HEADER(X11/Xaw3d/Scrollbar.h,
--	[AC_CHECK_LIB(Xaw3d, XawScrollbarSetThumb, HAVE_XAW3D=yes)], , -)
--    if test "${HAVE_XAW3D}" = "yes"; then
--	AC_DEFINE(HAVE_XAW3D, 1,
--		  [Define to 1 if you have the Xaw3d library (-lXaw3d).])
--    fi
--  fi
--fi
--
- dnl Use toolkit scroll bars if configured for GTK or X toolkit and either
- dnl using Motif or Xaw3d is available, and unless
- dnl --with-toolkit-scroll-bars=no was specified.

diff --git a/emacs/22.3/02_all_freebsd-sparc.patch b/emacs/22.3/02_all_freebsd-sparc.patch
deleted file mode 100644
index de206e7..0000000
--- a/emacs/22.3/02_all_freebsd-sparc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://bugs.gentoo.org/159584
-Patch taken from FreeBSD ports, by Giorgos Keramidas <keramida@×××××××.org>
-
---- emacs-orig/src/alloc.c
-+++ emacs/src/alloc.c
-@@ -4573,7 +4573,11 @@
-      needed on ia64 too.  See mach_dep.c, where it also says inline
-      assembler doesn't work with relevant proprietary compilers.  */
- #ifdef __sparc__
-+#ifdef __sparc64__
-+  asm ("flushw");
-+#else
-   asm ("ta 3");
-+#endif
- #endif
- 
-   /* Save registers that we need to see on the stack.  We need to see

diff --git a/emacs/22.3/03_all_sh.patch b/emacs/22.3/03_all_sh.patch
deleted file mode 100644
index c4a6469..0000000
--- a/emacs/22.3/03_all_sh.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- emacs-22.2-orig/configure.in	2008-09-26 07:20:44.000000000 +0200
-+++ emacs-22.2/configure.in	2008-09-30 12:57:06.000000000 +0200
-@@ -1192,6 +1192,16 @@
-     machine=mips opsys=gnu-linux
-   ;;
- 
-+  ## SuperH (little endian) Linux-based GNU system
-+  sh[34]-*-linux-gnu* )
-+    machine=sh3el opsys=gnu-linux
-+  ;;
-+
-+  ## SuperH (big endian) Linux-based GNU system
-+  sh[34]eb-*-linux-gnu* )
-+    machine=sh3eb opsys=gnu-linux
-+  ;;
-+
-   ## UXP/DS
-   sparc-fujitsu-sysv4* )
-     machine=sparc opsys=uxpds
---- emacs-22.2-orig/src/m/sh3eb.h	1970-01-01 01:00:00.000000000 +0100
-+++ emacs-22.2/src/m/sh3eb.h	2008-09-30 12:59:44.000000000 +0200
-@@ -0,0 +1,4 @@
-+/* machine description file for big-endian SuperH. */
-+
-+#include "sh3el.h"
-+#define WORDS_BIG_ENDIAN

diff --git a/emacs/22.3/04_all_linux-random-heap.patch b/emacs/22.3/04_all_linux-random-heap.patch
deleted file mode 100644
index 37bee82..0000000
--- a/emacs/22.3/04_all_linux-random-heap.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/236579
-http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=900
-Fixes sporadic segmentation faults in unexec.
-
---- emacs-22.3-orig/src/emacs.c	2008-05-12 10:30:13.000000000 +0200
-+++ emacs-22.3/src/emacs.c	2008-10-21 16:45:50.000000000 +0200
-@@ -883,7 +883,7 @@
-   if (!initialized
-       && (strcmp (argv[argc-1], "dump") == 0
-           || strcmp (argv[argc-1], "bootstrap") == 0)
--      && heap_bss_diff > MAX_HEAP_BSS_DIFF)
-+      /*&& heap_bss_diff > MAX_HEAP_BSS_DIFF*/)
-     {
-       if (! getenv ("EMACS_HEAP_EXEC"))
-         {

diff --git a/emacs/22.3/05_all_gtk-menu.patch b/emacs/22.3/05_all_gtk-menu.patch
deleted file mode 100644
index 09b7c46..0000000
--- a/emacs/22.3/05_all_gtk-menu.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-http://bugs.gentoo.org/292007
-http://emacsbugs.donarmstrong.com/4122
-http://bugs.gentoo.org/292492
-http://emacsbugs.donarmstrong.com/4336
-Fix updating of menus with GTK+ 2.18
-Patch by Jan Djärv <jan.h.d@×××××××.se>, backported from upstream CVS
-
---- emacs-22.3-orig/src/xfns.c
-+++ emacs-22.3/src/xfns.c
-@@ -374,10 +374,7 @@
- #ifdef USE_GTK
-               GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
-               if (gwdesc != 0
--                  && (gwdesc == x->widget
--                      || gwdesc == x->edit_widget
--                      || gwdesc == x->vbox_widget
--                      || gwdesc == x->menubar_widget))
-+                  && gtk_widget_get_toplevel (gwdesc) == x->widget)
-                 found = f;
- #else
- 	      if (wdesc == XtWindow (x->widget)
-@@ -398,54 +395,6 @@
-   return found;
- }
- 
--/* Likewise, but exclude the menu bar widget.  */
--
--struct frame *
--x_non_menubar_window_to_frame (dpyinfo, wdesc)
--     struct x_display_info *dpyinfo;
--     int wdesc;
--{
--  Lisp_Object tail, frame;
--  struct frame *f;
--  struct x_output *x;
--
--  if (wdesc == None) return 0;
--
--  for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail))
--    {
--      frame = XCAR (tail);
--      if (!GC_FRAMEP (frame))
--        continue;
--      f = XFRAME (frame);
--      if (!FRAME_X_P (f) || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
--	continue;
--      x = f->output_data.x;
--      /* This frame matches if the window is any of its widgets.  */
--      if (x->hourglass_window == wdesc)
--	return f;
--      else if (x->widget)
--	{
--#ifdef USE_GTK
--          GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
--          if (gwdesc != 0
--              && (gwdesc == x->widget
--                  || gwdesc == x->edit_widget
--                  || gwdesc == x->vbox_widget))
--            return f;
--#else
--	  if (wdesc == XtWindow (x->widget)
--	      || wdesc == XtWindow (x->column_widget)
--	      || wdesc == XtWindow (x->edit_widget))
--	    return f;
--#endif
--	}
--      else if (FRAME_X_WINDOW (f) == wdesc)
--	/* A tooltip frame.  */
--	return f;
--    }
--  return 0;
--}
--
- /* Likewise, but consider only the menu bar widget.  */
- 
- struct frame *
-@@ -473,15 +422,14 @@
-       if (x->menubar_widget)
-         {
-           GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
--          int found = 0;
- 
--          BLOCK_INPUT;
-+	  /* This gives false positives, but the rectangle check in xterm.c
-+	     where this is called takes care of that.  */
-           if (gwdesc != 0
-               && (gwdesc == x->menubar_widget
--                  || gtk_widget_get_parent (gwdesc) == x->menubar_widget))
--            found = 1;
--          UNBLOCK_INPUT;
--          if (found) return f;
-+                  || gtk_widget_is_ancestor (x->menubar_widget, gwdesc)
-+		  || gtk_widget_is_ancestor (gwdesc, x->menubar_widget)))
-+            return f;
-         }
- #else
-       if (x->menubar_widget
---- emacs-22.3-orig/src/xterm.c
-+++ emacs-22.3/src/xterm.c
-@@ -110,8 +110,6 @@
- #if defined (USE_X_TOOLKIT) || defined (USE_GTK)
- 
- extern void free_frame_menubar P_ ((struct frame *));
--extern struct frame *x_menubar_window_to_frame P_ ((struct x_display_info *,
--						    int));
- #endif
- 
- #ifdef USE_X_TOOLKIT
-@@ -144,11 +142,6 @@
- 
- #endif /* USE_X_TOOLKIT */
- 
--#if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
--#define x_any_window_to_frame x_window_to_frame
--#define x_top_window_to_frame x_window_to_frame
--#endif
--
- #ifdef USE_X_TOOLKIT
- #include "widget.h"
- #ifndef XtNinitialState
-@@ -3789,6 +3782,14 @@
- 		if (child == None || child == win)
- 		  break;
- 
-+#ifdef USE_GTK
-+		/* We don't wan't to know the innermost window.  We
-+		   want the edit window.  For non-Gtk+ the innermost
-+		   window is the edit window.  For Gtk+ it might not
-+		   be.  It might be the tool bar for example.  */
-+		if (x_window_to_frame (FRAME_X_DISPLAY_INFO (*fp), win))
-+		  break;
-+#endif
- 		win = child;
- 		parent_x = win_x;
- 		parent_y = win_y;
-@@ -3805,8 +3806,14 @@
- 	       parent_{x,y} are invalid, but that's okay, because we'll
- 	       never use them in that case.)  */
- 
-+#ifdef USE_GTK
-+	    /* We don't wan't to know the innermost window.  We
-+	       want the edit window.  */
-+	    f1 = x_window_to_frame (FRAME_X_DISPLAY_INFO (*fp), win);
-+#else
- 	    /* Is win one of our frames?  */
- 	    f1 = x_any_window_to_frame (FRAME_X_DISPLAY_INFO (*fp), win);
-+#endif
- 
- #ifdef USE_X_TOOLKIT
- 	    /* If we end up with the menu bar window, say it's not
---- emacs-22.3-orig/src/xterm.h
-+++ emacs-22.3/src/xterm.h
-@@ -412,10 +412,13 @@
- 
- extern struct frame *x_window_to_frame P_ ((struct x_display_info *, int));
- 
--#if defined (USE_X_TOOLKIT) || defined (USE_GTK)
- extern struct frame *x_any_window_to_frame P_ ((struct x_display_info *, int));
--extern struct frame *x_non_menubar_window_to_frame P_ ((struct x_display_info *, int));
-+extern struct frame *x_menubar_window_to_frame P_ ((struct x_display_info *, int));
- extern struct frame *x_top_window_to_frame P_ ((struct x_display_info *, int));
-+
-+#if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
-+#define x_any_window_to_frame x_window_to_frame
-+#define x_top_window_to_frame x_window_to_frame
- #endif
- 
- /* This is a chain of structures for all the X displays currently in use.  */

diff --git a/emacs/22.3/06_all_libpng14.patch b/emacs/22.3/06_all_libpng14.patch
deleted file mode 100644
index 53c5b73..0000000
--- a/emacs/22.3/06_all_libpng14.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-http://repos.archlinux.org/wsvn/packages/emacs/trunk/libpng14.patch
-
---- emacs-22.3-orig/src/image.c
-+++ emacs-22.3/src/image.c
-@@ -6338,7 +6338,7 @@
- /* PNG library details.  */
- 
- DEF_IMGLIB_FN (png_get_io_ptr);
--DEF_IMGLIB_FN (png_check_sig);
-+DEF_IMGLIB_FN (png_sig_cmp);
- DEF_IMGLIB_FN (png_create_read_struct);
- DEF_IMGLIB_FN (png_create_info_struct);
- DEF_IMGLIB_FN (png_destroy_read_struct);
-@@ -6369,7 +6369,7 @@
-     return 0;
- 
-   LOAD_IMGLIB_FN (library, png_get_io_ptr);
--  LOAD_IMGLIB_FN (library, png_check_sig);
-+  LOAD_IMGLIB_FN (library, png_sig_cmp);
-   LOAD_IMGLIB_FN (library, png_create_read_struct);
-   LOAD_IMGLIB_FN (library, png_create_info_struct);
-   LOAD_IMGLIB_FN (library, png_destroy_read_struct);
-@@ -6394,7 +6394,7 @@
- #else
- 
- #define fn_png_get_io_ptr		png_get_io_ptr
--#define fn_png_check_sig		png_check_sig
-+#define fn_png_sig_cmp			png_sig_cmp
- #define fn_png_create_read_struct	png_create_read_struct
- #define fn_png_create_info_struct	png_create_info_struct
- #define fn_png_destroy_read_struct	png_destroy_read_struct
-@@ -6541,7 +6541,7 @@
- 
-       /* Check PNG signature.  */
-       if (fread (sig, 1, sizeof sig, fp) != sizeof sig
--	  || !fn_png_check_sig (sig, sizeof sig))
-+	  || fn_png_sig_cmp (sig, 0, sizeof sig))
- 	{
- 	  image_error ("Not a PNG file: `%s'", file, Qnil);
- 	  UNGCPRO;
-@@ -6558,7 +6558,7 @@
- 
-       /* Check PNG signature.  */
-       if (tbr.len < sizeof sig
--	  || !fn_png_check_sig (tbr.bytes, sizeof sig))
-+	  || fn_png_sig_cmp (tbr.bytes, 0, sizeof sig))
- 	{
- 	  image_error ("Not a PNG image: `%s'", img->spec, Qnil);
- 	  UNGCPRO;

diff --git a/emacs/22.3/07_all_cpp-4.5.patch b/emacs/22.3/07_all_cpp-4.5.patch
deleted file mode 100644
index 7cc391f..0000000
--- a/emacs/22.3/07_all_cpp-4.5.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-http://bugs.gentoo.org/308653
-http://debbugs.gnu.org/5047
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=41748
-Fix building with GNU CPP 4.5, patch from upstream CVS.
-
---- emacs-22.3-orig/configure.in
-+++ emacs-22.3/configure.in
-@@ -3388,7 +3388,7 @@
-   sed -e '1,/start of cpp stuff/d'\
-       -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
-       < Makefile.c > junk.c
--  $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
-+  $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
-       sed -e 's/^ /	/' -e '/^#/d' -e '/^[ 	]*$/d' > junk2.c
-   cat junk1.c junk2.c > Makefile.new
-   rm -f junk.c junk1.c junk2.c
-@@ -3404,7 +3404,7 @@
-   sed -e '1,/start of cpp stuff/d'\
-       -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
-       < Makefile.c > junk.c
--  $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
-+  $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
-       sed -e 's/^ /	/' -e '/^#/d' -e '/^[ 	]*$/d' > junk2.c
-   cat junk1.c junk2.c > Makefile.new
-   rm -f junk.c junk1.c junk2.c

diff --git a/emacs/22.3/08_all_gameuser.patch b/emacs/22.3/08_all_gameuser.patch
deleted file mode 100644
index 4a6ba5e..0000000
--- a/emacs/22.3/08_all_gameuser.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7717
-Patch backported to Emacs 22.
-
---- emacs-22.3-orig/configure.in
-+++ emacs-22.3/configure.in
-@@ -156,6 +156,12 @@
-   locallisppath=${enableval}
- fi)
- 
-+AC_ARG_WITH(gameuser,
-+[  --with-gameuser=USER    user for shared game score files])
-+test "X${with_gameuser}" != X && test "${with_gameuser}" != yes \
-+  && gameuser="${with_gameuser}"
-+test "X$gameuser" = X && gameuser=games
-+
- #### Make srcdir absolute, if it isn't already.  It's important to
- #### avoid running the path through pwd unnecessarily, since pwd can
- #### give you automounter prefixes, which can go away.  We do all this

diff --git a/emacs/22.3/09_all_info-dir.patch b/emacs/22.3/09_all_info-dir.patch
deleted file mode 100644
index 992c105..0000000
--- a/emacs/22.3/09_all_info-dir.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7942
-Backported to Emacs 22.
-
---- emacs-22.3-orig/Makefile.in
-+++ emacs-22.3/Makefile.in
-@@ -504,29 +504,24 @@
- 	thisdir=`/bin/pwd`; \
- 	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \
- 	then \
--	  (cd $(DESTDIR)${infodir};  \
--	   if [ -f dir ]; then true; \
--	   else	\
--	     (cd $${thisdir}; \
--	      ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir; \
--	      chmod a+r $(DESTDIR)${infodir}/dir); \
--	   fi; \
--	   cd ${srcdir}/info ; \
-+	  (cd ${srcdir}/info ; \
- 	   for elt in $(INFO_FILES); do \
- 	      for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
- 	        ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \
- 	        chmod a+r $(DESTDIR)${infodir}/$$f; \
- 	      done; \
--	   done); \
--	else true; fi
--	-unset CDPATH; \
--	thisdir=`/bin/pwd`; \
--	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \
--	then \
--	  for elt in $(INFO_FILES); do \
--	    (cd $${thisdir}; \
--	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
--	  done; \
-+	   done; \
-+	   cd $(DESTDIR)${infodir};  \
-+	   if [ -f dir ]; then \
-+	      for elt in $(INFO_FILES); do \
-+		 (cd $${thisdir}; \
-+		  ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
-+	      done; \
-+	   else	\
-+	     (cd $${thisdir}; \
-+	      ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir; \
-+	      chmod a+r $(DESTDIR)${infodir}/dir); \
-+	   fi); \
- 	else true; fi
- 	-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir}
- 	thisdir=`/bin/pwd`; \

diff --git a/emacs/22.3/10_all_libpng15.patch b/emacs/22.3/10_all_libpng15.patch
deleted file mode 100644
index d16a7da..0000000
--- a/emacs/22.3/10_all_libpng15.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/384553
-
---- emacs-22.3-orig/src/image.c
-+++ emacs-22.3/src/image.c
-@@ -6427,7 +6427,7 @@
- {
-   xassert (png_ptr != NULL);
-   image_error ("PNG error: %s", build_string (msg), Qnil);
--  longjmp (png_ptr->jmpbuf, 1);
-+  longjmp (png_jmpbuf (png_ptr), 1);
- }
- 
- 
-@@ -6603,7 +6603,7 @@
- 
-   /* Set error jump-back.  We come back here when the PNG library
-      detects an error.  */
--  if (setjmp (png_ptr->jmpbuf))
-+  if (setjmp (png_jmpbuf (png_ptr)))
-     {
-     error:
-       if (png_ptr)