Gentoo Archives: gentoo-commits

From: "Petteri Raty (betelgeuse)" <betelgeuse@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/struts: ChangeLog struts-1.2.9-r2.ebuild
Date: Sun, 29 Mar 2009 17:03:54
Message-Id: E1LnyQI-0007bQ-5Z@stork.gentoo.org
1 betelgeuse 09/03/29 17:03:50
2
3 Modified: ChangeLog struts-1.2.9-r2.ebuild
4 Log:
5 Migrate to EAPI 2 for bug #239835.
6 (Portage version: 2.2_rc27/cvs/Linux i686)
7
8 Revision Changes Path
9 1.44 dev-java/struts/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/struts/ChangeLog?rev=1.44&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/struts/ChangeLog?rev=1.44&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/struts/ChangeLog?r1=1.43&r2=1.44
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v
18 retrieving revision 1.43
19 retrieving revision 1.44
20 diff -u -r1.43 -r1.44
21 --- ChangeLog 24 Mar 2009 19:04:44 -0000 1.43
22 +++ ChangeLog 29 Mar 2009 17:03:50 -0000 1.44
23 @@ -1,6 +1,9 @@
24 # ChangeLog for dev-java/struts
25 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.43 2009/03/24 19:04:44 betelgeuse Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.44 2009/03/29 17:03:50 betelgeuse Exp $
28 +
29 + 29 Mar 2009; Petteri Räty <betelgeuse@g.o> struts-1.2.9-r2.ebuild:
30 + Migrate to EAPI 2 for bug #239835.
31
32 24 Mar 2009; Petteri Räty <betelgeuse@g.o> struts-1.2.9-r2.ebuild:
33 Add SLOT deps for SLOT 0 deps.
34
35
36
37 1.6 dev-java/struts/struts-1.2.9-r2.ebuild
38
39 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/struts/struts-1.2.9-r2.ebuild?rev=1.6&view=markup
40 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/struts/struts-1.2.9-r2.ebuild?rev=1.6&content-type=text/plain
41 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/struts/struts-1.2.9-r2.ebuild?r1=1.5&r2=1.6
42
43 Index: struts-1.2.9-r2.ebuild
44 ===================================================================
45 RCS file: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.9-r2.ebuild,v
46 retrieving revision 1.5
47 retrieving revision 1.6
48 diff -u -r1.5 -r1.6
49 --- struts-1.2.9-r2.ebuild 24 Mar 2009 19:04:44 -0000 1.5
50 +++ struts-1.2.9-r2.ebuild 29 Mar 2009 17:03:50 -0000 1.6
51 @@ -1,8 +1,8 @@
52 # Copyright 1999-2009 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 -# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.9-r2.ebuild,v 1.5 2009/03/24 19:04:44 betelgeuse Exp $
55 +# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.9-r2.ebuild,v 1.6 2009/03/29 17:03:50 betelgeuse Exp $
56
57 -EAPI=1
58 +EAPI="2"
59 JAVA_PKG_IUSE="doc examples source"
60 WANT_ANT_TASKS="ant-trax"
61
62 @@ -15,7 +15,7 @@
63 LICENSE="Apache-2.0"
64 SLOT="1.2"
65 COMMON_DEPS="
66 - dev-java/antlr:0
67 + >=dev-java/antlr-2.7.7:0[java]
68 dev-java/commons-beanutils:1.7
69 >=dev-java/commons-collections-2.1:0
70 >=dev-java/commons-digester-1.5:0
71 @@ -33,9 +33,7 @@
72
73 S="${WORKDIR}/${MY_P}"
74
75 -src_unpack() {
76 - unpack ${A}
77 -
78 +java_prepare() {
79 # the build.xml expects this directory to exist
80 mkdir "${S}/lib"
81 cd "${S}/lib"