Add java-ant-2 to inherit and fix the deps a bit.

Package-Manager: portage-2.1.2.4

3 files changed, 23 insertions, 34 deletions

diff --git a/dev-java/aspectj/ChangeLog b/dev-java/aspectj/ChangeLog
index 1143020fe21b..4ebec7612a35 100644
--- a/dev-java/aspectj/ChangeLog
+++ b/dev-java/aspectj/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/aspectj
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/ChangeLog,v 1.21 2007/03/19 11:34:37 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/ChangeLog,v 1.22 2007/04/22 14:04:39 caster Exp $
+
+  22 Apr 2007; Vlastimil Babka <caster@gentoo.org> aspectj-1.2-r2.ebuild:
+  Add java-ant-2 to inherit and fix the deps a bit.
 
   19 Mar 2007; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove mkennedy from metadata.xml due to retirement.
diff --git a/dev-java/aspectj/Manifest b/dev-java/aspectj/Manifest
index f4c2ed97e21d..97dc16a83871 100644
--- a/dev-java/aspectj/Manifest
+++ b/dev-java/aspectj/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ajbrowser 149 RMD160 3c43e2534d4a3e6886d8eee7cd370144dbf14b09 SHA1 01b80efc40b252ebc32806eb9ee49a9c2e8637ef SHA256 902cc190b6d8e7221d6c818e8e34111a5308a1f222fa46db152b200de90826b3
 MD5 46d9b1155eb3ab559158a93afe23b36c files/ajbrowser 149
 RMD160 3c43e2534d4a3e6886d8eee7cd370144dbf14b09 files/ajbrowser 149
@@ -30,18 +27,18 @@ MD5 d8e6e955badeb042ec37383717e5ca0c files/aspectj-1.2-version-gentoo.patch 964
 RMD160 e2f4c342135064634ce45658f798101c74fb6194 files/aspectj-1.2-version-gentoo.patch 964
 SHA256 33f7da3f307bc08664b5c34babaebf05e468c8d7a1f23083831b590e51c38570 files/aspectj-1.2-version-gentoo.patch 964
 DIST aspectj-CVS-V1_2_0.tar.bz2 25289180 RMD160 7bcb9935a2e9992ca8eadb48bebbfa6c83479260 SHA1 0b04be73d43f4a2f35df71c615a75ef901af78ba SHA256 51dae7feb7a3ce2e9c28c37d9440aa0cc7cb8c7d5731e593e466751f935cbef9
-EBUILD aspectj-1.2-r2.ebuild 3033 RMD160 358d92af2d38b25e1d0eba11020335016c876b51 SHA1 1b37091717e38db9f07bdcff501b19da78dac227 SHA256 8bcfd2ed109c3ded5d76eb6ed7ba9e0ff6a1ba1b9cd64264a8f82e36da8e6619
-MD5 c45fa974b4a72d9a52e2b77f5cb273d1 aspectj-1.2-r2.ebuild 3033
-RMD160 358d92af2d38b25e1d0eba11020335016c876b51 aspectj-1.2-r2.ebuild 3033
-SHA256 8bcfd2ed109c3ded5d76eb6ed7ba9e0ff6a1ba1b9cd64264a8f82e36da8e6619 aspectj-1.2-r2.ebuild 3033
+EBUILD aspectj-1.2-r2.ebuild 2903 RMD160 f6c6f1062261da0cc98924e1de023a33975c2aa7 SHA1 a339755b81c2dc7f507f8ae54c9c5936000c5b0d SHA256 82677b0c0c73b0fd83a89d937a59dd97341e28733a604aaa332ae89ea15ed045
+MD5 4703bf8d45e5efa85aba7a4b1cb27ee4 aspectj-1.2-r2.ebuild 2903
+RMD160 f6c6f1062261da0cc98924e1de023a33975c2aa7 aspectj-1.2-r2.ebuild 2903
+SHA256 82677b0c0c73b0fd83a89d937a59dd97341e28733a604aaa332ae89ea15ed045 aspectj-1.2-r2.ebuild 2903
 EBUILD aspectj-1.2.ebuild 2383 RMD160 bef8b1d57c0b9e36d4f60d94de6c0cef8e68e028 SHA1 cc2a53112acf2a0577546ce6ebe3ee8811700041 SHA256 796a565d5b5cd3f10bbef89f4498474010183f7173da90d8d2691cffd139001e
 MD5 5f80accb3c4baa44ed55ccfa8c0f08f3 aspectj-1.2.ebuild 2383
 RMD160 bef8b1d57c0b9e36d4f60d94de6c0cef8e68e028 aspectj-1.2.ebuild 2383
 SHA256 796a565d5b5cd3f10bbef89f4498474010183f7173da90d8d2691cffd139001e aspectj-1.2.ebuild 2383
