Prefer virtual/jdk:1.5 over 1.4 and use JAVA_PKG_IUSE.

Package-Manager: portage-2.1.3_rc8

4 files changed, 36 insertions, 32 deletions

diff --git a/dev-db/hsqldb/ChangeLog b/dev-db/hsqldb/ChangeLog
index 425364873083..da22f2b41f0a 100644
--- a/dev-db/hsqldb/ChangeLog
+++ b/dev-db/hsqldb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/hsqldb
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.23 2007/03/13 17:07:13 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.24 2007/07/12 22:18:59 betelgeuse Exp $
+
+  12 Jul 2007; Petteri Räty <betelgeuse@gentoo.org>
+  hsqldb-1.7.3.1-r3.ebuild:
+  Prefer virtual/jdk:1.5 over 1.4 and use JAVA_PKG_IUSE.
 
   13 Mar 2007; Petteri Räty <betelgeuse@gentoo.org>
   -hsqldb-1.7.3.1-r2.ebuild:
@@ -35,6 +39,8 @@
   hsqldb-1.7.3.1-r3.ebuild:
   ant_src_unpack -> src_unpack
 
+*hsqldb-1.7.3.1-r3 (01 Jul 2006)
+
   01 Jul 2006; Joshua Nichols <nichoj@gentoo.org> +hsqldb-1.7.3.1-r3.ebuild:
   Revision bump to support new Java system. Also addresses bug #137332
 
diff --git a/dev-db/hsqldb/Manifest b/dev-db/hsqldb/Manifest
index 39f7eec96a6d..eda9fb42b074 100644
--- a/dev-db/hsqldb/Manifest
+++ b/dev-db/hsqldb/Manifest
@@ -26,14 +26,14 @@ EBUILD hsqldb-1.7.3.1-r1.ebuild 2502 RMD160 837d911ac5d89e382a74a987f5e4cfd8a749
 MD5 38831adc4b27fe8d9e7f8c5d5c77ee2c hsqldb-1.7.3.1-r1.ebuild 2502
 RMD160 837d911ac5d89e382a74a987f5e4cfd8a749ea56 hsqldb-1.7.3.1-r1.ebuild 2502
 SHA256 5324e57b952b3820f762b62386a9611b778b1e0924afe586ac553e6cae8c2355 hsqldb-1.7.3.1-r1.ebuild 2502
