Inherit java-ant-2 but turn off rewriting via JAVA_PKG_BSFIX as we patch build.xml.

Package-Manager: portage-2.1.2.2

3 files changed, 31 insertions, 13 deletions

diff --git a/dev-java/aspectwerkz/ChangeLog b/dev-java/aspectwerkz/ChangeLog
index a39963b85ae0..4dced712c226 100644
--- a/dev-java/aspectwerkz/ChangeLog
+++ b/dev-java/aspectwerkz/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/aspectwerkz
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/ChangeLog,v 1.11 2007/02/11 16:44:55 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/ChangeLog,v 1.12 2007/03/13 21:53:07 betelgeuse Exp $
+
+  13 Mar 2007; Petteri Räty <betelgeuse@gentoo.org>
+  aspectwerkz-2.0_rc2-r2.ebuild:
+  Inherit java-ant-2 but turn off rewriting via JAVA_PKG_BSFIX as we patch 
+  build.xml.
 
   11 Feb 2007; nixnut <nixnut@gentoo.org> aspectwerkz-2.0_rc2.ebuild:
   Stable on ppc wrt bug 165208
diff --git a/dev-java/aspectwerkz/Manifest b/dev-java/aspectwerkz/Manifest
index 95addc4ce874..0210205b6cdc 100644
--- a/dev-java/aspectwerkz/Manifest
+++ b/dev-java/aspectwerkz/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX aspectwerkz-2.0_rc2-gentoo.patch 4866 RMD160 5f103ae10c843b0ebcf5f3e92f9a733c4fde5dd8 SHA1 601cfaf73827be015c20935e4d02a041a2e440b6 SHA256 262f71feb10fc60b4fd2d6c160041c9ade5388c7d6b885ef9da18d4f8e4a3b29
 MD5 1bcde0233ea72230e5b78958ff1a30f9 files/aspectwerkz-2.0_rc2-gentoo.patch 4866
 RMD160 5f103ae10c843b0ebcf5f3e92f9a733c4fde5dd8 files/aspectwerkz-2.0_rc2-gentoo.patch 4866
@@ -11,18 +14,18 @@ EBUILD aspectwerkz-2.0_rc2-r1.ebuild 1441 RMD160 39ea58909d777ef309442e58952cc02
 MD5 c0d2b081bce387f53b1ad092aee236fb aspectwerkz-2.0_rc2-r1.ebuild 1441
 RMD160 39ea58909d777ef309442e58952cc0228fb983b5 aspectwerkz-2.0_rc2-r1.ebuild 1441
 SHA256 bd9b2cf5c7ec1b06d3a1f5b99f8245e000c648a4fedfeff2e0406f993ad7e402 aspectwerkz-2.0_rc2-r1.ebuild 1441
-EBUILD aspectwerkz-2.0_rc2-r2.ebuild 1737 RMD160 e562569e0a421eccfef6fd05d588ab086b4026e6 SHA1 282f1d1a52a2a3b18a148715231f6c2aa9a96956 SHA256 522fcab72f1b4ebfb4824fd9f55fc276e5eee7330a0b10e3160f7b571f7b460f
-MD5 a8c6d9f7c7b1a43af94c875c6a25bbd2 aspectwerkz-2.0_rc2-r2.ebuild 1737
-RMD160 e562569e0a421eccfef6fd05d588ab086b4026e6 aspectwerkz-2.0_rc2-r2.ebuild 1737
-SHA256 522fcab72f1b4ebfb4824fd9f55fc276e5eee7330a0b10e3160f7b571f7b460f aspectwerkz-2.0_rc2-r2.ebuild 1737
+EBUILD aspectwerkz-2.0_rc2-r2.ebuild 1770 RMD160 7891da879be1bb88e2d27be22b20b6d57f167439 SHA1 f090f0b0eac0c4c986b3175b518928129e7c28a8 SHA256 03389c0a3b69b05580e5501ef62cea5deb5585476aa9ccd30993542d72f557f5
+MD5 5c51e1895d94f2ce439bb78f883824e6 aspectwerkz-2.0_rc2-r2.ebuild 1770
+RMD160 7891da879be1bb88e2d27be22b20b6d57f167439 aspectwerkz-2.0_rc2-r2.ebuild 1770
+SHA256 03389c0a3b69b05580e5501ef62cea5deb5585476aa9ccd30993542d72f557f5 aspectwerkz-2.0_rc2-r2.ebuild 1770
 EBUILD aspectwerkz-2.0_rc2.ebuild 1555 RMD160 2373a1405c6a935d8594de893f7de3f7303b1f1e SHA1 34ef49fa219a3962bfa6ce42b96a3cd9bf41a9b7 SHA256 68af1421a5ef2ca73ff13280d09a19f2951fbdef471ae3568602a59a68b71eb9
 MD5 3faa409d38c59003fb26142ab9963a7b aspectwerkz-2.0_rc2.ebuild 1555
 RMD160 2373a1405c6a935d8594de893f7de3f7303b1f1e aspectwerkz-2.0_rc2.ebuild 1555
 SHA256 68af1421a5ef2ca73ff13280d09a19f2951fbdef471ae3568602a59a68b71eb9 aspectwerkz-2.0_rc2.ebuild 1555
