gentoo resync : 15.01.2020

3 files changed, 33 insertions, 1 deletions

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 7ab08671f486..77bc871c7025 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,5 +1,6 @@
 AUX xpra-0.13.1-ignore-gentoo-no-compile.patch 485 BLAKE2B 2c4a9c0d0fd6e9542abbcd7834d487ca64018b43ef365478f18d8959f0602dd1f4a50f48332487aa413ad4b4f8a91946494ef223b1b2b2c887400e7f7077f429 SHA512 244d6aaa805ef0f99238a0f1ff592efc9fda9d7c3898c0e3ff8a40bfb2d27597737e941b90d1d86c794a50dc61ade8862a4be97ef4938005b0f918565dc7abe9
 AUX xpra-2.0-suid-warning.patch 617 BLAKE2B dc7f1ba0ec9e30e260601f1151edb43855619a1c34bc29c05536c4dea30c8131179ea17ca30ce3ae2c87d7b374f7a02a5afcde89b6bf29921fc0a9de457e3d54 SHA512 f0d69a6e57435d6c9ef1ecb10e9fa6916b2a8b11f5979b7dffcc37c0a8ec387306b651d50ca3fe10a489cb28f6c2384fbe578510bd7f9bc7a51249e66c4d17ab
+AUX xpra-3.0.2-dbus.patch 1128 BLAKE2B c908950df22a16174c7885543e93277902826b8b0273472e8e70ea563d1fe24a0c9ca624e65fe1b312e27d093a7d24acda8db685cd3bdae29bd712a23b5d0d2d SHA512 c2d913ccb82cac41bd16271a878459fc4468620d9f235c2aaab3af7d327a666c8830cea43ba49da7a4faf9b609e6b3b8bbbf02f377399778af01139af4a38c88
 AUX xpra-3.0.2_ignore-gentoo-no-compile.patch 610 BLAKE2B 963b3b61602f6a7ad7c8247109932d0da7eeef2762eaa8a987a8f10178a13cec3255000661bc7e3344319a555c9f0ed41b6383be7728af543cb5d2e004c377b2 SHA512 ff16637dca766ba2d36351e1aeeb87f2bab02e73e8da8fdb566051727b0c6fec6df1925318eee8d1c87580196ec78f0303da56d3439b4b4bace3105a914251e8
 DIST xpra-2.2.2.tar.xz 2195836 BLAKE2B 39d8354738df399d98248a0d455c3b7fa6124f374f0f6e0a476bae53b9728b9ab16c11bd759b6ff52a28295445809fb18b3379b7fc620f0916944f738a00b280 SHA512 5c09e29732c9ca7d03557e4e6070517b192484e67944532d5aeca53e518c8617f7d3a5919a2557050fbb9aa4123a0302a53720dd7036823db83588264dd3e6d2
 DIST xpra-2.2.6.tar.xz 2198720 BLAKE2B 41f238e98dbb60598cffcc3960375a525658c72db478acace0acb964fe3ee039acb5e352a76ffb5724b6c4acd63ea510505f6841f688c67d0ae2a3cbc2270642 SHA512 f47b7a8b08fc90bdf3cba91e4f7343785cdf6e24a0979f4564e9f6885b0f36c03ff5656e2d7ac5fd21895faca7b00e8839ebd66c82122a2c7cab2b40bd44e745
@@ -8,5 +9,5 @@ DIST xpra-3.0.2.tar.xz 2749196 BLAKE2B 3c8745657a12637704fb88ac7b867ab387ef7ed22
 EBUILD xpra-2.2.2-r1.ebuild 4074 BLAKE2B 6e3faee346e422a113ba09c8cf355caa2ecc41c74c2ab1d720b32e6a3b051ba8b156785bc2c0a872ba186a18af2dd370b668dc512a4cfe3fdc6f421d9c16ae52 SHA512 24476f6100dd733d61316d695d644337b4c3bfcbd405cddc9429496fe64502a6605157a648c5417045db9b75c21343e072d87f12b239ed31c0289a87f96c06f3
 EBUILD xpra-2.2.6-r2.ebuild 4122 BLAKE2B 661931d507e047c6d78871adf14693b11a499eb05e96afadec6ac93678f890b715bcd884982fa9d76fb5ded069de09f5ee1df9a56d0d1668e25aa0b0d05eb82d SHA512 4a038cffd380329cb608d91ec5372df75fcb01724cf37dd24b10b222a91697d3a53e5042e631bdeb3c430f91c7ede8418aeaa31a9905624030947a55c7a608e4
 EBUILD xpra-2.4.3.ebuild 4161 BLAKE2B 29513d3a7d880f921bf474b5d2994315ba5b78ee38ea6d44ac1891ffd551571b42a5d6ffbdff24149c0df0a6898ae73f5585c3ade877f09475b2d7c2769cd116 SHA512 aa6a85ae73339fd65d7f971da9e77f7fee9803f5056e5273f07c7ae8a66fca40065546cf571fa9a2db8cdfe711f4f1ed86c893be8d0ff0490065f0e0d0ec9de5
