New revision with fixed dependencies. Fixes bug #95830.

(Portage version: 2.0.53_rc6)

4 files changed, 110 insertions, 15 deletions

diff --git a/dev-java/mx4j/ChangeLog b/dev-java/mx4j/ChangeLog
index a40fac3fd963..9b6799ed20fc 100644
--- a/dev-java/mx4j/ChangeLog
+++ b/dev-java/mx4j/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/mx4j
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v 1.3 2005/05/19 13:36:42 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v 1.4 2005/10/24 19:49:11 betelgeuse Exp $
+
+*mx4j-2.1.0-r1 (24 Oct 2005)
+
+  24 Oct 2005; Petteri Räty <betelgeuse@gentoo.org> +mx4j-2.1.0-r1.ebuild:
+  New revision with fixed dependencies. Fixes bug #95830.
 
   19 May 2005; Jan Brinkmann <luckyduck@gentoo.org> mx4j-2.1.0.ebuild:
   stable on amd64 and x86
diff --git a/dev-java/mx4j/Manifest b/dev-java/mx4j/Manifest
index bcd1be232486..979b9d759094 100644
--- a/dev-java/mx4j/Manifest
+++ b/dev-java/mx4j/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 577e162070ac052548f55d3370d5106c mx4j-2.1.0.ebuild 1984
-MD5 e3cc9e5976952688b1ad3cea4da48449 ChangeLog 594
-MD5 7973f86372fa9120f93c1c7f5caeb4bf metadata.xml 756
-MD5 be55fe365b4d3539f734ecfb88cf1738 files/mx4j-2.1.0-gentoo.patch 4583
+MD5 1d62c9ca1e21300b22ddafa416ebf268 ChangeLog 759
 MD5 16c385c3352e0ef59ed72e8942600d95 files/digest-mx4j-2.1.0 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC1Otd/rLF9B432nYRAv8FAKCRK6Hrg2xkgHKmsCYnL9WqYX3uJACeNjB4
-9nV0qchwG47+HHwBuZE7zwQ=
-=F7B6
------END PGP SIGNATURE-----
+MD5 16c385c3352e0ef59ed72e8942600d95 files/digest-mx4j-2.1.0-r1 66
+MD5 be55fe365b4d3539f734ecfb88cf1738 files/mx4j-2.1.0-gentoo.patch 4583
+MD5 7973f86372fa9120f93c1c7f5caeb4bf metadata.xml 756
+MD5 9b3a40ca07b41769071830311c6770bf mx4j-2.1.0-r1.ebuild 2692
+MD5 577e162070ac052548f55d3370d5106c mx4j-2.1.0.ebuild 1984
diff --git a/dev-java/mx4j/files/digest-mx4j-2.1.0-r1 b/dev-java/mx4j/files/digest-mx4j-2.1.0-r1
new file mode 100644
index 000000000000..d8fc5435f17c
--- /dev/null
+++ b/dev-java/mx4j/files/digest-mx4j-2.1.0-r1
@@ -0,0 +1 @@
+MD5 e5b0a056d25cee4bb7708a97715336b4 mx4j-2.1.0-src.tar.gz 675671
diff --git a/dev-java/mx4j/mx4j-2.1.0-r1.ebuild b/dev-java/mx4j/mx4j-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..dbac0367cc61
--- /dev/null
+++ b/dev-java/mx4j/mx4j-2.1.0-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/mx4j-2.1.0-r1.ebuild,v 1.1 2005/10/24 19:49:11 betelgeuse Exp $
+
+inherit eutils java-pkg
+
+DESCRIPTION="MX4J is a project to build an Open Source implementation of the Java(TM) Management Extensions (JMX) and of the JMX Remote API (JSR 160) specifications, and to build tools relating to JMX."
+HOMEPAGE="http://mx4j.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+
+# The ${S}/BUILD-HOWTO is a good source for dependencies
+# This package could also be built with 1.3 after the virtual
+# handling for java-config goes official
+
+# javamail and jython support is optional but because ant-core puts it in the classpath
+# if it is installed we can't force disable it without modifying the build.xml
+# and jikes refuses to compile mx4j with javamail support disabled
+
+# Optional jetty support can be enabled after jetty uses java-pkg_dojar to install jars
+
+RDEPEND=">=virtual/jre-1.4
+	=www-servers/axis-1*
+	=dev-java/bcel-5.1*
+	~dev-java/burlap-3.0.8
+	>=dev-java/commons-logging-1.0.4
+	~dev-java/hessian-3.0.8
+	dev-java/log4j
+	=dev-java/servletapi-2.3*
+	>=dev-java/sun-jaf-bin-1.0.2
+	>=dev-java/sun-javamail-bin-1.3.1
+	>=dev-java/jython-2.1"
+
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	>=dev-java/ant-core-1.6
+	jikes? ( >=dev-java/jikes-1.21 )
+	source? ( app-arch/zip )"
+
+LICENSE="mx4j"
+SLOT="2.1"
+KEYWORDS="~x86"
+
+IUSE="doc examples jikes source"
+
+src_unpack(){
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch
+
+	cd ${S}/lib
+
+#	use jetty && java-pkg_jar-from jetty
+
+	# for jmx
+	java-pkg_jar-from bcel
+	java-pkg_jar-from commons-logging
+	java-pkg_jar-from log4j
+
+	# for tools
+	java-pkg_jar-from axis-1
+	java-pkg_jar-from burlap-3.0
+	java-pkg_jar-from hessian-3.0.8
+	java-pkg_jar-from servletapi-2.3
+
+	# optionals (tools)
+	java-pkg_jar-from jython
+	java-pkg_jar-from sun-jaf-bin
+	java-pkg_jar-from sun-javamail-bin mail.jar
+}
+
+src_compile() {
+	cd build/
+
+	# The jsr160 and tools compilation could probably
+	# be made optional by use flags.
+	local antflags="compile.jmx compile.rjmx compile.tools"
+	use doc && antflags="${antflags} javadocs"
+	use examples && antflags="${antflags} compile.examples"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant ${antflags} || die "ant failed"
+}
+
+src_install() {
+	java-pkg_dojar dist/lib/*.jar
+	java-pkg_dowar dist/lib/*.war
+
+	dodoc README
+
+	use doc && java-pkg_dohtml -r dist/docs/api/*
+	use source && java-pkg_dosrc ${S}/src/core/*
+
+	if use examples; then
+		dodir /usr/share/doc/${PF}/examples
+		cp -r src/examples/mx4j/examples/* ${D}usr/share/doc/${PF}/examples
+	fi
+}