Prefer virtual/jdk-1.4 over 1.3 and add dev-java/ant-core to RDEPEND.

Package-Manager: portage-2.1.2.5

diff --git a/dev-java/tagunit/ChangeLog b/dev-java/tagunit/ChangeLog
index 1baf41a87bd0d9cbc5608055f879a5ed24ad79db..f1db62ba5664382c5d903a9f5a79cc61b04abcb6 100644 (file)
--- a/dev-java/tagunit/ChangeLog
+++ b/dev-java/tagunit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/tagunit
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tagunit/ChangeLog,v 1.12 2007/01/30 00:41:04 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tagunit/ChangeLog,v 1.13 2007/04/28 22:49:41 betelgeuse Exp $
+
+  28 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  tagunit-1.0.1-r1.ebuild:
+  Prefer virtual/jdk-1.4 over 1.3 and add dev-java/ant-core to RDEPEND.
 
   30 Jan 2007; Vlastimil Babka <caster@gentoo.org> tagunit-1.0.1-r1.ebuild:
   Put java-ant-2 after java-pkg-2 in inherit.

diff --git a/dev-java/tagunit/Manifest b/dev-java/tagunit/Manifest
index 52ff0a4250f702bff8b3943cb4594394810cba95..0236adfae81e1118b71df40a1edf2e516453a324 100644 (file)
--- a/dev-java/tagunit/Manifest
+++ b/dev-java/tagunit/Manifest
@@ -1,16 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST tagunit-1.0.1-src.zip 290460 RMD160 0b2e281b68576d943de5437b3503bf8fc47ecb8c SHA1 3144c012d761691eb44cab2840149536d8040d44 SHA256 5ecac67f63cbcde036caaf08a4dc5d544b644337e9ed0afd7e30117f5a8f940e
-EBUILD tagunit-1.0.1-r1.ebuild 1127 RMD160 13e74556453672e61d453344a562a02074fd12f3 SHA1 9ae42b19a78ecd28f903e9ec537e1c8c4422b1c8 SHA256 a79d7e53ac08c0d1d4a7fc9f12506a490942270c0ae726beab45b04b24709e5e
-MD5 4de81b5d37ef807351a8a9e35eca938e tagunit-1.0.1-r1.ebuild 1127
-RMD160 13e74556453672e61d453344a562a02074fd12f3 tagunit-1.0.1-r1.ebuild 1127
-SHA256 a79d7e53ac08c0d1d4a7fc9f12506a490942270c0ae726beab45b04b24709e5e tagunit-1.0.1-r1.ebuild 1127
+EBUILD tagunit-1.0.1-r1.ebuild 1142 RMD160 b7dec7049171925c28c511cc9386c652f1fbbddd SHA1 446ec07ed8224ac28e8bc219c67f11ab3df9df49 SHA256 44315bf7c4d9cbc4e1e9adc6ba4efb9921abc7888c65d594df2a687d8e14e2ff
+MD5 d744d985dd2b2696c2d18597f19cc1fc tagunit-1.0.1-r1.ebuild 1142
+RMD160 b7dec7049171925c28c511cc9386c652f1fbbddd tagunit-1.0.1-r1.ebuild 1142
+SHA256 44315bf7c4d9cbc4e1e9adc6ba4efb9921abc7888c65d594df2a687d8e14e2ff tagunit-1.0.1-r1.ebuild 1142
 EBUILD tagunit-1.0.1.ebuild 1192 RMD160 efb9bd18f9a314a923499d72039b4270997c819c SHA1 5c1b61ad115b97bac0d5801c206916ee529c7b96 SHA256 a677c62a69a103eb3322689361ee7496714f92c7cf6955dc8200f905f3a5710f
 MD5 eacff48d354140d4c1743e9637c21a9a tagunit-1.0.1.ebuild 1192
 RMD160 efb9bd18f9a314a923499d72039b4270997c819c tagunit-1.0.1.ebuild 1192
 SHA256 a677c62a69a103eb3322689361ee7496714f92c7cf6955dc8200f905f3a5710f tagunit-1.0.1.ebuild 1192