-EBUILD xpra-3.0.2.ebuild 4283 BLAKE2B cc64121bc0b17e0304c456fe2bdeed4b87f78dc0604a54a402fc2453f695daf868166c4c0741721ea87da84f7c7648cc81f7601a73cfb633daea816bc2822e3a SHA512 4831ab12404ea3d0f0129c34403508d558126cebfb37cdfdf0339f0e4ce661aba6e143407bae356fba69e07c372ab9f5177f277f353f8b114d74e7a8d5ac2362
+EBUILD xpra-3.0.2.ebuild 4339 BLAKE2B 2188887c73f3c057ebb43e4f3c9031f2a83dd34b86df9aba6b4fb2485cc40e1fbd3d81fa2b3608d5fd0ccb2b10120e385a11c8989b1e7b2908f62d77605d4c95 SHA512 a155a6ed3217842ac004c8672e201cb376775d2e1984c98ccb0260953e46c308109edfb06ff6d8a1fb957a06753735eeb8132182ba668756c6efc0c126e78fae
 MISC metadata.xml 1183 BLAKE2B 3401d4bc8847e1da6884abaa431cf0c64bc6cd2d1e118bde8b225f8a3670b561d9109cfa248652a71c397a9cdc8d50f6fd83a48ab41de569e03e22e63f5acd2b SHA512 5a48871a51cebe09db53997d61e49ed0828be430f34772b88fc06770bd90a935bec31e0dce7fb78756c337faf9cc1fa4896f5d6d709857fee9fde007ec0b0986
diff --git a/x11-wm/xpra/files/xpra-3.0.2-dbus.patch b/x11-wm/xpra/files/xpra-3.0.2-dbus.patch
new file mode 100644
index 000000000000..e0f14b8ba59d
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-3.0.2-dbus.patch
@@ -0,0 +1,29 @@
+Remove dbus functionality if USE=dbus is not specified.
+
+Index: xpra-3.0.2/xpra/scripts/server.py
+===================================================================
+--- xpra-3.0.2.orig/xpra/scripts/server.py
++++ xpra-3.0.2/xpra/scripts/server.py
+@@ -748,14 +748,9 @@ def do_run_server(error_cb, opts, mode,
+         log("chdir(%s)", opts.chdir)
+         os.chdir(opts.chdir)
+ 
+-    dbus_pid, dbus_env = 0, {}
+     if not shadowing and POSIX and not OSX and not clobber:
+         no_gtk()
+         assert starting or starting_desktop or proxying
+-        from xpra.server.dbus.dbus_start import start_dbus
+-        dbus_pid, dbus_env = start_dbus(opts.dbus_launch)
+-        if dbus_env:
+-            os.environ.update(dbus_env)
+ 
+     display = None
+     if not proxying:
+@@ -835,7 +830,6 @@ def do_run_server(error_cb, opts, mode,
+         app.display_name = display_name
+         app.init(opts)
+         app.init_sockets(sockets)
+-        app.init_dbus(dbus_pid, dbus_env)
+         if not shadowing and (xvfb_pid or clobber):
+             app.init_display_pid(xvfb_pid)
+         app.original_desktop_display = desktop_display
diff --git a/x11-wm/xpra/xpra-3.0.2.ebuild b/x11-wm/xpra/xpra-3.0.2.ebuild
index c57900d96ee6..f3cb1bc10dec 100644
--- a/x11-wm/xpra/xpra-3.0.2.ebuild
+++ b/x11-wm/xpra/xpra-3.0.2.ebuild
@@ -97,6 +97,8 @@ pkg_postinst() {
 }
 
 python_prepare_all() {
+	use dbus || eapply ${FILESDIR}/${PN}-3.0.2-dbus.patch
+
 	hprefixify -w '/os.path/' setup.py
 	hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \
 		xpra/platform{/xposix,}/paths.py xpra/scripts/server.py