gentoo resync : 19.11.2017

4 files changed, 2 insertions, 21 deletions

diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index b7c2d30982ee..fa84c7465d89 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -6,7 +6,6 @@ AUX cups-2.0.2-rename-systemd-service-files.patch 2092 SHA256 f6ef6f3fcbf96d383e
 AUX cups-2.0.3-cross-compile.patch 773 SHA256 5d9b8d5b79c5c34e9a992cf530a6f03f78f262ef3685fcac984029ba08a11a9c SHA512 0a99089f5f6dd231c34a017cfba91182717926943c2865ab0857b2c1aec2efac4e6fc1b9eee9cd1a1f6a99b810f272e8e69bc6fe2275f3d7ff001be3a3bf8ccc WHIRLPOOL d51a871229d9a3746989622b88dfeb009701efca3c94f855b7fae8f39049c8861678f9ddd1a273ef38b90da5c427856917a6303948c6a3ec2092ab9810b08515
 AUX cups-2.1.2-systemd-socket.patch 1542 SHA256 d24e13eee72917882ed4143989046f143f720e0fe10d01b6dee08ef36834a3aa SHA512 56759eafbac1e9947bcc445c850acd0c176687ae6360bc925bbb62153d4a049143d1d41efb3fcc78bbdeba18b0f11ef9a0c5452ec20fae7ef689518781cac48e WHIRLPOOL 8d6e20d02cef902fd8e9491ee51256e02f3b17dd10c96fde6fdb20c798c1d33ed6544d2a180318c73455353f1b013fa997f2b08d2a1f1acb80a50c0945053fa6
 AUX cups-2.2.0-dont-compress-manpages.patch 319 SHA256 f0a2d485d97734c3a7d17483d366cd8f03619d7ceb7ebac1baf2e8c8221d9246 SHA512 0f4822e50f9376dc2e8c87b55f6526ab514f5f08f737071f5b15696e71b51416203df6c9219d78989544bbc135cd92be91ef351a377be7ab4052e98c25c0c4f5 WHIRLPOOL 9897c0fc34ed29937129db10c431704d99ce95d5d452bc6cb9fc5f7570eaa41c2fe9351e52f26872a26ab4bd25e025f42aee7ca3898b171e9d158d11839c485a
-AUX cups-2.2.4-fix-install-perms.patch 646 SHA256 c070e555cda7bb2745a48e55bc652b9ebed0053862c69a026f2a62fb62a3afb8 SHA512 8ead1792208d0190aff22ec1c648e215ab456435c3ecb135b0318585789009cb27b67de939164637f58563fbed809c25ba1a39e39232e17e9470133ead387a5d WHIRLPOOL 24921f7951aa48c73eda8ed9f790976a3470c9e570e47935d310f68eb2f0ffedfcf43bafbd36185225129f195e33c95fe5a61bc28ae4cb27734a6ca52db1b622
 AUX cups-2.2.6-fix-install-perms.patch 660 SHA256 a15c47fe8a2f4283baca05c845845b0f463fc48a66fc4322d47607b565a67b2b SHA512 f64ed254bc79935ea3d9fce4c4cd8074445397c20ee1bc1e759e3bc7a336b30f73722357d2702219932e7a774f925abf9a450d3b30a12ca1f0c5f3c92b0b5fbf WHIRLPOOL 3274346388a918bd4ae587576575df8d785718f6687220ddd832b0d07805e3bb9c78d3525788042324ca0208ed67af76e443c0d8cb2f73540cde964575147907
 AUX cupsd.init.d-r2 432 SHA256 54b86ec2d7086004cde4e8b69aa49b7334718cad42a4426382f56269bb0f5a78 SHA512 d14973383158dd78e4970dce3037b73e812788f9e61ad9348b580cc8891e7ad6c2214709cac4a43829f7010720a755855c8357d1ada11d048deccf59aa4e83d5 WHIRLPOOL 42b5e0107d1d2fe8399a2ebe8a7d559d56d8c96bca63a587e8a79fc6b04096d072f2dedbc9ae3551fa0238ac169de178f63ea32436790a84354e308baf566a80
 AUX cupsd.init.d-r3 584 SHA256 06ccf2b8166cbe0046da899e4800ceb879d97d10544c40788d1117d0c1e2591a SHA512 ace66b46c17f99f8c6487188c14e8a1baf7acad602156b88cdae7fb4738c163a045240a1b28c6db4af86caa317723357186812eed81f9553a9ef3517c966c6b3 WHIRLPOOL 50020193e046da70f9236bbe3d6ca68acb27d337eaf7d5804156492c7d46885ebe8a873ea32770abbf063f8d1ccf8ef87407e6f39d14b53d1f8c1fa9385a61fd
