Drop cups-1.5, bug 428356 was filed 07/2012

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

11 files changed, 24 insertions, 843 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 6c3f98cca54a..df953a9d7721 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.574 2013/12/23 16:24:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.575 2013/12/26 00:08:21 dilfridge Exp $
+
+  26 Dec 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  -files/cups-1.4.4-dont-compress-manpages.patch,
+  -files/cups-1.4.4-perl-includes.patch, -files/cups-1.4.4-php-destdir.patch,
+  -files/cups-1.5.0-systemd-socket.patch, -files/cups-1.5.2-browsing.patch,
+  -files/cups-1.5.2-linkperl.patch, -cups-1.5.3.ebuild,
+  -files/cups-1.5.3-fix-install-perms.patch:
+  Drop cups-1.5, bug 428356 was filed 07/2012
 
   23 Dec 2013; Agostino Sarubbo <ago@gentoo.org> cups-1.6.4.ebuild:
   Stable for sparc, wrt bug #489914
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 8af71df7a4cc..774d73a05487 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,15 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX cups-1.4.4-dont-compress-manpages.patch 580 SHA256 cdefd273dcdc78aa5fe14bb0246e25572da7d28a91de5c7ac8be2a0bdd915860 SHA512 d262615af6ba4f95378ce2ced3816f42e4f616f7f021999508a8a652039b63eb0a7175e6cd41e8fdcc793a7d9137e7c3009ffa347e9567b4f38c8d82bee41b05 WHIRLPOOL 9096554a336874a7498cf40c20311ac2df36a18a4242fb3d0b73de395211244879e9648adbbfc1e40c4aee53c7827e3525c51bd6eae99910c99b8424ddade451
 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-systemd-socket-2.patch 12914 SHA256 779a91231b62f6467b3ee08d5cf9cb85c1fc5408a23b727aa4c4ddc54f450ed6 SHA512 9577ba50e737dd920ef06e6a5d95938ef10db5fcab8254137f15b2214846de56360dbf8c40c3a95e0b3459f5f925d18a9cd07a844cdda7dd9a41d9fac0118291 WHIRLPOOL a15a97f64db18c7ef7ba5e80096d3aeb06dbb19c388424b069e5fc8e125c159c0623aed59dc0748c8359c349a3fa314ef79f32a7b59aad214e92b974eb4f332e
-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.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 cups-1.6.2-statedir.patch 468 SHA256 52867308281522fce419b704ddf5c2c7c10b670fe4977050cf926f1d2f4259ca SHA512 dd9a609aa3d24d23cbb96f14c0a177d7d571508f63cfc98f7050d11b4ec59162bc48df2875ff2d39de1d1bba79ae0b163b82272fc5a48c1f080baff33502925c WHIRLPOOL 5fce69513834e675bd8c9dc843f75131f452601007f086db40878d0fc5453ebd7c5d06e25f3d556447fb9bf29a1df712f87477561d67d521e973835de1eb94e9
@@ -17,33 +10,30 @@ AUX cups-1.6.3-colord-profile.patch 1461 SHA256 1666a6ac70007bc2a505174daee9993d
 AUX cupsd.init.d 402 SHA256 66b14dffc99900c0db04453765e5bf48cdf0c197c6f50dccf2a55dc66dd0cf95 SHA512 1f71ba4240f5e8735f782dc688f21db5020065eed9063e1f452eeb5c7cef10cf50519c88746ce4b6a3133ce178fe7dd0ac975e5270ec0df95274e4b13627ef1b WHIRLPOOL c3a1be2ac335642ce85940855c4405af1d0e6e0b45f8e121e18ba98402ce5d035a6202e817bf7b03357b7727191ec7c2e7394d6e856df518b4443c5f81eff8de
 AUX cupsd.init.d-r1 394 SHA256 239f9831ba2a9df36d334037307cdc11cfa6476a11cbf6668db4ffb4096a248d SHA512 1050fb3073a2ef97660af061ce4b892f302cddc2c16c4db24a06549eef141b946ba104c140cc647d8afe9d78241267aaa894c593bed139a893fe13d6d60a4610 WHIRLPOOL 29118adc80f1593002f6c4d208b1978c2ec16aaa4fe84c9e547ec4412a7eb0d82c7e10f6bf4e1df52d5e37139f290f98a0d7a0cf6c6cc2532b97386ce67b4415
 AUX pdftops-1.20.gentoo 10412 SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1 SHA512 ee6179e862ef3561412a246e755a8c4379ca1afca3885412452104e2dbc8335d745cc7a4336f806d2bcd25a466a37751b34ce6283ee5d8682f41107b9e989469 WHIRLPOOL 8ebf6a8ad25485171f3cb55dfbdea4ccf30d56f095554e27f9800e72cefd2ae00dfe58ac28ddd8b8c30ab53e1fe74f4a5451d4b313ebe48b9832bc1a11b6262d
-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.2-source.tar.bz2 8363773 SHA256 37a3ebd305e76cfd4c9c53013e89c0f7a4dcb04b2e9da61029a29faa57e0f10d SHA512 08b7ae95af9c19a1bb72f851b801d55a51360a4c2993c34878d18a605bf1d9381eada5a8f51653c4467738f0509bb8ad713b79e78c8d2a80f1aa86f1d2196038 WHIRLPOOL 527f4eb1016ac20e737cb5171c8cb4c71295e36da8704dd97c8d405c1cf31a8861cab4dc1b2c8a37e21f83672b5212bf8ffbf7568bd118e8056aa777d0caa1ba
 DIST cups-1.6.4-source.tar.bz2 8262021 SHA256 b910c3e43b2d06f54154d12710e849455d0710c9983dab0a5f49a5e93b1b7e73 SHA512 b150b5915a6ab433546e14024c673372fba04623accc10c637742c83342d73bfb91b9bfbb2e3e6a64a4cc189449ae811eb4a721a994ed42e1a9c489a166f2719 WHIRLPOOL 4152b1b2699af91831f21f308e9836f66649bf6ccaeb03b7fe2fef7017ecaa0907dce5adf7eb7c37af0e6dd10de53f295b29cad52dad38fe1a8c141525b87541
 DIST cups-1.7.0-source.tar.bz2 8421353 SHA256 cf15b8caa9dab4638b628427ef309ab381817fc574b8e736d58680e0475cb2c8 SHA512 764b0fdf9a2d6d1b0be1990f8144ede7cae22a78502776f342fd76ff292ad9ba02dfbcecca5a2c1bf8bfb9597d227bdc953b790ad4eb8380ddcb2c63e4bda915 WHIRLPOOL 78ec4fa7db588ae73e0a8151d78884840c0419b8828c908a6383e259d7d0aec6e5967e7887b03e8ba6317a5572ab9f9feab947ac8f4884f1d51db7049c68da8a
