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

["Justin Lecher" <jlec@gentoo.org>]

commit:     d1e9815944711d01c6d1598cf23f14be9edc22d9
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 12:25:03 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 12:25:03 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1e98159

net-misc/dropbox: Fix ncurses deps

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=557472

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 net-misc/dropbox/Manifest                  |   8 ---
 net-misc/dropbox/dropbox-2.10.2.ebuild     |   4 ++
 net-misc/dropbox/dropbox-2.10.41-r1.ebuild | 106 -----------------------------
 net-misc/dropbox/dropbox-2.10.41.ebuild    | 105 ----------------------------
 net-misc/dropbox/dropbox-2.4.10.ebuild     | 104 ----------------------------
 net-misc/dropbox/dropbox-2.6.33.ebuild     | 104 ----------------------------
 net-misc/dropbox/dropbox-2.8.4.ebuild      | 104 ----------------------------
 net-misc/dropbox/dropbox-3.6.8.ebuild      |   5 +-
 8 files changed, 8 insertions(+), 532 deletions(-)

diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 414ebb4..a325fbe 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,12 +1,4 @@
 DIST dropbox-lnx.x86-2.10.2.tar.gz 26078108 SHA256 a43e24342e5f337034cf0d378f5a532ad69ad59bf00eb8a2065c465c969e3455 SHA512 0fb408d7a221c470fbc59c4ddb1f65d4fcb2d33c855b37474b6202a58f7be04b9cf0ed1ea18080efdd02998fe370bdef99ce1e27b8f627515ba3db859251e5ef WHIRLPOOL a33260d2a8907d676230464c9b4200b12debe2ac8aae5a7322250218481f348a2cc4217a84155900cbe9284e4070d424fbc7589e7733fab79d98e2ee324c5e02
-DIST dropbox-lnx.x86-2.10.41.tar.gz 27099644 SHA256 f335301cbbb41cec84353a8f670d01d761de61c08f48b408f5bb79889fad6a38 SHA512 e0eca266c2571f9cf8b6172edf0971d2c7041d2aec0872c45e5f38101eac135d40aca3631268fc567313b8ec3846543a20f053d4c239393227fec0b2e767e9d7 WHIRLPOOL 6b3c528dea8f16f244a7034b9fde7ebcac1e1b4f555072641e0ebe307ceef05ae75d2ac1b7146b93ca9ba7c3eae6b895c8743c7d54c28c3e40602f083338dfaa
-DIST dropbox-lnx.x86-2.4.10.tar.gz 22095816 SHA256 c1f19bace5eb63ef1263721a0866ddaf061c6e126a1f9fa5faa3a70e2aa267cf SHA512 5d3c6ea6cb193cb6cd885d92915ca7ff59ce895b9f517e683c7e32c0979f972bf56b0a569dc7b35f1f15095c7f643562c81b23fc85d9dcca52c07052e5c17832 WHIRLPOOL 1bbe12e8ee4ed42992c984582e8e60c5cdd388bd1d1ba52d97c61bc86954d78ce73f04ac1be2cb465fee82eca9972b0a45060296f9c958897fd82fabed7b609f
-DIST dropbox-lnx.x86-2.6.33.tar.gz 23602308 SHA256 90c6bebb1dda19b56f68d22a2422436903559f646adcbc290672630df9465b76 SHA512 e26f9f4e393e17e63b387e303189fdd716abbfb96d44648fff3c98beac3f373a71e8446bf90b95ee067556264fe9b12264ca66dcf5b2ba509763276f8fa0b224 WHIRLPOOL 2a2cd43c6a4889f262515413a219b6d3df81e5faf377713b9b5a5b34f6d2fde211ae8d2b55d17c03b04b5079ea8d59957a909a34af1a36bc6d145866d91f03c3
-DIST dropbox-lnx.x86-2.8.4.tar.gz 24066498 SHA256 9014842c40953f3d7057a11cb537bb5fcb807a0f1794a5efb908bcd343a2d2c5 SHA512 3c4af0c500fc7f41a4e2040fd1ba56198315ada7ffedd1d722b917466831716802871dffe32d4671693b54a9fee3de3553f2f466a4dc02b34c57e39422c3a8b6 WHIRLPOOL 426c97ca84753d306f55f71ef6341648de28bb65b936483dca41bb8e4a96cab515da9b8926c6f5a926f186154c30a03611bb8a2aaf803c0addec2e791729bc4f
 DIST dropbox-lnx.x86-3.6.8.tar.gz 61283985 SHA256 bca1e028a5acab38864320580965947559bc5e74a073e8e3c68cd56fab115d54 SHA512 4d3c37e5d6ccf4de3f317920439a32eaffb5132fcce2f6491b1f9dec7c0a5e06266c9509711a5564e9d6613f6cd8c9f594a691de1e2ad2bcdb7c0df1b7964341 WHIRLPOOL e0a81a0f4b86b8efc9535ab13ad81887331959ac943145c4d4135298c04d966065ef2bbcb7d3f5f43df9650924232768f84941d190b91866e93bf38957d5c09e
 DIST dropbox-lnx.x86_64-2.10.2.tar.gz 26852053 SHA256 0780001da7af0ee8b07115f59d1998708e5aa36c50ce13f73f32d7c7c0a08d11 SHA512 0746643546bdcd2de71812a87ccf665df4a656750d899e2b67a3dfa958bf7f59fcb1c99109b6bb1424f5dfbb625d0756a7cc0c01ba09b4375ed177d05846256e WHIRLPOOL 787e5882f546377173e73fcb8a4bfe205c1659e562e0ef4aea9d62123fb684cd254c3962861ea2eb54c6fab895561c29a1c507760eb906625db55fac5aa083dd
