Updated patchset, including a fix for the LDFLAGS issue.

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

3 files changed, 13 insertions, 10 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 9d513506e9e5..27f52974e416 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.446 2011/12/19 07:38:20 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.447 2011/12/19 19:15:05 ulm Exp $
+
+  19 Dec 2011; Ulrich Mueller <ulm@gentoo.org> emacs-18.59-r7.ebuild:
+  Updated patchset, including a fix for the LDFLAGS issue.
 
 *emacs-18.59-r7 (19 Dec 2011)
 
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index ad11a70c0972..f340f1a3e880 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 RMD160 4fab87eead1a66d767d2334d31507695dcf7b4a8 SHA1 075f1c9cf86e9a10fb686ebd04a2f95d6e4c3972 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd
 DIST emacs-18.59-patches-5.tar.bz2 17964 RMD160 55c561bf455fc101a65c4ec29956b6cecaa8f632 SHA1 7e9532ff07aa8141856382ef11344221453269fd SHA256 ab41883691956d705a9306f2a2bc803aff1ceea43da7e9539ff0ed51d2ae0953
+DIST emacs-18.59-patches-6.tar.bz2 18682 RMD160 f28e784048f067e7f35e574328d69e811438054d SHA1 214e66f27b4e00a1b9f8960f59505154cc9d5845 SHA256 1ff6430f5a127d3327cfe7854e3b6751db84c8b122c04b5f20c652589e737b59
 DIST emacs-18.59.tar.gz 2962652 RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc SHA1 15b25bf130e3eeb91f3eea8c01a3dec9aabf23cc SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e
 DIST emacs-21.4-patches-12.tar.bz2 13207 RMD160 1a35ce8b479ab783b3bf2d827bbae98c0b5185e1 SHA1 35c72d283f72eb479860766ce792b93b8af6cab6 SHA256 849ba3d3e75d759fcc8157057a9872338f4a99c3f776dbdce48036317b0f1125
 DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a SHA1 cdb33731180fe4a912838af805dd35e3f55394d4 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216
@@ -14,18 +15,18 @@ DIST emacs-23.3-patches-3.tar.bz2 14783 RMD160 5a609bfded363d63f6146c482881d63ea
 DIST emacs-23.3a.tar.bz2 38748283 RMD160 21f201714bca420c3a8fed8c92058cec786e724e SHA1 795bdfa372e42b9589a80f6dcb2ad8fed65b90e4 SHA256 9f4beee3bf4987914d57851c0aac017cb92a1410c2b31ba313265c64a38cc6ba
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
 EBUILD emacs-18.59-r6.ebuild 2736 RMD160 23d2b7c5cbf0deb8d76035a77fe803206581a810 SHA1 997a0271b8b4114867b308843180a59ab03fcf63 SHA256 bcc584e1ee5a50c6a6539458acf0ce229f79981430fe624e4f0301c63ddaf14a
