diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2010-06-14 11:52:45 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2010-06-14 11:52:45 +0000 |
| commit | ee1e9ec6ace743f0844df183a3411dbb7868176c (patch) | |
| tree | 6cfb96f5751a1bc9814d82b6fe13745d5b6cb4bb /app-office | |
| parent | Bump to OpenOffice 3.2.1 (diff) | |
| download | gentoo-2-ee1e9ec6ace743f0844df183a3411dbb7868176c.tar.gz gentoo-2-ee1e9ec6ace743f0844df183a3411dbb7868176c.tar.bz2 gentoo-2-ee1e9ec6ace743f0844df183a3411dbb7868176c.zip | |
Bump to OpenOffice.org 3.2.1
(Portage version: 2.2_rc67/cvs/Linux i686)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 9 | ||||
| -rw-r--r-- | app-office/openoffice/files/gentoo-3.2.1.diff (renamed from app-office/openoffice/files/gentoo-3.2.1_rc1.diff) | 9 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-3.2.1.ebuild (renamed from app-office/openoffice/openoffice-3.2.1_rc1.ebuild) | 11 |
3 files changed, 13 insertions, 16 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 6ebf0af727c7..a3e9af846e16 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.534 2010/05/25 16:42:48 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.535 2010/06/14 11:52:45 suka Exp $ + +*openoffice-3.2.1 (14 Jun 2010) + + 14 Jun 2010; Andreas Proschofsky <suka@gentoo.org> + -openoffice-3.2.1_rc1.ebuild, +openoffice-3.2.1.ebuild, + -files/gentoo-3.2.1_rc1.diff, +files/gentoo-3.2.1.diff: + Bump to OpenOffice.org 3.2.1 25 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> openoffice-3.2.0.ebuild, openoffice-3.2.1_rc1.ebuild: diff --git a/app-office/openoffice/files/gentoo-3.2.1_rc1.diff b/app-office/openoffice/files/gentoo-3.2.1.diff index 0bdfde41f361..a7e0dc961d82 100644 --- a/app-office/openoffice/files/gentoo-3.2.1_rc1.diff +++ b/app-office/openoffice/files/gentoo-3.2.1.diff @@ -42,13 +42,4 @@ AC_MSG_RESULT([$SUNTEMPLATES_LANG]) fi AC_SUBST(SUNTEMPLATES_LANG) -@@ -1584,7 +1584,7 @@ - elif test "$with_tag" = "OOO320_m8" ; then - UPSTREAM_VERSION=3.2.0 - elif test "$with_tag" = "OOO320_m17" ; then -- UPSTREAM_VERSION=3.2.1 -+ UPSTREAM_VERSION=3.2.1rc1_20100506 - fi - if test -n "$UPSTREAM_VERSION"; then - UPSTREAM_NAME="OOo_${UPSTREAM_VERSION}_src" diff --git a/app-office/openoffice/openoffice-3.2.1_rc1.ebuild b/app-office/openoffice/openoffice-3.2.1.ebuild index 5ece3fe26915..c2ada8b374f5 100644 --- a/app-office/openoffice/openoffice-3.2.1_rc1.ebuild +++ b/app-office/openoffice/openoffice-3.2.1.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.1_rc1.ebuild,v 1.2 2010/05/25 16:42:48 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.1.ebuild,v 1.1 2010/06/14 11:52:45 suka Exp $ WANT_AUTOMAKE="1.9" EAPI="2" @@ -13,11 +13,11 @@ 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 nsplugin odk opengl pam templates" -MY_PV=3.2.1.1 +MY_PV=3.2.1.3 PATCHLEVEL=OOO320 -SRC=OOo_${PV/_/}_20100506_src -MST=OOO320_m17 -DEVPATH=http://download.services.openoffice.org/files/extended/${PV/_/}/${SRC} +SRC=OOo_${PV}_src +MST=OOO320_m19 +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 @@ -27,7 +27,6 @@ DESCRIPTION="OpenOffice.org, a full office productivity suite." SRC_URI="${DEVPATH}_core.tar.bz2 ${DEVPATH}_extensions.tar.bz2 ${DEVPATH}_system.tar.bz2 - ${DEVPATH}_testautomation.tar.bz2 ${DEVPATH}_l10n.tar.bz2 binfilter? ( ${DEVPATH}_binfilter.tar.bz2 ) templates? ( http://extensions.services.openoffice.org/files/273/0/Sun_ODF_Template_Pack_en-US.oxt |