-DIST dropbox-lnx.x86_64-2.10.41.tar.gz 27879035 SHA256 7db18d297a12cdfbb1e03cb21876d748a68846907c21a929058051e8d49d49e2 SHA512 801a8f55991331d5e79682385046bbdd880e4a2e93fbd8369be51070bb0c2bb1af66fcbca00c9aa87c70d4fba8c73575ac077f0e1bb5d880dff834767fd0d2cc WHIRLPOOL 5970bb783d5887502eca00a958c99ab641d3534a806496acd1f94b06ef10a7da20e1e1141f69e54d435277c4e47514955a7a6ddad8fef7593b17eaec41ce84ca
-DIST dropbox-lnx.x86_64-2.4.10.tar.gz 22867842 SHA256 1bd9cff2a4c3a03cd900cf8f7426ccf8d61e9e292666eba61493be26fe8945d4 SHA512 02e7798f515ac492cb40c8ea6b83a9b3d5849a07ea8c34414d5329a1d8c35c6faf7edaca511638b79594cf963a8363d720e70171e6e8f1a3d45b3e3b8018bb75 WHIRLPOOL f87f8309e92095032da209f15ae4905cbc68ee06d41548e2ddfb477e33a90a49b0147128e8e84cb3e0e3ea5d346dbba7aa95b295a238f1829e021c7cb68641e2
-DIST dropbox-lnx.x86_64-2.6.33.tar.gz 24379142 SHA256 b4a7888fe87f23469215103da4b25bbab34a97060abdcd431b32e00b6229c3c2 SHA512 65abf5d15402d0b2393e66321a56461c06953aa6db9a08a3dddfea3582b85f8b48b0538a254c83fb3351384c08c70e97c05d35bffc112b660ad52889646f5aac WHIRLPOOL 706f79dc84303c2e71d279bc8e823a8b51afbdd27780a9b0292bfd81121e1e4084265fd8cd2fb4b066529883aa968f0abf38b1a3155c11e5d87ac48ddcac6d79
-DIST dropbox-lnx.x86_64-2.8.4.tar.gz 24840576 SHA256 0a6e8558ed3c8dc84f8d8ded531fa12a4237169c40f54d8ea4d93967f28e0abe SHA512 253d97653c72c383cc551a97f66cae2bbbdb9ced87de8fab13d66730b86e6a58402963256a0ed55bf41e52d3427005bce0452ae8bb8f1a3fb53fed2d62143fba WHIRLPOOL e8f99d58c5ac9c544e333173661ec9b7b30472dacb3d06b2f798d658099cad8f41b368d87b939cefa6a36d72c1b289a59612961a00009bd55d20e8e75c2893a3
 DIST dropbox-lnx.x86_64-3.6.8.tar.gz 64000290 SHA256 91f0b6b2842e3dcd4606b16a4bac18d3caa95def31e46a480610d7a0b071c68d SHA512 693103e2ce2ba22854cdc2a69c725f5b4dccd59d273e5c5465db34884c3f8530f58faa68e03a4ad3f11e33d925af2880c2fbd10f949dd82eea0fe187d6839140 WHIRLPOOL 079b96ff891a6d9b3df01c1eb00b2a098b16dc1fad70295b31f82de43c185038e27257ddb4721aef18a0e65d40c3a1944937451df3f01d8d092feb9b00bde77c

