Fix for wrongly colored compile output, see bug #172380

Package-Manager: portage-2.1.2.4

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index a7f122234e59908ebf144ebf09637735e5b388f3..ce177679fef2cb4edc535a5a3cd36aec9fc53759 100644 (file)
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.318 2007/04/24 20:52:12 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.319 2007/04/24 21:36:26 suka Exp $
+
+  24 Apr 2007; Andreas Proschofsky <suka@gentoo.org>
+  +files/2.2.0/ooo-env_log.diff, openoffice-2.2.0.ebuild:
+  Fix for wrongly colored compile output, see bug #172380
 
   24 Apr 2007; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.2.0.ebuild:

diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 098d75c136ffba59547048dcc14fe9615e922696..27b55553f4cfa0186a96463031f62fbc5da10fd6 100644 (file)
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -46,6 +46,10 @@ AUX 2.2.0/gentoo-2.2.0.diff 181 RMD160 8ac1700851de1216bf6c342fd697d65d123b13ae
 MD5 0ac100c746d44b8f92d7034cf41db54b files/2.2.0/gentoo-2.2.0.diff 181
 RMD160 8ac1700851de1216bf6c342fd697d65d123b13ae files/2.2.0/gentoo-2.2.0.diff 181
 SHA256 c0bcfd92976525c66f9e77a728c1dc71c8f09712177af9454d286082ba6e3d8d files/2.2.0/gentoo-2.2.0.diff 181
+AUX 2.2.0/ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
+MD5 1f836c5ae6bd978035358290c001c579 files/2.2.0/ooo-env_log.diff 617
+RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e files/2.2.0/ooo-env_log.diff 617
+SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1 files/2.2.0/ooo-env_log.diff 617
 AUX 2.2.0/regcompapply.diff 306 RMD160 1ea8ae87049aaba655b95e0700c53d6cf17df87d SHA1 33bd9823afb40f3477c277c49441546dd5fe4ed4 SHA256 f3a600f6178ab276bf58d69d97acf02200d99be07df00fcdd61442625f3a37ae
 MD5 df1c2b425e5eb0c3f710997078dbab71 files/2.2.0/regcompapply.diff 306
 RMD160 1ea8ae87049aaba655b95e0700c53d6cf17df87d files/2.2.0/regcompapply.diff 306
@@ -73,14 +77,14 @@ EBUILD openoffice-2.1.0-r1.ebuild 11912 RMD160 3485b04bc13db7ca29e223121c4322ffd
 MD5 671bfd761cc9c9667ed3aeaaecbd9ba5 openoffice-2.1.0-r1.ebuild 11912
 RMD160 3485b04bc13db7ca29e223121c4322ffd76e7697 openoffice-2.1.0-r1.ebuild 11912
 SHA256 a57ffa4bd36d004e90c72bdf6bf7faf1f20da5304754df5ffa3376b29bd507ec openoffice-2.1.0-r1.ebuild 11912
