Don't assign CPPFLAGS, use append-cppflags instead.

Package-Manager: portage-2.1.2.5

3 files changed, 18 insertions, 15 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 7de2fd5c0f84..ec0d51f4281e 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.142 2007/04/29 17:42:44 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.143 2007/04/29 19:01:15 ulm Exp $
+
+  29 Apr 2007; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r12.ebuild:
+  Don't assign CPPFLAGS, use append-cppflags instead.
 
   29 Apr 2007; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r12.ebuild:
   Apply emacs-21.4-ppc64-fix-unexelf.patch only on ppc64 architecture.
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 02305004fa21..da07aa16ba3e 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -70,10 +70,10 @@ EBUILD emacs-18.59-r4.ebuild 2549 RMD160 02162c6c4f0561644d326a349e46dd6187df7d1
 MD5 02f52fa5227806fdfa477c10a5fe7e33 emacs-18.59-r4.ebuild 2549
 RMD160 02162c6c4f0561644d326a349e46dd6187df7d1e emacs-18.59-r4.ebuild 2549
 SHA256 c8650c4f9fd7ec4dcce67d9ec0b77c6a25fc023321b55865489e580323f2ebf6 emacs-18.59-r4.ebuild 2549
-EBUILD emacs-21.4-r12.ebuild 5805 RMD160 64b99f996fa8f9d788874d87313a48f71150f712 SHA1 40f9a9fa18ec5d34dc1b73ea9a795d9cf66a61e4 SHA256 a09a64fe36f68e879243704f8bc7c0b96a79f8543c25e33cc506ca4a4310f35d
-MD5 b5c3b6c315ff7fc046ecf25399211fd9 emacs-21.4-r12.ebuild 5805
-RMD160 64b99f996fa8f9d788874d87313a48f71150f712 emacs-21.4-r12.ebuild 5805
-SHA256 a09a64fe36f68e879243704f8bc7c0b96a79f8543c25e33cc506ca4a4310f35d emacs-21.4-r12.ebuild 5805
+EBUILD emacs-21.4-r12.ebuild 5788 RMD160 16998c82fabb86b6f670ec567c26c55001803c59 SHA1 086fd53fe6da02083e8762665dc01f1b71c7d92c SHA256 956fb44a9257c82e6813a86cb0e5c8cb59370d22e629f1397bd76f19a1927697
+MD5 04f59ca57c185c7dd09fa2cc1158a247 emacs-21.4-r12.ebuild 5788
+RMD160 16998c82fabb86b6f670ec567c26c55001803c59 emacs-21.4-r12.ebuild 5788
+SHA256 956fb44a9257c82e6813a86cb0e5c8cb59370d22e629f1397bd76f19a1927697 emacs-21.4-r12.ebuild 5788
 EBUILD emacs-21.4-r4.ebuild 4551 RMD160 a7b49c929b37f60e45af01038595fd6e26579609 SHA1 aae095ad8995c6dc1b76e2805032073486b13476 SHA256 57f007813695810a6df614b335de85df341fdda53a36d7c806a18e315f70afec
 MD5 d008266355b179cf5699aded70630be3 emacs-21.4-r4.ebuild 4551
 RMD160 a7b49c929b37f60e45af01038595fd6e26579609 emacs-21.4-r4.ebuild 4551
@@ -82,10 +82,10 @@ EBUILD emacs-21.4-r8.ebuild 5727 RMD160 e879aeb102baa9977fee9a40d18c4a0acc001be2
 MD5 92f4d4ff1be57566edb7db155c0bbf53 emacs-21.4-r8.ebuild 5727
 RMD160 e879aeb102baa9977fee9a40d18c4a0acc001be2 emacs-21.4-r8.ebuild 5727
 SHA256 2a692ffbdc1203341a019866b2f54460a7f6faa7a048a8466cc2879545cdc3c2 emacs-21.4-r8.ebuild 5727
-MISC ChangeLog 21569 RMD160 f7a97d835ca2f0a47af9d17f6268c663bcc90e5c SHA1 ffe28499aa7d92b2475efe7f400a913f2e87555c SHA256 59076e17053d980e955585d001b176509c917e2c06962dfd5f8160c82a630d29
-MD5 d1644c0736d9329d19b8d0a30d950359 ChangeLog 21569
-RMD160 f7a97d835ca2f0a47af9d17f6268c663bcc90e5c ChangeLog 21569
-SHA256 59076e17053d980e955585d001b176509c917e2c06962dfd5f8160c82a630d29 ChangeLog 21569
+MISC ChangeLog 21694 RMD160 bedbfbf231971271363e4af600dec5678b6cad06 SHA1 bda2d01733ef6220b4dee8c1de2e1498195c5839 SHA256 1212df1732b514c5e49cfd1d6bfa1f6ba38c023b2b4b94c24a76bd1960cfb646
+MD5 3251d022e621b0fea0023822ccfa7a36 ChangeLog 21694
+RMD160 bedbfbf231971271363e4af600dec5678b6cad06 ChangeLog 21694
+SHA256 1212df1732b514c5e49cfd1d6bfa1f6ba38c023b2b4b94c24a76bd1960cfb646 ChangeLog 21694
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -108,7 +108,7 @@ SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGNNmXOeoy/oIi7uwRAu2xAKDWcQ5ya4WODFo7uTc6kkknxNgqVwCg3Qcv
-hYt9TFhY/J72/+m1UCRieSw=
-=yiqD
+iD8DBQFGNOv9Oeoy/oIi7uwRAoPrAKC2ipL1gcgRGTL47YhzOg49+IoxfACfZpI6
+2g7rHbhWYhVfIV1iY3r44/g=
+=h7Wq
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-21.4-r12.ebuild b/app-editors/emacs/emacs-21.4-r12.ebuild
index a33147c31c1e..b3e18ca1241d 100644
--- a/app-editors/emacs/emacs-21.4-r12.ebuild
+++ b/app-editors/emacs/emacs-21.4-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r12.ebuild,v 1.10 2007/04/29 17:42:44 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r12.ebuild,v 1.11 2007/04/29 19:01:15 ulm Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -69,7 +69,7 @@ src_unpack() {
 
 	# This will need to be updated for X-Compilation
 	sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
-		   "${S}/src/s/gnu-linux.h" || die
+		"${S}/src/s/gnu-linux.h" || die
 }
 
 src_compile() {
@@ -94,7 +94,7 @@ src_compile() {
 	if use X ; then
 		if use motif && use lesstif; then
 			append-ldflags -L/usr/X11R6/lib/lesstif -R/usr/X11R6/lib/lesstif
-			export CPPFLAGS="${CPPFLAGS} -I/usr/X11R6/include/lesstif"
+			append-cppflags -I/usr/X11R6/include/lesstif
 		fi
 		myconf="${myconf}
 			--with-x