diff options
author | Krzysztof Pawlik <nelchael@gentoo.org> | 2008-06-17 14:05:27 +0000 |
---|---|---|
committer | Krzysztof Pawlik <nelchael@gentoo.org> | 2008-06-17 14:05:27 +0000 |
commit | 82e69113dc2f38ee14902654469af073b0da55b5 (patch) | |
tree | ba9734de0f8ae5598ad0a3bdd8f3c1f7fef8566f /dev-java | |
parent | Version bump. (diff) | |
download | gentoo-2-82e69113dc2f38ee14902654469af073b0da55b5.tar.gz gentoo-2-82e69113dc2f38ee14902654469af073b0da55b5.tar.bz2 gentoo-2-82e69113dc2f38ee14902654469af073b0da55b5.zip |
Version bump.
(Portage version: 2.1.5.5)
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/mx4j/ChangeLog | 8 | ||||
-rw-r--r-- | dev-java/mx4j/files/mx4j-3.0.2-new-hessian.patch | 37 | ||||
-rw-r--r-- | dev-java/mx4j/mx4j-3.0.2.ebuild | 105 |
3 files changed, 149 insertions, 1 deletions
diff --git a/dev-java/mx4j/ChangeLog b/dev-java/mx4j/ChangeLog index 91bdfbec7d75..330fd0a35c5f 100644 --- a/dev-java/mx4j/ChangeLog +++ b/dev-java/mx4j/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/mx4j # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v 1.26 2008/05/03 02:46:33 ken69267 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v 1.27 2008/06/17 14:05:26 nelchael Exp $ + +*mx4j-3.0.2 (17 Jun 2008) + + 17 Jun 2008; Krzysiek Pawlik <nelchael@gentoo.org> + +files/mx4j-3.0.2-new-hessian.patch, +mx4j-3.0.2.ebuild: + Version bump. 03 May 2008; Kenneth Prugh <ken69267@gentoo.org> mx4j-3.0.1-r4.ebuild: amd64 stable, bug #217725 diff --git a/dev-java/mx4j/files/mx4j-3.0.2-new-hessian.patch b/dev-java/mx4j/files/mx4j-3.0.2-new-hessian.patch new file mode 100644 index 000000000000..8bc827b29b22 --- /dev/null +++ b/dev-java/mx4j/files/mx4j-3.0.2-new-hessian.patch @@ -0,0 +1,37 @@ +diff -Nru mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java +--- mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java 2008-06-17 15:32:02.000000000 +0200 ++++ mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java 2008-06-17 15:51:14.000000000 +0200 +@@ -12,13 +12,13 @@ + import java.io.IOException; + import java.io.ObjectInputStream; + ++import com.caucho.hessian.io.AbstractDeserializer; + import com.caucho.hessian.io.AbstractHessianInput; +-import com.caucho.hessian.io.Deserializer; + + /** + * @version $ + */ +-class JMXDeserializer extends Deserializer ++class JMXDeserializer extends AbstractDeserializer + { + private Class type; + +diff -Nru mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java +--- mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java 2008-06-17 15:32:02.000000000 +0200 ++++ mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java 2008-06-17 15:51:14.000000000 +0200 +@@ -13,12 +13,12 @@ + import java.io.ObjectOutputStream; + + import com.caucho.hessian.io.AbstractHessianOutput; +-import com.caucho.hessian.io.Serializer; ++import com.caucho.hessian.io.AbstractSerializer; + + /** + * @version $Revision: 1.1 $ + */ +-class JMXSerializer extends Serializer ++class JMXSerializer extends AbstractSerializer + { + public void writeObject(Object obj, AbstractHessianOutput out) throws IOException + { diff --git a/dev-java/mx4j/mx4j-3.0.2.ebuild b/dev-java/mx4j/mx4j-3.0.2.ebuild new file mode 100644 index 000000000000..fa85177a8abc --- /dev/null +++ b/dev-java/mx4j/mx4j-3.0.2.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/mx4j-3.0.2.ebuild,v 1.1 2008/06/17 14:05:26 nelchael Exp $ + +EAPI=1 +JAVA_PKG_IUSE="examples source doc" + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="Metapackage for mx4j" +HOMEPAGE="http://mx4j.sourceforge.net/" + +SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz + doc? ( mirror://sourceforge/${PN}/${P}.tar.gz )" + +LICENSE="GPL-2" +SLOT="3.0" + +KEYWORDS="~amd64 ~x86" + +IUSE="" + +COMMON_DEP=" + examples? ( + dev-java/bcel + dev-java/log4j + dev-java/commons-logging + www-servers/axis:1 + java-virtuals/servlet-api:2.3 + dev-java/hessian:3.0 + dev-java/jython + dev-java/gnu-jaf:1 + java-virtuals/javamail + ) + dev-java/mx4j-core:3.0 + dev-java/mx4j-tools:3.0 + !<dev-java/mx4j-tools-3.0.1-r1 + " + +RDEPEND=" + ${COMMON_DEP} + examples? ( >=virtual/jre-1.5 )" + +# We always depend on a jdk to get the package.env created +DEPEND=">=virtual/jdk-1.5 + ${COMMON_DEP}" + +src_unpack() { + unpack "${P}-src.tar.gz" + + epatch "${FILESDIR}/${P}-new-hessian.patch" + + if use doc; then + mkdir binary && cd binary + unpack "${P}.tar.gz" + fi + + if use examples; then + cd "${S}/lib" + java-pkg_jar-from bcel bcel.jar + java-pkg_jar-from log4j + java-pkg_jar-from commons-logging commons-logging.jar + java-pkg_jar-from axis-1 + java-pkg_jar-from --virtual servlet-api-2.3 servlet.jar + java-pkg_jar-from hessian-3.0 + java-pkg_jar-from jython jython.jar + java-pkg_jar-from gnu-jaf-1 activation.jar + java-pkg_jar-from --virtual javamail mail.jar + fi +} + +src_compile() { + cd build + use examples && eant compile.examples +} + +src_install() { + dodoc README.txt RELEASE-NOTES-* || die + + if use examples ; then + java-pkg_dojar dist/examples/mx4j-examples.jar + dodir /usr/share/doc/${PF}/examples + cp -r src/examples/mx4j/examples/* "${D}usr/share/doc/${PF}/examples" + fi + + use source && java-pkg_dosrc src/examples/mx4j + + if use doc; then + local docdir="${WORKDIR}/binary/${P}/docs/" + java-pkg_dojavadoc "${docdir}/api" + dohtml -r "${docdir}/images" + dohtml "${docdir}"/{*.html,*.css} + fi + + # Recording jars to get the same behaviour as before + local jars="$(java-pkg_getjars mx4j-core-3.0,mx4j-tools-3.0)" + for jar in ${jars//:/ }; do + java-pkg_regjar "${jar}" + done +} + +pkg_postinst() { + elog "Although this package can be used directly with java-config," + elog "ebuild developers should use mx4j-core and mx4j-tools directly." +} |