gentoo resync : 16.09.2020

5 files changed, 66 insertions, 61 deletions

diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index f191026eeb04..f61edd99df8a 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,13 +1,13 @@
 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-103.4.383.tar.gz 96880620 BLAKE2B 465ae55d90a4857f3311b4ac154297b1e422316a9b6eb0bec0b466eadafb06a0f8aa64fa8bfdcab44efdf185a344f0ea4bd2baef0df6a5712830687f08e03e96 SHA512 c4cb906729277a2b470e2ff5f4840bb2ff49e947ade1fd0b0eef1edc1bc995953b1a3ad6192592eb0c8c3a09bf67a92935be1114176651e54b227c1bf9c98ab3
 DIST dropbox-lnx.x86-104.4.175.tar.gz 96650490 BLAKE2B 4a74e3b8b31ba720ade57b685978c19827e53dc2eaf4519e10f736121c08e61de66caf1211568c52f624fb020ed8ba5c69c2dbf053bffa9e95d6c9308214d87d SHA512 30dbaa4061f673137f4659f201b62cabff94c827175d00fc348140926a9afe6f693e17237642988ccbe27988eb0aba516705cca65340d59d1d1889784660901c
-DIST dropbox-lnx.x86-98.4.158.tar.gz 96568004 BLAKE2B fc9ae4cf5d9ad1798dd5d55bf90cd5e77e7cd7405626fb55d4693e26d028d97a81d2843eb03d60de94f552cc446fffa4caa679ba3a750098a58549fc78ff4c67 SHA512 ce6432bbec1ec024e6753a93f2d0eed3af60de521f411f52efb63767eb500a85da80102a011e077fd9953d4827403d02143b186f30137ef7a338cb01664911a2
-DIST dropbox-lnx.x86_64-103.4.383.tar.gz 100927456 BLAKE2B f16876f45c345bf1590edb5f76d4bc0cfc3ed6dd1848badfbdbafff8409264c934de48abf9946deb2661d245077af690dfbd6d69c8e2c6b8acf9c13baced7660 SHA512 d0620fdaa6b80679390a906c0d1d4c22e0907ebacbbc06a9c52a5722b6aa793194c759af70888839d806d825d02d1504024efc7b46b7022afb5e71338e2f836e
+DIST dropbox-lnx.x86-105.4.649.tar.gz 96974503 BLAKE2B b14cd6891afcd7858ae7564e4f49753a60a70caef6f0c7ff56ecfef54bf1cfee629fd99f069679d210a3e16f48ab0387ca78bf49f92b2fce40ba4cdb0ec147df SHA512 5dfebc03d76465bc6a6cfd9fdb551385e0fa0b50908c8f2fab90a200815a8c5d90b2294cd8d8ff00284668b4d3e09aba031d124680b6780f5269224ee2e25376
+DIST dropbox-lnx.x86-105.4.651.tar.gz 96975853 BLAKE2B 63c37c22475127d06e5cabd9234818d5a54ca6ebb76b8e53616bc6642b6d9045ad1c0b4cbb364b181b2ccbfc4f6905fe39ce2092cb97978288c6c7e5ee9db771 SHA512 e6c4d02c268753b06613206086f9b4a1ff10202a7bca914a071921407fbd276f6a21352d9b43861966fdafd7dc08181bb0654575fcd0c5b344bd2e8f16ab9a47
 DIST dropbox-lnx.x86_64-104.4.175.tar.gz 100702526 BLAKE2B 49d89293ce5874a01fba14204acfd1234de87b4c5e3f5dfa93cd4041f9412e0801a3e232869e376e583d46d56ea9c7635ec756f005903786dffce1caba608350 SHA512 74e4061ac00881fee06ab7f978c27a2fd0e782db7efa63d10ed7c5ce28a679fe23084521d46f819cfc2a691df6e5aad1bd6706d3c2d604d4addd50ddb99e1b3d
