Removed xalan (optional) dependency to prevent circular deps reported in bug #161011...

Package-Manager: portage-2.1.2_rc4-r7

diff --git a/dev-java/bsf/ChangeLog b/dev-java/bsf/ChangeLog
index 10ef5e4802b32583acbd36df54897f126d8488b1..ce771313a09020b097724aafcf9e4623f5bd047e 100644 (file)
--- a/dev-java/bsf/ChangeLog
+++ b/dev-java/bsf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/bsf
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/ChangeLog,v 1.33 2007/01/08 00:37:14 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/ChangeLog,v 1.34 2007/01/09 00:20:27 caster Exp $
+
+  09 Jan 2007; Vlastimil Babka <caster@gentoo.org> bsf-2.3.0-r4.ebuild:
+  Removed xalan dependency (it's optional)to prevent circular deps reported
+  in bug #161011 by Darren Dale <dd55@cornell.edu>.
 
 *bsf-2.3.0-r4 (08 Jan 2007)
 

diff --git a/dev-java/bsf/Manifest b/dev-java/bsf/Manifest
index a923844286bf5d087acf6ca2eb8a856aca7ac99d..1676abad176b1bbf5b06ef36033b2920e408abae 100644 (file)
--- a/dev-java/bsf/Manifest
+++ b/dev-java/bsf/Manifest
@@ -16,14 +16,14 @@ EBUILD bsf-2.3.0-r3.ebuild 1492 RMD160 61d179dda6e133ebfc8eab53a9e67df378c563e6
 MD5 aff056f9aee7e7588d76e5384c32e85f bsf-2.3.0-r3.ebuild 1492
 RMD160 61d179dda6e133ebfc8eab53a9e67df378c563e6 bsf-2.3.0-r3.ebuild 1492
 SHA256 0666ce630eefe89166d408bc14ef4eb4b7d1223a218a53e3c706be41d8ceac2b bsf-2.3.0-r3.ebuild 1492
-EBUILD bsf-2.3.0-r4.ebuild 1728 RMD160 bf991fff7c7eba93f8cadec2ccb6c24fb47b0a6f SHA1 55b056ad2ef7b362d78ec74e2dbf7d7ee86d5b89 SHA256 b480a8df5660922941c11609c5942eb528010c65831e3ca2b270a180ec7dd391
-MD5 b8d7bf916502de5267307b854740d2c8 bsf-2.3.0-r4.ebuild 1728
-RMD160 bf991fff7c7eba93f8cadec2ccb6c24fb47b0a6f bsf-2.3.0-r4.ebuild 1728
-SHA256 b480a8df5660922941c11609c5942eb528010c65831e3ca2b270a180ec7dd391 bsf-2.3.0-r4.ebuild 1728
-MISC ChangeLog 3980 RMD160 1b2f9492745b85160babb0f5782c9f0f0b44fe99 SHA1 a7e3b87aca6fc3dd255038d4b24415c036c62622 SHA256 2f61eb373ecb4dc34e093321826bf38cc9d179f84afa9a8465dc37c620bd62fd
-MD5 a6b22ef35e8064b33ae15621fd8368a7 ChangeLog 3980
-RMD160 1b2f9492745b85160babb0f5782c9f0f0b44fe99 ChangeLog 3980
-SHA256 2f61eb373ecb4dc34e093321826bf38cc9d179f84afa9a8465dc37c620bd62fd ChangeLog 3980
+EBUILD bsf-2.3.0-r4.ebuild 1661 RMD160 2193c8a9deb1930f79f89a12bdb421541738a01b SHA1 af9321980532d504fdd957e4006e76dc0a1b45df SHA256 71aed65c12dc47e2e644fdb74d3668d9e84b8c779458c39233bba212e5b70158
+MD5 4dcf081e5a43ae0c7a27c65ac14fd7bf bsf-2.3.0-r4.ebuild 1661
+RMD160 2193c8a9deb1930f79f89a12bdb421541738a01b bsf-2.3.0-r4.ebuild 1661
+SHA256 71aed65c12dc47e2e644fdb74d3668d9e84b8c779458c39233bba212e5b70158 bsf-2.3.0-r4.ebuild 1661
+MISC ChangeLog 4181 RMD160 ec8e88de45cd7d4d5b707f0d3c7ba7849ea35bbb SHA1 fe0c35b3cd0fd50f4ec2fe690fc0ba7195e92cf0 SHA256 4a1c203aa7b5cd4312cac322147de14415271f530a7cd6c170491a098249b9c9
+MD5 1f36391f8db55ea44eeb5fc70481d620 ChangeLog 4181
+RMD160 ec8e88de45cd7d4d5b707f0d3c7ba7849ea35bbb ChangeLog 4181
+SHA256 4a1c203aa7b5cd4312cac322147de14415271f530a7cd6c170491a098249b9c9 ChangeLog 4181
 MISC metadata.xml 829 RMD160 46341bec09dfae6c9d870c92fc1520353a8ed58e SHA1 b4c3798c8d0e0ce8dd99884e47f15a7a09be2aba SHA256 12ff3afd1cc82efa3392c06b9bc411bd50318d1b2180b9765d723a51a7922e10
 MD5 2a5c0decd09ba5a48289b129458bf44c metadata.xml 829
 RMD160 46341bec09dfae6c9d870c92fc1520353a8ed58e metadata.xml 829

diff --git a/dev-java/bsf/bsf-2.3.0-r4.ebuild b/dev-java/bsf/bsf-2.3.0-r4.ebuild
index bf3d882588b1f9500f446ef8319ff011f6d6e5b7..849fecdbd38e4f619c849cc91a1f554f122f7ea3 100644 (file)
--- a/dev-java/bsf/bsf-2.3.0-r4.ebuild
+++ b/dev-java/bsf/bsf-2.3.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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-r4.ebuild,v 1.1 2007/01/08 00:37:14 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/bsf-2.3.0-r4.ebuild,v 1.2 2007/01/09 00:20:27 caster Exp $
 
 inherit java-pkg-2 eutils java-ant-2
 
@@ -16,7 +16,6 @@ IUSE="doc jython rhino source"
 COMMON_DEP="
        jython? ( >=dev-java/jython-2.1-r5 )
        rhino? ( =dev-java/rhino-1.5* )
-       dev-java/xalan
        =dev-java/servletapi-2.3*"
 RDEPEND=">=virtual/jre-1.4
        ${COMMON_DEP}"
@@ -34,8 +33,8 @@ src_unpack() {
 }
 
 src_compile() {
-       local cp="$(java-pkg_getjars xalan)"
-       local antflags="-Dxalan.present=true"
+       local cp
+       local antflags
        if use rhino; then
                antflags="${antflags} -Drhino.present=true"
                cp="${cp}:$(java-pkg_getjars rhino-1.5)"