-EBUILD emacs-18.59-r7.ebuild 4269 RMD160 a2973caf8af08ef4b51529d52381b8fcd66980db SHA1 5a75c5ae5375a22f85c8a7cf05dc3196598a1981 SHA256 60896c3ed60b69dfd640e3f428f22438e6525c8aa7e373b759a1aa4148c03129
+EBUILD emacs-18.59-r7.ebuild 4202 RMD160 7a7c03679a5bd6f61b961ed9609957cd1f262861 SHA1 c9f8176db1d5e9fae7001b422edcbb3f168b66d6 SHA256 3edc0b3ce6a4e4282c173c70d8971c941872d2a3050d2f2175348b090e0f5efb
 EBUILD emacs-21.4-r23.ebuild 5010 RMD160 2b7019a59d7ba82a320c8464c3c2b6c098410b5a SHA1 04e1932afc02456234eb46ffc0baa35681162a7e SHA256 263a626ed20b87ae8f19b136ce75f90d9f188e4a69d8bcfdbef540b419f9b693
 EBUILD emacs-22.3-r8.ebuild 7832 RMD160 d74e25b91dbe8783930d1647dec3cf8e44b49b17 SHA1 92e6d6b50578faf6f669e6b2389d7599712048e9 SHA256 b9a75b8b6f468f984441ab725779ff581c8ddbfa14ccff404cc11381d0db741b
 EBUILD emacs-23.3-r1.ebuild 10301 RMD160 885b752594822d1425e3afe95e997ea9fb5a2776 SHA1 90bcec933661eb0f5066a6ae679ecdb6b7ac42d0 SHA256 93cf3fe5516ed9b9f0e06ae9de0472e55c47d89d0c7824da5269e71d548e4d0c
 EBUILD emacs-23.3-r2.ebuild 10656 RMD160 015444a016093e78a11dec0ad71857e1fcc7ef61 SHA1 600b0741c75f0bc0ab246380ce1d105c83186cd3 SHA256 821938b07f1303e0b0a2a8751f1d98760c4623bb87817c722c9f8e60a9f6d106
 EBUILD emacs-23.3-r3.ebuild 10418 RMD160 614088e8d707016d832304080cc8a18c767c85c1 SHA1 78086accf5e921d31de5da9cdc848e100776a058 SHA256 dad8aef6845189bdaa6456b046a70824041f3a24ff5d02905a3db042d309ce45
-MISC ChangeLog 64086 RMD160 2ce57174b11f87fb40d65e7e702f31423febba5b SHA1 e3c914b105ce0785bb6293801ac5855c3409588c SHA256 12cfb345a11a1b2b8aae735b04823e449cbca258f486277888a8a139b2448ddb
+MISC ChangeLog 64216 RMD160 25c302ff7896334316156b4f869f826fc633fac6 SHA1 ba012a4e8dfc2cce0dfc4abef41622e479adee79 SHA256 feb157dfd0628771c2f5a4ac0e41c7f074f50caafdefe509b4656bf0196d9c78
 MISC metadata.xml 1644 RMD160 911d63b0a921d248984f3c5efeb1922f05aa5111 SHA1 7281388d7c274016274e888d97821fda9e5c958c SHA256 7c703ad3af721dfa1d9737f78cd848b7c69a7b906ead5c5fe8fd1db23a1d3166
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7u7E0ACgkQOeoy/oIi7uzwkgCgvvqPAFs0qAI7EJjwBHVwrEOu
-cDUAnRI+OOJL8NLO33XlRXOKOrlN79Cw
-=bZnq
+iEYEARECAAYFAk7vj5sACgkQOeoy/oIi7uzTTwCgmcN3pZNioA7jU9ZI21faTS1A
+DDwAnAhQxJvdrjQbUCZvsIRUVrz1qxYm
+=kYLg
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-18.59-r7.ebuild b/app-editors/emacs/emacs-18.59-r7.ebuild
index 7436e691b786..d9d9dba81c80 100644
--- a/app-editors/emacs/emacs-18.59-r7.ebuild
+++ b/app-editors/emacs/emacs-18.59-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r7.ebuild,v 1.1 2011/12/19 07:38:20 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r7.ebuild,v 1.2 2011/12/19 19:15:05 ulm Exp $
 
 EAPI=4
 
@@ -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-5.tar.bz2"
+	mirror://gentoo/${P}-patches-6.tar.bz2"
 
 LICENSE="GPL-1 GPL-2 BSD" #as-is
 SLOT="18"
@@ -59,10 +59,9 @@ src_configure() {
 src_compile() {
 	# Do not use the sandbox, or the dumped Emacs will be twice as large
 	export SANDBOX_ON=0
-	emake --jobs=1 CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" etc
 	emake --jobs=1 \
 		CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \
-		LD="$(tc-getCC)" LDFLAGS="-nostdlib ${LDFLAGS}"
+		LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {