commit:     ef0eb0a4f87136856fb150bb13c16f124c868220
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 12:44:38 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed May 25 22:23:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef0eb0a4

dev-java/freehep-io: Version bump to 2.2.2, EAPI bump, add tests

Package-Manager: portage-2.3.0_rc1

 dev-java/freehep-io/Manifest                |  2 +-
 dev-java/freehep-io/freehep-io-2.0.2.ebuild | 25 -------------------
 dev-java/freehep-io/freehep-io-2.2.2.ebuild | 37 +++++++++++++++++++++++++++++
 dev-java/freehep-io/metadata.xml            |  3 +++
 4 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/dev-java/freehep-io/Manifest b/dev-java/freehep-io/Manifest
index 0e3c389..dfcfd9b 100644
--- a/dev-java/freehep-io/Manifest
+++ b/dev-java/freehep-io/Manifest
@@ -1 +1 @@
-DIST freehep-io-2.0.2-sources.jar 58815 SHA256 
806f3404bb1d29a68d5bf198611ce1634cb3296f533430edababab35d77b19ea SHA512 
a04e39ffeb69c215f897d09e1adeb083477cd54d1ea5e73bbbac7161c54d181db70d690e4684871eaf137ece3c056862f8ab8a460f6de91d3e072ac84d6c1e82
 WHIRLPOOL 
6b30c46840a99b5e9d13dde5ab474d51ba748ba1b4b2f795a45b1748e6e508ff8acb1a6485ff40fe57ad78e3cf1b733b3f81d1ea6e2f55d8b484b930b67c08f6
+DIST freehep-io-2.2.2.tar.gz 76935 SHA256 
dd66232e8c484d35a732f05e04834d520a04769f4bc86c6eeaee764bf96f511b SHA512 
1cc7cab3d9648b119aa8c637c84cd985adc0f9dd2cdd153021500831325d719ef5fa41d8964ccbeed3af95b87e09c4886597c0ede1370a209f6807932636b0ee
 WHIRLPOOL 
db39f0e68e17416d2893462c554983c8eaa8831e505b6868ce29c03ed6c2d99f446d5e752f6d6ac5cb69d9daf9c16720a1941bdbdaf8e985dab6c838497fe518

diff --git a/dev-java/freehep-io/freehep-io-2.0.2.ebuild 
b/dev-java/freehep-io/freehep-io-2.0.2.ebuild
deleted file mode 100644
index b2b594a..0000000
--- a/dev-java/freehep-io/freehep-io-2.0.2.ebuild
+++ /dev/null
@@ -1,25 +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 I/O Library"
-HOMEPAGE="http://java.freehep.org/";
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND=">=dev-java/freehep-util-2.0.1
-       dev-java/junit"
-DEPEND=">=virtual/jdk-1.5
-       ${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-       ${CDEPEND}"
-JAVA_GENTOO_CLASSPATH="freehep-util,junit"

diff --git a/dev-java/freehep-io/freehep-io-2.2.2.ebuild 
b/dev-java/freehep-io/freehep-io-2.2.2.ebuild
new file mode 100644
index 0000000..ab28fb3
--- /dev/null
+++ b/dev-java/freehep-io/freehep-io-2.2.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP I/O Library"
+HOMEPAGE="http://java.freehep.org/";
+SRC_URI="https://github.com/freehep/${PN}/archive/${P}.tar.gz";
+LICENSE="Apache-2.0 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND=">=virtual/jdk-1.7
+       test? ( dev-java/junit:4 )"
+
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${PN}-${P}"
+JAVA_SRC_DIR="src/main/java"
+
+src_test() {
+       local DIR=src/test/java
+       local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4)"
+       local TESTS=$(find ${DIR} -name "*Test.java" ! -name "Abstract*")
+       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-io/metadata.xml b/dev-java/freehep-io/metadata.xml
index 952a4b9..ff99e83 100644
--- a/dev-java/freehep-io/metadata.xml
+++ b/dev-java/freehep-io/metadata.xml
@@ -5,4 +5,7 @@
                <email>[email protected]</email>
                <name>Java</name>
        </maintainer>
+       <upstream>
+               <remote-id type="github">freehep/freehep-io</remote-id>
+       </upstream>
 </pkgmetadata>

Reply via email to