Fix circular dependencies. thanks to sera. see #363147.

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

5 files changed, 135 insertions, 2 deletions

diff --git a/dev-java/bcel/ChangeLog b/dev-java/bcel/ChangeLog
index d0bc54ca932f..57a4c746471a 100644
--- a/dev-java/bcel/ChangeLog
+++ b/dev-java/bcel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/bcel
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcel/ChangeLog,v 1.53 2011/04/10 23:19:57 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcel/ChangeLog,v 1.54 2011/04/21 08:23:28 ali_bush Exp $
+
+*bcel-5.2-r2 (21 Apr 2011)
+
+  21 Apr 2011; Alistair Bush <ali_bush@gentoo.org> +bcel-5.2-r2.ebuild,
+  +files/bcel-5.2-build.xml.patch,
+  +files/findbugs-bcel-5.2_p20070531.patch.patch:
+  Fix circular dependencies. thanks to sera. see #363147.
 
 *bcel-5.2-r1 (10 Apr 2011)
 
diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest
index 63a510602269..ce101bca1936 100644
--- a/dev-java/bcel/Manifest
+++ b/dev-java/bcel/Manifest
@@ -1,8 +1,11 @@
 AUX bcel-5.1-gentoo-buildxml.diff 1289 RMD160 3a7af7a2c51bf31208310af047cd5dfa89e38702 SHA1 9dc9c47ac3bf40de7dfe814f8e38c221a49a7a97 SHA256 f451cc4a183f093eb91a5333b5f7a95f93c3555067b066f019c397ec5a161959
 AUX bcel-5.1-gentoo-src.diff 3249 RMD160 0c3548bb520535e70e27d4c8f9c7a7c7b52442d6 SHA1 9fde20b704c6d63bc50f5270b02bbaceb2c993e1 SHA256 b2ba3d62aae9766fe419400e1505e5d8896071b4028ff0978dffa5c7c8cffbd9
+AUX bcel-5.2-build.xml.patch 1195 RMD160 2f4d515e23e06d2dabdd194f290d0242c54f14f9 SHA1 59169052088f78d338a4929a339103c0ad6d6fb0 SHA256 3e1b99c68c0d9f179b3d7e882848fb1b90852e58bd24c18f91cebff2ef69ea72
+AUX findbugs-bcel-5.2_p20070531.patch.patch 1979 RMD160 90f5d295fc04f6a2f91739a9ed988316165919b5 SHA1 4d2afa9e5f29bd7ddb9578ed6554466b4c00c6ec SHA256 e2fbda6873aa11d17d388d4fd6a250a3c740eae6728b1e117ff856ee9ddb886f
 DIST bcel-5.2-src.tar.gz 261455 RMD160 824286886500f837c869ea6344e8362edbe10636 SHA1 3b3d451664855b0c9aae15dd05b69bf1063d8a1d SHA256 68039d59a38379d7b65ea3fc72276c43ba234776460e14361af35771bcaab295
 DIST findbugs-bcel-5.2_p20070531.patch.bz2 7190 RMD160 6dc670fed327a40141f1c41a1d68b238e16aea25 SHA1 6d210c8636d74019f4212fb9645fecf65d584f40 SHA256 43d049134de3eab3914fe850f4ddd89cd304ab21d87ca2669153a24f734f7981
 EBUILD bcel-5.2-r1.ebuild 1388 RMD160 3c0e1c8673be6676339b9577ba686e06aa4c40f2 SHA1 8b4d6764b40efc64b6187cdd121a73d1281b6138 SHA256 76ff41ca578047eb6db86f7292b16d97986a04410dc75a0f52e6ecc77e72e5b0
+EBUILD bcel-5.2-r2.ebuild 1390 RMD160 f9165a45d2126e7c72ac7e73243464874307073e SHA1 a30d2a991b4c0d45d1dec336d63ffd887c6dd4ce SHA256 94783122d683dedb33cbf82a36afd660b70f8cd26baa14dd126bafffa220a981
 EBUILD bcel-5.2.ebuild 988 RMD160 353a8966c977f6e8712de4dd17131f682ec4935a SHA1 989827b2c6616de4dd48174b018794c1149be55f SHA256 6940595a5adac7e2a8937882cea67a9270d2ef0a69d70712e11fa6d12ea81e0d
-MISC ChangeLog 5918 RMD160 131722b1c966213367aed315492d0590dc763141 SHA1 5ae6b8b551b31a21e5dd107581dfee1ce4048002 SHA256 0b9c5b7de0dca7bad9d5fe939f28c760e56b1bf386991176ed0ed2b33cc007d1
+MISC ChangeLog 6163 RMD160 31cdc606a42aada4d0709f2909dc5ecb5ce3f682 SHA1 5faecce20870b74d13705e9b75ed742bb73c129b SHA256 dd3cc1ecab45b76171c6707ecae56b5a28bd741d7b4c9c1c1e29e948e127c2f7
 MISC metadata.xml 736 RMD160 437c9c1259504fd017b69c90cca884a5dc6d839b SHA1 b1acf5e8cac866cfc3d5d6d5d3d1ba9d116b97d0 SHA256 25e5269e735628bab5ad098d7b0bb4d972ab5db69ff6a0c70b05af771984a207
diff --git a/dev-java/bcel/bcel-5.2-r2.ebuild b/dev-java/bcel/bcel-5.2-r2.ebuild
new file mode 100644
index 000000000000..948d090f3bac
--- /dev/null
+++ b/dev-java/bcel/bcel-5.2-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcel/bcel-5.2-r2.ebuild,v 1.1 2011/04/21 08:23:28 ali_bush Exp $
+
+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://jakarta.apache.org/bcel/"
+SRC_URI="mirror://apache/jakarta/${PN}/source/${P}-src.tar.gz
+	findbugs? ( http://dev.gentoo.org/~fordfrog/distfiles/findbugs-${P}_p20070531.patch.bz2 )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~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/files/bcel-5.2-build.xml.patch b/dev-java/bcel/files/bcel-5.2-build.xml.patch
new file mode 100644
index 000000000000..2f365afb6b78
--- /dev/null
+++ b/dev-java/bcel/files/bcel-5.2-build.xml.patch
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 000000000000..c3f21eb1c442
--- /dev/null
+++ b/dev-java/bcel/files/findbugs-bcel-5.2_p20070531.patch.patch
@@ -0,0 +1,52 @@
+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)