EAPI 5 bump. Update dependencies. Fix bug 551988.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.14/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x93491BB8

3 files changed, 122 insertions, 19 deletions

diff --git a/dev-java/mx4j/ChangeLog b/dev-java/mx4j/ChangeLog
index 3f07765b6ea5..2a92ee31a68d 100644
--- a/dev-java/mx4j/ChangeLog
+++ b/dev-java/mx4j/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/mx4j
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v 1.31 2015/06/09 13:55:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v 1.32 2015/06/13 18:26:12 monsieurp Exp $
+
+*mx4j-3.0.2-r1 (13 Jun 2015)
+
+  13 Jun 2015; Patrice Clement <monsieurp@gentoo.org> +mx4j-3.0.2-r1.ebuild:
+  EAPI 5 bump. Update dependencies. Fix bug 551988.
 
   09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Updating remote-id in metadata.xml
diff --git a/dev-java/mx4j/Manifest b/dev-java/mx4j/Manifest
index 92a71c685c9a..60f8de3bc003 100644
--- a/dev-java/mx4j/Manifest
+++ b/dev-java/mx4j/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX mx4j-3.0.2-new-hessian.patch 1666 SHA256 831bbce4b2ecddd0d1a6f24181fb993dddfb601d559a99227b9cb8f925f227bf SHA512 fcf4388cffcab4ad3efcba64cca9508ef7cd41ae5352df0b9898191988dd38f83ebdc9d475c1404bbccdfdae8223e012ac219aecb748fa472453b629e1043638 WHIRLPOOL fe0d0f715c29146c46ff9a81c8d981c72e7191a91dc09d71a4ca07fe5082d498d72102277a7f8cc55722d313cacfa9aa6b87bc64beb5dc2e0f679b61378bfaae
 DIST mx4j-3.0.1-src.tar.gz 622504 SHA256 f6cef53b68b06d97041f77b69e091eb76f08d1bd0d92f48c9bea958e8cb5dcba SHA512 7e37b49f7b25475a8926caa74b3f2d252f106374db26063d4f9c72f2e7a32e9c90256ee763e8791ce6a1981cacf8d1848cf616c7771c734c3e05494681663465 WHIRLPOOL 333cadbdc1d166202960d9da1978ccb2c6620d86e3b5aec40101139295160615bd32a5ada4c9346513361b41b026913b5d328aad15dc2bdc858587e920521c47
@@ -7,25 +7,18 @@ DIST mx4j-3.0.1.tar.gz 4562130 SHA256 bcb066f5b2323c66b80e80e641685e3adbd4a2d4c6
 DIST mx4j-3.0.2-src.tar.gz 618163 SHA256 bb552a8512567c4ab508a04c5931bff0d859dce36b44bdc4213c6433f02cb266 SHA512 24014ff723b0880ca5f94b28d3c698659aa04258853e259b7b4025decbf27f0022cbe9da1101b8e2d4e5fb950bfabd9556a402a9b99e6122d0fca324e479ebf8 WHIRLPOOL 31c45b785fef2596bcdd39f0c8507db8ea315de97cd78e34ae3e473b71e644d91554c6601ddcc283a325c36a2215680b8138ab89f3bd817961119edf2c935f05
 DIST mx4j-3.0.2.tar.gz 4555894 SHA256 282bd68e517aba3d0f5bbf76f90c3c09e446c529e7796467ab7de65398bb1115 SHA512 a4b8b62530ce41a0e3170a0c31dbaf5251096b98e50f73eeebd725f29e5b7e920d8c7f03d486d72c7643e9ce069a86a048c080f019fd0053dce5e6774809a26f WHIRLPOOL 775f2b51664e3d05687b1e3fbb7b538e45e2918b8a079d2048a75a1f5aca1c323a2d0c1e8847ca94649973fc7e6f9bb324d44f76acb551fe1270138ae126ebbb
 EBUILD mx4j-3.0.1-r4.ebuild 2475 SHA256 de24692a9d4d241ded1de72c5b04f746a01065343116a547e44ef3147057b2c4 SHA512 be0b826a44078d35d1b653b76f86d724e8dd15d632b98944d8b4d123c6606df5e280e7803036522c385c3e780f4fe277d6738ca914fd36b8635c34185f0d0c30 WHIRLPOOL 117304656cce0f3757e6049685cf2bbdc7ae4660953d3fc93667547f7adac57a4a8a2c598969bafea9a21a4077ec4b3e9fa301c45b69b3c3f127ed5ba23e0275
