commit: 40ae08e0322484a599551849e7914769ef491082 Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Mon Jun 22 11:37:13 2015 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Mon Jun 22 11:37:13 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=40ae08e0
dev-java/jeuclid-core: Fix SLOT version of batik Package-Manager: portage-2.2.20 dev-java/jeuclid-core/ChangeLog | 4 ++ dev-java/jeuclid-core/jeuclid-core-3.1.8.ebuild | 60 ---------------------- dev-java/jeuclid-core/jeuclid-core-3.1.9-r1.ebuild | 2 +- 3 files changed, 5 insertions(+), 61 deletions(-) diff --git a/dev-java/jeuclid-core/ChangeLog b/dev-java/jeuclid-core/ChangeLog index 5c2ebdc..bc78f18 100644 --- a/dev-java/jeuclid-core/ChangeLog +++ b/dev-java/jeuclid-core/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 22 Jun 2015; Justin Lecher <j...@gentoo.org> -jeuclid-core-3.1.8.ebuild, + jeuclid-core-3.1.9-r1.ebuild: + dev-java/jeuclid-core: Fix SLOT version of batik + 08 Jun 2015; Justin Lecher <j...@gentoo.org> metadata.xml: dev-java/jeuclid-core: Updating remote-id in metadata.xml diff --git a/dev-java/jeuclid-core/jeuclid-core-3.1.8.ebuild b/dev-java/jeuclid-core/jeuclid-core-3.1.8.ebuild deleted file mode 100644 index 19f8526..0000000 --- a/dev-java/jeuclid-core/jeuclid-core-3.1.8.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -JAVA_PKG_IUSE="source" -inherit eutils java-pkg-2 java-ant-2 - -DESCRIPTION="Core module of MathML rendering solution." -HOMEPAGE="http://jeuclid.sourceforge.net"; -SRC_URI="mirror://sourceforge/jeuclid/jeuclid-parent-${PV}-src.zip" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -COMMON_DEPEND="dev-java/ant-core - dev-java/batik:1.7 - 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 - -RDEPEND=">=virtual/jre-1.5 - ${COMMON_DEPEND}" - -DEPEND=">=virtual/jdk-1.5 - app-arch/unzip - ${COMMON_DEPEND}" - -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 - - # create directory for dependencies - mkdir lib || die - cd lib || die - - # 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 -} - -src_install() { - java-pkg_dojar target/${PN}.jar -} diff --git a/dev-java/jeuclid-core/jeuclid-core-3.1.9-r1.ebuild b/dev-java/jeuclid-core/jeuclid-core-3.1.9-r1.ebuild index be1a104..319df8b 100644 --- a/dev-java/jeuclid-core/jeuclid-core-3.1.9-r1.ebuild +++ b/dev-java/jeuclid-core/jeuclid-core-3.1.9-r1.ebuild @@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86" IUSE="" COMMON_DEPEND="dev-java/ant-core - dev-java/batik:1.7 + dev-java/batik:1.8= dev-java/commons-logging dev-java/jcip-annotations dev-java/xml-commons-external:1.3
