1 |
commit: 5fcf8302a299adbdde6d3eb2ae78034edecba0b0 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 25 20:44:57 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=5fcf8302 |
7 |
|
8 |
dev-java/freehep-graphicsio: Version bump to 2.4, EAPI bump, add tests |
9 |
|
10 |
Package-Manager: portage-2.3.0_rc1 |
11 |
|
12 |
dev-java/freehep-graphicsio/Manifest | 2 +- |
13 |
.../freehep-graphicsio-2.1.1.ebuild | 28 ------------ |
14 |
.../freehep-graphicsio-2.4.ebuild | 51 ++++++++++++++++++++++ |
15 |
dev-java/freehep-graphicsio/metadata.xml | 3 ++ |
16 |
4 files changed, 55 insertions(+), 29 deletions(-) |
17 |
|
18 |
diff --git a/dev-java/freehep-graphicsio/Manifest b/dev-java/freehep-graphicsio/Manifest |
19 |
index 2940a9f..249f670 100644 |
20 |
--- a/dev-java/freehep-graphicsio/Manifest |
21 |
+++ b/dev-java/freehep-graphicsio/Manifest |
22 |
@@ -1 +1 @@ |
23 |
-DIST freehep-graphicsio-2.1.1-sources.jar 636244 SHA256 744fe063505a492fb0fccb0a8890a5cb8a20a9c30276d676ca5bcf6bb2d859bd SHA512 ea6df974c0e7c1fa6ad72dc698434d9c33030a55d0f6cd96b5b5b381ef29ad7d88f25c09581056ef015acfd8a53fb8cb84151fe9748e5d30f8454c1bd14f643e WHIRLPOOL 34fd59acd8556f9b86e72d305db875c81f38b59b82a7618cf1f7b6470bd4fed8eb70a9feaa90591151866972a67c25a4a7f40ca7893c32eb433dabea986265cd |
24 |
+DIST freehep-vectorgraphics-2.4.tar.gz 4118379 SHA256 2c7e1bbb3c056e9de83e5f7d9e0b2aeb3f46734000cdd0f18423eb43216305dd SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382 WHIRLPOOL 62d61e05935348cf8b5d81033408729b02377f8a91760d08ab98a8e1451ea4d44e992a98dfb951978272ca842dbfa0d2885430cd16428dcf4da005aa092fbe76 |
25 |
|
26 |
diff --git a/dev-java/freehep-graphicsio/freehep-graphicsio-2.1.1.ebuild b/dev-java/freehep-graphicsio/freehep-graphicsio-2.1.1.ebuild |
27 |
deleted file mode 100644 |
28 |
index 9fd78da..0000000 |
29 |
--- a/dev-java/freehep-graphicsio/freehep-graphicsio-2.1.1.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,28 +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 GraphicsIO Base 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-graphics2d-2.1.1 |
51 |
- dev-java/freehep-export |
52 |
- dev-java/freehep-io |
53 |
- dev-java/freehep-util |
54 |
- dev-java/freehep-swing" |
55 |
-DEPEND=">=virtual/jdk-1.5 |
56 |
- ${CDEPEND}" |
57 |
-RDEPEND=">=virtual/jre-1.5 |
58 |
- ${CDEPEND}" |
59 |
-JAVA_GENTOO_CLASSPATH="freehep-graphics2d,freehep-export,freehep-io,freehep-util,freehep-swing" |
60 |
|
61 |
diff --git a/dev-java/freehep-graphicsio/freehep-graphicsio-2.4.ebuild b/dev-java/freehep-graphicsio/freehep-graphicsio-2.4.ebuild |
62 |
new file mode 100644 |
63 |
index 0000000..b59766e |
64 |
--- /dev/null |
65 |
+++ b/dev-java/freehep-graphicsio/freehep-graphicsio-2.4.ebuild |
66 |
@@ -0,0 +1,51 @@ |
67 |
+# Copyright 1999-2016 Gentoo Foundation |
68 |
+# Distributed under the terms of the GNU General Public License v2 |
69 |
+# $Id$ |
70 |
+ |
71 |
+EAPI=5 |
72 |
+ |
73 |
+MY_PN="freehep-vectorgraphics" |
74 |
+MY_P="${MY_PN}-${PV}" |
75 |
+JAVA_PKG_IUSE="doc source" |
76 |
+ |
77 |
+inherit java-pkg-2 java-pkg-simple |
78 |
+ |
79 |
+DESCRIPTION="High Energy Physics Java library - FreeHEP GraphicsIO Base Library" |
80 |
+HOMEPAGE="http://java.freehep.org/" |
81 |
+SRC_URI="https://github.com/freehep/${MY_PN}/archive/${MY_P}.tar.gz" |
82 |
+LICENSE="Apache-2.0 LGPL-2.1" |
83 |
+SLOT="0" |
84 |
+KEYWORDS="~amd64 ~x86" |
85 |
+IUSE="test" |
86 |
+ |
87 |
+CDEPEND="~dev-java/freehep-graphics2d-${PV}:${SLOT} |
88 |
+ ~dev-java/freehep-graphicsbase-${PV}:${SLOT} |
89 |
+ dev-java/freehep-io:0" |
90 |
+ |
91 |
+DEPEND="${CDEPEND} |
92 |
+ >=virtual/jdk-1.7 |
93 |
+ test? ( dev-java/junit:4 )" |
94 |
+ |
95 |
+RDEPEND="${CDEPEND} |
96 |
+ >=virtual/jre-1.7" |
97 |
+ |
98 |
+S="${WORKDIR}/${MY_PN}-${MY_P}/${PN}" |
99 |
+JAVA_SRC_DIR="src/main/java" |
100 |
+JAVA_GENTOO_CLASSPATH="freehep-graphics2d,freehep-graphicsbase,freehep-io" |
101 |
+ |
102 |
+src_compile() { |
103 |
+ java-pkg-simple_src_compile |
104 |
+ java-pkg_addres ${PN}.jar src/main/resources |
105 |
+} |
106 |
+ |
107 |
+src_test() { |
108 |
+ local DIR=src/test/java |
109 |
+ local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})" |
110 |
+ local TESTS=$(find ${DIR} -name "*Test.java") |
111 |
+ TESTS="${TESTS//src\/test\/java\/}" |
112 |
+ TESTS="${TESTS//.java}" |
113 |
+ TESTS="${TESTS//\//.}" |
114 |
+ |
115 |
+ ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java") |
116 |
+ ejunit4 -classpath "${CP}" ${TESTS} |
117 |
+} |
118 |
|
119 |
diff --git a/dev-java/freehep-graphicsio/metadata.xml b/dev-java/freehep-graphicsio/metadata.xml |
120 |
index 952a4b9..696a250 100644 |
121 |
--- a/dev-java/freehep-graphicsio/metadata.xml |
122 |
+++ b/dev-java/freehep-graphicsio/metadata.xml |
123 |
@@ -5,4 +5,7 @@ |
124 |
<email>java@g.o</email> |
125 |
<name>Java</name> |
126 |
</maintainer> |
127 |
+ <upstream> |
128 |
+ <remote-id type="github">freehep/freehep-vectorgraphics</remote-id> |
129 |
+ </upstream> |
130 |
</pkgmetadata> |