gentoo resync : 03.02.2018

10 files changed, 10 insertions, 11 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index a09ddc4b9388..9da1c6f27e58 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index 1f60b0dafd22..a29b66a6e641 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -36,5 +36,5 @@ DIST x86-debug-libreoffice-kde-java-5.4.2.2.xd3 518297724 BLAKE2B 580d482859c27a
 DIST x86-debug-libreoffice-kde-java-5.4.4.2.xd3 530430093 BLAKE2B 5619d7179d1bbbac296a7d91403d5ae09f63ce0548a1c90fbdfee481c3595221e6428061e5cd59aa94454a587fba6e2a0f0afed799fb5de26f01e708d8e4a230 SHA512 67c3f52cfd06cfa7c9133f4c829b8457d38b7ae83f663cd8b185105959fa5e022bd037ada8bb9ead950dfdc7437597b8ac4c98831d20d2422b4dcda518613aaa
 EBUILD libreoffice-bin-debug-5.4.2.2-r1.ebuild 2678 BLAKE2B 1e8f25ddb594c05f9e4e496b83fe5d0aae84dc55a13d770200fd72d7be6a0edd3824bff9e651af61c9b96e4a908d7aa9a0f339af3f1cac33c3d8bbd22261cfc3 SHA512 997eb0c415491c844ec8c2028501e9fdb23cabbe4159e74b575ca4c790c8600120afe8cbbbdf96e571195f88621cdabf138b055d7dd3e3f1b0c5dcf15021560b
 EBUILD libreoffice-bin-debug-5.4.2.2.ebuild 2678 BLAKE2B 1e8f25ddb594c05f9e4e496b83fe5d0aae84dc55a13d770200fd72d7be6a0edd3824bff9e651af61c9b96e4a908d7aa9a0f339af3f1cac33c3d8bbd22261cfc3 SHA512 997eb0c415491c844ec8c2028501e9fdb23cabbe4159e74b575ca4c790c8600120afe8cbbbdf96e571195f88621cdabf138b055d7dd3e3f1b0c5dcf15021560b
-EBUILD libreoffice-bin-debug-5.4.4.2.ebuild 2680 BLAKE2B 2093e25290cbb754de3d3ff1742a8dd229797d1410bfdc414d527d57b09ad6982500043ee80e0c018d2ca86416e36b4c651540f6b4f9ed2378b96115f28c8667 SHA512 d1a3f62744e3f8312fdc46b0912ee69d0fc1e8c8ff446755ea8b9579781d6ed81bfbf761a5b35d04af99d262e85660e4569b26ec8183965e28ce48e007983481
+EBUILD libreoffice-bin-debug-5.4.4.2.ebuild 2679 BLAKE2B a312f9286441c3868303f94806ef8ab85eb14e30fb47973ce5bdf3150b9fbb9f85aa1db31a7decea5fd5402717eebc712df1922474db9248c9cab3c03808c3de SHA512 be667472fe792323f833a07bb0405a6d59b2468b3a4fb3252f486cb6f1fa8fa7edd847eb6eb6374ed929722f3ac301cd12b67b04f3e32cbd760f8a6aa5a18447
 MISC metadata.xml 481 BLAKE2B 2b7085b47722f20719ca5e219b52e4334c4819db8c61dcee1446ac28e70cd90a3ac7e1713a4e95a0d3952d931ebcc34b137294b1e17f79cea9f41ec31fb3cd55 SHA512 6c5698440da103c49a6a26c99d3af9ef88f79a74542bca66cc8adad77dd5412760630e5753f163e92cbe58b53c0fd899b9115ca3ae85627bbacdc01c6dd7bb63
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.4.4.2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.4.4.2.ebuild
index 0a02ac27a977..f8723d429dac 100644
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.4.4.2.ebuild
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.4.4.2.ebuild
@@ -46,7 +46,7 @@ SRC_URI="
 IUSE="gnome java kde"
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
 
 RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
 
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index ec3a3a7ca208..23a63b0f87ac 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -37,5 +37,5 @@ DIST x86-bin-libreoffice-kde-java-5.4.2.2.xd3 24919539 BLAKE2B 7da2fcad2eee3d35a
 DIST x86-bin-libreoffice-kde-java-5.4.4.2.xd3 23590122 BLAKE2B a8f9467ab022a0181db8bceed85596ab1bfba49c4c629049aeee6b1b65a2b1a0f6bef82a46f0b5f8ce93ef2a3f977a818be90d72680a6889db4f2efcdd0f6aa1 SHA512 c574727bc3a0c9d9d0a97f20c2afd48e947dd619ae400ba76f8fa2844b84392da5fd42d0abcebb57ae6beb34fad84782f6f5d74a718d284e262796ff826ab1a5
 EBUILD libreoffice-bin-5.4.2.2-r1.ebuild 6393 BLAKE2B c5bb2ea55b0df8a91e9b906488f123bd552d946e9b1fb21447cbfa2d1b95e1cee212ed794ff189c5b5af3775435a7805cc48d2d64f72c7657dcb8b6f0d0c1830 SHA512 a54bc65f79ea2d19650eec7cb9bb15dd4f546aea928f597941904f36e286cd379fb15911d766bcf96515e11fa19d0d0fe5f3a96d8913b76a898efae86963b41a
 EBUILD libreoffice-bin-5.4.2.2.ebuild 6412 BLAKE2B 6b614e6784bb1f465803a7bf22547e0d8af203b092b882a503f03acf01e5b303bf1c27f6e609301673d3fa1ff1f6a3863e4e2cefad4be099d168c4e3335877f6 SHA512 cfe89c42af3682d6cfae9d27bc75ba93d69477a8b0ddc77f6d4511a2a9e31d7a9ee299e91627d86bd8cf0de2e7d9c40162f8482bc9547f34cef230749681fbe6
