commit: 56eaa7fc03d29098eccb43bc6dd3ff675a3e3ea1 Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> AuthorDate: Thu Jun 30 13:57:37 2016 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Thu Jun 30 14:11:45 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56eaa7fc
dev-java/bcel: Clean up old. Package-Manager: portage-2.2.28 dev-java/bcel/Manifest | 2 - dev-java/bcel/bcel-5.2-r2.ebuild | 42 ----------------- dev-java/bcel/bcel-5.2-r3.ebuild | 44 ------------------ dev-java/bcel/files/bcel-5.2-build.xml.patch | 29 ------------ .../files/findbugs-bcel-5.2_p20070531.patch.patch | 52 ---------------------- dev-java/bcel/metadata.xml | 3 -- 6 files changed, 172 deletions(-) diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest index 980e9ef..fc2cdaa 100644 --- a/dev-java/bcel/Manifest +++ b/dev-java/bcel/Manifest @@ -1,3 +1 @@ DIST BCEL_6_0_RC3.tar.gz 929878 SHA256 74a4a75cc7aea8dab4c17c6ff6c00c2c19411942974b4bd6871e6984235101a0 SHA512 05ccf95ebf6b374fb112296509b4011d741acf2315b331aa971f8c3bc6be2f73b39592721a8c769b6b9d631e78e348c124c56f567adc2338ed5508d5ec3bed77 WHIRLPOOL 6bd53b49a7b8b6cfd422b3249461c1ec685855e0e5dd33c7b3d1eac04f8d61f1cd14b357d1d560002fadec1ab21c1a2b0abaae553340e0b055c6446cc4d5a3ce -DIST bcel-5.2-src.tar.gz 261455 SHA256 68039d59a38379d7b65ea3fc72276c43ba234776460e14361af35771bcaab295 SHA512 c8c1d5250b0d8c2f194038551afbe322bd65cde2990277eb6b30e2cd8cc0af2576946afdbcd011b3804386a09fbbc2ae10fd20ae72a24232630b077e79b8847b WHIRLPOOL fae7334f7735e5f5be924bc35c434a2e6ea2ca85d1e038c7ffe6b4636ae9dd2e839c3d775cb17c054a48655c8539802d4db75fcb5e178c51eea2ad2cc9f152e1 -DIST findbugs-bcel-5.2_p20070531.patch.bz2 7190 SHA256 43d049134de3eab3914fe850f4ddd89cd304ab21d87ca2669153a24f734f7981 SHA512 84bf652cac3992fa3311af4962c0ae064c3f18dda43c91afc256592631f2597815bf07f92b3071680e3cef327b06530f689cf3320fb5ebf6342dc5eaf5d7a953 WHIRLPOOL 6d1d2b3e2d045c7368b4ef7fcd6bc13ce337e60910e24998359df5cccb489fd1077d96c7e7ac763b5041b8b38fe5d4194d1ccf1cc1f7ac68b625076e28c0abe3 diff --git a/dev-java/bcel/bcel-5.2-r2.ebuild b/dev-java/bcel/bcel-5.2-r2.ebuild deleted file mode 100644 index 33b7bcc..0000000 --- a/dev-java/bcel/bcel-5.2-r2.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=2 - -JAVA_PKG_IUSE="doc source" - -inherit eutils java-pkg-2 java-ant-2 - -DESCRIPTION="The Byte Code Engineering Library: analyze, create, manipulate Java class files" -HOMEPAGE="http://commons.apache.org/bcel/"; -SRC_URI="mirror://apache/jakarta/${PN}/source/${P}-src.tar.gz - findbugs? ( https://dev.gentoo.org/~fordfrog/distfiles/findbugs-${P}_p20070531.patch.bz2 )" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="-findbugs" - -RDEPEND=">=virtual/jre-1.5" -DEPEND=">=virtual/jdk-1.5" - -ANT_OPTS="-Xmx256m" - -java_prepare() { - epatch "${FILESDIR}/${P}"-build.xml.patch - if use findbugs; then - # Remove next line if no longer needed. Removes build.xml from patch. - patch -d "${WORKDIR}" -p0 < "${FILESDIR}"/findbugs-${P}_p20070531.patch.patch || die "Failed to patch" - - EPATCH_OPTS="-p7" epatch "${WORKDIR}"/findbugs-${P}_p20070531.patch - fi -} - -src_install() { - java-pkg_newjar ./target/${P}.jar - dodoc README.txt || die - - use doc && java-pkg_dojavadoc dist/docs/api - use source && java-pkg_dosrc src/java/* -} diff --git a/dev-java/bcel/bcel-5.2-r3.ebuild b/dev-java/bcel/bcel-5.2-r3.ebuild deleted file mode 100644 index ac8c8d9..0000000 --- a/dev-java/bcel/bcel-5.2-r3.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -JAVA_PKG_IUSE="doc source" - -inherit eutils java-pkg-2 java-ant-2 - -DESCRIPTION="The Byte Code Engineering Library: analyze, create, manipulate Java class files" -HOMEPAGE="http://commons.apache.org/bcel/"; -SRC_URI="mirror://apache/jakarta/${PN}/source/${P}-src.tar.gz - findbugs? ( https://dev.gentoo.org/~fordfrog/distfiles/findbugs-${P}_p20070531.patch.bz2 )" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="-findbugs" - -RDEPEND=">=virtual/jre-1.6" -DEPEND=">=virtual/jdk-1.6" - -JAVA_ANT_ENCODING="ISO-8859-1" - -ANT_OPTS="-Xmx256m" - -java_prepare() { - epatch "${FILESDIR}/${P}"-build.xml.patch - if use findbugs; then - # Remove next line if no longer needed. Removes build.xml from patch. - patch -d "${WORKDIR}" -p0 < "${FILESDIR}"/findbugs-${P}_p20070531.patch.patch || die "Failed to patch" - - EPATCH_OPTS="-p7" epatch "${WORKDIR}"/findbugs-${P}_p20070531.patch - fi -} - -src_install() { - java-pkg_newjar ./target/${P}.jar - dodoc README.txt || die - - use doc && java-pkg_dojavadoc dist/docs/api - use source && java-pkg_dosrc src/java/* -} diff --git a/dev-java/bcel/files/bcel-5.2-build.xml.patch b/dev-java/bcel/files/bcel-5.2-build.xml.patch deleted file mode 100644 index 2f365af..0000000 --- a/dev-java/bcel/files/bcel-5.2-build.xml.patch +++ /dev/null @@ -1,29 +0,0 @@ -Remove test from jar target and set the encoding for javadocs. - ---- build.xml 2006-06-03 05:48:22.000000000 +0200 -+++ build.xml 2011-04-20 17:04:49.000000000 +0200 -@@ -56,7 +56,7 @@ - </fileset> - </copy> - </target> -- <target name="jar" description="o Create the jar" depends="compile,test"> -+ <target name="jar" description="o Create the jar" depends="compile"> - <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"> - </jar> - </target> -@@ -100,7 +100,7 @@ - </property> - <property name="title" value="jakarta-bcel 5.2 API"> - </property> -- <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.bcel.*"> -+ <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.bcel.*" encoding="ISO-8859-1"> - <classpath> - <path refid="build.classpath"> - </path> -@@ -121,4 +121,4 @@ - <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"> - </unjar> - </target> --</project> -\ No newline at end of file -+</project> diff --git a/dev-java/bcel/files/findbugs-bcel-5.2_p20070531.patch.patch b/dev-java/bcel/files/findbugs-bcel-5.2_p20070531.patch.patch deleted file mode 100644 index c3f21eb..0000000 --- a/dev-java/bcel/files/findbugs-bcel-5.2_p20070531.patch.patch +++ /dev/null @@ -1,52 +0,0 @@ -Removes build.xml from patch - ---- findbugs-bcel-5.2_p20070531.patch 2011-04-20 17:16:53.000000000 +0200 -+++ findbugs-bcel-5.2_p20070531.patch 2011-04-20 17:17:48.000000000 +0200 -@@ -1,47 +1,3 @@ --Index: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/build.xml --=================================================================== ----- /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/build.xml (revision 0) --+++ /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/build.xml (revision 0) --@@ -0,0 +1,39 @@ --+<project name="bcel" default="jar"> --+ --+ <property name="src.dir" value="src/java"/> --+ <property name="classes.dir" value="eclipse"/> --+ <property name="jar.dir" value="."/> --+ --+ <target name="jar" depends="clean,classes"> --+ <!-- Main engine and command line jar file. --> --+ <jar destfile="${jar.dir}/bcel.jar" > --+ <!-- Compiled classes, properties files. --> --+ <fileset dir="${classes.dir}"> --+ <include name="**/*.class"/> --+ </fileset> --+ </jar> --+ </target> --+ --+ <!-- Compile Java source files, and copy other files (properties, --+ images, html, XSL stylesheets) that need to be part of the codebase. --> --+ <target name="classes"> --+ <mkdir dir="${classes.dir}"/> --+ <!-- Compile Java source files. --> --+ <javac srcdir="${src.dir}" --+ destdir="${classes.dir}" --+ source="1.5" --+ target="jsr14" --+ deprecation="on" --+ debug="on"> --+ </javac> --+ </target> --+ <!-- Delete generated files. --> --+ <target name="clean"> --+ <delete file="${classes.dir}"/> --+ <mkdir dir="${classes.dir}"/> --+ </target> --+ --+ --+</project> --+ --+<!-- vim:set ts=4: --> - Index: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/AbstractLocalVariableTable.java - =================================================================== - --- /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/AbstractLocalVariableTable.java (revision 0) diff --git a/dev-java/bcel/metadata.xml b/dev-java/bcel/metadata.xml index d4e4e4f..a831a15 100644 --- a/dev-java/bcel/metadata.xml +++ b/dev-java/bcel/metadata.xml @@ -13,9 +13,6 @@ by objects which contain all the symbolic information of the given class: methods, fields and byte code instructions, in particular. </longdescription> - <use> - <flag name="findbugs">Include performance patch for findbugs package.</flag> - </use> <upstream> <remote-id type="github">apache/commons-bcel</remote-id> </upstream>