-MISC ChangeLog 1654 RMD160 d73c87610a731910e283d9a85bed23fe87b30e85 SHA1 f2c98ba84defe2252bd33971a2d2a0745226bdde SHA256 3907a94a25ab18d15fcefad8e0d66f5c02be2bc6448be1d7981ba0a2bea5f928
-MD5 f0d0def3e6fd1c32b9916df47129118b ChangeLog 1654
-RMD160 d73c87610a731910e283d9a85bed23fe87b30e85 ChangeLog 1654
-SHA256 3907a94a25ab18d15fcefad8e0d66f5c02be2bc6448be1d7981ba0a2bea5f928 ChangeLog 1654
+MISC ChangeLog 1811 RMD160 f5118cc954aaa81661f58d0a1a0818bfab56f52d SHA1 737d57633b24eb24047444f955efb6dc19961955 SHA256 7e4203937133ca04b00607984f006d44580491f18b71aa9acddea6d289060b87
+MD5 13fd31c8e4855e02a848f4fc09c311ff ChangeLog 1811
+RMD160 f5118cc954aaa81661f58d0a1a0818bfab56f52d ChangeLog 1811
+SHA256 7e4203937133ca04b00607984f006d44580491f18b71aa9acddea6d289060b87 ChangeLog 1811
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -21,3 +24,10 @@ SHA256 3e91fb8c368f02b7a70b12137eca4c6ce9d53b530eb4fccdc199bcd8885698ae files/di
 MD5 a9875b91c2332cdc9a52c5c0eb2f4199 files/digest-tagunit-1.0.1-r1 244
 RMD160 848d0f87351bcbc0b990b07ec78b3a2ad084396c files/digest-tagunit-1.0.1-r1 244
 SHA256 3e91fb8c368f02b7a70b12137eca4c6ce9d53b530eb4fccdc199bcd8885698ae files/digest-tagunit-1.0.1-r1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGM8+GcxLzpIGCsLQRAl0XAJ9dqBzOKbucGyWLa21AuC4hq8xyIwCfRM9y
+ZeiFTUx3Rr1XyGylvvFudYU=
+=BYyh
+-----END PGP SIGNATURE-----

diff --git a/dev-java/tagunit/tagunit-1.0.1-r1.ebuild b/dev-java/tagunit/tagunit-1.0.1-r1.ebuild
index 5f36ccf6c65c28d44beabde3bd3150fe4e958f8e..ed0f3bd381c0f463e6072ab902164df1730ce2db 100644 (file)
--- a/dev-java/tagunit/tagunit-1.0.1-r1.ebuild
+++ b/dev-java/tagunit/tagunit-1.0.1-r1.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-java/tagunit/tagunit-1.0.1-r1.ebuild,v 1.3 2007/01/30 00:41:04 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tagunit/tagunit-1.0.1-r1.ebuild,v 1.4 2007/04/28 22:49:41 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -13,14 +15,15 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE="doc source"
 
-RDEPEND="|| ( =virtual/jre-1.3 =virtual/jre-1.4* )
-       =dev-java/servletapi-2.4*"
+COMMON_DEP="
+       =dev-java/servletapi-2.4*
+       >=dev-java/ant-core-1.6"
+RDEPEND=">=virtual/jre-1.3
+       ${COMMON_DEP}"
 
-DEPEND=" || ( =virtual/jdk-1.3 =virtual/jdk-1.4* )
-       ${RDEPEND}
-       >=dev-java/ant-core-1.6
-       app-arch/unzip
-       source? ( app-arch/zip )"
+DEPEND=" || ( =virtual/jdk-1.4* =virtual/jdk-1.3* )
+       ${COMMON_DEP}
+       app-arch/unzip"
 
 S="${WORKDIR}/${P}-src/tagunit-core"