-EBUILD libreoffice-bin-5.4.4.2.ebuild 6516 BLAKE2B 0ecffedea910dbf765677313dfd983b82f21914fffcad38062aa359a4c430c724cfea381bed1cdd045044d58875fef46993d4ada5a1b349c1842c2cf33be36dd SHA512 74e5566178088423000c8114d592bf1c1a91c1f079e4adc946c33c3285dc55b01815681cf74f0e526ebf8ace2c5850e34dc60a7188d01d8a25da07129b7ca2f6
+EBUILD libreoffice-bin-5.4.4.2.ebuild 6515 BLAKE2B 6a803099a76d431fc35eb8991ac4f4de415c6d64a0dfe8c7acd08d7ac2d0a8a16a275cbe43f31410a000341ac72b83176a45f372498b2896766ba33fe0043973 SHA512 9d012cd35378ce9c53ef9d077e0781965fbcdd670b31d047365b4fcad02cfeef8886c2658d63fa6ed9d691ae1a500dac08e33c74a30fe23911b69d5a50e94df4
 MISC metadata.xml 510 BLAKE2B 3c08e88fbf4a981a3adde50ee62d59899f24f87b2aee7359bec6c337adde486096de536227d81b1e3eeb2a27e01c08ca1d91db6d9311e0d34211528f63aea23c SHA512 12331dfd1fe409ce5a65bcf1ce8bd2e23f2e789b7009216e987b861fde897b78b16487399338af0e94e9e40da70ba32624251d71de5aae7d5b23891f54a994f0
diff --git a/app-office/libreoffice-bin/libreoffice-bin-5.4.4.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-5.4.4.2.ebuild
index f74c47dc1b6b..83d8a7c62454 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-5.4.4.2.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-5.4.4.2.ebuild
@@ -51,7 +51,7 @@ SRC_URI="
 IUSE="gnome java kde"
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
 
 BIN_COMMON_DEPEND="
 	app-text/hunspell:0/1.6
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index ad95b0413345..e7e8751b925f 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -504,6 +504,6 @@ DIST LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_zh-CN.tar.gz 794478 BLAKE2B 6474
 DIST LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_zh-TW.tar.gz 795551 BLAKE2B 7faa1bb5798357610c61c4bf3e53ea178c4d3bc5706651f903a5754172c8afa38bdcf40ebc6d4b9f41cae4d928857a8982a5b6547caefe420d19e767c021037b SHA512 b63cf9aa1fd749c1c7dc14202ef89c9c55c7581f55424a680d30092752eb21153875d736dfc557dd7ea160e5562489c3f202745bea47c7931256a89abbb66afb
 DIST LibreOffice_6.0.0.3_Linux_x86_rpm_langpack_zu.tar.gz 326199 BLAKE2B 31073f39e05680cf851e6e35b6a41d28b72305d4fbf7b3ed19c9174330d4cb4ac2cd221948e95d8b4065536ff88eb7d7801b1b42d8d10ea91007d4b0259ab2bb SHA512 6f2dbbad9802eac72eba74b7fbd6161b03bd594a1cea11413e1bb5c48433265e524fb09d3789d7bebb470d4207ce9a75701d2a76bd27342a6955a05783e38981
 EBUILD libreoffice-l10n-5.4.2.2.ebuild 3378 BLAKE2B ed62a2f4db3d43fdc21d98d572bec6e96dc3730de60dbc20d29b6f8d34120790d87f064d9285173793f948f9e2ca1dd20f0bb8bd8833d2c073671358dc98d1bb SHA512 90bc19cfab3bce49c5b32dfb046ca1f260237def3981de67b49efce47da0943b4f9ea5cd690dde0c4f819198210ae6efc5f98cfbf893e369a40a6364f2abe14c
