summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Buchinger <cb-gentoo@guya.de>2018-10-23 18:49:07 +0200
committerMichał Górny <mgorny@gentoo.org>2018-10-26 14:25:11 +0200
commit70e12bfc0e59eb6b24288987a323ab18581dca91 (patch)
tree8af71e9e5ce7c1a14265b2930c05e9b7369954e3 /media-sound/snapcast
parentnet-im/skype: Drop old (diff)
downloadgentoo-70e12bfc0e59eb6b24288987a323ab18581dca91.tar.gz
gentoo-70e12bfc0e59eb6b24288987a323ab18581dca91.tar.bz2
gentoo-70e12bfc0e59eb6b24288987a323ab18581dca91.zip
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>
Diffstat (limited to 'media-sound/snapcast')
-rw-r--r--media-sound/snapcast/files/snapclient.confd2
-rw-r--r--media-sound/snapcast/files/snapclient.initd2
-rw-r--r--media-sound/snapcast/files/snapserver.confd2
-rw-r--r--media-sound/snapcast/files/snapserver.initd2
-rw-r--r--media-sound/snapcast/metadata.xml3
-rw-r--r--media-sound/snapcast/snapcast-0.15.0-r1.ebuild (renamed from media-sound/snapcast/snapcast-0.15.0.ebuild)0
-rw-r--r--media-sound/snapcast/snapcast-9999.ebuild2
7 files changed, 4 insertions, 9 deletions
diff --git a/media-sound/snapcast/files/snapclient.confd b/media-sound/snapcast/files/snapclient.confd
index 311cce1c4fa..e636d74da2b 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 df69eb2621a..45c0c74316d 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 9b12f81ff2a..8a4327a79b9 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 02762c861b0..220e7228eeb 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 3a92671f333..cf204c8ac11 100644
--- 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
index a664ea01e29..a664ea01e29 100644
--- a/media-sound/snapcast/snapcast-0.15.0.ebuild
+++ b/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 a664ea01e29..6bfe033cdb5 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"