commit: 1e55b58a9c0db208cf789715ee5677128f7b8140 Author: Ralph Sennhauser <sera <AT> gentoo <DOT> org> AuthorDate: Sun Aug 3 09:31:05 2014 +0000 Commit: Ralph Sennhauser <sera <AT> gentoo <DOT> org> CommitDate: Sun Aug 3 09:31:05 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=1e55b58a
Remove aspectwerkz, changes applied in main tree --- dev-java/aspectwerkz/ChangeLog | 153 --------------------- dev-java/aspectwerkz/Manifest | 28 ---- dev-java/aspectwerkz/aspectwerkz-2.0.ebuild | 77 ----------- .../aspectwerkz/files/aspectwerkz-2.0-gentoo.patch | 138 ------------------- .../files/aspectwerkz-2.0-modernise_api.patch | 82 ----------- .../files/aspectwerkz-2.0_rc2-gentoo.patch | 85 ------------ .../files/aspectwerkz-2.0_rc2-jdk15.patch | 82 ----------- dev-java/aspectwerkz/metadata.xml | 5 - 8 files changed, 650 deletions(-) diff --git a/dev-java/aspectwerkz/ChangeLog b/dev-java/aspectwerkz/ChangeLog deleted file mode 100644 index fbe730d..0000000 --- a/dev-java/aspectwerkz/ChangeLog +++ /dev/null @@ -1,153 +0,0 @@ -# ChangeLog for dev-java/aspectwerkz -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/ChangeLog,v 1.34 2013/09/01 11:42:11 grobian Exp $ - - 18 Apr 2014; Andrew John Hughes <gnu_and...@member.fsf.org> - +files/aspectwerkz-2.0-modernise_api.patch, aspectwerkz-2.0.ebuild: - Use final java.util.concurrent API so it can be built against >=1.5 without - additional dependencies - - 01 Sep 2013; Fabian Groffen <grob...@gentoo.org> aspectwerkz-2.0.ebuild: - Marked *-macos - - 01 Sep 2013; Fabian Groffen <grob...@gentoo.org> aspectwerkz-2.0.ebuild: - Marked *-macos - - 27 Jun 2013; Alexis Ballier <aball...@gentoo.org> aspectwerkz-2.0.ebuild: - keyword ~amd64-fbsd - - 21 Feb 2010; Vlastimil Babka <cas...@gentoo.org> - aspectwerkz-2.0_rc2-r3.ebuild, aspectwerkz-2.0.ebuild: - Remove java5 flag and make it unconditional. - - 20 Jan 2010; Brent Baude <ran...@gentoo.org> aspectwerkz-2.0.ebuild: - Marking aspectwerkz-2.0 ppc64 for bug 281006 - - 03 Jan 2010; Christian Faulhammer <fa...@gentoo.org> - aspectwerkz-2.0.ebuild: - Transfer Prefix keywords - - 20 May 2009; Vlastimil Babka <cas...@gentoo.org> - -aspectwerkz-2.0_rc2-r2.ebuild, +aspectwerkz-2.0.ebuild, - +files/aspectwerkz-2.0-gentoo.patch: - Version bump, thanks to andrewkt...@yandex.ru and other devs working on - this in java-overlay. - - 25 Oct 2008; nixnut <nix...@gentoo.org> aspectwerkz-2.0_rc2-r3.ebuild: - Stable on ppc wrt bug 242952 - - 24 Oct 2008; Markus Meier <mae...@gentoo.org> - aspectwerkz-2.0_rc2-r3.ebuild: - x86 stable, bug #242952 - - 23 Oct 2008; Kenneth Prugh <ken69...@gentoo.org> - aspectwerkz-2.0_rc2-r3.ebuild: - amd64 stable, bug #242952 - -*aspectwerkz-2.0_rc2-r3 (30 Jul 2008) - - 30 Jul 2008; Petteri Räty <betelge...@gentoo.org> - +aspectwerkz-2.0_rc2-r3.ebuild: - Remove unneeded dependencies pointed out by java-dep-check. - - 30 Mar 2008; Markus Rothe <cors...@gentoo.org> - aspectwerkz-2.0_rc2-r2.ebuild: - Added ~ppc64 - - 11 Mar 2008; Petteri Räty <betelge...@gentoo.org> - aspectwerkz-2.0_rc2-r2.ebuild: - RESTRICT test because they fail. - - 09 Feb 2008; William L. Thomson Jr. <wl...@gentoo.org> - -files/aspectwerkz-2.0-gentoo.patch, -aspectwerkz-2.0_rc2.ebuild, - -aspectwerkz-2.0.ebuild: - Removed older versions in same slot - - 09 Feb 2008; William L. Thomson Jr. <wl...@gentoo.org> - aspectwerkz-2.0_rc2-r2.ebuild: - amd64 stable, bug #203270. - - 10 Jan 2008; Vlastimil Babka <cas...@gentoo.org> - aspectwerkz-2.0_rc2-r2.ebuild: - Restrict junit dependency. - - 26 Dec 2007; Markus Meier <mae...@gentoo.org> - aspectwerkz-2.0_rc2-r2.ebuild: - quotes and x86 stable, bug #203270 - - 25 Dec 2007; nixnut <nix...@gentoo.org> aspectwerkz-2.0_rc2-r2.ebuild: - Stable on ppc wrt bug 203270 - -*aspectwerkz-2.0 (25 Dec 2007) - - 25 Dec 2007; Petteri Räty <betelge...@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 <fordf...@gentoo.org> - aspectwerkz-2.0_rc2.ebuild, aspectwerkz-2.0_rc2-r2.ebuild: - Removed restriction on dev-java/qdox version as qdox versioning scheme has - changed and upgrade to new version of qdox would be impossible. - - 13 Mar 2007; Petteri Räty <betelge...@gentoo.org> - -aspectwerkz-2.0_rc2-r1.ebuild: - Cleanup. - - 13 Mar 2007; Petteri Räty <betelge...@gentoo.org> - aspectwerkz-2.0_rc2-r2.ebuild: - Inherit java-ant-2 but turn off rewriting via JAVA_PKG_BSFIX as we patch - build.xml. - - 11 Feb 2007; nixnut <nix...@gentoo.org> aspectwerkz-2.0_rc2.ebuild: - Stable on ppc wrt bug 165208 - - 22 Dec 2006; Petteri Räty <betelge...@gentoo.org> - aspectwerkz-2.0_rc2-r2.ebuild: - Depend on >=dev-java/java-config-2.0.31 and let it handle the java5 use flag - properly. - - 28 Sep 2006; Vlastimil Babka <cas...@gentoo.org> - aspectwerkz-2.0_rc2-r2.ebuild: - Added missing junit dependency, discovered through JAVA_PKG_STRICT. - -*aspectwerkz-2.0_rc2-r2 (05 Aug 2006) - - 05 Aug 2006; Joshua Nichols <nic...@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 <nelch...@gentoo.org> - aspectwerkz-2.0_rc2-r1.ebuild: - Requires 1.5. - - 27 Jul 2006; Krzysiek Pawlik <nelch...@gentoo.org> - aspectwerkz-2.0_rc2-r1.ebuild: - Added java-ant-2. - -*aspectwerkz-2.0_rc2-r1 (02 Jul 2006) - - 02 Jul 2006; Joshua Nichols <nic...@gentoo.org> - +aspectwerkz-2.0_rc2-r1.ebuild: - Revision bump to support new Java system. - - 09 Feb 2006; Joshua Nichols <nic...@gentoo.org> - aspectwerkz-2.0_rc2.ebuild: - Marked stable on amd64 and x86. - - 30 Apr 2005; Jan Brinkmann <luckyd...@gentoo.org> - aspectwerkz-2.0_rc2.ebuild: - added ~ppc to KEYWORDS, introduced support for the source useflag. - - 17 Feb 2005; Jan Brinkmann <luckyd...@gentoo.org> - aspectwerkz-2.0_rc2.ebuild: - added missing zip dependency. see #69831 - -*aspectwerkz-2.0_rc2 (05 Jan 2005) - - 05 Jan 2005; Jan Brinkmann <luckyd...@gentoo.org> +metadata.xml, - +files/aspectwerkz-2.0_rc2-gentoo.patch, +aspectwerkz-2.0_rc2.ebuild: - Initial import. Needed as a dependency of #76738. diff --git a/dev-java/aspectwerkz/Manifest b/dev-java/aspectwerkz/Manifest deleted file mode 100644 index 6eb32d6..0000000 --- a/dev-java/aspectwerkz/Manifest +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX aspectwerkz-2.0-gentoo.patch 8362 SHA256 3ec2444b5bce5f43c6bebb1ee0dc74359b93424955f0dd7b521dc2cb5713fb05 SHA512 33d1b35c56ad0ed31104f4328336f10e4bc0140594191fdba4a2a7bf4931b566a786bb7560731883afca1d801fd39bcb703d687c0c2865b6780e59ff30ee213b WHIRLPOOL fc835a8ff2dfd10b0790f5f4f474d956d019eb7d109b3734bd0413fc7699d3eaeafc8ef6f002de44f81d01f435d14b8674937c09a678d547976690e5fdf93318 -AUX aspectwerkz-2.0-modernise_api.patch 3556 SHA256 f585b3e2ccb759ecba9d3e0da0adeaf35b49bee3bbe19b5e310a07126ef0d9a4 SHA512 1f9ca2ff92092edbcd134b4b156ce5fcc615c46abc1f3b4af28c48d70aecbee25ef6471792fdf747e48b73f26fabb2171239c6df92612e0db93e9411a86c27f6 WHIRLPOOL 5f3dc87e627e531c650cfe1f75d45473800703f6bd9ea77c3ad92a98d1424c3f68f14104491b6eca3dc4a86be6be3adf41eff33b0d905e3137129fa8b27cac3e -AUX aspectwerkz-2.0_rc2-gentoo.patch 4866 SHA256 262f71feb10fc60b4fd2d6c160041c9ade5388c7d6b885ef9da18d4f8e4a3b29 SHA512 471a1a1fd9680dd6646b2424085b856bd98a2827237baf1c8ec299935bcd3a8fe158ecc00e540f337465d2c1b1825468c98ba0eb266f613ea4351aba0cc30b7d WHIRLPOOL 9f66d6cec9319f15a0227a784279993c8e2f194cf4bea3a9ed477c81f7393a058a5b7a4e5fd71efc15c189682c76ba1be0940ec7b3630f164f82776d57ae8510 -AUX aspectwerkz-2.0_rc2-jdk15.patch 4503 SHA256 7e0efe23f8f831bf0e11cc1e252c37387eede1b770847b44d803e0aeef7820de SHA512 b2c570d3a3fad540400fbb16034fad3cdfd2b4ee37eea26f85ec401cea2aba5d64c14bf0164788b11f649213acd53d13410868a6aa04b27caf36fd83f4311eec WHIRLPOOL c66f84803933032644e6c8ffc05f81f9a78e375965c98b428f1e88976626d5186375300efaaad85b364af9d1b3cfe1f685ac3c390c7e15682d0b53be35661951 -DIST aspectwerkz-2.0.zip 14166266 SHA256 6d0f94338539dd0cbb0837337f65a64f65495a4194647e93fa96b27829ba9b46 SHA512 80052e36fcfb67c50c7ddaf3d76bc135add57f8d5eafe80d8e7ec214bc2636c9a22bf72f3c6ed473c042f2c2fadf64a525c2a123466d6426446aa7bfd3305a3f WHIRLPOOL a07d6e6aba5fe2da923314c12ca845010ab853a62caad305256792ea5d4844533efc908feee9233f80362de65887e9b6d0293f77e60aaf399243eb26d0f16c7c -EBUILD aspectwerkz-2.0.ebuild 1657 SHA256 a79a2416fe2cb24229ee4e82b1ec63896c9213847eb424fa025b5dd7e7000523 SHA512 2ca8340cf53f408963a07ef10b71e2dc6953fd05546f8db4cdc36ba25a1357995f53db3f6ad8e532dda294ed967c65e8956bc8c30fe72c8d749380a9c91cbf2b WHIRLPOOL bed39cd733ceea1dd2da05b2fbada1814f8dc8fcf4d039237c3d366dc6a50f0a101667557a0f101ac3aa927a100b4d3e11f9a50a84e4ca9385d7a4c498ce9531 -MISC ChangeLog 5348 SHA256 678b182324ceacc9844b21329e167a226044a879b5ed2357918131b155a8f0d7 SHA512 a5d5ef0b0ee52082e078db59f4c75f14493aa3e031e53b87a0517d44cccd8887a52184c47ea971eab2c922ffcd435f4673a641536c3a1f12b521556abfe50c2c WHIRLPOOL ae4a0d357759704cdd934b1b41d6747aeff7954273436cbe9f26e853ef48202dbaa71748089c39be33fb0cc4f81fd30763d78028b82486159a2262f9edd3a3ee -MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQIcBAEBCAAGBQJTUY6oAAoJEDuWpXgki9wHyukP/1tUrIIv+Hl6tE54gtCF7bBp -QEhoqbxHW9znqAzwoSBjA2fpLGlrugvHwB1tOm+QjhDopyQUkPqAHb8i0OYKUDmD -ySaBYCoTpTY1JWdQ3asuPhvZC16NKQsmSiLdcLPRwbd7xtEPPbIbbOgGXJLMQxR9 -BSEZnVveruW/lCmX1WUtGbFjp4tPKjgiWK2rsrwS9YgWRg3SXmBs+EpAQzquDPa8 -QtWqZS7ARYhJ6o/gGsC0AO7Cqq5RWsCTYL7InzX9up8xqepsjUegT5Hl/Uit5CsH -wIigL1Mozopenf2+D57+ggPBX5FH90YyLaFs2Xso31yINQQQi0QNgEHrFzMpU2Lo -y6HE2N8xdz4kdbqTy3e5kNs7r11puxQcJ5a+BZdiEpxItIqxK67bx0ore7Du+f9a -cafR8nKDLPXlQIf2dAplI15fHP4mj98c5fdcl2zASTti5DBqjh1hmqL7HT0nq/AT -DPpbrlPp8RHfH4Voww4LIFhkAIPdk7HBeovhQGrZUBKP8iQ66DVxJtDmSH3ne9EH -XG1Z8beoAIUNjZPFebU8XbnLuDQ+runRTg6W8UrpNPNjReV5nCI/W447eBvsc4tV -p1kapnH3hCl27hvLvDtFClqp2qYb+/qaz7g9xTbWBCZz88TURVO42ktIKMCyO9PI -HWJEM7efhkQ1GiiYpsMl -=3BA5 ------END PGP SIGNATURE----- diff --git a/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild b/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild deleted file mode 100644 index ef24c69..0000000 --- a/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2014 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.8 2013/09/01 09:33:06 grobian Exp $ - -EAPI=2 - -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="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="" -# bug 203268 -RESTRICT="test" - -COMMON_DEP=" - dev-java/asm:1.5 - dev-java/dom4j:1 - dev-java/jrexx:0 - dev-java/trove:0 - dev-java/qdox:1.6 - dev-java/junit:0 - java-virtuals/jdk-with-com-sun" -RDEPEND=" - >=virtual/jre-1.5 - ${COMMON_DEP}" -DEPEND=" - >=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" - epatch "${FILESDIR}/${P}-modernise_api.patch" - - find . -name '*.jar' -delete || die - - cd "${S}/lib" - java-pkg_jar-from asm-1.5 - 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="-Djava.version=1.5" - 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/files/aspectwerkz-2.0-gentoo.patch b/dev-java/aspectwerkz/files/aspectwerkz-2.0-gentoo.patch deleted file mode 100644 index 0c7e99a..0000000 --- a/dev-java/aspectwerkz/files/aspectwerkz-2.0-gentoo.patch +++ /dev/null @@ -1,138 +0,0 @@ ---- 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/aspectwerkz-2.0-modernise_api.patch b/dev-java/aspectwerkz/files/aspectwerkz-2.0-modernise_api.patch deleted file mode 100644 index 8d930e8..0000000 --- a/dev-java/aspectwerkz/files/aspectwerkz-2.0-modernise_api.patch +++ /dev/null @@ -1,82 +0,0 @@ ---- src/main/org/codehaus/aspectwerkz/connectivity/RemoteProxyServer.java.old 2013-09-30 02:03:20.703138370 +0100 -+++ src/main/org/codehaus/aspectwerkz/connectivity/RemoteProxyServer.java 2013-09-30 05:49:54.768369910 +0100 -@@ -7,9 +7,13 @@ - **************************************************************************************/ - package org.codehaus.aspectwerkz.connectivity; - --import EDU.oswego.cs.dl.util.concurrent.BoundedBuffer; --import EDU.oswego.cs.dl.util.concurrent.LinkedQueue; --import EDU.oswego.cs.dl.util.concurrent.PooledExecutor; -+import java.util.concurrent.ArrayBlockingQueue; -+import java.util.concurrent.BlockingQueue; -+import java.util.concurrent.LinkedBlockingQueue; -+import java.util.concurrent.RejectedExecutionHandler; -+import java.util.concurrent.ThreadPoolExecutor; -+import java.util.concurrent.TimeUnit; -+ - import org.codehaus.aspectwerkz.exception.WrappedRuntimeException; - - import java.io.FileInputStream; -@@ -152,7 +156,7 @@ - /** - * The thread pool. - */ -- private PooledExecutor m_threadPool = null; -+ private ThreadPoolExecutor m_threadPool = null; - - /** - * The class loader to use. -@@ -262,13 +266,30 @@ - final int threadPoolInitSize, - final int keepAliveTime, - final boolean waitWhenBlocked) { -- m_threadPool = new PooledExecutor(new BoundedBuffer(threadPoolInitSize), threadPoolMaxSize); -- m_threadPool.setKeepAliveTime(keepAliveTime); -- m_threadPool.createThreads(threadPoolInitSize); -- m_threadPool.setMinimumPoolSize(threadPoolMinSize); -+ m_threadPool = new ThreadPoolExecutor(threadPoolInitSize, threadPoolMaxSize, -+ keepAliveTime, TimeUnit.MILLISECONDS, -+ new ArrayBlockingQueue(threadPoolInitSize) { -+ protected void afterExecute(Runnable r, ThreadPoolExecutor e) { -+ if (waitWhenBlocked) e.notifyAll(); -+ } -+ }); -+ m_threadPool.prestartAllCoreThreads(); -+ m_threadPool.setCorePoolSize(threadPoolMinSize); - if (waitWhenBlocked) { -- m_threadPool.waitWhenBlocked(); -- } -+ m_threadPool.setRejectedExecutionHandler(new RejectedExecutionHandler() { -+ public void rejectedExecution(Runnable r, ThreadPoolExecutor e) { -+ if (e.isTerminating() || e.isTerminated()) -+ return; -+ BlockingQueue<Runnable> tasks = e.getQueue(); -+ int maxSize = e.getMaximumPoolSize(); -+ while (tasks.remainingCapacity() == 0 || e.getPoolSize() == maxSize) -+ try { e.wait(); } catch (InterruptedException ex) {} -+ e.execute(r); -+ } -+ }); -+ } else { -+ m_threadPool.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy()); -+ } - } - - /** -@@ -281,9 +302,10 @@ - private void createDynamicThreadPool(final int threadPoolMinSize, - final int threadPoolInitSize, - final int keepAliveTime) { -- m_threadPool = new PooledExecutor(new LinkedQueue()); -- m_threadPool.setKeepAliveTime(keepAliveTime); -- m_threadPool.createThreads(threadPoolInitSize); -- m_threadPool.setMinimumPoolSize(threadPoolMinSize); -+ m_threadPool = new ThreadPoolExecutor(threadPoolInitSize, Integer.MAX_VALUE, -+ keepAliveTime, TimeUnit.MILLISECONDS, -+ new LinkedBlockingQueue()); -+ m_threadPool.prestartAllCoreThreads(); -+ m_threadPool.setCorePoolSize(threadPoolMinSize); - } --} -\ No newline at end of file -+} diff --git a/dev-java/aspectwerkz/files/aspectwerkz-2.0_rc2-gentoo.patch b/dev-java/aspectwerkz/files/aspectwerkz-2.0_rc2-gentoo.patch deleted file mode 100644 index 273bb22..0000000 --- a/dev-java/aspectwerkz/files/aspectwerkz-2.0_rc2-gentoo.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- build.xml.orig 2005-01-05 22:09:52.421137168 +0100 -+++ build.xml 2005-01-05 22:17:04.298481832 +0100 -@@ -42,8 +42,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"/> - - <!-- =================================================== --> -@@ -121,7 +119,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"> -@@ -153,12 +151,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> - - <!-- ============================================================== --> -@@ -250,42 +242,31 @@ - <!-- ============================================================== --> - <!-- 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.2.jar"/> -- <zipfileset src="${basedir}/lib/asm-attrs-1.5.2.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.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.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.2.jar"/> -- <zipfileset src="${basedir}/lib/asm-attrs-1.5.2.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"/> -- -- <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.jar" file="${build.dir}/aspectwerkz-core.jar" overwrite="true"/> - - <antcall target="dist:jdk15"/> - </target> diff --git a/dev-java/aspectwerkz/files/aspectwerkz-2.0_rc2-jdk15.patch b/dev-java/aspectwerkz/files/aspectwerkz-2.0_rc2-jdk15.patch deleted file mode 100644 index 855fd13..0000000 --- a/dev-java/aspectwerkz/files/aspectwerkz-2.0_rc2-jdk15.patch +++ /dev/null @@ -1,82 +0,0 @@ -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/metadata.xml b/dev-java/aspectwerkz/metadata.xml deleted file mode 100644 index 7303cef..0000000 --- a/dev-java/aspectwerkz/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <herd>java</herd> -</pkgmetadata>
