Bump to OpenOffice.org 3.1.1

(Portage version: 2.2_rc40/cvs/Linux i686)

2 files changed, 39 insertions, 33 deletions

diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog
index c9f419ccc82d..2ce6248e05f8 100644
--- a/app-office/openoffice-bin/ChangeLog
+++ b/app-office/openoffice-bin/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.216 2009/05/26 17:58:19 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.217 2009/09/02 19:40:14 suka Exp $
+
+  02 Sep 2009; Andreas Proschofsky <suka@gentoo.org>
+  -openoffice-bin-3.0.1.ebuild
+  Remove old release
+
+*openoffice-bin-3.1.1 (02 Sep 2009)
+
+  02 Sep 2009; Andreas Proschofsky <suka@gentoo.org>
+  +openoffice-bin-3.1.1.ebuild:
+  Add ebuild for OpenOffice.org 3.1.1
 
   26 May 2009; Andreas Proschofsky <suka@gentoo.org>
   openoffice-bin-3.1.0.ebuild:
diff --git a/app-office/openoffice-bin/openoffice-bin-3.0.1.ebuild b/app-office/openoffice-bin/openoffice-bin-3.1.1.ebuild
index 31969ec8d567..74baa1f88648 100644
--- a/app-office/openoffice-bin/openoffice-bin-3.0.1.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-3.1.1.ebuild
@@ -1,40 +1,42 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.0.1.ebuild,v 1.1 2009/02/04 09:15:26 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.1.1.ebuild,v 1.1 2009/09/02 19:40:14 suka Exp $
 
 inherit eutils fdo-mime rpm multilib
 
 IUSE="gnome java kde"
 
-BUILDID="9379"
-BUILDID2="9376"
-UREVER="1.4.1"
+BUILDID="9420"
+BUILDID2="9420"
+UREVER="1.5.1"
 MY_PV="${PV}rc2"
-MY_PV2="${MY_PV}_20090112"
+MY_PV2="${MY_PV}_20090820"
 MY_PV3="${PV}-${BUILDID}"
-BASIS="ooobasis3.0"
-MST="OOO300_m15"
-
-#if [ "${ARCH}" = "amd64" ] ; then
-#	OOARCH="x86_64"
-#	PACKED="${MST}_native_packed-1"
-#	PACKED2="${MST}_native_packed-1"
-#else
+BASIS="ooobasis3.1"
+MST="OOO310_m19"
+
+if [ "${ARCH}" = "amd64" ] ; then
+	OOARCH="x86_64"
+	PACKED="${MST}_native_packed-2"
+	PACKED2="${MST}_native_packed-2"
+else
 	OOARCH="i586"
 	PACKED="${MST}_native_packed-1"
 	PACKED2="${MST}_native_packed-1"
-#fi
+fi
 
 S="${WORKDIR}/${PACKED}_en-US.${BUILDID}/RPMS"
 DESCRIPTION="OpenOffice productivity suite"
 