diff --git a/net-print/cups/files/cups-2.2.4-fix-install-perms.patch b/net-print/cups/files/cups-2.2.4-fix-install-perms.patch
deleted file mode 100644
index b9fda922d2c6..000000000000
--- a/net-print/cups/files/cups-2.2.4-fix-install-perms.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- cups-2.2.4/Makedefs.in
-+++ cups-2.2.4/Makedefs.in
-@@ -39,12 +39,12 @@
- #
- 
- INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
--INSTALL_COMPDATA =	$(INSTALL) -c -m 444 @INSTALL_GZIP@
-+INSTALL_COMPDATA =	$(INSTALL) -c -m 644 @INSTALL_GZIP@
- INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
--INSTALL_DATA	=	$(INSTALL) -c -m 444
-+INSTALL_DATA	=	$(INSTALL) -c -m 644
- INSTALL_DIR	=	$(INSTALL) -d
- INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
--INSTALL_MAN	=	$(INSTALL) -c -m 444
-+INSTALL_MAN	=	$(INSTALL) -c -m 644
- INSTALL_SCRIPT	=	$(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
- 
- #
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 4cb38a73897f..13cedf91f35d 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -3,7 +3,7 @@ DIST hplip-3.16.3.tar.gz 22408596 SHA256 42d2302ee38bda41caa0f2f9524a91f531e3aa4
 DIST hplip-3.17.10.tar.gz 23878364 SHA256 0f7344174672f63a98a22f3c109005b6eb89fe738b7d466316bf2c53d083476c SHA512 0c1c78730d269ec41f95bbde887a490aebb4c9c3dcb9784052a1c3b537c12093cbc426e1f79266c63dd5e7adecdda0735b9bf964ddc1307b2c6603f3fa0462a8 WHIRLPOOL d8bffafedcfa40686d4e076c9a74af461a0ea29fec2a2effb5324fba8e60d9c85b13a0e8f73bfaf014ccb7bf4eb4e0d1eeffcdecc0efc4d1f31dd065d4093090
 DIST hplip-3.17.9-patches-1.tar.xz 8484 SHA256 2ec368039a59e375bebf565bd679dd3bedb1e0c1ecfc103c5dcf9bb2701ba9d7 SHA512 125f9cfd1c3cad662ce33954b8ab9ab1898368b449c4ad78dfe99f29de8025183773272b9865cd22b976a30c502e38254ce0ac59d685299dff7f9314927d546a WHIRLPOOL 2354bd3b158733b668c731ea3fd605170dd4cc0df5ffebc327a69ad33995ec02166d34897567ed69d608a62e97b33bd12fc0066acb6c302677cc68830a2661cf
 EBUILD hplip-3.16.3.ebuild 7462 SHA256 b878478540933b2f1c3b855d2dd88dccd02d8f45559c55c0661a53e1d52f7729 SHA512 d85473a09df3afada1a1a45aae2490adfa7853a426e8f05f3b86db381c15cde6db952e22535241505932a1ed9187646a1bb89ce7ce96db6f2e6e49ee819e5ca3 WHIRLPOOL 2121b7385aaaee2dde3a24fb098669f78575eb829dcffa96bd7f07ec8875da68a0d1da119dc922ba0dcd287ba964c3d5de1cb43cfadbad1f713887c30d02e84c
-EBUILD hplip-3.17.10.ebuild 7425 SHA256 e498455eed45af48da0e0e4bcc9a78b0ff162cbc1022ddada69b5496d8203308 SHA512 a9f0ecda7bf52aa609937be4ec736ba34152fc740f22bbce58f45d71483a00f8bf9b720d4a5f05daf6aa973505fa7084c42b3972fefcd0fda529fa053aa7ea67 WHIRLPOOL bd704a54e71b833d91e614f70d98143078f77127376afbdff3b2a7dea6d3d0150ca1529e4b1dfe61c56a7acaafb25d32120d60d6fbf36d89cc3e78dd2627c92d
+EBUILD hplip-3.17.10.ebuild 7424 SHA256 0b12952ceddec6be674724c097d9bfaf3aa1b153dad70d793fd741547aac13a0 SHA512 c5acb374766cd97c29aaf60f81566b3dd00abd3c8dbb3bca5360e891578f8f6c709a7d2b91279ad050e845dab4e0f7e5edf7070e305718c3e5859cee9dc24aab WHIRLPOOL 6ed98f219f484abad4a30492137bce3e0288aa06850dff5b67e7f248b96852ea95977d787863ab2871cdc64810924b9571e07283c0e17deff2ad959ac9deb90b
 MISC ChangeLog 10553 SHA256 478b5142e0cb6d90ed824076a36fc23072d79f259a51ee996c627ab5fe3db088 SHA512 d7dba727b6b20f1898f45d522825f2f0f290242c026380dfbd8f21c9fc13513325e5d068f8ea68966a2a2e5f177a72e356ce7b78f0d954988a72a4b1d45b4052 WHIRLPOOL 20517487b3fa070f441362ce9fce49adf6f747b5433f888b01dd5ff490f0ea9e6f54e389b4e85497cc70c2cb6f007be20326b73395a6a3ff1c6b11f3e89363e8
 MISC ChangeLog-2015 54819 SHA256 554474d3a1d6d3526536b50eb23527cd6747f93ac62bc41609172c7786106c25 SHA512 575bbc609adada123e29a9f311603d8e9c277ef2ad288ff2f85e97e12214eea3ad4c4e18e8d82a6493d12365f3af865a43e7b69da5bdfa2879a11d58b4c079de WHIRLPOOL 7bfc750377d8f3777a212398bee212671b72676588a5b3423212c7f95f061ff07d4330187a6f1a3530df7aedcb6c0ab1f1702e742c87979ec143daad9c348626
 MISC metadata.xml 1767 SHA256 bf65f35c2e3d4d64dbaaf0ec88b2ac9fdae734315948c0165e6827281253b585 SHA512 eab26de132a410104ad260bf09962702fdc0c554261511264d4d95375a7afa07fa5b902115e4a500d5371e54f483c6f655f6d0c1fbc387e46f10e98d20b842b3 WHIRLPOOL 4291d4991d4c78ddaff7fdbb96ad8fb7f0e3222ca427eeaca7546c95a98ef44865b050e0c7918655f95a95510552f295b3e9b5bf167dbaef58d0d29dd06bde1f
diff --git a/net-print/hplip/hplip-3.17.10.ebuild b/net-print/hplip/hplip-3.17.10.ebuild
index 1d28c58ac248..550501dcf362 100644
--- a/net-print/hplip/hplip-3.17.10.ebuild
+++ b/net-print/hplip/hplip-3.17.10.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ppc ppc64 ~x86"
 
 IUSE="doc fax +hpcups hpijs kde libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"