--- /usr/portage/app-office/openoffice/openoffice-2.0.4.ebuild	2006-10-21 12:35:33.000000000 +0200
+++ openoffice-2.0.4.ebuild	2006-10-23 07:31:28.000000000 +0200
@@ -19,7 +19,7 @@
 	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,12 +100,18 @@
 	!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 )
 	>=dev-libs/libxml2-2.0"
 
+if use amd64; then
+	# All availible 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
+
 PROVIDE="virtual/ooo"
 
 # FIXME executable stacks should be addressed upstream!