commit: 098b48cb07b518475ce5a5b022f564d25062c576 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Jun 10 17:58:37 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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
