Added ~amd64 keyword (bug #105607). Disabled jikes support (bug #89711). Added useful messages to 'die' calls.

Package-Manager: portage-2.0.53_rc7

4 files changed, 32 insertions, 17 deletions

diff --git a/dev-java/gnu-classpath-inetlib/Manifest b/dev-java/gnu-classpath-inetlib/Manifest
index f7343d612089..0e64534e219c 100644
--- a/dev-java/gnu-classpath-inetlib/Manifest
+++ b/dev-java/gnu-classpath-inetlib/Manifest
@@ -1,4 +1,4 @@
-MD5 0082c1af3bf8dcfef6dc4b182b0a0624 ChangeLog 1567
+MD5 a01a45eb14f5cb885374b46af1ff5a71 ChangeLog 1580
 MD5 a2a578355c1f554d3ae84752aaab1c19 files/digest-gnu-classpath-inetlib-1.0-r1 63
 MD5 d8e4542d02c3180ee42b1c87c424c968 files/digest-gnu-classpath-inetlib-1.1-r1 63
 MD5 12db45f9123283dd8cd2f655b21fea20 gnu-classpath-inetlib-1.0-r1.ebuild 1647
diff --git a/dev-java/gnu-javamail/ChangeLog b/dev-java/gnu-javamail/ChangeLog
index 0e77a707306a..616102ba04b8 100644
--- a/dev-java/gnu-javamail/ChangeLog
+++ b/dev-java/gnu-javamail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/gnu-javamail
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-javamail/ChangeLog,v 1.13 2005/09/17 22:05:45 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-javamail/ChangeLog,v 1.14 2005/11/30 01:27:53 nichoj Exp $
+
+  30 Nov 2005; <nichoj@gentoo.org> gnu-javamail-1.0.ebuild:
+  Added ~amd64 keyword (bug #105607). Disabled jikes support (bug #89711).
+  Added useful messages to 'die' calls.
 
 *gnu-javamail-1.0 (17 Sep 2005)
 
diff --git a/dev-java/gnu-javamail/Manifest b/dev-java/gnu-javamail/Manifest
index 09456d928b73..e4da20555b18 100644
--- a/dev-java/gnu-javamail/Manifest
+++ b/dev-java/gnu-javamail/Manifest
@@ -1,4 +1,14 @@
-MD5 bce80dbcfca1b7b99b06dab097ba9570 ChangeLog 1907
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8be7cb27c703083a7d4e001fa0b89b1d ChangeLog 2079
 MD5 805da153a00bca31f9ee2316ad37f257 files/digest-gnu-javamail-1.0 60
-MD5 f81a377d66bcdd5ec12d02f3a3c32cc2 gnu-javamail-1.0.ebuild 1384
+MD5 a9013eda839ef724a6909a5e8df7e7e7 gnu-javamail-1.0.ebuild 1499
 MD5 1abfa0b375cbfc010259917a4d3f57b7 metadata.xml 1094
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDjQDQndWRXhKOboURAjCWAKCYdVxo2QUkzHbQdd767Hd0sONjzQCgvYLF
+k7kD5TCaTBjpbx1ibZCxL/U=
+=/QDf
+-----END PGP SIGNATURE-----
diff --git a/dev-java/gnu-javamail/gnu-javamail-1.0.ebuild b/dev-java/gnu-javamail/gnu-javamail-1.0.ebuild
index c9e6fe4e0190..d33979b478f6 100644
--- a/dev-java/gnu-javamail/gnu-javamail-1.0.ebuild
+++ b/dev-java/gnu-javamail/gnu-javamail-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-javamail/gnu-javamail-1.0.ebuild,v 1.3 2005/11/09 08:37:40 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-javamail/gnu-javamail-1.0.ebuild,v 1.4 2005/11/30 01:27:53 nichoj Exp $
 
 inherit java-pkg
 
@@ -11,24 +11,27 @@ HOMEPAGE="http://www.gnu.org/software/classpathx/javamail/"
 SRC_URI="mirror://gnu/classpathx/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~x86"
-IUSE="doc jikes"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
 RDEPEND=">=virtual/jre-1.3
 	=dev-java/gnu-jaf-1*
 	=dev-java/gnu-classpath-inetlib-1.0*"
 DEPEND=">=virtual/jdk-1.3
-	${RDEPEND}
-	jikes? ( >=dev-java/jikes-1.19 )"
+	${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
+# TODO: Re-enable jikes support (see bug #89711)
+
 src_compile() {
 	local activation=$(dirname $(java-pkg_getjar gnu-jaf-1 activation.jar))
 	local inetlib=$(dirname $(java-pkg_getjar gnu-classpath-inetlib-1.0 inetlib.jar))
 
-	# TODO: Add jikes back	
+	local my_javac="${JAVAC}"
+	# use jikes && my_javac="jikes"
+
 	# TODO: Useflag this
-	econf \
+	JAVAC="${my_javac}" econf \
 		--with-activation-jar=${activation} \
 		--with-inetlib-jar=${inetlib} \
 		--enable-smtp \
@@ -37,19 +40,17 @@ src_compile() {
 		--enable-nntp \
 		--enable-mbox \
 		--enable-maildir \
-		|| die
-
-	echo "Configure finished. Compiling... Please wait."
+		|| die "failed to configure"
 
-	emake || die
+	emake || die "failed to compile"
 
 	if use doc; then
-		emake javadoc || die
+		emake javadoc || die "failed to generate javadoc"
 	fi
 }
 
 src_install() {
-	java-pkg_dojar gnumail.jar gnumail-providers.jar || die
+	java-pkg_dojar gnumail.jar gnumail-providers.jar || die "java-pkg_dojar failed"
 	dodoc AUTHORS ChangeLog NEWS README README.*
 	use doc && java-pkg_dohtml -r docs/*
 }