commit: 73f7abb9421ae66329a0f82a2b00962356252684 Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org> AuthorDate: Thu Feb 9 02:37:32 2023 +0000 Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org> CommitDate: Thu Feb 9 02:54:08 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73f7abb9
media-sound/upmpdcli: fix race in 'make install' Closes: https://bugs.gentoo.org/890298 Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org> media-sound/upmpdcli/files/makefile.patch | 22 ++++++++++++++++++++++ media-sound/upmpdcli/upmpdcli-1.5.20.ebuild | 11 ++++++++++- media-sound/upmpdcli/upmpdcli-1.6.3.ebuild | 11 ++++++++++- 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/media-sound/upmpdcli/files/makefile.patch b/media-sound/upmpdcli/files/makefile.patch new file mode 100644 index 000000000000..dd259a1406a6 --- /dev/null +++ b/media-sound/upmpdcli/files/makefile.patch @@ -0,0 +1,22 @@ +--- a/Makefile.in 2023-02-08 13:40:15.504842769 -0600 ++++ b/Makefile.in 2023-02-08 13:40:30.175898082 -0600 +@@ -2002,7 +2002,7 @@ + @MAKECONFGUI_TRUE@ prefix=$(prefix) exec_prefix=$(exec_prefix) libdir=$(libdir) \ + @MAKECONFGUI_TRUE@ install + +-install-data-hook: ++install-data-hook: install-dist_sysconfDATA + (cd $(DESTDIR)$(sysconfdir); test -f upmpdcli.conf || \ + mv upmpdcli.conf-dist upmpdcli.conf; chmod 600 upmpdcli.conf) + (cd $(DESTDIR)$(pkgdatadir); test -d src_scripts || mkdir src_scripts) +--- a/Makefile.am 2023-02-08 13:45:02.076935272 -0600 ++++ b/Makefile.am 2023-02-08 13:45:20.889007724 -0600 +@@ -285,7 +285,7 @@ + systemd/upmpdcli.service + + +-install-data-hook: ++install-data-hook: install-dist_sysconfDATA + (cd $(DESTDIR)$(sysconfdir); test -f upmpdcli.conf || \ + mv upmpdcli.conf-dist upmpdcli.conf; chmod 600 upmpdcli.conf) + (cd $(DESTDIR)$(pkgdatadir); test -d src_scripts || mkdir src_scripts) diff --git a/media-sound/upmpdcli/upmpdcli-1.5.20.ebuild b/media-sound/upmpdcli/upmpdcli-1.5.20.ebuild index a73fac04902e..6f8f00af7075 100644 --- a/media-sound/upmpdcli/upmpdcli-1.5.20.ebuild +++ b/media-sound/upmpdcli/upmpdcli-1.5.20.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit systemd +inherit autotools systemd DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon" HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"; @@ -28,6 +28,15 @@ RDEPEND=" thirdparty? ( dev-python/requests ) " +PATCHES=( + "${FILESDIR}"/makefile.patch +) + +src_prepare() { + default + eautoreconf +} + src_configure() { ./configure \ diff --git a/media-sound/upmpdcli/upmpdcli-1.6.3.ebuild b/media-sound/upmpdcli/upmpdcli-1.6.3.ebuild index a73fac04902e..6f8f00af7075 100644 --- a/media-sound/upmpdcli/upmpdcli-1.6.3.ebuild +++ b/media-sound/upmpdcli/upmpdcli-1.6.3.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit systemd +inherit autotools systemd DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon" HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"; @@ -28,6 +28,15 @@ RDEPEND=" thirdparty? ( dev-python/requests ) " +PATCHES=( + "${FILESDIR}"/makefile.patch +) + +src_prepare() { + default + eautoreconf +} + src_configure() { ./configure \
