[gentoo-commits] proj/java:master commit in: dev-java/aspectwerkz/files/, dev-java/aspectwerkz/

[Andrew John Hughes]

commit:     2dccb30f997703b7a787a4b8c37c533652e8d509
Author:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Mon Sep 30 04:10:13 2013 +0000
Commit:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Mon Sep 30 04:10:13 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=2dccb30f

Relies on com.sun classes for JDWP support.

Package-Manager: portage-2.2.6
Manifest-Sign-Key: 248BDC07

---
 dev-java/aspectwerkz/ChangeLog                     | 148 +++++++++++++++++++++
 dev-java/aspectwerkz/Manifest                      |  27 ++++
 dev-java/aspectwerkz/aspectwerkz-2.0.ebuild        |  78 +++++++++++
 .../aspectwerkz/files/aspectwerkz-2.0-gentoo.patch | 138 +++++++++++++++++++
 .../files/aspectwerkz-2.0_rc2-gentoo.patch         |  85 ++++++++++++
 .../files/aspectwerkz-2.0_rc2-jdk15.patch          |  82 ++++++++++++
 dev-java/aspectwerkz/metadata.xml                  |   5 +
 7 files changed, 563 insertions(+)

diff --git a/dev-java/aspectwerkz/ChangeLog b/dev-java/aspectwerkz/ChangeLog
new file mode 100644
index 0000000..901e76f
--- /dev/null
+++ b/dev-java/aspectwerkz/ChangeLog
@@ -0,0 +1,148 @@
+# ChangeLog for dev-java/aspectwerkz
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/ChangeLog,v 1.34 2013/09/01 11:42:11 grobian Exp $
+
+  01 Sep 2013; Fabian Groffen <grobian@g.o> aspectwerkz-2.0.ebuild:
+  Marked *-macos
+
+  01 Sep 2013; Fabian Groffen <grobian@g.o> aspectwerkz-2.0.ebuild:
+  Marked *-macos
+
+  27 Jun 2013; Alexis Ballier <aballier@g.o> aspectwerkz-2.0.ebuild:
+  keyword ~amd64-fbsd
+
+  21 Feb 2010; Vlastimil Babka <caster@g.o>
+  aspectwerkz-2.0_rc2-r3.ebuild, aspectwerkz-2.0.ebuild:
+  Remove java5 flag and make it unconditional.
+
+  20 Jan 2010; Brent Baude <ranger@g.o> aspectwerkz-2.0.ebuild:
+  Marking aspectwerkz-2.0 ppc64 for bug 281006
+
+  03 Jan 2010; Christian Faulhammer <fauli@g.o>
+  aspectwerkz-2.0.ebuild:
+  Transfer Prefix keywords
+
+  20 May 2009; Vlastimil Babka <caster@g.o>
+  -aspectwerkz-2.0_rc2-r2.ebuild, +aspectwerkz-2.0.ebuild,
+  +files/aspectwerkz-2.0-gentoo.patch:
+  Version bump, thanks to andrewktest@××××××.ru and other devs working on
+  this in java-overlay.
+
+  25 Oct 2008; nixnut <nixnut@g.o> aspectwerkz-2.0_rc2-r3.ebuild:
+  Stable on ppc wrt bug 242952
+
+  24 Oct 2008; Markus Meier <maekke@g.o>
+  aspectwerkz-2.0_rc2-r3.ebuild:
+  x86 stable, bug #242952
+
+  23 Oct 2008; Kenneth Prugh <ken69267@g.o>
+  aspectwerkz-2.0_rc2-r3.ebuild:
+  amd64 stable, bug #242952
+
+*aspectwerkz-2.0_rc2-r3 (30 Jul 2008)
+
+  30 Jul 2008; Petteri Räty <betelgeuse@g.o>
+  +aspectwerkz-2.0_rc2-r3.ebuild:
+  Remove unneeded dependencies pointed out by java-dep-check.
+
+  30 Mar 2008; Markus Rothe <corsair@g.o>
+  aspectwerkz-2.0_rc2-r2.ebuild:
+  Added ~ppc64
+
+  11 Mar 2008; Petteri Räty <betelgeuse@g.o>
+  aspectwerkz-2.0_rc2-r2.ebuild:
+  RESTRICT test because they fail.
+
+  09 Feb 2008; William L. Thomson Jr. <wltjr@g.o>
+  -files/aspectwerkz-2.0-gentoo.patch, -aspectwerkz-2.0_rc2.ebuild,
+  -aspectwerkz-2.0.ebuild:
+  Removed older versions in same slot
+
+  09 Feb 2008; William L. Thomson Jr. <wltjr@g.o>
+  aspectwerkz-2.0_rc2-r2.ebuild:
+  amd64 stable, bug #203270.
+
+  10 Jan 2008; Vlastimil Babka <caster@g.o>
+  aspectwerkz-2.0_rc2-r2.ebuild:
+  Restrict junit dependency.
+
+  26 Dec 2007; Markus Meier <maekke@g.o>
+  aspectwerkz-2.0_rc2-r2.ebuild:
+  quotes and x86 stable, bug #203270
+
+  25 Dec 2007; nixnut <nixnut@g.o> aspectwerkz-2.0_rc2-r2.ebuild:
+  Stable on ppc wrt bug 203270
+
+*aspectwerkz-2.0 (25 Dec 2007)
+
+  25 Dec 2007; Petteri Räty <betelgeuse@g.o>
+  +files/aspectwerkz-2.0-gentoo.patch, +aspectwerkz-2.0.ebuild:
+  Bring a version bump from java-overlay and add java5 use flag to it. Fixes
+  bug #120618.
+
+  04 Aug 2007; Miroslav Šulc <fordfrog@g.o>
+  aspectwerkz-2.0_rc2.ebuild, aspectwerkz-2.0_rc2-r2.ebuild:
+  Removed restriction on dev-java/qdox version as qdox versioning scheme has
+  changed and upgrade to new version of qdox would be impossible.
+
+  13 Mar 2007; Petteri Räty <betelgeuse@g.o>
+  -aspectwerkz-2.0_rc2-r1.ebuild:
+  Cleanup.
+
+  13 Mar 2007; Petteri Räty <betelgeuse@g.o>
+  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@g.o> aspectwerkz-2.0_rc2.ebuild:
+  Stable on ppc wrt bug 165208
+
+  22 Dec 2006; Petteri Räty <betelgeuse@g.o>
+  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@g.o>
+  aspectwerkz-2.0_rc2-r2.ebuild:
+  Added missing junit dependency, discovered through JAVA_PKG_STRICT.
+
+*aspectwerkz-2.0_rc2-r2 (05 Aug 2006)
+
+  05 Aug 2006; Joshua Nichols <nichoj@g.o>
+  +files/aspectwerkz-2.0_rc2-jdk15.patch, aspectwerkz-2.0_rc2.ebuild,
+  aspectwerkz-2.0_rc2-r1.ebuild, +aspectwerkz-2.0_rc2-r2.ebuild:
+  Introduced java5 use flag, for building Java 5 specific features of
+  aspectwerkz. This allows us to not require Java 5 expliticly, and addresses
+  bug #142750.
+
+  27 Jul 2006; Krzysiek Pawlik <nelchael@g.o>
+  aspectwerkz-2.0_rc2-r1.ebuild:
+  Requires 1.5.
+
+  27 Jul 2006; Krzysiek Pawlik <nelchael@g.o>
+  aspectwerkz-2.0_rc2-r1.ebuild:
+  Added java-ant-2.
+
+*aspectwerkz-2.0_rc2-r1 (02 Jul 2006)
+
+  02 Jul 2006; Joshua Nichols <nichoj@g.o>
+  +aspectwerkz-2.0_rc2-r1.ebuild:
+  Revision bump to support new Java system.
+
+  09 Feb 2006; Joshua Nichols <nichoj@g.o>
+  aspectwerkz-2.0_rc2.ebuild:
+  Marked stable on amd64 and x86.
+
+  30 Apr 2005; Jan Brinkmann <luckyduck@g.o>
+  aspectwerkz-2.0_rc2.ebuild:
+  added ~ppc to KEYWORDS, introduced support for the source useflag.
+
+  17 Feb 2005; Jan Brinkmann <luckyduck@g.o>
+  aspectwerkz-2.0_rc2.ebuild:
+  added missing zip dependency. see #69831
+
+*aspectwerkz-2.0_rc2 (05 Jan 2005)
+
+  05 Jan 2005; Jan Brinkmann <luckyduck@g.o> +metadata.xml,
+  +files/aspectwerkz-2.0_rc2-gentoo.patch, +aspectwerkz-2.0_rc2.ebuild:
+  Initial import. Needed as a dependency of #76738.

