Remove old

Package-Manager: portage-2.2.0_alpha124/cvs/Linux x86_64

9 files changed, 22 insertions, 598 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 5f53ff73d1b0..6dbcf4b4c335 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,13 @@
 # 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.509 2012/09/09 14:07:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.510 2012/09/09 15:40:24 dilfridge Exp $
+
+  09 Sep 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  -files/cups-1.4.0-backend-https.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,
+  -files/cups-1.4.8-CVE-2011-3170.patch, -files/cups-1.4.8-largeimage.patch:
+  Remove old
 
   09 Sep 2012; Raúl Porcel <armin76@gentoo.org> cups-1.5.2-r4.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #411887
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 13e171eecf4b..ea7a1ec17da1 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,17 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX cups-1.4.0-backend-https.patch 483 SHA256 9060a5d848d6655db4629822d01fd772a3fbe1a5107109c50cb0ecb4de7a9526 SHA512 b027cc2d6f0753d26fd8cb4c9405088f9444c0202d17a43841b3b1f99f2674ebf03aee73fbad4198a9859c748dd7ee2a4d69366eef251e2ef5524cec02729d53 WHIRLPOOL f692e716b68d0ea4cb1cccd0f62b5a74f6d382c07a9ba293e20efaac74eef0d32b32176302e03b5577b778b35cb3648415f92da398ead07e68436dcaddaedcd9
-AUX cups-1.4.2-str3200.patch 1654 SHA256 8a64f5c72d64ecd95d330fd90630eb02a67865c07921ecb0c010e84b49b537e0 SHA512 42973efea5e3b2a345b94459690fc1ed5406d3073453cf011f802c70a78eb95aef5490f4ea819a055f2ed2b286c0f0a7d5dcf0b4672e056316b8870e84f79e97 WHIRLPOOL 1ad0beb2251be588c195608b6f308881e4d0deaaae4ffaa3466d42e243f5066954d524b30f09e06afa794634eb076eb67dbdf51c579dd9247dd28dbda422d655
 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.4.6-force-gnutls.patch 3319 SHA256 beb4014eac5218d9f424b81946ac1e209625026bf20a7f4820758e5ee1fe5b66 SHA512 b30a2201ec8461964946c8e7999d2641db5ebcdd2bdb82901ea514dd1cf82d081456b284dcb76e2b4b75e5efede69ec41d8858b16d6de7e83e3f5a93d93339b3 WHIRLPOOL 030c8279c96dc7fb9e3fd7c2e1615a19ca9e3d442c457482a823f8417b61c06df3dee953cc076afddc7548255966dd3953798ee8dfb7f612b38791a7c2822882
-AUX cups-1.4.6-serialize-gnutls.patch 3625 SHA256 6bc9e16fc6865b2f3e0ee2d1947bdde691e41f90fce32b9839b3661dcea4a827 SHA512 7924d104a60d2198b44621f234f56f1e098a6a385df210659f4f16080dbbc0154157934b304c8fd03fcaeef9238c8aa3b84326a88820bc16bbbbdc09638a5784 WHIRLPOOL 85f69c9ea26e6c711b6ffce9a3706c488ce9f7c5bbd442a8d4d7072c17c9c212d60242c5c8aa768dba862a5bc44c9dd99dab5d29dbc45c86f8e6e78be30e9f7a
-AUX cups-1.4.8-CVE-2011-3170.patch 1045 SHA256 c94d49c3ff980b830874dae4158768554f87f429ae400838a605505aae350af6 SHA512 4694cd1d6d1d2eeedbb5cfabbff6421081185749bea67edaf28ad20f64408ff24c36181ae7038d4567b238c1b03b644439ec1aa0ed5d1dd6593eefe1999fcfa6 WHIRLPOOL de4237a63758bba7d4578f1bf2c3b6be11bceff8b8f9430ce8f93718a2f7e7a726fbaabc32c3c9c4e6d0064229fe93d5f24fd2e89929b752d807263d8e77c7ad
-AUX cups-1.4.8-largeimage.patch 572 SHA256 364a3ed3e161ad75836e6bc56746c25207680ab6f44563219c93146f0cf74541 SHA512 48ddd89db808efd16e23ffd3dc09a090181cf180da5ce763fe4bcf69df92a76f26706121b453c8b15f6044ab0cc650d36108a7a40e05cac5a4d39a1a14c5957e WHIRLPOOL 40cc142f0c6e681bfb0499f1326ee093df9b1493c5ae4fda5eff914038cce16e70f66fb293de1269543b00e49328cc9013bf8340f97069609f238b02e2580de7
 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
