gentoo resync : 27.10.2018

8 files changed, 11 insertions, 16 deletions

diff --git a/media-sound/snapcast/Manifest b/media-sound/snapcast/Manifest
index b9a9bfe5e25b..ed8885aa3b01 100644
--- a/media-sound/snapcast/Manifest
+++ b/media-sound/snapcast/Manifest
@@ -1,9 +1,9 @@
 AUX snapcast-options-for-use-flags.patch 2583 BLAKE2B 4ad94f7c2d796017047645dcc74bd04209817dcf6c96c05cf92a130af2c5239761325f25a0bf8ebd65c6d1221f3ba248b93eb98c22ad278c06bca46c8e27d056 SHA512 84be456467309c2c040526dfa1847e65fdec2c59d7ba917416d10ece0d7173d53ce11c2fed2a566fb3157e58757ea21500464c46abff18e57dfb092c18450932
-AUX snapclient.confd 643 BLAKE2B f15281f607b230b165e61dae2d71e58a9b899329da435caca46aa866a14528246bbfd9abfa1002815270d98fb926e322025095b9955fe84e0381c17149ca0b9c SHA512 34961a219a608aa5447fc4b47d08785923a4a8a5d70f87f03c62dab2f590180d72992f40594772ac9d2c8cfc89281789418eee46c860b1b7c1b826e6660cfc72
-AUX snapclient.initd 378 BLAKE2B a1f2dda0843c541edfefce80e0ad9587af8ef50844fe742d932a1a1d3ea06e8587574ec4c08d403858bb42b4bf3ebcfa67fce59182b2f779e09e2ad53790d0ca SHA512 5d58c9746ba793c59ae1690a97aa5f0c74ffd3fe86a1f9ed5851e3f181e050188f70a96fbc7b8cfe0afe5de784bc332e25b4a4e68873503106b2231c59e8af69
-AUX snapserver.confd 1013 BLAKE2B 205c58e3d42dc12d759c7dd5acbb1a1229ae052a48392731a7cc10cf9ab36250938995a75c4968c33521cf1480396856b5cd8653e90b5b8a3188e1660b1c1257 SHA512 5adcf37ed69ccb09541f7bf7563ddf5a8aaf1bfcabc02f430976ae5b8e418ea68cf0b22216f3f7387a04f7516a8f30cc5b2923f811c1833c7a4208e951fd266e
-AUX snapserver.initd 383 BLAKE2B bd920738ecb98eda76f0045b50b3b0763cd123ab5eb08bbbe2964d7a0556b6df2ecb879dd0b0ff9614b10520008e9934cb278a0f3705539076eb812404f0ba58 SHA512 565084bea18bfefe60c0e33e0fd33929a0b170df9d0cbbfbf794a9ee9055a9bf605a716ff18bf72d2813e890b64815eebc2bc24963f300b4061cf017440a62d6
+AUX snapclient.confd 641 BLAKE2B 74bae4c2c11fb7c1a7d4f2bd0f199c92a5ee11f68efb71da00026816f9dd7ba3555cc96c1e68be04dce26ea190a8e353c71817b5655ad2d9b43e3e510345c97b SHA512 f0adfca9354a4f5acb2def99585409e39229053e2b9be36309a67ac0b6935b1aeb061380a9e8a61d70bd902930536ec3afa98a6a708b08008eea1eb080fd1a5c
+AUX snapclient.initd 381 BLAKE2B defa09df346dac279f1ed903adaf88842b060b34d774cfd987fa51e9885f4968b0144106883a1a48e502c3e3558ca408babd38c46663b13ee56215caa108c3be SHA512 f429dfef7abd5705a8afc38f68125a7a6e5a812cd68733c8f47a65c7fb6aa22fc665c91e557726b8f35edbaced7b2e72ffad0ba123a6ed33bf8a6d333e8c1bae
+AUX snapserver.confd 1010 BLAKE2B 9d29348f1618dd399c5a9c500d1ec89fd6719243f472dbb666cfa16e6128411a83c9ac9401a1754b79ae4b560643d1f38c3f00f6f6d0a2301ad6e3fa2168c884 SHA512 98818d75e965d54082b33fa36769b74810b3137f07693eac00d10313c3716e72170e9148faa0ac25fefc7868bb7a206ac5ca6d18396fa71d1a74efcc14485548
+AUX snapserver.initd 386 BLAKE2B a88d150fd5dc0e11b20fad8d07111ca9ef0074bd79d66179fc952b636296ee1b1d151a90d8774ad419cd7ec982305da3da3ddda43d55f5ad47c45d98adb72649 SHA512 d8f6b72d1a5be5f2ddd9266fac33b6d24b046993c532f204e68824919ed09f41988923a59ba722c3c9c748b87c1fdda1c91026f8e591993f34188ef3c488f379
 DIST snapcast-0.15.0.tar.gz 667452 BLAKE2B 0bf7e28ba52356c8fff8066ded3d741243c2ba88cdc6cefda113c0d6866fe14b2fea6198d7809e564cd61d32a336a2c30ee22f6f5d6ae77368a6f3e254cc5065 SHA512 3751eeaa9be4ffd5c7633b8770f36e87360ab83004f090a8350e377f60a79d9502b92b92c5c9c35f513705e6484d113de9942f0a896824d7c5f806ba0010e84e
