diff options
author | Joshua Nichols <nichoj@gentoo.org> | 2006-08-05 16:56:06 +0000 |
---|---|---|
committer | Joshua Nichols <nichoj@gentoo.org> | 2006-08-05 16:56:06 +0000 |
commit | 152226c444557ae89873dfd4e20613075abfab88 (patch) | |
tree | 83037d16e50211462c283c87f87a10f7c7cb736f /dev-java | |
parent | Added java5 for aspectwerkz (diff) | |
download | historical-152226c444557ae89873dfd4e20613075abfab88.tar.gz historical-152226c444557ae89873dfd4e20613075abfab88.tar.bz2 historical-152226c444557ae89873dfd4e20613075abfab88.zip |
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.
Package-Manager: portage-2.1.1_pre4-r2
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/aspectwerkz/ChangeLog | 11 | ||||
-rw-r--r-- | dev-java/aspectwerkz/Manifest | 45 | ||||
-rw-r--r-- | dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r1.ebuild | 4 | ||||
-rw-r--r-- | dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r2.ebuild | 73 | ||||
-rw-r--r-- | dev-java/aspectwerkz/aspectwerkz-2.0_rc2.ebuild | 4 | ||||
-rw-r--r-- | dev-java/aspectwerkz/files/aspectwerkz-2.0_rc2-jdk15.patch | 82 | ||||
-rw-r--r-- | dev-java/aspectwerkz/files/digest-aspectwerkz-2.0_rc2-r2 | 3 |
7 files changed, 195 insertions, 27 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/Manifest b/dev-java/aspectwerkz/Manifest index 6d4b4db4e24a..9ed7dd7984b2 100644 --- a/dev-java/aspectwerkz/Manifest +++ b/dev-java/aspectwerkz/Manifest @@ -1,23 +1,28 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - 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 SHA256 262f71feb10fc60b4fd2d6c160041c9ade5388c7d6b885ef9da18d4f8e4a3b29 files/aspectwerkz-2.0_rc2-gentoo.patch 4866 +AUX aspectwerkz-2.0_rc2-jdk15.patch 4503 RMD160 ced2ad2d092e45c3671a1ddba8cf2868c90128c6 SHA1 d38a973cafca86a1b4c5794b1c4d53c3d52c1f56 SHA256 7e0efe23f8f831bf0e11cc1e252c37387eede1b770847b44d803e0aeef7820de +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 -EBUILD aspectwerkz-2.0_rc2-r1.ebuild 1443 RMD160 81c48ae369f9cdef2f55afedf017700da6ad6e94 SHA1 c538795345abcecbfc15c58012c528e5e74ac01e SHA256 988ff74b6c02bda911bb640591155308d5cb12476fe727be319c676112759a07 -MD5 d2f341306eba885005ce4d863b9a4b34 aspectwerkz-2.0_rc2-r1.ebuild 1443 -RMD160 81c48ae369f9cdef2f55afedf017700da6ad6e94 aspectwerkz-2.0_rc2-r1.ebuild 1443 -SHA256 988ff74b6c02bda911bb640591155308d5cb12476fe727be319c676112759a07 aspectwerkz-2.0_rc2-r1.ebuild 1443 -EBUILD aspectwerkz-2.0_rc2.ebuild 1556 RMD160 18db3e7be669bd614d36052a6b14f297f6bedb3c SHA1 76c7225ad0af41b7f7dd4610a633aa7e6bb67cfd SHA256 c4fe89d69488d898176788425483bcd36789225cc43669231de4fbcf19234276 -MD5 8b29d33d3874ba9247dd66a43d177834 aspectwerkz-2.0_rc2.ebuild 1556 -RMD160 18db3e7be669bd614d36052a6b14f297f6bedb3c aspectwerkz-2.0_rc2.ebuild 1556 -SHA256 c4fe89d69488d898176788425483bcd36789225cc43669231de4fbcf19234276 aspectwerkz-2.0_rc2.ebuild 1556 -MISC ChangeLog 1175 RMD160 0b1a5f0d26547d4e82218cf78c7aa489396916c6 SHA1 ff81fd34509fd20cf9dc09cb62c58cace22d9a64 SHA256 841db9d12b849ae8df7cb90f0d8abd39e2ac3d73abe6066785207d7ae2fa9e54 -MD5 3bf62ef3acfb0bd1be79a97a758f8f1d ChangeLog 1175 -RMD160 0b1a5f0d26547d4e82218cf78c7aa489396916c6 ChangeLog 1175 -SHA256 841db9d12b849ae8df7cb90f0d8abd39e2ac3d73abe6066785207d7ae2fa9e54 ChangeLog 1175 +EBUILD aspectwerkz-2.0_rc2-r1.ebuild 1441 RMD160 39ea58909d777ef309442e58952cc0228fb983b5 SHA1 3b0dd8b92aa23364bd1227a9ad84d9450252da74 SHA256 bd9b2cf5c7ec1b06d3a1f5b99f8245e000c648a4fedfeff2e0406f993ad7e402 +MD5 c0d2b081bce387f53b1ad092aee236fb aspectwerkz-2.0_rc2-r1.ebuild 1441 +RMD160 39ea58909d777ef309442e58952cc0228fb983b5 aspectwerkz-2.0_rc2-r1.ebuild 1441 +SHA256 bd9b2cf5c7ec1b06d3a1f5b99f8245e000c648a4fedfeff2e0406f993ad7e402 aspectwerkz-2.0_rc2-r1.ebuild 1441 +EBUILD aspectwerkz-2.0_rc2-r2.ebuild 1869 RMD160 e0107030548581e513eca6b446f97896654c6e4e SHA1 e6fcdc897cb369cbd5bdeb5314d9d4631f87548d SHA256 d8f598e075a55328eb2af77333400cfad0b6ffa3818b5fa8df342ff5e7e3ae1d +MD5 4c3ac8022282bd8dea0034eb0a58b657 aspectwerkz-2.0_rc2-r2.ebuild 1869 +RMD160 e0107030548581e513eca6b446f97896654c6e4e aspectwerkz-2.0_rc2-r2.ebuild 1869 +SHA256 d8f598e075a55328eb2af77333400cfad0b6ffa3818b5fa8df342ff5e7e3ae1d aspectwerkz-2.0_rc2-r2.ebuild 1869 +EBUILD aspectwerkz-2.0_rc2.ebuild 1556 RMD160 bc3d1107231eaaf152bcdb5d0ec621c30f18dc4a SHA1 e74ef8ba5420031d67491a549a0efdaf0ed32191 SHA256 294d2f7d0ccb7cdcd17b868e9d587300131883fa322361dd40bfdebabc352c25 +MD5 3346062657c463b2a396ffc728619143 aspectwerkz-2.0_rc2.ebuild 1556 +RMD160 bc3d1107231eaaf152bcdb5d0ec621c30f18dc4a aspectwerkz-2.0_rc2.ebuild 1556 +SHA256 294d2f7d0ccb7cdcd17b868e9d587300131883fa322361dd40bfdebabc352c25 aspectwerkz-2.0_rc2.ebuild 1556 +MISC ChangeLog 1561 RMD160 411891909508c719d5e3887fc5325c9a6588c499 SHA1 127a1448a74ea6237c33ceabc1917e58a253d04d SHA256 e34c55099c99164a926ca3c0c8cdec104815f8da041ee4fc5f8f91b0a3eb6c9d +MD5 ed3a69600e0e43393afd41006b8cebc5 ChangeLog 1561 +RMD160 411891909508c719d5e3887fc5325c9a6588c499 ChangeLog 1561 +SHA256 e34c55099c99164a926ca3c0c8cdec104815f8da041ee4fc5f8f91b0a3eb6c9d ChangeLog 1561 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158 @@ -28,10 +33,6 @@ SHA256 cf8c53ee9de8974e4f1550e22df2c5292ec83b69adf089c099f350f3af684c0f files/di MD5 a0ce019e97578ad1c6efb89e980f8bf6 files/digest-aspectwerkz-2.0_rc2-r1 253 RMD160 cf9e681a76af31bd2691713633bc1d2606199770 files/digest-aspectwerkz-2.0_rc2-r1 253 SHA256 cf8c53ee9de8974e4f1550e22df2c5292ec83b69adf089c099f350f3af684c0f files/digest-aspectwerkz-2.0_rc2-r1 253 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.4 (GNU/Linux) - -iD8DBQFEyLJvgo/w9rxVVVERAlTUAJ4jYZcHxMTEStZo8GCl0h46AIoV3QCgrgR4 -z5q4J9nKvB9HumnYmqCUWkk= -=uvOK ------END PGP SIGNATURE----- +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 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 |