Disable regcomp on ppc in another try to fix bug #147542

(Portage version: 2.1.2_rc4-r6)

5 files changed, 51 insertions, 2 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 1422f9e620a1..e9df3a4c3e22 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # 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.282 2007/01/05 08:23:31 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.283 2007/01/07 08:57:38 suka Exp $
+
+  07 Jan 2007; Andreas Proschofsky <suka@gentoo.org>
+  +files/2.0.4/disable-regcomp-java.diff,
+  +files/2.0.4/disable-regcomp-python.diff, +files/2.0.4/regcompapply.diff,
+  openoffice-2.0.4.ebuild:
+  Disable regcomp on ppc in another try to fix bug #147542
 
   05 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
   openoffice-2.0.4.ebuild:
diff --git a/app-office/openoffice/files/2.0.4/disable-regcomp-java.diff b/app-office/openoffice/files/2.0.4/disable-regcomp-java.diff
new file mode 100644
index 000000000000..f9a1ff10a483
--- /dev/null
+++ b/app-office/openoffice/files/2.0.4/disable-regcomp-java.diff
@@ -0,0 +1,12 @@
+Workaround, see http://www.openoffice.org/issues/show_bug.cgi?id=65026
+--- solenv/bin/modules/installer/servicesfile.pm.orig	2006-04-29 11:25:25.000000000 +0200
++++ solenv/bin/modules/installer/servicesfile.pm	2006-04-29 12:24:45.000000000 +0200
+@@ -471,7 +473,7 @@
+ 	$python_error_occured = 0;
+ 
+ 	if ( $#unocomponents > -1 ) { $uno_error_occured = register_unocomponents(\@unocomponents, $regcompfileref, $servicesfile); }
+-	if ( $#javacomponents > -1 ) { $java_error_occured = register_javacomponents(\@javacomponents, $regcompfileref, $servicesfile, $regcomprdb); }
++	if ( 0 ) { $java_error_occured = register_javacomponents(\@javacomponents, $regcompfileref, $servicesfile, $regcomprdb); }
+ 	if ( $#pythoncomponents > -1 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); }
+ 		
+ 	if ( $uno_error_occured || $java_error_occured || $python_error_occured ) { $registererrorflag = 1; }
diff --git a/app-office/openoffice/files/2.0.4/disable-regcomp-python.diff b/app-office/openoffice/files/2.0.4/disable-regcomp-python.diff
new file mode 100644
index 000000000000..e63a91f009eb
--- /dev/null
+++ b/app-office/openoffice/files/2.0.4/disable-regcomp-python.diff
@@ -0,0 +1,12 @@
+Workaround, see http://www.openoffice.org/issues/show_bug.cgi?id=65026
+--- solenv/bin/modules/installer/servicesfile.pm.orig	2006-10-23 13:49:24.000000000 +0200
++++ solenv/bin/modules/installer/servicesfile.pm	2006-10-23 13:50:04.000000000 +0200
+@@ -472,7 +472,7 @@
+ 
+ 	if ( $#unocomponents > -1 ) { $uno_error_occured = register_unocomponents(\@unocomponents, $regcompfileref, $servicesfile); }
+ 	if ( 0 ) { $java_error_occured = register_javacomponents(\@javacomponents, $regcompfileref, $servicesfile, $regcomprdb); }
+-	if ( $#pythoncomponents > -1 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); }
++	if ( 0 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); }
+ 		
+ 	if ( $uno_error_occured || $java_error_occured || $python_error_occured ) { $registererrorflag = 1; }
+ 	
diff --git a/app-office/openoffice/files/2.0.4/regcompapply.diff b/app-office/openoffice/files/2.0.4/regcompapply.diff
new file mode 100644
index 000000000000..e01a7a19222b
--- /dev/null
+++ b/app-office/openoffice/files/2.0.4/regcompapply.diff
@@ -0,0 +1,13 @@
+--- patches/src680/apply 
++++ patches/src680/apply 
+@@ -1152,6 +1152,9 @@
+ ibm-j9vm.diff, hmth
+ # Fix for some execstacks in libgcc3_uno.so, i#70845, aprosky
+ libgcc3_uno_noexecstack.diff
++#try to fix build on ppc
++disable-regcomp-java.diff
++disable-regcomp-python.diff
+ 
+ [ DebianBaseOnly ]
+ SectionOwner => rengelha
+
diff --git a/app-office/openoffice/openoffice-2.0.4.ebuild b/app-office/openoffice/openoffice-2.0.4.ebuild
index d55ad3842ff8..d75946781f3a 100644
--- a/app-office/openoffice/openoffice-2.0.4.ebuild
+++ b/app-office/openoffice/openoffice-2.0.4.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.0.4.ebuild,v 1.24 2007/01/05 08:23:31 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.4.ebuild,v 1.25 2007/01/07 08:57:38 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -183,6 +183,12 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff
 
+	if use ppc ; then
+		cp -f ${FILESDIR}/${PV}/disable-regcomp-java.diff ${S}/patches/src680 || die
+		cp -f ${FILESDIR}/${PV}/disable-regcomp-python.diff ${S}/patches/src680 || die
+		epatch ${FILESDIR}/${PV}/regcompapply.diff
+	fi
+
 	#Use flag checks
 	use java && echo "--with-jdk-home=${JAVA_HOME} --with-ant-home=${ANT_HOME}" >> ${CONFFILE}
 	use branding && echo "--with-intro-bitmaps=\\\"${S}/src/openintro_gentoo.bmp\\\"" >> ${CONFFILE}