Silent bump to ooo-build 3.0.0.3.6, also lots of other build fixes and cleanups, see ChangeLog

for more information
(Portage version: 2.2_rc20/cvs/Linux 2.6.28-gentoo i686)

6 files changed, 59 insertions, 510 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index fe1b61179ec9..335026334c08 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,25 @@
 # 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.439 2008/11/18 15:56:04 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.440 2008/12/28 18:40:51 suka Exp $
+
+  28 Dec 2008; Andreas Proschofsky <suka@gentoo.org> -files/gentoo-2.4.1.diff,
+  -openoffice-2.4.1.ebuild, openoffice-3.0.0.ebuild:
+  Bunch of fixes:
+
+  *) Internal Bump to ooo-build 3.0.0.3.6, see
+  http://svn.gnome.org/viewvc/ooo-build/branches/ooo-build-3-0/NEWS?revision
+  =14682&view=markup for more information
+
+  *) Remove dependencies on startup-notification and imagemagick, not needed
+  anymore
+
+  *) Remove hardcoded fonts for some languages, closes bug #252199
+
+  *) Remove some build problems with more strict sandbox, bug #251932
+
+  *) Fix mono install
+
+  *) Remove outdated (and security vulnerable) version
 
   18 Nov 2008; Torsten Veller <tove@gentoo.org> openoffice-2.4.1.ebuild,
   openoffice-3.0.0.ebuild:
