Adjusted ebuild because gnu-classpath-inetlib is now slotted.

Package-Manager: portage-2.0.52-r1

3 files changed, 18 insertions, 13 deletions

diff --git a/dev-java/gnu-javamail/ChangeLog b/dev-java/gnu-javamail/ChangeLog
index 4b15871b96f5..b3197e973773 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.10 2005/01/09 12:13:16 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-javamail/ChangeLog,v 1.11 2005/09/11 15:41:22 betelgeuse Exp $
+
+  11 Sep 2005; Petteri Räty <betelgeuse@gentoo.org>
+  gnu-javamail-20040331.ebuild:
+  Adjusted ebuild because gnu-classpath-inetlib is now slotted.
 
   09 Jan 2005; Sven Wegener <swegener@gentoo.org>
   gnu-javamail-20040331.ebuild:
diff --git a/dev-java/gnu-javamail/Manifest b/dev-java/gnu-javamail/Manifest
index b8bce1dfff60..d7db7401d722 100644
--- a/dev-java/gnu-javamail/Manifest
+++ b/dev-java/gnu-javamail/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 bee8dad5bb9a72a1db7de42f5c20bd6f gnu-javamail-20040331.ebuild 1245
-MD5 711faad46cc016a86365261635f33518 ChangeLog 1299
+MD5 3a0380e2492eaeb805391c9f6cfb14be gnu-javamail-20040331.ebuild 1302
+MD5 fdc0fd68883a48a31b4d2de4cc67153c ChangeLog 1451
 MD5 1abfa0b375cbfc010259917a4d3f57b7 metadata.xml 1094
 MD5 cb7f0ddae1ab50f81f5bbb9b6a67753d files/digest-gnu-javamail-20040331 77
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC27av/rLF9B432nYRAoc+AJsFcsZi3QpUCOXOlIod9SlfGOF85ACfYjxE
-qTcEliykY0hgGyaU4w9wGVo=
-=d7UG
+iD8DBQFDJFBAQiJ/wx066S4RAjVLAJwMcDK+kIKVmg7a4WVZp4auruAoyACeJrxj
+1yj02TjReAU8pp030oAF4H8=
+=2tY7
 -----END PGP SIGNATURE-----
diff --git a/dev-java/gnu-javamail/gnu-javamail-20040331.ebuild b/dev-java/gnu-javamail/gnu-javamail-20040331.ebuild
index 9e6df416016e..ebe8a1838fa4 100644
--- a/dev-java/gnu-javamail/gnu-javamail-20040331.ebuild
+++ b/dev-java/gnu-javamail/gnu-javamail-20040331.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-20040331.ebuild,v 1.10 2005/07/18 14:03:02 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-javamail/gnu-javamail-20040331.ebuild,v 1.11 2005/09/11 15:41:22 betelgeuse Exp $
 
 inherit java-pkg
 
@@ -9,11 +9,11 @@ HOMEPAGE="http://www.gnu.org/software/classpathx/javamail/"
 SRC_URI="http://www.gentoo.org/~karltk/java/distfiles/javamail-${PV}-gentoo.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86"
 IUSE="doc jikes"
 RDEPEND=">=virtual/jre-1.3
 	dev-java/gnu-activation
-	>=dev-java/gnu-classpath-inetlib-1.0"
+	=dev-java/gnu-classpath-inetlib-1.0*"
 DEPEND=">=virtual/jdk-1.3
 	${RDEPEND}
 	jikes? ( >=dev-java/jikes-1.19 )"
@@ -25,7 +25,7 @@ src_compile() {
 	# TODO: Useflag this
 	econf \
 		--with-activation-jar=/usr/share/gnu-activation/lib \
-		--with-inetlib-jar=/usr/share/gnu-classpath-inetlib/lib \
+		--with-inetlib-jar=/usr/share/gnu-classpath-inetlib-1.0/lib \
 		--enable-smtp \
 		--enable-imap \
 		--enable-pop3 \
@@ -33,14 +33,15 @@ src_compile() {
 		--enable-mbox \
 		--enable-maildir \
 		|| die
+	einfo "Configure finished. Compiling... Please wait."
 	emake || die
 	if use doc; then
-		emake javadoc
+		emake javadoc || die
 	fi
 }
 
 src_install() {
 	java-pkg_dojar gnumail.jar gnumail-providers.jar || die
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README README.*
+	dodoc AUTHORS ChangeLog INSTALL NEWS README README.*
 	use doc && java-pkg_dohtml -r docs/*
 }