-SRC_URI="x86? ( mirror://openoffice/stable/${PV}/OOo_${PV}_LinuxIntel_install_en-US.tar.gz )"
+SRC_URI="x86? ( mirror://openoffice/stable/${PV}/OOo_${PV}_LinuxIntel_install_en-US.tar.gz )
+	amd64? ( mirror://openoffice/stable/${PV}/OOo_${PV}_LinuxX86-64_install_wJRE_en-US.tar.gz  )"
 
-LANGS="af ar as_IN be_BY bg br bs ca cs da de dz el en en_GB en_ZA es et fi fr ga gl gu he hi_IN hr hu it ja ka kk km ko ku lt mk ml_IN mn 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 te_IN tg th ti_ER tr ts uk ur_IN ve vi xh zh_CN zh_TW zu"
+LANGS="af ar as_IN be_BY bg bn br brx bs ca cs cy de dgo dz el en en_GB en_ZA eo es et eu fa fi fr ga gl gu gu_IN he hi_IN hr hu id it ka kk km kn_IN ko kok ks ku lt mai mk ml_IN mn mni mr_IN my 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"
 
 for X in ${LANGS} ; do
 	[[ ${X} != "en" ]] && SRC_URI="${SRC_URI} linguas_${X}? (
-		x86? ( mirror://openoffice-extended/${MY_PV}/OOo_${MY_PV2}_LinuxIntel_langpack_${X/_/-}.tar.gz ) )"
+		x86? ( mirror://openoffice-extended/${MY_PV}/OOo_${MY_PV2}_LinuxIntel_langpack_${X/_/-}.tar.gz )
+		amd64? ( mirror://openoffice-extended/${MY_PV}/OOo_${MY_PV2}_LinuxX86-64_langpack_${X/_/-}.tar.gz ) )"
 	IUSE="${IUSE} linguas_${X}"
 done
 
@@ -42,7 +44,7 @@ HOMEPAGE="http://www.openoffice.org/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="!app-office/openoffice
 	x11-libs/libXaw
@@ -62,17 +64,18 @@ DEPEND="${RDEPEND}
 PROVIDE="virtual/ooo"
 RESTRICT="strip"
 
-QA_EXECSTACK="usr/$(get_libdir)/openoffice/basis3.0/program/*"
-QA_TEXTRELS="usr/$(get_libdir)/openoffice/basis3.0/program/libvclplug_genli.so \
-	usr/$(get_libdir)/openoffice/basis3.0/program/python-core-2.3.4/lib/lib-dynload/_curses_panel.so \
-	usr/$(get_libdir)/openoffice/basis3.0/program/python-core-2.3.4/lib/lib-dynload/_curses.so \
+QA_EXECSTACK="usr/$(get_libdir)/openoffice/basis3.1/program/*
+	usr/$(get_libdir)/openoffice/ure/lib/*"
+QA_TEXTRELS="usr/$(get_libdir)/openoffice/basis3.1/program/libvclplug_genli.so \
+	usr/$(get_libdir)/openoffice/basis3.1/program/python-core-2.3.4/lib/lib-dynload/_curses_panel.so \
+	usr/$(get_libdir)/openoffice/basis3.1/program/python-core-2.3.4/lib/lib-dynload/_curses.so \
 	usr/$(get_libdir)/openoffice/ure/lib/*"
 
 src_unpack() {
 
 	unpack ${A}
 
-	for i in base binfilter calc core01 core02 core03 core04 core05 core06 core07 draw graphicfilter images impress math ooofonts ooolinguistic pyuno testtool writer xsltfilter ; do
+	for i in base binfilter calc core01 core02 core03 core04 core05 core06 core07 draw graphicfilter images impress math ooofonts oooimprovement ooolinguistic pyuno testtool writer xsltfilter ; do
 		rpm_unpack "${S}/${BASIS}-${i}-${MY_PV3}.${OOARCH}.rpm"
 	done
 
@@ -83,7 +86,7 @@ src_unpack() {
 	rpm_unpack "${S}/openoffice.org3-${MY_PV3}.${OOARCH}.rpm"
 	rpm_unpack "${S}/openoffice.org-ure-${UREVER}-${BUILDID}.${OOARCH}.rpm"
 
-	rpm_unpack "${S}/desktop-integration/openoffice.org3.0-freedesktop-menus-3.0-${BUILDID2}.noarch.rpm"
+	rpm_unpack "${S}/desktop-integration/openoffice.org3.1-freedesktop-menus-3.1-${BUILDID2}.noarch.rpm"
 
 	use gnome && rpm_unpack "${S}/${BASIS}-gnome-integration-${MY_PV3}.${OOARCH}.rpm"
 	use kde && rpm_unpack "${S}/${BASIS}-kde-integration-${MY_PV3}.${OOARCH}.rpm"
@@ -153,7 +156,7 @@ src_install () {
 	dosym ${INSTDIR}/program/soffice /usr/bin/soffice
 
 	rm -f "${D}${INSTDIR}/basis-link" || die
-	dosym ${INSTDIR}/basis3.0 ${INSTDIR}/basis-link
+	dosym ${INSTDIR}/basis3.1 ${INSTDIR}/basis-link
 
 	# Change user install dir
 	sed -i -e "s/.openoffice.org\/3/.ooo3/g" "${D}${INSTDIR}/program/bootstraprc" || die
@@ -183,11 +186,4 @@ pkg_postinst() {
 	elog " Other dictionaries can be found at Suns extension site. "
 	elog
 
-	ewarn " Please note that this release of OpenOffice.org uses a "
-	ewarn " new user install dir. As a result you will have to redo "
-	ewarn " your settings. Alternatively you might copy the old one "
-	ewarn " over from ~/.ooo-2.0 to ~/.ooo3, but be warned that this "
-	ewarn " might break stuff. "
-	ewarn
-
 }