Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/snapcast/
Date: Fri, 07 Dec 2018 16:22:41
Message-Id: 1544199673.686851c28b593924a24f1f320d0304d021582db0.mgorny@gentoo
1 commit: 686851c28b593924a24f1f320d0304d021582db0
2 Author: Christian Buchinger <cb-gentoo <AT> guya <DOT> de>
3 AuthorDate: Tue Nov 27 08:25:52 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 7 16:21:13 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=686851c2
7
8 media-sound/snapcast: USE flag avahi > zeroconf
9
10 Use "zeroconf" instead of "avahi" USE flag
11
12 Closes: https://bugs.gentoo.org/671908
13 Package-Manager: Portage-2.3.52, Repoman-2.3.12
14 Signed-off-by: Christian Buchinger <cb-gentoo <AT> guya.de>
15 Closes: https://github.com/gentoo/gentoo/pull/10498
16 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
17
18 media-sound/snapcast/snapcast-0.15.0-r1.ebuild | 10 +++++-----
19 media-sound/snapcast/snapcast-9999.ebuild | 10 +++++-----
20 2 files changed, 10 insertions(+), 10 deletions(-)
21
22 diff --git a/media-sound/snapcast/snapcast-0.15.0-r1.ebuild b/media-sound/snapcast/snapcast-0.15.0-r1.ebuild
23 index a664ea01e29..ee8268aab95 100644
24 --- a/media-sound/snapcast/snapcast-0.15.0-r1.ebuild
25 +++ b/media-sound/snapcast/snapcast-0.15.0-r1.ebuild
26 @@ -21,15 +21,15 @@ fi
27
28 LICENSE="GPL-3+"
29 SLOT="0"
30 -IUSE="+avahi +client +flac +server static-libs tremor +vorbis"
31 +IUSE="+client +flac +server static-libs tremor +vorbis +zeroconf"
32
33 REQUIRED_USE="|| ( server client )"
34
35 -RDEPEND="avahi? ( net-dns/avahi[dbus] )
36 - client? ( media-libs/alsa-lib )
37 +RDEPEND="client? ( media-libs/alsa-lib )
38 flac? ( media-libs/flac )
39 tremor? ( media-libs/tremor )
40 - vorbis? ( media-libs/libvorbis )"
41 + vorbis? ( media-libs/libvorbis )
42 + zeroconf? ( net-dns/avahi[dbus] )"
43 DEPEND="${RDEPEND}
44 >=dev-cpp/aixlog-1.2.1
45 >=dev-cpp/asio-1.12.1
46 @@ -50,7 +50,6 @@ pkg_setup() {
47
48 src_configure() {
49 local mycmakeargs=(
50 - -DBUILD_WITH_AVAHI=$(usex avahi)
51 -DBUILD_CLIENT=$(usex client)
52 -DBUILD_WITH_FLAC=$(usex flac)
53 -DBUILD_SERVER=$(usex server)
54 @@ -58,6 +57,7 @@ src_configure() {
55 -DBUILD_TESTS=no
56 -DBUILD_WITH_TREMOR=$(usex tremor)
57 -DBUILD_WITH_VORBIS=$(usex vorbis)
58 + -DBUILD_WITH_AVAHI=$(usex zeroconf)
59 )
60
61 cmake-utils_src_configure
62
63 diff --git a/media-sound/snapcast/snapcast-9999.ebuild b/media-sound/snapcast/snapcast-9999.ebuild
64 index 6bfe033cdb5..09e72be8ff2 100644
65 --- a/media-sound/snapcast/snapcast-9999.ebuild
66 +++ b/media-sound/snapcast/snapcast-9999.ebuild
67 @@ -21,15 +21,15 @@ fi
68
69 LICENSE="GPL-3+"
70 SLOT="0"
71 -IUSE="+avahi +client +flac +server static-libs tremor +vorbis"
72 +IUSE="+client +flac +server static-libs tremor +vorbis +zeroconf"
73
74 REQUIRED_USE="|| ( server client )"
75
76 -RDEPEND="avahi? ( net-dns/avahi[dbus] )
77 - client? ( media-libs/alsa-lib )
78 +RDEPEND="client? ( media-libs/alsa-lib )
79 flac? ( media-libs/flac )
80 tremor? ( media-libs/tremor )
81 - vorbis? ( media-libs/libvorbis )"
82 + vorbis? ( media-libs/libvorbis )
83 + zeroconf? ( net-dns/avahi[dbus] )"
84 DEPEND="${RDEPEND}
85 >=dev-cpp/aixlog-1.2.1
86 >=dev-cpp/asio-1.12.1
87 @@ -48,7 +48,6 @@ pkg_setup() {
88
89 src_configure() {
90 local mycmakeargs=(
91 - -DBUILD_WITH_AVAHI=$(usex avahi)
92 -DBUILD_CLIENT=$(usex client)
93 -DBUILD_WITH_FLAC=$(usex flac)
94 -DBUILD_SERVER=$(usex server)
95 @@ -56,6 +55,7 @@ src_configure() {
96 -DBUILD_TESTS=no
97 -DBUILD_WITH_TREMOR=$(usex tremor)
98 -DBUILD_WITH_VORBIS=$(usex vorbis)
99 + -DBUILD_WITH_AVAHI=$(usex zeroconf)
100 )
101
102 cmake-utils_src_configure