Remove avahi useflag, use only zeroconf useflag for full avahi interface

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

4 files changed, 34 insertions, 32 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index d8b71116f3c9..20bb0d73f9ae 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.527 2013/04/01 22:21:26 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.528 2013/04/01 22:49:57 dilfridge Exp $
+
+  01 Apr 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.2-r1.ebuild,
+  cups-9999.ebuild:
+  Remove avahi useflag, use only zeroconf useflag for full avahi interface
 
 *cups-1.6.2-r1 (01 Apr 2013)
 
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index fc67de4fc4e3..30689b9d542f 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -30,27 +30,27 @@ EBUILD cups-1.5.0.ebuild 8250 SHA256 0e7967449e58ad9c385154c93c7dd35cd211f8dd062
 EBUILD cups-1.5.2-r4.ebuild 8363 SHA256 5962ac89342b0430eb663dbd012af6ad02f836d712496088b65af28817a241c3 SHA512 dd1cb9a9c570d51e376c71c784a3c6dfff38e07a2594792666cbcded73ba3dc5301393fc59c01113cc6461fd1e63371348df015be9cd3d2aa50859ad296535b6 WHIRLPOOL 2a69b6d45f64b191dabb4b6a4f112c7a9975a356c28999e50a413e6ab73a7f292e00a5995d9008419420063ee769ee11879267acd69a12a2c81deb0ab00829f0
 EBUILD cups-1.5.3.ebuild 8623 SHA256 4cba3b3f068540fe208208dd84785b4b235883fc9d1546a7c678835ac67bc01d SHA512 b82a7a79c7ab586dd3d66b70016ce0c9c79ea7d1deffca81fb2bd8c5de0d601456245471502ab7ecbc9887fa5f732c19d933a5358c28250fc016f5837e390303 WHIRLPOOL 7925273a5321b57476c2834583f1f491bb53cba89e86babe51c13eab10506c1c7a0ae08e6e4a23b84162323a85b9010303d4f2feec4482530dee6923fb68aa40
 EBUILD cups-1.6.1.ebuild 8313 SHA256 ea7db57c0936d02be764b6c45c114c53b636384bac04f4611c91a82b1fa061fd SHA512 700d3a9c4f51e3d29b8f9853d796cfc634140c302a7684e119c9e8ef95f3427dbf843f92cf3178c9ce7203610d06f79ecf8952bdf39bc1cd1000bcfb65459566 WHIRLPOOL 7c37a51280c31899b251b29f589c06651ba49e9f3399aa7b7e6b9ced9785b6961258dda6b0eb4d1226646cfd5e1e09e7f3775789a01c663263e8ff4db1ad1b38
-EBUILD cups-1.6.2-r1.ebuild 8503 SHA256 cd47e6decf7e31b908609c2ff8c76d123d1626b79b74afccd6b9c07b53aae3e6 SHA512 c19c9b22a98ce4ef4a19b751f0c92759da65558fd174005cb68b8b8d9b0c208797f021eedf98b4601ca7e120906c4ce858be035c457dadcf52718786546accb0 WHIRLPOOL b808e30eed653a86436722e1982a0914994f2c392e8e8b11afdc9ad2d84737d6115aeb6184e85700f7bf74840af96d851f22441c0684f4f6cfe001e98ca57655
+EBUILD cups-1.6.2-r1.ebuild 8448 SHA256 cc178b0218e588a81163d4652f70c8962ce4c0d38aaaa572c04fe8d55102c197 SHA512 e8b8bfaba92c08041ae012fde6ba9d6651f3f51969598a9b55e1c5d9e1cd64d84dcb8ae2b39d624466839ecdeff93b18aed043a89d27594fdfa2b3d2a1369321 WHIRLPOOL e453c3f525961b597452db84f2a52cee03734c813eba9768cae9bbc535d6b5459d9cf0981d779f6a27ea04e8bb8a048a308573cc326642763c9ff1d34f687f13
 EBUILD cups-1.6.2.ebuild 8459 SHA256 d0dccfbc627276838a75c6e07f4427fa37afec936eb951303ee19d3c2865423d SHA512 0e3be444977d67f7cc27bc448a5411f5a1f5f2c6b17f773c69b2b18feafb8eb14895da168c655fcf332a309ccd0a0956555738a808e865c53de38bda7a7f6fbf WHIRLPOOL 678997cab410ed3d09a7e750df2c8131f4670728b217b2cdcba4a67a77a88188e09dd095c883fdfea553ada90bd3fa1ade618f93b07e9e3ed15559a4e2ca4f25