-MISC ChangeLog 1997 RMD160 16c780cf6addc58f6634ae63019881f64ef74fca SHA1 47327398bbb09b83abe3aec1315f0a27a4c44bd0 SHA256 f104638e203cb6d00100b3c43ce6af9aca479600953871d5cb3f02706cd394d0
-MD5 e9dc8f151c5e2c080f7c72497d892f26 ChangeLog 1997
-RMD160 16c780cf6addc58f6634ae63019881f64ef74fca ChangeLog 1997
-SHA256 f104638e203cb6d00100b3c43ce6af9aca479600953871d5cb3f02706cd394d0 ChangeLog 1997
+MISC ChangeLog 2177 RMD160 bf02fbb8626b10a810cb051b393ef42e3c91fba5 SHA1 02dfb7252207a82817f800402271f41670e2550b SHA256 b13f784a7b359e8d6f6d5c6afdd9d5171fd6533fdfadb882a6b96dcca702176f
+MD5 27bce65d28ef38af866e543f96b51527 ChangeLog 2177
+RMD160 bf02fbb8626b10a810cb051b393ef42e3c91fba5 ChangeLog 2177
+SHA256 b13f784a7b359e8d6f6d5c6afdd9d5171fd6533fdfadb882a6b96dcca702176f ChangeLog 2177
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -36,3 +39,10 @@ SHA256 cf8c53ee9de8974e4f1550e22df2c5292ec83b69adf089c099f350f3af684c0f files/di
 MD5 a0ce019e97578ad1c6efb89e980f8bf6 files/digest-aspectwerkz-2.0_rc2-r2 253
 RMD160 cf9e681a76af31bd2691713633bc1d2606199770 files/digest-aspectwerkz-2.0_rc2-r2 253
 SHA256 cf8c53ee9de8974e4f1550e22df2c5292ec83b69adf089c099f350f3af684c0f files/digest-aspectwerkz-2.0_rc2-r2 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF9x1LcxLzpIGCsLQRAm7CAJ98s+Hh/rWZGhj78/2JJykI+uP2SQCfVrXK
+I7RK5MZdb/W4BAHOinWbqCQ=
+=fn27
+-----END PGP SIGNATURE-----
diff --git a/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r2.ebuild b/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r2.ebuild
index 7c37d8cd052c..119fb302c71d 100644
--- a/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r2.ebuild
+++ b/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r2.ebuild
@@ -1,9 +1,12 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r2.ebuild,v 1.3 2006/12/22 22:34:26 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r2.ebuild,v 1.4 2007/03/13 21:53:07 betelgeuse Exp $
+
+JAVA_PKG_BSFIX="off"
+# no rewriting required since we patch build.xml to contain target/source
+
+inherit java-pkg-2 eutils java-ant-2
 
-inherit java-pkg-2 eutils
-# no java-ant-2 required since we patch build.xml to contain target/source
 
 DESCRIPTION="AspectWerkz is a dynamic, lightweight and high-performant AOP/AOSD framework for Java."
 SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P/_rc/.RC}.zip"