From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B107315800F for ; Wed, 1 Feb 2023 15:28:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BF2BBE0B34; Wed, 1 Feb 2023 15:28:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A8B38E0B34 for ; Wed, 1 Feb 2023 15:28:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C377A340A5D for ; Wed, 1 Feb 2023 15:28:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3EA787F8 for ; Wed, 1 Feb 2023 15:28:53 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1675265252.79bd5db2f47d9b9ddd5b4371546913676100bda8.heroxbd@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/xpra/metadata.xml x11-wm/xpra/xpra-4.3.4.ebuild x11-wm/xpra/xpra-9999.ebuild X-VCS-Directories: x11-wm/xpra/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: 79bd5db2f47d9b9ddd5b4371546913676100bda8 X-VCS-Branch: master Date: Wed, 1 Feb 2023 15:28:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e048cffa-98e0-478a-8ee4-8ff5a1454bcb X-Archives-Hash: b45da00324b4486f2beb32cae48e3c2e commit: 79bd5db2f47d9b9ddd5b4371546913676100bda8 Author: Benda Xu gentoo org> AuthorDate: Wed Feb 1 14:48:56 2023 +0000 Commit: Benda XU gentoo 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 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 @@ 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-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 }