From: Petteri Räty Date: Tue, 16 Jan 2007 17:28:02 +0000 (+0000) Subject: Added patch to compile with jdks from 1.4 to 1.6. Thanks to Martin Jansa . Fixes bug #137968. Package-Manager: portage-2.1.2 --- diff --git a/dev-java/burlap/ChangeLog b/dev-java/burlap/ChangeLog index b60ae7d8e294..51f5c295556a 100644 --- a/dev-java/burlap/ChangeLog +++ b/dev-java/burlap/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/burlap -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/burlap/ChangeLog,v 1.10 2006/12/05 01:51:51 caster Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/burlap/ChangeLog,v 1.11 2007/01/16 17:28:02 betelgeuse Exp $ + +*burlap-3.0.8-r2 (16 Jan 2007) + + 16 Jan 2007; Petteri Räty + +files/3.0.8-java5.patch, +burlap-3.0.8-r2.ebuild: + Added patch to compile with jdks from 1.4 to 1.6. Thanks to Martin Jansa + . Fixes bug #137968. 05 Dec 2006; Vlastimil Babka burlap-3.0.8-r1.ebuild: Fix building due to stray space. diff --git a/dev-java/burlap/Manifest b/dev-java/burlap/Manifest index 83ca58ba7693..704eabef4b37 100644 --- a/dev-java/burlap/Manifest +++ b/dev-java/burlap/Manifest @@ -1,3 +1,10 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX 3.0.8-java5.patch 1688 RMD160 23aa2a17bc0ba205164868414674cf51856f386e SHA1 5b6d4bf21faa94d75f486606bc8fdb199fcdc5ad SHA256 c819931278fd56083ec0a53e256d5879b48f780ee29327720254ce51a28efce7 +MD5 ba81184fc8a9d87c7986c3141d7258ea files/3.0.8-java5.patch 1688 +RMD160 23aa2a17bc0ba205164868414674cf51856f386e files/3.0.8-java5.patch 1688 +SHA256 c819931278fd56083ec0a53e256d5879b48f780ee29327720254ce51a28efce7 files/3.0.8-java5.patch 1688 AUX build-2.1.12.xml 1546 RMD160 ebd507967b0bb2fabe2aac044ef60e3785189654 SHA1 68699e0269a51d6f4eba82e5b15bd485974d8084 SHA256 db486d24f063b5ec263d6da56b52dd2a7cae686cb9c347fb9702cc0d3dda7868 MD5 c089b7d34f96c556a34bb8c402794023 files/build-2.1.12.xml 1546 RMD160 ebd507967b0bb2fabe2aac044ef60e3785189654 files/build-2.1.12.xml 1546 @@ -12,10 +19,14 @@ EBUILD burlap-3.0.8-r1.ebuild 1094 RMD160 666edf6845284b66930edd0df02ba00b31531a MD5 b3564d42a276105c97ca124e26ccb941 burlap-3.0.8-r1.ebuild 1094 RMD160 666edf6845284b66930edd0df02ba00b31531adc burlap-3.0.8-r1.ebuild 1094 SHA256 276af82babaa4e47756bf6052094c5682e42b507f7d4bf877efda7944d261de8 burlap-3.0.8-r1.ebuild 1094 -MISC ChangeLog 1649 RMD160 576efa927b4248bc5bfdf0cbdfa4ac376822a7fa SHA1 efe5ee6142a0a99b3a8a1ea1af534ab349f18544 SHA256 386bfa7e57c7a15041d4ad0581beeaafa6cc99ea9be6cd84040f38a04bce64cb -MD5 812f101b5d18cbb93835c6ba38e348c9 ChangeLog 1649 -RMD160 576efa927b4248bc5bfdf0cbdfa4ac376822a7fa ChangeLog 1649 -SHA256 386bfa7e57c7a15041d4ad0581beeaafa6cc99ea9be6cd84040f38a04bce64cb ChangeLog 1649 +EBUILD burlap-3.0.8-r2.ebuild 1123 RMD160 de01535ea766c1f32058d4bd420d30b7afcb7a5c SHA1 1a0e5d8881322fd1512868320d2974c0248f647b SHA256 1b76b0a3952818d4bae3eaf5565d75eea462dde65b7eddeadabca12fc70f5fd6 +MD5 181335839a9c084a654c481ce70a6dae burlap-3.0.8-r2.ebuild 1123 +RMD160 de01535ea766c1f32058d4bd420d30b7afcb7a5c burlap-3.0.8-r2.ebuild 1123 +SHA256 1b76b0a3952818d4bae3eaf5565d75eea462dde65b7eddeadabca12fc70f5fd6 burlap-3.0.8-r2.ebuild 1123 +MISC ChangeLog 1915 RMD160 c4dcb960d895c8ae954f30dcb44a63559df7920c SHA1 06c6a16b524a3553c8327751707651ef6928c699 SHA256 4e09ddf84ac5c0f9064d8eac359df9d3825e81d8dca92b6acc23516dd859b25b +MD5 13e70600e2318b1dc10f2df121b25d0c ChangeLog 1915 +RMD160 c4dcb960d895c8ae954f30dcb44a63559df7920c ChangeLog 1915 +SHA256 4e09ddf84ac5c0f9064d8eac359df9d3825e81d8dca92b6acc23516dd859b25b ChangeLog 1915 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157 @@ -26,3 +37,13 @@ SHA256 91e067d6409e8fdc88b322db86b505a098ab7b8b4c7599cc6d1000f041456bf8 files/di MD5 2646f266a6969067807691b08fc0c21e files/digest-burlap-3.0.8-r1 238 RMD160 f9543fea374912773220e97a9d70e2c5411f2e2f files/digest-burlap-3.0.8-r1 238 SHA256 3815c8129b243ad751a29ea6c2bf9b78a2fbe980e1bc16bff5ad54321d121da6 files/digest-burlap-3.0.8-r1 238 +MD5 2646f266a6969067807691b08fc0c21e files/digest-burlap-3.0.8-r2 238 +RMD160 f9543fea374912773220e97a9d70e2c5411f2e2f files/digest-burlap-3.0.8-r2 238 +SHA256 3815c8129b243ad751a29ea6c2bf9b78a2fbe980e1bc16bff5ad54321d121da6 files/digest-burlap-3.0.8-r2 238 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQFFrQsscxLzpIGCsLQRAjJiAJ4gFFEHmLU9Hq2Q+TavB0bpBPQtzgCfTz87 +hE2+XIJM2HzgBdxRZ+O0jJY= +=ekmJ +-----END PGP SIGNATURE----- diff --git a/dev-java/burlap/burlap-3.0.8-r2.ebuild b/dev-java/burlap/burlap-3.0.8-r2.ebuild new file mode 100644 index 000000000000..2782dccf71b6 --- /dev/null +++ b/dev-java/burlap/burlap-3.0.8-r2.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/burlap/burlap-3.0.8-r2.ebuild,v 1.1 2007/01/16 17:28:02 betelgeuse Exp $ + +inherit base java-pkg-2 java-ant-2 + +DESCRIPTION="The Burlap web service protocol makes web services usable without requiring a large framework, and without learning yet another alphabet soup of protocols." +HOMEPAGE="http://www.caucho.com/burlap/" +SRC_URI="mirror://gentoo/${P}.tar.bz2" + +LICENSE="Apache-1.1" +SLOT="3.0" +KEYWORDS="~amd64 ~x86" + +IUSE="doc source" + +COMMON_DEP=" + =dev-java/servletapi-2.3* + =dev-java/hessian-3* + ~dev-java/caucho-services-${PV}" +RDEPEND=">=virtual/jre-1.4 + ${COMMON_DEP}" + +DEPEND=">=virtual/jdk-1.4 + app-arch/unzip + dev-java/ant-core + source? ( app-arch/zip ) + ${COMMON_DEP}" + +PATCHES="${FILESDIR}/3.0.8-java5.patch" + +src_compile() { + eant jar $(use_doc) -Dclasspath=$(java-pkg_getjars servletapi-2.3,hessian-3.0.8,caucho-services-3.0) +} + +src_install() { + java-pkg_dojar dist/${PN}.jar + + use doc && java-pkg_dojavadoc dist/doc/api + use source && java-pkg_dosrc src/* +} diff --git a/dev-java/burlap/files/3.0.8-java5.patch b/dev-java/burlap/files/3.0.8-java5.patch new file mode 100644 index 000000000000..02fe38f096b8 --- /dev/null +++ b/dev-java/burlap/files/3.0.8-java5.patch @@ -0,0 +1,28 @@ +diff -uNr burlap-3.0.8.orig/src/com/caucho/burlap/client/BurlapProxyFactory.java burlap-3.0.8/src/com/caucho/burlap/client/BurlapProxyFactory.java +--- burlap-3.0.8.orig/src/com/caucho/burlap/client/BurlapProxyFactory.java 2006-08-15 10:47:30.000000000 +0200 ++++ burlap-3.0.8/src/com/caucho/burlap/client/BurlapProxyFactory.java 2006-08-15 10:48:19.000000000 +0200 +@@ -202,7 +202,7 @@ + { + BurlapProxy handler = new BurlapProxy(this, new URL(url)); + +- return Proxy.newProxyInstance(api.getClassLoader(), ++ return java.lang.reflect.Proxy.newProxyInstance(api.getClassLoader(), + new Class[] { api, + BurlapRemoteObject.class }, + handler); +diff -uNr burlap-3.0.8.orig/src/com/caucho/burlap/client/BurlapProxy.java burlap-3.0.8/src/com/caucho/burlap/client/BurlapProxy.java +--- burlap-3.0.8.orig/src/com/caucho/burlap/client/BurlapProxy.java 2006-08-15 10:47:30.000000000 +0200 ++++ burlap-3.0.8/src/com/caucho/burlap/client/BurlapProxy.java 2006-08-15 10:48:08.000000000 +0200 +@@ -94,10 +94,10 @@ + if (methodName.equals("equals") && + params.length == 1 && params[0].equals(Object.class)) { + Object value = args[0]; +- if (value == null || ! Proxy.isProxyClass(value.getClass())) ++ if (value == null || ! java.lang.reflect.Proxy.isProxyClass(value.getClass())) + return new Boolean(false); + +- BurlapProxy handler = (BurlapProxy) Proxy.getInvocationHandler(value); ++ BurlapProxy handler = (BurlapProxy) java.lang.reflect.Proxy.getInvocationHandler(value); + + return new Boolean(_url.equals(handler.getURL())); + } diff --git a/dev-java/burlap/files/digest-burlap-3.0.8-r2 b/dev-java/burlap/files/digest-burlap-3.0.8-r2 new file mode 100644 index 000000000000..836a14e6e1d4 --- /dev/null +++ b/dev-java/burlap/files/digest-burlap-3.0.8-r2 @@ -0,0 +1,3 @@ +MD5 14004ea790142d7ea07c8bf07973cca5 burlap-3.0.8.tar.bz2 19835 +RMD160 5b1120aacd8cc5bc3a335d71bafcb34c003d5003 burlap-3.0.8.tar.bz2 19835 +SHA256 4cdb276c9c2a33379a7cd3dfe41abde503b6745bdd47e4d08c91b2ae382ebca1 burlap-3.0.8.tar.bz2 19835