Cleanups for migration to new Java system.

Package-Manager: portage-2.1.1_pre1

3 files changed, 15 insertions, 27 deletions

diff --git a/dev-java/aopalliance/ChangeLog b/dev-java/aopalliance/ChangeLog
index fb09d0dfd2e9..189934aecb17 100644
--- a/dev-java/aopalliance/ChangeLog
+++ b/dev-java/aopalliance/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/aopalliance
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/aopalliance/ChangeLog,v 1.3 2006/07/01 16:36:59 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aopalliance/ChangeLog,v 1.4 2006/07/02 05:01:54 nichoj Exp $
+
+  02 Jul 2006; Joshua Nichols <nichoj@gentoo.org> aopalliance-1.0-r1.ebuild:
+  Cleanups for migration to new Java system.
 
 *aopalliance-1.0-r1 (01 Jul 2006)
 
diff --git a/dev-java/aopalliance/Manifest b/dev-java/aopalliance/Manifest
index d8b4501523c6..1f59cc836e4f 100644
--- a/dev-java/aopalliance/Manifest
+++ b/dev-java/aopalliance/Manifest
@@ -1,19 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST aopalliance-1.0-gentoo.tar.bz2 4203 RMD160 513fa160b3254721ea1d8a0e366bb5e49e5c097f SHA1 117f2ec5e6e856f577d9de66c8205fdd00e51209 SHA256 30c954c195d3dbb189f68c28be51aecb41e5100e2ec9b58aeb5cb9ef43f72ebe
-EBUILD aopalliance-1.0-r1.ebuild 1265 RMD160 a73adc037ccc03f9e1f2f8d9ec2c8fa4f658f17d SHA1 53d8f50fa2a96dc45831b3f87dd6b63dd34b0a2b SHA256 54fdbe4e63108c2207dbc83a3dffdb6a6bedb53d609476e6a1145fc29479526e
-MD5 2b649aa17bd142eabe8d21a17bef6995 aopalliance-1.0-r1.ebuild 1265
-RMD160 a73adc037ccc03f9e1f2f8d9ec2c8fa4f658f17d aopalliance-1.0-r1.ebuild 1265
-SHA256 54fdbe4e63108c2207dbc83a3dffdb6a6bedb53d609476e6a1145fc29479526e aopalliance-1.0-r1.ebuild 1265
+EBUILD aopalliance-1.0-r1.ebuild 1088 RMD160 14e09ab54b92788e74eb376a83974c100dc7b24b SHA1 2fade4b3ef3fc76a9ef34b51f59cf66c7ec8e7d0 SHA256 c1cd51a4600929ad8d5f4c59807ca3bb8b3b62c9f169183a2b1b7e105829cf44
+MD5 27983f33bad24ecdce787b858b0e9837 aopalliance-1.0-r1.ebuild 1088
+RMD160 14e09ab54b92788e74eb376a83974c100dc7b24b aopalliance-1.0-r1.ebuild 1088
+SHA256 c1cd51a4600929ad8d5f4c59807ca3bb8b3b62c9f169183a2b1b7e105829cf44 aopalliance-1.0-r1.ebuild 1088
 EBUILD aopalliance-1.0.ebuild 1250 RMD160 689e69c4670f71e237631309b70cf69a22e9ade0 SHA1 6c6be6c8503abcd6473da9119a65fca6d165476c SHA256 b9a074c79cdaa85fd0e4f4182dece60318ec9615eb7f39eea476f976a0fe2b42
 MD5 9d51e214675de41ff31ea9478d299e0b aopalliance-1.0.ebuild 1250
 RMD160 689e69c4670f71e237631309b70cf69a22e9ade0 aopalliance-1.0.ebuild 1250
 SHA256 b9a074c79cdaa85fd0e4f4182dece60318ec9615eb7f39eea476f976a0fe2b42 aopalliance-1.0.ebuild 1250
-MISC ChangeLog 664 RMD160 b2c99f02ac79a06539b6c564c1753444005ec852 SHA1 da785752ccb47abf47bcdee12d1aeb2733da52a2 SHA256 4f25271ebf787499f6d0c5dae5875b8b8758467231d0674680760eccad6049b5
-MD5 5f16abc9ca211333515b289be83dcfb2 ChangeLog 664
-RMD160 b2c99f02ac79a06539b6c564c1753444005ec852 ChangeLog 664
-SHA256 4f25271ebf787499f6d0c5dae5875b8b8758467231d0674680760eccad6049b5 ChangeLog 664
+MISC ChangeLog 785 RMD160 94c1da3e936e24986e159324315060e394ed545a SHA1 1e005e148ad44b3e1ff67703d59e6d4639de4972 SHA256 9fe8c1b426dc5abeb38bea1153987c9a533509974fe0daeb14f8731c073d3804
+MD5 ef7c091d6acc01ab3fb1800bc616aa07 ChangeLog 785
+RMD160 94c1da3e936e24986e159324315060e394ed545a ChangeLog 785
+SHA256 9fe8c1b426dc5abeb38bea1153987c9a533509974fe0daeb14f8731c073d3804 ChangeLog 785
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -24,10 +21,3 @@ SHA256 00addc97cee89b3b3459c233d7901507d7539c606080d5c4b504a5c9fb81a0ec files/di
 MD5 c81ea784f98a88bf8a925d8d2fd5c073 files/digest-aopalliance-1.0-r1 265
 RMD160 e4722ca4d002c19c77c10fc6cdc49447d44c0812 files/digest-aopalliance-1.0-r1 265
 SHA256 00addc97cee89b3b3459c233d7901507d7539c606080d5c4b504a5c9fb81a0ec files/digest-aopalliance-1.0-r1 265
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEpqSxgo/w9rxVVVERAnTcAJ0Q/lFMXzZBXAi9gJHp/HWUhVnEpQCeJhtK
-5NA2OR6I8VuucqrjzuhA9Fo=
-=RzDf
------END PGP SIGNATURE-----
diff --git a/dev-java/aopalliance/aopalliance-1.0-r1.ebuild b/dev-java/aopalliance/aopalliance-1.0-r1.ebuild
index 2d4888cf7716..3f489d4bb912 100644
--- a/dev-java/aopalliance/aopalliance-1.0-r1.ebuild
+++ b/dev-java/aopalliance/aopalliance-1.0-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/aopalliance/aopalliance-1.0-r1.ebuild,v 1.1 2006/07/01 16:36:59 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aopalliance/aopalliance-1.0-r1.ebuild,v 1.2 2006/07/02 05:01:54 nichoj Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -15,19 +15,14 @@ HOMEPAGE="http://aopalliance.sourceforge.net/"
 LICENSE="public-domain"
 SLOT="1"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc jikes source"
+IUSE="doc source"
 DEPEND=">=virtual/jdk-1.4
 	dev-java/ant-core
-	jikes? ( dev-java/jikes )
 	source? ( app-arch/zip )"
 RDEPEND=">=virtual/jre-1.4"
 
 src_compile() {
-	local antflags="jar"
-	use jikes && antflags="-Dbuild.compiler=jikes ${antflags}"
-	use doc && antflags="${antflags} javadoc"
-
-	eant ${antflags} || die "ant failed"
+	eant jar $(use_doc) 
 }
 
 src_install() {