Version bump, bug #267174. Use virtual for jaf.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 65 insertions, 45 deletions

diff --git a/dev-java/sun-javamail/ChangeLog b/dev-java/sun-javamail/ChangeLog
index 01efd539ba6c..866fe7093582 100644
--- a/dev-java/sun-javamail/ChangeLog
+++ b/dev-java/sun-javamail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/sun-javamail
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-javamail/ChangeLog,v 1.17 2008/03/11 15:16:59 ranger Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-javamail/ChangeLog,v 1.18 2009/05/07 19:29:50 caster Exp $
+
+*sun-javamail-1.4.2 (07 May 2009)
+
+  07 May 2009; Vlastimil Babka <caster@gentoo.org> -sun-javamail-1.4.ebuild,
+  +sun-javamail-1.4.2.ebuild:
+  Version bump, bug #267174. Use virtual for jaf.
 
   11 Mar 2008; Brent Baude <ranger@gentoo.org> sun-javamail-1.4.1.ebuild:
   stable ppc64, bug 212658
diff --git a/dev-java/sun-javamail/sun-javamail-1.4.2.ebuild b/dev-java/sun-javamail/sun-javamail-1.4.2.ebuild
new file mode 100644
index 000000000000..da30bd80c31e
--- /dev/null
+++ b/dev-java/sun-javamail/sun-javamail-1.4.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-javamail/sun-javamail-1.4.2.ebuild,v 1.1 2009/05/07 19:29:50 caster Exp $
+
+EAPI=2
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A Java-based framework to build multiplatform mail and messaging applications."
+HOMEPAGE="http://java.sun.com/products/javamail/index.html"
+
+# error 500 without the double slash, wonder what HTTP standard says about this
+SRC_URI="http://kenai.com/projects/javamail/downloads/download//javamail-${PV}-src.zip"
+
+# either of these
+LICENSE="CDDL GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+COMMON_DEP="java-virtuals/jaf"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+S="${WORKDIR}"
+
+# some not essential classes need 1.5 to compile
+# but 1.4 bytecode for better support
+JAVA_PKG_WANT_SOURCE="1.4"
+JAVA_PKG_WANT_TARGET="1.4"
+
+src_unpack() {
+	default
+
+	# build.xml expects it here
+	mkdir -p legal/src/main/resources/META-INF || die
+	cp mail/src/main/resources/META-INF/LICENSE.txt \
+		legal/src/main/resources/META-INF || die
+}
+
+java_prepare() {
+	java-pkg_jar-from --virtual jaf
+}
+
+EANT_DOC_TARGET="docs"
+EANT_EXTRA_ARGS="-Djavaee.jar=activation.jar -Dspec.dir=doc/spec"
+
+src_install() {
+	java-pkg_dojar target/release/mail.jar
+
+	dodoc doc/release/{CHANGES,COMPAT,NOTES,README,SSLNOTES,distributionREADME}.txt || die
+	dohtml -r doc/release/{*.html,images} || die
+
+	use doc && java-pkg_dojavadoc target/release/docs/javadocs
+	use source && java-pkg_dosrc mail/src/main/java
+}
diff --git a/dev-java/sun-javamail/sun-javamail-1.4.ebuild b/dev-java/sun-javamail/sun-javamail-1.4.ebuild
deleted file mode 100644
index 99be089efb88..000000000000
--- a/dev-java/sun-javamail/sun-javamail-1.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-javamail/sun-javamail-1.4.ebuild,v 1.13 2007/11/25 08:00:39 caster Exp $
-
-JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A Java-based framework to build multiplatform mail and messaging applications."
-HOMEPAGE="http://java.sun.com/products/javamail/index.html"
-# CVS:
-# View: https://glassfish.dev.java.net/source/browse/glassfish/mail/?only_with_tag=JAVAMAIL-1_4
-# How-To: https://glassfish.dev.java.net/servlets/ProjectSource
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-
-DEPEND=">=virtual/jdk-1.5
-	dev-java/sun-jaf"
-RDEPEND=">=virtual/jre-1.4
-	dev-java/sun-jaf"
-S="${WORKDIR}/mail"
-
-JAVA_PKG_WANT_SOURCE="1.4"
-JAVA_PKG_WANT_TARGET="1.4"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	java-pkg_jar-from sun-jaf activation.jar activation-real.jar
-	cp -L activation-real.jar activation.jar
-}
-
-src_compile() {
-	eant -Djavaee.jar=activation.jar jar $(use_doc docs)
-}
-
-src_install() {
-	java-pkg_dojar build/release/mail.jar
-	use doc && java-pkg_dojavadoc build/release/docs/javadocs
-	use source && java-pkg_dosrc src/java
-}