gentoo resync : 28.04.2021

5 files changed, 34 insertions, 256 deletions

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 7acd97682fee..7843c8bac8d4 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -2,11 +2,10 @@ AUX xpra-2.0-suid-warning.patch 617 BLAKE2B dc7f1ba0ec9e30e260601f1151edb4385561
 AUX xpra-3.0.2-ldconfig.patch 1270 BLAKE2B b4eaa81610899c16a43b43c5f11f93335ca48add1302ed2bc2d6f1d6a1df3c234a65562c42b19b7ad53b0d267d9763606d43ba3ce18cfb6d70565d2f684dbe7c SHA512 09684ac0ac9626d1a441fb17a61919b3b1685520affcc72aa59e64c24ad55ffc7712af57e2ec392710e7dc412039daa6c76456ee6d5464a3e4057fb61d9ad7b1
 AUX xpra-3.0.2_ignore-gentoo-no-compile.patch 610 BLAKE2B 963b3b61602f6a7ad7c8247109932d0da7eeef2762eaa8a987a8f10178a13cec3255000661bc7e3344319a555c9f0ed41b6383be7728af543cb5d2e004c377b2 SHA512 ff16637dca766ba2d36351e1aeeb87f2bab02e73e8da8fdb566051727b0c6fec6df1925318eee8d1c87580196ec78f0303da56d3439b4b4bace3105a914251e8
 AUX xpra-4.0.3-suid-warning.patch 731 BLAKE2B 6e576c088bc59ee7a52e15a8fbceb9117a47e4bf818b6777ffe977b5db1f9e72077ffeea07570312603f160d5556d2980914887f56d9733b1b6bf49ae385d0e4 SHA512 d3a3c2a2510159e83d6d6bda11f37b5500ce80d4bac059d3bcee8293caa93652a132d074f46a728204b012c61707994ebb87e0e02afd0c4efeab7a705ba5ea69
-AUX xpra-4.0.6-r28363.patch 10454 BLAKE2B 8385dc347edf9e3464784cf0d9bb8450696b66bb66af3b14e3a3440fb2b6ffea9f1d7c640f1973e8d37084eced58daad451162ac2b6798a7b5e7fb8f6f89b430 SHA512 a75534371a391fe1fbf6cd327e0df9eeb1fc7b65376de734f523984ea124ad95c7782af380735b95500cc63002e065c9684bb92095c5850f2cf42e7b15d661f8
 DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647 SHA512 3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