-EBUILD cups-9999.ebuild 8500 SHA256 9220cbb2128125c496ad6137d83018efdc1bb11e10cdeb45cb78f6b83e16043d SHA512 f038a10ca61fe3b14a2e21e160f74ab3b867e2e4a85b66f9f12383533bad137bc8471d047244b913c0f4656da49fb1f1df4f324715d36ac93c7489f924778478 WHIRLPOOL fc0f068ca53722ed31818d5302d145f132df6572a8723d8fec919d84385b0c5c6b3dbe1630038fa7a3dd5277b77b7259fffda0fcf9ddddb776daea54e18b50cd
-MISC ChangeLog 80241 SHA256 09a810dd0d1d28cdc69d4c17b328d505ee6ae3726118c7af356dac0fa5dba455 SHA512 050bc0a9d31fc1181f6fe0b1eb0752519cb6c2eb5b8db14f9d3735d63e388a37fe580962b2496cb6324fe23651c41a1c646ab7a3b873882757f3389b2d2d0d62 WHIRLPOOL a271b622ca6ff397d3cc2b6ed26799a1c6802277569267bddf34f0989a05b084902e3d14230f667f66c488f94713820e5aff3e84a253fe6a960ac4cb92f8d201
+EBUILD cups-9999.ebuild 8445 SHA256 a9fd2e8484f22b303c02b726f6653c5a494abf6dc2776d49d9fbe5d138bfb4f5 SHA512 5aa7b02e99c46a0e04841048d915b3ad97cb1bfded8c43bdbe97739e4d0042631e466149af6d491d92a8198120ec1db75a849e2c78c174b2e6cc173046f6e2a4 WHIRLPOOL da92431bf9ec1c79cf4a37f0a2c62d7308fc5a39ec113e63490f2df0e3589ce6db63f7b78826f668aef19d2568b009a3db2d8ce13bb58700b6805ccd7934d4c8
+MISC ChangeLog 80416 SHA256 d9bb6ccd8f9532e76f3605a6a8eefac4395efa9089a23f5ecf861919a64984e6 SHA512 89d06b030c6b118115f14424ac751c7f5b5db2dd74271e289976db06eb60b8ad1f2c2086cdc1bdb720017926abd3c3101da17f20694302e1c9fa1f646a91a542 WHIRLPOOL c9d4b52c7fcb4a8466b580f3bcb619fe7e75d635842023f759c91b13479e6ea31cd5036fe38991b60e7e2c078ff6e68ad0e50fbaadfc4451b6ccf9e9ad8eabfb
 MISC metadata.xml 778 SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8 SHA512 717b6c3d940b2de149a68bb1c66175cd6fac04e21fcf581d6f1dd248c1bc5ee8fb98ec26a1fa2fca94e8fcb33f131c6635d40a6954721020a989dc260e8b8fbc WHIRLPOOL 057426e3c3f1e7e5a6bb124e0af0d804e15f6bbf17f7b278ef90d773f997beed6c6376bcc9603ac4c67f75675a33bc1fb7a02bb89f7a1ed69634a5d7bf9befbb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRWgieXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJRWg9MXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcD1oP/18qOaD5yItmfKXptEB1FfM+
