summaryrefslogtreecommitdiff
path: root/sys-auth
diff options
context:
space:
mode:
authorDennis Schridde <devurandom@gmx.net>2011-02-13 15:01:34 +0100
committerDennis Schridde <devurandom@gmx.net>2011-02-13 15:01:44 +0100
commit52207dc8cfb15d6c0e362aa5b1a9f20ed6233db1 (patch)
tree56b668dd8e6f81d6e6d90c8d50ff269daaa57ac3 /sys-auth
parent706e87eb930c3c9843d78478f6e2a792c9366cd0 (diff)
downloadkde-52207dc8cfb15d6c0e362aa5b1a9f20ed6233db1.tar.gz
kde-52207dc8cfb15d6c0e362aa5b1a9f20ed6233db1.tar.bz2
kde-52207dc8cfb15d6c0e362aa5b1a9f20ed6233db1.zip
[sys-auth/nss-mdns-0.10] Block net-misc/mDNSResponder to prevent file collision
Also: Minor cleanup of src_configure Bug: 256574 (Portage version: 2.2.0_alpha23/git/Linux x86_64, signed Manifest commit with key 50ED256E)
Diffstat (limited to 'sys-auth')
-rw-r--r--sys-auth/nss-mdns/Manifest8
-rw-r--r--sys-auth/nss-mdns/nss-mdns-0.10-r1.ebuild11
2 files changed, 12 insertions, 7 deletions
diff --git a/sys-auth/nss-mdns/Manifest b/sys-auth/nss-mdns/Manifest
index 1d6c3b4d144..dd54d16e769 100644
--- a/sys-auth/nss-mdns/Manifest
+++ b/sys-auth/nss-mdns/Manifest
@@ -5,12 +5,12 @@ AUX mdns.allow 29 RMD160 c65a9a70c14528b7330a51187634b51c43725397 SHA1 2be715163
AUX nss-mdns-0.10-no-minimal-search-domains-r1.patch 564 RMD160 33a90cf985deb566eccffc193aa5f2b1b4270a2a SHA1 1201667a170ac2edf91b62aa1cafa057eada71f1 SHA256 697a09aa5c8ac54e05f2c4daeb7019aa8091b7463c135195dbbd81d665191e6d
AUX nss-mdns-0.8-avahi-socket-r1.patch 401 RMD160 4ff4cac66fbe1724a6f72c7a6c43ba170eef8467 SHA1 d6e35b94707129ca70e19f684effe91d978e3f1e SHA256 e627d7f6bf811721057beebe2136426700674937d4958a7399ff6e614d9aea98
DIST nss-mdns-0.10.tar.gz 353130 RMD160 e33f318790bc0a7367297284cad977289f830a84 SHA1 d8610950b8b209e29129a70765449b820bcda1a0 SHA256 1e683c2e7c3921814706d62fbbd3e9cbf493a75fa00255e0e715508d8134fa6d
-EBUILD nss-mdns-0.10-r1.ebuild 1726 RMD160 400f45c60ae82c4b21cb8677fe4fa0101c270fc6 SHA1 bc4bbec6a9034e48f4fabdf965da59f3e8182984 SHA256 ce0d1dd5afd0aad34d582755c9933b75efb301a02ae5e1b0b970ff43308d43c2
+EBUILD nss-mdns-0.10-r1.ebuild 1784 RMD160 8944bcf2bfcc965a097a1effd0658a20b709f7c0 SHA1 8e38a033fe9d2e91b44803c16b071664e8b08433 SHA256 e87bd41d512d20e399538fb5ff4e011315b408405905271e7116b6e2d42f44a3
MISC metadata.xml 582 RMD160 a71b926124261130dc2f1415e621958e87269e7e SHA1 5a09b9703b44307d2312fa702580bccb26dd6319 SHA256 cd261bbcf54aa50efc7d9b1181b6a0e0b17d809d41b08b0184cf4e392e0716fa
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk1X4+oACgkQjqfyF1DtJW5DAwCgl8GPDU+JGK47J4Ghh9WQbEdL
-r6YAoKGVP+w22/Th+inyoeAlzx6nQYh8
-=P33K
+iEYEARECAAYFAk1X5D4ACgkQjqfyF1DtJW4dpQCaA8kTcfEvsKPOwITTw/OVhX3m
+e98Anjm8+RmPFGLTkn6zcp5+0FrNKrsS
+=IatZ
-----END PGP SIGNATURE-----
diff --git a/sys-auth/nss-mdns/nss-mdns-0.10-r1.ebuild b/sys-auth/nss-mdns/nss-mdns-0.10-r1.ebuild
index 97335fe0138..8df52126dd4 100644
--- a/sys-auth/nss-mdns/nss-mdns-0.10-r1.ebuild
+++ b/sys-auth/nss-mdns/nss-mdns-0.10-r1.ebuild
@@ -15,8 +15,9 @@ SLOT="0"
KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86"
IUSE="+search-domains"
-DEPEND="net-dns/avahi"
-RDEPEND="${DEPEND}"
+DEPEND="!net-misc/mDNSResponder"
+RDEPEND="${DEPEND}
+ net-dns/avahi"
src_prepare() {
epatch "${FILESDIR}"/${PN}-0.8-avahi-socket-r1.patch
@@ -25,7 +26,11 @@ src_prepare() {
}
src_configure() {
- econf $(use_enable search-domains) --enable-avahi || die "configure failed"
+ econf \
+ --enable-avahi \
+ --disable-legacy \
+ $(use_enable search-domains) \
+ || die "configure failed"
}
src_compile() {