From: Vlastimil Babka Date: Wed, 25 Apr 2007 11:30:47 +0000 (+0000) Subject: Fix the deps, small style cleanup. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=38134fbc8e96a2f01dc8bccfd394d7d7a6337efe;p=gentoo.git Fix the deps, small style cleanup. Package-Manager: portage-2.1.2.4 --- diff --git a/dev-java/adaptx/ChangeLog b/dev-java/adaptx/ChangeLog index 5faec6e7efd6..3477c33333f9 100644 --- a/dev-java/adaptx/ChangeLog +++ b/dev-java/adaptx/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/adaptx -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/adaptx/ChangeLog,v 1.22 2006/11/30 15:20:12 caster Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/adaptx/ChangeLog,v 1.23 2007/04/25 11:30:47 caster Exp $ + + 25 Apr 2007; Vlastimil Babka + adaptx-0.9.13_p20041105-r2.ebuild: + Fix the deps, small style cleanup. 30 Nov 2006; Vlastimil Babka adaptx-0.9.13_p20041105-r1.ebuild, adaptx-0.9.13_p20041105-r2.ebuild: diff --git a/dev-java/adaptx/Manifest b/dev-java/adaptx/Manifest index c9c75af419f7..f4f1d7c1fc2d 100644 --- a/dev-java/adaptx/Manifest +++ b/dev-java/adaptx/Manifest @@ -3,14 +3,14 @@ EBUILD adaptx-0.9.13_p20041105-r1.ebuild 1311 RMD160 9b8a5352e8682625915f804c54f MD5 10254a9c6d1592a13271b93be4a76cc4 adaptx-0.9.13_p20041105-r1.ebuild 1311 RMD160 9b8a5352e8682625915f804c54fd3efb17c24809 adaptx-0.9.13_p20041105-r1.ebuild 1311 SHA256 bfe886507d0f079215174fc60b19670abfddb511df9e8774aabc098503ef0fa9 adaptx-0.9.13_p20041105-r1.ebuild 1311 -EBUILD adaptx-0.9.13_p20041105-r2.ebuild 1370 RMD160 e3c284cf75f31df66bf02b1205115f56dcb79eb8 SHA1 247a32e2577c21f60b959f040f2f603e6e73f613 SHA256 4974934c4340a18280dd974c29d23aa33889f4192b3bd39ff69be792106e520b -MD5 5d3859fe5561fcfc81a696c5da306bb7 adaptx-0.9.13_p20041105-r2.ebuild 1370 -RMD160 e3c284cf75f31df66bf02b1205115f56dcb79eb8 adaptx-0.9.13_p20041105-r2.ebuild 1370 -SHA256 4974934c4340a18280dd974c29d23aa33889f4192b3bd39ff69be792106e520b adaptx-0.9.13_p20041105-r2.ebuild 1370 -MISC ChangeLog 3214 RMD160 42dc2f9fa5ba9d86cdbe355ee11270a67f2bff96 SHA1 b70e62b1e27e8bfc51a1d67d427314b1f72cb143 SHA256 1e15260aeb758e3fecab11ec71ec63303d5bafda4b41823aeb80cdee84014e91 -MD5 5bca21ae3ad828f562d2feed712f215b ChangeLog 3214 -RMD160 42dc2f9fa5ba9d86cdbe355ee11270a67f2bff96 ChangeLog 3214 -SHA256 1e15260aeb758e3fecab11ec71ec63303d5bafda4b41823aeb80cdee84014e91 ChangeLog 3214 +EBUILD adaptx-0.9.13_p20041105-r2.ebuild 1309 RMD160 843ed0286610f84227477f3995ac03ab3bd17c98 SHA1 64876f98a1d63fbafbc4ee1fbb0209531d075562 SHA256 1962b576029a57e6b88589bfa2b38a753b6b91d67c56c7e8a792690f4a8f1205 +MD5 ec5f43e8917209444e4358ff89f92ffd adaptx-0.9.13_p20041105-r2.ebuild 1309 +RMD160 843ed0286610f84227477f3995ac03ab3bd17c98 adaptx-0.9.13_p20041105-r2.ebuild 1309 +SHA256 1962b576029a57e6b88589bfa2b38a753b6b91d67c56c7e8a792690f4a8f1205 adaptx-0.9.13_p20041105-r2.ebuild 1309 +MISC ChangeLog 3340 RMD160 2c5d31374185fd581d8ce13fcd323fc248cbe69b SHA1 229ff16240909449dbb39a326282214e67574d14 SHA256 6f221c6665c118e9e1b81f81f8b4dac3883c30a06fa19874ec6321455366c529 +MD5 318985bb7d8164b895ff70854e17a1da ChangeLog 3340 +RMD160 2c5d31374185fd581d8ce13fcd323fc248cbe69b ChangeLog 3340 +SHA256 6f221c6665c118e9e1b81f81f8b4dac3883c30a06fa19874ec6321455366c529 ChangeLog 3340 MISC metadata.xml 309 RMD160 91f0a1c3b58ae951dfaa8444a6f1131df3fe792a SHA1 dbdf387a05d7b10a0eaf402e50eba9e540a20aaf SHA256 a070a1cd1fae94931b702a04c798598ea6ff216b5fe6cdd8efe3e729c40557b0 MD5 df6f8fd3ce326006c25a07d492d95c37 metadata.xml 309 RMD160 91f0a1c3b58ae951dfaa8444a6f1131df3fe792a metadata.xml 309 diff --git a/dev-java/adaptx/adaptx-0.9.13_p20041105-r2.ebuild b/dev-java/adaptx/adaptx-0.9.13_p20041105-r2.ebuild index 524050b1aafa..e9bdff573012 100644 --- a/dev-java/adaptx/adaptx-0.9.13_p20041105-r2.ebuild +++ b/dev-java/adaptx/adaptx-0.9.13_p20041105-r2.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/adaptx/adaptx-0.9.13_p20041105-r2.ebuild,v 1.5 2006/11/30 15:20:12 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/adaptx/adaptx-0.9.13_p20041105-r2.ebuild,v 1.6 2007/04/25 11:30:47 caster Exp $ +JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-ant-2 MY_PN=${PV%%_p*} @@ -10,19 +11,19 @@ DESCRIPTION="Adaptx is an XSLT processor and XPath engine" HOMEPAGE="http://project.exolab.org/cgi-bin/viewcvs.cgi/adaptx/?cvsroot=adaptx" SRC_URI="mirror://gentoo/${PN}-${MY_SNAPSHOT}.gentoo.tar.bz2" LICENSE="Exolab" -RDEPEND="=virtual/jre-1.4* - =dev-java/rhino-1.5* +CDEPEND="=dev-java/rhino-1.5* =dev-java/log4j-1.2* dev-java/gnu-jaxp dev-java/xml-commons >=dev-java/xerces-2.7" +RDEPEND="=virtual/jre-1.4* + dev-java/ant-core + ${CDEPEND}" DEPEND="=virtual/jdk-1.4* - >=dev-java/ant-core-1.4 - source? ( app-arch/zip ) - ${RDEPEND}" + ${CDEPEND}" SLOT="0.9" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="doc source" +IUSE="" S=${WORKDIR}/adaptx-20041105 @@ -31,9 +32,8 @@ src_compile() { # tried to build sources with jikes but # failed all the time on different # plattforms (amd64, x86) - local antflags="jar -Dclasspath=$(java-pkg_getjars xerces-2,xml-commons,rhino-1.5,gnu-jaxp,log4j,ant-core)" || die - antflags="${antflags} $(use_doc)" - eant ${antflags} || die "failed too build" + local cp="$(java-pkg_getjars xerces-2,xml-commons,rhino-1.5,gnu-jaxp,log4j,ant-core)" + eant -Dclasspath="${cp}" jar $(use_doc) } src_install() {