gentoo resync : 08.10.2021

2 files changed, 78 insertions, 0 deletions

diff --git a/media-sound/mpdscribble/files/mpdscribble-0.23-Don-t-install-AUTHORS-COPYING-NEWS-README.rst.patch b/media-sound/mpdscribble/files/mpdscribble-0.23-Don-t-install-AUTHORS-COPYING-NEWS-README.rst.patch
new file mode 100644
index 000000000000..a3cbf96df2fd
--- /dev/null
+++ b/media-sound/mpdscribble/files/mpdscribble-0.23-Don-t-install-AUTHORS-COPYING-NEWS-README.rst.patch
@@ -0,0 +1,29 @@
+From 8e1cf0bc6a6d6e1636d1abe18adbf7b5a76841e0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Thu, 9 Sep 2021 14:19:01 +0200
+Subject: [PATCH 2/2] Don't install AUTHORS, COPYING, NEWS, README.rst
+
+We install these in ebuilds.
+---
+ meson.build | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index b4cc736..28ade21 100644
+--- a/meson.build
++++ b/meson.build
+@@ -128,11 +128,6 @@ executable(
+   install: true
+ )
+ 
+-install_data(
+-  'AUTHORS', 'COPYING', 'NEWS', 'README.rst',
+-  install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()),
+-)
+-
+ subdir('systemd')
+ 
+ subdir('doc')
+-- 
+2.32.0
+
diff --git a/media-sound/mpdscribble/files/mpdscribble-0.23-Unconditionally-generate-systemd-unit-files.patch b/media-sound/mpdscribble/files/mpdscribble-0.23-Unconditionally-generate-systemd-unit-files.patch
new file mode 100644
index 000000000000..9e14fdb33804
--- /dev/null
+++ b/media-sound/mpdscribble/files/mpdscribble-0.23-Unconditionally-generate-systemd-unit-files.patch
@@ -0,0 +1,49 @@
+From 8bf74e12a900349cb1ac21c22065a64d09873ff2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Thu, 9 Sep 2021 13:54:15 +0200
+Subject: [PATCH 1/2] Unconditionally generate systemd unit files
+
+---
+ meson.build                | 4 +---
+ systemd/system/meson.build | 1 -
+ systemd/user/meson.build   | 1 -
+ 3 files changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index f22b7a3..b4cc736 100644
+--- a/meson.build
++++ b/meson.build
+@@ -133,9 +133,7 @@ install_data(
+   install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()),
+ )
+ 
+-if libsystemd_dep.found()
+-  subdir('systemd')
+-endif
++subdir('systemd')
+ 
+ subdir('doc')
+ 
+diff --git a/systemd/system/meson.build b/systemd/system/meson.build
+index 83c5fe1..dfbdd59 100644
+--- a/systemd/system/meson.build
++++ b/systemd/system/meson.build
+@@ -7,5 +7,4 @@ configure_file(
+   input: 'mpdscribble.service.in',
+   output: 'mpdscribble.service',
+   configuration: systemd_unit_conf,
+-  install_dir: systemd_system_unit_dir,
+ )
+diff --git a/systemd/user/meson.build b/systemd/user/meson.build
+index 5372d3c..72320ee 100644
+--- a/systemd/user/meson.build
++++ b/systemd/user/meson.build
+@@ -7,5 +7,4 @@ configure_file(
+   input: 'mpdscribble.service.in',
+   output: 'mpdscribble.service',
+   configuration: systemd_unit_conf,
+-  install_dir: systemd_user_unit_dir,
+ )
+-- 
+2.32.0
+