+EBUILD mx4j-3.0.2-r1.ebuild 2460 SHA256 72b76e546cf11c55604cf3356a9a67e05aa54af05a016853268125cdcc59666c SHA512 fcb5d908b703721d462f691aed4551f1274b2ef4871888186b05fab1f9d461b0576a5d02e76a42f19dce8999e4597cfc9fc10d8835537312469a965a45da4c12 WHIRLPOOL 5dedc4517f41e9a3dab4721e67349f92143158160f9025c17b1ac593fd34314f5756054a4563cf0ec694553832a342dc371dbb5c0f077722f57268d187d8dce5
 EBUILD mx4j-3.0.2.ebuild 2439 SHA256 ef84e799cf87e1db2b246a1713e8d44fcdd46ee287cf7ac2133b9dee60a359a6 SHA512 5f1fda3c5d0844a19f579c605ba971fa91f4cf5d500b2fdd46b9601dff3fd67ccb95d26fd8cb8952faf0025dff39d30e2f3366ad9fe8e60de91020be1c5f9c4f WHIRLPOOL 02979d60247d1f60ad498bfddf0667e46f123ec39f35745e7403c73f6ab595decb33c5a2b20c393ede9673bb417b3b859f13d9fd22401a0a301f3007691551d3
-MISC ChangeLog 4516 SHA256 40630b34a038d2ae7febbb5e6699d56fc24bbc975da1acdf85e9475c86d11a2a SHA512 099e73ac633308b3654ca3751c2f74dd933ee0110ea4046e3a0d40489d9fe8afba708207419a1e6ac3e70a26b7a76071ae815b0c2b79af45631e38150103aba9 WHIRLPOOL df5ac4ad7298d6e85eec783a6f8b5d2ffd2aea46f9d5aeabfbe1b7ef8ad358ef4d771a448a504c5434afab7985f4e8b5aa0e185f8bf1ac998df64ceeda832c8e
+MISC ChangeLog 4681 SHA256 e670995738b104b51013484b5fdd727e3c3e600fd9526087cfde80726a146afa SHA512 6e7aa15bb1ff52391e570365d00c5ed37064637e4a0f88c233ce1435e4906c12748a9458f692eab8a664f37fb1210831bcb6967b8cc6d776caa0189594502af0 WHIRLPOOL 51ee29eb8be857032921bcc8c3c8181f812e2ee59efd88e71febd9b7a1573d318a3b2a5d65a553d0baab7b88a019e61de8e359cab798bca10d90de5d7a2cc156
 MISC metadata.xml 1036 SHA256 bf9b1e290c948f7313b125822caa76a2f54b047f42b003ef411c9b637981571d SHA512 b3ea0c2e04113816a29f4a44fb9858dd3627bcb6dd6485e94df0c12fe43db0774c0f04c1c73da25e0a3ccf76a1edc6aba19c821a1646de3f9a228b64b0e0c8c7 WHIRLPOOL 93582b99b79316ed5a436b23454685d17949389223db1325a69ca035057046c128b2c91496e0a7a59106da280584556deac232ac3c44591535bbe7d8ac3822aa
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdvBeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiwsMP/2pY/liuJyza3IbR65OeWoyQ
-MaaeTDnDwaqynLBh5zkQARwGpQtK51zr+3Kj8p/AvZ1jJ/JloC5SJ6DhTk28p2o4
-un0eF10irXpVuh/C4XSbGakftMAUBlYmnEXLTSNBD85RRKqogniAIHiezWjlXWgj
-A0dq0ueRAX8Avvf4KLhujXj8h227BbWWpD6CzHXMHWVzkMbCg5l7mJ62whXi3lbw
-kow5x/45xNEYMq9BRFImw6EXKs3jVspJ2Oa92L908pc6eIJtyuI4PxqTEm2vmxI1
-6vqN4BKy/9evDIobQRKsl+rfApgdVNSJPm5tbOjpvU8wURFu8i/0K6wzeSGFhkke
-lr3uUBeRO4e+dINOhemspp3LRI4/anRStNqhp8C7Rbsr/O9l1mPjNagCBJR+9Kvi
-G04Bo843YHEZm59TgZk3eUXYAfchSqnmemh5wCmE+DqpVbzPbNZXBobptq5iTc6X
-+BwVctgvLgzyP0Xy2bDvU/Vtq++NnMrs1UsQhB47y0YHwOfZwkS1kOxuip/ht4ur
-QhZaK2jJb68+FymToJRZIXCKu+lo4OMKzP/ab4PpP3atMWiQr/7d0ZqPDEKk5TdR
-4iUDtNnZz0pXFU/SnD2y58gQ7bIP9rOvCa/c+3B45q54jqfjwE9Ar/St/tsLmyS0
-w88Jyq7OHBzN7CrezMYo
-=Xddr
+iQEcBAEBCAAGBQJVfHU8AAoJEJGRpfGTSRu4sm4IAJ7ZAFtMaK6NUWzER2px3j6q
+MO998oMs3lKOF4G+2CSmZ+lnMnMVJKM+BzqRmmqArvBJ0aBjMj1QX6wdV6AvEKmE
+UyhkB+lA87kIYlWbaZ5K2rmUBTlt5I6/aMk5+KeJwVxaqFt+PJzXYM+FZjmJJRoi
+SF6ceb7B1zGRUlTGoxFdfvUdPTz1qmeLUULYdyFJdZcyaRJeWHh5vtxmugPihXJT
+ZRUFWHKkh34OoZmSWXBy6oWAyNc0TzY6iwFzm2GJtEScZEyzzMpcbJNgEzczPger
+bzMcIZDaHi93CWbrWHT5i/h4UNYGk4+pauK1glC9spKtFlO28mqPQlChzSAGzf8=
+=7Rc0
 -----END PGP SIGNATURE-----
