Restored dropped 'xinetd-installation-fix' patch. Fixes bug #539696 by tman and PhobosK.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

4 files changed, 15 insertions, 22 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 037cdd343ce5..b188c3b37a3e 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.661 2015/02/21 12:05:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.662 2015/02/21 18:57:19 slyfox Exp $
+
+  21 Feb 2015; Sergei Trofimovich <slyfox@gentoo.org> cups-2.0.2-r1.ebuild,
+  files/cups-2.0.1-xinetd-installation-fix.patch:
+  Restored dropped 'xinetd-installation-fix' patch. Fixes bug #539696 by tman
+  and PhobosK.
 
   21 Feb 2015; Agostino Sarubbo <ago@gentoo.org> cups-2.0.1-r1.ebuild:
   Stable for ppc, wrt bug #533692
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 033461f49e6b..d466f97f5a3a 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -9,7 +9,7 @@ AUX cups-2.0.0-rename-systemd-service-files.patch 5429 SHA256 ef6e8c7aae48b3968e
 AUX cups-2.0.1-fix-compilation.patch 713 SHA256 adca276aa0ed4f4580da49a53f6301ec2c557131ac402ee731002312551deb93 SHA512 2e3c7565a1647a9d01b77ea02a38d4d965c6ae878fadd43334cfd4aaa986fde6e6e2f4c9bb0cf4fd964b4f71427b3383637b216cdbaf5b0c5967edd24e47e5ee WHIRLPOOL 230168efe3b985511e375fb79bad3c28d70deb5e3411d0cfc87f42ab7a51cbbbb9eb0d45f966ea1e416f29c67113dd83202a9414a54a3d5eac335e035b9bf3de
 AUX cups-2.0.1-fix-linkage-to-gnutls.patch 456 SHA256 091f1ffee8e7cb7d05d6291ce3a38e00a2276e5c9068f1345d04c8222ec12612 SHA512 133c49a7fb912cdd8dab15607f08b31f2ed8d9b7eddaa1db7dad68b4118dcc62fc2cfc8a2288e813cf2a2b6a2f1fea283b50343906827e01020f5070aff12283 WHIRLPOOL 26c5302b181d2ac4916c42b8f68be6aed80e29654b82e12cc637e5ed564c8f0b7bfe7fcfa89c2b66fb33e22dba54b79c6fa463c72f478b5adade6d3f6d4b185e
 AUX cups-2.0.1-rename-systemd-service-files.patch 2818 SHA256 cca42237e7b12343b939519af9ca36de3e890cb0d8cccdeb2abfa0520b56285a SHA512 1efd772c9891f214a47eaafe90ffed09f8282a89953c13180957e83be7eabb4bf4b20f7f596891144e1f8b641497239c94fd8b35c01e16a368307c4dd92c1050 WHIRLPOOL 991fb45f3ac8402c4daa6b3fcf33e12e2b6938d00730f6258d13575812f50b13a5593d9dbc840e6ac391c07bc4a7f0646fa8a16b48e1714f8701cf60971165b9
