From e23a08d0c97a0cc415aaa165da840b056f93c997 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Oct 2021 23:06:07 +0100 Subject: gentoo resync : 08.10.2021 --- media-sound/mpdscribble/Manifest | 5 ++- ...t-install-AUTHORS-COPYING-NEWS-README.rst.patch | 29 +++++++++++++ ...conditionally-generate-systemd-unit-files.patch | 49 ++++++++++++++++++++++ media-sound/mpdscribble/mpdscribble-0.23.ebuild | 42 +++++++++++++++++++ media-sound/mpdscribble/mpdscribble-9999.ebuild | 38 ----------------- 5 files changed, 124 insertions(+), 39 deletions(-) create mode 100644 media-sound/mpdscribble/files/mpdscribble-0.23-Don-t-install-AUTHORS-COPYING-NEWS-README.rst.patch create mode 100644 media-sound/mpdscribble/files/mpdscribble-0.23-Unconditionally-generate-systemd-unit-files.patch create mode 100644 media-sound/mpdscribble/mpdscribble-0.23.ebuild delete mode 100644 media-sound/mpdscribble/mpdscribble-9999.ebuild (limited to 'media-sound/mpdscribble') diff --git a/media-sound/mpdscribble/Manifest b/media-sound/mpdscribble/Manifest index 3181745837ea..beb942008537 100644 --- a/media-sound/mpdscribble/Manifest +++ b/media-sound/mpdscribble/Manifest @@ -1,5 +1,8 @@ +AUX mpdscribble-0.23-Don-t-install-AUTHORS-COPYING-NEWS-README.rst.patch 682 BLAKE2B 2f5944640d764dc77e601f74b22ce8487c80ec69827b3c3d551e732c33e38b126048e9c877e37e1732ffd18ae57808ee3fb1dc529653da1fa523be8499fdc0bd SHA512 65c153616b9b7d471cf793cec3294aa983247fc5b9c218a4fdb9ff9825c38499f5bfb7b81c1a98506e9102d1bc347e94d21f2296d50871787cdfada03a69aaaf +AUX mpdscribble-0.23-Unconditionally-generate-systemd-unit-files.patch 1407 BLAKE2B 9c70170c57f1eb1c43e22e824f1c208bc4c72ad751e10f68195e42fd331342bca4bc3066af671382258102bc63dd75386ead151e0ca8218e8df945373293db7a SHA512 d6c5582a7f4fc2059679ac8bba7dadd63133166522d63efce0c4adb77162fcedc8bee9d03cf4d192d9c6f97e827225b1993d0831e752f5c54f4badbab278a269 AUX mpdscribble.rc 475 BLAKE2B f57a87b042cd60d87119ea396bd84bdf846a04fcfadff69b6bfa6700cd177dd95cb5e7c753fc51eb4916410a64e20d42dff1a9e0b5024f2ad1d1d7e3ed3751f9 SHA512 b82d3e5678aba145a5c8d172ebf74960d164e3e934426cc755948d795743bb07158f502705d40c1730a40b6a6d73e84c5792419adaf6ab83ec7c33756f0abb43 DIST mpdscribble-0.22.tar.bz2 116981 BLAKE2B 13b15ca9e49faa3e5d254bc2864de4a0c409d8767db586def3a7bee415c67f84ddffbd7fce6093afe4aba5d5e66db8182aed52d9a141bebf4094a400f2ababe3 SHA512 bedd93392a4d5a0609dcaf7aefeeff3851f3084da8c34a4fc1f8fde51c2ba10b8370ac52cc8d55f0c9a96fffed975827a0935087c2c51880b7bfef8d79182dc8 +DIST mpdscribble-0.23.tar.xz 46624 BLAKE2B 47c59a4b2936b7990bb2d8563422c553d1e08b39a09a873fae1ad0215bd1fcc0dbcaa69e62eab9332530717a200a52295018a578e3c615e83d68d84564060402 SHA512 f924076a8aa201f67ba81e72a44d3dd1c31618bd87e4f75f6b63f7b3814fa08f6ef4f7964b1d518c5f8b68a1f8ba88f867c08ed8b0387157eec8e9f97eb0b825 EBUILD mpdscribble-0.22.ebuild 707 BLAKE2B 2ce67900b9bde1e81839e257cf3365f934873177b9675113915f6c46e68b6de006e703e37930162ef07558f46a0213ad1d06ecf038dd0546788388ac51ca0aaf SHA512 e2aaf1b1bb18bb8a0311b3e34379669666606fc2af58b2eaec6098dc88b2cb9a6f25a5c0db3ec01d83a68e041853a2c6963e01b1466e15400c188d604c27e131 -EBUILD mpdscribble-9999.ebuild 764 BLAKE2B e35259c4ac7ee6500a43f2d64139c5b36577b29703b2abd28ef52a2a1d8ce71c46b928edad256f3ab2fdebc877c136e9b41bd66b9e9d703e68704e3460e8119f SHA512 642d0f4699710df0da80f7bb65f86618e3c598002080277c829a2bfe5695bac82842b3ec0909c8c9f5ba3013fcaee40aece4e26a43d22600d63eb32cd449d1a1 +EBUILD mpdscribble-0.23.ebuild 996 BLAKE2B 6dfab0da40252d9cff82ccaa8be94dc8e29cd4a7d364e48f461a0fd5c38f2bdb89fa8d08c75d6c348aab5ee17e66fb9ee179b35398f937236ccefaa5cb545c0e SHA512 b6233debc73437394a252c2514b64a17d8fc10ab8517541741f2d9ffa0aaaa8e433958185c26b2aedbb1d358c802875be2a4e9c3bf5ecabcfe25a163d109413f MISC metadata.xml 784 BLAKE2B c38018b5bc728569e23dccc11fe4509b916448fec5316ac7170fe2fd4decb9a4ed568f40d039ed2d514e22209c18033f14324a5ff26521658e27e79c4102eab9 SHA512 f52ee040880383020d9f945359fd2597b44898fa215619e2ad435dfb1128791f8fcddcaa4cf1426712d684e3c1fa41e35fa35e1920364199e158cf24001c1443 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?= +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?= +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 000000000000..09a5937e6e1f --- /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 +} diff --git a/media-sound/mpdscribble/mpdscribble-9999.ebuild b/media-sound/mpdscribble/mpdscribble-9999.ebuild deleted file mode 100644 index 639a5eb9e342..000000000000 --- a/media-sound/mpdscribble/mpdscribble-9999.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit git-r3 autotools - -DESCRIPTION="An MPD client that submits information to Audioscrobbler" -HOMEPAGE="https://www.musicpd.org/clients/mpdscribble/" -EGIT_REPO_URI="https://github.com/MusicPlayerDaemon/mpdscribble.git" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="+curl" - -RDEPEND="dev-libs/glib:2 - media-libs/libmpdclient - curl? ( net-misc/curl ) - !curl? ( net-libs/libsoup:2.4 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - --with-http-client=$(usex curl curl soup) -} - -src_install() { - default - newinitd "${FILESDIR}/mpdscribble.rc" mpdscribble - keepdir /var/cache/mpdscribble -} -- cgit v1.2.3