Restrict jdk in DEPEND to 1.4 only for added abstract API in 1.5+, reported by opfer in bug #189277.

Package-Manager: portage-2.1.3.5

3 files changed, 16 insertions, 22 deletions

diff --git a/dev-db/octopus/ChangeLog b/dev-db/octopus/ChangeLog
index 51da731f6290..840c2af9b15b 100644
--- a/dev-db/octopus/ChangeLog
+++ b/dev-db/octopus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/octopus
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/ChangeLog,v 1.10 2007/07/12 22:25:17 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/ChangeLog,v 1.11 2007/08/20 16:19:10 caster Exp $
+
+  20 Aug 2007; Vlastimil Babka <caster@gentoo.org> octopus-3.0.1-r1.ebuild:
+  Restrict jdk in DEPEND to 1.4 only for added abstract API in 1.5+, reported
+  by opfer in bug #189277.
 
   12 Jul 2007; Petteri Räty <betelgeuse@gentoo.org> -octopus-3.0.1.ebuild:
   Remove generation 1 ebuild.
diff --git a/dev-db/octopus/Manifest b/dev-db/octopus/Manifest
index 59358bd994f5..9348127eaefe 100644
--- a/dev-db/octopus/Manifest
+++ b/dev-db/octopus/Manifest
@@ -1,20 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX octopus-3.0.1-gentoo-build.xml 15173 RMD160 f41c4f0f35c6ba82a7bffbabc3bc92ea287bbfd2 SHA1 d445125369890ea3a7f7b35938a1674f8540785d SHA256 9e4ee3eee4b814e041dd2ded687c3d4aa556357ccf66047c3f66b1627ea10a4b
 MD5 24925210eca628235c1f8a498f261dc2 files/octopus-3.0.1-gentoo-build.xml 15173
 RMD160 f41c4f0f35c6ba82a7bffbabc3bc92ea287bbfd2 files/octopus-3.0.1-gentoo-build.xml 15173
 SHA256 9e4ee3eee4b814e041dd2ded687c3d4aa556357ccf66047c3f66b1627ea10a4b files/octopus-3.0.1-gentoo-build.xml 15173
 DIST octopus-3.0-1.src.tar.gz 25968343 RMD160 cb55e7fb574f522c4396bc83905dca9d8e94b983 SHA1 403f96abcab23429ddb6f4d8709326f73521e263 SHA256 9f37514f0540c64aba2163b4c4faa5d5327db6c7f1946fcbe7dc0a36a2097cac
 DIST octopus-xmls-3.0.1.tar.bz2 22492 RMD160 c99466a70cf1d7ab17a69c606fad49fc3bdf8279 SHA1 1e829160ed7f0137f8d59d007a98ec2816d80cb7 SHA256 e92e32cfca1955e7de2cd6a02bdd9bf279b2cf9471bd0ba93a4e13532e4f4095
