Updated depenedencies, so that Java 1.6 won\'t be used at build time, because it causes build errors.

Package-Manager: portage-2.1.1_pre3-r5

3 files changed, 23 insertions, 23 deletions

diff --git a/dev-java/jaxme/ChangeLog b/dev-java/jaxme/ChangeLog
index aeba21b52d9e..249698a4af76 100644
--- a/dev-java/jaxme/ChangeLog
+++ b/dev-java/jaxme/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jaxme
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/ChangeLog,v 1.10 2006/07/28 11:12:20 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/ChangeLog,v 1.11 2006/08/07 00:11:55 nichoj Exp $
+
+  07 Aug 2006; Joshua Nichols <nichoj@gentoo.org> jaxme-0.3.1-r2.ebuild:
+  Updated depenedencies, so that Java 1.6 won't be used at build time, because
+  it causes build errors.
 
 *jaxme-0.3.1-r2 (28 Jul 2006)
 
diff --git a/dev-java/jaxme/Manifest b/dev-java/jaxme/Manifest
index c3bfcfaa1be3..f329ae35c602 100644
--- a/dev-java/jaxme/Manifest
+++ b/dev-java/jaxme/Manifest
@@ -1,23 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX jaxme-0.3.1-gentoo.patch 1771 RMD160 2c4d51b162bb87599e7c50b28bfd99dee37e5d96 SHA1 b5bc9691a0ba611e2f46b5bf854442b016cd0e2d SHA256 833974df6973940936e74919c9629bc17138805bf4dd54d53916334bb01c91fa
 MD5 8039a2f19bcc273d417ec48d00bbe87a files/jaxme-0.3.1-gentoo.patch 1771
 RMD160 2c4d51b162bb87599e7c50b28bfd99dee37e5d96 files/jaxme-0.3.1-gentoo.patch 1771
 SHA256 833974df6973940936e74919c9629bc17138805bf4dd54d53916334bb01c91fa files/jaxme-0.3.1-gentoo.patch 1771
 DIST ws-jaxme-0.3.1-src.tar.gz 3058903 RMD160 cd994b5fd9a15473ed7390b8911601b794f76cd0 SHA1 4ba5fd76cbda407c0b32af2e3235dab66a8b0a00 SHA256 9f02b233849ec10cda455c51d5bda46929f5fcbed237c5a5a760a19eb59e852c
-EBUILD jaxme-0.3.1-r2.ebuild 1838 RMD160 0982013280e433225c7203d5c479934e01e3e46e SHA1 b851eb06b5928d54d274cfe7aed6af5ab9264d88 SHA256 b685847362ba0d856f41e755d52ed4408a9f6dfc8c1c2aee53d9d5f35b726a17
-MD5 a2be028a32a719f3ce3782ac37c63e26 jaxme-0.3.1-r2.ebuild 1838
-RMD160 0982013280e433225c7203d5c479934e01e3e46e jaxme-0.3.1-r2.ebuild 1838
-SHA256 b685847362ba0d856f41e755d52ed4408a9f6dfc8c1c2aee53d9d5f35b726a17 jaxme-0.3.1-r2.ebuild 1838
+EBUILD jaxme-0.3.1-r2.ebuild 1944 RMD160 3a69ac0314bc219154c4111ffec424f05e8d5735 SHA1 3657a92ab83391113c546e64c84d069a228c284d SHA256 b015277a70c5ea7196e7270ca7f34b0ae330c3320d9c99b3d1000fb6624e1496
+MD5 29553389df295edda4186b5b5929e1ae jaxme-0.3.1-r2.ebuild 1944
+RMD160 3a69ac0314bc219154c4111ffec424f05e8d5735 jaxme-0.3.1-r2.ebuild 1944
+SHA256 b015277a70c5ea7196e7270ca7f34b0ae330c3320d9c99b3d1000fb6624e1496 jaxme-0.3.1-r2.ebuild 1944
 EBUILD jaxme-0.3.1.ebuild 1634 RMD160 a8c5130d275fc4345f73f5f7a7789561ff5d9acb SHA1 0e037a3253b304c6dec03b93ad9d0d1565a7fd5e SHA256 3d889735b474f7d07a1b5f0495ef12fdcdc924c4856c08a3211de587fd08dff4
 MD5 dd79eeaa71196821af81c46194d397bf jaxme-0.3.1.ebuild 1634
 RMD160 a8c5130d275fc4345f73f5f7a7789561ff5d9acb jaxme-0.3.1.ebuild 1634
 SHA256 3d889735b474f7d07a1b5f0495ef12fdcdc924c4856c08a3211de587fd08dff4 jaxme-0.3.1.ebuild 1634
