aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2015-06-22 13:37:13 +0200
committerJustin Lecher <jlec@gentoo.org>2015-06-22 13:37:13 +0200
commit40ae08e0322484a599551849e7914769ef491082 (patch)
treed820a6ea14b52c56bbbcaf8a9a548f60f81a04e1 /dev-java/jeuclid-core
parentsci-chemistry/phenix-bin: Drop old (diff)
downloadsci-40ae08e0322484a599551849e7914769ef491082.tar.gz
sci-40ae08e0322484a599551849e7914769ef491082.tar.bz2
sci-40ae08e0322484a599551849e7914769ef491082.zip
dev-java/jeuclid-core: Fix SLOT version of batik
Package-Manager: portage-2.2.20
Diffstat (limited to 'dev-java/jeuclid-core')
-rw-r--r--dev-java/jeuclid-core/ChangeLog4
-rw-r--r--dev-java/jeuclid-core/Manifest1
-rw-r--r--dev-java/jeuclid-core/jeuclid-core-3.1.8.ebuild60
-rw-r--r--dev-java/jeuclid-core/jeuclid-core-3.1.9-r1.ebuild2
4 files changed, 5 insertions, 62 deletions
diff --git a/dev-java/jeuclid-core/ChangeLog b/dev-java/jeuclid-core/ChangeLog
index 5c2ebdcc5..bc78f18b1 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 <jlec@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 <jlec@gentoo.org> metadata.xml:
dev-java/jeuclid-core: Updating remote-id in metadata.xml
diff --git a/dev-java/jeuclid-core/Manifest b/dev-java/jeuclid-core/Manifest
index 57cdc53f7..6d66029c7 100644
--- a/dev-java/jeuclid-core/Manifest
+++ b/dev-java/jeuclid-core/Manifest
@@ -1,2 +1 @@
-DIST jeuclid-parent-3.1.8-src.zip 8844588 SHA256 4c80740a78bef42c6e5b87e09df931448caa210469382270ac4f70016ac21a0c
DIST jeuclid-parent-3.1.9-src.zip 8858746 SHA256 80bddad60c02bb55d430cab78818c3a43223877c62bc71f1c7326e2ff8fbe362 SHA512 ae55ffa469664abbf5545479d7968fd36e003ccc3f21687a43e79d843d6d3855b779ebeca3d38cc0c4a466c2de21bffce8e7d14cb2199f57e125b58ac100f203 WHIRLPOOL 610e7dad58bece09eb1b0caec06de1c9afbb8bfaa9639c78c30b64b60d17029c8ed8d58c96b89d8f395a8fcab2025d274e781ed4b3dcb7ba7ed738375f299e88
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 19f8526d1..000000000
--- 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 be1a10414..319df8bd2 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