Update CUPS

14 files changed, 73 insertions, 1062 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index fe325e1..881beae 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -2,6 +2,17 @@
 # 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 $
 
+*cups-1.6.1 (31 Jul 2012)
+
+  31 Jul 2012; Daniel Solano Gómez <gentoo@sattvik.com>
+  -files/cups-1.4.0-backend-https.patch, -files/cups-1.4.1-group_fix.patch,
+  -files/cups-1.4.2-str3200.patch, -files/cups-1.4.6-force-gnutls.patch,
+  -files/cups-1.4.6-serialize-gnutls.patch, -cups-1.4.8-r1.ebuild,
+  -cups-1.4.8-r23.ebuild, -files/cups-1.4.8-CVE-2011-3170.patch,
+  -files/cups-1.4.8-largeimage.patch, cups-1.5.2-r4.ebuild,
+  -cups-1.5.2-r21.ebuild, cups-1.5.3.ebuild, +cups-1.6.1.ebuild:
+  Sync up with portage
+
 *cups-1.5.2-r21 (27 May 2012)
 
   27 May 2012; Daniel Solano Gómez <gentoo@sattvik.com> cups-1.5.2-r4.ebuild,
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 4435df9..1fee8d1 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,37 +1,27 @@
-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
-AUX cups-1.4.4-dont-compress-manpages.patch 580 RMD160 cbc2bf11025c1f27286bd7f2ece7ba76be6aa7ee SHA1 d7b2447263724eeb092b8cfc8ce54553ad1e5e11 SHA256 cdefd273dcdc78aa5fe14bb0246e25572da7d28a91de5c7ac8be2a0bdd915860
-AUX cups-1.4.4-fix-install-perms.patch 838 RMD160 206bd49e918bab96d24ca72f85f679d3c9122975 SHA1 6e8ef0f3e5c0efa636b4d2324bab2c8edc9461db SHA256 66e68f3bebd7339434e3de99582190d0bedce4b2e5370ff65104cc863daee6c2
-AUX cups-1.4.4-nostrip.patch 487 RMD160 27fe9a5512abb3496416e492dc4ec4fcd9c733c2 SHA1 2a1b6e7b718a5feb5921f38ec02f37b9d0edd310 SHA256 b96448896f08c5f91d5afb0c093f2638a262d1c45e716c29d5164cefee18bc61
-AUX cups-1.4.4-perl-includes.patch 637 RMD160 88d4f170ed5c9392860462f140adf9f860a24cfd SHA1 93185acfe7252ff9a69499f63192b3483d857cb0 SHA256 c730419e7b4bc16a8773a01eeb66523882901480af68686d0790558a2f5fe57d
-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.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 cups-1.5.0-systemd-socket.patch 12829 RMD160 d4ca24c299daf65f2621568443a339f82bd03a2a SHA1 f45e18ba92d3afbca6a26ac676f2f42738032c10 SHA256 350eb1bdb76618dd082e9cda26c5b1400f4f870ffd521186f4d74940d15b4cd5
-AUX cups-1.5.2-browsing.patch 513 RMD160 592b2a814f23beea82d61446989636a393ab34a7 SHA1 43f78e93f84a4da430cb2e1ced268ea00d5f00b3 SHA256 47a229fb7be6ada4e48806c24cdba70cd2b6161ac8fcf1290e07063e486b7bfe
-AUX cups-1.5.2-linkperl.patch 724 RMD160 5e94f21ab236a88ec2026e69aed58ce17dafaa5c SHA1 8556aea40a07176b0daa184bcce1b1abe3d81c48 SHA256 48891623d98a1767c11865d59c72146aa277f1bd0abda9871ae90540676b648e
-AUX cups-1.5.2-threads.patch 730 RMD160 e021b2d2f5293fb58f24279f2550488f90dc91e5 SHA1 bc1b1a8048d36393995f056493b57f5022e6d854 SHA256 adb76ff55cd6857e7bc6c36e9cb9d63201fe14b0f853f52271b45a54ad07a710
-AUX cups-1.5.2-threads2.patch 3192 RMD160 9736e8b03458be45fd1f427d3726368e81d51539 SHA1 2d87e9fe0267f3d6192cc81d1410b5eb534af39d SHA256 07a495e49b7646bfbb0d9f12841f3db8ccd4493c69c8a626b96e913bca384f5c
-AUX cups-1.5.3-fix-install-perms.patch 989 RMD160 d1c3f9eb1b1f3444a5e1bc1ced03d6bfe0d90e8a SHA1 003ee9555f03e57ee3d7e440f5f2f7c365a2295e SHA256 784254b8d0580b1b9823c5a499052c4fc76e2cadf2c22f975b69ab8655fbc59c
-AUX cups-1.6.0-dont-compress-manpages.patch 435 RMD160 14221113caa783c63f04443580c013215660b73a SHA1 8ac8f95cf34c05a9b1bc3f8f5677f545ca71dc26 SHA256 d3e41e8d4a841ac71e5ed8598fc444a2f11b4c94215b55dcf5147694bbbc88c3
-AUX cups-1.6.0-fix-install-perms.patch 948 RMD160 ed566ab57fded47c6dd40364aae7f8ac19aa90ef SHA1 8d2cee2c103be6b9f5c2c20d1100bb347584a3d5 SHA256 4a4a885bb2e111bd67bcb90a5780f33841b18bc02382317fb5e64c384aa0c4c8
-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.4.8-source.tar.bz2 4547162 RMD160 ee80e8d0b56dc0e2edf2a9aa9a43c4b92619f741 SHA1 9167f556e78e0bc075f1eb2f695d79cc1f334007 SHA256 6bd27e1213c139ed0bbadc5c29f97cf1e8f7f8f5b0bb29b227ecaff32aafa9a6
-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-locales.patch.xz 313616 RMD160 2346f911910c19364fc67c67c22b4d7583efe616 SHA1 b3f2660affd00d6a505beeccfb1280275197bd49 SHA256 273f3583882533ce995a0d3380d6db1b5aedb88790def799c38a3454c84357eb
-DIST cups-1.5.2-source.tar.bz2 9595665 RMD160 98181e2ee8c6e574fb6d405f688f52c9b61a2355 SHA1 56fdb4f58e676607845321c0296c1e90e416883f SHA256 b150aa108c631f4f07e92cb13c01263a67170e5ac8383c5548ef8f8473a187fb
-DIST cups-1.5.3-avahi.patch.bz2 17298 RMD160 fb2856801c08ddd73eb2677211cc0bba3f74cc57 SHA1 2d15bd82350806a4dfbedc6b3c48da08b3a7efcb SHA256 daed1232c56ff7a3cb293c7eedbb669f3200ac36120a4d2fec09bd91631038ef
-DIST cups-1.5.3-source.tar.bz2 9580485 RMD160 3516c1a0909921c9ae6f33eed9e06c9d9c475e3f SHA1 f7c4fc7d115da20dbbb6a3a568259df6702a7caa SHA256 9d716a8ffcefdaff1c37f4a4b590f1d74ff9ff72383a18f3c883c9235907f93d
-EBUILD cups-1.4.8-r1.ebuild 7314 RMD160 2dfd2b071ef96d913340dc6fcf7e4f61e1f1f51c SHA1 989f4a35877c49ee28717775cd33113e49984b06 SHA256 0d6c04eb446b29108f1fa45cfdfc74852dccfb195cd210977d4d3827ad5627d3
-EBUILD cups-1.4.8-r23.ebuild 8924 RMD160 1522fbbf1ce8a9310bc24230687efadb4034a382 SHA1 e167e46bc6a3c4827636f5853b387961ef4bd2b9 SHA256 1f7af5479a0c85f0951a986851e2cac79f35dd81e880ae6f83541192fdb5b7c3
-EBUILD cups-1.5.2-r21.ebuild 8893 RMD160 b8891bcca3f57923c4f9c7a12556b0ca00e91ed5 SHA1 7f8a673d41496108cd3d9ac6e48550994abfab3a SHA256 2450af8092e36e1a87182a31e27d591631cdfa7468b3689aa8686aa429757a73
-EBUILD cups-1.5.2-r4.ebuild 8401 RMD160 ea2b42ad2deb2d31b007ef955cb79ecc97f91a58 SHA1 c7527412604776d961545d7805c0763d41742885 SHA256 b722eaca1cba4654c6a40856d43101eebac7cf165bea0ea80ffcbb22d45cdec0
-EBUILD cups-1.5.3.ebuild 8526 RMD160 ea1a3c7c6487ef8eedd27fba3660eb45e8a70f6a SHA1 05b80956f35afc1a515c2df3ce91bb428145047a SHA256 2c35ed43d2375884bafa9e8f166a13c9dfb30a8056c18d1c26d223780924cbb7
-MISC ChangeLog 70097 RMD160 bb1d8e1c269b43c9655f9f496d6b247008a47dc7 SHA1 a88afac314bd86307d3099291fb0160c5c5b57a8 SHA256 edb8b04232217b6e3a5448233370dcc5ad3585d5c3e6e2305f867c55585ce5d7
-MISC metadata.xml 778 RMD160 39d95458b469079b683adf4f2e79eb0b803ce0b9 SHA1 62b298bb9c5435716ce81550213ccd086ec065aa SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8
+AUX cups-1.4.4-dont-compress-manpages.patch 580 SHA256 cdefd273dcdc78aa5fe14bb0246e25572da7d28a91de5c7ac8be2a0bdd915860 SHA512 d262615af6ba4f95378ce2ced3816f42e4f616f7f021999508a8a652039b63eb0a7175e6cd41e8fdcc793a7d9137e7c3009ffa347e9567b4f38c8d82bee41b05 WHIRLPOOL 9096554a336874a7498cf40c20311ac2df36a18a4242fb3d0b73de395211244879e9648adbbfc1e40c4aee53c7827e3525c51bd6eae99910c99b8424ddade451
+AUX cups-1.4.4-fix-install-perms.patch 838 SHA256 66e68f3bebd7339434e3de99582190d0bedce4b2e5370ff65104cc863daee6c2 SHA512 ad4d483c3b3a9e8eebe7ed598f8be5131f10485b4c96e9d0056aa8af9d87c39ad3f439aa9987c63475ef77ce7213c344ba6984725bbe8fc45cf9a0b5ac92736a WHIRLPOOL 4f4ab54052499b2d5a47db8a563a507c29ae1d93a2121fe8a874e89b6b0a032ac83268797405c6e65bdbe78fbcfbd66ffe7d5f27fdc0249d50782b50923ee246
+AUX cups-1.4.4-nostrip.patch 487 SHA256 b96448896f08c5f91d5afb0c093f2638a262d1c45e716c29d5164cefee18bc61 SHA512 10f46e841aa5646f40564e92b6c5b90a5d27702ea8a4dd8652cfd39834be54feec20a2c8d4fea663b90685865deae17851e57161aad7ff250916ce4accbb01fa WHIRLPOOL d55a6bf19e55e3cdb04510eb55b67c011ccdb8b3b73d8787b2da15a584f3e91437c0dc4b53bb62aac2b67c9985c18dddac85e06ca866722fa246a952eda16c0b
+AUX cups-1.4.4-perl-includes.patch 637 SHA256 c730419e7b4bc16a8773a01eeb66523882901480af68686d0790558a2f5fe57d SHA512 f5a832f5cbc23dc7c843e96d5da2a5e8764b7dfa96871ce538475ef14162b0b2ba5f989adef7f41d6b1a9645362aae87a053aa11eb0ffec0c4c0e3d3d902eb85 WHIRLPOOL ffaaa2126be2730d229b6ccbe29b86853465963373e73d6a1cf18670f87bf3f0829372ac0c9442fa1fec8d8ace52270b7fa1a45dbe5dbeafcfc05308eb271076
+AUX cups-1.4.4-php-destdir.patch 679 SHA256 d5126c5e917d8c41c7a4da1477800edd4aa752aaa4c6a67a73adbe1e3b050110 SHA512 520b49722cdc615fb896045c2cf839abd4a2f0850803e9398266595b6fd780957aebba6c895df77d84633655b170e382e73a0b201f5570a4d34ea8a1075d5f8f WHIRLPOOL f47ab551e31121087a9153dc9a050f9654564edd6ce19d3449e749a5d0ddc5d09101de06345ef31b6b1a40cb64397cf1f5755b420bf3fe3ae0070639e6582d17
+AUX cups-1.5.0-group_fix.patch 1774 SHA256 88a7d41298a43fd2004ef6d40690333c6a1e9c1da4251ac9f23b659e91a6559f SHA512 47ba077cc4ead381ad72983f5b28c09d1fe58a3dfbc31cf866db935a83f78a4b8834f89c8dfc7c5c10c01a059d3756e78fd19eda3e64f6effc23bda794d0a33f WHIRLPOOL b06dfe39e6b42f093d6265d2ccb93332772e78b1f01395c6b1f8999b82fd10ba63b7f978e8ea4cd43c25bf84fbc78af3fd5fe857a7dd34089fcdec0cd2ec487f
+AUX cups-1.5.0-systemd-socket.patch 12829 SHA256 350eb1bdb76618dd082e9cda26c5b1400f4f870ffd521186f4d74940d15b4cd5 SHA512 c9dbc387a6afb0baedb3a76605537c77d0d5fdc20a403c0a5241d27ab32e05cddb3091ee312b47ada45ecb3d5ad0d4fb911cde6c6c66a379e47c3819cd30f9dd WHIRLPOOL bda7686dcf483285690f9aeaafd8630a458df70e43d4c3ce7d8f723779a956c4ff638510b4eaa5f7fcb3fd31c96f90f4c8528a74d11dce6015a7d3bae91d730a
+AUX cups-1.5.2-browsing.patch 513 SHA256 47a229fb7be6ada4e48806c24cdba70cd2b6161ac8fcf1290e07063e486b7bfe SHA512 bd9c5be1a802a68350165c81aa107b2954bd0563edd16ee7ace762240af89c82e7ff4cc7451f16af24c87c874d8c8b094aba098d5acd612739497cca47df1e84 WHIRLPOOL b53617a904a3629bc55b0806dbafada9b0a6ae162eb7c752bcc7477fe69db8d6195d1b4e235ca6cd8c37e5f10b69410fb93278d805c18b4488425734a4a5eb1f
+AUX cups-1.5.2-linkperl.patch 724 SHA256 48891623d98a1767c11865d59c72146aa277f1bd0abda9871ae90540676b648e SHA512 4e45372a718ff975ef9dd472d834fa3341972e2f1045f1dc437a6507f656edff589d620e844a32e5ee5bcca9e71ad608baf415d553c991190504f67aa6fa0259 WHIRLPOOL 8e5f3b320a38eeea9e807271a65a0da993f79d1c9a8bead3e688a2a85253d352c78bae448487e5a8556c70aaa921e04af4f93341dff064f2a9a704a67845b7b0
+AUX cups-1.5.2-threads.patch 730 SHA256 adb76ff55cd6857e7bc6c36e9cb9d63201fe14b0f853f52271b45a54ad07a710 SHA512 323e14c10d584c335f1ca37622fbd5e6c3f55755abee3bd84da0d1dff34b2984575f2c8e099a7278e7c31e229a157e9b4faf7b45a0e516de4b4ec465135b0998 WHIRLPOOL e6b2db63661b235501e6dde5b2d9db3bae79b1f510c2cd21a1c6998da1864f2d2857734f00ba5bb4d4d5cec7101d8beeaf72588ed3a8ddf0a4f8ea05f795d3da
+AUX cups-1.5.2-threads2.patch 3192 SHA256 07a495e49b7646bfbb0d9f12841f3db8ccd4493c69c8a626b96e913bca384f5c SHA512 924a8b29f6edbc55a8c6f77fb6a6bf8c224ab2aeafda5cbe39ff2995e3eeb5add0c9cbbb8a93ba8465bfd02589aacab140996d35c6901c794147f920870d2c0a WHIRLPOOL 1580c4ed23e754fc39609f33fb472d4e655ec3f179e2c2587194535c631cb41ff84bb3a3c296aca02530079270ef5d6cac07338d0735313a5678c765eb686deb
+AUX cups-1.5.3-fix-install-perms.patch 989 SHA256 784254b8d0580b1b9823c5a499052c4fc76e2cadf2c22f975b69ab8655fbc59c SHA512 accc6bd685a201ffc84ed591c20cf467a4ab2beef71fa6ad56b25d425d0c73812998152b6e70fb59fd2d894ebeb7f8cb0affda88be25b038c5cd29a24cedda5d WHIRLPOOL 43d752741ac7097ce24cb0a96169ff778bf8d7d3f104cb670887d685b0a3e24ed910fd89cba8de88fe398534dfdd09e11f936142334e952bdea42bc78824424b
+AUX cups-1.6.0-dont-compress-manpages.patch 435 SHA256 d3e41e8d4a841ac71e5ed8598fc444a2f11b4c94215b55dcf5147694bbbc88c3 SHA512 f004b1e7178212eddefda8416c33514834e0e444243c456a8f0723e763247330b8366e71f64ee0e84196789498c5b22334049a8bec210068e02f06b64b683d7c WHIRLPOOL 1453927d8478c740f74ad9f18ef2bdc3dea30596b59cd5fb2a740942da14bef76a2418c3e536aeaad1cbf5ffb14c72e914ba6726776fe5f23f8b43ef4dedd25f
+AUX cups-1.6.0-fix-install-perms.patch 948 SHA256 4a4a885bb2e111bd67bcb90a5780f33841b18bc02382317fb5e64c384aa0c4c8 SHA512 9b2ecc47be2fd08d092017316af39e217e17a540d096cc62971521052632c40033a06cd7bdd5b319bd7f623fea803d569ced6728504d680fd50087288302164f WHIRLPOOL 7d6f4a5eab9964e6c2277f03affaf0eada9b7408eeac742a75d541ec5efe883940c816ea508a59c733327d3bbe0e31bd242b8c183e3f817a54208ed4a3071982
+AUX cupsd.init.d 402 SHA256 66b14dffc99900c0db04453765e5bf48cdf0c197c6f50dccf2a55dc66dd0cf95 SHA512 1f71ba4240f5e8735f782dc688f21db5020065eed9063e1f452eeb5c7cef10cf50519c88746ce4b6a3133ce178fe7dd0ac975e5270ec0df95274e4b13627ef1b WHIRLPOOL c3a1be2ac335642ce85940855c4405af1d0e6e0b45f8e121e18ba98402ce5d035a6202e817bf7b03357b7727191ec7c2e7394d6e856df518b4443c5f81eff8de
+AUX pdftops-1.20.gentoo 10412 SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1 SHA512 ee6179e862ef3561412a246e755a8c4379ca1afca3885412452104e2dbc8335d745cc7a4336f806d2bcd25a466a37751b34ce6283ee5d8682f41107b9e989469 WHIRLPOOL 8ebf6a8ad25485171f3cb55dfbdea4ccf30d56f095554e27f9800e72cefd2ae00dfe58ac28ddd8b8c30ab53e1fe74f4a5451d4b313ebe48b9832bc1a11b6262d
+DIST cups-1.5.2-avahi.patch.bz2 17252 SHA256 6100029c6eec05729b6ef49f743876b9bf4d67f7b20b624be98372f4fb3e1ede SHA512 8bb501d5989272803ad420e38249b5ac69c93d9bb12d86663d98b090e2bbf025c104b9e6a65b240d3df868ec780a3fa74b24bc7c3c4e007b0a21022750a5bf20 WHIRLPOOL f97bdef28419d5e9626823ea69ac59ea6f4d1d5dbdd075b386e23993eaf0ad475508b04eeff9089edce1b264e8086dbab00b6cac2265df1c97104829c044f4fb
+DIST cups-1.5.2-ipp-r8950.patch.bz2 19525 SHA256 1a2d36136fc66b5f53e7cfb3e5d815e62cc3a6b4cc61d678f29d8a0bb748572a SHA512 212d3cf4110cfbbf9feaf96d37598860c154d90df474cf85488208899b4624b7e325a46f4bf6cbbde9f76a1b98f26578085143023936ceda3dc62270fa86d0a3 WHIRLPOOL 563d60ae528fe9d558298542c283b53023fc546e652b3edccc4657f14500fcb7c0062ad09f2586fc84b02b2ef23a4e1a6b2cb0d8f1fa5993a0828a25c8e4be2d
+DIST cups-1.5.2-source.tar.bz2 9595665 SHA256 b150aa108c631f4f07e92cb13c01263a67170e5ac8383c5548ef8f8473a187fb SHA512 c1d83a7540d9506bd8e7d0ce8761a4737928feef388cc5008179d408cc7cf59347fdbfb5a1c9c66b229919d316e37ef2d1863ac5caacada11afb1514ab682309 WHIRLPOOL f2db515343ee0a564436363ed9b6625cf04e6e1e1a93cfbaad1dfaaecd49a89d7afd4bf0bc2828a435aea807b41dad93229d7f0bdf3228d7c6ee3c066482c362
+DIST cups-1.5.3-avahi.patch.bz2 17298 SHA256 daed1232c56ff7a3cb293c7eedbb669f3200ac36120a4d2fec09bd91631038ef SHA512 144f059e092e8b254ac31b156a6330fbd573ff22bcabc8a13703ef7c17e3fbda328ec7607b6a5e72b6ad7050142c6e73db733ebad31121c6b91b5a49d724b901 WHIRLPOOL c3c753580c0eb00b7842cc12d1799afe14e9b696c621150b1e23f8a115c18a442b9f45e7dfcf3721cb3efd7bfc7da366ac52fc4d4caa002adcdbc23164633820
+DIST cups-1.5.3-source.tar.bz2 9580485 SHA256 9d716a8ffcefdaff1c37f4a4b590f1d74ff9ff72383a18f3c883c9235907f93d SHA512 0de371eb347a41226a4a84de02f6eddf1585874c606b16173d8ff3e48d4317b1c90b4ef188068786a562c663117c8782339731d4f339ba76f438e8fae0d364cb WHIRLPOOL 09d564c6ac6cb4933e45f7e70b362a61416173cfcbbb3f26ed69c1b2dd51d7e9d8d1ec40993709ccc52a55b7842567a163425f18264ae8e86d20361f75448f5e
+DIST cups-1.6.1-source.tar.bz2 8218340 SHA256 5842ab1144e653160fe667ee78b932ee036b054c0c2d20533d19e309149a7790 SHA512 4652ab1c2a1d7650b4cb7e552a1689624471e0196bb1a5f389614f8727c1b1d6c59370511217ba6ae8ba427b4b0787ade8de0a9eadb0af3fe483833fbf152305 WHIRLPOOL e1c298d1c8bcaa81ac80734bf271fcb9bf8e232a88150d9c6ce628b179ef88e6cdf7299684af14b6addea268b75d8fd982a789117f81c81f9b9b5985837f91bd
+EBUILD cups-1.5.2-r4.ebuild 8470 SHA256 9c4935abb342eb4e40f57ab29fe3d537f9c6af65fa424c9f101742fbd311eb48 SHA512 72bd12af42638bafe48fada1a53d3b888ee6f75c77e93d996b0e1b10be9dbd187c3150c47e6e6d646f27fc39b0d175322bf60bf5d3d06aa06fe3b3a95fdc2689 WHIRLPOOL d9fff0799a1f647de6e11c4bf7940ec8f71576ef0fd72a604e5335e9813e58b4fdb6aa9781312269fbc3f3c869364e1f0ca767dc112add13085c448f397036c0
+EBUILD cups-1.5.3.ebuild 8721 SHA256 99d115434a1c0e0580912410cd9f4bbfb9a8c7068504ad62b1f45fe84bce98f2 SHA512 c56cbec6fea2ee9bc4e1467b8972c76aa56fc32efdb8e95a758b4a89f2cd0bb72d6c820055222cacd84f32236a9b1c58a0616adc406dd3c734f3139dba001614 WHIRLPOOL 5c6ffeda4d39ba4609195dd5c6e5985cedcf4ad94e1acd59776ab0156179d04ee00fce32bff0c708428ae84cf4d181dd0ddb9ae84326e61bafd77ce87eaf8ddf
+EBUILD cups-1.6.1.ebuild 7913 SHA256 e993ab4848c4b2e749fbe75c57341d330264a2146863a2f68c799550411f0378 SHA512 df82359ac96551473ae177c4c6c1e83ce0591000b0df4f36294856fea629785c5b8d4626258c135f88d7edf1a7c917d97e6906e482d41a7ae282c192c6c2aafa WHIRLPOOL 425ce7a249e4e1c0172f60034fc311b4e8c641aba3655aa51978844b6ea6addf1a9c2f9295f3c39e615420ebef0b774e861dd6ee9742fc59273915114367b4f4
+MISC ChangeLog 70611 SHA256 8e9cec7598615e663578dd83ee9c65ce7692ab7a4e8cc0f35a716523248e0d42 SHA512 25587150b1a4cbcbfa171c3eb13c3d8f9c563201f42805aac98084b162687218f6fdac485a4cad8619b305672607b35d4c174211031ae469d14f6932c978c0d9 WHIRLPOOL 7564f0aa708aae0bfbccd47674239aa964ba301bc2fc6350fb922b77536cf3787936ff056d37f29e8db0e28f8c5480f08fd92fdbe36c1ab667ff52c86b392a22
+MISC metadata.xml 778 SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8 SHA512 717b6c3d940b2de149a68bb1c66175cd6fac04e21fcf581d6f1dd248c1bc5ee8fb98ec26a1fa2fca94e8fcb33f131c6635d40a6954721020a989dc260e8b8fbc WHIRLPOOL 057426e3c3f1e7e5a6bb124e0af0d804e15f6bbf17f7b278ef90d773f997beed6c6376bcc9603ac4c67f75675a33bc1fb7a02bb89f7a1ed69634a5d7bf9befbb
diff --git a/net-print/cups/cups-1.4.8-r1.ebuild b/net-print/cups/cups-1.4.8-r1.ebuild
deleted file mode 100644
index 1223748..0000000
--- a/net-print/cups/cups-1.4.8-r1.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# 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.13 2012/06/01 04:19:51 zmedico Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit autotools eutils flag-o-matic linux-info multilib pam perl-module python versionator user java-pkg-opt-2
-
-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 dbus debug +filters gnutls java +jpeg kerberos ldap pam perl php +png python 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
-	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:0 )
-	slp? ( >=net-libs/openslp-1.0.4 )
-	ssl? (
-		gnutls? (
-			dev-libs/libgcrypt
-			net-libs/gnutls
-		)
-		!gnutls? ( >=dev-libs/openssl-0.9.8g )
-	)
-	tiff? ( >=media-libs/tiff-3.5.5:0 )
-	X? ( x11-misc/xdg-utils )
-	xinetd? ( sys-apps/xinetd )
-	!net-print/cupsddk
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PDEPEND="
-	app-text/ghostscript-gpl[cups]
-	>=app-text/poppler-0.12.3-r3[utils]
-	filters? ( net-print/foomatic-filters )
-"
-
-# 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
-
-	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"
-	# 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"
-
-	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_with java) \
-		$(use_with perl) \
-		$(use_with php) \
-		$(use_with python) \
-		$(use_with xinetd xinetd /etc/xinetd.d) \
-		--enable-libpaper \
-		--disable-libusb \
-		--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.4.8-r23.ebuild b/net-print/cups/cups-1.4.8-r23.ebuild
deleted file mode 100644
index d293c36..0000000
--- a/net-print/cups/cups-1.4.8-r23.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# 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.7 2012/06/01 04:19:51 zmedico Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit autotools eutils fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python user versionator java-pkg-opt-2
-
-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 ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="acl dbus debug +filters gnutls java +jpeg kerberos ldap pam perl php +png python 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:0 )
-	slp? ( >=net-libs/openslp-1.0.4 )
-	ssl? (
-		gnutls? (
-			dev-libs/libgcrypt
-			net-libs/gnutls
-		)
-		!gnutls? ( >=dev-libs/openssl-0.9.8g )
-	)
-	tiff? ( >=media-libs/tiff-3.5.5:0 )
-	usb? ( virtual/libusb:0 )
-	X? ( x11-misc/xdg-utils )
-	xinetd? ( sys-apps/xinetd )
-	!net-print/cupsddk
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PDEPEND="
-	app-text/ghostscript-gpl[cups]
-	>=app-text/poppler-0.12.3-r3[utils]
-	filters? ( net-print/foomatic-filters )
-"
-
-# 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() {
-	# 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"
-	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"
-
-	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/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_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.2-r4.ebuild b/net-print/cups/cups-1.5.2-r4.ebuild
index 5c5f9d8..9c34567 100644
--- a/net-print/cups/cups-1.5.2-r4.ebuild
+++ b/net-print/cups/cups-1.5.2-r4.ebuild
@@ -1,10 +1,11 @@
 # 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.13 2012/06/01 04:19:51 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r4.ebuild,v 1.15 2012/07/23 15:09:45 swift Exp $
 
 EAPI=4
 
 PYTHON_DEPEND="python? 2:2.5"
