1 |
commit: 2259930928b34d80772bdb8be716fbdf89177871 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 25 20:42:04 2016 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 25 21:58:30 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22599309 |
7 |
|
8 |
dev-java/freehep-graphics2d: Version bump to 2.4, EAPI bump, add tests |
9 |
|
10 |
Package-Manager: portage-2.3.0_rc1 |
11 |
|
12 |
dev-java/freehep-graphics2d/Manifest | 3 +- |
13 |
.../freehep-graphics2d-2.1.1.ebuild | 24 ------- |
14 |
.../freehep-graphics2d-2.4.ebuild | 74 ++++++++++++++++++++++ |
15 |
dev-java/freehep-graphics2d/metadata.xml | 3 + |
16 |
4 files changed, 79 insertions(+), 25 deletions(-) |
17 |
|
18 |
diff --git a/dev-java/freehep-graphics2d/Manifest b/dev-java/freehep-graphics2d/Manifest |
19 |
index 8bded0a..8cc405a 100644 |
20 |
--- a/dev-java/freehep-graphics2d/Manifest |
21 |
+++ b/dev-java/freehep-graphics2d/Manifest |
22 |
@@ -1 +1,2 @@ |
23 |
-DIST freehep-graphics2d-2.1.1-sources.jar 85104 SHA256 08a34bd74c4b263a3ccdae1d3e578f52a57473bbb248eaeac5b39c165f57a281 SHA512 18c93af064cdf4edb2d5cbdc7ed7eae57dbe472720bf197b7ea35fc884b3ece6dfb383e4e56d86b7d1c78ca1f5427f471d862dbc82d5538c2e1848b665376c36 WHIRLPOOL d0f21489f84dd96254c9b997148c685fc7caeb11c78b06d3bf6947db32f364a60d9b3007ada381445c99ecccb172217e5e44427ba1580c20e82f4bc4014e0895 |
24 |
+DIST freehep-chartable-converter-plugin-2.2.1.tar.gz 18159 SHA256 076086b08f775ad52a1ce58389167f048f594864ad6b198c92d540a30f96ae35 SHA512 4caac8b83b9efdee59e2a801bb001fdf7bab144bb5734bdb89ef3e1163bc9ffd05b2c8c59d611665573c432045a854fba28eb4d24260baea5286b34ae298add1 WHIRLPOOL a97d2c8685c29ae7d1dccf653577dd15cf085cf5439744f5c0dd904ebb8d85d9a6e6e825059230bc2baf4e519b87bfda136db2fac22202d878ae84b0382503bc |
25 |
+DIST freehep-vectorgraphics-2.4.tar.gz 4118379 SHA256 2c7e1bbb3c056e9de83e5f7d9e0b2aeb3f46734000cdd0f18423eb43216305dd SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382 WHIRLPOOL 62d61e05935348cf8b5d81033408729b02377f8a91760d08ab98a8e1451ea4d44e992a98dfb951978272ca842dbfa0d2885430cd16428dcf4da005aa092fbe76 |
26 |
|
27 |
diff --git a/dev-java/freehep-graphics2d/freehep-graphics2d-2.1.1.ebuild b/dev-java/freehep-graphics2d/freehep-graphics2d-2.1.1.ebuild |
28 |
deleted file mode 100644 |
29 |
index 1949c86..0000000 |
30 |
--- a/dev-java/freehep-graphics2d/freehep-graphics2d-2.1.1.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,24 +0,0 @@ |
33 |
-# Copyright 1999-2010 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
-# $Id$ |
36 |
- |
37 |
-JAVA_PKG_IUSE="" |
38 |
-GROUP_ID="org.freehep" |
39 |
-MAVEN2_REPOSITORIES="http://java.freehep.org/maven2" |
40 |
- |
41 |
-inherit java-pkg-2 java-mvn-src |
42 |
- |
43 |
-DESCRIPTION="High Energy Physics Java library - FreeHEP Graphics 2D Library" |
44 |
-HOMEPAGE="http://java.freehep.org/" |
45 |
- |
46 |
-LICENSE="LGPL-2.1" |
47 |
-SLOT="0" |
48 |
-KEYWORDS="~amd64 ~x86" |
49 |
-IUSE="" |
50 |
- |
51 |
-CDEPEND=">=dev-java/freehep-util-2.0.2" |
52 |
-DEPEND=">=virtual/jdk-1.5 |
53 |
- ${CDEPEND}" |
54 |
-RDEPEND=">=virtual/jre-1.5 |
55 |
- ${CDEPEND}" |
56 |
-JAVA_GENTOO_CLASSPATH="freehep-util" |
57 |
|
58 |
diff --git a/dev-java/freehep-graphics2d/freehep-graphics2d-2.4.ebuild b/dev-java/freehep-graphics2d/freehep-graphics2d-2.4.ebuild |
59 |
new file mode 100644 |
60 |
index 0000000..a25956a |
61 |
--- /dev/null |
62 |
+++ b/dev-java/freehep-graphics2d/freehep-graphics2d-2.4.ebuild |
63 |
@@ -0,0 +1,74 @@ |
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 |
+CHARTABLE_PN="freehep-chartable-converter-plugin" |
71 |
+CHARTABLE_P="${CHARTABLE_PN}-2.2.1" |
72 |
+ |
73 |
+MY_PN="freehep-vectorgraphics" |
74 |
+MY_P="${MY_PN}-${PV}" |
75 |
+ |
76 |
+JAVA_PKG_IUSE="doc source" |
77 |
+ |
78 |
+inherit java-pkg-2 java-pkg-simple |
79 |
+ |
80 |
+DESCRIPTION="High Energy Physics Java library - FreeHEP Graphics 2D Library" |
81 |
+HOMEPAGE="http://java.freehep.org/" |
82 |
+SRC_URI="https://github.com/freehep/${MY_PN}/archive/${MY_P}.tar.gz |
83 |
+ https://github.com/freehep/${CHARTABLE_PN}/archive/${CHARTABLE_P}.tar.gz" |
84 |
+LICENSE="Apache-2.0 LGPL-2.1" |
85 |
+SLOT="0" |
86 |
+KEYWORDS="~amd64 ~x86" |
87 |
+IUSE="test" |
88 |
+ |
89 |
+CDEPEND="~dev-java/freehep-graphicsbase-${PV}:${SLOT}" |
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-graphicsbase" |
101 |
+ |
102 |
+src_compile() { |
103 |
+ # This package uses a custom Maven plugin to generate some |
104 |
+ # sources. We're not using Maven but we can run it manually. We |
105 |
+ # could package the plugin separately but it's not used elsewhere. |
106 |
+ |
107 |
+ local SRC ENC CP="${WORKDIR}"/${CHARTABLE_PN}-${CHARTABLE_P}/src/main/java CLASS=org/freehep/graphics2d/font/encoding/CharTableConverter |
108 |
+ ejavac "${CP}/${CLASS}.java" |
109 |
+ |
110 |
+ for SRC in src/main/encoding/{Expert,Symbol,Zapfdingbats}.utf-16; do |
111 |
+ ebegin "Converting ${SRC}" |
112 |
+ java -cp "${CP}" ${CLASS} ${JAVA_SRC_DIR} org.freehep.graphics2d.font ${SRC} || die |
113 |
+ eend $? |
114 |
+ done |
115 |
+ |
116 |
+ SRC=src/main/encoding/Latin.utf-16 |
117 |
+ |
118 |
+ for ENC in ISO MAC WIN PDF STD; do |
119 |
+ ebegin "Converting ${SRC} (${ENC})" |
120 |
+ java -cp "${CP}" ${CLASS} ${JAVA_SRC_DIR} org.freehep.graphics2d.font ${SRC} ${ENC} || die |
121 |
+ eend $? |
122 |
+ done |
123 |
+ |
124 |
+ java-pkg-simple_src_compile |
125 |
+} |
126 |
+ |
127 |
+src_test() { |
128 |
+ local DIR=src/test/java |
129 |
+ local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})" |
130 |
+ local TESTS=$(find ${DIR} -name "Test*.java") |
131 |
+ TESTS="${TESTS//src\/test\/java\/}" |
132 |
+ TESTS="${TESTS//.java}" |
133 |
+ TESTS="${TESTS//\//.}" |
134 |
+ |
135 |
+ ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java") |
136 |
+ ejunit4 -classpath "${CP}" ${TESTS} |
137 |
+} |
138 |
|
139 |
diff --git a/dev-java/freehep-graphics2d/metadata.xml b/dev-java/freehep-graphics2d/metadata.xml |
140 |
index 952a4b9..696a250 100644 |
141 |
--- a/dev-java/freehep-graphics2d/metadata.xml |
142 |
+++ b/dev-java/freehep-graphics2d/metadata.xml |
143 |
@@ -5,4 +5,7 @@ |
144 |
<email>java@g.o</email> |
145 |
<name>Java</name> |
146 |
</maintainer> |
147 |
+ <upstream> |
148 |
+ <remote-id type="github">freehep/freehep-vectorgraphics</remote-id> |
149 |
+ </upstream> |
150 |
</pkgmetadata> |