Version Bump using ebuild by Boris Gruschke <boris@gruschke.de>. Plus various improvements. see #142455

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

4 files changed, 123 insertions, 13 deletions

diff --git a/dev-java/jaxme/ChangeLog b/dev-java/jaxme/ChangeLog
index f8f2c7664ce2..a71ae2075d71 100644
--- a/dev-java/jaxme/ChangeLog
+++ b/dev-java/jaxme/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jaxme
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/ChangeLog,v 1.27 2008/01/10 09:51:13 caster Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/ChangeLog,v 1.28 2009/05/23 00:55:55 ali_bush Exp $
+
+*jaxme-0.5.2 (23 May 2009)
+
+  23 May 2009; Alistair Bush <ali_bush@gentoo.org> +jaxme-0.5.2.ebuild,
+  +files/jaxme-0.5.2-fix_marshallers.patch:
+  Version Bump using ebuild by Boris Gruschke <boris@gruschke.de>. Plus
+  various improvements. see #142455. Dropped ia64 due to hsqldb.
 
   10 Jan 2008; Vlastimil Babka <caster@gentoo.org> jaxme-0.3.1-r4.ebuild:
   Restrict junit dep to 3.8* to prevent circular deps. Fix order of 1.5 and
diff --git a/dev-java/jaxme/Manifest b/dev-java/jaxme/Manifest
index 88ef84850869..4fe6a796a3ca 100644
--- a/dev-java/jaxme/Manifest
+++ b/dev-java/jaxme/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX jaxme-0.3.1-base64.diff 1197 RMD160 c6dab9441ee23f0d6977842379ce4801450bef21 SHA1 5e06765d5dcdc921b5d2be107c9dfe2c417c546c SHA256 47e26e354f17af945728c70ea5a5c715f7f373e46a59a0a4567f12c63127fbde
 AUX jaxme-0.3.1-gentoo.patch 1771 RMD160 2c4d51b162bb87599e7c50b28bfd99dee37e5d96 SHA1 b5bc9691a0ba611e2f46b5bf854442b016cd0e2d SHA256 833974df6973940936e74919c9629bc17138805bf4dd54d53916334bb01c91fa
+AUX jaxme-0.5.2-fix_marshallers.patch 1600 RMD160 cd4d579f4245a192226dea92e98be327df7e2558 SHA1 ae73c2fdf397d2f8c400b1e28c7dc3d8abe6c7a9 SHA256 82f1474b8416a625577fa3e171e4922c24029da7ba513ca7ac8c47df802e1a33
 DIST ws-jaxme-0.3.1-src.tar.gz 3058903 RMD160 cd994b5fd9a15473ed7390b8911601b794f76cd0 SHA1 4ba5fd76cbda407c0b32af2e3235dab66a8b0a00 SHA256 9f02b233849ec10cda455c51d5bda46929f5fcbed237c5a5a760a19eb59e852c
+DIST ws-jaxme-0.5.2-src.tar.gz 5478402 RMD160 75ed71ed02c84377a3c3a393a0a22637d01151e5 SHA1 e84103fca9dddb97f5eb2ad6549dcd77306ccd97 SHA256 0415d721259acf95c564fb84606bb17f6227c1cc444e89b78d1cd9903c1c88dc
 EBUILD jaxme-0.3.1-r4.ebuild 2370 RMD160 f216f440952e1723038ef06059674a2f93370e5a SHA1 c72383ed4d14a890459ffddaeabf4fe61c4bf2d5 SHA256 1e2912b7aaa1643fa274c89766dcd38508e3fe8fa8265f6486b1ac63b729cae5