diff --git a/dev-java/aspectwerkz/Manifest b/dev-java/aspectwerkz/Manifest
new file mode 100644
index 0000000..6f872bc
--- /dev/null
+++ b/dev-java/aspectwerkz/Manifest
@@ -0,0 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX aspectwerkz-2.0-gentoo.patch 8362 SHA256 3ec2444b5bce5f43c6bebb1ee0dc74359b93424955f0dd7b521dc2cb5713fb05 SHA512 33d1b35c56ad0ed31104f4328336f10e4bc0140594191fdba4a2a7bf4931b566a786bb7560731883afca1d801fd39bcb703d687c0c2865b6780e59ff30ee213b WHIRLPOOL fc835a8ff2dfd10b0790f5f4f474d956d019eb7d109b3734bd0413fc7699d3eaeafc8ef6f002de44f81d01f435d14b8674937c09a678d547976690e5fdf93318
+AUX aspectwerkz-2.0_rc2-gentoo.patch 4866 SHA256 262f71feb10fc60b4fd2d6c160041c9ade5388c7d6b885ef9da18d4f8e4a3b29 SHA512 471a1a1fd9680dd6646b2424085b856bd98a2827237baf1c8ec299935bcd3a8fe158ecc00e540f337465d2c1b1825468c98ba0eb266f613ea4351aba0cc30b7d WHIRLPOOL 9f66d6cec9319f15a0227a784279993c8e2f194cf4bea3a9ed477c81f7393a058a5b7a4e5fd71efc15c189682c76ba1be0940ec7b3630f164f82776d57ae8510
+AUX aspectwerkz-2.0_rc2-jdk15.patch 4503 SHA256 7e0efe23f8f831bf0e11cc1e252c37387eede1b770847b44d803e0aeef7820de SHA512 b2c570d3a3fad540400fbb16034fad3cdfd2b4ee37eea26f85ec401cea2aba5d64c14bf0164788b11f649213acd53d13410868a6aa04b27caf36fd83f4311eec WHIRLPOOL c66f84803933032644e6c8ffc05f81f9a78e375965c98b428f1e88976626d5186375300efaaad85b364af9d1b3cfe1f685ac3c390c7e15682d0b53be35661951
+DIST aspectwerkz-2.0.zip 14166266 SHA256 6d0f94338539dd0cbb0837337f65a64f65495a4194647e93fa96b27829ba9b46 SHA512 80052e36fcfb67c50c7ddaf3d76bc135add57f8d5eafe80d8e7ec214bc2636c9a22bf72f3c6ed473c042f2c2fadf64a525c2a123466d6426446aa7bfd3305a3f WHIRLPOOL a07d6e6aba5fe2da923314c12ca845010ab853a62caad305256792ea5d4844533efc908feee9233f80362de65887e9b6d0293f77e60aaf399243eb26d0f16c7c
+EBUILD aspectwerkz-2.0.ebuild 1673 SHA256 81d800f5d7504c73370255397ac595bae84914d82d41d39447925a79571dafad SHA512 97afa08a7ef26d9f79912d7d2a9c9617a596682af3462449403c12ba06961bbbee120d4b11617852d4a29e71be278442fdb6facbf0482abf11c3e110eb151727 WHIRLPOOL e88f4796dc9780f927dc4b0a4321ee85c082eb0702edab3eac1d95fe8c58cf95b3280612b7d535850937c9ffab47aab0ebe9096023eafd9b72af55fb533e158b
+MISC ChangeLog 5111 SHA256 f59c07b4564a202914ddd66b3755105ff3610cfeceef7fd4a6a79531265e692f SHA512 ee98b37c1ecd31e5334efc94e70b64d373039637dcc51772731553e04c4402ee35fc30419f73ad45680c1747e2477f994c140cab60f613a6298e96b63ac25f6e WHIRLPOOL 220970b75a74615a8598e177c36c8f3a41744b372c829c05697c5c56130e63062a9b6dce06c4932686abb8bb161ad2078cdcb6b264339fad3bddcae04149020a
+MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQIcBAEBCAAGBQJSSPmlAAoJEDuWpXgki9wHf40P/1MWDatULH0ZPvFAaBqoF5LL
+MhiwXjpR5ZwJd+ZjGxY2HoXzaONgn8thj6R/E0Eh1+E471ZYDSud0YgtzzDJuFGQ
+a6VI8iLZpOq9ThSboahxLMssDIQOw5sEQfLPsp+pwnd8eXfnM0/BiWBp98VdMuxC
++B/RKUIImadBj3lKrLxXJjfwK1jXwJSr3wCJ2DYq8qX9f7dUJBCGisEji1cNaKHb
+ObfacmWPHSBeZFx82EfBufkOtgHR4R4Bm8qCEoZqZq514gBA/MfKswedovWjBFGk
+S6lYUelq7DaYMrTTMBx+KiUNfTnsywcMMeuWFshyesg/na/hoxU+h6Y59GnhvXh0
+diUoVQ775YKXDf9OHU2Bb2j5+tQpUT6rLCUHFqrFGy0qdRgam2jIkwfLCeCR0jKt
+1gxQri6Phqo7ETqQOfy3P871ERU/qj9WD8E5RXhmj1HrMKRXuNmm0cgusIoEbU0P
+ui79uabNU29rSsjmhnu91dctslpI8d98Yp5mWlt0fT6DJIYlxJfc0/uHGjKIE/Rb
+zzHZJXFgBi3A0T4SXE1wC1xJ+EXOmqTFiRX+6cxzy4iZw40M+sj2wgcSShxuMkHL
+yb5/SgAM5dyYTn7yehFB3q4+WMTzWOGwhwuT/Fuyl0YEHHENFgKBf4akIRSqdyX/
+RFYiq/83jIBmVkuGzc8g
+=+tHy
+-----END PGP SIGNATURE-----

