Update cups

6 files changed, 22 insertions, 14 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 8010543..0265b17 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.454 2012/02/08 14:51:03 jer Exp $
 
+  04 May 2012; Daniel Solano Gómez <gentoo@sattvik.com> cups-1.4.8-r1.ebuild,
+  cups-1.4.8-r23.ebuild, cups-1.5.2-r4.ebuild, cups-1.5.2-r20.ebuild:
+  Sync up with portage.
+
 *cups-1.5.2-r20 (27 Apr 2012)
 *cups-1.5.2-r4 (27 Apr 2012)
 
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 48fd1e1..fe0c882 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -22,9 +22,9 @@ DIST cups-1.4.8-source.tar.bz2 4547162 RMD160 ee80e8d0b56dc0e2edf2a9aa9a43c4b926
 DIST cups-1.5.2-avahi.patch.bz2 17252 RMD160 40c7165de7f23e01aa3edf3968406e69fd0280f7 SHA1 e69c9b62b2773431dd7bb86573255d7c39fc2012 SHA256 6100029c6eec05729b6ef49f743876b9bf4d67f7b20b624be98372f4fb3e1ede
 DIST cups-1.5.2-ipp-r8950.patch.bz2 19525 RMD160 346a3141ae445dc9f17c7fbc0a467aea4910f10b SHA1 4bc3b40771261c37b63cbe4f65213b5db6c66534 SHA256 1a2d36136fc66b5f53e7cfb3e5d815e62cc3a6b4cc61d678f29d8a0bb748572a
 DIST cups-1.5.2-source.tar.bz2 9595665 RMD160 98181e2ee8c6e574fb6d405f688f52c9b61a2355 SHA1 56fdb4f58e676607845321c0296c1e90e416883f SHA256 b150aa108c631f4f07e92cb13c01263a67170e5ac8383c5548ef8f8473a187fb
-EBUILD cups-1.4.8-r1.ebuild 7312 RMD160 c05be205bbc05df5034bf57880adfaa8c58be907 SHA1 ce80b4276953ed364583762b659b2e52c29645ee SHA256 d9ad745fe8312f307b5b13979a6ae000ac6e10216d8779466af99b14a60a30a9
-EBUILD cups-1.4.8-r23.ebuild 8922 RMD160 1ef9e2c1f6f52a7adb8b30b2d4c43b74e74fcf59 SHA1 a24491edffbc09ab0a2e010593677d22dcc138b7 SHA256 d7c2bdd62e77815a7bfe2aef62107fc03d3bae7fa81cbf6bd1b89268c4db0300
-EBUILD cups-1.5.2-r20.ebuild 8477 RMD160 2b1ad492d3fca271e3c2992bd766a20caa35d14c SHA1 25a98aada1a8a217b546b4d5449d16133e0650fe SHA256 5e0e5bfb798b957478a320eee1a390dc04ac9f4a15541f3249e3a6d3c0478e70
-EBUILD cups-1.5.2-r4.ebuild 8284 RMD160 34706d600c43505a47cb71358336bc314d0738e4 SHA1 43279845e31e881bee9ce60524a973ca25a78209 SHA256 49e6ad56b2531bbb347db677eb25c79f0ca671d090c1d3af1163b3325f5c9a0d
-MISC ChangeLog 69738 RMD160 4277fc705fa98a93b585686aeb19ea2bafea3f12 SHA1 bea9a32185f34fa6865dee7ced7a9801e75d99a8 SHA256 433bc413d999f341285e9e8ce7d9bc062eae502cfde40b9f97a32623b90b9f96
+EBUILD cups-1.4.8-r1.ebuild 7308 RMD160 c54f6afc3378f4533fba70a81596bc91cbd8f246 SHA1 90cc9c36c59700673fee34eaa838a49762b5d756 SHA256 ed07484f7896d3a6958d31a112169150a1cd93d7e20911a752d1a53e9a4fd002
+EBUILD cups-1.4.8-r23.ebuild 8918 RMD160 e9bced39eeedfa497e2fea9efa75961a4e85018f SHA1 44fe6d7673f7381809ae69b58f847b532bdba18a SHA256 2f69534f197b14cdead18a6c7d70f2aef7dd31cce739f4b96f3c85e98904d59d
+EBUILD cups-1.5.2-r20.ebuild 8545 RMD160 29107dc4cc033ff22ef66f776181674ce9390720 SHA1 f6605586995f3c316b35b9187171a0e39df1fc07 SHA256 055c9a0b941d1ca584713173e3b155301744af3213cb03d70daced068aca27d5
+EBUILD cups-1.5.2-r4.ebuild 8349 RMD160 a7ada879a5f619f6991e11eaf23e5f10f6998900 SHA1 e8ca3e46c2ed69512cb40027c4512ea4c801e2fa SHA256 5d850521d1d8d0dfdc5e2d763f15306382dd31771f4f5d369774aa495f97db4d
+MISC ChangeLog 69912 RMD160 a5b7b2750dfd7bce611126709e8cb9b7564a22c9 SHA1 20939819cf9cee607210d78d4f27bc8c29bc2cfa SHA256 c25b2e8c0465b892f6a79384b1aa29e8b9e3b7f437f461ac63e68c15567c59f8
 MISC metadata.xml 691 RMD160 2a77a55b3ba142202c16f7c9e5710107cdd7565f SHA1 0fedf6ebd837708cd218a4a03741a20091714950 SHA256 3d89754273130856a7433fb325a132b07b86f7c0391284ab2c7dc8a2fa46fec7
