Beginning with this revision mx4j is a metapackage pulling in dev-java/mx4j-core and dev-java/mx4j-tools. This was done to reduce dependencies in packages that only require the core. See bug #152924 for further details. Thanks to Alex Tarkovsky <alextarkovsky@gmail.com> for the initial work.

Package-Manager: portage-2.1.2_rc2-r3

5 files changed, 154 insertions, 10 deletions

diff --git a/dev-java/mx4j/ChangeLog b/dev-java/mx4j/ChangeLog
index 883b4070cb68..f2015d199a71 100644
--- a/dev-java/mx4j/ChangeLog
+++ b/dev-java/mx4j/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-java/mx4j
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v 1.13 2006/11/28 04:29:32 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v 1.14 2006/12/07 14:50:27 betelgeuse Exp $
+
+*mx4j-3.0.1-r2 (07 Dec 2006)
+
+  07 Dec 2006; Petteri Räty <betelgeuse@gentoo.org> metadata.xml,
+  +mx4j-3.0.1-r2.ebuild:
+  Beginning with this revision mx4j is a metapackage pulling in
+  dev-java/mx4j-core and dev-java/mx4j-tools. This was done to reduce
+  dependencies in packages that only require the core. See bug #152924 for
+  further details. Thanks to Alex Tarkovsky <alextarkovsky@gmail.com> for the
+  initial work.
 
   28 Nov 2006; Joshua Nichols <nichoj@gentoo.org> -mx4j-3.0.1.ebuild:
   Dropped earlier revision with equivalent keywords.
diff --git a/dev-java/mx4j/Manifest b/dev-java/mx4j/Manifest
index 5ea54abad2b7..05079d3be905 100644
--- a/dev-java/mx4j/Manifest
+++ b/dev-java/mx4j/Manifest
@@ -1,16 +1,34 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST mx4j-3.0.1-src.tar.gz 622504 RMD160 fbbc976aebbe7af024992f15be7feb364d6d2b15 SHA1 e35d4935c0b780cb51760cc30322bf576523e319 SHA256 f6cef53b68b06d97041f77b69e091eb76f08d1bd0d92f48c9bea958e8cb5dcba
+DIST mx4j-3.0.1.tar.gz 4562130 RMD160 918808d122fba60388d5b344edffad3756b50936 SHA1 49094816e404f531c2442ea91a2167e5a9f38239 SHA256 bcb066f5b2323c66b80e80e641685e3adbd4a2d4c654f31c4a49b32b8290e006
 EBUILD mx4j-3.0.1-r1.ebuild 1784 RMD160 516450efb08352c4fce290ec01fe49dd15b486e9 SHA1 fe357037da6a7e346e8880b3b7f3290c6a1c9c37 SHA256 5dd88a5cc8f7361c74acde8849904027bd8e056f003501cf9ed93a0a2c600165
 MD5 fea7b625b578d99085e1032900a40c31 mx4j-3.0.1-r1.ebuild 1784
 RMD160 516450efb08352c4fce290ec01fe49dd15b486e9 mx4j-3.0.1-r1.ebuild 1784
 SHA256 5dd88a5cc8f7361c74acde8849904027bd8e056f003501cf9ed93a0a2c600165 mx4j-3.0.1-r1.ebuild 1784
