Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Ralph Sennhauser (sera)" <sera@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/avalon-logkit: ChangeLog avalon-logkit-1.2.2-r1.ebuild avalon-logkit-2.1-r6.ebuild
Date: Sat, 29 Sep 2012 11:04:52
Message-Id: 20120929110443.5A13121601@flycatcher.gentoo.org
1 sera 12/09/29 11:04:43
2
3 Modified: ChangeLog
4 Added: avalon-logkit-1.2.2-r1.ebuild
5 avalon-logkit-2.1-r6.ebuild
6 Log:
7 Use virtuals for jaf javamail jms and servlet-api.
8 Use slot deps.
9 Fix building slot 1.2 with jdk7.
10
11 (Portage version: 2.1.11.13/cvs/Linux x86_64)
12
13 Revision Changes Path
14 1.93 dev-java/avalon-logkit/ChangeLog
15
16 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/avalon-logkit/ChangeLog?rev=1.93&view=markup
17 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/avalon-logkit/ChangeLog?rev=1.93&content-type=text/plain
18 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/avalon-logkit/ChangeLog?r1=1.92&r2=1.93
19
20 Index: ChangeLog
21 ===================================================================
22 RCS file: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v
23 retrieving revision 1.92
24 retrieving revision 1.93
25 diff -u -r1.92 -r1.93
26 --- ChangeLog 14 May 2012 21:27:43 -0000 1.92
27 +++ ChangeLog 29 Sep 2012 11:04:43 -0000 1.93
28 @@ -1,6 +1,16 @@
29 # ChangeLog for dev-java/avalon-logkit
30 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
31 -# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.92 2012/05/14 21:27:43 halcy0n Exp $
32 +# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.93 2012/09/29 11:04:43 sera Exp $
33 +
34 +*avalon-logkit-2.1-r6 (29 Sep 2012)
35 +*avalon-logkit-1.2.2-r1 (29 Sep 2012)
36 +
37 + 29 Sep 2012; Ralph Sennhauser <sera@g.o>
38 + +avalon-logkit-1.2.2-r1.ebuild, +files/avalon-logkit-1.2.2-java7.patch,
39 + +avalon-logkit-2.1-r6.ebuild:
40 + Use virtuals for jaf javamail jms and servlet-api.
41 + Use slot deps.
42 + Fix building slot 1.2 with jdk7.
43
44 14 May 2012; Mark Loeser <halcy0n@g.o> avalon-logkit-2.1-r5.ebuild:
45 Stable for ppc64; bug #384613
46
47
48
49 1.1 dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild
50
51 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild?rev=1.1&view=markup
52 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild?rev=1.1&content-type=text/plain
53
54 Index: avalon-logkit-1.2.2-r1.ebuild
55 ===================================================================
56 # Copyright 1999-2012 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 # $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild,v 1.1 2012/09/29 11:04:43 sera Exp $
59
60 EAPI=4
61
62 JAVA_PKG_IUSE="doc source test"
63
64 inherit eutils java-pkg-2
65
66 DESCRIPTION="An easy-to-use Java logging toolkit designed for secure, performance-oriented logging."
67 HOMEPAGE="http://avalon.apache.org/"
68 SRC_URI="mirror://apache/avalon/logkit/source/logkit-${PV}-src.tar.gz"
69
70 LICENSE="Apache-1.1"
71 SLOT="1.2"
72 IUSE=""
73 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
74
75 COMMON_DEP="
76 dev-java/avalon-framework:4.1
77 dev-java/log4j:0
78 java-virtuals/jaf:0
79 java-virtuals/javamail:0
80 java-virtuals/jms:0
81 java-virtuals/servlet-api:2.5"
82 RDEPEND="${COMMON_DEP}
83 >=virtual/jre-1.4"
84 DEPEND="${COMMON_DEP}
85 >=virtual/jdk-1.4
86 test? ( dev-java/junit:4 )"
87
88 S="${WORKDIR}/logkit-${PV}-dev"
89 SRC_DIR="${S}/src/java"
90 JAVADOC_DIR="${S}/javadoc"
91
92 java_prepare() {
93 epatch "${FILESDIR}/${P}-java7.patch"
94 }
95
96 src_compile() {
97 mkdir classes || die "Could not create compile output dir"
98
99 ejavac \
100 -encoding "ISO-8859-1" \
101 -classpath $(java-pkg_getjars jaf,javamail,jms,log4j,servlet-api-2.5,avalon-framework-4.1) \
102 -d classes $(find "${SRC_DIR}" -name "*.java") \
103 || die "Compilation failed"
104
105 jar -cf "${S}/${PN}.jar" -C classes . || die "Could not create jar"
106
107 #Generate javadoc
108 if use doc ; then
109 mkdir "${JAVADOC_DIR}" || die "Could not create javadoc dir"
110 cd "${SRC_DIR}"
111 javadoc \
112 -encoding "ISO-8859-1" \
113 -sourcepath "${SRC_DIR}" \
114 -classpath $(java-pkg_getjars jaf,javamail,jms,log4j,servlet-api-2.5,avalon-framework-4.1) \
115 -source "${JAVA_VERSION}" \
116 -d "${JAVADOC_DIR}" \
117 $(find "org/apache/log" -type d | tr '/' '.') \
118 || die "Could not create javadoc"
119 fi
120 }
121
122 src_test() {
123 mkdir test-classes || die "Unable to make dir"
124 local TESTJAR="avalon-logkit-test.jar"
125
126 ejavac \
127 -encoding "ISO-8859-1" \
128 -classpath "avalon-logkit.jar:$(java-config -p junit-4)" \
129 -d test-classes \
130 $(find src/test -name '*.java')
131
132 jar -cf "${TESTJAR}" -C test-classes .
133
134 java -cp "avalon-logkit.jar:${TESTJAR}:$(java-config -p junit:4)" \
135 org.junit.runner.JUnitCore org.apache.log.format.test.FormatterTestCase \
136 org.apache.log.output.test.RevolvingFileStrategyTestCase \
137 org.apache.log.output.test.OutputTargetTestCase \
138 org.apache.log.output.test.DBTargetTestCase \
139 org.apache.log.util.test.UtilTestCase \
140 org.apache.log.test.LoggerListenerTestCase \
141 org.apache.log.test.WrappingTargetTestCase \
142 org.apache.log.test.InheritanceTestCase
143 }
144
145 src_install() {
146 java-pkg_dojar "${PN}.jar"
147 use doc && java-pkg_dojavadoc "${JAVADOC_DIR}"
148 use source && java-pkg_dosrc "${SRC_DIR}/*"
149 }
150
151
152
153 1.1 dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild
154
155 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild?rev=1.1&view=markup
156 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild?rev=1.1&content-type=text/plain
157
158 Index: avalon-logkit-2.1-r6.ebuild
159 ===================================================================
160 # Copyright 1999-2012 Gentoo Foundation
161 # Distributed under the terms of the GNU General Public License v2
162 # $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild,v 1.1 2012/09/29 11:04:43 sera Exp $
163
164 EAPI=4
165
166 JAVA_PKG_IUSE="doc source test"
167
168 inherit java-pkg-2 java-ant-2
169
170 DESCRIPTION="Easy-to-use Java logging toolkit"
171 HOMEPAGE="http://avalon.apache.org/"
172 SRC_URI="mirror://apache/excalibur/excalibur-logkit/source/${P}-src.tar.gz"
173
174 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
175 LICENSE="Apache-2.0"
176 SLOT="2.0"
177 IUSE=""
178
179 COMMON_DEP="
180 dev-java/log4j:0
181 java-virtuals/jms:0
182 java-virtuals/javamail:0
183 java-virtuals/servlet-api:2.5"
184 RDEPEND="${COMMON_DEP}
185 >=virtual/jre-1.4"
186 DEPEND="${COMMON_DEP}
187 >=virtual/jdk-1.4
188 test? ( dev-java/ant-junit )"
189
190 java_prepare() {
191 # Doesn't like 1.6 / 1.7 changes to JDBC
192 epatch "${FILESDIR}/${P}-java7.patch"
193
194 java-ant_ignore-system-classes
195
196 java-ant_xml-rewrite -f build.xml \
197 -c -e available -a classpathref -v 'build.classpath' || die
198
199 java-pkg_filter-compiler jikes
200 }
201
202 JAVA_ANT_REWRITE_CLASSPATH="yes"
203
204 EANT_GENTOO_CLASSPATH="javamail,jms,log4j,servlet-api-2.5"
205
206 src_test() {
207 java-pkg-2_src_test
208 }
209
210 src_install() {
211 java-pkg_newjar target/${P}.jar
212 use doc && java-pkg_dojavadoc dist/docs/api
213 use source && java-pkg_dosrc src/java/*
214 }
Report Message
Find on MARC Find on Google Groups