1 |
commit: ef0eb0a4f87136856fb150bb13c16f124c868220 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 25 12:44:38 2016 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 25 22:23:27 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef0eb0a4 |
7 |
|
8 |
dev-java/freehep-io: Version bump to 2.2.2, EAPI bump, add tests |
9 |
|
10 |
Package-Manager: portage-2.3.0_rc1 |
11 |
|
12 |
dev-java/freehep-io/Manifest | 2 +- |
13 |
dev-java/freehep-io/freehep-io-2.0.2.ebuild | 25 ------------------- |
14 |
dev-java/freehep-io/freehep-io-2.2.2.ebuild | 37 +++++++++++++++++++++++++++++ |
15 |
dev-java/freehep-io/metadata.xml | 3 +++ |
16 |
4 files changed, 41 insertions(+), 26 deletions(-) |
17 |
|
18 |
diff --git a/dev-java/freehep-io/Manifest b/dev-java/freehep-io/Manifest |
19 |
index 0e3c389..dfcfd9b 100644 |
20 |
--- a/dev-java/freehep-io/Manifest |
21 |
+++ b/dev-java/freehep-io/Manifest |
22 |
@@ -1 +1 @@ |
23 |
-DIST freehep-io-2.0.2-sources.jar 58815 SHA256 806f3404bb1d29a68d5bf198611ce1634cb3296f533430edababab35d77b19ea SHA512 a04e39ffeb69c215f897d09e1adeb083477cd54d1ea5e73bbbac7161c54d181db70d690e4684871eaf137ece3c056862f8ab8a460f6de91d3e072ac84d6c1e82 WHIRLPOOL 6b30c46840a99b5e9d13dde5ab474d51ba748ba1b4b2f795a45b1748e6e508ff8acb1a6485ff40fe57ad78e3cf1b733b3f81d1ea6e2f55d8b484b930b67c08f6 |
24 |
+DIST freehep-io-2.2.2.tar.gz 76935 SHA256 dd66232e8c484d35a732f05e04834d520a04769f4bc86c6eeaee764bf96f511b SHA512 1cc7cab3d9648b119aa8c637c84cd985adc0f9dd2cdd153021500831325d719ef5fa41d8964ccbeed3af95b87e09c4886597c0ede1370a209f6807932636b0ee WHIRLPOOL db39f0e68e17416d2893462c554983c8eaa8831e505b6868ce29c03ed6c2d99f446d5e752f6d6ac5cb69d9daf9c16720a1941bdbdaf8e985dab6c838497fe518 |
25 |
|
26 |
diff --git a/dev-java/freehep-io/freehep-io-2.0.2.ebuild b/dev-java/freehep-io/freehep-io-2.0.2.ebuild |
27 |
deleted file mode 100644 |
28 |
index b2b594a..0000000 |
29 |
--- a/dev-java/freehep-io/freehep-io-2.0.2.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,25 +0,0 @@ |
32 |
-# Copyright 1999-2010 Gentoo Foundation |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
-# $Id$ |
35 |
- |
36 |
-JAVA_PKG_IUSE="" |
37 |
-GROUP_ID="org.freehep" |
38 |
-MAVEN2_REPOSITORIES="http://java.freehep.org/maven2" |
39 |
- |
40 |
-inherit java-pkg-2 java-mvn-src |
41 |
- |
42 |
-DESCRIPTION="High Energy Physics Java library - FreeHEP I/O Library" |
43 |
-HOMEPAGE="http://java.freehep.org/" |
44 |
- |
45 |
-LICENSE="LGPL-2.1" |
46 |
-SLOT="0" |
47 |
-KEYWORDS="~amd64 ~x86" |
48 |
-IUSE="" |
49 |
- |
50 |
-CDEPEND=">=dev-java/freehep-util-2.0.1 |
51 |
- dev-java/junit" |
52 |
-DEPEND=">=virtual/jdk-1.5 |
53 |
- ${CDEPEND}" |
54 |
-RDEPEND=">=virtual/jre-1.5 |
55 |
- ${CDEPEND}" |
56 |
-JAVA_GENTOO_CLASSPATH="freehep-util,junit" |
57 |
|
58 |
diff --git a/dev-java/freehep-io/freehep-io-2.2.2.ebuild b/dev-java/freehep-io/freehep-io-2.2.2.ebuild |
59 |
new file mode 100644 |
60 |
index 0000000..ab28fb3 |
61 |
--- /dev/null |
62 |
+++ b/dev-java/freehep-io/freehep-io-2.2.2.ebuild |
63 |
@@ -0,0 +1,37 @@ |
64 |
+# Copyright 1999-2016 Gentoo Foundation |
65 |
+# Distributed under the terms of the GNU General Public License v2 |
66 |
+# $Id$ |
67 |
+ |
68 |
+EAPI=5 |
69 |
+ |
70 |
+JAVA_PKG_IUSE="doc source" |
71 |
+ |
72 |
+inherit java-pkg-2 java-pkg-simple |
73 |
+ |
74 |
+DESCRIPTION="High Energy Physics Java library - FreeHEP I/O Library" |
75 |
+HOMEPAGE="http://java.freehep.org/" |
76 |
+SRC_URI="https://github.com/freehep/${PN}/archive/${P}.tar.gz" |
77 |
+LICENSE="Apache-2.0 LGPL-2.1" |
78 |
+SLOT="0" |
79 |
+KEYWORDS="~amd64 ~x86" |
80 |
+IUSE="test" |
81 |
+ |
82 |
+DEPEND=">=virtual/jdk-1.7 |
83 |
+ test? ( dev-java/junit:4 )" |
84 |
+ |
85 |
+RDEPEND=">=virtual/jre-1.7" |
86 |
+ |
87 |
+S="${WORKDIR}/${PN}-${P}" |
88 |
+JAVA_SRC_DIR="src/main/java" |
89 |
+ |
90 |
+src_test() { |
91 |
+ local DIR=src/test/java |
92 |
+ local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4)" |
93 |
+ local TESTS=$(find ${DIR} -name "*Test.java" ! -name "Abstract*") |
94 |
+ TESTS="${TESTS//src\/test\/java\/}" |
95 |
+ TESTS="${TESTS//.java}" |
96 |
+ TESTS="${TESTS//\//.}" |
97 |
+ |
98 |
+ ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java") |
99 |
+ ejunit4 -classpath "${CP}" ${TESTS} |
100 |
+} |
101 |
|
102 |
diff --git a/dev-java/freehep-io/metadata.xml b/dev-java/freehep-io/metadata.xml |
103 |
index 952a4b9..ff99e83 100644 |
104 |
--- a/dev-java/freehep-io/metadata.xml |
105 |
+++ b/dev-java/freehep-io/metadata.xml |
106 |
@@ -5,4 +5,7 @@ |
107 |
<email>java@g.o</email> |
108 |
<name>Java</name> |
109 |
</maintainer> |
110 |
+ <upstream> |
111 |
+ <remote-id type="github">freehep/freehep-io</remote-id> |
112 |
+ </upstream> |
113 |
</pkgmetadata> |