+GENTOO_DEPEND_ON_PERL=no
 
 inherit autotools eutils fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python user versionator java-pkg-opt-2
 
@@ -22,7 +23,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc 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"
+	+png python selinux 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
@@ -46,6 +47,7 @@ RDEPEND="
 	pam? ( virtual/pam )
 	perl? ( dev-lang/perl )
 	png? ( >=media-libs/libpng-1.4.3:0 )
+	selinux? ( sec-policy/selinux-cups )
 	slp? ( >=net-libs/openslp-1.0.4 )
 	ssl? (
 		gnutls? (
diff --git a/net-print/cups/cups-1.5.3.ebuild b/net-print/cups/cups-1.5.3.ebuild
index 7ae5c1e..718caea 100644
--- a/net-print/cups/cups-1.5.3.ebuild
+++ b/net-print/cups/cups-1.5.3.ebuild
@@ -1,10 +1,11 @@
 # 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.3.ebuild,v 1.1 2012/06/02 18:06:35 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.3.ebuild,v 1.6 2012/07/23 15:09:45 swift Exp $
 
 EAPI=4
 
 PYTHON_DEPEND="python? 2:2.5"
+GENTOO_DEPEND_ON_PERL=no
 
 inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python user versionator java-pkg-opt-2 systemd
 
@@ -15,7 +16,7 @@ if [[ "${PV}" != "9999" ]]; then
 	SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2
 		http://dev.gentoo.org/~dilfridge/distfiles/${P}-avahi.patch.bz2
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 else
 	inherit subversion
 	ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
@@ -28,7 +29,7 @@ HOMEPAGE="http://www.cups.org/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="acl avahi dbus debug +filters gnutls java +jpeg kerberos ldap pam perl
-	+png python slp +ssl static-libs systemd +threads +tiff usb X xinetd"
+	+png python selinux slp +ssl static-libs systemd +threads +tiff usb X xinetd"
 
 LANGS="da de es eu fi fr hu id it ja ko nl no pl pt pt_BR ru sv zh zh_TW"
 for X in ${LANGS} ; do
@@ -52,6 +53,7 @@ RDEPEND="
 	pam? ( virtual/pam )
 	perl? ( dev-lang/perl )
 	png? ( >=media-libs/libpng-1.4.3:0 )
+	selinux? ( sec-policy/selinux-cups )
 	slp? ( >=net-libs/openslp-1.0.4 )
 	ssl? (
 		gnutls? (
@@ -225,6 +227,9 @@ src_compile() {
 }
 
 src_install() {
+	# Fix install-sh, posix sh does not have 'function'.
+	sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
+
 	emake BUILDROOT="${D}" install
 	dodoc {CHANGES,CREDITS,README}.txt
 
diff --git a/net-print/cups/cups-1.5.2-r21.ebuild b/net-print/cups/cups-1.6.1.ebuild
index d822ae6..84ba766 100644
--- a/net-print/cups/cups-1.5.2-r21.ebuild
+++ b/net-print/cups/cups-1.6.1.ebuild
@@ -1,23 +1,19 @@
 # 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-r21.ebuild,v 1.5 2012/06/01 04:19:51 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.1.ebuild,v 1.1 2012/07/31 08:19:38 dilfridge Exp $
 
 EAPI=4
 
 PYTHON_DEPEND="python? 2:2.5"
 
-inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python user versionator java-pkg-opt-2 systemd
+inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam python user versionator java-pkg-opt-2 systemd
 
-MY_P=${P/_}
-MY_PV=${PV/_}
+MY_P=${P/_beta/b}
+MY_PV=${PV/_beta/b}
 
 if [[ "${PV}" != "9999" ]]; then
-	SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2
-		http://dev.gentoo.org/~dilfridge/distfiles/${P}-ipp-r8950.patch.bz2
-		http://dev.gentoo.org/~dilfridge/distfiles/${P}-avahi.patch.bz2
-		http://dev.gentoo.org/~dilfridge/distfiles/${P}-locales.patch.xz
-	"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+	SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2"
+	KEYWORDS="~amd64 ~mips ~x86"
 else
 	inherit subversion
 	ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
@@ -29,10 +25,10 @@ HOMEPAGE="http://www.cups.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="acl avahi dbus debug +filters gnutls java +jpeg kerberos ldap pam perl
-	+png python slp +ssl static-libs systemd +threads +tiff usb X xinetd"
+IUSE="acl avahi dbus debug +filters gnutls java kerberos pam
+	python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
 
-LANGS="da de es eu fi fr id it ja ko nl no pl pt pt_BR ru sv zh zh_TW"
+LANGS="ca es ja"
 for X in ${LANGS} ; do
 	IUSE="${IUSE} linguas_${X}"
 done
@@ -48,13 +44,9 @@ RDEPEND="
 	avahi? ( net-dns/avahi )
 	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 )
-	png? ( >=media-libs/libpng-1.4.3:0 )
-	slp? ( >=net-libs/openslp-1.0.4 )
+	selinux? ( sec-policy/selinux-cups )
 	ssl? (
 		gnutls? (
 			dev-libs/libgcrypt
@@ -63,10 +55,10 @@ RDEPEND="
 		!gnutls? ( >=dev-libs/openssl-0.9.8g )
 	)
 	systemd? ( sys-apps/systemd )
-	tiff? ( >=media-libs/tiff-3.5.5:0 )
 	usb? ( virtual/libusb:0 )
 	X? ( x11-misc/xdg-utils )
 	xinetd? ( sys-apps/xinetd )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 "
 
 DEPEND="${RDEPEND}
@@ -76,6 +68,7 @@ DEPEND="${RDEPEND}
 PDEPEND="
 	app-text/ghostscript-gpl[cups]
 	>=app-text/poppler-0.12.3-r3[utils]
+	net-print/cups-filters
 	filters? ( net-print/foomatic-filters )
 "
 
@@ -87,19 +80,11 @@ RESTRICT="test"
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.4.4-dont-compress-manpages.patch"
-	"${FILESDIR}/${PN}-1.4.4-fix-install-perms.patch"
+	"${FILESDIR}/${PN}-1.6.0-dont-compress-manpages.patch"
+	"${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
 	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
-	"${FILESDIR}/${PN}-1.4.4-php-destdir.patch"
-	"${FILESDIR}/${PN}-1.4.4-perl-includes.patch"
-	"${FILESDIR}/${PN}-1.5.2-linkperl.patch"
-	"${FILESDIR}/${PN}-1.5.2-threads.patch"
-	"${FILESDIR}/${PN}-1.5.2-threads2.patch"
 	"${FILESDIR}/${PN}-1.5.0-systemd-socket.patch"		# systemd support
-	"${WORKDIR}/${PN}-1.5.2-ipp-r8950.patch"		# revert ipp backend to 1.4 state
-	"${WORKDIR}/${PN}-1.5.2-avahi.patch"			# avahi support from debian
 	"${FILESDIR}/${PN}-1.5.2-browsing.patch"		# browsing off by default
-	"${WORKDIR}/${PN}-1.5.2-locales.patch"			# patch locales back into existence
 	"${FILESDIR}/${PN}-1.5.0-group_fix.patch"       # Dan's group fix
 )
 
@@ -186,30 +171,24 @@ src_configure() {
 		--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 avahi) \
 		$(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 threads) \
-		$(use_enable tiff) \
 		$(use_enable usb libusb) \
+		$(use_enable zeroconf dnssd) \
 		$(use_with java) \
-		$(use_with perl) \
+		--without-perl \
 		--without-php \
 		$(use_with python) \
 		$(use_with xinetd xinetd /etc/xinetd.d) \
 		--enable-libpaper \
-		--disable-dnssd \
 		$(use_with systemd systemdsystemunitdir "$(systemd_get_unitdir)") \
 		${myconf}
 
@@ -220,27 +199,13 @@ src_configure() {
 	sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config || die
 }
 
-src_compile() {
-	emake
-
-	if use perl ; then
-		cd "${S}"/scripting/perl
-		perl-module_src_prep
-		perl-module_src_compile
-	fi
-}
-
 src_install() {
+	# Fix install-sh, posix sh does not have 'function'.
+	sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
+
 	emake BUILDROOT="${D}" install
 	dodoc {CHANGES,CREDITS,README}.txt
 
-	if use perl ; then
-		pushd scripting/perl > /dev/null
-		perl-module_src_install
-		fixlocalpod
-		popd > /dev/null
-	fi
-
 	# move the default config file to docs
 	dodoc "${ED}"/etc/cups/cupsd.conf.default
 	rm -f "${ED}"/etc/cups/cupsd.conf.default
@@ -286,6 +251,10 @@ src_install() {
 
 	# create /etc/cups/client.conf, bug #196967 and #266678
 	echo "ServerName /var/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
+
+	# the following files are now provided by cups-filters:
+	rm -r "${ED}"/usr/share/cups/banners || die
+	rm -r "${ED}"/usr/share/cups/data/testprint || die
 }
 
 pkg_preinst() {
diff --git a/net-print/cups/files/cups-1.4.0-backend-https.patch b/net-print/cups/files/cups-1.4.0-backend-https.patch
deleted file mode 100644
index 8a70a20..0000000
--- a/net-print/cups/files/cups-1.4.0-backend-https.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur cups-1.4.0/backend/Makefile cups-1.4.0.new/backend/Makefile
---- cups-1.4.0/backend/Makefile	2009-03-03 20:39:21.000000000 +0100
-+++ cups-1.4.0.new/backend/Makefile	2009-09-01 14:00:05.592615359 +0200
-@@ -91,6 +91,7 @@
- 	done
- 	$(RM) $(SERVERBIN)/backend/http
- 	$(LN) ipp $(SERVERBIN)/backend/http
-+	$(LN) ipp $(SERVERBIN)/backend/https
- 	if test "x$(DNSSD_BACKEND)" != x; then \
- 		$(RM) $(SERVERBIN)/backend/mdns; \
- 		$(LN) $(DNSSD_BACKEND) $(SERVERBIN)/backend/mdns; \
diff --git a/net-print/cups/files/cups-1.4.1-group_fix.patch b/net-print/cups/files/cups-1.4.1-group_fix.patch
deleted file mode 100644
index ba8fb24..0000000
--- a/net-print/cups/files/cups-1.4.1-group_fix.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -Naur cups-1.4.1/scheduler/auth.c cups-1.4.1-fixed/scheduler/auth.c
---- cups-1.4.1/scheduler/auth.c	2009-05-26 17:01:23.000000000 -0500
-+++ cups-1.4.1-fixed/scheduler/auth.c	2009-09-16 21:07:04.000000000 -0500
-@@ -1370,6 +1370,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
-@@ -1391,29 +1392,42 @@
-     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.2-str3200.patch b/net-print/cups/files/cups-1.4.2-str3200.patch
deleted file mode 100644
index 47d9114..0000000
--- a/net-print/cups/files/cups-1.4.2-str3200.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: scheduler/select.c
-===================================================================
---- scheduler/select.c	(revision 8887)
-+++ scheduler/select.c	(working copy)
-@@ -454,7 +454,7 @@
-     if (fdptr->read_cb && event->filter == EVFILT_READ)
-       (*(fdptr->read_cb))(fdptr->data);
- 
--    if (fdptr->write_cb && event->filter == EVFILT_WRITE)
-+    if (fdptr->use > 1 && fdptr->write_cb && event->filter == EVFILT_WRITE)
-       (*(fdptr->write_cb))(fdptr->data);
- 
-     release_fd(fdptr);
-@@ -499,7 +499,8 @@
- 	if (fdptr->read_cb && (event->events & (EPOLLIN | EPOLLERR | EPOLLHUP)))
- 	  (*(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)))
- 	  (*(fdptr->write_cb))(fdptr->data);
- 
- 	release_fd(fdptr);
-@@ -590,7 +591,8 @@
-       if (fdptr->read_cb && (pfd->revents & (POLLIN | POLLERR | POLLHUP)))
-         (*(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)))
-         (*(fdptr->write_cb))(fdptr->data);
- 
-       release_fd(fdptr);
-@@ -645,7 +647,8 @@
-       if (fdptr->read_cb && FD_ISSET(fdptr->fd, &cupsd_current_input))
-         (*(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))
-         (*(fdptr->write_cb))(fdptr->data);
- 
-       release_fd(fdptr);
diff --git a/net-print/cups/files/cups-1.4.6-force-gnutls.patch b/net-print/cups/files/cups-1.4.6-force-gnutls.patch
deleted file mode 100644
index 06daeb3..0000000
--- a/net-print/cups/files/cups-1.4.6-force-gnutls.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-Source: http://pkgs.fedoraproject.org/gitweb/?p=cups.git;a=blob;f=cups-force-gnutls.patch;h=85adaa8bdcc013e5401fffe74306a5fe644cf088;hb=HEAD
-Reason: Force the use of gnutls despite thread-safety concerns (Gentoo bug #350406)
-Upstream: http://cups.org/str.php?L3605
-
-diff -up cups-1.4.4/config-scripts/cups-ssl.m4.force-gnutls cups-1.4.4/config-scripts/cups-ssl.m4
---- cups-1.4.4/config-scripts/cups-ssl.m4.force-gnutls	2010-09-15 16:49:22.343502552 +0100
-+++ cups-1.4.4/config-scripts/cups-ssl.m4	2010-09-15 16:49:42.347502595 +0100
-@@ -65,23 +65,21 @@ if test x$enable_ssl != xno; then
- 	if $PKGCONFIG --exists gnutls; then
- 	    if test "x$have_pthread" = xyes; then
- 		AC_MSG_WARN([The current version of GNU TLS cannot be made thread-safe.])
--	    else
--	        have_ssl=1
--	        SSLLIBS=`$PKGCONFIG --libs gnutls`
--	        SSLFLAGS=`$PKGCONFIG --cflags gnutls`
--	        AC_DEFINE(HAVE_SSL)
--	        AC_DEFINE(HAVE_GNUTLS)
- 	    fi
-+	    have_ssl=1
-+	    SSLLIBS=`$PKGCONFIG --libs gnutls`
-+	    SSLFLAGS=`$PKGCONFIG --cflags gnutls`
-+	    AC_DEFINE(HAVE_SSL)
-+	    AC_DEFINE(HAVE_GNUTLS)
- 	elif test "x$LIBGNUTLSCONFIG" != x; then
- 	    if test "x$have_pthread" = xyes; then
- 		AC_MSG_WARN([The current version of GNU TLS cannot be made thread-safe.])
--	    else
--	        have_ssl=1
--	        SSLLIBS=`$LIBGNUTLSCONFIG --libs`
--	        SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
--	        AC_DEFINE(HAVE_SSL)
--	        AC_DEFINE(HAVE_GNUTLS)
- 	    fi
-+	    have_ssl=1
-+	    SSLLIBS=`$LIBGNUTLSCONFIG --libs`
-+	    SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
-+	    AC_DEFINE(HAVE_SSL)
-+	    AC_DEFINE(HAVE_GNUTLS)
- 	fi
- 
- 	if test $have_ssl = 1; then
-diff -up cups-1.4.4/configure.force-gnutls cups-1.4.4/configure
---- cups-1.4.4/configure.force-gnutls	2010-06-17 19:25:47.000000000 +0100
-+++ cups-1.4.4/configure	2010-09-15 16:50:01.689503165 +0100
-@@ -17542,36 +17542,34 @@ fi
- 	    if test "x$have_pthread" = xyes; then
- 		{ echo "$as_me:$LINENO: WARNING: The current version of GNU TLS cannot be made thread-safe." >&5
- echo "$as_me: WARNING: The current version of GNU TLS cannot be made thread-safe." >&2;}
--	    else
--	        have_ssl=1
--	        SSLLIBS=`$PKGCONFIG --libs gnutls`
--	        SSLFLAGS=`$PKGCONFIG --cflags gnutls`
--	        cat >>confdefs.h <<\_ACEOF
-+	    fi
-+	    have_ssl=1
-+	    SSLLIBS=`$PKGCONFIG --libs gnutls`
-+	    SSLFLAGS=`$PKGCONFIG --cflags gnutls`
-+	    cat >>confdefs.h <<\_ACEOF
- #define HAVE_SSL 1
- _ACEOF
- 
--	        cat >>confdefs.h <<\_ACEOF
-+	    cat >>confdefs.h <<\_ACEOF
- #define HAVE_GNUTLS 1
- _ACEOF
- 
--	    fi
- 	elif test "x$LIBGNUTLSCONFIG" != x; then
- 	    if test "x$have_pthread" = xyes; then
- 		{ echo "$as_me:$LINENO: WARNING: The current version of GNU TLS cannot be made thread-safe." >&5
- echo "$as_me: WARNING: The current version of GNU TLS cannot be made thread-safe." >&2;}
--	    else
--	        have_ssl=1
--	        SSLLIBS=`$LIBGNUTLSCONFIG --libs`
--	        SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
--	        cat >>confdefs.h <<\_ACEOF
-+	    fi
-+	    have_ssl=1
-+	    SSLLIBS=`$LIBGNUTLSCONFIG --libs`
-+	    SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
-+	    cat >>confdefs.h <<\_ACEOF
- #define HAVE_SSL 1
- _ACEOF
- 
--	        cat >>confdefs.h <<\_ACEOF
-+	    cat >>confdefs.h <<\_ACEOF
- #define HAVE_GNUTLS 1
- _ACEOF
- 
--	    fi
- 	fi
- 
- 	if test $have_ssl = 1; then
diff --git a/net-print/cups/files/cups-1.4.6-serialize-gnutls.patch b/net-print/cups/files/cups-1.4.6-serialize-gnutls.patch
deleted file mode 100644
index bfe9f5e..0000000
--- a/net-print/cups/files/cups-1.4.6-serialize-gnutls.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-Source: http://pkgs.fedoraproject.org/gitweb/?p=cups.git;a=blob;f=cups-serialize-gnutls.patch;h=cdd82cb95574801bf714364a585e31eb05191750;hb=HEAD
-Reason: Perform locking for gnutls and avoid libgcrypt's broken locking (Gentoo bug #350406)
-Upstream: http://cups.org/str.php?L3605
-
-diff -up cups-1.4.4/cups/http.c.serialize-gnutls cups-1.4.4/cups/http.c
---- cups-1.4.4/cups/http.c.serialize-gnutls	2010-09-17 13:37:01.858871762 +0100
-+++ cups-1.4.4/cups/http.c	2010-09-17 13:55:22.579871934 +0100
-@@ -149,7 +149,7 @@ static int		http_write_ssl(http_t *http,
- 
- #  ifdef HAVE_GNUTLS
- #    ifdef HAVE_PTHREAD_H
--GCRY_THREAD_OPTION_PTHREAD_IMPL;
-+static pthread_mutex_t gnutls_lock;
- #    endif /* HAVE_PTHREAD_H */
- 
- #  elif defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD_H)
-@@ -1231,7 +1231,7 @@ httpInitialize(void)
-   */
- 
- #  ifdef HAVE_PTHREAD_H
--  gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
-+  pthread_mutex_init(&gnutls_lock, NULL);
- #  endif /* HAVE_PTHREAD_H */
- 
-  /*
-@@ -2228,6 +2228,7 @@ _httpWait(http_t *http,			/* I - Connect
-     if (SSL_pending((SSL *)(http->tls)))
-       return (1);
- #  elif defined(HAVE_GNUTLS)
-+    /* lock already held here... */
-     if (gnutls_record_check_pending(((http_tls_t *)(http->tls))->session))
-       return (1);
- #  elif defined(HAVE_CDSASSL)
-@@ -2294,6 +2295,8 @@ int					/* O - 1 if data is available, 0
- httpWait(http_t *http,			/* I - Connection to server */
-          int    msec)			/* I - Milliseconds to wait */
- {
-+  int ret;
-+
-  /*
-   * First see if there is data in the buffer...
-   */
-@@ -2318,7 +2321,17 @@ httpWait(http_t *http,			/* I - Connecti
-   * If not, check the SSL/TLS buffers and do a select() on the connection...
-   */
- 
--  return (_httpWait(http, msec, 1));
-+#if defined(HAVE_SSL) && defined(HAVE_GNUTLS) && defined(HAVE_PTHREAD_H)
-+  pthread_mutex_lock(&gnutls_lock);
-+#endif
-+
-+  ret = _httpWait(http, msec, 1);
-+
-+#if defined(HAVE_SSL) && defined(HAVE_GNUTLS) && defined(HAVE_PTHREAD_H)
-+  pthread_mutex_unlock(&gnutls_lock);
-+#endif
-+
-+  return (ret);
- }
- 
- 
-@@ -2769,7 +2782,9 @@ http_read_ssl(http_t *http,		/* I - Conn
-   ssize_t	result;			/* Return value */
- 
- 
-+  pthread_mutex_lock(&gnutls_lock);
-   result = gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len);
-+  pthread_mutex_unlock(&gnutls_lock);
- 
-   if (result < 0 && !errno)
-   {
-@@ -3085,6 +3100,7 @@ http_setup_ssl(http_t *http)		/* I - Con
-     return (-1);
-   }
- 
-+  pthread_mutex_lock(&gnutls_lock);
-   gnutls_certificate_allocate_credentials(credentials);
- 
-   gnutls_init(&(conn->session), GNUTLS_CLIENT);
-@@ -3104,9 +3120,11 @@ http_setup_ssl(http_t *http)		/* I - Con
-     free(credentials);
-     free(conn);
- 
-+    pthread_mutex_unlock(&gnutls_lock);
-     return (-1);
-   }
- 
-+  pthread_mutex_unlock(&gnutls_lock);
-   conn->credentials = credentials;
- 
- #  elif defined(HAVE_CDSASSL)
-@@ -3196,9 +3214,11 @@ http_shutdown_ssl(http_t *http)		/* I - 
-   conn = (http_tls_t *)(http->tls);
-   credentials = (gnutls_certificate_client_credentials *)(conn->credentials);
- 
-+  pthread_mutex_lock(&gnutls_lock);
-   gnutls_bye(conn->session, GNUTLS_SHUT_RDWR);
-   gnutls_deinit(conn->session);
-   gnutls_certificate_free_credentials(*credentials);
-+  pthread_mutex_unlock(&gnutls_lock);
-   free(credentials);
-   free(conn);
- 
-@@ -3445,7 +3465,9 @@ http_write_ssl(http_t     *http,	/* I - 
- #  elif defined(HAVE_GNUTLS)
-   ssize_t	result;			/* Return value */
- 
-+  pthread_mutex_lock(&gnutls_lock);
-   result = gnutls_record_send(((http_tls_t *)(http->tls))->session, buf, len);
-+  pthread_mutex_unlock(&gnutls_lock);
- 
-   if (result < 0 && !errno)
-   {
diff --git a/net-print/cups/files/cups-1.4.8-CVE-2011-3170.patch b/net-print/cups/files/cups-1.4.8-CVE-2011-3170.patch
deleted file mode 100644
index 843456f..0000000
--- a/net-print/cups/files/cups-1.4.8-CVE-2011-3170.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Source: Upstream http://cups.org/str.php?L3914
-Reason: Avoid GIF reader loop (CVE-2011-2896)
-Upstream: Fixed in trunk
-
-diff -up cups-1.4.8/filter/image-gif.c.CVE-2011-2896 cups-1.4.8/filter/image-gif.c
---- cups-1.4.8/filter/image-gif.c.CVE-2011-2896	2011-06-20 21:37:51.000000000 +0100
-+++ cups-1.4.8/filter/image-gif.c	2011-08-19 11:33:37.547911212 +0100
-@@ -648,11 +648,13 @@ gif_read_lzw(FILE *fp,			/* I - File to 
- 
-     if (code == max_code)
-     {
--      *sp++ = firstcode;
--      code  = oldcode;
-+      if (sp < (stack + 8192))
-+	*sp++ = firstcode;
-+
-+      code = oldcode;
-     }
- 
--    while (code >= clear_code)
-+    while (code >= clear_code && sp < (stack + 8192))
-     {
-       *sp++ = table[1][code];
-       if (code == table[0][code])
-@@ -661,8 +663,10 @@ gif_read_lzw(FILE *fp,			/* I - File to 
-       code = table[0][code];
-     }
- 
--    *sp++ = firstcode = table[1][code];
--    code  = max_code;
-+    if (sp < (stack + 8192))
-+      *sp++ = firstcode = table[1][code];
-+
-+    code = max_code;
- 
-     if (code < 4096)
-     {
diff --git a/net-print/cups/files/cups-1.4.8-largeimage.patch b/net-print/cups/files/cups-1.4.8-largeimage.patch
deleted file mode 100644
index abf0b44..0000000
--- a/net-print/cups/files/cups-1.4.8-largeimage.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: filter/image.c
-===================================================================
---- filter/image.c	(Revision 9872)
-+++ filter/image.c	(Revision 9873)
-@@ -349,9 +349,10 @@
-   * Load the image as appropriate...
-   */
- 
--  img->max_ics = CUPS_TILE_MINIMUM;
--  img->xppi    = 128;
--  img->yppi    = 128;
-+  img->cachefile = -1;
-+  img->max_ics   = CUPS_TILE_MINIMUM;
-+  img->xppi      = 128;
-+  img->yppi      = 128;
- 
-   if (!memcmp(header, "GIF87a", 6) || !memcmp(header, "GIF89a", 6))
-     status = _cupsImageReadGIF(img, fp, primary, secondary, saturation, hue,