Some more java dependency fixes, closes bug #147249 again

Package-Manager: portage-2.1.2_pre2-r9

3 files changed, 23 insertions, 18 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 86f548bbe9e1..39445762175c 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # 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.261 2006/10/13 21:06:17 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.262 2006/10/13 22:38:32 suka Exp $
+
+  13 Oct 2006; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-2.0.4.ebuild:
+  Some more java dependency fixes, closes bug #147249 again
 
   13 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 159c97cfb011..8cffcc125c23 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -31,14 +31,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 9563 RMD160 a10a5e6b5212e0a12982874bfeb49b2a6e26c0ca SHA1 c5aa55ec0bcf37c79c7fb91069568ca18bee0048 SHA256 dc3c0b5e749937676ce2137d946a45a52c4e7da01121e4cdee6e5a694e933970
-MD5 61c90c7e476075d933dc3d19e0bb1890 openoffice-2.0.4.ebuild 9563
-RMD160 a10a5e6b5212e0a12982874bfeb49b2a6e26c0ca openoffice-2.0.4.ebuild 9563
-SHA256 dc3c0b5e749937676ce2137d946a45a52c4e7da01121e4cdee6e5a694e933970 openoffice-2.0.4.ebuild 9563
-MISC ChangeLog 55168 RMD160 d444d8060486f5bcbb21e3c5a87cb018fd2119d2 SHA1 be470d6b59ea78b310a85cfc9336047ef6ab7cea SHA256 068cfc3facd6c36f6ff4c9aa6fe8f236584850be597bb4bded6914d7070760a1
-MD5 e68e3042b345de5680032c8c07955998 ChangeLog 55168
-RMD160 d444d8060486f5bcbb21e3c5a87cb018fd2119d2 ChangeLog 55168
-SHA256 068cfc3facd6c36f6ff4c9aa6fe8f236584850be597bb4bded6914d7070760a1 ChangeLog 55168
+EBUILD openoffice-2.0.4.ebuild 9560 RMD160 8ecb33f33ea1db38925634f5df016e154a2dc6eb SHA1 f69e74da4d3e4368e4c9ef0cf837fa0a0a52634d SHA256 8c0ce8dfdf6953b2b0f1ba04237d3b756c412c1775e7995bf55138b9ec0d7adb
+MD5 118b19649734e7ca12f4f46a53675a30 openoffice-2.0.4.ebuild 9560
+RMD160 8ecb33f33ea1db38925634f5df016e154a2dc6eb openoffice-2.0.4.ebuild 9560
+SHA256 8c0ce8dfdf6953b2b0f1ba04237d3b756c412c1775e7995bf55138b9ec0d7adb openoffice-2.0.4.ebuild 9560
+MISC ChangeLog 55309 RMD160 0388bc6dc81aae172091a995a9e824fc18c2f25d SHA1 66e39e30e999ff38d04c15e1ecac4125eae9aad5 SHA256 9ecf97ba823d96abd21b4baa1ad4d327e7062a21cb5f8d66a9bbe8b2ae42d54b
+MD5 7aaeb9c4f11fdb09f6346ab927e4d61e ChangeLog 55309
+RMD160 0388bc6dc81aae172091a995a9e824fc18c2f25d ChangeLog 55309
+SHA256 9ecf97ba823d96abd21b4baa1ad4d327e7062a21cb5f8d66a9bbe8b2ae42d54b ChangeLog 55309
 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 b80580e8b372..a54c71297309 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.3 2006/10/13 21:06:17 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.4.ebuild,v 1.4 2006/10/13 22:38:32 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
-	http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
+	odk? ( 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
 	http://go-oo.org/packages/SRC680/hunspell_UNO_1.1.tar.gz
@@ -38,8 +38,7 @@ LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86"
 
-RDEPEND="${RDEPEND}
-	!app-office/openoffice-bin
+COMMON_DEPEND="!app-office/openoffice-bin
 	x11-libs/libXaw
 	x11-libs/libXinerama
 	virtual/libc
@@ -72,15 +71,16 @@ RDEPEND="${RDEPEND}
 	app-arch/unzip
 	>=app-text/hunspell-1.1.4-r1
 	dev-libs/expat
-	java? ( || ( =virtual/jre-1.5* =virtual/jre-1.4* )  )
 	>=dev-libs/boost-1.33.1
 	>=dev-libs/icu-3.4
 	linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
 	linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 )
 	linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"
 
-DEPEND="${DEPEND}
-	${RDEPEND}
+RDEPEND="java? ( || ( =virtual/jre-1.5* =virtual/jre-1.4* )  )
+	${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
 	x11-libs/libXrender
 	x11-proto/printproto
 	x11-proto/xextproto
@@ -176,7 +176,7 @@ src_unpack() {
 	cp -f ${FILESDIR}/${PV}/system-icu.diff ${S}/patches/src680 || die
 
 	#Use flag checks
-	use java && echo "--with-jdk-home=${JAVA_HOME} --with-ant-home=${ANT_HOME}" >> ${CONFFILE} || echo "--without-java" >> ${CONFFILE}
+	use java && echo "--with-jdk-home=${JAVA_HOME} --with-ant-home=${ANT_HOME}" >> ${CONFFILE}
 	use branding && echo "--with-intro-bitmaps=\\\"${S}/src/openintro_gentoo.bmp\\\"" >> ${CONFFILE}
 
 	echo "`use_enable binfilter`" >> ${CONFFILE}
@@ -200,7 +200,6 @@ src_unpack() {
 	echo "`use_with sound system-portaudio`" >> ${CONFFILE}
 	echo "`use_with sound system-sndfile`" >> ${CONFFILE}
 
-	echo "`use_enable odk`" >> ${CONFFILE}
 	echo "`use_enable debug crashdump`" >> ${CONFFILE}
 
 }
@@ -255,6 +254,8 @@ src_compile() {
 		`use_enable gnome quickstart` \
 		`use_enable pam` \
 		`use_enable !debug strip` \
+		`use_enable odk` \
+		`use_with java` \
 		--disable-access \
 		--disable-mono \
 		--disable-post-install-scripts \