Fix gcc-3.2 issues, default language choice when a wrong language is specified is disabled and hopefully ccache issues will be solved

4 files changed, 35 insertions, 9 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 438da1aeed18..2a0c9d2fbcce 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.44 2003/10/21 09:33:45 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.45 2003/10/23 09:24:25 pauldv Exp $
+
+  23 Oct 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.0-r1.ebuild,
+  openoffice-1.1.0.ebuild:
+  Do some flag-o-matic to prevent -march=pentium4 from failing on 3.2 compilers
 
   19 Oct 2003; Heinrich Wendel <lanius@gentoo.org> openoffice-1.1.0-r1.ebuild,
   openoffice-1.1.0.ebuild, openoffice-1.1_rc3.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index a2bfc88a40f0..c3be390ed24a 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,8 +1,8 @@
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
-MD5 559167d44fac462ce4d610182bf3c6aa ChangeLog 10789
+MD5 9eb5539d9a7478933ac49a84b851ddc5 ChangeLog 10975
 MD5 7564812fd1fe3da72c7bf49ca9df4f6d openoffice-1.0.3-r1.ebuild 21884
-MD5 bf6f41ea8c21f155049b8b0e31422dca openoffice-1.1.0-r1.ebuild 19186
-MD5 6c346ff67c1da3d5fd3001bfc71fcba5 openoffice-1.1.0.ebuild 19628
+MD5 fb794e1f18e69fcb2195e65898891ee5 openoffice-1.1.0-r1.ebuild 19746
+MD5 4404328b62ac96012b5568eac78d654f openoffice-1.1.0.ebuild 19772
 MD5 9d1828c128b70f1612c0c31b69719a26 files/digest-openoffice-1.1.0-r1 195
 MD5 9d1828c128b70f1612c0c31b69719a26 files/digest-openoffice-1.1.0 195
 MD5 b1ec8fd75e9b93ccf4a4f0c926de5199 files/digest-openoffice-1.0.3-r1 330
diff --git a/app-office/openoffice/openoffice-1.1.0-r1.ebuild b/app-office/openoffice/openoffice-1.1.0-r1.ebuild
index 42e2c334069b..6c007eff8b43 100644
--- a/app-office/openoffice/openoffice-1.1.0-r1.ebuild
+++ b/app-office/openoffice/openoffice-1.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.0-r1.ebuild,v 1.3 2003/10/21 09:33:46 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.0-r1.ebuild,v 1.4 2003/10/23 09:24:25 pauldv Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -137,11 +137,19 @@ pkg_setup() {
 	ewarn " merge again.					               "
 	ewarn "****************************************************************"
 
+	set_languages
 
 }
 
 set_languages () {
+	if [ -z "$LANGUAGE" ]; then
+		LANGUAGE=01
+	fi
+
 	case "$LANGUAGE" in
+		01 | ENUS ) LANGNO=01; LANGNAME=ENUS; LFULLNAME="US English (default
+)"
+			;;
 		03 | PORT ) LANGNO=03; LANGNAME=PORT; LFULLNAME=Portuguese
 			;;
 		07 | RUSS ) LANGNO=07; LANGNAME=RUSS; LFULLNAME=Russian
@@ -195,7 +203,13 @@ set_languages () {
 		97 | HEBREW ) LANGNO=97; LANGNAME=HEBREW; LFULLNAME=Hebrew
 			;;
 		* )
-			LANGNO=01; LANGNAME=ENUS; LFULLNAME="US English (default)"
+			eerror "Unknown LANGUAGE setting!"
+			eerror
+			eerror "Known LANGUAGE settings are:"
+			eerror "  ENUS | PORT | RUSS | GREEK | DTCH | FREN | SPAN | FINN | CAT | ITAL |"
+			eerror "  CZECH | SLOVAK | DAN | SWED | POL | GER | PORTBR | THAI | ESTONIAN |"
+			eerror "  JAPN | KOREAN | CHINSIM | CHINTRAD | TURK | HINDI | ARAB | HEBREW"
+			die
 			;;
 	esac
 }
@@ -308,6 +322,11 @@ get_EnvSet() {
 }
 
 src_compile() {
+
+	if [ "$(gcc-version)" = "3.2" ]; then
+		replace-flags "-march=pentium4" "-march=pentium3 -mcpu=pentium4"
+	fi
+
 	addpredict /bin
 	local buildcmd=""
 
@@ -332,7 +351,7 @@ src_compile() {
 	# Enable new ccache for this build
 	elif [ "${FEATURES/-ccache/}" = "${FEATURES}" -a \
 	     "${FEATURES/ccache/}" != "${FEATURES}" -a \
-	     -x /usr/bin/ccache ]
+	     -x /usr/bin/ccache -a ! -d /usr/bin/ccache ]
 	then
 		# Build uses its own env with $PATH, etc, so
 		# we take the easy way out. (Az)
diff --git a/app-office/openoffice/openoffice-1.1.0.ebuild b/app-office/openoffice/openoffice-1.1.0.ebuild
index 56646f0ce03c..eb3b9d50f28c 100644
--- a/app-office/openoffice/openoffice-1.1.0.ebuild
+++ b/app-office/openoffice/openoffice-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.0.ebuild,v 1.6 2003/10/21 09:33:46 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.0.ebuild,v 1.7 2003/10/23 09:24:25 pauldv Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -90,7 +90,7 @@ export LS_COLORS=""
 
 pkg_setup() {
 
-	if [ "$(gcc-version)" != "3.2" ]
+	if [ "$(gcc-version)" != "3.2" ] && [ "$(gcc-version)" != "3.3" ];
 	then
 		eerror
 		eerror "This build needs gcc-3.2.x, but due to profile"
@@ -315,6 +315,9 @@ get_EnvSet() {
 }
 
 src_compile() {
+	if [ "$(gcc-version)" = "3.2" ]; then
+		replace-flags "-march=pentium4" "-march=pentium3 -mcpu=pentium4"
+	fi
 	addpredict /bin
 	local buildcmd=""