-gpS6N+mFFvl76jSCsShwDrkJikpESp4SokzG/MTWVFu7/7w0gr2/2wkwA7lDxNH8
-gagNQQiSWPJ0BWdUVtIfe7ikfrPiepbEnvolPiWywUUj2gKMyiUIHOsOe3VHiVi2
-YT0ZQ3bJtW1Ay+LNVUrKqAgjMPlYmoCdy3xevqrT5TUn95G7erjJUcNufCn7+q8f
-bArpbSOa3bASkpwyOZiK1NyIA0lVhrE/Oj+35FBSgt2ZJ5Mq6sv5ptpB/eCX1hqa
-8dm3Y3iA3TnSjhaFO/jUsUDPknDf3RbW0cBPc9wyFmYVGNv7hpPn64o3BJDWHwvE
-DpmAgyuptZBsJ53qjkJ/BkhU6Q0Mlj/Yq7axDMiIFWUhekC+qpQ0tX2g8/uLiyPT
-kzfq/PF7p4c1g1STeb13cjmIgfxjdvCJHqGVpOmM26XqxfwBTxjX6TQEC89g/cWC
-hMMNU2JpZE+Bz86SgweWWD1fOr7jHlsBbV/4/kgxarIvXl3goIfJsj3SIQmdoxXg
-yXHzAjccnRsg2bYOvCQXHld9kpQLK1ZzGtv91pwRJ1MdYMJqc1mgVYxMBrJ+SbEt
-4mMRO+fdnY2wFq8YAa90FSbltE82Ak2eWetjfxtOVPloxB1R0ASzRYw1HnfF982Y
-srBRzR4dzDKtdcECvWvs
-=q7Y1
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcpAAP/R1jD8ysF5kRNaGJ1dvXJPXn
+K+r1w5/Ept6Ojyac/Vtm3udcnbp9cKGwUkWcBWGrG57382IrKi1zgByCy+oYnmWK
+iYyS8jG6DfDxOE5vCW6EQdmNP2JXDeJ5lEb51u7+JhOVW7JmQX3ukHja3qV3bRpR
+J88R6UbHue5uz2plxWfOkFb1g4/LbOb1aZs0pZDkztTr/VkhhVmXJUij7fPRlCPA
+RgVQQiebT/UcDtoy1nzqlUHk7SsU0IvUw5V/pEjLEbmB5qndng2mxPicCV4Gry5p
+dF+qn1umtPa+0meVRaKqa82IMLP3TpLlualJXfqPwFpOF2LvCt2DG4u/+/M9sl3A
+vyJBIMxjLPku4Y4twxyEAd0p56nFGo44zPqQS3sSsmLa6lb8pGDsLilElllYwiaS
+MltkzmFK160h3/IPCxNrScK8p/c4y1kBe884yzhSP3mZ7Y8aehiZn0Pt/4WqpIns
+JrBjQzWvZpNcExMK3qnuYlC5M3Bda5/1vS4vevtOCcRMfD+c0Mk8QkJktbyBSdsN
+gmPWeWcq3LXsyXveoymwKko64t5IDTgXhtTTNzTH+UiZ5dhDLJUn3kn5AqQRl8hS
+vW9R/6gIPCSY0+1GuPMgAd4FcW1wx8VvDDrtNMIa+rJEUBTZiuGwFlKt5wc+JQDV
+B9ps7CEmMjzIY6ABYNr3
+=S+yc
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.6.2-r1.ebuild b/net-print/cups/cups-1.6.2-r1.ebuild
index 8d85f0f95ad1..edd99a2ec78c 100644
--- a/net-print/cups/cups-1.6.2-r1.ebuild
+++ b/net-print/cups/cups-1.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.2-r1.ebuild,v 1.1 2013/04/01 22:21:26 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.2-r1.ebuild,v 1.2 2013/04/01 22:49:57 dilfridge Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ HOMEPAGE="http://www.cups.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="acl avahi dbus debug +filters gnutls java kerberos pam
+IUSE="acl dbus debug +filters gnutls java kerberos pam
 	python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
 
 LANGS="ca es fr ja ru"
