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

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

2024-07-06 Thread James Le Cuirot

commit: 46a9dd4de7bca2152a3403726e50375563e37003
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Jul  6 14:08:41 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Jul  6 14:08:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46a9dd4d

x11-wm/xpra: Fix file collision caused by failed tests

Closes: https://bugs.gentoo.org/935476
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/xpra-6.0.1-r1.ebuild | 8 ++--
 x11-wm/xpra/xpra-6..ebuild   | 8 ++--
 x11-wm/xpra/xpra-.ebuild | 8 ++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/x11-wm/xpra/xpra-6.0.1-r1.ebuild b/x11-wm/xpra/xpra-6.0.1-r1.ebuild
index 44f903773195..fef6cb43651c 100644
--- a/x11-wm/xpra/xpra-6.0.1-r1.ebuild
+++ b/x11-wm/xpra/xpra-6.0.1-r1.ebuild
@@ -338,13 +338,17 @@ python_test() {
--skip-slow unit.server.server_sockets_test \
--skip-slow unit.server.source.source_mixins_test \
|| die -n
+}
 
+python_install() {
# remove test file
-   rm "${INSTALL_ROOT}/usr/share/xpra/www" -r || die
+   rm -vrf "${BUILD_DIR}/install/usr/share/xpra/www"
+
+   distutils-r1_python_install
 }
 
 python_install_all() {
-   distutils-r1_python_prepare_all
+   distutils-r1_python_install_all
 
mv -v "${ED}"/usr/etc "${ED}"/ || die
 

diff --git a/x11-wm/xpra/xpra-6..ebuild b/x11-wm/xpra/xpra-6..ebuild
index 44f903773195..fef6cb43651c 100644
--- a/x11-wm/xpra/xpra-6..ebuild
+++ b/x11-wm/xpra/xpra-6..ebuild
@@ -338,13 +338,17 @@ python_test() {
--skip-slow unit.server.server_sockets_test \
--skip-slow unit.server.source.source_mixins_test \
|| die -n
+}
 
+python_install() {
# remove test file
-   rm "${INSTALL_ROOT}/usr/share/xpra/www" -r || die
+   rm -vrf "${BUILD_DIR}/install/usr/share/xpra/www"
+
+   distutils-r1_python_install
 }
 
 python_install_all() {
-   distutils-r1_python_prepare_all
+   distutils-r1_python_install_all
 
mv -v "${ED}"/usr/etc "${ED}"/ || die
 

diff --git a/x11-wm/xpra/xpra-.ebuild b/x11-wm/xpra/xpra-.ebuild
index 44f903773195..fef6cb43651c 100644
--- a/x11-wm/xpra/xpra-.ebuild
+++ b/x11-wm/xpra/xpra-.ebuild
@@ -338,13 +338,17 @@ python_test() {
--skip-slow unit.server.server_sockets_test \
--skip-slow unit.server.source.source_mixins_test \
|| die -n
+}
 
+python_install() {
# remove test file
-   rm "${INSTALL_ROOT}/usr/share/xpra/www" -r || die
+   rm -vrf "${BUILD_DIR}/install/usr/share/xpra/www"
+
+   distutils-r1_python_install
 }
 
 python_install_all() {
-   distutils-r1_python_prepare_all
+   distutils-r1_python_install_all
 
mv -v "${ED}"/usr/etc "${ED}"/ || die

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

2024-06-30 Thread James Le Cuirot

commit: 06ac0e5918c9ef2e319d6e562bd807241eae791b
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Jun 30 22:23:11 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jun 30 22:23:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06ac0e59

x11-wm/xpra: Add missing x11-drivers/xf86-video-dummy dependency

This used to be optional and we were disabling it, but now it's mandatory. Not
entirely sure this needs to be among the test dependencies but seems likely.

Bug: https://bugs.gentoo.org/934918
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/{xpra-6.0.1.ebuild => xpra-6.0.1-r1.ebuild} | 1 +
 x11-wm/xpra/xpra-6..ebuild  | 1 +
 x11-wm/xpra/xpra-.ebuild| 1 +
 3 files changed, 3 insertions(+)

diff --git a/x11-wm/xpra/xpra-6.0.1.ebuild b/x11-wm/xpra/xpra-6.0.1-r1.ebuild
similarity index 99%
rename from x11-wm/xpra/xpra-6.0.1.ebuild
rename to x11-wm/xpra/xpra-6.0.1-r1.ebuild
index bfe892db2a2a..44f903773195 100644
--- a/x11-wm/xpra/xpra-6.0.1.ebuild
+++ b/x11-wm/xpra/xpra-6.0.1-r1.ebuild
@@ -51,6 +51,7 @@ TEST_DEPEND="
server? (
x11-base/xorg-server[-minimal,xvfb]
x11-drivers/xf86-input-void
+   x11-drivers/xf86-video-dummy
)
webcam? ( media-video/v4l2loopback )
xinerama? ( x11-libs/libfakeXinerama )

diff --git a/x11-wm/xpra/xpra-6..ebuild b/x11-wm/xpra/xpra-6..ebuild
index bfe892db2a2a..44f903773195 100644
--- a/x11-wm/xpra/xpra-6..ebuild
+++ b/x11-wm/xpra/xpra-6..ebuild
@@ -51,6 +51,7 @@ TEST_DEPEND="
server? (
x11-base/xorg-server[-minimal,xvfb]
x11-drivers/xf86-input-void
+   x11-drivers/xf86-video-dummy
)
webcam? ( media-video/v4l2loopback )
xinerama? ( x11-libs/libfakeXinerama )

diff --git a/x11-wm/xpra/xpra-.ebuild b/x11-wm/xpra/xpra-.ebuild
index bfe892db2a2a..44f903773195 100644
--- a/x11-wm/xpra/xpra-.ebuild
+++ b/x11-wm/xpra/xpra-.ebuild
@@ -51,6 +51,7 @@ TEST_DEPEND="
server? (
x11-base/xorg-server[-minimal,xvfb]
x11-drivers/xf86-input-void
+   x11-drivers/xf86-video-dummy
)
webcam? ( media-video/v4l2loopback )
xinerama? ( x11-libs/libfakeXinerama )

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

2024-06-28 Thread James Le Cuirot

commit: f2812a1ca75ee7a2acf3ccd8119e595f757ed562
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Jun 28 08:48:23 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Jun 28 08:48:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2812a1c

x11-wm/xpra: Drop myself as maintainer

I haven't used this for a while. I thought I might come back to it, but that's
now looking unlikely.

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

 x11-wm/xpra/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index 9b78c23e894e..c37f8a3fe432 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -9,10 +9,6 @@
ale...@gentoo.org
Alexey Shvetsov
 
-
-   ch...@gentoo.org
-   James Le Cuirot
-
 
xpra
Xpra-org/xpra

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

2024-06-22 Thread Conrad Kostecki

commit: 3a444215206ccfb59408b6ba3bb5a7dfed9f2119
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue Jun 18 17:31:09 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Jun 22 18:50:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a444215

x11-wm/xpra: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/37206
Signed-off-by: Conrad Kostecki  gentoo.org>

 x11-wm/xpra/files/xpra--xdummy.patch | 14 --
 1 file changed, 14 deletions(-)

diff --git a/x11-wm/xpra/files/xpra--xdummy.patch 
b/x11-wm/xpra/files/xpra--xdummy.patch
deleted file mode 100644
index b86f0dda45fe..
--- a/x11-wm/xpra/files/xpra--xdummy.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Avoid Xdummy version detection, assume 0.4.1.
-
-diff --git a/setup.py b/setup.py
-index 529b591b1..b9431fea8 100755
 a/setup.py
-+++ b/setup.py
-@@ -793,6 +793,7 @@ def vernum(s):
- return tuple(int(v) for v in s.split("-", 1)[0].split("."))
-
- def get_dummy_driver_version():
-+return "0.4.1"
- #try various rpm names:
- for rpm_name in ("xorg-x11-drv-dummy", "xf86-video-dummy"):
- r, out, err = get_status_output(["rpm", "-q", "--queryformat", 
"%{VERSION}", rpm_name])

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

2024-06-14 Thread Michał Górny

commit: 3d5e312303630c1b76224f20a6c64c01b3da181f
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jun 11 03:04:43 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jun 14 12:26:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d5e3123

x11-wm/xpra: Remove old

Signed-off-by: Michał Górny  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/36945
Signed-off-by: Michał Górny  gentoo.org>

 x11-wm/xpra/Manifest |   1 -
 x11-wm/xpra/xpra-4.4.5-r2.ebuild | 221 ---
 2 files changed, 222 deletions(-)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index fb6136d149d3..54e1c35b2dd2 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,3 +1,2 @@
-DIST xpra-4.4.5.tar.gz 4332287 BLAKE2B 
64165a18d0f204247f984f616438252e82922447441376e6e46a15509486e67f699e852562cd632591fd2831a86592d5029c5905932fc9d267b16a7e6edd1b5a
 SHA512 
6fb28328efc020969fff17bf747a1e0bf5b21869c9532a8c482e12f979d1dec7989e10e5bf3a9ae7dbfaa9e48c670255b196fdb819200a74dfbdec3ba5ae744f
 DIST xpra-4.4.6.tar.gz 4334932 BLAKE2B 
0518c6807be85777bb67b0a3283a610c06a97813671bff6edc701533aaa8f26b96e423e56ba56491ede120697277f6935ee26976b49550dfd2d52bbcd2daebd8
 SHA512 
273ee959647c1281f18c7b1b24d3a5179c4b6ce81515cc34618c698e55bdc2a8e94f0e236d7ab41c7bf29fa7fde0b1a2a1432445b80a75cd5a90f4858419
 DIST xpra-6.0.1.tar.gz 17214848 BLAKE2B 
81a26cd9aa9a61241ba47bc6712cd225499a82a8743c4f5655f4529d525788789452daaa0894a2cb9292caa7fd9aa64f82ce5b347c9c168815198e18145629b9
 SHA512 
3520dec19bb6999fc19ffcd3c385545f4a61f7cf50d4d6930eb39dec1341c79f6c4c8c45d526f43b33ed78d5359524103fcf1608dc705b40e330a7eb53de2475

diff --git a/x11-wm/xpra/xpra-4.4.5-r2.ebuild b/x11-wm/xpra/xpra-4.4.5-r2.ebuild
deleted file mode 100644
index 2069b11904d4..
--- a/x11-wm/xpra/xpra-4.4.5-r2.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = * ]]; then
-   EGIT_REPO_URI="https://github.com/Xpra-org/xpra.git";
-   inherit git-r3
-else
-   inherit pypi
-   KEYWORDS="amd64 x86"
-fi
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_SINGLE_IMPL=yes
-DISTUTILS_USE_SETUPTOOLS=no
-DISTUTILS_EXT=1
-
-inherit xdg distutils-r1 tmpfiles udev
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
-HOMEPAGE="https://xpra.org/";
-LICENSE="GPL-2 BSD"
-SLOT="0"
-IUSE="brotli +client +clipboard crypt csc cups dbus doc ffmpeg jpeg html ibus 
+lz4 lzo minimal oauth opengl pinentry pulseaudio +server sound systemd test 
+trayicon udev vpx webcam webp xdg xinerama"
-IUSE+=" +python_single_target_python3_11"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-   || ( client server )
-   cups? ( dbus )
-   oauth? ( server )
-   opengl? ( client )
-   test? ( client clipboard crypt dbus html server sound xdg xinerama )
-"
-
-TEST_DEPEND="
-   $(python_gen_cond_dep '
-   dev-python/netifaces[${PYTHON_USEDEP}]
-   dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
-   dev-python/rencode[${PYTHON_USEDEP}]
-   dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-   xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] )
-   ')
-   html? ( www-apps/xpra-html5 )
-   server? (
-   x11-base/xorg-server[-minimal,xvfb]
-   x11-drivers/xf86-input-void
-   )
-   xinerama? ( x11-libs/libfakeXinerama )
-"
-DEPEND="
-   ${PYTHON_DEPS}
-   $(python_gen_cond_dep '
-   dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
-   opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
-   sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
-   ')
-   x11-libs/gtk+:3[introspection]
-   x11-libs/libX11
-   x11-libs/libXcomposite
-   x11-libs/libXdamage
-   x11-libs/libXfixes
-   x11-libs/libXrandr
-   x11-libs/libXres
-   x11-libs/libXtst
-   x11-libs/libxkbfile
-   brotli? ( app-arch/brotli )
-   csc? ( >=media-video/ffmpeg-1.2.2:0= )
-   ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264] )
-   jpeg? ( media-libs/libjpeg-turbo )
-   pulseaudio? (
-   media-libs/libpulse
-   media-plugins/gst-plugins-pulse:1.0
-   )
-   sound? (
-   media-libs/gstreamer:1.0
-   media-libs/gst-plugins-base:1.0
-   )
-   vpx? ( media-libs/libvpx media-video/ffmpeg )
-   webp? ( media-libs/libwebp )
-"
-RDEPEND="
-   ${DEPEND}
-   ${TEST_DEPEND}
-   $(python_gen_cond_dep '
-   crypt? ( dev-python/cryptography[${PYTHON_USEDEP}] )
-   cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
-   lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-   lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
-   oauth? ( dev-python/oauthlib[${PYTHON_USED

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

2024-06-10 Thread Arthur Zamarin

commit: b7badf3864db4a3cf19964783a892dcb96d5349f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Jun 10 19:49:56 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Jun 10 19:49:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7badf38

x11-wm/xpra: Stabilize 4.4.6-r2 amd64, #932817

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-wm/xpra/xpra-4.4.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/xpra/xpra-4.4.6-r2.ebuild b/x11-wm/xpra/xpra-4.4.6-r2.ebuild
index 9c4083c34137..85448a56bd48 100644
--- a/x11-wm/xpra/xpra-4.4.6-r2.ebuild
+++ b/x11-wm/xpra/xpra-4.4.6-r2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = * ]]; then
inherit git-r3
 else
inherit pypi
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{10..11} )

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

2024-06-10 Thread Arthur Zamarin

commit: cbd35d121f254f8ba760eb0da68f2b6cd171fca7
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Jun 10 19:49:59 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Jun 10 19:49:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbd35d12

x11-wm/xpra: Stabilize 4.4.6-r2 x86, #932817

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-wm/xpra/xpra-4.4.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/xpra/xpra-4.4.6-r2.ebuild b/x11-wm/xpra/xpra-4.4.6-r2.ebuild
index 85448a56bd48..d65933d2b255 100644
--- a/x11-wm/xpra/xpra-4.4.6-r2.ebuild
+++ b/x11-wm/xpra/xpra-4.4.6-r2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = * ]]; then
inherit git-r3
 else
inherit pypi
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 PYTHON_COMPAT=( python3_{10..11} )

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

2024-06-10 Thread Alexey Shvetsov

commit: dcc3756596141e0080544618e18f1152bf0be774
Author: Paul Zander  gmail  com>
AuthorDate: Tue Jun  4 17:58:47 2024 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Mon Jun 10 19:18:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcc37565

x11-wm/xpra: add 6.0.1, 6., update 

- Python 3.12 support
- PEP517 support
- re-enabled tests
- general rework of the ebuild

Closes: https://bugs.gentoo.org/912679
Closes: https://bugs.gentoo.org/929898
Signed-off-by: Paul Zander  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37042
Signed-off-by: Alexey Shvetsov  gentoo.org>

 x11-wm/xpra/Manifest |   1 +
 x11-wm/xpra/files/xpra--pep517.patch |  12 +
 x11-wm/xpra/metadata.xml |   4 +
 x11-wm/xpra/xpra-4.4.5-r2.ebuild |   7 +-
 x11-wm/xpra/xpra-4.4.6-r2.ebuild |   7 +-
 x11-wm/xpra/xpra-6.0.1.ebuild| 376 +++
 x11-wm/xpra/xpra-6..ebuild   | 376 +++
 x11-wm/xpra/xpra-.ebuild | 296 ++--
 8 files changed, 999 insertions(+), 80 deletions(-)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index b2881c697f2b..fb6136d149d3 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,2 +1,3 @@
 DIST xpra-4.4.5.tar.gz 4332287 BLAKE2B 
64165a18d0f204247f984f616438252e82922447441376e6e46a15509486e67f699e852562cd632591fd2831a86592d5029c5905932fc9d267b16a7e6edd1b5a
 SHA512 
6fb28328efc020969fff17bf747a1e0bf5b21869c9532a8c482e12f979d1dec7989e10e5bf3a9ae7dbfaa9e48c670255b196fdb819200a74dfbdec3ba5ae744f
 DIST xpra-4.4.6.tar.gz 4334932 BLAKE2B 
0518c6807be85777bb67b0a3283a610c06a97813671bff6edc701533aaa8f26b96e423e56ba56491ede120697277f6935ee26976b49550dfd2d52bbcd2daebd8
 SHA512 
273ee959647c1281f18c7b1b24d3a5179c4b6ce81515cc34618c698e55bdc2a8e94f0e236d7ab41c7bf29fa7fde0b1a2a1432445b80a75cd5a90f4858419
+DIST xpra-6.0.1.tar.gz 17214848 BLAKE2B 
81a26cd9aa9a61241ba47bc6712cd225499a82a8743c4f5655f4529d525788789452daaa0894a2cb9292caa7fd9aa64f82ce5b347c9c168815198e18145629b9
 SHA512 
3520dec19bb6999fc19ffcd3c385545f4a61f7cf50d4d6930eb39dec1341c79f6c4c8c45d526f43b33ed78d5359524103fcf1608dc705b40e330a7eb53de2475

diff --git a/x11-wm/xpra/files/xpra--pep517.patch 
b/x11-wm/xpra/files/xpra--pep517.patch
new file mode 100644
index ..48e355913b27
--- /dev/null
+++ b/x11-wm/xpra/files/xpra--pep517.patch
@@ -0,0 +1,12 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index 501829c18..842a2b962 100644
+--- a/pyproject.toml
 b/pyproject.toml
+@@ -1,6 +1,7 @@
+ [build-system]
+ requires = ["setuptools", "cython"]
+ build-backend = "setuptools.build_meta"
++backend-path = [ "" ]
+ 
+ [project]
+ name = "xpra"

diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index 2f4961963d03..9b78c23e894e 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -23,9 +23,13 @@
Enable clipboard support
Enable csc softscaler support
Install the HTML5 client
+   Enable the GTK3 client
Use ibus input method via 
app-i18n/ibus
+   Enable Multicast DNS via 
dev-libs/mdns
Enable OAuth2 authentication in the server
+   Enable H.264 support using 
media-libs/openh264
Use app-crypt/pinentry for password 
entry
+   Enable generating QRCodes for server URL via 
media-gfx/qrencode
Enable system tray icon
Build server-side code
Enable vpx image format support

diff --git a/x11-wm/xpra/xpra-4.4.5-r2.ebuild b/x11-wm/xpra/xpra-4.4.5-r2.ebuild
index 64f6dfde2400..2069b11904d4 100644
--- a/x11-wm/xpra/xpra-4.4.5-r2.ebuild
+++ b/x11-wm/xpra/xpra-4.4.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,18 +11,19 @@ else
KEYWORDS="amd64 x86"
 fi
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 DISTUTILS_SINGLE_IMPL=yes
 DISTUTILS_USE_SETUPTOOLS=no
 DISTUTILS_EXT=1
 
-inherit xdg xdg-utils distutils-r1 tmpfiles udev
+inherit xdg distutils-r1 tmpfiles udev
 
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
 HOMEPAGE="https://xpra.org/";
 LICENSE="GPL-2 BSD"
 SLOT="0"
 IUSE="brotli +client +clipboard crypt csc cups dbus doc ffmpeg jpeg html ibus 
+lz4 lzo minimal oauth opengl pinentry pulseaudio +server sound systemd test 
+trayicon udev vpx webcam webp xdg xinerama"
+IUSE+=" +python_single_target_python3_11"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
|| ( client server )

diff --git a/x11-wm/xpra/xpra-4.4.6-r2.ebuild b/x11-wm/xpra/xpra-4.4.6-r2.ebuild
index b4c34890cee3..9c4083c34137 100644
--- a/x11-wm/xpra/xpra-4.4.6-r2.ebuild
+++ b/x11-wm/xpra/xpra-4.4.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed un

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

2023-10-27 Thread Michał Górny

commit: 1e5ac80671f25d967c60f06807307794e7b7e218
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Oct 22 12:50:38 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Oct 27 15:18:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e5ac806

x11-wm/xpra: Remove redundant local flag descs

Signed-off-by: Michał Górny  gentoo.org>

 x11-wm/xpra/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index 0aaf8c4a4f85..2f4961963d03 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -19,7 +19,6 @@
https://www.xpra.org/trac/report
 
 
-   Enable brotli compression support
Build client-side code
Enable clipboard support
Enable csc softscaler support

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

2023-10-14 Thread James Le Cuirot

commit: 5833dda7a38bae0620f8b44d34dc82012c377451
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Oct 14 20:33:56 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Oct 14 20:33:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5833dda7

x11-wm/xpra: Restrict tests because the PEP517 migration broke them

Some tests failed for a while before that for unknown reasons anyway. This could
potentially be fixed up, but I'm stepping back from this package, at least for
the time being.

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

 x11-wm/xpra/xpra-4.4.6-r2.ebuild | 4 +++-
 x11-wm/xpra/xpra-.ebuild | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/x11-wm/xpra/xpra-4.4.6-r2.ebuild b/x11-wm/xpra/xpra-4.4.6-r2.ebuild
index 5ec14d265625..b4c34890cee3 100644
--- a/x11-wm/xpra/xpra-4.4.6-r2.ebuild
+++ b/x11-wm/xpra/xpra-4.4.6-r2.ebuild
@@ -114,7 +114,9 @@ BDEPEND="
doc? ( virtual/pandoc )
 "
 
