Version bump. Fixes bug #210813. Thanks to Alex V. Fansky <damwihu@gmail.com> for the patch enabling it to build.

(Portage version: 2.1.4.4)

3 files changed, 82 insertions, 2 deletions

diff --git a/dev-java/jibx-tools/ChangeLog b/dev-java/jibx-tools/ChangeLog
index 381583c47613..b1c6383efa6d 100644
--- a/dev-java/jibx-tools/ChangeLog
+++ b/dev-java/jibx-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jibx-tools
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jibx-tools/ChangeLog,v 1.2 2007/08/11 21:53:01 nelchael Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jibx-tools/ChangeLog,v 1.3 2008/02/21 23:17:32 betelgeuse Exp $
+
+*jibx-tools-1.1.5 (21 Feb 2008)
+
+  21 Feb 2008; Petteri Räty <betelgeuse@gentoo.org>
+  +files/1.1.5-build.patch, +jibx-tools-1.1.5.ebuild:
+  Version bump. Fixes bug #210813. Thanks to Alex V. Fansky
+  <damwihu@gmail.com> for the patch enabling it to build.
 
   11 Aug 2007; Krzysiek Pawlik <nelchael@gentoo.org> metadata.xml:
   Remove myself from <maintainer>.
diff --git a/dev-java/jibx-tools/files/1.1.5-build.patch b/dev-java/jibx-tools/files/1.1.5-build.patch
new file mode 100644
index 000000000000..b71c40d99668
--- /dev/null
+++ b/dev-java/jibx-tools/files/1.1.5-build.patch
@@ -0,0 +1,21 @@
+diff -urN ./build/src/org/jibx/binding/SchemaGenerator.java ../jibx/build/src/org/jibx/binding/SchemaGenerator.java
+--- ./build/src/org/jibx/binding/SchemaGenerator.java	2007-05-23 21:31:14.000000000 +0300
++++ ../jibx/build/src/org/jibx/binding/SchemaGenerator.java	2008-02-21 23:14:06.000000000 +0200
+@@ -178,7 +178,7 @@
+         m_classLocator = new IClassLocator() {
+             public IClass getClassInfo(String name) {
+                 try {
+-                    return new ClassWrapper(ClassCache.getClassFile(name));
++                    return new ClassWrapper(m_classLocator, ClassCache.getClassFile(name));
+                 } catch (JiBXException e) {
+                     throw new IllegalStateException("Class not found " + name);
+                 }
+@@ -382,7 +382,7 @@
+             
+             // check for reference to a mapped class
+             StructureElement structure = (StructureElement)comp;
+-            TemplateElementBase templ = structure.getMapAsMapping();
++            TemplateElementBase templ = structure.getEffectiveMapping();
+             if (! (templ instanceof MappingElement)) {
+                 
+                 // unknown content, leave it to user to fill in details
diff --git a/dev-java/jibx-tools/jibx-tools-1.1.5.ebuild b/dev-java/jibx-tools/jibx-tools-1.1.5.ebuild
new file mode 100644
index 000000000000..ed58a3c5eee1
--- /dev/null
+++ b/dev-java/jibx-tools/jibx-tools-1.1.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jibx-tools/jibx-tools-1.1.5.ebuild,v 1.1 2008/02/21 23:17:32 betelgeuse Exp $
+
+EAPI=1
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2 versionator
+
+MY_PV=$(replace_all_version_separators '_')
+
+DESCRIPTION="JiBX: Binding XML to Java Code - Generators"
+HOMEPAGE="http://jibx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/jibx/jibx_${MY_PV}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/bcel:0
+	dev-java/jsr173:0
+	~dev-java/jibx-${PV}"
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+S="${WORKDIR}/jibx"
+
+src_unpack() {
+	unpack ${A}
+	#http://jira.codehaus.org/browse/JIBX-207
+	epatch "${FILESDIR}/1.1.5-build.patch"
+	java-ant_rewrite-classpath "${S}/build/build.xml"
+	rm -v "${S}"/lib/*.jar || die
+}
+
+EANT_FILTER_COMPILER="ecj-3.3"
+EANT_BUILD_XML="build/build.xml"
+EANT_BUILD_TARGET="jar-tools"
+EANT_GENTOO_CLASSPATH="bcel,jsr173,jibx"
+
+src_install() {
+	java-pkg_register-dependency jibx
+
+	java-pkg_dojar "${S}/lib"/jibx-*.jar
+	use source && java-pkg_dosrc "${S}"/build/src/* "${S}"/build/extras/*
+}