Fix building with GNU CPP 4.5, bug 308653.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

6 files changed, 26 insertions, 22 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/Manifest b/app-editors/emacs/Manifest
index 9b92026e7c5c..4585f5ffaf76 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -2,31 +2,31 @@
 Hash: SHA1
 
 DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 RMD160 4fab87eead1a66d767d2334d31507695dcf7b4a8 SHA1 075f1c9cf86e9a10fb686ebd04a2f95d6e4c3972 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd
-DIST emacs-18.59-patches-4.tar.bz2 17690 RMD160 72d71f47616b51d3a82afd375585f614c0a188fb SHA1 c53d978d09e1ac326d0cdc094ff2b80ba102be48 SHA256 2172a28e5f7550e23f9aaa93281b1243e0c314dfe118e83864e09ec02aaef712
+DIST emacs-18.59-patches-5.tar.bz2 17964 RMD160 55c561bf455fc101a65c4ec29956b6cecaa8f632 SHA1 7e9532ff07aa8141856382ef11344221453269fd SHA256 ab41883691956d705a9306f2a2bc803aff1ceea43da7e9539ff0ed51d2ae0953
 DIST emacs-18.59.tar.gz 2962652 RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc SHA1 15b25bf130e3eeb91f3eea8c01a3dec9aabf23cc SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e
-DIST emacs-21.4-patches-10.tar.bz2 12695 RMD160 eacc95ef86e7fb0e5b326d0261d7d3461171e6a5 SHA1 0eeb7cd41d8fea9c10866c7ec63e90d63cec70fc SHA256 c0263bede0c6960e0b0fef8e953584ef93b65674fcfbc4944ff1c1f722a663e8
+DIST emacs-21.4-patches-11.tar.bz2 13005 RMD160 2a55e7e102659d978e9069f56d188c91a721f468 SHA1 f1068df11532aadc38c0ebb618f9d420add3f2bb SHA256 10f76aa765ae9de34b3a36fbfa8391cb1be1dd97e0f78700623b3d9a3c68902c
 DIST emacs-21.4-patches-9.tar.bz2 12452 RMD160 6060f5a2a342e1187c32a5a591b1523b02592d55 SHA1 221b6725b729f1c31816489a95ae94c9819f62df SHA256 b2acb9576b043e555714230f8e609b03c70b0a6e3a585db9b39dbf499e71d355
 DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a SHA1 cdb33731180fe4a912838af805dd35e3f55394d4 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216
 DIST emacs-22.3-patches-3.tar.bz2 4257 RMD160 54be56231a1089de414419adbb25fec570b30bc8 SHA1 5d1b725d20b4cd6af51dc5475d5b254c771006bd SHA256 a437aab14692384f9d4cddf434971051ade4f87047dcfa56ec2563127d946ba9
-DIST emacs-22.3-patches-4.tar.bz2 4623 RMD160 5e1d4e4359b4ccbeb73ff9f28fcbc77a633f8cb7 SHA1 0a5414277d926c731fd07d81cd8152b248dade4e SHA256 5dafcacbb4f7138ee995fa936bb5ab98a786ae55274a303af002f873318c7fc2
+DIST emacs-22.3-patches-5.tar.bz2 5018 RMD160 180d9a320354553ea45b6b1c50c7c7dd72e1077c SHA1 6c80dcebf08953244ab0e0900a1c40d016b291d9 SHA256 0717296c2b8a3622fc557d90350f64048c5930d04688cd07121a501441b3bfed
 DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 SHA1 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16
 DIST emacs-23.1-patches-5.tar.bz2 3414 RMD160 2ec70b92fcb77d357edcd9e2da54fa33cfb527ac SHA1 a1d851fcd490118f6e2f16a67b94dd89de5cc2f1 SHA256 f81df36a8e69010bd81ddfda36393d9ca0da205a9717ffd8721dff47320b14b1
-DIST emacs-23.1-patches-6.tar.bz2 3911 RMD160 70cf1998b0a22b66468ba1c2e7f918d68949bd4f SHA1 fe25cad5143d4f447c151e41e966038a1646d5a1 SHA256 8b76cf8d908a256b8101c12bbe6c3068155a8a314aab46910954d177b26d96dd
+DIST emacs-23.1-patches-7.tar.bz2 4271 RMD160 a4582c6e25b4c32f043cec503bb841c2c1c6ca16 SHA1 3fc42fcdd1034941f1a0f83ea7ddd3d86f77a157 SHA256 005cc13e4441a06a189b719ecc527e99b17518110a52b41bf20a2d6dacf13d11
 DIST emacs-23.1.tar.bz2 34382732 RMD160 e9b30bce2c174dde4dcfefb6068ae8648d59b251 SHA1 5f2d5dfcc17e7627ea752f675c605fe37c9c145c SHA256 2b35f4457c7a0ee9f9185579cc2890b43f129a112cf22500233489db7a24cb1c
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
-EBUILD emacs-18.59-r6.ebuild 2735 RMD160 1ed61abdb26747a06d675c0206fc713f9ad2a3e6 SHA1 f10bf46ae1a76d3e540505a3573e6580dc1e4609 SHA256 dd4f132c0fe076172fc5426a937697d966c36ffd9266f88ac353c81babd88e55
+EBUILD emacs-18.59-r6.ebuild 2736 RMD160 23d2b7c5cbf0deb8d76035a77fe803206581a810 SHA1 997a0271b8b4114867b308843180a59ab03fcf63 SHA256 bcc584e1ee5a50c6a6539458acf0ce229f79981430fe624e4f0301c63ddaf14a
 EBUILD emacs-21.4-r19.ebuild 5249 RMD160 37948b5917237c6ca7b148e6d36c5f10c9c6b205 SHA1 2f04b39e2e332b0b701beaeddfb941972b2e4e88 SHA256 8527a478c88151caf7b95fd799034c3f9d8f163bf55998c6d5a57ef7b14be59d
