diff options
author | 2010-08-29 11:10:48 +0000 | |
---|---|---|
committer | 2010-08-29 11:10:48 +0000 | |
commit | 6c8fdbb23257ad3c177a26851f1eaa383cc06322 (patch) | |
tree | cb242d828b3d2ef58558b2a62f627e57bd1f3bda /dev-java | |
parent | Version bump. Add perl to metadata.xml (diff) | |
download | historical-6c8fdbb23257ad3c177a26851f1eaa383cc06322.tar.gz historical-6c8fdbb23257ad3c177a26851f1eaa383cc06322.tar.bz2 historical-6c8fdbb23257ad3c177a26851f1eaa383cc06322.zip |
Make dep on hamcrest-core more specific to avoid slotting issues
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/junit/ChangeLog | 5 | ||||
-rw-r--r-- | dev-java/junit/Manifest | 4 | ||||
-rw-r--r-- | dev-java/junit/junit-4.6.ebuild | 4 |
3 files changed, 8 insertions, 5 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/Manifest b/dev-java/junit/Manifest index c7b08328c8cb..2a8b4e277251 100644 --- a/dev-java/junit/Manifest +++ b/dev-java/junit/Manifest @@ -2,6 +2,6 @@ AUX junit-3.8.2-build.xml 3179 RMD160 218ac28d9c167b719f6ace32479dd559b3ed010e S DIST junit3.8.2.zip 461426 RMD160 c66d64d8aa738460490e62fd332c112076d9b662 SHA1 701578302e244e5173dca3040cce0774a5c39645 SHA256 aae23d20e6f4dc45b4bf0b10fedcbd209c100342a0cafce1aa07d2da6da1f24a DIST junit4.6.zip 1259346 RMD160 4f87024e91b7252af89ad925db5cda0e17128525 SHA1 98c8c625e999f0c7463397a684a5c47a0ea106e3 SHA256 fa0acd11fab2b1b0cd57dd0bc7fdb4e7084d2e1a3ade7bc2c54a0f397f989b26 EBUILD junit-3.8.2-r1.ebuild 1135 RMD160 7c76b6c516016e709ffd50cb282f4828aab8ee7e SHA1 336961975849a18b91456a448308367cdbe393f9 SHA256 19c67667425cca781a5d15974572866edf31811fd1db5e6dcb8d23aa2f0d12bc -EBUILD junit-4.6.ebuild 2171 RMD160 fea4395ebd3ef36ec03892680e2dc697a44bdd3d SHA1 e45f2c67506ee134108c4c352978526bb2b12a3a SHA256 a023dcb4268422b0d7c7d12bd586d15a54c73ace672c77e7ffdb4dc53022710c -MISC ChangeLog 7645 RMD160 ff83ec828b08149dd422eb6bfedb3d688ec07e87 SHA1 5744d1400fd4b0196081eec617d54594dfd206fb SHA256 ae2986a47c6e794f73f1d6e2b149465f3eba7e36330e6464a02efa37da8bc34c +EBUILD junit-4.6.ebuild 2178 RMD160 ca5b8bd6f4b3b02f0848c07cc11e0c6b9844097f SHA1 2beb3ebc5c51c1d2e41a9a4f2cb400c5086f6693 SHA256 9fb4218f2a227348b9ad27547896d9f4025b245cf06a8d52e8d2baf3b0eea1df +MISC ChangeLog 7783 RMD160 6a57e0e243ec9546063a36cef969a54b3ead8fcc SHA1 ee05c456b7541b49a2fc9ec1a31de9574d07550f SHA256 1ff7929ec27b1ba672a7e6da4f5d322ee02c5dc51a0e5bd2074bff817502a6fb MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 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 |