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: commons-logging-1.1-r3.ebuild ChangeLog
Date: Sat, 12 Jan 2008 15:13:07
Message-Id: E1JDi2i-0007he-VO@stork.gentoo.org
1 caster 08/01/12 15:13:04
2
3 Modified: commons-logging-1.1-r3.ebuild ChangeLog
4 Log:
5 Fix emerging with USE=servletapi, bug #205453.
6 (Portage version: 2.1.4_rc14)
7
8 Revision Changes Path
9 1.2 dev-java/commons-logging/commons-logging-1.1-r3.ebuild
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/commons-logging-1.1-r3.ebuild?rev=1.2&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/commons-logging-1.1-r3.ebuild?rev=1.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/commons-logging-1.1-r3.ebuild?r1=1.1&r2=1.2
14
15 Index: commons-logging-1.1-r3.ebuild
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.1-r3.ebuild,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -u -r1.1 -r1.2
21 --- commons-logging-1.1-r3.ebuild 11 Jan 2008 08:12:29 -0000 1.1
22 +++ commons-logging-1.1-r3.ebuild 12 Jan 2008 15:13:04 -0000 1.2
23 @@ -1,6 +1,6 @@
24 # Copyright 1999-2008 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.1-r3.ebuild,v 1.1 2008/01/11 08:12:29 wltjr Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.1-r3.ebuild,v 1.2 2008/01/12 15:13:04 caster Exp $
28
29 inherit java-pkg-2 java-ant-2
30
31 @@ -16,7 +16,7 @@
32 RDEPEND=">=virtual/jre-1.3
33 avalon-logkit? ( =dev-java/avalon-logkit-1.2* )
34 log4j? ( =dev-java/log4j-1.2* )
35 - servletapi? ( =java-virtuals/servlet-api-2.3* )
36 + servletapi? ( ~java-virtuals/servlet-api-2.3 )
37 avalon-framework? ( =dev-java/avalon-framework-4.2* )"
38 # ATTENTION: Add this when log4j-1.3 is out
39 # =dev-java/log4j-1.3*
40 @@ -41,7 +41,7 @@
41 # ATTENTION: Add this when log4j-1.3 is out (check the SLOT)
42 #echo "log4j13.jar=$(java-pkg_getjars log4j-1.3)" > build.properties
43 use avalon-logkit && echo "logkit.jar=$(java-pkg_getjars avalon-logkit-1.2)" >> build.properties
44 - use servletapi && echo "servletapi.jar=$(java-pkg_getjars --virtual servlet-api-2.3)" >> build.properties
45 + use servletapi && echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-2.3 servlet.jar)" >> build.properties
46 use avalon-framework && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties
47 java-pkg_filter-compiler jikes ecj-3.2
48 }
49
50
51
52 1.55 dev-java/commons-logging/ChangeLog
53
54 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/ChangeLog?rev=1.55&view=markup
55 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/ChangeLog?rev=1.55&content-type=text/plain
56 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/ChangeLog?r1=1.54&r2=1.55
57
58 Index: ChangeLog
59 ===================================================================
60 RCS file: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v
61 retrieving revision 1.54
62 retrieving revision 1.55
63 diff -u -r1.54 -r1.55
64 --- ChangeLog 11 Jan 2008 08:12:29 -0000 1.54
65 +++ ChangeLog 12 Jan 2008 15:13:04 -0000 1.55
66 @@ -1,6 +1,10 @@
67 # ChangeLog for dev-java/commons-logging
68 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
69 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.54 2008/01/11 08:12:29 wltjr Exp $
70 +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.55 2008/01/12 15:13:04 caster Exp $
71 +
72 + 12 Jan 2008; Vlastimil Babka <caster@g.o>
73 + commons-logging-1.1-r3.ebuild:
74 + Fix emerging with USE=servletapi, bug #205453.
75
76 *commons-logging-1.1-r3 (11 Jan 2008)
77
78
79
80
81 --
82 gentoo-commits@l.g.o mailing list