diff --git a/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild b/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild
new file mode 100644
index 0000000..65e99e2
--- /dev/null
+++ b/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild,v 1.8 2013/09/01 09:33:06 grobian Exp $
+
+EAPI=2
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="AspectWerkz is a dynamic, lightweight and high-performant AOP/AOSD framework for Java."
+SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}.zip"
+HOMEPAGE="http://aspectwerkz.codehaus.org"
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+# bug 203268
+RESTRICT="test"
+
+COMMON_DEP="
+	dev-java/asm:1.5
+	dev-java/concurrent-util:0
+	dev-java/dom4j:1
+	dev-java/jrexx:0
+	dev-java/trove:0
+	dev-java/qdox:1.6
+	dev-java/junit:0
+	java-virtuals/jdk-with-com-sun"
+RDEPEND="
+	>=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND="
+	>=virtual/jdk-1.5
+	${COMMON_DEP}
+	app-arch/unzip"
+
+java_prepare() {
+	# unit tests need this
+	chmod +x "bin/${PN}" || die
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+
+	find . -name '*.jar' -delete || 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
+}
+
+_eant() {
+	local antflags="-Djava.version=1.5"
+	eant ${antflags} "${@}"
+
+}
+
+src_compile() {
+	_eant dist #precompiled javadocs
+}
+
+src_test() {
+	_eant test
+}
+
+src_install() {
+	use source && java-pkg_dosrc src/*
+	# other stuff besides javadoc here too
+	use doc && java-pkg_dohtml -r docs/*
+
+	cd lib
+	for jar in ${PN}*.jar; do
+		java-pkg_newjar ${jar} ${jar/-${PV}}
+	done
+}

diff --git a/dev-java/aspectwerkz/files/aspectwerkz-2.0-gentoo.patch b/dev-java/aspectwerkz/files/aspectwerkz-2.0-gentoo.patch
new file mode 100644
index 0000000..0c7e99a
--- /dev/null
+++ b/dev-java/aspectwerkz/files/aspectwerkz-2.0-gentoo.patch
@@ -0,0 +1,138 @@
+--- build.xml.orig	2005-03-10 12:05:48.000000000 +0300
++++ build.xml	2006-01-28 12:22:12.436634250 +0300
+@@ -44,8 +44,6 @@
+     <!--    <property name="aspectwerkz.classpath" refid="aspectwerkz.classpath" />-->
+ 
+     <!--    define the jarjar task we use to remap ASM -->
+-    <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${basedir}/lib/jarjar-0.3.jar"/>
+-
+     <target name="cleandist" depends="clean, dist"/>
+ 
+     <!-- =================================================== -->
+@@ -124,7 +122,7 @@
+     <!-- ============================================================== -->
+     <!-- compiles the distribution  -->
+     <!-- ============================================================== -->
+-    <target name="compile" depends="init">
++    <target name="compile" depends="clean">
+         <mkdir dir="${build.dir}"/>
+         <mkdir dir="${main.classes}"/>
+         <javac destdir="${jdk14.classes}" debug="on" source="1.3" target="1.3">
+@@ -156,12 +154,6 @@
+                 <path refid="project.class.path"/>
+             </classpath>
+         </javac>
+-        <!-- remap ASM since it is used directly in the tests for some -->
+-        <jarjar destfile="${test.classes}.jar">
+-            <fileset dir="${test.classes}" includes="**/*"/>
+-            <rule pattern="org.objectweb.asm.**" result="org.codehaus.aspectwerkz.@0"/>
+-        </jarjar>
+-        <unjar src="${test.classes}.jar" dest="${test.classes}" overwrite="true"/>
+     </target>
+ 
+     <!-- ============================================================== -->
+@@ -253,49 +245,36 @@
+     <!-- ============================================================== -->
+     <!-- create distribution -->
+     <!-- ============================================================== -->
+-    <target name="dist" depends="compile, compile:jdk15, compile:test, compile:extensions"><!-- not samples since Java 1.4 -->
++    <target name="dist" depends="compile, compile:jdk15"><!-- not samples since Java 1.4 -->
+         <copy file="${src.dir}/main/aspectwerkz2.dtd" todir="${main.classes}"/>
+ 
+         <!-- we embed jarjar version of ASM in it as well in case the aspectwerkz-core jar is not used -->
+-        <jarjar destfile="${build.dir}/aspectwerkz-${version}.jar" manifest="${lib.dir}/manifest.mf">
++        <jar destfile="${build.dir}/aspectwerkz.jar" manifest="${lib.dir}/manifest.mf">
+             <fileset dir="${main.classes}">
+                 <exclude name="**/aspectwerkz/hook/**/*"/>
+             </fileset>
+-            <zipfileset src="${basedir}/lib/asm-1.5.4-snapshot.jar"/>
+-            <zipfileset src="${basedir}/lib/asm-attrs-1.5.4-snapshot.jar"/>
+-            <rule pattern="org.objectweb.asm.**" result="org.codehaus.aspectwerkz.@0"/>
+-        </jarjar>
+-        <copy tofile="${lib.dir}/aspectwerkz-${version}.jar" file="${build.dir}/aspectwerkz-${version}.jar" overwrite="true"/>
++        </jar>
++        <copy tofile="${lib.dir}/aspectwerkz-${version}.jar" file="${build.dir}/aspectwerkz.jar" overwrite="true"/>
+ 
+         <!-- JDK 1.4 annotations only -->
+-        <jar destfile="${build.dir}/aspectwerkz-jdk14-${version}.jar">
++        <jar destfile="${build.dir}/aspectwerkz-jdk14.jar">
+             <fileset dir="${jdk14.classes}"/>
+         </jar>
+-        <copy tofile="${lib.dir}/aspectwerkz-jdk14-${version}.jar" file="${build.dir}/aspectwerkz-jdk14-${version}.jar" overwrite="true"/>
++        <copy tofile="${lib.dir}/aspectwerkz-jdk14-${version}.jar" file="${build.dir}/aspectwerkz-jdk14.jar" overwrite="true"/>
+ 
+         <!-- core contains the hook part -->
+         <!-- we embed jarjar version of ASM in it as well so that it will be in the bootclasspath for the asm hook -->
+-        <jarjar destfile="${build.dir}/aspectwerkz-core-${version}.jar">
++        <jar destfile="${build.dir}/aspectwerkz-core.jar">
+             <fileset dir="${main.classes}">
+                 <include name="**/aspectwerkz/hook/**/*"/>
+             </fileset>
+-            <zipfileset src="${basedir}/lib/asm-1.5.4-snapshot.jar"/>
+-            <zipfileset src="${basedir}/lib/asm-attrs-1.5.4-snapshot.jar"/>
+-            <rule pattern="org.objectweb.asm.**" result="org.codehaus.aspectwerkz.@0"/>
+-        </jarjar>
+-        <copy tofile="${lib.dir}/aspectwerkz-core-${version}.jar" file="${build.dir}/aspectwerkz-core-${version}.jar" overwrite="true"/>
+-
+-        <!-- extensions embeds ASM as well -->
+-        <jarjar jarfile="${build.dir}/aspectwerkz-extensions-${version}.jar" basedir="${extensions.classes}">
+-            <rule pattern="org.objectweb.asm.**" result="org.codehaus.aspectwerkz.@0"/>
+-        </jarjar>
+-        <copy tofile="${lib.dir}/aspectwerkz-extensions-${version}.jar" file="${build.dir}/aspectwerkz-extensions-${version}.jar" overwrite="true"/>
++        </jar>
++        <copy tofile="${lib.dir}/aspectwerkz-core-${version}.jar" file="${build.dir}/aspectwerkz-core.jar" overwrite="true"/>
+ 
+         <!-- build a jdk neutral nodeps for the main jar (extensions + deps)
+              (not core, jdk14, jdk15, Ant, JUnit,) -->
+-        <jar destfile="${build.dir}/aspectwerkz-nodeps-${version}.jar">
+-            <zipfileset src="${build.dir}/aspectwerkz-${version}.jar"/>
+-            <zipfileset src="${build.dir}/aspectwerkz-extensions-${version}.jar"/>
++        <jar destfile="${build.dir}/aspectwerkz-nodeps.jar">
++            <zipfileset src="${build.dir}/aspectwerkz.jar"/>
+             <zipgroupfileset dir="${lib.dir}">
+                 <exclude name="jarjar*"/>
+                 <exclude name="aspectwerkz*"/>
+@@ -308,32 +287,32 @@
+                 <exclude name="qdox*"/>
+                 <include name="*.jar"/>
+             <!-- add qdox manually to remove its META-INF/LICENSE.txt that is not the one of AW -->
+-            <zipfileset src="${lib.dir}/qdox-1.4.jar" excludes="META-INF/*"/>
++            <zipfileset src="${lib.dir}/qdox.jar" excludes="META-INF/*"/>
+         </jar>
+         <!-- nodeps -->
+-        <jar destfile="${build.dir}/aspectwerkz-nodeps-jdk14-${version}.jar">
+-            <zipfileset src="${build.dir}/aspectwerkz-nodeps-${version}.jar"/>
+-            <zipfileset src="${build.dir}/aspectwerkz-jdk14-${version}.jar"/>
++        <jar destfile="${build.dir}/aspectwerkz-nodeps-jdk14.jar">
++            <zipfileset src="${build.dir}/aspectwerkz-nodeps.jar"/>
++            <zipfileset src="${build.dir}/aspectwerkz-jdk14.jar"/>
+         </jar>
+-        <copy tofile="${lib.dir}/aspectwerkz-nodeps-jdk14-${version}.jar" file="${build.dir}/aspectwerkz-nodeps-jdk14-${version}.jar" overwrite="true"/>
++        <copy tofile="${lib.dir}/aspectwerkz-nodeps-jdk14-${version}.jar" file="${build.dir}/aspectwerkz-nodeps-jdk14.jar" overwrite="true"/>
+
+         <antcall target="dist:jdk15"/>
+
+     </target>
+
+     <target name="dist:jdk15" if="jdk15">
+         <!-- Java 5 annotation and JVMTI agent if J2SE 5 build -->
+-        <jar destfile="${build.dir}/aspectwerkz-jdk5-${version}.jar" manifest="${lib.dir}/manifest-core.mf">
++        <jar destfile="${build.dir}/aspectwerkz-jdk5.jar" manifest="${lib.dir}/manifest-core.mf">
+             <fileset dir="${jdk15.classes}"/>
+         </jar>
+-        <copy tofile="${lib.dir}/aspectwerkz-jdk5-${version}.jar" file="${build.dir}/aspectwerkz-jdk5-${version}.jar" overwrite="true"/>
++        <copy tofile="${lib.dir}/aspectwerkz-jdk5-${version}.jar" file="${build.dir}/aspectwerkz-jdk5.jar" overwrite="true"/>
+
+         <!-- nodeps -->
+-        <jar destfile="${build.dir}/aspectwerkz-nodeps-jdk5-${version}.jar" manifest="${lib.dir}/manifest-core.mf">
+-            <zipfileset src="${build.dir}/aspectwerkz-nodeps-${version}.jar"/>
+-            <zipfileset src="${build.dir}/aspectwerkz-jdk5-${version}.jar"/>
++        <jar destfile="${build.dir}/aspectwerkz-nodeps-jdk5.jar" manifest="${lib.dir}/manifest-core.mf">
++            <zipfileset src="${build.dir}/aspectwerkz-nodeps.jar"/>
++            <zipfileset src="${build.dir}/aspectwerkz-jdk5.jar"/>
+         </jar>
+-        <copy tofile="${lib.dir}/aspectwerkz-nodeps-jdk5-${version}.jar" file="${build.dir}/aspectwerkz-nodeps-jdk5-${version}.jar" overwrite="true"/>
++        <copy tofile="${lib.dir}/aspectwerkz-nodeps-jdk5-${version}.jar" file="${build.dir}/aspectwerkz-nodeps-jdk5.jar" overwrite="true"/>
+     </target>
+
+     <!-- ============================================================== -->

diff --git a/dev-java/aspectwerkz/files/aspectwerkz-2.0_rc2-gentoo.patch b/dev-java/aspectwerkz/files/aspectwerkz-2.0_rc2-gentoo.patch
new file mode 100644
index 0000000..273bb22
--- /dev/null
+++ b/dev-java/aspectwerkz/files/aspectwerkz-2.0_rc2-gentoo.patch
@@ -0,0 +1,85 @@
+--- build.xml.orig	2005-01-05 22:09:52.421137168 +0100
++++ build.xml	2005-01-05 22:17:04.298481832 +0100
+@@ -42,8 +42,6 @@
+     <!--    <property name="aspectwerkz.classpath" refid="aspectwerkz.classpath" />-->
+ 
+     <!--    define the jarjar task we use to remap ASM -->
+-    <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${basedir}/lib/jarjar-0.3.jar"/>
+-
+     <target name="cleandist" depends="clean, dist"/>
+ 
+     <!-- =================================================== -->
+@@ -121,7 +119,7 @@
+     <!-- ============================================================== -->
+     <!-- compiles the distribution  -->
+     <!-- ============================================================== -->
+-    <target name="compile" depends="init">
++    <target name="compile" depends="clean">
+         <mkdir dir="${build.dir}"/>
+         <mkdir dir="${main.classes}"/>
+         <javac destdir="${jdk14.classes}" debug="on" source="1.3" target="1.3">
+@@ -153,12 +151,6 @@
+                 <path refid="project.class.path"/>
+             </classpath>
+         </javac>
+-        <!-- remap ASM since it is used directly in the tests for some -->
+-        <jarjar destfile="${test.classes}.jar">
+-            <fileset dir="${test.classes}" includes="**/*"/>
+-            <rule pattern="org.objectweb.asm.**" result="org.codehaus.aspectwerkz.@0"/>
+-        </jarjar>
+-        <unjar src="${test.classes}.jar" dest="${test.classes}" overwrite="true"/>
+     </target>
+ 
+     <!-- ============================================================== -->
+@@ -250,42 +242,31 @@
+     <!-- ============================================================== -->
+     <!-- create distribution -->
+     <!-- ============================================================== -->
+-    <target name="dist" depends="compile, compile:jdk15, compile:test, compile:extensions"><!-- not samples since Java 1.4 -->
++    <target name="dist" depends="compile, compile:jdk15"><!-- not samples since Java 1.4 -->
+         <copy file="${src.dir}/main/aspectwerkz2.dtd" todir="${main.classes}"/>
+ 
+         <!-- we embed jarjar version of ASM in it as well in case the aspectwerkz-core jar is not used -->
+-        <jarjar destfile="${build.dir}/aspectwerkz-${version}.jar" manifest="${lib.dir}/manifest.mf">
++        <jar destfile="${build.dir}/aspectwerkz.jar" manifest="${lib.dir}/manifest.mf">
+             <fileset dir="${main.classes}">
+                 <exclude name="**/aspectwerkz/hook/**/*"/>
+             </fileset>
+-            <zipfileset src="${basedir}/lib/asm-1.5.2.jar"/>
+-            <zipfileset src="${basedir}/lib/asm-attrs-1.5.2.jar"/>
+-            <rule pattern="org.objectweb.asm.**" result="org.codehaus.aspectwerkz.@0"/>
+-        </jarjar>
+-        <copy tofile="${lib.dir}/aspectwerkz-${version}.jar" file="${build.dir}/aspectwerkz-${version}.jar" overwrite="true"/>
++        </jar>
++        <copy tofile="${lib.dir}/aspectwerkz.jar" file="${build.dir}/aspectwerkz.jar" overwrite="true"/>
+ 
+         <!-- JDK 1.4 annotations only -->
+-        <jar destfile="${build.dir}/aspectwerkz-jdk14-${version}.jar">
++        <jar destfile="${build.dir}/aspectwerkz-jdk14.jar">
+             <fileset dir="${jdk14.classes}"/>
+         </jar>
+-        <copy tofile="${lib.dir}/aspectwerkz-jdk14-${version}.jar" file="${build.dir}/aspectwerkz-jdk14-${version}.jar" overwrite="true"/>
++        <copy tofile="${lib.dir}/aspectwerkz-jdk14.jar" file="${build.dir}/aspectwerkz-jdk14.jar" overwrite="true"/>
+ 
+         <!-- core contains the hook part -->
+         <!-- we embed jarjar version of ASM in it as well so that it will be in the bootclasspath for the asm hook -->
+-        <jarjar destfile="${build.dir}/aspectwerkz-core-${version}.jar">
++        <jar destfile="${build.dir}/aspectwerkz-core.jar">
+             <fileset dir="${main.classes}">
+                 <include name="**/aspectwerkz/hook/**/*"/>
+             </fileset>
+-            <zipfileset src="${basedir}/lib/asm-1.5.2.jar"/>
+-            <zipfileset src="${basedir}/lib/asm-attrs-1.5.2.jar"/>
+-            <rule pattern="org.objectweb.asm.**" result="org.codehaus.aspectwerkz.@0"/>
+-        </jarjar>
+-        <copy tofile="${lib.dir}/aspectwerkz-core-${version}.jar" file="${build.dir}/aspectwerkz-core-${version}.jar" overwrite="true"/>
+-
+-        <jarjar jarfile="${build.dir}/aspectwerkz-extensions-${version}.jar" basedir="${extensions.classes}">
+-            <rule pattern="org.objectweb.asm.**" result="org.codehaus.aspectwerkz.@0"/>
+-        </jarjar>
+-        <copy tofile="${lib.dir}/aspectwerkz-extensions-${version}.jar" file="${build.dir}/aspectwerkz-extensions-${version}.jar" overwrite="true"/>
++        </jar>
++        <copy tofile="${lib.dir}/aspectwerkz-core.jar" file="${build.dir}/aspectwerkz-core.jar" overwrite="true"/>
+ 
+         <antcall target="dist:jdk15"/>
+     </target>

diff --git a/dev-java/aspectwerkz/files/aspectwerkz-2.0_rc2-jdk15.patch b/dev-java/aspectwerkz/files/aspectwerkz-2.0_rc2-jdk15.patch
new file mode 100644
index 0000000..855fd13
--- /dev/null
+++ b/dev-java/aspectwerkz/files/aspectwerkz-2.0_rc2-jdk15.patch
@@ -0,0 +1,82 @@
+diff -ru aw_2_0_2/build.xml aw_2_0_2-patched/build.xml
+--- aw_2_0_2/build.xml	2004-12-10 10:44:44.000000000 -0500
++++ aw_2_0_2-patched/build.xml	2006-08-05 11:43:03.000000000 -0400
+@@ -145,7 +145,7 @@
+     <target name="compile:test" depends="init, compile">
+         <mkdir dir="${build.dir}"/>
+         <mkdir dir="${test.classes}"/>
+-        <javac destdir="${test.classes}" debug="on">
++        <javac destdir="${test.classes}" debug="on" target="1.3" source="1.3">
+             <src path="${test.src.dir}"/>
+             <classpath>
+                 <path path="${jdk14.classes}"/>
+@@ -164,9 +164,9 @@
+     <!-- ============================================================== -->
+     <!-- compiles the Java5 stuff -->
+     <!-- ============================================================== -->
+-    <target name="compile:jdk15" depends="init" if="jdk15">
++    <target name="compile:jdk15" depends="init" if="jdk15" unless="nojdk15">
+         <echo message="** Found jdk15 specific compilation..."/>
+-        <javac destdir="${jdk15.classes}" deprecation="true" debug="true" optimize="false" source="1.5">
++        <javac destdir="${jdk15.classes}" deprecation="true" debug="true" optimize="false" source="1.5" target="1.5">
+             <src>
+                 <pathelement location="src/jdk15/main">
+                 </pathelement>
+@@ -290,7 +290,7 @@
+         <antcall target="dist:jdk15"/>
+     </target>
+ 
+-    <target name="dist:jdk15" if="jdk15">
++    <target name="dist:jdk15" if="jdk15" unless="nojdk15">
+         <!-- Java 5 annotation and JVMTI agent if J2SE 5 build -->
+         <jar destfile="${build.dir}/aspectwerkz-jdk5-${version}.jar" manifest="${lib.dir}/manifest-core.mf">
+             <fileset dir="${jdk15.classes}"/>
+@@ -344,10 +344,10 @@
+     <!-- =================================================== -->
+     <!--  JDK 5 tests that have been weaved offline -->
+     <!-- =================================================== -->
+-    <target name="test:offline:jdk15:call" if="jdk15">
++    <target name="test:offline:jdk15:call" if="jdk15" unless="nojdk15">
+         <antcall target="test:offline:jdk15"/>
+     </target>
+-    <target name="test:offline:jdk15" depends="init, dist, test:annotationc, test:weave" if="jdk15">
++    <target name="test:offline:jdk15" depends="init, dist, test:annotationc, test:weave" if="jdk15" unless="nojdk15">
+         <property name="offline.classpath" value="${java.home}/../lib/tools.jar${pathseparator}${lib.dir}/ant-1.5.2.jar${pathseparator}${test.classes}${pathseparator}${lib.dir}/aspectwerkz-jdk5-${version}.jar${pathseparator}${lib.dir}/aspectwerkz-core-${version}.jar${pathseparator}${lib.dir}/aspectwerkz-${version}.jar${pathseparator}${lib.dir}/piccolo-1.03.jar${pathseparator}${lib.dir}/qdox-1.4.jar${pathseparator}${lib.dir}/junit-3.8.1.jar${pathseparator}${lib.dir}/dom4j-1.4.jar"/>
+         <java
+             classname="test.AllJdk5Tests"
+@@ -406,7 +406,7 @@
+     <!-- =================================================== -->
+     <!--  all tests for JDK 5 -->
+     <!-- =================================================== -->
+-    <target name="test:jdk15:call" if="jdk15">
++    <target name="test:jdk15:call" if="jdk15" unless="nojdk15">
+         <antcall target="test:jdk15"/>
+     </target>
+     <target name="test:jdk15" depends="clean, dist, test:annotationc" if="jdk15">
+@@ -634,7 +634,7 @@
+         </java>
+     </target>
+ 
+-    <target name="samples:jdk5:callback" depends="init, clean, dist" if="jdk15" >
++    <target name="samples:jdk5:callback" depends="init, clean, dist" if="jdk15" unless="nojdk15" >
+         <java classname="examples.callback.Callback" fork="true">
+             <classpath>
+                 <pathelement path="${jdk15.classes}"/>
+@@ -646,7 +646,7 @@
+         </java>
+     </target>
+ 
+-    <target name="samples:jdk5:callback:hook" depends="init, clean, dist" if="jdk15">
++    <target name="samples:jdk5:callback:hook" depends="init, clean, dist" if="jdk15" unless="nojdk15">
+         <java classname="examples.callback.Callback" fork="true">
+             <classpath>
+                 <pathelement path="${samples.classes}"/>
+@@ -657,7 +657,7 @@
+         </java>
+     </target>
+ 
+-    <target name="samples:jdk5:proxy" depends="init, clean, dist" if="jdk15">
++    <target name="samples:jdk5:proxy" depends="init, clean, dist" if="jdk15" unless="nojdk15">
+         <java classname="examples.proxy.Proxy5" fork="true">
+             <classpath>
+                 <pathelement path="${jdk15.classes}"/>

diff --git a/dev-java/aspectwerkz/metadata.xml b/dev-java/aspectwerkz/metadata.xml
new file mode 100644
index 0000000..7303cef
--- /dev/null
+++ b/dev-java/aspectwerkz/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>