Fixed cyclic dependency with app-text/poppler[utils]:

- --with-pdftops add absolute path to disable pdftops autodetection
- moved poppler[data] to PDEPEND
- moved blocks to RDEPEND
- formatted deps for greated readability
Package-Manager: portage-2.2_rc66/cvs/Linux x86_64

5 files changed, 107 insertions, 68 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 019efd5056b5..deca972ad556 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.379 2010/02/10 19:46:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.380 2010/03/08 22:20:59 reavertm Exp $
+
+  08 Mar 2010; Maciej Mrozowski <reavertm@gentoo.org> cups-1.3.11-r1.ebuild,
+  cups-1.3.11-r2.ebuild, cups-1.4.2-r1.ebuild:
+  Fixed cyclic dependency with app-text/poppler[utils]
 
   10 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> cups-1.3.11-r1.ebuild,
   cups-1.3.11-r2.ebuild, cups-1.4.2-r1.ebuild:
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 7015184668b1..281eb6d729c4 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.2-source.tar.bz2 4450466 RMD160 3848989e3e585e69def0b5ccc9645c1670b0a687 SHA1 84be13b1a83a981cf1f3f9f812d53f3a3ca247cf SHA256 646bc0dbac064d05c0a93735fb556299eda0ae32ce4568506654cb952c719314
-EBUILD cups-1.3.11-r1.ebuild 8546 RMD160 424bb5b7e46f0b279ef142c775c787ef2e1a555c SHA1 fbcbc4cf5df0fd0cdf85cf069b4072acbdda4215 SHA256 edd70140731bf5ba0a76ff29d4fddcc1be658cb4924198a5bc56deca12c30859
-EBUILD cups-1.3.11-r2.ebuild 8752 RMD160 a00ac578043eeeba36c56aef2ea4da7eb4f5c8c0 SHA1 1cef429b1261025e87263110ae2b01aeba68835a SHA256 e25c684f58ad5de37e33ef489b3b6023b9d8affdf0e454db3d9e8a47f9559462
-EBUILD cups-1.4.2-r1.ebuild 5323 RMD160 87ed7dd322794b292e7af4f263aec4f1eff2b1d9 SHA1 b2a1b588f6b109205ca887df672d1ac6d10a11b9 SHA256 015be68130d5d43e8f90ec7fcdd433e409c3707d9869b634aad2c1362d492e20
-MISC ChangeLog 56582 RMD160 549ed2d5813ad0144f84f99424b42b48fcac8601 SHA1 27a41fc10ba4c7dffcc26d321e2bba25127627b8 SHA256 7dd4ad4f8990588bc89a4a2276488bba23d8a5e402085c9e1a6a33d390977968
+EBUILD cups-1.3.11-r1.ebuild 8585 RMD160 a29cc095f206ac9ad17fe2898eecc9d75777ce5a SHA1 48593d69334dbd740642cdbadc6190701b26acf7 SHA256 9917c16ab6441e58aa7c752653634771d6188f40e0460aea3f1d0a8d6b3e6b52
+EBUILD cups-1.3.11-r2.ebuild 8791 RMD160 f516abbd9e16eb700563871c3a2fb354f23c3459 SHA1 d47719da41455b885d8cbb623689ca280bfe4259 SHA256 fd41ea7708a601df3350a0eb4c6b2741e8bff899a03134fce468fb1319aefe59
+EBUILD cups-1.4.2-r1.ebuild 5355 RMD160 4f6db294cea45b48162680533cf2e26db505cccd SHA1 7b7d501509c3393594a4f1d25d0c4f6082cf509f SHA256 6ce51358a801bb0a54ec1c2c2a6d0a68a0244802f569456b526900e0b6c155f5
+MISC ChangeLog 56761 RMD160 41526e87e01312e2fd0773ce2f3af9fb2a660aa7 SHA1 1c1ea47f17e65bdc61515643b7301453db1fe758 SHA256 b19287ebf323c962a6440193570b40f89b9665102bd0176cf8d61ab65bb54ee5
 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 5d9a30b1bc02..f00bcf12cfd0 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.10 2010/02/10 19:46:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r1.ebuild,v 1.11 2010/03/08 22:20:59 reavertm Exp $
 
 EAPI=2
 inherit autotools eutils flag-o-matic multilib pam
@@ -16,7 +16,15 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="acl avahi dbus gnutls java jpeg kerberos ldap pam perl php png ppds python samba slp ssl static tiff X xinetd zeroconf"
 
-COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
+COMMON_DEPEND="
+	app-text/libpaper
+	dev-libs/libgcrypt
+	acl? (
+		kernel_linux? (
+			sys-apps/acl
+			sys-apps/attr
+		)
+	)
 	avahi? ( net-dns/avahi )
 	dbus? ( sys-apps/dbus )
 	gnutls? ( net-libs/gnutls )
@@ -30,38 +38,41 @@ COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
 	png? ( >=media-libs/libpng-1.2.1 )
 	python? ( dev-lang/python )
 	slp? ( >=net-libs/openslp-1.0.4 )
-	ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8g ) )
+	ssl? (
+		!gnutls? ( >=dev-libs/openssl-0.9.8g )
+	)
 	tiff? ( >=media-libs/tiff-3.5.5 )
 	xinetd? ( sys-apps/xinetd )
-	zeroconf? ( !avahi? ( net-misc/mDNSResponder ) )
-	app-text/libpaper
-	dev-libs/libgcrypt"
-
-DEPEND="${COMMON_DEPEND}
-	!<net-print/foomatic-filters-ppds-20070501
-	!<net-print/hplip-1.7.4a-r1"
-
+	zeroconf? (
+		!avahi? ( net-misc/mDNSResponder )
+	)
+"
+DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
+	!<net-print/foomatic-filters-ppds-20070501
+	!<net-print/hplip-1.7.4a-r1
 	!virtual/lpr
 	X? ( x11-misc/xdg-utils )
-	>=app-text/poppler-0.12.3-r3[utils]
-	"
-
+"
 PDEPEND="
-	ppds? ( || (
-		(
+	app-text/ghostscript-gpl
+	>=app-text/poppler-0.12.3-r3[utils]
+	ppds? (
+		|| (
+			(
+				net-print/foomatic-filters-ppds
+				net-print/foomatic-db-ppds
+			)
 			net-print/foomatic-filters-ppds
 			net-print/foomatic-db-ppds
+			net-print/hplip
+			net-print/gutenprint
+			net-print/foo2zjs
+			net-print/cups-pdf
 		)
-		net-print/foomatic-filters-ppds
-		net-print/foomatic-db-ppds
-		net-print/hplip
-		net-print/gutenprint
-		net-print/foo2zjs
-		net-print/cups-pdf
-	) )
+	)
 	samba? ( >=net-fs/samba-3.0.8 )
-	app-text/ghostscript-gpl"
+"
 
 PROVIDE="virtual/lpr"
 
@@ -157,7 +168,7 @@ src_configure() {
 		--with-cups-group=lp \
 		--with-docdir=/usr/share/cups/html \
 		--with-languages=${LINGUAS} \
-		--with-pdftops=pdftops \
+		--with-pdftops=/usr/bin/pdftops \
 		--with-system-groups=lpadmin \
 		--with-xinetd=/etc/xinetd.d \
 		$(use_enable acl) \
diff --git a/net-print/cups/cups-1.3.11-r2.ebuild b/net-print/cups/cups-1.3.11-r2.ebuild
index d1cf3872cda7..fe2c010389a1 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.3 2010/02/10 19:46:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r2.ebuild,v 1.4 2010/03/08 22:20:59 reavertm Exp $
 
 EAPI=2
 inherit autotools eutils flag-o-matic multilib pam
@@ -16,7 +16,15 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="acl avahi dbus gnutls java jpeg kerberos ldap pam perl php png ppds python samba slp ssl static tiff X xinetd zeroconf"
 
-COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
+COMMON_DEPEND="
+	app-text/libpaper
+	dev-libs/libgcrypt
+	acl? (
+		kernel_linux? (
+			sys-apps/acl
+			sys-apps/attr
+		)
+	)
 	avahi? ( net-dns/avahi )
 	dbus? ( sys-apps/dbus )
 	gnutls? ( net-libs/gnutls )
@@ -30,38 +38,41 @@ COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
 	png? ( >=media-libs/libpng-1.2.1 )
 	python? ( dev-lang/python )
 	slp? ( >=net-libs/openslp-1.0.4 )
-	ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8g ) )
+	ssl? (
+		!gnutls? ( >=dev-libs/openssl-0.9.8g )
+	)
 	tiff? ( >=media-libs/tiff-3.5.5 )
 	xinetd? ( sys-apps/xinetd )
-	zeroconf? ( !avahi? ( net-misc/mDNSResponder ) )
-	app-text/libpaper
-	dev-libs/libgcrypt"
-
-DEPEND="${COMMON_DEPEND}
-	!<net-print/foomatic-filters-ppds-20070501
-	!<net-print/hplip-1.7.4a-r1"
-
+	zeroconf? (
+		!avahi? ( net-misc/mDNSResponder )
+	)
+"
+DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
+	!<net-print/foomatic-filters-ppds-20070501
+	!<net-print/hplip-1.7.4a-r1
 	!virtual/lpr
 	X? ( x11-misc/xdg-utils )
