[patch] Correcting bad java deps.

openoffice-2.0.4-java.patch (text/plain), 1.15 KB, created by Jon Severinsson on 2006-10-13 12:50:12 UTC

--- /usr/portage/app-office/openoffice/openoffice-2.0.4.ebuild	2006-10-13 16:30:02.000000000 +0200
+++ openoffice-2.0.4.ebuild	2006-10-13 21:19:10.000000000 +0200
@@ -38,7 +38,8 @@
 SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86"
 
-RDEPEND="!app-office/openoffice-bin
+RDEPEND="${RDEPEND}
+	!app-office/openoffice-bin
 	x11-libs/libXaw
 	x11-libs/libXinerama
 	virtual/libc
@@ -71,14 +72,15 @@
 	app-arch/unzip
 	>=app-text/hunspell-1.1.4-r1
 	dev-libs/expat
-	java? ( || ( =virtual/jdk-1.4* =virtual/jdk-1.5* )  )
+	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="${RDEPEND}
+DEPEND="${DEPEND}
+	${RDEPEND}
 	x11-libs/libXrender
 	x11-proto/printproto
 	x11-proto/xextproto
@@ -97,7 +99,7 @@
 	!dev-util/dmake
 	>=dev-lang/python-2.3.4
 	>=app-admin/eselect-oodict-20060706
-	java? ( || ( =virtual/jre-1.4* =virtual/jre-1.5* )
+	java? ( || ( =virtual/jdk-1.4* =virtual/jdk-1.5* )
 		dev-java/ant-core )
 	dev-libs/libxslt
 	ldap? ( net-nds/openldap )