[gentoo-commits] repo/gentoo:master commit in: net-misc/dropbox/

[Alexandre Rostovtsev]

commit:     2901eb50a2563d859a4479f35de110413bea70de
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  3 03:12:38 2015 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Thu Sep  3 03:13:15 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2901eb50

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

 net-misc/dropbox/dropbox-2.10.2.ebuild | 2 +-
 net-misc/dropbox/dropbox-3.6.8.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/dropbox/dropbox-2.10.2.ebuild 
b/net-misc/dropbox/dropbox-2.10.2.ebuild
index 0032694..7d1eb0f 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 b72bcdd..c66a4fb 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() {