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