Fix glibc 2.10 issues for Emacs 18. Move Emacs 22 patches to mirrors.

(Portage version: 2.2_rc33/cvs/Linux i686)

7 files changed, 16 insertions, 221 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index ab41dd91864c..0dd73a2de13e 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/emacs
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.317 2009/05/28 14:07:03 fauli Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.318 2009/05/29 16:14:57 ulm Exp $
+
+  29 May 2009; Ulrich Mueller <ulm@gentoo.org> emacs-18.59-r6.ebuild,
+  -files/emacs-22.1-Xaw3d-headers.patch, -files/emacs-22.2-sh.patch,
+  emacs-22.3-r2.ebuild, -files/emacs-22.3-freebsd-sparc.patch,
+  -files/emacs-22.3-linux-random-heap.patch:
+  Updated Emacs 18 patchset; this fixes compilation with glibc 2.10 headers.
+  Move Emacs 22 patches to Gentoo mirrors.
 
   28 May 2009; Christian Faulhammer <fauli@gentoo.org> emacs-22.3-r2.ebuild:
   Remove USE=spell from all ebuilds, we don't want such dependencies, see
diff --git a/app-editors/emacs/emacs-18.59-r6.ebuild b/app-editors/emacs/emacs-18.59-r6.ebuild
index fe7107df083f..da14b573dbc9 100644
--- a/app-editors/emacs/emacs-18.59-r6.ebuild
+++ b/app-editors/emacs/emacs-18.59-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r6.ebuild,v 1.2 2009/02/22 16:33:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r6.ebuild,v 1.3 2009/05/29 16:14:57 ulm Exp $
 
 EAPI=2
 
@@ -10,7 +10,7 @@ DESCRIPTION="The extensible self-documenting text editor"
 HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/old-gnu/emacs/${P}.tar.gz
 	ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz
-	mirror://gentoo/${P}-patches-3.tar.bz2"
+	mirror://gentoo/${P}-patches-4.tar.bz2"
 
 LICENSE="GPL-1 GPL-2 BSD as-is"
 SLOT="18"
@@ -57,7 +57,7 @@ src_configure() {
 src_compile() {
 	# Do not use the sandbox, or the dumped Emacs will be twice as large
 	SANDBOX_ON=0
-	emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" || die
+	emake --jobs=1 CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" || die
 }
 
 src_install() {
diff --git a/app-editors/emacs/emacs-22.3-r2.ebuild b/app-editors/emacs/emacs-22.3-r2.ebuild
index c3ac89be03f3..6e3a6dd273e4 100644
--- a/app-editors/emacs/emacs-22.3-r2.ebuild
+++ b/app-editors/emacs/emacs-22.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r2.ebuild,v 1.11 2009/05/28 14:07:03 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r2.ebuild,v 1.12 2009/05/29 16:14:57 ulm Exp $
 
 EAPI=2
 
@@ -8,7 +8,8 @@ inherit autotools elisp-common eutils flag-o-matic
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
 HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.gz"
+SRC_URI="mirror://gnu/emacs/${P}.tar.gz
+	mirror://gentoo/${P}-patches-1.tar.bz2"
 
 LICENSE="GPL-3 FDL-1.2 BSD as-is X11"
 SLOT="22"
@@ -53,12 +54,7 @@ FULL_VERSION="${PV}"
 SITEFILE="20${PN}-${SLOT}-gentoo.el"
 
 src_prepare() {
-	epatch "${FILESDIR}/emacs-22.1-Xaw3d-headers.patch"
-	epatch "${FILESDIR}/emacs-22.3-freebsd-sparc.patch"
-	# SuperH support (bug 238210)
-	epatch "${FILESDIR}/emacs-22.2-sh.patch"
-	# Fix sporadic segmentation faults in unexec (bug 236579)
-	epatch "${FILESDIR}/emacs-22.3-linux-random-heap.patch"
+	EPATCH_SUFFIX=patch epatch
 
 	sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
 		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
diff --git a/app-editors/emacs/files/emacs-22.1-Xaw3d-headers.patch b/app-editors/emacs/files/emacs-22.1-Xaw3d-headers.patch
deleted file mode 100644
index 8b4f33271395..000000000000
--- a/app-editors/emacs/files/emacs-22.1-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/app-editors/emacs/files/emacs-22.2-sh.patch b/app-editors/emacs/files/emacs-22.2-sh.patch
deleted file mode 100644
index c4a64697ad8b..000000000000
--- a/app-editors/emacs/files/emacs-22.2-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/app-editors/emacs/files/emacs-22.3-freebsd-sparc.patch b/app-editors/emacs/files/emacs-22.3-freebsd-sparc.patch
deleted file mode 100644
index de206e7e0658..000000000000
--- a/app-editors/emacs/files/emacs-22.3-freebsd-sparc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://bugs.gentoo.org/159584
-Patch taken from FreeBSD ports, by Giorgos Keramidas <keramida@freebsd.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/app-editors/emacs/files/emacs-22.3-linux-random-heap.patch b/app-editors/emacs/files/emacs-22.3-linux-random-heap.patch
deleted file mode 100644
index 37bee82385e0..000000000000
--- a/app-editors/emacs/files/emacs-22.3-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"))
-         {