Depend on >=dev-java/java-config-2.0.31 and let it handle the java5 use flag properly.

Package-Manager: portage-2.1.2_rc3-r9

diff --git a/dev-java/aspectwerkz/ChangeLog b/dev-java/aspectwerkz/ChangeLog
index 2e1e88e7f36babad7bc56ce7293a23ec87b80855..734098b78feb788b3b7bcc3e8aeb28fc009ba541 100644 (file)
--- a/dev-java/aspectwerkz/ChangeLog
+++ b/dev-java/aspectwerkz/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/aspectwerkz
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/ChangeLog,v 1.9 2006/09/28 14:01:54 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/ChangeLog,v 1.10 2006/12/22 22:34:26 betelgeuse Exp $
+
+  22 Dec 2006; Petteri Räty <betelgeuse@gentoo.org>
+  aspectwerkz-2.0_rc2-r2.ebuild:
+  Depend on >=dev-java/java-config-2.0.31 and let it handle the java5 use flag
+  properly.
 
   28 Sep 2006; Vlastimil Babka <caster@gentoo.org>
   aspectwerkz-2.0_rc2-r2.ebuild:

diff --git a/dev-java/aspectwerkz/Manifest b/dev-java/aspectwerkz/Manifest
index 25e504004726ca8d17de99496a458a9ef0d00cd0..8fec83ab2a7f3179ef8ac7fc902e08148c7d0a3f 100644 (file)
--- 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 1910 RMD160 19eef12d45c89b5e0f4fc6369474bcddd87b507c SHA1 0bfc85076a30ec6d7ef87cf41886fa9bd0247f3f SHA256 8f49adfc0c93ab0ced748affbb8222f93b889252adc00bb2e9b519e0f3f699c3
-MD5 ad30a04405e3b605b7a0f078cce29f33 aspectwerkz-2.0_rc2-r2.ebuild 1910
-RMD160 19eef12d45c89b5e0f4fc6369474bcddd87b507c aspectwerkz-2.0_rc2-r2.ebuild 1910
-SHA256 8f49adfc0c93ab0ced748affbb8222f93b889252adc00bb2e9b519e0f3f699c3 aspectwerkz-2.0_rc2-r2.ebuild 1910
+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.ebuild 1556 RMD160 bc3d1107231eaaf152bcdb5d0ec621c30f18dc4a SHA1 e74ef8ba5420031d67491a549a0efdaf0ed32191 SHA256 294d2f7d0ccb7cdcd17b868e9d587300131883fa322361dd40bfdebabc352c25
 MD5 3346062657c463b2a396ffc728619143 aspectwerkz-2.0_rc2.ebuild 1556
 RMD160 bc3d1107231eaaf152bcdb5d0ec621c30f18dc4a aspectwerkz-2.0_rc2.ebuild 1556
 SHA256 294d2f7d0ccb7cdcd17b868e9d587300131883fa322361dd40bfdebabc352c25 aspectwerkz-2.0_rc2.ebuild 1556
-MISC ChangeLog 1716 RMD160 2479101da5c338f98b5f138727e7863694de67c4 SHA1 e91020978cc9efc7828ce754ebb256b585a8fae6 SHA256 3dcbb06213ee66c84765248fa18eefbc840351160a6a8fd2952e42c9196d27e9
-MD5 c14192aeb77aa2caa7f41c39fd68aa46 ChangeLog 1716
-RMD160 2479101da5c338f98b5f138727e7863694de67c4 ChangeLog 1716
-SHA256 3dcbb06213ee66c84765248fa18eefbc840351160a6a8fd2952e42c9196d27e9 ChangeLog 1716
+MISC ChangeLog 1899 RMD160 e97ced3ded31c6445fdfca9ec0b74184cb76dd32 SHA1 ddc82d7a540cc644583b38a5dad630b00e02270f SHA256 05320cc962d070d9bd6fda023ceeb1e73bece5656cc278bdc943db8956b9015e
+MD5 2cb1bb5cd6882a3b0e27382138bb48d2 ChangeLog 1899
+RMD160 e97ced3ded31c6445fdfca9ec0b74184cb76dd32 ChangeLog 1899
+SHA256 05320cc962d070d9bd6fda023ceeb1e73bece5656cc278bdc943db8956b9015e ChangeLog 1899
 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 v1.4.6 (GNU/Linux)
+
+iD4DBQFFjF2NcxLzpIGCsLQRAkayAJ44x9bLRK+mZzud3dlvSjvFDzXm1QCYlAyV
+ndb1X2U+Xf3/EanfKLUCyg==
+=y7u0
+-----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 874adf7ae239c048e87dae97f54fafb27ad54a2f..7c37d8cd052cc2ea517dbd058f1b19625c487617 100644 (file)
--- a/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r2.ebuild
+++ b/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r2.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/aspectwerkz/aspectwerkz-2.0_rc2-r2.ebuild,v 1.2 2006/09/28 14:01:54 caster Exp $
+# $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 $
 
 inherit java-pkg-2 eutils
 # no java-ant-2 required since we patch build.xml to contain target/source
@@ -24,20 +24,13 @@ RDEPEND=">=virtual/jre-1.3
        ~dev-java/qdox-20050104"
 DEPEND="java5? ( >=virtual/jdk-1.5 )
        !java5? ( >=virtual/jdk-1.3 )
+       >=dev-java/java-config-2.0.31
        ${RDEPEND}
        >=dev-java/ant-core-1.5
        app-arch/unzip
        source? ( app-arch/zip )"
 IUSE="java5 source"
 
-# Explicitily set JDK depends for java-utils-2 to parse
-# because it isn't smart with use flags yet
-if use java5; then
-       JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.5"
-else
-       JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.4"
-fi
-
 S=${WORKDIR}/aw_2_0_2
 
 src_unpack() {