also ship with gentoo specific systemd units

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xBD3A97A3

4 files changed, 38 insertions, 18 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index c81e557ecc58..ab3b2ca13534 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.650 2014/11/19 19:41:40 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.651 2014/11/19 23:05:43 tamiko Exp $
+
+*cups-2.0.1-r1 (19 Nov 2014)
+
+  19 Nov 2014; Matthias Maier <tamiko@gentoo.org> +cups-2.0.1-r1.ebuild,
+  -cups-2.0.1.ebuild, files/cups-2.0.1-rename-systemd-service-files.patch:
+  also ship with gentoo specific systemd units
 
 *cups-2.0.1 (19 Nov 2014)
 
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 0667e4e0ef81..86229c9df09c 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -7,7 +7,7 @@ AUX cups-1.6.0-fix-install-perms.patch 948 SHA256 4a4a885bb2e111bd67bcb90a5780f3
 AUX cups-1.7.2-systemd-socket-2.patch 11799 SHA256 aec7a98202143e26384fc46baa434f9da022b97793413c95bc1b3765449aceef SHA512 f551e6e1917303ce3e2206284f396885a9aa15bfdee6fdcd88182279cd52a26fc92f5e529b8b30edb0c58dbc749440d23515fa1246959875f525fb5e6b08d466 WHIRLPOOL 063253ffc641c1fd35d929f65c3e42374d5223afc106c2a2f2f0098d5115788573eeaad8fb2c53efe90334ef7a1605d164b1741189c8f8b77e7788097aa76923
 AUX cups-2.0.0-rename-systemd-service-files.patch 5429 SHA256 ef6e8c7aae48b3968e6185a80a7247137abfbc1609ebbaf1e631daba86f96dc3 SHA512 2219c0986fca7c1f89fd980447ada92f4e54548587a8b6d2af001a728d1594d01c5746e8136f7c6763d5846b81061d6e220f9231460e8460b3b838e7150a3d2d WHIRLPOOL b2f71be2fdc9724a9e82149820c866b00466156c30612a86ac6c824a39dfe854e77d7ede5ed782f4dc83dbde70156ef8e6e5d8399479d01e58411fead8cdd40a
 AUX cups-2.0.1-fix-compilation.patch 713 SHA256 adca276aa0ed4f4580da49a53f6301ec2c557131ac402ee731002312551deb93 SHA512 2e3c7565a1647a9d01b77ea02a38d4d965c6ae878fadd43334cfd4aaa986fde6e6e2f4c9bb0cf4fd964b4f71427b3383637b216cdbaf5b0c5967edd24e47e5ee WHIRLPOOL 230168efe3b985511e375fb79bad3c28d70deb5e3411d0cfc87f42ab7a51cbbbb9eb0d45f966ea1e416f29c67113dd83202a9414a54a3d5eac335e035b9bf3de