@@ -22,24 +16,32 @@ AUX cups-1.6.0-dont-compress-manpages.patch 435 SHA256 d3e41e8d4a841ac71e5ed8598
 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.4.8-source.tar.bz2 4547162 SHA256 6bd27e1213c139ed0bbadc5c29f97cf1e8f7f8f5b0bb29b227ecaff32aafa9a6 SHA512 434a26f0c867eccc54576f0594055a8153aecb2cd4d439b951d1d80696cb5220d0b880b3c8d82169056e17b05537c6e8323ad2d70250885c47a1a25e969a4eb9 WHIRLPOOL 98a2fd0afc97a1f35196ab5d37d22bdbe6f2dfe3bd0ce8d231d6fffdab5cf797fd4fe1951cd0514063cc8e468fb3e2f00a88191cdbf9b7e3323384ed533e6dc5
 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.4.8-r1.ebuild 7317 SHA256 55daeffa41d049b77696c5c19bcc1a2a063077ab36c3d2f15ca91190dfd88958 SHA512 5a6bdd0180aa81cf033d0b7b66cdc0bd8375e78370fb25d2381e88385ae29f8a47feb5c62631347b67707a75092a1ce3f33eaa95bb80912eb16d724f46e2493c WHIRLPOOL 5db1f9e1b9d9246a9bed62013569cc70572c32e1abf5480b7eaa60f047309056f57781efe63d494779672f7351d7c7a936d495c88cb38e44b67ff842437c698a
 EBUILD cups-1.5.2-r4.ebuild 8421 SHA256 ce3c4b59de12421bef0918ac4f6c47b7b3dccca820f29c92311ee738e34415c0 SHA512 c142b72652c27ccc8fca9653f9c4c34d971cc94d6cabb3ef54c46d126b5b03d0a627f2a4461637c443ec5fe52619f66f93f493af80a87b7d5eb8bb7a129e40c2 WHIRLPOOL 91cfdcc8499d4dc539f1fc60743eafc1cb3842032c6cbf394963e980b73e698d902df972b716433781782f1558cbaa9005345ebe382a6fdd55509e65df0a42de
 EBUILD cups-1.5.3.ebuild 8683 SHA256 93862c6bf66eb1003dbfef73cd1e199be45cfad8fcd5e1b36a6bc298e6fb3e6c SHA512 b44d3d5cdc343fe3686b6b0accc48ac44db76fc0d8b3562aa47b1a018cec1a8e9ae46cf7b0b1b1f47df4ff3bb9d35dbc1831cb5e4e94f620ecfcea3ae181318a WHIRLPOOL f39c84f449084790e1382283851a4a750dc01c0929fe0a20b6dca9a8635289bcefb3686c6d6de3b8453e2f718aea48769018701acd2618b71911df2424296dbf
 EBUILD cups-1.6.1.ebuild 8264 SHA256 e2a5be9306f18d715b2d5ef1f28d82f6685eeab8fe3045b2e24e7f614291950a SHA512 ec37e543afb3873630b06122d422befbfa577abc4e4989e2a4f9a56219c73022b7a8f11254f676d00d7a7fd29a3be4ce37b9cc38fb36235fb1f2ea51488738b6 WHIRLPOOL 76fb0a2cf427349241266f6acf7a16009dee78de39804c17a3b9c7e89803b67de63df4f7d4555cdd667cf4dd7ef2657f91e935d4901ede26aad676240953fcb4
 EBUILD cups-9999.ebuild 8264 SHA256 be21965832f33f26d90fcd7e598a4a0d6bef7eb014c87ff3751d3ba86fa46226 SHA512 6e3d0932e9c18319139fa1230acab2c9933119c6fa6b21073dd987c5868a0d7660ed0e66346d1f9060cc070b11b50c9e9f4ad69101b77dbc1f3ac3c8e801e70a WHIRLPOOL 7b4a7b1193d4ec07ebae0e80f40bbae63cbb47a0579a3dcd8adaf23dbc89ae88be5509691b2549e9829f287670b452effbbb8119535687d834e23d2aead5ea33
