commit: 476fe322e0793d7671738ee0350de3b872b60d97 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Mon Feb 28 23:04:43 2022 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Mon Feb 28 23:05:41 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=476fe322
x11-wm/xpra: Don't install service files by patching instead Auto-detection is used to determine what files to install, and where, which can be unpredictable, hence my earlier fix broke. Closes: https://bugs.gentoo.org/834336 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> x11-wm/xpra/files/xpra-4.2-no-service.patch | 19 +++++++++++++++++++ x11-wm/xpra/files/xpra-4.3-no-service.patch | 19 +++++++++++++++++++ x11-wm/xpra/xpra-4.2.ebuild | 4 +--- x11-wm/xpra/xpra-4.3.2.ebuild | 4 +--- 4 files changed, 40 insertions(+), 6 deletions(-) diff --git a/x11-wm/xpra/files/xpra-4.2-no-service.patch b/x11-wm/xpra/files/xpra-4.2-no-service.patch new file mode 100644 index 000000000000..dd85370968ba --- /dev/null +++ b/x11-wm/xpra/files/xpra-4.2-no-service.patch @@ -0,0 +1,19 @@ +Don't install the service files. Auto-detection is used to determine what files +to install, and where, which can be unpredictable on Gentoo. The init.d script +is also not suitable for Gentoo. + +diff --git a/setup.py b/setup.py +index 1718b06a9..b24a5bd1e 100755 +--- a/setup.py ++++ b/setup.py +@@ -139,8 +139,8 @@ from xpra.platform.features import LOCAL_SERVERS_SUPPORTED, SHADOW_SUPPORTED + shadow_ENABLED = SHADOW_SUPPORTED and DEFAULT + server_ENABLED = (LOCAL_SERVERS_SUPPORTED or shadow_ENABLED) and DEFAULT + rfb_ENABLED = server_ENABLED +-service_ENABLED = LINUX and server_ENABLED +-sd_listen_ENABLED = POSIX and pkg_config_ok("--exists", "libsystemd") ++service_ENABLED = False ++sd_listen_ENABLED = False + proxy_ENABLED = DEFAULT + client_ENABLED = DEFAULT + scripts_ENABLED = not WIN32 diff --git a/x11-wm/xpra/files/xpra-4.3-no-service.patch b/x11-wm/xpra/files/xpra-4.3-no-service.patch new file mode 100644 index 000000000000..b336db581953 --- /dev/null +++ b/x11-wm/xpra/files/xpra-4.3-no-service.patch @@ -0,0 +1,19 @@ +Don't install the service files. Auto-detection is used to determine what files +to install, and where, which can be unpredictable on Gentoo. The init.d script +is also not suitable for Gentoo. + +diff --git a/setup.py b/setup.py +index fc67abb50..a11dc0d97 100755 +--- a/setup.py ++++ b/setup.py +@@ -145,8 +145,8 @@ from xpra.platform.features import LOCAL_SERVERS_SUPPORTED, SHADOW_SUPPORTED + shadow_ENABLED = SHADOW_SUPPORTED and DEFAULT + server_ENABLED = (LOCAL_SERVERS_SUPPORTED or shadow_ENABLED) and DEFAULT + rfb_ENABLED = DEFAULT +-service_ENABLED = LINUX and server_ENABLED +-sd_listen_ENABLED = POSIX and pkg_config_ok("--exists", "libsystemd") ++service_ENABLED = False ++sd_listen_ENABLED = False + proxy_ENABLED = DEFAULT + client_ENABLED = DEFAULT + scripts_ENABLED = not WIN32 diff --git a/x11-wm/xpra/xpra-4.2.ebuild b/x11-wm/xpra/xpra-4.2.ebuild index 681a6c97aab5..c42097bb561a 100644 --- a/x11-wm/xpra/xpra-4.2.ebuild +++ b/x11-wm/xpra/xpra-4.2.ebuild @@ -96,6 +96,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch "${FILESDIR}"/${PN}-3.0.2-ldconfig.patch "${FILESDIR}"/${PN}-4.2-suid-warning.patch + "${FILESDIR}"/${PN}-4.2-no-service.patch ) python_prepare_all() { @@ -161,9 +162,6 @@ python_install_all() { local dir=$(get_udevdir) dodir "${dir%/*}" mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die - - # TODO: Write a Gentoo init script. - rm -r "${ED}"/etc/{init.d,sysconfig}/ || die } pkg_postinst() { diff --git a/x11-wm/xpra/xpra-4.3.2.ebuild b/x11-wm/xpra/xpra-4.3.2.ebuild index 84c10467c081..071992dfdb79 100644 --- a/x11-wm/xpra/xpra-4.3.2.ebuild +++ b/x11-wm/xpra/xpra-4.3.2.ebuild @@ -110,6 +110,7 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch "${FILESDIR}"/${PN}-4.2-suid-warning.patch + "${FILESDIR}"/${PN}-4.3-no-service.patch "${DISTDIR}"/${PN}-4.3.1-tests.patch ) @@ -188,9 +189,6 @@ python_install_all() { local dir=$(get_udevdir) dodir "${dir%/*}" mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die - - # TODO: Write a Gentoo init script. - rm -r "${ED}"/etc/{init.d,sysconfig}/ || die } pkg_postinst() {
