public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sebastian Pipping" <sping@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/betagarden:master commit in: net-misc/mocha/
Date: Sat, 19 Feb 2011 16:28:22 +0000 (UTC)	[thread overview]
Message-ID: <458d73b618af4c0338c1b078ae60d78777c1457e.sping@gentoo> (raw)

commit:     458d73b618af4c0338c1b078ae60d78777c1457e
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sat Feb 19 16:28:03 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 16:28:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=458d73b6

net-misc/mocha: Do not depend on JAF if Java 6 is around

---
 net-misc/mocha/mocha-1.1.1.ebuild |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

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}"
 



             reply	other threads:[~2011-02-19 16:28 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-19 16:28 Sebastian Pipping [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-06-06 10:37 [gentoo-commits] proj/betagarden:master commit in: net-misc/mocha/ Justin Lecher
2015-06-06 10:37 Justin Lecher
2011-10-27 18:02 Justin Lecher
2011-08-12 13:34 Sebastian Pipping
2011-02-19 17:58 Sebastian Pipping
2011-02-19 16:52 Sebastian Pipping
2011-02-19 16:20 Sebastian Pipping
2011-02-19  2:39 Sebastian Pipping

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=458d73b618af4c0338c1b078ae60d78777c1457e.sping@gentoo \
    --to=sping@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox