Silent bump to ooo-build-2.2.1, bunch of bugfixes. Also fix java bug #171274

(Portage version: 2.1.3_rc4)

4 files changed, 15 insertions, 21 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 4c86040439e1..2936c2b51d75 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.330 2007/06/16 13:24:25 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.331 2007/06/21 07:05:41 suka Exp $
+
+  21 Jun 2007; Andreas Proschofsky <suka@gentoo.org>
+  files/2.2.1/gentoo-2.2.1.diff, openoffice-2.2.1.ebuild:
+  Silent bump to ooo-build-2.2.1, bunch of bugfixes. Also fix java bug #171274
 
   16 Jun 2007; Andreas Proschofsky <suka@gentoo.org>
   -files/2.1.0/detect-db4.5.diff, -files/2.1.0/disable-regcomp-python.diff,
diff --git a/app-office/openoffice/files/2.2.1/gentoo-2.2.1.diff b/app-office/openoffice/files/2.2.1/gentoo-2.2.1.diff
index 9c0d7081e07c..85f600e31780 100644
--- a/app-office/openoffice/files/2.2.1/gentoo-2.2.1.diff
+++ b/app-office/openoffice/files/2.2.1/gentoo-2.2.1.diff
@@ -8,15 +8,4 @@
  EOT
      chmod 755 $1
  }
---- configure.in	2007/06/04 16:01:58	9518
-+++ configure.in	2007/06/11 09:46:34	9559
-@@ -941,7 +941,7 @@
-    UPSTREAM_NAME="OOo_2.2.0_src"
-    UPSTREAM_VERSION=2.2.0
- elif test "$with_tag" = "OOF680_m18"; then
--   UPSTREAM_NAME="OOo_2_2_1_src"
-+   UPSTREAM_NAME="OOo_2.2.1_src"
-    UPSTREAM_VERSION=2.2.1
- fi
- if test "z$with_mirror" != "z" ; then
 
diff --git a/app-office/openoffice/files/digest-openoffice-2.2.1 b/app-office/openoffice/files/digest-openoffice-2.2.1
index decfef661735..de6a736ea34a 100644
--- a/app-office/openoffice/files/digest-openoffice-2.2.1
+++ b/app-office/openoffice/files/digest-openoffice-2.2.1
@@ -19,18 +19,18 @@ SHA256 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863 extras-2
 MD5 4cc68d37ed3a3191bb78a14630e14c64 hunspell_UNO_1.1.tar.gz 13774
 RMD160 9c0c31220d63894c9060a05fd136083b0b017b94 hunspell_UNO_1.1.tar.gz 13774
 SHA256 9de07fbe97c9539bae9c76502474c76471ab173dac365e251ca3fc5281008149 hunspell_UNO_1.1.tar.gz 13774
-MD5 ca7cf690e5ba186ec3c025199fa35282 libwpg-0.1.0~cvs20070507.tar.gz 385942
-RMD160 bf97ceb497b059620a7b415641f2d2854b4cc23c libwpg-0.1.0~cvs20070507.tar.gz 385942
-SHA256 838f6123ae37685c65c734d891fec8659e96f19148daae255b326dedd74e71fb libwpg-0.1.0~cvs20070507.tar.gz 385942
+MD5 cfdc5e1fe2a559d458cf2a3fd3a52d8f libwpg-0.1.0~cvs20070608.tar.gz 396554
+RMD160 4ba3f5286ccc0fdea3962912a8f27dbd20f0feda libwpg-0.1.0~cvs20070608.tar.gz 396554
+SHA256 9d7c85a2c494260fe12fb0ec4e64c2670c5bb0e4abe167f032b72ea586f52903 libwpg-0.1.0~cvs20070608.tar.gz 396554
 MD5 2e442485100f7e00685737513f853546 libwps-0.1.0~svn20070129.tar.gz 426668
 RMD160 5936f952392ec44aaa7d3fb836bc76421377f669 libwps-0.1.0~svn20070129.tar.gz 426668
 SHA256 586d0e527f065bc462a2df16cc5842203377bb8b835faa4ce545f26e7e3956ec libwps-0.1.0~svn20070129.tar.gz 426668
 MD5 2ff7b4c52f9c3937ebe3002798fbc479 lp_solve_5.5.tar.gz 495452
 RMD160 4f54d0d2116998da5de38cf51505835a8fd6e412 lp_solve_5.5.tar.gz 495452
 SHA256 6f9946c08c8fc3c97f74b58db8a62eac74027a7e709d81ee968716f7386682f1 lp_solve_5.5.tar.gz 495452
