Restrict to either 1.6 or 1.5 as 1.7 release don't have needed com.sun.* classes...

Package-Manager: portage-2.1.4.4

diff --git a/dev-java/saaj/ChangeLog b/dev-java/saaj/ChangeLog
index a5288a38d5931934bd4167a58bdc6e12f55898e4..9c7df69e141d0814d41eaa2c1742f2c94748016f 100644 (file)
--- a/dev-java/saaj/ChangeLog
+++ b/dev-java/saaj/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/saaj
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/saaj/ChangeLog,v 1.8 2007/11/15 00:56:08 betelgeuse Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saaj/ChangeLog,v 1.9 2008/03/09 18:35:33 betelgeuse Exp $
+
+  09 Mar 2008; Petteri Räty <betelgeuse@gentoo.org> saaj-1.3.ebuild:
+  Restrict to either 1.6 or 1.5 as 1.7 release don't have needed com.sun.*
+  classes. Filed bug #212854 for com.sun usage.
 
   15 Nov 2007; Petteri Räty <betelgeuse@gentoo.org> saaj-1.3.ebuild:
   Add app-arch/unzip to DEPEND.

diff --git a/dev-java/saaj/Manifest b/dev-java/saaj/Manifest
index c84badd65488c5e815a442123f05c2ec1b46d82c..cad1b1bf6eb47ed0891d79e50403bd50e5479d45 100644 (file)
--- a/dev-java/saaj/Manifest
+++ b/dev-java/saaj/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX build.xml-1.3 442 RMD160 ca6ad741c1cf33f529f135bae63647317745f568 SHA1 813c2abd9a11af89fd519c410f5f2919aa0cc4b2 SHA256 4c92b6eaf6cb2a8bf1cf4f579536569ab37c198032369bc0eb869e4d36da3b74
 DIST saaj1.3.src.zip 262141 RMD160 87e3d28373e84b8fbd03f0467ad8a0b6e091139d SHA1 526b00954a373161eb39a6618446c56000c21b3d SHA256 51a746c08aac81c4fe39af6fcb3fd5f713159306f87f7ec84109b9d877e4fa6b
-EBUILD saaj-1.3.ebuild 1324 RMD160 a2be50a67b8d5900e1d9ff1ce4185252ed5356ac SHA1 82547a58fa05027c8f78cc150f3ed1dc1182d8f8 SHA256 5e2d02aced01f4f7ba3b5f99f291d5425025576a07e91a3b240406f71d4e1fc7
-MISC ChangeLog 1128 RMD160 9035de682b9773e8ca794ca93e09f335b3db9c33 SHA1 9a2c570a3de227938a11183188d108fd2774184c SHA256 2b070203508041065706eb252cf65312d23847667933f6596cd8ef3b543d30fe
+EBUILD saaj-1.3.ebuild 1439 RMD160 5c012c1e5d51cc2eba42a782937772095866962a SHA1 3d3df17523f36f0376a0ea8438b6ee962a0d7dcf SHA256 1a28ab7bb6d8bdfb8bab355d810cd2d0d2f215a0c089decc6478b1f4fdd97dc1
+MISC ChangeLog 1322 RMD160 5444498453ea0f74db2111553bb36f1ea3e6f743 SHA1 5eff1a1655b600c4c0b47eccaa71a4c0426a0565 SHA256 ec6c7ed6f02300c27ed5e343d679c97abfc401af31b89ee1dd4db2f646044a89
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH1C34cxLzpIGCsLQRAtWfAKCM6cKP2gWvRPY/6PDsBfCGp6SrJQCcCF6/
+k+IRsx4eoiVHeuZKIoxsAaM=
+=fheM
+-----END PGP SIGNATURE-----

diff --git a/dev-java/saaj/saaj-1.3.ebuild b/dev-java/saaj/saaj-1.3.ebuild
index 29ceff4da0ce77bc5a05bbce4888b777afb83d54..f936bf93ce2348a4e62d6a135040c5f1f59712be 100644 (file)
--- a/dev-java/saaj/saaj-1.3.ebuild
+++ b/dev-java/saaj/saaj-1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/saaj/saaj-1.3.ebuild,v 1.7 2007/11/15 00:56:08 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saaj/saaj-1.3.ebuild,v 1.8 2008/03/09 18:35:33 betelgeuse Exp $
 
 JAVA_PKG_IUSE="source"
 
@@ -19,7 +19,9 @@ COMMON_DEP="dev-java/jsr67
        dev-java/sun-jaf
        >=dev-java/xerces-2.8
        dev-java/xalan"
-DEPEND=">=virtual/jdk-1.5
+# needs com.sun.image.codec which 1.7 doesn't have
+# should fix it to not use them at all
+DEPEND="|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* )
        app-arch/unzip
        ${COMMON_DEP}"
 RDEPEND=">=virtual/jre-1.5