Fix classpath.

Package-Manager: portage-2.1.1_pre4-r4

diff --git a/dev-java/bsh/ChangeLog b/dev-java/bsh/ChangeLog
index 98b75a8b03a9cb1196a15149fafde383da070812..169b89cbb36cdc4b90e6f1a16873b012018d7e36 100644 (file)
--- a/dev-java/bsh/ChangeLog
+++ b/dev-java/bsh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/bsh
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/ChangeLog,v 1.30 2006/07/22 21:47:19 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/ChangeLog,v 1.31 2006/08/06 17:43:36 nelchael Exp $
+
+  06 Aug 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  bsh-2.0_beta4-r1.ebuild:
+  Fix classpath.
 
   22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   bsh-2.0_beta4-r1.ebuild:

diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest
index 54039b25bae881fe7fa94339cb921f9e83ed2fe7..970a0ea05882107fad1c08cb4227ea9ef5efbd16 100644 (file)
--- a/dev-java/bsh/Manifest
+++ b/dev-java/bsh/Manifest
@@ -37,18 +37,18 @@ EBUILD bsh-2.0_beta1-r1.ebuild 1175 RMD160 e8047bafc98c49d391805c71ca74e6c7864ee
 MD5 3e9db06b96be80b9500257a94feb42f8 bsh-2.0_beta1-r1.ebuild 1175
 RMD160 e8047bafc98c49d391805c71ca74e6c7864eec8b bsh-2.0_beta1-r1.ebuild 1175
 SHA256 0b2b90d4a0295127a1d1787b120df654bbc6173646b22efe7f5e16ac028d3fd2 bsh-2.0_beta1-r1.ebuild 1175
-EBUILD bsh-2.0_beta4-r1.ebuild 1609 RMD160 64cb6896b60e537d595e038c119303b9c19587bf SHA1 ad9a626af67138db5a80f71f07364315a1448d03 SHA256 a5c3b51cdf87cedd56dbf02adf38b422955c7fb6e30bccf1f4dd7534fad7bc05
-MD5 df5aa1d754e063c8ca523b259ae62fad bsh-2.0_beta4-r1.ebuild 1609
-RMD160 64cb6896b60e537d595e038c119303b9c19587bf bsh-2.0_beta4-r1.ebuild 1609
-SHA256 a5c3b51cdf87cedd56dbf02adf38b422955c7fb6e30bccf1f4dd7534fad7bc05 bsh-2.0_beta4-r1.ebuild 1609
+EBUILD bsh-2.0_beta4-r1.ebuild 1610 RMD160 433340062f67ce110dbe94387352451bfa56aebe SHA1 171942c3eb38f6852410038edd534bd23e1cc889 SHA256 85e96dbf03ca2fbb97ffc0fd468b13ae14552a0b88c4084a8d9ad800aea96de0
+MD5 f9eb4c29d4359120c107de735794632a bsh-2.0_beta4-r1.ebuild 1610
+RMD160 433340062f67ce110dbe94387352451bfa56aebe bsh-2.0_beta4-r1.ebuild 1610
+SHA256 85e96dbf03ca2fbb97ffc0fd468b13ae14552a0b88c4084a8d9ad800aea96de0 bsh-2.0_beta4-r1.ebuild 1610
 EBUILD bsh-2.0_beta4.ebuild 2044 RMD160 952b245065fb075a9618644c8dd3249741d50a53 SHA1 b871fb716aad94d5baf30f24aafeb7f7a9847808 SHA256 66acd5467fca4d3e731a6760c5ae43230be4bbcd3f3a1f19035c688ee75584aa
 MD5 518e18b6f28f343c38056468a9fc20a3 bsh-2.0_beta4.ebuild 2044
 RMD160 952b245065fb075a9618644c8dd3249741d50a53 bsh-2.0_beta4.ebuild 2044
 SHA256 66acd5467fca4d3e731a6760c5ae43230be4bbcd3f3a1f19035c688ee75584aa bsh-2.0_beta4.ebuild 2044
-MISC ChangeLog 3910 RMD160 044794034aa125a1be7922d65578680d9580f6b8 SHA1 73257d327f4db768a47cc0234c447821bf8e0d13 SHA256 4a47c09263f4ac6d4213def59d508bf7881da9c6d9c601f2f440920d360ed149
-MD5 ace2c90af627b0da2e3f5207b35952a2 ChangeLog 3910
-RMD160 044794034aa125a1be7922d65578680d9580f6b8 ChangeLog 3910
-SHA256 4a47c09263f4ac6d4213def59d508bf7881da9c6d9c601f2f440920d360ed149 ChangeLog 3910
+MISC ChangeLog 4008 RMD160 9abb389ad206eb035ecc7558631a49aa46d8beaf SHA1 138e17deb2ea36fb344d4aeea5b21b0a22aa0f38 SHA256 028a71d6c737f630e7918db450d0f7c86ab96e74c3bc2268d81469fbcb38f111
+MD5 91873ae220a3f979f60ea6977fba43fb ChangeLog 4008
+RMD160 9abb389ad206eb035ecc7558631a49aa46d8beaf ChangeLog 4008
+SHA256 028a71d6c737f630e7918db450d0f7c86ab96e74c3bc2268d81469fbcb38f111 ChangeLog 4008
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -66,9 +66,9 @@ MD5 d029ac05f23494a1ec8cda385644f7d9 files/digest-bsh-2.0_beta4-r1 467
 RMD160 a70cc8a98cbd04cc0a23b166168320972e034dba files/digest-bsh-2.0_beta4-r1 467
 SHA256 357f215c90d818f3da802676f4506777cebf2312a167604f99078a508434d6f4 files/digest-bsh-2.0_beta4-r1 467
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEwpzwgo/w9rxVVVERAta7AKCyxPtehWe0Yasttp9PlW15Q7j7hACbB/kB
-KV9cMJx/vqissURk/8QfB3E=
-=Cu4t
+iD8DBQFE1ipYgo/w9rxVVVERAkD6AJ0ZXcTP7P2Ev7VdgPEcgSqS0erzhgCePAfv
+H9Ngj/B7Kfvj35kNxxOCKe4=
+=lg8x
 -----END PGP SIGNATURE-----

diff --git a/dev-java/bsh/bsh-2.0_beta4-r1.ebuild b/dev-java/bsh/bsh-2.0_beta4-r1.ebuild
index 18410ea853fada4b63566c30867a7b6b24581476..429c6ebba37528a2842f865e88be16b717c93b68 100644 (file)
--- a/dev-java/bsh/bsh-2.0_beta4-r1.ebuild
+++ b/dev-java/bsh/bsh-2.0_beta4-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/bsh/bsh-2.0_beta4-r1.ebuild,v 1.2 2006/07/22 21:47:19 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/bsh-2.0_beta4-r1.ebuild,v 1.3 2006/08/06 17:43:36 nelchael Exp $
 
 inherit java-pkg-2 eutils java-ant-2
 
@@ -38,10 +38,13 @@ src_unpack() {
 }
 
 src_compile() {
-       local classpath="bsf-2.3,servletapi-2.4"
-       use readline && classpath="${classpath},libreadline-java"
+       cd "${S}/lib/"
+       java-pkg_jar-from servletapi-2.4
+       java-pkg_jar-from bsf-2.3
+       use readline && java-pkg_jar-from libreadline-java
+       cd "${S}"
 
-       eant -lib $(java-pkg_getjars ${classpath}) $(use_doc) jarall
+       eant $(use_doc) jarall
 }
 
 src_install() {