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.

(Portage version: 2.1.1_pre4-r2)

6 files changed, 172 insertions, 5 deletions

diff --git a/dev-java/aspectwerkz/ChangeLog b/dev-java/aspectwerkz/ChangeLog
index d07cd70dbec3..1e65fd33911a 100644
--- a/dev-java/aspectwerkz/ChangeLog
+++ b/dev-java/aspectwerkz/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/aspectwerkz
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/ChangeLog,v 1.7 2006/07/27 12:32:23 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/ChangeLog,v 1.8 2006/08/05 16:56:06 nichoj Exp $
+
+*aspectwerkz-2.0_rc2-r2 (05 Aug 2006)
+
+  05 Aug 2006; Joshua Nichols <nichoj@gentoo.org>
+  +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@gentoo.org>
   aspectwerkz-2.0_rc2-r1.ebuild:
diff --git a/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r1.ebuild b/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r1.ebuild
index cc86d8982fc0..67e14210627f 100644
--- a/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r1.ebuild
+++ b/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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-r1.ebuild,v 1.3 2006/07/27 12:32:23 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r1.ebuild,v 1.4 2006/08/05 16:56:06 nichoj Exp $
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -19,7 +19,7 @@ RDEPEND=">=virtual/jre-1.5
 	dev-java/jrexx
 	>=dev-java/junitperf-1.9.1
 	dev-java/trove
-	=dev-java/qdox-20050104"
+	~dev-java/qdox-20050104"
 DEPEND=">=virtual/jdk-1.5
 	${RDEPEND}
 	>=dev-java/ant-core-1.5
diff --git a/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r2.ebuild b/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r2.ebuild
new file mode 100644
index 000000000000..a599516c9071
--- /dev/null
+++ b/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2006 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.1 2006/08/05 16:56:06 nichoj Exp $
+
+inherit java-pkg-2 eutils
+# no java-ant-2 required since we patch build.xml to contain target/source
+
+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="~x86 ~amd64 ~ppc"
+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/junitperf-1.9.1
+	dev-java/trove
+	~dev-java/qdox-20050104"
+DEPEND="java5? ( >=virtual/jdk-1.5 )
+	!java5? ( >=virtual/jdk-1.3 )
+	${RDEPEND}
+	>=dev-java/ant-core-1.5
+	app-arch/unzip
+	source? ( app-arch/zip )"
+IUSE="java5 source"
+
+# Explicitily set JDK depends for java-utils-2 to parse
+# because it isn't smart with use flags yet
+if use java5; then
+	JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.5"
+else
+	JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.4"
+fi
+
+S=${WORKDIR}/aw_2_0_2
+
+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 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/aspectwerkz-2.0_rc2.ebuild b/dev-java/aspectwerkz/aspectwerkz-2.0_rc2.ebuild
index d8bc4ce5f39c..d0c49e882b98 100644
--- a/dev-java/aspectwerkz/aspectwerkz-2.0_rc2.ebuild
+++ b/dev-java/aspectwerkz/aspectwerkz-2.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.ebuild,v 1.6 2006/02/09 03:03:42 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/aspectwerkz-2.0_rc2.ebuild,v 1.7 2006/08/05 16:56:06 nichoj Exp $
 
 inherit java-pkg eutils
 
@@ -19,7 +19,7 @@ RDEPEND=">=virtual/jre-1.4
 	dev-java/jrexx
 	>=dev-java/junitperf-1.9.1
 	dev-java/trove
-	=dev-java/qdox-20050104"
+	~dev-java/qdox-20050104"
 DEPEND=">=virtual/jdk-1.4
 	${RDEPEND}
 	>=dev-java/ant-core-1.5
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 000000000000..855fd132e365
--- /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/files/digest-aspectwerkz-2.0_rc2-r2 b/dev-java/aspectwerkz/files/digest-aspectwerkz-2.0_rc2-r2
new file mode 100644
index 000000000000..fe6c79641bbe
--- /dev/null
+++ b/dev-java/aspectwerkz/files/digest-aspectwerkz-2.0_rc2-r2
@@ -0,0 +1,3 @@
+MD5 7ca18b72216703d52cf1dcfefb87822f aspectwerkz-2.0.RC2.zip 9758873
+RMD160 75fce715072b274432d8dee8b751675399f9e96b aspectwerkz-2.0.RC2.zip 9758873
+SHA256 ca3786ee34d7b339bee93944a1c136dcb2aaf783fd60ea88948c3bf19894e1a8 aspectwerkz-2.0.RC2.zip 9758873