Bump to 2.0.4_rc2, also add sound use-flag

Package-Manager: portage-2.1.2_pre1

4 files changed, 381 insertions, 1 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 363f8f3867d5..c1acf1410c99 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,15 @@
 # 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.255 2006/09/20 14:51:30 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.256 2006/09/22 16:39:32 suka Exp $
+
+*openoffice-2.0.4_rc2 (22 Sep 2006)
+
+  22 Sep 2006; Andreas Proschofsky <suka@gentoo.org>
+  -files/2.0.4_rc1/gentoo-2.0.4_rc1.diff,
+  +files/2.0.4_rc2/gentoo-2.0.4_rc2.diff,
+  -files/2.0.4_rc1/sfx2-docfile-newfilesave.diff,
+  -openoffice-2.0.4_rc1-r1.ebuild, +openoffice-2.0.4_rc2.ebuild:
+  Bump to 2.0.4_rc2, also add sound use-flag enable it if you need it ;)
 
   20 Sep 2006; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.0.4_rc1-r1.ebuild:
diff --git a/app-office/openoffice/files/2.0.4_rc2/gentoo-2.0.4_rc2.diff b/app-office/openoffice/files/2.0.4_rc2/gentoo-2.0.4_rc2.diff
new file mode 100644
index 000000000000..a64755cbb2d1
--- /dev/null
+++ b/app-office/openoffice/files/2.0.4_rc2/gentoo-2.0.4_rc2.diff
@@ -0,0 +1,22 @@
+--- bin/package-ooo 
++++ bin/package-ooo 
+@@ -57,6 +57,7 @@
+ #!/bin/sh
+ export OOO_EXTRA_ARG='$2'
++unset PYTHONPATH
+ $OOINSTBASE/program/ooqstart $3 "\$@"
+ EOT
+     chmod 755 $1
+ }
+--- bin/ooo-wrapper.in 
++++ bin/ooo-wrapper.in 
+@@ -92,6 +89,9 @@
+     print STDERR "\n\n --- Warning - OO.o will not work without a mounted /proc filesystem --- \n\n\n";
+ }
+ 
++# Clear PYTHONPATH, otherwise Python scripting does not work
++delete $ENV{'PYTHONPATH'};
++
+ # And here we go.
+ exec "$SystemInstallDir/program/$Binary", @ooo_argv
+ 
diff --git a/app-office/openoffice/files/digest-openoffice-2.0.4_rc2 b/app-office/openoffice/files/digest-openoffice-2.0.4_rc2
new file mode 100644
index 000000000000..bf6d67144056
--- /dev/null
+++ b/app-office/openoffice/files/digest-openoffice-2.0.4_rc2
@@ -0,0 +1,39 @@
+MD5 1948e39a68f12bfa0b7eb309c14d940c biblio.tar.bz2 6000
+RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6 biblio.tar.bz2 6000
+SHA256 c0410a80028c8c0a6c28f4727e89b632875a128c9fccc17102f18773f0ea620b biblio.tar.bz2 6000
+MD5 2aa6bb72a257abcd896014b08fa4e6f0 cli_types.dll 634880
+RMD160 2cba491d27cc349a3468127a93981396756c6fc8 cli_types.dll 634880
+SHA256 7316a75be649b5a1c09c953b6ac20aa1953afbddd82a454a864d4a1c70a5a3ca cli_types.dll 634880
+MD5 f06322e5157495c22ba77f310fa4a89b cli_types_bridgetest.dll 20480
+RMD160 ac4a4110cf21d5bc7d9797f651a84fa20627c03b cli_types_bridgetest.dll 20480
+SHA256 3e62533c0f9e337021d2396332438ad23ea0fd480aab849c50aab48ab40579bb cli_types_bridgetest.dll 20480
+MD5 733051ebeffae5232a2eb760162da020 extras-2.tar.bz2 94740
+RMD160 cba0fdebbbf84e6520af08d1cbb09363d36874bd extras-2.tar.bz2 94740
+SHA256 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863 extras-2.tar.bz2 94740
+MD5 4cc68d37ed3a3191bb78a14630e14c64 hunspell_UNO_1.1.tar.gz 13774
+RMD160 9c0c31220d63894c9060a05fd136083b0b017b94 hunspell_UNO_1.1.tar.gz 13774
+SHA256 9de07fbe97c9539bae9c76502474c76471ab173dac365e251ca3fc5281008149 hunspell_UNO_1.1.tar.gz 13774
+MD5 2ff7b4c52f9c3937ebe3002798fbc479 lp_solve_5.5.tar.gz 495452
+RMD160 4f54d0d2116998da5de38cf51505835a8fd6e412 lp_solve_5.5.tar.gz 495452
+SHA256 6f9946c08c8fc3c97f74b58db8a62eac74027a7e709d81ee968716f7386682f1 lp_solve_5.5.tar.gz 495452
+MD5 d737f3b71caf365c75eeae5b31d99bdb ood680-m4-binfilter.tar.bz2 16800760
+RMD160 a864e9929d0156330371bffcc37b77facfc906db ood680-m4-binfilter.tar.bz2 16800760
+SHA256 430d5d164e8f48ae600b130868586e5b50b7c4c98f3138b2333be9c4590388e4 ood680-m4-binfilter.tar.bz2 16800760
+MD5 78af5bdc68cb594d77365cf405a79864 ood680-m4-core.tar.bz2 121412930
+RMD160 5bcaaa997e1eb0a1e7e2335f8aaa4076a1f5ae13 ood680-m4-core.tar.bz2 121412930
+SHA256 e79b733e61990557d6bd05b3955c6f3a4e817d18aa767e8c54384875efd974d3 ood680-m4-core.tar.bz2 121412930
+MD5 3db28ac4efab118c57d3015361de62d0 ood680-m4-lang.tar.bz2 71589219
+RMD160 25e5208245ea87f00582113c6b05961e120843ae ood680-m4-lang.tar.bz2 71589219
+SHA256 5ba171ec5b49b04505ce71b2a734d94166262fcfd0594f9dd070681ce7d84522 ood680-m4-lang.tar.bz2 71589219
+MD5 ba224f69a027211742517f784bcb7ad4 ood680-m4-system.tar.bz2 28791586
+RMD160 b78b0f0c236d6135aef06e9ae75e6bf7139feca4 ood680-m4-system.tar.bz2 28791586
+SHA256 fb19326a3843d7a493440d53dc7b6153d4286354a5c30ccc4d4881f4547923df ood680-m4-system.tar.bz2 28791586
+MD5 400590f308afd5189bfceaca9eb75878 ooo-build-ood680-m4.tar.gz 4349611
+RMD160 7c21d2df4cd08542e12f0b98bbce3403f37b5cbf ooo-build-ood680-m4.tar.gz 4349611
+SHA256 668c654b7d73a44d19c6529b6cdc5b6a8f3dcdad0fdee4a56dbef56c43a2214d ooo-build-ood680-m4.tar.gz 4349611
+MD5 e3a0b76dcd876f3d721ee7183729153d unowinreg.dll 6144
+RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 unowinreg.dll 6144
+SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c unowinreg.dll 6144
+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.4_rc2.ebuild b/app-office/openoffice/openoffice-2.0.4_rc2.ebuild
new file mode 100644
index 000000000000..c81198c5fce6
--- /dev/null
+++ b/app-office/openoffice/openoffice-2.0.4_rc2.ebuild
@@ -0,0 +1,310 @@
+# 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.4_rc2.ebuild,v 1.1 2006/09/22 16:39:32 suka Exp $
+
+inherit check-reqs debug eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib toolchain-funcs
+
+IUSE="binfilter branding cairo cups dbus eds firefox gnome gstreamer gtk kde ldap mono sound odk pam webdav"
+
+MY_PV="${PV}"
+PATCHLEVEL="OOD680"
+SRC="ood680-m4"
+S="${WORKDIR}/ooo"
+S_OLD="${WORKDIR}/ooo-build-${SRC}"
+CONFFILE="${S}/distro-configs/Gentoo.conf.in"
+DESCRIPTION="OpenOffice.org, a full office productivity suite."
+
+SRC_URI="http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-core.tar.bz2
+	http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-system.tar.bz2
+	http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-lang.tar.bz2
+	binfilter? ( http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-binfilter.tar.bz2 )
+	http://go-oo.org/packages/${PATCHLEVEL}/ooo-build-${SRC}.tar.gz
+	mono? ( http://go-oo.org/packages/SRC680/cli_types.dll
+		http://go-oo.org/packages/SRC680/cli_types_bridgetest.dll )
+	http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
+	http://go-oo.org/packages/SRC680/extras-2.tar.bz2
+	http://go-oo.org/packages/SRC680/biblio.tar.bz2
+	http://go-oo.org/packages/SRC680/hunspell_UNO_1.1.tar.gz
+	http://go-oo.org/packages/xt/xt-20051206-src-only.zip
+	http://go-oo.org/packages/SRC680/lp_solve_5.5.tar.gz"
+
+LANGS="af ar be_BY bg bn bs ca cs cy da de el en en_GB en_US en_ZA es et fa fi fr gu_IN he hi_IN hr hu it ja km ko lt mk nb nl nn nr ns pa_IN pl pt pt_BR ru rw sh_YU sk sl sr_CS st sv sw_TZ th tn tr ts vi xh zh_CN zh_TW zu"
+
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+HOMEPAGE="http://go-oo.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="!app-office/openoffice-bin
+	x11-libs/libXaw
+	x11-libs/libXinerama
+	virtual/libc
+	>=dev-lang/perl-5.0
+	dbus? ( >=sys-apps/dbus-0.60 )
+	gnome? ( >=x11-libs/gtk+-2.4
+		>=gnome-base/gnome-vfs-2.6
+		>=gnome-base/gconf-2.0 )
+	gtk? ( >=x11-libs/gtk+-2.4 )
+	cairo? ( >=x11-libs/cairo-1.0.2
+		>=x11-libs/gtk+-2.8 )
+	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.2 )
+	firefox? ( >=www-client/mozilla-firefox-1.5-r9
+		>=dev-libs/nspr-4.6.2
+		>=dev-libs/nss-3.11-r1 )
+	sound? ( =media-libs/portaudio-18*
+			>=media-libs/libsndfile-1.0.9 )
+	webdav? ( >=net-misc/neon-0.24.7 )
+	>=x11-libs/startup-notification-0.5
+	>=media-libs/freetype-2.1.10-r2
+	>=media-libs/fontconfig-2.2.0
+	cups? ( net-print/cups )
+	media-libs/libpng
+	sys-devel/flex
+	sys-devel/bison
+	app-arch/zip
+	app-arch/unzip
+	>=app-text/hunspell-1.1.4-r1
+	dev-libs/expat
+	java? ( || ( =virtual/jdk-1.4* =virtual/jdk-1.5* )  )
+	>=dev-libs/boost-1.33.1
+	>=dev-libs/icu-3.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 )"
+
+DEPEND="${RDEPEND}
+	x11-libs/libXrender
+	x11-proto/printproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/xineramaproto
+	>=sys-apps/findutils-4.1.20-r1
+	>=sys-devel/gcc-3.2.1
+	dev-perl/Archive-Zip
+	dev-perl/Compress-Zlib
+	dev-util/pkgconfig
+	dev-util/intltool
+	>=net-misc/curl-7.9.8
+	sys-libs/zlib
+	sys-apps/coreutils
+	pam? ( sys-libs/pam )
+	!dev-util/dmake
+	>=dev-lang/python-2.3.4
+	>=app-admin/eselect-oodict-20060706
+	java? ( || ( =virtual/jre-1.4* =virtual/jre-1.5* )
+		dev-java/ant-core )
+	dev-libs/libxslt
+	ldap? ( net-nds/openldap )
+	mono? ( >=dev-lang/mono-1.1.6 )
+	>=dev-libs/libxml2-2.0"
+
+PROVIDE="virtual/ooo"
+
+# FIXME executable stacks should be addressed upstream!
+QA_EXECSTACK_x86="usr/lib/openoffice/program/libgcc3_uno.so"
+
+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="256"
+	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
+
+	java-pkg-opt-2_pkg_setup
+
+}
+
+src_unpack() {
+
+	unpack ooo-build-${SRC}.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}/${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}
+	use branding && echo "--with-intro-bitmaps=\\\"${S}/src/openintro_gentoo.bmp\\\"" >> ${CONFFILE}
+	use amd64 && echo "--with-system-boost" >> ${CONFFILE}
+
+	echo "`use_enable binfilter`" >> ${CONFFILE}
+
+	echo "`use_enable firefox mozilla`" >> ${CONFFILE}
+	echo "`use_with firefox system-mozilla`" >> ${CONFFILE}
+	echo "`use_with firefox`" >> ${CONFFILE}
+
+	echo "`use_enable ldap`" >> ${CONFFILE}
+	echo "`use_with ldap openldap`" >> ${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 dbus`" >> ${CONFFILE}
+	echo "`use_enable webdav neon`" >> ${CONFFILE}
+	echo "`use_with webdav system-neon`" >> ${CONFFILE}
+
+	echo "`use_enable sound pasf`" >> ${CONFFILE}
+	echo "`use_with sound system-portaudio`" >> ${CONFFILE}
+	echo "`use_with sound system-sndfile`" >> ${CONFFILE}
+
+	echo "`use_enable odk`" >> ${CONFFILE}
+	echo "`use_enable debug crashdump`" >> ${CONFFILE}
+
+	echo "--with-system-icu" >> ${CONFFILE}
+
+}
+
+src_compile() {
+
+	unset LIBC
+	addpredict "/bin"
+	addpredict "/root/.gconfd"
+	addpredict "/root/.gnome"
+
+	# 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"
+	replace-flags "-O?" "-O2"
+
+	use ppc && append-flags "-D_STLP_STRICT_ANSI"
+
+	# Now for our optimization flags ...
+	export ARCH_FLAGS="${CXXFLAGS}"
+	use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
+
+	# Make sure gnome-users get gtk-support
+	export GTKFLAG="`use_enable gtk`" && use gnome && GTKFLAG="--enable-gtk"
+
+	cd ${S}
+	autoconf || die
+	./configure ${MYCONF} \
+		--with-distro="Gentoo" \
+		--with-arch="${ARCH}" \
+		--with-srcdir="${DISTDIR}" \
+		--with-lang="${LINGUAS_OOO}" \
+		--with-num-cpus="${JOBS}" \
+		--with-binsuffix="2" \
+		--with-installed-ooo-dirname="openoffice" \
+		--with-tag=${SRC} \
+		"${GTKFLAG}" \
+		`use_enable kde` \
+		`use_enable cairo` \
+		`use_with cairo system-cairo` \
+		`use_enable gnome quickstart` \
+		`use_enable mono` \
+		`use_enable pam` \
+		`use_enable !debug strip` \
+		--disable-access \
+		--disable-post-install-scripts \
+		--enable-hunspell \
+		--with-system-hunspell \
+		--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() {
+
+	einfo "Preparing Installation"
+	make DESTDIR=${D} install || die "Installation failed!"
+
+	# Install corrected Symbol Font
+	insinto /usr/share/fonts/TTF/
+	doins fonts/*.ttf
+
+	# Fix the permissions for security reasons
+	chown -R root:root ${D} || die
+
+}
+
+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
+
+	einfo " To start OpenOffice.org, run:"
+	einfo
+	einfo " $ ooffice2"
+	einfo
+	einfo " Also, for individual components, you can use any of:"
+	einfo
+	einfo " oobase2, oocalc2, oodraw2, oofromtemplate2, ooimpress2, oomath2,"
+	einfo " ooweb2 or oowriter2"
+	einfo
+	einfo " Spell checking is now provided through our own myspell-ebuilds, "
+	einfo " if you want to use it, please install the correct myspell package "
+	einfo " according to your language needs. "
+
+}