Version bump. Fixes bug #105318. Thanks to Josh Nichols <nichoj@alum.rpi.edu>. Removed the old version because the date makes it newer than 1.0.

(Portage version: 2.0.52-r1)

5 files changed, 26 insertions, 20 deletions

diff --git a/dev-java/gnu-javamail/ChangeLog b/dev-java/gnu-javamail/ChangeLog
index d335d2e906bb..0e77a707306a 100644
--- a/dev-java/gnu-javamail/ChangeLog
+++ b/dev-java/gnu-javamail/ChangeLog
@@ -1,6 +1,14 @@
 # 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.12 2005/09/17 20:37:03 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-javamail/ChangeLog,v 1.13 2005/09/17 22:05:45 betelgeuse Exp $
+
+*gnu-javamail-1.0 (17 Sep 2005)
+
+  17 Sep 2005; Petteri Räty <betelgeuse@gentoo.org>
+  +gnu-javamail-1.0.ebuild, -gnu-javamail-20040331.ebuild:
+  Version bump. Fixes bug #105318. Thanks to Josh Nichols
+  <nichoj@alum.rpi.edu>. Removed the old version because the date makes it
+  newer than 1.0.
 
   17 Sep 2005; Petteri Räty <betelgeuse@gentoo.org>
   gnu-javamail-20040331.ebuild:
diff --git a/dev-java/gnu-javamail/Manifest b/dev-java/gnu-javamail/Manifest
index b907c4a20b2a..4edd7ed24b94 100644
--- a/dev-java/gnu-javamail/Manifest
+++ b/dev-java/gnu-javamail/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 24002523916c26c31f6a288550d2a0dd gnu-javamail-20040331.ebuild 1297
+MD5 4d781aad6b44b474ee38aff617b1b7ab gnu-javamail-1.0.ebuild 1408
 MD5 fb8480dd2e84864af8f02617a3e43c1a ChangeLog 1610
 MD5 1abfa0b375cbfc010259917a4d3f57b7 metadata.xml 1094
-MD5 cb7f0ddae1ab50f81f5bbb9b6a67753d files/digest-gnu-javamail-20040331 77
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDLH6SQiJ/wx066S4RAvtWAJsHH8ye4nmdEFKB9UG7ySN+6HGIVgCfTOsL
-nKKi92UAxro7NgNre+WkeS8=
-=zc4f
------END PGP SIGNATURE-----
+MD5 805da153a00bca31f9ee2316ad37f257 files/digest-gnu-javamail-1.0 60
diff --git a/dev-java/gnu-javamail/files/digest-gnu-javamail-1.0 b/dev-java/gnu-javamail/files/digest-gnu-javamail-1.0
new file mode 100644
index 000000000000..563242194257
--- /dev/null
+++ b/dev-java/gnu-javamail/files/digest-gnu-javamail-1.0
@@ -0,0 +1 @@
+MD5 64742f096c13146ec07734a449194bd7 mail-1.0.tar.gz 707084
diff --git a/dev-java/gnu-javamail/files/digest-gnu-javamail-20040331 b/dev-java/gnu-javamail/files/digest-gnu-javamail-20040331
deleted file mode 100644
index 4fcd3de32da7..000000000000
--- a/dev-java/gnu-javamail/files/digest-gnu-javamail-20040331
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a5c3f840513db27f83a83cac4e59cd8f javamail-20040331-gentoo.tar.bz2 235390
diff --git a/dev-java/gnu-javamail/gnu-javamail-20040331.ebuild b/dev-java/gnu-javamail/gnu-javamail-1.0.ebuild
index bd0561437845..e4097d0c6c2b 100644
--- a/dev-java/gnu-javamail/gnu-javamail-20040331.ebuild
+++ b/dev-java/gnu-javamail/gnu-javamail-1.0.ebuild
@@ -1,14 +1,16 @@
 # 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.12 2005/09/17 20:37:03 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-javamail/gnu-javamail-1.0.ebuild,v 1.1 2005/09/17 22:05:45 betelgeuse Exp $
 
 inherit java-pkg
 
+MY_PN="mail"
+MY_P="${MY_PN}-${PV}"
 DESCRIPTION="GNU implementation of the Javamail API"
 HOMEPAGE="http://www.gnu.org/software/classpathx/javamail/"
-SRC_URI="http://www.gentoo.org/~karltk/java/distfiles/javamail-${PV}-gentoo.tar.bz2"
+SRC_URI="mirror://gnu/classpathx/${MY_P}.tar.gz"
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="1"
 KEYWORDS="~x86"
 IUSE="doc jikes"
 RDEPEND=">=virtual/jre-1.3
@@ -18,14 +20,17 @@ DEPEND=">=virtual/jdk-1.3
 	${RDEPEND}
 	jikes? ( >=dev-java/jikes-1.19 )"
 
-S=${WORKDIR}/javamail-${PV}
+S=${WORKDIR}/${MY_P}
 
 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	
 	# TODO: Useflag this
 	econf \
-		--with-activation-jar=/usr/share/gnu-jaf-1/lib \
-		--with-inetlib-jar=/usr/share/gnu-classpath-inetlib-1.0/lib \
+		--with-activation-jar=${activation} \
+		--with-inetlib-jar=${inetlib} \
 		--enable-smtp \
 		--enable-imap \
 		--enable-pop3 \
@@ -33,8 +38,11 @@ src_compile() {
 		--enable-mbox \
 		--enable-maildir \
 		|| die
+
 	echo "Configure finished. Compiling... Please wait."
+
 	emake || die
+
 	if use doc; then
 		emake javadoc || die
 	fi