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

Package-Manager: portage-2.1.4.4

4 files changed, 96 insertions, 3 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/Manifest b/dev-java/jibx-tools/Manifest
index 77f322d16c41..0dac522142f0 100644
--- a/dev-java/jibx-tools/Manifest
+++ b/dev-java/jibx-tools/Manifest
@@ -1,4 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.1.5-build.patch 1208 RMD160 115b186e743964ef152a8ee8c423ea1978af7956 SHA1 5e048ccb49e4b682964e3e0fce7a4d1ca9e6d56c SHA256 0e2eb5609c9528fed3024d2f08e1536a4c6c80e638fd6da8a697ff98f018c869
 DIST jibx_1_1_3.zip 6565693 RMD160 469b25a488ed30b69d8b5e2260edf8e79f108dea SHA1 a851a1aeb0dc19369f55f4c21670aacb88a503a1 SHA256 c056475c9479c9fd38f123758ce731423c5aa0c0d4f0bd88ac3e2f1aafca3782
+DIST jibx_1_1_5.zip 6788994 RMD160 dc18629428de8e4c230e5f1febe106d0b8844b9d SHA1 06b727b383903aaee923287d90ad4c106e362fd2 SHA256 121dbe5b7338081ffbf09cd1175afe5e1862a63673f467d560e0ab4c27fb3f17
 EBUILD jibx-tools-1.1.3.ebuild 1274 RMD160 48df1cb656e67cecc24ab21b970f4ba73709d151 SHA1 8f9cb386dfc6cabddce8d437e70a7a45e0f9fb6d SHA256 e7b5e72df9b670e0d48f8444b24b03e86b6ebb5111be6a55b6ceccfea6df0ba1
-MISC ChangeLog 480 RMD160 c60b26fda79f3572ea1ae82d9f09f683b3bf44e2 SHA1 c9295b937e850fb8657e862720cff826c839bed2 SHA256 622d14a54fa467fd315312f89a47bacf4e628a14e33e5a464cb2ca62151461e7
+EBUILD jibx-tools-1.1.5.ebuild 1246 RMD160 b5787dac84ef446f0d8d0af404c8af833aa864c6 SHA1 ab3b204e54ff3adcc0a2cc3e9be3397429932eb2 SHA256 4bd16428754fbba9d7672c8fd1109c22b6104d0670638402a9fea349a8cc9405
+MISC ChangeLog 741 RMD160 4cde57ed532136e6941eeb8cf12fa06f36aa2d9f SHA1 dc0643da47bd87f7e8624c910a1e175a832eb202 SHA256 b3b844f090091fb1684da03e34e84ac79a36e5511b7061573a863a88286ed93e
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHvgaTcxLzpIGCsLQRAoJxAJ94zk4o2CnxoWVnii04vofjcMQrIwCfR234
+YR0OIZBLdrDPXVxN/bWlAAQ=
+=QXNz
+-----END PGP SIGNATURE-----
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/*
+}