diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2010-04-18 13:28:44 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2010-04-18 13:28:44 +0000 |
| commit | 169e209f379a2074404adbd4a1530fc8fc29ac7b (patch) | |
| tree | 393e3ec8b0044d0930bc7193bef27c3e8b9b91bf /app-office | |
| parent | Improve Python support. (diff) | |
| download | gentoo-2-169e209f379a2074404adbd4a1530fc8fc29ac7b.tar.gz gentoo-2-169e209f379a2074404adbd4a1530fc8fc29ac7b.tar.bz2 gentoo-2-169e209f379a2074404adbd4a1530fc8fc29ac7b.zip | |
Patchset bump to ooo-build-3.2.0.10, also fix upstream tarball mess-up
(Portage version: 2.2_rc67/cvs/Linux i686)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice/files/gentoo-3.2.0.diff | 20 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-3.2.0.ebuild | 6 |
3 files changed, 28 insertions, 4 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 2d4746a97dd2..5f4fa940de52 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,10 @@ # 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.526 2010/04/17 23:52:48 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.527 2010/04/18 13:28:43 suka Exp $ + + 18 Apr 2010; Andreas Proschofsky <suka@gentoo.org> + openoffice-3.2.0.ebuild, files/gentoo-3.2.0.diff: + Patchset bump to ooo-build-3.2.0.10, also fix upstream tarball mess-up 17 Apr 2010; Joseph Jezak <josejx@gentoo.org> openoffice-3.2.0.ebuild: Marked ppc stable for bug #305195. diff --git a/app-office/openoffice/files/gentoo-3.2.0.diff b/app-office/openoffice/files/gentoo-3.2.0.diff index 864400705d9a..1b00c342e834 100644 --- a/app-office/openoffice/files/gentoo-3.2.0.diff +++ b/app-office/openoffice/files/gentoo-3.2.0.diff @@ -9,6 +9,15 @@ # support server-only versions of 64bit JDKs 64bit-jdk-server-paths.diff, i#65974, hmth # use IBM j9vm over IBM classic JVM +@@ -2932,7 +2932,7 @@ + l10n-build-only-selected-langs.diff, i#106185, pmladek + + [ LocalizeFixes < ooo320-m13 ] +-i109407_BUSCAR.diff ++#i109407_BUSCAR.diff + + [ PieceBits ] + # zipintro is not kind to us ... @@ -3561,7 +3561,6 @@ [ BuildBits ] # Allow oowintool to detect java sdk 1.6.x @@ -44,4 +53,15 @@ AC_MSG_RESULT([$SUNTEMPLATES_LANG]) fi AC_SUBST(SUNTEMPLATES_LANG) +--- bin/setup.in ++++ bin/setup.in +@@ -268,7 +268,7 @@ + OOO_TARBALL="${UPSTREAM_NAME}_core.tar.bz2" + OOO_SYSTEM_TARBALL="${UPSTREAM_NAME}_system.tar.bz2" + OOO_BINFILTER_TARBALL="${UPSTREAM_NAME}_binfilter.tar.bz2" +- OOO_LANG_TARBALL="${UPSTREAM_NAME}_l10n.tar.bz2" ++ OOO_LANG_TARBALL="${UPSTREAM_NAME}_l10n-fixed.tar.bz2" + OOO_EXTENSIONS_TARBALL="${UPSTREAM_NAME}_extensions.tar.bz2" + else + OOO_TARBALL="$CVSTAG-core.tar.bz2" diff --git a/app-office/openoffice/openoffice-3.2.0.ebuild b/app-office/openoffice/openoffice-3.2.0.ebuild index 226d531c095d..11d75e68859f 100644 --- a/app-office/openoffice/openoffice-3.2.0.ebuild +++ b/app-office/openoffice/openoffice-3.2.0.ebuild @@ -1,6 +1,6 @@ # 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.20 2010/04/17 23:52:48 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.21 2010/04/18 13:28:43 suka Exp $ WANT_AUTOMAKE="1.9" EAPI="2" @@ -11,7 +11,7 @@ inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag-o-matic IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam templates" -MY_PV=3.2.0.7 +MY_PV=3.2.0.10 PATCHLEVEL=OOO320 SRC=OOo_${PV}_src MST=OOO320_m12 @@ -24,9 +24,9 @@ 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 + mirror://gentoo/OOo_3.2.0_src_l10n-fixed.tar.bz2 binfilter? ( ${DEVPATH}_binfilter.tar.bz2 ) templates? ( http://extensions.services.openoffice.org/files/273/0/Sun_ODF_Template_Pack_en-US.oxt http://extensions.services.openoffice.org/files/295/1/Sun_ODF_Template_Pack_de.oxt |