[gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/

[James Le Cuirot]

commit:     33f1645df2181fcd724b4a4b5a40c5d76d326994
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 22 21:40:18 2022 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 21:40:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33f1645d

x11-wm/xpra: Version bump to 4.3.4

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 x11-wm/xpra/Manifest                                | 1 +
 x11-wm/xpra/{xpra-9999.ebuild => xpra-4.3.4.ebuild} | 6 +++---
 x11-wm/xpra/xpra-9999.ebuild                        | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 70bd8bab90ad..310851c94a31 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,3 +1,4 @@
 DIST xpra-4.2.tar.gz 4057304 BLAKE2B 
17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10
 SHA512 
261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353
 DIST xpra-4.3.1-tests.patch 51444 BLAKE2B 
c645aa52bb06c3872f6c1c7aace099c10a6fd46dd4c386ec1a13f6326e3fc8860a71767510ce9b44375cc8b30cef563e4405b2834670a9d2c555d3359d16e99f
 SHA512 
0c70c33e24980db31e904c91f987a73693bd2349958ea8392138987e1dc1852ea42a4ee7e3b238f01c92adc57dbe196e57f4c4accf27aade6c4ea55c1ff9b40c
 DIST xpra-4.3.3.tar.gz 4180278 BLAKE2B 
2fceab6c95efd0bd0390b7965aea588f39e43f86094c1f9921e1f75022f569808e27d7d85adcccfd64ac28889d0f6d2d6afdf4365f8c919bac8b1a14f3919f23
 SHA512 
c470e892b4b6379b6c9447731ab174e85c26de15fdc9541a199a2f49e45d07942ae8638f8ddf040a22c73422c6e6b262a9066cd8990f182b75163f7d449d91e2
+DIST xpra-4.3.4.tar.gz 4184031 BLAKE2B 
e01e338398f86c80a1092ea3155126ed26eb959ca97790add4cfcdb0ec8a1c6391937ff101c889ec78bb00bbf38ac0c42c5b85d60e72804ffccbbe5f446aaa3e
 SHA512 
93855ff248f135c70a2144a0afbc66e4830b8d214c9c2017dff1d3e3c7902dac15b1cb03670cde8018b40d5c404bd7c243625faeaba712130f5d0082f562c60c

diff --git a/x11-wm/xpra/xpra-9999.ebuild b/x11-wm/xpra/xpra-4.3.4.ebuild
similarity index 96%
copy from x11-wm/xpra/xpra-9999.ebuild
copy to x11-wm/xpra/xpra-4.3.4.ebuild
index a21d89139d37..a0bcf0ffcbc9 100644
--- a/x11-wm/xpra/xpra-9999.ebuild
+++ b/x11-wm/xpra/xpra-4.3.4.ebuild
@@ -7,7 +7,8 @@ if [[ ${PV} = 9999* ]]; then
        EGIT_REPO_URI="https://github.com/Xpra-org/xpra.git";
        inherit git-r3
 else
-       SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+       SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+               https://dev.gentoo.org/~chewi/distfiles/${PN}-4.3.1-tests.patch";
        KEYWORDS="~amd64 ~x86"
 fi
 
@@ -115,9 +116,8 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
        "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
-       "${FILESDIR}"/${PN}-4.2-suid-warning.patch
        "${FILESDIR}"/${PN}-4.3-no-service.patch
-       "${FILESDIR}"/${PN}-9999-xdummy.patch
+       "${DISTDIR}"/${PN}-4.3.1-tests.patch
 )
 
 python_prepare_all() {

diff --git a/x11-wm/xpra/xpra-9999.ebuild b/x11-wm/xpra/xpra-9999.ebuild
index a21d89139d37..5dea4bc89ba3 100644
--- a/x11-wm/xpra/xpra-9999.ebuild
+++ b/x11-wm/xpra/xpra-9999.ebuild
@@ -115,7 +115,6 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
        "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
-       "${FILESDIR}"/${PN}-4.2-suid-warning.patch
        "${FILESDIR}"/${PN}-4.3-no-service.patch
        "${FILESDIR}"/${PN}-9999-xdummy.patch
 )