public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-java/fop: fop-2.0.ebuild ChangeLog
@ 2015-06-26 23:05 Patrice Clement (monsieurp)
  0 siblings, 0 replies; 10+ messages in thread
From: Patrice Clement (monsieurp) @ 2015-06-26 23:05 UTC (permalink / raw
  To: gentoo-commits

monsieurp    15/06/26 23:05:10

  Modified:             ChangeLog
  Added:                fop-2.0.ebuild
  Log:
  Version bump. Fix bug 551966.
  
  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.72                 dev-java/fop/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- ChangeLog	10 Aug 2014 20:13:16 -0000	1.71
+++ ChangeLog	26 Jun 2015 23:05:10 -0000	1.72
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/fop
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.71 2014/08/10 20:13:16 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.72 2015/06/26 23:05:10 monsieurp Exp $
+
+*fop-2.0 (27 Jun 2015)
+
+  27 Jun 2015; Patrice Clement <monsieurp@gentoo.org> +fop-2.0.ebuild:
+  Version bump. Fix bug 551966.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> fop-1.1.ebuild:
   QA: drop trailing '.' from DESCRIPTION



1.1                  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.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/fop-2.0.ebuild?rev=1.1&content-type=text/plain

Index: fop-2.0.ebuild
===================================================================
# 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.1 2015/06/26 23:05:10 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
# TODO: package and use optional dependency jeuclid

EAPI="5"

JAVA_PKG_IUSE="doc examples source test"
WANT_ANT_TASKS="ant-trax"

inherit eutils java-pkg-2 java-ant-2

DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
HOMEPAGE="http://xmlgraphics.apache.org/fop/"
SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip"

KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~sparc-solaris ~x86-linux ~x86-macos ~x86-solaris"
IUSE="hyphenation jai"
LICENSE="Apache-2.0"
SLOT="0"

# Doesn't work with java.awt.headless, requires Mockito.
RESTRICT="test"

CDEPEND="
	dev-java/batik:1.8
	dev-java/ant-core:0
	dev-java/fontbox:1.7
	dev-java/commons-io:1
	dev-java/commons-logging:0
	java-virtuals/servlet-api:3.0
	dev-java/avalon-framework:4.2
	dev-java/xmlgraphics-commons:2
	dev-java/xml-commons-external:1.3
	jai? ( dev-java/sun-jai-bin:0 )"

RDEPEND=">=virtual/jre-1.6
	${CDEPEND}"

DEPEND=">=virtual/jdk-1.6
	dev-java/qdox:1.12
	hyphenation? ( dev-java/offo-hyphenation:0 )
	app-arch/unzip
	${CDEPEND}
	test? (
		dev-java/ant-junit:0
		dev-java/junit:4
		dev-java/xmlunit:1
		dev-java/mockito:0
	)"

java_prepare() {
	find "${S}" -name '*.jar' -print -delete || die
}

JAVA_ANT_REWRITE_CLASSPATH="true"
EANT_DOC_TARGET="javadocs"
EANT_BUILD_TARGET="package"
EANT_GENTOO_CLASSPATH="
	ant-core
	batik-1.8
	fontbox-1.7
	commons-io-1
	commons-logging
	servlet-api-3.0
	avalon-framework-4.2
	xmlgraphics-commons-2
	xml-commons-external-1.3
"

EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}
	mockito
	junit-4
	xmlunit-1
"

EANT_EXTRA_ARGS="-Djce.present=true"
EANT_DOC_TARGET="javadocs"
EANT_TEST_TARGET="junit"
#EANT_TEST_EXTRA_ARGS="-Djunit.present=true -Dxmlunit.present=true"

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/"

	java-pkg-2_src_compile
}

# Tests are broken even in 2.0
src_test() {
	EANT_ANT_TASKS="ant-junit" \
		java-pkg-2_src_test
}

src_install() {
	java-pkg_dojar build/fop.jar build/fop-sandbox.jar

	if use hyphenation ; then
		java-pkg_dojar build/fop-hyph.jar
		insinto /usr/share/${PN}/
		doins -r hyph
	fi

	# Doesn't support everything upstream launcher does...
	java-pkg_dolauncher ${PN} --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
}





