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)

4 files changed, 226 insertions, 75 deletions

diff --git a/dev-java/aspectwerkz/ChangeLog b/dev-java/aspectwerkz/ChangeLog
index 27e055765acf..0b10adfdf5d9 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.27 2008/10/25 17:23:14 nixnut Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/ChangeLog,v 1.28 2009/05/20 16:03:46 caster Exp $
+
+  20 May 2009; Vlastimil Babka <caster@gentoo.org>
+  -aspectwerkz-2.0_rc2-r2.ebuild, +aspectwerkz-2.0.ebuild,
+  +files/aspectwerkz-2.0-gentoo.patch:
+  Version bump, thanks to andrewktest@yandex.ru and other devs working on
+  this in java-overlay.
 
   25 Oct 2008; nixnut <nixnut@gentoo.org> aspectwerkz-2.0_rc2-r3.ebuild:
   Stable on ppc wrt bug 242952
diff --git a/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild b/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild
new file mode 100644
index 000000000000..6185763df96e
--- /dev/null
+++ b/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2009 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.3 2009/05/20 16:03:46 caster Exp $
+
+EAPI=2
+
+JAVA_PKG_IUSE="doc java5 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 ~ppc ~ppc64 ~x86"
+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"
+RDEPEND="
+	!java5? ( >=virtual/jre-1.4 )
+	java5? ( >=virtual/jre-1.5 )
+	${COMMON_DEP}"
+DEPEND="
+	!java5? ( >=virtual/jdk-1.4 )
+	java5? ( >=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
+	use java5 && antflags="-Djava.version=1.5" || antflags="-Djava.version=1.4"
+	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/aspectwerkz-2.0_rc2-r2.ebuild b/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r2.ebuild
deleted file mode 100644
index 671e2e88a5bd..000000000000
--- a/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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-r2.ebuild,v 1.12 2008/03/30 17:12:41 corsair Exp $
-
-JAVA_PKG_BSFIX="off"
-# no rewriting required since we patch build.xml to contain target/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/bcel
-	dev-java/concurrent-util
-	=dev-java/dom4j-1*
-	=dev-java/javassist-2*
-	dev-java/jrexx
-	=dev-java/junit-3.8*
-	>=dev-java/junitperf-1.9.1
-	dev-java/trove
-	dev-java/qdox"
-DEPEND="java5? ( >=virtual/jdk-1.5 )
-	!java5? ( >=virtual/jdk-1.3 )
-	>=dev-java/java-config-2.0.31
-	${RDEPEND}
-	>=dev-java/ant-core-1.5
-	app-arch/unzip
-	source? ( app-arch/zip )"
-IUSE="java5 source"
-
-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 {} \; || die
-	cd "${S}"/lib
-	#rm *.jar
-	java-pkg_jar-from asm-1.5
-	java-pkg_jar-from bcel
-	java-pkg_jar-from concurrent-util
-	java-pkg_jar-from dom4j-1
-	java-pkg_jar-from javassist-2
-	java-pkg_jar-from jrexx
-	java-pkg_jar-from junit
-	java-pkg_jar-from junitperf
-	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/*
-}
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>
+
+     <!-- ============================================================== -->