Sync up with portage

20 files changed, 104 insertions, 1386 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 2b638c5..cd355ea 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,7 +1,23 @@
 # ChangeLog for net-print/cups
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*cups-1.5.0-r3 (19 Jan 2012)
+*cups-1.4.8-r23 (19 Jan 2012)
+
+  19 Jan 2012; Daniel Solano Gómez <gentoo@sattvik.com>
+  -files/cups-1.3.0-configure.patch, -files/cups-1.3.7-backend-https.patch,
+  -files/cups-1.3.8-group_fix.patch, -files/cups-1.3.10-str3178.patch,
+  -cups-1.3.11-r4.ebuild, -files/cups-1.3.11-pdf-m4.patch,
+  -files/cups-1.3.11-str3200.patch,
+  -files/cups-1.3.11-str3367-security-1.3v2.patch,
+  -files/cups-1.3.11-str3401-security-1.3v2-regression.patch,
+  -cups-1.4.6-r2.ebuild, -files/cups-1.4.6-web-hang.patch,
+  cups-1.4.8-r1.ebuild, -cups-1.4.8-r21.ebuild, cups-1.4.8-r22.ebuild,
+  +cups-1.4.8-r23.ebuild, -cups-1.5.0-r1.ebuild, cups-1.5.0-r2.ebuild,
+  +cups-1.5.0-r3.ebuild, files/cupsd.init.d, metadata.xml:
+  Sync up with portage.
+
   06 Oct 2011; Daniel Solano Gómez <gentoo@sattvik.com> cups-1.4.8-r1.ebuild,
   cups-1.4.8-r21.ebuild, cups-1.5.0-r1.ebuild, cups-1.5.0-r2.ebuild:
   Sync up with main tree.
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 3432694..1a4307a 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,11 +1,3 @@
-AUX cups-1.3.0-configure.patch 651 RMD160 e4c7f45d7ddc28157433bf025c7f946c7e3b6d6a SHA1 101bf1893b56640d9fa82078e29319fbbd1449c7 SHA256 d6e5e60a982a3c093c0d0f89cf865e2b4c36290f5b1e188b7bf305d210070736
-AUX cups-1.3.10-str3178.patch 888 RMD160 ff061fc3500960f441c59896cdfe421d5f47f386 SHA1 fac5361b1172aba167d48988f874faa6faf1554a SHA256 e6550fad17017ac6897e6e9c70a4aafaaec5473c05a19e9e50277293cdc6aac6
-AUX cups-1.3.11-pdf-m4.patch 1476 RMD160 be4d4ed2b699625282c9725faee08e01edca9b7a SHA1 a8b092b9c155c161c781319a94cb1bb7de734c3f SHA256 191b0c41c142ed31718fc01f55fcefc6c26735fa56165c23450fd7a454818b01
-AUX cups-1.3.11-str3200.patch 1782 RMD160 6c9134d1bc90650b882e167a5ae118d0f239b7ae SHA1 adb5b0ef222ad5beb2424bcb93a3c891af6a744e SHA256 2ae6d48ce7071051120740d654787be1bba0258752f4844f55a18f8e03e062e6
-AUX cups-1.3.11-str3367-security-1.3v2.patch 12834 RMD160 e770139528cbdf918f5c9073fbea8b31f30cac0f SHA1 81825028af8021aff2e67a36d8e9aa71cbbb42f4 SHA256 d4d770ce17855293348059451909fecbcc9e968d6731ac73b8d81927e2afe134
-AUX cups-1.3.11-str3401-security-1.3v2-regression.patch 871 RMD160 bb08b55e8d61341e9eeecc8fe99ba743d38500dd SHA1 33a919f4ef5de3c780f6f35e68d096ccf8371718 SHA256 ab9f24c05a422995b9ee274f36ffa0a9a6dca4d55fde4830a31201d1e61bd756
-AUX cups-1.3.7-backend-https.patch 450 RMD160 9a1ad48d2be40c89510ccc512649f0a2eb5543b0 SHA1 d3dd55fcdee47855d6b7c1443adb6c2b3d8c9cdb SHA256 060f929ae3eae5dc411ce6352a0d50c3296b013974f034fc2ad8d6bb0c81b45a
-AUX cups-1.3.8-group_fix.patch 1755 RMD160 c26e4b0fb3d47b022200c4220807c0116038f0a6 SHA1 583055cdbad6bf32f380e3a2d03a933850e3db4e SHA256 c0160400b885f2c4b1a656473d01074a497c812db8effb54094d2fa936dd2c40
 AUX cups-1.4.0-backend-https.patch 483 RMD160 b338f67ebf0719b5e12eaa8490affbd7a1bb8c0e SHA1 bfeadba67792203d654a64bdec16f3d2a31aeca6 SHA256 9060a5d848d6655db4629822d01fd772a3fbe1a5107109c50cb0ecb4de7a9526
 AUX cups-1.4.1-group_fix.patch 1752 RMD160 b2e8fde6ddc0e385e85ced4e38668bea23cde800 SHA1 241fa8f1220976cd69c447bc276d17d8808c8eed SHA256 625a5abff28d58ef0f747781777535549ddba77dd36f1cf72c3aea7a4fdafaab
 AUX cups-1.4.2-str3200.patch 1654 RMD160 cc40d26f7e9dbe5a12d9426535d09de10254da26 SHA1 b330108bcfb8ca3ab5d6dd3b48dc3d2937c7bca1 SHA256 8a64f5c72d64ecd95d330fd90630eb02a67865c07921ecb0c010e84b49b537e0
@@ -16,22 +8,17 @@ AUX cups-1.4.4-perl-includes.patch 637 RMD160 88d4f170ed5c9392860462f140adf9f860
 AUX cups-1.4.4-php-destdir.patch 679 RMD160 1b15d42373a952a608a01cb8c97efbbd3c78ac77 SHA1 e312bbae57224dead45284f9c62942b1a25282fc SHA256 d5126c5e917d8c41c7a4da1477800edd4aa752aaa4c6a67a73adbe1e3b050110
 AUX cups-1.4.6-force-gnutls.patch 3319 RMD160 c6cc024a702305eb81661d5cdadd9857e9a6778e SHA1 5ac62ed3ca20bc7a4541c990c676c433299b2177 SHA256 beb4014eac5218d9f424b81946ac1e209625026bf20a7f4820758e5ee1fe5b66
 AUX cups-1.4.6-serialize-gnutls.patch 3625 RMD160 873b2806cfec732c4a4f3f2981f666a958dd5b0e SHA1 aae046121d0139fbba1cb9147c8742f73b2f1fa0 SHA256 6bc9e16fc6865b2f3e0ee2d1947bdde691e41f90fce32b9839b3661dcea4a827
-AUX cups-1.4.6-web-hang.patch 1749 RMD160 ff8d4cfa10a5de5a911c8672313904f50b13fd0f SHA1 f37a3fb7d71a6d56bbb3e5e7a8cf74ca8cb19276 SHA256 f49cef2ce1f2eecdd8ee07d85f306a19375f6d48510763aa51e96a0c54ad27c5
 AUX cups-1.4.8-CVE-2011-3170.patch 1045 RMD160 9a27eb1ec34ced57da5bbe7c55261d8aa35b01c0 SHA1 6155d7c4b34ff6447a93aa56fa4b5958eb943202 SHA256 c94d49c3ff980b830874dae4158768554f87f429ae400838a605505aae350af6
 AUX cups-1.4.8-largeimage.patch 572 RMD160 62e0a92fb1dc62adff43bcdc22f201da426d8916 SHA1 1528f2b1f67e7c532418dd7f495db1788ae7d2d4 SHA256 364a3ed3e161ad75836e6bc56746c25207680ab6f44563219c93146f0cf74541
 AUX cups-1.5.0-group_fix.patch 1774 RMD160 cd6b98deecbc8e6f92fdf24f6682c3426a4512b2 SHA1 501ada69a9607c7831f827277c5691b34392d519 SHA256 88a7d41298a43fd2004ef6d40690333c6a1e9c1da4251ac9f23b659e91a6559f
-AUX cupsd.init.d 293 RMD160 19fbef21cee7e472e7028f3101b680baa0089c54 SHA1 e6b27b2638fec258fe2f55c926c2530e909ca3d2 SHA256 b4268a6bae95e96b6af21c3716ecc905073736ce7dc33be1489d574a447f3c48
+AUX cupsd.init.d 402 RMD160 1b132354d01ad2ecebbe5238b09dfa3cb9391d43 SHA1 ea48170f3369486792ed9f98fe7d1c53487b455c SHA256 66b14dffc99900c0db04453765e5bf48cdf0c197c6f50dccf2a55dc66dd0cf95
 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.6-source.tar.bz2 4517061 RMD160 94c9921e03f5ec52d9c16947435622365f53aef6 SHA1 42fb1ca00ee7291561564d3072716eb2045f05d1 SHA256 f08711702a77b52c7150f96fe1f45482f6151cb95ef601268c528607fe6ad514
 DIST cups-1.4.8-source.tar.bz2 4547162 RMD160 ee80e8d0b56dc0e2edf2a9aa9a43c4b92619f741 SHA1 9167f556e78e0bc075f1eb2f695d79cc1f334007 SHA256 6bd27e1213c139ed0bbadc5c29f97cf1e8f7f8f5b0bb29b227ecaff32aafa9a6
 DIST cups-1.5.0-source.tar.bz2 4090210 RMD160 e7be9b6b44428561609c59abaea8fa31a11aefff SHA1 628f549867751e373fc20c7558fec422f9eb942b SHA256 c6f99b68a558f4d626e9a5076d664f38e9925715dc541b07f0328c9aeb02ec33
