media-sound/snapcast: Minor fixes

* 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 <cb-gentoo@guya.de>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Closes: https://github.com/gentoo/gentoo/pull/10207
Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/media-sound/snapcast/files/snapclient.confd b/media-sound/snapcast/files/snapclient.confd
index 311cce1c4fa6c571e20d84e2a475c2ddda81c492..e636d74da2bcb8a126f45edd3593ee8c200a241e 100644 (file)
--- 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 df69eb2621a02e6be3ce4fa3de2434a01ce2a617..45c0c74316d67b42040f9805d8bb7a416e5e7b5c 100644 (file)
--- 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 9b12f81ff2ab11b1cb4ff40d4479d00d88e11d5d..8a4327a79b9a83bc0a07e3085126716f44a336d1 100644 (file)
--- 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 02762c861b03d943852eff3aa871729c1db7288e..220e7228eebdeffc09b6139203838b0f6b92ba2f 100644 (file)
--- 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 3a92671f33350c1e6cc2008492192dd22eea4c55..cf204c8ac111bf5af0bd8dae2f06ae9af092b899 100644 (file)
--- a/media-sound/snapcast/metadata.xml
+++ b/media-sound/snapcast/metadata.xml
@@ -10,12 +10,9 @@
                <name>Proxy Maintainers</name>
        </maintainer>
        <use>
-               <flag name="avahi">Build with avahi support</flag>
                <flag name="client">Build and install Snapcast client component</flag>
-               <flag name="flac">Build with FLAC compression support</flag>
                <flag name="server">Build and install Snapcast server component</flag>
                <flag name="tremor">Build with TREMOR version of vorbis</flag>
-               <flag name="vorbis">Build with libvorbis support</flag>
        </use>
        <upstream>
                <maintainer status="active">

diff --git a/media-sound/snapcast/snapcast-0.15.0.ebuild b/media-sound/snapcast/snapcast-0.15.0-r1.ebuild
similarity index 100%
rename from media-sound/snapcast/snapcast-0.15.0.ebuild
rename to media-sound/snapcast/snapcast-0.15.0-r1.ebuild

diff --git a/media-sound/snapcast/snapcast-9999.ebuild b/media-sound/snapcast/snapcast-9999.ebuild
index a664ea01e296e05c3cf314bc1237a67b22a40993..6bfe033cdb5e36ce78e3725d280ccab2a6ff6cc1 100644 (file)
--- 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"