-EBUILD cups-1.5.3.ebuild 8531 SHA256 f69a635b9c64076a183274a49eec89e5c84c2ec37b6c97c492ad3e8d2c3d243f SHA512 b0ebb91b9ca2f0473ce628f2e5df205bf1821df450aa1456572590c7be769ee89120c717c81bf15d03fdb7ba8176950a7835b85aeadbc1d77596d8967f5056e7 WHIRLPOOL c5b42134aeca5361c0a9c0c06830a0882614a836ab623c85345aec3435976bc6e2388ac4b4aea2e5326ea3235b5aacc7206aa65ba880e45bf154ea76b652950b
 EBUILD cups-1.6.2-r5.ebuild 8943 SHA256 f990666793e13ab80e25a31a127973914a7fb167099b8bedf54fbc734c7c4a6d SHA512 2cab80062934036ddf102ce79fa7aacb26ea700cd49f938bccc6d804b343f409b26bd65dae5aa738f29045323e33d5f61ec981e8026ab76f8f3d9d7aaeb7aa40 WHIRLPOOL 1fd0ef47536d9d7f724a46112fc324a0cc6492c111a84fc15e43e0941f6f23ba38c13164119f62ac7a1b0bdde5d89b6e3131ab805d24becd96b8f198810375bb
 EBUILD cups-1.6.4.ebuild 9037 SHA256 6bc57c839899ba182130d6953c55e9166a54ff9bcd3ff3c67872755cf3e30b94 SHA512 e5ba57a582bb84bdf2e4068e65e07e9fa83788452784fe876abcbf4fc382de163045d815c566e95c438812ad4391e256eb215b17208fb14e0baa5d0f81521f56 WHIRLPOOL 21723af98511fd808c2c9b53b4790ad5c6a77f766a46bd19d4a572ad0f73710ee29414a7de76faa761657e86059ffc57fbb6922f7a7f97b4a485ead97c49e013
 EBUILD cups-1.6.9999.ebuild 9098 SHA256 b1a840074d6cbae0b1c5e0bc3002f80651181641aac011b48e4a5d9dfdc2f00b SHA512 be8f749a411fd12e0698a72c8345d05b6b8e27b9d84e8de8295574b06c0ccc52d9ebcd811da3a70e4be89381efe7164381d01ad9ed4645dfcb754a3e9c6bf6ba WHIRLPOOL 0e66ee6a43f305b91c0ea5fe0dee260cbfb2b3f09d67ce0c4dfab377f12cb6a1d017b29df38d977493b0536b3276c43ec4c5f68c3d7fe599702652c2577b139a
 EBUILD cups-1.7.0.ebuild 9103 SHA256 9d887f3e844dae6004c43404178ae7349346c1e6df6fc4106063956644e25a02 SHA512 23786e8694b4c152ce910acf6ea8f37fe59fd862b3b40dc9182b101409fac87515cf2a5f6f903bbfe99056d7ccd058ee8e86f4102009ad398e9ee327d0948e92 WHIRLPOOL a5f5a7912a0d5fdadd7e95aa86e0e18fe4ceff73823e2819f6bb6dd76af77597ecf698b55396ee74d4e6b4e0767b244562cf878c94d407998f77f3960f720fcd
 EBUILD cups-9999.ebuild 9103 SHA256 1750515b8358e1c73e3691886457f0a7d718e1559e84530a24c8edb2a887fe90 SHA512 9970cd82623eed3ff577e80ed7b05a465baa939aca0977ba231d08f20bf1bfabe7d5c65a2e09ff3b39f6acb07d9cbc3b61457c76c6b9054b24ca600b8da4695d WHIRLPOOL 4557c6f4ee5b19cb09a189e5159e9de268013934f0f1d2bde41d264045445a4471471b4a082a0655c84fed4da0ce26d1642a0c20840d0b3eaa8d274ca3ae4764
