Bring a version bump from java-overlay and add java5 use flag to it. Fixes bug #120618.

Package-Manager: portage-2.1.4_rc9

5 files changed, 263 insertions, 5 deletions

diff --git a/dev-java/aspectwerkz/ChangeLog b/dev-java/aspectwerkz/ChangeLog
index 3f36ef4289b1..2b379d7db661 100644
--- a/dev-java/aspectwerkz/ChangeLog
+++ b/dev-java/aspectwerkz/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/aspectwerkz
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/ChangeLog,v 1.15 2007/08/04 11:01:47 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/ChangeLog,v 1.16 2007/12/25 01:57:33 betelgeuse Exp $
+
+*aspectwerkz-2.0 (25 Dec 2007)
+
+  25 Dec 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +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@gentoo.org>
   aspectwerkz-2.0_rc2.ebuild, aspectwerkz-2.0_rc2-r2.ebuild:
diff --git a/dev-java/aspectwerkz/Manifest b/dev-java/aspectwerkz/Manifest
index 6a31b91ace03..0f0a50391b00 100644
--- a/dev-java/aspectwerkz/Manifest
+++ b/dev-java/aspectwerkz/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX aspectwerkz-2.0-gentoo.patch 8362 RMD160 8f670bdbc6a18068890abaf1fee6fadb4f8e083b SHA1 42aa28d84856b6b9cdef5c410e8a62d555839e70 SHA256 3ec2444b5bce5f43c6bebb1ee0dc74359b93424955f0dd7b521dc2cb5713fb05
+MD5 f92dd3b9159cc47fcae2d56825000141 files/aspectwerkz-2.0-gentoo.patch 8362
+RMD160 8f670bdbc6a18068890abaf1fee6fadb4f8e083b files/aspectwerkz-2.0-gentoo.patch 8362
+SHA256 3ec2444b5bce5f43c6bebb1ee0dc74359b93424955f0dd7b521dc2cb5713fb05 files/aspectwerkz-2.0-gentoo.patch 8362
 AUX aspectwerkz-2.0_rc2-gentoo.patch 4866 RMD160 5f103ae10c843b0ebcf5f3e92f9a733c4fde5dd8 SHA1 601cfaf73827be015c20935e4d02a041a2e440b6 SHA256 262f71feb10fc60b4fd2d6c160041c9ade5388c7d6b885ef9da18d4f8e4a3b29
 MD5 1bcde0233ea72230e5b78958ff1a30f9 files/aspectwerkz-2.0_rc2-gentoo.patch 4866
 RMD160 5f103ae10c843b0ebcf5f3e92f9a733c4fde5dd8 files/aspectwerkz-2.0_rc2-gentoo.patch 4866
@@ -7,6 +14,11 @@ MD5 f216531d3d24d7c011b307640da55b8e files/aspectwerkz-2.0_rc2-jdk15.patch 4503
 RMD160 ced2ad2d092e45c3671a1ddba8cf2868c90128c6 files/aspectwerkz-2.0_rc2-jdk15.patch 4503
 SHA256 7e0efe23f8f831bf0e11cc1e252c37387eede1b770847b44d803e0aeef7820de files/aspectwerkz-2.0_rc2-jdk15.patch 4503
 DIST aspectwerkz-2.0.RC2.zip 9758873 RMD160 75fce715072b274432d8dee8b751675399f9e96b SHA1 fcbc31d1ee7073b7f561c3a84d0d327fe35a6cb6 SHA256 ca3786ee34d7b339bee93944a1c136dcb2aaf783fd60ea88948c3bf19894e1a8
+DIST aspectwerkz-2.0.zip 14166266 RMD160 f4ec7306a3d8054dc5e4f639e84d856999b06d48 SHA1 b7ec22eda02610b63fa1842080b0326b138d77dc SHA256 6d0f94338539dd0cbb0837337f65a64f65495a4194647e93fa96b27829ba9b46
+EBUILD aspectwerkz-2.0.ebuild 2041 RMD160 14be0f052c825902670fb4b06f5e68940986629d SHA1 dd168d867e81bedf14464ec1aeb70d5140b4b600 SHA256 bd5c6848f28dcc865a7ed2767ea2c63046704d4082c70801b9bae8dd04895275
+MD5 948a416df3b6da17de811ddb27ba9b77 aspectwerkz-2.0.ebuild 2041
+RMD160 14be0f052c825902670fb4b06f5e68940986629d aspectwerkz-2.0.ebuild 2041
+SHA256 bd5c6848f28dcc865a7ed2767ea2c63046704d4082c70801b9bae8dd04895275 aspectwerkz-2.0.ebuild 2041
 EBUILD aspectwerkz-2.0_rc2-r2.ebuild 1757 RMD160 a3f3a408b2bab3058d8285f837fab236874d7a9c SHA1 239715073fa32bda3dc361c907d523fd188f2589 SHA256 47cd30e5393e7de4ecda869fc86301f888a5071db4750acb21ab0e5dd31f5b02
 MD5 a4decb27e9da0146c62871b2d0fd836b aspectwerkz-2.0_rc2-r2.ebuild 1757
 RMD160 a3f3a408b2bab3058d8285f837fab236874d7a9c aspectwerkz-2.0_rc2-r2.ebuild 1757
