Silent bump to ooo-build 2.4.0.7, other minor fixes

Package-Manager: portage-2.1.5_rc4

4 files changed, 14 insertions, 33 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 7d4e06fd7b7a..45df41d5ed81 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.387 2008/04/15 18:58:30 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.388 2008/04/18 12:45:06 suka Exp $
+
+  18 Apr 2008; Andreas Proschofsky <suka@gentoo.org>
+  files/2.4.0/gentoo-2.4.0.diff, openoffice-2.4.0.ebuild:
+  Silent bump to ooo-build 2.4.0.7, muchos bugfixes. Also reintroduce
+  branding use-flag and remove some cruft
 
   15 Apr 2008; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.4.0.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 28df09c43709..5cd55fb2948f 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -5,7 +5,7 @@ AUX 2.3.1/ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e S
 AUX 2.3.1/regcompapply.diff 312 RMD160 6f92774febf7a78091f2eddf2f589d271f155864 SHA1 a9328d636b94416d9a7ffdd6aa8a94d1cca77aeb SHA256 e6245f28282c5a43bca1c127f2622cf4ea5726bc5761c3d3a7be3dd0bf6068a8
 AUX 2.3.1/stlport-ppc-buildfix-apply.diff 257 RMD160 777695a68b975bf3a584d5f125dfdc16d584a955 SHA1 f3e0df039c00881b02741afceada9676030b4c4e SHA256 dbe5d331fdf44964098791034164b61c2d4911066cd538c8908ca908dfd66da3
 AUX 2.3.1/stlport-ppc-buildfix.diff 2192 RMD160 9f1b5be42101f0abbc0be98570643cb42fe74246 SHA1 d6ad0f4a73778f7d0c29a65c004d8f2c962bce5b SHA256 979ef2431fd40e3142b4213370bd16c7f6b99ff49d43d572164c1b43adba1b1f
-AUX 2.4.0/gentoo-2.4.0.diff 1539 RMD160 6d57405aac44f0d861a991411273b9f938f92271 SHA1 cd0e3c0cd9a369ebbb76b3145fa87c4c5ba05c28 SHA256 bd22c45367a712865d861e472b48eed1d5929e0954fdd9d47ca2ff895cf56595
+AUX 2.4.0/gentoo-2.4.0.diff 572 RMD160 1107e41d7b19b1a71e501b4dfa6f8f204517ecdc SHA1 f68cb994ee45080f24c0c97b695cc1fb87e58157 SHA256 bbf60d7d89c3347d0aa10dfa9c9aa899c1ef8a97111584cf7ec3b8d1db30a9f7
 AUX 2.4.0/ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
 DIST OOo_2.3.1_src_binfilter.tar.bz2 6476673 RMD160 497aec1de49ea941ab8305331a9fc9e8e04a5162 SHA1 0643c52da3850a164928342e7651897b7a76ca1f SHA256 9a76f8eae3dd546f42db883c12f8f21823e0e28ed6d43e83871dd1c1e07fff57
 DIST OOo_2.3.1_src_core.tar.bz2 144156134 RMD160 ab75c022d00ed6269eb9437f9c022e44181c6d3a SHA1 de189e03a329cdd334823a52b800fad0c033ab4d SHA256 4c807dd262eb714397de9e78d244d587968a92142a917dbb47f5180c40db6753
@@ -23,13 +23,13 @@ DIST libwps-0.1.0.tar.gz 555470 RMD160 aabc3b7938baa50c866f769317476893e5cba231
 DIST libwps-0.1.2.tar.gz 413360 RMD160 a3f60fed70ab0c4f34091c10f4eb4a421cb87d44 SHA1 3da402f74a6296425e88d0ab1cf197a5927288d6 SHA256 e8f03fc83f7ddd3976adb61f693eaeebefee852655875816e5f945e0efabb2b1
 DIST lp_solve_5.5.0.10_source.tar.gz 769268 RMD160 17e16c6c9fe9807e148d0b96bd8a3b41953681f6 SHA1 815216ecc4c8cac1cc5905ca3fb5d6168c1deac4 SHA256 171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695
 DIST ooo-build-2.3.1.2.tar.gz 8919121 RMD160 bbf48c05b9bfbd4633bc798b2e92c45c464b40dd SHA1 10c444bbe42a061350551b6d6ee7d65fb3aeb876 SHA256 9b0f77291d48e1fe2a7a6de766f7fc60fae17e1010aacafeb9c42c0d193740bf