-DIST dropbox-lnx.x86_64-98.4.158.tar.gz 100751556 BLAKE2B 8ebbfa7101852e531edf9c6b3318c14418c95a0e618ce3725411e6fb1dbae70860de9b0daeba4c824fff0b3bd5f9a9347a4fe09c1433f76be3b3cc86184d769e SHA512 00db27742f8dff9d3fb96f06fcefdb30450b675b3c3cd35df717908455a8b1ca0419efff8932022d82c89dd3fccca183bc1bb16a1fb25c0505c49dfd03b06a19
-EBUILD dropbox-103.4.383.ebuild 2548 BLAKE2B 0ab7a439a7f99d50ef8fa036807330510463895ac7498dcac125cc0fb35615fca328a228f0d69d291c182323c4777e6a4e69e7d7201315729df9cf84b0643008 SHA512 4231b7e3b24db00386a00e3c589f2889dbfe9fa4658c8d912e0b9c96de8b35061b588bfd985514928f97fa78f0a01b0b836f0c0e3d34577f5bff985c009bb1a8
-EBUILD dropbox-104.4.175.ebuild 2349 BLAKE2B a62df585380bb874f4127821d3e90164eb85c47c12ba5670c53d1dd91a330a82d6593e52ba5b45a6fa875a8128f772ff9aefbd6ece1429cb17590db70e072e00 SHA512 60162483835652d6a019af5bfaed3c31e4d08c6ecb3e9cf81971a9ea2b7169aaf139d3906f6ba13f45f79ecc1965afe52e25c4cce0eaa31f9fb6f01862819fff
-EBUILD dropbox-98.4.158.ebuild 2546 BLAKE2B 615c2a5848135ecdbae88019b23218acf2114347a931bd345f660f1dc333bbdefbf304ec8c4069947af061e114dea8fe856bffcedbd91437b1300f979f12272f SHA512 88e21dfd4905e1c31114814243cf93b5f6e95302e2f90c7fde2b5c955f0789f1ca66c9b7b7372d2ec5c404d8e6788ce76e66b658151f28ec16020eb3c06aec7e
-MISC metadata.xml 422 BLAKE2B aa4c408abfc15620a5a8aa6f65891c152315200622b4cf65214757244394a7234e01093d4c0d899d93897182061b02631cce9a3f9409e530d9d9d9a7662771a8 SHA512 987f29ecd23a68ee9037749c20640279f1e232e1d09fb0c4279940643ed50cfd2f0ee8c3e5d3f582b6ca227c757bd3306ca7b3bc59cc7a4f86e9586421d4c839
+DIST dropbox-lnx.x86_64-105.4.649.tar.gz 101001350 BLAKE2B e6aeef5bf38649fca5fba35a88080e905a2d16276927bf9ae5952fbc79e32fe7aac5552b7a53fe3cc59170d0af711f2c9c412da8a4539f7bedea6cea47986b03 SHA512 b6f3e766ee9e2b138624bab5ffed9365163b8d33017cce27c9e0beab2b2f500288e6283c59da8a96421daca36b1c6e46925658b6ffab1fdde43efc92ccf1ce18
+DIST dropbox-lnx.x86_64-105.4.651.tar.gz 101001773 BLAKE2B 9cb07111fceec62b34faa7f9b258e9c60f63c7d3828986f9fe06e27c9df24da00d77ec61eed0318c33453a7a4254e89946504deb8e9c1078204a508c2e9ac7df SHA512 8ffdb4682950a643d3230ae07c73a2b6e862051d700af021cb14152b681c7d01164e821b2fd59978612aaf12843084912aae9d0a6fa127d2fcc01e49908a1c5b
+EBUILD dropbox-104.4.175.ebuild 2611 BLAKE2B bf627000c6058defb57ece27ca2ff7a496b98942a896c39d8fa8064c916052d4692c6c9d7ff82ebfea4964ee34ade283a6454d918f906d27a1a80b1c8b6daf6f SHA512 16776b54f81559f301424df3a1c6f8f5526422e07857ce8acf62e1d4be2195532190e69f734c673539762ef25d4077f90b1223f640616fcba52552509300aeb1
+EBUILD dropbox-105.4.649.ebuild 2619 BLAKE2B 0d69bf03e5039bdb5ae193deda12ab1a77c7acf20622f90075d14e61be8b019b8551ec3727cfc37b2d36fd6eb063697840b983f42b3b03fe5efc5b87d61f0cd0 SHA512 aad780d3b5e3daac4126915cd1622025d1734dc83af04f3eef8965cc2c5948298e3c9fbb0dd173d846424a8a09d490150a6f5b69c0e23116fba6513854563bb5
+EBUILD dropbox-105.4.651.ebuild 2619 BLAKE2B 0d69bf03e5039bdb5ae193deda12ab1a77c7acf20622f90075d14e61be8b019b8551ec3727cfc37b2d36fd6eb063697840b983f42b3b03fe5efc5b87d61f0cd0 SHA512 aad780d3b5e3daac4126915cd1622025d1734dc83af04f3eef8965cc2c5948298e3c9fbb0dd173d846424a8a09d490150a6f5b69c0e23116fba6513854563bb5
+MISC metadata.xml 335 BLAKE2B 6b61d3baf32526555421f8507defe48e5dff38e51a27fdbe7a3006a1083f2334b5ea83d4d4d9cf87b45af211a267a31e8bec805a1db1766087090455268fe724 SHA512 ee923a78e49b35d74453bdf51ce5be59f695f5aaf54f7ff58eb2d3165dc9acf97371110f92456a5a39d862a5ebe967c3225489ba407c6ea1250443868255613a
diff --git a/net-misc/dropbox/dropbox-104.4.175.ebuild b/net-misc/dropbox/dropbox-104.4.175.ebuild
index e25a6938b0d2..2408606d15fa 100644
--- a/net-misc/dropbox/dropbox-104.4.175.ebuild
+++ b/net-misc/dropbox/dropbox-104.4.175.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 IUSE="selinux X"
 
 RESTRICT="mirror strip"
