Move CFLAGS filtering stuff inside of src_unpack

5 files changed, 44 insertions, 44 deletions

diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest
index 3d6f3b9c5ef5..7d76c8a20ec4 100644
--- a/app-office/openoffice-ximian/Manifest
+++ b/app-office/openoffice-ximian/Manifest
@@ -1,7 +1,7 @@
-MD5 4f1d4a2b6af18cfdec390bd2c655befc openoffice-ximian-1.1.53.ebuild 14931
-MD5 250df02f3dd965be559fa30ca2949b44 openoffice-ximian-1.1.51-r1.ebuild 15072
-MD5 94538bfe7ce6f59a451b2f8e8874d4a4 openoffice-ximian-1.1.55.ebuild 15331
-MD5 b81f1671c7f7f7eac758d434a865cd39 openoffice-ximian-1.1.54.ebuild 15307
+MD5 563436d5e482c2e44849d7d6282b1c3a openoffice-ximian-1.1.53.ebuild 14939
+MD5 665131dd815e781e7fb75a405e7c8c11 openoffice-ximian-1.1.51-r1.ebuild 15080
+MD5 e5a72be7f50dff0ff94161f023be2c34 openoffice-ximian-1.1.55.ebuild 15339
+MD5 3ba183e50de5f7a6d59339aaf45c5185 openoffice-ximian-1.1.54.ebuild 15315
 MD5 3870efcc8dd790847fd2e6ef17ae19a1 ChangeLog 9609
 MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
 MD5 bd8a36025a84cb2ad840e822f513e468 files/digest-openoffice-ximian-1.1.51-r1 213
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.51-r1.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.51-r1.ebuild
index b80f569a1f4c..b81268d2c286 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.1.51-r1.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.51-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.51-r1.ebuild,v 1.3 2004/05/05 10:44:33 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.51-r1.ebuild,v 1.4 2004/05/07 06:29:31 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -28,15 +28,6 @@
 
 inherit flag-o-matic eutils gcc
 
-# Compile problems with these ...
-filter-flags "-funroll-loops"
-filter-flags "-fomit-frame-pointer"
-filter-flags "-fprefetch-loop-arrays"
-filter-flags "-fno-default-inline"
-append-flags "-fno-strict-aliasing"
-replace-flags "-O3" "-O2"
-replace-flags "-Os" "-O2"
-
 # We want gcc3 if possible!!!!
 export WANT_GCC_3="yes"
 
