| 1 |
monsieurp 15/06/27 13:04:00 |
| 2 |
|
| 3 |
Modified: fop-2.0.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Make use of ${P} where we can in order to avoid clashing with other SLOTs. Fix bug 553392. |
| 6 |
|
| 7 |
Signed-off-by: Patrice Clement <monsieurp@g.o> |
| 8 |
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.3 dev-java/fop/fop-2.0.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/fop-2.0.ebuild?rev=1.3&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/fop-2.0.ebuild?rev=1.3&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/fop-2.0.ebuild?r1=1.2&r2=1.3 |
| 16 |
|
| 17 |
Index: fop-2.0.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v |
| 20 |
retrieving revision 1.2 |
| 21 |
retrieving revision 1.3 |
| 22 |
diff -u -r1.2 -r1.3 |
| 23 |
--- fop-2.0.ebuild 26 Jun 2015 23:09:14 -0000 1.2 |
| 24 |
+++ fop-2.0.ebuild 27 Jun 2015 13:04:00 -0000 1.3 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
# Copyright 1999-2015 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v 1.2 2015/06/26 23:09:14 monsieurp Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v 1.3 2015/06/27 13:04:00 monsieurp Exp $ |
| 30 |
|
| 31 |
# TODO: if 'doc' use flag is used then should build also extra docs ('docs' ant target), currently it cannot |
| 32 |
# be built as it needs forrest which we do not have |
| 33 |
@@ -85,8 +85,14 @@ |
| 34 |
src_compile() { |
| 35 |
EANT_GENTOO_CLASSPATH_EXTRA+="$(java-pkg_getjars --build-only qdox-1.12)" |
| 36 |
|
| 37 |
- use jai && EANT_EXTRA_ARGS+=" -Djai.present=true" && EANT_GENTOO_CLASSPATH+=",sun-jai-bin" |
| 38 |
- use hyphenation && EANT_EXTRA_ARGS+=" -Dhyphenation.present=true -Duser.hyph.dir=${EPREFIX}/usr/share/offo-hyphenation/hyph/" |
| 39 |
+ if use jai; then |
| 40 |
+ EANT_EXTRA_ARGS+=" -Djai.present=true" |
| 41 |
+ EANT_GENTOO_CLASSPATH+=" sun-jai-bin" |
| 42 |
+ fi |
| 43 |
+ |
| 44 |
+ if use hyphenation; then |
| 45 |
+ EANT_EXTRA_ARGS+=" -Dhyphenation.present=true -Duser.hyph.dir=${EPREFIX}/usr/share/offo-hyphenation/hyph/" |
| 46 |
+ fi |
| 47 |
|
| 48 |
java-pkg-2_src_compile |
| 49 |
} |
| 50 |
@@ -100,18 +106,30 @@ |
| 51 |
src_install() { |
| 52 |
java-pkg_dojar build/fop.jar build/fop-sandbox.jar |
| 53 |
|
| 54 |
- if use hyphenation ; then |
| 55 |
+ if use hyphenation; then |
| 56 |
java-pkg_dojar build/fop-hyph.jar |
| 57 |
- insinto /usr/share/${PN}/ |
| 58 |
+ insinto /usr/share/${P}/ |
| 59 |
doins -r hyph |
| 60 |
fi |
| 61 |
|
| 62 |
# Doesn't support everything upstream launcher does... |
| 63 |
- java-pkg_dolauncher ${PN} --main org.apache.fop.cli.Main |
| 64 |
+ java-pkg_dolauncher ${P} --main org.apache.fop.cli.Main |
| 65 |
|
| 66 |
dodoc NOTICE README |
| 67 |
|
| 68 |
- use doc && java-pkg_dojavadoc build/javadocs |
| 69 |
- use examples && java-pkg_doexamples examples/* conf |
| 70 |
- use source && java-pkg_dosrc src/java/org src/sandbox/org |
| 71 |
+ if use doc; then |
| 72 |
+ java-pkg_dojavadoc \ |
| 73 |
+ build/javadocs |
| 74 |
+ fi |
| 75 |
+ |
| 76 |
+ if use examples; then |
| 77 |
+ java-pkg_doexamples \ |
| 78 |
+ examples/* conf |
| 79 |
+ fi |
| 80 |
+ |
| 81 |
+ if use source; then |
| 82 |
+ java-pkg_dosrc \ |
| 83 |
+ src/java/org \ |
| 84 |
+ src/sandbox/org |
| 85 |
+ fi |
| 86 |
} |
| 87 |
|
| 88 |
|
| 89 |
|
| 90 |
1.74 dev-java/fop/ChangeLog |
| 91 |
|
| 92 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/ChangeLog?rev=1.74&view=markup |
| 93 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/ChangeLog?rev=1.74&content-type=text/plain |
| 94 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/ChangeLog?r1=1.73&r2=1.74 |
| 95 |
|
| 96 |
Index: ChangeLog |
| 97 |
=================================================================== |
| 98 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v |
| 99 |
retrieving revision 1.73 |
| 100 |
retrieving revision 1.74 |
| 101 |
diff -u -r1.73 -r1.74 |
| 102 |
--- ChangeLog 26 Jun 2015 23:09:14 -0000 1.73 |
| 103 |
+++ ChangeLog 27 Jun 2015 13:04:00 -0000 1.74 |
| 104 |
@@ -1,6 +1,10 @@ |
| 105 |
# ChangeLog for dev-java/fop |
| 106 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 107 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.73 2015/06/26 23:09:14 monsieurp Exp $ |
| 108 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.74 2015/06/27 13:04:00 monsieurp Exp $ |
| 109 |
+ |
| 110 |
+ 27 Jun 2015; Patrice Clement <monsieurp@g.o> fop-2.0.ebuild: |
| 111 |
+ Make use of ${P} where we can in order to avoid clashing with other SLOTs. Fix |
| 112 |
+ bug 553392. |
| 113 |
|
| 114 |
27 Jun 2015; Patrice Clement <monsieurp@g.o> fop-2.0.ebuild: |
| 115 |
Slot version 2.0 as it should. |
Archives