-EBUILD openoffice-2.2.0.ebuild 11726 RMD160 6b247ddf0a7c8eeb7e72df88bbfb47e5dbb81476 SHA1 9dc2870b77fc7d59718e47684bb7896dd0755ce0 SHA256 0a5d2a72d4dc7e9f72f7b849e890a7915caaf7e16a94489fb66a96b4b8048238
-MD5 7fe319a839a9e9076320f61524c30fe7 openoffice-2.2.0.ebuild 11726
-RMD160 6b247ddf0a7c8eeb7e72df88bbfb47e5dbb81476 openoffice-2.2.0.ebuild 11726
-SHA256 0a5d2a72d4dc7e9f72f7b849e890a7915caaf7e16a94489fb66a96b4b8048238 openoffice-2.2.0.ebuild 11726
-MISC ChangeLog 66249 RMD160 d3fc9d321c1a8caf27bc151aebc88a76e6c0fff9 SHA1 2ebeddbe29a7f5cad57dd06acadcbf65f772ed62 SHA256 9caefb960b1042e539ee93d0133fd55b1ec44eb80fed03fb60008e8d433d05fa
-MD5 4d5f7bc30627ac3e842727d0e8c73ea3 ChangeLog 66249
-RMD160 d3fc9d321c1a8caf27bc151aebc88a76e6c0fff9 ChangeLog 66249
-SHA256 9caefb960b1042e539ee93d0133fd55b1ec44eb80fed03fb60008e8d433d05fa ChangeLog 66249
+EBUILD openoffice-2.2.0.ebuild 11769 RMD160 dc8c6d814ae7b2135e1b358eff5b96514585a62d SHA1 ec268fba4df125724873b8db5bdaf15b7cc747d8 SHA256 abc82d273df116182da89b6a37beb3993cad3e2be7dc286240ba7439477de094
+MD5 25034387cb3529c48171f49d646c955e openoffice-2.2.0.ebuild 11769
+RMD160 dc8c6d814ae7b2135e1b358eff5b96514585a62d openoffice-2.2.0.ebuild 11769
+SHA256 abc82d273df116182da89b6a37beb3993cad3e2be7dc286240ba7439477de094 openoffice-2.2.0.ebuild 11769
+MISC ChangeLog 66419 RMD160 ed35df0362dde767897f55840cd146d2c21cb8c8 SHA1 16b4f11803c13c94c23a600b89e0ebc562ba7207 SHA256 984baa570aa5eabba6a6936edbffb6675ed72eaaf9d1433a77113658ca30394b
+MD5 e8e9e0db70e5a9f76286079f1e57d6b5 ChangeLog 66419
+RMD160 ed35df0362dde767897f55840cd146d2c21cb8c8 ChangeLog 66419
+SHA256 984baa570aa5eabba6a6936edbffb6675ed72eaaf9d1433a77113658ca30394b ChangeLog 66419
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461

diff --git a/app-office/openoffice/files/2.2.0/ooo-env_log.diff b/app-office/openoffice/files/2.2.0/ooo-env_log.diff
new file mode 100644 (file)
index 0000000..908169a
--- /dev/null
+++ b/app-office/openoffice/files/2.2.0/ooo-env_log.diff
@@ -0,0 +1,25 @@
+--- bin/build-ooo.orig 2007-04-18 18:32:06.000000000 +0200
++++ bin/build-ooo      2007-04-18 18:32:45.000000000 +0200
+@@ -21,9 +21,8 @@
+ echo "configuring ...";
+ autoconf || exit 1;
+ 
+-echo "Env for configure:"
+-set
+-echo "Env for configure ends"
++echo "Log Env for configure to `pwd`/env.log"
++set > env.log
+ 
+ eval ./configure "$CONFIGURE_OPTIONS" "$PROPAGATED_ARGS" || exit 1;
+ 
+@@ -88,8 +88,8 @@
+ # similar that gives child nmake's pain.
+ unset MAKEFLAGS
+ 
+-echo "Env:"
+-set
++echo "Log Env to `pwd`/env.log"
++set > env.log
+ 
+ # What extra localizations are avilable as $SRCDIR/GSI_*.sdf and are not
+ # already merged?

diff --git a/app-office/openoffice/openoffice-2.2.0.ebuild b/app-office/openoffice/openoffice-2.2.0.ebuild
index 7a1d35445454c286b0b9cea780900e105996d280..e146340493f23e85ec815218ae4583b01d219428 100644 (file)
--- a/app-office/openoffice/openoffice-2.2.0.ebuild
+++ b/app-office/openoffice/openoffice-2.2.0.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-office/openoffice/openoffice-2.2.0.ebuild,v 1.4 2007/04/24 20:52:12 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.2.0.ebuild,v 1.5 2007/04/24 21:36:26 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -202,6 +202,7 @@ src_unpack() {
        #Some fixes for our patchset
        cd ${S}
        epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff
+       epatch ${FILESDIR}/${PV}/ooo-env_log.diff
 
        if use ppc ; then
                cp -f ${FILESDIR}/${PV}/disable-regcomp-java.diff ${S}/patches/src680 || die