From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Thu, 3 Sep 2015 03:12:38 +0000 (-0400)
Subject: net-misc/dropbox: || order: first try ncurses:5/5, then fall back to 0/5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2901eb50a2563d859a4479f35de110413bea70de;p=gentoo.git

net-misc/dropbox: || order: first try ncurses:5/5, then fall back to 0/5

Non-maintainer commit to fix emerge conflict that is affecting many users.

Gentoo-Bug: 559204
Package-Manager: portage-2.2.20.1
---

diff --git a/net-misc/dropbox/dropbox-2.10.2.ebuild b/net-misc/dropbox/dropbox-2.10.2.ebuild
index 0032694491e4..7d1eb0f600e5 100644
--- a/net-misc/dropbox/dropbox-2.10.2.ebuild
+++ b/net-misc/dropbox/dropbox-2.10.2.ebuild
@@ -46,8 +46,8 @@ RDEPEND="
 	>=sys-devel/gcc-4.2.0
 	sys-libs/zlib
 	|| (
-		sys-libs/ncurses:0/5
 		sys-libs/ncurses:5/5
+		sys-libs/ncurses:0/5
 	)
 "
 
diff --git a/net-misc/dropbox/dropbox-3.6.8.ebuild b/net-misc/dropbox/dropbox-3.6.8.ebuild
index b72bcdddd800..c66a4fb6e8ea 100644
--- a/net-misc/dropbox/dropbox-3.6.8.ebuild
+++ b/net-misc/dropbox/dropbox-3.6.8.ebuild
@@ -56,8 +56,8 @@ RDEPEND="
 	>=sys-devel/gcc-4.2.0
 	sys-libs/zlib
 	|| (
-		sys-libs/ncurses:0/5
 		sys-libs/ncurses:5/5
+		sys-libs/ncurses:0/5
 	)"
 
 src_unpack() {