Unset LDFLAGS; see bug #77430 and bug #65002.

Package-Manager: portage-2.0.51.19

4 files changed, 36 insertions, 16 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 76d6d15f1bab..386b02258d5f 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.59 2005/04/08 17:12:38 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.60 2005/04/12 13:34:03 usata Exp $
+
+  12 Apr 2005; Mamoru KOMACHI <usata@gentoo.org> emacs-21.4.ebuild,
+  emacs-21.4-r1.ebuild:
+  Unset LDFLAGS; see bug #77430 and bug #65002.
 
 *emacs-21.4-r1 (08 Apr 2005)
 
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index b7e3c2e24b9c..8ed95e503f4a 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,21 +1,31 @@
-MD5 12938feba91966dbaeab37e85d0203a3 emacs-21.4.ebuild 4077
-MD5 da56e8c901b47b503a383867fd9f86e4 emacs-22.0.50_pre20050225.ebuild 5399
-MD5 7b39bb8bc99880c93606158e68f9a4c2 ChangeLog 9202
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b237593351a692138c20e5da87ad49b0 ChangeLog 9343
+MD5 b3de67bc7b4ee29ffd655b868eea8080 emacs-21.4-r1.ebuild 4286
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
+MD5 da56e8c901b47b503a383867fd9f86e4 emacs-22.0.50_pre20050225.ebuild 5399
 MD5 767c6035b2be8309041a7c2e81bfd7a0 emacs-18.59.ebuild 2007
-MD5 f001de6d06f29e1b05c3472ea7b74f8d emacs-21.4-r1.ebuild 4201
-MD5 0e5a4a35651f5365c6191636a2c26eb7 files/emacs.desktop 190
-MD5 56a239d1965c2bac249e787b1ef6a1f5 files/digest-emacs-21.4-r1 126
-MD5 0d61f19c0e6fcdb6657ae1d4d9e69801 files/60emacs-22.0.50.envd 39
+MD5 001c8b0a6b1cf0e95aeb082e6fd48125 emacs-21.4.ebuild 4105
 MD5 8edd35b2b32c2b594138b6bde063d961 files/emacs-22.0.50.desktop 249
-MD5 ef8adf470d7d95802802b3860ef8d9a9 files/emacs-21.3-xorg.patch 394
+MD5 2f000567bd6037e79de677b0edd814ab files/60emacs-21.envd 34
+MD5 7d302a307c0e6ab874699eb0c496f982 files/emacs-21.desktop 245
+MD5 5f423550e3d32b7c0511eccd93a94750 files/emacs-subdirs-el-gentoo.diff 1369
+MD5 0e5a4a35651f5365c6191636a2c26eb7 files/emacs.desktop 190
 MD5 bb29381a50b72e88d869fb09a2c0a34e files/emacs-21.3-amd64.patch 7938
 MD5 3763ec7eaed9e5bb4da2f3f7c3795594 files/emacs-21.3-hppa.patch 2493
 MD5 0d7a5eba9d25e527c53da9a73c3bb767 files/digest-emacs-18.59 216
-MD5 5f423550e3d32b7c0511eccd93a94750 files/emacs-subdirs-el-gentoo.diff 1369
-MD5 56a239d1965c2bac249e787b1ef6a1f5 files/digest-emacs-21.4 126
 MD5 f6a4a0f9d36297f686ca56fae7bcef68 files/digest-emacs-22.0.50_pre20050225 242
-MD5 2aaf4fc4c9513f13c4edb24327247f83 files/emacs-21.3-ppc64.patch 1622
-MD5 2f000567bd6037e79de677b0edd814ab files/60emacs-21.envd 34
-MD5 7d302a307c0e6ab874699eb0c496f982 files/emacs-21.desktop 245
+MD5 56a239d1965c2bac249e787b1ef6a1f5 files/digest-emacs-21.4-r1 126
 MD5 277b238c9263aabcc2ef92de1d6d68bb files/emacs-nofink-gentoo.diff 1520
+MD5 ef8adf470d7d95802802b3860ef8d9a9 files/emacs-21.3-xorg.patch 394
+MD5 56a239d1965c2bac249e787b1ef6a1f5 files/digest-emacs-21.4 126
+MD5 2aaf4fc4c9513f13c4edb24327247f83 files/emacs-21.3-ppc64.patch 1622
+MD5 0d61f19c0e6fcdb6657ae1d4d9e69801 files/60emacs-22.0.50.envd 39
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCW8vdVWNWqTUmv+0RAiRaAJ9WlFYqKma/SCok8DDfu7c0GceVtwCfROSV
+zLy0ROwyJnVJCRHf4kTVCo8=
+=Af71
+-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-21.4-r1.ebuild b/app-editors/emacs/emacs-21.4-r1.ebuild
index 46299ab10dfc..3fe6a5214acc 100644
--- a/app-editors/emacs/emacs-21.4-r1.ebuild
+++ b/app-editors/emacs/emacs-21.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r1.ebuild,v 1.1 2005/04/08 17:12:38 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r1.ebuild,v 1.2 2005/04/12 13:34:03 usata Exp $
 
 inherit flag-o-matic eutils alternatives toolchain-funcs
 
@@ -65,6 +65,9 @@ src_compile() {
 	# -fstack-protector gets internal compiler error at xterm.c (bug 33265)
 	filter-flags -fstack-protector
 
+	# emacs doesn't handle LDFLAGS properly (bug #77430 and bug #65002)
+	unset LDFLAGS
+
 	# gcc 3.4 with -O3 or stronger flag spoils emacs
 	if [ "$(gcc-major-version)" -ge 3 -a "$(gcc-minor-version)" -ge 4 ] ; then
 		replace-flags -O[3-9] -O2
diff --git a/app-editors/emacs/emacs-21.4.ebuild b/app-editors/emacs/emacs-21.4.ebuild
index 3b1e04763041..307bc9a320b8 100644
--- a/app-editors/emacs/emacs-21.4.ebuild
+++ b/app-editors/emacs/emacs-21.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4.ebuild,v 1.9 2005/02/21 17:36:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4.ebuild,v 1.10 2005/04/12 13:34:03 usata Exp $
 
 inherit flag-o-matic eutils alternatives toolchain-funcs
 
@@ -63,6 +63,9 @@ src_compile() {
 	# -fstack-protector gets internal compiler error at xterm.c (bug 33265)
 	filter-flags -fstack-protector
 
+	# bug #77430
+	unset LDFLAGS
+
 	# gcc 3.4 with -O3 or stronger flag spoils emacs
 	if [ "$(gcc-major-version)" -ge 3 -a "$(gcc-minor-version)" -ge 4 ] ; then
 		replace-flags -O[3-9] -O2