Pull in net-print/foomatic-filters via a default-on useflag, bug 384793

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

6 files changed, 36 insertions, 26 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 03cfe56eb458..e4af44d5caa7 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.440 2012/01/15 20:19:54 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.441 2012/01/15 22:41:37 dilfridge Exp $
+
+  15 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.4.8-r1.ebuild,
+  cups-1.4.8-r23.ebuild, cups-1.5.0-r3.ebuild, metadata.xml:
+  Pull in net-print/foomatic-filters via a default-on useflag, bug 384793
 
   15 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.4.8-r23.ebuild,
   cups-1.5.0-r3.ebuild, files/cupsd.init.d:
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index cd69f3c9ee27..82a0139f370a 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -16,27 +16,27 @@ AUX cupsd.init.d 402 RMD160 1b132354d01ad2ecebbe5238b09dfa3cb9391d43 SHA1 ea4817
 AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SHA1 6afb8a655b6ff013a2c8c8cbfb615ba1e561503b SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1
 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.4.8-r1.ebuild 7192 RMD160 43c67440f0b0b8770feec13af5ab051b5d2412e6 SHA1 9c27bcd87594fda8f828e95bae9b42760b2710a3 SHA256 c2561794a4711d8f58b46a9deed774f82bee57cb8f5a6ab341cfb116597de18b
+EBUILD cups-1.4.8-r1.ebuild 7247 RMD160 5dad178dde209a300c95eff90f3cdcf354029ca4 SHA1 529fbc8c02821448d79e6ba5d8f1ef6a9db960de SHA256 33b5320844e2185725446fc18ada3109d03fcd197f26eec9e94d870dbae2fdd4
 EBUILD cups-1.4.8-r22.ebuild 8493 RMD160 39b39b32ddc4bead92546180f11f377b9bdbca01 SHA1 6e5397d498b9ae8e66e74d9a1253b44ac79d77e1 SHA256 5eae14cd692f2639a69c518bbd381b04cc7fdfdca067c944bd90181212c5b387
-EBUILD cups-1.4.8-r23.ebuild 8808 RMD160 717f05c1f06594572072289e74eaa2bc9757afc0 SHA1 4bedd20c15a6ed14acb4d31f4335b6b09545f4ff SHA256 f18dd361bcc4dfd1070b315fe20b7f65cadce177dc81137121fa56dc11a821f6
+EBUILD cups-1.4.8-r23.ebuild 8858 RMD160 70b93c0b6b047c4cbb5b430db1a39774f0a480c8 SHA1 9f37004da1d8c347bf23e6871a1f187cfaba5c6c SHA256 09488eadea98ecdea281815850a43ffe43caee38852fbc61639fe6bd4a68e801
 EBUILD cups-1.5.0-r2.ebuild 6501 RMD160 0137c7b531696e83d0ce536f0681321d6f9d4726 SHA1 46e87de85a2d705428ff75d2063cc274e48e753d SHA256 64bdb26eea84190d450f9d0228b46581b2024a9a9af4c061f96821bb9aec43f4
