diff options
| author |   Alistair Bush <ali_bush@gentoo.org> | 2010-08-29 11:10:48 +0000 |
|---|---|---|
| committer | Alistair Bush <ali_bush@gentoo.org> | 2010-08-29 11:10:48 +0000 |
| commit | bd146e07c31244cc7342dc1d0cc47139ee748ab4 (patch) | |
| tree | cca163f866daa10ff34eb5009195041e854171a1 /dev-java/junit | |
| parent | Version bump. Add perl to metadata.xml (diff) | |
| download | gentoo-2-bd146e07c31244cc7342dc1d0cc47139ee748ab4.tar.gz gentoo-2-bd146e07c31244cc7342dc1d0cc47139ee748ab4.tar.bz2 gentoo-2-bd146e07c31244cc7342dc1d0cc47139ee748ab4.zip | |
Make dep on hamcrest-core more specific to avoid slotting issues
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/junit')
| -rw-r--r-- | dev-java/junit/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/junit/junit-4.6.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-java/junit/ChangeLog b/dev-java/junit/ChangeLog index f00e879de80a..3dc03ee32fa7 100644 --- a/dev-java/junit/ChangeLog +++ b/dev-java/junit/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/junit # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.57 2010/07/16 20:02:29 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.58 2010/08/29 11:10:48 ali_bush Exp $ + + 29 Aug 2010; Alistair Bush <ali_bush@gentoo.org> junit-4.6.ebuild: + Make dep on hamcrest-core more specific to avoid slotting issues 16 Jul 2010; Fabian Groffen <grobian@gentoo.org> junit-3.8.2-r1.ebuild, junit-4.6.ebuild: diff --git a/dev-java/junit/junit-4.6.ebuild b/dev-java/junit/junit-4.6.ebuild index b87038a83028..1cce4e5eb2d5 100644 --- a/dev-java/junit/junit-4.6.ebuild +++ b/dev-java/junit/junit-4.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-4.6.ebuild,v 1.7 2010/07/16 20:02:29 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-4.6.ebuild,v 1.8 2010/08/29 11:10:48 ali_bush Exp $ # WARNING: JUNIT.JAR IS _NOT_ SYMLINKED TO ANT-CORE LIB FOLDER AS JUNIT3 IS @@ -17,7 +17,7 @@ SLOT="4" KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="" -CDEPEND="dev-java/hamcrest-core" +CDEPEND="=dev-java/hamcrest-core-1.1*" RDEPEND=">=virtual/jre-1.5 ${CDEPEND}" DEPEND=">=virtual/jdk-1.5 |