-DIST ooo-build-2.4.0.6.tar.gz 8410886 RMD160 c9116626bbbc8983684ccdbe126d8356c1741914 SHA1 7c891c769c4ca73e93b583827c7538bbf979ca90 SHA256 c5df4387c934d8fafdf0e376a36f9de4f9437293cb816682496637d0e5a3755f
+DIST ooo-build-2.4.0.7.tar.gz 8589913 RMD160 64aacf1a628dc69cbe0d9e4837239168536e68fa SHA1 987f76c683e2111a936d3c62d6d2520b6b7872a7 SHA256 8bb2407022b294e7e62557d65c9919c9a746e5061d83b215c9d948870c6cfa14
 DIST oox.2007-09-05.tar.bz2 357665 RMD160 7c098136d35b4e6bc9ffa6c26ed0aa7cbd9fef13 SHA1 88336ac37450db579246212026c5b2c7745bd47a SHA256 29014ae9c3a69161933dae63133568d5b34d3d7ce734673a63c8c01c70d14769
 DIST oox.2008-02-29.tar.bz2 454902 RMD160 ff23feb96d9f950e230c419529862de2f748635b SHA1 b8e9136219e2d3d67a2353579a7f2afb2a21d563 SHA256 112ea899a8f8f69cbeeaffa7ec219fc275190c4c8cad2416a5587283dcd89685
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 DIST writerfilter.2008-02-29.tar.bz2 745803 RMD160 5f1642ee32757bf235ab8ada9f88023608dbf0e6 SHA1 398ebd9a18af5ae4a08305443cd4b16036ad1a37 SHA256 be55befd2694a8f5871a96cf7d33919dece8b890a081d7da493c6889db27dd94
 DIST xt-20051206-src-only.zip 423516 RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d SHA1 edaba936383f5e1d6d245b4c826c6207825a8297 SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e
 EBUILD openoffice-2.3.1-r1.ebuild 12385 RMD160 15cc21255d3cedf5b16019faf8dcd7d52055b8a9 SHA1 f74bec8f21572caa6eded91662b6c977f2223539 SHA256 e3b877db697ac97d8e1dc12291deab4b25c97343ed8041a30b1b4f8bb322da92
-EBUILD openoffice-2.4.0.ebuild 12460 RMD160 0b115b3c9eec3ecdc185fde92fb839ee7669e22f SHA1 1a7963d66b1203defcc5b03e5d7230fe3f04d4af SHA256 1468225508bc6d57cc06f75d2192f7c340c6ef4086bd4c683d0183c92e7792b6
-MISC ChangeLog 80393 RMD160 4d2e6b4453ddd6aa4502b896d58865ec2102fe8d SHA1 c840d5fb3a310a83176c32e1d29ad09bd587ba5e SHA256 669909c2182a0b7ad7920fa0e63ffd804fd4045b9261b66c6ca74691831112c2
+EBUILD openoffice-2.4.0.ebuild 12414 RMD160 a97412d2cbcf1f652c3f24510ab52d87609223b7 SHA1 b7dec57c62a71ab2042e184f88834ee7fc79fb39 SHA256 8348a379c0df69184fe3aef951d29130c019d1741d932e848bde8a7e1b6b9c64
+MISC ChangeLog 80617 RMD160 341946391dc2558910d7e34b37a93f2f63bb27a6 SHA1 b4be7c8f995bc06264d8e4ea77b1ed8e9db95d82 SHA256 97a1f530cffc69687272c8f2e88362a1ac630beb50f0dfdd8f49a2e463921058
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
diff --git a/app-office/openoffice/files/2.4.0/gentoo-2.4.0.diff b/app-office/openoffice/files/2.4.0/gentoo-2.4.0.diff
index e711a3e4b46c..962d2ae9f283 100644
--- a/app-office/openoffice/files/2.4.0/gentoo-2.4.0.diff
+++ b/app-office/openoffice/files/2.4.0/gentoo-2.4.0.diff
@@ -8,28 +8,6 @@
  $OOINSTBASE/program/soffice $2 "\$@"
  EOT
      chmod 755 $1
