Fix build due to missing ant class when xalan and xerces are not installed, bug ...

Package-Manager: portage-2.2.0_alpha68/cvs/Linux x86_64

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index d55ef00b7f8c45209817233c47b389647bc89244..3100d7dd21addabfa2a8b2024ee74b3092ce77ea 100644 (file)
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/icedtea
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.40 2011/11/05 23:35:28 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.41 2011/11/06 23:22:43 caster Exp $
+
+  06 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-7.2.0-r1.ebuild:
+  Fix build due to missing ant class when xalan and xerces are not installed,
+  bug #389625.
 
   05 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-7.2.0-r1.ebuild:
   Relax lcms dep to allow the stable 2.0a satisfy it.

diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 62fc656cf5680d2b85f22bd464ec789b8bf22682..2bc21ea8bdf7de5d1ca1f59759fee19b680a6a81 100644 (file)
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -19,6 +19,6 @@ DIST jdk6-jaxws-b20.zip 5513069 RMD160 47b2d4fe528d770391e8926299df45cc6f68e9b5
 DIST openjdk-6-src-b22-28_feb_2011.tar.gz 45279689 RMD160 2b8f92cdb4d7dd3eb3cbb800a73e1666ee4bf5b1 SHA1 65a60153adbc8bc47fb95bb2b588a9a0b8701c95 SHA256 14a097d45b8c040e984be164a8cefbf22040a9ad57474fe87dd8cf2d0b08328b
 EBUILD icedtea-6.1.10.4-r1.ebuild 10901 RMD160 35a1922c192469bde056e28556e8a979f4c7a20a SHA1 8106276634f574457bee03144ab065076f60fcf8 SHA256 b5f474d18853e4d0be6b0e1d0a51e100fc02f155aef917969dda30f0c772e395
 EBUILD icedtea-6.1.10.4.ebuild 10669 RMD160 7d9eadb3b2553f8f0e881c5732fa9b8a486f34f4 SHA1 b52ba57da1427d5e0844818a2c2ced43d508dccc SHA256 5bf2ed661c49f530e1b3382454a52149eb6e36b08dcd1e0559bf40d50d1f5349
-EBUILD icedtea-7.2.0-r1.ebuild 11079 RMD160 874d18790e7480571a02ceded2d6c7a44f3555a7 SHA1 f3adc86d2483de4dbe6b8d1ea9e70d460d022214 SHA256 7beb19f2b4ea466e8a68d73c7f831a5a064b6074957d6b540e9451387538e6d7
-MISC ChangeLog 7836 RMD160 b61299c395eaa161d9b830fe5c3237b1460f3405 SHA1 8b6ae5cd5ba1bb2b03499ca941251a5db4365af5 SHA256 e4d492336093e7ed599ede24acd5c1b88051ef6af78fccde86900c12c1f9f5f5
+EBUILD icedtea-7.2.0-r1.ebuild 10919 RMD160 0f462875a60e635be9458ce916b7880d77f4d3e4 SHA1 6ee2ea7f0f88daeb11b5bc605a2eee5d5250e815 SHA256 b08ca7bddfefbde4d41e08c3f6e8752caf2a3ae6326850bbf7b4b709b6f4091e
+MISC ChangeLog 8006 RMD160 f3f8d6dad955502e01958e130ee06243ab3c0169 SHA1 910a15ab83ac85ceff026f42805bac28d81d3ddb SHA256 dfb77d4f2022c07201555c4a033598e410b5441837fa55a97ad41d23c7b966a1
 MISC metadata.xml 1567 RMD160 7cb547ff92d8896cdbb0dd53aa682fe31d027b4e SHA1 c42d533a391f98fa303b591a4ba1471e0de94b7c SHA256 596df17fd33825a2abb567685bda63f6ff56cbfa616911199855e3fac8bec5e4

diff --git a/dev-java/icedtea/icedtea-7.2.0-r1.ebuild b/dev-java/icedtea/icedtea-7.2.0-r1.ebuild
index 9aaba9bccca8dfeb66a4bf11b07158e7d62cae98..964ab3452472f90f2398bb07bbc94305fc3d73ae 100644 (file)
--- a/dev-java/icedtea/icedtea-7.2.0-r1.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.4 2011/11/05 23:35:28 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.5 2011/11/06 23:22:43 caster Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -74,9 +74,7 @@ RDEPEND=">=net-print/cups-1.2.12
 # Additional dependencies for building:
 #   zip: extract OpenJDK tarball, and needed by configure
 #   ant, ecj, jdk: required to build Java code
-# Only ant-core-1.7.1-r2 and later contain a version of Ant that
-# properly respects environment variables, if the build
-# sets some environment variables.
+# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
 # ca-certificates, perl and openssl are used for the cacerts keystore generation
 # xext headers have two variants depending on version - bug #288855
 # autoconf - as long as we use eautoreconf, version restrictions for bug #294918
@@ -90,7 +88,7 @@ DEPEND="${RDEPEND}
        )
        app-arch/zip
        >=dev-libs/libxslt-1.1.26
-       >=dev-java/ant-core-1.7.1-r2
+       >=dev-java/ant-core-1.8.1
        dev-java/ant-nodeps
        app-misc/ca-certificates
        dev-lang/perl
@@ -231,9 +229,8 @@ src_compile() {
        # an environment variable so it works properly...
        export ANT_RESPECT_JAVA_HOME=TRUE
 
-       # ant -diagnostics in Ant 1.8.0 fails without xerces+xalan
-       # otherwise we try to load the least that's needed to avoid possible classpath collisions
-       export ANT_TASKS="xerces-2 xalan ant-nodeps"
+       # We try to load the least that's needed to avoid possible classpath collisions
+       export ANT_TASKS="ant-nodeps"
 
        emake -j 1
 }