commit:     fa40a68813842842cae00dac90450cf3e1b979ce
Author:     James Calligeros <jcalligeros99 <AT> gmail <DOT> com>
AuthorDate: Sun Dec 10 00:59:53 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 01:44:18 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa40a688

media-video/wireplumber: don't copy default configs to /etc/

Wireplumber does not tolerate having its default config split
across /etc/ and /usr/share/. It has also recently acquired features
which allow system integrators and other interested third parties
to ship customised configuration packages to better integrate
oddball hardware, such as Apple Silicon Macs. These configs naturally
live in /usr/share/, since they are not user-created. As /etc/ takes
precedence over /usr/share/, having the OOTB config there prevents
these custom configs from being loaded properly.

This commit removes the step which copies the OOTB config to /etc/,
which matches the behaviour expected (and now arguably required)
upstream. Users are responsible for adding their own overrides to
/etc/ should they so choose.

Signed-off-by: James Calligeros <jcalligeros99 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34207
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{wireplumber-9999.ebuild => wireplumber-0.4.17-r1.ebuild} | 11 -----------
 media-video/wireplumber/wireplumber-9999.ebuild               | 11 -----------
 2 files changed, 22 deletions(-)

diff --git a/media-video/wireplumber/wireplumber-9999.ebuild 
b/media-video/wireplumber/wireplumber-0.4.17-r1.ebuild
similarity index 91%
copy from media-video/wireplumber/wireplumber-9999.ebuild
copy to media-video/wireplumber/wireplumber-0.4.17-r1.ebuild
index 02516dabf6eb..42e484bf9447 100644
--- a/media-video/wireplumber/wireplumber-9999.ebuild
+++ b/media-video/wireplumber/wireplumber-0.4.17-r1.ebuild
@@ -95,17 +95,6 @@ src_configure() {
        meson_src_configure
 }
 
-src_install() {
-       meson_src_install
-
-       # We copy the default config, so that Gentoo tools can pick up on any
-       # updates and /etc does not end up with stale overrides.
-       # If a reflinking CoW filesystem is used (e.g. Btrfs), then the files
-       # will not actually get stored twice until modified.
-       insinto /etc
-       doins -r "${ED}"/usr/share/wireplumber
-}
-
 pkg_postinst() {
        if systemd_is_booted ; then
                ewarn "pipewire-media-session.service is no longer installed. 
You must switch"

diff --git a/media-video/wireplumber/wireplumber-9999.ebuild 
b/media-video/wireplumber/wireplumber-9999.ebuild
index 02516dabf6eb..42e484bf9447 100644
--- a/media-video/wireplumber/wireplumber-9999.ebuild
+++ b/media-video/wireplumber/wireplumber-9999.ebuild
@@ -95,17 +95,6 @@ src_configure() {
        meson_src_configure
 }
 
-src_install() {
-       meson_src_install
-
-       # We copy the default config, so that Gentoo tools can pick up on any
-       # updates and /etc does not end up with stale overrides.
-       # If a reflinking CoW filesystem is used (e.g. Btrfs), then the files
-       # will not actually get stored twice until modified.
-       insinto /etc
-       doins -r "${ED}"/usr/share/wireplumber
-}
-
 pkg_postinst() {
        if systemd_is_booted ; then
                ewarn "pipewire-media-session.service is no longer installed. 
You must switch"

Reply via email to