-MISC ChangeLog 1449 RMD160 576376f653aecdcaf28c9bd07f2730c63e7d5d5e SHA1 0cc09fd57253767ec641ace4a4ea38b9aa4f88a2 SHA256 37ae184ae5944d5c4ca8245bffaac1466f68235ff9712b6d59a364b94bc2cdae
-MD5 221013d29142a819285403deef56a4e5 ChangeLog 1449
-RMD160 576376f653aecdcaf28c9bd07f2730c63e7d5d5e ChangeLog 1449
-SHA256 37ae184ae5944d5c4ca8245bffaac1466f68235ff9712b6d59a364b94bc2cdae ChangeLog 1449
+MISC ChangeLog 1626 RMD160 b8b0ba0813345f7b7b11a707c7ffbf2b3ea520ce SHA1 43373aaf819dfb5b388623044f37501b75f1c2a0 SHA256 364b5f98cc75b7c24787a53f5b18c935d9e10481d52bf8f2737e8c7829da0fbe
+MD5 7db7f3e148d58e2dac9c98a466660486 ChangeLog 1626
+RMD160 b8b0ba0813345f7b7b11a707c7ffbf2b3ea520ce ChangeLog 1626
+SHA256 364b5f98cc75b7c24787a53f5b18c935d9e10481d52bf8f2737e8c7829da0fbe ChangeLog 1626
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -28,10 +25,3 @@ SHA256 0f7eb759824895c7f8af0a9f3e9f270b9849fb68689cc8f0b3eda15670eb8a5b files/di
 MD5 180aace1ee8992c766d8f39693fd74e1 files/digest-jaxme-0.3.1-r2 259
 RMD160 e549ab8391bb8016eec864b90f26967e95affc95 files/digest-jaxme-0.3.1-r2 259
 SHA256 0f7eb759824895c7f8af0a9f3e9f270b9849fb68689cc8f0b3eda15670eb8a5b files/digest-jaxme-0.3.1-r2 259
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEyfErgo/w9rxVVVERAhGmAJ92mAIBsTGmRQ3/q2UYWQGwwWPuCQCgnpy1
-8vBIZ6C5viVfm5sLtcMGSMc=
-=tDUY
------END PGP SIGNATURE-----
diff --git a/dev-java/jaxme/jaxme-0.3.1-r2.ebuild b/dev-java/jaxme/jaxme-0.3.1-r2.ebuild
index 6423202996dc..9c5aa5e49461 100644
--- a/dev-java/jaxme/jaxme-0.3.1-r2.ebuild
+++ b/dev-java/jaxme/jaxme-0.3.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/jaxme-0.3.1-r2.ebuild,v 1.1 2006/07/28 11:12:20 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/jaxme-0.3.1-r2.ebuild,v 1.2 2006/08/07 00:11:55 nichoj Exp $
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -15,15 +15,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc source"
 
-RDEPEND=">=virtual/jre-1.4
+COMMON_DEP="
 	dev-db/hsqldb
 	>=dev-java/xerces-2.6
 	dev-java/junit
 	>=dev-java/log4j-1.2.8
 	dev-java/xmldb"
-DEPEND=">=virtual/jdk-1.4
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+# FIXME doesn't like to compile with Java 1.6
+DEPEND="|| (
+		=virtual/jdk-1.4*
+		=virtual/jdk-1.5*
+	)
 	dev-java/ant-core
-	${RDEPEND}"
+	${COMMON_DEP}"
 
 S="${WORKDIR}/${MY_P}"