-MISC ChangeLog 3858 RMD160 5d715040d6670ff6a648c56198e4f3a4fe1a3952 SHA1 2f67c587042f8b87679699a1b9e78976746a98bb SHA256 e13b7b27096ab40c49a3d6cb660c9147b0f705b8551fee196936ea0c5b3ab4e6
+EBUILD jaxme-0.5.2.ebuild 2202 RMD160 5d64e54b7ce1a04e5e466555a9d58f363fe9053e SHA1 eb83ca12570ff0d9f5c0dfea48099e0f47d8725d SHA256 4e24aa5c2edd28fc754f60dbddfe85e5987888a0dbd390d0c049f5ec49054919
+MISC ChangeLog 4142 RMD160 b3e968695149b133d5958ca521ae13638d06752b SHA1 c9539c5da3cb46591c06a1c6c8d51091d723f7e4 SHA256 a076ff40c3aaa46f0e0a7207cffabf70d7661f90dc30ae919a877f9653024cc0
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH1ay+cxLzpIGCsLQRAmMMAJ4z2vAv6YDxob76US5l0Ik7wGRXQQCeOqRM
-043mk3nWI9HvRRPCXdQAQG8=
-=L1JP
------END PGP SIGNATURE-----
diff --git a/dev-java/jaxme/files/jaxme-0.5.2-fix_marshallers.patch b/dev-java/jaxme/files/jaxme-0.5.2-fix_marshallers.patch
new file mode 100644
index 000000000000..e36b81c4c306
--- /dev/null
+++ b/dev-java/jaxme/files/jaxme-0.5.2-fix_marshallers.patch
@@ -0,0 +1,24 @@
+diff -ur ws-jaxme-0.5.2-old/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java ws-jaxme-0.5.2/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java
+--- ws-jaxme-0.5.2-old/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java	2005-03-10 12:14:08.000000000 +0200
++++ ws-jaxme-0.5.2/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java	2009-04-05 00:43:39.498597962 +0300
+@@ -45,7 +45,7 @@
+  * @author <a href="mailto:joe@ispsoft.de">Jochen Wiedmann</a>
+  * @version $Id: jaxme-0.5.2-fix_marshallers.patch,v 1.1 2009/05/23 00:55:54 ali_bush Exp $
+  */
+-public class JMMarshallerImpl extends JMControllerImpl implements JMMarshaller {
++public abstract class JMMarshallerImpl extends JMControllerImpl implements JMMarshaller {
+   /** Default value for {@link Marshaller#JAXB_ENCODING}.
+    * (UTF-8 encoding)
+    */
+diff -ur ws-jaxme-0.5.2-old/src/jaxme/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java ws-jaxme-0.5.2/src/jaxme/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java
+--- ws-jaxme-0.5.2-old/src/jaxme/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java	2005-03-04 12:41:53.000000000 +0200
++++ ws-jaxme-0.5.2/src/jaxme/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java	2009-04-05 00:43:53.635210800 +0300
+@@ -44,7 +44,7 @@
+ 
+ /** JaxMe's {@link javax.xml.bind.Unmarshaller} implementation.
+  */
+-public class JMUnmarshallerImpl extends JMControllerImpl implements JMUnmarshaller {
++public abstract class JMUnmarshallerImpl extends JMControllerImpl implements JMUnmarshaller {
+     private static final SAXParserFactory spf;
+     static {
+         spf = SAXParserFactory.newInstance();
diff --git a/dev-java/jaxme/jaxme-0.5.2.ebuild b/dev-java/jaxme/jaxme-0.5.2.ebuild
new file mode 100644
index 000000000000..b9c7cf204c14
--- /dev/null
+++ b/dev-java/jaxme/jaxme-0.5.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/jaxme-0.5.2.ebuild,v 1.1 2009/05/23 00:55:55 ali_bush Exp $
+
+EAPI="2"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_PN=ws-${PN}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="JaxMe 2 is an open source implementation of JAXB, the specification for Java/XML binding."
+HOMEPAGE="http://ws.apache.org/jaxme/index.html"
+SRC_URI="mirror://apache/ws/${PN}/source/${MY_P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEP="dev-java/antlr:0[java]
+	dev-db/hsqldb:0
+	>=dev-java/xerces-2.7
+	=dev-java/junit-3.8*
+	>=dev-java/log4j-1.2.8
+	dev-java/xmldb:0"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${MY_P}"
+
+# We do it later
+JAVA_PKG_BSFIX="off"
+
+java_prepare() {
+	cd "${S}/prerequisites"
+	rm *.jar
+	java-pkg_jarfrom antlr
+	java-pkg_jarfrom hsqldb hsqldb.jar hsqldb-1.7.1.jar
+	java-pkg_jarfrom junit
+	java-pkg_jarfrom log4j log4j.jar log4j-1.2.8.jar
+	java-pkg_jarfrom xerces-2
+	java-pkg_jarfrom xmldb xmldb-api.jar xmldb-api-20021118.jar
+	java-pkg_jarfrom xmldb xmldb-api-sdk.jar xmldb-api-sdk-20021118.jar
+	java-pkg_jarfrom --build-only ant-core ant.jar ant-1.5.4.jar
+	java-pkg_jarfrom --build-only ant-core ant.jar ant.jar
+
+	# Special case: jaxme uses ant/*.xml files, so rewriting them by hand
+	# is better:
+	cd "${S}"
+	for i in build.xml ant/*.xml src/webapp/web.xml src/test/jaxb/build.xml; do
+		java-ant_bsfix_one "${i}"
+	done
+
+	# Patch marshal classes to be abstract for build to succeed
+	epatch "${FILESDIR}/${P}-fix_marshallers.patch"
+}
+
+EANT_BUILD_TARGET="all"
+EANT_EXTRA_ARGS=""
+EANT_TEST_ANT_TASKS="hsqldb"
+
+src_compile() {
+	use doc && EANT_EXTRA_ARGS+="-Dbuild.apidocs=dist/doc/api"
+
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	pushd dist > /dev/null
+	for jar in *.jar; do
+		java-pkg_newjar ${jar} ${jar/-${PV}/}
+	done
+	popd > /dev/null
+
+	dodoc NOTICE || die
+
+	if use doc; then
+		java-pkg_dojavadoc dist/doc/api
+		dohtml -r src/documentation/manual
+	fi
+	use source && java-pkg_dosrc src/{pm,jaxme,js,api,webapp,xs}/*
+}