-@@ -431,7 +431,7 @@
-     chmod go-w $OOINSTDIR/sdk/settings/component.uno.map
- fi
- 
--if test "$DISTRO" = "SUSE" || ! echo "$DISTRO" | grep -q "SUSE-10" ; then
-+if test "$DISTRO" = "SUSE" || echo "$DISTRO" | grep -q "SUSE-11" ; then
-     # branding stuff for openSUSE >= 11.0 and SLED >= 11
-     mkdir -p $DATADIR/$OOOINSTALLDIRNAME/program
-     echo "%dir $DATADIRBASE/$OOOINSTALLDIRNAME" >$BUILDDIR/upstream_branding_list.txt
---- patches/src680/apply 
-+++ patches/src680/apply 
-@@ -88,8 +88,8 @@
- # openmamba
- openmamba: LinuxCommon, GlobalDesktopFiles
- #Gentoo
--GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CalcSolver, CairoFonts, BerkeleyDB43
--GentooUnstable: GentooBase, GentooExperimental, Gcc43, TransparentPrinting
-+GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CalcSolver, CairoFonts, BerkeleyDB43, Gcc43
-+GentooUnstable: GentooBase, GentooExperimental, TransparentPrinting
- Gentoo : GentooBase
- Gentoo64: GentooBase
- # rPath Linux
 --- patches/src680/svg-import-filter.diff   2008-04-12 23:55:36.000000000 +0400
 +++ patches/src680/svg-import-filter.diff   2008-03-06 21:09:06.000000000 +0300
 @@ -692,7 +692,7 @@
diff --git a/app-office/openoffice/openoffice-2.4.0.ebuild b/app-office/openoffice/openoffice-2.4.0.ebuild
index a955b8728f5f..2e2add3f5e46 100644
--- a/app-office/openoffice/openoffice-2.4.0.ebuild
+++ b/app-office/openoffice/openoffice-2.4.0.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.4.0.ebuild,v 1.9 2008/04/15 18:58:30 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.4.0.ebuild,v 1.10 2008/04/18 12:45:06 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
 
 inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib
 
-IUSE="binfilter cups dbus debug eds firefox gnome gstreamer gtk kde ldap mono odk pam seamonkey webdav xulrunner"
+IUSE="binfilter branding cups dbus debug eds firefox gnome gstreamer gtk kde ldap mono odk pam seamonkey webdav xulrunner"
 
-MY_PV="2.4.0.6"
+MY_PV="2.4.0.7"
 PATCHLEVEL="OOH680"
 SRC="OOo_${PV}_src"
 S="${WORKDIR}/ooo"
@@ -243,7 +243,7 @@ src_unpack() {
 	fi
 
 	# Upstream bitmaps are broken, so force ours for now
-	echo "--with-intro-bitmaps=\\\"${S}/src/openintro_gentoo.bmp\\\"" >> ${CONFFILE}
+	use branding && echo "--with-intro-bitmaps=\\\"${S}/src/openintro_gentoo.bmp\\\"" >> ${CONFFILE}
 
 	echo "`use_enable binfilter`" >> ${CONFFILE}
 
@@ -301,7 +301,6 @@ src_compile() {
 	filter-flags "-ftracer"
 	filter-flags "-fforce-addr"
 	replace-flags "-O?" "-O2"
-	append-flags "-DGL_GLEXT_PROTOTYPES"
 
 	# Now for our optimization flags ...
 	export ARCH_FLAGS="${CXXFLAGS}"
@@ -325,7 +324,6 @@ src_compile() {
 		${GTKFLAG} \
 		`use_enable mono` \
 		`use_enable kde` \
-		`use_enable gnome quickstart` \
 		`use_enable pam` \
 		`use_enable !debug strip` \
 		`use_enable odk` \