Fix building with GNU CPP 4.5, bug 308653.

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

5 files changed, 14 insertions, 10 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 67464630600a..1f31a83a75e9 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.370 2010/03/08 19:13:52 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.371 2010/03/11 08:50:36 ulm Exp $
+
+  11 Mar 2010; Ulrich Mueller <ulm@gentoo.org> emacs-18.59-r6.ebuild,
+  emacs-21.4-r20.ebuild, emacs-22.3-r4.ebuild, emacs-23.1-r3.ebuild:
+  Fix building with GNU CPP 4.5, bug 308653.
 
 *emacs-23.1-r3 (08 Mar 2010)
 *emacs-22.3-r4 (08 Mar 2010)
diff --git a/app-editors/emacs/emacs-18.59-r6.ebuild b/app-editors/emacs/emacs-18.59-r6.ebuild
index 6d734a3d7fc7..643ca2768e26 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
+# Copyright 1999-2010 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.9 2009/12/30 16:19:12 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r6.ebuild,v 1.10 2010/03/11 08:50:36 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-4.tar.bz2"
+	mirror://gentoo/${P}-patches-5.tar.bz2"
 
 LICENSE="GPL-1 GPL-2 BSD" #as-is
 SLOT="18"
diff --git a/app-editors/emacs/emacs-21.4-r20.ebuild b/app-editors/emacs/emacs-21.4-r20.ebuild
index 2ab28b9d5cae..b20e87534109 100644
--- a/app-editors/emacs/emacs-21.4-r20.ebuild
+++ b/app-editors/emacs/emacs-21.4-r20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r20.ebuild,v 1.1 2010/03/08 19:13:52 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r20.ebuild,v 1.2 2010/03/11 08:50:36 ulm Exp $
 
 EAPI=2
 
@@ -9,7 +9,7 @@ inherit flag-o-matic eutils toolchain-funcs autotools
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
 HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
-	mirror://gentoo/${P}-patches-10.tar.bz2
+	mirror://gentoo/${P}-patches-11.tar.bz2
 	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
 
 LICENSE="GPL-2 FDL-1.1 BSD as-is MIT"
diff --git a/app-editors/emacs/emacs-22.3-r4.ebuild b/app-editors/emacs/emacs-22.3-r4.ebuild
index d2d202b39195..084bcceb318d 100644
--- a/app-editors/emacs/emacs-22.3-r4.ebuild
+++ b/app-editors/emacs/emacs-22.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r4.ebuild,v 1.1 2010/03/08 19:13:52 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r4.ebuild,v 1.2 2010/03/11 08:50:36 ulm Exp $
 
 EAPI=2
 
@@ -9,7 +9,7 @@ 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
-	mirror://gentoo/${P}-patches-4.tar.bz2"
+	mirror://gentoo/${P}-patches-5.tar.bz2"
 
 LICENSE="GPL-3 FDL-1.2 BSD as-is MIT"
 SLOT="22"
diff --git a/app-editors/emacs/emacs-23.1-r3.ebuild b/app-editors/emacs/emacs-23.1-r3.ebuild
index 12614ff1d8de..821d1d67bb5a 100644
--- a/app-editors/emacs/emacs-23.1-r3.ebuild
+++ b/app-editors/emacs/emacs-23.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.1-r3.ebuild,v 1.1 2010/03/08 19:13:52 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.1-r3.ebuild,v 1.2 2010/03/11 08:50:36 ulm Exp $
 
 EAPI=2
 
@@ -17,7 +17,7 @@ if [ "${PV##*.}" = "9999" ]; then
 	S="${WORKDIR}/${ECVS_LOCALNAME}"
 else
 	SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
-		mirror://gentoo/${P}-patches-6.tar.bz2"
+		mirror://gentoo/${P}-patches-7.tar.bz2"
 	# FULL_VERSION keeps the full version number, which is needed in
 	# order to determine some path information correctly for copy/move
 	# operations later on