diff options
author | Alexandre Rostovtsev <tetromino@gentoo.org> | 2015-09-02 23:12:38 -0400 |
---|---|---|
committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2015-09-02 23:13:15 -0400 |
commit | 2901eb50a2563d859a4479f35de110413bea70de (patch) | |
tree | 42c20dc41929cbaf8f0c7b9c7db35e9df470f710 /net-misc | |
parent | bd9dcf1438fd0a7df4ee76fa5b3bec401ab906b3 (diff) | |
download | gentoo-2901eb50a2563d859a4479f35de110413bea70de.tar.gz gentoo-2901eb50a2563d859a4479f35de110413bea70de.tar.xz |
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
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/dropbox/dropbox-2.10.2.ebuild | 2 | ||||
-rw-r--r-- | 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 0032694491e..7d1eb0f600e 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 b72bcdddd80..c66a4fb6e8e 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() { |