Gentoo Archives: gentoo-commits

From: Benda XU <heroxbd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/
Date: Wed, 01 Feb 2023 15:28:56
Message-Id: 1675265252.79bd5db2f47d9b9ddd5b4371546913676100bda8.heroxbd@gentoo
1 commit: 79bd5db2f47d9b9ddd5b4371546913676100bda8
2 Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 1 14:48:56 2023 +0000
4 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 1 15:27:32 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79bd5db2
7
8 x11-wm/xpra: enable py3.11
9
10 xpra now treat its main "xpra" as scripts, so that the latter has to
11 be enabled.
12
13 xpra_udev_product_version is a udev helper script.
14
15 Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
16
17 x11-wm/xpra/metadata.xml | 1 +
18 x11-wm/xpra/xpra-4.3.4.ebuild | 6 ++++--
19 x11-wm/xpra/xpra-9999.ebuild | 6 ++++--
20 3 files changed, 9 insertions(+), 4 deletions(-)
21
22 diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
23 index 79237ca0d2ac..230b35b55f48 100644
24 --- a/x11-wm/xpra/metadata.xml
25 +++ b/x11-wm/xpra/metadata.xml
26 @@ -14,6 +14,7 @@
27 <name>James Le Cuirot</name>
28 </maintainer>
29 <upstream>
30 + <remote-id type="pypi">xpra</remote-id>
31 <bugs-to>https://www.xpra.org/trac/report</bugs-to>
32 </upstream>
33 <use>
34
35 diff --git a/x11-wm/xpra/xpra-4.3.4.ebuild b/x11-wm/xpra/xpra-4.3.4.ebuild
36 index 190633c60938..54c34c90b098 100644
37 --- a/x11-wm/xpra/xpra-4.3.4.ebuild
38 +++ b/x11-wm/xpra/xpra-4.3.4.ebuild
39 @@ -12,7 +12,7 @@ else
40 KEYWORDS="~amd64 ~x86"
41 fi
42
43 -PYTHON_COMPAT=( python3_{9,10} )
44 +PYTHON_COMPAT=( python3_{9..11} )
45 DISTUTILS_SINGLE_IMPL=yes
46 DISTUTILS_USE_SETUPTOOLS=no
47
48 @@ -131,7 +131,8 @@ python_prepare_all() {
49 -i setup.py || die
50
51 if use minimal; then
52 - sed -r -e 's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \
53 + sed -r -e '/pam_ENABLED/s/DEFAULT/False/' \
54 + -e 's/^(xdg_open)_ENABLED = .*/\1_ENABLED = False/' \
55 -i setup.py || die
56 fi
57 }
58 @@ -199,6 +200,7 @@ python_install_all() {
59 mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
60 else
61 rm -vr "${ED}"/usr/lib/udev || die
62 + rm -v "${ED}"/usr/bin/xpra_udev_product_version || die
63 fi
64 }
65
66
67 diff --git a/x11-wm/xpra/xpra-9999.ebuild b/x11-wm/xpra/xpra-9999.ebuild
68 index e9b2bf0106f5..2465c20f7b26 100644
69 --- a/x11-wm/xpra/xpra-9999.ebuild
70 +++ b/x11-wm/xpra/xpra-9999.ebuild
71 @@ -11,7 +11,7 @@ else
72 KEYWORDS="~amd64 ~x86"
73 fi
74
75 -PYTHON_COMPAT=( python3_{9,10} )
76 +PYTHON_COMPAT=( python3_{9..11} )
77 DISTUTILS_SINGLE_IMPL=yes
78 DISTUTILS_USE_SETUPTOOLS=no
79
80 @@ -130,7 +130,8 @@ python_prepare_all() {
81 -i setup.py || die
82
83 if use minimal; then
84 - sed -r -e 's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \
85 + sed -r -e '/pam_ENABLED/s/DEFAULT/False/' \
86 + -e 's/^(xdg_open)_ENABLED = .*/\1_ENABLED = False/' \
87 -i setup.py || die
88 fi
89 }
90 @@ -198,6 +199,7 @@ python_install_all() {
91 mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
92 else
93 rm -vr "${ED}"/usr/lib/udev || die
94 + rm -v "${ED}"/usr/bin/xpra_udev_product_version || die
95 fi
96 }