revbump mx4j to support java-virtuals/javamail

Package-Manager: portage-2.1.3.15

4 files changed, 127 insertions, 5 deletions

diff --git a/dev-java/mx4j/ChangeLog b/dev-java/mx4j/ChangeLog
index 4a56a960a1be..af634fd6c87f 100644
--- a/dev-java/mx4j/ChangeLog
+++ b/dev-java/mx4j/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/mx4j
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v 1.20 2007/04/26 23:21:30 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v 1.21 2007/10/20 07:07:29 ali_bush Exp $
+
+*mx4j-3.0.1-r3 (20 Oct 2007)
+
+  20 Oct 2007; <alistair@gentoo.org> +mx4j-3.0.1-r3.ebuild:
+  RevBumping mx4j to support java-virtuals/javamail
 
   26 Apr 2007; Vlastimil Babka <caster@gentoo.org> mx4j-3.0.1-r2.ebuild:
   Fix dependencies and recording of jars.
diff --git a/dev-java/mx4j/Manifest b/dev-java/mx4j/Manifest
index 99c892174b42..0793de9863c4 100644
--- a/dev-java/mx4j/Manifest
+++ b/dev-java/mx4j/Manifest
@@ -4,10 +4,14 @@ EBUILD mx4j-3.0.1-r2.ebuild 2468 RMD160 045ab922698d2add9682e0824b9ab53ec9693a54
 MD5 82bdaecf79afef68901ecf8e6163672b mx4j-3.0.1-r2.ebuild 2468
 RMD160 045ab922698d2add9682e0824b9ab53ec9693a54 mx4j-3.0.1-r2.ebuild 2468
 SHA256 c230605ca63648110073a8fd1e0e3ff6201459367ed5bf2b07ab9d70feba31ed mx4j-3.0.1-r2.ebuild 2468
-MISC ChangeLog 2982 RMD160 87109c7ca8c37c7f76c9ca0caf55917657e50764 SHA1 885c5e43df9a99acfbd05eb6e5197dcd63a93721 SHA256 6c224ca68a170bfe2e57075753a331b01d93058c85f5bee7cd0a5578e12dc360
-MD5 7f024286c33417a7a5ce8a63ce855992 ChangeLog 2982
-RMD160 87109c7ca8c37c7f76c9ca0caf55917657e50764 ChangeLog 2982
-SHA256 6c224ca68a170bfe2e57075753a331b01d93058c85f5bee7cd0a5578e12dc360 ChangeLog 2982
+EBUILD mx4j-3.0.1-r3.ebuild 2455 RMD160 bedd91b6ac5d5d0a590a00f6e70180e418f96c7d SHA1 3af218ae0e25df1b8e0412e9f9b858983ffdf12f SHA256 a79d3ce4cd6517d9049c0b43fe9b2ed9b091c5a25e804f587198116a8db63d7e
+MD5 71c02c3500b53f0589e477fea3dccd88 mx4j-3.0.1-r3.ebuild 2455
+RMD160 bedd91b6ac5d5d0a590a00f6e70180e418f96c7d mx4j-3.0.1-r3.ebuild 2455
+SHA256 a79d3ce4cd6517d9049c0b43fe9b2ed9b091c5a25e804f587198116a8db63d7e mx4j-3.0.1-r3.ebuild 2455
+MISC ChangeLog 3127 RMD160 3512e68242d273d08db94072638cbb5b66767395 SHA1 4c4356ac0eaf8b5623214ff3b97225d53f718abe SHA256 05561bb2db96fdbe13b598b5980eb0c0e135206e80cefe2ec921c3ffadb3970f
+MD5 71e279b9199113abee74a045e3c97d36 ChangeLog 3127
+RMD160 3512e68242d273d08db94072638cbb5b66767395 ChangeLog 3127
+SHA256 05561bb2db96fdbe13b598b5980eb0c0e135206e80cefe2ec921c3ffadb3970f ChangeLog 3127
 MISC metadata.xml 960 RMD160 f01dfdf3b03a84656f0c17ee634381d01e6288f9 SHA1 0c20fd32321a719a2c1e1047bbad403c0c6158da SHA256 a7c53c20547646cf8ee55f8c64935ed669eddfcc8dd3e54da66afecf21b4d2da
 MD5 3ef22a0f5aafa3b6494e26b3639eece2 metadata.xml 960
 RMD160 f01dfdf3b03a84656f0c17ee634381d01e6288f9 metadata.xml 960
@@ -15,3 +19,6 @@ SHA256 a7c53c20547646cf8ee55f8c64935ed669eddfcc8dd3e54da66afecf21b4d2da metadata
 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
+MD5 ebe9005d4a0d8f793d9d2724877d98dc files/digest-mx4j-3.0.1-r3 479
+RMD160 1dc5a0ca676e90267f10855335a3259c3dee9957 files/digest-mx4j-3.0.1-r3 479
+SHA256 11aec312a732c1d7aa13be693a289989c049d67d31019fdb1f7c99d651e465e4 files/digest-mx4j-3.0.1-r3 479
diff --git a/dev-java/mx4j/files/digest-mx4j-3.0.1-r3 b/dev-java/mx4j/files/digest-mx4j-3.0.1-r3
new file mode 100644
index 000000000000..94f7328bcac4
--- /dev/null
+++ b/dev-java/mx4j/files/digest-mx4j-3.0.1-r3
@@ -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/mx4j-3.0.1-r3.ebuild b/dev-java/mx4j/mx4j-3.0.1-r3.ebuild
new file mode 100644
index 000000000000..e6fd3f75a089
--- /dev/null
+++ b/dev-java/mx4j/mx4j-3.0.1-r3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2007 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-r3.ebuild,v 1.1 2007/10/20 07:07:29 ali_bush Exp $
+
+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"
+
+IUSE=""
+
+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*
+		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.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 --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."
+}