-MISC ChangeLog 77702 SHA256 daf906b3192e55a423097edfb389151f2628690fe010e678bb6ae17f8aecde4f SHA512 5d449b8cee92d73ec983da746a451f6b45dd1f12192063a6c79cbe6372bd9ca1699f0de5606288205d6e09f1534592152fd193aff91b7749d8709e538aa5e558 WHIRLPOOL 8c5864919766aae1bb1da717b99a79462e22ee646aeaa868378c0cb782322ad7b826b1fdaa4a86c464ce313d82236e600f04570b8c78a8746804ff24d3855a0c
+MISC ChangeLog 78033 SHA256 e3efb3505bcaf6f5fe5e6299d64166c38dcd83dc3f19d32545f71300105d2551 SHA512 6995e0e0f6b4bc8fb3a582abe16c0d1bac7e443fae3318c90a4e6c1994f7b5a4d32368b56fcf0b43b5389a679c0177017d427f1266be5a1c96735ca8e26f085a WHIRLPOOL b76a8b762ea5912b79c0b261c324d6f2fc1c3e77b650dbab699712830cbd934ed5429e7a812729165367029fb26477a4640f28ae0a1cf62e987c0877607286db
 MISC metadata.xml 778 SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8 SHA512 717b6c3d940b2de149a68bb1c66175cd6fac04e21fcf581d6f1dd248c1bc5ee8fb98ec26a1fa2fca94e8fcb33f131c6635d40a6954721020a989dc260e8b8fbc WHIRLPOOL 057426e3c3f1e7e5a6bb124e0af0d804e15f6bbf17f7b278ef90d773f997beed6c6376bcc9603ac4c67f75675a33bc1fb7a02bb89f7a1ed69634a5d7bf9befbb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBMorYACgkQuQc30/atMkAwlACdEww0TG+QGWDxpRCQuPSHWkYS
-gSUAnjVqy2RvETlrkRma1eE2lXcazW+C
-=X4tN
+iQIcBAEBCAAGBQJQTLjiAAoJEEb+UGWnxTyHBbMQAJhTM0wbVCvBytFWmLBABRk4
+X7NXI6L2cNaxPvTkn0PtAbK+OvMLs46E3fKLM0v0iQTJOWqWmc0dEXA3CWmMtB6P
+9vpTPr5KHpKRzPIcTqfxy+W2tNAGF6aCkH29tLxJ12nNB87NdQLkg5Ib81fFOLvi
+OcxhKwJSl21i1RYv3HQBVDbZYbe8eXcEErV3fS8RuKRFkSPj+YUCt3JCwRJUgfBk
++t5Zu03+PjmAs4Es01aGsvY48986TqfNdbmOb1J/3uYBAcyiT7cNK+Z4g11XOvpY
+6ulmmWVwbGhF+KM/XTaBv3F2PdRCrj6ouW+aXOmbylOLx8uI13V83xAxE3tM3VLe
+4KjegKRJ32PCt55WdekLOYyb7JzEfk/Gniuh3VjGhEDZFlLJ8lhRNanDj7inwQC0
+qkChqQajvUmm9vqmI+4tB5SdGrRuWLbQgxbcWs4qj/5oMi06cgnnCZ+/BdU+rFls
+9WWtx55+1MVGeu8p+gDDkBOru0fhc35mQQi0osT5bpM84oCwbkwQLp3Bm6LVwcy8
+S1O534DUlTz7wVUSJEumYinYG4SIhf8zvP7e/odDLpZb7u92rByqXMGXdWJdXF8e
+nfpkFzCnJqFMBA0YayEA4XiIFaJCZR1N5Hy8F6Vh2Crgldiknk55SfMgIpB95hbX
+fcG+rmg+4P4lktsQO4F5
+=HUTk
 -----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
deleted file mode 100644
index 544f533ece69..000000000000
--- a/net-print/cups/cups-1.4.8-r1.ebuild
+++ /dev/null
@@ -1,270 +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.17 2012/08/08 17:28:41 dilfridge 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 selinux 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 )
-	selinux? ( sec-policy/selinux-cups )
-	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
-	!net-print/cups-filters
-"
-
-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"
-
-	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/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 8a70a20e6c5d..000000000000
--- 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.2-str3200.patch b/net-print/cups/files/cups-1.4.2-str3200.patch
deleted file mode 100644
index 47d9114ed131..000000000000
--- 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 06daeb321499..000000000000
--- 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 bfe9f5e18a33..000000000000
--- 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 843456f2eebd..000000000000
--- 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 abf0b44d46d2..000000000000
--- 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,