Fix deps per bug #328773.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 12 insertions, 24 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 43872b341ca6..bad1fcfa4a60 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.393 2010/07/30 22:32:11 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.394 2010/08/10 20:54:31 scarabeus Exp $
+
+  10 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  cups-1.3.11-r1.ebuild, cups-1.3.11-r2.ebuild:
+  Fix deps per bug #328773.
 
   30 Jul 2010; Jory A. Pratt <anarchy@gentoo.org> cups-1.4.4.ebuild:
   make threads support optional, ack from scarabeus
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 33822461ee8e..799622674a6a 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -10,8 +10,8 @@ AUX cupsd.init.d 293 RMD160 19fbef21cee7e472e7028f3101b680baa0089c54 SHA1 e6b27b
 AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SHA1 6afb8a655b6ff013a2c8c8cbfb615ba1e561503b SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1
 DIST cups-1.3.11-source.tar.bz2 3799393 RMD160 a0646f2ba29fbd39d211ea5c3fdbd24a00f66a78 SHA1 df5cfb64fb608fc128acadde670dc30af49bdb18 SHA256 5e310fd324a15fae1e1c9721879f5c948d788e04735a5263a40c6146fff607b8
 DIST cups-1.4.4-source.tar.bz2 4472741 RMD160 1f486acda02e83b6824f8ca33b74c02ff3f01994 SHA1 3e179c007fa6cd6874b60ff18a6f48070547a00a SHA256 d25ffa35add3abeeec0eba60be2cffc89425b649c64ef3a73dfc724683a59aa3
-EBUILD cups-1.3.11-r1.ebuild 8609 RMD160 7b825a5838eadb995758c76caf5878d4b558ba26 SHA1 99d35b057e590ff804522c63a0cc51061c36d9d2 SHA256 2a3fe0f0283d653037bec73e877a3f12cd50b063a3dd3d0b1dde11ea4a9bc311
-EBUILD cups-1.3.11-r2.ebuild 8807 RMD160 92c74e1912c79d73ae52b1f0ed195a5023188fa8 SHA1 7b1314dbab94a7b2be0da281f115e46c0ccca7a3 SHA256 e54ce2f8fa171d2a8b005ff27791cce732c51e551972ccf9207d926aaa86e602
+EBUILD cups-1.3.11-r1.ebuild 8236 RMD160 3d691e0cd89724f2f167c0df9b0709ebd5d1c568 SHA1 670d92532d1b436470e851e8fa3df90d3c0575f8 SHA256 cfce6af026847d98ed64c8ceb2c4114d2df6e896c6f2b0ab3605f9c1755701b7
+EBUILD cups-1.3.11-r2.ebuild 8431 RMD160 f57db7c53959e8f2e9f334019552210d662982d8 SHA1 a046c3c5255a9ac4e1c1c2b19d511e0aaac8d102 SHA256 c10dc5a854f9b859c236c29c09c87d3467c191bbad455eaa5d22d672e3166e6e
 EBUILD cups-1.4.4.ebuild 5397 RMD160 a9112da2f66517b0735abafcb26e621fcb4bb0d7 SHA1 178b4523d05a8e653fe1eb534cc142a14db89cff SHA256 3c4636515f29c0cea04d56f570852f1df47e2aff648ba52577dd9d835e402e3d
-MISC ChangeLog 58249 RMD160 03f66e625b7fab9a785ae812faec558dd3c256ca SHA1 2b7bbee11137fd74f0709648b7d4884cea57fffa SHA256 7de0a9dd2d6e85fc11db05c38398b39f4dda84049b3bb1963b4392c3385e501e
+MISC ChangeLog 58383 RMD160 fd0a2c2c7a070e76c766d1180b20193b180c8b54 SHA1 fee01ed99542f8d280cf36b9b7bd0313cbf52498 SHA256 5f0b215fe483b825123debba7979d8edb9a568d123d05f9290fab710b68bee83
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
diff --git a/net-print/cups/cups-1.3.11-r1.ebuild b/net-print/cups/cups-1.3.11-r1.ebuild
index 97b82c7b8be5..7187b2ba3dda 100644
--- a/net-print/cups/cups-1.3.11-r1.ebuild
+++ b/net-print/cups/cups-1.3.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r1.ebuild,v 1.12 2010/06/30 15:29:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r1.ebuild,v 1.13 2010/08/10 20:54:31 scarabeus Exp $
 
 EAPI=2
 inherit autotools eutils flag-o-matic multilib pam
@@ -25,7 +25,7 @@ COMMON_DEPEND="
 			sys-apps/attr
 		)
 	)
-	avahi? ( net-dns/avahi )
+	avahi? ( net-dns/avahi[mdnsresponder-compat] )
 	dbus? ( sys-apps/dbus )
 	gnutls? ( net-libs/gnutls )
 	java? ( >=virtual/jre-1.4 )
@@ -89,14 +89,6 @@ for X in ${LANGS} ; do
 done
 
 pkg_setup() {
-	if use avahi && ! built_with_use net-dns/avahi mdnsresponder-compat ; then
-		echo
-		eerror "In order to have cups working with avahi zeroconf support, you need"
-		eerror "to have net-dns/avahi emerged with \"mdnsresponder-compat\" in your USE"
-		eerror "flag. Please add that flag, re-emerge avahi, and then emerge cups again."
-		die "net-dns/avahi is missing the mdnsresponder-compat feature."
-	fi
-
 	enewgroup lp
 	enewuser lp -1 -1 -1 lp
 
diff --git a/net-print/cups/cups-1.3.11-r2.ebuild b/net-print/cups/cups-1.3.11-r2.ebuild
index 797d6be2c7e1..1195c5affb7f 100644
--- a/net-print/cups/cups-1.3.11-r2.ebuild
+++ b/net-print/cups/cups-1.3.11-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r2.ebuild,v 1.12 2010/07/18 19:01:21 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r2.ebuild,v 1.13 2010/08/10 20:54:31 scarabeus Exp $
 
 EAPI=2
 inherit autotools eutils flag-o-matic multilib pam
@@ -25,7 +25,7 @@ COMMON_DEPEND="
 			sys-apps/attr
 		)
 	)
-	avahi? ( net-dns/avahi )
+	avahi? ( net-dns/avahi[mdnsresponder-compat] )
 	dbus? ( sys-apps/dbus )
 	gnutls? ( net-libs/gnutls )
 	java? ( >=virtual/jre-1.4 )
@@ -89,14 +89,6 @@ for X in ${LANGS} ; do
 done
 
 pkg_setup() {
-	if use avahi && ! built_with_use net-dns/avahi mdnsresponder-compat ; then
-		echo
-		eerror "In order to have cups working with avahi zeroconf support, you need"
-		eerror "to have net-dns/avahi emerged with \"mdnsresponder-compat\" in your USE"
-		eerror "flag. Please add that flag, re-emerge avahi, and then emerge cups again."
-		die "net-dns/avahi is missing the mdnsresponder-compat feature."
-	fi
-
 	enewgroup lp
 	enewuser lp -1 -1 -1 lp