-AUX cups-2.0.1-xinetd-installation-fix.patch 600 SHA256 a8bc5324cf03d78fd5bebe25fa61ec287feca438f5bd2bd1060554fa635e1130 SHA512 9994908983edac4c46f143e7407ff8c862f96a47602ed401051ef2e6130b086760cce01987fbafe001d4d556714de44b14210d9e8f744c948a66a7267282eed2 WHIRLPOOL d89f7a523e388cac8babd0ecd2c38ad5315382f5fd8a44783c3855fe2ca721d160b0f3185c54f806a1eb9ea5fd40d62cb451aad48bd1f47dcc89e3e2c1340786
+AUX cups-2.0.1-xinetd-installation-fix.patch 332 SHA256 f533f03cac8f40bd0a1ca9eb91307781e7ae80be24fd1a48ead8133729c1b842 SHA512 e4111fb05ac381f5639868464734fbbc9296252bda288fc415274cb0eda37ff57d4d2816e34960a3e30a1c73c3aa6911267a5d2c29f1480d8e44fdb6e95f3836 WHIRLPOOL 1b4360e7aab326f0992d69941b69f604297eaafa3eb284b498c08bafdc5e72d107988f48986e7fe09d568a69726147cbc1baee99caefbbc1fbc3054453be63ef
 AUX cups-2.0.2-rename-systemd-service-files.patch 2092 SHA256 f6ef6f3fcbf96d383e7207130393660630a3c159b19d2c6a5437106e52bee1d6 SHA512 409a7508dccbbcfca60ba448f8cea84ecb2710890e7655c67b8292c34c8d555884e7e82e70c2c700691af1a786ce0d8c8c799b6fb471a18f1b87eda99eacd9cb WHIRLPOOL 388300e7e95fee7e6b1ed49885ae13ef79ad743b335d60f44e2745c75d4b203ac84401a9bda1a5e5a6a67c2a599243d8f2a9fd714a58ab76b74ca97041ca9a62
 AUX cups-2.0.2-systemd-socket.patch 2390 SHA256 250d8c8bb406f2c0fff8c71b0e04c23610eb287ee4980a6597b727ef3ba7cbfd SHA512 221972ff8749fc8ee674bc4f1487f4e29b28d14494ee9ab177b86c5e042c342a004c6b22469f16687400bde8e40c7d82c923d8d3bbba1a072771f2b27a347a4e WHIRLPOOL 997f9a4fbe41f1ba9ed6bae6c48e4b8891f7c5cacee54a77d8ee105fe1bd4b0d3091ffecee97f7f9c926c547161569aeead44024576927e91031060c8cfdac66
 AUX cupsd.init.d-r1 504 SHA256 4705b68372090ee7db69da1ad35131551ed1ba99032db2486ff6c31d2170ce6b SHA512 9eac4fc725b14615bb31c96a69c00a14ab2fb23fa355f1ced655f93e6364555b2710a277ceab439199a275405b016492b4c9183fab755c02354013e0904a03bc WHIRLPOOL e0ce34f4b73de6e63ba1f01b0df543cd66fecc692af8254acb3dd1147c0cd4e1f42ed7df4b18b26af0114db54c3b8c1bca526ed54146307223ac24a0b3d3502c
@@ -22,25 +22,15 @@ EBUILD cups-1.7.5.ebuild 10431 SHA256 328696896e43f0348df62ba50ee7715f8232b83367
 EBUILD cups-1.7.9999.ebuild 10621 SHA256 e27e4f543474fa2f7a00ea0bb32758a941a6c7db0267fdab9b384b25e8b51914 SHA512 2fccf3f4759eeec3bec079073a13486136e71850ea783114ecab953212f5c0fbeefde5a6683712a88799f7a8a9ad02321e6e02c45804ae737cc55273e4066be4 WHIRLPOOL 45ed707f69b10203322392649e67238868c5675e8b67ba7e98af66128b624fbab3cf261760a3a669a8d7a81200a9015f873ecc500557ae6f9cc8ec57fe366a39
 EBUILD cups-2.0.0-r2.ebuild 10350 SHA256 8d50f9037a07df7a97cb6c0ade5e348c26da12b0a4a43a9f94f9f055c1c33091 SHA512 d8f6b63e14635f36148ad5d2795321bde87f498ebc6b172f3f6dd925bc30a984a751088a3b997376e52dbd1bacc510b2c8c795a27b43bfca7e5a942f062143a4 WHIRLPOOL 06fe31e815ccb14af9e9014824e1e06a0e7f4b4b1fc77e8bfb42ae5568f326cb1b729d5bcf8f9e1380b6d0085e53f2f46ec2c59c87a5173821e9e7f63dc4fd6b
 EBUILD cups-2.0.1-r1.ebuild 10501 SHA256 118fb3cfe31c35a84f9e3d42953d131cd4d9b410ed4c4c9719e8cb0bf09edbaf SHA512 f34d1ab6fa3839c9085aca612df70dc730f0d20ff49015f398b7647459f5bf5b260fb5b263b9747a9021470c927ea5451d144138698a0041b2716240f2823768 WHIRLPOOL 8d50aeafa1ca506c79d19057e66dc3176b68849df2744b4fc168099403aa59e3eecd737773ba59bad6f86f0c5a1477593c4a3336e3924bdea01719db492f4950
-EBUILD cups-2.0.2-r1.ebuild 10442 SHA256 cd5cdbc98610322c62bbc0200127a163f167873f3129745b5ea9db8bd4f04f48 SHA512 0dc2099deb43171a339b8dfa7a86621cbaea7071042aee1389a1128a5c34ae9d2056da93cf623a803ca3dde79e16b90b1b46899135349e389e6808c06eda6da3 WHIRLPOOL 5785a4f6528cd708becac74e8a0a3006b71bcc6a9c9769838e00646617cbab6336eee8f3fc77742eafc0d12ceb5eac7ffc626f222929d2d50292c3068abb80f0
+EBUILD cups-2.0.2-r1.ebuild 10500 SHA256 596e7a4fa3514d5eea33652ab07964ac4fe7374bd4a60102df2f81063b6a855e SHA512 9f8bfaf471c55586354e33d1dc62a259ee7afe3d2212cd1ad6d506902dc1be21ec2da18e165a204e81207ed4912f074c408fc8cd9b7bc6e11ddaa0ac1b377289 WHIRLPOOL 9caa45008f55516f0ddcc6bf0818b5de23205cfccff44291e677dbd46edb98134df53943057617ccaf03a2ff42aabe0d040254145bdbbb7d71fcf62e81b32c73
 EBUILD cups-2.0.2.ebuild 10360 SHA256 e88bc427514e240e55d8bf43d36e13ba67d159be50bbd00fe9d5fca86ffbfce8 SHA512 9db8ed48a687d43dbb8a8e719877bb8fded6de7165356aed99309eabf491757dbc3bcc76ee75096ce38fa413300ac757165e7c3ae8c426a78f969eef7d39d9f8 WHIRLPOOL 3af627bb06b8b714ac6a7000a2a4153fed96e0d3e1182b989c30c88b4afd1aeaa63b41a30d019a123c6ef1cb441900ca117121aa2f4927b4252f122251965476
 EBUILD cups-9999.ebuild 10360 SHA256 dee6edeb6ef62086921f21ce704788ac9dbb067456eef3d7e0afb6c8c25e36d8 SHA512 b3729b4db8a23286ee39950688a8f5c59eed3f17a8b8044e593715a7aa17d182099fb25f8d95b80fce4559f2985fa1b3886c4792d07f0203e7de1d75281c6678 WHIRLPOOL 481435ad07b4671e50b210d118a2dc71e88f7e9a5f16e19a525145d85cf3c126bef9b73ff1f92a55674be1aa75c02b52f1a46c8484c903f1f71504778f72f99b
