Removed older versions in same slot

Package-Manager: portage-2.1.4.1

5 files changed, 7 insertions, 295 deletions

diff --git a/dev-java/aspectwerkz/ChangeLog b/dev-java/aspectwerkz/ChangeLog
index f458f1d28846..2276ad59af41 100644
--- a/dev-java/aspectwerkz/ChangeLog
+++ b/dev-java/aspectwerkz/ChangeLog
@@ -1,6 +1,11 @@
 # 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.20 2008/02/09 21:10:29 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/ChangeLog,v 1.21 2008/02/09 21:18:38 wltjr Exp $
+
+  09 Feb 2008; William L. Thomson Jr. <wltjr@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. <wltjr@gentoo.org>
   aspectwerkz-2.0_rc2-r2.ebuild:
diff --git a/dev-java/aspectwerkz/Manifest b/dev-java/aspectwerkz/Manifest
index b59aa0e258c1..c277f6cfd6bb 100644
--- a/dev-java/aspectwerkz/Manifest
+++ b/dev-java/aspectwerkz/Manifest
@@ -1,10 +1,6 @@
-AUX aspectwerkz-2.0-gentoo.patch 8362 RMD160 8f670bdbc6a18068890abaf1fee6fadb4f8e083b SHA1 42aa28d84856b6b9cdef5c410e8a62d555839e70 SHA256 3ec2444b5bce5f43c6bebb1ee0dc74359b93424955f0dd7b521dc2cb5713fb05
 AUX aspectwerkz-2.0_rc2-gentoo.patch 4866 RMD160 5f103ae10c843b0ebcf5f3e92f9a733c4fde5dd8 SHA1 601cfaf73827be015c20935e4d02a041a2e440b6 SHA256 262f71feb10fc60b4fd2d6c160041c9ade5388c7d6b885ef9da18d4f8e4a3b29
 AUX aspectwerkz-2.0_rc2-jdk15.patch 4503 RMD160 ced2ad2d092e45c3671a1ddba8cf2868c90128c6 SHA1 d38a973cafca86a1b4c5794b1c4d53c3d52c1f56 SHA256 7e0efe23f8f831bf0e11cc1e252c37387eede1b770847b44d803e0aeef7820de
 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
 EBUILD aspectwerkz-2.0_rc2-r2.ebuild 1766 RMD160 4ad912fbb487dd717f2cb659bf570ea61c2939b0 SHA1 803aed37557e05007a27cd736c9a1ce581d81ed7 SHA256 bc9c3f1d1030f4af29d0cc849d31fe6bb69ad0ead3c8ff9177fa75a0fb8d9adf
-EBUILD aspectwerkz-2.0_rc2.ebuild 1547 RMD160 6e4385acf314cefbe06f7b8019550985876f6908 SHA1 5f303191aa9b8c8c784fc7517058ccfc173f2288 SHA256 b869c102255a942d2a016fa4a1dc0592a1cc4cd2a2fa6d5302cdefb449e3069b
-MISC ChangeLog 3267 RMD160 d116c21aa347938760e47989679fb2c4c028c29d SHA1 cf5367dfad4daa329596267e8cee3729c4902bec SHA256 4d2ddbbbc87161dfb2ed43e524841844ab90f44f47135ec7b71fca8b4a9fd21b
+MISC ChangeLog 3458 RMD160 38a4f90fe86056b16a3d981c4f7a89999b6e329f SHA1 3b18e33a952a6e336fa4542277fd6670e2806c04 SHA256 6995144f94b106bae95dcec5c88db2860f845a0ecacca4b15a451ca507fe1392
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
diff --git a/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild b/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild
deleted file mode 100644
index 26b4545e3ce8..000000000000
--- a/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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/aspectwerkz-2.0_rc2.ebuild b/dev-java/aspectwerkz/aspectwerkz-2.0_rc2.ebuild
deleted file mode 100644
index 6fa694502f05..000000000000
--- a/dev-java/aspectwerkz/aspectwerkz-2.0_rc2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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_rc2.ebuild,v 1.9 2007/08/04 11:01:47 fordfrog Exp $
-
-inherit java-pkg eutils
-
-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 x86"
-RDEPEND=">=virtual/jre-1.4
-	=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"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
-	>=dev-java/ant-core-1.5
-	app-arch/unzip
-	jikes? ( >=dev-java/jikes-1.21 )
-	source? ( app-arch/zip )"
-IUSE="jikes source"
-
-S=${WORKDIR}/aw_2_0_2
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.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="dist"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "failed to build"
-}
-
-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
deleted file mode 100644
index 0c7e99a33817..000000000000
--- 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>
-
-     <!-- ============================================================== -->