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 86F0715800F for ; Thu, 9 Feb 2023 02:54:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 61D34E07A9; Thu, 9 Feb 2023 02:54:27 +0000 (UTC) Received: from smtp.gentoo.org (mail.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4CD7EE07A9 for ; Thu, 9 Feb 2023 02:54:27 +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 4314B34085A for ; Thu, 9 Feb 2023 02:54:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6203689C for ; Thu, 9 Feb 2023 02:54:24 +0000 (UTC) From: "Erik Mackdanz" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Erik Mackdanz" Message-ID: <1675911248.73f7abb9421ae66329a0f82a2b00962356252684.stasibear@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/upmpdcli/, media-sound/upmpdcli/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/upmpdcli/files/makefile.patch media-sound/upmpdcli/upmpdcli-1.5.20.ebuild media-sound/upmpdcli/upmpdcli-1.6.3.ebuild X-VCS-Directories: media-sound/upmpdcli/files/ media-sound/upmpdcli/ X-VCS-Committer: stasibear X-VCS-Committer-Name: Erik Mackdanz X-VCS-Revision: 73f7abb9421ae66329a0f82a2b00962356252684 X-VCS-Branch: master Date: Thu, 9 Feb 2023 02:54:24 +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: 573a10cc-b158-46c6-b5ce-dcc69e170aaa X-Archives-Hash: 8c1611fdfec1d5d2759cb0a4436e252b commit: 73f7abb9421ae66329a0f82a2b00962356252684 Author: Erik Mackdanz gentoo org> AuthorDate: Thu Feb 9 02:37:32 2023 +0000 Commit: Erik Mackdanz gentoo 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 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 \