Fixed rewriting of build files, see bug #141940.

Package-Manager: portage-2.1.1_pre3-r5

3 files changed, 26 insertions, 13 deletions

diff --git a/dev-java/jaxme/ChangeLog b/dev-java/jaxme/ChangeLog
index 26d0652ed1fa..4a6e7391a093 100644
--- a/dev-java/jaxme/ChangeLog
+++ b/dev-java/jaxme/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jaxme
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/ChangeLog,v 1.8 2006/07/27 20:26:58 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/ChangeLog,v 1.9 2006/07/28 08:19:32 nelchael Exp $
+
+  28 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org> jaxme-0.3.1-r1.ebuild:
+  Fixed rewriting of build files, see bug #141940.
 
 *jaxme-0.3.1-r1 (27 Jul 2006)
 
diff --git a/dev-java/jaxme/Manifest b/dev-java/jaxme/Manifest
index 5b2ed1abb047..aa8bf58c2c05 100644
--- a/dev-java/jaxme/Manifest
+++ b/dev-java/jaxme/Manifest
@@ -6,18 +6,18 @@ MD5 8039a2f19bcc273d417ec48d00bbe87a files/jaxme-0.3.1-gentoo.patch 1771
 RMD160 2c4d51b162bb87599e7c50b28bfd99dee37e5d96 files/jaxme-0.3.1-gentoo.patch 1771
 SHA256 833974df6973940936e74919c9629bc17138805bf4dd54d53916334bb01c91fa files/jaxme-0.3.1-gentoo.patch 1771
 DIST ws-jaxme-0.3.1-src.tar.gz 3058903 RMD160 cd994b5fd9a15473ed7390b8911601b794f76cd0 SHA1 4ba5fd76cbda407c0b32af2e3235dab66a8b0a00 SHA256 9f02b233849ec10cda455c51d5bda46929f5fcbed237c5a5a760a19eb59e852c
-EBUILD jaxme-0.3.1-r1.ebuild 1595 RMD160 fceffcbb85f74d07c97af544e6e7bdb14ebb69a6 SHA1 e6ba5fa3e2ea299b6655bd95c5cf9293b4559848 SHA256 642ef0b5bfdff25099fefeaec06e9a64f0031b9a875122fda811ec771ca30197
-MD5 12d16acfe9149880b27057b254ae6e58 jaxme-0.3.1-r1.ebuild 1595
-RMD160 fceffcbb85f74d07c97af544e6e7bdb14ebb69a6 jaxme-0.3.1-r1.ebuild 1595
-SHA256 642ef0b5bfdff25099fefeaec06e9a64f0031b9a875122fda811ec771ca30197 jaxme-0.3.1-r1.ebuild 1595
+EBUILD jaxme-0.3.1-r1.ebuild 1838 RMD160 0eb81097f71f73b96aca5795625dde2c3d4f6fac SHA1 2b081d7722faf360b63a9e9bb3d6ed74979d5556 SHA256 183543c52708eff26e4d403fcd4b56f3b7fc0e4f8ed28d1b8764b4ec78f8e284
+MD5 b05992d11fe32a7e315db6bb91a197eb jaxme-0.3.1-r1.ebuild 1838
+RMD160 0eb81097f71f73b96aca5795625dde2c3d4f6fac jaxme-0.3.1-r1.ebuild 1838
+SHA256 183543c52708eff26e4d403fcd4b56f3b7fc0e4f8ed28d1b8764b4ec78f8e284 jaxme-0.3.1-r1.ebuild 1838
 EBUILD jaxme-0.3.1.ebuild 1634 RMD160 a8c5130d275fc4345f73f5f7a7789561ff5d9acb SHA1 0e037a3253b304c6dec03b93ad9d0d1565a7fd5e SHA256 3d889735b474f7d07a1b5f0495ef12fdcdc924c4856c08a3211de587fd08dff4
 MD5 dd79eeaa71196821af81c46194d397bf jaxme-0.3.1.ebuild 1634
 RMD160 a8c5130d275fc4345f73f5f7a7789561ff5d9acb jaxme-0.3.1.ebuild 1634
 SHA256 3d889735b474f7d07a1b5f0495ef12fdcdc924c4856c08a3211de587fd08dff4 jaxme-0.3.1.ebuild 1634
-MISC ChangeLog 1146 RMD160 08959cbfa911fc14cf95e4425a978fc29dc36f08 SHA1 d3ef4b8a0b1d07769af56248afb7a1fd870fdfab SHA256 61f60a569e3ecdbb0231583094a6abc0ccdaa57b38ac3f70a0cd45f863c06775
-MD5 f5e1105120c95b0e3d71c9cb1e61bc5f ChangeLog 1146
-RMD160 08959cbfa911fc14cf95e4425a978fc29dc36f08 ChangeLog 1146
-SHA256 61f60a569e3ecdbb0231583094a6abc0ccdaa57b38ac3f70a0cd45f863c06775 ChangeLog 1146
+MISC ChangeLog 1274 RMD160 4d5a0fa609d80c29adc82cbb610e36774331dba5 SHA1 de53bac6a93008ba3d45d86de221206a9ff12637 SHA256 e0d77a285ae2b17d6cbcf6208bb1c021cd998b940e456d2321394ea27737a32f
+MD5 a1fcae8dc0e49e3d131b29dca3a1de11 ChangeLog 1274
+RMD160 4d5a0fa609d80c29adc82cbb610e36774331dba5 ChangeLog 1274
+SHA256 e0d77a285ae2b17d6cbcf6208bb1c021cd998b940e456d2321394ea27737a32f ChangeLog 1274
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -31,7 +31,7 @@ SHA256 0f7eb759824895c7f8af0a9f3e9f270b9849fb68689cc8f0b3eda15670eb8a5b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEySGngo/w9rxVVVERAk8cAJ4kLWf4fo8WuXi899VVYRnhuxz33QCfaZwm
-VLi2MdJUUrReqA3Y4kwilXQ=
-=7+bx
+iD8DBQFEycirgo/w9rxVVVERAlemAJ4rmA69Ua6JIar2dIeJVqQtYPyG7wCeKdMo
+u8p+mYAJ/dBXlgx235aDNSo=
+=llJI
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jaxme/jaxme-0.3.1-r1.ebuild b/dev-java/jaxme/jaxme-0.3.1-r1.ebuild
index cb87960756ee..394176d35171 100644
--- a/dev-java/jaxme/jaxme-0.3.1-r1.ebuild
+++ b/dev-java/jaxme/jaxme-0.3.1-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/jaxme/jaxme-0.3.1-r1.ebuild,v 1.1 2006/07/27 20:26:58 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/jaxme-0.3.1-r1.ebuild,v 1.2 2006/07/28 08:19:32 nelchael Exp $
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -27,6 +27,9 @@ DEPEND=">=virtual/jdk-1.4
 
 S="${WORKDIR}/${MY_P}"
 
+# We do it later
+JAVA_PKG_BSFIX="off"
+
 src_unpack() {
 	unpack ${A}
 
@@ -42,6 +45,13 @@ src_unpack() {
 	java-pkg_jarfrom xerces-2
 	java-pkg_jarfrom xmldb xmldb-api.jar xmldb-api-20021118.jar
 	java-pkg_jarfrom xmldb xmldb-api-sdk.jar xmldb-api-sdk-20021118.jar
+
+	# Special case: jaxme uses build<foo>.xml files, so rewriting them by hand
+	# is better:
+	cd ${S}
+	for i in build*.xml src/webapp/build.xml src/test/jaxb/build.xml; do
+		java-ant_bsfix_one "${i}"
+	done
 }
 
 src_compile() {