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

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 68 insertions, 48 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/Manifest b/dev-java/sun-javamail/Manifest
index ff6d48db9631..34c49c7485dd 100644
--- a/dev-java/sun-javamail/Manifest
+++ b/dev-java/sun-javamail/Manifest
@@ -1,6 +1,6 @@
+DIST javamail-1.4.2-src.zip 1108483 RMD160 9f21027faefc8ae7465f9ff6ef08f8d67ae82af4 SHA1 102842e39d35012fecc2ee986dc9ae6c42e6b9bf SHA256 3abda1db9d8cbeaaf73776c9bb82366b703c754a24e2f97d3828ddf9fd611927
 DIST sun-javamail-1.4.1.tar.bz2 395502 RMD160 8eb08845d2027eb10d732de8720a12f0c9e6d69e SHA1 f9cde1685d85c30c8566c9cc76804a577cdb8d42 SHA256 9e3830e59773c45ee9594fc38541eeca7a509fe6271dbb988f7e288f265fe70d
-DIST sun-javamail-1.4.tar.bz2 288541 RMD160 ea5a49c37314d13fd3975f66c7ad6f52e88bd00d SHA1 2aa4e91a0e82c2e2a709e1a73b30ad9b25f7e3bf SHA256 7c45efe65123f439a7d88e478c9fa8f3475c455aab9e7f1466b207d1e9bbbaee
 EBUILD sun-javamail-1.4.1.ebuild 1485 RMD160 ca3271c538a4b233b4e0710ed5a3354540db8f01 SHA1 85d624b2c25e3755b5273cd80941d54945fca185 SHA256 6af352100f6bc5bdca2c23cc6dd5b32f20e760621944e5ae09e74bd65af3e64c
-EBUILD sun-javamail-1.4.ebuild 1260 RMD160 c4a37ea33377ba666ac9f7abe4a5d093703fff19 SHA1 3bf154c0a49c779687d90750989d42d6a039f8c5 SHA256 cdf7e7b9a806e2ffd6b32485ec6083a95421c6e771724b413e13fc28991136b1
-MISC ChangeLog 2212 RMD160 cde54ea412d6b0eb5414e3a2a15105e120a46977 SHA1 3b9a8e6efa900a6aec16afa8f26c2d2d1667da21 SHA256 18be64299b1548ef07fc1f07dbd7fb9fb231f741ed37be427cffffb312286dba
+EBUILD sun-javamail-1.4.2.ebuild 1645 RMD160 8562781c163bd7f30a547495f14b9fbe5bd9f1b2 SHA1 a47bed28aa29d4c71a74115a1ab98fad1fff0891 SHA256 b8d9d94d9078e0731b01728c0a76f75c0ec3416648d5d0ab9864c0edf1c1ca04
+MISC ChangeLog 2405 RMD160 768148a630adbe4ced24b60a80fd3156e0d38ff2 SHA1 881b7370c9938cb87b849e49521bfab7503baee2 SHA256 af0dae5124f9b4cbc8c8398ee483d1b4cfe70afb3083fa26435a51e705bc1cb5
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
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
-}