@@ -15,17 +27,27 @@ EBUILD aspectwerkz-2.0_rc2.ebuild 1547 RMD160 6e4385acf314cefbe06f7b801955098587
 MD5 30792b77b4d2b80b275ef49decb225b9 aspectwerkz-2.0_rc2.ebuild 1547
 RMD160 6e4385acf314cefbe06f7b8019550985876f6908 aspectwerkz-2.0_rc2.ebuild 1547
 SHA256 b869c102255a942d2a016fa4a1dc0592a1cc4cd2a2fa6d5302cdefb449e3069b aspectwerkz-2.0_rc2.ebuild 1547
-MISC ChangeLog 2570 RMD160 f8737d9b45ab3bb2afad115224df9d6069d869ea SHA1 cc3093b0f92103468d35d9c4acef7799356ce8df SHA256 10a02bb37a6262b0743d8a5d3e890dc2a122a9c25bdd3f635fae33b19fefb3de
-MD5 d98861bfb8345807b86e622df8f3bfa4 ChangeLog 2570
-RMD160 f8737d9b45ab3bb2afad115224df9d6069d869ea ChangeLog 2570
-SHA256 10a02bb37a6262b0743d8a5d3e890dc2a122a9c25bdd3f635fae33b19fefb3de ChangeLog 2570
+MISC ChangeLog 2814 RMD160 764b68b9d7978c4003970cab726d0db661892089 SHA1 ac240f9e7fc4f0ee6346561ecb53c3cc34e520a4 SHA256 fdd1b93f1f6744dd6fd1ba6e1849711af13b7038008718d8226c16e48a9230dc
+MD5 7aab757c3c51f1715f01a1937a2adfc0 ChangeLog 2814
+RMD160 764b68b9d7978c4003970cab726d0db661892089 ChangeLog 2814
+SHA256 fdd1b93f1f6744dd6fd1ba6e1849711af13b7038008718d8226c16e48a9230dc ChangeLog 2814
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata.xml 158
+MD5 3d5ff624f146991a5c9adc7b259aa21c files/digest-aspectwerkz-2.0 244
+RMD160 4dd36fb2e7727207aa76e6853b050fc1a66898ce files/digest-aspectwerkz-2.0 244
+SHA256 03a89b3a94c95954e8af1955f4810ab1bb73957b72eda1c351f7ac573fda49c2 files/digest-aspectwerkz-2.0 244
 MD5 a0ce019e97578ad1c6efb89e980f8bf6 files/digest-aspectwerkz-2.0_rc2 253
 RMD160 cf9e681a76af31bd2691713633bc1d2606199770 files/digest-aspectwerkz-2.0_rc2 253
 SHA256 cf8c53ee9de8974e4f1550e22df2c5292ec83b69adf089c099f350f3af684c0f files/digest-aspectwerkz-2.0_rc2 253
 MD5 a0ce019e97578ad1c6efb89e980f8bf6 files/digest-aspectwerkz-2.0_rc2-r2 253
 RMD160 cf9e681a76af31bd2691713633bc1d2606199770 files/digest-aspectwerkz-2.0_rc2-r2 253
 SHA256 cf8c53ee9de8974e4f1550e22df2c5292ec83b69adf089c099f350f3af684c0f files/digest-aspectwerkz-2.0_rc2-r2 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHcGOdcxLzpIGCsLQRAuQCAJ4ycmcStkwobiHa+lxhJBbmxAsG6gCfQ2BK
+kMrJWXHhI/wnPkM//L3X7mk=
+=rGO7
+-----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 000000000000..26b4545e3ce8
--- /dev/null
+++ b/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2007 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.1 2007/12/25 01:57:33 betelgeuse Exp $
+
+# Add java5 support when java-config handless
+# https://bugs.gentoo.org/show_bug.cgi?id=161622
+# for now the support is in java-overlay
+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="~x86 ~amd64 ~ppc"
+IUSE="java5"
+
+COMMON_DEP="
+	=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
+	=dev-java/junit-3*"
+RDEPEND="
+	java5? ( >=virtual/jre-1.5 )
+	!java5? ( >=virtual/jre-1.4 )
+	${COMMON_DEP}"
+DEPEND="
+	java5? ( >=virtual/jdk-1.5 )
+	!java5? ( >=virtual/jdk-1.4 )
+	${COMMON_DEP}
+	app-arch/unzip"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	# unit tests need this
+	chmod +x bin/${PN} || die
+	epatch ${FILESDIR}/${P}-gentoo.patch
+
+	find . -name '*.jar' -exec rm {} \; || die
+
+	cd "${S}/lib"
+	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
+}
+
+_eant() {
+	local version=1.4
+	use java5 && version=1.5
+	eant ${antflags} -Djava.version=${version} "${@}"
+}
+
+src_compile() {
+	_eant dist #precompiled javadocs
+	rm -v lib/*nodeps*.jar || die
+}
+
+src_test() {
+	ASPECTWERKZ_HOME="${S}" _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 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