@@ -41,7 +41,6 @@ RDEPEND="
 			sys-apps/attr
 		)
 	)
-	avahi? ( net-dns/avahi )
 	dbus? ( sys-apps/dbus )
 	java? ( >=virtual/jre-1.6 )
 	kerberos? ( virtual/krb5 )
@@ -58,7 +57,7 @@ RDEPEND="
 	usb? ( virtual/libusb:0 )
 	X? ( x11-misc/xdg-utils )
 	xinetd? ( sys-apps/xinetd )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+	zeroconf? ( net-dns/avahi )
 "
 
 DEPEND="${RDEPEND}
@@ -169,7 +168,7 @@ src_configure() {
 		--with-languages="${LINGUAS}" \
 		--with-system-groups=lpadmin \
 		$(use_enable acl) \
-		$(use_enable avahi) \
+		$(use_enable zeroconf avahi) \
 		$(use_enable dbus) \
 		$(use_enable debug) \
 		$(use_enable debug debug-guards) \
@@ -178,7 +177,7 @@ src_configure() {
 		$(use_enable static-libs static) \
 		$(use_enable threads) \
 		$(use_enable usb libusb) \
-		$(use_enable zeroconf dnssd) \
+		--disable-dnssd \
 		$(use_with java) \
 		--without-perl \
 		--without-php \
@@ -211,7 +210,7 @@ src_install() {
 
 	# install our init script
 	local neededservices
-	use avahi && neededservices+=" avahi-daemon"
+	use zeroconf && neededservices+=" avahi-daemon"
 	use dbus && neededservices+=" dbus"
 	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
 	cp "${FILESDIR}"/cupsd.init.d-r1 "${T}"/cupsd || die
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 60afd32e94ce..0a2eb4202ef7 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.27 2013/04/01 22:21:26 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.28 2013/04/01 22:49:57 dilfridge Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ HOMEPAGE="http://www.cups.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="acl avahi dbus debug +filters gnutls java kerberos pam
+IUSE="acl dbus debug +filters gnutls java kerberos pam
 	python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
 
 LANGS="ca es fr ja ru"
@@ -41,7 +41,6 @@ RDEPEND="
 			sys-apps/attr
 		)
 	)
-	avahi? ( net-dns/avahi )
 	dbus? ( sys-apps/dbus )
 	java? ( >=virtual/jre-1.6 )
 	kerberos? ( virtual/krb5 )
@@ -58,7 +57,7 @@ RDEPEND="
 	usb? ( virtual/libusb:0 )
 	X? ( x11-misc/xdg-utils )
 	xinetd? ( sys-apps/xinetd )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+	zeroconf? ( net-dns/avahi )
 "
 
 DEPEND="${RDEPEND}
@@ -169,7 +168,7 @@ src_configure() {
 		--with-languages="${LINGUAS}" \
 		--with-system-groups=lpadmin \
 		$(use_enable acl) \
-		$(use_enable avahi) \
+		$(use_enable zeroconf avahi) \
 		$(use_enable dbus) \
 		$(use_enable debug) \
 		$(use_enable debug debug-guards) \
@@ -178,7 +177,7 @@ src_configure() {
 		$(use_enable static-libs static) \
 		$(use_enable threads) \
 		$(use_enable usb libusb) \
-		$(use_enable zeroconf dnssd) \
+		--disable-dnssd \
 		$(use_with java) \
 		--without-perl \
 		--without-php \
@@ -211,7 +210,7 @@ src_install() {
 
 	# install our init script
 	local neededservices
-	use avahi && neededservices+=" avahi-daemon"
+	use zeroconf && neededservices+=" avahi-daemon"
 	use dbus && neededservices+=" dbus"
 	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
 	cp "${FILESDIR}"/cupsd.init.d-r1 "${T}"/cupsd || die