diff --git a/net-misc/dropbox/dropbox-2.10.2.ebuild b/net-misc/dropbox/dropbox-2.10.2.ebuild
index c73da1d..81c0159 100644
--- a/net-misc/dropbox/dropbox-2.10.2.ebuild
+++ b/net-misc/dropbox/dropbox-2.10.2.ebuild
@@ -45,6 +45,10 @@ RDEPEND="
 	net-misc/wget
 	>=sys-devel/gcc-4.2.0
 	sys-libs/zlib
+	|| (
+		<sys-libs/ncurses-6
+		sys-libs/ncurses:5
+	)
 "
 
 src_unpack() {

diff --git a/net-misc/dropbox/dropbox-2.10.41-r1.ebuild b/net-misc/dropbox/dropbox-2.10.41-r1.ebuild
deleted file mode 100644
index ddd5d25..0000000
--- a/net-misc/dropbox/dropbox-2.10.41-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils gnome2-utils pax-utils systemd
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="http://dropbox.com/"
-SRC_URI="
-	x86? ( http://dl-web.dropbox.com/u/17/dropbox-lnx.x86-${PV}.tar.gz )
-	amd64? ( http://dl-web.dropbox.com/u/17/dropbox-lnx.x86_64-${PV}.tar.gz )"
-
-LICENSE="CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="+librsync-bundled selinux X"
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-DEPEND="librsync-bundled? ( dev-util/patchelf )"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-# USE=X require wxGTK's dependencies. system-library cannot be used due to
-# missing symbol (CtlColorEvent). #443686
-RDEPEND="
-	X? (
-		dev-libs/glib:2
-		media-libs/libpng:1.2
-		sys-libs/zlib
-		virtual/jpeg
-		x11-libs/gtk+:2
-		x11-libs/libSM
-		x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-		x11-themes/hicolor-icon-theme
-	)
-	app-arch/bzip2
-	dev-libs/popt
-	!librsync-bundled? ( net-libs/librsync )
-	net-misc/wget
-	>=sys-devel/gcc-4.2.0
-	sys-libs/zlib
-	selinux? ( sec-policy/selinux-dropbox )
-"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}"
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir .dropbox-dist
-}
-
-src_prepare() {
-	rm -vf libbz2* libpopt.so.0 libpng12.so.0 || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf *wx* images || die
-	fi
-	if use librsync-bundled ; then
-		patchelf --set-rpath '$ORIGIN' _librsync.so || die
-	else
-		rm -vf librsync.so.1 || die
-	fi
-	mv cffi-0.7.2-py2.7-*.egg dropbox_sqlite_ext-0.0-py2.7.egg distribute-0.6.26-py2.7.egg "${T}" || die
-	rm -rf *.egg library.zip || die
-	mv "${T}"/cffi-0.7.2-py2.7-*.egg "${T}"/dropbox_sqlite_ext-0.0-py2.7.egg "${T}"/distribute-0.6.26-py2.7.egg "${S}" || die
-	ln -s dropbox library.zip || die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	use X && doicon -s 16 -c status "${T}"/status
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

diff --git a/net-misc/dropbox/dropbox-2.10.41.ebuild b/net-misc/dropbox/dropbox-2.10.41.ebuild
deleted file mode 100644
index 523b718..0000000
--- a/net-misc/dropbox/dropbox-2.10.41.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils gnome2-utils pax-utils systemd
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="http://dropbox.com/"
-SRC_URI="
-	x86? ( http://dl-web.dropbox.com/u/17/dropbox-lnx.x86-${PV}.tar.gz )
-	amd64? ( http://dl-web.dropbox.com/u/17/dropbox-lnx.x86_64-${PV}.tar.gz )"
-
-LICENSE="CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="+librsync-bundled X"
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-DEPEND="librsync-bundled? ( dev-util/patchelf )"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-# USE=X require wxGTK's dependencies. system-library cannot be used due to
-# missing symbol (CtlColorEvent). #443686
-RDEPEND="
-	X? (
-		dev-libs/glib:2
-		media-libs/libpng:1.2
-		sys-libs/zlib
-		virtual/jpeg
-		x11-libs/gtk+:2
-		x11-libs/libSM
-		x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-		x11-themes/hicolor-icon-theme
-	)
-	app-arch/bzip2
-	dev-libs/popt
-	!librsync-bundled? ( net-libs/librsync )
-	net-misc/wget
-	>=sys-devel/gcc-4.2.0
-	sys-libs/zlib
-"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}"
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir .dropbox-dist
-}
-
-src_prepare() {
-	rm -vf libbz2* libpopt.so.0 libpng12.so.0 || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf *wx* images || die
-	fi
-	if use librsync-bundled ; then
-		patchelf --set-rpath '$ORIGIN' _librsync.so || die
-	else
-		rm -vf librsync.so.1 || die
-	fi
-	mv cffi-0.7.2-py2.7-*.egg dropbox_sqlite_ext-0.0-py2.7.egg distribute-0.6.26-py2.7.egg "${T}" || die
-	rm -rf *.egg library.zip || die
-	mv "${T}"/cffi-0.7.2-py2.7-*.egg "${T}"/dropbox_sqlite_ext-0.0-py2.7.egg "${T}"/distribute-0.6.26-py2.7.egg "${S}" || die
-	ln -s dropbox library.zip || die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	use X && doicon -s 16 -c status "${T}"/status
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

diff --git a/net-misc/dropbox/dropbox-2.4.10.ebuild b/net-misc/dropbox/dropbox-2.4.10.ebuild
deleted file mode 100644
index e874eed..0000000
--- a/net-misc/dropbox/dropbox-2.4.10.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils gnome2-utils pax-utils systemd
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="http://dropbox.com/"
-SRC_URI="
-	x86? ( http://dl-web.dropbox.com/u/17/dropbox-lnx.x86-${PV}.tar.gz )
-	amd64? ( http://dl-web.dropbox.com/u/17/dropbox-lnx.x86_64-${PV}.tar.gz )"
-
-LICENSE="CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-linux"
-IUSE="+librsync-bundled X"
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-DEPEND="librsync-bundled? ( dev-util/patchelf )"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-# USE=X require wxGTK's dependencies. system-library cannot be used due to
-# missing symbol (CtlColorEvent). #443686
-RDEPEND="
-	X? (
-		dev-libs/glib:2
-		media-libs/libpng:1.2
-		sys-libs/zlib
-		virtual/jpeg
-		x11-libs/gtk+:2
-		x11-libs/libSM
-		x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-		x11-themes/hicolor-icon-theme
-	)
-	app-arch/bzip2
-	dev-libs/popt
-	!librsync-bundled? ( net-libs/librsync )
-	net-misc/wget
-	>=sys-devel/gcc-4.2.0
-	sys-libs/zlib
-"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}"
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	rmdir .dropbox-dist
-}
-
-src_prepare() {
-	rm -vf libbz2* libpopt.so.0 libpng12.so.0 || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf *wx* images || die
-	fi
-	if use librsync-bundled ; then
-		patchelf --set-rpath '$ORIGIN' _librsync.so || die
-	else
-		rm -vf librsync.so.1 || die
-	fi
-	mv cffi-0.6-py2.7-*.egg "${T}" || die
-	rm -rf *.egg library.zip || die
-	mv "${T}"/cffi-0.6-py2.7-*.egg "${S}" || die
-	ln -s dropbox library.zip || die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	use X && doicon -s 16 -c status "${T}"/status
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

diff --git a/net-misc/dropbox/dropbox-2.6.33.ebuild b/net-misc/dropbox/dropbox-2.6.33.ebuild
deleted file mode 100644
index 5436774..0000000
--- a/net-misc/dropbox/dropbox-2.6.33.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils gnome2-utils pax-utils systemd
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="http://dropbox.com/"
-SRC_URI="
-	x86? ( http://dl-web.dropbox.com/u/17/dropbox-lnx.x86-${PV}.tar.gz )
-	amd64? ( http://dl-web.dropbox.com/u/17/dropbox-lnx.x86_64-${PV}.tar.gz )"
-
-LICENSE="CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-linux"
-IUSE="+librsync-bundled X"
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-DEPEND="librsync-bundled? ( dev-util/patchelf )"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-# USE=X require wxGTK's dependencies. system-library cannot be used due to
-# missing symbol (CtlColorEvent). #443686
-RDEPEND="
-	X? (
-		dev-libs/glib:2
-		media-libs/libpng:1.2
-		sys-libs/zlib
-		virtual/jpeg
-		x11-libs/gtk+:2
-		x11-libs/libSM
-		x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-		x11-themes/hicolor-icon-theme
-	)
-	app-arch/bzip2
-	dev-libs/popt
-	!librsync-bundled? ( net-libs/librsync )
-	net-misc/wget
-	>=sys-devel/gcc-4.2.0
-	sys-libs/zlib
-"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}"
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	rmdir .dropbox-dist
-}
-
-src_prepare() {
-	rm -vf libbz2* libpopt.so.0 libpng12.so.0 || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf *wx* images || die
-	fi
-	if use librsync-bundled ; then
-		patchelf --set-rpath '$ORIGIN' _librsync.so || die
-	else
-		rm -vf librsync.so.1 || die
-	fi
-	mv cffi-0.7.2-py2.7-*.egg dropbox_sqlite_ext-0.0-py2.7.egg distribute-0.6.26-py2.7.egg "${T}" || die
-	rm -rf *.egg library.zip || die
-	mv "${T}"/cffi-0.7.2-py2.7-*.egg "${T}"/dropbox_sqlite_ext-0.0-py2.7.egg "${T}"/distribute-0.6.26-py2.7.egg "${S}" || die
-	ln -s dropbox library.zip || die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	use X && doicon -s 16 -c status "${T}"/status
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

diff --git a/net-misc/dropbox/dropbox-2.8.4.ebuild b/net-misc/dropbox/dropbox-2.8.4.ebuild
deleted file mode 100644
index f4d7197..0000000
--- a/net-misc/dropbox/dropbox-2.8.4.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils gnome2-utils pax-utils systemd
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="http://dropbox.com/"
-SRC_URI="
-	x86? ( http://dl-web.dropbox.com/u/17/dropbox-lnx.x86-${PV}.tar.gz )
-	amd64? ( http://dl-web.dropbox.com/u/17/dropbox-lnx.x86_64-${PV}.tar.gz )"
-
-LICENSE="CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="+librsync-bundled X"
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-DEPEND="librsync-bundled? ( dev-util/patchelf )"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-# USE=X require wxGTK's dependencies. system-library cannot be used due to
-# missing symbol (CtlColorEvent). #443686
-RDEPEND="
-	X? (
-		dev-libs/glib:2
-		media-libs/libpng:1.2
-		sys-libs/zlib
-		virtual/jpeg
-		x11-libs/gtk+:2
-		x11-libs/libSM
-		x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-		x11-themes/hicolor-icon-theme
-	)
-	app-arch/bzip2
-	dev-libs/popt
-	!librsync-bundled? ( net-libs/librsync )
-	net-misc/wget
-	>=sys-devel/gcc-4.2.0
-	sys-libs/zlib
-"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}"
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	rmdir .dropbox-dist
-}
-
-src_prepare() {
-	rm -vf libbz2* libpopt.so.0 libpng12.so.0 || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf *wx* images || die
-	fi
-	if use librsync-bundled ; then
-		patchelf --set-rpath '$ORIGIN' _librsync.so || die
-	else
-		rm -vf librsync.so.1 || die
-	fi
-	mv cffi-0.7.2-py2.7-*.egg dropbox_sqlite_ext-0.0-py2.7.egg distribute-0.6.26-py2.7.egg "${T}" || die
-	rm -rf *.egg library.zip || die
-	mv "${T}"/cffi-0.7.2-py2.7-*.egg "${T}"/dropbox_sqlite_ext-0.0-py2.7.egg "${T}"/distribute-0.6.26-py2.7.egg "${S}" || die
-	ln -s dropbox library.zip || die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	use X && doicon -s 16 -c status "${T}"/status
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

diff --git a/net-misc/dropbox/dropbox-3.6.8.ebuild b/net-misc/dropbox/dropbox-3.6.8.ebuild
index d9cd2a8..4ef68ce 100644
--- a/net-misc/dropbox/dropbox-3.6.8.ebuild
+++ b/net-misc/dropbox/dropbox-3.6.8.ebuild
@@ -55,7 +55,10 @@ RDEPEND="
 	net-misc/wget
 	>=sys-devel/gcc-4.2.0
 	sys-libs/zlib
-"
+	|| (
+		<sys-libs/ncurses-6
+		sys-libs/ncurses:5
+	)"
 
 src_unpack() {
 	unpack ${A}