-MD5 73aedaa4afd0aa3a4505855c6931b103 ooo-build-2.2.0.2.tar.gz 4826885
-RMD160 d22fe423ad0fb6931c21be6e6965480cbd475ab0 ooo-build-2.2.0.2.tar.gz 4826885
-SHA256 f1db200433a70c9851c7dab5c1e51f952e67379e975504a9338281c1a6955f00 ooo-build-2.2.0.2.tar.gz 4826885
+MD5 06c4210179b51035ce6a38690a26d909 ooo-build-2.2.1.tar.gz 4845814
+RMD160 73863358dc7866f2ef9b3454591ad39f6612a271 ooo-build-2.2.1.tar.gz 4845814
+SHA256 e642aa70c6b5fdfcb5614f9be787538a9e0f7f4f1c67b74f8c43e4bd5f4dcc3d ooo-build-2.2.1.tar.gz 4845814
 MD5 e3a0b76dcd876f3d721ee7183729153d unowinreg.dll 6144
 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 unowinreg.dll 6144
 SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c unowinreg.dll 6144
diff --git a/app-office/openoffice/openoffice-2.2.1.ebuild b/app-office/openoffice/openoffice-2.2.1.ebuild
index 8a7519f3086a..7a8ba0d88c67 100644
--- a/app-office/openoffice/openoffice-2.2.1.ebuild
+++ b/app-office/openoffice/openoffice-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.2.1.ebuild,v 1.5 2007/06/16 12:00:10 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.2.1.ebuild,v 1.6 2007/06/21 07:05:41 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -9,7 +9,7 @@ inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2
 
 IUSE="binfilter branding cairo cups dbus debug eds firefox gnome gstreamer gtk kde ldap mono sound odk pam seamonkey webdav"
 
-MY_PV="2.2.0.2"
+MY_PV="2.2.1"
 PATCHLEVEL="OOF680"
 SRC="OOo_${PV}_src"
 S="${WORKDIR}/ooo"
@@ -28,7 +28,7 @@ SRC_URI="mirror://openoffice/stable/${PV}/${SRC}_core.tar.bz2
 	http://go-oo.org/packages/xt/xt-20051206-src-only.zip
 	http://go-oo.org/packages/SRC680/lp_solve_5.5.tar.gz
 	http://go-oo.org/packages/SRC680/libwps-0.1.0~svn20070129.tar.gz
-	http://go-oo.org/packages/SRC680/libwpg-0.1.0~cvs20070507.tar.gz"
+	http://go-oo.org/packages/SRC680/libwpg-0.1.0~cvs20070608.tar.gz"
 
 LANGS1="af ar as_IN be_BY bg bn br bs ca cs cy da de dz el en_GB en_ZA eo es et fa fi fr ga gl gu_IN he hi_IN hr hu it ja km ko ku lt lv mk ml_IN mr_IN nb ne nl nn nr ns or_IN pa_IN pl pt pt_BR ru rw sh_YU sk sl sr_CS ss st sv sw_TZ ta_IN te_IN tg th ti_ER tn tr ts uk ur_IN ve vi xh zh_CN zh_TW zu"
 LANGS="${LANGS1} en en_US"
@@ -215,6 +215,7 @@ src_unpack() {
 	if use java ; then
 		echo "--with-ant-home=${ANT_HOME}" >> ${CONFFILE}
 		echo "--with-jdk-home=$(java-config --jdk-home 2>/dev/null)" >> ${CONFFILE}
+		echo "--with-java-target-version=$(java-pkg_get-target)" >> ${CONFFILE}
 		echo "--with-system-beanshell" >> ${CONFFILE}
 		echo "--with-system-xalan" >> ${CONFFILE}
 		echo "--with-system-xerces" >> ${CONFFILE}