Remove unneeded dependencies pointed out by java-dep-check.

Package-Manager: portage-2.2_rc4/cvs/Linux 2.6.26-gentoo i686

3 files changed, 85 insertions, 2 deletions

diff --git a/dev-java/aspectwerkz/ChangeLog b/dev-java/aspectwerkz/ChangeLog
index 27a49a202ab5..db955540f3ed 100644
--- a/dev-java/aspectwerkz/ChangeLog
+++ b/dev-java/aspectwerkz/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/aspectwerkz
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/ChangeLog,v 1.23 2008/03/30 17:12:41 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/ChangeLog,v 1.24 2008/07/30 22:25:07 betelgeuse Exp $
+
+*aspectwerkz-2.0_rc2-r3 (30 Jul 2008)
+
+  30 Jul 2008; Petteri Räty <betelgeuse@gentoo.org>
+  +aspectwerkz-2.0_rc2-r3.ebuild:
+  Remove unneeded dependencies pointed out by java-dep-check.
 
   30 Mar 2008; Markus Rothe <corsair@gentoo.org>
   aspectwerkz-2.0_rc2-r2.ebuild:
diff --git a/dev-java/aspectwerkz/Manifest b/dev-java/aspectwerkz/Manifest
index d0b8779231a3..43c859693232 100644
--- a/dev-java/aspectwerkz/Manifest
+++ b/dev-java/aspectwerkz/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX aspectwerkz-2.0_rc2-gentoo.patch 4866 RMD160 5f103ae10c843b0ebcf5f3e92f9a733c4fde5dd8 SHA1 601cfaf73827be015c20935e4d02a041a2e440b6 SHA256 262f71feb10fc60b4fd2d6c160041c9ade5388c7d6b885ef9da18d4f8e4a3b29
 AUX aspectwerkz-2.0_rc2-jdk15.patch 4503 RMD160 ced2ad2d092e45c3671a1ddba8cf2868c90128c6 SHA1 d38a973cafca86a1b4c5794b1c4d53c3d52c1f56 SHA256 7e0efe23f8f831bf0e11cc1e252c37387eede1b770847b44d803e0aeef7820de
 DIST aspectwerkz-2.0.RC2.zip 9758873 RMD160 75fce715072b274432d8dee8b751675399f9e96b SHA1 fcbc31d1ee7073b7f561c3a84d0d327fe35a6cb6 SHA256 ca3786ee34d7b339bee93944a1c136dcb2aaf783fd60ea88948c3bf19894e1a8
 EBUILD aspectwerkz-2.0_rc2-r2.ebuild 1805 RMD160 e87da29b51ba3f7a4f89b2752f01d3c57dedba3d SHA1 3f90de4d19df9823948a95ea51dbb98b4d082450 SHA256 9f600b1565eb24f83a0669dfeb1ca1213522718c47084e44ff465b874c55e8f5
-MISC ChangeLog 3680 RMD160 3eea1ad4bffa549269e36843ea78ce1c45f28025 SHA1 09dd35d796a64f1bd0245b2c8efdc7b01c8454f8 SHA256 25d502d359b0ad1ce3500c48267a598d0f50280e9acb5b3beb3ce99a0838b698
+EBUILD aspectwerkz-2.0_rc2-r3.ebuild 1644 RMD160 032d1d3d981c8f37acbf2e19f7634128604cd1a8 SHA1 79c7358d86cca59b30cb0f6cf344e85e242e324f SHA256 72aac5167d69d86e2e8f7cff0bcd7f87e6a74d97e378ccaae53d0f7144f8d49b
+MISC ChangeLog 3872 RMD160 b884f684e8c1d164aa465a14f24f642570b87b5c SHA1 7cbade00433415c176cdb28331a02b7692af8b39 SHA256 5e1b87286ba242ecdbc30ed22a4970315451444d46ddc7d0bac0420952d7750d
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiQ6lMACgkQcxLzpIGCsLSe/gCgnTpPmdIbf6urglfoMkm4d0tJ
+SeIAn1oVvXuhK7lS+tzJvlUKWRDxuMWT
+=CoOv
+-----END PGP SIGNATURE-----
diff --git a/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r3.ebuild b/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r3.ebuild
new file mode 100644
index 000000000000..0c3886aaa271
--- /dev/null
+++ b/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2008 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-r3.ebuild,v 1.1 2008/07/30 22:25:07 betelgeuse Exp $
+
+EAPI=1
+# no rewriting required since we patch build.xml to contain target/source
+JAVA_PKG_BSFIX="off"
+JAVA_PKG_IUSE="java5 source"
+
+inherit java-pkg-2 eutils java-ant-2
+
+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"
+HOMEPAGE="http://aspectwerkz.codehaus.org"
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+RDEPEND=">=virtual/jre-1.3
+	dev-java/asm:1.5
+	dev-java/concurrent-util:0
+	dev-java/dom4j:1
+	dev-java/jrexx:0
+	dev-java/junit:0
+	dev-java/trove:0
+	dev-java/qdox:1.6"
+DEPEND="java5? ( >=virtual/jdk-1.5 )
+	!java5? ( >=virtual/jdk-1.3 )
+	${RDEPEND}
+	app-arch/unzip"
+IUSE=""
+
+S=${WORKDIR}/aw_2_0_2
+
+# These fail
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-jdk15.patch
+
+	find . -name '*.jar' -exec rm -v {} \; || die
+	find . -name '*.class' -exec rm -v {} \; || die
+	cd "${S}"/lib
+	java-pkg_jar-from asm-1.5
+	java-pkg_jar-from concurrent-util
+	java-pkg_jar-from dom4j-1
+	java-pkg_jar-from jrexx
+	java-pkg_jar-from junit
+	java-pkg_jar-from trove
+	java-pkg_jar-from qdox-1.6
+}
+
+src_compile() {
+	local antflags
+	use "!java5" && antflags="-Dnojdk15=true"
+	eant ${antflags} dist || die "eant failed"
+}
+
+src_install() {
+	java-pkg_dojar lib/${PN}*.jar
+
+	use source && java-pkg_dosrc src/*
+}