-EBUILD libreoffice-l10n-5.4.4.2.ebuild 3367 BLAKE2B 978a3b2b66392857fa9d0a1fabc32d8440eba6b115b02a442e430302e82f3ec2791b74ba06a118f9125d40a2af7a1222a0cb26432b34a525f48e18af0d46e277 SHA512 c645cbc2706cfd9cb53ca0ce981c07fa4849514e5797be437dc8d6178fcd0afefcff3c3b0f935ffd6a0f180d3de9b696efc48c2b6b1630ea9a13c12a29cbf328
+EBUILD libreoffice-l10n-5.4.4.2.ebuild 3366 BLAKE2B 0ed31a22ec4998d1b2eae8a7ca9cf8aa8c3c9e4d532c50323b34ecaa809facb8ea78c2e9a672b9839251842fff8e73dbe6fc165f2f961bcc40e4b2a7660ca836 SHA512 472083f47a61d640a0067fe0f780fe860d0b8c067b30c6d5a7c9ea7a1ab073c20bef4c6c6d72a5f581cc6fde6e91b8d959a859f68b79b772b69f54900df8bda7
 EBUILD libreoffice-l10n-6.0.0.3.ebuild 3381 BLAKE2B acba35c6617836017ee6c712991665536577cf0e11522a3eb9659742f6415132c43ef886806277e81ec2d386c73cffd0b6e8b021770e1048c01738396700a07d SHA512 bf4f8a1948f3079b1645b2d95f9b76f227dcd266663edbc361b58f6274fc0c8044d3d7f5e511fb3c08e3c5b938378c620e60110ebf5756752d920c41e3ae869b
 MISC metadata.xml 369 BLAKE2B 7629064f409fe8ba7f0daa435ff56eaf0870f70b45961c635119725e9a78ca40bbdf77a39e70f83a31103944f579b13db5fb07f8dc9e7ecb77491d36220370e9 SHA512 8cc7592062150a5472a5b8cf4106d0c3fd7270c7e6d0d566852bbc6670a90be2c73e6c04f085e32b41f40dd1adf9800a53a1af8df5cb297c20394c55e3df45c6
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-5.4.4.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-5.4.4.2.ebuild
index aac8fda328cc..faf035fa0b83 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-5.4.4.2.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-5.4.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="offlinehelp"
 
 #
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index e9f372a70dcb..f0446832490d 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,9 +19,9 @@ DIST libreoffice-help-5.4.2.2.tar.xz 2343504 BLAKE2B 7d446d5b078adc8943be3fced92
 DIST libreoffice-help-5.4.4.2.tar.xz 2343352 BLAKE2B d94528f6dcc85730f2443f3a84beff0cd113bb9c423d767c74d831649e56b0c92279474a0f1169ebc0ffd7804d57dba86aaa352e7fd1d9df9721f3ff6059047c SHA512 55abdde1cf0f62d213a897cc30b92ae04960c9b1e6e69c4f86242d2beecd787f44be9c3d0c8684d775ffe40b17d685a71739c9c2f08753649c4e1298fdf94226
 DIST libreoffice-help-6.0.0.3.tar.xz 2972556 BLAKE2B 6805f6a28cf29c6d55732051763f12ad2dc2c76c27c518dc40b85f2ef8f7ad4943de3a55629da4de77ee1ebd3b62a8e225e0ee260081f3c25cbffc60a21970c1 SHA512 9058edf71e34e55e23f5559af94d12d5f12c38385b30d75919283f435eac07dfc790d116b556aca0d0aa30f5119aea39f07a123a1f1e5ad172f5b19b3f7dc4b0
 EBUILD libreoffice-5.4.2.2.ebuild 17284 BLAKE2B 2f1c4a8f7a661b36fa3eaa8559eeeb9e7140cb3e1cc71ca1f4272512e3a268c7e24e60bebd9088a76f06e546bf0307a6e18626fc2e4fe55f04f7ad081befdc27 SHA512 3fde8087bbe39bc3bbf6509bb2faa9635a9e7ced06df58c67f143de24fc49f9e3742d5e61001a28fa9a0d600e8bb5ff72fb578acdd5637ac37c51679408cc810
