summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2006-05-14 20:27:38 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2006-05-14 20:27:38 +0000
commit529683c49ccf529ad18f83d1ba8e19df6ff43584 (patch)
tree3899bf024fda2f1b684e575bec4f22db7e26aeae /dev-java/adaptx
parent+dev-libs/DirectFB:v4l2 (diff)
downloadhistorical-529683c49ccf529ad18f83d1ba8e19df6ff43584.tar.gz
historical-529683c49ccf529ad18f83d1ba8e19df6ff43584.tar.bz2
historical-529683c49ccf529ad18f83d1ba8e19df6ff43584.zip
Fixed emerging with LOCALCLASSPATH disabled in /usr/bin/ant. Bug #115888.
Package-Manager: portage-2.1_rc1
Diffstat (limited to 'dev-java/adaptx')
-rw-r--r--dev-java/adaptx/ChangeLog6
-rw-r--r--dev-java/adaptx/Manifest22
-rw-r--r--dev-java/adaptx/adaptx-0.9.13_p20041105-r1.ebuild18
3 files changed, 21 insertions, 25 deletions
diff --git a/dev-java/adaptx/ChangeLog b/dev-java/adaptx/ChangeLog
index 760fdef1343f..55382bd4cb58 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.16 2006/05/14 20:24:11 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/adaptx/ChangeLog,v 1.17 2006/05/14 20:27:38 betelgeuse Exp $
+
+ 14 May 2006; Petteri Räty <betelgeuse@gentoo.org>
+ adaptx-0.9.13_p20041105-r1.ebuild:
+ Fixed emerging with LOCALCLASSPATH disabled in /usr/bin/ant. Bug #115888.
14 May 2006; Petteri Räty <betelgeuse@gentoo.org>
-adaptx-0.9.13_p20041105.ebuild:
diff --git a/dev-java/adaptx/Manifest b/dev-java/adaptx/Manifest
index da58bcf273de..eb1dcb6c34cb 100644
--- a/dev-java/adaptx/Manifest
+++ b/dev-java/adaptx/Manifest
@@ -2,14 +2,14 @@
Hash: SHA1
DIST adaptx-20041105.gentoo.tar.bz2 332828 RMD160 e17a4d70d0296ac6781a80cc467ea3188eb74062 SHA256 f02c8d56c19e3e89608337a7bc210942b04788d213989ab55ebe1010d02cb53f size 332828
-EBUILD adaptx-0.9.13_p20041105-r1.ebuild 1489 RMD160 d22ad89cd9bdb9c57b60ac8b6cc25c0dcbe6ff67 SHA1 a2e6176a8974461f7997b3652e28989e649b02e0 SHA256 83948012a8745a408738cc63be70af6f2aa34b867a31fb43e3e3c498cbd499e6 size 1489
-MD5 f9c69a8558d21697f4ea2ecd44949132 adaptx-0.9.13_p20041105-r1.ebuild 1489
-RMD160 d22ad89cd9bdb9c57b60ac8b6cc25c0dcbe6ff67 adaptx-0.9.13_p20041105-r1.ebuild 1489
-SHA256 83948012a8745a408738cc63be70af6f2aa34b867a31fb43e3e3c498cbd499e6 adaptx-0.9.13_p20041105-r1.ebuild 1489
-MISC ChangeLog 2276 RMD160 6f38fda6622c58390dc6e0c28c17fb923b425abf SHA1 699ddff2be04a79dac2d7f22bc0f7ed7a6895f68 SHA256 933912a4a5865eebe840be732f3c4295408ad8da67b6a85a8eac3bd2fccbd838 size 2276
-MD5 26a46fec91c117d529181701ae7751d6 ChangeLog 2276
-RMD160 6f38fda6622c58390dc6e0c28c17fb923b425abf ChangeLog 2276
-SHA256 933912a4a5865eebe840be732f3c4295408ad8da67b6a85a8eac3bd2fccbd838 ChangeLog 2276
+EBUILD adaptx-0.9.13_p20041105-r1.ebuild 1359 RMD160 3607517245ec90d05d65c83427fee08ff9e72feb SHA1 0913d70a76ddf3a299fe230b249385b2bf922fe2 SHA256 0bd584783d5a2d425667df79e86593f47b924aa6919658e1ad5c521d96bcfe33 size 1359
+MD5 4d8f6fbbce31994fee47e1d24408ff86 adaptx-0.9.13_p20041105-r1.ebuild 1359
+RMD160 3607517245ec90d05d65c83427fee08ff9e72feb adaptx-0.9.13_p20041105-r1.ebuild 1359
+SHA256 0bd584783d5a2d425667df79e86593f47b924aa6919658e1ad5c521d96bcfe33 adaptx-0.9.13_p20041105-r1.ebuild 1359
+MISC ChangeLog 2443 RMD160 5154e5f4dec0726cd82989b07116ec3aab772950 SHA1 8d973785ce1e7785dceb1706c775268c75b6df84 SHA256 98dee0e269d8a146aeee57d1a22e5e3b4f43571d6a4e40d703438ff2ab4aae1b size 2443
+MD5 a4ccfb3ec48a2aaa00cdb33b1cef9a6e ChangeLog 2443
+RMD160 5154e5f4dec0726cd82989b07116ec3aab772950 ChangeLog 2443
+SHA256 98dee0e269d8a146aeee57d1a22e5e3b4f43571d6a4e40d703438ff2ab4aae1b ChangeLog 2443
MISC metadata.xml 310 RMD160 4f01b32bc2eede20cb0fdcaa33dc9637b14398d9 SHA1 b0fcacee3c73955709492bb76dcf4e84e6bccb8c SHA256 bc3845ba7d9bc81d4202fd5020c54d4716f6d404d69b0de38b4717449bfa89c0 size 310
MD5 2d1041fb0d459f9ca2614faa69da0e09 metadata.xml 310
RMD160 4f01b32bc2eede20cb0fdcaa33dc9637b14398d9 metadata.xml 310
@@ -20,7 +20,7 @@ SHA256 02fa22c3a7b994071220cd69b65cd7665b91919529402994652f7ff3fd7db63d files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
-iD4DBQFEZ5H3cxLzpIGCsLQRAvFEAJMG4NjIHoEqcdIkbBnyp4VxplsyAJ0TgJKO
-11130iN6OvyENDYnItF+FA==
-=FY64
+iD8DBQFEZ5LFcxLzpIGCsLQRAl+9AJ0XtEgWDzbnCsC8xXdZl9yNUTGjBACeLVzE
+M9JqWh3tGpJ/0x+1qPq6jUU=
+=6rWc
-----END PGP SIGNATURE-----
diff --git a/dev-java/adaptx/adaptx-0.9.13_p20041105-r1.ebuild b/dev-java/adaptx/adaptx-0.9.13_p20041105-r1.ebuild
index 2a7eaf6054bb..e128660eb6c4 100644
--- a/dev-java/adaptx/adaptx-0.9.13_p20041105-r1.ebuild
+++ b/dev-java/adaptx/adaptx-0.9.13_p20041105-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 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-r1.ebuild,v 1.11 2006/02/09 01:08:20 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/adaptx/adaptx-0.9.13_p20041105-r1.ebuild,v 1.12 2006/05/14 20:27:38 betelgeuse Exp $
inherit java-pkg
@@ -25,23 +25,15 @@ IUSE="doc"
S=${WORKDIR}/adaptx-20041105
-src_unpack() {
- unpack ${A}
- cd ${S}/lib
- java-pkg_jar-from xerces-2 xercesImpl.jar
- java-pkg_jar-from xml-commons xml-apis.jar
- java-pkg_jar-from rhino-1.5
- java-pkg_jar-from gnu-jaxp
- java-pkg_jar-from ant-core ant.jar
- java-pkg_jar-from log4j
-}
-
src_compile() {
+ local classpath="$(java-pkg_getjars \
+ xerces-2,xml-commons,rhino-1.5,gnu-jaxp,log4j)"
+
cd src/
# tried to build sources with jikes but
# failed all the time on different
# plattforms (amd64, x86)
- local antflags="jar"
+ local antflags="jar -Dclasspath=${classpath}"
use doc && antflags="${antflags} javadoc"
ant ${antflags} || die "failed too build"
}