-AUX cups-2.0.1-rename-systemd-service-files.patch 2450 SHA256 5d7ede862d2e26c3a63f7b599b73e3e9dcc3a73d9ac1e1d7472abcd9c4710742 SHA512 12980ee5d7bff7edcfbbed1a94b89705d12430daa0a292eea8e353b456afbf765ac528fc1913b82b3062b901a888681854d0e86e6c12f75892d97e2ab695f1ac WHIRLPOOL 42896ce5e5c90a6d7ad700df8267c7953ea59fd299711dc3431553bcedfa0c6f353f8b31de1fc9604405a611919d556ae6716a9e1715f034c461d69613b55580
+AUX cups-2.0.1-rename-systemd-service-files.patch 2818 SHA256 cca42237e7b12343b939519af9ca36de3e890cb0d8cccdeb2abfa0520b56285a SHA512 1efd772c9891f214a47eaafe90ffed09f8282a89953c13180957e83be7eabb4bf4b20f7f596891144e1f8b641497239c94fd8b35c01e16a368307c4dd92c1050 WHIRLPOOL 991fb45f3ac8402c4daa6b3fcf33e12e2b6938d00730f6258d13575812f50b13a5593d9dbc840e6ac391c07bc4a7f0646fa8a16b48e1714f8701cf60971165b9
 AUX cupsd.init.d-r1 504 SHA256 4705b68372090ee7db69da1ad35131551ed1ba99032db2486ff6c31d2170ce6b SHA512 9eac4fc725b14615bb31c96a69c00a14ab2fb23fa355f1ced655f93e6364555b2710a277ceab439199a275405b016492b4c9183fab755c02354013e0904a03bc WHIRLPOOL e0ce34f4b73de6e63ba1f01b0df543cd66fecc692af8254acb3dd1147c0cd4e1f42ed7df4b18b26af0114db54c3b8c1bca526ed54146307223ac24a0b3d3502c
 DIST cups-1.7.5-source.tar.bz2 8793338 SHA256 18cb4c6847dbaaaa05c8b35af787f19dd5c7686970b46548e72c711c6f26bd02 SHA512 fe446b3d904539d744d3fa24f3ced2549ef9dfea8c805f1602eb71d03e19c2f06edaacf51f148e8216207af0c901f7d956c855f49b13b01112b01c9c45b75b9d WHIRLPOOL 7a85ec51f6333493b42b566471ba218cdf7d3bf9ac6314d4a1b1e922c0bbc3f51380331c0a3da9d2ecf4bf0d58dc9e50f905c8aa6b328592fb5427ddb167ae2d
 DIST cups-2.0.0-source.tar.bz2 8737532 SHA256 83fdbbcb4ac4d82949bbde6d5dce7a4b6a62557da8f3d46c5e34b951110f5be2 SHA512 d6b3f3ef786c477914678825cff68c96d8e3457fdf8742e65f444312e8b9da44b44a5a91b09b855011a2abb4b16b3351d5dfd649ddb9e98d17bec849c9908d33 WHIRLPOOL 2615a2d339e4702538ee717d485130be2245cfec4091032de13ada89c9eb06b92a12de4302fcb7b15731fcfad6dcc4a0c7240d988b830a844b5701c0c067bd0a
@@ -16,24 +16,24 @@ EBUILD cups-1.7.5-r2.ebuild 10666 SHA256 da0787e5fa181fef0cea06a48d345dc598a9501
 EBUILD cups-1.7.5.ebuild 10431 SHA256 328696896e43f0348df62ba50ee7715f8232b83367fe5941b46783ed438bd458 SHA512 a61568ac379ddd995c0f527cceecc914c5c1d45e040000a0024f7a2015f0f4e567669dac223ba1c2b246c0aecf9eff68d718f4dd000be620a21f6c510ce35b7c WHIRLPOOL 59978548be1cad588e994b57e26d67c27ed47890c6256f152976d0247d43fa8ebfdc374478187b69acd314d85913f7852283c81023f497958d505e53d17e23f7
 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.ebuild 10390 SHA256 94ccd04795ec0e8ac737f5eda2289e37ce035addd2f3ca0a7553ab7bd25cd8cb SHA512 38d79c63e0e59f3ea0c86a78f8505da1dcbb5c3a188660e691bec5b51434d2232a41c83e7344b7687d072151862f7ab25544dc6c4f75e22f6805fb3818921752 WHIRLPOOL 5a3fa72ed64049d48cd94c30cee60c5374bd19133940b95795796e08b45d6d50a76eb0f17ff62848e5102d5da737ed2886d82957a359292cb93c4afb1e49299d
