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

Package-Manager: portage-2.3.0_rc1

diff --git a/dev-java/freehep-graphicsio/Manifest b/dev-java/freehep-graphicsio/Manifest
index 2940a9f299309c460e5e8c33e9c4128f3fbd5ed2..249f670c4c25d5e2993a12afcf92f142e4cdb4be 100644 (file)
--- a/dev-java/freehep-graphicsio/Manifest
+++ b/dev-java/freehep-graphicsio/Manifest
@@ -1 +1 @@
-DIST freehep-graphicsio-2.1.1-sources.jar 636244 SHA256 744fe063505a492fb0fccb0a8890a5cb8a20a9c30276d676ca5bcf6bb2d859bd SHA512 ea6df974c0e7c1fa6ad72dc698434d9c33030a55d0f6cd96b5b5b381ef29ad7d88f25c09581056ef015acfd8a53fb8cb84151fe9748e5d30f8454c1bd14f643e WHIRLPOOL 34fd59acd8556f9b86e72d305db875c81f38b59b82a7618cf1f7b6470bd4fed8eb70a9feaa90591151866972a67c25a4a7f40ca7893c32eb433dabea986265cd
+DIST freehep-vectorgraphics-2.4.tar.gz 4118379 SHA256 2c7e1bbb3c056e9de83e5f7d9e0b2aeb3f46734000cdd0f18423eb43216305dd SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382 WHIRLPOOL 62d61e05935348cf8b5d81033408729b02377f8a91760d08ab98a8e1451ea4d44e992a98dfb951978272ca842dbfa0d2885430cd16428dcf4da005aa092fbe76

diff --git a/dev-java/freehep-graphicsio/freehep-graphicsio-2.1.1.ebuild b/dev-java/freehep-graphicsio/freehep-graphicsio-2.1.1.ebuild
deleted file mode 100644 (file)
index 9fd78da..0000000
--- a/dev-java/freehep-graphicsio/freehep-graphicsio-2.1.1.ebuild
+++ /dev/null
@@ -1,28 +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 Base Library"
-HOMEPAGE="http://java.freehep.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND=">=dev-java/freehep-graphics2d-2.1.1
-       dev-java/freehep-export
-       dev-java/freehep-io
-       dev-java/freehep-util
-       dev-java/freehep-swing"
-DEPEND=">=virtual/jdk-1.5
-       ${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-       ${CDEPEND}"
-JAVA_GENTOO_CLASSPATH="freehep-graphics2d,freehep-export,freehep-io,freehep-util,freehep-swing"

diff --git a/dev-java/freehep-graphicsio/freehep-graphicsio-2.4.ebuild b/dev-java/freehep-graphicsio/freehep-graphicsio-2.4.ebuild
new file mode 100644 (file)
index 0000000..b59766e
--- /dev/null
+++ b/dev-java/freehep-graphicsio/freehep-graphicsio-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 GraphicsIO Base 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"
+IUSE="test"
+
+CDEPEND="~dev-java/freehep-graphics2d-${PV}:${SLOT}
+       ~dev-java/freehep-graphicsbase-${PV}:${SLOT}
+       dev-java/freehep-io:0"
+
+DEPEND="${CDEPEND}
+       >=virtual/jdk-1.7
+       test? ( 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-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,${JAVA_GENTOO_CLASSPATH})"
+       local TESTS=$(find ${DIR} -name "*Test.java")
+       TESTS="${TESTS//src\/test\/java\/}"
+       TESTS="${TESTS//.java}"
+       TESTS="${TESTS//\//.}"
+
+       ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
+       ejunit4 -classpath "${CP}" ${TESTS}
+}

diff --git a/dev-java/freehep-graphicsio/metadata.xml b/dev-java/freehep-graphicsio/metadata.xml
index 952a4b9b605c580d061e9066fa199f0b315ea45e..696a250adce43f073d3f51820a456fc52c5036d2 100644 (file)
--- a/dev-java/freehep-graphicsio/metadata.xml
+++ b/dev-java/freehep-graphicsio/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>