diff --git a/net-print/cups/cups-1.4.8-r1.ebuild b/net-print/cups/cups-1.4.8-r1.ebuild
index 161e050..823d596 100644
--- a/net-print/cups/cups-1.4.8-r1.ebuild
+++ b/net-print/cups/cups-1.4.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r1.ebuild,v 1.11 2012/01/27 21:30:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r1.ebuild,v 1.12 2012/05/03 07:22:30 jdhore Exp $
 
 EAPI=3
 
@@ -56,7 +56,7 @@ RDEPEND="
 "
 
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
+	virtual/pkgconfig
 "
 
 PDEPEND="
diff --git a/net-print/cups/cups-1.4.8-r23.ebuild b/net-print/cups/cups-1.4.8-r23.ebuild
index 6998dd8..8e55b79 100644
--- a/net-print/cups/cups-1.4.8-r23.ebuild
+++ b/net-print/cups/cups-1.4.8-r23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r23.ebuild,v 1.5 2012/01/27 21:30:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r23.ebuild,v 1.6 2012/05/03 07:22:30 jdhore Exp $
 
 EAPI=3
 
@@ -57,7 +57,7 @@ RDEPEND="
 "
 
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
+	virtual/pkgconfig
 "
 
 PDEPEND="
diff --git a/net-print/cups/cups-1.5.2-r20.ebuild b/net-print/cups/cups-1.5.2-r20.ebuild
index e0a4930..34dd329 100644
--- a/net-print/cups/cups-1.5.2-r20.ebuild
+++ b/net-print/cups/cups-1.5.2-r20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r20.ebuild,v 1.1 2012/04/26 21:51:03 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r20.ebuild,v 1.3 2012/05/03 07:22:30 jdhore Exp $
 
 EAPI=4
 
@@ -37,6 +37,7 @@ RDEPEND="
 			sys-apps/attr
 		)
 	)
+	avahi? ( net-dns/avahi )
 	dbus? ( sys-apps/dbus )
 	java? ( >=virtual/jre-1.6 )
 	jpeg? ( virtual/jpeg:0 )
@@ -61,7 +62,7 @@ RDEPEND="
 "
 
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
+	virtual/pkgconfig
 "
 
 PDEPEND="
@@ -244,6 +245,7 @@ src_install() {
 
 	# install our init script
 	local neededservices
+	use avahi && neededservices+=" avahi-daemon"
 	use dbus && neededservices+=" dbus"
 	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
 	cp "${FILESDIR}"/cupsd.init.d "${T}"/cupsd || die
diff --git a/net-print/cups/cups-1.5.2-r4.ebuild b/net-print/cups/cups-1.5.2-r4.ebuild
index 16911e9..b82789c 100644
--- a/net-print/cups/cups-1.5.2-r4.ebuild
+++ b/net-print/cups/cups-1.5.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r4.ebuild,v 1.1 2012/04/26 21:51:03 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r4.ebuild,v 1.6 2012/05/03 20:45:48 maekke Exp $
 
 EAPI=4
 
@@ -20,7 +20,7 @@ SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
+KEYWORDS="amd64 arm hppa ~ppc ~x86"
 IUSE="acl avahi dbus debug +filters gnutls java +jpeg kerberos ldap pam perl
 	+png python slp +ssl static-libs +threads +tiff usb X xinetd"
 
@@ -37,6 +37,7 @@ RDEPEND="
 			sys-apps/attr
 		)
 	)
+	avahi? ( net-dns/avahi )
 	dbus? ( sys-apps/dbus )
 	java? ( >=virtual/jre-1.6 )
 	jpeg? ( virtual/jpeg:0 )
@@ -60,7 +61,7 @@ RDEPEND="
 "
 
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
+	virtual/pkgconfig
 "
 
 PDEPEND="
@@ -239,6 +240,7 @@ src_install() {
 
 	# install our init script
 	local neededservices
+	use avahi && neededservices+=" avahi-daemon"
 	use dbus && neededservices+=" dbus"
 	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
 	cp "${FILESDIR}"/cupsd.init.d "${T}"/cupsd || die