^ permalink raw reply	[flat|nested] 10+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-java/fop: fop-2.0.ebuild ChangeLog
@ 2015-06-26 23:09 Patrice Clement (monsieurp)
  0 siblings, 0 replies; 10+ messages in thread
From: Patrice Clement (monsieurp) @ 2015-06-26 23:09 UTC (permalink / raw
  To: gentoo-commits

monsieurp    15/06/26 23:09:14

  Modified:             fop-2.0.ebuild ChangeLog
  Log:
  Slot version 2.0 as it should.
  
  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.2                  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.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/fop-2.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/fop-2.0.ebuild?r1=1.1&r2=1.2

Index: fop-2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fop-2.0.ebuild	26 Jun 2015 23:05:10 -0000	1.1
+++ fop-2.0.ebuild	26 Jun 2015 23:09:14 -0000	1.2
@@ -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.1 2015/06/26 23:05:10 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v 1.2 2015/06/26 23:09:14 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
@@ -20,7 +20,7 @@
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~sparc-solaris ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="hyphenation jai"
 LICENSE="Apache-2.0"
-SLOT="0"
+SLOT="2"
 
 # Doesn't work with java.awt.headless, requires Mockito.
 RESTRICT="test"



1.73                 dev-java/fop/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- ChangeLog	26 Jun 2015 23:05:10 -0000	1.72
+++ ChangeLog	26 Jun 2015 23:09:14 -0000	1.73
@@ -1,6 +1,9 @@
 # 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.72 2015/06/26 23:05:10 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.73 2015/06/26 23:09:14 monsieurp Exp $
+
+  27 Jun 2015; Patrice Clement <monsieurp@gentoo.org> fop-2.0.ebuild:
+  Slot version 2.0 as it should.
 
 *fop-2.0 (27 Jun 2015)
 





^ permalink raw reply	[flat|nested] 10+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-java/fop: fop-2.0.ebuild ChangeLog
@ 2015-06-27 13:04 Patrice Clement (monsieurp)
  0 siblings, 0 replies; 10+ messages in thread
From: Patrice Clement (monsieurp) @ 2015-06-27 13:04 UTC (permalink / raw
  To: gentoo-commits

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.





^ permalink raw reply	[flat|nested] 10+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-java/fop: fop-2.0.ebuild ChangeLog
@ 2015-06-27 17:53 Agostino Sarubbo (ago)
  0 siblings, 0 replies; 10+ messages in thread
From: Agostino Sarubbo (ago) @ 2015-06-27 17:53 UTC (permalink / raw
  To: gentoo-commits

ago         15/06/27 17:53:16

  Modified:             fop-2.0.ebuild ChangeLog
  Log:
  Stable for amd64, wrt bug #553370
  
  (Portage version: 2.2.18/cvs/Linux x86_64, RepoMan options: --include-arches="amd64", signed Manifest commit with key 7194459F)

Revision  Changes    Path
1.4                  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.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/fop-2.0.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/fop-2.0.ebuild?r1=1.3&r2=1.4

Index: fop-2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fop-2.0.ebuild	27 Jun 2015 13:04:00 -0000	1.3
+++ fop-2.0.ebuild	27 Jun 2015 17:53:16 -0000	1.4
@@ -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.3 2015/06/27 13:04:00 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v 1.4 2015/06/27 17:53:16 ago 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
@@ -17,7 +17,7 @@
 HOMEPAGE="http://xmlgraphics.apache.org/fop/"
 SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip"
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~sparc-solaris ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="hyphenation jai"
 LICENSE="Apache-2.0"
 SLOT="2"



1.75                 dev-java/fop/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- ChangeLog	27 Jun 2015 13:04:00 -0000	1.74
+++ ChangeLog	27 Jun 2015 17:53:16 -0000	1.75
@@ -1,6 +1,9 @@
 # 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.74 2015/06/27 13:04:00 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.75 2015/06/27 17:53:16 ago Exp $
+
+  27 Jun 2015; Agostino Sarubbo <ago@gentoo.org> fop-2.0.ebuild:
+  Stable for amd64, wrt bug #553370
 
   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





^ permalink raw reply	[flat|nested] 10+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-java/fop: fop-2.0.ebuild ChangeLog
@ 2015-06-27 17:53 Agostino Sarubbo (ago)
  0 siblings, 0 replies; 10+ messages in thread
From: Agostino Sarubbo (ago) @ 2015-06-27 17:53 UTC (permalink / raw
  To: gentoo-commits

ago         15/06/27 17:53:42

  Modified:             fop-2.0.ebuild ChangeLog
  Log:
  Stable for x86, wrt bug #553370
  
  (Portage version: 2.2.18/cvs/Linux x86_64, RepoMan options: --include-arches="x86", signed Manifest commit with key 7194459F)

Revision  Changes    Path
1.5                  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.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/fop-2.0.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/fop-2.0.ebuild?r1=1.4&r2=1.5

Index: fop-2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fop-2.0.ebuild	27 Jun 2015 17:53:16 -0000	1.4
+++ fop-2.0.ebuild	27 Jun 2015 17:53:42 -0000	1.5
@@ -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.4 2015/06/27 17:53:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v 1.5 2015/06/27 17:53:42 ago 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
@@ -17,7 +17,7 @@
 HOMEPAGE="http://xmlgraphics.apache.org/fop/"
 SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip"
 
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="hyphenation jai"
 LICENSE="Apache-2.0"
 SLOT="2"



1.76                 dev-java/fop/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- ChangeLog	27 Jun 2015 17:53:16 -0000	1.75
+++ ChangeLog	27 Jun 2015 17:53:42 -0000	1.76
@@ -1,6 +1,9 @@
 # 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.75 2015/06/27 17:53:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.76 2015/06/27 17:53:42 ago Exp $
+
+  27 Jun 2015; Agostino Sarubbo <ago@gentoo.org> fop-2.0.ebuild:
+  Stable for x86, wrt bug #553370
 
   27 Jun 2015; Agostino Sarubbo <ago@gentoo.org> fop-2.0.ebuild:
   Stable for amd64, wrt bug #553370





^ permalink raw reply	[flat|nested] 10+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-java/fop: fop-2.0.ebuild ChangeLog
@ 2015-06-27 18:47 Patrice Clement (monsieurp)
  0 siblings, 0 replies; 10+ messages in thread
From: Patrice Clement (monsieurp) @ 2015-06-27 18:47 UTC (permalink / raw
  To: gentoo-commits

monsieurp    15/06/27 18:47:54

  Modified:             fop-2.0.ebuild ChangeLog
  Log:
  Use a combination of - instead of  courtesy of James Le Cuirot <chewi@gentoo.org>. 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.6                  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.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/fop-2.0.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/fop-2.0.ebuild?r1=1.5&r2=1.6

Index: fop-2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fop-2.0.ebuild	27 Jun 2015 17:53:42 -0000	1.5
+++ fop-2.0.ebuild	27 Jun 2015 18:47:54 -0000	1.6
@@ -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.5 2015/06/27 17:53:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v 1.6 2015/06/27 18:47:54 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
@@ -22,6 +22,8 @@
 LICENSE="Apache-2.0"
 SLOT="2"
 
+MY_P="${PN}-${SLOT}"
+
 # Doesn't work with java.awt.headless, requires Mockito.
 RESTRICT="test"
 
@@ -108,12 +110,12 @@
 
 	if use hyphenation; then
 		java-pkg_dojar build/fop-hyph.jar
-		insinto /usr/share/${P}/
+		insinto /usr/share/${MY_P}/
 		doins -r hyph
 	fi
 
 	# Doesn't support everything upstream launcher does...
-	java-pkg_dolauncher ${P} --main org.apache.fop.cli.Main
+	java-pkg_dolauncher ${MY_P} --main org.apache.fop.cli.Main
 
 	dodoc NOTICE README
 



1.79                 dev-java/fop/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- ChangeLog	27 Jun 2015 18:30:43 -0000	1.78
+++ ChangeLog	27 Jun 2015 18:47:54 -0000	1.79
@@ -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.78 2015/06/27 18:30:43 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.79 2015/06/27 18:47:54 monsieurp Exp $
+
+  27 Jun 2015; Patrice Clement <monsieurp@gentoo.org> fop-2.0.ebuild:
+  Use a combination of - instead of  courtesy of James Le Cuirot
+  <chewi@gentoo.org>. Fix bug 553392.
 
   27 Jun 2015; Patrice Clement <monsieurp@gentoo.org> metadata.xml:
   Remove unused USE flag and clear QA warning.





^ permalink raw reply	[flat|nested] 10+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-java/fop: fop-2.0.ebuild ChangeLog
@ 2015-06-27 21:28 Patrice Clement (monsieurp)
  0 siblings, 0 replies; 10+ messages in thread
From: Patrice Clement (monsieurp) @ 2015-06-27 21:28 UTC (permalink / raw
  To: gentoo-commits

monsieurp    15/06/27 21:28:33

  Modified:             fop-2.0.ebuild ChangeLog
  Log:
  Keyword for ppc+ppc64. Signed off by James Le Cuirot <chewi@gentoo.org>.
  
  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.7                  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.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/fop-2.0.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/fop-2.0.ebuild?r1=1.6&r2=1.7

Index: fop-2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fop-2.0.ebuild	27 Jun 2015 18:47:54 -0000	1.6
+++ fop-2.0.ebuild	27 Jun 2015 21:28:33 -0000	1.7
@@ -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.6 2015/06/27 18:47:54 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v 1.7 2015/06/27 21:28:33 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
@@ -9,7 +9,6 @@
 EAPI="5"
 
 JAVA_PKG_IUSE="doc examples source test"
-WANT_ANT_TASKS="ant-trax"
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -17,7 +16,7 @@
 HOMEPAGE="http://xmlgraphics.apache.org/fop/"
 SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip"
 
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 x86 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="hyphenation jai"
 LICENSE="Apache-2.0"
 SLOT="2"



1.80                 dev-java/fop/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- ChangeLog	27 Jun 2015 18:47:54 -0000	1.79
+++ ChangeLog	27 Jun 2015 21:28:33 -0000	1.80
@@ -1,6 +1,9 @@
 # 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.79 2015/06/27 18:47:54 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.80 2015/06/27 21:28:33 monsieurp Exp $
+
+  27 Jun 2015; Patrice Clement <monsieurp@gentoo.org> fop-2.0.ebuild:
+  Keyword for ppc+ppc64. Signed off by James Le Cuirot <chewi@gentoo.org>.
 
   27 Jun 2015; Patrice Clement <monsieurp@gentoo.org> fop-2.0.ebuild:
   Use a combination of - instead of  courtesy of James Le Cuirot





^ permalink raw reply	[flat|nested] 10+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-java/fop: fop-2.0.ebuild ChangeLog
@ 2015-06-28 15:01 Patrice Clement (monsieurp)
  0 siblings, 0 replies; 10+ messages in thread
From: Patrice Clement (monsieurp) @ 2015-06-28 15:01 UTC (permalink / raw
  To: gentoo-commits

monsieurp    15/06/28 15:01:28

  Modified:             fop-2.0.ebuild ChangeLog
  Log:
  Stable for ppc+ppc64 with ALLARCHES.
  
  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.8                  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.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/fop-2.0.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/fop-2.0.ebuild?r1=1.7&r2=1.8

Index: fop-2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fop-2.0.ebuild	27 Jun 2015 21:28:33 -0000	1.7
+++ fop-2.0.ebuild	28 Jun 2015 15:01:28 -0000	1.8
@@ -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.7 2015/06/27 21:28:33 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v 1.8 2015/06/28 15:01:28 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
@@ -16,7 +16,7 @@
 HOMEPAGE="http://xmlgraphics.apache.org/fop/"
 SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip"
 
-KEYWORDS="amd64 x86 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 x86 ppc ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="hyphenation jai"
 LICENSE="Apache-2.0"
 SLOT="2"



1.81                 dev-java/fop/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- ChangeLog	27 Jun 2015 21:28:33 -0000	1.80
+++ ChangeLog	28 Jun 2015 15:01:28 -0000	1.81
@@ -1,6 +1,9 @@
 # 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.80 2015/06/27 21:28:33 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.81 2015/06/28 15:01:28 monsieurp Exp $
+
+  28 Jun 2015; Patrice Clement <monsieurp@gentoo.org> fop-2.0.ebuild:
+  Stable for ppc+ppc64 with ALLARCHES.
 
   27 Jun 2015; Patrice Clement <monsieurp@gentoo.org> fop-2.0.ebuild:
   Keyword for ppc+ppc64. Signed off by James Le Cuirot <chewi@gentoo.org>.





^ permalink raw reply	[flat|nested] 10+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-java/fop: fop-2.0.ebuild ChangeLog
@ 2015-06-29 12:33 Patrice Clement (monsieurp)
  0 siblings, 0 replies; 10+ messages in thread
From: Patrice Clement (monsieurp) @ 2015-06-29 12:33 UTC (permalink / raw
  To: gentoo-commits

monsieurp    15/06/29 12:33:34

  Modified:             fop-2.0.ebuild ChangeLog
  Log:
  Set JAVA_ANT_ENCODING to ISO-8859-1. Fix bug 553494.
  
  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.9                  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.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/fop-2.0.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/fop-2.0.ebuild?r1=1.8&r2=1.9

Index: fop-2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fop-2.0.ebuild	28 Jun 2015 15:01:28 -0000	1.8
+++ fop-2.0.ebuild	29 Jun 2015 12:33:34 -0000	1.9
@@ -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.8 2015/06/28 15:01:28 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v 1.9 2015/06/29 12:33:34 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
@@ -23,7 +23,7 @@
 
 MY_P="${PN}-${SLOT}"
 
-# Doesn't work with java.awt.headless, requires Mockito.
+# Tests are broken even in 2.0
 RESTRICT="test"
 
 CDEPEND="
@@ -36,13 +36,13 @@
 	dev-java/avalon-framework:4.2
 	dev-java/xmlgraphics-commons:2
 	dev-java/xml-commons-external:1.3
+	dev-java/qdox:1.12
 	jai? ( dev-java/sun-jai-bin:0 )"
 
 RDEPEND=">=virtual/jre-1.6
 	${CDEPEND}"
 
 DEPEND=">=virtual/jdk-1.6
-	dev-java/qdox:1.12
 	hyphenation? ( dev-java/offo-hyphenation:0 )
 	app-arch/unzip
 	${CDEPEND}
@@ -57,6 +57,7 @@
 	find "${S}" -name '*.jar' -print -delete || die
 }
 
+JAVA_ANT_ENCODING="ISO-8859-1"
 JAVA_ANT_REWRITE_CLASSPATH="true"
 EANT_DOC_TARGET="javadocs"
 EANT_BUILD_TARGET="package"
@@ -105,10 +106,10 @@
 }
 
 src_install() {
-	java-pkg_dojar build/fop.jar build/fop-sandbox.jar
+	java-pkg_dojar build/${PN} build/${PN}-sandbox.jar
 
 	if use hyphenation; then
-		java-pkg_dojar build/fop-hyph.jar
+		java-pkg_dojar build/${PN}-hyph.jar
 		insinto /usr/share/${MY_P}/
 		doins -r hyph
 	fi



1.82                 dev-java/fop/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- ChangeLog	28 Jun 2015 15:01:28 -0000	1.81
+++ ChangeLog	29 Jun 2015 12:33:34 -0000	1.82
@@ -1,6 +1,9 @@
 # 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.81 2015/06/28 15:01:28 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.82 2015/06/29 12:33:34 monsieurp Exp $
+
+  29 Jun 2015; Patrice Clement <monsieurp@gentoo.org> fop-2.0.ebuild:
+  Set JAVA_ANT_ENCODING to ISO-8859-1. Fix bug 553494.
 
   28 Jun 2015; Patrice Clement <monsieurp@gentoo.org> fop-2.0.ebuild:
   Stable for ppc+ppc64 with ALLARCHES.





^ permalink raw reply	[flat|nested] 10+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-java/fop: fop-2.0.ebuild ChangeLog
@ 2015-07-11 17:58 Patrice Clement (monsieurp)
  0 siblings, 0 replies; 10+ messages in thread
From: Patrice Clement (monsieurp) @ 2015-07-11 17:58 UTC (permalink / raw
  To: gentoo-commits

monsieurp    15/07/11 17:58:30

  Modified:             fop-2.0.ebuild ChangeLog
  Log:
  Mend compiling process by dropping previous patch and adding back eventResourceGenerator task definition so that event-model.xml files are correctly generated. Add required jars into lib directory using java-pkg_jar-from. Fix bug 554386.
  
  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.11                 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.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/fop-2.0.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/fop/fop-2.0.ebuild?r1=1.10&r2=1.11

Index: fop-2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fop-2.0.ebuild	5 Jul 2015 21:51:08 -0000	1.10
+++ fop-2.0.ebuild	11 Jul 2015 17:58:30 -0000	1.11
@@ -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.10 2015/07/05 21:51:08 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v 1.11 2015/07/11 17:58:30 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
@@ -67,19 +67,28 @@
 "
 
 TARGETS=(
+	resourcegen
 	jar-hyphenation
 	jar-sandbox
 	jar-main
 )
 
 java_prepare() {
-	epatch "${FILESDIR}"/${P}-build.xml.patch
-
-	find "${S}"/lib -type f -name \*.jar | xargs rm -v
+	find "${S}"/lib -type f | xargs rm -v
 }
 
 src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only qdox-1.12)"
+	# https://bugs.gentoo.org/show_bug.cgi?id=554386
+	# http://wiki.apache.org/xmlgraphics-fop/HowTo/BuildFOPAlternatively
+	java-pkg_jar-from --into lib qdox-1.12 qdox.jar
+	java-pkg_jar-from --into lib xmlgraphics-commons-2 xmlgraphics-commons.jar
+	java-pkg_jar-from --into lib commons-logging commons-logging.jar
+	java-pkg_jar-from --into lib commons-io-1 commons-io.jar
+	java-pkg_jar-from --into lib fontbox-1.7 fontbox.jar
+	java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis-ext.jar
+	java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis.jar
+	java-pkg_jar-from --into lib avalon-framework-4.2 avalon-framework.jar
+	java-pkg_jar-from --virtual --into lib servlet-api-3.0 servlet-api.jar
 
 	for target in ${TARGETS[@]}; do
 		EANT_BUILD_TARGET="${target}" \
@@ -91,7 +100,6 @@
 		EANT_BUILD_TARGET="javadocs" \
 			java-pkg-2_src_compile
 	fi
-
 }
 
 src_install() {



1.84                 dev-java/fop/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- ChangeLog	5 Jul 2015 21:51:08 -0000	1.83
+++ ChangeLog	11 Jul 2015 17:58:30 -0000	1.84
@@ -1,6 +1,13 @@
 # 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.83 2015/07/05 21:51:08 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.84 2015/07/11 17:58:30 monsieurp Exp $
+
+  11 Jul 2015; Patrice Clement <monsieurp@gentoo.org>
+  -files/fop-2.0-build.xml.patch, fop-2.0.ebuild:
+  Mend compiling process by dropping previous patch and adding back
+  eventResourceGenerator task definition so that event-model.xml files are
+  correctly generated. Add required jars into lib directory using java-pkg_jar-
+  from. Fix bug 554386.
 
   05 Jul 2015; Patrice Clement <monsieurp@gentoo.org>
   +files/fop-2.0-build.xml.patch, fop-2.0.ebuild, metadata.xml:





^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2015-07-11 17:58 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-27 21:28 [gentoo-commits] gentoo-x86 commit in dev-java/fop: fop-2.0.ebuild ChangeLog Patrice Clement (monsieurp)
  -- strict thread matches above, loose matches on Subject: below --
2015-07-11 17:58 Patrice Clement (monsieurp)
2015-06-29 12:33 Patrice Clement (monsieurp)
2015-06-28 15:01 Patrice Clement (monsieurp)
2015-06-27 18:47 Patrice Clement (monsieurp)
2015-06-27 17:53 Agostino Sarubbo (ago)
2015-06-27 17:53 Agostino Sarubbo (ago)
2015-06-27 13:04 Patrice Clement (monsieurp)
2015-06-26 23:09 Patrice Clement (monsieurp)
2015-06-26 23:05 Patrice Clement (monsieurp)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox