diff options
| author | Johannes Huber <johu@gentoo.org> | 2012-02-23 15:32:00 +0100 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2012-02-23 15:32:00 +0100 |
| commit | df27162ee44c23ff08c09142f45297e9251d18ce (patch) | |
| tree | dd122fbd7cf9fb01cf16b1f333ff75faad1bfd15 | |
| parent | fff6c56efa1ca579d40c5963dae0b3adad3178b8 (diff) | |
| download | kde-df27162ee44c23ff08c09142f45297e9251d18ce.tar.gz kde-df27162ee44c23ff08c09142f45297e9251d18ce.tar.bz2 kde-df27162ee44c23ff08c09142f45297e9251d18ce.zip | |
[kde-base/kdelibs] Remove dep on net-misc/mDNSResponder wrt bug 405385.
(Portage version: 2.2.0_alpha88/git/Linux x86_64, unsigned Manifest commit)
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild | 17 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-9999.ebuild | 17 |
2 files changed, 10 insertions, 24 deletions
diff --git a/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild index fe3b694ce59..56163b0f4ae 100644 --- a/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild +++ b/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild @@ -19,9 +19,9 @@ HOMEPAGE="http://www.kde.org/" KEYWORDS="" LICENSE="LGPL-2.1" -IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos -lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev -+udisks +upower upnp zeroconf" +IUSE="3dnow acl alsa altivec +bzip2 debug doc fam +handbook jpeg2k kerberos lzma +mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks ++upower upnp zeroconf" REQUIRED_USE=" udisks? ( udev ) @@ -84,12 +84,7 @@ COMMONDEPEND=" ssl? ( dev-libs/openssl ) udev? ( sys-fs/udev ) upnp? ( media-libs/herqq ) - zeroconf? ( - || ( - net-dns/avahi[mdnsresponder-compat] - !bindist? ( net-misc/mDNSResponder ) - ) - ) + zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) " DEPEND="${COMMONDEPEND} doc? ( app-doc/doxygen ) @@ -193,10 +188,8 @@ src_configure() { if use zeroconf; then if has_version net-dns/avahi; then mycmakeargs=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF) - elif has_version net-misc/mDNSResponder; then - mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=ON) else - die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found." + die "USE=\"zeroconf\" enabled but net-dns/avahi wasn't found." fi else mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF) diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild index fe3b694ce59..cb3f98eb4a6 100644 --- a/kde-base/kdelibs/kdelibs-9999.ebuild +++ b/kde-base/kdelibs/kdelibs-9999.ebuild @@ -19,9 +19,9 @@ HOMEPAGE="http://www.kde.org/" KEYWORDS="" LICENSE="LGPL-2.1" -IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos -lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev -+udisks +upower upnp zeroconf" +IUSE="3dnow acl alsa altivec +bzip2 debug doc fam +handbook jpeg2k kerberos lzma +mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks ++upower upnp zeroconf" REQUIRED_USE=" udisks? ( udev ) @@ -84,12 +84,7 @@ COMMONDEPEND=" ssl? ( dev-libs/openssl ) udev? ( sys-fs/udev ) upnp? ( media-libs/herqq ) - zeroconf? ( - || ( - net-dns/avahi[mdnsresponder-compat] - !bindist? ( net-misc/mDNSResponder ) - ) - ) + zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) " DEPEND="${COMMONDEPEND} doc? ( app-doc/doxygen ) @@ -193,10 +188,8 @@ src_configure() { if use zeroconf; then if has_version net-dns/avahi; then mycmakeargs=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF) - elif has_version net-misc/mDNSResponder; then - mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=ON) else - die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found." + die "USE=\"zeroconf\" but net-dns/avahi wasn't found." fi else mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF) |