[patch] Proposed fixes to dev-java/fop-2.0.ebuild

fop-2.0.ebuild.patch (text/plain), 854 bytes, created by Petr Pisar on 2015-06-27 06:08:16 UTC

--- /usr/portage/dev-java/fop/fop-2.0.ebuild	2015-06-27 01:09:14.000000000 +0200
+++ /usr/local/portage/petr_p/dev-java/fop/fop-2.0.ebuild	2015-06-27 07:57:20.406878594 +0200
@@ -37,7 +37,9 @@
 	dev-java/xml-commons-external:1.3
 	jai? ( dev-java/sun-jai-bin:0 )"
 
+# File conflict with older fop, bug #553392
 RDEPEND=">=virtual/jre-1.6
+	!dev-java/fop:0
 	${CDEPEND}"
 
 DEPEND=">=virtual/jdk-1.6
@@ -85,7 +87,7 @@
 src_compile() {
 	EANT_GENTOO_CLASSPATH_EXTRA+="$(java-pkg_getjars --build-only qdox-1.12)"
 
-	use jai && EANT_EXTRA_ARGS+=" -Djai.present=true" && EANT_GENTOO_CLASSPATH+=",sun-jai-bin"
+	use jai && EANT_EXTRA_ARGS+=" -Djai.present=true" && EANT_GENTOO_CLASSPATH+=" sun-jai-bin"
 	use hyphenation && EANT_EXTRA_ARGS+=" -Dhyphenation.present=true -Duser.hyph.dir=${EPREFIX}/usr/share/offo-hyphenation/hyph/"
 
 	java-pkg-2_src_compile