-DIST xpra-4.0.6.tar.xz 2797752 BLAKE2B 3f2d4108fec1f1b5c0cd38a26f1a2c41af253fd234427e8e54104ff3742b9f7ae3e1863db837addd76acc6856b6f3cfcbde97edc2bc75314b215d4ca46a816f8 SHA512 e3dc66040898ed40ef12b8cdb89e5f42c2f36edc071afb435334389e727f376ddc116dbee47018468bff24f2cdd7be35750b58bc108ba73c5558bd9eccbd04ea
-DIST xpra-4.1.1.tar.xz 2674236 BLAKE2B 388306b33d99e97e07eb4a0f14ad33a08f9b367fa8e8b6d0553b0815ceb1b99540d027d2bdf8b6ef0a8ad3dda5a92861acf6c429034b7dd7e061eaefe86ade89 SHA512 b6312fb40849446ad88181664256610fcc673c5263449f610dd3fe40d0f331b1493efdee0560b78ef217ebc168d81a020b3bc97d369f9c1810a73e62e8e02873
-EBUILD xpra-3.0.5-r2.ebuild 3841 BLAKE2B 387b36e4114eb489815bc6c09cd2ec7f9cb560d9c37e50aaadb567d5a8b9917c68f7b6db086a01d9efe719b955791c6ac70b8b913e5c86d25bff4d6da3d8679f SHA512 6fd77a9190d67a7c77b329d929890716d6b5814470383eea1dbf816fe190b8570997833bde5741d766745e54bd7e5e4f6f746609a69d0cc69c23f0f27907959c
-EBUILD xpra-4.0.6_p28363.ebuild 3903 BLAKE2B 21eed5f246a785f88fc1a00f77fa707c522de1f2c8a52fb5e9343aecfdff2c2fe726ad5f778dcb79dc1c6237ec3e2fa35ad0647a2b034bb6434d8a10dc15ccd2 SHA512 6d1ff46e3625937d9b71f7ea8f15f41c84e66f9014712f622bd259cb9026fe314e57b454aabdc8df3ec0cea78606f05e54d5f9883d49ff3d793ec62182b16962
-EBUILD xpra-4.1.1.ebuild 3905 BLAKE2B 7eb6ec4ef2ead2166f938dc90f1ab1720da1b4e21f2b91e8775f8113ff3acc773a06c1d60d0e1391e3360dc658a9691506255ca11abbcbe05d68c10f21910eb0 SHA512 6ffba9a2cfbdee776711f44a688c2aebe0167aad65932d1644147bb4c62422e4486b0076145a06cbb065e9a4994201bb75eea41ca254421e22d514dc6f12d26f
+DIST xpra-4.1.2.tar.xz 2676588 BLAKE2B db3694fdd9f7e20ba93099ecde50d712de41bb64a2d317b9f10e349b7f501015d083c212250206c0f3e25e154311a096ce4c17972131af68584be666bbf7e067 SHA512 860533c4173b92ee110e65849110870a3b129b993d8a2a2308142474164e4f1c45984669e7e3963540290192310de5d2de0e0713b80f4cb8c6ae7f9c3bb0814e
+DIST xpra-4.1.3.tar.gz 3850971 BLAKE2B b5f5a0546c785762974f27650408cb83fdfa2ac8a5b5dd8c6b08a9978ff17a0dfc85f95fde405689a19517ef66bcc7aefc1dad71acc2dda7883ed38d3c22b91c SHA512 e401793ae9a4539d39bc161be4d34af2dca81c78f189664d8ebdefff99d413d364d4ceb37dd776b027b206119da81957ef7436a727c00d3ad5895a3c90742e39
+EBUILD xpra-3.0.5-r2.ebuild 3834 BLAKE2B 774548ad7f6e2f9f1cf4751d8ef1119e7fb93ac3d1fb9a1d89367e6ec8a20430fd3787a8681b7abd72a2da4e7b05c4f078f92a7a13fcf96b8e448449aa490254 SHA512 f019c875c6e5feffb6ff09d4ef2c3c9cfeb360c98e03a59863e5c3e0b43c4e143d24434559659f5e85577e2e80a332e7fd7889a48041c32b8e97f810c50be598
+EBUILD xpra-4.1.2.ebuild 4103 BLAKE2B e1247052d7953d0a350f40930332d75238087efebc72a2d447bf4b5925db8a30212540f67404b010139b10c61b1a55160ddd0bff9e4dca7736fdd2ec32258af9 SHA512 769b995d24eeb348286993b1eff2c4d2c4caab0456300eb4ace5e7e962825143d3ef4d95d5446b8f8409497a3c491202f246cb631b50639f98e26a28bcf100ea
+EBUILD xpra-4.1.3.ebuild 4103 BLAKE2B d279ddb09bcb0c784d98387b7e4ef61b73a550b865085f9d24f1863902759cff57f573df5fcb1b8e2c0f1e2e93f09b9e49ec95b323157f3d965e41e40e5e0257 SHA512 27330d1b6a9e95ab2c93bf6620fe357b863d3a1493ea129c6d3154ccd953ed4379f4b21fb8858177d040f5bb01bfa205e2aa49d41c72c5a327453be4c0a1d982
 MISC metadata.xml 1090 BLAKE2B 51b66f86c4858f3c6081e03ee5444b0fd84de0db0355e7538a507ae6290b82f09407acef6e335ac7c5d7dfa2801da5e6b0f0b904daea6fd5c34f19d17492007a SHA512 99dde78c6a33dbbb890b071165c9e0ca57ea3d7a6866abfccda2d976006dcf17b531b2dd464a2c0e312c181d1a3561ba61316a8c5c9c27976281965673aca55d
