gentoo resync : 20.03.2022

5 files changed, 16 insertions, 117 deletions

diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 8e1f2bdcbd2c..ffba7b6e91c7 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -2,14 +2,13 @@ AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
 DIST DropboxGlyph_Blue.svg 605 BLAKE2B 6c488bd261293b22da98035935ddfa9247bedbc6f4da2f9fc2470af802c1f4f597ac88b01b5bef9e77e1e717267f633d6a04af2ccfd3c5f9dbff22fbceaf9a91 SHA512 9202344b904dcd7955e5a355dadf537d1544140d74f8a33bdc40e18e36661e3a474d11cf17613eaebf4e76c170d8413d99abdedfb8635784bcd6892b4b259712
-DIST dropbox-lnx.x86-138.4.2392.tar.gz 100212564 BLAKE2B 901212edd0a0034cf8040bc745d0ce50c38f922305cad9c07d4c48be935758658e729087008ca039273b2213dd756dcfd212aa10a803bc14537a570e06de5d5c SHA512 b17f77267cfe08ed4d5be3a2087eb8c1fdd7112245aa7f63f7d334f404bc6617dfa45f8f38918971bed051d7f3a9e765b910c597de63e2d48a5afd3d3d9a4fa4
-DIST dropbox-lnx.x86-139.4.4896.tar.gz 99109699 BLAKE2B 42de55420b78be67f863a4e53c252afaf7123ced2df2a597c44cdd4f62482a494c078446a6de15301ee2fbcfda08e8232d8964b9c11d40109b397142ceeb0470 SHA512 57d31a961eec14887af5ac1cadd06b202b4d181e864000f10596637602cf55ad9ceebb5442aab06bf09abeadce7ded4b4794ccfc299a4c0e9dbd6945311d45f3
-DIST dropbox-lnx.x86-140.4.1951.tar.gz 99178001 BLAKE2B eb9f6686386ea7f844f9284786fc9f8ec33653c740de8c6b14cf2853fb21fd883cc317ecf57232d479a5964662bfbe65c675871fa946a68869f797b766bb0724 SHA512 857e97d7091fc4c10c693828424ca0df367c8d4456092e44eade0b6d5057a10923db02a23620b5eb5055ddb53913a7ef7b09ff385529a9da7b0ddf39ae13daa3
-DIST dropbox-lnx.x86_64-138.4.2392.tar.gz 101870495 BLAKE2B c9e38624814afd47776a04d0cf8f7ce7fe1392a72bc778d322f91e3aa097e2769acfe696366dd98f53b2af5ff87f88a9bb78bc906a3cfcd6bff0cd436fb16bd5 SHA512 6692711545af89bbde6f43bafb76b8c89d813522849ddfc66892d575ee4c315273a4a489a73f6e80f457c8b2059a62100469c4d43dd12f99a98d803fde9701bf
-DIST dropbox-lnx.x86_64-139.4.4896.tar.gz 100772994 BLAKE2B e8e79fb351441f4f619227967c7e74f25ac17d305b97ac51dd71e00dc72ca1d213cfeab2f49ed8bb545386de07c9beac249e881f9dafe485575c57766e29def1 SHA512 7f30247b0caa11dcea1c182644611a66daea43b84a97f829342927b7bb80d71dd0ea0bb602eb107e4b4f83d0f2cc5802a0b07f94c01a48d7af0b8d484dd6237a
-DIST dropbox-lnx.x86_64-140.4.1951.tar.gz 100824435 BLAKE2B 03f35dcd651535dbbfaf593119f1ffe58c5c4ee6e1beaac178affdd560e3aad406d36a4b990130915c0152ee9694133142073ad420bf72d6297279f804e358c8 SHA512 97e85eb5426ec26361b57ab07e34b5aefd17925ba2ca73b1f75b006cd6697e42e08b75781ffbef9456ce2e1c36f549c0c7ebf823b495331c98c5fd5c55724471
-EBUILD dropbox-138.4.2392.ebuild 2673 BLAKE2B ea072896d60698af6f9e20e5fe55d846c858748a04d3b7530df6bd5e33b159a76b82046b246a2c38ff56bfc0503c7a71199e5cc2c29731d45349a5f39c3553d0 SHA512 929ebc6094fac362fed2d41379ff535a632da9a9e3c5ade2b1d66a591e9c571b8bb981cfa109a8460918e5e89af49a10071cb7ba4f972d3d66bed673567320c0
-EBUILD dropbox-139.4.4896-r1.ebuild 2867 BLAKE2B 5cb3cbee274db23705e0e5804036332e08450993fe1ffe41ad7ba97b6b85a772b02aed8c4eede759406c65892dd757e49dcccee9be56d66bf47eff1f046add30 SHA512 56e3830c2c7eb74129c91a014ad2ba605df87c5b6e5a98020e2d226375a5343e891c817685375eaf1cc3449d10e427ff5921192cbb3a5373a736781b6e175820
-EBUILD dropbox-139.4.4896.ebuild 2675 BLAKE2B b90735c78f9beb3ed1b4b291bd3945fe2abdeadd9bac0580fc9bf0400149f54f8153495a6ce9d0affbeabf515ce3753d7db9e16be304e32c440eea21308aa422 SHA512 57e11c59311c192269b40d2b9025dfec194f0013d5a8714477f7f3c7ca8a0169c2b2d07c8b744fe728f01238de6c96439c0d16ee9cddfd4381f9401e56a5372d
-EBUILD dropbox-140.4.1951.ebuild 2867 BLAKE2B 5cb3cbee274db23705e0e5804036332e08450993fe1ffe41ad7ba97b6b85a772b02aed8c4eede759406c65892dd757e49dcccee9be56d66bf47eff1f046add30 SHA512 56e3830c2c7eb74129c91a014ad2ba605df87c5b6e5a98020e2d226375a5343e891c817685375eaf1cc3449d10e427ff5921192cbb3a5373a736781b6e175820
+DIST dropbox-lnx.x86-141.4.3299.tar.gz 101154693 BLAKE2B b95f1b1d9ba4673bb8c66129c6221f72f0bd08b86152f4a810e4d7346f52f5bab3488747d007ab6c9f15cf1c9a4df1ca68097f21122465386822a8862f3888dc SHA512 2c9277fa73a5930b2abf113b4f52f205b7dd2cc5b6eb4d46487fb3a70019b77d0fdef7afd24aa9563f527d2b48094d2da865e122523a79f30cbdf0c2c3f87205
+DIST dropbox-lnx.x86-142.4.4197.tar.gz 101203911 BLAKE2B 5f8d299372fb0e6d67eb091ebd95c0f92fc1a1ca7e89b4bbad6c00a7f8b049c9aec46cc330657e797b0125e9c090fec40cbba5475e376262ad38f94ebb9daa58 SHA512 65f77bd6b9906291246a5dd7e5e1ad2771ed4f2e1a969e0335950a88043a0799564ed0d1efa61a2495d4dfd109278edc4b3adeac9b0959cec9e0b3f3f655410f
+DIST dropbox-lnx.x86-143.4.4161.tar.gz 101332974 BLAKE2B c81417a3f100c064af4370cac698a46b7f667eb26b819dbc8420ed7bf583cc5e07ac469cb34ffbb5818314c5adb1869b8611b7c5768feb307f62fcbaf49541c9 SHA512 41ad7016feb2560d09877388e423e16364d132abb1ac4d875b19b3d1be71b9c2f313efcc09f18ebdab6fe3b36f6add50137ea36e67737320a7ec0a229643978c
+DIST dropbox-lnx.x86_64-141.4.3299.tar.gz 103354049 BLAKE2B 5f2d881d8c8422707ab42b3a4f75ca9a9c32023273f3bb0bacd6eb7a9cf89b45b3aa8442649868814ca8d4063978ddb8f34c5c1bc464274c103075ecc19ea514 SHA512 16dd3c717c7cd578b7a7af53cb3f432ce849b5ee7bd13ba86ff919e59c35b8b5ee8e70784995cdfdf49b877d0c3d9ca5638974ee3cbe863e332978c5fad905bf
+DIST dropbox-lnx.x86_64-142.4.4197.tar.gz 103610767 BLAKE2B 005a0b36b9265f6ec9e4b019ac8df1a2e83f56cf15f6f558ab167fa2972a1fad4e605e7553b819877902dbf63685c77c47468882e47c1ef9ec1965d00fe455ce SHA512 30228316033d76dd1204a909f6fb21f21bcb1e2c5752a000619c4a69859299bc441830f5ca5439ea096f2e3f493374257367c90b5d4d6f4c8268bf3010913244
+DIST dropbox-lnx.x86_64-143.4.4161.tar.gz 103726609 BLAKE2B ac611ed45d57d0ffa9f31ba5078e54fdacebc5b59cfc82d101c87db69ad1eff5709159898504c7032e680c4d26d22ccf149299ce874e8709c765fcf9ad5ff41d SHA512 fa885e6ada8000c888cca201127c3511da3e5a007b0984105eb20cb3615addb26dc1558561ab59cecf8835697fd2ed64a357ac28320960b0dbd7778dfbbedd92
+EBUILD dropbox-141.4.3299.ebuild 2865 BLAKE2B 05f3927207125b61497a4ce3c6e76d4e0380bf5f06ef104942036b4663ba6862b64c3ac140753d0199df66aa2556cbb10eb149720bf219f220c7609df970bd11 SHA512 4da3e90183b7f79ce35e50e1b231cd1a3cfb9aeb4fbeafe4cbb922ba45e805e39c2fe91176d52dda7073ff0b8cf300069222fac35fa928fc88ecc936937204d5
+EBUILD dropbox-142.4.4197.ebuild 2867 BLAKE2B 5cb3cbee274db23705e0e5804036332e08450993fe1ffe41ad7ba97b6b85a772b02aed8c4eede759406c65892dd757e49dcccee9be56d66bf47eff1f046add30 SHA512 56e3830c2c7eb74129c91a014ad2ba605df87c5b6e5a98020e2d226375a5343e891c817685375eaf1cc3449d10e427ff5921192cbb3a5373a736781b6e175820
+EBUILD dropbox-143.4.4161.ebuild 2867 BLAKE2B 5cb3cbee274db23705e0e5804036332e08450993fe1ffe41ad7ba97b6b85a772b02aed8c4eede759406c65892dd757e49dcccee9be56d66bf47eff1f046add30 SHA512 56e3830c2c7eb74129c91a014ad2ba605df87c5b6e5a98020e2d226375a5343e891c817685375eaf1cc3449d10e427ff5921192cbb3a5373a736781b6e175820
 MISC metadata.xml 336 BLAKE2B 0932d5cb97ca50abfbfd49b3b209733da73c94ed41ef1087e6c43c4e65f3a09186f74c507cf0db5d64a1c5231d3560a7d6a8bb6130e95e1d5dbb7f3974801df3 SHA512 25bee9aa1ab64f01bb4544dec14b4b98bcb3877714ec33c6cbed4cdd3362d2a4cab58f425cad3723398e4ee0a2ba16a550ab38ff9f974cd0c5046df1b34b5eb0