-	>=app-text/poppler-0.12.3-r3[utils]
-	"
-
+"
 PDEPEND="
-	ppds? ( || (
-		(
+	app-text/ghostscript-gpl
+	>=app-text/poppler-0.12.3-r3[utils]
+	ppds? (
+		|| (
+			(
+				net-print/foomatic-filters-ppds
+				net-print/foomatic-db-ppds
+			)
 			net-print/foomatic-filters-ppds
 			net-print/foomatic-db-ppds
+			net-print/hplip
+			net-print/gutenprint
+			net-print/foo2zjs
+			net-print/cups-pdf
 		)
-		net-print/foomatic-filters-ppds
-		net-print/foomatic-db-ppds
-		net-print/hplip
-		net-print/gutenprint
-		net-print/foo2zjs
-		net-print/cups-pdf
-	) )
+	)
 	samba? ( >=net-fs/samba-3.0.8 )
-	app-text/ghostscript-gpl"
+"
 
 PROVIDE="virtual/lpr"
 
@@ -160,7 +171,7 @@ src_configure() {
 		--with-cups-group=lp \
 		--with-docdir=/usr/share/cups/html \
 		--with-languages=${LINGUAS} \
-		--with-pdftops=pdftops \
+		--with-pdftops=/usr/bin/pdftops \
 		--with-system-groups=lpadmin \
 		--with-xinetd=/etc/xinetd.d \
 		$(use_enable acl) \
diff --git a/net-print/cups/cups-1.4.2-r1.ebuild b/net-print/cups/cups-1.4.2-r1.ebuild
index 69087fed7bc1..016abcfca388 100644
--- a/net-print/cups/cups-1.4.2-r1.ebuild
+++ b/net-print/cups/cups-1.4.2-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.4.2-r1.ebuild,v 1.4 2010/02/10 19:46:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.2-r1.ebuild,v 1.5 2010/03/08 22:20:59 reavertm Exp $
 
 EAPI="2"
 
@@ -17,7 +17,16 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="acl dbus debug gnutls java +jpeg kerberos ldap pam perl php +png python samba slp +ssl static +tiff X xinetd"
 
-COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
+COMMON_DEPEND="
+	app-text/libpaper
+	dev-libs/libgcrypt
+	dev-libs/libusb
+	acl? (
+		kernel_linux? (
+			sys-apps/acl
+			sys-apps/attr
+		)
+	)
 	dbus? ( sys-apps/dbus )
 	gnutls? ( net-libs/gnutls )
 	java? ( >=virtual/jre-1.4 )
@@ -30,22 +39,26 @@ COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
 	png? ( >=media-libs/libpng-1.2.1 )
 	python? ( dev-lang/python )
 	slp? ( >=net-libs/openslp-1.0.4 )
-	ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8g ) )
+	ssl? (
+		!gnutls? ( >=dev-libs/openssl-0.9.8g )
+	)
 	tiff? ( >=media-libs/tiff-3.5.5 )
 	xinetd? ( sys-apps/xinetd )
-	app-text/libpaper
-	dev-libs/libgcrypt
-	dev-libs/libusb
-	>=app-text/poppler-0.12.3-r3[utils]
-	!net-print/cupsddk"
-
+"
 DEPEND="${COMMON_DEPEND}"
 
 RDEPEND="${COMMON_DEPEND}
+	!net-print/cupsddk
 	!virtual/lpr
-	X? ( x11-misc/xdg-utils )"
-
-PDEPEND="|| ( app-text/ghostscript-gpl[cups] app-text/ghostscript-gnu[cups] )"
+	X? ( x11-misc/xdg-utils )
+"
+PDEPEND="
+	|| (
+		app-text/ghostscript-gpl[cups]
+		app-text/ghostscript-gnu[cups]
+	)
+	>=app-text/poppler-0.12.3-r3[utils]
+"
 
 PROVIDE="virtual/lpr"
 
@@ -102,7 +115,7 @@ src_configure() {
 		--with-cups-group=lp \
 		--with-docdir=/usr/share/cups/html \
 		--with-languages="${LINGUAS}" \
-		--with-pdftops=pdftops \
+		--with-pdftops=/usr/bin/pdftops \
 		--with-system-groups=lpadmin \
 		$(use_enable acl) \
 		$(use_enable dbus) \