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

[Benda XU]

commit:     79bd5db2f47d9b9ddd5b4371546913676100bda8
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  1 14:48:56 2023 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Wed Feb  1 15:27:32 2023 +0000
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 <heroxbd <AT> gentoo.org>

 x11-wm/xpra/metadata.xml      | 1 +
 x11-wm/xpra/xpra-4.3.4.ebuild | 6 ++++--
 x11-wm/xpra/xpra-9999.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 @@
        <name>James Le Cuirot</name>
 </maintainer>
 <upstream>
+       <remote-id type="pypi">xpra</remote-id>
        <bugs-to>https://www.xpra.org/trac/report</bugs-to>
 </upstream>
 <use>

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-9999.ebuild b/x11-wm/xpra/xpra-9999.ebuild
index e9b2bf0106f5..2465c20f7b26 100644
--- a/x11-wm/xpra/xpra-9999.ebuild
+++ b/x11-wm/xpra/xpra-9999.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
 }