-RESTRICT="!test? ( test )"
+# Broken by PEP517 migration, and some tests failed for a while before that for
+# unknown reasons.
+RESTRICT="test"
 
 PATCHES=(
"${FILESDIR}"/${PN}-4.4-xdummy.patch

diff --git a/x11-wm/xpra/xpra-.ebuild b/x11-wm/xpra/xpra-.ebuild
index 09e2d5b2a699..b2531fd6fa85 100644
--- a/x11-wm/xpra/xpra-.ebuild
+++ b/x11-wm/xpra/xpra-.ebuild
@@ -114,7 +114,9 @@ BDEPEND="
doc? ( virtual/pandoc )
 "
 
-RESTRICT="!test? ( test )"
+# Broken by PEP517 migration and some tests failed for a while before that for
+# unknown reasons.
+RESTRICT="test"
 
 PATCHES=(
"${FILESDIR}"/${PN}--xdummy.patch

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

2023-09-02 Thread Benda XU

commit: 7a72d0773f343ce9ef358c54926e26ff182613a3
Author: Benda Xu  gentoo  org>
AuthorDate: Sat Sep  2 09:17:49 2023 +
Commit: Benda XU  gentoo  org>
CommitDate: Sat Sep  2 09:18:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a72d077

x11-wm/xpra: drop systemd-run call for USE=minimal.

Signed-off-by: Benda Xu  gentoo.org>

 x11-wm/xpra/files/xpra-4.4.6_minimal-features.patch| 18 ++
 .../{xpra-4.4.6-r1.ebuild => xpra-4.4.6-r2.ebuild} | 13 +++--
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/x11-wm/xpra/files/xpra-4.4.6_minimal-features.patch 
b/x11-wm/xpra/files/xpra-4.4.6_minimal-features.patch
new file mode 100644
index ..78a4cccb3684
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.4.6_minimal-features.patch
@@ -0,0 +1,18 @@
+Xpra is a good piece of software except that some features are not
+useful only to introduce unnecessary dependencies.
+
+Forwarded: no need.
+
+Index: xpra-4.4.6/xpra/scripts/main.py
+===
+--- xpra-4.4.6.orig/xpra/scripts/main.py
 xpra-4.4.6/xpra/scripts/main.py
+@@ -64,7 +64,7 @@ CLIPBOARD_CLASS = os.environ.get("XPRA_C
+ WAIT_SERVER_TIMEOUT = envint("WAIT_SERVER_TIMEOUT", 90)
+ CONNECT_TIMEOUT = envint("XPRA_CONNECT_TIMEOUT", 20)
+ OPENGL_PROBE_TIMEOUT = envint("XPRA_OPENGL_PROBE_TIMEOUT", 5)
+-SYSTEMD_RUN = envbool("XPRA_SYSTEMD_RUN", True)
++SYSTEMD_RUN = False
+ VERIFY_X11_SOCKET_TIMEOUT = envint("XPRA_VERIFY_X11_SOCKET_TIMEOUT", 1)
+ LIST_REPROBE_TIMEOUT = envint("XPRA_LIST_REPROBE_TIMEOUT", 10)
+ 

diff --git a/x11-wm/xpra/xpra-4.4.6-r1.ebuild b/x11-wm/xpra/xpra-4.4.6-r2.ebuild
similarity index 98%
rename from x11-wm/xpra/xpra-4.4.6-r1.ebuild
rename to x11-wm/xpra/xpra-4.4.6-r2.ebuild
index b9dcf632b0fc..5ec14d265625 100644
--- a/x11-wm/xpra/xpra-4.4.6-r1.ebuild
+++ b/x11-wm/xpra/xpra-4.4.6-r2.ebuild
@@ -121,18 +121,19 @@ PATCHES=(
 )
 
 python_prepare_all() {
+   if use minimal; then
+   sed -r -e '/pam_ENABLED/s/DEFAULT/False/' \
+   -e 's/^(xdg_open)_ENABLED = .*/\1_ENABLED = False/' \
+   -i setup.py || die
+   PATCHES+=( 
"${FILESDIR}"/${PN}-4.4.6_xpra-4.4.6_minimal-features.patch )
+   fi
+
distutils-r1_python_prepare_all
 
hprefixify xpra/scripts/config.py
 
sed -r -e "/\bdoc_dir =/s:/${PN}/\":/${PF}/html\":" \
-i setup.py || die
-
-   if use minimal; then
-   sed -r -e '/pam_ENABLED/s/DEFAULT/False/' \
-   -e 's/^(xdg_open)_ENABLED = .*/\1_ENABLED = False/' \
-   -i setup.py || die
-   fi
 }
 
 python_configure_all() {

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

2023-07-27 Thread Sam James

commit: ce7a57911a35210f7443a364807b20f8b86b59ea
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 27 07:05:06 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 27 07:05:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce7a5791

x11-wm/xpra: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 x11-wm/xpra/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index 851f88503995..0aaf8c4a4f85 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -15,6 +15,7 @@
 
 
xpra
+   Xpra-org/xpra
https://www.xpra.org/trac/report

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

2023-06-27 Thread Benda XU

commit: 4fbc88cb60bd8dcd547a8800726eeb24155c173b
Author: Benda Xu  gentoo  org>
AuthorDate: Mon Jun 26 14:53:12 2023 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Jun 27 13:38:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fbc88cb

x11-wm/xpra: migrate to PEP517.

A /usr/etc installation location bug is unveiled.  Fix it.

Signed-off-by: Benda Xu  gentoo.org>

 x11-wm/xpra/xpra-4.4.6-r1.ebuild | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/x11-wm/xpra/xpra-4.4.6-r1.ebuild b/x11-wm/xpra/xpra-4.4.6-r1.ebuild
index 70ff28512e72..b9dcf632b0fc 100644
--- a/x11-wm/xpra/xpra-4.4.6-r1.ebuild
+++ b/x11-wm/xpra/xpra-4.4.6-r1.ebuild
@@ -12,11 +12,11 @@ else
 fi
 
 PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=yes
-DISTUTILS_USE_SETUPTOOLS=no
 DISTUTILS_EXT=1
 
-inherit xdg xdg-utils distutils-r1 prefix tmpfiles udev
+inherit xdg xdg-utils distutils-r1 multibuild prefix tmpfiles udev
 
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
 HOMEPAGE="https://xpra.org/";
@@ -193,6 +193,14 @@ python_test() {
 python_install_all() {
distutils-r1_python_prepare_all
 
+   # Switching to PEP517 gives /usr/etc. Previously, setup.py hardcodes
+   # if root_prefix.endswith("/usr"):
+   # root_prefix = root_prefix[:-4]
+   # But now setuptools uses data/* to represent out-of-sitedir files.
+   # The upstream hack no longer works. We are on our own.
+
+   mv -v "${ED}"/usr/etc "${ED}"/ || die
+
# Move udev dir to the right place if necessary.
if use udev; then
local dir=$(get_udevdir)

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

2023-06-27 Thread Benda XU

commit: 68e45f8e359cda963c67c7e2755effcbb72c1242
Author: Benda Xu  gentoo  org>
AuthorDate: Mon Jun 26 15:10:17 2023 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Jun 27 13:38:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68e45f8e

x11-wm/xpra: sync the live ebuild with 4.4.6-r1.

Signed-off-by: Benda Xu  gentoo.org>

 x11-wm/xpra/files/xpra--tests.patch | 34 -
 x11-wm/xpra/xpra-.ebuild| 17 +++--
 2 files changed, 11 insertions(+), 40 deletions(-)

diff --git a/x11-wm/xpra/files/xpra--tests.patch 
b/x11-wm/xpra/files/xpra--tests.patch
deleted file mode 100644
index 746966577dcd..
--- a/x11-wm/xpra/files/xpra--tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 79573c7f1241225922bee992f2caaf730cfbe3ac Mon Sep 17 00:00:00 2001
-From: totaam 
-Date: Sun, 9 Oct 2022 21:37:39 +0700
-Subject: [PATCH 3/3] Revert "don't use GLib directly"
-
-This reverts commit bc8bf26c44d1b151d709232460483f5432f79f5b.

- xpra/server/mixins/child_command_server.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/xpra/server/mixins/child_command_server.py 
b/xpra/server/mixins/child_command_server.py
-index 8dea3c1f7..1c2a60e27 100644
 a/xpra/server/mixins/child_command_server.py
-+++ b/xpra/server/mixins/child_command_server.py
-@@ -11,6 +11,8 @@ import os.path
- from time import monotonic
- from subprocess import Popen
-
-+from gi.repository import GLib
-+
- from xpra.platform.features import COMMAND_SIGNALS
- from xpra.child_reaper import getChildReaper, reaper_cleanup
- from xpra.os_util import (
-@@ -72,7 +74,7 @@ class ChildCommandServer(StubServerMixin):
- #even if __init__ is called multiple times:
- if not getattr(self, "late_start_requested", False):
- self.late_start_requested = True
--self.idle_add(self.late_start)
-+GLib.idle_add(self.late_start)
-
- def late_start(self):
- def do_late_start():
---
-2.38.0

diff --git a/x11-wm/xpra/xpra-.ebuild b/x11-wm/xpra/xpra-.ebuild
index bc63326e1601..09e2d5b2a699 100644
--- a/x11-wm/xpra/xpra-.ebuild
+++ b/x11-wm/xpra/xpra-.ebuild
@@ -12,11 +12,11 @@ else
 fi
 
 PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=yes
-DISTUTILS_USE_SETUPTOOLS=no
 DISTUTILS_EXT=1
 
-inherit xdg xdg-utils distutils-r1 tmpfiles udev
+inherit xdg xdg-utils distutils-r1 multibuild prefix tmpfiles udev
 
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
 HOMEPAGE="https://xpra.org/";
@@ -118,15 +118,12 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
"${FILESDIR}"/${PN}--xdummy.patch
-   "${FILESDIR}"/${PN}--tests.patch
 )
 
 python_prepare_all() {
distutils-r1_python_prepare_all
 
-   # FIXME: There are hardcoded paths all over the place but the following
-   # double-prefixes some files under /etc. Looks tricky to fix. :(
-   #hprefixify $(find -type f \( -name "*.py" -o -name "*.conf" \))
+   hprefixify xpra/scripts/config.py
 
sed -r -e "/\bdoc_dir =/s:/${PN}/\":/${PF}/html\":" \
-i setup.py || die
@@ -196,6 +193,14 @@ python_test() {
 python_install_all() {
distutils-r1_python_prepare_all
 
+   # Switching to PEP517 gives /usr/etc. Previously, setup.py hardcodes
+   # if root_prefix.endswith("/usr"):
+   # root_prefix = root_prefix[:-4]
+   # But now setuptools uses data/* to represent out-of-sitedir files.
+   # The upstream hack no longer works. We are on our own.
+
+   mv -v "${ED}"/usr/etc "${ED}"/ || die
+
# Move udev dir to the right place if necessary.
if use udev; then
local dir=$(get_udevdir)

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

2023-06-27 Thread Benda XU

commit: 45a9b6d8547284abd64bc0035b215b312dcd8701
Author: Benda Xu  gentoo  org>
AuthorDate: Mon Jun 26 08:32:48 2023 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Jun 27 13:38:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45a9b6d8

x11-wm/xpra: retry to prefixify Xpra.

Xpra likes to embed many hard-coded directory guess making the
prefixify tricky in the past.  This is an attempt to prefixify it from
a minimal set of modifications.

Bug: https://bugs.gentoo.org/802105
Signed-off-by: Benda Xu  gentoo.org>

 x11-wm/xpra/xpra-4.4.6-r1.ebuild | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/x11-wm/xpra/xpra-4.4.6-r1.ebuild b/x11-wm/xpra/xpra-4.4.6-r1.ebuild
index 322e28c739e9..70ff28512e72 100644
--- a/x11-wm/xpra/xpra-4.4.6-r1.ebuild
+++ b/x11-wm/xpra/xpra-4.4.6-r1.ebuild
@@ -16,7 +16,7 @@ DISTUTILS_SINGLE_IMPL=yes
 DISTUTILS_USE_SETUPTOOLS=no
 DISTUTILS_EXT=1
 
-inherit xdg xdg-utils distutils-r1 tmpfiles udev
+inherit xdg xdg-utils distutils-r1 prefix tmpfiles udev
 
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
 HOMEPAGE="https://xpra.org/";
@@ -123,9 +123,7 @@ PATCHES=(
 python_prepare_all() {
distutils-r1_python_prepare_all
 
-   # FIXME: There are hardcoded paths all over the place but the following
-   # double-prefixes some files under /etc. Looks tricky to fix. :(
-   #hprefixify $(find -type f \( -name "*.py" -o -name "*.conf" \))
+   hprefixify xpra/scripts/config.py
 
sed -r -e "/\bdoc_dir =/s:/${PN}/\":/${PF}/html\":" \
-i setup.py || die

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

2023-06-26 Thread James Le Cuirot

commit: 99e585bac78e0aa1445717d9c302f030d64a6aec
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Jun 26 22:32:35 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Jun 26 22:33:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99e585ba

x11-wm/xpra: Conditionally require pillow[webp] and drop pillow USE flag

We have had pillow as an unconditional dependency for ages. It is technically
optional, but upstream strongly recommends it.

Closes: https://bugs.gentoo.org/799752
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/metadata.xml| 1 -
 x11-wm/xpra/xpra-4.4.5-r2.ebuild| 2 +-
 x11-wm/xpra/{xpra-4.4.6.ebuild => xpra-4.4.6-r1.ebuild} | 4 ++--
 x11-wm/xpra/xpra-.ebuild| 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index 48743006848c..851f88503995 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -25,7 +25,6 @@
Install the HTML5 client
Use ibus input method via 
app-i18n/ibus
Enable OAuth2 authentication in the server
-   Enable pillow support
Use app-crypt/pinentry for password 
entry
Enable system tray icon
Build server-side code

diff --git a/x11-wm/xpra/xpra-4.4.5-r2.ebuild b/x11-wm/xpra/xpra-4.4.5-r2.ebuild
index 2c08072e01a5..64f6dfde2400 100644
--- a/x11-wm/xpra/xpra-4.4.5-r2.ebuild
+++ b/x11-wm/xpra/xpra-4.4.5-r2.ebuild
@@ -22,7 +22,7 @@ DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning 
WM (parti) based o
 HOMEPAGE="https://xpra.org/";
 LICENSE="GPL-2 BSD"
 SLOT="0"
-IUSE="brotli +client +clipboard crypt csc cups dbus doc ffmpeg jpeg html ibus 
+lz4 lzo minimal oauth opengl pillow pinentry pulseaudio +server sound systemd 
test +trayicon udev vpx webcam webp xdg xinerama"
+IUSE="brotli +client +clipboard crypt csc cups dbus doc ffmpeg jpeg html ibus 
+lz4 lzo minimal oauth opengl pinentry pulseaudio +server sound systemd test 
+trayicon udev vpx webcam webp xdg xinerama"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
|| ( client server )

diff --git a/x11-wm/xpra/xpra-4.4.6.ebuild b/x11-wm/xpra/xpra-4.4.6-r1.ebuild
similarity index 96%
rename from x11-wm/xpra/xpra-4.4.6.ebuild
rename to x11-wm/xpra/xpra-4.4.6-r1.ebuild
index 45f19d022704..322e28c739e9 100644
--- a/x11-wm/xpra/xpra-4.4.6.ebuild
+++ b/x11-wm/xpra/xpra-4.4.6-r1.ebuild
@@ -22,7 +22,7 @@ DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning 
WM (parti) based o
 HOMEPAGE="https://xpra.org/";
 LICENSE="GPL-2 BSD"
 SLOT="0"
-IUSE="brotli +client +clipboard crypt csc cups dbus doc ffmpeg jpeg html ibus 
+lz4 lzo minimal oauth opengl pillow pinentry pulseaudio +server sound systemd 
test +trayicon udev vpx webcam webp xdg xinerama"
+IUSE="brotli +client +clipboard crypt csc cups dbus doc ffmpeg jpeg html ibus 
+lz4 lzo minimal oauth opengl pinentry pulseaudio +server sound systemd test 
+trayicon udev vpx webcam webp xdg xinerama"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
|| ( client server )
@@ -35,7 +35,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 TEST_DEPEND="
$(python_gen_cond_dep '
dev-python/netifaces[${PYTHON_USEDEP}]
-   dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+   dev-python/pillow[jpeg?,webp?,${PYTHON_USEDEP}]
dev-python/rencode[${PYTHON_USEDEP}]
dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] )

diff --git a/x11-wm/xpra/xpra-.ebuild b/x11-wm/xpra/xpra-.ebuild
index 052a2654219b..bc63326e1601 100644
--- a/x11-wm/xpra/xpra-.ebuild
+++ b/x11-wm/xpra/xpra-.ebuild
@@ -22,7 +22,7 @@ DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning 
WM (parti) based o
 HOMEPAGE="https://xpra.org/";
 LICENSE="GPL-2 BSD"
 SLOT="0"
-IUSE="brotli +client +clipboard crypt csc cups dbus doc ffmpeg jpeg html ibus 
+lz4 lzo minimal oauth opengl pillow pinentry pulseaudio +server sound systemd 
test +trayicon udev vpx webcam webp xdg xinerama"
+IUSE="brotli +client +clipboard crypt csc cups dbus doc ffmpeg jpeg html ibus 
+lz4 lzo minimal oauth opengl pinentry pulseaudio +server sound systemd test 
+trayicon udev vpx webcam webp xdg xinerama"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
|| ( client server )
@@ -35,7 +35,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 TEST_DEPEND="
$(python_gen_cond_dep '
dev-python/netifaces[${PYTHON_USEDEP}]
-   dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+   dev-python/pillow[jpeg?,webp?,${PYTHON_USEDEP}]
dev-python/rencode[${PYTHON_USEDEP}]
dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] )

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

2023-06-24 Thread James Le Cuirot

commit: ee8ec05f05cb808a1924c4536339d1247966a1b1
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Jun 24 14:31:31 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Jun 24 14:32:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee8ec05f

x11-wm/xpra: Version bump to 4.4.6

The tests still fail.

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

 x11-wm/xpra/Manifest  |   1 +
 x11-wm/xpra/xpra-4.4.6.ebuild | 220 ++
 2 files changed, 221 insertions(+)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 3e29e19a6741..b2881c697f2b 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1 +1,2 @@
 DIST xpra-4.4.5.tar.gz 4332287 BLAKE2B 
64165a18d0f204247f984f616438252e82922447441376e6e46a15509486e67f699e852562cd632591fd2831a86592d5029c5905932fc9d267b16a7e6edd1b5a
 SHA512 
6fb28328efc020969fff17bf747a1e0bf5b21869c9532a8c482e12f979d1dec7989e10e5bf3a9ae7dbfaa9e48c670255b196fdb819200a74dfbdec3ba5ae744f
+DIST xpra-4.4.6.tar.gz 4334932 BLAKE2B 
0518c6807be85777bb67b0a3283a610c06a97813671bff6edc701533aaa8f26b96e423e56ba56491ede120697277f6935ee26976b49550dfd2d52bbcd2daebd8
 SHA512 
273ee959647c1281f18c7b1b24d3a5179c4b6ce81515cc34618c698e55bdc2a8e94f0e236d7ab41c7bf29fa7fde0b1a2a1432445b80a75cd5a90f4858419

diff --git a/x11-wm/xpra/xpra-4.4.6.ebuild b/x11-wm/xpra/xpra-4.4.6.ebuild
new file mode 100644
index ..45f19d022704
--- /dev/null
+++ b/x11-wm/xpra/xpra-4.4.6.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = * ]]; then
+   EGIT_REPO_URI="https://github.com/Xpra-org/xpra.git";
+   inherit git-r3
+else
+   inherit pypi
+   KEYWORDS="~amd64 ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_EXT=1
+
+inherit xdg xdg-utils distutils-r1 tmpfiles udev
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
+HOMEPAGE="https://xpra.org/";
+LICENSE="GPL-2 BSD"
+SLOT="0"
+IUSE="brotli +client +clipboard crypt csc cups dbus doc ffmpeg jpeg html ibus 
+lz4 lzo minimal oauth opengl pillow pinentry pulseaudio +server sound systemd 
test +trayicon udev vpx webcam webp xdg xinerama"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   || ( client server )
+   cups? ( dbus )
+   oauth? ( server )
+   opengl? ( client )
+   test? ( client clipboard crypt dbus html server sound xdg xinerama )
+"
+
+TEST_DEPEND="
+   $(python_gen_cond_dep '
+   dev-python/netifaces[${PYTHON_USEDEP}]
+   dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+   dev-python/rencode[${PYTHON_USEDEP}]
+   dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+   xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] )
+   ')
+   html? ( www-apps/xpra-html5 )
+   server? (
+   x11-base/xorg-server[-minimal,xvfb]
+   x11-drivers/xf86-input-void
+   )
+   xinerama? ( x11-libs/libfakeXinerama )
+"
+DEPEND="
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+   opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+   sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
+   ')
+   x11-libs/gtk+:3[introspection]
+   x11-libs/libX11
+   x11-libs/libXcomposite
+   x11-libs/libXdamage
+   x11-libs/libXfixes
+   x11-libs/libXrandr
+   x11-libs/libXres
+   x11-libs/libXtst
+   x11-libs/libxkbfile
+   brotli? ( app-arch/brotli )
+   csc? ( >=media-video/ffmpeg-1.2.2:0= )
+   ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264] )
+   jpeg? ( media-libs/libjpeg-turbo )
+   pulseaudio? (
+   media-libs/libpulse
+   media-plugins/gst-plugins-pulse:1.0
+   )
+   sound? (
+   media-libs/gstreamer:1.0
+   media-libs/gst-plugins-base:1.0
+   )
+   vpx? ( media-libs/libvpx media-video/ffmpeg )
+   webp? ( media-libs/libwebp )
+"
+RDEPEND="
+   ${DEPEND}
+   ${TEST_DEPEND}
+   $(python_gen_cond_dep '
+   crypt? ( dev-python/cryptography[${PYTHON_USEDEP}] )
+   cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+   lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+   lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+   oauth? ( dev-python/oauthlib[${PYTHON_USEDEP}] )
+   opengl? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+   webcam? (
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/pyinotify[${PYTHON_USEDEP}]
+   media-libs/opencv[${PYTHON_USEDEP},python]
+   )
+   ')
+   acct-group/xpra
+   virtual/ssh
+   x11-apps/xauth
+

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

2023-06-17 Thread James Le Cuirot

commit: d5decb08518dc8bdca78208c37baca956c758e69
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Jun 17 12:45:57 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Jun 17 12:45:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5decb08

x11-wm/xpra: Avoid udev directory move on usr-merge systems

Closes: https://bugs.gentoo.org/908477
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/xpra-4.4.5-r2.ebuild | 8 +---
 x11-wm/xpra/xpra-.ebuild | 8 +---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/x11-wm/xpra/xpra-4.4.5-r2.ebuild b/x11-wm/xpra/xpra-4.4.5-r2.ebuild
index a774716c5872..2c08072e01a5 100644
--- a/x11-wm/xpra/xpra-4.4.5-r2.ebuild
+++ b/x11-wm/xpra/xpra-4.4.5-r2.ebuild
@@ -195,11 +195,13 @@ python_test() {
 python_install_all() {
distutils-r1_python_prepare_all
 
-   # Move udev dir to the right place.
+   # Move udev dir to the right place if necessary.
if use udev; then
local dir=$(get_udevdir)
-   dodir "${dir%/*}"
-   mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
+   if [[ ! ${ED}/usr/lib/udev -ef ${ED}${dir} ]]; then
+   dodir "${dir%/*}"
+   mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
+   fi
else
rm -vr "${ED}"/usr/lib/udev || die
rm -v "${ED}"/usr/libexec/xpra/xpra_udev_product_version || die

diff --git a/x11-wm/xpra/xpra-.ebuild b/x11-wm/xpra/xpra-.ebuild
index 8a065e465ed5..052a2654219b 100644
--- a/x11-wm/xpra/xpra-.ebuild
+++ b/x11-wm/xpra/xpra-.ebuild
@@ -196,11 +196,13 @@ python_test() {
 python_install_all() {
distutils-r1_python_prepare_all
 
-   # Move udev dir to the right place.
+   # Move udev dir to the right place if necessary.
if use udev; then
local dir=$(get_udevdir)
-   dodir "${dir%/*}"
-   mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
+   if [[ ! ${ED}/usr/lib/udev -ef ${ED}${dir} ]]; then
+   dodir "${dir%/*}"
+   mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
+   fi
else
rm -vr "${ED}"/usr/lib/udev || die
rm -v "${ED}"/usr/libexec/xpra/xpra_udev_product_version || die

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

2023-06-12 Thread Andreas Sturmlechner

commit: 9c15a7239ec2589e1225b465f3688731c473d071
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jun 12 16:30:26 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jun 12 17:44:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c15a723

x11-wm/xpra: drop 4.3.4-r1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-wm/xpra/Manifest   |   2 -
 .../xpra-3.0.2_ignore-gentoo-no-compile.patch  |  13 --
 x11-wm/xpra/files/xpra-4.3-no-service.patch|  19 --
 x11-wm/xpra/xpra-4.3.4-r1.ebuild   | 219 -
 4 files changed, 253 deletions(-)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 9e1c819b017b..3e29e19a6741 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,3 +1 @@
-DIST xpra-4.3.1-tests.patch 51444 BLAKE2B 
c645aa52bb06c3872f6c1c7aace099c10a6fd46dd4c386ec1a13f6326e3fc8860a71767510ce9b44375cc8b30cef563e4405b2834670a9d2c555d3359d16e99f
 SHA512 
0c70c33e24980db31e904c91f987a73693bd2349958ea8392138987e1dc1852ea42a4ee7e3b238f01c92adc57dbe196e57f4c4accf27aade6c4ea55c1ff9b40c
-DIST xpra-4.3.4.tar.gz 4184031 BLAKE2B 
e01e338398f86c80a1092ea3155126ed26eb959ca97790add4cfcdb0ec8a1c6391937ff101c889ec78bb00bbf38ac0c42c5b85d60e72804ffccbbe5f446aaa3e
 SHA512 
93855ff248f135c70a2144a0afbc66e4830b8d214c9c2017dff1d3e3c7902dac15b1cb03670cde8018b40d5c404bd7c243625faeaba712130f5d0082f562c60c
 DIST xpra-4.4.5.tar.gz 4332287 BLAKE2B 
64165a18d0f204247f984f616438252e82922447441376e6e46a15509486e67f699e852562cd632591fd2831a86592d5029c5905932fc9d267b16a7e6edd1b5a
 SHA512 
6fb28328efc020969fff17bf747a1e0bf5b21869c9532a8c482e12f979d1dec7989e10e5bf3a9ae7dbfaa9e48c670255b196fdb819200a74dfbdec3ba5ae744f

diff --git a/x11-wm/xpra/files/xpra-3.0.2_ignore-gentoo-no-compile.patch 
b/x11-wm/xpra/files/xpra-3.0.2_ignore-gentoo-no-compile.patch
deleted file mode 100644
index 5823ac8c167e..
--- a/x11-wm/xpra/files/xpra-3.0.2_ignore-gentoo-no-compile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xpra-3.0.2/setup.py
-===
 xpra-3.0.2.orig/setup.py
-+++ xpra-3.0.2/setup.py
-@@ -516,7 +516,7 @@ def cython_add(extension, min_version="0
- #python2.7 setup.py build -b build-2.7 install --no-compile \
- #--root=/var/tmp/portage/x11-wm/xpra-0.7.0/temp/images/2.7
- if "--no-compile" in sys.argv and not ("build" in sys.argv and "install" 
in sys.argv):
--return
-+pass
- assert cython_ENABLED, "cython compilation is disabled"
- cython_version_check(min_version)
- from Cython.Distutils import build_ext

diff --git a/x11-wm/xpra/files/xpra-4.3-no-service.patch 
b/x11-wm/xpra/files/xpra-4.3-no-service.patch
deleted file mode 100644
index b336db581953..
--- a/x11-wm/xpra/files/xpra-4.3-no-service.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Don't install the service files. Auto-detection is used to determine what files
-to install, and where, which can be unpredictable on Gentoo. The init.d script
-is also not suitable for Gentoo.
-
-diff --git a/setup.py b/setup.py
-index fc67abb50..a11dc0d97 100755
 a/setup.py
-+++ b/setup.py
-@@ -145,8 +145,8 @@ from xpra.platform.features import 
LOCAL_SERVERS_SUPPORTED, SHADOW_SUPPORTED
- shadow_ENABLED = SHADOW_SUPPORTED and DEFAULT
- server_ENABLED = (LOCAL_SERVERS_SUPPORTED or shadow_ENABLED) and DEFAULT
- rfb_ENABLED = DEFAULT
--service_ENABLED = LINUX and server_ENABLED
--sd_listen_ENABLED = POSIX and pkg_config_ok("--exists", "libsystemd")
-+service_ENABLED = False
-+sd_listen_ENABLED = False
- proxy_ENABLED  = DEFAULT
- client_ENABLED = DEFAULT
- scripts_ENABLED = not WIN32

diff --git a/x11-wm/xpra/xpra-4.3.4-r1.ebuild b/x11-wm/xpra/xpra-4.3.4-r1.ebuild
deleted file mode 100644
index af4ceff68269..
--- a/x11-wm/xpra/xpra-4.3.4-r1.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = * ]]; then
-   EGIT_REPO_URI="https://github.com/Xpra-org/xpra.git";
-   inherit git-r3
-else
-   inherit pypi
-   SRC_URI+="
-   https://dev.gentoo.org/~chewi/distfiles/${PN}-4.3.1-tests.patch
-   "
-   KEYWORDS="amd64 x86"
-fi
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_SINGLE_IMPL=yes
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit xdg xdg-utils distutils-r1 tmpfiles udev
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
-HOMEPAGE="https://xpra.org/";
-LICENSE="GPL-2 BSD"
-SLOT="0"
-IUSE="brotli +client +clipboard crypt csc cups dbus doc ffmpeg jpeg html ibus 
+lz4 lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test 
udev vpx webcam webp xdg xinerama"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-   || ( client server )
-   cups? ( dbus )
-   opengl? ( client )
-   test? ( client clipboard cr

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

2023-06-11 Thread Arthur Zamarin

commit: bc2cced4d9a1165c0d861ae5085e2ef891e4f33a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jun 11 19:54:46 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jun 11 19:54:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc2cced4

x11-wm/xpra: Stabilize 4.4.5-r2 x86, #908248

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-wm/xpra/xpra-4.4.5-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/xpra/xpra-4.4.5-r2.ebuild b/x11-wm/xpra/xpra-4.4.5-r2.ebuild
index 6858ad5f78ca..a774716c5872 100644
--- a/x11-wm/xpra/xpra-4.4.5-r2.ebuild
+++ b/x11-wm/xpra/xpra-4.4.5-r2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = * ]]; then
inherit git-r3
 else
inherit pypi
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 PYTHON_COMPAT=( python3_{9..11} )

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

2023-06-11 Thread Arthur Zamarin

commit: 27699262bf3a8161b903d40323645ae7b4bc00c3
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jun 11 19:54:42 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jun 11 19:54:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27699262

x11-wm/xpra: Stabilize 4.4.5-r2 amd64, #908248

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-wm/xpra/xpra-4.4.5-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/xpra/xpra-4.4.5-r2.ebuild b/x11-wm/xpra/xpra-4.4.5-r2.ebuild
index 3e523fb230f6..6858ad5f78ca 100644
--- a/x11-wm/xpra/xpra-4.4.5-r2.ebuild
+++ b/x11-wm/xpra/xpra-4.4.5-r2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = * ]]; then
inherit git-r3
 else
inherit pypi
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{9..11} )

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

2023-06-10 Thread Andreas Sturmlechner

commit: dfd34ef6322ce5e4b87ded904f7af7c5057c7033
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon May 29 09:30:06 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun 10 18:03:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfd34ef6

x11-wm/xpra: Switch IUSE=pulseaudio to media-libs/libpulse

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-wm/xpra/xpra-4.4.5-r2.ebuild | 2 +-
 x11-wm/xpra/xpra-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-wm/xpra/xpra-4.4.5-r2.ebuild b/x11-wm/xpra/xpra-4.4.5-r2.ebuild
index 03d884be7df1..3e523fb230f6 100644
--- a/x11-wm/xpra/xpra-4.4.5-r2.ebuild
+++ b/x11-wm/xpra/xpra-4.4.5-r2.ebuild
@@ -68,7 +68,7 @@ DEPEND="
ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264] )
jpeg? ( media-libs/libjpeg-turbo )
pulseaudio? (
-   media-sound/pulseaudio
+   media-libs/libpulse
media-plugins/gst-plugins-pulse:1.0
)
sound? (

diff --git a/x11-wm/xpra/xpra-.ebuild b/x11-wm/xpra/xpra-.ebuild
index b1d83402a147..8a065e465ed5 100644
--- a/x11-wm/xpra/xpra-.ebuild
+++ b/x11-wm/xpra/xpra-.ebuild
@@ -68,7 +68,7 @@ DEPEND="
ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264] )
jpeg? ( media-libs/libjpeg-turbo )
pulseaudio? (
-   media-sound/pulseaudio
+   media-libs/libpulse
media-plugins/gst-plugins-pulse:1.0
)
sound? (

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

2023-06-10 Thread Andreas Sturmlechner

commit: e7ebfa9004bd8670be598454e48b7d057f313a76
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jun 10 18:02:41 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun 10 18:02:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7ebfa90

x11-wm/xpra: drop 4.4.5-r1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-wm/xpra/xpra-4.4.5-r1.ebuild | 218 ---
 1 file changed, 218 deletions(-)

diff --git a/x11-wm/xpra/xpra-4.4.5-r1.ebuild b/x11-wm/xpra/xpra-4.4.5-r1.ebuild
deleted file mode 100644
index 53d661a90a6b..
--- a/x11-wm/xpra/xpra-4.4.5-r1.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = * ]]; then
-   EGIT_REPO_URI="https://github.com/Xpra-org/xpra.git";
-   inherit git-r3
-else
-   inherit pypi
-   KEYWORDS="~amd64 ~x86"
-fi
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_SINGLE_IMPL=yes
-DISTUTILS_USE_SETUPTOOLS=no
-DISTUTILS_EXT=1
-
-inherit xdg xdg-utils distutils-r1 tmpfiles udev
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
-HOMEPAGE="https://xpra.org/";
-LICENSE="GPL-2 BSD"
-SLOT="0"
-IUSE="brotli +client +clipboard crypt csc cups dbus doc ffmpeg jpeg html ibus 
+lz4 lzo minimal oauth opengl pillow pinentry pulseaudio +server sound systemd 
test +trayicon udev vpx webcam webp xdg xinerama"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-   || ( client server )
-   cups? ( dbus )
-   oauth? ( server )
-   opengl? ( client )
-   test? ( client clipboard crypt dbus html server sound xdg xinerama )
-"
-
-TEST_DEPEND="
-   $(python_gen_cond_dep '
-   dev-python/netifaces[${PYTHON_USEDEP}]
-   dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
-   dev-python/rencode[${PYTHON_USEDEP}]
-   dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-   xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] )
-   ')
-   html? ( www-apps/xpra-html5 )
-   server? (
-   x11-base/xorg-server[-minimal,xvfb]
-   x11-drivers/xf86-input-void
-   )
-   xinerama? ( x11-libs/libfakeXinerama )
-"
-DEPEND="
-   ${PYTHON_DEPS}
-   $(python_gen_cond_dep '
-   dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
-   opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
-   sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
-   ')
-   x11-libs/gtk+:3[introspection]
-   x11-libs/libX11
-   x11-libs/libXcomposite
-   x11-libs/libXdamage
-   x11-libs/libXfixes
-   x11-libs/libXrandr
-   x11-libs/libXres
-   x11-libs/libXtst
-   x11-libs/libxkbfile
-   brotli? ( app-arch/brotli )
-   csc? ( >=media-video/ffmpeg-1.2.2:0= )
-   ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264] )
-   jpeg? ( media-libs/libjpeg-turbo )
-   pulseaudio? (
-   media-sound/pulseaudio
-   media-plugins/gst-plugins-pulse:1.0
-   )
-   sound? (
-   media-libs/gstreamer:1.0
-   media-libs/gst-plugins-base:1.0
-   )
-   vpx? ( media-libs/libvpx media-video/ffmpeg )
-   webp? ( media-libs/libwebp )
-"
-RDEPEND="
-   ${DEPEND}
-   ${TEST_DEPEND}
-   $(python_gen_cond_dep '
-   crypt? ( dev-python/cryptography[${PYTHON_USEDEP}] )
-   cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
-   lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-   lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
-   oauth? ( dev-python/oauthlib[${PYTHON_USEDEP}] )
-   opengl? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
-   webcam? (
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/pyinotify[${PYTHON_USEDEP}]
-   media-libs/opencv[${PYTHON_USEDEP},python]
-   )
-   ')
-   acct-group/xpra
-   virtual/ssh
-   x11-apps/xauth
-   x11-apps/xmodmap
-   ibus? ( app-i18n/ibus )
-   pinentry? ( app-crypt/pinentry )
-   trayicon? ( dev-libs/libayatana-appindicator )
-   udev? ( virtual/udev )
-"
-DEPEND+="
-   test? ( ${TEST_DEPEND} )
-"
-BDEPEND="
-   $(python_gen_cond_dep '
-   >=dev-python/cython-0.16[${PYTHON_USEDEP}]
-   ')
-   virtual/pkgconfig
-   doc? ( virtual/pandoc )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-4.4-xdummy.patch
-)
-
-python_prepare_all() {
-   distutils-r1_python_prepare_all
-
-   # FIXME: There are hardcoded paths all over the place but the following
-   # double-prefixes some files under /etc. Looks tricky to fix. :(
-   #hprefixify $(find -type f \( -name "*.py" -o -name "*.conf" \))
-
-   sed -r -e "/\bdoc_dir =/s:

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

2023-06-10 Thread Andreas Sturmlechner

commit: 098b48cb07b518475ce5a5b022f564d25062c576
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jun 10 17:58:37 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun 10 18:02:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=098b48cb

x11-wm/xpra: Fix doc_dir sed

Closes: https://bugs.gentoo.org/908088
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-wm/xpra/{xpra-.ebuild => xpra-4.4.5-r2.ebuild} | 7 +++
 x11-wm/xpra/xpra-.ebuild   | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/x11-wm/xpra/xpra-.ebuild b/x11-wm/xpra/xpra-4.4.5-r2.ebuild
similarity index 97%
copy from x11-wm/xpra/xpra-.ebuild
copy to x11-wm/xpra/xpra-4.4.5-r2.ebuild
index 93c9941bab1e..03d884be7df1 100644
--- a/x11-wm/xpra/xpra-.ebuild
+++ b/x11-wm/xpra/xpra-4.4.5-r2.ebuild
@@ -117,8 +117,7 @@ BDEPEND="
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-   "${FILESDIR}"/${PN}--xdummy.patch
-   "${FILESDIR}"/${PN}--tests.patch
+   "${FILESDIR}"/${PN}-4.4-xdummy.patch
 )
 
 python_prepare_all() {
@@ -128,7 +127,7 @@ python_prepare_all() {
# double-prefixes some files under /etc. Looks tricky to fix. :(
#hprefixify $(find -type f \( -name "*.py" -o -name "*.conf" \))
 
-   sed -r -e "/\bdoc_dir =/s:/${PN}\":/${PF}/html\":" \
+   sed -r -e "/\bdoc_dir =/s:/${PN}/\":/${PF}/html\":" \
-i setup.py || die
 
if use minimal; then
@@ -145,7 +144,6 @@ python_configure_all() {
DISTUTILS_ARGS=(
--without-PIC
--without-Xdummy
-   $(use_with sound audio)
$(use_with client)
$(use_with clipboard)
$(use_with csc csc_swscale)
@@ -169,6 +167,7 @@ python_configure_all() {
$(use_with opengl)
$(use_with server shadow)
$(use_with server)
+   $(use_with sound)
--without-strict
$(use_with vpx)
--with-warn

diff --git a/x11-wm/xpra/xpra-.ebuild b/x11-wm/xpra/xpra-.ebuild
index 93c9941bab1e..b1d83402a147 100644
--- a/x11-wm/xpra/xpra-.ebuild
+++ b/x11-wm/xpra/xpra-.ebuild
@@ -128,7 +128,7 @@ python_prepare_all() {
# double-prefixes some files under /etc. Looks tricky to fix. :(
#hprefixify $(find -type f \( -name "*.py" -o -name "*.conf" \))
 
-   sed -r -e "/\bdoc_dir =/s:/${PN}\":/${PF}/html\":" \
+   sed -r -e "/\bdoc_dir =/s:/${PN}/\":/${PF}/html\":" \
-i setup.py || die
 
if use minimal; then

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

2023-06-08 Thread Sam James

commit: 68f50bd00e93603abddec2e7d000110f672172d3
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  8 22:27:38 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  8 22:34:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68f50bd0

x11-wm/xpra: use virtual/pandoc

Signed-off-by: Sam James  gentoo.org>

 x11-wm/xpra/xpra-4.3.4-r1.ebuild | 2 +-
 x11-wm/xpra/xpra-4.4.5-r1.ebuild | 2 +-
 x11-wm/xpra/xpra-.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/x11-wm/xpra/xpra-4.3.4-r1.ebuild b/x11-wm/xpra/xpra-4.3.4-r1.ebuild
index 1bb5ff518511..af4ceff68269 100644
--- a/x11-wm/xpra/xpra-4.3.4-r1.ebuild
+++ b/x11-wm/xpra/xpra-4.3.4-r1.ebuild
@@ -112,7 +112,7 @@ BDEPEND="
>=dev-python/cython-0.16[${PYTHON_USEDEP}]
')
virtual/pkgconfig
-   doc? ( app-text/pandoc )
+   doc? ( virtual/pandoc )
 "
 
 RESTRICT="!test? ( test )"

diff --git a/x11-wm/xpra/xpra-4.4.5-r1.ebuild b/x11-wm/xpra/xpra-4.4.5-r1.ebuild
index edf3498864ce..53d661a90a6b 100644
--- a/x11-wm/xpra/xpra-4.4.5-r1.ebuild
+++ b/x11-wm/xpra/xpra-4.4.5-r1.ebuild
@@ -111,7 +111,7 @@ BDEPEND="
>=dev-python/cython-0.16[${PYTHON_USEDEP}]
')
virtual/pkgconfig
-   doc? ( app-text/pandoc )
+   doc? ( virtual/pandoc )
 "
 
 RESTRICT="!test? ( test )"

diff --git a/x11-wm/xpra/xpra-.ebuild b/x11-wm/xpra/xpra-.ebuild
index 00b773011b00..93c9941bab1e 100644
--- a/x11-wm/xpra/xpra-.ebuild
+++ b/x11-wm/xpra/xpra-.ebuild
@@ -111,7 +111,7 @@ BDEPEND="
>=dev-python/cython-0.16[${PYTHON_USEDEP}]
')
virtual/pkgconfig
-   doc? ( app-text/pandoc )
+   doc? ( virtual/pandoc )
 "
 
 RESTRICT="!test? ( test )"

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

2023-06-07 Thread Pacho Ramos

commit: b5714004abedd35ce613439261b025d8fc4b6f24
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Jun  7 08:39:43 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Jun  7 08:39:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5714004

x11-wm/xpra: Migrate to Ayatana indicators

See https://bugs.gentoo.org/887171 for rational, all packages in testing were
already migrated. Upstream support both implementations using ayatana if
possible and falling back to old implementation if ayatana is not available.

Signed-off-by: Pacho Ramos  gentoo.org>

 x11-wm/xpra/{xpra-4.4.5.ebuild => xpra-4.4.5-r1.ebuild} | 2 +-
 x11-wm/xpra/xpra-.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-wm/xpra/xpra-4.4.5.ebuild b/x11-wm/xpra/xpra-4.4.5-r1.ebuild
similarity index 99%
rename from x11-wm/xpra/xpra-4.4.5.ebuild
rename to x11-wm/xpra/xpra-4.4.5-r1.ebuild
index 199c4d9d268c..5b09076bf35b 100644
--- a/x11-wm/xpra/xpra-4.4.5.ebuild
+++ b/x11-wm/xpra/xpra-4.4.5-r1.ebuild
@@ -99,7 +99,7 @@ RDEPEND="
x11-apps/xmodmap
ibus? ( app-i18n/ibus )
pinentry? ( app-crypt/pinentry )
-   trayicon? ( dev-libs/libappindicator:3 )
+   trayicon? ( dev-libs/libayatana-appindicator )
udev? ( virtual/udev )
 "
 DEPEND+="

diff --git a/x11-wm/xpra/xpra-.ebuild b/x11-wm/xpra/xpra-.ebuild
index f24fa2443658..6accf7da4de8 100644
--- a/x11-wm/xpra/xpra-.ebuild
+++ b/x11-wm/xpra/xpra-.ebuild
@@ -99,7 +99,7 @@ RDEPEND="
x11-apps/xmodmap
ibus? ( app-i18n/ibus )
pinentry? ( app-crypt/pinentry )
-   trayicon? ( dev-libs/libappindicator:3 )
+   trayicon? ( dev-libs/libayatana-appindicator )
udev? ( virtual/udev )
 "
 DEPEND+="

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

2023-06-07 Thread Pacho Ramos

commit: 7fbc642751f7cc211d5763de3481434135ee4ca7
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Jun  7 08:41:49 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Jun  7 08:41:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fbc6427

x11-wm/xpra: Set DISTUTILS_EXT=1

Signed-off-by: Pacho Ramos  gentoo.org>

 x11-wm/xpra/xpra-4.4.5-r1.ebuild | 1 +
 x11-wm/xpra/xpra-.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/x11-wm/xpra/xpra-4.4.5-r1.ebuild b/x11-wm/xpra/xpra-4.4.5-r1.ebuild
index 5b09076bf35b..edf3498864ce 100644
--- a/x11-wm/xpra/xpra-4.4.5-r1.ebuild
+++ b/x11-wm/xpra/xpra-4.4.5-r1.ebuild
@@ -14,6 +14,7 @@ fi
 PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_SINGLE_IMPL=yes
 DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_EXT=1
 
 inherit xdg xdg-utils distutils-r1 tmpfiles udev
 

diff --git a/x11-wm/xpra/xpra-.ebuild b/x11-wm/xpra/xpra-.ebuild
index 6accf7da4de8..00b773011b00 100644
--- a/x11-wm/xpra/xpra-.ebuild
+++ b/x11-wm/xpra/xpra-.ebuild
@@ -14,6 +14,7 @@ fi
 PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_SINGLE_IMPL=yes
 DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_EXT=1
 
 inherit xdg xdg-utils distutils-r1 tmpfiles udev

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

2023-05-23 Thread James Le Cuirot

commit: 5d42e5ed3c698a6bb9c987c84ebf0b647cb4c399
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue May 23 20:25:17 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue May 23 20:26:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d42e5ed

x11-wm/xpra: Bump to 4.4.5, drop old 4.4.4

Bug: https://bugs.gentoo.org/906130
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/Manifest | 2 +-
 x11-wm/xpra/{xpra-4.4.4.ebuild => xpra-4.4.5.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 8670ac3604fd..9e1c819b017b 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,3 +1,3 @@
 DIST xpra-4.3.1-tests.patch 51444 BLAKE2B 
c645aa52bb06c3872f6c1c7aace099c10a6fd46dd4c386ec1a13f6326e3fc8860a71767510ce9b44375cc8b30cef563e4405b2834670a9d2c555d3359d16e99f
 SHA512 
0c70c33e24980db31e904c91f987a73693bd2349958ea8392138987e1dc1852ea42a4ee7e3b238f01c92adc57dbe196e57f4c4accf27aade6c4ea55c1ff9b40c
 DIST xpra-4.3.4.tar.gz 4184031 BLAKE2B 
e01e338398f86c80a1092ea3155126ed26eb959ca97790add4cfcdb0ec8a1c6391937ff101c889ec78bb00bbf38ac0c42c5b85d60e72804ffccbbe5f446aaa3e
 SHA512 
93855ff248f135c70a2144a0afbc66e4830b8d214c9c2017dff1d3e3c7902dac15b1cb03670cde8018b40d5c404bd7c243625faeaba712130f5d0082f562c60c
-DIST xpra-4.4.4.tar.gz 4324840 BLAKE2B 
d39f83b5f6ea960f12170bcc55d3c46d290682bb26424dc57a3ab62f01a4dad513466883287e6197231c96ac81872403d27ff1b65c7c0e520adcda8846766e02
 SHA512 
807fb3b12b5ecc8dbf73aef9dddf509c3397c97d04db4f397d4672b6f097ff977ce71f6ba00fb585ea7dfaf047a4c68e5cca099436da28bc20f4bc2c229c98c9
+DIST xpra-4.4.5.tar.gz 4332287 BLAKE2B 
64165a18d0f204247f984f616438252e82922447441376e6e46a15509486e67f699e852562cd632591fd2831a86592d5029c5905932fc9d267b16a7e6edd1b5a
 SHA512 
6fb28328efc020969fff17bf747a1e0bf5b21869c9532a8c482e12f979d1dec7989e10e5bf3a9ae7dbfaa9e48c670255b196fdb819200a74dfbdec3ba5ae744f

diff --git a/x11-wm/xpra/xpra-4.4.4.ebuild b/x11-wm/xpra/xpra-4.4.5.ebuild
similarity index 100%
rename from x11-wm/xpra/xpra-4.4.4.ebuild
rename to x11-wm/xpra/xpra-4.4.5.ebuild

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

2023-05-20 Thread James Le Cuirot

commit: d59a7e446c597fbfe52fd3031b779882464810c4
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat May 20 20:21:56 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat May 20 20:21:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d59a7e44

x11-wm/xpra: Add trayicon USE flag and missing dependency

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

 x11-wm/xpra/metadata.xml  | 1 +
 x11-wm/xpra/xpra-4.4.4.ebuild | 3 ++-
 x11-wm/xpra/xpra-.ebuild  | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index 308083d50825..48743006848c 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -27,6 +27,7 @@
Enable OAuth2 authentication in the server
Enable pillow support
Use app-crypt/pinentry for password 
entry
+   Enable system tray icon
Build server-side code
Enable vpx image format support
Enable webcam support via opencv

diff --git a/x11-wm/xpra/xpra-4.4.4.ebuild b/x11-wm/xpra/xpra-4.4.4.ebuild
index e1b6b335baab..199c4d9d268c 100644
--- a/x11-wm/xpra/xpra-4.4.4.ebuild
+++ b/x11-wm/xpra/xpra-4.4.4.ebuild
@@ -21,7 +21,7 @@ DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning 
WM (parti) based o
 HOMEPAGE="https://xpra.org/";
 LICENSE="GPL-2 BSD"
 SLOT="0"
-IUSE="brotli +client +clipboard crypt csc cups dbus doc ffmpeg jpeg html ibus 
+lz4 lzo minimal oauth opengl pillow pinentry pulseaudio +server sound systemd 
test udev vpx webcam webp xdg xinerama"
+IUSE="brotli +client +clipboard crypt csc cups dbus doc ffmpeg jpeg html ibus 
+lz4 lzo minimal oauth opengl pillow pinentry pulseaudio +server sound systemd 
test +trayicon udev vpx webcam webp xdg xinerama"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
|| ( client server )
@@ -99,6 +99,7 @@ RDEPEND="
x11-apps/xmodmap
ibus? ( app-i18n/ibus )
pinentry? ( app-crypt/pinentry )
+   trayicon? ( dev-libs/libappindicator:3 )
udev? ( virtual/udev )
 "
 DEPEND+="

diff --git a/x11-wm/xpra/xpra-.ebuild b/x11-wm/xpra/xpra-.ebuild
index b338f3df7a4f..f24fa2443658 100644
--- a/x11-wm/xpra/xpra-.ebuild
+++ b/x11-wm/xpra/xpra-.ebuild
@@ -21,7 +21,7 @@ DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning 
WM (parti) based o
 HOMEPAGE="https://xpra.org/";
 LICENSE="GPL-2 BSD"
 SLOT="0"
-IUSE="brotli +client +clipboard crypt csc cups dbus doc ffmpeg jpeg html ibus 
+lz4 lzo minimal oauth opengl pillow pinentry pulseaudio +server sound systemd 
test udev vpx webcam webp xdg xinerama"
+IUSE="brotli +client +clipboard crypt csc cups dbus doc ffmpeg jpeg html ibus 
+lz4 lzo minimal oauth opengl pillow pinentry pulseaudio +server sound systemd 
test +trayicon udev vpx webcam webp xdg xinerama"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
|| ( client server )
@@ -99,6 +99,7 @@ RDEPEND="
x11-apps/xmodmap
ibus? ( app-i18n/ibus )
pinentry? ( app-crypt/pinentry )
+   trayicon? ( dev-libs/libappindicator:3 )
udev? ( virtual/udev )
 "
 DEPEND+="

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

2023-05-16 Thread James Le Cuirot

commit: 3102cd8d6d3e1e22e1f1f2820fef94a0965c7166
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue May 16 22:12:08 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue May 16 22:12:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3102cd8d

x11-wm/xpra: Use setup.py args to avoid sd_listen/service files

I didn't realise I could have done this without a patch.

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

 x11-wm/xpra/files/xpra-4.5-no-service.patch | 19 ---
 x11-wm/xpra/xpra-4.4.4.ebuild   |  3 ++-
 x11-wm/xpra/xpra-.ebuild|  3 ++-
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/x11-wm/xpra/files/xpra-4.5-no-service.patch 
b/x11-wm/xpra/files/xpra-4.5-no-service.patch
deleted file mode 100644
index 329c492784ac..
--- a/x11-wm/xpra/files/xpra-4.5-no-service.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Don't install the service files. Auto-detection is used to determine what files
-to install, and where, which can be unpredictable on Gentoo. The init.d script
-is also not suitable for Gentoo.
-
-diff --git a/setup.py b/setup.py
-index 529b591b1..ad23d6ecc 100755
 a/setup.py
-+++ b/setup.py
-@@ -187,8 +187,8 @@ rfb_ENABLED = DEFAULT
- quic_ENABLED = DEFAULT
- ssh_ENABLED = DEFAULT
- http_ENABLED = DEFAULT
--service_ENABLED = LINUX and server_ENABLED
--sd_listen_ENABLED = POSIX and pkg_config_ok("--exists", "libsystemd")
-+service_ENABLED = False
-+sd_listen_ENABLED = False
- proxy_ENABLED  = DEFAULT
- client_ENABLED = DEFAULT
- scripts_ENABLED = not WIN32

diff --git a/x11-wm/xpra/xpra-4.4.4.ebuild b/x11-wm/xpra/xpra-4.4.4.ebuild
index e458911550a1..ef2fc4e3 100644
--- a/x11-wm/xpra/xpra-4.4.4.ebuild
+++ b/x11-wm/xpra/xpra-4.4.4.ebuild
@@ -115,7 +115,6 @@ BDEPEND="
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-4.3-no-service.patch
"${FILESDIR}"/${PN}-4.4-xdummy.patch
 )
 
@@ -161,6 +160,8 @@ python_configure_all() {
$(use_with jpeg jpeg_encoder)
$(use_with jpeg jpeg_decoder)
--without-mdns
+   --without-sd_listen
+   --without-service
$(use_with opengl)
$(use_with server shadow)
$(use_with server)

diff --git a/x11-wm/xpra/xpra-.ebuild b/x11-wm/xpra/xpra-.ebuild
index b2d368301a68..23c923b710aa 100644
--- a/x11-wm/xpra/xpra-.ebuild
+++ b/x11-wm/xpra/xpra-.ebuild
@@ -115,7 +115,6 @@ BDEPEND="
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-4.5-no-service.patch
"${FILESDIR}"/${PN}--xdummy.patch
"${FILESDIR}"/${PN}--tests.patch
 )
@@ -163,6 +162,8 @@ python_configure_all() {
$(use_with jpeg jpeg_encoder)
$(use_with jpeg jpeg_decoder)
--without-mdns
+   --without-sd_listen
+   --without-service
$(use_with opengl)
$(use_with server shadow)
$(use_with server)

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

2023-05-16 Thread James Le Cuirot

commit: 26532a745e96a2bcd4cab5e8d4a469133cec7055
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue May 16 22:15:53 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue May 16 22:15:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26532a74

x11-wm/xpra: Set --without-strict to avoid -Werror

I don't know why --with-strict was given before as it's a bad idea.

Closes: https://bugs.gentoo.org/906343
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/xpra-4.3.4-r1.ebuild | 2 +-
 x11-wm/xpra/xpra-4.4.4.ebuild| 2 +-
 x11-wm/xpra/xpra-.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/x11-wm/xpra/xpra-4.3.4-r1.ebuild b/x11-wm/xpra/xpra-4.3.4-r1.ebuild
index 88e345b4b4c5..1bb5ff518511 100644
--- a/x11-wm/xpra/xpra-4.3.4-r1.ebuild
+++ b/x11-wm/xpra/xpra-4.3.4-r1.ebuild
@@ -169,7 +169,7 @@ python_configure_all() {
$(use_with server shadow)
$(use_with server)
$(use_with sound)
-   --with-strict
+   --without-strict
$(use_with vpx)
--with-warn
$(use_with webcam)

diff --git a/x11-wm/xpra/xpra-4.4.4.ebuild b/x11-wm/xpra/xpra-4.4.4.ebuild
index ef2fc4e3..e1b6b335baab 100644
--- a/x11-wm/xpra/xpra-4.4.4.ebuild
+++ b/x11-wm/xpra/xpra-4.4.4.ebuild
@@ -166,7 +166,7 @@ python_configure_all() {
$(use_with server shadow)
$(use_with server)
$(use_with sound)
-   --with-strict
+   --without-strict
$(use_with vpx)
--with-warn
$(use_with webcam)

diff --git a/x11-wm/xpra/xpra-.ebuild b/x11-wm/xpra/xpra-.ebuild
index 23c923b710aa..b338f3df7a4f 100644
--- a/x11-wm/xpra/xpra-.ebuild
+++ b/x11-wm/xpra/xpra-.ebuild
@@ -167,7 +167,7 @@ python_configure_all() {
$(use_with opengl)
$(use_with server shadow)
$(use_with server)
-   --with-strict
+   --without-strict
$(use_with vpx)
--with-warn
$(use_with webcam)

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

2023-05-16 Thread James Le Cuirot

commit: 3731a2aa0ad2d30b6b089bd0c6667d6c5d84b505
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue May 16 21:54:41 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue May 16 21:55:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3731a2aa

x11-wm/xpra: Update xpra_udev_product_version path

It has changed since 4.3.

Closes: https://bugs.gentoo.org/906372
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/xpra-4.4.4.ebuild | 2 +-
 x11-wm/xpra/xpra-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-wm/xpra/xpra-4.4.4.ebuild b/x11-wm/xpra/xpra-4.4.4.ebuild
index 5683ea5b33ce..e458911550a1 100644
--- a/x11-wm/xpra/xpra-4.4.4.ebuild
+++ b/x11-wm/xpra/xpra-4.4.4.ebuild
@@ -199,7 +199,7 @@ python_install_all() {
mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
else
rm -vr "${ED}"/usr/lib/udev || die
-   rm -v "${ED}"/usr/bin/xpra_udev_product_version || die
+   rm -v "${ED}"/usr/libexec/xpra/xpra_udev_product_version || die
fi
 }
 

diff --git a/x11-wm/xpra/xpra-.ebuild b/x11-wm/xpra/xpra-.ebuild
index c4e11b241ef1..b2d368301a68 100644
--- a/x11-wm/xpra/xpra-.ebuild
+++ b/x11-wm/xpra/xpra-.ebuild
@@ -200,7 +200,7 @@ python_install_all() {
mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
else
rm -vr "${ED}"/usr/lib/udev || die
-   rm -v "${ED}"/usr/bin/xpra_udev_product_version || die
+   rm -v "${ED}"/usr/libexec/xpra/xpra_udev_product_version || die
fi
 }

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

2023-05-16 Thread James Le Cuirot

commit: 7b8bb4db212502e165689739d28a7ebd5d61848b
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue May 16 16:11:57 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue May 16 21:55:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b8bb4db

x11-wm/xpra: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31065
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/files/xpra-4.4-tests.patch | 100 -
 1 file changed, 100 deletions(-)

diff --git a/x11-wm/xpra/files/xpra-4.4-tests.patch 
b/x11-wm/xpra/files/xpra-4.4-tests.patch
deleted file mode 100644
index 28691606304d..
--- a/x11-wm/xpra/files/xpra-4.4-tests.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 5e657b3fbed2f8495272d6b207d1b3c0a660a72f Mon Sep 17 00:00:00 2001
-From: James Le Cuirot 
-Date: Sun, 2 Oct 2022 22:59:17 +0100
-Subject: [PATCH 1/3] Fix test_root_window_model by formatting geometry string
- correctly
-
-You can't use `{geometry:24}` style formatting on a list or tuple. It
-must be converted to a string first.

- xpra/server/shadow/root_window_model.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xpra/server/shadow/root_window_model.py 
b/xpra/server/shadow/root_window_model.py
-index cb89466ef..e69949e7d 100644
 a/xpra/server/shadow/root_window_model.py
-+++ b/xpra/server/shadow/root_window_model.py
-@@ -65,7 +65,7 @@ class RootWindowModel:
- self.signal_listeners = {}
-
- def __repr__(self):
--return f"RootWindowModel({self.capture} : {self.geometry:24})"
-+return f"RootWindowModel({self.capture} : {str(self.geometry):24})"
-
- def get_info(self) -> dict:
- info = {}
---
-2.38.0
-
-
-From 3fe12855383831f10442a1f4451d206dfee2cb92 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot 
-Date: Sun, 2 Oct 2022 21:51:01 +0100
-Subject: [PATCH 2/3] Fix test_get_version_info when the revision is 0
-
-The 4.4 tarball has revision 0, which causes it to not be included in
-the version info dict. Check for `not None` instead of truthiness.

- xpra/version_util.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/xpra/version_util.py b/xpra/version_util.py
-index 17c0ec27a..5dd38fd3e 100755
 a/xpra/version_util.py
-+++ b/xpra/version_util.py
-@@ -158,7 +158,7 @@ def get_version_info(full=1) -> dict:
- "branch": BRANCH,
- "commit": COMMIT,
- }.items():
--if v and v!="unknown":
-+if v is not None and v!="unknown":
- props[k] = v
- except ImportError as e:
- warn("missing some source information: %s", e)
-@@ -181,7 +181,7 @@ def get_version_info_full() -> dict:
- "cython"   : "CYTHON_VERSION",
-   }.items():
- v = getattr(build_info, bk, None)
--if v:
-+if v is not None:
- props[k] = v
- #record library versions:
- d = dict((k.lstrip("lib_"), getattr(build_info, k)) for k in 
dir(build_info) if k.startswith("lib_"))
---
-2.38.0
-
-
-From 79573c7f1241225922bee992f2caaf730cfbe3ac Mon Sep 17 00:00:00 2001
-From: totaam 
-Date: Sun, 9 Oct 2022 21:37:39 +0700
-Subject: [PATCH 3/3] Revert "don't use GLib directly"
-
-This reverts commit bc8bf26c44d1b151d709232460483f5432f79f5b.

- xpra/server/mixins/child_command_server.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/xpra/server/mixins/child_command_server.py 
b/xpra/server/mixins/child_command_server.py
-index 8dea3c1f7..1c2a60e27 100644
 a/xpra/server/mixins/child_command_server.py
-+++ b/xpra/server/mixins/child_command_server.py
-@@ -11,6 +11,8 @@ import os.path
- from time import monotonic
- from subprocess import Popen
-
-+from gi.repository import GLib
-+
- from xpra.platform.features import COMMAND_SIGNALS
- from xpra.child_reaper import getChildReaper, reaper_cleanup
- from xpra.os_util import (
-@@ -72,7 +74,7 @@ class ChildCommandServer(StubServerMixin):
- #even if __init__ is called multiple times:
- if not getattr(self, "late_start_requested", False):
- self.late_start_requested = True
--self.idle_add(self.late_start)
-+GLib.idle_add(self.late_start)
-
- def late_start(self):
- def do_late_start():
---
-2.38.0

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

2023-05-14 Thread James Le Cuirot

commit: 49ff03f7e0cb6afe2ec4fc0a31023ee38aa85361
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun May 14 14:39:50 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun May 14 14:53:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49ff03f7

x11-wm/xpra: Don't use reserved TDEPEND variable name

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

 x11-wm/xpra/xpra-4.3.4-r1.ebuild | 6 +++---
 x11-wm/xpra/xpra-.ebuild | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/x11-wm/xpra/xpra-4.3.4-r1.ebuild b/x11-wm/xpra/xpra-4.3.4-r1.ebuild
index eb1ec1c68778..88e345b4b4c5 100644
--- a/x11-wm/xpra/xpra-4.3.4-r1.ebuild
+++ b/x11-wm/xpra/xpra-4.3.4-r1.ebuild
@@ -33,7 +33,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
test? ( client clipboard crypt dbus html server sound xdg xinerama )
 "
 
-TDEPEND="
+TEST_DEPEND="
$(python_gen_cond_dep '
dev-python/netifaces[${PYTHON_USEDEP}]
dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
@@ -81,7 +81,7 @@ DEPEND="
 "
 RDEPEND="
${DEPEND}
-   ${TDEPEND}
+   ${TEST_DEPEND}
$(python_gen_cond_dep '
crypt? ( dev-python/cryptography[${PYTHON_USEDEP}] )
cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
@@ -105,7 +105,7 @@ RDEPEND="
udev? ( virtual/udev )
 "
 DEPEND+="
-   test? ( ${TDEPEND} )
+   test? ( ${TEST_DEPEND} )
 "
 BDEPEND="
$(python_gen_cond_dep '

diff --git a/x11-wm/xpra/xpra-.ebuild b/x11-wm/xpra/xpra-.ebuild
index 5e5fb4d66e2f..2d2f17c05900 100644
--- a/x11-wm/xpra/xpra-.ebuild
+++ b/x11-wm/xpra/xpra-.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
test? ( client clipboard crypt dbus html server sound xdg xinerama )
 "
 
-TDEPEND="
+TEST_DEPEND="
$(python_gen_cond_dep '
dev-python/netifaces[${PYTHON_USEDEP}]
dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
@@ -78,7 +78,7 @@ DEPEND="
 "
 RDEPEND="
${DEPEND}
-   ${TDEPEND}
+   ${TEST_DEPEND}
$(python_gen_cond_dep '
crypt? ( dev-python/cryptography[${PYTHON_USEDEP}] )
cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
@@ -102,7 +102,7 @@ RDEPEND="
udev? ( virtual/udev )
 "
 DEPEND+="
-   test? ( ${TDEPEND} )
+   test? ( ${TEST_DEPEND} )
 "
 BDEPEND="
$(python_gen_cond_dep '

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

2023-05-14 Thread James Le Cuirot

commit: 15bcf35582bb7ad431835dbea82c2aada2ec32a3
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun May 14 14:41:38 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun May 14 14:53:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15bcf355

x11-wm/xpra: Update  for latest changes

Some tests are failing, but I can't figure out why.

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

 x11-wm/xpra/files/xpra-4.5-no-service.patch | 19 
 x11-wm/xpra/files/xpra--tests.patch | 34 +
 x11-wm/xpra/files/xpra--xdummy.patch| 26 +++---
 x11-wm/xpra/metadata.xml|  1 +
 x11-wm/xpra/xpra-.ebuild| 14 ++--
 5 files changed, 69 insertions(+), 25 deletions(-)

diff --git a/x11-wm/xpra/files/xpra-4.5-no-service.patch 
b/x11-wm/xpra/files/xpra-4.5-no-service.patch
new file mode 100644
index ..329c492784ac
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.5-no-service.patch
@@ -0,0 +1,19 @@
+Don't install the service files. Auto-detection is used to determine what files
+to install, and where, which can be unpredictable on Gentoo. The init.d script
+is also not suitable for Gentoo.
+
+diff --git a/setup.py b/setup.py
+index 529b591b1..ad23d6ecc 100755
+--- a/setup.py
 b/setup.py
+@@ -187,8 +187,8 @@ rfb_ENABLED = DEFAULT
+ quic_ENABLED = DEFAULT
+ ssh_ENABLED = DEFAULT
+ http_ENABLED = DEFAULT
+-service_ENABLED = LINUX and server_ENABLED
+-sd_listen_ENABLED = POSIX and pkg_config_ok("--exists", "libsystemd")
++service_ENABLED = False
++sd_listen_ENABLED = False
+ proxy_ENABLED  = DEFAULT
+ client_ENABLED = DEFAULT
+ scripts_ENABLED = not WIN32

diff --git a/x11-wm/xpra/files/xpra--tests.patch 
b/x11-wm/xpra/files/xpra--tests.patch
new file mode 100644
index ..746966577dcd
--- /dev/null
+++ b/x11-wm/xpra/files/xpra--tests.patch
@@ -0,0 +1,34 @@
+From 79573c7f1241225922bee992f2caaf730cfbe3ac Mon Sep 17 00:00:00 2001
+From: totaam 
+Date: Sun, 9 Oct 2022 21:37:39 +0700
+Subject: [PATCH 3/3] Revert "don't use GLib directly"
+
+This reverts commit bc8bf26c44d1b151d709232460483f5432f79f5b.
+---
+ xpra/server/mixins/child_command_server.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/xpra/server/mixins/child_command_server.py 
b/xpra/server/mixins/child_command_server.py
+index 8dea3c1f7..1c2a60e27 100644
+--- a/xpra/server/mixins/child_command_server.py
 b/xpra/server/mixins/child_command_server.py
+@@ -11,6 +11,8 @@ import os.path
+ from time import monotonic
+ from subprocess import Popen
+
++from gi.repository import GLib
++
+ from xpra.platform.features import COMMAND_SIGNALS
+ from xpra.child_reaper import getChildReaper, reaper_cleanup
+ from xpra.os_util import (
+@@ -72,7 +74,7 @@ class ChildCommandServer(StubServerMixin):
+ #even if __init__ is called multiple times:
+ if not getattr(self, "late_start_requested", False):
+ self.late_start_requested = True
+-self.idle_add(self.late_start)
++GLib.idle_add(self.late_start)
+
+ def late_start(self):
+ def do_late_start():
+--
+2.38.0

diff --git a/x11-wm/xpra/files/xpra--xdummy.patch 
b/x11-wm/xpra/files/xpra--xdummy.patch
index 2326e63498ce..b86f0dda45fe 100644
--- a/x11-wm/xpra/files/xpra--xdummy.patch
+++ b/x11-wm/xpra/files/xpra--xdummy.patch
@@ -1,24 +1,14 @@
-From 7c384b517fb391065b84b60fa8f1ec3338ed4fce Mon Sep 17 00:00:00 2001
-From: James Le Cuirot 
-Date: Sat, 16 Apr 2022 22:30:11 +0100
-Subject: [PATCH] Avoid Xdummy version detection, assume 0.4.0
-

- setup.py | 1 +
- 1 file changed, 1 insertion(+)
+Avoid Xdummy version detection, assume 0.4.1.
 
 diff --git a/setup.py b/setup.py
-index 40bfba61c..e4636cb46 100755
+index 529b591b1..b9431fea8 100755
 --- a/setup.py
 +++ b/setup.py
-@@ -657,6 +657,7 @@ def get_gcc_version():
- return GCC_VERSION
- 
+@@ -793,6 +793,7 @@ def vernum(s):
+ return tuple(int(v) for v in s.split("-", 1)[0].split("."))
+
  def get_dummy_driver_version():
-+return (0, 4)
- def vernum(s):
- return tuple(int(v) for v in s.split("-", 1)[0].split("."))
++return "0.4.1"
  #try various rpm names:
--- 
-2.34.1
-
+ for rpm_name in ("xorg-x11-drv-dummy", "xf86-video-dummy"):
+ r, out, err = get_status_output(["rpm", "-q", "--queryformat", 
"%{VERSION}", rpm_name])

diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index 230b35b55f48..308083d50825 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -24,6 +24,7 @@
Enable csc softscaler support
Install the HTML5 client
Use ibus input method via 
app-i18n/ibus
+   Enable OAuth2 authentication in the server
Enable pillow support
Use app-crypt/pinentry for password 
entry
Build server-side code

diff --git a/x11-wm/xpra/xpra-.ebuild b/x11-wm/xpra/xpra-

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

2023-05-14 Thread James Le Cuirot

commit: 670718bef9d2b1314ca52c5025be61ddef6efdcb
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun May 14 14:37:36 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun May 14 14:53:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=670718be

x11-wm/xpra: Add missing cryptography dependency

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

 x11-wm/xpra/xpra-4.3.4-r1.ebuild | 5 +++--
 x11-wm/xpra/xpra-.ebuild | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/x11-wm/xpra/xpra-4.3.4-r1.ebuild b/x11-wm/xpra/xpra-4.3.4-r1.ebuild
index 8afbbadd6496..eb1ec1c68778 100644
--- a/x11-wm/xpra/xpra-4.3.4-r1.ebuild
+++ b/x11-wm/xpra/xpra-4.3.4-r1.ebuild
@@ -24,13 +24,13 @@ DESCRIPTION="X Persistent Remote Apps (xpra) and 
Partitioning WM (parti) based o
 HOMEPAGE="https://xpra.org/";
 LICENSE="GPL-2 BSD"
 SLOT="0"
-IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 
lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test udev 
vpx webcam webp xdg xinerama"
+IUSE="brotli +client +clipboard crypt csc cups dbus doc ffmpeg jpeg html ibus 
+lz4 lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test 
udev vpx webcam webp xdg xinerama"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
|| ( client server )
cups? ( dbus )
opengl? ( client )
-   test? ( client clipboard dbus html server sound xdg xinerama )
+   test? ( client clipboard crypt dbus html server sound xdg xinerama )
 "
 
 TDEPEND="
@@ -83,6 +83,7 @@ RDEPEND="
${DEPEND}
${TDEPEND}
$(python_gen_cond_dep '
+   crypt? ( dev-python/cryptography[${PYTHON_USEDEP}] )
cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )

diff --git a/x11-wm/xpra/xpra-.ebuild b/x11-wm/xpra/xpra-.ebuild
index 08e2503c90e1..5e5fb4d66e2f 100644
--- a/x11-wm/xpra/xpra-.ebuild
+++ b/x11-wm/xpra/xpra-.ebuild
@@ -21,13 +21,13 @@ DESCRIPTION="X Persistent Remote Apps (xpra) and 
Partitioning WM (parti) based o
 HOMEPAGE="https://xpra.org/";
 LICENSE="GPL-2 BSD"
 SLOT="0"
-IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 
lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test udev 
vpx webcam webp xdg xinerama"
+IUSE="brotli +client +clipboard crypt csc cups dbus doc ffmpeg jpeg html ibus 
+lz4 lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test 
udev vpx webcam webp xdg xinerama"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
|| ( client server )
cups? ( dbus )
opengl? ( client )
-   test? ( client clipboard dbus html server sound xdg xinerama )
+   test? ( client clipboard crypt dbus html server sound xdg xinerama )
 "
 
 TDEPEND="
@@ -80,6 +80,7 @@ RDEPEND="
${DEPEND}
${TDEPEND}
$(python_gen_cond_dep '
+   crypt? ( dev-python/cryptography[${PYTHON_USEDEP}] )
cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )

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

2023-05-14 Thread James Le Cuirot

commit: 00aeecac09183fae1050b7282abc1623b33be6b8
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun May 14 14:47:58 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun May 14 14:53:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00aeecac

x11-wm/xpra: Version bump to 4.4.4

Some tests are failing, but I can't figure out why.

Closes: https://bugs.gentoo.org/882613
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/Manifest|   1 +
 x11-wm/xpra/files/xpra-4.4-tests.patch  | 100 +++
 x11-wm/xpra/files/xpra-4.4-xdummy.patch |  24 
 x11-wm/xpra/xpra-4.4.4.ebuild   | 215 
 4 files changed, 340 insertions(+)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 92b946c95af1..8670ac3604fd 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,2 +1,3 @@
 DIST xpra-4.3.1-tests.patch 51444 BLAKE2B 
c645aa52bb06c3872f6c1c7aace099c10a6fd46dd4c386ec1a13f6326e3fc8860a71767510ce9b44375cc8b30cef563e4405b2834670a9d2c555d3359d16e99f
 SHA512 
0c70c33e24980db31e904c91f987a73693bd2349958ea8392138987e1dc1852ea42a4ee7e3b238f01c92adc57dbe196e57f4c4accf27aade6c4ea55c1ff9b40c
 DIST xpra-4.3.4.tar.gz 4184031 BLAKE2B 
e01e338398f86c80a1092ea3155126ed26eb959ca97790add4cfcdb0ec8a1c6391937ff101c889ec78bb00bbf38ac0c42c5b85d60e72804ffccbbe5f446aaa3e
 SHA512 
93855ff248f135c70a2144a0afbc66e4830b8d214c9c2017dff1d3e3c7902dac15b1cb03670cde8018b40d5c404bd7c243625faeaba712130f5d0082f562c60c
+DIST xpra-4.4.4.tar.gz 4324840 BLAKE2B 
d39f83b5f6ea960f12170bcc55d3c46d290682bb26424dc57a3ab62f01a4dad513466883287e6197231c96ac81872403d27ff1b65c7c0e520adcda8846766e02
 SHA512 
807fb3b12b5ecc8dbf73aef9dddf509c3397c97d04db4f397d4672b6f097ff977ce71f6ba00fb585ea7dfaf047a4c68e5cca099436da28bc20f4bc2c229c98c9

diff --git a/x11-wm/xpra/files/xpra-4.4-tests.patch 
b/x11-wm/xpra/files/xpra-4.4-tests.patch
new file mode 100644
index ..28691606304d
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.4-tests.patch
@@ -0,0 +1,100 @@
+From 5e657b3fbed2f8495272d6b207d1b3c0a660a72f Mon Sep 17 00:00:00 2001
+From: James Le Cuirot 
+Date: Sun, 2 Oct 2022 22:59:17 +0100
+Subject: [PATCH 1/3] Fix test_root_window_model by formatting geometry string
+ correctly
+
+You can't use `{geometry:24}` style formatting on a list or tuple. It
+must be converted to a string first.
+---
+ xpra/server/shadow/root_window_model.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xpra/server/shadow/root_window_model.py 
b/xpra/server/shadow/root_window_model.py
+index cb89466ef..e69949e7d 100644
+--- a/xpra/server/shadow/root_window_model.py
 b/xpra/server/shadow/root_window_model.py
+@@ -65,7 +65,7 @@ class RootWindowModel:
+ self.signal_listeners = {}
+
+ def __repr__(self):
+-return f"RootWindowModel({self.capture} : {self.geometry:24})"
++return f"RootWindowModel({self.capture} : {str(self.geometry):24})"
+
+ def get_info(self) -> dict:
+ info = {}
+--
+2.38.0
+
+
+From 3fe12855383831f10442a1f4451d206dfee2cb92 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot 
+Date: Sun, 2 Oct 2022 21:51:01 +0100
+Subject: [PATCH 2/3] Fix test_get_version_info when the revision is 0
+
+The 4.4 tarball has revision 0, which causes it to not be included in
+the version info dict. Check for `not None` instead of truthiness.
+---
+ xpra/version_util.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xpra/version_util.py b/xpra/version_util.py
+index 17c0ec27a..5dd38fd3e 100755
+--- a/xpra/version_util.py
 b/xpra/version_util.py
+@@ -158,7 +158,7 @@ def get_version_info(full=1) -> dict:
+ "branch": BRANCH,
+ "commit": COMMIT,
+ }.items():
+-if v and v!="unknown":
++if v is not None and v!="unknown":
+ props[k] = v
+ except ImportError as e:
+ warn("missing some source information: %s", e)
+@@ -181,7 +181,7 @@ def get_version_info_full() -> dict:
+ "cython"   : "CYTHON_VERSION",
+   }.items():
+ v = getattr(build_info, bk, None)
+-if v:
++if v is not None:
+ props[k] = v
+ #record library versions:
+ d = dict((k.lstrip("lib_"), getattr(build_info, k)) for k in 
dir(build_info) if k.startswith("lib_"))
+--
+2.38.0
+
+
+From 79573c7f1241225922bee992f2caaf730cfbe3ac Mon Sep 17 00:00:00 2001
+From: totaam 
+Date: Sun, 9 Oct 2022 21:37:39 +0700
+Subject: [PATCH 3/3] Revert "don't use GLib directly"
+
+This reverts commit bc8bf26c44d1b151d709232460483f5432f79f5b.
+---
+ xpra/server/mixins/child_command_server.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/xpra/server/mixins/child_command_server.py 
b/xpra/server/mixins/child_command_server.py
+index 8dea3c1f7..1c2a

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

2023-05-14 Thread James Le Cuirot

commit: 50abacce974fea038676c63eb08ea07908ce93a3
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun May 14 08:43:14 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun May 14 08:44:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50abacce

x11-wm/xpra: Disable x265 as it causes issues

We're not supposed to use it apparently.

Bug: https://github.com/Xpra-org/xpra/issues/3822
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/{xpra-4.3.4.ebuild => xpra-4.3.4-r1.ebuild} | 4 ++--
 x11-wm/xpra/xpra-.ebuild| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11-wm/xpra/xpra-4.3.4.ebuild b/x11-wm/xpra/xpra-4.3.4-r1.ebuild
similarity index 98%
rename from x11-wm/xpra/xpra-4.3.4.ebuild
rename to x11-wm/xpra/xpra-4.3.4-r1.ebuild
index 3583260ace2a..8afbbadd6496 100644
--- a/x11-wm/xpra/xpra-4.3.4.ebuild
+++ b/x11-wm/xpra/xpra-4.3.4-r1.ebuild
@@ -66,7 +66,7 @@ DEPEND="
x11-libs/libxkbfile
brotli? ( app-arch/brotli )
csc? ( >=media-video/ffmpeg-1.2.2:0= )
-   ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
+   ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264] )
jpeg? ( media-libs/libjpeg-turbo )
pulseaudio? (
media-sound/pulseaudio
@@ -159,7 +159,7 @@ python_configure_all() {
$(use_with ffmpeg dec_avcodec2)
$(use_with ffmpeg enc_ffmpeg)
$(use_with ffmpeg enc_x264)
-   $(use_with ffmpeg enc_x265)
+   --without-enc_x265
--with-gtk3
$(use_with jpeg jpeg_encoder)
$(use_with jpeg jpeg_decoder)

diff --git a/x11-wm/xpra/xpra-.ebuild b/x11-wm/xpra/xpra-.ebuild
index 05cbf8814ab3..08e2503c90e1 100644
--- a/x11-wm/xpra/xpra-.ebuild
+++ b/x11-wm/xpra/xpra-.ebuild
@@ -63,7 +63,7 @@ DEPEND="
x11-libs/libxkbfile
brotli? ( app-arch/brotli )
csc? ( >=media-video/ffmpeg-1.2.2:0= )
-   ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
+   ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264] )
jpeg? ( media-libs/libjpeg-turbo )
pulseaudio? (
media-sound/pulseaudio
@@ -156,7 +156,7 @@ python_configure_all() {
$(use_with ffmpeg dec_avcodec2)
$(use_with ffmpeg enc_ffmpeg)
$(use_with ffmpeg enc_x264)
-   $(use_with ffmpeg enc_x265)
+   --without-enc_x265
--with-gtk3
$(use_with jpeg jpeg_encoder)
$(use_with jpeg jpeg_decoder)

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

2023-05-01 Thread James Le Cuirot

commit: f4faeb20b18dda9a216e0f582c7e8ba668bfde1f
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon May  1 07:50:47 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon May  1 07:50:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4faeb20

x11-wm/xpra: Drop old 4.3.3

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

 x11-wm/xpra/Manifest  |   1 -
 x11-wm/xpra/files/xpra-4.2-suid-warning.patch |  12 --
 x11-wm/xpra/files/xpra-4.3-cpp.patch  |  34 
 x11-wm/xpra/xpra-4.3.3.ebuild | 216 --
 4 files changed, 263 deletions(-)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 1b68b101e872..92b946c95af1 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,3 +1,2 @@
 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/files/xpra-4.2-suid-warning.patch 
b/x11-wm/xpra/files/xpra-4.2-suid-warning.patch
deleted file mode 100644
index b1b2afb4e18b..
--- a/x11-wm/xpra/files/xpra-4.2-suid-warning.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --color -Naur a/xpra/scripts/config.py b/xpra/scripts/config.py
 a/xpra/scripts/config.py   2021-05-19 16:18:30.475153200 +0100
-+++ b/xpra/scripts/config.py   2021-05-30 08:50:42.326953006 +0100
-@@ -159,7 +159,7 @@
- if (xorg_stat.st_mode & stat.S_ISUID)!=0:
- if (xorg_stat.st_mode & stat.S_IROTH)==0:
- if warn_fn:
--warn_fn("%s is suid and not readable, Xdummy support 
unavailable" % xorg_bin)
-+debug("%s is suid and not readable, Xdummy support 
unavailable" % xorg_bin)
- return get_Xvfb_command()
- debug("%s is suid and readable, using the xpra_Xdummy 
wrapper" % xorg_bin)
- use_wrapper = True

diff --git a/x11-wm/xpra/files/xpra-4.3-cpp.patch 
b/x11-wm/xpra/files/xpra-4.3-cpp.patch
deleted file mode 100644
index 41f1263e3465..
--- a/x11-wm/xpra/files/xpra-4.3-cpp.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c80d18b41701082e60ce6bfa5bd6a274affaff96 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot 
-Date: Sun, 22 May 2022 12:00:01 +0100
-Subject: [PATCH] Most build systems respect the CPP env var instead of just
- calling cpp
-

- setup.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index f84d56c6d..7f0db3b69 100755
 a/setup.py
-+++ b/setup.py
-@@ -149,6 +149,7 @@ ARM = ARCH.startswith("arm") or ARCH.startswith("aarch")
- print("ARCH=%s" % (ARCH,))
- 
- INCLUDE_DIRS = os.environ.get("INCLUDE_DIRS", os.path.join(sys.prefix, 
"include")).split(os.pathsep)
-+CPP = os.environ.get("CPP", "cpp")
- 
- from xpra.platform.features import LOCAL_SERVERS_SUPPORTED, SHADOW_SUPPORTED
- shadow_ENABLED = SHADOW_SUPPORTED and DEFAULT
-@@ -2423,7 +2424,7 @@ if v4l2_ENABLED:
- ENABLE_DEVICE_CAPS = 0
- if os.path.exists(videodev2_h):
- try:
--with subprocess.Popen("cpp -fpreprocessed %s | grep -q 
device_caps" % videodev2_h,
-+with subprocess.Popen("%s -fpreprocessed %s | grep -q 
device_caps" % (CPP, videodev2_h),
-  shell=True) as proc:
- ENABLE_DEVICE_CAPS = proc.wait()==0
- except OSError:
--- 
-2.35.1
-

diff --git a/x11-wm/xpra/xpra-4.3.3.ebuild b/x11-wm/xpra/xpra-4.3.3.ebuild
deleted file mode 100644
index 2bc1844bb041..
--- a/x11-wm/xpra/xpra-4.3.3.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = * ]]; 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
-   https://dev.gentoo.org/~chewi/distfiles/${PN}-4.3.1-tests.patch";
-   KEYWORDS="amd64 x86"
-fi
-
-PYTHON_COMPAT=( python3_{9,10} )
-DISTUTILS_SINGLE_IMPL=yes
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit x

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

2023-05-01 Thread Arthur Zamarin

commit: bc054eb6aa1402153560b0e8320daa094b613a11
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon May  1 07:45:53 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon May  1 07:45:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc054eb6

x11-wm/xpra: Stabilize 4.3.4 x86, #904599

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-wm/xpra/xpra-4.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/xpra/xpra-4.3.4.ebuild b/x11-wm/xpra/xpra-4.3.4.ebuild
index 32a4a46aacb5..3583260ace2a 100644
--- a/x11-wm/xpra/xpra-4.3.4.ebuild
+++ b/x11-wm/xpra/xpra-4.3.4.ebuild
@@ -11,7 +11,7 @@ else
SRC_URI+="
https://dev.gentoo.org/~chewi/distfiles/${PN}-4.3.1-tests.patch
"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 PYTHON_COMPAT=( python3_{9..11} )

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

2023-04-22 Thread Arthur Zamarin

commit: 1ee767f91db8ee7ac50aa9e69caea6e52a6d84b7
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr 22 16:00:09 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 22 16:00:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ee767f9

x11-wm/xpra: Stabilize 4.3.4 amd64, #904599

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-wm/xpra/xpra-4.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/xpra/xpra-4.3.4.ebuild b/x11-wm/xpra/xpra-4.3.4.ebuild
index 716df2f2418d..32a4a46aacb5 100644
--- a/x11-wm/xpra/xpra-4.3.4.ebuild
+++ b/x11-wm/xpra/xpra-4.3.4.ebuild
@@ -11,7 +11,7 @@ else
SRC_URI+="
https://dev.gentoo.org/~chewi/distfiles/${PN}-4.3.1-tests.patch
"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{9..11} )

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

2023-03-16 Thread Michał Górny

commit: e437f5c2f140374f3dbf9223de9bdc605a2f6565
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Mar 16 18:57:41 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Mar 17 05:31:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e437f5c2

x11-wm/xpra: Use pypi.eclass

Signed-off-by: Michał Górny  gentoo.org>

 x11-wm/xpra/xpra-4.3.4.ebuild | 6 --
 x11-wm/xpra/xpra-.ebuild  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/x11-wm/xpra/xpra-4.3.4.ebuild b/x11-wm/xpra/xpra-4.3.4.ebuild
index 54c34c90b098..716df2f2418d 100644
--- a/x11-wm/xpra/xpra-4.3.4.ebuild
+++ b/x11-wm/xpra/xpra-4.3.4.ebuild
@@ -7,8 +7,10 @@ if [[ ${PV} = * ]]; 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
-   https://dev.gentoo.org/~chewi/distfiles/${PN}-4.3.1-tests.patch";
+   inherit pypi
+   SRC_URI+="
+   https://dev.gentoo.org/~chewi/distfiles/${PN}-4.3.1-tests.patch
+   "
KEYWORDS="~amd64 ~x86"
 fi
 

diff --git a/x11-wm/xpra/xpra-.ebuild b/x11-wm/xpra/xpra-.ebuild
index 2465c20f7b26..05cbf8814ab3 100644
--- a/x11-wm/xpra/xpra-.ebuild
+++ b/x11-wm/xpra/xpra-.ebuild
@@ -7,7 +7,7 @@ if [[ ${PV} = * ]]; 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"
+   inherit pypi
KEYWORDS="~amd64 ~x86"
 fi

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

2023-02-01 Thread Benda XU

commit: 79bd5db2f47d9b9ddd5b4371546913676100bda8
Author: Benda Xu  gentoo  org>
AuthorDate: Wed Feb  1 14:48:56 2023 +
Commit: Benda XU  gentoo  org>
CommitDate: Wed Feb  1 15:27:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79bd5db2

x11-wm/xpra: enable py3.11

xpra now treat its main "xpra" as scripts, so that the latter has to
be enabled.

xpra_udev_product_version is a udev helper script.

Signed-off-by: Benda Xu  gentoo.org>

 x11-wm/xpra/metadata.xml  | 1 +
 x11-wm/xpra/xpra-4.3.4.ebuild | 6 --
 x11-wm/xpra/xpra-.ebuild  | 6 --
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index 79237ca0d2ac..230b35b55f48 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -14,6 +14,7 @@
James Le Cuirot
 
 
+   xpra
https://www.xpra.org/trac/report
 
 

diff --git a/x11-wm/xpra/xpra-4.3.4.ebuild b/x11-wm/xpra/xpra-4.3.4.ebuild
index 190633c60938..54c34c90b098 100644
--- a/x11-wm/xpra/xpra-4.3.4.ebuild
+++ b/x11-wm/xpra/xpra-4.3.4.ebuild
@@ -12,7 +12,7 @@ else
KEYWORDS="~amd64 ~x86"
 fi
 
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_SINGLE_IMPL=yes
 DISTUTILS_USE_SETUPTOOLS=no
 
@@ -131,7 +131,8 @@ python_prepare_all() {
-i setup.py || die
 
if use minimal; then
-   sed -r -e 
's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \
+   sed -r -e '/pam_ENABLED/s/DEFAULT/False/' \
+   -e 's/^(xdg_open)_ENABLED = .*/\1_ENABLED = False/' \
-i setup.py || die
fi
 }
@@ -199,6 +200,7 @@ python_install_all() {
mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
else
rm -vr "${ED}"/usr/lib/udev || die
+   rm -v "${ED}"/usr/bin/xpra_udev_product_version || die
fi
 }
 

diff --git a/x11-wm/xpra/xpra-.ebuild b/x11-wm/xpra/xpra-.ebuild
index e9b2bf0106f5..2465c20f7b26 100644
--- a/x11-wm/xpra/xpra-.ebuild
+++ b/x11-wm/xpra/xpra-.ebuild
@@ -11,7 +11,7 @@ else
KEYWORDS="~amd64 ~x86"
 fi
 
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_SINGLE_IMPL=yes
 DISTUTILS_USE_SETUPTOOLS=no
 
@@ -130,7 +130,8 @@ python_prepare_all() {
-i setup.py || die
 
if use minimal; then
-   sed -r -e 
's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \
+   sed -r -e '/pam_ENABLED/s/DEFAULT/False/' \
+   -e 's/^(xdg_open)_ENABLED = .*/\1_ENABLED = False/' \
-i setup.py || die
fi
 }
@@ -198,6 +199,7 @@ python_install_all() {
mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
else
rm -vr "${ED}"/usr/lib/udev || die
+   rm -v "${ED}"/usr/bin/xpra_udev_product_version || die
fi
 }

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

2022-09-04 Thread James Le Cuirot

commit: 13c19aab15dbfb2a21b3489af4d8b5f87c6d1a89
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Sep  4 10:57:13 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Sep  4 10:57:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13c19aab

x11-wm/xpra: Prevent Wayland from confusing the tests

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

 x11-wm/xpra/xpra-4.3.3.ebuild | 3 ++-
 x11-wm/xpra/xpra-4.3.4.ebuild | 3 ++-
 x11-wm/xpra/xpra-.ebuild  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/x11-wm/xpra/xpra-4.3.3.ebuild b/x11-wm/xpra/xpra-4.3.3.ebuild
index a50b752c6ed4..ade4ca7fc866 100644
--- a/x11-wm/xpra/xpra-4.3.3.ebuild
+++ b/x11-wm/xpra/xpra-4.3.3.ebuild
@@ -185,7 +185,8 @@ python_test() {
distutils_install_for_testing
xdg_environment_reset
 
-   PYTHONPATH=${S}/tests/unittests:${BUILD_DIR}/test/lib \
+   env -u WAYLAND_DISPLAY -u XDG_SESSION_TYPE \
+   PYTHONPATH="${S}/tests/unittests:${BUILD_DIR}/test/lib" \
XPRA_SYSTEMD_RUN=$(usex systemd) XPRA_TEST_COVERAGE=0 \
"${PYTHON}" "${S}"/tests/unittests/unit/run.py || die
 }

diff --git a/x11-wm/xpra/xpra-4.3.4.ebuild b/x11-wm/xpra/xpra-4.3.4.ebuild
index a0bcf0ffcbc9..b5532cbb6507 100644
--- a/x11-wm/xpra/xpra-4.3.4.ebuild
+++ b/x11-wm/xpra/xpra-4.3.4.ebuild
@@ -183,7 +183,8 @@ python_test() {
distutils_install_for_testing
xdg_environment_reset
 
-   PYTHONPATH=${S}/tests/unittests:${BUILD_DIR}/test/lib \
+   env -u WAYLAND_DISPLAY -u XDG_SESSION_TYPE \
+   PYTHONPATH="${S}/tests/unittests:${BUILD_DIR}/test/lib" \
XPRA_SYSTEMD_RUN=$(usex systemd) XPRA_TEST_COVERAGE=0 \
"${PYTHON}" "${S}"/tests/unittests/unit/run.py || die
 }

diff --git a/x11-wm/xpra/xpra-.ebuild b/x11-wm/xpra/xpra-.ebuild
index 5dea4bc89ba3..8f90e620cdf4 100644
--- a/x11-wm/xpra/xpra-.ebuild
+++ b/x11-wm/xpra/xpra-.ebuild
@@ -182,7 +182,8 @@ python_test() {
distutils_install_for_testing
xdg_environment_reset
 
-   PYTHONPATH=${S}/tests/unittests:${BUILD_DIR}/test/lib \
+   env -u WAYLAND_DISPLAY -u XDG_SESSION_TYPE \
+   PYTHONPATH="${S}/tests/unittests:${BUILD_DIR}/test/lib" \
XPRA_SYSTEMD_RUN=$(usex systemd) XPRA_TEST_COVERAGE=0 \
"${PYTHON}" "${S}"/tests/unittests/unit/run.py || die
 }

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

2022-08-29 Thread James Le Cuirot

commit: db75ee79722700299a45b254c89007270d24689b
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Aug 29 14:05:49 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Aug 29 14:05:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db75ee79

x11-wm/xpra: Drop old 4.2

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

 x11-wm/xpra/Manifest|   1 -
 x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch |  33 --
 x11-wm/xpra/files/xpra-4.2-no-service.patch |  19 
 x11-wm/xpra/xpra-4.2.ebuild | 170 
 4 files changed, 223 deletions(-)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 310851c94a31..1b68b101e872 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,4 +1,3 @@
-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/files/xpra-3.0.2-ldconfig.patch 
b/x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch
deleted file mode 100644
index 8475d47b8b3c..
--- a/x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ruN xpra-3.0.2.orig/xpra/x11/fakeXinerama.py 
xpra-3.0.2/xpra/x11/fakeXinerama.py
 xpra-3.0.2.orig/xpra/x11/fakeXinerama.py   2019-09-24 15:54:02.0 
+0200
-+++ xpra-3.0.2/xpra/x11/fakeXinerama.py2020-01-16 12:20:22.620519078 
+0100
-@@ -23,29 +23,6 @@
- 
- def find_libfakeXinerama():
- libname = "fakeXinerama"
--try:
--from ctypes.util import find_library
--flibname = find_library("fakeXinerama")
--if flibname:
--libname = flibname
--except Exception:
--pass
--if POSIX:
--for lib_dir in os.environ.get("LD_LIBRARY_PATH", 
"/usr/lib").split(os.pathsep):
--lib_path = os.path.join(lib_dir, libname)
--if not os.path.exists(lib_dir):
--continue
--if os.path.exists(lib_path) and os.path.isfile(lib_path):
--return lib_path
--if LINUX:
--try:
--libpath = find_lib_ldconfig("fakeXinerama")
--if libpath:
--return libpath
--except Exception as e:
--log("find_libfakeXinerama()", exc_info=True)
--log.error("Error: cannot launch ldconfig -p to locate 
libfakeXinerama:")
--log.error(" %s", e)
- return find_lib(libname)
- 
- current_xinerama_config = None

diff --git a/x11-wm/xpra/files/xpra-4.2-no-service.patch 
b/x11-wm/xpra/files/xpra-4.2-no-service.patch
deleted file mode 100644
index dd85370968ba..
--- a/x11-wm/xpra/files/xpra-4.2-no-service.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Don't install the service files. Auto-detection is used to determine what files
-to install, and where, which can be unpredictable on Gentoo. The init.d script
-is also not suitable for Gentoo.
-
-diff --git a/setup.py b/setup.py
-index 1718b06a9..b24a5bd1e 100755
 a/setup.py
-+++ b/setup.py
-@@ -139,8 +139,8 @@ from xpra.platform.features import 
LOCAL_SERVERS_SUPPORTED, SHADOW_SUPPORTED
- shadow_ENABLED = SHADOW_SUPPORTED and DEFAULT
- server_ENABLED = (LOCAL_SERVERS_SUPPORTED or shadow_ENABLED) and DEFAULT
- rfb_ENABLED = server_ENABLED
--service_ENABLED = LINUX and server_ENABLED
--sd_listen_ENABLED = POSIX and pkg_config_ok("--exists", "libsystemd")
-+service_ENABLED = False
-+sd_listen_ENABLED = False
- proxy_ENABLED  = DEFAULT
- client_ENABLED = DEFAULT
- scripts_ENABLED = not WIN32

diff --git a/x11-wm/xpra/xpra-4.2.ebuild b/x11-wm/xpra/xpra-4.2.ebuild
deleted file mode 100644
index c42097bb561a..
--- a/x11-wm/xpra/xpra-4.2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pyth

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

2022-08-29 Thread Jakov Smolić

commit: 13a9966b63ee37a26c522607c49af10c71d3b3a2
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Aug 29 12:49:23 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Aug 29 12:49:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13a9966b

x11-wm/xpra: Stabilize 4.3.3 x86, #853619

Signed-off-by: Jakov Smolić  gentoo.org>

 x11-wm/xpra/xpra-4.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/xpra/xpra-4.3.3.ebuild b/x11-wm/xpra/xpra-4.3.3.ebuild
index 0439786ef126..a50b752c6ed4 100644
--- a/x11-wm/xpra/xpra-4.3.3.ebuild
+++ b/x11-wm/xpra/xpra-4.3.3.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = * ]]; then
 else
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"
+   KEYWORDS="amd64 x86"
 fi
 
 PYTHON_COMPAT=( python3_{7,8,9,10} )

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

2022-07-05 Thread Sam James

commit: cb9b6a97328dfa3d21fe5744bf0b4fd4b60324de
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul  6 06:05:51 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul  6 06:05:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb9b6a97

x11-wm/xpra: Stabilize 4.3.3 amd64, #853619

Signed-off-by: Sam James  gentoo.org>

 x11-wm/xpra/xpra-4.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/xpra/xpra-4.3.3.ebuild b/x11-wm/xpra/xpra-4.3.3.ebuild
index 6edd3e2ee447..0439786ef126 100644
--- a/x11-wm/xpra/xpra-4.3.3.ebuild
+++ b/x11-wm/xpra/xpra-4.3.3.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = * ]]; then
 else
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"
+   KEYWORDS="amd64 ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{7,8,9,10} )

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

2022-06-22 Thread James Le Cuirot

commit: 33f1645df2181fcd724b4a4b5a40c5d76d326994
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Jun 22 21:40:18 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Jun 22 21:40:18 2022 +
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  gentoo.org>

 x11-wm/xpra/Manifest| 1 +
 x11-wm/xpra/{xpra-.ebuild => xpra-4.3.4.ebuild} | 6 +++---
 x11-wm/xpra/xpra-.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-.ebuild b/x11-wm/xpra/xpra-4.3.4.ebuild
similarity index 96%
copy from x11-wm/xpra/xpra-.ebuild
copy to x11-wm/xpra/xpra-4.3.4.ebuild
index a21d89139d37..a0bcf0ffcbc9 100644
--- a/x11-wm/xpra/xpra-.ebuild
+++ b/x11-wm/xpra/xpra-4.3.4.ebuild
@@ -7,7 +7,8 @@ if [[ ${PV} = * ]]; 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}--xdummy.patch
+   "${DISTDIR}"/${PN}-4.3.1-tests.patch
 )
 
 python_prepare_all() {

diff --git a/x11-wm/xpra/xpra-.ebuild b/x11-wm/xpra/xpra-.ebuild
index a21d89139d37..5dea4bc89ba3 100644
--- a/x11-wm/xpra/xpra-.ebuild
+++ b/x11-wm/xpra/xpra-.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}--xdummy.patch
 )

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

2022-05-26 Thread James Le Cuirot

commit: 49b7c0c1ca3d0ab153bce1206008262424c29a00
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu May 26 22:06:56 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu May 26 22:06:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49b7c0c1

x11-wm/xpra: Add udev USE flag and call udev_reload when enabled

Closes: https://bugs.gentoo.org/847037
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/xpra-4.3.3.ebuild | 19 +++
 x11-wm/xpra/xpra-.ebuild  | 19 +++
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/x11-wm/xpra/xpra-4.3.3.ebuild b/x11-wm/xpra/xpra-4.3.3.ebuild
index a6855e815cf0..6edd3e2ee447 100644
--- a/x11-wm/xpra/xpra-4.3.3.ebuild
+++ b/x11-wm/xpra/xpra-4.3.3.ebuild
@@ -22,7 +22,7 @@ DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning 
WM (parti) based o
 HOMEPAGE="https://xpra.org/";
 LICENSE="GPL-2 BSD"
 SLOT="0"
-IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 
lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test vpx 
webcam webp xdg xinerama"
+IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 
lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test udev 
vpx webcam webp xdg xinerama"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
|| ( client server )
@@ -99,6 +99,7 @@ RDEPEND="
x11-apps/xmodmap
ibus? ( app-i18n/ibus )
pinentry? ( app-crypt/pinentry )
+   udev? ( virtual/udev )
 "
 DEPEND+="
test? ( ${TDEPEND} )
@@ -193,12 +194,22 @@ 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
+   if use udev; then
+   local dir=$(get_udevdir)
+   dodir "${dir%/*}"
+   mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
+   else
+   rm -vr "${ED}"/usr/lib/udev || die
+   fi
 }
 
 pkg_postinst() {
tmpfiles_process xpra.conf
xdg_pkg_postinst
+   use udev && udev_reload
+}
+
+pkg_postrm() {
+   xdg_pkg_postinst
+   use udev && udev_reload
 }

diff --git a/x11-wm/xpra/xpra-.ebuild b/x11-wm/xpra/xpra-.ebuild
index 59f1f56b88b3..a21d89139d37 100644
--- a/x11-wm/xpra/xpra-.ebuild
+++ b/x11-wm/xpra/xpra-.ebuild
@@ -21,7 +21,7 @@ DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning 
WM (parti) based o
 HOMEPAGE="https://xpra.org/";
 LICENSE="GPL-2 BSD"
 SLOT="0"
-IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 
lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test vpx 
webcam webp xdg xinerama"
+IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 
lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test udev 
vpx webcam webp xdg xinerama"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
|| ( client server )
@@ -98,6 +98,7 @@ RDEPEND="
x11-apps/xmodmap
ibus? ( app-i18n/ibus )
pinentry? ( app-crypt/pinentry )
+   udev? ( virtual/udev )
 "
 DEPEND+="
test? ( ${TDEPEND} )
@@ -191,12 +192,22 @@ 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
+   if use udev; then
+   local dir=$(get_udevdir)
+   dodir "${dir%/*}"
+   mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
+   else
+   rm -vr "${ED}"/usr/lib/udev || die
+   fi
 }
 
 pkg_postinst() {
tmpfiles_process xpra.conf
xdg_pkg_postinst
+   use udev && udev_reload
+}
+
+pkg_postrm() {
+   xdg_pkg_postinst
+   use udev && udev_reload
 }

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

2022-05-22 Thread James Le Cuirot

commit: 9c3f62cd0d98ca76908cc3d661159cfc6c119d12
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun May 22 12:41:34 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun May 22 12:41:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c3f62cd

x11-wm/xpra: Patch around setup.py hardcoded call to cpp

This has been merged upstream.

Closes: https://bugs.gentoo.org/831337
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/files/xpra-4.3-cpp.patch | 34 ++
 x11-wm/xpra/xpra-4.3.3.ebuild|  1 +
 2 files changed, 35 insertions(+)

diff --git a/x11-wm/xpra/files/xpra-4.3-cpp.patch 
b/x11-wm/xpra/files/xpra-4.3-cpp.patch
new file mode 100644
index ..41f1263e3465
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.3-cpp.patch
@@ -0,0 +1,34 @@
+From c80d18b41701082e60ce6bfa5bd6a274affaff96 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot 
+Date: Sun, 22 May 2022 12:00:01 +0100
+Subject: [PATCH] Most build systems respect the CPP env var instead of just
+ calling cpp
+
+---
+ setup.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index f84d56c6d..7f0db3b69 100755
+--- a/setup.py
 b/setup.py
+@@ -149,6 +149,7 @@ ARM = ARCH.startswith("arm") or ARCH.startswith("aarch")
+ print("ARCH=%s" % (ARCH,))
+ 
+ INCLUDE_DIRS = os.environ.get("INCLUDE_DIRS", os.path.join(sys.prefix, 
"include")).split(os.pathsep)
++CPP = os.environ.get("CPP", "cpp")
+ 
+ from xpra.platform.features import LOCAL_SERVERS_SUPPORTED, SHADOW_SUPPORTED
+ shadow_ENABLED = SHADOW_SUPPORTED and DEFAULT
+@@ -2423,7 +2424,7 @@ if v4l2_ENABLED:
+ ENABLE_DEVICE_CAPS = 0
+ if os.path.exists(videodev2_h):
+ try:
+-with subprocess.Popen("cpp -fpreprocessed %s | grep -q 
device_caps" % videodev2_h,
++with subprocess.Popen("%s -fpreprocessed %s | grep -q 
device_caps" % (CPP, videodev2_h),
+  shell=True) as proc:
+ ENABLE_DEVICE_CAPS = proc.wait()==0
+ except OSError:
+-- 
+2.35.1
+

diff --git a/x11-wm/xpra/xpra-4.3.3.ebuild b/x11-wm/xpra/xpra-4.3.3.ebuild
index 337531a3c0f3..a6855e815cf0 100644
--- a/x11-wm/xpra/xpra-4.3.3.ebuild
+++ b/x11-wm/xpra/xpra-4.3.3.ebuild
@@ -117,6 +117,7 @@ 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}-4.3-cpp.patch
"${DISTDIR}"/${PN}-4.3.1-tests.patch
 )

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

2022-05-22 Thread James Le Cuirot

commit: 9364057ddebd8bad0abc98881347b6dfec5f6b4a
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun May 22 10:54:12 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun May 22 10:54:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9364057d

x11-wm/xpra: Drop old 4.3.2

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

 x11-wm/xpra/Manifest  |   1 -
 x11-wm/xpra/xpra-4.3.2.ebuild | 197 --
 2 files changed, 198 deletions(-)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index b930ca5f5341..70bd8bab90ad 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,4 +1,3 @@
 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.2.tar.gz 4175968 BLAKE2B 
16d42f9509c1ac3cf3f345a6cdd3711496019064c890268d1c1612e37e34ffe93016488f8a6d1bf8509da1d32500571e80bb4143a2f870f07530386515107735
 SHA512 
b9bc89a0d042e4ef2a416b7787bd1588a9d151d482319c637073749383e2b3f3361eb0f95c0e39ba98c9ae87ef5acb68c4980645fb9a2feea37215f88f7a8a95
 DIST xpra-4.3.3.tar.gz 4180278 BLAKE2B 
2fceab6c95efd0bd0390b7965aea588f39e43f86094c1f9921e1f75022f569808e27d7d85adcccfd64ac28889d0f6d2d6afdf4365f8c919bac8b1a14f3919f23
 SHA512 
c470e892b4b6379b6c9447731ab174e85c26de15fdc9541a199a2f49e45d07942ae8638f8ddf040a22c73422c6e6b262a9066cd8990f182b75163f7d449d91e2

diff --git a/x11-wm/xpra/xpra-4.3.2.ebuild b/x11-wm/xpra/xpra-4.3.2.ebuild
deleted file mode 100644
index 071992dfdb79..
--- a/x11-wm/xpra/xpra-4.3.2.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_SINGLE_IMPL=yes
-DISTUTILS_USE_SETUPTOOLS=no
-inherit xdg xdg-utils distutils-r1 tmpfiles udev
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
-HOMEPAGE="https://xpra.org/";
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-   https://dev.gentoo.org/~chewi/distfiles/${PN}-4.3.1-tests.patch";
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 
lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test vpx 
webcam webp xdg xinerama"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-   || ( client server )
-   cups? ( dbus )
-   opengl? ( client )
-   test? ( client clipboard dbus html server sound xdg xinerama )
-"
-
-TDEPEND="
-   $(python_gen_cond_dep '
-   dev-python/netifaces[${PYTHON_USEDEP}]
-   dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
-   dev-python/rencode[${PYTHON_USEDEP}]
-   dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-   xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] )
-   ')
-   html? ( www-apps/xpra-html5 )
-   server? (
-   x11-base/xorg-server[-minimal,xvfb]
-   x11-drivers/xf86-input-void
-   )
-   xinerama? ( x11-libs/libfakeXinerama )
-"
-DEPEND="
-   ${PYTHON_DEPS}
-   $(python_gen_cond_dep '
-   dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
-   opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
-   sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
-   ')
-   x11-libs/gtk+:3[introspection]
-   x11-libs/libX11
-   x11-libs/libXcomposite
-   x11-libs/libXdamage
-   x11-libs/libXfixes
-   x11-libs/libXrandr
-   x11-libs/libXres
-   x11-libs/libXtst
-   x11-libs/libxkbfile
-   brotli? ( app-arch/brotli )
-   csc? ( >=media-video/ffmpeg-1.2.2:0= )
-   ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
-   jpeg? ( media-libs/libjpeg-turbo )
-   pulseaudio? (
-   media-sound/pulseaudio
-   media-plugins/gst-plugins-pulse:1.0
-   )
-   sound? (
-   media-libs/gstreamer:1.0
-   media-libs/gst-plugins-base:1.0
-   )
-   vpx? ( media-libs/libvpx media-video/ffmpeg )
-   webp? ( media-libs/libwebp )
-"
-RDEPEND="
-   ${DEPEND}
-   ${TDEPEND}
-   $(python_gen_cond_dep '
-   cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
-   lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-   lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
-   opengl? (
-

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

2022-04-29 Thread James Le Cuirot

commit: 00a81436f2ea48adaf8f17168e4af4749e2973ac
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Apr 29 09:32:24 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Apr 29 09:32:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00a81436

x11-wm/xpra: Version bump to 4.3.3

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

 x11-wm/xpra/Manifest  |   1 +
 x11-wm/xpra/xpra-4.3.3.ebuild | 203 ++
 2 files changed, 204 insertions(+)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index b75a51d00781..b930ca5f5341 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.2.tar.gz 4175968 BLAKE2B 
16d42f9509c1ac3cf3f345a6cdd3711496019064c890268d1c1612e37e34ffe93016488f8a6d1bf8509da1d32500571e80bb4143a2f870f07530386515107735
 SHA512 
b9bc89a0d042e4ef2a416b7787bd1588a9d151d482319c637073749383e2b3f3361eb0f95c0e39ba98c9ae87ef5acb68c4980645fb9a2feea37215f88f7a8a95
+DIST xpra-4.3.3.tar.gz 4180278 BLAKE2B 
2fceab6c95efd0bd0390b7965aea588f39e43f86094c1f9921e1f75022f569808e27d7d85adcccfd64ac28889d0f6d2d6afdf4365f8c919bac8b1a14f3919f23
 SHA512 
c470e892b4b6379b6c9447731ab174e85c26de15fdc9541a199a2f49e45d07942ae8638f8ddf040a22c73422c6e6b262a9066cd8990f182b75163f7d449d91e2

diff --git a/x11-wm/xpra/xpra-4.3.3.ebuild b/x11-wm/xpra/xpra-4.3.3.ebuild
new file mode 100644
index ..337531a3c0f3
--- /dev/null
+++ b/x11-wm/xpra/xpra-4.3.3.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = * ]]; 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
+   https://dev.gentoo.org/~chewi/distfiles/${PN}-4.3.1-tests.patch";
+   KEYWORDS="~amd64 ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit xdg xdg-utils distutils-r1 tmpfiles udev
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
+HOMEPAGE="https://xpra.org/";
+LICENSE="GPL-2 BSD"
+SLOT="0"
+IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 
lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test vpx 
webcam webp xdg xinerama"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   || ( client server )
+   cups? ( dbus )
+   opengl? ( client )
+   test? ( client clipboard dbus html server sound xdg xinerama )
+"
+
+TDEPEND="
+   $(python_gen_cond_dep '
+   dev-python/netifaces[${PYTHON_USEDEP}]
+   dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+   dev-python/rencode[${PYTHON_USEDEP}]
+   dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+   xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] )
+   ')
+   html? ( www-apps/xpra-html5 )
+   server? (
+   x11-base/xorg-server[-minimal,xvfb]
+   x11-drivers/xf86-input-void
+   )
+   xinerama? ( x11-libs/libfakeXinerama )
+"
+DEPEND="
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+   opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+   sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
+   ')
+   x11-libs/gtk+:3[introspection]
+   x11-libs/libX11
+   x11-libs/libXcomposite
+   x11-libs/libXdamage
+   x11-libs/libXfixes
+   x11-libs/libXrandr
+   x11-libs/libXres
+   x11-libs/libXtst
+   x11-libs/libxkbfile
+   brotli? ( app-arch/brotli )
+   csc? ( >=media-video/ffmpeg-1.2.2:0= )
+   ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
+   jpeg? ( media-libs/libjpeg-turbo )
+   pulseaudio? (
+   media-sound/pulseaudio
+   media-plugins/gst-plugins-pulse:1.0
+   )
+   sound? (
+   media-libs/gstreamer:1.0
+   media-libs/gst-plugins-base:1.0
+   )
+   vpx? ( media-libs/libvpx media-video/ffmpeg )
+   webp? ( media-libs/libwebp )
+"
+RDEPEND="
+   ${DEPEND}
+   ${TDEPEND}
+   $(python_gen_cond_dep '
+   cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+

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

2022-04-17 Thread James Le Cuirot

commit: e1c4f0626f5ab94414b9f35185a71fe33a198a22
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Apr 17 12:52:00 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Apr 17 12:52:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1c4f062

x11-wm/xpra: Add live ebuild

Strangely, the unit tests often get fixed up after each release, so it helps to
catch and fix these early.

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

 x11-wm/xpra/files/xpra--xdummy.patch |  24 
 x11-wm/xpra/xpra-.ebuild | 202 +++
 2 files changed, 226 insertions(+)

diff --git a/x11-wm/xpra/files/xpra--xdummy.patch 
b/x11-wm/xpra/files/xpra--xdummy.patch
new file mode 100644
index ..2326e63498ce
--- /dev/null
+++ b/x11-wm/xpra/files/xpra--xdummy.patch
@@ -0,0 +1,24 @@
+From 7c384b517fb391065b84b60fa8f1ec3338ed4fce Mon Sep 17 00:00:00 2001
+From: James Le Cuirot 
+Date: Sat, 16 Apr 2022 22:30:11 +0100
+Subject: [PATCH] Avoid Xdummy version detection, assume 0.4.0
+
+---
+ setup.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/setup.py b/setup.py
+index 40bfba61c..e4636cb46 100755
+--- a/setup.py
 b/setup.py
+@@ -657,6 +657,7 @@ def get_gcc_version():
+ return GCC_VERSION
+ 
+ def get_dummy_driver_version():
++return (0, 4)
+ def vernum(s):
+ return tuple(int(v) for v in s.split("-", 1)[0].split("."))
+ #try various rpm names:
+-- 
+2.34.1
+

diff --git a/x11-wm/xpra/xpra-.ebuild b/x11-wm/xpra/xpra-.ebuild
new file mode 100644
index ..59f1f56b88b3
--- /dev/null
+++ b/x11-wm/xpra/xpra-.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = * ]]; 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"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit xdg xdg-utils distutils-r1 tmpfiles udev
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
+HOMEPAGE="https://xpra.org/";
+LICENSE="GPL-2 BSD"
+SLOT="0"
+IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 
lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test vpx 
webcam webp xdg xinerama"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   || ( client server )
+   cups? ( dbus )
+   opengl? ( client )
+   test? ( client clipboard dbus html server sound xdg xinerama )
+"
+
+TDEPEND="
+   $(python_gen_cond_dep '
+   dev-python/netifaces[${PYTHON_USEDEP}]
+   dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+   dev-python/rencode[${PYTHON_USEDEP}]
+   dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+   xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] )
+   ')
+   html? ( www-apps/xpra-html5 )
+   server? (
+   x11-base/xorg-server[-minimal,xvfb]
+   x11-drivers/xf86-input-void
+   )
+   xinerama? ( x11-libs/libfakeXinerama )
+"
+DEPEND="
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+   opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+   sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
+   ')
+   x11-libs/gtk+:3[introspection]
+   x11-libs/libX11
+   x11-libs/libXcomposite
+   x11-libs/libXdamage
+   x11-libs/libXfixes
+   x11-libs/libXrandr
+   x11-libs/libXres
+   x11-libs/libXtst
+   x11-libs/libxkbfile
+   brotli? ( app-arch/brotli )
+   csc? ( >=media-video/ffmpeg-1.2.2:0= )
+   ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
+   jpeg? ( media-libs/libjpeg-turbo )
+   pulseaudio? (
+   media-sound/pulseaudio
+   media-plugins/gst-plugins-pulse:1.0
+   )
+   sound? (
+   media-libs/gstreamer:1.0
+   media-libs/gst-plugins-base:1.0
+   )
+   vpx? ( media-libs/libvpx media-video/ffmpeg )
+   webp? ( media-libs/libwebp )
+"
+RDEPEND="
+   ${DEPEND}
+   ${TDEPEND}
+   $(python_gen_cond_dep '
+   cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+   lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+   lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+   opengl? (
+   client? ( 
dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+   )
+   webcam? (
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/pyinotify[${PYTHON_USEDEP}]
+   media-libs/opencv[${PYTHON_USEDEP},python]
+   )
+   ')
+   acct-group/xpra
+

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

2022-03-11 Thread Andreas K. Hüttel

commit: e75bece6d5179b4ec755ec47cd8a6aed43d7b5d4
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Fri Mar 11 19:40:02 2022 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Fri Mar 11 19:40:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e75bece6

x11-wm/xpra: Drop myself from maintainership

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 x11-wm/xpra/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index 224acc5dbb49..79237ca0d2ac 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -1,10 +1,6 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-
-   dilfri...@gentoo.org
-   Andreas K. Huettel
-
 
hero...@gentoo.org
Benda Xu

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

2022-02-28 Thread James Le Cuirot

commit: 476fe322e0793d7671738ee0350de3b872b60d97
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Feb 28 23:04:43 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Feb 28 23:05:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=476fe322

x11-wm/xpra: Don't install service files by patching instead

Auto-detection is used to determine what files to install, and where, which can
be unpredictable, hence my earlier fix broke.

Closes: https://bugs.gentoo.org/834336
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/files/xpra-4.2-no-service.patch | 19 +++
 x11-wm/xpra/files/xpra-4.3-no-service.patch | 19 +++
 x11-wm/xpra/xpra-4.2.ebuild |  4 +---
 x11-wm/xpra/xpra-4.3.2.ebuild   |  4 +---
 4 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/x11-wm/xpra/files/xpra-4.2-no-service.patch 
b/x11-wm/xpra/files/xpra-4.2-no-service.patch
new file mode 100644
index ..dd85370968ba
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.2-no-service.patch
@@ -0,0 +1,19 @@
+Don't install the service files. Auto-detection is used to determine what files
+to install, and where, which can be unpredictable on Gentoo. The init.d script
+is also not suitable for Gentoo.
+
+diff --git a/setup.py b/setup.py
+index 1718b06a9..b24a5bd1e 100755
+--- a/setup.py
 b/setup.py
+@@ -139,8 +139,8 @@ from xpra.platform.features import 
LOCAL_SERVERS_SUPPORTED, SHADOW_SUPPORTED
+ shadow_ENABLED = SHADOW_SUPPORTED and DEFAULT
+ server_ENABLED = (LOCAL_SERVERS_SUPPORTED or shadow_ENABLED) and DEFAULT
+ rfb_ENABLED = server_ENABLED
+-service_ENABLED = LINUX and server_ENABLED
+-sd_listen_ENABLED = POSIX and pkg_config_ok("--exists", "libsystemd")
++service_ENABLED = False
++sd_listen_ENABLED = False
+ proxy_ENABLED  = DEFAULT
+ client_ENABLED = DEFAULT
+ scripts_ENABLED = not WIN32

diff --git a/x11-wm/xpra/files/xpra-4.3-no-service.patch 
b/x11-wm/xpra/files/xpra-4.3-no-service.patch
new file mode 100644
index ..b336db581953
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.3-no-service.patch
@@ -0,0 +1,19 @@
+Don't install the service files. Auto-detection is used to determine what files
+to install, and where, which can be unpredictable on Gentoo. The init.d script
+is also not suitable for Gentoo.
+
+diff --git a/setup.py b/setup.py
+index fc67abb50..a11dc0d97 100755
+--- a/setup.py
 b/setup.py
+@@ -145,8 +145,8 @@ from xpra.platform.features import 
LOCAL_SERVERS_SUPPORTED, SHADOW_SUPPORTED
+ shadow_ENABLED = SHADOW_SUPPORTED and DEFAULT
+ server_ENABLED = (LOCAL_SERVERS_SUPPORTED or shadow_ENABLED) and DEFAULT
+ rfb_ENABLED = DEFAULT
+-service_ENABLED = LINUX and server_ENABLED
+-sd_listen_ENABLED = POSIX and pkg_config_ok("--exists", "libsystemd")
++service_ENABLED = False
++sd_listen_ENABLED = False
+ proxy_ENABLED  = DEFAULT
+ client_ENABLED = DEFAULT
+ scripts_ENABLED = not WIN32

diff --git a/x11-wm/xpra/xpra-4.2.ebuild b/x11-wm/xpra/xpra-4.2.ebuild
index 681a6c97aab5..c42097bb561a 100644
--- a/x11-wm/xpra/xpra-4.2.ebuild
+++ b/x11-wm/xpra/xpra-4.2.ebuild
@@ -96,6 +96,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
"${FILESDIR}"/${PN}-3.0.2-ldconfig.patch
"${FILESDIR}"/${PN}-4.2-suid-warning.patch
+   "${FILESDIR}"/${PN}-4.2-no-service.patch
 )
 
 python_prepare_all() {
@@ -161,9 +162,6 @@ python_install_all() {
local dir=$(get_udevdir)
dodir "${dir%/*}"
mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
-
-   # TODO: Write a Gentoo init script.
-   rm -r "${ED}"/etc/{init.d,sysconfig}/ || die
 }
 
 pkg_postinst() {

diff --git a/x11-wm/xpra/xpra-4.3.2.ebuild b/x11-wm/xpra/xpra-4.3.2.ebuild
index 84c10467c081..071992dfdb79 100644
--- a/x11-wm/xpra/xpra-4.3.2.ebuild
+++ b/x11-wm/xpra/xpra-4.3.2.ebuild
@@ -110,6 +110,7 @@ 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
"${DISTDIR}"/${PN}-4.3.1-tests.patch
 )
 
@@ -188,9 +189,6 @@ python_install_all() {
local dir=$(get_udevdir)
dodir "${dir%/*}"
mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
-
-   # TODO: Write a Gentoo init script.
-   rm -r "${ED}"/etc/{init.d,sysconfig}/ || die
 }
 
 pkg_postinst() {

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

2022-02-27 Thread James Le Cuirot

commit: 7dafb3115ae50dc666dffb36075eabd9bc577588
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Feb 27 10:18:53 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Feb 27 10:18:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dafb311

x11-wm/xpra: Add Python 3.10 to version 4.3.2

The tests pass.

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

 x11-wm/xpra/xpra-4.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/xpra/xpra-4.3.2.ebuild b/x11-wm/xpra/xpra-4.3.2.ebuild
index 0e1835e5a126..84c10467c081 100644
--- a/x11-wm/xpra/xpra-4.3.2.ebuild
+++ b/x11-wm/xpra/xpra-4.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 DISTUTILS_SINGLE_IMPL=yes
 DISTUTILS_USE_SETUPTOOLS=no
 inherit xdg xdg-utils distutils-r1 tmpfiles udev

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

2022-02-27 Thread James Le Cuirot

commit: 237b800c646692ed4fdc27a8996f7961a57a09fb
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Feb 27 09:46:20 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Feb 27 09:46:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=237b800c

x11-wm/xpra: Delete the non-Gentoo init.d script

It was not marked executable, but we should not install a non-Gentoo script
anyway. I don't personally use Xpra as a server on Gentoo, so I'm not going to
write a script, but anyone is welcome to contribute one.

Closes: https://bugs.gentoo.org/833858
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/xpra-4.2.ebuild   | 3 +++
 x11-wm/xpra/xpra-4.3.2.ebuild | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/x11-wm/xpra/xpra-4.2.ebuild b/x11-wm/xpra/xpra-4.2.ebuild
index 6e18d37932bb..681a6c97aab5 100644
--- a/x11-wm/xpra/xpra-4.2.ebuild
+++ b/x11-wm/xpra/xpra-4.2.ebuild
@@ -161,6 +161,9 @@ python_install_all() {
local dir=$(get_udevdir)
dodir "${dir%/*}"
mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
+
+   # TODO: Write a Gentoo init script.
+   rm -r "${ED}"/etc/{init.d,sysconfig}/ || die
 }
 
 pkg_postinst() {

diff --git a/x11-wm/xpra/xpra-4.3.2.ebuild b/x11-wm/xpra/xpra-4.3.2.ebuild
index b0bbdd1cfe13..0e1835e5a126 100644
--- a/x11-wm/xpra/xpra-4.3.2.ebuild
+++ b/x11-wm/xpra/xpra-4.3.2.ebuild
@@ -188,6 +188,9 @@ python_install_all() {
local dir=$(get_udevdir)
dodir "${dir%/*}"
mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
+
+   # TODO: Write a Gentoo init script.
+   rm -r "${ED}"/etc/{init.d,sysconfig}/ || die
 }
 
 pkg_postinst() {

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

2022-02-27 Thread James Le Cuirot

commit: 33d8a1063dff858cffe6543668e2c9fd3ca3b91f
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Feb 27 09:42:46 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Feb 27 09:42:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33d8a106

x11-wm/xpra: Drop old 4.3.1-r1

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

 x11-wm/xpra/Manifest |   1 -
 x11-wm/xpra/xpra-4.3.1-r1.ebuild | 196 ---
 2 files changed, 197 deletions(-)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 3fa3cca26d4f..b75a51d00781 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,4 +1,3 @@
 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.1.tar.gz 4174135 BLAKE2B 
ac007f812fa7d27c4a5edc231f5f0b79311916b4dcfd43f14bfce5cf9d55a5b5738ec484f9ec653e2901d0b1d9d316ac14202668e77b80a56da34b6f98b3cf32
 SHA512 
0423a2c3bf5df0b6fafffc788b9e648a5f4e41d68a5b8ea014349ea78062be91cfca38f68656d1399ad0e3ba21952e216f3acc3e5bc3387d992c29d4388b6a07
 DIST xpra-4.3.2.tar.gz 4175968 BLAKE2B 
16d42f9509c1ac3cf3f345a6cdd3711496019064c890268d1c1612e37e34ffe93016488f8a6d1bf8509da1d32500571e80bb4143a2f870f07530386515107735
 SHA512 
b9bc89a0d042e4ef2a416b7787bd1588a9d151d482319c637073749383e2b3f3361eb0f95c0e39ba98c9ae87ef5acb68c4980645fb9a2feea37215f88f7a8a95

diff --git a/x11-wm/xpra/xpra-4.3.1-r1.ebuild b/x11-wm/xpra/xpra-4.3.1-r1.ebuild
deleted file mode 100644
index b0bbdd1cfe13..
--- a/x11-wm/xpra/xpra-4.3.1-r1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_SINGLE_IMPL=yes
-DISTUTILS_USE_SETUPTOOLS=no
-inherit xdg xdg-utils distutils-r1 tmpfiles udev
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
-HOMEPAGE="https://xpra.org/";
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-   https://dev.gentoo.org/~chewi/distfiles/${PN}-4.3.1-tests.patch";
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 
lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test vpx 
webcam webp xdg xinerama"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-   || ( client server )
-   cups? ( dbus )
-   opengl? ( client )
-   test? ( client clipboard dbus html server sound xdg xinerama )
-"
-
-TDEPEND="
-   $(python_gen_cond_dep '
-   dev-python/netifaces[${PYTHON_USEDEP}]
-   dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
-   dev-python/rencode[${PYTHON_USEDEP}]
-   dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-   xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] )
-   ')
-   html? ( www-apps/xpra-html5 )
-   server? (
-   x11-base/xorg-server[-minimal,xvfb]
-   x11-drivers/xf86-input-void
-   )
-   xinerama? ( x11-libs/libfakeXinerama )
-"
-DEPEND="
-   ${PYTHON_DEPS}
-   $(python_gen_cond_dep '
-   dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
-   opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
-   sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
-   ')
-   x11-libs/gtk+:3[introspection]
-   x11-libs/libX11
-   x11-libs/libXcomposite
-   x11-libs/libXdamage
-   x11-libs/libXfixes
-   x11-libs/libXrandr
-   x11-libs/libXres
-   x11-libs/libXtst
-   x11-libs/libxkbfile
-   brotli? ( app-arch/brotli )
-   csc? ( >=media-video/ffmpeg-1.2.2:0= )
-   ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
-   jpeg? ( media-libs/libjpeg-turbo )
-   pulseaudio? (
-   media-sound/pulseaudio
-   media-plugins/gst-plugins-pulse:1.0
-   )
-   sound? (
-   media-libs/gstreamer:1.0
-   media-libs/gst-plugins-base:1.0
-   )
-   vpx? ( media-libs/libvpx media-video/ffmpeg )
-   webp? ( media-libs/libwebp )
-"
-RDEPEND="
-   ${DEPEND}
-   ${TDEPEND}
-   $(python_gen_cond_dep '
-   cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
-   lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-   lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
-   opengl? (

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

2022-01-28 Thread James Le Cuirot

commit: be4227cc5561ef22d9e8b6af72aef804485ba9db
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Jan 28 16:26:10 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Jan 28 16:26:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be4227cc

x11-wm/xpra: Drop unused Manifest entry

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

 x11-wm/xpra/Manifest | 1 -
 1 file changed, 1 deletion(-)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index bc3f6506bfea..3fa3cca26d4f 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,4 +1,3 @@
-DIST xpra-4.2.3.tar.gz 3897648 BLAKE2B 
e9d3b4f07f8fae88ad410201a503bc5c738daae91640843cfce2b70da03e916295709bb74ffbb5e70f8e8ba2dcc3085861bdd9b097d24096ccba332693cc076b
 SHA512 
cebec316a0cbd673907379b54248901743a8bf6b6d25c7b36465794da4e1b19296b5fd465df8ba9d563b2a246fab572fa8db25c24c511da9ddc340a8c95557d5
 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.1.tar.gz 4174135 BLAKE2B 
ac007f812fa7d27c4a5edc231f5f0b79311916b4dcfd43f14bfce5cf9d55a5b5738ec484f9ec653e2901d0b1d9d316ac14202668e77b80a56da34b6f98b3cf32
 SHA512 
0423a2c3bf5df0b6fafffc788b9e648a5f4e41d68a5b8ea014349ea78062be91cfca38f68656d1399ad0e3ba21952e216f3acc3e5bc3387d992c29d4388b6a07

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

2022-01-28 Thread James Le Cuirot

commit: 3c2f164da33dc769f29e3587ab891d78b50957dd
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Jan 28 13:44:06 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Jan 28 13:44:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c2f164d

x11-wm/xpra: Drop old 4.2.3

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

 x11-wm/xpra/files/xpra-4.2.2-bad-tests.patch   |  36 
 .../files/xpra-4.2.2-true-false-bin-path.patch |  38 
 x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch  |  30 
 x11-wm/xpra/xpra-4.2.3.ebuild  | 199 -
 4 files changed, 303 deletions(-)

diff --git a/x11-wm/xpra/files/xpra-4.2.2-bad-tests.patch 
b/x11-wm/xpra/files/xpra-4.2.2-bad-tests.patch
deleted file mode 100644
index 0d34ab0ef2fa..
--- a/x11-wm/xpra/files/xpra-4.2.2-bad-tests.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/tests/unittests/unit/net/compression_test.py 
b/tests/unittests/unit/net/compression_test.py
-index 29ac7f2d2..89b68fdbf 100755
 a/tests/unittests/unit/net/compression_test.py
-+++ b/tests/unittests/unit/net/compression_test.py
-@@ -11,7 +11,6 @@ from xpra.net import compression
- class TestCompression(unittest.TestCase):
- 
- def test_main(self):
--compression.sanity_checks()
- compression.init_all()
- assert compression.use("zlib")
- assert compression.get_compression_caps()
-diff --git a/tests/unittests/unit/net/packet_encoding_test.py 
b/tests/unittests/unit/net/packet_encoding_test.py
-index 69ef95c65..eead158b0 100755
 a/tests/unittests/unit/net/packet_encoding_test.py
-+++ b/tests/unittests/unit/net/packet_encoding_test.py
-@@ -12,7 +12,6 @@ class TestPacketEncoding(unittest.TestCase):
- 
- def test_env_log(self):
- packet_encoding.init_all()
--packet_encoding.sanity_checks()
- assert packet_encoding.get_packet_encoding_caps()
- assert packet_encoding.get_enabled_encoders()
- for x in packet_encoding.get_enabled_encoders():
-diff --git a/tests/unittests/unit/scripts/main_test.py 
b/tests/unittests/unit/scripts/main_test.py
-index 6dd54069c..f9478c2ab 100755
 a/tests/unittests/unit/scripts/main_test.py
-+++ b/tests/unittests/unit/scripts/main_test.py
-@@ -121,7 +121,6 @@ class TestMain(unittest.TestCase):
- t("tcp://fe80::c1:ac45:7351:ea69%eth1:14500", {"host" : 
"fe80::c1:ac45:7351:ea69%eth1", "port" : 14500})
- t("tcp://[fe80::c1:ac45:7351:ea69]:14500", {"host" : 
"fe80::c1:ac45:7351:ea69", "port" : 14500})
- t("tcp://host/100,key1=value1", {"key1" : "value1"})
--t("tcp://host/key1=value1", {"key1" : "value1"})
- try:
- from xpra.net.vsock import CID_ANY, PORT_ANY#@UnresolvedImport
- t("vsock://any:any/", {"vsock" : (CID_ANY, PORT_ANY)})

diff --git a/x11-wm/xpra/files/xpra-4.2.2-true-false-bin-path.patch 
b/x11-wm/xpra/files/xpra-4.2.2-true-false-bin-path.patch
deleted file mode 100644
index 255e80738616..
--- a/x11-wm/xpra/files/xpra-4.2.2-true-false-bin-path.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 6e9ef70facfcc280e4c98892d2af6636d122c762 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot 
-Date: Tue, 24 Aug 2021 09:56:26 +0100
-Subject: [PATCH] Execute true and false from /bin, not /usr/bin
-
-Some distributions now have /bin symlinked to /usr/bin, but not all of
-them. /bin should work everywhere.

- tests/unittests/unit/server/auth_test.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tests/unittests/unit/server/auth_test.py 
b/tests/unittests/unit/server/auth_test.py
-index 373db96e5..8e6be8e20 100755
 a/tests/unittests/unit/server/auth_test.py
-+++ b/tests/unittests/unit/server/auth_test.py
-@@ -73,7 +73,7 @@ class TestAuth(unittest.TestCase):
- kwargs["connection"] = "fake-connection-data"
- #exec auth would fail during rpmbuild without a default command:
- if "command" not in kwargs:
--kwargs["command"] = "/usr/bin/true"
-+kwargs["command"] = "/bin/true"
- return c(username, **kwargs)
- 
- def _test_module(self, module):
-@@ -380,8 +380,8 @@ class TestAuth(unittest.TestCase):
- a = self._init_auth("exec", **kwargs)
- assert not a.requires_challenge(), "%s should not require a 
challenge" % a
- assert self.capsauth(a)==success, "%s should have %s using 
cmd=%s" % (a, ["failed", "succeeded"][success], cmd)
--exec_cmd("/usr/bin/true", True)
--exec_cmd("/usr/bin/false", False)
-+exec_cmd("/bin/true", True)
-+exec_cmd("/bin/false", False)
- 
- 
- def main():
--- 
-2.32.0
-

diff --git a/x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch 
b/x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch
deleted file mode 100644
index 337527305ecc..
--- a/x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/tests/unittests/uni

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

2022-01-28 Thread James Le Cuirot

commit: 770202f48a0382dfbee97625686cbd0c03455504
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Jan 28 13:42:27 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Jan 28 13:42:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=770202f4

x11-wm/xpra: Version bump to 4.3.2

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

 x11-wm/xpra/Manifest  |   1 +
 x11-wm/xpra/xpra-4.3.2.ebuild | 196 ++
 2 files changed, 197 insertions(+)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index dd83568444b8..bc3f6506bfea 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -2,3 +2,4 @@ DIST xpra-4.2.3.tar.gz 3897648 BLAKE2B 
e9d3b4f07f8fae88ad410201a503bc5c738daae91
 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.1.tar.gz 4174135 BLAKE2B 
ac007f812fa7d27c4a5edc231f5f0b79311916b4dcfd43f14bfce5cf9d55a5b5738ec484f9ec653e2901d0b1d9d316ac14202668e77b80a56da34b6f98b3cf32
 SHA512 
0423a2c3bf5df0b6fafffc788b9e648a5f4e41d68a5b8ea014349ea78062be91cfca38f68656d1399ad0e3ba21952e216f3acc3e5bc3387d992c29d4388b6a07
+DIST xpra-4.3.2.tar.gz 4175968 BLAKE2B 
16d42f9509c1ac3cf3f345a6cdd3711496019064c890268d1c1612e37e34ffe93016488f8a6d1bf8509da1d32500571e80bb4143a2f870f07530386515107735
 SHA512 
b9bc89a0d042e4ef2a416b7787bd1588a9d151d482319c637073749383e2b3f3361eb0f95c0e39ba98c9ae87ef5acb68c4980645fb9a2feea37215f88f7a8a95

diff --git a/x11-wm/xpra/xpra-4.3.2.ebuild b/x11-wm/xpra/xpra-4.3.2.ebuild
new file mode 100644
index ..b0bbdd1cfe13
--- /dev/null
+++ b/x11-wm/xpra/xpra-4.3.2.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_USE_SETUPTOOLS=no
+inherit xdg xdg-utils distutils-r1 tmpfiles udev
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
+HOMEPAGE="https://xpra.org/";
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+   https://dev.gentoo.org/~chewi/distfiles/${PN}-4.3.1-tests.patch";
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 
lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test vpx 
webcam webp xdg xinerama"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   || ( client server )
+   cups? ( dbus )
+   opengl? ( client )
+   test? ( client clipboard dbus html server sound xdg xinerama )
+"
+
+TDEPEND="
+   $(python_gen_cond_dep '
+   dev-python/netifaces[${PYTHON_USEDEP}]
+   dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+   dev-python/rencode[${PYTHON_USEDEP}]
+   dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+   xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] )
+   ')
+   html? ( www-apps/xpra-html5 )
+   server? (
+   x11-base/xorg-server[-minimal,xvfb]
+   x11-drivers/xf86-input-void
+   )
+   xinerama? ( x11-libs/libfakeXinerama )
+"
+DEPEND="
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+   opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+   sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
+   ')
+   x11-libs/gtk+:3[introspection]
+   x11-libs/libX11
+   x11-libs/libXcomposite
+   x11-libs/libXdamage
+   x11-libs/libXfixes
+   x11-libs/libXrandr
+   x11-libs/libXres
+   x11-libs/libXtst
+   x11-libs/libxkbfile
+   brotli? ( app-arch/brotli )
+   csc? ( >=media-video/ffmpeg-1.2.2:0= )
+   ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
+   jpeg? ( media-libs/libjpeg-turbo )
+   pulseaudio? (
+   media-sound/pulseaudio
+   media-plugins/gst-plugins-pulse:1.0
+   )
+   sound? (
+   media-libs/gstreamer:1.0
+   media-libs/gst-plugins-base:1.0
+   )
+   vpx? ( media-libs/libvpx media-video/ffmpeg )
+   webp? ( media-libs/libwebp )
+"
+RDEPEND="
+   ${DEPEND}
+   ${TDEPEND}
+   $(python_gen_cond_dep '
+   cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+   lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+   lzo? ( >=dev

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

2022-01-16 Thread James Le Cuirot

commit: bf6b6b18ad1bbc3474534a4fd6a24a84e1ba3288
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Jan 16 23:06:04 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jan 16 23:06:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf6b6b18

x11-wm/xpra: Add missing new libXres dependency to 4.3.1

Closes: https://bugs.gentoo.org/831286
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/{xpra-4.3.1.ebuild => xpra-4.3.1-r1.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/x11-wm/xpra/xpra-4.3.1.ebuild b/x11-wm/xpra/xpra-4.3.1-r1.ebuild
similarity index 99%
rename from x11-wm/xpra/xpra-4.3.1.ebuild
rename to x11-wm/xpra/xpra-4.3.1-r1.ebuild
index dbc1bee840bb..b0bbdd1cfe13 100644
--- a/x11-wm/xpra/xpra-4.3.1.ebuild
+++ b/x11-wm/xpra/xpra-4.3.1-r1.ebuild
@@ -53,6 +53,7 @@ DEPEND="
x11-libs/libXdamage
x11-libs/libXfixes
x11-libs/libXrandr
+   x11-libs/libXres
x11-libs/libXtst
x11-libs/libxkbfile
brotli? ( app-arch/brotli )

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

2022-01-15 Thread James Le Cuirot

commit: e58c93a656c1ecfc7b78408b78397737dd89a431
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Jan 15 23:26:28 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Jan 15 23:30:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e58c93a6

x11-wm/xpra: Version bump to 4.3.1

A lot of unreleased fixes were needed to make the tests pass.

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

 x11-wm/xpra/Manifest  |   2 +
 x11-wm/xpra/xpra-4.3.1.ebuild | 195 ++
 2 files changed, 197 insertions(+)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 30c45f40eba5..227fbd0d94f1 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,3 +1,5 @@
 DIST xpra-4.2.2.tar.gz 3894227 BLAKE2B 
a25dde9c3732e31cd8127393f89f2495e01896d18d5212b141b4046c265a9ead029bed68c9610c2330ec0a885af1eeb3f92aef2c16dd102293e34ac208be605a
 SHA512 
3f81b5a2f7abdfc14f7e48ec708524e38142b984e6539e94a27b6aef7b5a5e063ef14e6b7383a7719ecc7687c62f49eeeb5668282c337d90a79194c354dedd24
 DIST xpra-4.2.3.tar.gz 3897648 BLAKE2B 
e9d3b4f07f8fae88ad410201a503bc5c738daae91640843cfce2b70da03e916295709bb74ffbb5e70f8e8ba2dcc3085861bdd9b097d24096ccba332693cc076b
 SHA512 
cebec316a0cbd673907379b54248901743a8bf6b6d25c7b36465794da4e1b19296b5fd465df8ba9d563b2a246fab572fa8db25c24c511da9ddc340a8c95557d5
 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.1.tar.gz 4174135 BLAKE2B 
ac007f812fa7d27c4a5edc231f5f0b79311916b4dcfd43f14bfce5cf9d55a5b5738ec484f9ec653e2901d0b1d9d316ac14202668e77b80a56da34b6f98b3cf32
 SHA512 
0423a2c3bf5df0b6fafffc788b9e648a5f4e41d68a5b8ea014349ea78062be91cfca38f68656d1399ad0e3ba21952e216f3acc3e5bc3387d992c29d4388b6a07

diff --git a/x11-wm/xpra/xpra-4.3.1.ebuild b/x11-wm/xpra/xpra-4.3.1.ebuild
new file mode 100644
index ..dbc1bee840bb
--- /dev/null
+++ b/x11-wm/xpra/xpra-4.3.1.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_USE_SETUPTOOLS=no
+inherit xdg xdg-utils distutils-r1 tmpfiles udev
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
+HOMEPAGE="https://xpra.org/";
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+   https://dev.gentoo.org/~chewi/distfiles/${PN}-4.3.1-tests.patch";
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 
lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test vpx 
webcam webp xdg xinerama"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   || ( client server )
+   cups? ( dbus )
+   opengl? ( client )
+   test? ( client clipboard dbus html server sound xdg xinerama )
+"
+
+TDEPEND="
+   $(python_gen_cond_dep '
+   dev-python/netifaces[${PYTHON_USEDEP}]
+   dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+   dev-python/rencode[${PYTHON_USEDEP}]
+   dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+   xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] )
+   ')
+   html? ( www-apps/xpra-html5 )
+   server? (
+   x11-base/xorg-server[-minimal,xvfb]
+   x11-drivers/xf86-input-void
+   )
+   xinerama? ( x11-libs/libfakeXinerama )
+"
+DEPEND="
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+   opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+   sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
+   ')
+   x11-libs/gtk+:3[introspection]
+   x11-libs/libX11
+   x11-libs/libXcomposite
+   x11-libs/libXdamage
+   x11-libs/libXfixes
+   x11-libs/libXrandr
+   x11-libs/libXtst
+   x11-libs/libxkbfile
+   brotli? ( app-arch/brotli )
+   csc? ( >=media-video/ffmpeg-1.2.2:0= )
+   ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
+   jpeg? ( media-libs/libjpeg-turbo )
+   pulseaudio? (
+   media-sound/pulseaudio
+   media-plugins/gst-plugins-pulse:1.0
+   )
+   sound? (
+   media-libs/gstreamer:1.0
+   media-libs/gst-plugins-base:1.0
+   )
+   vpx? ( media-libs/libvpx media-video/ffmpeg )
+

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

2022-01-15 Thread James Le Cuirot

commit: 0e863ca57cec68d5e748a7eb30f2d323f7898099
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Jan 15 23:29:04 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Jan 15 23:30:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e863ca5

x11-wm/xpra: Drop old 4.2.2

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

 x11-wm/xpra/Manifest|   1 -
 x11-wm/xpra/files/xpra-4.2.2-dup-ip.patch   |  40 --
 x11-wm/xpra/files/xpra-4.2.2-ldconfig.patch |  22 ---
 x11-wm/xpra/xpra-4.2.2.ebuild   | 200 
 4 files changed, 263 deletions(-)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 227fbd0d94f1..dd83568444b8 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,4 +1,3 @@
-DIST xpra-4.2.2.tar.gz 3894227 BLAKE2B 
a25dde9c3732e31cd8127393f89f2495e01896d18d5212b141b4046c265a9ead029bed68c9610c2330ec0a885af1eeb3f92aef2c16dd102293e34ac208be605a
 SHA512 
3f81b5a2f7abdfc14f7e48ec708524e38142b984e6539e94a27b6aef7b5a5e063ef14e6b7383a7719ecc7687c62f49eeeb5668282c337d90a79194c354dedd24
 DIST xpra-4.2.3.tar.gz 3897648 BLAKE2B 
e9d3b4f07f8fae88ad410201a503bc5c738daae91640843cfce2b70da03e916295709bb74ffbb5e70f8e8ba2dcc3085861bdd9b097d24096ccba332693cc076b
 SHA512 
cebec316a0cbd673907379b54248901743a8bf6b6d25c7b36465794da4e1b19296b5fd465df8ba9d563b2a246fab572fa8db25c24c511da9ddc340a8c95557d5
 DIST xpra-4.2.tar.gz 4057304 BLAKE2B 
17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10
 SHA512 
261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353
 DIST xpra-4.3.1-tests.patch 51444 BLAKE2B 
c645aa52bb06c3872f6c1c7aace099c10a6fd46dd4c386ec1a13f6326e3fc8860a71767510ce9b44375cc8b30cef563e4405b2834670a9d2c555d3359d16e99f
 SHA512 
0c70c33e24980db31e904c91f987a73693bd2349958ea8392138987e1dc1852ea42a4ee7e3b238f01c92adc57dbe196e57f4c4accf27aade6c4ea55c1ff9b40c

diff --git a/x11-wm/xpra/files/xpra-4.2.2-dup-ip.patch 
b/x11-wm/xpra/files/xpra-4.2.2-dup-ip.patch
deleted file mode 100644
index f689166dec9d..
--- a/x11-wm/xpra/files/xpra-4.2.2-dup-ip.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/tests/unittests/unit/net/net_util_test.py 
b/tests/unittests/unit/net/net_util_test.py
-index 1ceaf4573..870801666 100755
 a/tests/unittests/unit/net/net_util_test.py
-+++ b/tests/unittests/unit/net/net_util_test.py
-@@ -6,6 +6,7 @@
-
- import unittest
-
-+from collections import defaultdict
- from xpra.net.net_util import (
- get_info, get_interfaces, get_interfaces_addresses, #get_interface,
- get_gateways, get_bind_IPs, do_get_bind_ifacemask,
-@@ -26,10 +27,8 @@ class TestVersionUtilModule(unittest.TestCase):
- ifaces = get_interfaces()
- if not ifaces:
- return
-+ip_ifaces = defaultdict(list)
- for iface in ifaces:
--ipmasks = do_get_bind_ifacemask(iface)
--for ip, _ in ipmasks:
--assert get_iface(ip)==iface
- if if_nametoindex:
- try:
- i = if_nametoindex(iface)
-@@ -37,7 +36,14 @@ class TestVersionUtilModule(unittest.TestCase):
- pass
- else:
- if if_indextoname:
--assert if_indextoname(i)==iface
-+assert if_indextoname(i)==iface, "expected interface 
%s for index %i but got %s" % (
-+iface, i, if_indextoname(i))
-+ipmasks = do_get_bind_ifacemask(iface)
-+for ip, _ in ipmasks:
-+ip_ifaces[ip].append(iface)
-+for ip, ifaces in ip_ifaces.items():
-+assert get_iface(ip) in ifaces, "expected interface for ip %s to 
be one of %s but got %s" % (
-+ip, ifaces, get_iface(ip))
- ia = get_interfaces_addresses()
- assert ia
- #for iface, address in ia.items():

diff --git a/x11-wm/xpra/files/xpra-4.2.2-ldconfig.patch 
b/x11-wm/xpra/files/xpra-4.2.2-ldconfig.patch
deleted file mode 100644
index 2cd009994c4b..
--- a/x11-wm/xpra/files/xpra-4.2.2-ldconfig.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f97daef82521c9297f6cc2d7925fe5c6ed526ad1 Mon Sep 17 00:00:00 2001
-From: totaam 
-Date: Sun, 22 Aug 2021 21:31:52 +0700
-Subject: [PATCH] #3239 with shell=True, best not to use a list
-

- xpra/os_util.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xpra/os_util.py b/xpra/os_util.py
-index 2f8c0d64a..2f309f888 100644
 a/xpra/os_util.py
-+++ b/xpra/os_util.py
-@@ -786,7 +786,7 @@ def find_lib_ldconfig(libname):
- ldconfig = t
- break
- import subprocess
--p = subprocess.Popen([ldconfig, "-p"], stdout=subprocess.PIPE, 
stderr=subprocess.PIPE, shell=True)
-+p = subprocess.Popen("%s -p" % ldconfig, stdout=subpro

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

2021-10-06 Thread James Le Cuirot

commit: 2c1c7d7e9717d3eba8abb0395e4a85e2f3268d5e
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Oct  6 12:06:32 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Oct  6 12:08:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c1c7d7e

x11-wm/xpra: Version bump to 4.2.3

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

 x11-wm/xpra/Manifest  |   1 +
 x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch |  30 +
 x11-wm/xpra/xpra-4.2.3.ebuild | 199 ++
 3 files changed, 230 insertions(+)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 9eb5666590e..e38e029bc47 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,3 +1,4 @@
 DIST xpra-4.2.1.tar.gz 3878766 BLAKE2B 
c537b54b8ea5cc1ad2909eeccf61eba59a518165eb72c7d4984d26f378e4babca997c2f6cf78f5ba947edbc4ad6c4085c86793aad9b01f1fca2b22b1daaabda9
 SHA512 
553d8c11f1a77a2a58cbad7df0d899c611e21eb01dad3516f99f1fb9cc7a4507ba7557807b62ddea7101ca01bab123962a34b9c3369db06d1bb318debd91dc55
 DIST xpra-4.2.2.tar.gz 3894227 BLAKE2B 
a25dde9c3732e31cd8127393f89f2495e01896d18d5212b141b4046c265a9ead029bed68c9610c2330ec0a885af1eeb3f92aef2c16dd102293e34ac208be605a
 SHA512 
3f81b5a2f7abdfc14f7e48ec708524e38142b984e6539e94a27b6aef7b5a5e063ef14e6b7383a7719ecc7687c62f49eeeb5668282c337d90a79194c354dedd24
+DIST xpra-4.2.3.tar.gz 3897648 BLAKE2B 
e9d3b4f07f8fae88ad410201a503bc5c738daae91640843cfce2b70da03e916295709bb74ffbb5e70f8e8ba2dcc3085861bdd9b097d24096ccba332693cc076b
 SHA512 
cebec316a0cbd673907379b54248901743a8bf6b6d25c7b36465794da4e1b19296b5fd465df8ba9d563b2a246fab572fa8db25c24c511da9ddc340a8c95557d5
 DIST xpra-4.2.tar.gz 4057304 BLAKE2B 
17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10
 SHA512 
261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353

diff --git a/x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch 
b/x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch
new file mode 100644
index 000..337527305ec
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch
@@ -0,0 +1,30 @@
+diff --git a/tests/unittests/unit/net/net_util_test.py 
b/tests/unittests/unit/net/net_util_test.py
+index 5c6e3096c..870801666 100755
+--- a/tests/unittests/unit/net/net_util_test.py
 b/tests/unittests/unit/net/net_util_test.py
+@@ -27,11 +27,8 @@ class TestVersionUtilModule(unittest.TestCase):
+ ifaces = get_interfaces()
+ if not ifaces:
+ return
++ip_ifaces = defaultdict(list)
+ for iface in ifaces:
+-ipmasks = do_get_bind_ifacemask(iface)
+-for ip, _ in ipmasks:
+-assert get_iface(ip)==iface, "expected interface %s for ip %s 
but got %s" % (
+-iface, ip, get_iface(ip))
+ if if_nametoindex:
+ try:
+ i = if_nametoindex(iface)
+@@ -41,6 +38,12 @@ class TestVersionUtilModule(unittest.TestCase):
+ if if_indextoname:
+ assert if_indextoname(i)==iface, "expected interface 
%s for index %i but got %s" % (
+ iface, i, if_indextoname(i))
++ipmasks = do_get_bind_ifacemask(iface)
++for ip, _ in ipmasks:
++ip_ifaces[ip].append(iface)
++for ip, ifaces in ip_ifaces.items():
++assert get_iface(ip) in ifaces, "expected interface for ip %s to 
be one of %s but got %s" % (
++ip, ifaces, get_iface(ip))
+ ia = get_interfaces_addresses()
+ assert ia
+ #for iface, address in ia.items():

diff --git a/x11-wm/xpra/xpra-4.2.3.ebuild b/x11-wm/xpra/xpra-4.2.3.ebuild
new file mode 100644
index 000..6280862e546
--- /dev/null
+++ b/x11-wm/xpra/xpra-4.2.3.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_USE_SETUPTOOLS=no
+inherit xdg xdg-utils distutils-r1 tmpfiles udev
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
+HOMEPAGE="https://xpra.org/";
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 
lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test vpx 
webcam webp xdg xinerama"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   || ( client server )
+   cups? ( dbus )
+   opengl? ( client )
+   test? ( client clipboard dbus html server sound xdg xinerama )
+"
+
+TDEPEND="
+   $(python_gen_cond_dep '
+   dev-python/netifaces[${PYTHON_USEDEP}]
+   dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+   dev-pyth

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

2021-10-06 Thread James Le Cuirot

commit: 44615ebdee27d129048aaa8d619b1e1f251ba466
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Oct  6 12:07:15 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Oct  6 12:08:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44615ebd

x11-wm/xpra: Drop old 4.2.1

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

 x11-wm/xpra/Manifest  |   1 -
 x11-wm/xpra/xpra-4.2.1.ebuild | 169 --
 2 files changed, 170 deletions(-)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index e38e029bc47..30c45f40eba 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,4 +1,3 @@
-DIST xpra-4.2.1.tar.gz 3878766 BLAKE2B 
c537b54b8ea5cc1ad2909eeccf61eba59a518165eb72c7d4984d26f378e4babca997c2f6cf78f5ba947edbc4ad6c4085c86793aad9b01f1fca2b22b1daaabda9
 SHA512 
553d8c11f1a77a2a58cbad7df0d899c611e21eb01dad3516f99f1fb9cc7a4507ba7557807b62ddea7101ca01bab123962a34b9c3369db06d1bb318debd91dc55
 DIST xpra-4.2.2.tar.gz 3894227 BLAKE2B 
a25dde9c3732e31cd8127393f89f2495e01896d18d5212b141b4046c265a9ead029bed68c9610c2330ec0a885af1eeb3f92aef2c16dd102293e34ac208be605a
 SHA512 
3f81b5a2f7abdfc14f7e48ec708524e38142b984e6539e94a27b6aef7b5a5e063ef14e6b7383a7719ecc7687c62f49eeeb5668282c337d90a79194c354dedd24
 DIST xpra-4.2.3.tar.gz 3897648 BLAKE2B 
e9d3b4f07f8fae88ad410201a503bc5c738daae91640843cfce2b70da03e916295709bb74ffbb5e70f8e8ba2dcc3085861bdd9b097d24096ccba332693cc076b
 SHA512 
cebec316a0cbd673907379b54248901743a8bf6b6d25c7b36465794da4e1b19296b5fd465df8ba9d563b2a246fab572fa8db25c24c511da9ddc340a8c95557d5
 DIST xpra-4.2.tar.gz 4057304 BLAKE2B 
17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10
 SHA512 
261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353

diff --git a/x11-wm/xpra/xpra-4.2.1.ebuild b/x11-wm/xpra/xpra-4.2.1.ebuild
deleted file mode 100644
index 3cf2a6ed02a..000
--- a/x11-wm/xpra/xpra-4.2.1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_SINGLE_IMPL=yes
-DISTUTILS_USE_SETUPTOOLS=no
-inherit xdg distutils-r1 tmpfiles prefix udev
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
-HOMEPAGE="https://xpra.org/";
-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 doc ffmpeg jpeg ibus +lz4 lzo 
minimal opengl pillow pinentry pulseaudio server sound test vpx webcam webp"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-   || ( client server )
-   cups? ( dbus )
-   opengl? ( client )
-"
-
-DEPEND="
-   ${PYTHON_DEPS}
-   $(python_gen_cond_dep '
-   dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
-   opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
-   sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
-   ')
-   x11-libs/gtk+:3[introspection]
-   x11-libs/libX11
-   x11-libs/libXcomposite
-   x11-libs/libXdamage
-   x11-libs/libXfixes
-   x11-libs/libXrandr
-   x11-libs/libXtst
-   x11-libs/libxkbfile
-   brotli? ( app-arch/brotli )
-   csc? ( >=media-video/ffmpeg-1.2.2:0= )
-   ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
-   jpeg? ( media-libs/libjpeg-turbo )
-   pulseaudio? (
-   media-sound/pulseaudio
-   media-plugins/gst-plugins-pulse:1.0
-   )
-   sound? (
-   media-libs/gstreamer:1.0
-   media-libs/gst-plugins-base:1.0
-   )
-   vpx? ( media-libs/libvpx media-video/ffmpeg )
-   webp? ( media-libs/libwebp )
-"
-RDEPEND="
-   ${DEPEND}
-   $(python_gen_cond_dep '
-   dev-python/netifaces[${PYTHON_USEDEP}]
-   dev-python/rencode[${PYTHON_USEDEP}]
-   dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
-   cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
-   dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-   lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-   lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
-   opengl? (
-   client? ( 
dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
-   )
-   webcam? (
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/pyinotify[${PYTHON_USEDEP}]
-   media-libs/opencv[${PYTHON_USEDEP},python]
-   )
-   ')
-   acct-group/xpra
-   virtual/ssh
-   x11-apps/xmodmap
-   ibus? ( app-i18n/ibus )
-   pinentry? ( app-crypt/pinentry )
-   server? (
-   x11-base/xorg-server[-minimal,xvfb]
-

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

2021-09-04 Thread James Le Cuirot

commit: 81c161656c900dfc8fe0aa3f343c781ade6153b8
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Sep  4 10:17:10 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Sep  4 10:17:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81c16165

x11-wm/xpra: Bump to 4.2.2, add tests

The tests required tweaks but they should work in the next release.

I had to drop prefix support because it's broken and hard to fix.

Closes: https://bugs.gentoo.org/802105
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/Manifest   |   1 +
 x11-wm/xpra/files/xpra-4.2.2-bad-tests.patch   |  36 
 x11-wm/xpra/files/xpra-4.2.2-dup-ip.patch  |  40 +
 x11-wm/xpra/files/xpra-4.2.2-ldconfig.patch|  22 +++
 .../files/xpra-4.2.2-true-false-bin-path.patch |  38 
 x11-wm/xpra/metadata.xml   |   2 +
 x11-wm/xpra/xpra-4.2.2.ebuild  | 200 +
 7 files changed, 339 insertions(+)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 384b7becefb..9eb5666590e 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,2 +1,3 @@
 DIST xpra-4.2.1.tar.gz 3878766 BLAKE2B 
c537b54b8ea5cc1ad2909eeccf61eba59a518165eb72c7d4984d26f378e4babca997c2f6cf78f5ba947edbc4ad6c4085c86793aad9b01f1fca2b22b1daaabda9
 SHA512 
553d8c11f1a77a2a58cbad7df0d899c611e21eb01dad3516f99f1fb9cc7a4507ba7557807b62ddea7101ca01bab123962a34b9c3369db06d1bb318debd91dc55
+DIST xpra-4.2.2.tar.gz 3894227 BLAKE2B 
a25dde9c3732e31cd8127393f89f2495e01896d18d5212b141b4046c265a9ead029bed68c9610c2330ec0a885af1eeb3f92aef2c16dd102293e34ac208be605a
 SHA512 
3f81b5a2f7abdfc14f7e48ec708524e38142b984e6539e94a27b6aef7b5a5e063ef14e6b7383a7719ecc7687c62f49eeeb5668282c337d90a79194c354dedd24
 DIST xpra-4.2.tar.gz 4057304 BLAKE2B 
17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10
 SHA512 
261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353

diff --git a/x11-wm/xpra/files/xpra-4.2.2-bad-tests.patch 
b/x11-wm/xpra/files/xpra-4.2.2-bad-tests.patch
new file mode 100644
index 000..0d34ab0ef2f
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.2.2-bad-tests.patch
@@ -0,0 +1,36 @@
+diff --git a/tests/unittests/unit/net/compression_test.py 
b/tests/unittests/unit/net/compression_test.py
+index 29ac7f2d2..89b68fdbf 100755
+--- a/tests/unittests/unit/net/compression_test.py
 b/tests/unittests/unit/net/compression_test.py
+@@ -11,7 +11,6 @@ from xpra.net import compression
+ class TestCompression(unittest.TestCase):
+ 
+ def test_main(self):
+-compression.sanity_checks()
+ compression.init_all()
+ assert compression.use("zlib")
+ assert compression.get_compression_caps()
+diff --git a/tests/unittests/unit/net/packet_encoding_test.py 
b/tests/unittests/unit/net/packet_encoding_test.py
+index 69ef95c65..eead158b0 100755
+--- a/tests/unittests/unit/net/packet_encoding_test.py
 b/tests/unittests/unit/net/packet_encoding_test.py
+@@ -12,7 +12,6 @@ class TestPacketEncoding(unittest.TestCase):
+ 
+ def test_env_log(self):
+ packet_encoding.init_all()
+-packet_encoding.sanity_checks()
+ assert packet_encoding.get_packet_encoding_caps()
+ assert packet_encoding.get_enabled_encoders()
+ for x in packet_encoding.get_enabled_encoders():
+diff --git a/tests/unittests/unit/scripts/main_test.py 
b/tests/unittests/unit/scripts/main_test.py
+index 6dd54069c..f9478c2ab 100755
+--- a/tests/unittests/unit/scripts/main_test.py
 b/tests/unittests/unit/scripts/main_test.py
+@@ -121,7 +121,6 @@ class TestMain(unittest.TestCase):
+ t("tcp://fe80::c1:ac45:7351:ea69%eth1:14500", {"host" : 
"fe80::c1:ac45:7351:ea69%eth1", "port" : 14500})
+ t("tcp://[fe80::c1:ac45:7351:ea69]:14500", {"host" : 
"fe80::c1:ac45:7351:ea69", "port" : 14500})
+ t("tcp://host/100,key1=value1", {"key1" : "value1"})
+-t("tcp://host/key1=value1", {"key1" : "value1"})
+ try:
+ from xpra.net.vsock import CID_ANY, PORT_ANY#@UnresolvedImport
+ t("vsock://any:any/", {"vsock" : (CID_ANY, PORT_ANY)})

diff --git a/x11-wm/xpra/files/xpra-4.2.2-dup-ip.patch 
b/x11-wm/xpra/files/xpra-4.2.2-dup-ip.patch
new file mode 100644
index 000..f689166dec9
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.2.2-dup-ip.patch
@@ -0,0 +1,40 @@
+diff --git a/tests/unittests/unit/net/net_util_test.py 
b/tests/unittests/unit/net/net_util_test.py
+index 1ceaf4573..870801666 100755
+--- a/tests/unittests/unit/net/net_util_test.py
 b/tests/unittests/unit/net/net_util_test.py
+@@ -6,6 +6,7 @@
+
+ import unittest
+
++from collections import defaultdict
+ from xpra.net.net_util import (
+ get_info, get_interfaces, get_interfaces_addr

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

2021-07-30 Thread David Seifert

commit: bad74a8955e70af8219064ebf180c53d32a858d0
Author: David Seifert  gentoo  org>
AuthorDate: Fri Jul 30 22:55:09 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Jul 30 22:55:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bad74a89

x11-wm/xpra: consistent tmpfiles_process arguments

Closes: https://github.com/gentoo/gentoo/pull/21839
Signed-off-by: David Seifert  gentoo.org>

 x11-wm/xpra/xpra-4.2.1.ebuild | 11 +--
 x11-wm/xpra/xpra-4.2.ebuild   | 11 +--
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/x11-wm/xpra/xpra-4.2.1.ebuild b/x11-wm/xpra/xpra-4.2.1.ebuild
index 1f8dc0a75fa..3cf2a6ed02a 100644
--- a/x11-wm/xpra/xpra-4.2.1.ebuild
+++ b/x11-wm/xpra/xpra-4.2.1.ebuild
@@ -98,12 +98,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.2-suid-warning.patch
 )
 
-pkg_postinst() {
-   tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
-
-   xdg_pkg_postinst
-}
-
 python_prepare_all() {
hprefixify -w '/os.path/' setup.py
hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \
@@ -168,3 +162,8 @@ python_install_all() {
dodir "${dir%/*}"
mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
 }
+
+pkg_postinst() {
+   tmpfiles_process xpra.conf
+   xdg_pkg_postinst
+}

diff --git a/x11-wm/xpra/xpra-4.2.ebuild b/x11-wm/xpra/xpra-4.2.ebuild
index f79d0e144a0..6e18d37932b 100644
--- a/x11-wm/xpra/xpra-4.2.ebuild
+++ b/x11-wm/xpra/xpra-4.2.ebuild
@@ -98,12 +98,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.2-suid-warning.patch
 )
 
-pkg_postinst() {
-   tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
-
-   xdg_pkg_postinst
-}
-
 python_prepare_all() {
hprefixify -w '/os.path/' setup.py
hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \
@@ -168,3 +162,8 @@ python_install_all() {
dodir "${dir%/*}"
mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
 }
+
+pkg_postinst() {
+   tmpfiles_process xpra.conf
+   xdg_pkg_postinst
+}

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

2021-07-18 Thread Conrad Kostecki

commit: eb9e0c13c683f840add259c55d87467d2e750cbb
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Jul 18 10:42:48 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Jul 18 10:42:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb9e0c13

x11-wm/xpra: drop old version

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki  gentoo.org>

 x11-wm/xpra/Manifest|   2 -
 x11-wm/xpra/files/xpra-2.0-suid-warning.patch   |  11 --
 x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch |  12 --
 x11-wm/xpra/xpra-3.0.5-r2.ebuild| 147 -
 x11-wm/xpra/xpra-4.1.3.ebuild   | 168 
 5 files changed, 340 deletions(-)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 59734fa8ff1..384b7becefb 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,4 +1,2 @@
-DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B 
a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647
 SHA512 
3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
-DIST xpra-4.1.3.tar.gz 3850971 BLAKE2B 
b5f5a0546c785762974f27650408cb83fdfa2ac8a5b5dd8c6b08a9978ff17a0dfc85f95fde405689a19517ef66bcc7aefc1dad71acc2dda7883ed38d3c22b91c
 SHA512 
e401793ae9a4539d39bc161be4d34af2dca81c78f189664d8ebdefff99d413d364d4ceb37dd776b027b206119da81957ef7436a727c00d3ad5895a3c90742e39
 DIST xpra-4.2.1.tar.gz 3878766 BLAKE2B 
c537b54b8ea5cc1ad2909eeccf61eba59a518165eb72c7d4984d26f378e4babca997c2f6cf78f5ba947edbc4ad6c4085c86793aad9b01f1fca2b22b1daaabda9
 SHA512 
553d8c11f1a77a2a58cbad7df0d899c611e21eb01dad3516f99f1fb9cc7a4507ba7557807b62ddea7101ca01bab123962a34b9c3369db06d1bb318debd91dc55
 DIST xpra-4.2.tar.gz 4057304 BLAKE2B 
17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10
 SHA512 
261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353

diff --git a/x11-wm/xpra/files/xpra-2.0-suid-warning.patch 
b/x11-wm/xpra/files/xpra-2.0-suid-warning.patch
deleted file mode 100644
index 806694f2431..000
--- a/x11-wm/xpra/files/xpra-2.0-suid-warning.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 xpra-2.0/xpra/scripts/config.py
-+++ xpra-2.0/xpra/scripts/config.py
-@@ -127,7 +127,7 @@
- xorg_stat = os.stat(xorg_bin)
- if (xorg_stat.st_mode & stat.S_ISUID)!=0:
- if (xorg_stat.st_mode & stat.S_IROTH)==0:
--warn("%s is suid and not readable, Xdummy support 
unavailable" % xorg_bin)
-+debug("%s is suid and not readable, Xdummy support 
unavailable" % xorg_bin)
- return get_Xvfb_command()
- debug("%s is suid and readable, using the xpra_Xdummy 
wrapper" % xorg_bin)
- use_wrapper = True

diff --git a/x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch 
b/x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch
deleted file mode 100644
index ae590110f1c..000
--- a/x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar a/xpra/scripts/config.py b/xpra/scripts/config.py
 a/xpra/scripts/config.py   2020-05-10 19:00:55.0 +0200
-+++ b/xpra/scripts/config.py   2020-06-07 18:35:49.361899872 +0200
-@@ -150,7 +150,7 @@
- if (xorg_stat.st_mode & stat.S_ISUID)!=0:
- if (xorg_stat.st_mode & stat.S_IROTH)==0:
- if warn:
--warn("%s is suid and not readable, Xdummy support 
unavailable" % xorg_bin)
-+debug("%s is suid and not readable, Xdummy support 
unavailable" % xorg_bin)
- return get_Xvfb_command()
- debug("%s is suid and readable, using the xpra_Xdummy 
wrapper" % xorg_bin)
- use_wrapper = True

diff --git a/x11-wm/xpra/xpra-3.0.5-r2.ebuild b/x11-wm/xpra/xpra-3.0.5-r2.ebuild
deleted file mode 100644
index 1371e2b78d8..000
--- a/x11-wm/xpra/xpra-3.0.5-r2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# 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 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/";
-SRC_URI="http://xpra.org/src/${P}.tar.xz";
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo opengl pillow 
pulseaudio server sound test vpx webcam webp"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-   || ( client server )
-   cups? ( dbus )
-   opengl? ( clien

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

2021-07-17 Thread Agostino Sarubbo

commit: ba5a911390713bf4151d781aaf9dc9011b1f9808
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jul 18 06:35:30 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jul 18 06:35:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba5a9113

x11-wm/xpra: x86 stable wrt bug #802354

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-wm/xpra/xpra-4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/xpra/xpra-4.2.ebuild b/x11-wm/xpra/xpra-4.2.ebuild
index 652c9126e97..f79d0e144a0 100644
--- a/x11-wm/xpra/xpra-4.2.ebuild
+++ b/x11-wm/xpra/xpra-4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://xpra.org/src/${P}.tar.gz";
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg ibus +lz4 lzo 
minimal opengl pillow pinentry pulseaudio server sound test vpx webcam webp"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}

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

2021-07-17 Thread Agostino Sarubbo

commit: 302a46fe19cf0a70a0a4160d9ddc0df55f428ed5
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jul 18 06:32:22 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jul 18 06:32:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=302a46fe

x11-wm/xpra: amd64 stable wrt bug #802354

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-wm/xpra/xpra-4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/xpra/xpra-4.2.ebuild b/x11-wm/xpra/xpra-4.2.ebuild
index 1f8dc0a75fa..652c9126e97 100644
--- a/x11-wm/xpra/xpra-4.2.ebuild
+++ b/x11-wm/xpra/xpra-4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://xpra.org/src/${P}.tar.gz";
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg ibus +lz4 lzo 
minimal opengl pillow pinentry pulseaudio server sound test vpx webcam webp"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}

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

2021-07-13 Thread James Le Cuirot

commit: 8b60b0c57ec7326dfc8529b6452f83ea1dd5803e
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Jul 13 21:48:30 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Jul 13 21:48:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b60b0c5

x11-wm/xpra: Version bump to 4.2.1

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/Manifest  |   1 +
 x11-wm/xpra/xpra-4.2.1.ebuild | 170 ++
 2 files changed, 171 insertions(+)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index addfc19c3ae..59734fa8ff1 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,3 +1,4 @@
 DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B 
a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647
 SHA512 
3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
 DIST xpra-4.1.3.tar.gz 3850971 BLAKE2B 
b5f5a0546c785762974f27650408cb83fdfa2ac8a5b5dd8c6b08a9978ff17a0dfc85f95fde405689a19517ef66bcc7aefc1dad71acc2dda7883ed38d3c22b91c
 SHA512 
e401793ae9a4539d39bc161be4d34af2dca81c78f189664d8ebdefff99d413d364d4ceb37dd776b027b206119da81957ef7436a727c00d3ad5895a3c90742e39
+DIST xpra-4.2.1.tar.gz 3878766 BLAKE2B 
c537b54b8ea5cc1ad2909eeccf61eba59a518165eb72c7d4984d26f378e4babca997c2f6cf78f5ba947edbc4ad6c4085c86793aad9b01f1fca2b22b1daaabda9
 SHA512 
553d8c11f1a77a2a58cbad7df0d899c611e21eb01dad3516f99f1fb9cc7a4507ba7557807b62ddea7101ca01bab123962a34b9c3369db06d1bb318debd91dc55
 DIST xpra-4.2.tar.gz 4057304 BLAKE2B 
17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10
 SHA512 
261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353

diff --git a/x11-wm/xpra/xpra-4.2.1.ebuild b/x11-wm/xpra/xpra-4.2.1.ebuild
new file mode 100644
index 000..1f8dc0a75fa
--- /dev/null
+++ b/x11-wm/xpra/xpra-4.2.1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_USE_SETUPTOOLS=no
+inherit xdg distutils-r1 tmpfiles prefix udev
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
+HOMEPAGE="https://xpra.org/";
+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 doc ffmpeg jpeg ibus +lz4 lzo 
minimal opengl pillow pinentry pulseaudio server sound test vpx webcam webp"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   || ( client server )
+   cups? ( dbus )
+   opengl? ( client )
+"
+
+DEPEND="
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+   opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+   sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
+   ')
+   x11-libs/gtk+:3[introspection]
+   x11-libs/libX11
+   x11-libs/libXcomposite
+   x11-libs/libXdamage
+   x11-libs/libXfixes
+   x11-libs/libXrandr
+   x11-libs/libXtst
+   x11-libs/libxkbfile
+   brotli? ( app-arch/brotli )
+   csc? ( >=media-video/ffmpeg-1.2.2:0= )
+   ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
+   jpeg? ( media-libs/libjpeg-turbo )
+   pulseaudio? (
+   media-sound/pulseaudio
+   media-plugins/gst-plugins-pulse:1.0
+   )
+   sound? (
+   media-libs/gstreamer:1.0
+   media-libs/gst-plugins-base:1.0
+   )
+   vpx? ( media-libs/libvpx media-video/ffmpeg )
+   webp? ( media-libs/libwebp )
+"
+RDEPEND="
+   ${DEPEND}
+   $(python_gen_cond_dep '
+   dev-python/netifaces[${PYTHON_USEDEP}]
+   dev-python/rencode[${PYTHON_USEDEP}]
+   dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+   cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+   dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+   lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+   lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+   opengl? (
+   client? ( 
dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+   )
+   webcam? (
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/pyinotify[${PYTHON_USEDEP}]
+   media-libs/opencv[${PYTHON_USEDEP},python]
+   )
+   ')
+   acct-group/xpra
+   virtual/ssh
+   x11-apps/xmodmap
+   ibus? ( app-i18n/ibus )
+   pinentry? ( app-crypt/pinentry )
+   server? (
+

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

2021-05-30 Thread James Le Cuirot

commit: e11d7375480a0b0a7199d3fcbcf8e2cefb0c5f77
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun May 30 07:53:59 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun May 30 07:56:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e11d7375

x11-wm/xpra: Version bump to 4.2

Adds ibus and pinentry USE flags.

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/Manifest  |   1 +
 x11-wm/xpra/files/xpra-4.2-suid-warning.patch |  12 ++
 x11-wm/xpra/metadata.xml  |   2 +
 x11-wm/xpra/xpra-4.2.ebuild   | 170 ++
 4 files changed, 185 insertions(+)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 9e57431ebb4..58025dff631 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,3 +1,4 @@
 DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B 
a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647
 SHA512 
3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
 DIST xpra-4.1.2.tar.xz 2676588 BLAKE2B 
db3694fdd9f7e20ba93099ecde50d712de41bb64a2d317b9f10e349b7f501015d083c212250206c0f3e25e154311a096ce4c17972131af68584be666bbf7e067
 SHA512 
860533c4173b92ee110e65849110870a3b129b993d8a2a2308142474164e4f1c45984669e7e3963540290192310de5d2de0e0713b80f4cb8c6ae7f9c3bb0814e
 DIST xpra-4.1.3.tar.gz 3850971 BLAKE2B 
b5f5a0546c785762974f27650408cb83fdfa2ac8a5b5dd8c6b08a9978ff17a0dfc85f95fde405689a19517ef66bcc7aefc1dad71acc2dda7883ed38d3c22b91c
 SHA512 
e401793ae9a4539d39bc161be4d34af2dca81c78f189664d8ebdefff99d413d364d4ceb37dd776b027b206119da81957ef7436a727c00d3ad5895a3c90742e39
+DIST xpra-4.2.tar.gz 4057304 BLAKE2B 
17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10
 SHA512 
261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353

diff --git a/x11-wm/xpra/files/xpra-4.2-suid-warning.patch 
b/x11-wm/xpra/files/xpra-4.2-suid-warning.patch
new file mode 100644
index 000..b1b2afb4e18
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.2-suid-warning.patch
@@ -0,0 +1,12 @@
+diff --color -Naur a/xpra/scripts/config.py b/xpra/scripts/config.py
+--- a/xpra/scripts/config.py   2021-05-19 16:18:30.475153200 +0100
 b/xpra/scripts/config.py   2021-05-30 08:50:42.326953006 +0100
+@@ -159,7 +159,7 @@
+ if (xorg_stat.st_mode & stat.S_ISUID)!=0:
+ if (xorg_stat.st_mode & stat.S_IROTH)==0:
+ if warn_fn:
+-warn_fn("%s is suid and not readable, Xdummy support 
unavailable" % xorg_bin)
++debug("%s is suid and not readable, Xdummy support 
unavailable" % xorg_bin)
+ return get_Xvfb_command()
+ debug("%s is suid and readable, using the xpra_Xdummy 
wrapper" % xorg_bin)
+ use_wrapper = True

diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index ce472786e3a..a90f8afcffa 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -25,7 +25,9 @@
Build client-side code
Enable clipboard support
Enable csc softscaler support
+   Use ibus input method via 
app-i18n/ibus
Enable pillow support
+   Use app-crypt/pinentry for password 
entry
Build server-side code
Enable vpx image format support
Enable webcam support via opencv

diff --git a/x11-wm/xpra/xpra-4.2.ebuild b/x11-wm/xpra/xpra-4.2.ebuild
new file mode 100644
index 000..1f8dc0a75fa
--- /dev/null
+++ b/x11-wm/xpra/xpra-4.2.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_USE_SETUPTOOLS=no
+inherit xdg distutils-r1 tmpfiles prefix udev
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
+HOMEPAGE="https://xpra.org/";
+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 doc ffmpeg jpeg ibus +lz4 lzo 
minimal opengl pillow pinentry pulseaudio server sound test vpx webcam webp"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   || ( client server )
+   cups? ( dbus )
+   opengl? ( client )
+"
+
+DEPEND="
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+   opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+   sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
+   ')
+   x11-libs/gtk+:3[introspection]
+   x11-libs/libX11
+   x11-libs/libXcomposite
+

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

2021-05-30 Thread James Le Cuirot

commit: e4b5ec7d565977e8bca583a576d679dbec8d507f
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun May 30 07:54:35 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun May 30 07:56:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4b5ec7d

x11-wm/xpra: Drop old 4.1.2

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/Manifest  |   1 -
 x11-wm/xpra/xpra-4.1.2.ebuild | 168 --
 2 files changed, 169 deletions(-)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 58025dff631..addfc19c3ae 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,4 +1,3 @@
 DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B 
a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647
 SHA512 
3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
-DIST xpra-4.1.2.tar.xz 2676588 BLAKE2B 
db3694fdd9f7e20ba93099ecde50d712de41bb64a2d317b9f10e349b7f501015d083c212250206c0f3e25e154311a096ce4c17972131af68584be666bbf7e067
 SHA512 
860533c4173b92ee110e65849110870a3b129b993d8a2a2308142474164e4f1c45984669e7e3963540290192310de5d2de0e0713b80f4cb8c6ae7f9c3bb0814e
 DIST xpra-4.1.3.tar.gz 3850971 BLAKE2B 
b5f5a0546c785762974f27650408cb83fdfa2ac8a5b5dd8c6b08a9978ff17a0dfc85f95fde405689a19517ef66bcc7aefc1dad71acc2dda7883ed38d3c22b91c
 SHA512 
e401793ae9a4539d39bc161be4d34af2dca81c78f189664d8ebdefff99d413d364d4ceb37dd776b027b206119da81957ef7436a727c00d3ad5895a3c90742e39
 DIST xpra-4.2.tar.gz 4057304 BLAKE2B 
17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10
 SHA512 
261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353

diff --git a/x11-wm/xpra/xpra-4.1.2.ebuild b/x11-wm/xpra/xpra-4.1.2.ebuild
deleted file mode 100644
index cde55d55195..000
--- a/x11-wm/xpra/xpra-4.1.2.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_SINGLE_IMPL=yes
-DISTUTILS_USE_SETUPTOOLS=no
-inherit xdg distutils-r1 tmpfiles prefix udev
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
-HOMEPAGE="https://xpra.org/";
-SRC_URI="https://xpra.org/src/${P}.tar.xz";
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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 )
-   cups? ( dbus )
-   opengl? ( client )
-"
-
-DEPEND="
-   ${PYTHON_DEPS}
-   $(python_gen_cond_dep '
-   dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
-   opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
-   sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
-   ')
-   x11-libs/gtk+:3[introspection]
-   x11-libs/libX11
-   x11-libs/libXcomposite
-   x11-libs/libXdamage
-   x11-libs/libXfixes
-   x11-libs/libXrandr
-   x11-libs/libXtst
-   x11-libs/libxkbfile
-   brotli? ( app-arch/brotli )
-   csc? ( >=media-video/ffmpeg-1.2.2:0= )
-   ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
-   jpeg? ( media-libs/libjpeg-turbo )
-   pulseaudio? (
-   media-sound/pulseaudio
-   media-plugins/gst-plugins-pulse:1.0
-   )
-   sound? (
-   media-libs/gstreamer:1.0
-   media-libs/gst-plugins-base:1.0
-   )
-   vpx? ( media-libs/libvpx media-video/ffmpeg )
-   webp? ( media-libs/libwebp )
-"
-RDEPEND="
-   ${DEPEND}
-   $(python_gen_cond_dep '
-   dev-python/netifaces[${PYTHON_USEDEP}]
-   dev-python/rencode[${PYTHON_USEDEP}]
-   dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
-   cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
-   dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-   lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-   lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
-   opengl? (
-   client? ( 
dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
-   )
-   webcam? (
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/pyinotify[${PYTHON_USEDEP}]
-   media-libs/opencv[${PYTHON_USEDEP},python]
-   )
-   ')
-   acct-group/xpra
-   virtual/ssh
-   x11-apps/xmodmap
-   server? (
-   x11-base/xorg-server[-minimal,xvfb]
-   x11-drivers/xf86-input-void
-   )
-

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

2021-04-23 Thread James Le Cuirot

commit: 7a2fe829e3612bf7be2e2ef5892694b17187cb17
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Apr 23 10:39:37 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Apr 23 10:39:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a2fe829

x11-wm/xpra: Version bump to 4.1.3

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/Manifest  |   1 +
 x11-wm/xpra/xpra-4.1.3.ebuild | 168 ++
 2 files changed, 169 insertions(+)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 32cb2c66399..623892d0d1e 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,3 +1,4 @@
 DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B 
a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647
 SHA512 
3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
 DIST xpra-4.1.1.tar.xz 2674236 BLAKE2B 
388306b33d99e97e07eb4a0f14ad33a08f9b367fa8e8b6d0553b0815ceb1b99540d027d2bdf8b6ef0a8ad3dda5a92861acf6c429034b7dd7e061eaefe86ade89
 SHA512 
b6312fb40849446ad88181664256610fcc673c5263449f610dd3fe40d0f331b1493efdee0560b78ef217ebc168d81a020b3bc97d369f9c1810a73e62e8e02873
 DIST xpra-4.1.2.tar.xz 2676588 BLAKE2B 
db3694fdd9f7e20ba93099ecde50d712de41bb64a2d317b9f10e349b7f501015d083c212250206c0f3e25e154311a096ce4c17972131af68584be666bbf7e067
 SHA512 
860533c4173b92ee110e65849110870a3b129b993d8a2a2308142474164e4f1c45984669e7e3963540290192310de5d2de0e0713b80f4cb8c6ae7f9c3bb0814e
+DIST xpra-4.1.3.tar.gz 3850971 BLAKE2B 
b5f5a0546c785762974f27650408cb83fdfa2ac8a5b5dd8c6b08a9978ff17a0dfc85f95fde405689a19517ef66bcc7aefc1dad71acc2dda7883ed38d3c22b91c
 SHA512 
e401793ae9a4539d39bc161be4d34af2dca81c78f189664d8ebdefff99d413d364d4ceb37dd776b027b206119da81957ef7436a727c00d3ad5895a3c90742e39

diff --git a/x11-wm/xpra/xpra-4.1.3.ebuild b/x11-wm/xpra/xpra-4.1.3.ebuild
new file mode 100644
index 000..db407cd0db7
--- /dev/null
+++ b/x11-wm/xpra/xpra-4.1.3.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_USE_SETUPTOOLS=no
+inherit xdg distutils-r1 tmpfiles prefix udev
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
+HOMEPAGE="https://xpra.org/";
+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 doc ffmpeg jpeg +lz4 lzo minimal 
opengl pillow pulseaudio server sound test vpx webcam webp"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   || ( client server )
+   cups? ( dbus )
+   opengl? ( client )
+"
+
+DEPEND="
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+   opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+   sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
+   ')
+   x11-libs/gtk+:3[introspection]
+   x11-libs/libX11
+   x11-libs/libXcomposite
+   x11-libs/libXdamage
+   x11-libs/libXfixes
+   x11-libs/libXrandr
+   x11-libs/libXtst
+   x11-libs/libxkbfile
+   brotli? ( app-arch/brotli )
+   csc? ( >=media-video/ffmpeg-1.2.2:0= )
+   ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
+   jpeg? ( media-libs/libjpeg-turbo )
+   pulseaudio? (
+   media-sound/pulseaudio
+   media-plugins/gst-plugins-pulse:1.0
+   )
+   sound? (
+   media-libs/gstreamer:1.0
+   media-libs/gst-plugins-base:1.0
+   )
+   vpx? ( media-libs/libvpx media-video/ffmpeg )
+   webp? ( media-libs/libwebp )
+"
+RDEPEND="
+   ${DEPEND}
+   $(python_gen_cond_dep '
+   dev-python/netifaces[${PYTHON_USEDEP}]
+   dev-python/rencode[${PYTHON_USEDEP}]
+   dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+   cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+   dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+   lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+   lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+   opengl? (
+   client? ( 
dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+   )
+   webcam? (
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/pyinotify[${PYTHON_USEDEP}]
+   media-libs/opencv[${PYTHON_USEDEP},python]
+   )
+   ')
+   acct-group/xpra
+   virtual/ssh
+   x11-apps/xmodmap
+   server? (
+   x11-base/xorg-server[-minimal,xvfb]
+   x11-drivers/xf86-input-void
+

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

2021-04-23 Thread James Le Cuirot

commit: e633f434404c679deedb68f6c6cb1ce71f163d9a
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Apr 23 10:40:15 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Apr 23 10:40:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e633f434

x11-wm/xpra: Drop old 4.1.1

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/Manifest  |   1 -
 x11-wm/xpra/xpra-4.1.1.ebuild | 159 --
 2 files changed, 160 deletions(-)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 623892d0d1e..9e57431ebb4 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,4 +1,3 @@
 DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B 
a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647
 SHA512 
3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
-DIST xpra-4.1.1.tar.xz 2674236 BLAKE2B 
388306b33d99e97e07eb4a0f14ad33a08f9b367fa8e8b6d0553b0815ceb1b99540d027d2bdf8b6ef0a8ad3dda5a92861acf6c429034b7dd7e061eaefe86ade89
 SHA512 
b6312fb40849446ad88181664256610fcc673c5263449f610dd3fe40d0f331b1493efdee0560b78ef217ebc168d81a020b3bc97d369f9c1810a73e62e8e02873
 DIST xpra-4.1.2.tar.xz 2676588 BLAKE2B 
db3694fdd9f7e20ba93099ecde50d712de41bb64a2d317b9f10e349b7f501015d083c212250206c0f3e25e154311a096ce4c17972131af68584be666bbf7e067
 SHA512 
860533c4173b92ee110e65849110870a3b129b993d8a2a2308142474164e4f1c45984669e7e3963540290192310de5d2de0e0713b80f4cb8c6ae7f9c3bb0814e
 DIST xpra-4.1.3.tar.gz 3850971 BLAKE2B 
b5f5a0546c785762974f27650408cb83fdfa2ac8a5b5dd8c6b08a9978ff17a0dfc85f95fde405689a19517ef66bcc7aefc1dad71acc2dda7883ed38d3c22b91c
 SHA512 
e401793ae9a4539d39bc161be4d34af2dca81c78f189664d8ebdefff99d413d364d4ceb37dd776b027b206119da81957ef7436a727c00d3ad5895a3c90742e39

diff --git a/x11-wm/xpra/xpra-4.1.1.ebuild b/x11-wm/xpra/xpra-4.1.1.ebuild
deleted file mode 100644
index 65e29330271..000
--- a/x11-wm/xpra/xpra-4.1.1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_SINGLE_IMPL=yes
-DISTUTILS_USE_SETUPTOOLS=no
-inherit xdg distutils-r1 tmpfiles prefix
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
-HOMEPAGE="https://xpra.org/";
-SRC_URI="https://xpra.org/src/${P}.tar.xz";
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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 )
-   cups? ( dbus )
-   opengl? ( client )
-"
-
-DEPEND="
-   ${PYTHON_DEPS}
-   $(python_gen_cond_dep '
-   dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
-   opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
-   sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
-   ')
-   x11-libs/gtk+:3[introspection]
-   x11-libs/libX11
-   x11-libs/libXcomposite
-   x11-libs/libXdamage
-   x11-libs/libXfixes
-   x11-libs/libXrandr
-   x11-libs/libXtst
-   x11-libs/libxkbfile
-   brotli? ( app-arch/brotli )
-   csc? ( >=media-video/ffmpeg-1.2.2:0= )
-   ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
-   jpeg? ( media-libs/libjpeg-turbo )
-   pulseaudio? (
-   media-sound/pulseaudio
-   media-plugins/gst-plugins-pulse:1.0
-   )
-   sound? (
-   media-libs/gstreamer:1.0
-   media-libs/gst-plugins-base:1.0
-   )
-   vpx? ( media-libs/libvpx media-video/ffmpeg )
-   webp? ( media-libs/libwebp )
-"
-RDEPEND="
-   ${DEPEND}
-   $(python_gen_cond_dep '
-   dev-python/netifaces[${PYTHON_USEDEP}]
-   dev-python/rencode[${PYTHON_USEDEP}]
-   dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
-   cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
-   dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-   lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-   lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
-   opengl? (
-   client? ( 
dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
-   )
-   webcam? (
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/pyinotify[${PYTHON_USEDEP}]
-   media-libs/opencv[${PYTHON_USEDEP},python]
-   )
-   ')
-   acct-group/xpra
-   virtual/ssh
-   x11-apps/xmodmap
-   server? (
-   x11-base/xorg-server[-minimal,xvfb]
-   x11-drivers/xf86-input-void
-   )
-"
-

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

2021-04-16 Thread Sam James

commit: edc365b8a9084ae1c4def1537d8b31a1d49647c5
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 16 08:16:19 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 16 11:23:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edc365b8

x11-wm/xpra: eutils--

Signed-off-by: Sam James  gentoo.org>

 x11-wm/xpra/xpra-3.0.5-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-wm/xpra/xpra-3.0.5-r2.ebuild b/x11-wm/xpra/xpra-3.0.5-r2.ebuild
index dcc8cb7aa4f..1371e2b78d8 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/";

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

2021-04-07 Thread James Le Cuirot

commit: 6514301e0a2ddc6a629c1f41a0e6c7bb8f1faa87
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Apr  7 23:04:47 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Apr  7 23:04:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6514301e

x11-wm/xpra: Drop old 4.0.6-r28363

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/Manifest  |   1 -
 x11-wm/xpra/files/xpra-4.0.6-r28363.patch | 238 --
 x11-wm/xpra/xpra-4.0.6_p28363.ebuild  | 160 
 3 files changed, 399 deletions(-)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 0103f4ad8be..32cb2c66399 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,4 +1,3 @@
 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
 DIST xpra-4.1.2.tar.xz 2676588 BLAKE2B 
db3694fdd9f7e20ba93099ecde50d712de41bb64a2d317b9f10e349b7f501015d083c212250206c0f3e25e154311a096ce4c17972131af68584be666bbf7e067
 SHA512 
860533c4173b92ee110e65849110870a3b129b993d8a2a2308142474164e4f1c45984669e7e3963540290192310de5d2de0e0713b80f4cb8c6ae7f9c3bb0814e

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 5187b700c0d..000
--- 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 @

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

2021-04-07 Thread James Le Cuirot

commit: 08544d9afaff2107bc9ec6ee919371a3f41df44f
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Apr  7 23:04:04 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Apr  7 23:04:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08544d9a

x11-wm/xpra: Fix udev rule installation path

Although /usr/lib/udev is mentioned in udev's documentation, Gentoo
typically uses /lib/udev so move the directory.

Closes: https://bugs.gentoo.org/777867
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/xpra-4.1.2.ebuild | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/x11-wm/xpra/xpra-4.1.2.ebuild b/x11-wm/xpra/xpra-4.1.2.ebuild
index 65e29330271..cde55d55195 100644
--- a/x11-wm/xpra/xpra-4.1.2.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
+}

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

2021-04-07 Thread James Le Cuirot

commit: 6b3ca1e852061948fbfa53fcb657d1f3422cb28e
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Apr  7 23:02:31 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Apr  7 23:02:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b3ca1e8

x11-wm/xpra: Version bump to 4.1.2

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/Manifest  |   1 +
 x11-wm/xpra/xpra-4.1.2.ebuild | 159 ++
 2 files changed, 160 insertions(+)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index fdc3727bbaf..0103f4ad8be 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,3 +1,4 @@
 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
+DIST xpra-4.1.2.tar.xz 2676588 BLAKE2B 
db3694fdd9f7e20ba93099ecde50d712de41bb64a2d317b9f10e349b7f501015d083c212250206c0f3e25e154311a096ce4c17972131af68584be666bbf7e067
 SHA512 
860533c4173b92ee110e65849110870a3b129b993d8a2a2308142474164e4f1c45984669e7e3963540290192310de5d2de0e0713b80f4cb8c6ae7f9c3bb0814e

diff --git a/x11-wm/xpra/xpra-4.1.2.ebuild b/x11-wm/xpra/xpra-4.1.2.ebuild
new file mode 100644
index 000..65e29330271
--- /dev/null
+++ b/x11-wm/xpra/xpra-4.1.2.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_USE_SETUPTOOLS=no
+inherit xdg distutils-r1 tmpfiles prefix
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
+HOMEPAGE="https://xpra.org/";
+SRC_URI="https://xpra.org/src/${P}.tar.xz";
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+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 )
+   cups? ( dbus )
+   opengl? ( client )
+"
+
+DEPEND="
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+   opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+   sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
+   ')
+   x11-libs/gtk+:3[introspection]
+   x11-libs/libX11
+   x11-libs/libXcomposite
+   x11-libs/libXdamage
+   x11-libs/libXfixes
+   x11-libs/libXrandr
+   x11-libs/libXtst
+   x11-libs/libxkbfile
+   brotli? ( app-arch/brotli )
+   csc? ( >=media-video/ffmpeg-1.2.2:0= )
+   ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
+   jpeg? ( media-libs/libjpeg-turbo )
+   pulseaudio? (
+   media-sound/pulseaudio
+   media-plugins/gst-plugins-pulse:1.0
+   )
+   sound? (
+   media-libs/gstreamer:1.0
+   media-libs/gst-plugins-base:1.0
+   )
+   vpx? ( media-libs/libvpx media-video/ffmpeg )
+   webp? ( media-libs/libwebp )
+"
+RDEPEND="
+   ${DEPEND}
+   $(python_gen_cond_dep '
+   dev-python/netifaces[${PYTHON_USEDEP}]
+   dev-python/rencode[${PYTHON_USEDEP}]
+   dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+   cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+   dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+   lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+   lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+   opengl? (
+   client? ( 
dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+   )
+   webcam? (
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/pyinotify[${PYTHON_USEDEP}]
+   media-libs/opencv[${PYTHON_USEDEP},python]
+   )
+   ')
+   acct-group/xpra
+   virtual/ssh
+   x11-apps/xmodmap
+   server? (
+   x11-base/xorg-server[-minimal,xvfb]
+   x11-drivers/xf86-input-void
+   )

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

2021-03-08 Thread James Le Cuirot

commit: f9a6bc3e06b1f79945c7f31f76d25082a8dfaa4f
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Mar  8 12:05:11 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Mar  8 12:05:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9a6bc3e

x11-wm/xpra: Bump to 4.1.1, drop old 4.1

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/Manifest   | 2 +-
 x11-wm/xpra/{xpra-4.1.ebuild => xpra-4.1.1.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 4a362787371..fdc3727bbaf 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,3 +1,3 @@
 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.tar.xz 2680552 BLAKE2B 
7b23ac9cc226cea7aaf076c7c747189a76e95b520ac629e5649b627cd78211aba34e31c2c09477d55d50694659921a0553eec8c8ad3e1d7c98299dec8e75b236
 SHA512 
b2ce7875aaa5cef52195aa16b5914a2f9fa3ff279d39d7c7a72ea3da11afefeb5536d46987525d5bc948c28e3fea01d5cc975d2b32edc2a541b3fb0130560224
+DIST xpra-4.1.1.tar.xz 2674236 BLAKE2B 
388306b33d99e97e07eb4a0f14ad33a08f9b367fa8e8b6d0553b0815ceb1b99540d027d2bdf8b6ef0a8ad3dda5a92861acf6c429034b7dd7e061eaefe86ade89
 SHA512 
b6312fb40849446ad88181664256610fcc673c5263449f610dd3fe40d0f331b1493efdee0560b78ef217ebc168d81a020b3bc97d369f9c1810a73e62e8e02873

diff --git a/x11-wm/xpra/xpra-4.1.ebuild b/x11-wm/xpra/xpra-4.1.1.ebuild
similarity index 100%
rename from x11-wm/xpra/xpra-4.1.ebuild
rename to x11-wm/xpra/xpra-4.1.1.ebuild

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

2021-03-02 Thread James Le Cuirot

commit: 3537401698fd47f11ae93b97803b0a125ee859da
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Mar  2 13:24:32 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Mar  2 13:24:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35374016

x11-wm/xpra: Version bump to 4.1

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/Manifest|   1 +
 x11-wm/xpra/xpra-4.1.ebuild | 159 
 2 files changed, 160 insertions(+)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 50c37163f42..b5f28223d31 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,3 +1,4 @@
 DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B 
a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647
 SHA512 
3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
 DIST xpra-4.0.5.tar.xz 2795828 BLAKE2B 
fed6514d75dbb08f386325e30e375fd2077db1dad91602e575e3955a622a52ade2fc8e0c6c823d8a495684afb3a2f55f27e28abdf8734d0eca25275a3d358193
 SHA512 
d2aa2b70b6ec702bca5b0c2b06378107d45c4cad79f83ee2a1ed27fd5f66474e2d8e1d28d5111e60417ed089f91bab0b1566b0c9b3dcf6f0cb5e204ff5c42c92
 DIST xpra-4.0.6.tar.xz 2797752 BLAKE2B 
3f2d4108fec1f1b5c0cd38a26f1a2c41af253fd234427e8e54104ff3742b9f7ae3e1863db837addd76acc6856b6f3cfcbde97edc2bc75314b215d4ca46a816f8
 SHA512 
e3dc66040898ed40ef12b8cdb89e5f42c2f36edc071afb435334389e727f376ddc116dbee47018468bff24f2cdd7be35750b58bc108ba73c5558bd9eccbd04ea
+DIST xpra-4.1.tar.xz 2680552 BLAKE2B 
7b23ac9cc226cea7aaf076c7c747189a76e95b520ac629e5649b627cd78211aba34e31c2c09477d55d50694659921a0553eec8c8ad3e1d7c98299dec8e75b236
 SHA512 
b2ce7875aaa5cef52195aa16b5914a2f9fa3ff279d39d7c7a72ea3da11afefeb5536d46987525d5bc948c28e3fea01d5cc975d2b32edc2a541b3fb0130560224

diff --git a/x11-wm/xpra/xpra-4.1.ebuild b/x11-wm/xpra/xpra-4.1.ebuild
new file mode 100644
index 000..65e29330271
--- /dev/null
+++ b/x11-wm/xpra/xpra-4.1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_USE_SETUPTOOLS=no
+inherit xdg distutils-r1 tmpfiles prefix
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
+HOMEPAGE="https://xpra.org/";
+SRC_URI="https://xpra.org/src/${P}.tar.xz";
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+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 )
+   cups? ( dbus )
+   opengl? ( client )
+"
+
+DEPEND="
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+   opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+   sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
+   ')
+   x11-libs/gtk+:3[introspection]
+   x11-libs/libX11
+   x11-libs/libXcomposite
+   x11-libs/libXdamage
+   x11-libs/libXfixes
+   x11-libs/libXrandr
+   x11-libs/libXtst
+   x11-libs/libxkbfile
+   brotli? ( app-arch/brotli )
+   csc? ( >=media-video/ffmpeg-1.2.2:0= )
+   ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
+   jpeg? ( media-libs/libjpeg-turbo )
+   pulseaudio? (
+   media-sound/pulseaudio
+   media-plugins/gst-plugins-pulse:1.0
+   )
+   sound? (
+   media-libs/gstreamer:1.0
+   media-libs/gst-plugins-base:1.0
+   )
+   vpx? ( media-libs/libvpx media-video/ffmpeg )
+   webp? ( media-libs/libwebp )
+"
+RDEPEND="
+   ${DEPEND}
+   $(python_gen_cond_dep '
+   dev-python/netifaces[${PYTHON_USEDEP}]
+   dev-python/rencode[${PYTHON_USEDEP}]
+   dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+   cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+   dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+   lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+   lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+   opengl? (
+   client? ( 
dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+   )
+   webcam? (
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/pyinotify[${PYTHON_USEDEP}]
+   media-libs/opencv[${PYTHON_USEDEP},python]
+   )
+   ')
+   acct-group/xpra
+   virtual/ssh
+   x11-apps/xmodmap
+   server? (
+   x11-base/xorg-server[-minimal,xvfb]
+   x11-drivers/xf86-input-void
+   )
+"
+BDEPEND=

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

2021-03-02 Thread James Le Cuirot

commit: b627a541854d0420d6e51f2f2b79d63bb64ed31f
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Mar  2 13:25:35 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Mar  2 13:25:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b627a541

x11-wm/xpra: Drop old 4.0.5

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/Manifest  |   1 -
 x11-wm/xpra/xpra-4.0.5.ebuild | 144 --
 2 files changed, 145 deletions(-)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index b5f28223d31..4a362787371 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,4 +1,3 @@
 DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B 
a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647
 SHA512 
3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
-DIST xpra-4.0.5.tar.xz 2795828 BLAKE2B 
fed6514d75dbb08f386325e30e375fd2077db1dad91602e575e3955a622a52ade2fc8e0c6c823d8a495684afb3a2f55f27e28abdf8734d0eca25275a3d358193
 SHA512 
d2aa2b70b6ec702bca5b0c2b06378107d45c4cad79f83ee2a1ed27fd5f66474e2d8e1d28d5111e60417ed089f91bab0b1566b0c9b3dcf6f0cb5e204ff5c42c92
 DIST xpra-4.0.6.tar.xz 2797752 BLAKE2B 
3f2d4108fec1f1b5c0cd38a26f1a2c41af253fd234427e8e54104ff3742b9f7ae3e1863db837addd76acc6856b6f3cfcbde97edc2bc75314b215d4ca46a816f8
 SHA512 
e3dc66040898ed40ef12b8cdb89e5f42c2f36edc071afb435334389e727f376ddc116dbee47018468bff24f2cdd7be35750b58bc108ba73c5558bd9eccbd04ea
 DIST xpra-4.1.tar.xz 2680552 BLAKE2B 
7b23ac9cc226cea7aaf076c7c747189a76e95b520ac629e5649b627cd78211aba34e31c2c09477d55d50694659921a0553eec8c8ad3e1d7c98299dec8e75b236
 SHA512 
b2ce7875aaa5cef52195aa16b5914a2f9fa3ff279d39d7c7a72ea3da11afefeb5536d46987525d5bc948c28e3fea01d5cc975d2b32edc2a541b3fb0130560224

diff --git a/x11-wm/xpra/xpra-4.0.5.ebuild b/x11-wm/xpra/xpra-4.0.5.ebuild
deleted file mode 100644
index 7e464f4eb4d..000
--- a/x11-wm/xpra/xpra-4.0.5.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2020 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 tmpfiles prefix
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
-HOMEPAGE="http://xpra.org/ http://xpra.org/src/";
-SRC_URI="http://xpra.org/src/${P}.tar.xz";
-
-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"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-   || ( client server )
-   cups? ( dbus )
-   opengl? ( client )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-   dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-   x11-libs/gtk+:3[introspection]
-   x11-libs/libX11
-   x11-libs/libXcomposite
-   x11-libs/libXdamage
-   x11-libs/libXfixes
-   x11-libs/libXrandr
-   x11-libs/libXtst
-   x11-libs/libxkbfile
-   brotli? ( app-arch/brotli )
-   csc? ( >=media-video/ffmpeg-1.2.2:0= )
-   ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
-   jpeg? ( media-libs/libjpeg-turbo )
-   opengl? ( dev-python/pyopengl )
-   pulseaudio? (
-   media-sound/pulseaudio
-   media-plugins/gst-plugins-pulse:1.0
-   )
-   sound? ( media-libs/gstreamer:1.0
-   media-libs/gst-plugins-base:1.0
-   dev-python/gst-python:1.0 )
-   vpx? ( media-libs/libvpx media-video/ffmpeg )
-   webp? ( media-libs/libwebp )
-"
-RDEPEND="${COMMON_DEPEND}
-   acct-group/xpra
-   dev-python/netifaces[${PYTHON_USEDEP}]
-   dev-python/rencode[${PYTHON_USEDEP}]
-   dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
-   virtual/ssh
-   x11-apps/xmodmap
-   cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
-   dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-   lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-   lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
-   opengl? (
-   client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
-   )
-   server? ( x11-base/xorg-server[-minimal,xvfb]
-   x11-drivers/xf86-input-void
-   )
-   webcam? ( dev-python/numpy[${PYTHON_USEDEP}]
-   media-libs/opencv[python]
-   dev-python/pyinotify[${PYTHON_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
-   virtual/pkgconfig
-   >=dev-python/cython-0.16[${PYTHON_USEDEP}]"
-
-RESTRICT="!test? ( test )"
-
-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
-)
-
-pkg_postinst() {
-   tmpfile

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

2021-01-19 Thread James Le Cuirot

commit: 308e38977c46e65f9b1662d0f4d1595144d52f90
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Jan 19 22:24:25 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Jan 19 22:38:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=308e3897

x11-wm/xpra: Add myself as maintainer for a little while

Package-Manager: Portage-3.0.14, Repoman-3.0.1
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index 349c6f4b186..4f4e62d12f5 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -13,6 +13,10 @@
ale...@gentoo.org
Alexey Shvetsov
 
+
+   ch...@gentoo.org
+   James Le Cuirot
+
 
https://www.xpra.org/trac/report

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

2021-01-19 Thread James Le Cuirot

commit: 31776efc4ea73f03c05e368548e74d720ade0872
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Jan 19 22:37:19 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Jan 19 22:38:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31776efc

x11-wm/xpra: Drop old 3.0.2-r1 and 4.0.4

Package-Manager: Portage-3.0.14, Repoman-3.0.1
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/Manifest|   2 -
 x11-wm/xpra/files/xpra-3.0.2-dbus.patch |  29 ---
 x11-wm/xpra/metadata.xml|   4 -
 x11-wm/xpra/xpra-3.0.2-r1.ebuild| 144 
 x11-wm/xpra/xpra-4.0.4.ebuild   | 139 --
 5 files changed, 318 deletions(-)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 836f937897f..50c37163f42 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,5 +1,3 @@
-DIST xpra-3.0.2.tar.xz 2749196 BLAKE2B 
3c8745657a12637704fb88ac7b867ab387ef7ed2250396d9e534aecf81e40f85332a2c51ba49638834012f4a4d85c03bd7e49ee259bb2400aeb60fb06abf8b59
 SHA512 
115f606ff5886d99a906f318cb1a7a4a86e80ebf23e4336e67938267d92ef624de577cc8fc06c6ce541b7c44a0cef58d930b5928f32e24dfc67c72127c7b623c
 DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B 
a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647
 SHA512 
3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
-DIST xpra-4.0.4.tar.xz 2792512 BLAKE2B 
e16c47e82cf9f8712521c8f9c436b7bb819d9469fc0135ade1f2c9fc6f2a8a0fecf417caae87a1eca9c4b6daec1a82add5d6547208caee1a1d681ebc7b3d3d3b
 SHA512 
91a90cdab775ec2501ef1601188b97ca4aa741e541f8d941add8d509767790a144b67f094177dda7539eff305710f2c834b90a93e9441437dac615677963094c
 DIST xpra-4.0.5.tar.xz 2795828 BLAKE2B 
fed6514d75dbb08f386325e30e375fd2077db1dad91602e575e3955a622a52ade2fc8e0c6c823d8a495684afb3a2f55f27e28abdf8734d0eca25275a3d358193
 SHA512 
d2aa2b70b6ec702bca5b0c2b06378107d45c4cad79f83ee2a1ed27fd5f66474e2d8e1d28d5111e60417ed089f91bab0b1566b0c9b3dcf6f0cb5e204ff5c42c92
 DIST xpra-4.0.6.tar.xz 2797752 BLAKE2B 
3f2d4108fec1f1b5c0cd38a26f1a2c41af253fd234427e8e54104ff3742b9f7ae3e1863db837addd76acc6856b6f3cfcbde97edc2bc75314b215d4ca46a816f8
 SHA512 
e3dc66040898ed40ef12b8cdb89e5f42c2f36edc071afb435334389e727f376ddc116dbee47018468bff24f2cdd7be35750b58bc108ba73c5558bd9eccbd04ea

diff --git a/x11-wm/xpra/files/xpra-3.0.2-dbus.patch 
b/x11-wm/xpra/files/xpra-3.0.2-dbus.patch
deleted file mode 100644
index e0f14b8ba59..000
--- a/x11-wm/xpra/files/xpra-3.0.2-dbus.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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/metadata.xml b/x11-wm/xpra/metadata.xml
index 4f4e62d12f5..ce472786e3a 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -25,10 +25,6 @@
Build client-side code
Enable clipboard support
Enable csc softscaler support
-   Enable avcodec2 decoder support
-   Enable advanced ffmpeg/libav encoder 
support
-   Enable x264 encoder support
-   Enable x265 encoder support
Enable pillow support
Build server-side code
Enable vpx image format support

diff --git a/x11-wm/xpra/xpra-3.0.2-r1.ebuild b/x11-wm/xpra/xpra-3.0.2-r1.ebuild
deleted file mode 100644
index f518280f02d..000
--- a/x11-wm/xpra/xpra-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3
-PYTHON_COMPAT=( python3_{6,7} )
-inherit xdg distutils-r1 eutils flag-o-matic user tmpfiles prefix
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) bas

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

2021-01-19 Thread James Le Cuirot

commit: 63e84c8efc156cbbe07582eaac96fd2fee77352f
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Jan 19 22:31:33 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Jan 19 22:38:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63e84c8e

x11-wm/xpra: Use single Python implementation, EAPI 7

Package-Manager: Portage-3.0.14, Repoman-3.0.1
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/xpra-4.0.6_p28363.ebuild | 64 ++--
 1 file changed, 40 insertions(+), 24 deletions(-)

diff --git a/x11-wm/xpra/xpra-4.0.6_p28363.ebuild 
b/x11-wm/xpra/xpra-4.0.6_p28363.ebuild
index 22424531d4a..01ec69226da 100644
--- a/x11-wm/xpra/xpra-4.0.6_p28363.ebuild
+++ b/x11-wm/xpra/xpra-4.0.6_p28363.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_SINGLE_IMPL=yes
 DISTUTILS_USE_SETUPTOOLS=no
-inherit xdg distutils-r1 eutils tmpfiles prefix
+inherit xdg distutils-r1 tmpfiles prefix
 
 MY_P="${PN}-${PV%_p*}"
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
@@ -23,8 +24,13 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
opengl? ( client )
 "
 
-COMMON_DEPEND="${PYTHON_DEPS}
-   dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+DEPEND="
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+   opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+   sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
+   ')
x11-libs/gtk+:3[introspection]
x11-libs/libX11
x11-libs/libXcomposite
@@ -37,40 +43,50 @@ COMMON_DEPEND="${PYTHON_DEPS}
csc? ( >=media-video/ffmpeg-1.2.2:0= )
ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
jpeg? ( media-libs/libjpeg-turbo )
-   opengl? ( dev-python/pyopengl )
pulseaudio? (
media-sound/pulseaudio
media-plugins/gst-plugins-pulse:1.0
)
-   sound? ( media-libs/gstreamer:1.0
+   sound? (
+   media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
-   dev-python/gst-python:1.0 )
+   )
vpx? ( media-libs/libvpx media-video/ffmpeg )
webp? ( media-libs/libwebp )
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
+   ${DEPEND}
+   $(python_gen_cond_dep '
+   dev-python/netifaces[${PYTHON_USEDEP}]
+   dev-python/rencode[${PYTHON_USEDEP}]
+   dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+   cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+   dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+   lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+   lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+   opengl? (
+   client? ( 
dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+   )
+   webcam? (
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/pyinotify[${PYTHON_USEDEP}]
+   media-libs/opencv[${PYTHON_USEDEP},python]
+   )
+   ')
acct-group/xpra
-   dev-python/netifaces[${PYTHON_USEDEP}]
-   dev-python/rencode[${PYTHON_USEDEP}]
-   dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
virtual/ssh
x11-apps/xmodmap
-   cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
-   dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-   lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-   lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
-   opengl? (
-   client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
-   )
-   server? ( x11-base/xorg-server[-minimal,xvfb]
+   server? (
+   x11-base/xorg-server[-minimal,xvfb]
x11-drivers/xf86-input-void
)
-   webcam? ( dev-python/numpy[${PYTHON_USEDEP}]
-   media-libs/opencv[python]
-   dev-python/pyinotify[${PYTHON_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
+"
+BDEPEND="
virtual/pkgconfig
-   >=dev-python/cython-0.16[${PYTHON_USEDEP}]"
+   $(python_gen_cond_dep '
+   >=dev-python/cython-0.16[${PYTHON_USEDEP}]
+   ')
+"
 
 RESTRICT="!test? ( test )"

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

2021-01-19 Thread James Le Cuirot

commit: b0de3418e9b17db2f09fc2acdb60668f65c013fd
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Jan 19 22:25:23 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Jan 19 22:38:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0de3418

x11-wm/xpra: Version bump to 4.0.6_p28363

4.0.6 has some nice fixes but also a bad bug. This revision has a few
subsequent fixes.

Package-Manager: Portage-3.0.14, Repoman-3.0.1
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/Manifest  |   1 +
 x11-wm/xpra/files/xpra-4.0.6-r28363.patch | 238 ++
 x11-wm/xpra/xpra-4.0.6_p28363.ebuild  | 148 +++
 3 files changed, 387 insertions(+)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 8a4b5fa5d88..836f937897f 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -2,3 +2,4 @@ DIST xpra-3.0.2.tar.xz 2749196 BLAKE2B 
3c8745657a12637704fb88ac7b867ab387ef7ed22
 DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B 
a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647
 SHA512 
3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
 DIST xpra-4.0.4.tar.xz 2792512 BLAKE2B 
e16c47e82cf9f8712521c8f9c436b7bb819d9469fc0135ade1f2c9fc6f2a8a0fecf417caae87a1eca9c4b6daec1a82add5d6547208caee1a1d681ebc7b3d3d3b
 SHA512 
91a90cdab775ec2501ef1601188b97ca4aa741e541f8d941add8d509767790a144b67f094177dda7539eff305710f2c834b90a93e9441437dac615677963094c
 DIST xpra-4.0.5.tar.xz 2795828 BLAKE2B 
fed6514d75dbb08f386325e30e375fd2077db1dad91602e575e3955a622a52ade2fc8e0c6c823d8a495684afb3a2f55f27e28abdf8734d0eca25275a3d358193
 SHA512 
d2aa2b70b6ec702bca5b0c2b06378107d45c4cad79f83ee2a1ed27fd5f66474e2d8e1d28d5111e60417ed089f91bab0b1566b0c9b3dcf6f0cb5e204ff5c42c92
+DIST xpra-4.0.6.tar.xz 2797752 BLAKE2B 
3f2d4108fec1f1b5c0cd38a26f1a2c41af253fd234427e8e54104ff3742b9f7ae3e1863db837addd76acc6856b6f3cfcbde97edc2bc75314b215d4ca46a816f8
 SHA512 
e3dc66040898ed40ef12b8cdb89e5f42c2f36edc071afb435334389e727f376ddc116dbee47018468bff24f2cdd7be35750b58bc108ba73c5558bd9eccbd04ea

diff --git a/x11-wm/xpra/files/xpra-4.0.6-r28363.patch 
b/x11-wm/xpra/files/xpra-4.0.6-r28363.patch
new file mode 100644
index 000..5187b700c0d
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.0.6-r28363.patch
@@ -0,0 +1,238 @@
+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/l

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

2021-01-19 Thread James Le Cuirot

commit: d93067873047fb02e00e6e3f636572749a0fe767
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Jan 19 22:30:18 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Jan 19 22:38:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9306787

x11-wm/xpra: Use HTTPS for HOMEPAGE and SRC_URI

Package-Manager: Portage-3.0.14, Repoman-3.0.1
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/xpra-4.0.6_p28363.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-wm/xpra/xpra-4.0.6_p28363.ebuild 
b/x11-wm/xpra/xpra-4.0.6_p28363.ebuild
index dc52b8c275e..22424531d4a 100644
--- a/x11-wm/xpra/xpra-4.0.6_p28363.ebuild
+++ b/x11-wm/xpra/xpra-4.0.6_p28363.ebuild
@@ -9,8 +9,8 @@ inherit xdg distutils-r1 eutils tmpfiles prefix
 
 MY_P="${PN}-${PV%_p*}"
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
-HOMEPAGE="http://xpra.org/ http://xpra.org/src/";
-SRC_URI="http://xpra.org/src/${MY_P}.tar.xz";
+HOMEPAGE="https://xpra.org/";
+SRC_URI="https://xpra.org/src/${MY_P}.tar.xz";
 
 LICENSE="GPL-2 BSD"
 SLOT="0"

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

2021-01-19 Thread James Le Cuirot

commit: e688527e830c8f2f1fe77d0029788290ccb78dd7
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Jan 19 22:28:19 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Jan 19 22:38:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e688527e

x11-wm/xpra: Drop obsolete -fno-strict-aliasing fix

Package-Manager: Portage-3.0.14, Repoman-3.0.1
Signed-off-by: James Le Cuirot  gentoo.org>

 x11-wm/xpra/xpra-4.0.6_p28363.ebuild | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/x11-wm/xpra/xpra-4.0.6_p28363.ebuild 
b/x11-wm/xpra/xpra-4.0.6_p28363.ebuild
index 55099a674a1..dc52b8c275e 100644
--- a/x11-wm/xpra/xpra-4.0.6_p28363.ebuild
+++ b/x11-wm/xpra/xpra-4.0.6_p28363.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=no
-inherit xdg distutils-r1 eutils flag-o-matic tmpfiles prefix
+inherit xdg distutils-r1 eutils tmpfiles prefix
 
 MY_P="${PN}-${PV%_p*}"
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
@@ -140,9 +140,5 @@ python_configure_all() {
--with-x11
)
 
-   # see https://www.xpra.org/trac/ticket/1080
-   # and http://trac.cython.org/ticket/395
-   append-cflags -fno-strict-aliasing
-
export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
 }

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

2020-12-28 Thread Benda XU

commit: 87a857c44efc3e04d32b5aae37b0d480fdd86fdc
Author: Benda Xu  gentoo  org>
AuthorDate: Mon Dec 28 14:59:45 2020 +
Commit: Benda XU  gentoo  org>
CommitDate: Mon Dec 28 15:06:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87a857c4

x11-wm/xpra: bump to 4.0.5.

Add USE=minimal for disabling bloat features.

Add pyobject[cairo] dependency.

Suggested-by: kavol  email.cz
Closes: https://bugs.gentoo.org/752504
Package-Manager: Portage-3.0.12, Repoman-3.0.1
Signed-off-by: Benda Xu  gentoo.org>

 x11-wm/xpra/Manifest  |   1 +
 x11-wm/xpra/xpra-4.0.5.ebuild | 144 ++
 2 files changed, 145 insertions(+)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 93154bc9e09..8a4b5fa5d88 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,3 +1,4 @@
 DIST xpra-3.0.2.tar.xz 2749196 BLAKE2B 
3c8745657a12637704fb88ac7b867ab387ef7ed2250396d9e534aecf81e40f85332a2c51ba49638834012f4a4d85c03bd7e49ee259bb2400aeb60fb06abf8b59
 SHA512 
115f606ff5886d99a906f318cb1a7a4a86e80ebf23e4336e67938267d92ef624de577cc8fc06c6ce541b7c44a0cef58d930b5928f32e24dfc67c72127c7b623c
 DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B 
a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647
 SHA512 
3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
 DIST xpra-4.0.4.tar.xz 2792512 BLAKE2B 
e16c47e82cf9f8712521c8f9c436b7bb819d9469fc0135ade1f2c9fc6f2a8a0fecf417caae87a1eca9c4b6daec1a82add5d6547208caee1a1d681ebc7b3d3d3b
 SHA512 
91a90cdab775ec2501ef1601188b97ca4aa741e541f8d941add8d509767790a144b67f094177dda7539eff305710f2c834b90a93e9441437dac615677963094c
+DIST xpra-4.0.5.tar.xz 2795828 BLAKE2B 
fed6514d75dbb08f386325e30e375fd2077db1dad91602e575e3955a622a52ade2fc8e0c6c823d8a495684afb3a2f55f27e28abdf8734d0eca25275a3d358193
 SHA512 
d2aa2b70b6ec702bca5b0c2b06378107d45c4cad79f83ee2a1ed27fd5f66474e2d8e1d28d5111e60417ed089f91bab0b1566b0c9b3dcf6f0cb5e204ff5c42c92

diff --git a/x11-wm/xpra/xpra-4.0.5.ebuild b/x11-wm/xpra/xpra-4.0.5.ebuild
new file mode 100644
index 000..49c1939400a
--- /dev/null
+++ b/x11-wm/xpra/xpra-4.0.5.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
+inherit xdg distutils-r1 eutils flag-o-matic tmpfiles prefix
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
+HOMEPAGE="http://xpra.org/ http://xpra.org/src/";
+SRC_URI="http://xpra.org/src/${P}.tar.xz";
+
+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"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   || ( client server )
+   cups? ( dbus )
+   opengl? ( client )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+   dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+   x11-libs/gtk+:3[introspection]
+   x11-libs/libX11
+   x11-libs/libXcomposite
+   x11-libs/libXdamage
+   x11-libs/libXfixes
+   x11-libs/libXrandr
+   x11-libs/libXtst
+   x11-libs/libxkbfile
+   brotli? ( app-arch/brotli )
+   csc? ( >=media-video/ffmpeg-1.2.2:0= )
+   ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
+   jpeg? ( media-libs/libjpeg-turbo )
+   opengl? ( dev-python/pyopengl )
+   pulseaudio? (
+   media-sound/pulseaudio
+   media-plugins/gst-plugins-pulse:1.0
+   )
+   sound? ( media-libs/gstreamer:1.0
+   media-libs/gst-plugins-base:1.0
+   dev-python/gst-python:1.0 )
+   vpx? ( media-libs/libvpx media-video/ffmpeg )
+   webp? ( media-libs/libwebp )
+"
+RDEPEND="${COMMON_DEPEND}
+   acct-group/xpra
+   dev-python/netifaces[${PYTHON_USEDEP}]
+   dev-python/rencode[${PYTHON_USEDEP}]
+   dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+   virtual/ssh
+   x11-apps/xmodmap
+   cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+   dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+   lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+   lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+   opengl? (
+   client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+   )
+   server? ( x11-base/xorg-server[-minimal,xvfb]
+   x11-drivers/xf86-input-void
+   )
+   webcam? ( dev-python/numpy[${PYTHON_USEDEP}]
+   media-libs/opencv[python]
+   dev-python/pyinotify[${PYTHON_USEDEP}] )"
+DEPEND="${COMMON_DEPEND}
+   virtual/pkgconfig
+   >=dev-python/cython-0.16[${PYTHON_USEDEP}]"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
+   "${

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

2020-10-31 Thread Mikle Kolyada

commit: ae88733bc4fa32319e49d82e836e0dc0806adbd9
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Oct 31 11:20:21 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Oct 31 11:20:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae88733b

x11-wm/xpra: Stabilize 3.0.5-r2 amd64, #736701

Signed-off-by: Mikle Kolyada  gentoo.org>

 x11-wm/xpra/xpra-3.0.5-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/xpra/xpra-3.0.5-r2.ebuild b/x11-wm/xpra/xpra-3.0.5-r2.ebuild
index a6a83a8e771..3be5dbb7655 100644
--- a/x11-wm/xpra/xpra-3.0.5-r2.ebuild
+++ b/x11-wm/xpra/xpra-3.0.5-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.xz";
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo opengl pillow 
pulseaudio server sound test vpx webcam webp"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}

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

2020-10-29 Thread Andreas K. Hüttel

commit: d57dca20f6f8ee91ab021ac3b0cf86101521e974
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Thu Oct 29 22:23:50 2020 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Thu Oct 29 22:24:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d57dca20

x11-wm/xpra: Version bump

Closes: https://bugs.gentoo.org/723484
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 x11-wm/xpra/Manifest|   1 +
 x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch |  12 ++
 x11-wm/xpra/metadata.xml|   1 +
 x11-wm/xpra/xpra-4.0.4.ebuild   | 139 
 4 files changed, 153 insertions(+)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index a6c194f8b9e..93154bc9e09 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,2 +1,3 @@
 DIST xpra-3.0.2.tar.xz 2749196 BLAKE2B 
3c8745657a12637704fb88ac7b867ab387ef7ed2250396d9e534aecf81e40f85332a2c51ba49638834012f4a4d85c03bd7e49ee259bb2400aeb60fb06abf8b59
 SHA512 
115f606ff5886d99a906f318cb1a7a4a86e80ebf23e4336e67938267d92ef624de577cc8fc06c6ce541b7c44a0cef58d930b5928f32e24dfc67c72127c7b623c
 DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B 
a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647
 SHA512 
3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
+DIST xpra-4.0.4.tar.xz 2792512 BLAKE2B 
e16c47e82cf9f8712521c8f9c436b7bb819d9469fc0135ade1f2c9fc6f2a8a0fecf417caae87a1eca9c4b6daec1a82add5d6547208caee1a1d681ebc7b3d3d3b
 SHA512 
91a90cdab775ec2501ef1601188b97ca4aa741e541f8d941add8d509767790a144b67f094177dda7539eff305710f2c834b90a93e9441437dac615677963094c

diff --git a/x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch 
b/x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch
new file mode 100644
index 000..ae590110f1c
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch
@@ -0,0 +1,12 @@
+diff -Nuar a/xpra/scripts/config.py b/xpra/scripts/config.py
+--- a/xpra/scripts/config.py   2020-05-10 19:00:55.0 +0200
 b/xpra/scripts/config.py   2020-06-07 18:35:49.361899872 +0200
+@@ -150,7 +150,7 @@
+ if (xorg_stat.st_mode & stat.S_ISUID)!=0:
+ if (xorg_stat.st_mode & stat.S_IROTH)==0:
+ if warn:
+-warn("%s is suid and not readable, Xdummy support 
unavailable" % xorg_bin)
++debug("%s is suid and not readable, Xdummy support 
unavailable" % xorg_bin)
+ return get_Xvfb_command()
+ debug("%s is suid and readable, using the xpra_Xdummy 
wrapper" % xorg_bin)
+ use_wrapper = True

diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index e1742788d2b..349c6f4b186 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -17,6 +17,7 @@
https://www.xpra.org/trac/report
 
 
+   Enable brotli compression support
Build client-side code
Enable clipboard support
Enable csc softscaler support

diff --git a/x11-wm/xpra/xpra-4.0.4.ebuild b/x11-wm/xpra/xpra-4.0.4.ebuild
new file mode 100644
index 000..ff3e6b93213
--- /dev/null
+++ b/x11-wm/xpra/xpra-4.0.4.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
+inherit xdg distutils-r1 eutils flag-o-matic tmpfiles prefix
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"
+HOMEPAGE="http://xpra.org/ http://xpra.org/src/";
+SRC_URI="http://xpra.org/src/${P}.tar.xz";
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="brotli +client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo opengl 
pillow pulseaudio server sound test vpx webcam webp"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   || ( client server )
+   cups? ( dbus )
+   opengl? ( client )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+   dev-python/pygobject:3[${PYTHON_USEDEP}]
+   x11-libs/gtk+:3[introspection]
+   x11-libs/libX11
+   x11-libs/libXcomposite
+   x11-libs/libXdamage
+   x11-libs/libXfixes
+   x11-libs/libXrandr
+   x11-libs/libXtst
+   x11-libs/libxkbfile
+   brotli? ( app-arch/brotli )
+   csc? ( >=media-video/ffmpeg-1.2.2:0= )
+   ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
+   jpeg? ( media-libs/libjpeg-turbo )
+   opengl? ( dev-python/pyopengl )
+   pulseaudio? (
+   media-sound/pulseaudio
+   media-plugins/gst-plugins-pulse:1.0
+   )
+   sound? ( media-libs/gstreamer:1.0
+   media-libs/gst-plugins-base:1.0
+   dev-python/gst-python:1.0 )
+   vpx? ( media-libs/libvpx media-video/ffmpeg

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

2020-10-24 Thread Andreas K. Hüttel

commit: 5a31c7a9baa9a5d7892bc7d3ef3a15e501c9a353
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Oct 24 10:19:43 2020 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sat Oct 24 15:33:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a31c7a9

x11-wm/xpra: Add missing dependency

Closes: https://bugs.gentoo.org/750491
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 x11-wm/xpra/{xpra-3.0.5-r1.ebuild => xpra-3.0.5-r2.ebuild} | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/x11-wm/xpra/xpra-3.0.5-r1.ebuild b/x11-wm/xpra/xpra-3.0.5-r2.ebuild
similarity index 97%
rename from x11-wm/xpra/xpra-3.0.5-r1.ebuild
rename to x11-wm/xpra/xpra-3.0.5-r2.ebuild
index 8a02d9ecfc6..a6a83a8e771 100644
--- a/x11-wm/xpra/xpra-3.0.5-r1.ebuild
+++ b/x11-wm/xpra/xpra-3.0.5-r2.ebuild
@@ -36,7 +36,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
jpeg? ( media-libs/libjpeg-turbo )
opengl? ( dev-python/pyopengl )
-   pulseaudio? ( media-sound/pulseaudio )
+   pulseaudio? (
+   media-sound/pulseaudio
+   media-plugins/gst-plugins-pulse:1.0
+   )
sound? ( media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
dev-python/gst-python:1.0 )

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

2020-10-18 Thread Thomas Deutschmann

commit: 55f407c282b9f3ff4714240b52f92943fe5f5779
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Oct 18 18:05:43 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Oct 18 18:05:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55f407c2

x11-wm/xpra: x86 stable (bug #736701)

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann  gentoo.org>

 x11-wm/xpra/xpra-3.0.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/xpra/xpra-3.0.5-r1.ebuild b/x11-wm/xpra/xpra-3.0.5-r1.ebuild
index 50ffaccdea5..8a02d9ecfc6 100644
--- a/x11-wm/xpra/xpra-3.0.5-r1.ebuild
+++ b/x11-wm/xpra/xpra-3.0.5-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.xz";
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo opengl pillow 
pulseaudio server sound test vpx webcam webp"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}

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

2020-10-17 Thread Andreas K. Hüttel

commit: 98129b93b50b7f5c5acc2769e0e336873923dc93
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Oct 17 22:15:11 2020 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sat Oct 17 22:20:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98129b93

x11-wm/xpra: Move metainfo files to correct location

Closes: https://bugs.gentoo.org/743130
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 x11-wm/xpra/xpra-3.0.5-r1.ebuild | 8 
 1 file changed, 8 insertions(+)

diff --git a/x11-wm/xpra/xpra-3.0.5-r1.ebuild b/x11-wm/xpra/xpra-3.0.5-r1.ebuild
index 24df1d4e4d9..50ffaccdea5 100644
--- a/x11-wm/xpra/xpra-3.0.5-r1.ebuild
+++ b/x11-wm/xpra/xpra-3.0.5-r1.ebuild
@@ -74,6 +74,14 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.0.2-ldconfig.patch
 )
 
+src_install() {
+   distutils-r1_src_install
+
+   mkdir -p "${ED}/usr/share/metainfo" || die
+   mv "${ED}/usr/share/appdata/"* "${ED}/usr/share/metainfo/" || die
+   rmdir "${ED}/usr/share/appdata" || die
+}
+
 pkg_postinst() {
enewgroup ${PN}
tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf

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

2020-10-16 Thread Andreas K. Hüttel

commit: 6ebb362e67b20f2bcbab109f738fd918f4edd315
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Fri Oct 16 17:08:42 2020 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Fri Oct 16 17:08:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ebb362e

x11-wm/xpra: Fix DISTUTILS_USE_SETUPTOOLS

Closes: https://bugs.gentoo.org/749053
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 x11-wm/xpra/xpra-3.0.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/xpra/xpra-3.0.5-r1.ebuild b/x11-wm/xpra/xpra-3.0.5-r1.ebuild
index 0e40fc2e6e0..24df1d4e4d9 100644
--- a/x11-wm/xpra/xpra-3.0.5-r1.ebuild
+++ b/x11-wm/xpra/xpra-3.0.5-r1.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3
 PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
 inherit xdg distutils-r1 eutils flag-o-matic user tmpfiles prefix
 
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"

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

2020-10-14 Thread Alexey Shvetsov

commit: 78f61f36c1966b78a9038aaf9ffcadc6a52f43ae
Author: Alexey Shvetsov  gentoo  org>
AuthorDate: Wed Oct 14 10:50:21 2020 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Wed Oct 14 10:50:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78f61f36

x11-wm/xpra: add py39

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Alexey Shvetsov  gentoo.org>

 x11-wm/xpra/xpra-3.0.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/xpra/xpra-3.0.5-r1.ebuild b/x11-wm/xpra/xpra-3.0.5-r1.ebuild
index 843bae636e4..0e40fc2e6e0 100644
--- a/x11-wm/xpra/xpra-3.0.5-r1.ebuild
+++ b/x11-wm/xpra/xpra-3.0.5-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit xdg distutils-r1 eutils flag-o-matic user tmpfiles prefix
 
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"

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

2020-06-08 Thread Alexey Shvetsov

commit: 4c358fcc9a2e9820f76e06be064beb449dd7957a
Author: Alexey Shvetsov  gentoo  org>
AuthorDate: Mon Jun  8 20:54:38 2020 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Mon Jun  8 20:54:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c358fcc

x11-wm/xpra: Fix pkgcore warning

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Alexey Shvetsov  gentoo.org>

 x11-wm/xpra/xpra-3.0.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/xpra/xpra-3.0.2-r1.ebuild b/x11-wm/xpra/xpra-3.0.2-r1.ebuild
index 67c37be000f..f518280f02d 100644
--- a/x11-wm/xpra/xpra-3.0.2-r1.ebuild
+++ b/x11-wm/xpra/xpra-3.0.2-r1.ebuild
@@ -88,7 +88,7 @@ pkg_postinst() {
 }
 
 python_prepare_all() {
-   use dbus || eapply ${FILESDIR}/${PN}-3.0.2-dbus.patch
+   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 \

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

2020-06-08 Thread Alexey Shvetsov

commit: da468b02093835fc154bf95220bc27afac29debd
Author: Alexey Shvetsov  gentoo  org>
AuthorDate: Mon Jun  8 20:53:27 2020 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Mon Jun  8 20:53:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da468b02

x11-wm/xpra: Works with py38

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Alexey Shvetsov  gentoo.org>

 x11-wm/xpra/xpra-3.0.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/xpra/xpra-3.0.5-r1.ebuild b/x11-wm/xpra/xpra-3.0.5-r1.ebuild
index ab142fb477a..843bae636e4 100644
--- a/x11-wm/xpra/xpra-3.0.5-r1.ebuild
+++ b/x11-wm/xpra/xpra-3.0.5-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit xdg distutils-r1 eutils flag-o-matic user tmpfiles prefix
 
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based 
on wimpiggy"

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

2020-04-26 Thread David Seifert

commit: 95f7c0f513303ecf44850a3ec87587c639d86b7d
Author: David Seifert  gentoo  org>
AuthorDate: Sun Apr 26 10:59:30 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Apr 26 10:59:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95f7c0f5

x11-wm/xpra: Replace virtual/ffmpeg

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: David Seifert  gentoo.org>

 x11-wm/xpra/{xpra-3.0.2.ebuild => xpra-3.0.2-r1.ebuild} | 2 +-
 x11-wm/xpra/{xpra-3.0.5.ebuild => xpra-3.0.5-r1.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-wm/xpra/xpra-3.0.2.ebuild b/x11-wm/xpra/xpra-3.0.2-r1.ebuild
similarity index 98%
rename from x11-wm/xpra/xpra-3.0.2.ebuild
rename to x11-wm/xpra/xpra-3.0.2-r1.ebuild
index 87c56d0e4a4..67c37be000f 100644
--- a/x11-wm/xpra/xpra-3.0.2.ebuild
+++ b/x11-wm/xpra/xpra-3.0.2-r1.ebuild
@@ -46,7 +46,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
sound? ( media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
dev-python/gst-python:1.0 )
-   vpx? ( media-libs/libvpx virtual/ffmpeg )
+   vpx? ( media-libs/libvpx media-video/ffmpeg )
webp? ( media-libs/libwebp )"
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/x11-wm/xpra/xpra-3.0.5.ebuild b/x11-wm/xpra/xpra-3.0.5-r1.ebuild
similarity index 98%
rename from x11-wm/xpra/xpra-3.0.5.ebuild
rename to x11-wm/xpra/xpra-3.0.5-r1.ebuild
index d7d1465aea4..ab142fb477a 100644
--- a/x11-wm/xpra/xpra-3.0.5.ebuild
+++ b/x11-wm/xpra/xpra-3.0.5-r1.ebuild
@@ -40,7 +40,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
sound? ( media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
dev-python/gst-python:1.0 )
-   vpx? ( media-libs/libvpx virtual/ffmpeg )
+   vpx? ( media-libs/libvpx media-video/ffmpeg )
webp? ( media-libs/libwebp )
 "
 RDEPEND="${COMMON_DEPEND}

1 2 >

1 - 100 of 188 matches

Mail list logo