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 0032694491e491f8f3c89bcce5087044b683c491..7d1eb0f600e58551cc2db8fa186fafe6154399f8 100644 (file)
--- 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 b72bcdddd800b1997aa591ea20704321adc0bed6..c66a4fb6e8eac29e8e295cb251c5431363c11673 100644 (file)
--- 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() {