-EBUILD libreoffice-5.4.4.2.ebuild 17361 BLAKE2B 7fa4ca01338ac8cd9e07288e672ddd033368a5a0281b4c56c2ebe21d6814fec6d1aedf9f06cab4ffa4d0b54f3285cf64781d205926860e3c03907c1b34171086 SHA512 8f551d2d9de46e3ecf10953ece19d9bd005164c6d407e4b980a57dfa74b82d6fce3481d9466a909a938d17cbcf87e27c57e12c186ae8d2c405d9cb32ac76a9b1
+EBUILD libreoffice-5.4.4.2.ebuild 17360 BLAKE2B afce5248e9dd29d697ff565cab9331317ed619a55a5e7b8f4291d29bcc0152cc703d11f903e5ae1708d90467aae61d1ee784f59b8a13dec21d16009fc8a8658a SHA512 0f64e3442ec4df67c4a35ad9a8edbaa543c3a849e29bfbac90891dd0fa69c287b6255eb1b6a2bcb361f999ea79b70de0801e89016e80a637973873eb3f3b0343
 EBUILD libreoffice-5.4.9999.ebuild 17313 BLAKE2B 1701bda68e2ebfdba50ed889d6d13a261a6e8127aa2f47aae68a4e7f39d771f716983f8beee7c927244e101783ba9e50512f35a16c959c979d1475c2baff8b55 SHA512 640c75d7e9b1806249d61006b9b6524c28cf68a6b90936effd0dcca45f5b58bc1b327ed2b37fda815d09c827bd3c5805780bf3e65078fea658518d5219e0fc21
 EBUILD libreoffice-6.0.0.3.ebuild 16584 BLAKE2B 578987c8621f47c5cd72830e622f688f62a8a9859d2dc0c9194d1052512aed93211643cbd596ef3b525657680191c66d558da2a1d63934e050ba45764db3c7ac SHA512 e72118b60e4cc70a8a94d7d0404d292759c7b073625bdadafe946a445102b1b9553004e63cb0e5ba11fa07054b384c8d80fd76567d9a7ca8116491f9b841547b
-EBUILD libreoffice-6.0.9999.ebuild 16570 BLAKE2B c9cec097591e7fc082a3bdd706f0546f072414a904b8c924b43487644af3883d93c7dbfd43e63b287425520c99ec20efc6364d3c14b2e9229414c9f5229df74d SHA512 df05d7b8923e9ec013c7f8af481b7a56781a80fbd68469665b2cadc58b29409fd01f5b2fe355a9cb173fec7d51bf240c3478d68b0da65da01c3aa98456525abd
+EBUILD libreoffice-6.0.9999.ebuild 16509 BLAKE2B be4e30efc68c2dbf7d9876a4a6be12090f3203f70513417d9839ffbf229d6f228a4d08039ca402ad9fa0355367389bcd803ac16eff10ff63fcff5c498e54cc8a SHA512 f81162fa524813c036275b191edc404c3c1dc5a5e414b581edbe156c6c233519db0978b71b0c78b095e6c67803e598371c8cad34caf508194e18c0f9e8abddd5
 EBUILD libreoffice-9999.ebuild 16399 BLAKE2B 6d80bd72a3704f1e2e5316999b9b0a80145f1ac9127caaed496e1178e5be43e8b59c097e054dc7af2197fa121bcd1a7b1e8cbaf9b42c7e5a897f0c8e5d3de79e SHA512 5c09becaad0e632822d5a08e18f40a15eb078531cb1eaf54fa33cc31588994a650a44f928d85b73ff67e14f4f8b605dd4c039cea75674ac01719306d048c390f
 MISC metadata.xml 1443 BLAKE2B cbf2c4306fdcde291bcb0692af7dc9f43f1eaf05fe93d6faffbc85833dc4d5ae653cc299a9bdb55dfb335c8aff316893a72ac48488fb372f667f81212648fe75 SHA512 df37d47b0f2f9f9c229b0d558d69fcda897a54b8ef1584d9940a7817885d52aa6b17b1879cf3103a9129fcac0611b4fe49213876bd2e446c70e57735a144b323
diff --git a/app-office/libreoffice/libreoffice-5.4.4.2.ebuild b/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
index 2e4b24caa4b4..cfeb8bc1a4af 100644
--- a/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
@@ -71,7 +71,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 4ef05313f50d..9890bb1bf837 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -250,7 +250,6 @@ PATCHES=(
 
 	# TODO: upstream
 	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
-	"${FILESDIR}/${PN}-6.0.0.1-poppler-0.62.patch" # bug 642602
 
 	# gtk3-kde5 vcl plugin backported from master
 	"${WORKDIR}"/${PATCHSET/.tar.xz/}