commit: 118a7420b9a156c559163b1509d0135063330992 Author: Arsen Arsenović <arsen <AT> aarsen <DOT> me> AuthorDate: Thu Sep 9 12:25:15 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Sat Oct 2 12:35:44 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=118a7420
media-sound/mpdscribble: add version 0.23 This version of mpdscribble uses meson to build, so a full rewrite of the ebuild was needed. Closes: https://bugs.gentoo.org/812275 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Arsen Arsenović <arsen <AT> aarsen.me> Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> media-sound/mpdscribble/Manifest | 1 + ...t-install-AUTHORS-COPYING-NEWS-README.rst.patch | 29 +++++++++++++ ...conditionally-generate-systemd-unit-files.patch | 49 ++++++++++++++++++++++ media-sound/mpdscribble/mpdscribble-0.23.ebuild | 42 +++++++++++++++++++ 4 files changed, 121 insertions(+) diff --git a/media-sound/mpdscribble/Manifest b/media-sound/mpdscribble/Manifest index 4f8b64bafb7..1cb46d9a4de 100644 --- a/media-sound/mpdscribble/Manifest +++ b/media-sound/mpdscribble/Manifest @@ -1 +1,2 @@ DIST mpdscribble-0.22.tar.bz2 116981 BLAKE2B 13b15ca9e49faa3e5d254bc2864de4a0c409d8767db586def3a7bee415c67f84ddffbd7fce6093afe4aba5d5e66db8182aed52d9a141bebf4094a400f2ababe3 SHA512 bedd93392a4d5a0609dcaf7aefeeff3851f3084da8c34a4fc1f8fde51c2ba10b8370ac52cc8d55f0c9a96fffed975827a0935087c2c51880b7bfef8d79182dc8 +DIST mpdscribble-0.23.tar.xz 46624 BLAKE2B 47c59a4b2936b7990bb2d8563422c553d1e08b39a09a873fae1ad0215bd1fcc0dbcaa69e62eab9332530717a200a52295018a578e3c615e83d68d84564060402 SHA512 f924076a8aa201f67ba81e72a44d3dd1c31618bd87e4f75f6b63f7b3814fa08f6ef4f7964b1d518c5f8b68a1f8ba88f867c08ed8b0387157eec8e9f97eb0b825 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 00000000000..a3cbf96df2f --- /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?= <[email protected]> +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 00000000000..9e14fdb3380 --- /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?= <[email protected]> +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 + diff --git a/media-sound/mpdscribble/mpdscribble-0.23.ebuild b/media-sound/mpdscribble/mpdscribble-0.23.ebuild new file mode 100644 index 00000000000..09a5937e6e1 --- /dev/null +++ b/media-sound/mpdscribble/mpdscribble-0.23.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson systemd + +DESCRIPTION="An MPD client that submits information to Audioscrobbler" +HOMEPAGE=" + https://www.musicpd.org/clients/mpdscribble/ + https://github.com/MusicPlayerDaemon/mpdscribble +" +SRC_URI="https://www.musicpd.org/download/${PN}/${PV}/${P}.tar.xz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + dev-libs/boost + dev-libs/libgcrypt:= + media-libs/libmpdclient + net-misc/curl +" + +DEPEND="${RDEPEND}" + +DOCS=( AUTHORS COPYING NEWS README.rst ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.23-Unconditionally-generate-systemd-unit-files.patch + "${FILESDIR}"/${PN}-0.23-Don-t-install-AUTHORS-COPYING-NEWS-README.rst.patch +) + +src_install() { + meson_src_install + newinitd "${FILESDIR}/mpdscribble.rc" mpdscribble + keepdir /var/cache/mpdscribble + + systemd_dounit "${BUILD_DIR}"/systemd/system/"${PN}".service + systemd_douserunit "${BUILD_DIR}"/systemd/user/"${PN}".service +}
