Silent bump to ooo-build-2.3.0.5 also some more ppc-fixes

(Portage version: 2.1.3.15)

4 files changed, 22 insertions, 12 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index edd03ba5fc60..b070f5e95369 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,15 @@
 # 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.350 2007/10/11 07:34:20 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.351 2007/10/19 09:52:08 suka Exp $
+
+  19 Oct 2007; Andreas Proschofsky <suka@gentoo.org>
+  files/2.3.0/gentoo-2.3.0.diff, openoffice-2.3.0.ebuild:
+  Silent bump to ooo-build-2.3.0.5, some good fixes. This also drops the glib
+  dependency for the quickstarter for more info see here:
+  
+  http://svn.gnome.org/viewvc/ooo-build/trunk/NEWS?revision=10529&view=markup
+  
+  Also add some CFLAG-magic to help the ppc-build
 
   11 Oct 2007; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.3.0.ebuild:
diff --git a/app-office/openoffice/files/2.3.0/gentoo-2.3.0.diff b/app-office/openoffice/files/2.3.0/gentoo-2.3.0.diff
index 38b97530d2cf..ddfd07043782 100644
--- a/app-office/openoffice/files/2.3.0/gentoo-2.3.0.diff
+++ b/app-office/openoffice/files/2.3.0/gentoo-2.3.0.diff
@@ -1,13 +1,13 @@
 --- bin/package-ooo 
 +++ bin/package-ooo 
-@@ -57,6 +57,7 @@
+@@ -33,6 +33,7 @@
+ {
+     cat <<EOT >$1
  #!/bin/sh
- export OOO_EXTRA_ARG='$2'
 +unset PYTHONPATH
- $OOINSTBASE/program/ooqstart $3 "\$@"
+ $OOINSTBASE/program/soffice $2 "\$@"
  EOT
      chmod 755 $1
- }
 --- distro-configs/Gentoo.conf.in 
 +++ distro-configs/Gentoo.conf.in 
 @@ -3,7 +3,6 @@
diff --git a/app-office/openoffice/files/digest-openoffice-2.3.0 b/app-office/openoffice/files/digest-openoffice-2.3.0
index 28443fe93984..f5efd0f8eb26 100644
--- a/app-office/openoffice/files/digest-openoffice-2.3.0
+++ b/app-office/openoffice/files/digest-openoffice-2.3.0
@@ -25,9 +25,9 @@ SHA256 c3c4e0a63b0d1e2a3063172b44c722dde84608c3675fb124bb6f7e00f270379e libwps-0
 MD5 26b3e95ddf3d9c077c480ea45874b3b8 lp_solve_5.5.0.10_source.tar.gz 769268
 RMD160 17e16c6c9fe9807e148d0b96bd8a3b41953681f6 lp_solve_5.5.0.10_source.tar.gz 769268
 SHA256 171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695 lp_solve_5.5.0.10_source.tar.gz 769268
-MD5 5d4c0e75deddcd53bb64ea9c296bb11a ooo-build-2.3.0.4.tar.gz 7877310
-RMD160 86f6f90bae4ec8fbc525a39f8ef774dd66210103 ooo-build-2.3.0.4.tar.gz 7877310
-SHA256 f2ca3acbc166a9c00bad22ef346188cf881608496f69eee7de5b956a8a035e60 ooo-build-2.3.0.4.tar.gz 7877310
+MD5 6e6e8b9ad6f3af9fd91bd38f641cd51a ooo-build-2.3.0.5.tar.gz 7947424
+RMD160 c3a062283cbbd9c60419b8ef5555f5c9707336ad ooo-build-2.3.0.5.tar.gz 7947424
+SHA256 a330b072d8e70b8d8a832558531cbdb0ac11280ff9c2521e3de6fac85f94f101 ooo-build-2.3.0.5.tar.gz 7947424
 MD5 42aceb3508ff8b5ed04d0451b30f6ccf oox.2007-09-05.tar.bz2 357665
 RMD160 7c098136d35b4e6bc9ffa6c26ed0aa7cbd9fef13 oox.2007-09-05.tar.bz2 357665
 SHA256 29014ae9c3a69161933dae63133568d5b34d3d7ce734673a63c8c01c70d14769 oox.2007-09-05.tar.bz2 357665
diff --git a/app-office/openoffice/openoffice-2.3.0.ebuild b/app-office/openoffice/openoffice-2.3.0.ebuild
index 4dc98e8d26e4..c8e51e5ab0a6 100644
--- a/app-office/openoffice/openoffice-2.3.0.ebuild
+++ b/app-office/openoffice/openoffice-2.3.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.3.0.ebuild,v 1.12 2007/10/11 07:34:20 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.0.ebuild,v 1.13 2007/10/19 09:52:08 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -9,7 +9,7 @@ inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2
 
 IUSE="binfilter cairo cups dbus debug eds firefox gnome gstreamer gtk kde ldap mono sound odk pam seamonkey webdav xulrunner"
 
-MY_PV="2.3.0.4"
+MY_PV="2.3.0.5"
 PATCHLEVEL="OOG680"
 SRC="OOo_${PV}_src"
 S="${WORKDIR}/ooo"
@@ -94,7 +94,6 @@ COMMON_DEPEND="!app-office/openoffice-bin
 	dev-libs/expat
 	>=dev-libs/icu-3.6
 	>=sys-libs/db-4.3
-	>=dev-libs/glib-2.12
 	>=app-text/libwpd-0.8.8
 	>=media-libs/libsvg-0.1.4
 	linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
@@ -293,7 +292,8 @@ src_compile() {
 	filter-flags "-fforce-addr"
 	replace-flags "-O?" "-O2"
 
-	use ppc && append-flags "-D_STLP_STRICT_ANSI"
+	# Build problems with STLport and regcomp without these
+	use ppc && append-flags "-D_STLP_STRICT_ANSI -fno-schedule-insns"
 
 	# Now for our optimization flags ...
 	export ARCH_FLAGS="${CXXFLAGS}"
@@ -310,6 +310,7 @@ src_compile() {
 	./configure ${MYCONF} \
 		--with-distro="Gentoo" \
 		--with-arch="${ARCH}" \
+		--host="${CHOST}" \
 		--with-srcdir="${DISTDIR}" \
 		--with-lang="${LINGUAS_OOO}" \
 		--with-num-cpus="${JOBS}" \