commit: 0f9551e62bad6b72b98e5a0d80058e04b9441cc1 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Wed May 18 21:25:33 2016 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Thu May 19 18:19:34 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f9551e6
dev-java/asm: Remove several unused versions Package-Manager: portage-2.3.0_rc1 dev-java/asm/Manifest | 3 -- dev-java/asm/asm-2.0-r2.ebuild | 47 -------------------- dev-java/asm/asm-2.2.3-r2.ebuild | 52 ---------------------- dev-java/asm/asm-4.0-r1.ebuild | 40 ----------------- dev-java/asm/asm-5.0.4.ebuild | 45 ------------------- dev-java/asm/files/asm-2.2.3-build.xml.patch | 65 ---------------------------- dev-java/asm/files/asm-2.2.3-commons.patch | 13 ------ 7 files changed, 265 deletions(-) diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest index 6d4ec5c..ecebfe7 100644 --- a/dev-java/asm/Manifest +++ b/dev-java/asm/Manifest @@ -1,7 +1,4 @@ -DIST asm-2.0.tar.gz 258426 SHA256 8c0b305819f123aa3333efb66acbeb8f5deb8cef5419c1d940310c7fbe7c194e SHA512 6736d7cccecfb6de999a2f5fdf527112206b056646da70f3597f272138b191b5b28ee620aa1a708c9941416eca7bb56c5dcf947ec377c9899f05aaf014186c4d WHIRLPOOL 779b1ea46fbd9458eb00ec59e035492f1fa1ec2f5fa03a01547f3ef1600a0f886d6f51b96b5e47e972db47d709f381788eaa023ce8cdbb3c36590339b632f4cc -DIST asm-2.2.3.tar.gz 287535 SHA256 56c5ce25bff92c3641b6435e28eee71718bc4eb62d4964faa9da6bb9d1002344 SHA512 765b145a42cc02ef3066a6922afacdc70e63d7713c971e76621e7e03bdfd7e9426ca61a4b302fa0ad78f88046bfda5382befe84b690eb8102c7df912c0f0b73a WHIRLPOOL aca2299cf522034685a3ac008067a30230aaa811fc96cc3451b81b937903e21759c512330638acfc48101680576d90db46b915d097abdd902b3a58825877c4bf DIST asm-3.3.1.tar.gz 854626 SHA256 69a523d41c82d7979c9b47271e31187e23c064e1d2a93b52950463bcb80197f5 SHA512 b0dffde873dcdfd8328736cfaeb8a3fca2e0788fa642d3af0c995d55c6ca4b1847e35c24100277a453b518305c5fe234d1935fa8de9b25bddd5dee5f1d4a4d44 WHIRLPOOL 90158f7fd87eae641e20aaca736debbd34b70e22feae1021c5f47255b8b9e8305460444e1f070288292b64a6aef3c083c81b520343f97b570ec1799d56d13874 DIST asm-4.0.tar.gz 752187 SHA256 feb2b078f10d420b6ab04cca136db1b57935170d53d12c64d381e118185c7b0e SHA512 642bc32fc0310b8e4291386866e53ba62802f2ae888163cd6e879232bbe3c3728c3a135aa667f91aec5bbb743621c2ee2d2a1a1d1ccb36c5249874a5ba9b08db WHIRLPOOL 8ac20fd836a97572c0b449637491e31a01d29f65eac71cf5412ae0948d1264ed098fd9fbe6ee51af386b78c25bef38c6878693144875e3f29692ad6daf320bd0 DIST asm-5.0.3.tar.gz 781742 SHA256 36e8b760d40898cce83e913e78cf6e631a6a3dc3b448895bb35c02d298c21c4b SHA512 fb2fbddbd01ec6d355d5f218db801512a160b505e91c4ad81cc1a0f1265c358cf8df6140c216e2d5acc109dc2286c29de6bf5b60b29a094e70c96070a54b20af WHIRLPOOL e93cbf659b224d50b8a0971ceaacbcb72acfbf23347baf4a9875e647c5f43b70587a5e24ea01f3ecb57eee31e0550144b59d55e97daafba9d76158427518f667 -DIST asm-5.0.4.tar.gz 781781 SHA256 3e6e25f1013ec016bd11c90ee41faa6226b5bd50385d0cd51df8a81d2db3525d SHA512 997b77ff45a3b1538d75e64700556f1e405f84aac5d99536b77338714c5dc2e7f973b2a6507f75d56e50a146a4744698e8e35cd4714a9127e2b09bfb5f9a346e WHIRLPOOL df6c5d60dbbe5343cb6e216bd22c0ec5c2c24f350b0106c4938cc558fdfa99700717a8ec06505fddf2633d236a2774ffad0ddff81ee694ed0cc7b34476d32b61 DIST asm-5.1.tar.gz 791417 SHA256 661b4824191ac40c6c670dcf43f6a9975d9d127af49c448d55e32ed7a5896e66 SHA512 de702516f9e16686c027c9a200a1750e6dcaee96bb1ed8bc0591673404d015b8817e37f210be645681dff7a2c31f7ddce8b406ccc8c6e11f1424e19c04c38f1e WHIRLPOOL 35913e6bb7e6d555444958baeee9d4276d8a2c9aaadad9920fc955cfdf0227ac82deadacc3586361d23435bd8956f7e248728b33cda5843976133a65f34b2a51 diff --git a/dev-java/asm/asm-2.0-r2.ebuild b/dev-java/asm/asm-2.0-r2.ebuild deleted file mode 100644 index 00da4e1..0000000 --- a/dev-java/asm/asm-2.0-r2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Bytecode manipulation framework for Java" -HOMEPAGE="http://asm.objectweb.org"; -SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz"; -LICENSE="BSD" -SLOT="2" -KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris" -IUSE="doc source" - -CDEPEND=" - dev-java/ant-core:0 - dev-java/ant-owanttask:0" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.6" - -DEPEND=" - ${CDEPEND} - source? ( app-arch/zip ) - >=virtual/jdk-1.6" - -RESTRICT="test" - -java_prepare() { - echo "objectweb.ant.tasks.path ${EPREFIX}/usr/share/ant-owanttask/lib/ow_util_ant_tasks.jar" \ - >> build.properties || die -} - -src_compile() { - eant jar $(use_doc jdoc) -} - -src_install() { - for x in output/dist/lib/*.jar ; do - java-pkg_newjar ${x} $(basename ${x/-${PV}}) - done - use doc && java-pkg_dohtml -r output/dist/doc/javadoc/user/* - use source && java-pkg_dosrc src/* -} diff --git a/dev-java/asm/asm-2.2.3-r2.ebuild b/dev-java/asm/asm-2.2.3-r2.ebuild deleted file mode 100644 index e1b12fb..0000000 --- a/dev-java/asm/asm-2.2.3-r2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Bytecode manipulation framework for Java" -HOMEPAGE="http://asm.objectweb.org"; -SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz"; -LICENSE="BSD" -SLOT="2.2" -KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="doc source" - -CDEPEND="dev-java/ant-core:0 - dev-java/ant-owanttask:0" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.6" - -DEPEND=" - ${CDEPEND} - source? ( app-arch/zip ) - >=virtual/jdk-1.6" - -PATCHES=( - "${FILESDIR}/${P}-build.xml.patch" - "${FILESDIR}/${P}-commons.patch" -) - -JAVA_ANT_ENCODING="ISO-8859-1" -EANT_DOC_TARGET="jdoc" - -# Needs unpackaged deps. -# https://bugs.gentoo.org/show_bug.cgi?id=212860 -RESTRICT="test" - -java_prepare() { - epatch "${PATCHES[@]}" - echo "objectweb.ant.tasks.path = $(java-pkg_getjar --build-only ant-owanttask ow_util_ant_tasks.jar)" >> build.properties || die -} - -src_install() { - for x in output/dist/lib/*.jar ; do - java-pkg_newjar ${x} $(basename ${x/-${PV}}) - done - use doc && java-pkg_dohtml -r output/dist/doc/javadoc/user/* - use source && java-pkg_dosrc src/* -} diff --git a/dev-java/asm/asm-4.0-r1.ebuild b/dev-java/asm/asm-4.0-r1.ebuild deleted file mode 100644 index 63236e9..0000000 --- a/dev-java/asm/asm-4.0-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MY_P="${PN}-${PV/rc/RC}" -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Bytecode manipulation framework for Java" -HOMEPAGE="http://asm.ow2.org"; -SRC_URI="http://download.forge.objectweb.org/${PN}/${MY_P}.tar.gz"; -LICENSE="BSD" -SLOT="4" -IUSE="" -KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x64-macos" - -DEPEND=">=virtual/jdk-1.5" -RDEPEND=">=virtual/jre-1.5" - -# Needs dependencies we don't have yet. -RESTRICT="test" - -S="${WORKDIR}/${MY_P}" -EANT_DOC_TARGET="jdoc" - -# Fails if this objectweb.ant.tasks.path is not set. -# Java generics seem to break unless product.noshrink is set. -EANT_EXTRA_ARGS="-Dobjectweb.ant.tasks.path=foobar -Dproduct.noshrink=true" - -src_install() { - for x in output/dist/lib/*.jar ; do - java-pkg_newjar "${x}" $(basename "${x%-*}.jar") - done - - use doc && java-pkg_dojavadoc output/dist/doc/javadoc/user/ - use source && java-pkg_dosrc src/* -} diff --git a/dev-java/asm/asm-5.0.4.ebuild b/dev-java/asm/asm-5.0.4.ebuild deleted file mode 100644 index 414109a..0000000 --- a/dev-java/asm/asm-5.0.4.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -OLD_P="${PN}-4.0" -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Bytecode manipulation framework for Java" -HOMEPAGE="http://asm.ow2.org"; -SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz - http://download.forge.objectweb.org/${PN}/${OLD_P}.tar.gz"; -LICENSE="BSD" -SLOT="4" -IUSE="" -KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x64-macos" - -DEPEND=">=virtual/jdk-1.6" -RDEPEND=">=virtual/jre-1.6" - -# Needs dependencies we don't have yet. -RESTRICT="test" - -EANT_DOC_TARGET="jdoc" - -# Fails if this objectweb.ant.tasks.path is not set. -# Java generics seem to break unless product.noshrink is set. -EANT_EXTRA_ARGS="-Dobjectweb.ant.tasks.path=foobar -Dproduct.noshrink=true" - -java_prepare() { - # Borrow some ant scripts from an old version to avoid requiring - # bndlib and friends. This may not work forever! - cp -vf "../${OLD_P}/archive"/*.xml archive/ || die -} - -src_install() { - for x in output/dist/lib/*.jar ; do - java-pkg_newjar "${x}" $(basename "${x%-*}.jar") - done - - use doc && java-pkg_dojavadoc output/dist/doc/javadoc/user/ - use source && java-pkg_dosrc src/* -} diff --git a/dev-java/asm/files/asm-2.2.3-build.xml.patch b/dev-java/asm/files/asm-2.2.3-build.xml.patch deleted file mode 100644 index b2c4a7e..0000000 --- a/dev-java/asm/files/asm-2.2.3-build.xml.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -Nur asm-2.2.3/build.xml asm-2.2.3_patched/build.xml ---- asm-2.2.3/build.xml 2006-07-05 18:32:20.000000000 +0300 -+++ asm-2.2.3_patched/build.xml 2008-09-25 23:12:06.000000000 +0300 -@@ -96,17 +96,6 @@ - <pathelement location="${out.build}"/> - </path> - -- <path id="cobertura.classpath"> -- <fileset dir="test/lib"> -- <include name="cobertura-1.7.jar"/> -- <include name="log4j-1.2.9.jar"/> -- <include name="jakarta-oro-2.0.8.jar"/> -- <include name="asm-2.1.jar"/> -- <include name="ccl.jar"/> -- <include name="javancss.jar"/> -- </fileset> -- </path> -- - <taskdef name="multipleAnt" - classname="org.objectweb.util.ant.MultipleAnt" - classpath="${objectweb.ant.tasks.path}"/> -@@ -118,8 +107,6 @@ - <taskdef name="multipleCopy" - classname="org.objectweb.util.ant.MultipleCopy" - classpath="${objectweb.ant.tasks.path}"/> -- -- <taskdef classpathref="cobertura.classpath" resource="tasks.properties"/> - </target> - - <!-- =================================== --> -@@ -180,34 +167,6 @@ - </junitreport> - </target> - -- <target name="coverage" depends="compile"> -- <delete file="cobertura.ser"/> -- <delete dir="${out.instr}"/> -- <cobertura-instrument todir="${out.instr}"> -- <ignore regex="org.apache.log4j.*"/> -- <fileset dir="${out.build}/tmp"> -- <include name="**/*.class"/> -- <exclude name="**/optimizer/*.class" /> -- <exclude name="**/*Test*.class" /> -- </fileset> -- </cobertura-instrument> -- <copy todir="${out.instr}" preservelastmodified="yes"> -- <fileset dir="${out.build}/tmp"/> -- </copy> -- <property name="classes" value="${out.instr}"/> -- <ant antfile="${test}/build.xml" target="test" inheritRefs="true"/> -- </target> -- -- <target name="coverage.report" depends="init"> -- <cobertura-report destdir="${out}/coverage" srcdir="${src}" format="xml"/> -- <cobertura-report destdir="${out}/coverage"> -- <fileset dir="${src}"> -- <include name="**/*.java"/> -- <exclude name="**/asm/optimizer/**/*.java"/> -- </fileset> -- </cobertura-report> -- </target> -- - <!-- =================================== --> - <!-- ========== DIST ========== --> - <!-- =================================== --> diff --git a/dev-java/asm/files/asm-2.2.3-commons.patch b/dev-java/asm/files/asm-2.2.3-commons.patch deleted file mode 100644 index f7b9d79..0000000 --- a/dev-java/asm/files/asm-2.2.3-commons.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru asm-2.2.3-orig/src/org/objectweb/asm/commons/SerialVersionUIDAdder.java asm-2.2.3/src/org/objectweb/asm/commons/SerialVersionUIDAdder.java ---- asm-2.2.3-orig/src/org/objectweb/asm/commons/SerialVersionUIDAdder.java 2006-11-19 00:21:09.000000000 -0500 -+++ asm-2.2.3/src/org/objectweb/asm/commons/SerialVersionUIDAdder.java 2006-11-19 00:22:12.000000000 -0500 -@@ -431,7 +431,7 @@ - try { - return MessageDigest.getInstance("SHA").digest(value); - } catch (Exception e) { -- throw new UnsupportedOperationException(e); -+ throw new UnsupportedOperationException(e.toString()); - } - } - -Only in asm-2.2.3/src/org/objectweb/asm/commons: SerialVersionUIDAdder.java.orig
