Bump to OpenOffice.org 3.2.0, remove templates integration for now,

breaks the build for me
(Portage version: 2.2_rc63/cvs/Linux i686)

3 files changed, 429 insertions, 1 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 4011e43320a5..2ca94cde1dcb 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/openoffice
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.506 2010/02/10 21:10:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.507 2010/02/20 17:46:28 suka Exp $
+
+*openoffice-3.2.0 (20 Feb 2010)
+
+  20 Feb 2010; Andreas Proschofsky <suka@gentoo.org>
+  +openoffice-3.2.0.ebuild, +files/gentoo-3.2.0.diff:
+  Bump to OpenOffice.org 3.2.0, remove templates integration for now, breaks
+  the build for me
 
   10 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
   openoffice-3.1.1.ebuild:
diff --git a/app-office/openoffice/files/gentoo-3.2.0.diff b/app-office/openoffice/files/gentoo-3.2.0.diff
new file mode 100644
index 000000000000..6abd7731d06b
--- /dev/null
+++ b/app-office/openoffice/files/gentoo-3.2.0.diff
@@ -0,0 +1,18 @@
+--- patches/dev300/apply 
++++ patches/dev300/apply
+@@ -1596,7 +1596,7 @@
+ SectionOwner => aprosky
+ 
+ # Allow build to proceed with PaX enabled
+-gentoo-pax-fix.diff, aprosky
++#gentoo-pax-fix.diff, aprosky
+ # support server-only versions of 64bit JDKs
+ 64bit-jdk-server-paths.diff, i#65974, hmth
+ # use IBM j9vm over IBM classic JVM
+@@ -3550,4 +3550,4 @@
+ [ BuildBits ]
+ # Allow oowintool to detect java sdk 1.6.x
+ oowintool-java6.diff, fridrich
+-connectivity-build-fix-mac.diff, thorsten
++#connectivity-build-fix-mac.diff, thorsten
+
diff --git a/app-office/openoffice/openoffice-3.2.0.ebuild b/app-office/openoffice/openoffice-3.2.0.ebuild
new file mode 100644
index 000000000000..fa9e602896d8
--- /dev/null
+++ b/app-office/openoffice/openoffice-3.2.0.ebuild
@@ -0,0 +1,403 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.1 2010/02/20 17:46:28 suka Exp $
+
+WANT_AUTOMAKE="1.9"
+EAPI="2"
+KDE_REQUIRED="optional"
+CMAKE_REQUIRED="false"
+
+inherit bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde4-base mono multilib toolchain-funcs
+
+IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam"
+
+MY_PV=3.2.0.5
+PATCHLEVEL=OOO320
+SRC=OOo_${PV}_src
+MST=OOO320_m12
+DEVPATH=http://download.services.openoffice.org/files/stable/${PV}/${SRC}
+S=${WORKDIR}/ooo
+S_OLD=${WORKDIR}/ooo-build-${MY_PV}
+CONFFILE=${S}/distro-configs/Gentoo.conf.in
+BASIS=basis3.2
+DESCRIPTION="OpenOffice.org, a full office productivity suite."
+
+SRC_URI="${DEVPATH}_core.tar.bz2
+	${DEVPATH}_extensions.tar.bz2
+	${DEVPATH}_l10n.tar.bz2
+	${DEVPATH}_system.tar.bz2
+	${DEVPATH}_testautomation.tar.bz2
+	binfilter? ( ${DEVPATH}_binfilter.tar.bz2 )
+	http://download.go-oo.org/${PATCHLEVEL}/ooo-build-${MY_PV}.tar.gz
+	odk? ( java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )
+	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-30.tar.bz2
+	http://download.go-oo.org/DEV300/ooo_oxygen_images-2009-06-17.tar.gz
+	http://download.go-oo.org/SRC680/libwps-0.1.2.tar.gz"
+
+LANGS1="af ar as_IN be_BY bg bn br brx bs ca cs cy da de dgo dz el en en_GB en_ZA eo es et eu fa fi fr ga gl gu he hi_IN hr hu id it ja ka kk km kn_IN ko kok ks ku lt mai mk ml_IN mn mni mr_IN nb ne nl nn nr ns oc or_IN pa_IN pl pt pt_BR ru rw sa_IN sat sd sh sk sl sr ss st sv sw_TZ ta ta_IN te_IN tg th ti_ER tn tr ts uk ur_IN uz ve vi xh zh_CN zh_TW zu"
+LANGS="${LANGS1} en en_US"
+
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+# intersection of available linguas and app-dicts/myspell-* dictionaries
+SPELL_DIRS="af bg ca cs cy da de el en eo es et fr ga gl he hr hu it ku lt mk nb nl nn pl pt ru sk sl sv tn zu"
+SPELL_DIRS_DEPEND=""
+for X in ${SPELL_DIRS} ; do
+	SPELL_DIRS_DEPEND="${SPELL_DIRS_DEPEND} linguas_${X}? ( app-dicts/myspell-${X} )"
+done
+
+HOMEPAGE="http://go-oo.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~sparc"
+
+COMMON_DEPEND="!app-office/openoffice-bin
+	x11-libs/libXaw
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	>=dev-lang/perl-5.0
+	>=dev-libs/glib-2.18
+	dbus? ( >=dev-libs/dbus-glib-0.71 )
+	gnome? ( >=x11-libs/gtk+-2.10
+		>=gnome-base/gconf-2.0
+		>=gnome-base/gnome-vfs-2.6
+		>=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 )
+	java? ( >=dev-java/bsh-2.0_beta4
+		>=dev-db/hsqldb-1.8.0.9
+		dev-java/lucene:2.3
+		dev-java/lucene-analyzers:2.3
+		dev-java/rhino:1.5 )
+	mono? ( || ( >dev-lang/mono-2.4-r1 <dev-lang/mono-2.4 ) )
+	nsplugin? ( || ( net-libs/xulrunner:1.9 net-libs/xulrunner:1.8 )
+		>=dev-libs/nspr-4.6.6
+		>=dev-libs/nss-3.11-r1 )
+	opengl? ( virtual/opengl
+		virtual/glu )
+	>=net-misc/neon-0.24.7
+	>=dev-libs/openssl-0.9.8g
+	>=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
+	dev-libs/expat
+	>=dev-libs/icu-4.0
+	>=sys-libs/db-4.3
+	>=app-text/libwpd-0.8.8
+	>=dev-libs/redland-1.0.8
+	>=media-libs/vigra-1.4
+	>=app-text/poppler-0.12.3-r3
+	>=media-libs/libwpg-0.1.3"
+
+RDEPEND="java? ( >=virtual/jre-1.5 )
+	${SPELL_DIRS_DEPEND}
+	${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-proto/printproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/xineramaproto
+	>=sys-apps/findutils-4.1.20-r1
+	dev-perl/Archive-Zip
+	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
+	>=dev-util/gperf-3
+	>=net-misc/curl-7.12
+	sys-libs/zlib
+	sys-apps/coreutils
+	pam? ( sys-libs/pam
+		sys-apps/shadow[pam] )
+	>=dev-lang/python-2.3.4[threads]
+	java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* )
+		>=dev-java/ant-core-1.7 )
+	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. "
+	ewarn
+	ewarn " Also if you experience a build break, please make sure to retry "
+	ewarn " with MAKEOPTS="-j1" before filing a bug. "
+	ewarn
+
+	# Check if we have enough RAM and free diskspace to build this beast
+	CHECKREQS_MEMORY="512"
+	use debug && CHECKREQS_DISK_BUILD="12288" || CHECKREQS_DISK_BUILD="6144"
+	check_reqs
+
+	strip-linguas ${LANGS}
+
+	if [ -z "${LINGUAS}" ] || [[ "${LINGUAS}" == en ]]; then
+		export LINGUAS_OOO=""
+	elif [[ ${LINGUAS} =~ en([^_]|$) ]]; then
+		export LINGUAS_OOO="$(echo ${LINGUAS} | sed -e 's/\ben\b/en_US/;s/_/-/g')"
+	# case: en-US lingua not set, add
+	else
+		export LINGUAS_OOO="en-US ${LINGUAS//_/-}"
+	fi
+
+	if use !java; then
+		ewarn " You are building with java-support disabled, this results in some "
+		ewarn " of the OpenOffice.org functionality being disabled. "
+		ewarn " If something you need does not work for you, rebuild with "
+		ewarn " java in your USE-flags. "
+		ewarn
+	fi
+
+	if use !gtk && use !gnome; then
+		ewarn " If you want the OpenOffice.org systray quickstarter to work "
+		ewarn " activate either the 'gtk' or 'gnome' 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 nsplugin; then
+		if pkg-config --exists libxul; then
+			BRWS="libxul"
+		elif pkg-config --exists xulrunner-xpcom; then
+			BRWS="xulrunner"
+		else
+			die "USE flag [nsplugin] set but no installed xulrunner found!"
+		fi
+	fi
+
+	java-pkg-opt-2_pkg_setup
+
+	# sys-libs/db version used
+	local db_ver=$(db_findver '>=sys-libs/db-4.3')
+
+	kde4-base_pkg_setup
+
+}
+
+src_unpack() {
+
+	unpack ooo-build-${MY_PV}.tar.gz
+
+}
+
+src_prepare() {
+
+	# 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}/gentoo-pythonpath.diff"
+	epatch "${FILESDIR}/ooo-env_log.diff"
+	cp -f "${FILESDIR}/boost-undefined-references.diff" "${S}/patches/hotfixes" || die
+
+	#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-jvm-path=/usr/$(get_libdir)/" >> ${CONFFILE}
+		echo "--with-system-beanshell" >> ${CONFFILE}
+		echo "--with-system-hsqldb" >> ${CONFFILE}
+		echo "--with-system-lucene" >> ${CONFFILE}
+		echo "--with-system-rhino" >> ${CONFFILE}
+		echo "--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" >> ${CONFFILE}
+		echo "--with-hsqldb-jar=$(java-pkg_getjar hsqldb hsqldb.jar)" >> ${CONFFILE}
+		echo "--with-lucene-core-jar=$(java-pkg_getjar lucene-2.3 lucene-core.jar)" >> ${CONFFILE}
+		echo "--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)" >> ${CONFFILE}
+		echo "--with-rhino-jar=$(java-pkg_getjar rhino-1.5 js.jar)" >> ${CONFFILE}
+	fi
+
+	if use nsplugin ; then
+		echo "--enable-mozilla" >> ${CONFFILE}
+		echo "--with-system-mozilla=${BRWS}" >> ${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 gconf) >> ${CONFFILE}
+	echo $(use_enable gnome gnome-vfs) >> ${CONFFILE}
+	#gio support still gives crashes, see i#108993
+	echo "--disable-gio" >> ${CONFFILE}
+	echo $(use_enable gnome lockdown) >> ${CONFFILE}
+	echo $(use_enable gstreamer) >> ${CONFFILE}
+	echo $(use_enable gtk systray) >> ${CONFFILE}
+	echo $(use_enable ldap) >> ${CONFFILE}
+	echo $(use_enable opengl) >> ${CONFFILE}
+	echo $(use_with ldap openldap) >> ${CONFFILE}
+	echo $(use_enable debug crashdump) >> ${CONFFILE}
+	echo $(use_enable debug strip-solver) >> ${CONFFILE}
+
+	# Extension stuff
+	echo "--with-extension-integration" >> ${CONFFILE}
+	echo "--enable-minimizer" >> ${CONFFILE}
+	echo "--enable-pdfimport" >> ${CONFFILE}
+	echo "--enable-presenter-console" >> ${CONFFILE}
+
+	echo "--without-writer2latex" >> ${CONFFILE}
+
+	# Use splash screen without Sun logo
+	echo "--with-intro-bitmaps=\\\"${S}/build/${MST}/ooo_custom_images/nologo/introabout/intro.bmp\\\"" >> ${CONFFILE}
+
+	# Upstream this
+	echo "--with-system-redland" >> ${CONFFILE}
+
+}
+
+src_configure() {
+
+	use kde && export KDE4DIR="${KDEDIR}"
+
+	# Use multiprocessing by default now, it gets tested by upstream
+	export JOBS=$(echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/")
+
+	# Compile problems with these ...
+	filter-flags "-funroll-loops"
+	filter-flags "-fprefetch-loop-arrays"
+	filter-flags "-fno-default-inline"
+	filter-flags "-ftracer"
+	filter-flags "-fforce-addr"
+
+	filter-flags "-O[s2-9]"
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		filter-flags "-fstack-protector"
+		filter-flags "-fstack-protector-all"
+		replace-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer"
+	fi
+
+	# 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}" \
+		--with-srcdir="${DISTDIR}" \
+		--with-lang="${LINGUAS_OOO}" \
+		--with-num-cpus="${JOBS}" \
+		--without-binsuffix \
+		--with-installed-ooo-dirname="openoffice" \
+		--with-tag="${MST}" \
+		--with-drink="True Blood" \
+		--without-git \
+		--without-split \
+		${GTKFLAG} \
+		$(use_enable mono) \
+		--disable-kde \
+		$(use_enable kde kde4) \
+		$(use_enable !debug strip) \
+		$(use_enable odk) \
+		$(use_enable pam) \
+		$(use_with java) \
+		--disable-sun-templates \
+		--disable-access \
+		--disable-post-install-scripts \
+		--enable-extensions \
+		--with-system-libwpd \
+		--with-system-libwpg \
+		--mandir=/usr/share/man \
+		--libdir=/usr/$(get_libdir) \
+		|| die "Configuration failed!"
+
+}
+
+src_compile() {
+
+	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 -RP root:0 "${D}"
+
+	# record java libraries
+	if use java; then
+			java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/${BASIS}/program/classes/*.jar
+			java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/ure/share/java/*.jar
+	fi
+
+	# Upstream places the bash-completion module in /etc. Gentoo places them in
+	# /usr/share/bash-completion. bug 226061
+	dobashcompletion "${D}"/etc/bash_completion.d/ooffice.sh ooffice
+	rm -rf "${D}"/etc/bash_completion.d/ || die "rm failed"
+
+}
+
+pkg_postinst() {
+
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	BASH_COMPLETION_NAME=ooffice && bash-completion_pkg_postinst
+
+	( [[ -x /sbin/chpax ]] || [[ -x /sbin/paxctl ]] ) && [[ -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && scanelf -Xzm /usr/$(get_libdir)/openoffice/program/soffice.bin
+
+	# Add available & useful jars to openoffice classpath
+	use java && /usr/$(get_libdir)/openoffice/${BASIS}/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
+
+	elog " Some aditional functionality can be installed via Extension Manager: "
+	elog " *) PDF Import "
+	elog " *) Presentation Console "
+	elog " *) Presentation Minimizer "
+	elog
+	elog " Please use the packages provided in "
+	elog " /usr/$(get_libdir)/openoffice/share/extension/install/ "
+	elog " instead of those from the SUN extension site. "
+	elog
+
+	kde4-base_pkg_postinst
+
+}