Add a fix for classpath handling.

Package-Manager: portage-2.1.1_pre4-r4

diff --git a/dev-java/bsf/ChangeLog b/dev-java/bsf/ChangeLog
index 1ef5ff1a8347a8d261b4f8381d6275e93ab61884..c7bfa21fb2d02301482198ca0c793cf1e69aa7f6 100644 (file)
--- a/dev-java/bsf/ChangeLog
+++ b/dev-java/bsf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/bsf
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/ChangeLog,v 1.28 2006/07/22 21:45:50 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/ChangeLog,v 1.29 2006/08/06 17:35:51 nelchael Exp $
+
+  06 Aug 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/bsf-2.3.0-classpath.patch, bsf-2.3.0-r3.ebuild:
+  Add a fix for classpath handling.
 
   22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org> bsf-2.3.0-r3.ebuild:
   ant_src_unpack -> src_unpack

diff --git a/dev-java/bsf/Manifest b/dev-java/bsf/Manifest
index e4173f258fa916b1025bd66a3314cf51230fe11f..f44b1639b9bc0d43fd37919a4bbb3440557ab43e 100644 (file)
--- a/dev-java/bsf/Manifest
+++ b/dev-java/bsf/Manifest
@@ -1,20 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX bsf-2.3.0-classpath.patch 667 RMD160 a1cc82b3166ddb81412549cd5963bde4d071548d SHA1 08b93525ccab82c4ab9cd3e7a628b86e0ab4b09f SHA256 c265a5d44d1630b049d9a0c32b51a71efcb5cb27d8671fdca350af4deb24d074
+MD5 bd886816ca8081772505b2550a366f92 files/bsf-2.3.0-classpath.patch 667
+RMD160 a1cc82b3166ddb81412549cd5963bde4d071548d files/bsf-2.3.0-classpath.patch 667
+SHA256 c265a5d44d1630b049d9a0c32b51a71efcb5cb27d8671fdca350af4deb24d074 files/bsf-2.3.0-classpath.patch 667
 DIST bsf-rhino-1.5.patch.bz2 10818 RMD160 18d4d1f4153855679766c1b60679459c2937797b SHA1 1404c3fcb8427831a65116e045221aaf841a36fe SHA256 62afe966897b6f136a6f38f61a8959871c48ef8552a12fd96ce22c0dfab5d9ad
 DIST bsf-src-2.3.0.tar.gz 1035181 RMD160 24d378bca1f68950b9b2699192c3138fb2bff7e4 SHA1 7c69c14f8f54d671fb8b32cad3e5f289ba41b814 SHA256 ed0caf3567d7c084f21c0f0ce38077384c8e4afc80a1df7a2095a53ada777503
 EBUILD bsf-2.3.0-r2.ebuild 1591 RMD160 891b21493c4eb6c7dfefd48de9e426c4caff5e2b SHA1 cec41c96a2d519e7fe5505b73ae2d91633488abf SHA256 f724d6fe9418a67d01722be9e8707047444cd3b9902bc0f7e5dd633cc06a09dc
 MD5 502cde235676f548c92f01196871810b bsf-2.3.0-r2.ebuild 1591
 RMD160 891b21493c4eb6c7dfefd48de9e426c4caff5e2b bsf-2.3.0-r2.ebuild 1591
 SHA256 f724d6fe9418a67d01722be9e8707047444cd3b9902bc0f7e5dd633cc06a09dc bsf-2.3.0-r2.ebuild 1591
-EBUILD bsf-2.3.0-r3.ebuild 1396 RMD160 bc34652088cc27b011b2e6e32358ce66c0bcd005 SHA1 ac7dadb52b3968323c9098a71abfa22cc307a029 SHA256 4c0c0028ec73b70be94a5019260fbeb11797d0c5d894d4deb78441e050811db4
-MD5 7d6ba5db86a70a56553126061cf8c2a8 bsf-2.3.0-r3.ebuild 1396
-RMD160 bc34652088cc27b011b2e6e32358ce66c0bcd005 bsf-2.3.0-r3.ebuild 1396
-SHA256 4c0c0028ec73b70be94a5019260fbeb11797d0c5d894d4deb78441e050811db4 bsf-2.3.0-r3.ebuild 1396
-MISC ChangeLog 3243 RMD160 c7c8941acb9ecb2fcdb14fe6fb90125f0122ee00 SHA1 35740afecef2186210222800d1ccfa77513bb482 SHA256 8739fe4d0f8c1166df232db90ceb82a318289db2124fe7ffe0bc0793b3a7c662
-MD5 136b1721c8ce4afb7a442175c6105e7a ChangeLog 3243
-RMD160 c7c8941acb9ecb2fcdb14fe6fb90125f0122ee00 ChangeLog 3243
-SHA256 8739fe4d0f8c1166df232db90ceb82a318289db2124fe7ffe0bc0793b3a7c662 ChangeLog 3243
+EBUILD bsf-2.3.0-r3.ebuild 1482 RMD160 9a7be0f5920718a638f00318dcd3c54acd891ca5 SHA1 a2993efc404ebdc6fe353493f45a0833f4bc82a8 SHA256 c14fbd847db7223f3df72f438176258546a790fb5a96ac368572bb61db231473
+MD5 e7a565337d054efa000ce31d198b98de bsf-2.3.0-r3.ebuild 1482
+RMD160 9a7be0f5920718a638f00318dcd3c54acd891ca5 bsf-2.3.0-r3.ebuild 1482
+SHA256 c14fbd847db7223f3df72f438176258546a790fb5a96ac368572bb61db231473 bsf-2.3.0-r3.ebuild 1482
+MISC ChangeLog 3390 RMD160 07fa02c3c657d3b6669104f838e15d4df818cad1 SHA1 3c67396808608e000757ac8e37ae7023a7c54484 SHA256 6c85365c12da0f2374515d11b43c695e0742dd7d4866888dfe42ae265ed1b2ec
+MD5 9a6e8be6a201bf72025a8cb54760fb10 ChangeLog 3390
+RMD160 07fa02c3c657d3b6669104f838e15d4df818cad1 ChangeLog 3390
+SHA256 6c85365c12da0f2374515d11b43c695e0742dd7d4866888dfe42ae265ed1b2ec ChangeLog 3390
 MISC metadata.xml 829 RMD160 46341bec09dfae6c9d870c92fc1520353a8ed58e SHA1 b4c3798c8d0e0ce8dd99884e47f15a7a09be2aba SHA256 12ff3afd1cc82efa3392c06b9bc411bd50318d1b2180b9765d723a51a7922e10
 MD5 2a5c0decd09ba5a48289b129458bf44c metadata.xml 829
 RMD160 46341bec09dfae6c9d870c92fc1520353a8ed58e metadata.xml 829
