public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Heather Cynede" <cynede@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/dotnet:master commit in: dev-dotnet/nuget/
Date: Thu,  9 Jul 2015 04:32:00 +0000 (UTC)	[thread overview]
Message-ID: <1435658555.5376c5920906d1026cd9bb5c7f0755d29fd15d1a.cynede@gentoo> (raw)

commit:     5376c5920906d1026cd9bb5c7f0755d29fd15d1a
Author:     Heather <Heather <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Tue Jun 30 10:02:35 2015 +0000
Commit:     Heather Cynede <cynede <AT> gentoo <DOT> org>
CommitDate: Tue Jun 30 10:02:35 2015 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=5376c592

fix nuget conflict

 dev-dotnet/nuget/nuget-2.8.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-dotnet/nuget/nuget-2.8.3.ebuild b/dev-dotnet/nuget/nuget-2.8.3.ebuild
index 5cd6082..d427612 100644
--- a/dev-dotnet/nuget/nuget-2.8.3.ebuild
+++ b/dev-dotnet/nuget/nuget-2.8.3.ebuild
@@ -22,7 +22,7 @@ IUSE=""
 # it fixed in 3.2.3
 DEPEND=">=dev-lang/mono-3.2.3
 	<=dev-dotnet/xdt-for-monodevelop-2.8.2
-	!dev-dotnet/nuget"
+	!dev-dotnet/nuget-codeplex"
 RDEPEND="${DEPEND}"
 
 # note about blocking nuget:


             reply	other threads:[~2015-07-09  4:32 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-09  4:32 Heather Cynede [this message]
  -- strict thread matches above, loose matches on Subject: below --
2017-08-03  7:57 [gentoo-commits] proj/dotnet:master commit in: dev-dotnet/nuget/ Mikhail Pukhlikov
2016-07-21  6:18 Heather Cynede
2015-09-30 15:20 Heather Cynede
2015-08-10 11:54 Heather Cynede
2015-05-28  4:26 Heather Cynede
2015-04-10 15:22 Heather Cynede
2015-01-11  7:42 Heather Cynede

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=1435658555.5376c5920906d1026cd9bb5c7f0755d29fd15d1a.cynede@gentoo \
    --to=cynede@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