diff options
| author |   Sebastian Pipping <sebastian@pipping.org> | 2011-02-19 17:28:03 +0100 |
|---|---|---|
| committer | Sebastian Pipping <sebastian@pipping.org> | 2011-02-19 17:28:03 +0100 |
| commit | 458d73b618af4c0338c1b078ae60d78777c1457e (patch) | |
| tree | 795041e1c72098e8d000d3123d8dfa97b25ba7a3 /net-misc | |
| parent | net-misc/mocha: Be happy with jaf (not sun-jaf in particular) (diff) | |
| download | betagarden-458d73b618af4c0338c1b078ae60d78777c1457e.tar.gz betagarden-458d73b618af4c0338c1b078ae60d78777c1457e.tar.bz2 betagarden-458d73b618af4c0338c1b078ae60d78777c1457e.zip | |
net-misc/mocha: Do not depend on JAF if Java 6 is around
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/mocha/Manifest | 2 | ||||
| -rw-r--r-- | net-misc/mocha/mocha-1.1.1.ebuild | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/net-misc/mocha/Manifest b/net-misc/mocha/Manifest index 209e6a0..01f0138 100644 --- a/net-misc/mocha/Manifest +++ b/net-misc/mocha/Manifest @@ -1,5 +1,5 @@ AUX mocha-1.1.1-gentoo.patch 1161 RMD160 4e62fb32b3dd9a017f288a220ef5c668d6b510d3 SHA1 4e04b3fe88389b93e1d6f25a90129336e8be1242 SHA256 bfa634634710d02bd4187ff16905ce55cb1eccb87d3b67a342bab3a3cee6ce7c AUX mocha-1.1.1-gtk.patch 456 RMD160 ae504f76b64b0b7517ecc22d6e5f25c270b06e23 SHA1 304f116e1e5dcb3b2ae2701fd96a782025e991a2 SHA256 98b76024df6d3dd615b061b2b5d7e918825f52d383b52d91d7bcf2a300150f5d DIST mocha-1.1.1.tar.gz 494192 RMD160 834644c848feeed651bd9b126fdc76a0e694ee90 SHA1 20ab2b39d1c94f3b0a7d6893657d8cdd1161f1e9 SHA256 d3f2d4b933a72250de5f1c9107183fd24a5f968918f68c27b7c74d2243d9962b -EBUILD mocha-1.1.1.ebuild 1203 RMD160 33cd710012ad0e72c0d40cb51c3d1cf5ad892442 SHA1 68fa4b6845fe30c75b2334c403a5330dd35b4797 SHA256 a84dec4003e9c70b06546c1c5add6ad9fd23c3d19eac26c9e877d4e75282c5d8 +EBUILD mocha-1.1.1.ebuild 1284 RMD160 dba618dd9acd34f212a06b29875b31469573b011 SHA1 cee1093ab771e5d4e3c11d83c751dae566cd8d32 SHA256 683ad6bbdb8611255e43d1db12b752cc0571551a961ae6415516082d6adbab7c MISC metadata.xml 257 RMD160 04e4c6e678ba8e8ffde93f57d06a40b60f9eaa69 SHA1 e3c39bf9a25beebbe626726bb94f6e22db4fa06d SHA256 b4a209de2bfbbcc5ceab61bf458a1ee79da4c60a30e4aabf54b76e9709b56db8 diff --git a/net-misc/mocha/mocha-1.1.1.ebuild b/net-misc/mocha/mocha-1.1.1.ebuild index f15cd17..15a4058 100644 --- a/net-misc/mocha/mocha-1.1.1.ebuild +++ b/net-misc/mocha/mocha-1.1.1.ebuild @@ -16,12 +16,13 @@ KEYWORDS="~amd64 ~x86" IUSE="" COMMON_DEP="java-virtuals/javamail - java-virtuals/jaf dev-java/swing-layout" -DEPEND=">=virtual/jdk-1.5 +DEPEND="|| ( >=virtual/jdk-1.6 + ( >=virtual/jdk-1.5 java-virtuals/jaf ) ) ${COMMON_DEP}" -RDEPEND=">=virtual/jre-1.5 +RDEPEND="|| ( >=virtual/jre-1.6 + ( >=virtual/jre-1.5 java-virtuals/jaf ) ) sys-apps/net-tools ${COMMON_DEP}" |