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

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/castor: castor-0.9.9.1-r4.ebuild castor-1.1.1-r2.ebuild
Date: Sun, 03 Aug 2008 22:32:17
Message-Id: E1KPm7Z-0006t3-V3@stork.gentoo.org
1 betelgeuse 08/08/03 22:32:13
2
3 Modified: castor-0.9.9.1-r4.ebuild
4 Added: castor-1.1.1-r2.ebuild
5 Log:
6 Remove unneeded dependency on adaptx.
7 (Portage version: 2.2_rc6/cvs/Linux 2.6.26-gentoo i686)
8
9 Revision Changes Path
10 1.3 dev-java/castor/castor-0.9.9.1-r4.ebuild
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/castor/castor-0.9.9.1-r4.ebuild?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/castor/castor-0.9.9.1-r4.ebuild?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/castor/castor-0.9.9.1-r4.ebuild?r1=1.2&r2=1.3
15
16 Index: castor-0.9.9.1-r4.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-java/castor/castor-0.9.9.1-r4.ebuild,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- castor-0.9.9.1-r4.ebuild 20 Jul 2008 16:29:20 -0000 1.2
23 +++ castor-0.9.9.1-r4.ebuild 3 Aug 2008 22:32:13 -0000 1.3
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2008 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/castor-0.9.9.1-r4.ebuild,v 1.2 2008/07/20 16:29:20 ken69267 Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/castor-0.9.9.1-r4.ebuild,v 1.3 2008/08/03 22:32:13 betelgeuse Exp $
29
30 EAPI=1
31 JAVA_PKG_IUSE="doc examples source"
32 @@ -20,7 +20,6 @@
33 dev-java/jakarta-oro:2.0
34 dev-java/jakarta-regexp:1.3
35 dev-java/ldapsdk:4.1
36 - java-virtuals/servlet-api:2.3
37 dev-java/xerces:1.3
38 dev-java/cglib:2"
39 RDEPEND=">=virtual/jre-1.4
40 @@ -42,7 +41,7 @@
41 cd "${S}/lib"
42 rm -v *.jar || die
43 #FIXME: uses these bundled classes
44 - #rm -v tests/*.jar || die
45 + rm -v tests/*.jar || die
46 java-pkg_jar-from --build-only ant-core ant.jar
47 #Only used by examples and tests and we aren't building them
48 #java-pkg_jar-from adaptx-0.9
49 @@ -50,7 +49,6 @@
50 java-pkg_jar-from cglib-2
51 java-pkg_jar-from jakarta-oro-2.0 jakarta-oro.jar oro.jar
52 java-pkg_jar-from jakarta-regexp-1.3 jakarta-regexp.jar regexp.jar
53 - java-pkg_jar-from --virtual servlet-api-2.3
54 java-pkg_jar-from xerces-1.3
55 java-pkg_jar-from ldapsdk-4.1 ldapjdk.jar
56 }
57
58
59
60 1.1 dev-java/castor/castor-1.1.1-r2.ebuild
61
62 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/castor/castor-1.1.1-r2.ebuild?rev=1.1&view=markup
63 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/castor/castor-1.1.1-r2.ebuild?rev=1.1&content-type=text/plain
64
65 Index: castor-1.1.1-r2.ebuild
66 ===================================================================
67 # Copyright 1999-2008 Gentoo Foundation
68 # Distributed under the terms of the GNU General Public License v2
69 # $Header: /var/cvsroot/gentoo-x86/dev-java/castor/castor-1.1.1-r2.ebuild,v 1.1 2008/08/03 22:32:13 betelgeuse Exp $
70
71 JAVA_PKG_IUSE="doc examples source"
72
73 inherit java-pkg-2 java-ant-2
74
75 DESCRIPTION="Data binding framework for Java"
76 HOMEPAGE="http://www.castor.org"
77 SRC_URI="http://dist.codehaus.org/${PN}/${PV}/${P}-src.tgz"
78
79 #SRC_URI="mirror://gentoo/${P}.tar.bz2"
80 # svn co https://svn.codehaus.org/castor/castor/tags/1.0.3/ castor-1.0.3
81 # cd castor-1.0.3
82 # mvn ant:ant
83 # do some magic to build.xml
84 # rm lib/*
85 # cd ../
86 # tar cjvf castor-1.0.3.tar.bz2 --exclude=.svn castor-1.0.3
87
88 LICENSE="Exolab"
89 SLOT="1.0"
90 KEYWORDS="~amd64 ~x86"
91 IUSE=""
92
93 # tests and full documentation when support will be added
94 # dev-java/log4j
95 # ~dev-java/servletapi-2.4
96 # dev-java/junit"
97
98 COMMON_DEPS="
99 =dev-java/cglib-2.1*
100 dev-java/commons-logging
101 =dev-java/jakarta-oro-2.0*
102 =dev-java/jakarta-regexp-1.3*
103 java-virtuals/transaction-api
104 =dev-java/ldapsdk-4.1*
105 dev-java/ant-core"
106
107 DEPEND=">=virtual/jdk-1.4
108 ${COMMON_DEPS}"
109 RDEPEND=">=virtual/jre-1.4
110 ${COMMON_DEPS}"
111
112 src_unpack() {
113 unpack ${A}
114
115 java-ant_rewrite-classpath "${S}/anttask/build.xml"
116
117 cd "${S}"
118 # http://jira.codehaus.org/browse/CASTOR-2008
119 epatch "${FILESDIR}/1.1.1-jdk-1.4.patch"
120
121 cd "${S}/lib"
122 rm -v *.jar tests/*.jar
123 java-pkg_jar-from cglib-2.1 cglib.jar
124 java-pkg_jar-from commons-logging \
125 commons-logging-api.jar commons-logging-1.1.jar
126 java-pkg_jar-from jakarta-oro-2.0
127 java-pkg_jar-from jakarta-regexp-1.3
128 java-pkg_jar-from transaction-api
129 java-pkg_jar-from ldapsdk-4.1 ldapjdk.jar
130 java-pkg_jar-from ant-core ant.jar
131
132 # These are only used for tests or documentation
133 #java-pkg_jar-from junit
134 #java-pkg_jar-from adaptx-0.9
135 #java-pkg_jar-from log4j
136 #java-pkg_jar-from servletapi-2.4 servlet-api.jar
137 use doc && mkdir "${S}/bin/lib"
138 java-pkg_filter-compiler jikes
139 }
140
141 # clean target is borked
142 # http://jira.codehaus.org/browse/CASTOR-2009
143 EANT_BUILD_XML="src/build.xml"
144 EANT_GENTOO_CLASSPATH="ant-core"
145
146 # Needs for example mockejb which is not packaged yet
147 #src_test() {
148 # cd "${S}"/src/
149 # eant tests
150 #}
151
152 src_install() {
153 cd dist
154 for jar in *.jar; do
155 java-pkg_newjar ${jar} ${jar//-${PV}}
156 done
157 cd ..
158 dodoc src/etc/CHANGELOG || die
159 java-pkg_register-ant-task
160 use source && java-pkg_dosrc */main/java/org
161 use doc && java-pkg_dojavadoc build/doc/javadoc
162 use examples && java-pkg_doexamples src/examples
163 }
Report Message
Find on MARC Find on Google Groups