-MISC ChangeLog 87109 SHA256 c6db293750fac167945c25b717dd64df1a924bec09380f39d64eb8ba991db30b SHA512 98fbd308f22ca4528a24f961940d23f8899b273dbb5589b6d0af0c6d0cd2d8d34e3524dc63de4ae6a7e4068c35b45ba05b1baac1634080afdf7404d44d119406 WHIRLPOOL 3c4d60f0317a96162701b4d411ac31fe72a4df0973f298b59133261ef7d7c45217751f12e718ae92203c5003ed8d8230de0ea1bb084e5cbbb8a5fd35c68a9cfa
-MISC metadata.xml 789 SHA256 6efaa6b3229db0ca62837556ed72fb497546d46178f10107b1aa17570665c742 SHA512 63fa10e24551505a9251f633818364459211f53be2e310c9f94364b6c6635ef911a73da5c9952a6963fa997b9e3178dd224afbc55cb56fe7cc00f2a53a9c4a69 WHIRLPOOL 0e4f27d31bbdc3e57d14e27c2c46395a937b01a991a12b291f29014064113073693f389d5d2103d609b303f951fc9c124829f339b73cd12e4ec58fb8e93dcae4
+MISC ChangeLog 87524 SHA256 626d593a5621200ee9fae2314789c63a567758b1ffa4da955118940267193eed SHA512 3d951a7b49184cd20ddf69f9a376c99c1aa19b3e165d1a3ba97a4083b1d0a14f73346696ef96f203f201bef0ceed838d65357b3731acb4b9473d004ac71190db WHIRLPOOL 4a47a2acb352d76ff55b694264b21304205806ff4f38e09441b3864e1c83fc59e913a0866da5e8a27afd766e12f729b8fcde63a19b906f18af6fc45d88e83034
+MISC metadata.xml 601 SHA256 9bcf6942c89c7dd963f9a34c413c1da17e25cd36489b95b708d4a89ff9659ea8 SHA512 58f0fe7d1f7b66a637013eeddb26a5c409d46915c8f4220e54850cf17cfa0cb082b3c2c5055a660857729cb4c5a53c7ac229dab6a29f801e53dae0ddc94cb573 WHIRLPOOL 55660efe3345c304742dbb12947776a97ebec51354fbab55423dd1fa7efa1b3d9321f067dfcc469462911e12446892b223ebbd3b670d1126255ffe642a64a527
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSuGOvAAoJELp701BxlEWf98oP/2f9pqjqb/eZdI8I+Aa3SjwH
-TDTOyaPQe75QNEz/nO63DbOEydLAawzV8oNkKvpeClW38wT2QZWO/WkZbRD+Kr36
-EsrFtCX6dP7zQd1ocydD0j9hQ4bRsmRBeaihD2k7Tpcv8I4Q9ZqvySXKncWwxH34
-OBmkL1tTUwSdYbV1nbtKnSahjbMH/p8WQljpmg63Z3QKec5GUW1sV7Ao+CeZFH4y
-JO9r+To6mh4u52zx5Ur9DykggK5r1nx/tupuRHU6KajSiUO9LeXUPW8if+lFI2wc
-gBtGQAQFkGprAknxknKbv267kHbm8rJea/Y7WpQ9ZY+Q2ttWDs0jswoZRmuG3vuo
-MqIKz2I8dIk16/eeIRTmDCSwRK7KZVZVA1RVU0eajBfql39pDAC96EXjuq+zARke
-qpztD6ZupAF3xZM+tR3matCLe4TIffkbVvtFSZuf5HK1B9DBPZSE5V3fnRZcn1Lk
-6I1TWeoGbMxbYDNPsCOsa4rCGH1vNLixJDNHa+94unzONqOiLzhCVWVCpFzf2s/W
-DzDMtPupd3NbTfp3tZ9/Upt5NFonpi+Wdfd93ORaMO5Vvk2dVDcniFzZfxL1LhGm
-6PXe09cNaEvbyTVeuKngrQ/VBPGHSnFN3adtTHFepBaWXedvJ2Ll3JT+mpAu7D4Z
-2swKxmQFHzKPMTImz/p5
-=P/jV
+iQIcBAEBCAAGBQJSu3QHAAoJEJS/30SErRQvXF0P/A7QpNb/mPXjWa2wFCqbr3rh
+sy81voTiy4VeM179LGfLtkneuNfJKoJE0P4aSt+2LAnV/Uj6y5aNpyHZRfoSY3Vv
+/Rw8KIxZUWFxzpYlgzOK7aKDA/0EJNoFgME5l9fwGChfa+YIRUPAZsoC2oLZEfJz
+BDx9T3P5U8d2ljgOUG9ErBlxtxxRpqZhlm2jcxzrnSxTIAs2O1a3H2xBF1zAE1ei
+E3jePZQLrxYJvitMvULcAOXaOHlEsBjOFB/R6ks96i4w2XhMJwEnL05H5eGGLknT
+nLvCqiYdIIAYODDjy8KRfF88RT+twZZVmHcxevN+hYCijG0yLHlGzXHiCItZ0ll3
+wlrbs75nZ5vfSuEncLqkX/NuVCsa6DuGzxw6k1T9Oc23SES6S0Ng5uEKnWfnSIFA
+PbAwq5QcQZYIIeQYnVvBZe8l1NLDXTy8kzNmcsSxirxOukDzzVTq2CvrrRIavixD
+//jFp1DENfGRJxJVrB4RF2bNBOoT19/ixsvBIhqB7PfPYee8M2RcYa1MniIV3Tso
+D1balXoAOALB8ud62JX03y+1Z4RLGhtek3ZsH3gM+7bwLB9zBhqyHylgrO0v11Wv
+XmR5T2rojKYWGeKYfVBjfgjnXP78Apfvu9w5VMtXZnfON1mLuNHecp9mfaYWQ4cr
+yeYTfHPrOzIkbhgm53j7
+=7Rzx
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.5.3.ebuild b/net-print/cups/cups-1.5.3.ebuild
deleted file mode 100644
index d5220b944b08..000000000000
--- a/net-print/cups/cups-1.5.3.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2013 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.11 2013/08/14 11:48:21 dilfridge 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
-
-MY_P=${P/_}
-MY_PV=${PV/_}
-
-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="~m68k"
-else
-	inherit subversion
-	ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
-	KEYWORDS=""
-fi
-
-DESCRIPTION="The Common Unix Printing System"
-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 selinux slp +ssl static-libs systemd +threads +tiff usb X xinetd"
-
-LANGS="es hu"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-RDEPEND="
-	app-text/libpaper
-	acl? (
-		kernel_linux? (
-			sys-apps/acl
-			sys-apps/attr
-		)
-	)
-	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 )
-	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 )
-	)
-	systemd? ( sys-apps/systemd )
-	tiff? ( >=media-libs/tiff-3.5.5:0 )
-	usb? ( virtual/libusb:1 )
-	X? ( x11-misc/xdg-utils )
-	xinetd? ( sys-apps/xinetd )
-	!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 )
-"
-
-REQUIRED_USE="gnutls? ( ssl )"
-
-# upstream includes an interactive test which is a nono for gentoo
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.4-dont-compress-manpages.patch"
-	"${FILESDIR}/${PN}-1.5.3-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.0-systemd-socket.patch"		# systemd support
-	"${WORKDIR}/${PN}-1.5.3-avahi.patch"			# avahi support from debian
-	"${FILESDIR}/${PN}-1.5.2-browsing.patch"		# browsing off by default
-)
-
-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 kernel_linux; then
-		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. In this case, "
-					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 libusb code."
-				fi
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	base_src_prepare
-	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 ; then
-		myconf+="
-			$(use_enable gnutls)
-			$(use_enable !gnutls openssl)
-		"
-	else
-		myconf+="
-			--disable-gnutls
-			--disable-openssl
-		"
-	fi
-
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--localstatedir=/var \
-		--with-cups-user=lp \
-		--with-cups-group=lp \
-		--with-docdir=/usr/share/cups/html \
-		--with-languages="${LINGUAS}" \
-		--with-pdftops=/usr/bin/pdftops \
-		--with-system-groups=lpadmin \
-		$(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_with java) \
-		$(use_with 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}
-
-	# 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
-
-	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
-
-	# clean out cups init scripts
-	rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
-
-	# install our init script
-	local neededservices
-	use avahi && neededservices+=" avahi-daemon"
-	use dbus && neededservices+=" dbus"
-	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
-	cp "${FILESDIR}"/cupsd.init.d "${T}"/cupsd || die
-	sed -i \
-		-e "s/@neededservices@/$neededservices/" \
-		"${T}"/cupsd || die
-	doinitd "${T}"/cupsd
-
-	# install our pam script
-	pamd_mimic_system cups auth account
-
-	if use xinetd ; then
-		# correct path
-		sed -i \
-			-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
-			"${ED}"/etc/xinetd.d/cups-lpd || die
-		# it is safer to disable this by default, bug #137130
-		grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
-			{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/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 "${ED}"/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 "${ED}"/usr/share/applications
-
-	# create /etc/cups/client.conf, bug #196967 and #266678
-	echo "ServerName /var/run/cups/cups.sock" >> "${ED}"/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
-	elog "Network browsing for printers is now switched off by default in the config file."
-	elog "To (re-)enable it, edit /etc/cups/cupsd.conf and set \"Browsing On\", "
-	elog "afterwards re-start or reload cups."
-	echo
-}
-
-pkg_postrm() {
-	# Update desktop file database and gtk icon cache (bug 370059)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
diff --git a/net-print/cups/files/cups-1.4.4-dont-compress-manpages.patch b/net-print/cups/files/cups-1.4.4-dont-compress-manpages.patch
deleted file mode 100644
index 4a639c0223b9..000000000000
--- a/net-print/cups/files/cups-1.4.4-dont-compress-manpages.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# Source: Fedora
-
-diff -up cups-1.4b2-svn8404/config-scripts/cups-manpages.m4.no-gzip-man cups-1.4b2-svn8404/config-scripts/cups-manpages.m4
---- cups-1.4b2-svn8404/config-scripts/cups-manpages.m4.no-gzip-man	2009-01-16 08:58:42.000000000 +0000
-+++ cups-1.4b2-svn8404/config-scripts/cups-manpages.m4	2009-03-05 11:11:12.000000000 +0000
-@@ -69,10 +69,10 @@ case "$uname" in
- 		;;
- 	Linux* | GNU* | Darwin*)
- 		# Linux, GNU Hurd, and Mac OS X
--		MAN1EXT=1.gz
--		MAN5EXT=5.gz
--		MAN7EXT=7.gz
--		MAN8EXT=8.gz
-+		MAN1EXT=1
-+		MAN5EXT=5
-+		MAN7EXT=7
-+		MAN8EXT=8
- 		MAN8DIR=8
- 		;;
- 	*)
diff --git a/net-print/cups/files/cups-1.4.4-perl-includes.patch b/net-print/cups/files/cups-1.4.4-perl-includes.patch
deleted file mode 100644
index 677c57ded88a..000000000000
--- a/net-print/cups/files/cups-1.4.4-perl-includes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN cups-1.4.4/scripting/perl/Makefile.PL cups-1.4.4.new//scripting/perl/Makefile.PL
---- cups-1.4.4/scripting/perl/Makefile.PL	2002-08-19 22:43:03.000000000 +0200
-+++ cups-1.4.4.new//scripting/perl/Makefile.PL	2010-09-12 19:12:53.173000149 +0200
-@@ -11,7 +11,7 @@
-     'LIBS'		=> ['-lcups '], # e.g., '-lm'
-     'DEFINE'		=> '', # e.g., '-DHAVE_SOMETHING'
- 	# Insert -I. if you add *.h files later:
--    'INC'		=> '', # e.g., '-I/usr/include/other'
-+    'INC'		=> '-I../../', # e.g., '-I/usr/include/other'
- 	# Un-comment this if you add C files to link with later:
-     # 'OBJECT'		=> '$(O_FILES)', # link all the C files too
- );
diff --git a/net-print/cups/files/cups-1.4.4-php-destdir.patch b/net-print/cups/files/cups-1.4.4-php-destdir.patch
deleted file mode 100644
index 01a64c83f797..000000000000
--- a/net-print/cups/files/cups-1.4.4-php-destdir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# Source: Gentoo
-
-diff -urN cups-1.4.4/scripting/php/Makefile cups-1.4.4.new//scripting/php/Makefile
---- cups-1.4.4/scripting/php/Makefile	2008-08-27 23:12:43.000000000 +0200
-+++ cups-1.4.4.new//scripting/php/Makefile	2010-08-13 10:32:35.764063909 +0200
-@@ -95,11 +95,11 @@
- 
- install-exec:
- 	echo Installing $(PHPCUPS) in $(PHPDIR)
--	$(INSTALL_DIR) $(PHPDIR)
--	$(INSTALL_LIB) $(PHPCUPS) $(PHPDIR)
-+	$(INSTALL_DIR) $(DESTDIR)/$(PHPDIR)
-+	$(INSTALL_LIB) $(PHPCUPS) $(DESTDIR)/$(PHPDIR)
- 	if test "x$(SYMROOT)" != x; then \
--		$(INSTALL_DIR) $(SYMROOT); \
--		cp $(PHPCUPS) $(SYMROOT); \
-+		$(INSTALL_DIR) $(DESTDIR)/$(SYMROOT); \
-+		cp $(PHPCUPS) $(DESTDIR)/$(SYMROOT); \
- 	fi
- 
- 
diff --git a/net-print/cups/files/cups-1.5.0-systemd-socket.patch b/net-print/cups/files/cups-1.5.0-systemd-socket.patch
deleted file mode 100644
index 60918b39a631..000000000000
--- a/net-print/cups/files/cups-1.5.0-systemd-socket.patch
+++ /dev/null
@@ -1,396 +0,0 @@
-diff -up cups-1.5.0/config.h.in.systemd-socket cups-1.5.0/config.h.in
---- cups-1.5.0/config.h.in.systemd-socket	2011-10-18 15:32:40.741672460 +0100
-+++ cups-1.5.0/config.h.in	2011-10-18 15:32:40.843670530 +0100
-@@ -503,6 +503,13 @@
- 
- 
- /*
-+ * Do we have systemd support?
-+ */
-+
-+#undef HAVE_SYSTEMD
-+
-+
-+/*
-  * Various scripting languages...
-  */
- 
-diff -up cups-1.5.0/config-scripts/cups-systemd.m4.systemd-socket cups-1.5.0/config-scripts/cups-systemd.m4
---- cups-1.5.0/config-scripts/cups-systemd.m4.systemd-socket	2011-10-18 15:32:40.844670511 +0100
-+++ cups-1.5.0/config-scripts/cups-systemd.m4	2011-10-18 15:33:16.861989058 +0100
-@@ -0,0 +1,36 @@
-+dnl
-+dnl "$Id: cups-1.5.0-systemd-socket.patch,v 1.1 2012/01/28 20:43:10 dilfridge Exp $"
-+dnl
-+dnl   systemd stuff for CUPS.
-+
-+dnl Find whether systemd is available
-+
-+SDLIBS=""
-+AC_ARG_WITH([systemdsystemunitdir],
-+        AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
-+        [], [with_systemdsystemunitdir=$($PKGCONFIG --variable=systemdsystemunitdir systemd)])
-+if test "x$with_systemdsystemunitdir" != xno; then
-+        AC_MSG_CHECKING(for libsystemd-daemon)
-+        if $PKGCONFIG --exists libsystemd-daemon; then
-+		AC_MSG_RESULT(yes)
-+        	SDCFLAGS=`$PKGCONFIG --cflags libsystemd-daemon`
-+        	SDLIBS=`$PKGCONFIG --libs libsystemd-daemon`
-+		AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
-+		AC_DEFINE(HAVE_SYSTEMD)
-+	else
-+		AC_MSG_RESULT(no)
-+	fi
-+fi
-+
-+if test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ; then
-+        SYSTEMD_UNITS="cups.service cups.socket cups.path"
-+else
-+        SYSTEMD_UNITS=""
-+fi
-+
-+AC_SUBST(SYSTEMD_UNITS)
-+AC_SUBST(SDLIBS)
-+
-+dnl
-+dnl "$Id: cups-1.5.0-systemd-socket.patch,v 1.1 2012/01/28 20:43:10 dilfridge Exp $"
-+dnl
-diff -up cups-1.5.0/configure.in.systemd-socket cups-1.5.0/configure.in
---- cups-1.5.0/configure.in.systemd-socket	2010-11-20 01:03:46.000000000 +0000
-+++ cups-1.5.0/configure.in	2011-10-18 15:32:40.844670511 +0100
-@@ -37,6 +37,7 @@ sinclude(config-scripts/cups-pam.m4)
- sinclude(config-scripts/cups-largefile.m4)
- sinclude(config-scripts/cups-dnssd.m4)
- sinclude(config-scripts/cups-launchd.m4)
-+sinclude(config-scripts/cups-systemd.m4)
- sinclude(config-scripts/cups-defaults.m4)
- sinclude(config-scripts/cups-pdf.m4)
- sinclude(config-scripts/cups-scripting.m4)
-@@ -71,6 +72,9 @@ AC_OUTPUT(Makedefs
- 	  conf/snmp.conf
- 	  cups-config
- 	  data/testprint
-+          data/cups.service
-+          data/cups.socket
-+          data/cups.path
- 	  desktop/cups.desktop
- 	  doc/help/ref-cupsd-conf.html
- 	  doc/help/standard.html
-diff -up cups-1.5.0/cups/usersys.c.systemd-socket cups-1.5.0/cups/usersys.c
---- cups-1.5.0/cups/usersys.c.systemd-socket	2011-10-18 15:32:40.645674277 +0100
-+++ cups-1.5.0/cups/usersys.c	2011-10-18 15:32:40.845670492 +0100
-@@ -770,7 +770,7 @@ cups_read_client_conf(
-     struct stat	sockinfo;		/* Domain socket information */
- 
-     if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
--	(sockinfo.st_mode & S_IRWXO) == S_IRWXO)
-+	(sockinfo.st_mode & (S_IROTH | S_IWOTH)) == (S_IROTH | S_IWOTH))
-       cups_server = CUPS_DEFAULT_DOMAINSOCKET;
-     else
- #endif /* CUPS_DEFAULT_DOMAINSOCKET */
-diff -up cups-1.5.0/data/cups.path.in.systemd-socket cups-1.5.0/data/cups.path.in
---- cups-1.5.0/data/cups.path.in.systemd-socket	2011-10-18 15:32:40.846670473 +0100
-+++ cups-1.5.0/data/cups.path.in	2011-10-18 15:32:40.846670473 +0100
-@@ -0,0 +1,8 @@
-+[Unit]
-+Description=CUPS Printer Service Spool
-+
-+[Path]
-+PathExistsGlob=@CUPS_REQUESTS@/d*
-+
-+[Install]
-+WantedBy=multi-user.target
-diff -up cups-1.5.0/data/cups.service.in.systemd-socket cups-1.5.0/data/cups.service.in
---- cups-1.5.0/data/cups.service.in.systemd-socket	2011-10-18 15:32:40.846670473 +0100
-+++ cups-1.5.0/data/cups.service.in	2011-10-18 15:32:40.846670473 +0100
-@@ -0,0 +1,9 @@
-+[Unit]
-+Description=CUPS Printing Service
-+
-+[Service]
-+ExecStart=@sbindir@/cupsd -f
-+
-+[Install]
-+Also=cups.socket cups.path
-+WantedBy=printer.target
-diff -up cups-1.5.0/data/cups.socket.in.systemd-socket cups-1.5.0/data/cups.socket.in
---- cups-1.5.0/data/cups.socket.in.systemd-socket	2011-10-18 15:32:40.847670454 +0100
-+++ cups-1.5.0/data/cups.socket.in	2011-10-18 15:32:40.847670454 +0100
-@@ -0,0 +1,10 @@
-+[Unit]
-+Description=CUPS Printing Service Sockets
-+
-+[Socket]
-+ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-+ListenStream=631
-+BindIPv6Only=ipv6-only
-+
-+[Install]
-+WantedBy=sockets.target
-diff -up cups-1.5.0/data/Makefile.systemd-socket cups-1.5.0/data/Makefile
---- cups-1.5.0/data/Makefile.systemd-socket	2011-05-12 06:21:56.000000000 +0100
-+++ cups-1.5.0/data/Makefile	2011-10-18 15:32:40.847670454 +0100
-@@ -112,6 +112,12 @@ install-data:
- 		$(INSTALL_DATA) $$file $(DATADIR)/ppdc; \
- 	done
- 	$(INSTALL_DIR) -m 755 $(DATADIR)/profiles
-+	if test "x$(SYSTEMD_UNITS)" != "x" ; then \
-+		$(INSTALL_DIR) -m 755 $(SYSTEMDUNITDIR); \
-+		for file in $(SYSTEMD_UNITS); do \
-+			$(INSTALL_DATA) $$file $(SYSTEMDUNITDIR); \
-+		done; \
-+	fi
- 
- 
- #
-@@ -159,6 +165,9 @@ uninstall:
- 	-$(RMDIR) $(DATADIR)/charsets
- 	-$(RMDIR) $(DATADIR)/banners
- 	-$(RMDIR) $(DATADIR)
-+	for file in $(SYSTEMD_UNITS); do \
-+		$(RM) $(SYSTEMDUNITDIR)/$$file; \
-+	done
- 
- 
- #
-diff -up cups-1.5.0/Makedefs.in.systemd-socket cups-1.5.0/Makedefs.in
---- cups-1.5.0/Makedefs.in.systemd-socket	2011-10-18 15:32:40.719672876 +0100
-+++ cups-1.5.0/Makedefs.in	2011-10-18 15:32:40.848670435 +0100
-@@ -143,6 +143,7 @@ CXXFLAGS	=	@CPPFLAGS@ @CXXFLAGS@
- CXXLIBS		=	@CXXLIBS@
- DBUS_NOTIFIER	=	@DBUS_NOTIFIER@
- DBUS_NOTIFIERLIBS =	@DBUS_NOTIFIERLIBS@
-+SYSTEMD_UNITS   =       @SYSTEMD_UNITS@
- DNSSD_BACKEND	=	@DNSSD_BACKEND@
- DSOFLAGS	=	-L../cups @DSOFLAGS@
- DSOLIBS		=	@DSOLIBS@ $(COMMONLIBS)
-@@ -151,6 +152,7 @@ FONTS		=	@FONTS@
- IMGLIBS		=	@IMGLIBS@
- IMGFILTERS	=	@IMGFILTERS@
- LAUNCHDLIBS	=	@LAUNCHDLIBS@
-+SDLIBS		=	@SDLIBS@
- LDFLAGS		=	-L../cgi-bin -L../cups -L../filter -L../ppdc \
- 			-L../scheduler @LDARCHFLAGS@ \
- 			@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
-@@ -267,6 +269,7 @@ PAMFILE		=	@PAMFILE@
- 
- DEFAULT_LAUNCHD_CONF =	@DEFAULT_LAUNCHD_CONF@
- DBUSDIR		=	@DBUSDIR@
-+SYSTEMDUNITDIR  =       $(BUILDROOT)@systemdsystemunitdir@
- 
- 
- #
-diff -up cups-1.5.0/scheduler/client.h.systemd-socket cups-1.5.0/scheduler/client.h
---- cups-1.5.0/scheduler/client.h.systemd-socket	2011-03-25 21:25:38.000000000 +0000
-+++ cups-1.5.0/scheduler/client.h	2011-10-18 15:32:40.848670435 +0100
-@@ -75,6 +75,9 @@ typedef struct
-   int			fd;		/* File descriptor for this server */
-   http_addr_t		address;	/* Bind address of socket */
-   http_encryption_t	encryption;	/* To encrypt or not to encrypt... */
-+#ifdef HAVE_SYSTEMD
-+  int			is_systemd;	/* Is this a systemd socket? */
-+#endif /* HAVE_SYSTEMD */
- } cupsd_listener_t;
- 
- 
-diff -up cups-1.5.0/scheduler/listen.c.systemd-socket cups-1.5.0/scheduler/listen.c
---- cups-1.5.0/scheduler/listen.c.systemd-socket	2011-04-16 00:38:13.000000000 +0100
-+++ cups-1.5.0/scheduler/listen.c	2011-10-18 15:32:40.849670416 +0100
-@@ -401,7 +401,11 @@ cupsdStopListening(void)
-        lis;
-        lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
-   {
--    if (lis->fd != -1)
-+    if (lis->fd != -1
-+#ifdef HAVE_SYSTEMD
-+        && !lis->is_systemd
-+#endif /* HAVE_SYSTEMD */
-+        )
-     {
- #ifdef WIN32
-       closesocket(lis->fd);
-diff -up cups-1.5.0/scheduler/main.c.systemd-socket cups-1.5.0/scheduler/main.c
---- cups-1.5.0/scheduler/main.c.systemd-socket	2011-10-18 15:32:40.802671306 +0100
-+++ cups-1.5.0/scheduler/main.c	2011-10-18 15:32:40.851670379 +0100
-@@ -26,6 +26,8 @@
-  *   launchd_checkin()     - Check-in with launchd and collect the listening
-  *                           fds.
-  *   launchd_checkout()    - Update the launchd KeepAlive file as needed.
-+ *   systemd_checkin()     - Check-in with systemd and collect the
-+ *                           listening fds.
-  *   parent_handler()      - Catch USR1/CHLD signals...
-  *   process_children()    - Process all dead children...
-  *   select_timeout()      - Calculate the select timeout value.
-@@ -62,6 +64,10 @@
- #  endif /* !LAUNCH_JOBKEY_SERVICEIPC */
- #endif /* HAVE_LAUNCH_H */
- 
-+#ifdef HAVE_SYSTEMD
-+#include <systemd/sd-daemon.h>
-+#endif /* HAVE_SYSTEMD */
-+
- #if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
- #  include <malloc.h>
- #endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
-@@ -78,6 +84,9 @@
- static void		launchd_checkin(void);
- static void		launchd_checkout(void);
- #endif /* HAVE_LAUNCHD */
-+#ifdef HAVE_SYSTEMD
-+static void		systemd_checkin(void);
-+#endif /* HAVE_SYSTEMD */
- static void		parent_handler(int sig);
- static void		process_children(void);
- static void		sigchld_handler(int sig);
-@@ -537,6 +546,13 @@ main(int  argc,				/* I - Number of comm
-   }
- #endif /* HAVE_LAUNCHD */
- 
-+#ifdef HAVE_SYSTEMD
-+ /*
-+  * If we were started by systemd get the listen sockets file descriptors...
-+  */
-+  systemd_checkin();
-+#endif /* HAVE_SYSTEMD */
-+
-  /*
-   * Startup the server...
-   */
-@@ -759,6 +775,15 @@ main(int  argc,				/* I - Number of comm
- 	}
- #endif /* HAVE_LAUNCHD */
- 
-+#ifdef HAVE_SYSTEMD
-+       /*
-+	* If we were started by systemd get the listen sockets file
-+	* descriptors...
-+        */
-+
-+        systemd_checkin();
-+#endif /* HAVE_SYSTEMD */
-+
-        /*
-         * Startup the server...
-         */
-@@ -1584,6 +1609,100 @@ launchd_checkout(void)
- }
- #endif /* HAVE_LAUNCHD */
- 
-+#ifdef HAVE_SYSTEMD
-+static void
-+systemd_checkin(void)
-+{
-+  int n, fd;
-+
-+  n = sd_listen_fds(0);
-+  if (n < 0)
-+  {
-+    cupsdLogMessage(CUPSD_LOG_ERROR,
-+           "systemd_checkin: Failed to acquire sockets from systemd - %s",
-+           strerror(-n));
-+    exit(EXIT_FAILURE);
-+    return;
-+  }
-+
-+  if (n == 0)
-+    return;
-+
-+  for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd ++)
-+  {
-+    http_addr_t addr;
-+    socklen_t addrlen = sizeof (addr);
-+    int r;
-+    cupsd_listener_t *lis;
-+    char s[256];
-+
-+    r = sd_is_socket(fd, AF_UNSPEC, SOCK_STREAM, 1);
-+    if (r < 0) {
-+      cupsdLogMessage(CUPSD_LOG_ERROR,
-+             "systemd_checkin: Unable to verify socket type - %s",
-+             strerror(-r));
-+      continue;
-+    }
-+
-+    if (!r) {
-+      cupsdLogMessage(CUPSD_LOG_ERROR,
-+             "systemd_checkin: Socket not of the right type");
-+      continue;
-+    }
-+
-+    if (getsockname(fd, (struct sockaddr*) &addr, &addrlen))
-+    {
-+      cupsdLogMessage(CUPSD_LOG_ERROR,
-+             "systemd_checkin: Unable to get local address - %s",
-+             strerror(errno));
-+      continue;
-+    }
-+
-+     /*
-+    * Try to match the systemd socket address to one of the listeners...
-+    */
-+
-+    for (lis = (cupsd_listener_t *)cupsArrayFirst(Listeners);
-+       lis;
-+       lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
-+      if (httpAddrEqual(&lis->address, &addr))
-+      break;
-+
-+    if (lis)
-+    {
-+      cupsdLogMessage(CUPSD_LOG_DEBUG,
-+                      "systemd_checkin: Matched existing listener %s with fd %d...",
-+                      httpAddrString(&(lis->address), s, sizeof(s)), fd);
-+    }
-+    else
-+    {
-+      cupsdLogMessage(CUPSD_LOG_DEBUG,
-+                      "systemd_checkin: Adding new listener %s with fd %d...",
-+                      httpAddrString(&addr, s, sizeof(s)), fd);
-+
-+      if ((lis = calloc(1, sizeof(cupsd_listener_t))) == NULL)
-+      {
-+        cupsdLogMessage(CUPSD_LOG_ERROR,
-+                        "systemd_checkin: Unable to allocate listener - "
-+                        "%s.", strerror(errno));
-+        exit(EXIT_FAILURE);
-+      }
-+
-+      cupsArrayAdd(Listeners, lis);
-+
-+      memcpy(&lis->address, &addr, sizeof(lis->address));
-+    }
-+
-+    lis->fd = fd;
-+    lis->is_systemd = 1;
-+
-+#  ifdef HAVE_SSL
-+    if (_httpAddrPort(&(lis->address)) == 443)
-+      lis->encryption = HTTP_ENCRYPT_ALWAYS;
-+#  endif /* HAVE_SSL */
-+  }
-+}
-+#endif /* HAVE_SYSTEMD */
- 
- /*
-  * 'parent_handler()' - Catch USR1/CHLD signals...
-diff -up cups-1.5.0/scheduler/Makefile.systemd-socket cups-1.5.0/scheduler/Makefile
---- cups-1.5.0/scheduler/Makefile.systemd-socket	2011-10-18 15:32:40.817671022 +0100
-+++ cups-1.5.0/scheduler/Makefile	2011-10-18 15:32:40.852670360 +0100
-@@ -382,7 +382,7 @@ cupsd:	$(CUPSDOBJS) $(LIBCUPSMIME) ../cu
- 	$(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \
- 		$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
- 		$(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBS) \
--		$(LIBGSSAPI) $(LIBWRAP)
-+		$(LIBGSSAPI) $(LIBWRAP) $(SDLIBS)
- 
- cupsd-static:	$(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
- 	echo Linking $@...
-@@ -390,7 +390,7 @@ cupsd-static:	$(CUPSDOBJS) libcupsmime.a
- 		$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
- 		../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \
- 		$(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \
--		$(LIBWRAP)
-+		$(LIBWRAP) $(SDLIBS)
- 
- 
- #
diff --git a/net-print/cups/files/cups-1.5.2-browsing.patch b/net-print/cups/files/cups-1.5.2-browsing.patch
deleted file mode 100644
index 6ab08b1383e2..000000000000
--- a/net-print/cups/files/cups-1.5.2-browsing.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ruN cups-1.5.2.orig/conf/cupsd.conf.in cups-1.5.2/conf/cupsd.conf.in
---- cups-1.5.2.orig/conf/cupsd.conf.in	2010-12-09 22:24:51.000000000 +0100
-+++ cups-1.5.2/conf/cupsd.conf.in	2012-04-19 00:12:31.004045949 +0200
-@@ -18,7 +18,8 @@
- @CUPS_LISTEN_DOMAINSOCKET@
- 
- # Show shared printers on the local network.
--Browsing On
-+# We switch this off by default in Gentoo, to avoid an unnecessary open port.
-+Browsing Off
- BrowseOrder allow,deny
- BrowseAllow all
- BrowseLocalProtocols @CUPS_BROWSE_LOCAL_PROTOCOLS@
diff --git a/net-print/cups/files/cups-1.5.2-linkperl.patch b/net-print/cups/files/cups-1.5.2-linkperl.patch
deleted file mode 100644
index 1bffda5d3473..000000000000
--- a/net-print/cups/files/cups-1.5.2-linkperl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN cups-1.5.2.orig/scripting/perl/Makefile.PL cups-1.5.2/scripting/perl/Makefile.PL
---- cups-1.5.2.orig/scripting/perl/Makefile.PL	2002-08-19 22:43:03.000000000 +0200
-+++ cups-1.5.2/scripting/perl/Makefile.PL	2012-04-19 22:11:45.000000000 +0200
-@@ -8,7 +8,7 @@
-     ($] >= 5.005 ?    ## Add these new keywords supported since 5.005
-       (ABSTRACT_FROM => 'CUPS.pm', # retrieve abstract from module
-        AUTHOR     => 'A. U. Thor <a.u.thor@a.galaxy.far.far.away>') : ()),
--    'LIBS'		=> ['-lcups '], # e.g., '-lm'
-+    'LIBS'		=> ['-L../../cups -lcups '], # e.g., '-lm'
-     'DEFINE'		=> '', # e.g., '-DHAVE_SOMETHING'
- 	# Insert -I. if you add *.h files later:
-     'INC'		=> '', # e.g., '-I/usr/include/other'
diff --git a/net-print/cups/files/cups-1.5.3-fix-install-perms.patch b/net-print/cups/files/cups-1.5.3-fix-install-perms.patch
deleted file mode 100644
index 50ad42485e12..000000000000
--- a/net-print/cups/files/cups-1.5.3-fix-install-perms.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN cups-1.5.3.orig/Makedefs.in cups-1.5.3/Makedefs.in
---- cups-1.5.3.orig/Makedefs.in	2012-03-01 01:05:55.000000000 +0100
-+++ cups-1.5.3/Makedefs.in	2012-06-02 19:32:42.000000000 +0200
-@@ -41,14 +41,14 @@
- # Installation programs...
- #
- 
--INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
-+INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
- INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
--INSTALL_COMPDATA =	$(INSTALL) -c -m 444 @INSTALL_GZIP@
--INSTALL_DATA	=	$(INSTALL) -c -m 444
-+INSTALL_COMPDATA =	$(INSTALL) -c -m 644 @INSTALL_GZIP@
-+INSTALL_DATA	=	$(INSTALL) -c -m 644
- INSTALL_DIR	=	$(INSTALL) -d
--INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
--INSTALL_MAN	=	$(INSTALL) -c -m 444
--INSTALL_SCRIPT	=	$(INSTALL) -c -m 555
-+INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
-+INSTALL_MAN	=	$(INSTALL) -c -m 644
-+INSTALL_SCRIPT	=	$(INSTALL) -c -m 755
- 
- #
- # Default user, group, and system groups for the scheduler...
diff --git a/net-print/cups/metadata.xml b/net-print/cups/metadata.xml
index 2d153c7b04d3..799098b7f7ef 100644
--- a/net-print/cups/metadata.xml
+++ b/net-print/cups/metadata.xml
@@ -12,14 +12,8 @@
     <flag name='python'>
       Add support for the Python interpeter in the web server CGIs.
     </flag>
-    <flag name='perl'>
-      Add support for the Perl interpeter in the web server CGIs.
-    </flag>
     <flag name='java'>
       Add support for the Java interpeter in the web server CGIs.
     </flag>
-    <flag name='systemd'>
-      Add support for systemd socket activation.
-    </flag>
   </use>
 </pkgmetadata>