gentoo resync : 14.12.2020

3 files changed, 3 insertions, 108 deletions

diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 04f651c870e6..a34cb2433b30 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,10 +1,7 @@
 AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad3294a927d8cbd708427e4aba8b6f62157a5b6e7cec8d7631a6d79ccd55616a9bca63003ef72f5 SHA512 100a9480dc086e18972c25bbf554e47737dae43989fc7fe1d01173c2570e64792e64fa7d52a93ca53f3e1248b3b335fd838b5c7713dae937e919f0e6a99bb132
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
-DIST dropbox-lnx.x86-109.4.517.tar.gz 98336166 BLAKE2B 6c8e59b6640d83c9f4a36a700d9471b2c4b97618126b78fabccc031ee6ba2c8b94122b273d01b21d6762020aae904c284a3d335dac70259692fbd045cbc0d7b2 SHA512 308e2d837a761d8bae02ef38cc9724fc6a411b1cdbd89c2bb0e3e2b4ee512755c859579fcb8cf1ea34b1e75becbe9910f878f8b019ce3b74c59a15a92e44df4f
-DIST dropbox-lnx.x86-110.4.458.tar.gz 98543766 BLAKE2B 85c1e2d23436a8a48587a8d50a5d44c7a8f6e6de571f7a7eaa2cd54da45a7f3721f23a9ab1769353536d50c93f40d35635f228342888ba4509de9c9130d5f0a5 SHA512 e913cac34c1934818d5ac1478f3b723d34f5a196451a8b652a7bdbef552f94258b36323cd3ae77bfdb2a85caf0006b6fbf0ef6997a4d616f25c0bed18c844393
-DIST dropbox-lnx.x86_64-109.4.517.tar.gz 102381526 BLAKE2B 915d8901e88597c456d507e70ba4026cb41d110ac08a902f10a02490e272e61cc81b67f04769e44746883e1f6064eb4ee034d74aa6b4ed4e6d6ee0a7d785efb2 SHA512 502149b0d20d47ed6af3e073d2e54b3888fa093084e8c45fb5c36aef56d47a2d4280daf8dd586ad95b55db9435b45acca4b25140840a786d1c1a101011210de4
-DIST dropbox-lnx.x86_64-110.4.458.tar.gz 102601668 BLAKE2B b9614d7880dab101ff12812b78e26b269ad1e82505d4a02fc284dcf0c72256062b65bcb29598a45268b41eaa7567f6d13cfa8e264df805bbe434039852094b90 SHA512 f8107e4335adce49f3eca742b0517777aa84d35a60657c92dcf155f55fecef3bbcb01e4c1bddb43eb96568f9f296245e57e6af0c799e2cd5fd9c900bd98e0ccf
-EBUILD dropbox-109.4.517.ebuild 2617 BLAKE2B 4c3c0dff5562ba9d40f10b6b5754a5f4ee8011bc7331a0ad9e2d89997a22e00752c8a062a24a4c49404fd6b2743f814b31e792c25ecbeecd0340a4edf33ddebb SHA512 3a89190dd79b8eb50e33262c3a76fd63476c09c42cdb7026abb72e4fd1eb109c92f0f6c09903af4874cb72c271998ceb21723a6f893fb954eade67c1be860765
-EBUILD dropbox-110.4.458.ebuild 2619 BLAKE2B 0d69bf03e5039bdb5ae193deda12ab1a77c7acf20622f90075d14e61be8b019b8551ec3727cfc37b2d36fd6eb063697840b983f42b3b03fe5efc5b87d61f0cd0 SHA512 aad780d3b5e3daac4126915cd1622025d1734dc83af04f3eef8965cc2c5948298e3c9fbb0dd173d846424a8a09d490150a6f5b69c0e23116fba6513854563bb5
+DIST dropbox-lnx.x86-111.4.472.tar.gz 98640604 BLAKE2B 326c5290857bc511116f4375a1900570843ae0d50575ca8025ef3e431dafba7059a9952e8742d37ef0a297ac967ab115ebe4edc80f7f86a07aa04c6541ef2648 SHA512 4411f4f261bf4cde4d1d23c50696414119f13c5a18cb3e9cadec823570eed30c3f277b770068656d73e3a36e710c1554a58d51498ca1d2433905a2c03eae63a0
+DIST dropbox-lnx.x86_64-111.4.472.tar.gz 102674853 BLAKE2B 13255b9737859b9594901955d3819499173b43f12a0eaf476a402bf4bbfe3f1ca5881bf3fda5bdf47d0936e2e9d4bed58abc89c58feeb907074d965739e75021 SHA512 f70a37e0a6fa4f56353d1482b8621b526ecba31a9fdc6da337f3c01e075c87c28728cfd80f7f1a1f74286e294652684e2b7e671c7a6b195cd96eee64f785b3c4
+EBUILD dropbox-111.4.472.ebuild 2617 BLAKE2B 4c3c0dff5562ba9d40f10b6b5754a5f4ee8011bc7331a0ad9e2d89997a22e00752c8a062a24a4c49404fd6b2743f814b31e792c25ecbeecd0340a4edf33ddebb SHA512 3a89190dd79b8eb50e33262c3a76fd63476c09c42cdb7026abb72e4fd1eb109c92f0f6c09903af4874cb72c271998ceb21723a6f893fb954eade67c1be860765
 MISC metadata.xml 335 BLAKE2B 6b61d3baf32526555421f8507defe48e5dff38e51a27fdbe7a3006a1083f2334b5ea83d4d4d9cf87b45af211a267a31e8bec805a1db1766087090455268fe724 SHA512 ee923a78e49b35d74453bdf51ce5be59f695f5aaf54f7ff58eb2d3165dc9acf97371110f92456a5a39d862a5ebe967c3225489ba407c6ea1250443868255613a
diff --git a/net-misc/dropbox/dropbox-110.4.458.ebuild b/net-misc/dropbox/dropbox-110.4.458.ebuild
deleted file mode 100644
index 7286be94a2dc..000000000000
--- a/net-misc/dropbox/dropbox-110.4.458.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
-	X? (
-		x11-themes/hicolor-icon-theme
-	)
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/glib:2
-	dev-libs/libffi-compat:6
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/wget
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	default
-	# we supply all of these in RDEPEND
-	rm -vf libGL.so.1 libX11* libffi.so.6 || die
-	# some of these do not appear to be used
-	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
-		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
-		wmctrl libdrm.so.2 libpopt.so.0 || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf images || die
-	fi
-	patchelf --set-rpath '$ORIGIN' \
-		apex._apex.*.so \
-		nucleus_python.*.so \
-		tprt.*.so \
-		|| 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
-
-	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_postinst() {
-	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
-	einfo " your user's home directory.  To prevent this, run the following as"
-	einfo " each user who will run dropbox:"
-	einfo ""
-	einfo "install -dm0 ~/.dropbox-dist"
-}
diff --git a/net-misc/dropbox/dropbox-109.4.517.ebuild b/net-misc/dropbox/dropbox-111.4.472.ebuild
index c4fb56f770ad..c4fb56f770ad 100644
--- a/net-misc/dropbox/dropbox-109.4.517.ebuild
+++ b/net-misc/dropbox/dropbox-111.4.472.ebuild