commit: 4507cf4c9a4819c4ba591bbb64472b8478699e0a Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com> AuthorDate: Sun Jul 27 13:07:45 2014 +0000 Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com> CommitDate: Sun Jul 27 13:07:45 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4507cf4c
dev-java/jeuclid-core: upgrade dependencies Package-Manager: portage-2.2.10 --- dev-java/jeuclid-core/ChangeLog | 10 ++++++++-- .../jeuclid-core/files/jeuclid-core-cast-issue.patch | 18 ++++++++++++++++++ ...core-3.1.9.ebuild => jeuclid-core-3.1.9-r1.ebuild} | 19 +++++-------------- 3 files changed, 31 insertions(+), 16 deletions(-) diff --git a/dev-java/jeuclid-core/ChangeLog b/dev-java/jeuclid-core/ChangeLog index 9b3617b..b75ef7d 100644 --- a/dev-java/jeuclid-core/ChangeLog +++ b/dev-java/jeuclid-core/ChangeLog @@ -1,7 +1,14 @@ # ChangeLog for dev-java/jeuclid-core -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*jeuclid-core-3.1.9-r1 (27 Jul 2014) + + 27 Jul 2014; Guillaume Horel <[email protected]> + +files/jeuclid-core-cast-issue.patch, +jeuclid-core-3.1.9-r1.ebuild, + -jeuclid-core-3.1.9.ebuild: + dev-java/jeuclid-core: upgrade dependencies + *jeuclid-core-3.1.9 (14 May 2012) 14 May 2012; Sébastien Fabbro <[email protected]> @@ -18,4 +25,3 @@ 22 Jan 2010; Sébastien Fabbro <[email protected]> +metadata.xml: Initial import. Ebuild initially submitted by Jiri Tyr, bug #224995 - diff --git a/dev-java/jeuclid-core/files/jeuclid-core-cast-issue.patch b/dev-java/jeuclid-core/files/jeuclid-core-cast-issue.patch new file mode 100644 index 0000000..2ff4670 --- /dev/null +++ b/dev-java/jeuclid-core/files/jeuclid-core-cast-issue.patch @@ -0,0 +1,18 @@ +Index: jeuclid-parent-3.1.9/jeuclid-core/src/main/java/net/sourceforge/jeuclid/converter/ConverterRegistry.java +=================================================================== +--- jeuclid-parent-3.1.9.orig/jeuclid-core/src/main/java/net/sourceforge/jeuclid/converter/ConverterRegistry.java 2010-02-12 15:10:32.000000000 +0100 ++++ jeuclid-parent-3.1.9/jeuclid-core/src/main/java/net/sourceforge/jeuclid/converter/ConverterRegistry.java 2013-08-20 14:55:16.000000000 +0200 +@@ -52,10 +52,10 @@ + */ + @SuppressWarnings("unchecked") + protected ConverterRegistry() { +- final Iterator<ConverterDetector> it = Service +- .providers(ConverterDetector.class); ++ final Iterator<Object> it = Service ++ .providers(ConverterDetector.class); + while (it.hasNext()) { +- final ConverterDetector det = it.next(); ++ final ConverterDetector det = (ConverterDetector) it.next(); + det.detectConversionPlugins(this); + } + } diff --git a/dev-java/jeuclid-core/jeuclid-core-3.1.9.ebuild b/dev-java/jeuclid-core/jeuclid-core-3.1.9-r1.ebuild similarity index 59% rename from dev-java/jeuclid-core/jeuclid-core-3.1.9.ebuild rename to dev-java/jeuclid-core/jeuclid-core-3.1.9-r1.ebuild index e3c3fe8..8d901a7 100644 --- a/dev-java/jeuclid-core/jeuclid-core-3.1.9.ebuild +++ b/dev-java/jeuclid-core/jeuclid-core-3.1.9-r1.ebuild @@ -20,9 +20,7 @@ COMMON_DEPEND="dev-java/ant-core dev-java/commons-logging dev-java/jcip-annotations dev-java/xml-commons-external:1.3 - dev-java/xmlgraphics-commons:1.3" - -# note: dev-java/jcip-annotations is in the java overlay + dev-java/xmlgraphics-commons:1.5" RDEPEND=">=virtual/jre-1.5 ${COMMON_DEPEND}" @@ -34,11 +32,8 @@ DEPEND=">=virtual/jdk-1.5 S="${WORKDIR}/jeuclid-parent-${PV}/${PN}" src_prepare() { - # remove support of FreeHep from JAVA files (not needed for FOP plugin) - # really not needed? - #rm -f src/main/java/net/sourceforge/jeuclid/converter/FreeHep* - - epatch "${FILESDIR}"/${PN}-no-freehep.patch + epatch "${FILESDIR}"/${PN}-no-freehep.patch \ + "${FILESDIR}"/${PN}-cast-issue.patch # create directory for dependencies mkdir lib && cd lib || die @@ -46,12 +41,8 @@ src_prepare() { # add dependencies into the lib dir java-pkg_jar-from ant-core ant.jar java-pkg_jar-from batik-1.7 batik-all.jar - java-pkg_jar-from commons-logging commons-logging.jar - java-pkg_jar-from jcip-annotations jcip-annotations.jar - java-pkg_jar-from xml-commons-external-1.3 xml-apis.jar - java-pkg_jar-from xmlgraphics-commons-1.3 xmlgraphics-commons.jar - #java-pkg_jar-from freehep-util freehep-util.jar - #java-pkg_jar-from freehep-graphics2d freehep-graphics2d.jar + java-pkg_jar-from commons-logging,jcip-annotations,xml-commons-external-1.3 + java-pkg_jar-from xml-commons-external-1.3,xmlgraphics-commons-1.5 } src_install() {