-EBUILD emacs-21.4-r20.ebuild 5260 RMD160 1dfe82e08deeb6c8691ebac44b1585851f3309c2 SHA1 813def5bcf89af97ac8b4fe84b079945658be58a SHA256 c0ae63b3ff734b67d01d97f47997e3401d779d8271f76372a1983ae7ca467158
+EBUILD emacs-21.4-r20.ebuild 5260 RMD160 30069581e314da0db3e31f07ad54e8cfa686fb72 SHA1 f41704f0db97454ed8f358917311e96adf44a7c9 SHA256 c7dc4ce56286c4fa0e684e284d29f907d37ee2ad8758f1b0ae838e6c50c73e12
 EBUILD emacs-22.3-r3.ebuild 7833 RMD160 c9f82bfcff4c7408ee5f579f43ab9a3f7d56bdec SHA1 0f7e8ed4eae680ef56306ce6eb372113a3d8cb27 SHA256 c193c8947ba893368dbf06c9781d8d466b434854c42f37e0028c3577734c2bcb
-EBUILD emacs-22.3-r4.ebuild 7839 RMD160 4d40274315a7c0b808dce518d049ed7744df8ecd SHA1 6a41c9f4aaf848ed979fcd79cc9c4ba862b854ff SHA256 6c4d48cf7d29d5594c9f2eaee19d0dbcfd3725d14ed210636eaf6795b0a5122c
+EBUILD emacs-22.3-r4.ebuild 7839 RMD160 a5c42cd03db119fc453e6cc7718bde4fe3d23391 SHA1 153c353a42c18511ff576de67c590f34c2a532f6 SHA256 8c4850cb5d305b026a9225ee8e4576a15df5bbfbf3dbebd40d914d1948cd0cef
 EBUILD emacs-23.1-r2.ebuild 9712 RMD160 be850522adf821e720b9539012b2fe0987d11170 SHA1 93e835258d58542e9f9e3610a2c1cab623d7477a SHA256 7d5a09f53e1f3dfee51885e9feb32235421df5bac033528b24f1339a3faa44a3
-EBUILD emacs-23.1-r3.ebuild 9722 RMD160 5e0f46349c484d347fe323043e63178cff331629 SHA1 66690bd43e4cf707ac07d30a370f7bd2ebafafe1 SHA256 35b82894cc078d4dcb25b3df381c0767f75dc8f0c67c9a5272e80858fda75429
-MISC ChangeLog 52310 RMD160 a6123bcf9101f330a387ad1e13c36f93f9d21e59 SHA1 aa3b5e19ca429a8d77936d65f2b8df81f3cd707e SHA256 9070ba20a05c9d58566bb6fb0bdae63096b2b4be40c569f82ca77030c05be181
+EBUILD emacs-23.1-r3.ebuild 9722 RMD160 b1190219c0cbee2a7e651e1237583a9b196645a4 SHA1 6d6d5db00c907dd0f8ea3486591f008e0f8c3062 SHA256 1c8748b88775f2082108eec421614e15ebd163d6c5912d937fae54f5b62015d6
+MISC ChangeLog 52495 RMD160 08d13eaa5cf280cfdad28ea0e0f2449b8bf8fe1b SHA1 09b723de4fcbe81dfa9af3ae5aeebbdc762e1324 SHA256 4f7ab334ee33f9a3eeebda9deb801f3ee7d989b6d5c393ed1e5d88b0dae2e7bb
 MISC metadata.xml 1652 RMD160 d5b841ffd970ae6338f01b56bc354004a78a13e8 SHA1 3f19193ed03a37bc67644966c839ea738b21c976 SHA256 fa53ed0bd63c3dd37877f11aa0ac7e3811da9db6c90437176ab60d76329f0cd7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuVTIYACgkQOeoy/oIi7uwmoQCfYOc0/n2tGudffvhbqiJdvHfd
-FyEAoNB5YUAwVP6ofcMoVhEZFYr+IBju
-=wA7p
+iEYEARECAAYFAkuYrwcACgkQOeoy/oIi7uyjJgCgqrB+3E3Du2XeV/1lEjQAzBvn
+2XcAn3RuHcOkoyRuERE0WibjbDFLAuIX
+=aBlG
 -----END PGP SIGNATURE-----
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