--- fop-0.20.5-r6.ebuild	2006-08-06 05:40:26.000000000 +0200
+++ fop-0.20.5-r6.ebuild	2006-08-30 10:21:14.000000000 +0200
@@ -22,9 +22,9 @@
 	dev-java/xalan
 	>=dev-java/xerces-2.6.2
 	!dev-java/fop-bin"
-RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.3* )
+RDEPEND="( =virtual/jre-1.4* )
 	${COMMON_DEP}"
-DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.3* )
+DEPEND="|| ( =virtual/jdk-1.4* )
 	${COMMON_DEP}
 	>=dev-java/ant-1.5.4"
 
@@ -50,7 +50,12 @@
 src_compile() {
 	java-pkg_filter-compiler jikes
 
-	eant package $(use_doc javadocs)
+	local jaip jimip
+	
+	use jai && jaip="-Djai.present=true"
+	use jimi && jimip="-Djimi.present=true"
+
+	eant ${jaip} ${jimip} package $(use_doc javadocs)
 }
 
 src_install() {