summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2007-12-25 01:57:34 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2007-12-25 01:57:34 +0000
commitfc830fe91fc98282b1755319cec649881254fe88 (patch)
treeab5c65561b81c0842d573105fc85b5f8c1736a8c /dev-java/aspectwerkz/files
parentupdated to check for mpich2 cxx interface (which breaks standard headers) (diff)
downloadhistorical-fc830fe91fc98282b1755319cec649881254fe88.tar.gz
historical-fc830fe91fc98282b1755319cec649881254fe88.tar.bz2
historical-fc830fe91fc98282b1755319cec649881254fe88.zip
Bring a version bump from java-overlay and add java5 use flag to it. Fixes bug #120618.
Package-Manager: portage-2.1.4_rc9
Diffstat (limited to 'dev-java/aspectwerkz/files')
-rw-r--r--dev-java/aspectwerkz/files/aspectwerkz-2.0-gentoo.patch138
-rw-r--r--dev-java/aspectwerkz/files/digest-aspectwerkz-2.03
2 files changed, 141 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>
+
+ <!-- ============================================================== -->
diff --git a/dev-java/aspectwerkz/files/digest-aspectwerkz-2.0 b/dev-java/aspectwerkz/files/digest-aspectwerkz-2.0
new file mode 100644
index 000000000000..a8d4496b02d8
--- /dev/null
+++ b/dev-java/aspectwerkz/files/digest-aspectwerkz-2.0
@@ -0,0 +1,3 @@
+MD5 d7462b4d76f268e78a3843a28da71990 aspectwerkz-2.0.zip 14166266
+RMD160 f4ec7306a3d8054dc5e4f639e84d856999b06d48 aspectwerkz-2.0.zip 14166266
+SHA256 6d0f94338539dd0cbb0837337f65a64f65495a4194647e93fa96b27829ba9b46 aspectwerkz-2.0.zip 14166266