-EBUILD hsqldb-1.7.3.1-r3.ebuild 3673 RMD160 5206406b92879e55a13830d722b053de4087e96d SHA1 3a310d5edf3f55a8a9cac65da7bad94c588b6914 SHA256 7343d45798dc7df2c70502480123535fe607cffcdd8bfc0461872c703e89824a
-MD5 6bca8100cc0d8afd886e8738d60cab39 hsqldb-1.7.3.1-r3.ebuild 3673
-RMD160 5206406b92879e55a13830d722b053de4087e96d hsqldb-1.7.3.1-r3.ebuild 3673
-SHA256 7343d45798dc7df2c70502480123535fe607cffcdd8bfc0461872c703e89824a hsqldb-1.7.3.1-r3.ebuild 3673
-MISC ChangeLog 3404 RMD160 0336e618a1b510662ad1f073f7258f8cf0c11dac SHA1 4a8cce1975231e0faaed64b090b43b3adef5885d SHA256 28bff22dcf5bf0ff45dfd6bc87e5fe6b71d14e275dca66748887ad76923577b4
-MD5 2084c89de35949764b5132dcf190f0f0 ChangeLog 3404
-RMD160 0336e618a1b510662ad1f073f7258f8cf0c11dac ChangeLog 3404
-SHA256 28bff22dcf5bf0ff45dfd6bc87e5fe6b71d14e275dca66748887ad76923577b4 ChangeLog 3404
+EBUILD hsqldb-1.7.3.1-r3.ebuild 3615 RMD160 9012405b795c861c628d5f23ef81a5c38b620fbc SHA1 e6eee1d6eb714d46b0ed3e0f9f7927cad16a4745 SHA256 42a41bc37f06424b249eb09a4cbcf69769aa792e7a79fff438c5a3a4716c86a4
+MD5 2d331ba9c8c15976298a501089b73753 hsqldb-1.7.3.1-r3.ebuild 3615
+RMD160 9012405b795c861c628d5f23ef81a5c38b620fbc hsqldb-1.7.3.1-r3.ebuild 3615
+SHA256 42a41bc37f06424b249eb09a4cbcf69769aa792e7a79fff438c5a3a4716c86a4 hsqldb-1.7.3.1-r3.ebuild 3615
+MISC ChangeLog 3577 RMD160 ac6a8ed37a25ac285ad5707fa38c424ade1fe69f SHA1 8adf0207ccea7754bac61b34f7d510837bb2e624 SHA256 932553df167d9d670c8feb8b2571229e3e624a3a6324e1d5a288432edb1c3051
+MD5 4379e999a98e857cd2b21a9b2cae1cc0 ChangeLog 3577
+RMD160 ac6a8ed37a25ac285ad5707fa38c424ade1fe69f ChangeLog 3577
+SHA256 932553df167d9d670c8feb8b2571229e3e624a3a6324e1d5a288432edb1c3051 ChangeLog 3577
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -45,9 +45,9 @@ MD5 471a41687c1918a2cf96debd809b0f8b files/digest-hsqldb-1.7.3.1-r3 238
 RMD160 6a25f0ec3b556ae4fadb7d103bbbff934e9aaa69 files/digest-hsqldb-1.7.3.1-r3 238
 SHA256 0ecc6ec70a0db5046776b8738be22a06b72b6ca44709502edb6f721fdba9dbdb files/digest-hsqldb-1.7.3.1-r3 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFF9tpNcxLzpIGCsLQRAj3YAJ96G1uUJixtHer/SXooCNxHgGPj2QCfSvHx
-qUmblg5iMvtgXt+1XxNVprw=
-=RET/
+iD8DBQFGlqjUcxLzpIGCsLQRAlOPAJoC9c37JQj1th9Wo5W4R4HBUWPMMACglRcl
+D+H6dg/xrelVPneNmhUD9p8=
+=7FSB
 -----END PGP SIGNATURE-----
diff --git a/dev-db/hsqldb/hsqldb-1.7.3.1-r3.ebuild b/dev-db/hsqldb/hsqldb-1.7.3.1-r3.ebuild
index 58a2fafd5f6a..2d8f74050d54 100644
--- a/dev-db/hsqldb/hsqldb-1.7.3.1-r3.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.7.3.1-r3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.7.3.1-r3.ebuild,v 1.6 2007/01/09 15:34:06 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.7.3.1-r3.ebuild,v 1.7 2007/07/12 22:18:59 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 eutils versionator java-ant-2
 
@@ -14,19 +16,15 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc source"
 
 CDEP="=dev-java/servletapi-2.3*"
 
 # doesn't like Java 1.6 due to JDBC changes
-RDEPEND="
-	|| ( =virtual/jre-1.4* =virtual/jre-1.5* )
+RDEPEND=">=virtual/jre-1.4
 	${CDEP}"
 DEPEND="
-	|| ( =virtual/jdk-1.4* =virtual/jdk-1.5* )
+	|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )
 	app-arch/unzip
-	dev-java/ant-core
-	source? ( app-arch/zip )
 	${CDEP}"
 
 S="${WORKDIR}/${PN}"
diff --git a/dev-db/octopus/Manifest b/dev-db/octopus/Manifest
index 10e5ef076004..cb4165902d05 100644
--- a/dev-db/octopus/Manifest
+++ b/dev-db/octopus/Manifest
@@ -7,18 +7,18 @@ RMD160 f41c4f0f35c6ba82a7bffbabc3bc92ea287bbfd2 files/octopus-3.0.1-gentoo-build
 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 1829 RMD160 6a01cac7d46e6ced1d39597b43da48810e2f88e5 SHA1 f0607d8de8eadae0f90a7f1054f24e0df6c0181f SHA256 e0f797b2f67b93a13b0c0d478d0ecbfb533512e1561a27a3fb6edffe58967b65
