Don't (needlessly) xml-rewrite web.xml, prevent build-time DTD fetching, fixes bug...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-java/jaxme/ChangeLog b/dev-java/jaxme/ChangeLog
index 0d984b92d8921c1b815a6132479ec70659ae8f7c..7d1e9c67c271b6c755c206a779cf285fae24ae4c 100644 (file)
--- a/dev-java/jaxme/ChangeLog
+++ b/dev-java/jaxme/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jaxme
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/ChangeLog,v 1.35 2010/04/16 13:24:59 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/ChangeLog,v 1.36 2010/04/16 13:38:21 caster Exp $
+
+  16 Apr 2010; Vlastimil Babka <caster@gentoo.org> jaxme-0.5.2.ebuild:
+  Don't (needlessly) xml-rewrite web.xml, prevent build-time DTD fetching,
+  fixes bug #297803.
 
   16 Apr 2010; Vlastimil Babka <caster@gentoo.org> jaxme-0.5.2.ebuild:
   Fix building with USE=doc, bug #310311. Thanks to Cosmin Giradu for

diff --git a/dev-java/jaxme/Manifest b/dev-java/jaxme/Manifest
index abc4bb8300f3572e9ec8e1367d8557185797d48d..b94da6387ab6ba2c7db756c6e6046cb62b81f824 100644 (file)
--- a/dev-java/jaxme/Manifest
+++ b/dev-java/jaxme/Manifest
@@ -4,6 +4,6 @@ AUX jaxme-0.5.2-fix_marshallers.patch 1600 RMD160 cd4d579f4245a192226dea92e98be3
 DIST ws-jaxme-0.3.1-src.tar.gz 3058903 RMD160 cd994b5fd9a15473ed7390b8911601b794f76cd0 SHA1 4ba5fd76cbda407c0b32af2e3235dab66a8b0a00 SHA256 9f02b233849ec10cda455c51d5bda46929f5fcbed237c5a5a760a19eb59e852c
 DIST ws-jaxme-0.5.2-src.tar.gz 5478402 RMD160 75ed71ed02c84377a3c3a393a0a22637d01151e5 SHA1 e84103fca9dddb97f5eb2ad6549dcd77306ccd97 SHA256 0415d721259acf95c564fb84606bb17f6227c1cc444e89b78d1cd9903c1c88dc
 EBUILD jaxme-0.3.1-r4.ebuild 2370 RMD160 f216f440952e1723038ef06059674a2f93370e5a SHA1 c72383ed4d14a890459ffddaeabf4fe61c4bf2d5 SHA256 1e2912b7aaa1643fa274c89766dcd38508e3fe8fa8265f6486b1ac63b729cae5
-EBUILD jaxme-0.5.2.ebuild 2571 RMD160 6a8f9f3aad3973bd0c1c6dd7a4b67245a1c2765f SHA1 af5095b89a32c7a44958e86c7a2519bcd3fb9d0c SHA256 02349600ebd7d1b9e1945b3aa47f2b4f40eb06520e349588676edd72b06b084b
-MISC ChangeLog 4953 RMD160 54ffec1759dc833ea01949c53317cd616c7f18cc SHA1 4e6be97f4bdd9609ffa32a42db6df1fa95e45c40 SHA256 86ba4690a628e54b58d94546b7601083b1f186c50380b701ebe284356878a78d
+EBUILD jaxme-0.5.2.ebuild 2574 RMD160 b93ba3af7757d7a8468a4b9c15eddc046427e2ce SHA1 1c0b2514fc6e8ea81bb1528702ed7eadf8e9aa7c SHA256 a050a8b365ef13f60b1656703363d26606917d806041917536533f2db464eed0
+MISC ChangeLog 5121 RMD160 9b12e9291e436de890a6d122bc97c2d3014b416b SHA1 1efb5db68ce0827a0a8831da8b2b6f818209722b SHA256 63dfddb9ef476d3ec02cbd5de02eb508267269ac5fa0d9c2b325b9f66b9e26ba
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb

diff --git a/dev-java/jaxme/jaxme-0.5.2.ebuild b/dev-java/jaxme/jaxme-0.5.2.ebuild
index b9252595bdfe149bd5bec19bc9433b6987c0c2f7..31cf62f1834762f7f4190601f3ceb506df50fc1b 100644 (file)
--- a/dev-java/jaxme/jaxme-0.5.2.ebuild
+++ b/dev-java/jaxme/jaxme-0.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/jaxme-0.5.2.ebuild,v 1.9 2010/04/16 13:28:14 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/jaxme-0.5.2.ebuild,v 1.10 2010/04/16 13:38:21 caster Exp $
 
 EAPI="2"
 
@@ -52,7 +52,7 @@ java_prepare() {
        # Special case: jaxme uses ant/*.xml files, so rewriting them by hand
        # is better:
        cd "${S}"
-       for i in build.xml ant/*.xml src/webapp/web.xml src/test/jaxb/build.xml; do
+       for i in build.xml ant/*.xml src/webapp/build.xml src/test/jaxb/build.xml; do
                java-ant_bsfix_one "${i}"
        done