Restrict junit dependency.

Package-Manager: portage-2.1.4_rc14

3 files changed, 16 insertions, 23 deletions

diff --git a/dev-db/octopus/ChangeLog b/dev-db/octopus/ChangeLog
index 3929130a8ba7..3d93a32c0fea 100644
--- a/dev-db/octopus/ChangeLog
+++ b/dev-db/octopus/ChangeLog
@@ -1,6 +1,9 @@
 # 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.12 2007/11/13 12:27:27 opfer Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/ChangeLog,v 1.13 2008/01/10 21:59:09 caster Exp $
+
+  10 Jan 2008; Vlastimil Babka <caster@gentoo.org> octopus-3.0.1-r1.ebuild:
+  Restrict junit dependency.
 
   13 Nov 2007; Christian Faulhammer <opfer@gentoo.org>
   octopus-3.0.1-r1.ebuild:
diff --git a/dev-db/octopus/Manifest b/dev-db/octopus/Manifest
index 0dc67b48f3ef..fa75b74c4ce9 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 1845 RMD160 7dde097b16f82e34181aca5109fd1c8802041d65 SHA1 9c9010d3ee83ea83902665f1d8332763407e3add SHA256 b77c349e69fd98fefcdfb0845905e1924e1bde065f6a3e667acb443e7552f081
-MD5 5cce8c3f207fdd1cf37cdd258b8c3213 octopus-3.0.1-r1.ebuild 1845
-RMD160 7dde097b16f82e34181aca5109fd1c8802041d65 octopus-3.0.1-r1.ebuild 1845
-SHA256 b77c349e69fd98fefcdfb0845905e1924e1bde065f6a3e667acb443e7552f081 octopus-3.0.1-r1.ebuild 1845
-MISC ChangeLog 1960 RMD160 0d4b07c43b8ca5eb4377d2b1b0281010d448771d SHA1 1564c0ded231752cfb617db5e353570cf3e6268f SHA256 916e262372152196a28701b62a38c14b42ee5fcf37b22a4f4566bbfdbeef5b09
-MD5 725f2db38d9099a2abe3d59d494c6a69 ChangeLog 1960
-RMD160 0d4b07c43b8ca5eb4377d2b1b0281010d448771d ChangeLog 1960
-SHA256 916e262372152196a28701b62a38c14b42ee5fcf37b22a4f4566bbfdbeef5b09 ChangeLog 1960
+EBUILD octopus-3.0.1-r1.ebuild 1852 RMD160 4d2385fad2a48a6853e55b2ab6d2c2b35bd7a5c9 SHA1 28014889582bd59ba9d00669a3ec24f2a8431d25 SHA256 7c3d582184e8575bea53216462eb34a5e62ed1df441d8ac7b8cd3761576ebf8c
+MD5 e4b5a597f9ecfd9b875096f41df0436d octopus-3.0.1-r1.ebuild 1852
+RMD160 4d2385fad2a48a6853e55b2ab6d2c2b35bd7a5c9 octopus-3.0.1-r1.ebuild 1852
+SHA256 7c3d582184e8575bea53216462eb34a5e62ed1df441d8ac7b8cd3761576ebf8c octopus-3.0.1-r1.ebuild 1852
+MISC ChangeLog 2067 RMD160 b480e2a593bbe37e9acfff39bfb4063ad1005938 SHA1 a8b3dda96d81d126d4d200ae5e740e7e720d65d6 SHA256 fde8e5c8854bcad1af7d0846584db483a66aa4a7bd38521516b32188823c5d5d
+MD5 39bd4e27c98e3ef1c8c3974d57f46d13 ChangeLog 2067
+RMD160 b480e2a593bbe37e9acfff39bfb4063ad1005938 ChangeLog 2067
+SHA256 fde8e5c8854bcad1af7d0846584db483a66aa4a7bd38521516b32188823c5d5d ChangeLog 2067
 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 v1.4.7 (GNU/Linux)
-
-iD8DBQFHOZg3NQqtfCuFneMRAuQYAKCWeGN/YxGTr8oJ0k5qavWFtMcUDACffwJi
-YhwRnRHj4Yh24FkRLGlEGSg=
-=w0f+
------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 53f1207e81a5..cd6d26684801 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
+# Copyright 1999-2008 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.8 2007/11/13 12:27:27 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/octopus-3.0.1-r1.ebuild,v 1.9 2008/01/10 21:59:09 caster Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -20,7 +20,7 @@ COMMON_DEP="
 	>=dev-java/xerces-2.7
 	>=dev-java/log4j-1.2.8
 	=dev-java/rhino-1.6*
-	dev-java/junit
+	=dev-java/junit-3.8*
 	>=dev-java/ant-core-1.4"
 
 # Does not like org.w3c.dom.Node