OpenOffice.org 2.4.0 is released

(Portage version: 2.1.4.4)

4 files changed, 18 insertions, 58 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 9036a19bb742..0573d129f698 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.378 2008/03/26 22:37:52 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.379 2008/03/27 08:07:23 suka Exp $
+
+*openoffice-2.4.0 (27 Mar 2008)
+
+  27 Mar 2008; Andreas Proschofsky <suka@gentoo.org>
+  -files/2.4.0_rc5/gentoo-2.4.0_rc5.diff, +files/2.4.0/gentoo-2.4.0.diff,
+  +files/2.4.0/ooo-env_log.diff, -files/2.4.0_rc5/ooo-env_log.diff,
+  -openoffice-2.4.0_rc5.ebuild, +openoffice-2.4.0.ebuild:
+  OpenOffice.org 2.4.0 is released
 
   26 Mar 2008; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.4.0_rc5.ebuild:
diff --git a/app-office/openoffice/files/2.4.0_rc5/gentoo-2.4.0_rc5.diff b/app-office/openoffice/files/2.4.0_rc5/gentoo-2.4.0_rc5.diff
deleted file mode 100644
index 7b9da0a7ff0b..000000000000
--- a/app-office/openoffice/files/2.4.0_rc5/gentoo-2.4.0_rc5.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- bin/package-ooo 
-+++ bin/package-ooo 
-@@ -33,6 +33,7 @@
- {
-     cat <<EOT >$1
- #!/bin/sh
-+unset PYTHONPATH
- $OOINSTBASE/program/soffice $2 "\$@"
- EOT
-     chmod 755 $1
---- configure.in 
-+++ configure.in 
-@@ -1090,7 +1090,7 @@
- elif test "$with_tag" = "OOG680_m9" ; then
-    UPSTREAM_VERSION=2.3.1
- elif test "$with_tag" = "OOH680_m11" ; then
--   UPSTREAM_VERSION=2.4.0
-+   UPSTREAM_VERSION=2.4.0rc5
- fi
- if test -n "$UPSTREAM_VERSION"; then
-    UPSTREAM_NAME="OOo_${UPSTREAM_VERSION}_src"
-
diff --git a/app-office/openoffice/files/2.4.0_rc5/ooo-env_log.diff b/app-office/openoffice/files/2.4.0_rc5/ooo-env_log.diff
deleted file mode 100644
index 908169ab6c5a..000000000000
--- a/app-office/openoffice/files/2.4.0_rc5/ooo-env_log.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- bin/build-ooo.orig	2007-04-18 18:32:06.000000000 +0200
-+++ bin/build-ooo	2007-04-18 18:32:45.000000000 +0200
-@@ -21,9 +21,8 @@
- echo "configuring ...";
- autoconf || exit 1;
- 
--echo "Env for configure:"
--set
--echo "Env for configure ends"
-+echo "Log Env for configure to `pwd`/env.log"
-+set > env.log
- 
- eval ./configure "$CONFIGURE_OPTIONS" "$PROPAGATED_ARGS" || exit 1;
- 
-@@ -88,8 +88,8 @@
- # similar that gives child nmake's pain.
- unset MAKEFLAGS
- 
--echo "Env:"
--set
-+echo "Log Env to `pwd`/env.log"
-+set > env.log
- 
- # What extra localizations are avilable as $SRCDIR/GSI_*.sdf and are not
- # already merged?
diff --git a/app-office/openoffice/openoffice-2.4.0_rc5.ebuild b/app-office/openoffice/openoffice-2.4.0.ebuild
index 57ea027f9377..bfebceae2ce7 100644
--- a/app-office/openoffice/openoffice-2.4.0_rc5.ebuild
+++ b/app-office/openoffice/openoffice-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.4.0_rc5.ebuild,v 1.5 2008/03/26 22:37:52 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.4.0.ebuild,v 1.1 2008/03/27 08:07:23 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -9,19 +9,18 @@ inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2
 
 IUSE="binfilter cups dbus debug eds firefox gnome gstreamer gtk kde ldap mono odk pam seamonkey webdav xulrunner"
 
-MY_PV="2.4.0.3.1"
-MY_PV2="2.4.0rc5"
+MY_PV="2.4.0.3.2"
 PATCHLEVEL="OOH680"
-SRC="OOo_${MY_PV2}_src"
+SRC="OOo_${PV}_src"
 S="${WORKDIR}/ooo"
 S_OLD="${WORKDIR}/ooo-build-${MY_PV}"
 CONFFILE="${S}/distro-configs/Gentoo.conf.in"
 DESCRIPTION="OpenOffice.org, a full office productivity suite."
 
-SRC_URI="mirror://openoffice/contrib/rc/${MY_PV2}/${SRC}_core.tar.bz2
-	binfilter? ( mirror://openoffice/contrib/rc/${MY_PV2}/${SRC}_binfilter.tar.bz2 )
+SRC_URI="mirror://openoffice/stable/${PV}/${SRC}_core.tar.bz2
+	binfilter? ( mirror://openoffice/stable/${PV}/${SRC}_binfilter.tar.bz2 )
 	http://download.go-oo.org/${PATCHLEVEL}/ooo-build-${MY_PV}.tar.gz
-	odk? ( mirror://openoffice/contrib/rc/${MY_PV2}/${SRC}_sdk.tar.bz2
+	odk? ( mirror://openoffice/stable/${PV}/${SRC}_sdk.tar.bz2
 		java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )
 	http://download.go-oo.org/SRC680/extras-2.tar.bz2
 	http://download.go-oo.org/SRC680/biblio.tar.bz2
@@ -39,7 +38,7 @@ for X in ${LANGS} ; do
 done
 
 for Y in ${LANGS1} ; do
-	SRC_URI="${SRC_URI} linguas_${Y}? ( mirror://openoffice/contrib/rc/${PV}/${SRC}_l10n.tar.bz2 )"
+	SRC_URI="${SRC_URI} linguas_${Y}? ( mirror://openoffice/stable/${PV}/${SRC}_l10n.tar.bz2 )"
 done
 
 HOMEPAGE="http://go-oo.org"
@@ -129,7 +128,7 @@ DEPEND="${COMMON_DEPEND}
 	pam? ( sys-libs/pam )
 	!dev-util/dmake
 	>=dev-lang/python-2.3.4
-	java? ( || ( =virtual/jdk-1.5* =virtual/jdk-1.4* )
+	java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* )
 		dev-java/ant-core )
 	ldap? ( net-nds/openldap )"
 
@@ -312,7 +311,7 @@ src_compile() {
 		--with-num-cpus="${JOBS}" \
 		--without-binsuffix \
 		--with-installed-ooo-dirname="openoffice" \
-		--with-tag=OOH680_m11 \
+		--with-tag=OOH680_m12 \
 		${GTKFLAG} \
 		`use_enable mono` \
 		`use_enable kde` \