-MISC ChangeLog 2587 RMD160 e07208ae9444b57c9d51d2a0b8755272602ccbdf SHA1 135f0eae9f7be8269f0422bfff10ee91e60df793 SHA256 f60a8e34cd1f2c7bbca8a91bbbcf31785e7865d1fe44e1e18b870d209f2fe3c7
-MD5 76678c3bfa2bfbe52d21660d5664a3b9 ChangeLog 2587
-RMD160 e07208ae9444b57c9d51d2a0b8755272602ccbdf ChangeLog 2587
-SHA256 f60a8e34cd1f2c7bbca8a91bbbcf31785e7865d1fe44e1e18b870d209f2fe3c7 ChangeLog 2587
+MISC ChangeLog 2714 RMD160 a6d7008235be3d4b68c6371b4c7592f3917556da SHA1 7289dff2405e8977f0dae3d3435a5e8cfc1cbd14 SHA256 7f108f08d3f926d5d1b3eff6d24656e8bebd3a9ac626f17a9bdb32d68c7521ef
+MD5 17a973487fcfe6fa8218ed54d59cc7f5 ChangeLog 2714
+RMD160 a6d7008235be3d4b68c6371b4c7592f3917556da ChangeLog 2714
+SHA256 7f108f08d3f926d5d1b3eff6d24656e8bebd3a9ac626f17a9bdb32d68c7521ef ChangeLog 2714
 MISC metadata.xml 599 RMD160 c965e7f006d5dbcab54a833a6da6458a862ba047 SHA1 9373732ec2c667341a1efff02a2f1a3cfb79d598 SHA256 ac9b79dca4d91c286e721a5b63cface5920cf6a7d2ea01e49c38d0df2a8477f2
 MD5 a64f566d44473c1979fd878fc942c91f metadata.xml 599
 RMD160 c965e7f006d5dbcab54a833a6da6458a862ba047 metadata.xml 599
@@ -52,10 +49,3 @@ SHA256 9b8162d8104f4321acead881ce409a15401534ee6d6f449e23341f6ab91b8d1e files/di
 MD5 7ba8bf395bec103ba01c137764036f9b files/digest-aspectj-1.2-r2 265
 RMD160 dd8d1c2faaaefb0c2cc2eef633ba390b16c3a5b7 files/digest-aspectj-1.2-r2 265
 SHA256 9b8162d8104f4321acead881ce409a15401534ee6d6f449e23341f6ab91b8d1e files/digest-aspectj-1.2-r2 265
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFF/nUTugEuf3OQ0akRAuRXAJwP5IWuspSuGjGOea6eoBuJ1E6PUQCdEq6h
-cztQxE0RpuHF5jZdkQCdDI8=
-=+7i8
------END PGP SIGNATURE-----
diff --git a/dev-java/aspectj/aspectj-1.2-r2.ebuild b/dev-java/aspectj/aspectj-1.2-r2.ebuild
index 3465599f1573..7dc93c5989b3 100644
--- a/dev-java/aspectj/aspectj-1.2-r2.ebuild
+++ b/dev-java/aspectj/aspectj-1.2-r2.ebuild
@@ -1,24 +1,23 @@
-# 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/aspectj/aspectj-1.2-r2.ebuild,v 1.2 2006/11/30 15:24:13 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/aspectj-1.2-r2.ebuild,v 1.3 2007/04/22 14:04:39 caster Exp $
 
-inherit java-pkg-2 eutils
+inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="AspectJ is a seemless extension to the Java programming language for Aspect Oriented Programming (AOP)"
 SRC_URI="mirror://gentoo/aspectj-CVS-V1_2_0.tar.bz2"
 HOMEPAGE="http://www.eclipse.org/aspectj/"
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant-core
-	sys-apps/findutils"
-RDEPEND=">=virtual/jre-1.3
-	dev-java/xalan
-	dev-java/bcel
+CDEPEND="dev-java/bcel
 	dev-java/junit
 	dev-java/jython
 	=dev-java/jakarta-regexp-1.3*
 	=dev-java/saxon-6.5*
-	dev-java/xml-commons
-	>=dev-java/xerces-2.7"
+	dev-java/ant-core"
+DEPEND=">=virtual/jdk-1.3
+	sys-apps/findutils
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.3
+	${CDEPEND}"
 
 SLOT="0"
 LICENSE="CPL-1.0 Apache-1.1"
@@ -57,10 +56,7 @@ src_unpack() {
 
 	cd lib/ant/lib
 		rm *.jar
-		java-pkg_jar-from xalan
 		java-pkg_jar-from ant-core
-		java-pkg_jar-from xml-commons xml-apis.jar
-		java-pkg_jar-from xerces-2
 
 	cd ../../commons
 		rm *.jar
@@ -91,7 +87,7 @@ src_unpack() {
 
 src_compile() {
 	cd build
-	eant -f build.xml
+	eant
 }
 
 src_install() {