-EBUILD octopus-3.0.1-r1.ebuild 1834 RMD160 01f829882f46e95384c29221f33c0343a98f83d3 SHA1 c3c557b75c265953daf1025468ae24e3d5b82d54 SHA256 c799acf6dc738465bbeb3733f94da7028f04731f9701c271f2efd56b4d06360c
-MD5 0d4324e70457a3ad048f35a489dbe300 octopus-3.0.1-r1.ebuild 1834
-RMD160 01f829882f46e95384c29221f33c0343a98f83d3 octopus-3.0.1-r1.ebuild 1834
-SHA256 c799acf6dc738465bbeb3733f94da7028f04731f9701c271f2efd56b4d06360c octopus-3.0.1-r1.ebuild 1834
-MISC ChangeLog 1657 RMD160 89206b0e66fd46eda2aed08f081a7ea54c7659ac SHA1 8bcc038f2e448f62513e777018a4bae35bc39bce SHA256 6e102f91af1cd9d990ccb070d9a92eb2af49c30dcb52b7fb12d48b5013ee3a4e
-MD5 2ee53299608b4ae5a8803c62eb0cdc53 ChangeLog 1657
-RMD160 89206b0e66fd46eda2aed08f081a7ea54c7659ac ChangeLog 1657
-SHA256 6e102f91af1cd9d990ccb070d9a92eb2af49c30dcb52b7fb12d48b5013ee3a4e ChangeLog 1657
+EBUILD octopus-3.0.1-r1.ebuild 1806 RMD160 9d458b197209c0237358afe289c6de012f2c7c13 SHA1 109faeea49d6642282a1fa1d52679744fee78034 SHA256 c3784d9b772b5d030f7f9a4c06676fc01d31cd543a8f232374de674852480fb3
+MD5 688aaf848feb6e934b1c402d9d7e3927 octopus-3.0.1-r1.ebuild 1806
+RMD160 9d458b197209c0237358afe289c6de012f2c7c13 octopus-3.0.1-r1.ebuild 1806
+SHA256 c3784d9b772b5d030f7f9a4c06676fc01d31cd543a8f232374de674852480fb3 octopus-3.0.1-r1.ebuild 1806
+MISC ChangeLog 1835 RMD160 c8af1f0961eeb23a60e9a67a3ea77f50c9ab5dbc SHA1 d9fe3f728bff59a3cccba6c40ff3d330d6ed0a34 SHA256 bf6c348ec11257b7b01c0ecda8ad8b0bf3418bbb277da06a1ea4de710f933622
+MD5 d990302d611888a4b51ba63b08d62c28 ChangeLog 1835
+RMD160 c8af1f0961eeb23a60e9a67a3ea77f50c9ab5dbc ChangeLog 1835
+SHA256 bf6c348ec11257b7b01c0ecda8ad8b0bf3418bbb277da06a1ea4de710f933622 ChangeLog 1835
 MISC metadata.xml 360 RMD160 3866ff6e15925bf44afaf6495d232310977bcf10 SHA1 2d8d9bf19917f3177a76cf27ece6bb094f8a06e3 SHA256 276d2a4e636b8f732db4f61630d7d0737aa8ebcd2192ead0907cc8f3e664bd52
 MD5 f714935dbbb0098df2d7c92514e7703b metadata.xml 360
 RMD160 3866ff6e15925bf44afaf6495d232310977bcf10 metadata.xml 360
@@ -22,10 +19,3 @@ SHA256 276d2a4e636b8f732db4f61630d7d0737aa8ebcd2192ead0907cc8f3e664bd52 metadata
 MD5 0e40c109914222d2fcda00f41eab2a7d files/digest-octopus-3.0.1-r1 515
 RMD160 6d193267ee00c5c8993163a4a24d68f1e611469e files/digest-octopus-3.0.1-r1 515
 SHA256 d5e311cd19d535c3b487e503b25e905c14813ad409270cdedcc61f1767356f02 files/digest-octopus-3.0.1-r1 515
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGlqpNcxLzpIGCsLQRAozdAJwPg7wf5Xbncel/5XJD7L/AGRnK/wCeIi9t
-uWLjFBNVM0kaLxvHoGI2Jzg=
-=ls9P
------END PGP SIGNATURE-----
diff --git a/dev-db/octopus/octopus-3.0.1-r1.ebuild b/dev-db/octopus/octopus-3.0.1-r1.ebuild
index f99cfe647b66..5678282ea54e 100644
--- a/dev-db/octopus/octopus-3.0.1-r1.ebuild
+++ b/dev-db/octopus/octopus-3.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/octopus-3.0.1-r1.ebuild,v 1.6 2007/07/12 22:23:34 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/octopus-3.0.1-r1.ebuild,v 1.7 2007/08/20 16:19:10 caster Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -24,11 +24,11 @@ COMMON_DEP="
 	>=dev-java/ant-core-1.4"
 
 # Does not like org.w3c.dom.Node
-# from 1.6
+# from 1.5+
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEP}"
 
-DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )
+DEPEND="=virtual/jdk-1.4*
 	${COMMON_DEP}"
 
 TOPDIR="${PN}-$(get_version_component_range 1-2)"