diff --git a/x11-wm/xpra/files/xpra-4.0.6-r28363.patch b/x11-wm/xpra/files/xpra-4.0.6-r28363.patch
deleted file mode 100644
index 5187b700c0df..000000000000
--- a/x11-wm/xpra/files/xpra-4.0.6-r28363.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-Index: selinux/xpra_socketactivation/xpra_socketactivation.te
-===================================================================
---- a/selinux/xpra_socketactivation/xpra_socketactivation.te	(revision 28285)
-+++ b/selinux/xpra_socketactivation/xpra_socketactivation.te	(revision 28363)
-@@ -27,6 +27,7 @@
- 	type unconfined_t;
- 	type bin_t;
- 	type avahi_t;
-+	type config_home_t;
- 
- 	attribute can_read_shadow_passwords;
- }
-@@ -55,6 +56,9 @@
- allow xpra_t xpra_conf_t:dir { getattr open read search };
- files_search_etc(xpra_t)
- 
-+allow xpra_t config_home_t:dir { getattr search };
-+allow xpra_t config_home_t:file { getattr ioctl open read };
-+
- type xpra_socket_t;
- files_type(xpra_socket_t)
- 
-Index: setup.py
-===================================================================
---- a/setup.py	(revision 28285)
-+++ b/setup.py	(revision 28363)
-@@ -1533,8 +1533,9 @@
-                     for k,v in subs.items():
-                         data = data.replace(k, v)
-                 with open(dst_file, "wb") as f:
--                    return f.write(data)
-+                    f.write(data)
-                 if chmod:
-+                    print("chmod(%s, %s)" % (dst_file, oct(chmod)))
-                     os.chmod(dst_file, chmod)
- 
-             if printing_ENABLED and POSIX:
-Index: unittests/unit/net/crypto_test.py
-===================================================================
---- a/unittests/unit/net/crypto_test.py	(revision 28285)
-+++ b/unittests/unit/net/crypto_test.py	(revision 28363)
-@@ -88,7 +88,7 @@
-         start = monotonic_time()
-         self.do_test_backend(data, enc_iterations, dec_iterations)
-         end = monotonic_time()
--        elapsed = end-start
-+        elapsed = max(0.0001, end-start)
-         speed = (asize*16) * (enc_iterations + dec_iterations) / elapsed
-         iter_time = elapsed*1000/(enc_iterations + dec_iterations)
-         print("%10iKB: %5.1fms: %16iMB/s" % (asize*16//1024, iter_time, speed//1024//1024))
-Index: win32/MINGW_BUILD.sh
-===================================================================
---- a/win32/MINGW_BUILD.sh	(revision 28285)
-+++ b/win32/MINGW_BUILD.sh	(revision 28363)
-@@ -286,6 +286,8 @@
- #why is it shipping those files??
- find lib/ -name "*dll.a" -exec rm {} \;
- #only keep the actual loaders, not all the other crap cx_Freeze put there:
-+#but keep librsvg
-+mv lib/gdk-pixbuf-2.0/2.10.0/loaders/librsvg* ./
- mkdir lib/gdk-pixbuf-2.0/2.10.0/loaders.tmp
- mv lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*.dll lib/gdk-pixbuf-2.0/2.10.0/loaders.tmp/
- rm -fr lib/gdk-pixbuf-2.0/2.10.0/loaders
-@@ -326,6 +328,9 @@
- #and keep pdfium:
- mv lib/*pdfium*.dll ./
- pushd lib > /dev/null
-+#cx_Freeze forgets these two!?
-+cp $MINGW_PREFIX/bin/libatk-*dll ./
-+cp $MINGW_PREFIX/bin/libgtk-*dll ./
- #remove all the pointless duplication:
- for x in `ls *dll`; do
- 	find ./ -mindepth 2 -name "${x}" -exec rm {} \;
-Index: xpra/client/gtk_base/gtk_client_window_base.py
-===================================================================
---- a/xpra/client/gtk_base/gtk_client_window_base.py	(revision 28285)
-+++ b/xpra/client/gtk_base/gtk_client_window_base.py	(revision 28363)
-@@ -1806,10 +1806,16 @@
- 
-     def _set_backing_size(self, ww, wh):
-         b = self._backing
-+        bw = self._client.cx(ww)
-+        bh = self._client.cy(wh)
-+        if max(ww, wh)>=32000 or min(ww, wh)<0:
-+            raise Exception("invalid window size %ix%i" % (ww, wh))
-+        if max(bw, bh)>=32000:
-+            raise Exception("invalid window backing size %ix%i" % (bw, bh))
-         if b:
--            b.init(ww, wh, self._client.cx(ww), self._client.cy(wh))
-+            b.init(ww, wh, bw, bh)
-         else:
--            self.new_backing(self._client.cx(ww), self._client.cy(wh))
-+            self.new_backing(bw, bh)
- 
-     def resize(self, w, h, resize_counter=0):
-         ww, wh = self.get_size()
-Index: xpra/net/file_transfer.py
-===================================================================
---- a/xpra/net/file_transfer.py	(revision 28285)
-+++ b/xpra/net/file_transfer.py	(revision 28363)
-@@ -580,6 +580,10 @@
- 
-     def _process_open_url(self, packet):
-         url, send_id = packet[1:3]
-+        try:
-+            url = strtobytes(url).decode("utf8")
-+        except UnicodeDecodeError:
-+            url = bytestostr(url)
-         if not self.open_url:
-             filelog.warn("Warning: received a request to open URL '%s'", url)
-             filelog.warn(" but opening of URLs is disabled")
-@@ -670,12 +674,12 @@
-         filelog("process send-data-request: send_id=%s, url=%s, printit=%s, openit=%s", s(send_id), url, printit, openit)
-         def cb_answer(accept):
-             filelog("accept%s=%s", (url, printit, openit), accept)
-+            self.send("send-data-response", send_id, accept)
-         #filenames and url are always sent encoded as utf8:
-         try:
-             url = strtobytes(url).decode("utf8")
-         except:
-             url = bytestostr(url)
--            self.send("send-data-response", send_id, accept)
-         if dtype==b"file":
-             if not self.file_transfer:
-                 cb_answer(False)
-Index: xpra/net/socket_util.py
-===================================================================
---- a/xpra/net/socket_util.py	(revision 28285)
-+++ b/xpra/net/socket_util.py	(revision 28363)
-@@ -622,7 +622,7 @@
-             log.info(" %s does not exist", dirname)
-         #only show extra information if the socket permissions
-         #would have been accessible by the group:
--        if POSIX and (sperms & 0o40):
-+        elif POSIX and (sperms & 0o40):
-             uid = getuid()
-             username = get_username_for_uid(uid)
-             groups = get_groups(username)
-Index: xpra/platform/xposix/paths.py
-===================================================================
---- a/xpra/platform/xposix/paths.py	(revision 28285)
-+++ b/xpra/platform/xposix/paths.py	(revision 28363)
-@@ -102,12 +102,12 @@
- 
- def do_get_user_conf_dirs(uid):
-     #per-user configuration location:
--    #(but never use /root/.xpra)
-+    #(but never use /root/.xpra or /root/.config/xpra)
-     if uid is None:
-         uid = os.getuid()
-     dirs = []
--    dirs += [os.path.join(os.environ.get("XDG_CONFIG_HOME", "~/.config"), "xpra")]
-     if uid>0:
-+        dirs += [os.path.join(os.environ.get("XDG_CONFIG_HOME", "~/.config"), "xpra")]
-         dirs.append("~/.xpra")
-     return dirs
- 
-Index: xpra/platform/xposix/sd_listen.pyx
-===================================================================
---- a/xpra/platform/xposix/sd_listen.pyx	(revision 28285)
-+++ b/xpra/platform/xposix/sd_listen.pyx	(revision 28363)
-@@ -52,7 +52,7 @@
-     return sockets
- 
- def get_sd_socket_type(fd):
--    from xpra.net.common import TCP_SOCKTYPES
-+    from xpra.net.bytestreams import TCP_SOCKTYPES
-     socktype = os.environ.get("XPRA_SD%i_SOCKET_TYPE" % fd)
-     if not socktype:
-         socktype = os.environ.get("XPRA_SD_SOCKET_TYPE", "tcp")
-Index: xpra/server/mixins/audio_server.py
-===================================================================
---- a/xpra/server/mixins/audio_server.py	(revision 28285)
-+++ b/xpra/server/mixins/audio_server.py	(revision 28363)
-@@ -121,7 +121,7 @@
-             from xpra.platform.xposix.paths import _get_xpra_runtime_dir, get_runtime_dir
-             rd = osexpand(get_runtime_dir())
-             if not os.path.exists(rd) or not os.path.isdir(rd):
--                log.warn("Warning: the runtime directory '%s' does not exist,")
-+                log.warn("Warning: the runtime directory '%s' does not exist,", rd)
-                 log.warn(" cannot start a private pulseaudio server")
-             else:
-                 xpra_rd = _get_xpra_runtime_dir()
-Index: xpra/server/window/motion.pyx
-===================================================================
---- a/xpra/server/window/motion.pyx	(revision 28285)
-+++ b/xpra/server/window/motion.pyx	(revision 28363)
-@@ -79,7 +79,7 @@
-         for i,v in enumerate(arr):
-             self.a2[i] = <uint64_t> abs(v)
- 
--    def update(self, pixels, int16_t x, int16_t y, uint16_t width, uint16_t height, uint16_t rowstride, uint8_t bpp=4):
-+    def update(self, pixels, int16_t x, int16_t y, uint16_t width, uint16_t height, uint32_t rowstride, uint8_t bpp=4):
-         """
-             Add a new image to compare with,
-             checksum its rows into a2,
-Index: xpra/server/window/window_video_source.py
-===================================================================
---- a/xpra/server/window/window_video_source.py	(revision 28285)
-+++ b/xpra/server/window/window_video_source.py	(revision 28363)
-@@ -1785,6 +1785,13 @@
-             scrolllog("no scrolling: detection has already been used on this image")
-             #we've already checked
-             return False
-+        x = image.get_target_x()
-+        y = image.get_target_y()
-+        w = image.get_width()
-+        h = image.get_height()
-+        if w>=32000 or h>=32000:
-+            scrolllog("no scrolling: the image is too large, %ix%i", w, h)
-+            return False
-         #don't download the pixels if we have a GPU buffer,
-         #since that means we're likely to be able to compress on the GPU too with NVENC:
-         if not image.has_pixels():
-@@ -1792,10 +1799,6 @@
-         if self.content_type=="video" or not self.non_video_encodings:
-             scrolllog("no scrolling: content is video")
-             return False
--        x = image.get_target_x()
--        y = image.get_target_y()
--        w = image.get_width()
--        h = image.get_height()
-         if w<MIN_SCROLL_IMAGE_SIZE or h<MIN_SCROLL_IMAGE_SIZE:
-             scrolllog("no scrolling: image size %ix%i is too small, minimum is %ix%i",
-                       w, h, MIN_SCROLL_IMAGE_SIZE, MIN_SCROLL_IMAGE_SIZE)
-Index: xpra/x11/x11_server_core.py
-===================================================================
---- a/xpra/x11/x11_server_core.py	(revision 28285)
-+++ b/xpra/x11/x11_server_core.py	(revision 28363)
-@@ -687,7 +687,7 @@
-                 #we can use XRRSetScreenSize:
-                 try:
-                     with xsync:
--                        RandR.xrr_set_screen_size(w, h, self.xdpi or self.dpi, self.ydpi or self.dpi)
-+                        RandR.xrr_set_screen_size(w, h, self.xdpi or self.dpi or 96, self.ydpi or self.dpi or 96)
-                 except XError:
-                     screenlog("XRRSetScreenSize failed", exc_info=True)
-             screenlog("calling RandR.get_screen_size()")
diff --git a/x11-wm/xpra/xpra-3.0.5-r2.ebuild b/x11-wm/xpra/xpra-3.0.5-r2.ebuild
index dcc8cb7aa4f3..1371e2b78d86 100644
--- a/x11-wm/xpra/xpra-3.0.5-r2.ebuild
+++ b/x11-wm/xpra/xpra-3.0.5-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=no
-inherit xdg distutils-r1 eutils flag-o-matic user tmpfiles prefix
+inherit xdg distutils-r1 flag-o-matic user tmpfiles prefix
 
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
 HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
diff --git a/x11-wm/xpra/xpra-4.1.1.ebuild b/x11-wm/xpra/xpra-4.1.2.ebuild
index 65e293302714..cde55d551959 100644
--- a/x11-wm/xpra/xpra-4.1.1.ebuild
+++ b/x11-wm/xpra/xpra-4.1.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_SINGLE_IMPL=yes
 DISTUTILS_USE_SETUPTOOLS=no
-inherit xdg distutils-r1 tmpfiles prefix
+inherit xdg distutils-r1 tmpfiles prefix udev
 
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
 HOMEPAGE="https://xpra.org/"
@@ -157,3 +157,12 @@ python_configure_all() {
 
 	export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
 }
+
+python_install_all() {
+	distutils-r1_python_prepare_all
+
+	# Move udev dir to the right place.
+	local dir=$(get_udevdir)
+	dodir "${dir%/*}"
+	mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
+}
diff --git a/x11-wm/xpra/xpra-4.0.6_p28363.ebuild b/x11-wm/xpra/xpra-4.1.3.ebuild
index 5a306498e828..db407cd0db72 100644
--- a/x11-wm/xpra/xpra-4.0.6_p28363.ebuild
+++ b/x11-wm/xpra/xpra-4.1.3.ebuild
@@ -6,17 +6,16 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_SINGLE_IMPL=yes
 DISTUTILS_USE_SETUPTOOLS=no
-inherit xdg distutils-r1 tmpfiles prefix
+inherit xdg distutils-r1 tmpfiles prefix udev
 
-MY_P="${PN}-${PV%_p*}"
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
 HOMEPAGE="https://xpra.org/"
-SRC_URI="https://xpra.org/src/${MY_P}.tar.xz"
+SRC_URI="https://xpra.org/src/${P}.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="brotli +client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo minimal opengl pillow pulseaudio server sound test vpx webcam webp"
+IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg +lz4 lzo minimal opengl pillow pulseaudio server sound test vpx webcam webp"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( client server )
@@ -86,6 +85,7 @@ BDEPEND="
 	$(python_gen_cond_dep '
 		>=dev-python/cython-0.16[${PYTHON_USEDEP}]
 	')
+	doc? ( app-text/pandoc )
 "
 
 RESTRICT="!test? ( test )"
@@ -94,11 +94,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
 	"${FILESDIR}"/${PN}-3.0.2-ldconfig.patch
 	"${FILESDIR}"/${PN}-4.0.3-suid-warning.patch
-	"${FILESDIR}"/${PN}-4.0.6-r28363.patch
 )
 
-S="${WORKDIR}/${MY_P}"
-
 pkg_postinst() {
 	tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
 
@@ -110,6 +107,9 @@ python_prepare_all() {
 	hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \
 		xpra/platform{/xposix,}/paths.py xpra/scripts/server.py
 
+	sed -r -e "/\bdoc_dir =/s:/${PN}\":/${PF}/html\":" \
+		-i setup.py || die
+
 	if use minimal; then
 		sed -r -e 's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \
 			-i setup.py || die
@@ -134,16 +134,15 @@ python_configure_all() {
 		$(use_with cups printing)
 		--without-debug
 		$(use_with dbus)
+		$(use_with doc docs)
 		$(use_with ffmpeg dec_avcodec2)
 		$(use_with ffmpeg enc_ffmpeg)
 		$(use_with ffmpeg enc_x264)
 		$(use_with ffmpeg enc_x265)
 		--with-gtk3
-		--without-html5
 		$(use_with jpeg jpeg_encoder)
 		$(use_with jpeg jpeg_decoder)
 		--without-mdns
-		--without-minify
 		$(use_with opengl)
 		$(use_with server shadow)
 		$(use_with server)
@@ -158,3 +157,12 @@ python_configure_all() {
 
 	export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
 }
+
+python_install_all() {
+	distutils-r1_python_prepare_all
+
+	# Move udev dir to the right place.
+	local dir=$(get_udevdir)
+	dodir "${dir%/*}"
+	mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
+}