-EBUILD cups-1.3.11-r4.ebuild 8230 RMD160 06cae988bc72fd05846e74c736798294c948ea1d SHA1 4a88b7dd7c62690e4e3ebdd3c8da1087ba5f94d9 SHA256 b7643b9e72c90fa66078ab8d4af8af463d1bfdf837e465e9fc078276e418493d
-EBUILD cups-1.4.6-r2.ebuild 7302 RMD160 ae4b79035d1bffde784e6e93e03787f7eaaf4cc6 SHA1 a8dbbd84a26884bf88c3da27234c86bab011d471 SHA256 feba1310274d9a11b2966c0e22498e3eec44aff2f342a24e53428b1c7031d4ae
-EBUILD cups-1.4.8-r1.ebuild 7261 RMD160 1e5b97606ebbe5a2a40718569b576bdabcf4e9bb SHA1 7459afcabf0b86dfdd6606125042721f012fff91 SHA256 35d4fa661fdb2e400867460a8f1c7519c4c119d15612d0744bb8131d4562b55e
-EBUILD cups-1.4.8-r21.ebuild 8513 RMD160 416859157cc245ffb18652cb167b4bbd90187d6c SHA1 fc6e1ac8464f011b22d156dbaacae145e103ac1e SHA256 ca7db772310779e3323f7ba8b1654fa6724466e316a904dcbf8b4648b375f18f
-EBUILD cups-1.4.8-r22.ebuild 8564 RMD160 10ac049fd78cd10eeb1e8b90f30ebc49bee43bb9 SHA1 ade38fdfc3048857dba8ebe5bae1f5297a5af397 SHA256 fd676171a9dae7c172d78ef9635b4151a399d9ba1a71b504811dd213ea207ae1
-EBUILD cups-1.5.0-r1.ebuild 8369 RMD160 39794df46df95db4cd4862fc04d7d705a0f05623 SHA1 7f5fc021f7154adf028d99bbf4751be6b67f2372 SHA256 847e99629fd7f3692e18ea216e205cfe32358eb8b2e0d19746c0e5b564751ddd
-EBUILD cups-1.5.0-r2.ebuild 6572 RMD160 ff1eab43f971c9e9028c9adae086fcb5077b1fcf SHA1 2d935d2e06544e40cd8eb7efeb57107f79f0a981 SHA256 bea2ee7b58fe5e4eab223fd4baf8cfe06fcc39b23ee9e77853ee8b0b16175246
-MISC ChangeLog 3525 RMD160 575fcb2f7fe2ff9edd5b81fd4c4959808c4c76a3 SHA1 e87f6586c2a2ceefa5ee3f6021501fff092332cb SHA256 5a6b9612a41c72f7e53cc5ffa1cc96450e781f393540cddd0af5faa6e7a79050
-MISC metadata.xml 586 RMD160 73a1f1c0096d5035dfa53207b00c125894f6822a SHA1 123501263490cab57af2b99f2336fb70c094d9b0 SHA256 3b729c497ee38452b1ca051b759f43b5f9e117f9c36c0f3b660e4bd8ab7c295b
+EBUILD cups-1.4.8-r1.ebuild 7317 RMD160 4613c88f64852a61f09c2f0b20736f96b61fdf46 SHA1 69884c35777d63ad57a936d646d898ee94572223 SHA256 39f0c51249722595ad9a0340eb93fd80148f3ff55c46089140cdb033282d1bb0
+EBUILD cups-1.4.8-r22.ebuild 8563 RMD160 99098b75481312bee9e82ca0d5d523bdf86beb71 SHA1 b87099033aaf8b12ab91398ef95bdd21293785c1 SHA256 815539bcbabf560a9b481dffd49beeed8d06d27f2ec4bf985eb22ad7b8278140
+EBUILD cups-1.4.8-r23.ebuild 8928 RMD160 199666537496cf60b59a3701edfcb31e3b8811aa SHA1 79866423ff990a88bb07d21baf8637bea3b75f00 SHA256 7dd60a0320774ecb021b132ce2448f619b7f703699ac52cc759c249637a00c78
+EBUILD cups-1.5.0-r2.ebuild 6571 RMD160 ba38b72c4741bcb9d14684079a5e0aa3b502a5eb SHA1 3abd07514902c4f562fc798fe87bb388c7a4292b SHA256 6ff49fd5b257aa48970541a78033d167a8d2bb5d0150d04600947cc322f5783b
+EBUILD cups-1.5.0-r3.ebuild 6936 RMD160 81ffebb0bd7f0dd39b6af36eee950eaf20a3a396 SHA1 5e13d8a34fd6e6e2535e7a4a4da47de71ce325d7 SHA256 ab7ceb93c83b7de87015affa3cfdee33a9575186d28e920eaebf01fbcb303df1
+MISC ChangeLog 4282 RMD160 28ae248a8289aa6694698fed568936cf128d1173 SHA1 ec31f151fc3df0d61e2ecf24752517f7b38d1a3b SHA256 1cadf6213c609d6804104d77f85a3d6c268a6a66c14ee27d088734f2010647d2
+MISC metadata.xml 691 RMD160 2a77a55b3ba142202c16f7c9e5710107cdd7565f SHA1 0fedf6ebd837708cd218a4a03741a20091714950 SHA256 3d89754273130856a7433fb325a132b07b86f7c0391284ab2c7dc8a2fa46fec7
diff --git a/net-print/cups/cups-1.3.11-r4.ebuild b/net-print/cups/cups-1.3.11-r4.ebuild
deleted file mode 100644
index b8e8f85..0000000
--- a/net-print/cups/cups-1.3.11-r4.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2011 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-r4.ebuild,v 1.5 2011/04/30 15:10:52 scarabeus Exp $
-
-EAPI=2
-inherit autotools eutils flag-o-matic multilib pam
-
-MY_P=${P/_}
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-SRC_URI="mirror://easysw/${PN}/${PV}/${MY_P}-source.tar.bz2"
-
-LICENSE="GPL-2"
-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="
-	app-text/libpaper
-	dev-libs/libgcrypt
-	acl? (
-		kernel_linux? (
-			sys-apps/acl
-			sys-apps/attr
-		)
-	)
-	avahi? ( net-dns/avahi[mdnsresponder-compat] )
-	dbus? ( sys-apps/dbus )
-	gnutls? ( net-libs/gnutls )
-	java? ( >=virtual/jre-1.4 )
-	jpeg? ( virtual/jpeg )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam )
-	perl? ( dev-lang/perl )
-	php? ( dev-lang/php )
-	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 )
-	)
-	tiff? ( >=media-libs/tiff-3.5.5 )
-	xinetd? ( sys-apps/xinetd )
-	zeroconf? (
-		!avahi? ( net-misc/mDNSResponder )
-	)
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!<net-print/foomatic-filters-ppds-20070501
-	!<net-print/hplip-1.7.4a-r1
-	X? ( x11-misc/xdg-utils )
-"
-PDEPEND="
-	app-text/ghostscript-gpl[cups]
-	>=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
-		)
-	)
-	samba? ( >=net-fs/samba-3.0.8 )
-"
-
-# upstream includes an interactive test which is a nono for gentoo.
-# therefore, since the printing herd has bigger fish to fry, for now,
-# we just leave it out, even if FEATURES=test
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-LANGS="de en es et fr he id it ja pl sv zh_TW"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-pkg_setup() {
-	enewgroup lp
-	enewuser lp -1 -1 -1 lp
-
-	enewgroup lpadmin 106
-}
-
-src_prepare() {
-	# disable configure automagic for acl/attr, upstream bug STR #2723
-	epatch "${FILESDIR}/${PN}-1.3.0-configure.patch"
-
-	# create a missing symlink to allow https printing via IPP, bug #217293
-	epatch "${FILESDIR}/${PN}-1.3.7-backend-https.patch"
-
-	# detect recent libgnutls versions, upstream bug STR #3178
-	epatch "${FILESDIR}/${PN}-1.3.10-str3178.patch"
-
-	# CVE-2009-2820: Several XSS flaws in forms processed by CUPS web interface
-	# upstream bug STR #3178 and STR #3401
-	epatch "${FILESDIR}/${PN}-1.3.11-str3367-security-1.3v2.patch"
-	epatch "${FILESDIR}/${PN}-1.3.11-str3401-security-1.3v2-regression.patch"
-	# CVE-2009-3553: Use-after-free (crash) due improper reference counting in abstract file descriptors handling interface
-	# upstream bug STR #3200
-	epatch "${FILESDIR}/${PN}-1.3.11-str3200.patch"
-	# Fix failing if poppler is not around
-	epatch "${FILESDIR}/${PN}-1.3.11-pdf-m4.patch"
-
-	# Dan's groups patch
-	epatch "${FILESDIR}/${PN}-1.3.8-group_fix.patch"
-
-	# cups does not use autotools "the usual way" and ship a static config.h.in
-	eaclocal
-	eautoconf
-}
-
-src_configure() {
-	# Fails to compile on SH
-	use sh && replace-flags -O? -O0
-
-	# needed to prevent ghostscript compile failures
-	use kerberos && strip-flags
-
-	# locale support
-	strip-linguas ${LANGS}
-
-	if [ -z "${LINGUAS}" ] ; then
-		export LINGUAS=all
-	fi
-
-	export DSOFLAGS="${LDFLAGS}"
-
-	if use ldap ; then
-		append-flags -DLDAP_DEPRECATED
-	fi
-
-	local myconf
-
-	if use avahi || use zeroconf ; then
-		myconf="${myconf} --enable-dnssd"
-	else
-		myconf="${myconf} --disable-dnssd"
-	fi
-
-	if use ssl || use gnutls ; then
-		myconf="${myconf} \
-			$(use_enable gnutls) \
-			$(use_enable !gnutls openssl)"
-	else
-		myconf="${myconf} \
-			--disable-gnutls \
-			--disable-openssl"
-	fi
-
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--localstatedir=/var \
-		--with-cups-user=lp \
-		--with-cups-group=lp \
-		--with-docdir=/usr/share/cups/html \
-		--with-languages=${LINGUAS} \
-		--with-pdftops=/usr/bin/pdftops \
-		--with-system-groups=lpadmin \
-		--with-xinetd=/etc/xinetd.d \
-		$(use_enable acl) \
-		$(use_enable dbus) \
-		$(use_enable jpeg) \
-		$(use_enable kerberos gssapi) \
-		$(use_enable ldap) \
-		$(use_enable pam) \
-		$(use_enable png) \
-		$(use_enable slp) \
-		$(use_enable static) \
-		$(use_enable tiff) \
-		$(use_with java) \
-		$(use_with perl) \
-		$(use_with php) \
-		$(use_with python) \
-		--enable-libpaper \
-		--enable-threads \
-		--with-optim="${CFLAGS}" \
-		${myconf}
-
-	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
-	# makes more sense when facing multilib support.
-	sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)"/usr/libexec/cups:' Makedefs
-	sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h
-	sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config
-}
-
-src_install() {
-	emake BUILDROOT="${D}" install || die "emake install failed"
-	dodoc {CHANGES{,-1.{0,1}},CREDITS,README}.txt || die "dodoc install failed"
-
-	# clean out cups init scripts
-	rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups}
-
-	# install our init script
-	local neededservices
-	use avahi && neededservices="$neededservices avahi-daemon"
-	use dbus && neededservices="$neededservices dbus"
-	use zeroconf && ! use avahi && neededservices="$neededservices mDNSResponderPosix"
-	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
-	sed -e "s/@neededservices@/$neededservices/" "${FILESDIR}"/cupsd.init.d > "${T}"/cupsd
-	doinitd "${T}"/cupsd
-
-	# install our pam script
-	pamd_mimic_system cups auth account
-
-	if use xinetd ; then
-		# correct path
-		sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" "${D}"/etc/xinetd.d/cups-lpd
-		# it is safer to disable this by default, bug #137130
-		grep -w 'disable' "${D}"/etc/xinetd.d/cups-lpd || \
-			sed -i -e "s:}:\tdisable = yes\n}:" "${D}"/etc/xinetd.d/cups-lpd
-	else
-		rm -rf "${D}"/etc/xinetd.d
-	fi
-
-	keepdir /usr/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \
-		/var/run/cups/certs /var/cache/cups /var/spool/cups/tmp /etc/cups/ssl
-
-	# .desktop handling. X useflag. xdg-open from freedesktop is preferred, upstream bug STR #2724.
-	if use X ; then
-		sed -i -e "s:htmlview:xdg-open:" "${D}"/usr/share/applications/cups.desktop
-	else
-		rm -r "${D}"/usr/share/applications
-	fi
-
-	# fix a symlink collision, see bug #172341
-	dodir /usr/share/ppd
-	dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds
-
-	# create RSS feed directory
-	diropts -m 0740 -o lp -g lp
-	dodir /var/cache/cups/rss
-
-	# create /etc/cups/client.conf, bug #196967 and #266678
-	echo "ServerName /var/run/cups/cups.sock" >> "${D}"/etc/cups/client.conf
-}
-
-pkg_preinst() {
-	# cleanups
-	[ -n "${PN}" ] && rm -fR "${ROOT}"/usr/share/doc/"${PN}"-*
-	has_version "=${CATEGORY}/${PN}-1.2*"
-	upgrade_from_1_2=$?
-}
-
-pkg_postinst() {
-	echo
-	elog "For information about installing a printer and general cups setup"
-	elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml"
-	echo
-
-	if [[ $upgrade_from_1_2 = 0 ]] ; then
-		echo
-		ewarn "You have upgraded from an older cups version. Please make sure"
-		ewarn "to run \"etc-update\" and \"revdep-rebuild\" NOW."
-		echo
-	fi
-
-	if [ -e "${ROOT}"/usr/lib/cups ] ; then
-		echo
-		ewarn "/usr/lib/cups exists - You need to remerge every ebuild that"
-		ewarn "installed into /usr/lib/cups and /etc/cups, qfile is in portage-utils:"
-		ewarn "# FEATURES=-collision-protect emerge -va1 \$(qfile -qC /usr/lib/cups /etc/cups | sed -e \"s:net-print/cups$::\")"
-		echo
-		ewarn "FEATURES=-collision-protect is needed to overwrite the compatibility"
-		ewarn "symlinks installed by this package, it won't be needed on later merges."
-		ewarn "You should also run revdep-rebuild"
-		echo
-
-		# place symlinks to make the update smoothless
-		for i in "${ROOT}"/usr/lib/cups/{backend,filter}/* ; do
-			if [ "${i/\*}" == "${i}" ] && ! [ -e ${i/lib/libexec} ] ; then
-				ln -s ${i} ${i/lib/libexec}
-			fi
-		done
-	fi
-}
diff --git a/net-print/cups/cups-1.4.8-r1.ebuild b/net-print/cups/cups-1.4.8-r1.ebuild
index 9034900..cb87a51 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-2011 Gentoo Foundation
+# 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.7 2011/09/03 13:21:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r1.ebuild,v 1.9 2012/01/15 22:41:37 dilfridge Exp $
 
 EAPI=3
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://easysw/${PN}/${PV}/${MY_P}-source.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="acl dbus debug gnutls java +jpeg kerberos ldap pam perl php +png python samba slp +ssl static-libs +threads +tiff X xinetd"
+IUSE="acl dbus debug +filters gnutls java +jpeg kerberos ldap pam perl php +png python samba slp +ssl static-libs +threads +tiff X xinetd"
 
 LANGS="da de es eu fi fr id it ja ko nl no pl pt pt_BR ru sv zh zh_TW"
 for X in ${LANGS} ; do
@@ -33,6 +33,7 @@ RDEPEND="
 		)
 	)
 	dbus? ( sys-apps/dbus )
+	filters? ( net-print/foomatic-filters )
 	java? ( >=virtual/jre-1.6 )
 	jpeg? ( virtual/jpeg:0 )
 	kerberos? ( virtual/krb5 )
@@ -40,7 +41,7 @@ RDEPEND="
 	pam? ( virtual/pam )
 	perl? ( dev-lang/perl )
 	php? ( dev-lang/php )
-	png? ( >=media-libs/libpng-1.4.3 )
+	png? ( >=media-libs/libpng-1.4.3:0 )
 	slp? ( >=net-libs/openslp-1.0.4 )
 	ssl? (
 		gnutls? (
@@ -49,7 +50,7 @@ RDEPEND="
 		)
 		!gnutls? ( >=dev-libs/openssl-0.9.8g )
 	)
-	tiff? ( >=media-libs/tiff-3.5.5 )
+	tiff? ( >=media-libs/tiff-3.5.5:0 )
 	X? ( x11-misc/xdg-utils )
 	xinetd? ( sys-apps/xinetd )
 	!net-print/cupsddk
diff --git a/net-print/cups/cups-1.4.8-r22.ebuild b/net-print/cups/cups-1.4.8-r22.ebuild
index e1e929c..73a8e03 100644
--- a/net-print/cups/cups-1.4.8-r22.ebuild
+++ b/net-print/cups/cups-1.4.8-r22.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-r22.ebuild,v 1.1 2011/08/28 23:20:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r22.ebuild,v 1.2 2011/11/13 11:36:59 jlec Exp $
 
 EAPI=3
 
@@ -40,7 +40,7 @@ RDEPEND="
 	pam? ( virtual/pam )
 	perl? ( dev-lang/perl )
 	php? ( dev-lang/php )
-	png? ( >=media-libs/libpng-1.4.3 )
+	png? ( >=media-libs/libpng-1.4.3:0 )
 	slp? ( >=net-libs/openslp-1.0.4 )
 	ssl? (
 		gnutls? (
@@ -49,7 +49,7 @@ RDEPEND="
 		)
 		!gnutls? ( >=dev-libs/openssl-0.9.8g )
 	)
-	tiff? ( >=media-libs/tiff-3.5.5 )
+	tiff? ( >=media-libs/tiff-3.5.5:0 )
 	usb? ( virtual/libusb:0 )
 	X? ( x11-misc/xdg-utils )
 	xinetd? ( sys-apps/xinetd )
diff --git a/net-print/cups/cups-1.4.8-r21.ebuild b/net-print/cups/cups-1.4.8-r23.ebuild
index b8bf8fc..96048fc 100644
--- a/net-print/cups/cups-1.4.8-r21.ebuild
+++ b/net-print/cups/cups-1.4.8-r23.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-r21.ebuild,v 1.2 2011/08/27 10:46:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r23.ebuild,v 1.3 2012/01/15 22:41:37 dilfridge Exp $
 
 EAPI=3
 
 PYTHON_DEPEND="python? 2:2.5"
 
-inherit autotools eutils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2
+inherit autotools eutils fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2
 
 MY_P=${P/_}
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://easysw/${PN}/${PV}/${MY_P}-source.tar.bz2"
 LICENSE="GPL-2"
 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-libs +threads +tiff usb X xinetd"
+IUSE="acl dbus debug +filters gnutls java +jpeg kerberos ldap pam perl php +png python samba slp +ssl static-libs +threads +tiff usb X xinetd"
 
 LANGS="da de es eu fi fr id it ja ko nl no pl pt pt_BR ru sv zh zh_TW"
 for X in ${LANGS} ; do
@@ -33,6 +33,7 @@ RDEPEND="
 		)
 	)
 	dbus? ( sys-apps/dbus )
+	filters? ( net-print/foomatic-filters )
 	java? ( >=virtual/jre-1.6 )
 	jpeg? ( virtual/jpeg:0 )
 	kerberos? ( virtual/krb5 )
@@ -40,7 +41,7 @@ RDEPEND="
 	pam? ( virtual/pam )
 	perl? ( dev-lang/perl )
 	php? ( dev-lang/php )
-	png? ( >=media-libs/libpng-1.4.3 )
+	png? ( >=media-libs/libpng-1.4.3:0 )
 	slp? ( >=net-libs/openslp-1.0.4 )
 	ssl? (
 		gnutls? (
@@ -49,7 +50,7 @@ RDEPEND="
 		)
 		!gnutls? ( >=dev-libs/openssl-0.9.8g )
 	)
-	tiff? ( >=media-libs/tiff-3.5.5 )
+	tiff? ( >=media-libs/tiff-3.5.5:0 )
 	usb? ( virtual/libusb:0 )
 	X? ( x11-misc/xdg-utils )
 	xinetd? ( sys-apps/xinetd )
@@ -138,6 +139,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.4.4-perl-includes.patch"
 	epatch "${FILESDIR}/${PN}-1.4.6-force-gnutls.patch"
 	epatch "${FILESDIR}/${PN}-1.4.6-serialize-gnutls.patch"
+	epatch "${FILESDIR}/${PN}-1.4.8-largeimage.patch"
 	# security fixes
 	epatch "${FILESDIR}/${PN}-1.4.8-CVE-2011-3170.patch"
 
@@ -279,7 +281,7 @@ src_install() {
 	fi
 
 	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
-		/var/cache/cups /var/cache/cups/rss /var/log/cups /var/run/cups/certs \
+		/var/cache/cups /var/cache/cups/rss /var/log/cups \
 		/var/spool/cups/tmp
 
 	keepdir /etc/cups/{interfaces,ppd,ssl}
@@ -290,9 +292,23 @@ src_install() {
 	echo "ServerName /var/run/cups/cups.sock" >> "${D}"/etc/cups/client.conf
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+
 	echo
 	elog "For information about installing a printer and general cups setup"
 	elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml"
 	echo
 }
+
+pkg_postrm() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/net-print/cups/cups-1.5.0-r1.ebuild b/net-print/cups/cups-1.5.0-r1.ebuild
deleted file mode 100644
index 454d342..0000000
--- a/net-print/cups/cups-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.0-r1.ebuild,v 1.2 2011/08/27 10:46:02 dilfridge Exp $
-
-#
-# See http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=blob;f=net-print/cups/notes.txt;hb=HEAD
-# for some notes about the ongoing work here
-#
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit autotools eutils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2
-
-MY_P=${P/_}
-MY_PV=${PV/_}
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl dbus debug gnutls java +jpeg kerberos ldap pam perl php +png python samba slp +ssl static-libs +threads +tiff usb X xinetd"
-
-LANGS="da de es eu fi fr id it ja ko nl no pl pt pt_BR ru sv zh zh_TW"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-RDEPEND="
-	app-text/libpaper
-	acl? (
-		kernel_linux? (
-			sys-apps/acl
-			sys-apps/attr
-		)
-	)
-	dbus? ( sys-apps/dbus )
-	java? ( >=virtual/jre-1.6 )
-	jpeg? ( virtual/jpeg:0 )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap[ssl?,gnutls?] )
-	pam? ( virtual/pam )
-	perl? ( dev-lang/perl )
-	php? ( dev-lang/php )
-	png? ( >=media-libs/libpng-1.4.3 )
-	slp? ( >=net-libs/openslp-1.0.4 )
-	ssl? (
-		gnutls? (
-			dev-libs/libgcrypt
-			>=net-libs/gnutls-2.11
-		)
-		!gnutls? ( >=dev-libs/openssl-0.9.8g )
-	)
-	tiff? ( >=media-libs/tiff-3.5.5 )
-	usb? ( virtual/libusb:0 )
-	X? ( x11-misc/xdg-utils )
-	xinetd? ( sys-apps/xinetd )
-	!net-print/cupsddk
-"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-"
-
-PDEPEND="
-	app-text/ghostscript-gpl[cups]
-	>=app-text/poppler-0.12.3-r3[utils]
-"
-
-# upstream includes an interactive test which is a nono for gentoo.
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup lp
-	enewuser lp -1 -1 -1 lp
-	enewgroup lpadmin 106
-
-	# python 3 is no-go
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-
-	if use usb; then
-		elog "You are going to use new libusb backed to access your usb printer."
-		elog "This interface has quite few known issues and does not report all"
-		elog "issues and just refuses to print."
-		elog "Please consider disabling usb useflag if you are having issues."
-		elog
-		elog "Please note that if you disable the usb useflag your device will be"
-		elog "still working using kernel usblp interface instead of libusb."
-		echo
-	fi
-
-	linux-info_pkg_setup
-	if  ! linux_config_exists; then
-		ewarn "Can't check the linux kernel configuration."
-		ewarn "You might have some incompatible options enabled."
-	else
-		# recheck that we don't have usblp to collide with libusb
-		if use usb; then
-			if linux_chkconfig_present USB_PRINTER; then
-				eerror "Your usb printers will be managed via libusb which collides with kernel module."
-				eerror "${P} requires the USB_PRINTER support disabled."
-				eerror "Please disable it:"
-				eerror "    CONFIG_USB_PRINTER=n"
-				eerror "in /usr/src/linux/.config or"
-				eerror "    Device Drivers --->"
-				eerror "        USB support  --->"
-				eerror "            [ ] USB Printer support"
-				eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)."
-			fi
-		else
-			#here we should warn user that he should enable it so he can print
-			if ! linux_chkconfig_present USB_PRINTER; then
-				ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
-				ewarn "support in your kernel."
-				ewarn "Please enable it:"
-				ewarn "    CONFIG_USB_PRINTER=y"
-				ewarn "in /usr/src/linux/.config or"
-				ewarn "    Device Drivers --->"
-				ewarn "        USB support  --->"
-				ewarn "            [*] USB Printer support"
-				ewarn "Alternatively, enable the usb useflag for cups and use the new, less-tested libusb code."
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	# various build time fixes
-	epatch "${FILESDIR}/${PN}-1.4.4-dont-compress-manpages.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-fix-install-perms.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-nostrip.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-php-destdir.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-perl-includes.patch"
-	# security fixes
-	epatch "${FILESDIR}/${PN}-1.4.8-CVE-2011-3170.patch"
-
-	# Dan's group fix
-	epatch "${FILESDIR}/${PN}-1.5.0-group_fix.patch"
-
-	AT_M4DIR=config-scripts eaclocal
-	eautoconf
-}
-
-src_configure() {
-	export DSOFLAGS="${LDFLAGS}"
-
-	# locale support
-	strip-linguas ${LANGS}
-	if [ -z "${LINGUAS}" ] ; then
-		export LINGUAS=none
-	fi
-
-	local myconf
-	if use ssl || use gnutls ; then
-		myconf+="
-			$(use_enable gnutls)
-			$(use_enable !gnutls openssl)
-		"
-	else
-		myconf+="
-			--disable-gnutls
-			--disable-openssl
-		"
-	fi
-
-	# bug 352252, recheck for later versions if still necessary....
-	if use gnutls && ! use threads ; then
-		ewarn "The useflag gnutls requires also threads enabled. Switching on threads."
-	fi
-	if use gnutls || use threads ; then
-		myconf+=" --enable-threads "
-	else
-		myconf+=" --disable-threads "
-	fi
-
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--localstatedir=/var \
-		--with-cups-user=lp \
-		--with-cups-group=lp \
-		--with-docdir=/usr/share/cups/html \
-		--with-languages="${LINGUAS}" \
-		--with-pdftops=/usr/bin/pdftops \
-		--with-system-groups=lpadmin \
-		$(use_enable acl) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable debug debug-guards) \
-		$(use_enable jpeg) \
-		$(use_enable kerberos gssapi) \
-		$(use_enable ldap) \
-		$(use_enable pam) \
-		$(use_enable png) \
-		$(use_enable slp) \
-		$(use_enable static-libs static) \
-		$(use_enable tiff) \
-		$(use_enable usb libusb) \
-		$(use_with java) \
-		$(use_with perl) \
-		$(use_with php) \
-		$(use_with python) \
-		$(use_with xinetd xinetd /etc/xinetd.d) \
-		--enable-libpaper \
-		--disable-dnssd \
-		${myconf}
-
-	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
-	# makes more sense when facing multilib support.
-	sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)"/usr/libexec/cups:' Makedefs || die
-	sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h || die
-	sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config || die
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use perl ; then
-		cd "${S}"/scripting/perl
-		perl-module_src_prep
-		perl-module_src_compile
-	fi
-
-	if use php ; then
-		cd "${S}"/scripting/php
-		emake || die "emake php failed"
-	fi
-}
-
-src_install() {
-	emake BUILDROOT="${D}" install || die "emake install failed"
-	dodoc {CHANGES,CREDITS,README}.txt || die "dodoc install failed"
-
-	if use perl ; then
-		cd "${S}"/scripting/perl
-		perl-module_src_install
-		fixlocalpod
-	fi
-
-	if use php ; then
-		cd "${S}"/scripting/php
-		emake DESTDIR="${D}" install || die "emake install for php bindings failed"
-	fi
-
-	# clean out cups init scripts
-	rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups}
-
-	# install our init script
-	local neededservices
-	use dbus && neededservices+=" dbus"
-	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
-	cp "${FILESDIR}"/cupsd.init.d "${T}"/cupsd || die
-	sed -i \
-		-e "s/@neededservices@/$neededservices/" \
-		"${T}"/cupsd || die
-	doinitd "${T}"/cupsd || die "doinitd failed"
-
-	# install our pam script
-	pamd_mimic_system cups auth account
-
-	if use xinetd ; then
-		# correct path
-		sed -i \
-			-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
-			"${D}"/etc/xinetd.d/cups-lpd || die
-		# it is safer to disable this by default, bug #137130
-		grep -w 'disable' "${D}"/etc/xinetd.d/cups-lpd || \
-			{ sed -i -e "s:}:\tdisable = yes\n}:" "${D}"/etc/xinetd.d/cups-lpd || die ; }
-		# write permission for file owner (root), bug #296221
-		fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
-	else
-		rm -rf "${D}"/etc/xinetd.d
-	fi
-
-	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
-		/var/cache/cups /var/cache/cups/rss /var/log/cups /var/run/cups/certs \
-		/var/spool/cups/tmp
-
-	keepdir /etc/cups/{interfaces,ppd,ssl}
-
-	use X || rm -r "${D}"/usr/share/applications
-
-	# create /etc/cups/client.conf, bug #196967 and #266678
-	echo "ServerName /var/run/cups/cups.sock" >> "${D}"/etc/cups/client.conf
-}
-
-pkg_postinst() {
-	echo
-	elog "For information about installing a printer and general cups setup"
-	elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml"
-	echo
-}
diff --git a/net-print/cups/cups-1.5.0-r2.ebuild b/net-print/cups/cups-1.5.0-r2.ebuild
index 0cb263f..bcd4b99 100644
--- a/net-print/cups/cups-1.5.0-r2.ebuild
+++ b/net-print/cups/cups-1.5.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.0-r2.ebuild,v 1.2 2011/09/18 08:11:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.0-r2.ebuild,v 1.3 2011/11/13 11:36:59 jlec Exp $
 
 #
 # See http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=blob;f=net-print/cups/notes.txt;hb=HEAD
@@ -46,7 +46,7 @@ RDEPEND="
 	pam? ( virtual/pam )
 	perl? ( dev-lang/perl )
 	php? ( dev-lang/php )
-	png? ( >=media-libs/libpng-1.4.3 )
+	png? ( >=media-libs/libpng-1.4.3:0 )
 	slp? ( >=net-libs/openslp-1.0.4 )
 	ssl? (
 		gnutls? (
@@ -55,7 +55,7 @@ RDEPEND="
 		)
 		!gnutls? ( >=dev-libs/openssl-0.9.8g )
 	)
-	tiff? ( >=media-libs/tiff-3.5.5 )
+	tiff? ( >=media-libs/tiff-3.5.5:0 )
 	usb? ( virtual/libusb:0 )
 	X? ( x11-misc/xdg-utils )
 	xinetd? ( sys-apps/xinetd )
diff --git a/net-print/cups/cups-1.4.6-r2.ebuild b/net-print/cups/cups-1.5.0-r3.ebuild
index 83e34bd..64cdf62 100644
--- a/net-print/cups/cups-1.4.6-r2.ebuild
+++ b/net-print/cups/cups-1.5.0-r3.ebuild
@@ -1,23 +1,29 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.6-r2.ebuild,v 1.10 2011/08/07 14:04:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.0-r3.ebuild,v 1.3 2012/01/15 22:41:37 dilfridge Exp $
+
+#
+# See http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=blob;f=net-print/cups/notes.txt;hb=HEAD
+# for some notes about the ongoing work here
+#
 
 EAPI=3
 
 PYTHON_DEPEND="python? 2:2.5"
 
-inherit autotools eutils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2
+inherit autotools eutils fdo-mime gnome2-utils flag-o-matic multilib pam perl-module python versionator java-pkg-opt-2
 
 MY_P=${P/_}
+MY_PV=${PV/_}
 
 DESCRIPTION="The Common Unix Printing System"
 HOMEPAGE="http://www.cups.org/"
-SRC_URI="mirror://easysw/${PN}/${PV}/${MY_P}-source.tar.bz2"
+SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="acl dbus debug gnutls java +jpeg kerberos ldap pam perl php +png python samba slp +ssl static-libs +threads +tiff X xinetd"
+KEYWORDS="~amd64 ~x86"
+IUSE="acl dbus debug +filters gnutls java +jpeg kerberos ldap pam perl php +png python samba slp +ssl static-libs +threads +tiff usb X xinetd"
 
 LANGS="da de es eu fi fr id it ja ko nl no pl pt pt_BR ru sv zh zh_TW"
 for X in ${LANGS} ; do
@@ -33,6 +39,7 @@ RDEPEND="
 		)
 	)
 	dbus? ( sys-apps/dbus )
+	filters? ( net-print/foomatic-filters )
 	java? ( >=virtual/jre-1.6 )
 	jpeg? ( virtual/jpeg:0 )
 	kerberos? ( virtual/krb5 )
@@ -40,16 +47,17 @@ RDEPEND="
 	pam? ( virtual/pam )
 	perl? ( dev-lang/perl )
 	php? ( dev-lang/php )
-	png? ( >=media-libs/libpng-1.4.3 )
+	png? ( >=media-libs/libpng-1.4.3:0 )
 	slp? ( >=net-libs/openslp-1.0.4 )
 	ssl? (
 		gnutls? (
 			dev-libs/libgcrypt
-			net-libs/gnutls
+			>=net-libs/gnutls-2.11
 		)
 		!gnutls? ( >=dev-libs/openssl-0.9.8g )
 	)
-	tiff? ( >=media-libs/tiff-3.5.5 )
+	tiff? ( >=media-libs/tiff-3.5.5:0 )
+	usb? ( virtual/libusb:0 )
 	X? ( x11-misc/xdg-utils )
 	xinetd? ( sys-apps/xinetd )
 	!net-print/cupsddk
@@ -79,42 +87,21 @@ pkg_setup() {
 		python_set_active_version 2
 		python_pkg_setup
 	fi
-
-	linux-info_pkg_setup
-	if  ! linux_config_exists; then
-		ewarn "Can't check the linux kernel configuration."
-		ewarn "You might have some incompatible options enabled."
-	else
-			#here we should warn user that he should enable it so he can print
-			if ! linux_chkconfig_present USB_PRINTER; then
-				ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
-				ewarn "support in your kernel."
-				ewarn "Please enable it:"
-				ewarn "    CONFIG_USB_PRINTER=y"
-				ewarn "in /usr/src/linux/.config or"
-				ewarn "    Device Drivers --->"
-				ewarn "        USB support  --->"
-				ewarn "            [*] USB Printer support"
-			fi
-	fi
 }
 
 src_prepare() {
-	# create a missing symlink to allow https printing via IPP, bug #217293
-	epatch "${FILESDIR}/${PN}-1.4.0-backend-https.patch"
 	# various build time fixes
 	epatch "${FILESDIR}/${PN}-1.4.4-dont-compress-manpages.patch"
 	epatch "${FILESDIR}/${PN}-1.4.4-fix-install-perms.patch"
 	epatch "${FILESDIR}/${PN}-1.4.4-nostrip.patch"
 	epatch "${FILESDIR}/${PN}-1.4.4-php-destdir.patch"
 	epatch "${FILESDIR}/${PN}-1.4.4-perl-includes.patch"
-	epatch "${FILESDIR}/${PN}-1.4.6-force-gnutls.patch"
-	epatch "${FILESDIR}/${PN}-1.4.6-serialize-gnutls.patch"
-	# interface hangs using some browsers, bug #325871
-	epatch "${FILESDIR}/${PN}-1.4.6-web-hang.patch"
+	epatch "${FILESDIR}/${PN}-1.4.8-largeimage.patch"
+	# security fixes
+	epatch "${FILESDIR}/${PN}-1.4.8-CVE-2011-3170.patch"
 
 	# Dan's group fix
-	epatch "${FILESDIR}/${PN}-1.4.1-group_fix.patch"
+	epatch "${FILESDIR}/${PN}-1.5.0-group_fix.patch"
 
 	AT_M4DIR=config-scripts eaclocal
 	eautoconf
@@ -173,7 +160,7 @@ src_configure() {
 		$(use_enable slp) \
 		$(use_enable static-libs static) \
 		$(use_enable tiff) \
-		--disable-libusb \
+		$(use_enable usb libusb) \
 		$(use_with java) \
 		$(use_with perl) \
 		$(use_with php) \
@@ -251,7 +238,7 @@ src_install() {
 	fi
 
 	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
-		/var/cache/cups /var/cache/cups/rss /var/log/cups /var/run/cups/certs \
+		/var/cache/cups /var/cache/cups/rss /var/log/cups \
 		/var/spool/cups/tmp
 
 	keepdir /etc/cups/{interfaces,ppd,ssl}
@@ -262,9 +249,23 @@ src_install() {
 	echo "ServerName /var/run/cups/cups.sock" >> "${D}"/etc/cups/client.conf
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+
 	echo
 	elog "For information about installing a printer and general cups setup"
 	elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml"
 	echo
 }
+
+pkg_postrm() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/net-print/cups/files/cups-1.3.0-configure.patch b/net-print/cups/files/cups-1.3.0-configure.patch
deleted file mode 100644
index f248dfe..0000000
--- a/net-print/cups/files/cups-1.3.0-configure.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur cups-1.3.3/config-scripts/cups-common.m4 cups-1.3.3.new/config-scripts/cups-common.m4
---- cups-1.3.3/config-scripts/cups-common.m4	2007-09-28 22:40:03.000000000 +0200
-+++ cups-1.3.3.new/config-scripts/cups-common.m4	2007-10-04 14:40:49.414154416 +0200
-@@ -270,7 +270,12 @@
- dnl See if we have POSIX ACL support...
- SAVELIBS="$LIBS"
- LIBS=""
--AC_SEARCH_LIBS(acl_init, acl, AC_DEFINE(HAVE_ACL_INIT))
-+
-+AC_ARG_ENABLE(acl, [  --enable-acl            enable POSIX ACL support, default=auto])
-+if test "x$enable_acl" != xno; then
-+	AC_SEARCH_LIBS(acl_init, acl, AC_DEFINE(HAVE_ACL_INIT))
-+fi
-+
- CUPSDLIBS="$CUPSDLIBS $LIBS"
- LIBS="$SAVELIBS"
- 
-
diff --git a/net-print/cups/files/cups-1.3.10-str3178.patch b/net-print/cups/files/cups-1.3.10-str3178.patch
deleted file mode 100644
index 5336e23..0000000
--- a/net-print/cups/files/cups-1.3.10-str3178.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur cups-1.3.10/config-scripts/cups-ssl.m4 cups-1.3.10.new/config-scripts/cups-ssl.m4
---- cups-1.3.10/config-scripts/cups-ssl.m4	2007-07-11 23:46:42.000000000 +0200
-+++ cups-1.3.10.new/config-scripts/cups-ssl.m4	2009-05-29 02:38:27.444267250 +0200
-@@ -64,11 +64,11 @@
-     fi
- 
-     dnl Then look for GNU TLS...
--    if test "x${SSLLIBS}" = "x" -a "x${enable_gnutls}" != "xno"; then
-+    if test "x${SSLLIBS}" = "x" -a "x${enable_gnutls}" != "xno" -a "x$PKGCONFIG" != x; then
-     	AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config)
--	if test "x$LIBGNUTLSCONFIG" != x; then
--	    SSLLIBS=`$LIBGNUTLSCONFIG --libs`
--	    SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
-+	if $PKGCONFIG --exists gnutls; then
-+	    SSLLIBS=`$PKGCONFIG --libs gnutls`
-+	    SSLFLAGS=`$PKGCONFIG --cflags gnutls`
- 	    ENCRYPTION_REQUIRED="  Encryption Required"
- 	    AC_DEFINE(HAVE_SSL)
- 	    AC_DEFINE(HAVE_GNUTLS)
diff --git a/net-print/cups/files/cups-1.3.11-pdf-m4.patch b/net-print/cups/files/cups-1.3.11-pdf-m4.patch
deleted file mode 100644
index 830ecfb..0000000
--- a/net-print/cups/files/cups-1.3.11-pdf-m4.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-# This patch is taken from cups 1.4.5 and fixes annoying requirement to have poppler around during build-time
-
---- cups-1.3.11/config-scripts/cups-pdf.m4	2009-03-12 22:34:21.000000000 +0100
-+++ cups-1.4.5/config-scripts/cups-pdf.m4	2009-08-08 00:30:30.000000000 +0200
-@@ -13,12 +13,7 @@
- dnl   file is missing or damaged, see the license at "http://www.cups.org/".
- dnl
- 
--AC_ARG_ENABLE(pdftops, [  --enable-pdftops        build pdftops filter, default=auto ])
--AC_ARG_WITH(pdftops, [  --with-pdftops          set pdftops filter (gs,pdftops,none), default=pdftops ])
--
--if test "x$enable_pdftops" = xno -a "x$with_pdftops" = x; then
--	with_pdftops=no
--fi
-+AC_ARG_WITH(pdftops, [  --with-pdftops          set pdftops filter (gs,/path/to/gs,pdftops,/path/to/pdftops,none), default=pdftops ])
- 
- PDFTOPS=""
- CUPS_PDFTOPS=""
-@@ -52,6 +47,12 @@
- 	fi
- 	;;
- 
-+	x/*/gs) # Use /path/to/gs without any check:
-+	CUPS_GHOSTSCRIPT="$with_pdftops"
-+	AC_DEFINE(HAVE_GHOSTSCRIPT)
-+	PDFTOPS="pdftops"
-+	;;
-+
- 	xpdftops)
- 	AC_PATH_PROG(CUPS_PDFTOPS, pdftops)
- 	if test "x$CUPS_PDFTOPS" != x; then
-@@ -62,6 +63,20 @@
- 		exit 1
- 	fi
- 	;;
-+
-+	x/*/pdftops) # Use /path/to/pdftops without any check:
-+	CUPS_PDFTOPS="$with_pdftops"
-+	AC_DEFINE(HAVE_PDFTOPS)
-+	PDFTOPS="pdftops"
-+	;;
-+
-+	xnone) # Make no pdftops filter if with_pdftops=none:
-+	;;
-+
-+	*) # Invalid with_pdftops value:
-+	AC_MSG_ERROR(Invalid with_pdftops value!)
-+	exit 1
-+	;;
- esac
- 
- AC_DEFINE_UNQUOTED(CUPS_PDFTOPS, "$CUPS_PDFTOPS")
diff --git a/net-print/cups/files/cups-1.3.11-str3200.patch b/net-print/cups/files/cups-1.3.11-str3200.patch
deleted file mode 100644
index 84cdbd2..0000000
--- a/net-print/cups/files/cups-1.3.11-str3200.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -up cups-1.3.7/scheduler/select.c.CVE-2009-3553 cups-1.3.7/scheduler/select.c
---- cups-1.3.7/scheduler/select.c.CVE-2009-3553	2007-11-30 19:29:50.000000000 +0000
-+++ cups-1.3.7/scheduler/select.c	2009-11-11 16:36:07.223893886 +0000
-@@ -477,7 +477,7 @@ cupsdDoSelect(long timeout)		/* I - Time
-       (*(fdptr->read_cb))(fdptr->data);
-     }
- 
--    if (fdptr->write_cb && event->filter == EVFILT_WRITE)
-+    if (fdptr->use > 1 && fdptr->write_cb && event->filter == EVFILT_WRITE)
-     {
-       cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdDoSelect: Write on fd %d...",
- 	              fdptr->fd);
-@@ -537,7 +537,7 @@ cupsdDoSelect(long timeout)		/* I - Time
- 	  (*(fdptr->read_cb))(fdptr->data);
- 	}
- 
--	if (fdptr->write_cb && (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)))
-+	if (fdptr->use > 1 && fdptr->write_cb && (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)))
- 	{
- 	  cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdDoSelect: Write on fd %d...",
- 	        	  fdptr->fd);
-@@ -649,7 +649,7 @@ cupsdDoSelect(long timeout)		/* I - Time
-         (*(fdptr->read_cb))(fdptr->data);
-       }
- 
--      if (fdptr->write_cb && (pfd->revents & (POLLOUT | POLLERR | POLLHUP)))
-+      if (fdptr->use > 1 && fdptr->write_cb && (pfd->revents & (POLLOUT | POLLERR | POLLHUP)))
-       {
-         cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdDoSelect: Write on fd %d...",
- 	                fdptr->fd);
-@@ -719,7 +719,7 @@ cupsdDoSelect(long timeout)		/* I - Time
-         (*(fdptr->read_cb))(fdptr->data);
-       }
- 
--      if (fdptr->write_cb && FD_ISSET(fdptr->fd, &cupsd_current_output))
-+      if (fdptr->use > 1 && fdptr->write_cb && FD_ISSET(fdptr->fd, &cupsd_current_output))
-       {
-         cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdDoSelect: Write on fd %d...",
- 	                fdptr->fd);
diff --git a/net-print/cups/files/cups-1.3.11-str3367-security-1.3v2.patch b/net-print/cups/files/cups-1.3.11-str3367-security-1.3v2.patch
deleted file mode 100644
index 8fe6b17..0000000
--- a/net-print/cups/files/cups-1.3.11-str3367-security-1.3v2.patch
+++ /dev/null
@@ -1,435 +0,0 @@
-Index: cgi-bin/printers.c
-===================================================================
---- cgi-bin/printers.c	(.../easysw/current-1.3.x)	(revision 1707)
-+++ cgi-bin/printers.c	(.../branches/leopard/cups)	(revision 1707)
-@@ -72,6 +72,7 @@
-   */
- 
-   cgiSetVariable("SECTION", "printers");
-+  cgiSetVariable("REFRESH_PAGE", "");
- 
-  /*
-   * See if we are displaying a printer or all printers...
-Index: cgi-bin/cgi.h
-===================================================================
---- cgi-bin/cgi.h	(.../easysw/current-1.3.x)	(revision 1707)
-+++ cgi-bin/cgi.h	(.../branches/leopard/cups)	(revision 1707)
-@@ -54,6 +54,7 @@
- extern void		cgiAbort(const char *title, const char *stylesheet,
- 			         const char *format, ...);
- extern int		cgiCheckVariables(const char *names);
-+extern void		cgiClearVariables(void);
- extern void		*cgiCompileSearch(const char *query);
- extern void		cgiCopyTemplateFile(FILE *out, const char *tmpl);
- extern void		cgiCopyTemplateLang(const char *tmpl);
-Index: cgi-bin/template.c
-===================================================================
---- cgi-bin/template.c	(.../easysw/current-1.3.x)	(revision 1707)
-+++ cgi-bin/template.c	(.../branches/leopard/cups)	(revision 1707)
-@@ -639,6 +639,8 @@
-       fputs("&gt;", out);
-     else if (*s == '\"')
-       fputs("&quot;", out);
-+    else if (*s == '\'')
-+      fputs("&#39;", out);
-     else if (*s == '&')
-       fputs("&amp;", out);
-     else
-@@ -659,7 +661,7 @@
- {
-   while (*s)
-   {
--    if (strchr("%&+ <>#=", *s) || *s & 128)
-+    if (strchr("%@&+ <>#=", *s) || *s < ' ' || *s & 128)
-       fprintf(out, "%%%02X", *s & 255);
-     else
-       putc(*s, out);
-Index: cgi-bin/ipp-var.c
-===================================================================
---- cgi-bin/ipp-var.c	(.../easysw/current-1.3.x)	(revision 1707)
-+++ cgi-bin/ipp-var.c	(.../branches/leopard/cups)	(revision 1707)
-@@ -1220,7 +1220,9 @@
-   int			ascending,	/* Order of jobs (0 = descending) */
- 			first,		/* First job to show */
- 			count;		/* Number of jobs */
--  const char		*var;		/* Form variable */
-+  const char		*var,		/* Form variable */
-+			*query,		/* Query string */
-+			*section;	/* Section in web interface */
-   void			*search;	/* Search data */
-   char			url[1024],	/* URL for prev/next/this */
- 			*urlptr,	/* Position in URL */
-@@ -1265,10 +1267,13 @@
-     * Get a list of matching job objects.
-     */
- 
--    if ((var = cgiGetVariable("QUERY")) != NULL)
--      search = cgiCompileSearch(var);
-+    if ((query = cgiGetVariable("QUERY")) != NULL)
-+      search = cgiCompileSearch(query);
-     else
-+    {
-+      query  = NULL;
-       search = NULL;
-+    }
- 
-     jobs  = cgiGetIPPObjects(response, search);
-     count = cupsArrayCount(jobs);
-@@ -1293,17 +1298,28 @@
-     if (first < 0)
-       first = 0;
- 
--    sprintf(url, "%d", count);
--    cgiSetVariable("TOTAL", url);
--
-     if ((var = cgiGetVariable("ORDER")) != NULL)
-       ascending = !strcasecmp(var, "asc");
-     else
--    {
-       ascending = !which_jobs || !strcasecmp(which_jobs, "not-completed");
--      cgiSetVariable("ORDER", ascending ? "asc" : "dec");
--    }
- 
-+    section = cgiGetVariable("SECTION");
-+
-+    cgiClearVariables();
-+
-+    if (query)
-+      cgiSetVariable("QUERY", query);
-+
-+    cgiSetVariable("ORDER", ascending ? "asc" : "dec");
-+
-+    cgiSetVariable("SECTION", section);
-+
-+    sprintf(url, "%d", count);
-+    cgiSetVariable("TOTAL", url);
-+
-+    if (which_jobs)
-+      cgiSetVariable("WHICH_JOBS", which_jobs);
-+
-     if (ascending)
-     {
-       for (i = 0, job = (ipp_attribute_t *)cupsArrayIndex(jobs, first);
-@@ -1325,11 +1341,10 @@
- 
-     urlend = url + sizeof(url);
- 
--    if ((var = cgiGetVariable("QUERY")) != NULL)
-+    if (query != NULL)
-     {
-       if (dest)
--        snprintf(url, sizeof(url), "/%s/%s?QUERY=", cgiGetVariable("SECTION"),
--	         dest);
-+        snprintf(url, sizeof(url), "/%s/%s?QUERY=", section, dest);
-       else
-         strlcpy(url, "/jobs/?QUERY=", sizeof(url));
- 
-@@ -1344,7 +1359,7 @@
-     else
-     {
-       if (dest)
--        snprintf(url, sizeof(url), "/%s/%s?", cgiGetVariable("SECTION"), dest);
-+        snprintf(url, sizeof(url), "/%s/%s?", section, dest);
-       else
-         strlcpy(url, "/jobs/?", sizeof(url));
- 
-Index: cgi-bin/admin.c
-===================================================================
---- cgi-bin/admin.c	(.../easysw/current-1.3.x)	(revision 1707)
-+++ cgi-bin/admin.c	(.../branches/leopard/cups)	(revision 1707)
-@@ -104,6 +104,7 @@
-   */
- 
-   cgiSetVariable("SECTION", "admin");
-+  cgiSetVariable("REFRESH_PAGE", "");
- 
-  /*
-   * See if we have form data...
-@@ -134,16 +135,61 @@
- 
- 
-       if (getenv("HTTPS"))
--        snprintf(prefix, sizeof(prefix), "https://%s:%s",
--	         getenv("SERVER_NAME"), getenv("SERVER_PORT"));
-+	snprintf(prefix, sizeof(prefix), "https://%s:%s",
-+		 getenv("SERVER_NAME"), getenv("SERVER_PORT"));
-       else
--        snprintf(prefix, sizeof(prefix), "http://%s:%s",
--	         getenv("SERVER_NAME"), getenv("SERVER_PORT"));
-+	snprintf(prefix, sizeof(prefix), "http://%s:%s",
-+		 getenv("SERVER_NAME"), getenv("SERVER_PORT"));
- 
-+      fprintf(stderr, "DEBUG: redirecting with prefix %s!\n", prefix);
-+
-       if ((url = cgiGetVariable("URL")) != NULL)
--        printf("Location: %s%s\n\n", prefix, url);
-+      {
-+	char	encoded[1024],		/* Encoded URL string */
-+		*ptr;			/* Pointer into encoded string */
-+
-+
-+	ptr = encoded;
-+	if (*url != '/')
-+	  *ptr++ = '/';
-+
-+	for (; *url && ptr < (encoded + sizeof(encoded) - 4); url ++)
-+	{
-+	  if (strchr("%@&+ <>#=", *url) || *url < ' ' || *url & 128)
-+	  {
-+	   /*
-+	    * Percent-encode this character; safe because we have at least 4
-+	    * bytes left in the array...
-+	    */
-+
-+	    sprintf(ptr, "%%%02X", *url & 255);
-+	    ptr += 3;
-+	  }
-+	  else
-+	    *ptr++ = *url;
-+	}
-+
-+	*ptr = '\0';
-+
-+	if (*url)
-+	{
-+	 /*
-+	  * URL was too long, just redirect to the admin page...
-+	  */
-+
-+	  printf("Location: %s/admin\n\n", prefix);
-+	}
-+	else
-+	{
-+	 /*
-+	  * URL is OK, redirect there...
-+	  */
-+
-+	  printf("Location: %s%s\n\n", prefix, encoded);
-+	}
-+      }
-       else
--        printf("Location: %s/admin\n\n", prefix);
-+	printf("Location: %s/admin\n\n", prefix);
-     }
-     else if (!strcmp(op, "start-printer"))
-       do_printer_op(http, IPP_RESUME_PRINTER, cgiText(_("Start Printer")));
-@@ -293,6 +339,31 @@
-     * and classes and (re)show the add page...
-     */
- 
-+    if (cgiGetVariable("EVENT_JOB_CREATED"))
-+      cgiSetVariable("EVENT_JOB_CREATED", "CHECKED");
-+    if (cgiGetVariable("EVENT_JOB_COMPLETED"))
-+      cgiSetVariable("EVENT_JOB_COMPLETED", "CHECKED");
-+    if (cgiGetVariable("EVENT_JOB_STOPPED"))
-+      cgiSetVariable("EVENT_JOB_STOPPED", "CHECKED");
-+    if (cgiGetVariable("EVENT_JOB_CONFIG_CHANGED"))
-+      cgiSetVariable("EVENT_JOB_CONFIG_CHANGED", "CHECKED");
-+    if (cgiGetVariable("EVENT_PRINTER_STOPPED"))
-+      cgiSetVariable("EVENT_PRINTER_STOPPED", "CHECKED");
-+    if (cgiGetVariable("EVENT_PRINTER_ADDED"))
-+      cgiSetVariable("EVENT_PRINTER_ADDED", "CHECKED");
-+    if (cgiGetVariable("EVENT_PRINTER_MODIFIED"))
-+      cgiSetVariable("EVENT_PRINTER_MODIFIED", "CHECKED");
-+    if (cgiGetVariable("EVENT_PRINTER_DELETED"))
-+      cgiSetVariable("EVENT_PRINTER_DELETED", "CHECKED");
-+    if (cgiGetVariable("EVENT_SERVER_STARTED"))
-+      cgiSetVariable("EVENT_SERVER_STARTED", "CHECKED");
-+    if (cgiGetVariable("EVENT_SERVER_STOPPED"))
-+      cgiSetVariable("EVENT_SERVER_STOPPED", "CHECKED");
-+    if (cgiGetVariable("EVENT_SERVER_RESTARTED"))
-+      cgiSetVariable("EVENT_SERVER_RESTARTED", "CHECKED");
-+    if (cgiGetVariable("EVENT_SERVER_AUDIT"))
-+      cgiSetVariable("EVENT_SERVER_AUDIT", "CHECKED");
-+
-     request  = ippNewRequest(CUPS_GET_PRINTERS);
-     response = cupsDoRequest(http, request, "/");
- 
-@@ -450,6 +521,10 @@
-     * Do the request and get back a response...
-     */
- 
-+    cgiClearVariables();
-+    if (name)
-+      cgiSetVariable("PRINTER_NAME", name);
-+
-     if ((response = cupsDoRequest(http, request, "/")) != NULL)
-     {
-      /*
-@@ -2336,7 +2411,9 @@
-   if ((val = cupsGetOption("DefaultAuthType", num_settings,
-                            settings)) != NULL && !strcasecmp(val, "Negotiate"))
-     cgiSetVariable("KERBEROS", "CHECKED");
-+  else
- #endif /* HAVE_GSSAPI */
-+  cgiSetVariable("KERBEROS", "");
- 
-   cupsFreeOptions(num_settings, settings);
- 
-Index: cgi-bin/help.c
-===================================================================
---- cgi-bin/help.c	(.../easysw/current-1.3.x)	(revision 1707)
-+++ cgi-bin/help.c	(.../branches/leopard/cups)	(revision 1707)
-@@ -63,6 +63,7 @@
-   */
- 
-   cgiSetVariable("SECTION", "help");
-+  cgiSetVariable("REFRESH_PAGE", "");
- 
-  /*
-   * Load the help index...
-@@ -102,7 +103,7 @@
-   */
- 
-   for (i = 0; i < argc; i ++)
--    fprintf(stderr, "argv[%d]=\"%s\"\n", i, argv[i]);
-+    fprintf(stderr, "DEBUG: argv[%d]=\"%s\"\n", i, argv[i]);
- 
-   if ((helpfile = getenv("PATH_INFO")) != NULL)
-   {
-@@ -179,6 +180,12 @@
-   topic = cgiGetVariable("TOPIC");
-   si    = helpSearchIndex(hi, query, topic, helpfile);
- 
-+  cgiClearVariables();
-+  if (query)
-+    cgiSetVariable("QUERY", query);
-+  if (topic)
-+    cgiSetVariable("TOPIC", topic);
-+
-   fprintf(stderr, "DEBUG: query=\"%s\", topic=\"%s\"\n",
-           query ? query : "(null)", topic ? topic : "(null)");
- 
-Index: cgi-bin/var.c
-===================================================================
---- cgi-bin/var.c	(.../easysw/current-1.3.x)	(revision 1707)
-+++ cgi-bin/var.c	(.../branches/leopard/cups)	(revision 1707)
-@@ -15,6 +15,7 @@
-  * Contents:
-  *
-  *   cgiCheckVariables()        - Check for the presence of "required" variables.
-+ *   cgiClearVariables()        - Clear all form variables.
-  *   cgiGetArray()              - Get an element from a form array...
-  *   cgiGetFile()               - Get the file (if any) that was submitted in the form.
-  *   cgiGetSize()               - Get the size of a form array value.
-@@ -135,6 +136,31 @@
- 
- 
- /*
-+ * 'cgiClearVariables()' - Clear all form variables.
-+ */
-+
-+void
-+cgiClearVariables(void)
-+{
-+  int		i, j;			/* Looping vars */
-+  _cgi_var_t	*v;			/* Current variable */
-+
-+
-+  for (v = form_vars, i = form_count; i > 0; v ++, i --)
-+  {
-+    _cupsStrFree(v->name);
-+    for (j = 0; j < v->nvalues; j ++)
-+      if (v->values[j])
-+        _cupsStrFree(v->values[j]);
-+  }
-+
-+  form_count = 0;
-+
-+  cgi_unlink_file();
-+}
-+
-+
-+/*
-  * 'cgiGetArray()' - Get an element from a form array...
-  */
- 
-@@ -154,7 +180,7 @@
-   if (element < 0 || element >= var->nvalues)
-     return (NULL);
- 
--  return (var->values[element]);
-+  return (_cupsStrAlloc(var->values[element]));
- }
- 
- 
-@@ -209,7 +235,7 @@
-            var->values[var->nvalues - 1]);
- #endif /* DEBUG */
- 
--  return ((var == NULL) ? NULL : var->values[var->nvalues - 1]);
-+  return ((var == NULL) ? NULL : _cupsStrAlloc(var->values[var->nvalues - 1]));
- }
- 
- 
-@@ -341,9 +367,9 @@
-       var->nvalues = element + 1;
-     }
-     else if (var->values[element])
--      free((char *)var->values[element]);
-+      _cupsStrFree((char *)var->values[element]);
- 
--    var->values[element] = strdup(value);
-+    var->values[element] = _cupsStrAlloc(value);
-   }
- }
- 
-@@ -388,7 +414,7 @@
-   {
-     for (i = size; i < var->nvalues; i ++)
-       if (var->values[i])
--        free((void *)(var->values[i]));
-+        _cupsStrFree((void *)(var->values[i]));
-   }
- 
-   var->nvalues = size;
-@@ -421,9 +447,9 @@
-   {
-     for (i = 0; i < var->nvalues; i ++)
-       if (var->values[i])
--        free((char *)var->values[i]);
-+        _cupsStrFree((char *)var->values[i]);
- 
--    var->values[0] = strdup(value);
-+    var->values[0] = _cupsStrAlloc(value);
-     var->nvalues   = 1;
-   }
- }
-@@ -470,10 +496,10 @@
-   if ((var->values = calloc(element + 1, sizeof(char *))) == NULL)
-     return;
- 
--  var->name            = strdup(name);
-+  var->name            = _cupsStrAlloc(name);
-   var->nvalues         = element + 1;
-   var->avalues         = element + 1;
--  var->values[element] = strdup(value);
-+  var->values[element] = _cupsStrAlloc(value);
- 
-   form_count ++;
- }
-Index: cgi-bin/jobs.c
-===================================================================
---- cgi-bin/jobs.c	(.../easysw/current-1.3.x)	(revision 1707)
-+++ cgi-bin/jobs.c	(.../branches/leopard/cups)	(revision 1707)
-@@ -57,6 +57,7 @@
-   */
- 
-   cgiSetVariable("SECTION", "jobs");
-+  cgiSetVariable("REFRESH_PAGE", "");
- 
-  /*
-   * Connect to the HTTP server...
-Index: cgi-bin/classes.c
-===================================================================
---- cgi-bin/classes.c	(.../easysw/current-1.3.x)	(revision 1707)
-+++ cgi-bin/classes.c	(.../branches/leopard/cups)	(revision 1707)
-@@ -69,6 +69,7 @@
-   */
- 
-   cgiSetVariable("SECTION", "classes");
-+  cgiSetVariable("REFRESH_PAGE", "");
- 
-  /*
-   * See if we are displaying a printer or all classes...
-
diff --git a/net-print/cups/files/cups-1.3.11-str3401-security-1.3v2-regression.patch b/net-print/cups/files/cups-1.3.11-str3401-security-1.3v2-regression.patch
deleted file mode 100644
index 5f57175..0000000
--- a/net-print/cups/files/cups-1.3.11-str3401-security-1.3v2-regression.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- cgi-bin/admin.c.ori	2009-10-30 14:07:13.000000000 -0400
-+++ cgi-bin/admin.c	2009-10-30 14:06:54.000000000 -0400
-@@ -536,6 +536,7 @@
-   ipp_attribute_t *attr;		/* member-uris attribute */
-   char		uri[HTTP_MAX_URI];	/* Device or printer URI */
-   const char	*name,			/* Pointer to class name */
-+		*op,			/* Operation name */
- 		*ptr;			/* Pointer to CGI variable */
-   const char	*title;			/* Title of page */
-   static const char * const pattrs[] =	/* Requested printer attributes */
-@@ -547,6 +548,7 @@
- 
- 
-   title = cgiText(modify ? _("Modify Class") : _("Add Class"));
-+  op    = cgiGetVariable("OP");
-   name  = cgiGetVariable("PRINTER_NAME");
- 
-   if (cgiGetVariable("PRINTER_LOCATION") == NULL)
-@@ -572,6 +574,8 @@
-     */
- 
-     cgiClearVariables();
-+    if (op)
-+      cgiSetVariable("OP", op);
-     if (name)
-       cgiSetVariable("PRINTER_NAME", name);
- 
diff --git a/net-print/cups/files/cups-1.3.7-backend-https.patch b/net-print/cups/files/cups-1.3.7-backend-https.patch
deleted file mode 100644
index 44706b3..0000000
--- a/net-print/cups/files/cups-1.3.7-backend-https.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur cups-1.3.7/backend/Makefile cups-1.3.7.new/backend/Makefile
---- cups-1.3.7/backend/Makefile	2007-08-08 21:27:51.000000000 +0200
-+++ cups-1.3.7.new/backend/Makefile	2008-04-14 16:42:18.106785330 +0200
-@@ -62,6 +62,7 @@
- 	done
- 	$(RM) $(SERVERBIN)/backend/http
- 	$(LN) ipp $(SERVERBIN)/backend/http
-+	$(LN) ipp $(SERVERBIN)/backend/https
- 	if test "x$(SYMROOT)" != "x"; then \
- 		$(INSTALL_DIR) $(SYMROOT); \
- 		for file in $(TARGETS); do \
diff --git a/net-print/cups/files/cups-1.3.8-group_fix.patch b/net-print/cups/files/cups-1.3.8-group_fix.patch
deleted file mode 100644
index c69723f..0000000
--- a/net-print/cups/files/cups-1.3.8-group_fix.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -Nuar cups-1.3.8.orig/scheduler/auth.c cups-1.3.8/scheduler/auth.c
---- cups-1.3.8.orig/scheduler/auth.c	2008-04-21 18:13:22.000000000 -0500
-+++ cups-1.3.8/scheduler/auth.c	2008-10-08 16:23:32.000000000 -0500
-@@ -1281,6 +1281,7 @@
-     const char    *groupname)		/* I - Group name */
- {
-   int			i;		/* Looping var */
-+  int			foundit;	/* Whether or not the search returned a positive result. */
-   struct group		*group;		/* System group info */
-   char			junk[33];	/* MD5 password (not used) */
- #ifdef HAVE_MBR_UID_TO_UUID
-@@ -1302,29 +1303,43 @@
-     return (0);
- 
-  /*
--  * Check to see if the user is a member of the named group...
-+  * Iterate through all group entries until a match is found.
-   */
--
--  group = getgrnam(groupname);
--  endgrent();
--
--  if (group != NULL)
-+  setgrent();
-+  foundit=0;
-+  while(!foundit && (group=getgrent())!=NULL)
-   {
-    /*
--    * Group exists, check it...
-+    * If the group name doesn't match, move on...
-     */
-+    if(strcasecmp(groupname, group->gr_name))
-+      continue;
- 
-+   /*
-+    * First, check to see if group ID matches the user's group ID.
-+    */
-+    if(user && group->gr_gid == user->pw_gid)
-+    {
-+      foundit=1;
-+      break;
-+    }
-+    
-+   /*
-+    * Check to see if the user is listed as a member of the group...
-+    */
-     for (i = 0; group->gr_mem[i]; i ++)
-       if (!strcasecmp(username, group->gr_mem[i]))
--	return (1);
-+      {
-+	foundit=1;
-+	break;
-+      }
-   }
-+  endgrent();
- 
-  /*
--  * Group doesn't exist or user not in group list, check the group ID
--  * against the user's group ID...
-+  * If the group membership was confirmed, return.
-   */
--
--  if (user && group && group->gr_gid == user->pw_gid)
-+  if(foundit)
-     return (1);
- 
- #ifdef HAVE_MBR_UID_TO_UUID
diff --git a/net-print/cups/files/cups-1.4.6-web-hang.patch b/net-print/cups/files/cups-1.4.6-web-hang.patch
deleted file mode 100644
index 6ccf05a..0000000
--- a/net-print/cups/files/cups-1.4.6-web-hang.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Index: cgi-bin/html.c
-===================================================================
---- cgi-bin/html.c	(revision 9428)
-+++ cgi-bin/html.c	(working copy)
-@@ -1,9 +1,9 @@
- /*
-  * "$Id: cups-1.4.6-web-hang.patch,v 1.1 2011/04/30 15:39:45 scarabeus Exp $"
-  *
-- *   HTML support functions for the Common UNIX Printing System (CUPS).
-+ *   HTML support functions for CUPS.
-  *
-- *   Copyright 2007-2009 by Apple Inc.
-+ *   Copyright 2007-2011 by Apple Inc.
-  *   Copyright 1997-2006 by Easy Software Products.
-  *
-  *   These coded instructions, statements, and computer programs are the
-@@ -208,31 +208,13 @@
- int					/* O - 1 if multi-part supported, 0 otherwise */
- cgiSupportsMultipart(void)
- {
--  const char	*user_agent;		/* User-Agent string */
--  static int	supports_multipart = -1;/* Cached value */
-+ /*
-+  * Too many bug reports for browsers that don't support it, and too much pain
-+  * to whitelist known-good browsers, so for now we just punt on multi-part
-+  * support... :(
-+  */
- 
--
--  if (supports_multipart < 0)
--  {
--   /*
--    * CUPS STR #3049: Apparently some browsers don't support multi-part
--    * documents, which makes them useless for many web sites.  Rather than
--    * abandoning those users, we'll offer a degraded single-part mode...
--    *
--    * Currently we know that anything based on Gecko, MSIE, and Safari all
--    * work.  We'll add more as they are reported/tested.
--    */
--
--    if ((user_agent = getenv("HTTP_USER_AGENT")) != NULL &&
--        (strstr(user_agent, " Gecko/") != NULL ||
--	 strstr(user_agent, " MSIE ") != NULL ||
--	 strstr(user_agent, " Safari/") != NULL))
--      supports_multipart = 1;
--    else
--      supports_multipart = 0;
--  }
--
--  return (supports_multipart);
-+  return (0);
- }
- 
- 
diff --git a/net-print/cups/files/cupsd.init.d b/net-print/cups/files/cupsd.init.d
index e5529ee..1e9ccf8 100644
--- a/net-print/cups/files/cupsd.init.d
+++ b/net-print/cups/files/cupsd.init.d
@@ -9,6 +9,8 @@ depend() {
 
 start() {
 	ebegin "Starting cupsd"
+	checkpath -q -d -m 0755 -o root:lp /var/run/cups
+	checkpath -q -d -m 0511 -o lp:lpadmin /var/run/cups/certs
 	start-stop-daemon --start --quiet --exec /usr/sbin/cupsd
 	eend $?
 }
diff --git a/net-print/cups/metadata.xml b/net-print/cups/metadata.xml
index 5b5f2ac..e209898 100644
--- a/net-print/cups/metadata.xml
+++ b/net-print/cups/metadata.xml
@@ -3,6 +3,9 @@
 <pkgmetadata>
   <herd>printing</herd>
   <use>
+    <flag name='filters'>
+      Pull in net-print/foomatic-filters for filtering by default.
+    </flag>
     <flag name='python'>
       Add support for the Python interpeter in the web server CGIs.
     </flag>