@@ -26,9 +30,9 @@ MD5 acc51178000478a121155b2958e2d811 files/digest-bsf-2.3.0-r3 491
 RMD160 82ebc43e7da7ba54c8c82c7ab2bfcd1661e5f3fb files/digest-bsf-2.3.0-r3 491
 SHA256 86c62d16b61f6ffbea891ea0403e91b69d2c423d209d14a10f3434b46d07eb0c files/digest-bsf-2.3.0-r3 491
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEwpyYgo/w9rxVVVERApNVAJ0VW5FBJMuBde+H9fSbnfIuXDaoLwCgwhHu
-DENj3ZLq0bmUo+3QSPO3dRw=
-=MHj9
+iD8DBQFE1iiHgo/w9rxVVVERAv5sAJwK41PCB0g0d9Z7UUJAlHnVBGo0GACeN3Lh
+ZfW0oQ+avQQyhBpqTYWveoY=
+=QunN
 -----END PGP SIGNATURE-----

diff --git a/dev-java/bsf/bsf-2.3.0-r3.ebuild b/dev-java/bsf/bsf-2.3.0-r3.ebuild
index 6a7312fafa62008d0fedbe58b3741f16cc22e71d..2d8e7f447f7300efeeeefac0f140d840daebdd8d 100644 (file)
--- a/dev-java/bsf/bsf-2.3.0-r3.ebuild
+++ b/dev-java/bsf/bsf-2.3.0-r3.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/bsf/bsf-2.3.0-r3.ebuild,v 1.2 2006/07/22 21:45:50 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/bsf-2.3.0-r3.ebuild,v 1.3 2006/08/06 17:35:51 nelchael Exp $
 
 inherit java-pkg-2 eutils java-ant-2
 
@@ -26,18 +26,19 @@ DEPEND=">=virtual/jdk-1.4
 src_unpack() {
        unpack ${A}
 
-       epatch ${WORKDIR}/bsf-rhino-1.5.patch
+       epatch "${WORKDIR}/bsf-rhino-1.5.patch"
+       epatch "${FILESDIR}/${P}-classpath.patch"
 }
 
 src_compile() {
-       use rhino && cp="${cp}:$(java-pkg_getjars rhino-1.5)"
-       use jython && cp="${cp}:$(java-pkg_getjars jython)"
+       has_version dev-java/rhino && cp="${cp}:$(java-pkg_getjars rhino-1.5)"
+       has_version dev-java/jython && cp="${cp}:$(java-pkg_getjars jython)"
 
        cd ${S}/src/taglib
        eant -Dservlet.jar="$(java-pkg_getjars servletapi-2.3)" compile
 
        cd ${S}/src
-       eant -Dclasspath=${cp} compile $(use_doc javadocs)
+       eant -Dgentoo.classpath=${cp} compile $(use_doc javadocs)
 }
 
 src_install() {

diff --git a/dev-java/bsf/files/bsf-2.3.0-classpath.patch b/dev-java/bsf/files/bsf-2.3.0-classpath.patch
new file mode 100644 (file)
index 0000000..8e8321e
--- /dev/null
+++ b/dev-java/bsf/files/bsf-2.3.0-classpath.patch
@@ -0,0 +1,14 @@
+diff -Nru bsf-2.3.0.vanilla/src/bsf/build.xml bsf-2.3.0/src/bsf/build.xml
+--- bsf-2.3.0.vanilla/src/bsf/build.xml        2006-08-06 19:25:59.000000000 +0200
++++ bsf-2.3.0/src/bsf/build.xml        2006-08-06 19:33:04.000000000 +0200
+@@ -208,9 +208,8 @@
+       </fileset>
+     </copy>
+ 
+-    <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}">
++      <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}" classpath="${bsf.extraclasspath}:${gentoo.classpath}">
+       <patternset refid="javac.source.files"/>
+-      <classpath location="${bsf.extraclasspath}"/>
+     </javac>
+ 
+     <!-- ================================================================= -->