-MISC ChangeLog 1870 RMD160 40a172cb01035160f4749176e69bdda92c4cd250 SHA1 a55685f347c36251d5f69287db6e4662adf1ee63 SHA256 4cd72b6e3f49638d09c177966534c13302f21c57ae1c6d95c70b134ba31eac6b
-MD5 21a3c061f6dc873cc6b0de00a2dbcd4a ChangeLog 1870
-RMD160 40a172cb01035160f4749176e69bdda92c4cd250 ChangeLog 1870
-SHA256 4cd72b6e3f49638d09c177966534c13302f21c57ae1c6d95c70b134ba31eac6b ChangeLog 1870
-MISC metadata.xml 756 RMD160 fc8a38a7f1afd54eb4c4761da3958eccca1ce56a SHA1 77c6dba4518af5234b3f9009774df80a8b4df0ce SHA256 0408b9087d726ef932597f150e1de741419993f0804c821b545c1097c8dec4e2
-MD5 7973f86372fa9120f93c1c7f5caeb4bf metadata.xml 756
-RMD160 fc8a38a7f1afd54eb4c4761da3958eccca1ce56a metadata.xml 756
-SHA256 0408b9087d726ef932597f150e1de741419993f0804c821b545c1097c8dec4e2 metadata.xml 756
+EBUILD mx4j-3.0.1-r2.ebuild 2525 RMD160 f2094e10d72905daa41839fe6b188cd29685e692 SHA1 8aa752c168d527bbe97be1cd58b71dd5f7e45705 SHA256 1f62b5f118c847b4564b482ec01b0b6fcaa168f982e93cbf8c93d07fdad6db61
+MD5 8952b1c563587078e44badb34275d4e9 mx4j-3.0.1-r2.ebuild 2525
+RMD160 f2094e10d72905daa41839fe6b188cd29685e692 mx4j-3.0.1-r2.ebuild 2525
+SHA256 1f62b5f118c847b4564b482ec01b0b6fcaa168f982e93cbf8c93d07fdad6db61 mx4j-3.0.1-r2.ebuild 2525
+MISC ChangeLog 2300 RMD160 b3c0a177f7ee1c46e9a7ead0810c81ca7810219e SHA1 fe7e911b5a36213dd1ef546a8b85ffd0fd6bce8e SHA256 517296dce533c607066591bee6edd7d2d89576c5d240093ae049f7eb174a8f29
+MD5 5654148669fb83fdf95d4addd33d8570 ChangeLog 2300
+RMD160 b3c0a177f7ee1c46e9a7ead0810c81ca7810219e ChangeLog 2300
+SHA256 517296dce533c607066591bee6edd7d2d89576c5d240093ae049f7eb174a8f29 ChangeLog 2300
+MISC metadata.xml 960 RMD160 f01dfdf3b03a84656f0c17ee634381d01e6288f9 SHA1 0c20fd32321a719a2c1e1047bbad403c0c6158da SHA256 a7c53c20547646cf8ee55f8c64935ed669eddfcc8dd3e54da66afecf21b4d2da
+MD5 3ef22a0f5aafa3b6494e26b3639eece2 metadata.xml 960
+RMD160 f01dfdf3b03a84656f0c17ee634381d01e6288f9 metadata.xml 960
+SHA256 a7c53c20547646cf8ee55f8c64935ed669eddfcc8dd3e54da66afecf21b4d2da metadata.xml 960
 MD5 cc7604d7334a2b7d2171c2baacada25e files/digest-mx4j-3.0.1-r1 244
 RMD160 cd1c3fabbf60acb0b8a1830788962bf9b65ceff3 files/digest-mx4j-3.0.1-r1 244
 SHA256 d5e8a1a30175e8368ff175e886ae1a8227b7a5be0438286e4145459fc620bf71 files/digest-mx4j-3.0.1-r1 244
+MD5 ebe9005d4a0d8f793d9d2724877d98dc files/digest-mx4j-3.0.1-r2 479
+RMD160 1dc5a0ca676e90267f10855335a3259c3dee9957 files/digest-mx4j-3.0.1-r2 479
+SHA256 11aec312a732c1d7aa13be693a289989c049d67d31019fdb1f7c99d651e465e4 files/digest-mx4j-3.0.1-r2 479
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFeCo+cxLzpIGCsLQRAhtZAKCNMEYrZBWo3bpZXpRvO6zD74U7RwCeMjzs
+1+p7rpwoqL9h/kq4rmgcL0Q=
+=opHB
+-----END PGP SIGNATURE-----
diff --git a/dev-java/mx4j/files/digest-mx4j-3.0.1-r2 b/dev-java/mx4j/files/digest-mx4j-3.0.1-r2
new file mode 100644
index 000000000000..94f7328bcac4
--- /dev/null
+++ b/dev-java/mx4j/files/digest-mx4j-3.0.1-r2
@@ -0,0 +1,6 @@
+MD5 eb5c08c4281aeb94c08ead7091b23dde mx4j-3.0.1-src.tar.gz 622504
+RMD160 fbbc976aebbe7af024992f15be7feb364d6d2b15 mx4j-3.0.1-src.tar.gz 622504
+SHA256 f6cef53b68b06d97041f77b69e091eb76f08d1bd0d92f48c9bea958e8cb5dcba mx4j-3.0.1-src.tar.gz 622504
+MD5 3f0089c7f305a7715a6481aca66c4e0c mx4j-3.0.1.tar.gz 4562130
+RMD160 918808d122fba60388d5b344edffad3756b50936 mx4j-3.0.1.tar.gz 4562130
+SHA256 bcb066f5b2323c66b80e80e641685e3adbd4a2d4c654f31c4a49b32b8290e006 mx4j-3.0.1.tar.gz 4562130
diff --git a/dev-java/mx4j/metadata.xml b/dev-java/mx4j/metadata.xml
index a3589cacc8e5..1ebf8a80b9b2 100644
--- a/dev-java/mx4j/metadata.xml
+++ b/dev-java/mx4j/metadata.xml
@@ -5,6 +5,10 @@
 <longdescription>
 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.
 
