sci-physics/root: rename USE flag avahi -> zeroconf

As suggested by pacho in bug 601682.

Package-Manager: portage-2.3.3
Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>

diff --git a/sci-physics/root/root-5.34.26.ebuild b/sci-physics/root/root-5.34.26.ebuild
index ccb48984a24ca997db5874db1a0c40b4ed3c54c6..a99893b4fc59f570dcb2758e0d082a5716858c98 100644 (file)
--- a/sci-physics/root/root-5.34.26.ebuild
+++ b/sci-physics/root/root-5.34.26.ebuild
@@ -22,10 +22,10 @@ HOMEPAGE="https://root.cern.ch"
 
 SLOT="0/$(get_version_component_range 1-3 ${PV})"
 LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
-IUSE="+X afs avahi c++11 c++14 doc emacs examples fits fftw
+IUSE="+X afs c++11 c++14 doc emacs examples fits fftw
        graphviz http kerberos ldap +math minimal mpi mysql odbc
        +opengl openmp oracle postgres prefix pythia6 pythia8
-       python qt4 +reflex ruby sqlite ssl xinetd xml xrootd"
+       python qt4 +reflex ruby sqlite ssl xinetd xml xrootd zeroconf"
 
 # TODO: add support for: davix
 # TODO: unbundle: vdt
@@ -74,7 +74,6 @@ CDEPEND="
        )
        !minimal? (
                afs? ( net-fs/openafs )
-               avahi? ( net-dns/avahi:0= )
                emacs? ( virtual/emacs )
                fits? ( sci-libs/cfitsio:0= )
                fftw? ( sci-libs/fftw:3.0= )
@@ -102,6 +101,7 @@ CDEPEND="
                ssl? ( dev-libs/openssl:0= )
                xml? ( dev-libs/libxml2:2= )
                xrootd? ( >=net-libs/xrootd-3.3.5:0= )
+               zeroconf? ( net-dns/avahi:0= )
        )"
 
 DEPEND="${CDEPEND}
@@ -307,7 +307,6 @@ src_configure() {
                        $(use_enable X asimage)
                        $(use_enable X xft)
                        $(use_enable afs)
-                       $(use_enable avahi bonjour)
                        $(use_enable c++11 cxx11)
                        $(use_enable c++14 cxx14)
                        $(use_enable fits fitsio)
@@ -342,6 +341,7 @@ src_configure() {
                        $(use_enable ssl)
                        $(use_enable xml)
                        $(use_enable xrootd)
+                       $(use_enable zeroconf bonjour)
                        ${EXTRA_ECONF}
                )
        fi

diff --git a/sci-physics/root/root-5.34.32.ebuild b/sci-physics/root/root-5.34.32.ebuild
index b888d83cda809d6665ba5d9a9550095a4a784c34..fe92a83364c37d26c093f913bb90f08a9abb361c 100644 (file)
--- a/sci-physics/root/root-5.34.32.ebuild
+++ b/sci-physics/root/root-5.34.32.ebuild
@@ -22,10 +22,11 @@ HOMEPAGE="https://root.cern.ch"
 
 SLOT="0/$(get_version_component_range 1-3 ${PV})"
 LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
-IUSE="+X afs avahi c++11 c++14 doc emacs examples fits fftw gdml
+IUSE="+X afs c++11 c++14 doc emacs examples fits fftw gdml
        graphviz http kerberos ldap +math +memstat mpi mysql odbc
        +opengl openmp oracle postgres prefix pythia6 pythia8
-       python qt4 +reflex ruby shadow sqlite ssl table +tiff xinetd xml xrootd"
+       python qt4 +reflex ruby shadow sqlite ssl table +tiff xinetd
+       xml xrootd zeroconf"
 
 # TODO: add support for: davix
 # TODO: unbundle: vdt
@@ -67,7 +68,6 @@ CDEPEND="
                x11-libs/libXft:0=
        )
        afs? ( net-fs/openafs )
-       avahi? ( net-dns/avahi:0= )
        emacs? ( virtual/emacs )
        fits? ( sci-libs/cfitsio:0= )
        fftw? ( sci-libs/fftw:3.0= )
@@ -96,6 +96,7 @@ CDEPEND="
        ssl? ( dev-libs/openssl:0= )
        xml? ( dev-libs/libxml2:2= )
        xrootd? ( >=net-libs/xrootd-3.3.5:0= )
+       zeroconf? ( net-dns/avahi:0= )
 "
 
 DEPEND="${CDEPEND}
@@ -287,7 +288,6 @@ src_configure() {
                $(use_enable X asimage)
                $(use_enable X xft)
                $(use_enable afs)
-               $(use_enable avahi bonjour)
                $(use_enable c++11 cxx11)
                $(use_enable c++14 cxx14)
                $(use_enable fits fitsio)
@@ -329,6 +329,7 @@ src_configure() {
                $(use_enable tiff astiff)
                $(use_enable xml)
                $(use_enable xrootd)
+               $(use_enable zeroconf bonjour)
                ${EXTRA_ECONF}
        )
 

diff --git a/sci-physics/root/root-5.34.36.ebuild b/sci-physics/root/root-5.34.36.ebuild
index cb13f8fabf6065309cf1d33cbb5f8327cc695f95..0872b4d5b2388b6c9f46c222b4dfbbd7cdf7bdcc 100644 (file)
--- a/sci-physics/root/root-5.34.36.ebuild
+++ b/sci-physics/root/root-5.34.36.ebuild
@@ -22,10 +22,11 @@ HOMEPAGE="https://root.cern.ch"
 
 SLOT="0/$(get_version_component_range 1-3 ${PV})"
 LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
-IUSE="+X afs avahi c++11 c++14 doc emacs examples fits fftw gdml
+IUSE="+X afs c++11 c++14 doc emacs examples fits fftw gdml
        graphviz http kerberos ldap +math +memstat mpi mysql odbc
        +opengl openmp oracle postgres prefix pythia6 pythia8
-       python qt4 +reflex ruby shadow sqlite ssl table +tiff xinetd xml xrootd"
+       python qt4 +reflex ruby shadow sqlite ssl table +tiff xinetd
+       xml xrootd zeroconf"
 
 # TODO: add support for: davix
 # TODO: unbundle: vdt
@@ -67,7 +68,6 @@ CDEPEND="
                x11-libs/libXft:0=
        )
        afs? ( net-fs/openafs )
-       avahi? ( net-dns/avahi:0= )
        emacs? ( virtual/emacs )
        fits? ( sci-libs/cfitsio:0= )
        fftw? ( sci-libs/fftw:3.0= )
@@ -96,6 +96,7 @@ CDEPEND="
        ssl? ( dev-libs/openssl:0= )
        xml? ( dev-libs/libxml2:2= )
        xrootd? ( >=net-libs/xrootd-3.3.5:0= )
+       zeroconf? ( net-dns/avahi:0= )
 "
 
 DEPEND="${CDEPEND}
@@ -284,7 +285,6 @@ src_configure() {
                $(use_enable X asimage)
                $(use_enable X xft)
                $(use_enable afs)
-               $(use_enable avahi bonjour)
                $(use_enable c++11 cxx11)
                $(use_enable c++14 cxx14)
                $(use_enable fits fitsio)
@@ -326,6 +326,7 @@ src_configure() {
                $(use_enable tiff astiff)
                $(use_enable xml)
                $(use_enable xrootd)
+               $(use_enable zeroconf bonjour)
                ${EXTRA_ECONF}
        )