diff --git a/dev-java/mx4j/mx4j-3.0.2-r1.ebuild b/dev-java/mx4j/mx4j-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..ec49ab726716
--- /dev/null
+++ b/dev-java/mx4j/mx4j-3.0.2-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 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-r1.ebuild,v 1.1 2015/06/13 18:26:12 monsieurp Exp $
+
+EAPI=5
+
+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=""
+
+CDEPEND="examples? (
+		dev-java/bcel:0
+		dev-java/log4j:0
+		dev-java/commons-logging:0
+		www-servers/axis:1
+		java-virtuals/servlet-api:3.0
+		dev-java/hessian:4.0
+		dev-java/jython:2.7
+		dev-java/gnu-jaf:1
+		java-virtuals/javamail:0
+	)
+	dev-java/mx4j-core:3.0
+	dev-java/mx4j-tools:3.0
+	!<dev-java/mx4j-tools-3.0.1-r1
+	"
+
+RDEPEND="
+	${CDEPEND}
+	examples? ( >=virtual/jre-1.6 )"
+
+# We always depend on a jdk to get the package.env created
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+src_prepare() {
+	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 hessian-4.0
+		java-pkg_jar-from jython-2.7 jython.jar
+		java-pkg_jar-from gnu-jaf-1 activation.jar
+		java-pkg_jar-from --virtual javamail mail.jar
+		java-pkg_jar-from --virtual servlet-api-3.0 servlet-api.jar
+	fi
+}
+
+src_compile() {
+	cd build
+	if use examples; then
+		eant compile.examples
+	fi
+}
+
+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}/${P}/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."
+}