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

Package-Manager: portage-2.1_pre7-r3

5 files changed, 39 insertions, 21 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/Manifest b/app-office/openoffice/Manifest
index b6cbbbc85597..3bb65538eee8 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,21 +1,21 @@
-MD5 6ed518d48c22437d8bac2e20dfd750d3 ChangeLog 43140
-RMD160 39c5d4f9bc90a638d9f5ff7b7b8b5dc00709f671 ChangeLog 43140
-SHA256 5411421afa680d232cda0aa2177ce6cba1255fc56b7ea952dd79f1e08fad1f4f ChangeLog 43140
+MD5 e1824ffdeab5c855ea72fb629e11f252 ChangeLog 43381
+RMD160 e0abdc283238035475f52120dbb46507b23aeffb ChangeLog 43381
+SHA256 dfad88008525cc92bc7defed81a0722bce9a1bf95078b1c8afc5de30c01f4974 ChangeLog 43381
 MD5 500f7e71be57d40b0a8042cab1484df9 files/2.0.1/alwayscrystal.diff 3222
 RMD160 6f563dccad523db881def1fdb711df3949c2a687 files/2.0.1/alwayscrystal.diff 3222
 SHA256 22af14b2c3bd7d796eeda2f4a423f4290e71d2f2790a82038b837c6219133ef1 files/2.0.1/alwayscrystal.diff 3222
-MD5 919be84ef3c8315b84c37cdd1f5b947d files/2.0.2/pythonfix.diff 523
-RMD160 9e60f68dae950bc929d454a5d5d0a050a03b90e9 files/2.0.2/pythonfix.diff 523
-SHA256 adf13d129e3a3a6fb513ada2046af98d10d4d46953603da13be8e4ae75d56527 files/2.0.2/pythonfix.diff 523
+MD5 6bdcbcb4270ebd6863e30cc2bd0220d1 files/2.0.2/gentoo-2.0.2.diff 840
+RMD160 2375bbc2ee803d4e4195b3e0ddae93d767a8a552 files/2.0.2/gentoo-2.0.2.diff 840
+SHA256 c2da419a6d23ab7553a2809e7c64729dcd78a1726bad0c47b96b20fa0cce1512 files/2.0.2/gentoo-2.0.2.diff 840
 MD5 9017e3971f27ac77833ae962069feccf files/digest-openoffice-2.0.1 2024
 RMD160 94f476c151e7c42212f2d6dd05b48443ca784e1e files/digest-openoffice-2.0.1 2024
 SHA256 ac0d68a776f61080710f7f031ed79457a1f1a30bc24abcc85a563ce1df2d9d46 files/digest-openoffice-2.0.1 2024
 MD5 9017e3971f27ac77833ae962069feccf files/digest-openoffice-2.0.1-r1 2024
 RMD160 94f476c151e7c42212f2d6dd05b48443ca784e1e files/digest-openoffice-2.0.1-r1 2024
 SHA256 ac0d68a776f61080710f7f031ed79457a1f1a30bc24abcc85a563ce1df2d9d46 files/digest-openoffice-2.0.1-r1 2024
-MD5 866bebf4804bd0328df9abc31e854c90 files/digest-openoffice-2.0.2 2726
-RMD160 678507d37b4ae3f54c5dffa09ceb1b02b38d14c9 files/digest-openoffice-2.0.2 2726
-SHA256 9d862fba6c0283bbd5e77282c6442a1438d278b843a71da1c720aeab8986033a files/digest-openoffice-2.0.2 2726
+MD5 2d9167e845f93b3d5079c21985ca8fc9 files/digest-openoffice-2.0.2 2726
+RMD160 c7e8cd8cb3e14bcdbd1bfff7693935b15f0cc540 files/digest-openoffice-2.0.2 2726
+SHA256 53e9d2a4ac8de422dd19e3daadc9fee4fc0d454be9c1547b7ad928dfe6dedae5 files/digest-openoffice-2.0.2 2726
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 metadata.xml 461
@@ -25,6 +25,6 @@ SHA256 56d3fe2e3e5c6ca3b4edc264b7e60ff1490a0e355d0b939f6805d347638f3019 openoffi
 MD5 7cc2820c5adc1d257bff44f894cf2767 openoffice-2.0.1.ebuild 7252
 RMD160 5b5adfc222b78c5ecd065c0674b8ea50e839bc84 openoffice-2.0.1.ebuild 7252
 SHA256 20105cce8cc455b7674d0e86b7bcdf1097ee94f3d6a9b1fb521517d7ff81138e openoffice-2.0.1.ebuild 7252
-MD5 ef05cb2b82ab1923450c70b57563b2ab openoffice-2.0.2.ebuild 7743
-RMD160 cc19f28efb3bf23ddeb4f6fef2c583f031c40e47 openoffice-2.0.2.ebuild 7743
-SHA256 6b614c99b729517d6ba9ec7e567415b221fe5d30ee14c1b3f70f746e36a5700d openoffice-2.0.2.ebuild 7743
+MD5 1c4800c4d43f706b350695362d00771d openoffice-2.0.2.ebuild 7779
+RMD160 29f17e2e6ef8dba4154911584f2e9b7858422e86 openoffice-2.0.2.ebuild 7779
+SHA256 cfe6f733fde0364160d00e7b0e8779163e67b0456c3833080106b5917ee63c0d openoffice-2.0.2.ebuild 7779
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() {