1 |
caster 10/02/28 01:32:21 |
2 |
|
3 |
Modified: jgroups-2.7.0.ebuild ChangeLog |
4 |
Added: jgroups-2.9.0.ebuild |
5 |
Log: |
6 |
Version bump. Fix building with ant-1.8 - bug #305929. Use java_prepare. |
7 |
(Portage version: 2.2_rc63/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.5 dev-java/jgroups/jgroups-2.7.0.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jgroups/jgroups-2.7.0.ebuild?rev=1.5&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jgroups/jgroups-2.7.0.ebuild?rev=1.5&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jgroups/jgroups-2.7.0.ebuild?r1=1.4&r2=1.5 |
15 |
|
16 |
Index: jgroups-2.7.0.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/jgroups/jgroups-2.7.0.ebuild,v |
19 |
retrieving revision 1.4 |
20 |
retrieving revision 1.5 |
21 |
diff -u -r1.4 -r1.5 |
22 |
--- jgroups-2.7.0.ebuild 15 Jan 2010 20:33:52 -0000 1.4 |
23 |
+++ jgroups-2.7.0.ebuild 28 Feb 2010 01:32:20 -0000 1.5 |
24 |
@@ -1,6 +1,6 @@ |
25 |
# Copyright 1999-2010 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgroups/jgroups-2.7.0.ebuild,v 1.4 2010/01/15 20:33:52 abcd Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgroups/jgroups-2.7.0.ebuild,v 1.5 2010/02/28 01:32:20 caster Exp $ |
29 |
|
30 |
EAPI="2" |
31 |
JAVA_PKG_IUSE="doc source" |
32 |
@@ -28,7 +28,7 @@ |
33 |
|
34 |
S=${WORKDIR}/${MY_P}.src |
35 |
|
36 |
-src_prepare() { |
37 |
+java_prepare() { |
38 |
cd "${S}/lib" || die |
39 |
rm -v *.jar || die |
40 |
|
41 |
|
42 |
|
43 |
|
44 |
1.31 dev-java/jgroups/ChangeLog |
45 |
|
46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jgroups/ChangeLog?rev=1.31&view=markup |
47 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jgroups/ChangeLog?rev=1.31&content-type=text/plain |
48 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jgroups/ChangeLog?r1=1.30&r2=1.31 |
49 |
|
50 |
Index: ChangeLog |
51 |
=================================================================== |
52 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/jgroups/ChangeLog,v |
53 |
retrieving revision 1.30 |
54 |
retrieving revision 1.31 |
55 |
diff -u -r1.30 -r1.31 |
56 |
--- ChangeLog 15 Jan 2010 20:33:52 -0000 1.30 |
57 |
+++ ChangeLog 28 Feb 2010 01:32:20 -0000 1.31 |
58 |
@@ -1,6 +1,13 @@ |
59 |
# ChangeLog for dev-java/jgroups |
60 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
61 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgroups/ChangeLog,v 1.30 2010/01/15 20:33:52 abcd Exp $ |
62 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgroups/ChangeLog,v 1.31 2010/02/28 01:32:20 caster Exp $ |
63 |
+ |
64 |
+*jgroups-2.9.0 (28 Feb 2010) |
65 |
+ |
66 |
+ 28 Feb 2010; Vlastimil Babka <caster@g.o> -files/2.4.1-jdk4.patch, |
67 |
+ +files/2.9.0-ant-1.8-compat.patch, jgroups-2.7.0.ebuild, |
68 |
+ +jgroups-2.9.0.ebuild: |
69 |
+ Version bump. Fix building with ant-1.8 - bug #305929. Use java_prepare. |
70 |
|
71 |
15 Jan 2010; Jonathan Callen <abcd@g.o> jgroups-2.7.0.ebuild: |
72 |
Add prefix keywords |
73 |
|
74 |
|
75 |
|
76 |
1.1 dev-java/jgroups/jgroups-2.9.0.ebuild |
77 |
|
78 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jgroups/jgroups-2.9.0.ebuild?rev=1.1&view=markup |
79 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jgroups/jgroups-2.9.0.ebuild?rev=1.1&content-type=text/plain |
80 |
|
81 |
Index: jgroups-2.9.0.ebuild |
82 |
=================================================================== |
83 |
# Copyright 1999-2010 Gentoo Foundation |
84 |
# Distributed under the terms of the GNU General Public License v2 |
85 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/jgroups/jgroups-2.9.0.ebuild,v 1.1 2010/02/28 01:32:20 caster Exp $ |
86 |
|
87 |
EAPI="2" |
88 |
JAVA_PKG_IUSE="doc source" |
89 |
|
90 |
inherit java-pkg-2 java-ant-2 |
91 |
|
92 |
MY_PN="JGroups" |
93 |
MY_PV="${PV/_p/-sp}" |
94 |
MY_P="${MY_PN}-${MY_PV}.GA" |
95 |
DESCRIPTION="JGroups is a toolkit for reliable multicast communication." |
96 |
SRC_URI="mirror://sourceforge/javagroups/${MY_P}.src.zip" |
97 |
HOMEPAGE="http://www.jgroups.org/javagroupsnew/docs/" |
98 |
LICENSE="LGPL-2.1" |
99 |
SLOT="0" |
100 |
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos" |
101 |
IUSE="" |
102 |
RDEPEND=">=virtual/jre-1.5 |
103 |
dev-java/bsh:0 |
104 |
dev-java/log4j:0 |
105 |
java-virtuals/jmx" |
106 |
|
107 |
DEPEND=">=virtual/jdk-1.5 |
108 |
${RDEPEND} |
109 |
app-arch/unzip" |
110 |
|
111 |
S=${WORKDIR}/${MY_P}.src |
112 |
|
113 |
java_prepare() { |
114 |
# bug #305929 |
115 |
epatch "${FILESDIR}/2.9.0-ant-1.8-compat.patch" |
116 |
|
117 |
cd "${S}/lib" || die |
118 |
rm -v *.jar || die |
119 |
|
120 |
java-pkg_jar-from bsh |
121 |
java-pkg_jar-from log4j |
122 |
java-pkg_jar-from --virtual jmx |
123 |
|
124 |
# Needed for unit tests |
125 |
#java-pkg_jar-from --build-only junit |
126 |
# One unit tests needs this |
127 |
#java-pkg_jar-from --build-only bcprov |
128 |
|
129 |
# Just get rid of these as they are of no use to us as we don't install them |
130 |
# Always tries to compile them. |
131 |
#if ! use test; then |
132 |
rm -vr "${S}"/tests/{junit,other,junit-functional}/org || die |
133 |
rm -v "${S}/src/org/jgroups/util/JUnitXMLReporter.java" || die |
134 |
#fi |
135 |
} |
136 |
|
137 |
JAVA_ANT_ENCODING="ISO-8859-1" |
138 |
|
139 |
# The jar target generates jgroups-all.jar that has the demos and tests in it |
140 |
EANT_BUILD_TARGET="jgroups-core.jar" |
141 |
|
142 |
src_install() { |
143 |
java-pkg_dojar dist/jgroups-*.jar |
144 |
dodoc CREDITS README || die |
145 |
|
146 |
if use doc; then |
147 |
java-pkg_dojavadoc dist/javadoc |
148 |
insinto /usr/share/doc/${PF} |
149 |
doins -r doc/* || die |
150 |
fi |
151 |
use source && java-pkg_dosrc src/* |
152 |
|
153 |
} |
154 |
|
155 |
RESTRICT="test" |
156 |
# A lot of these fail. Don't know status in 2.7 |
157 |
# as need testng in main tree first. |
158 |
src_test() { |
159 |
# run the report target for nice html pages |
160 |
ANT_TASKS="ant-junit" eant unittests-xml |
161 |
} |