Update to new patch revision, fix some file permission and remove patch which breaks gcc-4.1

(Portage version: 2.1_pre7-r3)

4 files changed, 27 insertions, 9 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index d5b084719eb4..b9e2e56945c1 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.200 2006/03/25 18:22:29 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.201 2006/04/01 07:17:41 suka Exp $
+
+  01 Apr 2006; Andreas Proschofsky <suka@gentoo.org>
+  -files/2.0.2/pythonfix.diff, +files/2.0.2/gentoo-2.0.2.diff,
+  openoffice-2.0.2.ebuild:
+  Update to new patch revision, fix some file permission and remove patch
+  which breaks gcc-4.1
 
   25 Mar 2006; Andreas Proschofsky <suka@gentoo.org>
   +files/2.0.2/pythonfix.diff, -files/2.0.2/removecrystalcheck.diff,
diff --git a/app-office/openoffice/files/2.0.2/pythonfix.diff b/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff
index a64755cbb2d1..7c338137f9d7 100644
--- a/app-office/openoffice/files/2.0.2/pythonfix.diff
+++ b/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff
@@ -20,3 +20,14 @@
  # And here we go.
  exec "$SystemInstallDir/program/$Binary", @ooo_argv
  
+--- patches/src680/apply 
++++ patches/src680/apply 
+@@ -624,8 +624,6 @@
+ # Fix i#54730
+ buildfix-longnames-54730.diff
+ 
+-# Fix missing __cxa_guard_acquire/__cxa_guard_release - #34676 (for FC3)
+-sal-cxa-guard.diff
+ # Fix ODK Java bits
+ odk-java-wizpanel.diff
+ # add possibility to set ARCH_FLAGS when building libnas
diff --git a/app-office/openoffice/files/digest-openoffice-2.0.2 b/app-office/openoffice/files/digest-openoffice-2.0.2
index 7ebc6e15f570..bf4ebf34298c 100644
--- a/app-office/openoffice/files/digest-openoffice-2.0.2
+++ b/app-office/openoffice/files/digest-openoffice-2.0.2
@@ -25,9 +25,9 @@ SHA256 9de07fbe97c9539bae9c76502474c76471ab173dac365e251ca3fc5281008149 hunspell
 MD5 f34404f8dc6123aca156d203c37e3e5d libwpd-0.8.3.tar.gz 482757
 RMD160 f8010300e50e1c43942e6a84a3b526738edb4ed5 libwpd-0.8.3.tar.gz 482757
 SHA256 2221aaa444d29f4a1eacea1a0a939012f02a8aa8e02c178788d68ccc0024170c libwpd-0.8.3.tar.gz 482757
-MD5 fc15200e1d6b9a7bfbce0f46f2cb3bc4 ooo-build-2.0.2.2.tar.gz 5205084
-RMD160 1b213878b007e18c4aaf5f7ab45fa46b6c867a1f ooo-build-2.0.2.2.tar.gz 5205084
-SHA256 1201d1c6b522364e6f54b7a1e3430e3c0e7a692f067e1533a859a095a8c63bd7 ooo-build-2.0.2.2.tar.gz 5205084
+MD5 3b8e1cb56107b47ce30555a64109ee98 ooo-build-2.0.2.4.tar.gz 5220067
+RMD160 ef874f21c030320ef8f4723d040926b497990b95 ooo-build-2.0.2.4.tar.gz 5220067
+SHA256 44148d0e6339821db63f4dc8fc2fc52df5f6aa4d6267ba1a0c8816cef26a4cda ooo-build-2.0.2.4.tar.gz 5220067
 MD5 0395e6e7da27c1cea7e1852286f6ccf9 xt-20051206-src-only.zip 423516
 RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d xt-20051206-src-only.zip 423516
 SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e xt-20051206-src-only.zip 423516
diff --git a/app-office/openoffice/openoffice-2.0.2.ebuild b/app-office/openoffice/openoffice-2.0.2.ebuild
index 249ab3ebead6..41d1e3ebffed 100644
--- a/app-office/openoffice/openoffice-2.0.2.ebuild
+++ b/app-office/openoffice/openoffice-2.0.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.2.ebuild,v 1.5 2006/03/25 18:22:29 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.2.ebuild,v 1.6 2006/04/01 07:17:41 suka Exp $
 
 inherit eutils fdo-mime flag-o-matic kde-functions mono toolchain-funcs
 
 IUSE="binfilter cairo eds firefox gnome gtk java kde ldap mono mozilla xml2"
 
-MY_PV="${PV}.2"
+MY_PV="${PV}.4"
 PATCHLEVEL="OOB680"
 SRC="OOO_2_0_2"
 S="${WORKDIR}/ooo-build-${MY_PV}"
@@ -145,7 +145,7 @@ src_unpack() {
 
 	#Some fixes for our patchset
 	cd ${S}
-	epatch ${FILESDIR}/${PV}/pythonfix.diff
+	epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff
 
 	#Use flag checks
 	use java && echo "--with-jdk-home=${JAVA_HOME} --with-ant-home=${ANT_HOME}" >> ${CONFFILE} || echo "--without-java" >> ${CONFFILE}
@@ -163,8 +163,6 @@ src_unpack() {
 	echo "`use_enable gnome lockdown`" >> ${CONFFILE}
 	echo "`use_enable gnome atkbridge`" >> ${CONFFILE}
 
-	echo "--with-system-curl"  >> ${CONFFILE}
-
 }
 
 src_compile() {
@@ -237,6 +235,9 @@ src_install() {
 	insinto /usr/share/fonts/TTF/
 	doins fonts/*.ttf
 
+	# Fix the permissions for security reasons
+	chown -R root:root ${D} || die
+
 }
 
 pkg_postinst() {