@@ -94,3 +94,11 @@ src_install() {
 
 	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-103.4.383.ebuild b/net-misc/dropbox/dropbox-105.4.649.ebuild
index 38f892d3ba40..7286be94a2dc 100644
--- a/net-misc/dropbox/dropbox-103.4.383.ebuild
+++ b/net-misc/dropbox/dropbox-105.4.649.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="+librsync-bundled selinux X"
+IUSE="selinux X"
 
 RESTRICT="mirror strip"
 
@@ -26,27 +26,22 @@ BDEPEND="dev-util/patchelf"
 # Be sure to have GLIBCXX_3.4.9, #393125
 RDEPEND="
 	X? (
-		dev-libs/glib:2
-		media-libs/fontconfig
-		media-libs/freetype
-		virtual/jpeg
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-		x11-misc/wmctrl
 		x11-themes/hicolor-icon-theme
 	)
-	!librsync-bundled? ( <net-libs/librsync-2 )
 	selinux? ( sec-policy/selinux-dropbox )
 	app-arch/bzip2
+	dev-libs/glib:2
 	dev-libs/libffi-compat:6
-	dev-libs/popt
+	media-libs/fontconfig
+	media-libs/freetype
 	net-misc/wget
-	>=sys-devel/gcc-4.2.0
 	sys-libs/zlib
-	sys-libs/ncurses-compat:5"
+	sys-libs/ncurses-compat:5
+	virtual/opengl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+"
 
 src_unpack() {
 	unpack ${A}
@@ -59,20 +54,17 @@ src_unpack() {
 
 src_prepare() {
 	default
-
-	rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die
-	# tray icon doesnt load when removing libQt5* (bug 641416)
-	#rm -vrf libQt5* libicu* qt.conf plugins/ || die
+	# 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
-	if use librsync-bundled ; then
-		patchelf --set-rpath '$ORIGIN' librsyncffi_native.*.so || die
-	else
-		rm -vf librsync.so.1 || die
-	fi
 	patchelf --set-rpath '$ORIGIN' \
 		apex._apex.*.so \
 		nucleus_python.*.so \
@@ -100,3 +92,11 @@ src_install() {
 
 	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-98.4.158.ebuild b/net-misc/dropbox/dropbox-105.4.651.ebuild
index fdd08dee9730..7286be94a2dc 100644
--- a/net-misc/dropbox/dropbox-98.4.158.ebuild
+++ b/net-misc/dropbox/dropbox-105.4.651.ebuild
@@ -13,8 +13,8 @@ SRC_URI="
 
 LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-linux"
-IUSE="+librsync-bundled selinux X"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="selinux X"
 
 RESTRICT="mirror strip"
 
@@ -26,27 +26,22 @@ BDEPEND="dev-util/patchelf"
 # Be sure to have GLIBCXX_3.4.9, #393125
 RDEPEND="
 	X? (
-		dev-libs/glib:2
-		media-libs/fontconfig
-		media-libs/freetype
-		virtual/jpeg
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-		x11-misc/wmctrl
 		x11-themes/hicolor-icon-theme
 	)
-	!librsync-bundled? ( <net-libs/librsync-2 )
 	selinux? ( sec-policy/selinux-dropbox )
 	app-arch/bzip2
+	dev-libs/glib:2
 	dev-libs/libffi-compat:6
-	dev-libs/popt
+	media-libs/fontconfig
+	media-libs/freetype
 	net-misc/wget
-	>=sys-devel/gcc-4.2.0
 	sys-libs/zlib
-	sys-libs/ncurses-compat:5"
+	sys-libs/ncurses-compat:5
+	virtual/opengl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+"
 
 src_unpack() {
 	unpack ${A}
@@ -59,20 +54,17 @@ src_unpack() {
 
 src_prepare() {
 	default
-
-	rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die
-	# tray icon doesnt load when removing libQt5* (bug 641416)
-	#rm -vrf libQt5* libicu* qt.conf plugins/ || die
+	# 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
-	if use librsync-bundled ; then
-		patchelf --set-rpath '$ORIGIN' librsyncffi_native.*.so || die
-	else
-		rm -vf librsync.so.1 || die
-	fi
 	patchelf --set-rpath '$ORIGIN' \
 		apex._apex.*.so \
 		nucleus_python.*.so \
@@ -100,3 +92,11 @@ src_install() {
 
 	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/metadata.xml b/net-misc/dropbox/metadata.xml
index 690936c39b8d..e8403c0e098f 100644
--- a/net-misc/dropbox/metadata.xml
+++ b/net-misc/dropbox/metadata.xml
@@ -8,7 +8,4 @@
     <email>bkohler@gentoo.org</email>
     <name>Ben Kohler</name>
   </maintainer>
-  <use>
-    <flag name="librsync-bundled">Use bundled librsync library</flag>
-  </use>
 </pkgmetadata>