@@ -266,6 +257,15 @@ src_unpack() {
 	${PATCHDIR}/bin/font-munge ${S}/officecfg/registry/data/org/openoffice/VCL.xcu
 	echo "done munging fonts."
 
+	# Compile problems with these ...
+	filter-flags "-funroll-loops"
+	filter-flags "-fomit-frame-pointer"
+	filter-flags "-fprefetch-loop-arrays"
+	filter-flags "-fno-default-inline"
+	append-flags "-fno-strict-aliasing"
+	replace-flags "-O3" "-O2"
+	replace-flags "-Os" "-O2"
+
 	if [ "$(gcc-version)" == "3.2" ]; then
 		einfo "You use a buggy gcc, so replacing -march=pentium4 with -march=pentium3"
 		replace-flags "-march=pentium4" "-march=pentium3 -mcpu=pentium4"
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.53.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.53.ebuild
index 235d40094f9c..9670f0e8c157 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.1.53.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.53.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.53.ebuild,v 1.4 2004/05/05 10:44:33 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.53.ebuild,v 1.5 2004/05/07 06:29:31 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -28,15 +28,6 @@
 
 inherit flag-o-matic eutils gcc
 
-# Compile problems with these ...
-filter-flags "-funroll-loops"
-filter-flags "-fomit-frame-pointer"
-filter-flags "-fprefetch-loop-arrays"
-filter-flags "-fno-default-inline"
-append-flags "-fno-strict-aliasing"
-replace-flags "-O3" "-O2"
-replace-flags "-Os" "-O2"
-
 # We want gcc3 if possible!!!!
 export WANT_GCC_3="yes"
 
@@ -266,6 +257,15 @@ src_unpack() {
 		replace-flags "-march=pentium4" "-march=pentium3 -mcpu=pentium4"
 	fi
 
+	# Compile problems with these ...
+	filter-flags "-funroll-loops"
+	filter-flags "-fomit-frame-pointer"
+	filter-flags "-fprefetch-loop-arrays"
+	filter-flags "-fno-default-inline"
+	append-flags "-fno-strict-aliasing"
+	replace-flags "-O3" "-O2"
+	replace-flags "-Os" "-O2"
+
 	# Now for our optimization flags ...
 	export CXXFLAGS="${CXXFLAGS} -fno-for-scope -fpermissive -fno-rtti"
 	perl -pi -e "s|^CFLAGSOPT=.*|CFLAGSOPT=${CFLAGS}|g" \
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.54.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.54.ebuild
index 62cc17b5e3f7..f3b0460ea938 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.1.54.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.54.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.54.ebuild,v 1.6 2004/05/06 22:24:25 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.54.ebuild,v 1.7 2004/05/07 06:29:31 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -30,15 +30,6 @@ inherit flag-o-matic eutils gcc
 
 IUSE="gnome kde ooo-kde"
 
-# Compile problems with these ...
-filter-flags "-funroll-loops"
-filter-flags "-fomit-frame-pointer"
-filter-flags "-fprefetch-loop-arrays"
-filter-flags "-fno-default-inline"
-append-flags "-fno-strict-aliasing"
-replace-flags "-O3" "-O2"
-replace-flags "-Os" "-O2"
-
 # We want gcc3 if possible!!!!
 export WANT_GCC_3="yes"
 
@@ -275,6 +266,15 @@ src_unpack() {
 	${PATCHDIR}/bin/font-munge ${S}/officecfg/registry/data/org/openoffice/VCL.xcu
 	echo "done munging fonts."
 
+	# Compile problems with these ...
+	filter-flags "-funroll-loops"
+	filter-flags "-fomit-frame-pointer"
+	filter-flags "-fprefetch-loop-arrays"
+	filter-flags "-fno-default-inline"
+	append-flags "-fno-strict-aliasing"
+	replace-flags "-O3" "-O2"
+	replace-flags "-Os" "-O2"
+
 	if [ "$(gcc-version)" == "3.2" ]; then
 		einfo "You use a buggy gcc, so replacing -march=pentium4 with -march=pentium3"
 		replace-flags "-march=pentium4" "-march=pentium3 -mcpu=pentium4"
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.55.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.55.ebuild
index ebb49b3bfeb0..91f64746bb7f 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.1.55.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.55.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.55.ebuild,v 1.2 2004/05/06 22:24:25 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.55.ebuild,v 1.3 2004/05/07 06:29:31 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -30,15 +30,6 @@ inherit flag-o-matic eutils gcc
 
 IUSE="gnome kde ooo-kde"
 
-# Compile problems with these ...
-filter-flags "-funroll-loops"
-filter-flags "-fomit-frame-pointer"
-filter-flags "-fprefetch-loop-arrays"
-filter-flags "-fno-default-inline"
-append-flags "-fno-strict-aliasing"
-replace-flags "-O3" "-O2"
-replace-flags "-Os" "-O2"
-
 # We want gcc3 if possible!!!!
 export WANT_GCC_3="yes"
 
@@ -276,6 +267,15 @@ src_unpack() {
 	${PATCHDIR}/bin/font-munge ${S}/officecfg/registry/data/org/openoffice/VCL.xcu
 	echo "done munging fonts."
 
+	# Compile problems with these ...
+	filter-flags "-funroll-loops"
+	filter-flags "-fomit-frame-pointer"
+	filter-flags "-fprefetch-loop-arrays"
+	filter-flags "-fno-default-inline"
+	append-flags "-fno-strict-aliasing"
+	replace-flags "-O3" "-O2"
+	replace-flags "-Os" "-O2"
+
 	if [ "$(gcc-version)" == "3.2" ]; then
 		einfo "You use a buggy gcc, so replacing -march=pentium4 with -march=pentium3"
 		replace-flags "-march=pentium4" "-march=pentium3 -mcpu=pentium4"