Resolving bug #112448 with a revbump

(Portage version: 2.0.53_rc7)

5 files changed, 100 insertions, 1 deletions

diff --git a/dev-java/bcel/ChangeLog b/dev-java/bcel/ChangeLog
index 01659d9d2130..c74f2b43ea0c 100644
--- a/dev-java/bcel/ChangeLog
+++ b/dev-java/bcel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/bcel
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcel/ChangeLog,v 1.31 2005/11/11 03:42:41 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcel/ChangeLog,v 1.32 2005/11/13 21:27:29 compnerd Exp $
+
+*bcel-5.1-r2 (13 Nov 2005)
+
+  13 Nov 2005; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/bcel-5.1-gentoo-buildxml-r2.diff, +bcel-5.1-r2.ebuild:
+  Rev bumping.  Changing the depend from a JDK/JRE 1.2 to 1.3 to resolve jikes
+  issue (Bug #112448).
 
   11 Nov 2005; Saleem Abdulrasool <compnerd@gentoo.org>
   files/bcel-5.1-gentoo-buildxml.diff:
diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest
index 73ccabc8e784..0944feb4a632 100644
--- a/dev-java/bcel/Manifest
+++ b/dev-java/bcel/Manifest
@@ -1,7 +1,10 @@
 MD5 dfaa526ca7a0fb60c9d822147bf24171 ChangeLog 3276
 MD5 c96bbc294abd9aa075a92dfea2812121 bcel-5.1-r1.ebuild 1319
+MD5 46aec97abf71cff66b9a8d5ea311c363 bcel-5.1-r2.ebuild 1322
+MD5 eaf1c0b776367b54481fa33646ed41d8 files/bcel-5.1-gentoo-buildxml-r2.diff 1289
 MD5 e9f9e5f7524a465068ef1fc658d9453c files/bcel-5.1-gentoo-buildxml.diff 1289
 MD5 55afed4e967381f557d9a2247060a3c9 files/bcel-5.1-gentoo-src.diff 3249
 MD5 88f16b1c12a8814d078c5eb3906d2218 files/bcel-5.1-gentoo.diff 457
 MD5 e908f81e51167a747ab8527dacc3ee4e files/digest-bcel-5.1-r1 66
+MD5 e908f81e51167a747ab8527dacc3ee4e files/digest-bcel-5.1-r2 66
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
diff --git a/dev-java/bcel/bcel-5.1-r2.ebuild b/dev-java/bcel/bcel-5.1-r2.ebuild
new file mode 100644
index 000000000000..dfd71f9f4c13
--- /dev/null
+++ b/dev-java/bcel/bcel-5.1-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcel/bcel-5.1-r2.ebuild,v 1.1 2005/11/13 21:27:29 compnerd Exp $
+
+inherit java-pkg eutils
+
+DESCRIPTION="The Byte Code Engineering Library: analyze, create, manipulate Java class files"
+HOMEPAGE="http://jakarta.apache.org/bcel/"
+SRC_URI="mirror://apache/jakarta/bcel/source/${P}-src.tar.gz"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="x86 ppc sparc amd64 ppc64"
+IUSE="doc jikes source"
+RDEPEND=">=virtual/jre-1.3
+	=dev-java/jakarta-regexp-1.3*"
+DEPEND=">=virtual/jdk-1.3
+	app-arch/unzip
+	dev-java/ant-core
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	unzip -q "${P}-src.zip" || die "failed to unpack"
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo-buildxml-r2.diff
+	epatch ${FILESDIR}/${P}-gentoo-src.diff
+
+	echo "regexp.jar=$(java-pkg_getjars jakarta-regexp-1.3)" > build.properties
+}
+
+src_compile() {
+	local antflags="jar"
+	use doc && antflags="${antflags} apidocs"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant ${antflags} || die "compilation failed"
+}
+
+src_install() {
+	java-pkg_dojar bin/bcel.jar
+
+	if use doc; then
+		dodoc LICENSE.txt
+		java-pkg_dohtml -r docs/
+	fi
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/bcel/files/bcel-5.1-gentoo-buildxml-r2.diff b/dev-java/bcel/files/bcel-5.1-gentoo-buildxml-r2.diff
new file mode 100644
index 000000000000..7e73dc37154d
--- /dev/null
+++ b/dev-java/bcel/files/bcel-5.1-gentoo-buildxml-r2.diff
@@ -0,0 +1,39 @@
+--- build.xml.orig	2004-12-19 18:15:47.840287952 +0100
++++ build.xml	2004-12-19 18:19:13.831972456 +0100
+@@ -58,24 +58,32 @@
+   <!-- Compile the sources -->
+   <target name="compile" depends="init">
+     <mkdir dir="${build.dest}"/>
+-    <javac srcdir="${src.dir}" destdir="${build.dest}" classpath="${class.path}" debug="true"/>
++    <javac srcdir="${src.dir}" 
++	    destdir="${build.dest}" 
++	    classpath="${class.path}" 
++	    debug="off" 
++	    target="1.3" 
++	    source="1.3">
++    	<classpath>
++		<pathelement path="${regexp.jar}"/>
++	</classpath>
++    </javac>
+   </target>
+ 
+   <!-- Just an alias -->
+   <target name="build" depends="compile"/>
+ 
+   <!-- Jar the library -->
+-  <target name="jar" depends="examples">
++  <target name="jar" depends="compile">
+     <jar jarfile="${build.dir}/${name}.jar" 
+          basedir="${build.dest}"
+-	 manifest="${basedir}/manifest.txt"
+ 	 includes="org/**,listclass.class"
+     />
+   </target>
+ 
+   <!-- Compile the examples -->
+   <target name="examples" depends="compile">
+-    <javac srcdir="${examples.dir}" destdir="${build.dest}" classpath="${class.path}" />
++    <javac srcdir="${examples.dir}" destdir="${build.dest}" classpath="${class.path}" target="1.3" source="1.3"/>
+   </target>
+ 
+   <!-- Creates the API documentation -->
diff --git a/dev-java/bcel/files/digest-bcel-5.1-r2 b/dev-java/bcel/files/digest-bcel-5.1-r2
new file mode 100644
index 000000000000..f44f8af3ffcb
--- /dev/null
+++ b/dev-java/bcel/files/digest-bcel-5.1-r2
@@ -0,0 +1 @@
+MD5 31ebbd7738325c775bd3ad5ce90dc263 bcel-5.1-src.tar.gz 12634761