diff --git a/net-misc/dropbox/dropbox-139.4.4896.ebuild b/net-misc/dropbox/dropbox-139.4.4896.ebuild
deleted file mode 100644
index 3592a37d70d0..000000000000
--- a/net-misc/dropbox/dropbox-139.4.4896.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2022 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
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libxcb
-"
-
-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-138.4.2392.ebuild b/net-misc/dropbox/dropbox-141.4.3299.ebuild
index f3ad56f900ca..f43dae64fff9 100644
--- a/net-misc/dropbox/dropbox-138.4.2392.ebuild
+++ b/net-misc/dropbox/dropbox-141.4.3299.ebuild
@@ -9,7 +9,9 @@ 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 )"
+	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
+	https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
+"
 
 LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
@@ -85,7 +87,10 @@ src_install() {
 	fperms a+x "${targetdir}"/{dropbox,dropboxd}
 	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
 
-	use X && doicon -s 16 -c status "${T}"/status
+	if use X; then
+		doicon -s 16 -c status "${T}"/status
+		newicon -s scalable "${DISTDIR}/DropboxGlyph_Blue.svg" dropbox.svg
+	fi
 
 	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
 
diff --git a/net-misc/dropbox/dropbox-139.4.4896-r1.ebuild b/net-misc/dropbox/dropbox-142.4.4197.ebuild
index 0c3e0f739306..0c3e0f739306 100644
--- a/net-misc/dropbox/dropbox-139.4.4896-r1.ebuild
+++ b/net-misc/dropbox/dropbox-142.4.4197.ebuild
diff --git a/net-misc/dropbox/dropbox-140.4.1951.ebuild b/net-misc/dropbox/dropbox-143.4.4161.ebuild
index 0c3e0f739306..0c3e0f739306 100644
--- a/net-misc/dropbox/dropbox-140.4.1951.ebuild
+++ b/net-misc/dropbox/dropbox-143.4.4161.ebuild