-MD5 269944cda049c51169dbc911f4b4f833 octopus-3.0.1-r1.ebuild 1829
-RMD160 6a01cac7d46e6ced1d39597b43da48810e2f88e5 octopus-3.0.1-r1.ebuild 1829
-SHA256 e0f797b2f67b93a13b0c0d478d0ecbfb533512e1561a27a3fb6edffe58967b65 octopus-3.0.1-r1.ebuild 1829
+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
 EBUILD octopus-3.0.1.ebuild 1576 RMD160 c5d5cb21a28dd73a17d81e3c1e8a9e78cc8f2178 SHA1 6034ff591cbab260691736d893159b4aa48f620f SHA256 0c70476363d9e998aac9b7914f8b4cb9bd3fdbf3101a29379da1fee044e9122f
 MD5 7237f323681ca2620fb50a54a1fc75ef octopus-3.0.1.ebuild 1576
 RMD160 c5d5cb21a28dd73a17d81e3c1e8a9e78cc8f2178 octopus-3.0.1.ebuild 1576
 SHA256 0c70476363d9e998aac9b7914f8b4cb9bd3fdbf3101a29379da1fee044e9122f octopus-3.0.1.ebuild 1576
-MISC ChangeLog 1406 RMD160 e23e559fb18fac714739376bcf46e9b155bf4477 SHA1 d55f1e189183b01eef4ee821a4dec32ea4794261 SHA256 04466ebf37fd7edf95bf8af4513a63f94cb36de0cd8a553786ac3a47aef58104
-MD5 2c737fc4f5061e47b2f082c7b0b0bd2e ChangeLog 1406
-RMD160 e23e559fb18fac714739376bcf46e9b155bf4477 ChangeLog 1406
-SHA256 04466ebf37fd7edf95bf8af4513a63f94cb36de0cd8a553786ac3a47aef58104 ChangeLog 1406
+MISC ChangeLog 1549 RMD160 5f05012055b77226604acc6dd74eb67429727717 SHA1 539c7ecc86dd5922abd4d8bba3bfb0aed8645b3e SHA256 c8a349930844da9ca8bc93bb3e207fae1333790e91cb7e62b205b8f44b5a06fa
+MD5 f95da7d344d8e4619cad83504f65e791 ChangeLog 1549
+RMD160 5f05012055b77226604acc6dd74eb67429727717 ChangeLog 1549
+SHA256 c8a349930844da9ca8bc93bb3e207fae1333790e91cb7e62b205b8f44b5a06fa ChangeLog 1549
 MISC metadata.xml 360 RMD160 3866ff6e15925bf44afaf6495d232310977bcf10 SHA1 2d8d9bf19917f3177a76cf27ece6bb094f8a06e3 SHA256 276d2a4e636b8f732db4f61630d7d0737aa8ebcd2192ead0907cc8f3e664bd52
 MD5 f714935dbbb0098df2d7c92514e7703b metadata.xml 360
 RMD160 3866ff6e15925bf44afaf6495d232310977bcf10 metadata.xml 360
@@ -30,9 +30,9 @@ 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 v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFF0VpFNQqtfCuFneMRAhARAJ0fY0rKKtDGuvdaL4/GNVJn2rV9lACffKSd
-q7DTrfSmuRWNddLvTcMSdOY=
-=x4Vw
+iD8DBQFGlqnncxLzpIGCsLQRAqmOAJ0WzfYf6wd58EEPp8OTjY1N8h3X1ACfdt7m
+S95RO533/xRoFHp/hloyo7U=
+=EyTq
 -----END PGP SIGNATURE-----