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 48B0415810F for ; Sat, 10 Jun 2023 18:04:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 58D4BE08D3; Sat, 10 Jun 2023 18:04:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2DE82E08D3 for ; Sat, 10 Jun 2023 18:04:02 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EF186340EDF for ; Sat, 10 Jun 2023 18:04:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 55C4FA53 for ; Sat, 10 Jun 2023 18:03:59 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1686420133.098b48cb07b518475ce5a5b022f564d25062c576.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/xpra/xpra-4.4.5-r2.ebuild x11-wm/xpra/xpra-9999.ebuild X-VCS-Directories: x11-wm/xpra/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 098b48cb07b518475ce5a5b022f564d25062c576 X-VCS-Branch: master Date: Sat, 10 Jun 2023 18:03:59 +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: 0a8966e4-6041-4c27-9e97-a7e8f0556b19 X-Archives-Hash: 12e7df46888b9a136b03e587852d9546 commit: 098b48cb07b518475ce5a5b022f564d25062c576 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jun 10 17:58:37 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 10 18:02:13 2023 +0000 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-9999.ebuild => xpra-4.4.5-r2.ebuild} | 7 +++---- x11-wm/xpra/xpra-9999.ebuild | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/x11-wm/xpra/xpra-9999.ebuild b/x11-wm/xpra/xpra-4.4.5-r2.ebuild similarity index 97% copy from x11-wm/xpra/xpra-9999.ebuild copy to x11-wm/xpra/xpra-4.4.5-r2.ebuild index 93c9941bab1e..03d884be7df1 100644 --- a/x11-wm/xpra/xpra-9999.ebuild +++ b/x11-wm/xpra/xpra-4.4.5-r2.ebuild @@ -117,8 +117,7 @@ BDEPEND=" RESTRICT="!test? ( test )" PATCHES=( - "${FILESDIR}"/${PN}-9999-xdummy.patch - "${FILESDIR}"/${PN}-9999-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-9999.ebuild b/x11-wm/xpra/xpra-9999.ebuild index 93c9941bab1e..b1d83402a147 100644 --- a/x11-wm/xpra/xpra-9999.ebuild +++ b/x11-wm/xpra/xpra-9999.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