diff --git a/app-office/openoffice/files/fixsandbox.diff b/app-office/openoffice/files/fixsandbox.diff
new file mode 100644
index 000000000000..9249da284baa
--- /dev/null
+++ b/app-office/openoffice/files/fixsandbox.diff
@@ -0,0 +1,11 @@
+--- officecfg/util/makefile.mk 
++++ officecfg/util/makefile.mk 
+@@ -41,7 +41,6 @@
+ 
+ $(MISC)$/$(TARGET)_delzip :
+ 	-$(RM) $(BIN)$/registry_{$(alllangiso)}.zip	
+-	-$(RM) $(COMMON_OUTPUT)$/bin$/registry_{$(alllangiso)}.zip
+ 
+ $(BIN)$/registry_{$(alllangiso)}.zip : $(MISC)$/$(TARGET)_delzip
+ 	cd $(MISC)$/registry$/res$/$(@:b:s/registry_//) && zip -ru ..$/..$/..$/..$/bin$/registry_$(@:b:s/registry_//).zip org/*
+
diff --git a/app-office/openoffice/files/gentoo-2.4.1.diff b/app-office/openoffice/files/gentoo-2.4.1.diff
deleted file mode 100644
index 962d2ae9f283..000000000000
--- a/app-office/openoffice/files/gentoo-2.4.1.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- bin/package-ooo 
-+++ bin/package-ooo 
-@@ -33,6 +33,7 @@
- {
-     cat <<EOT >$1
- #!/bin/sh
-+unset PYTHONPATH
- $OOINSTBASE/program/soffice $2 "\$@"
- EOT
-     chmod 755 $1
---- 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 @@
- +                      $(SLO)$/units.obj
- +
- +.IF "$(COMID)"=="gcc3"
--+.IF "$(CCNUMVER)">="000400000000" 
-++.IF "$(CCNUMVER)">="000400000000" || "$(SYSTEM_BOOST)"=="YES"
- +CFLAGS+=-DUSE_MODERN_SPIRIT
- +.ENDIF
-  .ENDIF
-
diff --git a/app-office/openoffice/files/gentoo-3.0.0.diff b/app-office/openoffice/files/gentoo-3.0.0.diff
index c11b021514d1..e074f3d405f9 100644
--- a/app-office/openoffice/files/gentoo-3.0.0.diff
+++ b/app-office/openoffice/files/gentoo-3.0.0.diff
@@ -8,48 +8,18 @@
  $OOINSTBASE/program/soffice $2 "\$@"
  EOT
      chmod 755 $1
---- distro-configs/CommonLinux.conf.in 
-+++ distro-configs/CommonLinux.conf.in 
-@@ -2,8 +2,6 @@
- --with-openldap
- --with-build-version=\"Build @OOO_BUILDVERSION@\"
- --without-fonts
----with-system-freetype
----with-system-gcc
- --with-system-jpeg
- --with-system-libxml
- --with-system-mozilla
-@@ -14,7 +12,6 @@
- --with-system-poppler
- --with-unix-wrapper=ooffice@OOO_BINSUFFIX@
- --enable-evolution2
----enable-atkbridge
- --with-alloc=system
- --with-vba-package-format=builtin
- @CAIRO_CONFIGURE_FLAG@
---- distro-configs/Gentoo.conf.in 
-+++ distro-configs/Gentoo.conf.in 
-@@ -16,7 +16,7 @@
- --with-system-neon
- --with-system-openssl
- --with-system-vigra
----with-system-xrender-headers
-+--with-system-xrender
- --without-myspell-dicts
- --without-stlport
- --with-vendor=\"Gentoo Foundation\"
 --- patches/dev300/apply 
 +++ patches/dev300/apply 
-@@ -1425,7 +1425,11 @@
+@@ -1458,6 +1458,12 @@
+ [ GentooOnly ]
  SectionOwner => aprosky
  
- # system lucene classpath
--gentoo-system-lucene.diff
-+#gentoo-system-lucene.diff
 +# No java build
 +nojavanostax.diff
 +# Fix freezes with dict|hyph-stuff in one dir
 +hunspell-one-dir-nocrash.diff
++# Sandbox problem with wrong path
++fixsandbox.diff
  # Allow build to proceed with PaX enabled
  gentoo-pax-fix.diff, aprosky
  # support server-only versions of 64bit JDKs
@@ -64,51 +34,22 @@
  +CFLAGS+=-DUSE_MODERN_SPIRIT
  +.ENDIF
   .ENDIF
---- patches/dev300/scp2_extensions.diff 
-+++ patches/dev300/scp2_extensions.diff 
-@@ -370,7 +370,7 @@
- +/* ** SUN Template Pack (en-US)** */
- +
- +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_en_US
--+Module gid_Module_Optional_Extensions_Sun_Template_Pack_en-US
-++Module gid_Module_Optional_Extensions_SUN_Template_Pack_en-US
- +    PackageInfo = "packinfo_extensions.txt";
- +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_en-US);
- +    ParentID = gid_Module_Optional_Extensions;
-@@ -385,7 +385,7 @@
- +/* ** SUN Template Pack (de)** */
- +
- +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_de
--+Module gid_Module_Optional_Extensions_Sun_Template_Pack_de
-++Module gid_Module_Optional_Extensions_SUN_Template_Pack_de
- +    PackageInfo = "packinfo_extensions.txt";
- +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_de);
- +    ParentID = gid_Module_Optional_Extensions;
-@@ -400,7 +400,7 @@
- +/* ** SUN Template Pack (it)** */
- +
- +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_it
--+Module gid_Module_Optional_Extensions_Sun_Template_Pack_it
-++Module gid_Module_Optional_Extensions_SUN_Template_Pack_it
- +    PackageInfo = "packinfo_extensions.txt";
- +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_it);
- +    ParentID = gid_Module_Optional_Extensions;
-@@ -415,7 +415,7 @@
- +/* ** SUN Template Pack (fr)** */
- +
- +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_fr
--+Module gid_Module_Optional_Extensions_Sun_Template_Pack_fr
-++Module gid_Module_Optional_Extensions_SUN_Template_Pack_fr
- +    PackageInfo = "packinfo_extensions.txt";
- +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_fr);
- +    ParentID = gid_Module_Optional_Extensions;
-@@ -430,7 +430,7 @@
- +/* ** SUN Template Pack (es)** */
- +
- +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK_es
--+Module gid_Module_Optional_Extensions_Sun_Template_Pack_es
-++Module gid_Module_Optional_Extensions_SUN_Template_Pack_es
- +    PackageInfo = "packinfo_extensions.txt";
- +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TEMPLATE_PACK_es);
- +    ParentID = gid_Module_Optional_Extensions;
+--- bin/install-mono 
++++ bin/install-mono 
+@@ -32,13 +32,13 @@
+ # to be found in PKG_CONFIG_PATH, though
+ mkdir -p $OODESTDIR${LIBDIRBASE}/pkgconfig/
+ sed -e "s|@OOOINSTALLDIRNAME@|$OOOINSTALLDIRNAME|g" \
+-    $SRCDIR/mono-ooo.pc.in >${OODESTDIR}${LIBDIRBASE}/pkgconfig/mono-$OOOINSTALLDIRNAME.pc
++    $TOOLSDIR/src/mono-ooo.pc.in >${OODESTDIR}${LIBDIRBASE}/pkgconfig/mono-$OOOINSTALLDIRNAME.pc
+ 
+ # extra dlls config files
+ for dll in cli_uno_bridge.dll ; do
+     sed -e "s|@LIBDIRBASE@|$LIBDIRBASE|g" \
+ 	-e "s|@OOOINSTALLDIRNAME@|$OOOINSTALLDIRNAME|g" \
+-	$SRCDIR/$dll.config.in > $OOINSTDIR/ure/lib/$dll.config
++	$TOOLSDIR/src/$dll.config.in > $OOINSTDIR/ure/lib/$dll.config
+     if test -n "$OODESTDIR" ; then
+ 	file_list=`grep "^$OOINSTBASE/ure/lib/$dll$" $OODESTDIR/gid* | head -n 1 | cut -d: -f1`
+ 	echo "$OOINSTBASE/ure/lib/$dll.config" >>$file_list
 
