Specifying net-dns/avahi[dbus] dependency when avahi use flag is enabled, bug 364539

Package-Manager: portage-2.1.9.42/cvs/Linux i686

6 files changed, 22 insertions, 17 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 5ddbc9f1a0ac..ce2438dcf123 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.470 2011/05/04 16:36:07 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.471 2011/05/05 17:24:10 vostorga Exp $
+
+  05 May 2011; Víctor Ostorga <vostorga@gentoo.org> samba-3.4.12.ebuild,
+  samba-3.4.13.ebuild, samba-3.5.8.ebuild, samba-3.5.8-r1.ebuild:
+  Specifying net-dns/avahi[dbus] dependency when avahi use flag is enabled,
+  bug 364539
 
   04 May 2011; Víctor Ostorga <vostorga@gentoo.org> samba-3.5.8-r1.ebuild,
   +files/3.5/samba-3.5.8-uclib-build.patch:
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index a6f589375030..76019390eedc 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -31,17 +31,17 @@ DIST samba-3.4.13.tar.gz 34805783 RMD160 da4cdb57bec225fa35b1a6e889f1c49beaaf508
 DIST samba-3.5.8.tar.gz 30721269 RMD160 02703bbaf7d7e7b9786a2228fe6085143c99251a SHA1 ffb71de38442eee14aafb44f819671354dc5cce9 SHA256 331e3f2806edcad853b48f4b1e653367ad9a6ce1ab5ed486c03a6bf614882796
 DIST samba-4.0.0alpha11.tar.gz 13917363 RMD160 3ec5597de6a2c80eaa426712101777fa92786b5c SHA1 8ed2befbbd45f6501d9e6036bcdfb332431a7b4f SHA256 ec9f4a9153b9e2c233420642ee98a8b944322e8b39a9b6912430fb24e88b81b9
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 RMD160 82f6d443d289253a184e5f5dda17d865cb79b2b5 SHA1 1dd5100447cb827aacb8bb18bf88b7b10955a38c SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d
-EBUILD samba-3.4.12.ebuild 11861 RMD160 750f8afe059cdc815a5c1cefda7539ff7ca28969 SHA1 ef4a379e61668d63b100f4ec962ab89e890dd3ca SHA256 f7308d692377f503e4ee60927508a29645ca5b6a6cbfafa659a053a5b77cf194
-EBUILD samba-3.4.13.ebuild 11873 RMD160 92b269fdc844c7abd8de479c0d19d5d166a8d125 SHA1 9a42cbfbe9137893f8a0053ba2e9fd8c121200e0 SHA256 11812b5e73b1e54a9500e2430304923ea357ab18f6002da19e07ff35423c34f3
-EBUILD samba-3.5.8-r1.ebuild 11962 RMD160 96e0ec9ee6a28a604ea387465f2f53fb70f7687b SHA1 b2c4935d723d9c7a46bb3d11ae803a7f3c0c8b1d SHA256 4c3b14fc899e87a7fec5dd8f7e6da27c3712be1309cc7f0abdc3ab624fb06511
-EBUILD samba-3.5.8.ebuild 12729 RMD160 88956016de7cca429a9fc56993bfb43b634b3ac0 SHA1 09011aa0e312be1be93e05c75c4bb6fc5b160a37 SHA256 03118d35562237cf15ae20beb201505a9cab39c1eab3652ea65635d9110437d0
+EBUILD samba-3.4.12.ebuild 11868 RMD160 f4a947beec3cceb95e1241991a827e673913aee3 SHA1 76ef9617d3604eb6941a13bae2f92e2816bdc223 SHA256 b72494103bf6f78691ec952bd878687b56671a1914e305a56a4728d22a410bb1
+EBUILD samba-3.4.13.ebuild 11879 RMD160 d8fe5d3ad76b26f653f4c2f8a62d57e748fb113f SHA1 217edcd9a75b23de4328d8f6cdbe441565bbc25a SHA256 9bb1cbe6642d07e12eb8f0e80228405fc5e09cb4f16bbf9f2c291d5750ef6c5f
+EBUILD samba-3.5.8-r1.ebuild 11968 RMD160 0b559c0d46a4e6493971616a765053e2ce216be3 SHA1 13b3686487563435be413ece26de403ebe59f8f1 SHA256 964102b971bf1c3db52b0673363f89250561f335601a9a33f3df1f2483c74917
+EBUILD samba-3.5.8.ebuild 12734 RMD160 3d4145c2be91bb05498adbbd507ced25df9aff91 SHA1 f30d7d7e16e365d421ef79a90efc20d1729b7e0f SHA256 cf6f724a69d82644ad4a4be64aed243775c44d55fbf7d69acf443d175c91b110
 EBUILD samba-4.0.0_alpha11.ebuild 4231 RMD160 efebbeed51868bf0cf51f6151b531f3e65834db2 SHA1 49169a33b69d1a69ecc102d8010c7b11f9256117 SHA256 02427fccf34de0f6aea8960d664b85a51fb80cce7bd107bc53111df386fb0660
