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

Gentoo Archives: gentoo-commits

From: "Vlastimil Babka (caster)" <caster@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/commons-logging: ChangeLog commons-logging-1.1-r6.ebuild commons-logging-1.1-r5.ebuild
Date: Wed, 30 Jan 2008 17:32:18
Message-Id: E1JKGla-0005uv-KR@stork.gentoo.org
1 caster 08/01/30 17:30:30
2
3 Modified: ChangeLog
4 Added: commons-logging-1.1-r6.ebuild
5 commons-logging-1.1-r5.ebuild
6 Log:
7 Fix missing jdk14logger (bug #208098), a regression of fix for bug #200918. The -r5 is based on current stable -r2 and straight stabled because -r2 got broken after its stabling and without revbump. The -r6 is based on -r4 and has also EAPI=1 slot deps and few other style tweaks.
8 (Portage version: 2.1.4, RepoMan options: --force)
9
10 Revision Changes Path
11 1.57 dev-java/commons-logging/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/ChangeLog?rev=1.57&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/ChangeLog?rev=1.57&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/ChangeLog?r1=1.56&r2=1.57
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v
20 retrieving revision 1.56
21 retrieving revision 1.57
22 diff -u -r1.56 -r1.57
23 --- ChangeLog 14 Jan 2008 16:22:37 -0000 1.56
24 +++ ChangeLog 30 Jan 2008 17:30:30 -0000 1.57
25 @@ -1,6 +1,16 @@
26 # ChangeLog for dev-java/commons-logging
27 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.56 2008/01/14 16:22:37 elvanor Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.57 2008/01/30 17:30:30 caster Exp $
30 +
31 +*commons-logging-1.1-r6 (30 Jan 2008)
32 +*commons-logging-1.1-r5 (30 Jan 2008)
33 +
34 + 30 Jan 2008; Vlastimil Babka <caster@g.o>
35 + +commons-logging-1.1-r5.ebuild, +commons-logging-1.1-r6.ebuild:
36 + Fix missing jdk14logger (bug #208098), a regression of fix for bug #200918.
37 + The -r5 is based on current stable -r2 and straight stabled because -r2 got
38 + broken after its stabling and without revbump. The -r6 is based on -r4 and
39 + has also EAPI=1 slot deps and few other style tweaks.
40
41 *commons-logging-1.1-r4 (14 Jan 2008)
42
43
44
45
46 1.1 dev-java/commons-logging/commons-logging-1.1-r6.ebuild
47
48 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/commons-logging-1.1-r6.ebuild?rev=1.1&view=markup
49 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/commons-logging-1.1-r6.ebuild?rev=1.1&content-type=text/plain
50
51 Index: commons-logging-1.1-r6.ebuild
52 ===================================================================
53 # Copyright 1999-2008 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 # $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.1-r6.ebuild,v 1.1 2008/01/30 17:30:30 caster Exp $
56
57 EAPI="1"
58 JAVA_PKG_IUSE="doc source"
59
60 inherit java-pkg-2 java-ant-2 java-osgi
61
62 DESCRIPTION="The Jakarta-Commons Logging package is an ultra-thin bridge between different logging libraries."
63 HOMEPAGE="http://jakarta.apache.org/commons/logging/"
64 SRC_URI="mirror://apache/jakarta/commons/logging/source/${P}-src.tar.gz"
65
66 LICENSE="Apache-2.0"
67 SLOT="0"
68 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
69 IUSE="avalon-logkit log4j servletapi avalon-framework"
70
71 COMMON_DEP="
72 avalon-logkit? ( dev-java/avalon-logkit:1.2 )
73 log4j? ( dev-java/log4j:0 )
74 servletapi? ( java-virtuals/servlet-api:2.3 )
75 avalon-framework? ( dev-java/avalon-framework:4.2 )"
76 # ATTENTION: Add this when log4j-1.3 is out
77 # =dev-java/log4j-1.3*
78 RDEPEND=">=virtual/jre-1.4
79 ${COMMON_DEP}"
80 DEPEND=">=virtual/jdk-1.4
81 ${COMMON_DEP}"
82
83 S="${WORKDIR}/${P}-src/"
84
85 src_unpack() {
86 unpack ${A}
87 cd "${S}"
88
89 epatch "${FILESDIR}/${P}-gentoo.patch"
90 # patch to make the build.xml respect no servletapi
91 # TODO file upstream -nichoj
92 epatch "${FILESDIR}/${P}-servletapi.patch"
93
94 # bug 200918
95 java-ant_ignore-system-classes
96
97 # bug #208098
98 echo "jdk.1.4.present=true" > build.properties
99 use log4j && echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties
100 # ATTENTION: Add this when log4j-1.3 is out (check the SLOT)
101 #echo "log4j13.jar=$(java-pkg_getjars log4j-1.3)" > build.properties
102 use avalon-logkit && echo "logkit.jar=$(java-pkg_getjars avalon-logkit-1.2)" >> build.properties
103 use servletapi && echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-2.3 servlet.jar)" >> build.properties
104 use avalon-framework && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties
105 java-pkg_filter-compiler jikes ecj-3.2
106 }
107
108 EANT_BUILD_TARGET="compile"
109
110 src_install() {
111 java-osgi_newjar-fromfile "target/${P}.jar" "${FILESDIR}/${P}-manifest" "Apache Commons Logging"
112 java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
113 java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
114
115 dodoc RELEASE-NOTES.txt || die
116 dohtml PROPOSAL.html STATUS.html || die
117 use doc && java-pkg_dojavadoc target/docs/
118 use source && java-pkg_dosrc src/java/org
119 }
120
121
122
123 1.1 dev-java/commons-logging/commons-logging-1.1-r5.ebuild
124
125 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/commons-logging-1.1-r5.ebuild?rev=1.1&view=markup
126 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/commons-logging-1.1-r5.ebuild?rev=1.1&content-type=text/plain
127
128 Index: commons-logging-1.1-r5.ebuild
129 ===================================================================
130 # Copyright 1999-2008 Gentoo Foundation
131 # Distributed under the terms of the GNU General Public License v2
132 # $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.1-r5.ebuild,v 1.1 2008/01/30 17:30:30 caster Exp $
133
134 inherit java-pkg-2 java-ant-2
135
136 DESCRIPTION="The Jakarta-Commons Logging package is an ultra-thin bridge between different logging libraries."
137 HOMEPAGE="http://jakarta.apache.org/commons/logging/"
138 SRC_URI="mirror://apache/jakarta/commons/logging/source/${P}-src.tar.gz"
139
140 LICENSE="Apache-2.0"
141 SLOT="0"
142 KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
143 IUSE="avalon-logkit log4j servletapi avalon-framework doc source"
144
145 RDEPEND=">=virtual/jre-1.4
146 avalon-logkit? ( =dev-java/avalon-logkit-1.2* )
147 log4j? ( =dev-java/log4j-1.2* )
148 servletapi? ( =dev-java/servletapi-2.3* )
149 avalon-framework? ( =dev-java/avalon-framework-4.2* )"
150 # ATTENTION: Add this when log4j-1.3 is out
151 # =dev-java/log4j-1.3*
152 DEPEND=">=virtual/jdk-1.4
153 dev-java/ant-core
154 source? ( app-arch/zip )
155 ${RDEPEND}"
156
157 S="${WORKDIR}/${P}-src/"
158
159 src_unpack() {
160 unpack ${A}
161 cd "${S}"
162 epatch "${FILESDIR}/${P}-gentoo.patch"
163 # patch to make the build.xml respect no servletapi
164 # TODO file upstream -nichoj
165 epatch "${FILESDIR}/${P}-servletapi.patch"
166
167 # bug 200918
168 java-ant_ignore-system-classes
169
170 # bug #208098
171 echo "jdk.1.4.present=true" > build.properties
172 use log4j && echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties
173 # ATTENTION: Add this when log4j-1.3 is out (check the SLOT)
174 #echo "log4j13.jar=$(java-pkg_getjars log4j-1.3)" > build.properties
175 use avalon-logkit && echo "logkit.jar=$(java-pkg_getjars avalon-logkit-1.2)" >> build.properties
176 use servletapi && echo "servletapi.jar=$(java-pkg_getjars servletapi-2.3)" >> build.properties
177 use avalon-framework && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties
178 java-pkg_filter-compiler jikes ecj-3.2
179 }
180
181 EANT_BUILD_TARGET="compile"
182
183 src_install() {
184 java-pkg_newjar target/${P}.jar ${PN}.jar
185 java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
186 java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
187
188 dodoc RELEASE-NOTES.txt || die
189 dohtml PROPOSAL.html STATUS.html || die
190 use doc && java-pkg_dojavadoc target/docs/
191 use source && java-pkg_dosrc src/java/org
192 }
193
194
195
196 --
197 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups