dev-java/freehep-graphicsio-tests: Version bump to 2.4, EAPI bump

Package-Manager: portage-2.3.0_rc1

4 files changed, 49 insertions, 33 deletions

diff --git a/dev-java/freehep-graphicsio-tests/Manifest b/dev-java/freehep-graphicsio-tests/Manifest
index 42cdbae1c862..249f670c4c25 100644
--- a/dev-java/freehep-graphicsio-tests/Manifest
+++ b/dev-java/freehep-graphicsio-tests/Manifest
@@ -1 +1 @@
-DIST freehep-graphicsio-tests-2.1.1-sources.jar 66076 SHA256 bcde7ffa56ed65195462fec89cb6b17c9701360831e7e0d37e9b4e275d9c5bf9 SHA512 a29110346620c249000e06873a4905c56f71f54f278423edb07d860f13466c71dedcb70affc3ed53d6a9f6e404583aed0feebe944c6b741e755186306b94acb4 WHIRLPOOL d6ed888e90692c047c1799c6e922ab4b5460ca776b55278f6fdfabc0acde34c58149583c2eb263754b06a51e975d8d7fec0a467c2e71f6280ccd03ce82f6d3f1
+DIST freehep-vectorgraphics-2.4.tar.gz 4118379 SHA256 2c7e1bbb3c056e9de83e5f7d9e0b2aeb3f46734000cdd0f18423eb43216305dd SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382 WHIRLPOOL 62d61e05935348cf8b5d81033408729b02377f8a91760d08ab98a8e1451ea4d44e992a98dfb951978272ca842dbfa0d2885430cd16428dcf4da005aa092fbe76
diff --git a/dev-java/freehep-graphicsio-tests/freehep-graphicsio-tests-2.1.1.ebuild b/dev-java/freehep-graphicsio-tests/freehep-graphicsio-tests-2.1.1.ebuild
deleted file mode 100644
index 06d5c816c354..000000000000
--- a/dev-java/freehep-graphicsio-tests/freehep-graphicsio-tests-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 GraphicsIO Test Library"
-HOMEPAGE="http://java.freehep.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="dev-java/freehep-export
-	>=dev-java/freehep-graphicsio-2.1.1
-	dev-java/junit
-	dev-java/freehep-misc-deps
-	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-export,freehep-graphicsio,junit,freehep-misc-deps,freehep-util,freehep-swing,freehep-graphics2d,freehep-io,freehep-export"
diff --git a/dev-java/freehep-graphicsio-tests/freehep-graphicsio-tests-2.4.ebuild b/dev-java/freehep-graphicsio-tests/freehep-graphicsio-tests-2.4.ebuild
new file mode 100644
index 000000000000..9e35fd424d2a
--- /dev/null
+++ b/dev-java/freehep-graphicsio-tests/freehep-graphicsio-tests-2.4.ebuild
@@ -0,0 +1,45 @@
+# 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 GraphicsIO Test Library"
+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"
+
+CDEPEND="~dev-java/freehep-graphics2d-${PV}:${SLOT}
+	~dev-java/freehep-graphicsbase-${PV}:${SLOT}
+	~dev-java/freehep-graphicsio-${PV}:${SLOT}
+	dev-java/freehep-io:0
+	dev-java/junit:4"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.7"
+
+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,junit-4"
+
+java_prepare() {
+	# Avoid additional deps for "extra" tests.
+	sed -i -r "/Test(Histogram|ScatterPlot)/d" \
+		${JAVA_SRC_DIR}/org/freehep/graphicsio/test/TestSuite.java || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
diff --git a/dev-java/freehep-graphicsio-tests/metadata.xml b/dev-java/freehep-graphicsio-tests/metadata.xml
index 952a4b9b605c..696a250adce4 100644
--- a/dev-java/freehep-graphicsio-tests/metadata.xml
+++ b/dev-java/freehep-graphicsio-tests/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>