Version bump, thanks to andrewktest@yandex.ru and other devs working on this in java-overlay.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

1 files changed, 138 insertions, 0 deletions

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 000000000000..0c7e99a33817
--- /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>
+
+     <!-- ============================================================== -->