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

(Portage version: 2.1.9.46/cvs/Linux x86_64)

4 files changed, 131 insertions, 1 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/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)