From 8b3ed5606414572bc0fca5cf84fbe8e37c88e074 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <chewi@gentoo.org>
Date: Wed, 25 May 2016 22:07:00 +0100
Subject: dev-java/freehep-graphicsio-svg: Version bump to 2.4, EAPI bump,
 tests

Package-Manager: portage-2.3.0_rc1
---
 dev-java/freehep-graphicsio-svg/Manifest           |  2 +-
 .../freehep-graphicsio-svg-2.1.1.ebuild            | 32 --------------
 .../freehep-graphicsio-svg-2.4.ebuild              | 51 ++++++++++++++++++++++
 dev-java/freehep-graphicsio-svg/metadata.xml       |  3 ++
 4 files changed, 55 insertions(+), 33 deletions(-)
 delete mode 100644 dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.1.1.ebuild
 create mode 100644 dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.4.ebuild

(limited to 'dev-java')

diff --git a/dev-java/freehep-graphicsio-svg/Manifest b/dev-java/freehep-graphicsio-svg/Manifest
index 924e092b0648..249f670c4c25 100644
--- a/dev-java/freehep-graphicsio-svg/Manifest
+++ b/dev-java/freehep-graphicsio-svg/Manifest
@@ -1 +1 @@
-DIST freehep-graphicsio-svg-2.1.1-sources.jar 16943 SHA256 f9182db42a831634792144e9937c7669f54ca03e79af02441f08833d89cb1647 SHA512 da5959f58ba315d163eeee0b6ca5cb39d2f5b608117091d4257c7f791b16e8626e27c82f59b2ff547258c150b40096d311ecf7d5148e59daaa5e67d94dad2e8f WHIRLPOOL 46cf8fcd83775ac04b32e682d6f734fac797139e1bf8f8e074b57d4683dd2402d8aaf70de00b8b95429bcb9c859090b11a74c33ebcc303429e7f61e07713b611
+DIST freehep-vectorgraphics-2.4.tar.gz 4118379 SHA256 2c7e1bbb3c056e9de83e5f7d9e0b2aeb3f46734000cdd0f18423eb43216305dd SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382 WHIRLPOOL 62d61e05935348cf8b5d81033408729b02377f8a91760d08ab98a8e1451ea4d44e992a98dfb951978272ca842dbfa0d2885430cd16428dcf4da005aa092fbe76
diff --git a/dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.1.1.ebuild b/dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.1.1.ebuild
deleted file mode 100644
index a75d299b219b..000000000000
--- a/dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE=""
-GROUP_ID="org.freehep"
-MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
-
-inherit java-pkg-2 java-mvn-src
-
-DESCRIPTION="High Energy Physics Java library - FreeHEP Scalable Vector Graphics Driver"
-HOMEPAGE="http://java.freehep.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="dev-java/freehep-xml
-	>=dev-java/freehep-graphicsio-2.1.1
-	>=dev-java/freehep-graphicsio-tests-2.1.1
-	dev-java/junit
-	dev-java/freehep-util
-	dev-java/freehep-swing
-	dev-java/freehep-graphics2d
-	dev-java/freehep-io
-	dev-java/freehep-export"
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-JAVA_GENTOO_CLASSPATH="freehep-xml,freehep-graphicsio,freehep-graphicsio-tests,junit,freehep-util,freehep-swing,freehep-graphics2d,freehep-io,freehep-export"
diff --git a/dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.4.ebuild b/dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.4.ebuild
new file mode 100644
index 000000000000..4bab18ceed11
--- /dev/null
+++ b/dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="freehep-vectorgraphics"
+MY_P="${MY_PN}-${PV}"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP Scalable Vector Graphics Driver"
+HOMEPAGE="http://java.freehep.org/"
+SRC_URI="https://github.com/freehep/${MY_PN}/archive/${MY_P}.tar.gz"
+LICENSE="Apache-2.0 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="~dev-java/freehep-graphics2d-${PV}:${SLOT}
+	~dev-java/freehep-graphicsbase-${PV}:${SLOT}
+	~dev-java/freehep-graphicsio-${PV}:${SLOT}
+	dev-java/freehep-io:0"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7
+	test? (
+		~dev-java/freehep-graphicsio-tests-${PV}:${SLOT}
+		dev-java/junit:4
+	)"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}/${PN}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="freehep-graphics2d,freehep-graphicsbase,freehep-graphicsio,freehep-io"
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_test() {
+	local DIR=src/test/java
+	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,freehep-graphicsio-tests,${JAVA_GENTOO_CLASSPATH})"
+
+	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
+	ejunit4 -classpath "${CP}" org.freehep.graphicsio.svg.test.SVGTestSuite
+}
diff --git a/dev-java/freehep-graphicsio-svg/metadata.xml b/dev-java/freehep-graphicsio-svg/metadata.xml
index 952a4b9b605c..696a250adce4 100644
--- a/dev-java/freehep-graphicsio-svg/metadata.xml
+++ b/dev-java/freehep-graphicsio-svg/metadata.xml
@@ -5,4 +5,7 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">freehep/freehep-vectorgraphics</remote-id>
+	</upstream>
 </pkgmetadata>
-- 
cgit v1.2.3-65-gdbad