1 |
chewi 15/05/29 22:34:16 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: jrobin-1.6.0-r1.ebuild |
5 |
Removed: jrobin-1.6.0.ebuild |
6 |
Log: |
7 |
Install rrdtool wrapper as jrobin-rrdtool to avoid conflicting with |
8 |
net-analyzer/rrdtool. Closes bug #550522. |
9 |
|
10 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 9C6D7DE4) |
11 |
|
12 |
Revision Changes Path |
13 |
1.6 dev-java/jrobin/ChangeLog |
14 |
|
15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jrobin/ChangeLog?rev=1.6&view=markup |
16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jrobin/ChangeLog?rev=1.6&content-type=text/plain |
17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jrobin/ChangeLog?r1=1.5&r2=1.6 |
18 |
|
19 |
Index: ChangeLog |
20 |
=================================================================== |
21 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/jrobin/ChangeLog,v |
22 |
retrieving revision 1.5 |
23 |
retrieving revision 1.6 |
24 |
diff -u -r1.5 -r1.6 |
25 |
--- ChangeLog 25 May 2015 20:58:14 -0000 1.5 |
26 |
+++ ChangeLog 29 May 2015 22:34:15 -0000 1.6 |
27 |
@@ -1,6 +1,13 @@ |
28 |
# ChangeLog for dev-java/jrobin |
29 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
30 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jrobin/ChangeLog,v 1.5 2015/05/25 20:58:14 chewi Exp $ |
31 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jrobin/ChangeLog,v 1.6 2015/05/29 22:34:15 chewi Exp $ |
32 |
+ |
33 |
+*jrobin-1.6.0-r1 (29 May 2015) |
34 |
+ |
35 |
+ 29 May 2015; James Le Cuirot <chewi@g.o> +jrobin-1.6.0-r1.ebuild, |
36 |
+ -jrobin-1.6.0.ebuild: |
37 |
+ Install rrdtool wrapper as jrobin-rrdtool to avoid conflicting with net- |
38 |
+ analyzer/rrdtool. Closes bug #550522. |
39 |
|
40 |
*jrobin-1.6.0 (25 May 2015) |
41 |
|
42 |
|
43 |
|
44 |
|
45 |
1.1 dev-java/jrobin/jrobin-1.6.0-r1.ebuild |
46 |
|
47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jrobin/jrobin-1.6.0-r1.ebuild?rev=1.1&view=markup |
48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jrobin/jrobin-1.6.0-r1.ebuild?rev=1.1&content-type=text/plain |
49 |
|
50 |
Index: jrobin-1.6.0-r1.ebuild |
51 |
=================================================================== |
52 |
# Copyright 1999-2015 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/jrobin/jrobin-1.6.0-r1.ebuild,v 1.1 2015/05/29 22:34:15 chewi Exp $ |
55 |
|
56 |
EAPI="5" |
57 |
|
58 |
JAVA_PKG_IUSE="doc source" |
59 |
|
60 |
inherit java-pkg-2 java-pkg-simple |
61 |
|
62 |
DESCRIPTION="JRobin is a 100% pure Java alternative to RRDTool" |
63 |
HOMEPAGE="http://www.jrobin.org/" |
64 |
SRC_URI="https://github.com/OpenNMS/${PN}/archive/${P}-1.tar.gz" |
65 |
|
66 |
LICENSE="LGPL-2.1" |
67 |
SLOT="0" |
68 |
KEYWORDS="~amd64 ~x86" |
69 |
IUSE="test" |
70 |
|
71 |
RDEPEND=">=virtual/jre-1.6" |
72 |
DEPEND=">=virtual/jdk-1.6 |
73 |
test? ( dev-java/asm:4 |
74 |
>=dev-java/cglib-3.1:3 |
75 |
dev-java/easymock:3.2 |
76 |
dev-java/junit:4 |
77 |
dev-java/objenesis:0 )" |
78 |
|
79 |
S="${WORKDIR}/${PN}-${P}-1/src" |
80 |
JAVA_SRC_DIR="main/java" |
81 |
|
82 |
java_prepare() { |
83 |
find "${WORKDIR}" -name "*.jar" -delete || die |
84 |
|
85 |
# The tests need the resources in this directory for some reason. |
86 |
mkdir -p test/java/target/classes || die |
87 |
cd test/java/target/classes || die |
88 |
ln -snf ../../../../main/resources/* . || die |
89 |
} |
90 |
|
91 |
src_compile() { |
92 |
java-pkg-simple_src_compile |
93 |
jar uf "${PN}.jar" -C main/resources . || die |
94 |
} |
95 |
|
96 |
src_install() { |
97 |
java-pkg-simple_src_install |
98 |
java-pkg_dolauncher "${PN}-rrdtool" --main org.jrobin.cmd.RrdCommander |
99 |
} |
100 |
|
101 |
src_test() { |
102 |
cd test/java || die |
103 |
|
104 |
local CP=".:${S}/${PN}.jar:$(java-pkg_getjars asm-4,cglib-3,easymock-3.2,junit-4,objenesis)" |
105 |
local TESTS=$(find * -name "*Test.java") |
106 |
TESTS="${TESTS//.java}" |
107 |
TESTS="${TESTS//\//.}" |
108 |
|
109 |
ejavac -cp "${CP}" -d . $(find * -name "*.java") |
110 |
ejunit4 -classpath "${CP}" ${TESTS} |
111 |
} |
112 |
|
113 |
pkg_postinst() { |
114 |
elog "The rrdtool executable has been installed as ${PN}-rrdtool to" |
115 |
elog "avoid conflicting with net-analyzer/rrdtool." |
116 |
} |