+EBUILD cups-2.0.1-r1.ebuild 10393 SHA256 911e4a8509cbb944b93ed91b611b472f59acea882e966e940ecc3028882e2aed SHA512 1d43aebeef1dad5c400bb6625e991dbce2406eb3b44c081342e3713b0c818a74be38a001f73689ba5ba5fea442fae28142967bc34d21666571f0dd030f131263 WHIRLPOOL 5fa82cece2f70e2377d438921385f6937f786fe6c9af8f9c3a77d1cc97bdb68eaf39971ef6d44ac29cb2f882944a81784a1f915074286ab17cc99b0366431fe9
 EBUILD cups-9999.ebuild 10379 SHA256 091c2619d78e431f95f420f338d3d8a09ed8d14b3b82f639b6b9643dbf4bdda2 SHA512 171ce4c065e1b0c2aa685728515d76d2c95930f64c1d0f105d85e085c130e430acd317854b48256b511b1da73ffacdd1db6b3da6593b39ca7cf9d1937c1740e3 WHIRLPOOL e01daef7090562d346a1fdef7dde4c6bbe816a78be38c098233c56e162df446318ee112042cf78cd26ee933de6353adba3c83d352f1a346ca1c57dae257e4d20
-MISC ChangeLog 98465 SHA256 79956ec75097fe6235494ea4ff843fa832fd04bb9b1c6c488c6d52846d2bb10a SHA512 0de859ec48fe3f8339afb7def805cd428af08dce5775e72171cad429114ca0e8ce53e8966e255b2dfa2c40e5d746a348fc75480db4a56218bdd55e9f20c1f07d WHIRLPOOL 67ec2a22ce2e887e77dcc50693c89bc3b390e98fa4be21b16c3376124224dd42a0efd774845cda670202c09cbaba50e767b909ab2c4f767dc70de649c0150dcd
+MISC ChangeLog 98691 SHA256 e0602d0d50fc87a720ee89a4b7c2051537053d3a29378ad81afe90d5e89f5fc4 SHA512 4221c3499ceb504c178f396a60ab874b57ba97af7c72f7b31fcadef7cd6234da5c4549cf3b12d877774b8e61363ba01190eb7160554fac90dc91f9a1b5e67ff6 WHIRLPOOL 31b4e84c2b7723eb1b9f683709adf99efcbe486f8cd535e2ed44be2f0527f83b3530b045ef7ec3d67c4890a48a80b23b815fddae2fdcf419df2a7a7aeb6338b4
 MISC metadata.xml 496 SHA256 732bba7ee060b7be5e0b23d06d24c12c2bfc1c6be1440cdfebe6d5d94d145c47 SHA512 713300abb461ad923c4f6e59326fa97b2372181df4ef82bf04dd6f2d68dc0eb7c34e518cbb40ebd535cb9c4bf52d2648512002cc2cb55c6f21406cc973fa4496 WHIRLPOOL 061013ee6ddaf510964589024e39c4a05f18f0a6d2488eb5b121bb962a378348e71261f7e153f34dbb33337a2e49eb7da94e52d0cb7a128d71e9b4466f8a5933
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJUbPJ2AAoJELhOzYlK7nn/vBcQAM3Uy9D3X7NeGiaBL5wRVYA7
-hyVhVY67DyGcDXnFsRVa100aYbKc71HPLZVeZ+1P20keMmV/1XpcBNFMv9X2Gl1v
-Gnrr5Y2BSUt99lG9W1Jq+FgFbJ3rMkDZOiBK7LSu9HE4pA0upUB5mQZ8/b61yJu2
-p3zsUbcWqbBUZbiiqT6s5m6GcJqW3Ge030GwqO/DCu2HMNWLNn9M4lxhMZt1BMhF
-hTEVBZBQSM52eoiDxkhzpPgxO/N+iybUqEe33Y/iaBnuT91ExKW1hAAjZ4nzSgBt
-UewDPL574HkvlFaoKUkiDrHgkTM7bkxPMFdVqGwnNErVrw81KfV9q24/VFBJpkS7
-BKDAch80FNCoNmxGBBPKnzaaDKmHdKSMWZKlehofV0kap3Nzz7a4ov6Plsh4K9P9
-D7ajpjtQuF+pxbBBFUNgrIkQSKClRlIkWY+9orCqDKgKBuseZugQi8FYTbN2f2LM
-dZ/nA9V2f44tnqIdBYctRj4iYfhRWyPbUgC2bYnR6pIYjirHrnIIn/TiHgtLCPO6
-vcC4n5qxv31Uiix6ulo9hA4NhzyyoOFGdruUMqWUKlnrKgCzQuD5NGkKDxM0jrFK
-/Wksn/7SOzsttiRe1WBjDVi963xQxgwaAevbqzytxMDHv92xAshtM1X27zNxa+a1
-aHMZ3zzcKI4E+IxH3aW3
-=BQ7x
+iQIcBAEBCAAGBQJUbSJJAAoJELhOzYlK7nn/16kP/jnncSHs7OiYayhJmrUpa/CJ
+BBKsZM7diXcJzjy9SC7pOGMRwqeXMJyQoSqg1BCB68A4fTzFABKxQDt0X1YyVkOU
+2VVQs4yFDQYKf+Q18WyHG3DRc6MljJ1TTgH71ci6OD5Dga0nzgjiGueJTw5RF9HV
+1N0rQF3cLjcQ7b9XJd0ATySnd+GlKkyDrugWiO3ZA9VM4dTcYIGswAncQKK+2gaP
+ER1Q58x0Lhh8I31EGy0RRmATR1OYVK0aMxl7XVB8vZSuOcF2skMODIrmmke8mUtz
+53oGXJGRyq0gVqTLq+mEyl5qwgVstB9yVxjXgag264PidrE7+Pt3CXtaAOB5866n
+fNDw7JzgPxLpxIc4p4gNJZemHFIf/iURuYl0HqrJdkf7M6n546i+zDHa+pFi+cE6
+19zHtNVmtgnt5NibQUkwJaAtR31LisbxVqnruIXHfesWeJs9OrVeSS1feuVfXaFN
+y97QsZP7ZJeBIjp0g4rx4eOx7OvfWex0CUrsdDCPC4O3+s5XmVHhB7KzUmEE3EEH
++TbjNJyoSQnGGpokRwOkNvvH3Z2JUPDmbQZDSzOJWCY+3tpLYy4qJaRay3ExZ873
+4Fk1Z4Hf+rdc7ueiYKCd0Xyshr1ucncdWbb5HwcaLDyym09bR3RijELD2F7xgBph
+nGuZltezrlj5R9gbg5Ky
+=rz2n
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-2.0.1.ebuild b/net-print/cups/cups-2.0.1-r1.ebuild
index a9809bae5a5c..3e5a87ce4fdb 100644
--- a/net-print/cups/cups-2.0.1.ebuild
+++ b/net-print/cups/cups-2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-2.0.1.ebuild,v 1.1 2014/11/19 19:41:40 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-2.0.1-r1.ebuild,v 1.1 2014/11/19 23:05:43 tamiko Exp $
 
 EAPI=5
 
diff --git a/net-print/cups/files/cups-2.0.1-rename-systemd-service-files.patch b/net-print/cups/files/cups-2.0.1-rename-systemd-service-files.patch
index 967856e4ee60..c77997d7fec4 100644
--- a/net-print/cups/files/cups-2.0.1-rename-systemd-service-files.patch
+++ b/net-print/cups/files/cups-2.0.1-rename-systemd-service-files.patch
@@ -54,6 +54,20 @@ index 0a27c76..7a04248 100644
 -Also=org.cups.cupsd.socket org.cups.cupsd.path
 +Also=cups.socket cups.path
  WantedBy=printer.target
+diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
+--- a/scheduler/org.cups.cupsd.socket.in
++++ a/scheduler/org.cups.cupsd.socket.in
+@@ -3,6 +3,10 @@
+ 
+ [Socket]
+ ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
++ListenStream=[::1]:631
++ListenStream=127.0.0.1:631
++BindIPv6Only=ipv6-only
++ReusePort=true
+ 
+ [Install]
+ WantedBy=sockets.target
 -- 
 2.0.4