[gentoo-commits] gentoo-x86 commit in dev-java/fop: fop-2.0.ebuild ChangeLog

["Patrice Clement (monsieurp)" <monsieurp@gentoo.org>]

monsieurp    15/06/27 13:04:00

  Modified:             fop-2.0.ebuild ChangeLog
  Log:
  Make use of ${P} where we can in order to avoid clashing with other SLOTs. Fix bug 553392.
  
  Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)

Revision  Changes    Path
1.3                  dev-java/fop/fop-2.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/fop-2.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/fop-2.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/fop-2.0.ebuild?r1=1.2&r2=1.3

Index: fop-2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fop-2.0.ebuild	26 Jun 2015 23:09:14 -0000	1.2
+++ fop-2.0.ebuild	27 Jun 2015 13:04:00 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v 1.2 2015/06/26 23:09:14 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v 1.3 2015/06/27 13:04:00 monsieurp Exp $
 
 # TODO: if 'doc' use flag is used then should build also extra docs ('docs' ant target), currently it cannot
 #       be built as it needs forrest which we do not have
@@ -85,8 +85,14 @@
 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 hyphenation && EANT_EXTRA_ARGS+=" -Dhyphenation.present=true -Duser.hyph.dir=${EPREFIX}/usr/share/offo-hyphenation/hyph/"
+	if use jai; then
+		EANT_EXTRA_ARGS+=" -Djai.present=true"
+		EANT_GENTOO_CLASSPATH+=" sun-jai-bin"
+	fi
+
+	if use hyphenation; then
+		EANT_EXTRA_ARGS+=" -Dhyphenation.present=true -Duser.hyph.dir=${EPREFIX}/usr/share/offo-hyphenation/hyph/"
+	fi
 
 	java-pkg-2_src_compile
 }
@@ -100,18 +106,30 @@
 src_install() {
 	java-pkg_dojar build/fop.jar build/fop-sandbox.jar
 
-	if use hyphenation ; then
+	if use hyphenation; then
 		java-pkg_dojar build/fop-hyph.jar
-		insinto /usr/share/${PN}/
+		insinto /usr/share/${P}/
 		doins -r hyph
 	fi
 
 	# Doesn't support everything upstream launcher does...
-	java-pkg_dolauncher ${PN} --main org.apache.fop.cli.Main
+	java-pkg_dolauncher ${P} --main org.apache.fop.cli.Main
 
 	dodoc NOTICE README
 
-	use doc && java-pkg_dojavadoc build/javadocs
-	use examples && java-pkg_doexamples examples/* conf
-	use source && java-pkg_dosrc src/java/org src/sandbox/org
+	if use doc; then
+		java-pkg_dojavadoc \
+			build/javadocs
+	fi
+
+	if use examples; then
+		java-pkg_doexamples \
+			examples/* conf
+	fi
+
+	if use source; then
+		java-pkg_dosrc \
+			src/java/org \
+			src/sandbox/org
+	fi
 }



1.74                 dev-java/fop/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/ChangeLog?rev=1.74&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/ChangeLog?rev=1.74&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/ChangeLog?r1=1.73&r2=1.74

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- ChangeLog	26 Jun 2015 23:09:14 -0000	1.73
+++ ChangeLog	27 Jun 2015 13:04:00 -0000	1.74
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/fop
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.73 2015/06/26 23:09:14 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.74 2015/06/27 13:04:00 monsieurp Exp $
+
+  27 Jun 2015; Patrice Clement <monsieurp@gentoo.org> fop-2.0.ebuild:
+  Make use of ${P} where we can in order to avoid clashing with other SLOTs. Fix
+  bug 553392.
 
   27 Jun 2015; Patrice Clement <monsieurp@gentoo.org> fop-2.0.ebuild:
   Slot version 2.0 as it should.