-MISC ChangeLog 78534 RMD160 9dfe8c1f9163c5499fdaa1e245be89e7d7f322e9 SHA1 d700ebb59fe7fde31029063e9cf8a1faa60db063 SHA256 30fe2efb9b9759ea1fbe80d688d11ea40818aded60911b6c030869a28968fc9a
+MISC ChangeLog 78764 RMD160 550079178613c7c3321583ffcc5696aabb8d420a SHA1 01acc82bfd7c759a7f0d31e761a7c10d5f23f890 SHA256 e1fd2687f31f3a3a7e0e5f8a684497e5bb610673e839b14a1ee35ca2db1fda1b
 MISC metadata.xml 1435 RMD160 cbeae62707473b88127daa6170e8ca58861ef38b SHA1 32ff9e4f94646cc85bca64f208ea19faae1e2075 SHA256 bdff2271efdf94275d1a6096c48407c0372e088b10f85f19b989b18d50c2a5f0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3BgI8ACgkQKQaZ7OJe4zaSFQCfWFd+1jUVAHpxD/R/nx8Xqq7v
-aVcAn2U5jra0ye4avAAjHRZtfc1iQ/CU
-=8wv7
+iEYEARECAAYFAk3C3VYACgkQKQaZ7OJe4zYlswCgk3UtNPMjQsJ9kpGc5nnUHyhN
+i24An1+HJbgSAXiWuS3lmjcbNXzbg7nw
+=dD/g
 -----END PGP SIGNATURE-----
diff --git a/net-fs/samba/samba-3.4.12.ebuild b/net-fs/samba/samba-3.4.12.ebuild
index 001c08c2790e..b971bdd42ea5 100644
--- a/net-fs/samba/samba-3.4.12.ebuild
+++ b/net-fs/samba/samba-3.4.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.4.12.ebuild,v 1.6 2011/03/05 13:43:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.4.12.ebuild,v 1.7 2011/05/05 17:24:10 vostorga Exp $
 
 EAPI="2"
 
@@ -29,7 +29,7 @@ DEPEND="dev-libs/popt
 	virtual/libiconv
 	ads? ( virtual/krb5 sys-fs/e2fsprogs
 		client? ( sys-apps/keyutils ) )
-	avahi? ( net-dns/avahi )
+	avahi? ( net-dns/avahi[dbus] )
 	caps? ( sys-libs/libcap )
 	client? ( !net-fs/mount-cifs
 		dev-libs/iniparser )
diff --git a/net-fs/samba/samba-3.4.13.ebuild b/net-fs/samba/samba-3.4.13.ebuild
index fee83c9de7d2..9f05a64b2125 100644
--- a/net-fs/samba/samba-3.4.13.ebuild
+++ b/net-fs/samba/samba-3.4.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.4.13.ebuild,v 1.1 2011/05/04 14:08:27 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.4.13.ebuild,v 1.2 2011/05/05 17:24:10 vostorga Exp $
 
 EAPI="2"
 
@@ -29,7 +29,7 @@ DEPEND="dev-libs/popt
 	virtual/libiconv
 	ads? ( virtual/krb5 sys-fs/e2fsprogs
 		client? ( sys-apps/keyutils ) )
-	avahi? ( net-dns/avahi )
+	avahi? ( net-dns/avahi[dbus] )
 	caps? ( sys-libs/libcap )
 	client? ( !net-fs/mount-cifs
 		dev-libs/iniparser )
diff --git a/net-fs/samba/samba-3.5.8-r1.ebuild b/net-fs/samba/samba-3.5.8-r1.ebuild
index 2c63aeaf7c5c..c4b7cbe8d973 100644
--- a/net-fs/samba/samba-3.5.8-r1.ebuild
+++ b/net-fs/samba/samba-3.5.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.8-r1.ebuild,v 1.3 2011/05/04 16:36:07 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.8-r1.ebuild,v 1.4 2011/05/05 17:24:10 vostorga Exp $
 
 EAPI=4
 
@@ -30,7 +30,7 @@ DEPEND="dev-libs/popt
 	virtual/libiconv
 	ads? ( virtual/krb5 sys-fs/e2fsprogs
 		client? ( sys-apps/keyutils ) )
-	avahi? ( net-dns/avahi )
+	avahi? ( net-dns/avahi[dbus] )
 	caps? ( sys-libs/libcap )
 	client? ( !net-fs/mount-cifs
 		dev-libs/iniparser )
diff --git a/net-fs/samba/samba-3.5.8.ebuild b/net-fs/samba/samba-3.5.8.ebuild
index 21ffa7c4f4e8..6f9bf745df04 100644
--- a/net-fs/samba/samba-3.5.8.ebuild
+++ b/net-fs/samba/samba-3.5.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.8.ebuild,v 1.2 2011/03/15 16:01:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.8.ebuild,v 1.3 2011/05/05 17:24:10 vostorga Exp $
 
 EAPI="2"
 
@@ -29,7 +29,7 @@ DEPEND="dev-libs/popt
 	virtual/libiconv
 	ads? ( virtual/krb5 sys-fs/e2fsprogs
 		client? ( sys-apps/keyutils ) )
-	avahi? ( net-dns/avahi )
+	avahi? ( net-dns/avahi[dbus] )
 	caps? ( sys-libs/libcap )
 	client? ( !net-fs/mount-cifs
 		dev-libs/iniparser )