diff --git a/app-office/openoffice/openoffice-2.4.1.ebuild b/app-office/openoffice/openoffice-2.4.1.ebuild
deleted file mode 100644
index 6a25333a74ee..000000000000
--- a/app-office/openoffice/openoffice-2.4.1.ebuild
+++ /dev/null
@@ -1,396 +0,0 @@
-# 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.1.ebuild,v 1.9 2008/11/18 15:56:04 tove 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 opengl pam seamonkey xulrunner"
-
-MY_PV="2.4.1.8"
-PATCHLEVEL="OOH680"
-SRC="OOo_${PV}_src"
-MST="OOH680_m17"
-S="${WORKDIR}/ooo"
-S_OLD="${WORKDIR}/ooo-build-${MY_PV}"
-CONFFILE="${S}/distro-configs/Gentoo.conf.in"
-DESCRIPTION="OpenOffice.org, a full office productivity suite."
-
-SRC_URI="mirror://openoffice/stable/${PV}/${SRC}_core.tar.bz2
-	binfilter? ( mirror://openoffice/stable/${PV}/${SRC}_binfilter.tar.bz2 )
-	http://download.go-oo.org/${PATCHLEVEL}/ooo-build-${MY_PV}.tar.gz
-	odk? ( mirror://openoffice/stable/${PV}/${SRC}_sdk.tar.bz2
-		java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )
-	http://download.go-oo.org/SRC680/extras-2.tar.bz2
-	http://download.go-oo.org/SRC680/biblio.tar.bz2
-	http://download.go-oo.org/SRC680/lp_solve_5.5.0.10_source.tar.gz
-	http://download.go-oo.org/SRC680/libwps-0.1.2.tar.gz
-	http://download.go-oo.org/SRC680/libwpg-0.1.2.tar.gz
-	http://download.go-oo.org/SRC680/oox.2008-02-29.tar.bz2
-	http://download.go-oo.org/SRC680/writerfilter.2008-02-29.tar.bz2"
-
-LANGS1="af ar as_IN be_BY bg bn br bs ca cs cy da de dz el en_GB en_ZA eo es et fa fi fr ga gl gu_IN he hi_IN hr hu it ja km ko ku lt lv mk ml_IN mr_IN nb ne nl nn nr ns or_IN pa_IN pl pt pt_BR ru rw sh sk sl sr ss st sv sw_TZ ta_IN te_IN tg th ti_ER tn tr ts uk ur_IN ve vi xh zh_CN zh_TW zu"
-LANGS="${LANGS1} en en_US"
-
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-for Y in ${LANGS1} ; do
-	SRC_URI="${SRC_URI} linguas_${Y}? ( mirror://openoffice/stable/${PV}/${SRC}_l10n.tar.bz2 )"
-done
-
-HOMEPAGE="http://go-oo.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-
-COMMON_DEPEND="!app-office/openoffice-bin
-	x11-libs/libXaw
-	x11-libs/libXinerama
-	>=dev-lang/perl-5.0
-	dbus? ( >=dev-libs/dbus-glib-0.71 )
-	gnome? ( >=x11-libs/gtk+-2.10
-		>=gnome-base/gnome-vfs-2.6
-		>=gnome-base/gconf-2.0
-		>=x11-libs/cairo-1.0.2 )
-	gtk? ( >=x11-libs/gtk+-2.10
-		>=x11-libs/cairo-1.0.2 )
-	eds? ( >=gnome-extra/evolution-data-server-1.2 )
-	gstreamer? ( >=media-libs/gstreamer-0.10
-			>=media-libs/gst-plugins-base-0.10 )
-	kde? ( =kde-base/kdelibs-3* )
-	java? ( >=dev-java/bsh-2.0_beta4
-		>=dev-java/xalan-2.7
-		>=dev-java/xalan-serializer-2.7
-		>=dev-java/xerces-2.7
-		=dev-java/xml-commons-external-1.3*
-		>=dev-db/hsqldb-1.8.0.9
-		=dev-java/rhino-1.5* )
-	mono? ( >=dev-lang/mono-1.2.3.1 )
-	opengl? ( virtual/opengl
-		virtual/glu )
-	xulrunner? ( >=net-libs/xulrunner-1.8
-		>=dev-libs/nspr-4.6.6
-		>=dev-libs/nss-3.11-r1 )
-	!xulrunner? ( firefox? ( >=dev-libs/nspr-4.6.6
-		>=dev-libs/nss-3.11-r1 ) )
-	!xulrunner? ( !firefox? ( seamonkey? ( =www-client/seamonkey-1*
-		>=dev-libs/nspr-4.6.6
-		>=dev-libs/nss-3.11-r1 ) ) )
-	>=net-misc/neon-0.24.7
-	>=dev-libs/openssl-0.9.8g
-	>=x11-libs/startup-notification-0.5
-	>=media-libs/freetype-2.1.10-r2
-	>=media-libs/fontconfig-2.3.0
-	cups? ( net-print/cups )
-	media-libs/jpeg
-	media-libs/libpng
-	app-arch/zip
-	app-arch/unzip
-	>=app-text/hunspell-1.1.4-r1
-	>=app-admin/eselect-oodict-20060706
-	dev-libs/expat
-	>=dev-libs/icu-3.8
-	>=sys-libs/db-4.3
-	>=app-text/libwpd-0.8.8
-	>=media-libs/libsvg-0.1.4
-	>=media-libs/vigra-1.4
-	linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
-	linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 )
-	linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"
-
-RDEPEND="java? ( >=virtual/jre-1.4 )
-	!xulrunner? ( firefox? ( || ( =www-client/mozilla-firefox-2*
-		=www-client/mozilla-firefox-bin-2* ) ) )
-	${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libXrender
-	x11-proto/printproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xineramaproto
-	>=sys-apps/findutils-4.1.20-r1
-	dev-perl/Archive-Zip
-	virtual/perl-Compress-Zlib
-	>=virtual/perl-Compress-Raw-Zlib-2.002
-	virtual/perl-IO-Compress-Base
-	dev-util/pkgconfig
-	dev-util/intltool
-	>=dev-libs/boost-1.33.1
-	sys-devel/flex
-	sys-devel/bison
-	dev-libs/libxslt
-	>=dev-libs/libxml2-2.0
-	!xulrunner? ( firefox? ( =www-client/mozilla-firefox-2* ) )
-	>=dev-util/gperf-3
-	>=net-misc/curl-7.12
-	sys-libs/zlib
-	sys-apps/coreutils
-	media-gfx/imagemagick
-	pam? ( sys-libs/pam )
-	!dev-util/dmake
-	>=dev-lang/python-2.3.4
-	java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* )
-		dev-java/ant-core )
-	ldap? ( net-nds/openldap )"
-
-PROVIDE="virtual/ooo"
-
-pkg_setup() {
-
-	ewarn
-	ewarn " It is important to note that OpenOffice.org is a very fragile  "
-	ewarn " build when it comes to CFLAGS.  A number of flags have already "
-	ewarn " been filtered out.  If you experience difficulty merging this  "
-	ewarn " package and use agressive CFLAGS, lower the CFLAGS and try to  "
-	ewarn " merge again. Also note that building OOo takes a lot of time and "
-	ewarn " hardware ressources: 4-6 GB free diskspace and 256 MB RAM are "
-	ewarn " the minimum requirements. If you have less, use openoffice-bin "
-	ewarn " instead. "
-	ewarn
-
-	# Check if we have enough RAM and free diskspace to build this beast
-	CHECKREQS_MEMORY="512"
-	use debug && CHECKREQS_DISK_BUILD="8192" || CHECKREQS_DISK_BUILD="5120"
-	check_reqs
-
-	strip-linguas ${LANGS}
-
-	if [[ -z "${LINGUAS}" ]]; then
-		export LINGUAS_OOO="en-US"
-		ewarn
-		ewarn " To get a localized build, set the according LINGUAS variable(s). "
-		ewarn
-	else
-		export LINGUAS_OOO=`echo ${LINGUAS} | \
-			sed -e 's/\ben\b/en_US/g' -e 's/_/-/g'`
-	fi
-
-	if use !java; then
-		ewarn " You are building with java-support disabled, this results in some "
-		ewarn " of the OpenOffice.org functionality (i.e. help) being disabled. "
-		ewarn " If something you need does not work for you, rebuild with "
-		ewarn " java in your USE-flags. "
-		ewarn
-	fi
-
-	if is-flagq -ffast-math ; then
-		eerror " You are using -ffast-math, which is known to cause problems. "
-		eerror " Please remove it from your CFLAGS, using this globally causes "
-		eerror " all sorts of problems. "
-		eerror " After that you will also have to - at least - rebuild python otherwise "
-		eerror " the openoffice build will break. "
-		die
-	fi
-
-	if use pam; then
-		if ! built_with_use sys-apps/shadow pam; then
-			eerror " shadow needs to be built with pam-support. "
-			eerror " rebuild it accordingly or remove the pam use-flag "
-			die
-		fi
-	fi
-
-	if use xulrunner; then
-		if pkg-config --exists xulrunner-xpcom; then
-			XULR="xulrunner"
-		elif pkg-config --exists libxul; then
-			XULR="libxul"
-		else
-			die "USE flag [xulrunner] set but not found!"
-		fi
-	fi
-
-	# Check python
-	if ! built_with_use dev-lang/python threads
-	then
-	    eerror "Python needs to be built with threads."
-	    die
-	fi
-
-	java-pkg-opt-2_pkg_setup
-
-	# sys-libs/db version used
-	local db_ver="$(db_findver '>=sys-libs/db-4.3')"
-
-}
-
-src_unpack() {
-
-	unpack ooo-build-${MY_PV}.tar.gz
-
-	# Hackish workaround for overlong path problem, see bug #130837
-	mv "${S_OLD}" "${S}" || die
-
-	#Some fixes for our patchset
-	cd "${S}"
-	epatch "${FILESDIR}/gentoo-${PV}.diff"
-	epatch "${FILESDIR}/ooo-env_log.diff"
-
-	#Use flag checks
-	if use java ; then
-		echo "--with-ant-home=${ANT_HOME}" >> ${CONFFILE}
-		echo "--with-jdk-home=$(java-config --jdk-home 2>/dev/null)" >> ${CONFFILE}
-		echo "--with-java-target-version=$(java-pkg_get-target)" >> ${CONFFILE}
-		echo "--with-system-beanshell" >> ${CONFFILE}
-		echo "--with-system-xalan" >> ${CONFFILE}
-		echo "--with-system-xerces" >> ${CONFFILE}
-		echo "--with-system-xml-apis" >> ${CONFFILE}
-		echo "--with-system-hsqldb" >> ${CONFFILE}
-		echo "--with-system-rhino" >> ${CONFFILE}
-		echo "--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" >> ${CONFFILE}
-		echo "--with-serializer-jar=$(java-pkg_getjar xalan-serializer serializer.jar)" >> ${CONFFILE}
-		echo "--with-xalan-jar=$(java-pkg_getjar xalan xalan.jar)" >> ${CONFFILE}
-		echo "--with-xerces-jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)" >> ${CONFFILE}
-		echo "--with-xml-apis-jar=$(java-pkg_getjar xml-commons-external-1.3 xml-apis.jar)" >> ${CONFFILE}
-		echo "--with-hsqldb-jar=$(java-pkg_getjar hsqldb hsqldb.jar)" >> ${CONFFILE}
-		echo "--with-rhino-jar=$(java-pkg_getjar rhino-1.5 js.jar)" >> ${CONFFILE}
-	fi
-
-	if use firefox || use seamonkey || use xulrunner ; then
-		echo "--enable-mozilla" >> ${CONFFILE}
-		local browser
-		use seamonkey && browser="seamonkey"
-		use firefox && browser="firefox"
-		use xulrunner && browser="${XULR}"
-
-		echo "--with-system-mozilla=${browser}" >> ${CONFFILE}
-	else
-		echo "--disable-mozilla" >> ${CONFFILE}
-		echo "--without-system-mozilla" >> ${CONFFILE}
-	fi
-
-	echo "`use_enable binfilter`" >> ${CONFFILE}
-	echo "`use_enable cups`" >> ${CONFFILE}
-	echo "`use_enable dbus`" >> ${CONFFILE}
-	echo "`use_enable eds evolution2`" >> ${CONFFILE}
-	echo "`use_enable gnome gnome-vfs`" >> ${CONFFILE}
-	echo "`use_enable gnome lockdown`" >> ${CONFFILE}
-	echo "`use_enable gnome atkbridge`" >> ${CONFFILE}
-	echo "`use_enable gstreamer`" >> ${CONFFILE}
-	echo "`use_enable ldap`" >> ${CONFFILE}
-	echo "`use_enable opengl`" >> ${CONFFILE}
-	echo "`use_with ldap openldap`" >> ${CONFFILE}
-	echo "--enable-neon" >> ${CONFFILE}
-	echo "--with-system-neon" >> ${CONFFILE}
-	echo "--with-system-openssl" >> ${CONFFILE}
-
-	echo "`use_enable debug crashdump`" >> ${CONFFILE}
-
-	# Original branding results in black splash screens for some, so forcing ours
-	echo "--with-intro-bitmaps=\\\"${S}/src/openintro_gentoo.bmp\\\"" >> ${CONFFILE}
-
-	eautoreconf
-
-}
-
-src_compile() {
-
-	# Should the build use multiprocessing? Not enabled by default, as it tends to break
-	export JOBS="1"
-	if [[ "${WANT_MP}" == "true" ]]; then
-		export JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"`
-	fi
-
-	# Compile problems with these ...
-	filter-flags "-funroll-loops"
-	filter-flags "-fprefetch-loop-arrays"
-	filter-flags "-fno-default-inline"
-	filter-flags "-fstack-protector"
-	filter-flags "-fstack-protector-all"
-	filter-flags "-ftracer"
-	filter-flags "-fforce-addr"
-	filter-flags "-O[s2-9]"
-
-	# Build with NVidia cards breaks otherwise
-	use opengl && append-flags "-DGL_GLEXT_PROTOTYPES"
-
-	# Now for our optimization flags ...
-	export ARCH_FLAGS="${CXXFLAGS}"
-	use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
-
-	# Make sure gnome-users get gtk-support
-	local GTKFLAG="--disable-gtk --disable-cairo --without-system-cairo"
-	( use gtk || use gnome ) && GTKFLAG="--enable-gtk --enable-cairo --with-system-cairo"
-
-	cd "${S}"
-	./configure \
-		--with-distro="Gentoo" \
-		--with-arch="${ARCH}" \
-		--host="${CHOST}" \
-		--with-srcdir="${DISTDIR}" \
-		--with-lang="${LINGUAS_OOO}" \
-		--with-num-cpus="${JOBS}" \
-		--without-binsuffix \
-		--with-installed-ooo-dirname="openoffice" \
-		--with-tag="${MST}" \
-		${GTKFLAG} \
-		`use_enable mono` \
-		`use_enable kde` \
-		`use_enable pam` \
-		`use_enable !debug strip` \
-		`use_enable odk` \
-		`use_with java` \
-		--disable-access \
-		--disable-post-install-scripts \
-		--enable-hunspell \
-		--enable-openxml \
-		--with-system-hunspell \
-		--with-system-libwpd \
-		--with-system-libsvg \
-		--mandir=/usr/share/man \
-		--libdir=/usr/$(get_libdir) \
-		|| die "Configuration failed!"
-
-	einfo "Building OpenOffice.org..."
-	use kde && set-kdedir 3
-	make || die "Build failed"
-
-}
-
-src_install() {
-
-	export PYTHONPATH=""
-
-	einfo "Preparing Installation"
-	make DESTDIR="${D}" install || die "Installation failed!"
-
-	# Fix the permissions for security reasons
-	chown -R root:0 "${D}"
-
-	# record java libraries
-	use java && java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/program/classes/*.jar
-
-}
-
-pkg_postinst() {
-
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-
-	eselect oodict update --libdir $(get_libdir)
-
-	[[ -x /sbin/chpax ]] && [[ -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && chpax -zm /usr/$(get_libdir)/openoffice/program/soffice.bin
-
-	# Add available & useful jars to openoffice classpath
-	use java && /usr/$(get_libdir)/openoffice/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
-
-	elog " To start OpenOffice.org, run:"
-	elog
-	elog " $ ooffice"
-	elog
-	elog " Also, for individual components, you can use any of:"
-	elog
-	elog " oobase, oocalc, oodraw, oofromtemplate, ooimpress, oomath,"
-	elog " ooweb or oowriter"
-	elog
-	elog " Spell checking is now provided through our own myspell-ebuilds, "
-	elog " if you want to use it, please install the correct myspell package "
-	elog " according to your language needs. "
-
-}
diff --git a/app-office/openoffice/openoffice-3.0.0.ebuild b/app-office/openoffice/openoffice-3.0.0.ebuild
index c4c5da113405..287211a0e278 100644
--- a/app-office/openoffice/openoffice-3.0.0.ebuild
+++ b/app-office/openoffice/openoffice-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # 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-3.0.0.ebuild,v 1.18 2008/11/18 15:56:04 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild,v 1.19 2008/12/28 18:40:51 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -10,7 +10,7 @@ inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2
 
 IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam templates"
 
-MY_PV="3.0.0.3.5"
+MY_PV="3.0.0.3.6"
 PATCHLEVEL="OOO300"
 SRC="OOo_${PV}_src"
 MST="ooo300-m9"
@@ -48,7 +48,7 @@ SRC_URI="${DEVPATH}-artwork.tar.bz2
 	http://download.go-oo.org/SRC680/extras-3.tar.bz2
 	http://download.go-oo.org/SRC680/biblio.tar.bz2
 	http://download.go-oo.org/SRC680/lp_solve_5.5.0.12_source.tar.gz
-	http://download.go-oo.org/DEV300/scsolver.2008-10-07.tar.bz2
+	http://download.go-oo.org/DEV300/scsolver.2008-10-30.tar.bz2
 	http://download.go-oo.org/SRC680/libwps-0.1.2.tar.gz
 	http://download.go-oo.org/SRC680/libwpg-0.1.3.tar.gz"
 
@@ -87,7 +87,6 @@ COMMON_DEPEND="!app-office/openoffice-bin
 		virtual/glu )
 	>=net-misc/neon-0.24.7
 	>=dev-libs/openssl-0.9.8g
-	>=x11-libs/startup-notification-0.5
 	>=media-libs/freetype-2.1.10-r2
 	>=media-libs/fontconfig-2.3.0
 	cups? ( net-print/cups )
@@ -101,10 +100,7 @@ COMMON_DEPEND="!app-office/openoffice-bin
 	>=sys-libs/db-4.3
 	>=app-text/libwpd-0.8.8
 	>=media-libs/vigra-1.4
-	>=app-text/poppler-0.8.0
-	linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
-	linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 )
-	linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"
+	>=app-text/poppler-0.8.0"
 
 RDEPEND="java? ( >=virtual/jre-1.5 )
 	${COMMON_DEPEND}"
@@ -132,7 +128,6 @@ DEPEND="${COMMON_DEPEND}
 	>=net-misc/curl-7.12
 	sys-libs/zlib
 	sys-apps/coreutils
-	media-gfx/imagemagick
 	pam? ( sys-libs/pam )
 	!dev-util/dmake
 	>=dev-lang/python-2.3.4
@@ -266,6 +261,7 @@ src_unpack() {
 	epatch "${FILESDIR}/ooo-env_log.diff"
 	cp -f "${FILESDIR}/nojavanostax.diff" "${S}/patches/dev300" || die
 	cp -f "${FILESDIR}/hunspell-one-dir-nocrash.diff" "${S}/patches/dev300" || die
+	cp -f "${FILESDIR}/fixsandbox.diff" "${S}/patches/dev300" || die
 
 	#Use flag checks
 	if use java ; then
@@ -384,7 +380,7 @@ src_install() {
 	make DESTDIR="${D}" install || die "Installation failed!"
 
 	# Fix the permissions for security reasons
-	chown -R root:0 "${D}"
+#	chown -RP root:0 "${D}"
 
 	# record java libraries
 	use java && java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/basis3.0/program/classes/*.jar