-JMX is an optional package for J2SE that provides a standard way to manage applications. It can also be used to wrap legacy systems and provide a standard interface to the outside world, enabling the development of web services. JMX allows developers to write more modular and loosely coupled system components and reduce the complexity of large, interoperating systems. 
+JMX is an optional package for J2SE that provides a standard way to manage applications. It can also be used to wrap legacy systems and provide a standard interface to the outside world, enabling the development of web services. JMX allows developers to write more modular and loosely coupled system components and reduce the complexity of large, interoperating systems.
+
+Beginning with 3.0.1-r2 mx4j was split into three packages dev-java/mxj4-core,
+dev-java/mxj4-tools and dev-java/mx4j. This was done in order to reduce
+dependencies in packages that only require the core.
 </longdescription>
 </pkgmetadata>
diff --git a/dev-java/mx4j/mx4j-3.0.1-r2.ebuild b/dev-java/mx4j/mx4j-3.0.1-r2.ebuild
new file mode 100644
index 000000000000..8800db3bd8a8
--- /dev/null
+++ b/dev-java/mx4j/mx4j-3.0.1-r2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/mx4j-3.0.1-r2.ebuild,v 1.1 2006/12/07 14:50:27 betelgeuse Exp $
+
+JAVA_PKG_OPT_USE="examples"
+
+inherit java-pkg-opt-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="~x86"
+
+IUSE="doc examples source"
+
+COMMON_DEP="
+	examples? (
+		dev-java/bcel
+		dev-java/log4j
+		dev-java/commons-logging
+		=www-servers/axis-1*
+		~dev-java/servletapi-2.3
+		=dev-java/burlap-3.0*
+		=dev-java/hessian-3.0.8*
+		dev-java/jython
+		=dev-java/gnu-jaf-1*
+		=dev-java/gnu-javamail-1*
+	)"
+
+
+RDEPEND="
+	=dev-java/mx4j-core-3.0*
+	=dev-java/mx4j-tools-3.0*
+	${COMMON_DEP}
+	examples? ( >=virtual/jre-1.4 )"
+
+# We always depend on a jdk to get the package.env created
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+
+src_unpack() {
+	unpack "${P}-src.tar.gz"
+
+	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 servletapi-2.3 servlet.jar
+		java-pkg_jar-from burlap-3.0
+		java-pkg_jar-from hessian-3.0.8
+		java-pkg_jar-from jython jython.jar
+		java-pkg_jar-from gnu-jaf-1 activation.jar
+		java-pkg_jar-from gnu-javamail-1 gnumail.jar 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 examples/mx4j
+
+	if use doc; then
+		local docdir="${WORKDIR}/binary/${P}/docs/"
+		java-pkg_dojavadoc "${docdir}/api"
+		java-pkg_dohtml -r "${docdir}/images"
+		java-pkg_dohtml "${docdir}"/{*.html,*.css}
+	fi
+
+	# Recording jars to get the same behaviour as before
+	oldifs="${IFS}"
+	IFS=":"
+	java-pkg_getjars mx4j-core-3.0,mx4j-tools-3.0
+	for jar in $(java-pkg_getjars mx4j-core-3.0,mx4j-tools-3.0); do
+		java-pkg_regjar "${jar}"
+	done
+	IFS="${oldifs}"
+}
+
+pkg_postinst() {
+	elog "Although this package can be used directly with java-config,"
+	elog "ebuild developers should use mx4j-core and mx4j-tools directly."
+}