-EBUILD cups-1.5.0-r3.ebuild 6816 RMD160 1688e88622e04ec695b080a14e9c5484cb45d86a SHA1 d4396a988395c9df8655cbd1575ec97cd3ee736d SHA256 a2633ed9dad3f47fd25076282c008982358c25179b4a40d09b18f6b6b09aadff
-MISC ChangeLog 66816 RMD160 71ff5d1b95658b33da79abc9714cdefdbcbc19b7 SHA1 c4fe5b426f43eaab8fedd4648420989287394671 SHA256 d69e82883b7f585639000c1dff2ea78e369d4c00d5a31345e50f391a9936ac7e
-MISC metadata.xml 586 RMD160 73a1f1c0096d5035dfa53207b00c125894f6822a SHA1 123501263490cab57af2b99f2336fb70c094d9b0 SHA256 3b729c497ee38452b1ca051b759f43b5f9e117f9c36c0f3b660e4bd8ab7c295b
+EBUILD cups-1.5.0-r3.ebuild 6866 RMD160 800306b35bdb0319f2257d98b2e1f737b4c3dfd0 SHA1 d3d66eb78855f45abddb15098ba7d1d0d3b44f3d SHA256 a8f2c76b41c537fd2d006f063c7b17c35679a7cf4d0076b34988c90420fb80da
+MISC ChangeLog 67031 RMD160 dae37b78a1ca6ed013ab844d8c79b3c7c4609208 SHA1 c898f30b67f1f8f31b418d012fcb963458276751 SHA256 a01688c2aced33741e203276b68601cf673b4847b83c231f83b0505d69275a6d
+MISC metadata.xml 691 RMD160 2a77a55b3ba142202c16f7c9e5710107cdd7565f SHA1 0fedf6ebd837708cd218a4a03741a20091714950 SHA256 3d89754273130856a7433fb325a132b07b86f7c0391284ab2c7dc8a2fa46fec7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPEzUxAAoJENwGBM22xffe9oUP/21lEs1JUl/MLEvXLVrCFqjq
-FICBemEnuhnCHcpyAk2hanZXZFvaL90VDS64XXX+XLMz0+LJUY0NjBooMYQiAIHz
-tZZeXnNWJgtFOMyOOR6dQoW1N+oVWA2eLBs75HODa3JiZjHROizhMjzNk1cZpq2N
-DCQu27AkpRxsmMwoogLCIYca5th/RgtjwmvK8Rq+jFHIYzTOnDT6zJHZ/QxbvSpQ
-/mWEwjFrnG3KYbZyoWCsLm/kgUOsp/GuRPzjeP+y4NOCuFEiWmCRC6DnJOAGKM3e
-PZqEjap9fbj8dvE2/Phz8p/J5GqeTLj34HgjAU5az/PLWOKr2GoVgKUStC1AbzuE
-SnRP4/JRPlX0VMJIDN+XCj2efqiylN0BWV5t4NqxCnQ2oXHaT0NH5peRsJeyABXz
-dYtXPP11mUjQCm/QiXwT3cE+DwdLnfG8NFg7h/Lyk/KUsiaR5drrEsg3Wlrx5hWM
-uNBEw/1Bfg2+z+MZDtv9wsi3JSlcuh715QlL0+YW7R34fxkbFAMj907gZ3ohudGh
-QJ+lVZwZsgJiq8zz0paZ/9eFKzAtXipaguIRSOktaFSSiXAQcHJVtDfxrHS9Carh
-aokQ2d9NqInikZYZOOhBwgdWk57fUoIf8xpbWx+uWfaYu3DIQOuL0iFKni/z6qk8
-guKPMaQ3nZswm+T/kre8
-=DWn9
+iQIcBAEBCgAGBQJPE1ZmAAoJENwGBM22xffeWuwP/3elxkOLy6CyFbLmR5Fn9jdA
+WnoCpr9GG/cpv2YIIELQ+TWbB86e9QP9Ob5pPwsV3B05GRnzYK+KyoOmY3afhGkn
+SamWgfy6U5ek2amMxmZ6Akv3jPxKGFkac4q1apuXClqjQIx1ECQYc88T9pSIcgQt
+c6pEf8iwWMrMjqukARATNS7w1dakSwjeJUVdWPHt1u83Zwy+SzhXGvWfqQxuyJul
+2Ql0euDTf7xRHn9W+j0k3dumXZ3cjAsocBnuu7jER5zJDVJocfBt5Y4eykY53osU
+FtZYPyoHhx/+alM49cPMqyDlUf6C9N5xJOvkB7g1rX15u0W9ZNj6/KbTJ6XI4F9C
+AH/PIEKklLcxGn1fQWRJn/fIroTdBlFpHvE9+Ra7bbZZZCMFEwRI8rge2J1XiEpY
+e6jWupmSoJfp4CH17na4+RDE2wis1MA+Cm5CfdXr6sgXNQsNu+ZwlGiwlmLVL7aL
+uWN3pPWlPKttUBb0ZrY9czXQga+kITojcRgFTHoUQN1Sn5WIQEwfcR2n37f2Kq8f
+dJ4HfZdhnecYYF6cPDmiH1vATBRSWnmVQ7DTBjBcaJGy/dJ1bk33P/SyoJfsSLt2
+6G5tLcWWm2LnakiXxElmCafK/wsqSAjbayekPs+WKGUtw97lQv0T89YY1QHkUAvN
+xwIoY2dFu6ljwXRHkdhY
+=fN7f
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.4.8-r1.ebuild b/net-print/cups/cups-1.4.8-r1.ebuild
index 92de5f52c468..f8529110589f 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.8 2011/11/13 11:36:59 jlec 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 )
diff --git a/net-print/cups/cups-1.4.8-r23.ebuild b/net-print/cups/cups-1.4.8-r23.ebuild
index ac39d3718c27..0f23f1661908 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.2 2012/01/15 20:19:54 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
 
@@ -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 )
diff --git a/net-print/cups/cups-1.5.0-r3.ebuild b/net-print/cups/cups-1.5.0-r3.ebuild
index caad1de4e981..5b54004d89b0 100644
--- a/net-print/cups/cups-1.5.0-r3.ebuild
+++ b/net-print/cups/cups-1.5.0-r3.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.0-r3.ebuild,v 1.2 2012/01/15 20:19:54 dilfridge 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
@@ -23,7 +23,7 @@ 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"
+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
@@ -39,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 )
diff --git a/net-print/cups/metadata.xml b/net-print/cups/metadata.xml
index 5b5f2ac0c4b0..e209898a86d1 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>