Block mDNSResponder, both because of the header installed with mdnsresponder-compat...

Package-Manager: portage-2.1.2.5

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 960443c604d8e1aaa49fb8300a6b5f12e1cf9023..bebfbc91d4828bd4b8ef3a26498b234ac1c04e86 100644 (file)
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.99 2007/04/24 20:13:47 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.100 2007/04/28 12:48:09 carlo Exp $
+
+  28 Apr 2007; Carsten Lohrke <carlo@gentoo.org> avahi-0.6.18.ebuild:
+  Block mDNSResponder, both because of the header installed with
+  mdnsresponder-compat use flag set and sys-auth/nss-mdns.
 
   24 Apr 2007; Sven Wegener <swegener@gentoo.org>
   -files/0.6.15-dbus-fixes.patch, -avahi-0.6.15.ebuild:

diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index facebaffb31da399f32f1a1bdc488577a25d0717..499b26163d9cd3c339bac518e4be99c25c448d3b 100644 (file)
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX autoipd.sh 1271 RMD160 85ac3d69aff64867baa0ba6c58e9f224ba0e2e57 SHA1 95a6145f00ccd511e3b067d4669148861f56c2a4 SHA256 9582a49d0674fac714f448976065fd4e1f0423c08f645685160ed682a121f8c9
 MD5 873dca478a6a7bd3931f462becade245 files/autoipd.sh 1271
 RMD160 85ac3d69aff64867baa0ba6c58e9f224ba0e2e57 files/autoipd.sh 1271
@@ -60,14 +57,14 @@ EBUILD avahi-0.6.17.ebuild 4189 RMD160 83a4e58d7af7493651cec8cd43724961b32d1b4e
 MD5 1281506152bed09977cf6dcd8e0dd7d7 avahi-0.6.17.ebuild 4189
 RMD160 83a4e58d7af7493651cec8cd43724961b32d1b4e avahi-0.6.17.ebuild 4189
 SHA256 80ad1bd0d5bd093a3374243e3bfb0fa0a1d54e28105faa0852d19436c74797fd avahi-0.6.17.ebuild 4189
-EBUILD avahi-0.6.18.ebuild 4335 RMD160 b7f71475eb72a6e8b3264f95da09bd1e8ab02ecc SHA1 f7dd97dd48060485d49d233b33caeaf1b40a6ce2 SHA256 eff83e0c0f6c79b26666e11804e5515fcbded04c508732c92f053b4a5f149b83
-MD5 0c2b629067fa128ecb1eb1bc6dad1612 avahi-0.6.18.ebuild 4335
-RMD160 b7f71475eb72a6e8b3264f95da09bd1e8ab02ecc avahi-0.6.18.ebuild 4335
-SHA256 eff83e0c0f6c79b26666e11804e5515fcbded04c508732c92f053b4a5f149b83 avahi-0.6.18.ebuild 4335
-MISC ChangeLog 13346 RMD160 366145f0fb2849751b43298d8f62c775c5dae816 SHA1 21af49651c93440ca18e20cfdbc6a29824697036 SHA256 7e34c9cda6bbdabe383c7b9812e9d0afced8625b85b50fbaa8369f28ed2b62b7
-MD5 34d81e368db0ffcb6d50a9596092b473 ChangeLog 13346
-RMD160 366145f0fb2849751b43298d8f62c775c5dae816 ChangeLog 13346
-SHA256 7e34c9cda6bbdabe383c7b9812e9d0afced8625b85b50fbaa8369f28ed2b62b7 ChangeLog 13346
+EBUILD avahi-0.6.18.ebuild 4357 RMD160 8db8b5b909a7d10d361c91d673c94b06a5731027 SHA1 036c2822e811ad4e9d8270be7e5b9e2dba8bbebc SHA256 f2778e4d2ae4778205bdda37a92a00a1a9a5a147ea6973a1940148e595dc8e87
+MD5 84728b8000ccb94bd420dc43b84897ea avahi-0.6.18.ebuild 4357
+RMD160 8db8b5b909a7d10d361c91d673c94b06a5731027 avahi-0.6.18.ebuild 4357
+SHA256 f2778e4d2ae4778205bdda37a92a00a1a9a5a147ea6973a1940148e595dc8e87 avahi-0.6.18.ebuild 4357
+MISC ChangeLog 13539 RMD160 21967b17e753084bcb944f7397e58c8fda088b42 SHA1 47dc30e5781fb758f10fcfe794e4e6d6e6276b55 SHA256 b086c796aa64c71caf04d490bd46d0a85cebaa8c559798cd16a2e1001ab800d5
+MD5 893012837b910b41e86fbc8ccc838525 ChangeLog 13539
+RMD160 21967b17e753084bcb944f7397e58c8fda088b42 ChangeLog 13539
+SHA256 b086c796aa64c71caf04d490bd46d0a85cebaa8c559798cd16a2e1001ab800d5 ChangeLog 13539
 MISC metadata.xml 223 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 SHA1 bd4caecc4cecdd93cb0e935e8f4ff92272aae978 SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d
 MD5 b8a99a5b7fa586fe9cabbacc87d88bfe metadata.xml 223
 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 metadata.xml 223
@@ -81,10 +78,3 @@ SHA256 c9184b9bd5b1d7318517095be0096d4cc2dc6e71361b16fba22ff288c986053c files/di
 MD5 799fc91b1e5a781e5538b9ee127ea8b1 files/digest-avahi-0.6.18 238
 RMD160 1ace061c86b5b39e749495f208cee4c0d7d40e67 files/digest-avahi-0.6.18 238
 SHA256 11372c91a1b12a5b2930aa3fc3ff38c756c108f7a4a42bbef1e02636ef434e7a files/digest-avahi-0.6.18 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGLmUGI1lqEGTUzyQRAi8RAKCy1wkrFeZzdRXqLqxgQT1PFdX6lACg3grM
-j6S+tGEg7A0lygsCagahE3g=
-=+psr
------END PGP SIGNATURE-----

diff --git a/net-dns/avahi/avahi-0.6.18.ebuild b/net-dns/avahi/avahi-0.6.18.ebuild
index fb89583676cc89cbc31e6b5ad2cedb627d6b2e61..b071ca77aa6421df387cfff9ec3a5a980c33c085 100644 (file)
--- a/net-dns/avahi/avahi-0.6.18.ebuild
+++ b/net-dns/avahi/avahi-0.6.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2000-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.18.ebuild,v 1.6 2007/04/22 13:52:02 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.18.ebuild,v 1.7 2007/04/28 12:48:09 carlo Exp $
 
 inherit eutils mono python qt3 qt4
 
@@ -46,7 +46,8 @@ RDEPEND=">=dev-libs/libdaemon-0.5
                dev-python/twisted
                dev-python/twisted-web
        )
-       kernel_linux? ( sys-libs/libcap )"
+       kernel_linux? ( sys-libs/libcap )
+       !net-misc/mDNSResponder"
 DEPEND="${RDEPEND}
        >=dev-util/pkgconfig-0.9.0
        doc? (