From 70e12bfc0e59eb6b24288987a323ab18581dca91 Mon Sep 17 00:00:00 2001 From: Christian Buchinger Date: Tue, 23 Oct 2018 18:49:07 +0200 Subject: media-sound/snapcast: Minor fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Forcing -d(aemon) by moving it from confd to initd * Dropped global USE flag descriptions * Removed CMakeList patch because upstream merged it Signed-off-by: Christian Buchinger Package-Manager: Portage-2.3.51, Repoman-2.3.11 Closes: https://github.com/gentoo/gentoo/pull/10207 Signed-off-by: Michał Górny --- media-sound/snapcast/files/snapclient.confd | 2 +- media-sound/snapcast/files/snapclient.initd | 2 +- media-sound/snapcast/files/snapserver.confd | 2 +- media-sound/snapcast/files/snapserver.initd | 2 +- media-sound/snapcast/metadata.xml | 3 - media-sound/snapcast/snapcast-0.15.0-r1.ebuild | 89 ++++++++++++++++++++++++++ media-sound/snapcast/snapcast-0.15.0.ebuild | 89 -------------------------- media-sound/snapcast/snapcast-9999.ebuild | 2 - 8 files changed, 93 insertions(+), 98 deletions(-) create mode 100644 media-sound/snapcast/snapcast-0.15.0-r1.ebuild delete mode 100644 media-sound/snapcast/snapcast-0.15.0.ebuild (limited to 'media-sound/snapcast') diff --git a/media-sound/snapcast/files/snapclient.confd b/media-sound/snapcast/files/snapclient.confd index 311cce1c4fa6..e636d74da2bc 100644 --- a/media-sound/snapcast/files/snapclient.confd +++ b/media-sound/snapcast/files/snapclient.confd @@ -30,4 +30,4 @@ SNAPCLIENT_USER="--user snapclient:audio" -SNAPCLIENT_OPTS="-d" +SNAPCLIENT_OPTS="" diff --git a/media-sound/snapcast/files/snapclient.initd b/media-sound/snapcast/files/snapclient.initd index df69eb2621a0..45c0c74316d6 100644 --- a/media-sound/snapcast/files/snapclient.initd +++ b/media-sound/snapcast/files/snapclient.initd @@ -4,7 +4,7 @@ name=snapclient command="/usr/bin/snapclient" -command_args="$SNAPCLIENT_USER $SNAPCLIENT_OPTS" +command_args="-d $SNAPCLIENT_USER $SNAPCLIENT_OPTS" pidfile="/run/snapclient/pid" depend() { diff --git a/media-sound/snapcast/files/snapserver.confd b/media-sound/snapcast/files/snapserver.confd index 9b12f81ff2ab..8a4327a79b9a 100644 --- a/media-sound/snapcast/files/snapserver.confd +++ b/media-sound/snapcast/files/snapserver.confd @@ -42,4 +42,4 @@ SNAPSERVER_USER="--user snapserver:snapserver" -SNAPSERVER_OPTS="-d -s pipe:///tmp/snapfifo?name=default" +SNAPSERVER_OPTS="-s pipe:///tmp/snapfifo?name=default" diff --git a/media-sound/snapcast/files/snapserver.initd b/media-sound/snapcast/files/snapserver.initd index 02762c861b03..220e7228eebd 100644 --- a/media-sound/snapcast/files/snapserver.initd +++ b/media-sound/snapcast/files/snapserver.initd @@ -4,7 +4,7 @@ name=snapserver command="/usr/bin/snapserver" -command_args="$SNAPSERVER_USER $SNAPSERVER_OPTS" +command_args="-d $SNAPSERVER_USER $SNAPSERVER_OPTS" pidfile="/run/snapserver/pid" depend() { diff --git a/media-sound/snapcast/metadata.xml b/media-sound/snapcast/metadata.xml index 3a92671f3335..cf204c8ac111 100644 --- a/media-sound/snapcast/metadata.xml +++ b/media-sound/snapcast/metadata.xml @@ -10,12 +10,9 @@ Proxy Maintainers - Build with avahi support Build and install Snapcast client component - Build with FLAC compression support Build and install Snapcast server component Build with TREMOR version of vorbis - Build with libvorbis support diff --git a/media-sound/snapcast/snapcast-0.15.0-r1.ebuild b/media-sound/snapcast/snapcast-0.15.0-r1.ebuild new file mode 100644 index 000000000000..a664ea01e296 --- /dev/null +++ b/media-sound/snapcast/snapcast-0.15.0-r1.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +DESCRIPTION="Synchronous multi-room audio player" +HOMEPAGE="https://github.com/badaix/snapcast" + +if [[ ${PV} == *9999 ]] ; then + inherit user cmake-utils git-r3 + + EGIT_REPO_URI="https://github.com/badaix/snapcast.git" + EGIT_BRANCH="develop" +else + inherit user cmake-utils + + SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-3+" +SLOT="0" +IUSE="+avahi +client +flac +server static-libs tremor +vorbis" + +REQUIRED_USE="|| ( server client )" + +RDEPEND="avahi? ( net-dns/avahi[dbus] ) + client? ( media-libs/alsa-lib ) + flac? ( media-libs/flac ) + tremor? ( media-libs/tremor ) + vorbis? ( media-libs/libvorbis )" +DEPEND="${RDEPEND} + >=dev-cpp/aixlog-1.2.1 + >=dev-cpp/asio-1.12.1 + >=dev-cpp/popl-1.2.0" + +PATCHES=( "${FILESDIR}/${PN}-options-for-use-flags.patch" ) + +pkg_setup() { + if use server ; then + enewgroup "snapserver" + enewuser "snapserver" -1 -1 /var/lib/snapserver snapserver + fi + + if use client ; then + enewuser "snapclient" -1 -1 /var/lib/snapclient audio + fi +} + +src_configure() { + local mycmakeargs=( + -DBUILD_WITH_AVAHI=$(usex avahi) + -DBUILD_CLIENT=$(usex client) + -DBUILD_WITH_FLAC=$(usex flac) + -DBUILD_SERVER=$(usex server) + -DBUILD_STATIC_LIBS=$(usex static-libs) + -DBUILD_TESTS=no + -DBUILD_WITH_TREMOR=$(usex tremor) + -DBUILD_WITH_VORBIS=$(usex vorbis) + ) + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + for bin in server client ; do + if use ${bin} ; then + doman "${bin}/snap${bin}.1" + + newconfd "${FILESDIR}/snap${bin}.confd" "snap${bin}" + newinitd "${FILESDIR}/snap${bin}.initd" "snap${bin}" + fi + done + + if use client ; then + keepdir /var/lib/snapclient + fowners snapclient:audio /var/lib/snapclient + fperms 0770 /var/lib/snapclient + fi + + if use server ; then + keepdir /var/lib/snapserver + fowners snapserver:snapserver /var/lib/snapserver + fperms 0770 /var/lib/snapserver + fi +} diff --git a/media-sound/snapcast/snapcast-0.15.0.ebuild b/media-sound/snapcast/snapcast-0.15.0.ebuild deleted file mode 100644 index a664ea01e296..000000000000 --- a/media-sound/snapcast/snapcast-0.15.0.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -DESCRIPTION="Synchronous multi-room audio player" -HOMEPAGE="https://github.com/badaix/snapcast" - -if [[ ${PV} == *9999 ]] ; then - inherit user cmake-utils git-r3 - - EGIT_REPO_URI="https://github.com/badaix/snapcast.git" - EGIT_BRANCH="develop" -else - inherit user cmake-utils - - SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3+" -SLOT="0" -IUSE="+avahi +client +flac +server static-libs tremor +vorbis" - -REQUIRED_USE="|| ( server client )" - -RDEPEND="avahi? ( net-dns/avahi[dbus] ) - client? ( media-libs/alsa-lib ) - flac? ( media-libs/flac ) - tremor? ( media-libs/tremor ) - vorbis? ( media-libs/libvorbis )" -DEPEND="${RDEPEND} - >=dev-cpp/aixlog-1.2.1 - >=dev-cpp/asio-1.12.1 - >=dev-cpp/popl-1.2.0" - -PATCHES=( "${FILESDIR}/${PN}-options-for-use-flags.patch" ) - -pkg_setup() { - if use server ; then - enewgroup "snapserver" - enewuser "snapserver" -1 -1 /var/lib/snapserver snapserver - fi - - if use client ; then - enewuser "snapclient" -1 -1 /var/lib/snapclient audio - fi -} - -src_configure() { - local mycmakeargs=( - -DBUILD_WITH_AVAHI=$(usex avahi) - -DBUILD_CLIENT=$(usex client) - -DBUILD_WITH_FLAC=$(usex flac) - -DBUILD_SERVER=$(usex server) - -DBUILD_STATIC_LIBS=$(usex static-libs) - -DBUILD_TESTS=no - -DBUILD_WITH_TREMOR=$(usex tremor) - -DBUILD_WITH_VORBIS=$(usex vorbis) - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - for bin in server client ; do - if use ${bin} ; then - doman "${bin}/snap${bin}.1" - - newconfd "${FILESDIR}/snap${bin}.confd" "snap${bin}" - newinitd "${FILESDIR}/snap${bin}.initd" "snap${bin}" - fi - done - - if use client ; then - keepdir /var/lib/snapclient - fowners snapclient:audio /var/lib/snapclient - fperms 0770 /var/lib/snapclient - fi - - if use server ; then - keepdir /var/lib/snapserver - fowners snapserver:snapserver /var/lib/snapserver - fperms 0770 /var/lib/snapserver - fi -} diff --git a/media-sound/snapcast/snapcast-9999.ebuild b/media-sound/snapcast/snapcast-9999.ebuild index a664ea01e296..6bfe033cdb5e 100644 --- a/media-sound/snapcast/snapcast-9999.ebuild +++ b/media-sound/snapcast/snapcast-9999.ebuild @@ -35,8 +35,6 @@ DEPEND="${RDEPEND} >=dev-cpp/asio-1.12.1 >=dev-cpp/popl-1.2.0" -PATCHES=( "${FILESDIR}/${PN}-options-for-use-flags.patch" ) - pkg_setup() { if use server ; then enewgroup "snapserver" -- cgit v1.2.3-65-gdbad