Bump to final release of OpenOffice.org 2.4.1

(Portage version: 2.1.5.4)

3 files changed, 15 insertions, 20 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index a01939ae615c..f53854486af7 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,13 @@
 # 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.400 2008/06/01 19:14:34 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.401 2008/06/10 09:33:55 suka Exp $
+
+*openoffice-2.4.1 (10 Jun 2008)
+
+  10 Jun 2008; Andreas Proschofsky <suka@gentoo.org>
+  -files/gentoo-2.4.1_rc2.diff, +files/gentoo-2.4.1.diff,
+  -openoffice-2.4.1_rc2.ebuild, +openoffice-2.4.1.ebuild:
+  OpenOffice.org 2.4.1 final release
 
 *openoffice-2.4.1_rc2 (01 Jun 2008)
 
diff --git a/app-office/openoffice/files/gentoo-2.4.1_rc2.diff b/app-office/openoffice/files/gentoo-2.4.1.diff
index 2f6c8fc22da0..962d2ae9f283 100644
--- a/app-office/openoffice/files/gentoo-2.4.1_rc2.diff
+++ b/app-office/openoffice/files/gentoo-2.4.1.diff
@@ -19,15 +19,4 @@
  +CFLAGS+=-DUSE_MODERN_SPIRIT
  +.ENDIF
   .ENDIF
---- configure.in 
-+++ configure.in 
-@@ -1136,7 +1136,7 @@
- elif test "$with_tag" = "OOH680_m12" ; then
-    UPSTREAM_VERSION=2.4.0
- elif test "$with_tag" = "OOH680_m17" ; then
--   UPSTREAM_VERSION=2.4.1
-+   UPSTREAM_VERSION=2.4.1rc2
- fi
- if test -n "$UPSTREAM_VERSION"; then
-    UPSTREAM_NAME="OOo_${UPSTREAM_VERSION}_src"
 
diff --git a/app-office/openoffice/openoffice-2.4.1_rc2.ebuild b/app-office/openoffice/openoffice-2.4.1.ebuild
index 73f8ef52b7b9..966526a12e19 100644
--- a/app-office/openoffice/openoffice-2.4.1_rc2.ebuild
+++ b/app-office/openoffice/openoffice-2.4.1.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.1_rc2.ebuild,v 1.1 2008/06/01 19:14:34 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.4.1.ebuild,v 1.1 2008/06/10 09:33:55 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -9,20 +9,19 @@ 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 opengl pam seamonkey xulrunner"
 
-MY_PV="2.4.1.3"
-MY_PV2="2.4.1rc2"
+MY_PV="2.4.1.5"
 PATCHLEVEL="OOH680"
-SRC="OOo_${MY_PV2}_src"
+SRC="OOo_${PV}_src"
 MST="OOH680_m17"
 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
@@ -40,7 +39,7 @@ for X in ${LANGS} ; do
 done
 
 for Y in ${LANGS1} ; do
-	SRC_URI="${SRC_URI} linguas_${Y}? ( mirror://openoffice/contrib/rc/${MY_PV2}/${SRC}_l10n.tar.bz2 )"
+	SRC_URI="${SRC_URI} linguas_${Y}? ( mirror://openoffice/stable/${PV}/${SRC}_l10n.tar.bz2 )"
 done
 
 HOMEPAGE="http://go-oo.org"