-MISC ChangeLog 100310 SHA256 814e4f5811c8faf33547d0e8bf1a115f7ccfbec15d40701d4d5073865fc09904 SHA512 bcfd6c0e9c2391a39ce7725ac31473a331e7b256e09b99f756fe1bc8fc609c212022c83363d9430a6f4d60975a65d8abbb1ba632b06c2cdefc1d21f3b7509571 WHIRLPOOL 8fad284384775324e4b38c9ea573b512ab822e6e063eb0b1f0a575b061a2563b25fb517197fe05052738fc77bed56f31cf341d33a94adc92136195f5b85b2ca8
+MISC ChangeLog 100533 SHA256 918cee6c3b9eba7d0fcf8809b0cdffcc562d43870fbdefd953910749f737f6b6 SHA512 1605d11b8e0380719a5c2140ddfa707c12c4418f02d1d4e0421814d9fe1cd91ee0830ab79e64f39aa21bfefd5501fa7e052a3529505268a0e6edbce9dba9307f WHIRLPOOL c729108139f0429ad04cdf9cc37710594efa0a354056afa85094741269362d02139b8f865182ec314a8088b8ae05b156e77d007b1545ca1b46d1fe06729db0c8
 MISC metadata.xml 496 SHA256 732bba7ee060b7be5e0b23d06d24c12c2bfc1c6be1440cdfebe6d5d94d145c47 SHA512 713300abb461ad923c4f6e59326fa97b2372181df4ef82bf04dd6f2d68dc0eb7c34e518cbb40ebd535cb9c4bf52d2648512002cc2cb55c6f21406cc973fa4496 WHIRLPOOL 061013ee6ddaf510964589024e39c4a05f18f0a6d2488eb5b121bb962a378348e71261f7e153f34dbb33337a2e49eb7da94e52d0cb7a128d71e9b4466f8a5933
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU6HSMAAoJELp701BxlEWfcyUP+wSZDBDvDnZECoc+JySNBEbM
-zgs13wXMTJo1yX4gxujLj4Gtt77brw7Q4OhaKyZRVFauUCUcPRsqxKQuVDOCpF+E
-hq3U3QWJV+kdzUZixO1li5aKGZNev/tEhXmHF3P9mfcHgbK7chidwYJo9ysUPZPR
-QR2J0pHegB99nlNzwDHAqFF38TZDKy6vZ9F/GTfXHidvdLfM68u/qTFgA/Zgqro+
-2got0+MVbbnT+kBKFf6i6qtOVRWX5dun09XK6szrCYFigliKT+5FS1hYDLjCCb+/
-dlEB4FER9HVExdmwHdlqb1rXT/scVuaSqBEpkNdV6h2zXLtq+r6qyqJnZ8tyzRMW
-dOxn21LBXF1BD5NCfqwFrQ39xyvIUcMZN4/Gk3BxFEOh0Dpg/qrFP2ywrS8/rXXL
-3tUNUJ5XYZnFHNpcO1lhBWwBY8DcU+YT02Mwdbu92YxeR5le7VcusF7ZfWLOgaqE
-l4b2PN6y9aTq4Z/NwfohYSCVLveEaiEY2jQroinf3g+zsmZ58f+mz52ycl+xv7u4
-d/4mgZ8O+YPFT6VlByVULReNodgnRTPRSo9R9TH4LnCRypbMTY2gbbmjyB4mM6nV
-LFrtAyLhaCERAR6Om2rXAKj6vBFSOobajW5mFP8fiVFTd73EDKXGTbYgDCTcy9gF
-uK5Inw3/JtWrm//WFB5n
-=4kHP
+iEYEAREIAAYFAlTo1RIACgkQcaHudmEf86qE8QCZAX0S5B+TC7/0Kxk+P0uEMg9T
+2lgAnAxTiKadvJt6I9Kztcc+VuxTKEn6
+=A+wT
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-2.0.2-r1.ebuild b/net-print/cups/cups-2.0.2-r1.ebuild
index 1c890a7a7b69..2d3039dabee8 100644
--- a/net-print/cups/cups-2.0.2-r1.ebuild
+++ b/net-print/cups/cups-2.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-2.0.2-r1.ebuild,v 1.1 2015/02/13 14:23:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-2.0.2-r1.ebuild,v 1.2 2015/02/21 18:57:19 slyfox Exp $
 
 EAPI=5
 
@@ -99,6 +99,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
 	"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
 	"${FILESDIR}/${PN}-2.0.2-systemd-socket.patch"
+	"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
 )
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/net-print/cups/files/cups-2.0.1-xinetd-installation-fix.patch b/net-print/cups/files/cups-2.0.1-xinetd-installation-fix.patch
index 3cd73304cbd1..2e8419e7675a 100644
--- a/net-print/cups/files/cups-2.0.1-xinetd-installation-fix.patch
+++ b/net-print/cups/files/cups-2.0.1-xinetd-installation-fix.patch
@@ -1,9 +1,6 @@
 --- a/scheduler/Makefile
 +++ a/scheduler/Makefile
-@@ -208,7 +208,8 @@
- 		$(INSTALL_DATA) org.cups.cupsd.socket $(BUILDROOT)$(SYSTEMD_DIR)/cups.socket; \
- 		$(INSTALL_DATA) org.cups.cups-lpdAT.service $(BUILDROOT)$(SYSTEMD_DIR)/cups-lpd@.service; \
- 		$(INSTALL_DATA) org.cups.cups-lpd.socket $(BUILDROOT)$(SYSTEMD_DIR)/cups-lpd.socket; \
+@@ -211,4 +211,5 @@
 -	elif test "x$(XINETD)" != x; then \
 +	fi
 +	if test "x$(XINETD)" != x; then \