media-sound/snapcast: USE flag avahi > zeroconf

Use "zeroconf" instead of "avahi" USE flag

Closes: https://bugs.gentoo.org/671908
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Christian Buchinger <cb-gentoo@guya.de>
Closes: https://github.com/gentoo/gentoo/pull/10498
Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/media-sound/snapcast/snapcast-0.15.0-r1.ebuild b/media-sound/snapcast/snapcast-0.15.0-r1.ebuild
index a664ea01e296e05c3cf314bc1237a67b22a40993..ee8268aab95301fc9967ceb848cb42412d955a2d 100644 (file)
--- a/media-sound/snapcast/snapcast-0.15.0-r1.ebuild
+++ b/media-sound/snapcast/snapcast-0.15.0-r1.ebuild
@@ -21,15 +21,15 @@ fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="+avahi +client +flac +server static-libs tremor +vorbis"
+IUSE="+client +flac +server static-libs tremor +vorbis +zeroconf"
 
 REQUIRED_USE="|| ( server client )"
 
-RDEPEND="avahi? ( net-dns/avahi[dbus] )
-       client? ( media-libs/alsa-lib )
+RDEPEND="client? ( media-libs/alsa-lib )
        flac? ( media-libs/flac )
        tremor? ( media-libs/tremor )
-       vorbis? ( media-libs/libvorbis )"
+       vorbis? ( media-libs/libvorbis )
+       zeroconf? ( net-dns/avahi[dbus] )"
 DEPEND="${RDEPEND}
        >=dev-cpp/aixlog-1.2.1
        >=dev-cpp/asio-1.12.1
@@ -50,7 +50,6 @@ pkg_setup() {
 
 src_configure() {
        local mycmakeargs=(
-               -DBUILD_WITH_AVAHI=$(usex avahi)
                -DBUILD_CLIENT=$(usex client)
                -DBUILD_WITH_FLAC=$(usex flac)
                -DBUILD_SERVER=$(usex server)
@@ -58,6 +57,7 @@ src_configure() {
                -DBUILD_TESTS=no
                -DBUILD_WITH_TREMOR=$(usex tremor)
                -DBUILD_WITH_VORBIS=$(usex vorbis)
+               -DBUILD_WITH_AVAHI=$(usex zeroconf)
        )
 
        cmake-utils_src_configure

diff --git a/media-sound/snapcast/snapcast-9999.ebuild b/media-sound/snapcast/snapcast-9999.ebuild
index 6bfe033cdb5e36ce78e3725d280ccab2a6ff6cc1..09e72be8ff2e57eb78f0c931854b418d0523b84f 100644 (file)
--- a/media-sound/snapcast/snapcast-9999.ebuild
+++ b/media-sound/snapcast/snapcast-9999.ebuild
@@ -21,15 +21,15 @@ fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="+avahi +client +flac +server static-libs tremor +vorbis"
+IUSE="+client +flac +server static-libs tremor +vorbis +zeroconf"
 
 REQUIRED_USE="|| ( server client )"
 
-RDEPEND="avahi? ( net-dns/avahi[dbus] )
-       client? ( media-libs/alsa-lib )
+RDEPEND="client? ( media-libs/alsa-lib )
        flac? ( media-libs/flac )
        tremor? ( media-libs/tremor )
-       vorbis? ( media-libs/libvorbis )"
+       vorbis? ( media-libs/libvorbis )
+       zeroconf? ( net-dns/avahi[dbus] )"
 DEPEND="${RDEPEND}
        >=dev-cpp/aixlog-1.2.1
        >=dev-cpp/asio-1.12.1
@@ -48,7 +48,6 @@ pkg_setup() {
 
 src_configure() {
        local mycmakeargs=(
-               -DBUILD_WITH_AVAHI=$(usex avahi)
                -DBUILD_CLIENT=$(usex client)
                -DBUILD_WITH_FLAC=$(usex flac)
                -DBUILD_SERVER=$(usex server)
@@ -56,6 +55,7 @@ src_configure() {
                -DBUILD_TESTS=no
                -DBUILD_WITH_TREMOR=$(usex tremor)
                -DBUILD_WITH_VORBIS=$(usex vorbis)
+               -DBUILD_WITH_AVAHI=$(usex zeroconf)
        )
 
        cmake-utils_src_configure