-EBUILD snapcast-0.15.0.ebuild 2027 BLAKE2B 3b59f8b92af313d4be43e94cf6f96b80b0bef11bd13ad7d131b1af700929665c39c2916b5f48b996a4a39df6c4f194b5b3accf434f378ad11e4a23e81bb887be SHA512 1fbc1e71107ba90abbd03a61d67ffdcc684e5fbd59e611c0f79c4f2197d3cf83634bbfee6391ef83dfbc2837b54eceb1f5a4496d3c3bf495952b8d7ff0836cc6
-EBUILD snapcast-9999.ebuild 2027 BLAKE2B 3b59f8b92af313d4be43e94cf6f96b80b0bef11bd13ad7d131b1af700929665c39c2916b5f48b996a4a39df6c4f194b5b3accf434f378ad11e4a23e81bb887be SHA512 1fbc1e71107ba90abbd03a61d67ffdcc684e5fbd59e611c0f79c4f2197d3cf83634bbfee6391ef83dfbc2837b54eceb1f5a4496d3c3bf495952b8d7ff0836cc6
-MISC metadata.xml 1335 BLAKE2B 6b0e6cfeb32d2fd6c9dfd5404df5795a1c82f1fffb2e12c31ee5c6656e0b7470d41416775c816211847bb37288f620b7f5ffe85641b88d3b5493f21436a43ae6 SHA512 78bc34f1071f7efaf923dded86d6af3761f34612832b29e6ddacf63c7bcbb5c9662e3857a818dfd0328423a7ba3aaa6d383cf425551227b6228d6d58cad4943b
+EBUILD snapcast-0.15.0-r1.ebuild 2027 BLAKE2B 3b59f8b92af313d4be43e94cf6f96b80b0bef11bd13ad7d131b1af700929665c39c2916b5f48b996a4a39df6c4f194b5b3accf434f378ad11e4a23e81bb887be SHA512 1fbc1e71107ba90abbd03a61d67ffdcc684e5fbd59e611c0f79c4f2197d3cf83634bbfee6391ef83dfbc2837b54eceb1f5a4496d3c3bf495952b8d7ff0836cc6
+EBUILD snapcast-9999.ebuild 1966 BLAKE2B 9a5cd3681ad18305dd558d99baabe9a1630f817d1569fe9a30b77a160603fe52d941eb8398c99ce8f943995dedab370ccf141e8d7bc94c11df1883b697a854f8 SHA512 d824679b93e13117a206d69a2cb5c7978619ef25308bbe75d28685630435238fa4496d473bf54477ddb7b53b48c327aebb19de6a4ce393909249eb335392a599
+MISC metadata.xml 1161 BLAKE2B 6274c692ae99e43490e09e0c900a95a90ac423b4cd13a5399ab629023a594ba0d4c313df31d040760e46daee4cca8df23d497dd47052dbab86071156fc183624 SHA512 fce326e7afc1989206d24a970d38ddf1860368e8a69fceab5336b87558274eaace21214885f942ca40aca7031eef0abb0f0dc3b8f1d4ebde93ebe1bd8848a766
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 @@
 		<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 a664ea01e296..a664ea01e296 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 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"