Force jdk-1.4 on AMD64 to prevent build breakage

Package-Manager: portage-2.1.2_pre3-r7

3 files changed, 24 insertions, 12 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 0c4e4fa0be42..9a29376f2525 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.265 2006/10/21 10:08:46 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.266 2006/10/23 09:01:17 suka Exp $
+
+  23 Oct 2006; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-2.0.4.ebuild:
+  Force jdk-1.4 on AMD64 to prevent build breakages. Thanks to Jon 
+  Severinsson <jon@severinsson.net> for the fix in bug #151225
 
   21 Oct 2006; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.0.4.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index ae683bd307d6..8db2d2d84c68 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -28,14 +28,14 @@ EBUILD openoffice-2.0.3.ebuild 9145 RMD160 60a33696dbe9eecd555720610c34ccfdf834e
 MD5 59f7b5eb1b353c0bbd22dc07607acfcf openoffice-2.0.3.ebuild 9145
 RMD160 60a33696dbe9eecd555720610c34ccfdf834efcb openoffice-2.0.3.ebuild 9145
 SHA256 ca6828638a3c30e4cde1ebd454e566f6718fbea528befc1c1fd9caf928054f30 openoffice-2.0.3.ebuild 9145
-EBUILD openoffice-2.0.4.ebuild 9549 RMD160 6ecbdd68c0ce00ebf8c901e77ec8212b4648b718 SHA1 2539edbde8ad781b48ccfff53b8c844bc219d2bc SHA256 521788d334751256216f24aac06997c7e792e768bf2ae4a88a7882fc543b52cf
-MD5 f7f18d99eb223b802d4df55b82cf28fc openoffice-2.0.4.ebuild 9549
-RMD160 6ecbdd68c0ce00ebf8c901e77ec8212b4648b718 openoffice-2.0.4.ebuild 9549
-SHA256 521788d334751256216f24aac06997c7e792e768bf2ae4a88a7882fc543b52cf openoffice-2.0.4.ebuild 9549
-MISC ChangeLog 55813 RMD160 090ee53c5ec3fa80cec78fabdb448de3fa5714b1 SHA1 a1e6465dc0bf0b4300d3b5563daf6876bdd961d6 SHA256 b154cc64a2a5b5068837187eaf624d5a9dd01f8594901b053f77e48587b36a1f
-MD5 09704077f2c32c8ba9cb40078036d4fb ChangeLog 55813
-RMD160 090ee53c5ec3fa80cec78fabdb448de3fa5714b1 ChangeLog 55813
-SHA256 b154cc64a2a5b5068837187eaf624d5a9dd01f8594901b053f77e48587b36a1f ChangeLog 55813
+EBUILD openoffice-2.0.4.ebuild 9785 RMD160 a19eb950dc965b172d3cebed162e35d32f00547a SHA1 1e6c7e052aabe0589ea4f3083bfee4bd5305f945 SHA256 61ae56de10b8ca4eb20bd25287afa52bb083f5b9a64f3b2e1daa60e7e5c7bcb7
+MD5 f3fbe2d79e7b6d641b376f5c84a31a27 openoffice-2.0.4.ebuild 9785
+RMD160 a19eb950dc965b172d3cebed162e35d32f00547a openoffice-2.0.4.ebuild 9785
+SHA256 61ae56de10b8ca4eb20bd25287afa52bb083f5b9a64f3b2e1daa60e7e5c7bcb7 openoffice-2.0.4.ebuild 9785
+MISC ChangeLog 56025 RMD160 7c2d69d294b3c9166052ac32d4d38aec75fbcb4d SHA1 ad9586426388226c1d60b31a32e6cf2fba0021f5 SHA256 ee9336ebd3c39ed77287f502379083107bcab0a558a40ef2eedf377d326bff79
+MD5 2d987f1de38713e3b8b43c8f14c4bee3 ChangeLog 56025
+RMD160 7c2d69d294b3c9166052ac32d4d38aec75fbcb4d ChangeLog 56025
+SHA256 ee9336ebd3c39ed77287f502379083107bcab0a558a40ef2eedf377d326bff79 ChangeLog 56025
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
diff --git a/app-office/openoffice/openoffice-2.0.4.ebuild b/app-office/openoffice/openoffice-2.0.4.ebuild
index e90babf82157..865628325827 100644
--- a/app-office/openoffice/openoffice-2.0.4.ebuild
+++ b/app-office/openoffice/openoffice-2.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.4.ebuild,v 1.7 2006/10/21 10:08:46 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.4.ebuild,v 1.8 2006/10/23 09:01:17 suka Exp $
 
 inherit check-reqs debug eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions multilib toolchain-funcs
 
@@ -19,7 +19,7 @@ SRC_URI="http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-core.tar.bz2
 	http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-lang.tar.bz2
 	binfilter? ( http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-binfilter.tar.bz2 )
 	http://go-oo.org/packages/${PATCHLEVEL}/ooo-build-${MY_PV}.tar.gz
-	odk? ( http://go-oo.org/packages/OOD680/${SRC}-sdk_oo.tar.bz2
+	odk? ( http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-sdk_oo.tar.bz2
 		java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )
 	http://go-oo.org/packages/SRC680/extras-2.tar.bz2
 	http://go-oo.org/packages/SRC680/biblio.tar.bz2
@@ -100,7 +100,7 @@ DEPEND="${COMMON_DEPEND}
 	!dev-util/dmake
 	>=dev-lang/python-2.3.4
 	>=app-admin/eselect-oodict-20060706
-	java? ( || ( =virtual/jdk-1.4* =virtual/jdk-1.5* )
+	java? ( || ( =virtual/jdk-1.4* !amd64? ( =virtual/jdk-1.5* ) )
 		dev-java/ant-core )
 	dev-libs/libxslt
 	ldap? ( net-nds/openldap )
@@ -108,6 +108,13 @@ DEPEND="${COMMON_DEPEND}
 
 PROVIDE="virtual/ooo"
 
+if use amd64; then
+	# All available Java 1.5 JDKs are broken, in one way or another, on amd64.
+	# Thus we force the use of a Java 1.4 JDK on amd64 (and amd64 only).
+	export JAVA_PKG_NV_DEPEND="=virtual/jdk-1.4*"
+fi
+
+
 # FIXME executable stacks should be addressed upstream!
 QA_EXECSTACK_x86="usr/lib/openoffice/program/libgcc3_uno.so"