gentoo resync : 15.02.2018

77 files changed, 76 insertions, 76 deletions

diff --git a/dev-texlive/Manifest.gz b/dev-texlive/Manifest.gz
index b6f3cc96b0b0..86b1bcc309d4 100644
--- a/dev-texlive/Manifest.gz
+++ b/dev-texlive/Manifest.gz
diff --git a/dev-texlive/texlive-basic/Manifest b/dev-texlive/texlive-basic/Manifest
index 9eeafd75fe8b..6f1d3924eec1 100644
--- a/dev-texlive/texlive-basic/Manifest
+++ b/dev-texlive/texlive-basic/Manifest
@@ -333,5 +333,5 @@ EBUILD texlive-basic-2013.ebuild 1702 BLAKE2B 71fdfd7880bfa73365ca8bbd97e42492ca
 EBUILD texlive-basic-2014.ebuild 1670 BLAKE2B 8630493349ae85ea661b44e9e211bd12558dd72e1f630de4227dd5bfab590c2e812976970f226df2d5581a56faa7d59c57193752faac9ceae288bbca4af34b5d SHA512 b4887c336269bf826c81466759351057a19ed0047f82ae8b06c9eed1d483c500bd99a0b962bf62fda778d44758ff1f9c8e9fae6771d66b883f5704107a4ca061
 EBUILD texlive-basic-2015.ebuild 1722 BLAKE2B 08620f418a40d45fc413361520df51f35fec6d2eb80d74fbf01acd9678e9948881e7a2c4d5d878f6a29ffe0104ef7f82cf00dee0bf28fac25f29f0c18a50ecaa SHA512 d42b475db6259196281a09eb2e4ab9d058aa49ca1639131e5371388812a0cc839a9ec79cae2ea21b02d08f7097b2a7997925ca56704a6cb5654cec10cf153a09
 EBUILD texlive-basic-2016.ebuild 3224 BLAKE2B 3bceb6a883a0e125c48c49e6471729650fe8dc1c22fdc32cba5a7583a7b2f29796b0881f38484143a8d98afd602e72183763c8edfbf657f68b253532eb56e8e1 SHA512 da7416cbd7f4efd0efbff5315a9e5c91d11ee4d42a817d674b58c320a5c1dfd141700365ff9ef604fd379d302d2eec084e51d76c1eeca599cf6ca31e98c4788c
-EBUILD texlive-basic-2017-r1.ebuild 3226 BLAKE2B 5ca0e4c2c9c4c8b11580776253ee7464b1fcf25ffa3b6b60bf06fa8693039864760fd0de96e49569f654db471b124f68e1c479a09a2692018dacf381db1017ab SHA512 3a714baea203d47d5770ff72576852ca79fa4d385c45e1e4218478bb6f4505408b4af9451b03db98eda1de20765a508327670b08d438e984aab29be8b2d8b328
+EBUILD texlive-basic-2017-r1.ebuild 3225 BLAKE2B 130affda7b5ed74dc0477f21f2b293cc499fe2be9ad69e4f937d9b562a6ba70c86cccca64dad8a08bf97d2f86afd85e8e0da918a8bd98309669f5139a1a496de SHA512 182264ab8c4a69218e6e08c5ebdc0ad4ea6bce07327f5954f98dd2812b5efe600ca8e88fc53380d54878fa3fd927a241c1befe46d25748da6b65fb16aef24ead
 MISC metadata.xml 688 BLAKE2B aa7b007f62d5b0a2abbf20faf44b53118960ba7cd36777fcd168ee50b41256a6cb46838e0b3757bb45f0e5c7fc5cb1b9ee3a53bbe9c23f2563cb852a24a810f9 SHA512 59ed72f217730364d768f0240839d7dea3ad2e6f01c9b24658e999f7e3415711ef1783e3260391bcfc9d396528d2fc7eb8d28ef96c7c19731f123574a2c64f69
diff --git a/dev-texlive/texlive-basic/texlive-basic-2017-r1.ebuild b/dev-texlive/texlive-basic/texlive-basic-2017-r1.ebuild
index d018340c44b3..ce9152f9914e 100644
--- a/dev-texlive/texlive-basic/texlive-basic-2017-r1.ebuild
+++ b/dev-texlive/texlive-basic/texlive-basic-2017-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Essential programs and files"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 OFL public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND="!<dev-texlive/texlive-latex-2009
 !<dev-texlive/texlive-latexrecommended-2009
diff --git a/dev-texlive/texlive-bibtexextra/Manifest b/dev-texlive/texlive-bibtexextra/Manifest
index f1f82929ce15..a7d72cf7a9d9 100644
--- a/dev-texlive/texlive-bibtexextra/Manifest
+++ b/dev-texlive/texlive-bibtexextra/Manifest
@@ -742,5 +742,5 @@ DIST texlive-module-xcite.source-2016.tar.xz 3112 BLAKE2B 7daffdcd5a43e961c42618
 DIST texlive-module-xcite.source-2017.tar.xz 3108 BLAKE2B 805e383e43bb27febc97f160cd4ae34149fa33c55e16db672fcc30877a37e9b5ada8fa2d94a5e87b6d8607bb503cf9c7d4c1ffb357699f772079504f85d6be20 SHA512 f99d309c7939d864be018f8b33833534d15981a84307aa77249ce3ee259c4649d509ab1322be6318a4cbae85b753b37b594694b39beb628f6cbafbd6f688a151
 EBUILD texlive-bibtexextra-2015.ebuild 4240 BLAKE2B 92244bad9860483ab5145e3f40cdb3b4818b5af573a4096c236846f9a59a5a0691448ced86ff9ac9edb82b9be99f8e45b3a0626d0f9a44966b3ad904c6f20932 SHA512 884a45704da1da1485ad6de484e85fccf8e39897ae0ee58c3734a52f3c95f713efe1a18ef337256b261f481b3f168c93b1a4d968d63f82fc813e4c55d4661aba
 EBUILD texlive-bibtexextra-2016.ebuild 4903 BLAKE2B 3398edfbf07efb51fbe639aa681cb31cad95545bb58fc7acbb673c566b022f598005e5e36612a146cac6403c1cf3bf016bc737352c54d1b9bebe8d3d24b97ccc SHA512 2830a1975cbd7c64243bcb789792bf52bafa64b14b580626d803b8c13265f90315a7c304adad4d3a5448d3ad9839712b792ede2dc4f1131d10ba2cca8933d328
-EBUILD texlive-bibtexextra-2017.ebuild 5187 BLAKE2B 34051f403d3342fb8ba4e15100a4d44afe08e9116ee6995e5c1ce3e48ad0721415aaf829829a72f3cbc6ef06ccf32481ccb17c45a0cab73ca13bf60ee9f94d55 SHA512 52652f5f365b6e24693e2c857eb7a6fcff00e2ab1e71ca06c1f99e00e9e822ec723e4dfa129269adcca0e59fd84354329ffec7ac2bc55b09c03d41efa872d738
+EBUILD texlive-bibtexextra-2017.ebuild 5186 BLAKE2B 333b2c78a9ea976e6cd6d596afdcf9c5aee64cc614fa8f1d5eff24524956b3c62fe2cc320a344d383fe04058f8f222b45a8bef68311612d4cc6e8fb6bfdd8720 SHA512 19b4cfc23edf80258ba88b5c16d2b85d4e7fbe2352b34e90173c06382b98ecfae5fe397d8a1819857de0bb72e1e48461c0e8563ae7f5618ff9d00a4bfa2e0aab
 MISC metadata.xml 495 BLAKE2B eaf4c29c2686caa7d176ca20cb28e092a895c5d1ba17b2023f5f59b7a01383e106582ad1ecd5c2f0fc3d8912a53311db98791b8799a4e52b4eab01c4cda2b003 SHA512 1209d61abc60dcffd50bd8e460b9f6130afd00da9d350d4a53a287ddda6a78140129c7ff036aeca4f008f33d9eedfb0eb3d7fd839196eb14cd4ee46da92d2429
diff --git a/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2017.ebuild b/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2017.ebuild
index 67a98ec88384..3cd3377caeaa 100644
--- a/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2017.ebuild
+++ b/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive BibTeX additional styles"
 
 LICENSE=" Artistic GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2017
 !=dev-texlive/texlive-latexextra-2007*
diff --git a/dev-texlive/texlive-context/Manifest b/dev-texlive/texlive-context/Manifest
index e2fca110d967..802fb4ac30f5 100644
--- a/dev-texlive/texlive-context/Manifest
+++ b/dev-texlive/texlive-context/Manifest
@@ -209,5 +209,5 @@ DIST texlive-module-jmn-2016.tar.xz 40024 BLAKE2B 5b4999cbaa4583e37af40b40ee82b7
 DIST texlive-module-jmn-2017.tar.xz 40024 BLAKE2B 5b4999cbaa4583e37af40b40ee82b71e8483ea5689a72c63f1cbcd4962ccd5eb737ebb77b665b56843827809d644bda24574ea1c2de1fa6d52ee159d890afb0b SHA512 cdf252d2e61f53444be69c4b6c9ab1cdafd865365f1d59f0c7d428825858153f213a86a5871e93bb3bb261ac4afa9c5391b2adb21f1c59d81bc6592711aeef38
 EBUILD texlive-context-2015.ebuild 3331 BLAKE2B 0f01efd1cdd744c56214a322de4462f1c0ef03fbf1e73052b1ed5f4e529835257fcfd0bd72f87c641419458a251c3a2a61e70a5a1ead441e8ced52ae48a15787 SHA512 a0e41acd624e8f0c2b2cf0c57a7d171642b6f34c96697c6fba89526f46b6335c43084fb0ffa85f5ed4975f74eeb3a3b55dbb5081eee2fe90ec6ec0117c01853a
 EBUILD texlive-context-2016.ebuild 3390 BLAKE2B 6763b062145c1ff60d8064a199c9b007da5a3348e3d69fd433f2ec462c66e06b381eae77379a4cb9a90b766358a338d6f6b5a7944f2ca39449dbad3a8176ac24 SHA512 29bd33b405090ec461ca6ecb76ad38130838bdc8a3e82529f7de67eda88cd23b0960f84039e54d3db520ffde08616b9fd9262c87b7681adeb289e620fe211369
-EBUILD texlive-context-2017.ebuild 3402 BLAKE2B f13ba021c47a86d65aa1ff7604776784bef251d360bdf1bfa428b1b75b7d0bdb1107e7b643fcf3af954e65d1f8f27435be1e235f61e68eb47ccf412899d8d6a8 SHA512 d72ca0c88deec225f7e551db518028aa1fea90191e67f9bb1f558d99e3f2813175396c51c89e6c8df241000824e7520aa199dd13405383f415632f84b5d4cc2b
+EBUILD texlive-context-2017.ebuild 3401 BLAKE2B 641916d3a75011b6fbf75ffd99e1721d56ace318b19c47251a6485bb64d6633af988fbff11c9c2a7f253dc0b6cdb9665f51aca873d7c3ec2b9045973bb3c5458 SHA512 a29c483f6a113e9ada50df4c058ed1c4f8980fad809ad354a2b39053e90a5e38171c9463535c9efd12270545619d70d7de9ef54d32c0aa17eec3e6e4c97d70d9
 MISC metadata.xml 517 BLAKE2B 18bea3fc4db71d01c85ed3d254367f5cc9be257dbbb6d524c2fdaf87215efb617bc2268bd598f3c69bb8bd3b1bb1cf529268db118305fc6394bec447504c72b3 SHA512 6a05b0aa2626563c21edc01c8d842ac54e7533420e86d41d91a2f6730ef1dabcaf96bc2d68088a9ddf89fae4a932b9bee5dff998b75c1824d789cf6937995311
diff --git a/dev-texlive/texlive-context/texlive-context-2017.ebuild b/dev-texlive/texlive-context/texlive-context-2017.ebuild
index 71890cca0b3f..5fd733928b65 100644
--- a/dev-texlive/texlive-context/texlive-context-2017.ebuild
+++ b/dev-texlive/texlive-context/texlive-context-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive ConTeXt and packages"
 
 LICENSE=" BSD GPL-1 GPL-2 GPL-3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 >=dev-texlive/texlive-latex-2010
diff --git a/dev-texlive/texlive-fontsextra/Manifest b/dev-texlive/texlive-fontsextra/Manifest
index cb1241efcfe2..bdbe190d3257 100644
--- a/dev-texlive/texlive-fontsextra/Manifest
+++ b/dev-texlive/texlive-fontsextra/Manifest
@@ -1664,5 +1664,5 @@ DIST texlive-module-zlmtt.doc-2016.tar.xz 53496 BLAKE2B 21c8fb0408a61ac64efb5437
 DIST texlive-module-zlmtt.doc-2017.tar.xz 53516 BLAKE2B 58c88b219e36bb4ee1379468b2995713c729edde8f36f18c1f6209b74cf8122997caf27f24d3bc8072ee0ece2ada0542e37816bb56c2de20d658739f0c4ff246 SHA512 834220fc28cda484b15cca0b896124a98f3664686582490c19582644524cdedd111e0ec500cdb4fbd45dd0a4c3ec9d647ee4a5a4de699f6b6ed16a67e7221312
 EBUILD texlive-fontsextra-2015.ebuild 6636 BLAKE2B 3989b0191b27a60d3d21e1f63eae24691491380d8db26e5df29ead531b89b8010dce36a97f58191a67d32ebb8c0c205fc37ab5889b213aac032c707702e54743 SHA512 55f849a5f5404b150a5ab657ee4a8f8fb3a83187b9fc19e7cb8d73897777549be70b556ab105ed35b41802907cbed8ccb52d5bcfaa736b9ded8de96c33ad799c
 EBUILD texlive-fontsextra-2016.ebuild 7447 BLAKE2B b28ea9f6ac33e106121cc6ea9810a269e1a88774cdf3de93accde179373f6a28ee4e0363facf55dd851c3382d61e2022dca9e48debd0c157f4a82325cccce27c SHA512 cf782c23daf034de2537aa5262708b7f8e46e9fc58bcfe30a485e7665273211f6db3cad7c67b57f3bb840dae3c14845256d22ecf019dce5b83a4a7e9f0ab032c
-EBUILD texlive-fontsextra-2017.ebuild 7508 BLAKE2B 64cc519f56d78cdf66315512d74b40095cc37948fdddb3745f319e5afaad910975d9397111b533f90bc6e49aba8f2bf94dd957a7948578e0b3c72ca2cfad0b07 SHA512 0979be7d1d68faef7e88d8c7eebf6ba934e604a5c2cb5d117aa2028087b30d176b1c85718fbe9c52423dc85c8c5ff34588e5fe58297727732c9b655523306367
+EBUILD texlive-fontsextra-2017.ebuild 7507 BLAKE2B 80efef84f089cb77fb11b6f188161064ee0f900c5427800fc307df0a87f9c0ad07e431b401eeca1cd94e3af5380765c343d3241f9bb5f442a9dd85d61adcf84e SHA512 d2ebe12249628e65cd8a518cb94b496d9d4278255b7c77d2efa5c0fb5a0e9dca1cf4b059ede14d0b0c61567bae6e66cc7cb53c42e05457c30f665656b3757133
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-fontsextra/texlive-fontsextra-2017.ebuild b/dev-texlive/texlive-fontsextra/texlive-fontsextra-2017.ebuild
index 223d72da49ca..244537a4a0e0 100644
--- a/dev-texlive/texlive-fontsextra/texlive-fontsextra-2017.ebuild
+++ b/dev-texlive/texlive-fontsextra/texlive-fontsextra-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Additional fonts"
 
 LICENSE=" Apache-2.0 BSD GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 MIT OFL public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !=dev-texlive/texlive-langpolish-2007*
diff --git a/dev-texlive/texlive-fontsrecommended/Manifest b/dev-texlive/texlive-fontsrecommended/Manifest
index 24186016ae2d..caf8067c317b 100644
--- a/dev-texlive/texlive-fontsrecommended/Manifest
+++ b/dev-texlive/texlive-fontsrecommended/Manifest
@@ -191,5 +191,5 @@ DIST texlive-module-zapfding-2016.tar.xz 46960 BLAKE2B 47d0c14c5d540178ee2639a2b
 DIST texlive-module-zapfding-2017.tar.xz 46916 BLAKE2B d9aa25802f203bd2b08dc503c8e163dc0a404dd0629aa5a7a1e28543c85f3b59695d480789eb0b11408490aa72d8e8716ab9fed413641cfdd4106ec7878f99bf SHA512 d7efd293f6e0616d1a633615f9bb79970c829fb99a7d5c1b6c217058ee74f29492fbc303a35951140a135d7742b58609c693df4eeb1ecdc5f63cd9fcdb177d11
 EBUILD texlive-fontsrecommended-2015.ebuild 1390 BLAKE2B 0611474b755f436a3a346da7bb4a06c789e873405713d749599d77a76c875b7aadb2331ce0d19bbe96ebc7e71f0a5e380074b2c7de54d860717b799bb18be97e SHA512 83303017badad9096a7f724c58dec81169d63ced6ac8eafcb36f66b7147b146e51679fea0b6271758558fb76ebc375557bd4e3a5ae05d361c9fdd30f0244c6c4
 EBUILD texlive-fontsrecommended-2016.ebuild 1429 BLAKE2B d1e173c6a3444ba682cccf349829218469bf161f0181da39c19fad0f854f6fb629e7e9e626ad21e3949533ce8ab92ff621fe6220ad1f09fadd236a034087caa3 SHA512 e09f522f15d8b033a149e0bd07dadefb9fa7194a1cff1bf38ecf6fd6bb2fafb64397fe2d1f8a78de61e3799b1bbc211210d910e8a9eac233e008122c27db082d
-EBUILD texlive-fontsrecommended-2017.ebuild 1398 BLAKE2B 1901e6cad79e947198c358166abffad259004aa9ad9d6a623d99a4a339a70fd63db8a93f7053fcf4dbce14915bfd6d9d3b99ff7464efb3ebe1b2270745ad8544 SHA512 1177f5f2614d3cff3f2e0714c57b3321556c661cad298f6e4b117e072ae6a3c303061280f242a5802ed3bf13c4100606d7bfce242c1fb82419da825854f34ffa
+EBUILD texlive-fontsrecommended-2017.ebuild 1397 BLAKE2B 7d5ab62f25ddb1477b0ae46eb260beed22c7d4870705f841a1b910eeb7b22c103201f3fd636de5015db0e1d0873a18d6349a41f46374c142bff67a7e73651dd3 SHA512 e7829a6340d119587e5e6788348b439d03da84033094d123f6f618a6871c82da946b7cb640405ded10f77cac7114aa17d6b9b94d6d2c453c1a2921aad06f8f75
 MISC metadata.xml 569 BLAKE2B ae2ca0d4582cf74769c8537a954af064ea8e615318b8aa1d23f8ada27e6c8c41dc177654bf60ad9ee99fd29e14472ee79d8859de134bf50100aa384a10a69dba SHA512 0753e724c31d9af811afffb43e2317076a8f83211d5a45eee3f5002d8bcc5e424af95b5582d6b556cd2f42133984f5e0979a399d812f3844def897643344b101
diff --git a/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2017.ebuild b/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2017.ebuild
index 3f1004e1a1c0..09b73825018f 100644
--- a/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2017.ebuild
+++ b/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Recommended fonts"
 
 LICENSE=" BSD GPL-1 GPL-2 LPPL-1.3 OFL public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !=dev-texlive/texlive-basic-2007*
diff --git a/dev-texlive/texlive-fontutils/Manifest b/dev-texlive/texlive-fontutils/Manifest
index 99656877bf3b..ad1c7935514c 100644
--- a/dev-texlive/texlive-fontutils/Manifest
+++ b/dev-texlive/texlive-fontutils/Manifest
@@ -96,5 +96,5 @@ DIST texlive-module-t1utils.doc-2016.tar.xz 95856 BLAKE2B 7eb77e6f98b472001b4d34
 DIST texlive-module-t1utils.doc-2017.tar.xz 95856 BLAKE2B 7eb77e6f98b472001b4d3484840b30002ab079cff6066759e38a6635abff28b490ca6bf4d80f483a6237e195b20e4f00144a184c839ce92c0a070343cbf8c74c SHA512 59f3c52154ad0e443f35b5ed90cdecc201295ccad18dc919e8b41e9c5ac636502332e50a00febc0716702606eb98f2b8ae9438f3f881cb93fb81b91c5150451b
 EBUILD texlive-fontutils-2015.ebuild 1623 BLAKE2B ba8173335c3e0cccfc7e16b7cf15c89a053f70918a184c47a44ba1e98bbed4337891dc087baf19087206e2416c270a1cfbf9bb7d6f2d97aa4b25ab545a2426a0 SHA512 1bf8ed4c31a3e75a208d4fbcf71c5eded16b8c3ae0ad0b60766b92fbc7141533670984728419f26423740e357b98b25d685b30bf5228efa0ac9ecab8f3f9b5fd
 EBUILD texlive-fontutils-2016.ebuild 1641 BLAKE2B 99ecfc5d05050363cd18b273307b7dd79116c58417329751d587e461bb5e2398bc84991f4c08317a2350c26901dc6957af1eca345d71f4ef986534416e3f84b0 SHA512 a7e3f93f0a9cda43669fd347051f4350c6c513bddf1754854b894e8ec71115a23d6f3f2aadb053b4a5d46c8091d30454c3a90738cdd40bce26b9257b414586d5
-EBUILD texlive-fontutils-2017.ebuild 1648 BLAKE2B 5728442e625770b1c88d681921cdf29f4b81d47e863310cec5802e1734c91cba40559414eaf2430f149d295ed6343626a8a12403904d03d2916ca1988dbcfbbb SHA512 1bebe65a35e2b9939cffef56f628c28308a7584084c3eb4fd83ccda1a4c5463f59c92bfa6e10027ecaf44e78a2571175405687545e2eb942d87234564d1326aa
+EBUILD texlive-fontutils-2017.ebuild 1647 BLAKE2B 9eab3f33664a631515d59bc2bb5b642890e7beb9dd07b3a9ecae1d89f82bef13b5b52852aa11ab1f41f9da167901409b6e967122dbad67ec2512fb8f95f1a49d SHA512 8041160dc99be841767ea32f4a69679509013298c7b2266993726f8450a49e9bfa0738817273129bac18d75d0f5126e99c6b88e9ba452d5e0d135613654d8aba
 MISC metadata.xml 638 BLAKE2B 309dd88d7961480feda8e50f7c6c2f63274d24fd2beaf6c751cff8224243fbb25f23c176c92df85f0d09dccc8f6a90c9f63a301bb2c8527827aff6c97df85410 SHA512 c2ae5eb56b99612125ed6063f369979c8888a6b253a3a47bb4f125f45a8923207f13d5eacba69ef6af3717017a50e1603e17701cad95b484270c5715cf2c56ff
diff --git a/dev-texlive/texlive-fontutils/texlive-fontutils-2017.ebuild b/dev-texlive/texlive-fontutils/texlive-fontutils-2017.ebuild
index 8fcb2810e2d8..206b646449fe 100644
--- a/dev-texlive/texlive-fontutils/texlive-fontutils-2017.ebuild
+++ b/dev-texlive/texlive-fontutils/texlive-fontutils-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Graphics and font utilities"
 
 LICENSE=" Artistic GPL-1 GPL-2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-psutils
diff --git a/dev-texlive/texlive-formatsextra/Manifest b/dev-texlive/texlive-formatsextra/Manifest
index a5af2f176030..ede6c8b92584 100644
--- a/dev-texlive/texlive-formatsextra/Manifest
+++ b/dev-texlive/texlive-formatsextra/Manifest
@@ -73,5 +73,5 @@ DIST texlive-module-texsis.doc-2017.tar.xz 130016 BLAKE2B c64cf692a8582dcea4ddcf
 DIST texlive-module-xmltexconfig-2017.tar.xz 460 BLAKE2B 48985abdf4e6211a630fc928184d1bf4a93b1400c4fd7b9964e64ee9245e1e9357bff437351bf96abf0c20b8c835def9549f4af47eac50d53dc0d46e300a1957 SHA512 20d6c529e0772be2c31b1f47d353f19981c0c0c1790a7e025290f2715b747fdd189f6cb51f6cb9faaa990461e9a30d829854cdfedefb1b20cd1d362e13323c8b
 EBUILD texlive-formatsextra-2015.ebuild 855 BLAKE2B 4caeb81ac40eff97ac794179c4ab1133b4bc7da411bd0f27ac61cf91769938852ff6e4540f2aafc960f2331e99f1b2dcb1717f59418c84df19a4cd8b3c92a43e SHA512 6609dab2676c3f2d6ad28a96bfeecb8a97a40ac45678eefebe46163589ba8c5c3b7349df45a28bae4080fd67932fffe3273285317e345a7d825eda4bb39d49f7
 EBUILD texlive-formatsextra-2016.ebuild 866 BLAKE2B 52fbfe70db78a94d37f3438aa5e6090cd6f92145ae1881972736b0e2e0e3167bc2c4be23cef35eb832bd173884cebd6c6eb575574a256cc0690b09ef42e359d9 SHA512 307a695dfc9c40a722b2f7bda478c888d0f4777c85c0531c5c34b102c3203f8f65f1cdc44d8a258139599370091129664c194b5d7961c6b07a3b49409b7b5bc1
-EBUILD texlive-formatsextra-2017.ebuild 1219 BLAKE2B 07731bde3ded2a6cee9608ab570b75c97cd94fa7a80c1d147b852c8e6c13d041068d159a45f8c7cd5b602d488433ece119d19bde3e46aad93a636dd428f916f8 SHA512 806c43459813286b1bed4bceb4d0a9bd8bac19ff10ac765890640abdcd1da20e1bbfc133767090338bb0ac23ae1085209f93874342080a01e5d19477e8616b9a
+EBUILD texlive-formatsextra-2017.ebuild 1218 BLAKE2B b404a31169956bd7f476dd9058f8b95f5355cdf5be7757865d11409de53fa85b0920fdfa356de543ff3022e9b3307501f7b21f5bae18e5b714f01934a07415a9 SHA512 3264fe0863873809a3b4f35e579d91fc2350c4e8b72cb18c864a3612cacc0981b2e9088545d03bd762ab37a67e7de6e6d0c9b8d726282966878f8ef7e8b2ec78
 MISC metadata.xml 683 BLAKE2B d76a08b76354e21ad30a29835dc19c8c280313b330106276ff74f9221265472565ae8dc5582cab4963450482513f48a281af0adf7e2ebaa9adc7de2a14274975 SHA512 044d70fc0c48a776f9d169e0c5abd41c29ffc2508f05c175f301833cbc64f39f841effa2dab8a3b8c7ca94d487c25f3412593d3b173914c826874236e66db556
diff --git a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2017.ebuild b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2017.ebuild
index 4914702f17f8..022213fc1d0c 100644
--- a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2017.ebuild
+++ b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Additional formats"
 
 LICENSE=" GPL-1 GPL-2 GPL-3 LPPL-1.3 public-domain TeX "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 >=dev-texlive/texlive-latex-2017
diff --git a/dev-texlive/texlive-games/Manifest b/dev-texlive/texlive-games/Manifest
index 301e992d0d64..2dfe44b23ee5 100644
--- a/dev-texlive/texlive-games/Manifest
+++ b/dev-texlive/texlive-games/Manifest
@@ -228,5 +228,5 @@ DIST texlive-module-xskak.source-2016.tar.xz 14252 BLAKE2B fe640843de6ee3a74bde1
 DIST texlive-module-xskak.source-2017.tar.xz 14244 BLAKE2B ef03e62fd8031626ba3678f8812b13eaa416252ac287233bd696679d31abd661b5a2ed88b8b4624fac0ba9b7ccabee9cb9e32c38dd7c7bd1f1e4f2787cb04169 SHA512 91f482e0ac3d798507583729fde18a1a014c6f5e71507fb10f4c893613661488953529f78496bac476a6dab9d3d896d0b6eb902eb166b77b78c90148afad0375
 EBUILD texlive-games-2015.ebuild 1641 BLAKE2B c6df36330b7f4c8197a61399b75a2e44c55b69f63863ef4ee9f77ecf3713d002b25a18cff01ac2f41bb40bae0c581828ffc184575605e0a24baf073dde9fa7e2 SHA512 a2f2c66788974f68e16d0e6886a491628811c5e27598ec3ca1c7859079fe93190ec883f47fac696b4e228a7753b0e4480b76aff5ae0c1c011b4904a69e746b99
 EBUILD texlive-games-2016.ebuild 1679 BLAKE2B de35db32c8b09cfa753c54a8486487dcd3a58a5b738033ff96e4fe062c6762978ab06d0d90b4d4a2761da3f4fd248e1b3cb6c9428de503602aa0a57190b3481a SHA512 40edce778f8ac4e22b05258667c42be1fd6422b99f4334b1e3beefbf62dd5bf0d8f683f44a0dabbb5f4a3d0c67d0010a0c3af5558f0c76d8b0a5a3cbd451d1d5
-EBUILD texlive-games-2017.ebuild 1692 BLAKE2B d9034e7c7091c75820475dc9303e9b95fd5e12ca2b5160faa09fb0957294ebf5e1e4ad3ab48149853d68bbebd375eb2016541f8951d251fcc4dcce70f06409e4 SHA512 5b62cf785da06a7ff7172708d46930e882595bbc27e4cec3b38d4e8885e3f2a830897b23303ad30e2f7cc40db25bf0d6b349ed4cc4835c287080723d858f2828
+EBUILD texlive-games-2017.ebuild 1691 BLAKE2B f4cb2edf028c54150566bf478c0adb23620fe283e8e4e64859b2c7dcdc189ba6f60f0f76941a1ed6c278b51fbf7a8931f17de64d5fc8a9c278c0369c6d3b28d1 SHA512 6f51de7f35de90331fef73e868a1baee45df20636aec24f38b742fc93d056817f9f7dbbe4be8a0616d3d787b76d1e19dacc7be3e0910d02bb910c889c713a692
 MISC metadata.xml 465 BLAKE2B 3de0cdbc6aa2d82d9014a125adea187b4c28e22ce8da0eae7b50d4a7507beb618869f282d8a5a7258edacb43e26038f9704da1d61a86ccf86baabfeccc3f3d99 SHA512 026164fc27101f4b41d1a2b5a979762d3f75f1b0f13d74b7d3aa617ebe24d92708c3f68c7d4d12887c821b3f799cc0528f38f0a20507f5ceb1e427f300d094c2
diff --git a/dev-texlive/texlive-games/texlive-games-2017.ebuild b/dev-texlive/texlive-games/texlive-games-2017.ebuild
index b104339c1da2..45e54cc5a61a 100644
--- a/dev-texlive/texlive-games/texlive-games-2017.ebuild
+++ b/dev-texlive/texlive-games/texlive-games-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Games typesetting"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2017
 !<dev-texlive/texlive-latexextra-2009
diff --git a/dev-texlive/texlive-humanities/Manifest b/dev-texlive/texlive-humanities/Manifest
index e3f24adbffcb..7f32390a9505 100644
--- a/dev-texlive/texlive-humanities/Manifest
+++ b/dev-texlive/texlive-humanities/Manifest
@@ -375,5 +375,5 @@ DIST texlive-module-xyling.doc-2016.tar.xz 148336 BLAKE2B c5713dfb4cfcbb53358573
 DIST texlive-module-xyling.doc-2017.tar.xz 148336 BLAKE2B c5713dfb4cfcbb533585738d9f84ebf906f3b86b207cf846261ad89e279ededaf9ecd418a8f2af882ad26a1af11a5a9264f4b497a4c2096262e78e0c666ffa51 SHA512 66da3f3cd34f67c078102731dbbe218fb000e96727a244c70cab046836e85af89fbb3987ec2696bac85885ed277a6e33ac955214924265be639ff228382a8ee9
 EBUILD texlive-humanities-2015.ebuild 1984 BLAKE2B 678d593214418f3e09d8edcc52525594de0d621ac11369535f724bb380213456fe9cc76a4d925fcb92893943c5d81e0da2a117949b3d4085498d202f1c4eaeaf SHA512 90194819949102591cb8f378da050701ed766865e1cb167fa724d38822b07c45141d20bbc4fc90ef8a5fc6683229c30397c6ddcae1ccb691ca10f24ae9a412bd
 EBUILD texlive-humanities-2016.ebuild 2168 BLAKE2B 1b08839cccc0590ee88549bf1fc5ff14450a86996ee6483e85227e62bac219880bf0b9067f65365112873adbad1be55043d0bdd47fd039a5794c3dcb3771c850 SHA512 33cfe4d2f7ea9d94a198a69b2cf23b77d90da98b03309f1727d86dd25be315c90062235529b2fabae3e48dcdd142a6817d23effd050c2a00af3b0924f4b33ce0
-EBUILD texlive-humanities-2017.ebuild 2181 BLAKE2B f70848db1dcf757e3b055e3491655a69e485c1985ce324a472d9fd7de29ff25fc483c3b55f84dabd3bce442da4a24243f81fa6357c56018fae27ac42962bee3d SHA512 a5e5cc0e53b9172237561f62a4326befd982f1bca6b05ed01437e7ccfe783448eab7e2f04931af72e4f9e8d6910aea35389bfebcd842bad937e1c3a205362aea
+EBUILD texlive-humanities-2017.ebuild 2180 BLAKE2B 952b3bf700d30b3970b2c1b7472f028dd40d5ea55efdf57795c0b946816379df22a3bf2a02b76f6baeacdb8cec93517255daa3fd1bf5dc4194144b17a45f9c76 SHA512 8af62ace9f190caa52bdb883beb263d6c1420a7e8671f7bf1c257a16c1b4471e1586acf8b0899a913cfb679d3e3327a6fbdd3bba24e94f4ec51c0a1d62fb2931
 MISC metadata.xml 475 BLAKE2B 2142cba5684575516bfc39a7ce98a7f5a496cb309e7d21d6f90f13d5d9999291e29cc3d85f4b4242acacedcee02f0d224e27d6ace55e69c7a0e0fae38360b278 SHA512 32785127247aaffa27bc13a63d6d39b50084b437895ae3eab812e9a047efbda0e59ff3bb8281654148f6c3d4fccbd2223c984b92b7a38825efdb19083296567c
diff --git a/dev-texlive/texlive-humanities/texlive-humanities-2017.ebuild b/dev-texlive/texlive-humanities/texlive-humanities-2017.ebuild
index 7839e5c38534..13e50dc6fe1e 100644
--- a/dev-texlive/texlive-humanities/texlive-humanities-2017.ebuild
+++ b/dev-texlive/texlive-humanities/texlive-humanities-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Humanities packages"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2017
 !dev-tex/lineno
diff --git a/dev-texlive/texlive-langarabic/Manifest b/dev-texlive/texlive-langarabic/Manifest
index 86e96d05ca12..37cb618120f3 100644
--- a/dev-texlive/texlive-langarabic/Manifest
+++ b/dev-texlive/texlive-langarabic/Manifest
@@ -102,5 +102,5 @@ DIST texlive-module-xepersian.source-2016.tar.xz 71732 BLAKE2B ae89d5f706af05451
 DIST texlive-module-xepersian.source-2017.tar.xz 70908 BLAKE2B f2e1a6422ff0faa994c0b38a391786cac7b4c416dfd66c3586a15e61de62cc84f3165f93871a1cc4c61485b2870d1d76fd9058c344b168e079ab121ea19a274a SHA512 be7fb30ad51937d2c500ddc48bff37bd8b8d109b08c7118f913e6ed145d8c7a1fd327b0f1af98b039f0587c455d1d70bc9d27f3527ae8b2709e87fab3008e3f3
 EBUILD texlive-langarabic-2015.ebuild 1061 BLAKE2B 7420181b852bc970b4f0b1da994063bd3680b34b70568114227a71e7911f094487517947b546f0618597839f2639c1b00e8b9659934defdcea030ce02a2baafc SHA512 3866788553d62879b1c639ea0ec2ec2692bb208dbaade1b64e184501f1ac1b2c545ea334e40e5533c29609a3a866201efc9d1db119e7b88bbc989ed3563ee7d8
 EBUILD texlive-langarabic-2016.ebuild 1204 BLAKE2B 5c7bd475b696ef312b9dc3dc35acdc5bd07efc4191de4c90d42c0a55f24ba36573d99bb94ce03b5e5519f8b98ded1505dada515b2519ab2802c5d49c0ce08cf4 SHA512 827155b4be0245106d23b678404d6a179905fd90b3c95aa1af3752e8018c20e03709d4ae500906d949915d678523c21a7140e1c588f640919d8547c0815ea02d
-EBUILD texlive-langarabic-2017.ebuild 1234 BLAKE2B e02f4355503471a157c8de35a44f74479efe8415bb169ee9d63aacb2b30c1900fdc90da1a72f2368b330292b7e2816654c81e3c3b664579bb8b1f6c83670d6c4 SHA512 9e190711070a2eb43d168e2b122694d0b76a17252b501393dd38db1dfc444057070855ced093bdc0d2c5c98a78b721b5620e1dcb9adf26ab7c35be33344d9f9e
+EBUILD texlive-langarabic-2017.ebuild 1233 BLAKE2B cba285698463ad781441eba5ba63ff875af09fbc1d6ebce44afebb118043108aeed4787ff08f162463230201b17b40eec81950de2eea778717aad22814579cec SHA512 a8da008306167e1ab6cd02ec597309be850a0e70479b7d48d26cb3058e285682ed3c0c4f25690ffe8f067ff8e5bdbd6b87808ea38a18ab9ad841a6fba8316a91
 MISC metadata.xml 442 BLAKE2B 736ea2f06e692dd1cb0b4438d8387f401012d78d427da16aa300d9e875fe9f531ab1cf7837d07e131f93a40868af960925fbc300de440b3b0c870d7f444edc19 SHA512 152893abd014e6d0faade3d41cc1664b3a875f0bfcfc5788e52ede435a7b6aaf7a1f7b717dbe52347c515740071353f160187961d5dc80e58773870d42115b9d
diff --git a/dev-texlive/texlive-langarabic/texlive-langarabic-2017.ebuild b/dev-texlive/texlive-langarabic/texlive-langarabic-2017.ebuild
index b7cb16b5a58e..3832c65066a7 100644
--- a/dev-texlive/texlive-langarabic/texlive-langarabic-2017.ebuild
+++ b/dev-texlive/texlive-langarabic/texlive-langarabic-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Arabic"
 
 LICENSE=" CC-BY-SA-4.0 GPL-2 GPL-3+ LPPL-1.3 LPPL-1.3c OFL public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-langarab
diff --git a/dev-texlive/texlive-langchinese/Manifest b/dev-texlive/texlive-langchinese/Manifest
index f223f5ed3ea8..cc384202ffd4 100644
--- a/dev-texlive/texlive-langchinese/Manifest
+++ b/dev-texlive/texlive-langchinese/Manifest
@@ -126,5 +126,5 @@ DIST texlive-module-zhspacing.doc-2016.tar.xz 169376 BLAKE2B 45808ff96133386df78
 DIST texlive-module-zhspacing.doc-2017.tar.xz 169380 BLAKE2B 2576e25d7f1d1fbe8d6c79267296473396bde0e88fa5072f0a0e47c6ad43da60170f44c9ae0c2ef4016abdaa915fcc52768051af0e97378a60f356b5f5218508 SHA512 0232956c6b105b02dcc036be0fb5bf761dd99119ed9a339db2c882bdff9ddc5ed17b351cdb0dd297c76760b298306db268794f73567873c62d7eb361a60e0fd7
 EBUILD texlive-langchinese-2015.ebuild 1330 BLAKE2B 041767732d0432a9f2e3e94812112cf4edc87e2636405bfbc4637dd462c556461ec01d336dc2e3049efef08c7c8b59326964b58c738b0f0958c1f9597c9d331e SHA512 ff6c43158d33da0115af1dcdbbec5fbb72a101e95ef61387d42e9ccc81368427d949a50c8e09e770a04dd2b45a62aee7e83a427e87fef7acc12ee70ed31d1a15
 EBUILD texlive-langchinese-2016.ebuild 1472 BLAKE2B 0b97940fae8153ca85373518010b8f173ad73b3df297604b4e5f1fef990453b055da6069092801beab766172d2b24e5057f7ba80c444feba819304879a7010ae SHA512 7bbd67fd50f2392f41cf9113fcb9ffcf7bc3f40a1d664ac92802ed63bb55a9b38e942d1620cebcceeb0307f8271612c595d50a90b9a9bda677f9bd37fa8673de
-EBUILD texlive-langchinese-2017.ebuild 1478 BLAKE2B 781f1dd4a69750435063110f486503e6316242bfcbc077af03da68cd1c2383b76720a6f50e9061abdcf5a684b5d4e846e37f55a751f070ab05e40c5abc7c4d46 SHA512 67fa96e28028fd9ad7ed6e60ab6e5f469c0a335b34b96343688d5d62878d63883211caa7aba0902fcff5a8299d0c894d39586fba887634033f5d497645333be7
+EBUILD texlive-langchinese-2017.ebuild 1477 BLAKE2B 81c11c690adffb2e9d6151e87d266b0550cafbf1d1862e44993cdbaa1c79e128c2522289cdef9e1fc46ff97e55494e97ed7b8b979ee64d996fe0c36ec44e3f13 SHA512 85911837ec2af8c0bf3996bb1f32c0f603f3bcb1a603d1b3566a0cf9ba38c47c3f6eee2ab6fc7cc51204cf8ad8cf67f933f4dc749911af4a04a4c594aac14344
 MISC metadata.xml 474 BLAKE2B 747a030b403eeaf6d99ce9fdf27b18216b5d4f22d07d93360e4055a25e7aa0927d4d2ee9df26afdf67838027cd2bf4033a9bbb2efa2a8cfce5c9894bfa6eadc4 SHA512 4916435018bf6a3a3a4ed6e2b140c6970bcdb9a97dd0fc55e1572436a1d58ce0063c0d48de606fb266fccd470882d7643ead61a37e4cce6cf5d326ea39526aae
diff --git a/dev-texlive/texlive-langchinese/texlive-langchinese-2017.ebuild b/dev-texlive/texlive-langchinese/texlive-langchinese-2017.ebuild
index 339a3015e65b..8ccd957461b6 100644
--- a/dev-texlive/texlive-langchinese/texlive-langchinese-2017.ebuild
+++ b/dev-texlive/texlive-langchinese/texlive-langchinese-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Chinese"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-langcjk-2017
 !<dev-texlive/texlive-langcjk-2014
diff --git a/dev-texlive/texlive-langcjk/Manifest b/dev-texlive/texlive-langcjk/Manifest
index 105cc51f303c..7d14d65c8f6b 100644
--- a/dev-texlive/texlive-langcjk/Manifest
+++ b/dev-texlive/texlive-langcjk/Manifest
@@ -62,5 +62,5 @@ DIST texlive-module-zxjafont.doc-2016.tar.xz 135392 BLAKE2B 45ed0bc4943682318cc4
 DIST texlive-module-zxjafont.doc-2017.tar.xz 135392 BLAKE2B 45ed0bc4943682318cc489f1c9a08097f9b5c7c8cf53320eba6a379b5238b2f0319becb98f1482c98b59b5103595703b25a06f32671edb02f8283518d0864dbe SHA512 27cd14f91f64ebfb2e4076895bf04a31f5d0b21acf4a9fee8e3c816c847bb45e894e0dc5ed5cb06c8fe425e75352d975b800511afe38af6f952b37ed1b0c30a8
 EBUILD texlive-langcjk-2015.ebuild 1169 BLAKE2B 9d4411e779b0806846f0a7118ed6d063bb8c8f934c3450b185058ccdf006439e27a98a4c12afe96126e4e3f7d17acea1dacf0d37668bf5068c6d510f157da246 SHA512 02e83ce9e4d97d3888de92d08167765b6df8eab5fed0aa71cdbee7c7ab612699acf2e84526422e67beaecbfc325148dbb3463b424f25539927e0744b12eb800c
 EBUILD texlive-langcjk-2016.ebuild 1210 BLAKE2B 857fd3f3becf0f3c0235b0fd8a962048ada09f95da91b95e42527bace6ef97eafb5035ef37725d64e6bbbb0a68e562263b87f30a02637d2331fbee0cb986bb06 SHA512 ef2415142050f91c49d4bedc445ff7aba975aeaac0ee4963bb3b71bc8a978613953c42f27a5290c138e44ccea81c365a7abd18834a165c21a675b671af5b6353
-EBUILD texlive-langcjk-2017.ebuild 1259 BLAKE2B a51ba20d440239db386f5b5ff4404281e80a79053122441f9a394123eec6858fcc2a82321931a586c025da1d5bb4fa24879fa3299cf6e5569280db690cb52bd7 SHA512 f11448f6cfc33e33d466eb8e294ecba605fe61a17d1c91b089f3636340ee67ff1e8c086ae5078fbaebb342be180b32c8bee68ff0f99fa2312351bce475af6e0e
+EBUILD texlive-langcjk-2017.ebuild 1258 BLAKE2B 89e8af306c1e6440789c107e091d487d2894d6e2eba77e1469b79c3b5cc8932aed312366865dac6bbf69a82f1c3cfc4576061eb37cf5290241e5f1d0752abb75 SHA512 d0e8e8e4eac939bf7f2a6e111c4685108d5a57f491bb8f372a20013404857f3987a63c9141dd90ff41b2971359846fdc726ba228d4a64a4175cdaf4fe7bae0dd
 MISC metadata.xml 723 BLAKE2B 9cb444063df06e44b6058fd7a4696a54ce0da42446175bad1b1ae17874efc1481f68d667358c5b649905b7a8ec8bdb2b631711e39c110d002bc56bd1ffbcb888 SHA512 d8503e8724dc8600e133fe921e1f2ee8d62a30dd7af0cb50657ece7d50a2cf07178f84252014535c6a7d4cb4664f7492396a924060781599540a8e88f80d9de1
diff --git a/dev-texlive/texlive-langcjk/texlive-langcjk-2017.ebuild b/dev-texlive/texlive-langcjk/texlive-langcjk-2017.ebuild
index 9de0d380c569..59d9e21a65f8 100644
--- a/dev-texlive/texlive-langcjk/texlive-langcjk-2017.ebuild
+++ b/dev-texlive/texlive-langcjk/texlive-langcjk-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Chinese/Japanese/Korean (base)"
 
 LICENSE=" BSD GPL-2 GPL-3 LPPL-1.3 MIT TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 >=app-text/texlive-core-2010[cjk]
diff --git a/dev-texlive/texlive-langcyrillic/Manifest b/dev-texlive/texlive-langcyrillic/Manifest
index 9e7d8f18a621..ab598c29c595 100644
--- a/dev-texlive/texlive-langcyrillic/Manifest
+++ b/dev-texlive/texlive-langcyrillic/Manifest
@@ -270,5 +270,5 @@ DIST texlive-module-ukrhyph.doc-2016.tar.xz 160948 BLAKE2B 7844b1c9d0efcaedbd77f
 DIST texlive-module-ukrhyph.doc-2017.tar.xz 160948 BLAKE2B 7cb5ecffd21eb994dec06bd9666138913a429895d5acb5a643e1e388c0b94eeafcc57868816acd8432fd198e92e54b23455336424207f799c8f5934f4e749207 SHA512 6e426ed9bdfd97145613330d613d7c43c15c40e2c7524938f569004e2ba67adc8622a5ae3b58f51e868d74b83618651d107e7f5e52f4077c21e66e0468497a8c
 EBUILD texlive-langcyrillic-2015.ebuild 2281 BLAKE2B e3b4467b62f304f6a62c782576aee7311d8fd223d62bf447b4d4d7e79392b84ba20dae72463760894fc8e5d7d92bce334e5788014c412efab1342ca155408cd0 SHA512 dfaf50fbf9cb0a2e68f7b5520a188ffed47bb2e645fa12995b1e5b8022975488facd2fe00e8d188b2b5d30e897176fea20de7d66ad19eb6fd2d1cee1d755e5c9
 EBUILD texlive-langcyrillic-2016.ebuild 2479 BLAKE2B 8b51434a007652fcacb0bf389dc65beddf872a33804a931f6e527db8eda61302f43fbcfcec99c0906bc104a59a6e7f18c402c54731f5f7f1e7bbb216a3b29749 SHA512 03307bef68df6061ff2d815d3683e5dbdfe148d91a045a24c46c0351a0cca97843681242bb5239e0480b093fbcf0ef7488a2a1b74d4c8611db505674a9ae72e9
-EBUILD texlive-langcyrillic-2017.ebuild 2503 BLAKE2B 9c7181a3f3c9b6c8a0999ca7d0faa2391af4e7bb684d65287e7c7222a12e56fad329b8b013d09e170aefa0c4512045aeb20d8904862bbd82d8f76a6e1365d44a SHA512 6c4f202fb8941f37605841f99461009a316b356834560ced34a536c99e94379423416ed37c06cdbfc1ab1fe3754e21e5ff3606267831f4635d8d1b7b7cfb31b1
+EBUILD texlive-langcyrillic-2017.ebuild 2502 BLAKE2B 5097ddade4c0a6c2f27d061d5ede795f40cef476f35616a5bdd8ed2f0e3cb1169fb14005ec0b4c4787c4208faac0b77d76f07a66a46ce2e018a8ee381a7ce04b SHA512 85257139228d08b720143bb2cf3d2af7148c4dcadb3da96f7a8ee9f06125bdd5e4784da5298898310acaf06d0fc833bfcd31a5a58d0bed79d1e93d4c24a80c70
 MISC metadata.xml 525 BLAKE2B c1d2a5c32b236c45931436789390fbb09eb05a21874a13c607ebeae2b722fcf4d317a5df44fe243aed230089354fe17ff7f8681e3b75fe03ec48ff0df6886113 SHA512 3ce96ce9895df4195578f5e0859a103fb64332cc6716bf5321751fdbfdf30ab19d32ca82aafd2d9942c2a410a17cf35a970f3ec15743a5b097b42706e4ef5fe3
diff --git a/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2017.ebuild b/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2017.ebuild
index 6cdac11e0b18..8930229e4029 100644
--- a/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2017.ebuild
+++ b/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Cyrillic"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 >=dev-texlive/texlive-latex-2017
diff --git a/dev-texlive/texlive-langczechslovak/Manifest b/dev-texlive/texlive-langczechslovak/Manifest
index 765df28c7204..368a388c8c0a 100644
--- a/dev-texlive/texlive-langczechslovak/Manifest
+++ b/dev-texlive/texlive-langczechslovak/Manifest
@@ -75,5 +75,5 @@ DIST texlive-module-texlive-cz.doc-2016.tar.xz 1029148 BLAKE2B c941abdc2dac11b68
 DIST texlive-module-texlive-cz.doc-2017.tar.xz 918152 BLAKE2B e258fec9292ed957e9603e7fe525427e894b6f1c5b9da47143a99e96c8c46f39eb3db1e16315e4e80834da5c611efeb97bd4e6ad3bb27b228cf80729256d2341 SHA512 914b96890fe0d136ebe7939e3659b9b93faa0f226ecef2a6bc06d058680a1ad48318ef09e6093eeb48073dfb32b65d141b80f36f631acaa9858d6ac72279e1bf
 EBUILD texlive-langczechslovak-2015-r1.ebuild 1026 BLAKE2B 68dbdd932989d2b1496ebdfc2611b1296c5a70e4c5cacd68832b998e0ed22032a312b68e86aff273cf9b14423707ad9bf33b3a7d256d8d8d98fa59f566a1f4ad SHA512 425b4f393c60bf59cd7610596f1693298ce274b8debd37a51b7d4523304819f63328698e3f2ad0475f5631cdca28a1d30d348731f7f6eac8b48838e4f2db9a44
 EBUILD texlive-langczechslovak-2016.ebuild 1111 BLAKE2B 9f4ef99e1e0cda3ad5701c27e48c03c03420bbd8e91848b4b90abf8fe15f4800bca7e79d55ef0f409ee5d782785a109a38414cd7f173ad5ea3478f777c7fadd2 SHA512 dfa07cf40853f59a8c85388ce0f66d34f730f34df0efc68a90260fa8db5965833305e165669565cc33415a8e5e67ef7b9997af35aa437be5d56333e2de4c9c96
-EBUILD texlive-langczechslovak-2017.ebuild 1117 BLAKE2B 4aefd21065e2dbe2d230aa14e398ba3cd80813e131d797d0bad87fb129e657cecb88e77c00362ff7a5fdfe23f855ed69d2c7273d0e98662afdee04c08ae51c69 SHA512 8bcd45480fe617f8b4e963c31b51b19a709d01323f774ea84f9659551818de799f1325822d87b8cda18d7c787c382040b1642d0a2417637f5bb8fa21414bffa0
+EBUILD texlive-langczechslovak-2017.ebuild 1116 BLAKE2B f6e419ece6d3522ea19bac1652292e6542c421cd2b76c58edcf63296fe350def49629d89d8dc437e7097614b7f5da72c9ced9ae3b9adaa65d7693ecfd14eebc0 SHA512 c50d8599a54a717f193d160e2a6d14262801edaaa7c947ee9a2eec03224d9d877da2f4f514c62df54fae6f54bf39a24bc87d9935db6ba5effef8c2392b5e0a6a
 MISC metadata.xml 436 BLAKE2B 3c6031ea7696419b6d259418d4093bb41cc1562bb07e35cba24485550c806a1ba2b741530ea2c7a1168d3844baa2a7fbb55be69a69911cda4fb0e955209e7983 SHA512 6db7969532a5e09e517223fe972926798a8221d2921d5d11d3f2fba86dd6283e62e782f8273151c7fa05f9eb3dbf43e8f53179e049a16f975052b22993f494b2
diff --git a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2017.ebuild b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2017.ebuild
index 4340ebc34a49..1423cef9d6ec 100644
--- a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2017.ebuild
+++ b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Czech/Slovak"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 >=dev-texlive/texlive-latex-2017
diff --git a/dev-texlive/texlive-langenglish/Manifest b/dev-texlive/texlive-langenglish/Manifest
index b43a97a19018..007cbedcef7f 100644
--- a/dev-texlive/texlive-langenglish/Manifest
+++ b/dev-texlive/texlive-langenglish/Manifest
@@ -358,5 +358,5 @@ DIST texlive-module-xetexref.doc-2016.tar.xz 174672 BLAKE2B b014ac92ef2ce4994c58
 DIST texlive-module-xetexref.doc-2017.tar.xz 174648 BLAKE2B bf126a0056264985fa1e3b54d94e577c81c7e278b578fc45e13dda76eefcee37bfeb4a773c73b7022ea43ff62eb8d3d985b66bfa613188055b6bd08a1f33a29b SHA512 f5db9bde0d0370f56164c5054f1dadc983f84a26f16d3d35d76b738e542db3a63a737a529c250cb282f6389284a9ab10c564b25ccbf09f64fe96559e0752351e
 EBUILD texlive-langenglish-2015.ebuild 2470 BLAKE2B b3de439067bc9662dbddc9f44fc834e716b5da5ab857bb1531877962b72fdc8d95af479b4311f1ef69e9660c616a9703b4fb258e1db8f5a331840260294fe030 SHA512 ef60a5aff5246aa8132c3d80a33496d3dea69a69d1e725b7fca2a8dbb2dbccde23609856abe16c1986f9a1a23e4ceebe9f9b19a984a42b3020727cefdf383887
 EBUILD texlive-langenglish-2016.ebuild 2542 BLAKE2B 2e4b55602cb7fe4f3b9db9ee50647046f792d51547987d6d95cb4c76d93cdc8098c27397e7856bb8d770add63804f806f164195f4d6394f7e3a5b37e06b8fd46 SHA512 b0947fff8c0aaf724850516524a4445af1c539137278419048f4a438716f7b6898f41db66019709489b28d15309d0ff5bc4f4e27f352c0dfda02afb94bb7bbbe
-EBUILD texlive-langenglish-2017.ebuild 2620 BLAKE2B b6a449061c4f1c6dae661965c19a501cd006746373a0bd6e15df9dc2cafddfc4d7d56da6e5fc6d54c44909061eb1c107a08e6bcf5242f285e94b489d2036344c SHA512 f2abdff3a97035e13bdb882d0f9466ed11211d3a72a55f81d47054de7adfdbb42134d8c82b478b0abd648364816cf562544713977f196d7ad8c44aea02e0d633
+EBUILD texlive-langenglish-2017.ebuild 2619 BLAKE2B c440c65b31c1683f7af9c2dbfe8664603444cf8ed08675b6884d95f53a2d9edee0abf82de63b9afa808015454ddf13fb3e3e2a377685a1e53aed814183deacbf SHA512 8d6f538f3e27d9f677983a25f33ce087bc48439240e38a61a3bb19ab63405dc462dadfae70980298b60e5a26bda6e40c106f8970b1bee6f0b9633fe4f6da831a
 MISC metadata.xml 454 BLAKE2B c93dc6411985a25b9a32ad10276380a60dbb427b3b5da91bf09800425ffb32caf65a2fe1e512755d69001c4ba6143fb1df7ebbb259045bdf4cc689a494e67f70 SHA512 31c04097cb5cf947fcb4332ef246526cbe9c0ba0086d12e8ebcd1b7c3e298b063ce8e13d88b29ad7b397ef8338ed38c3f05cfbd1ad3c99fac79c59eeb8b28b5b
diff --git a/dev-texlive/texlive-langenglish/texlive-langenglish-2017.ebuild b/dev-texlive/texlive-langenglish/texlive-langenglish-2017.ebuild
index 0bd55d1e24c0..3fd97341d9d0 100644
--- a/dev-texlive/texlive-langenglish/texlive-langenglish-2017.ebuild
+++ b/dev-texlive/texlive-langenglish/texlive-langenglish-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive US and UK English"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-documentation-english
diff --git a/dev-texlive/texlive-langeuropean/Manifest b/dev-texlive/texlive-langeuropean/Manifest
index 9d46aba145e5..8407d5cc037e 100644
--- a/dev-texlive/texlive-langeuropean/Manifest
+++ b/dev-texlive/texlive-langeuropean/Manifest
@@ -622,5 +622,5 @@ EBUILD texlive-langeuropean-2013.ebuild 2840 BLAKE2B 48f3e173ba64c39818c0d4085d1
 EBUILD texlive-langeuropean-2014.ebuild 2909 BLAKE2B d9f5bbc02ec05adafdeda554edf184b9aa870a2844ab0ed2a7fba65dc92025c5b35611b7637fabaf5589a384a5314aee7e124934f80b42cc10ca4777ca3f9dd1 SHA512 1165a468fc864784fdbe11f7e89e25eb2fcd57d2e754af2a865130bbe814b6c327ad920c0a8d878e4179946562861a18a74f3f24121167860c9a562f04fb64eb
 EBUILD texlive-langeuropean-2015.ebuild 3058 BLAKE2B d98a6872ee8dc59ea66645a56c4e318ed457eb8aff33e52644d9c7f5d8e090900abb7094126ce97fc26c28b91f395a1e9ec8c2fa79012c468fa8eb0e9878e89a SHA512 a59af9f2e82083e2a3929955a1863edacf957164aa30ee955a0a525a98d4b26034c82f377a23aa47a6b02f9c437ff3f143f70511b916698b9d8130943edac140
 EBUILD texlive-langeuropean-2016.ebuild 3409 BLAKE2B a78de8adf4e4255c2f882b45cef5e34aa1b3c1d2942a59738772ef205bfcdaa9add592c4a8cf31bcaf6a2021226650840def54dfc1e800e67781a3a384e9d63d SHA512 ceecf93b9bb7b35fc43f84f1941d3e5a9466df8e43f58c2752c0efe7feddded1044a6f4e6a66bf209fc8e94d6f8e8f3372ede7ebbfdf26d7d37f43bcc5a96cd4
-EBUILD texlive-langeuropean-2017.ebuild 3391 BLAKE2B 97a40a2234eaaeb1b75ee98dab12120ea344544b53dc30c56442ff7f295fc614fe31bb7a3b1ea33c0efb93e3c3e3d49264ccc99ab3ccd863e5b313d685a3198f SHA512 2d6beebf5f09333d0efb90f723629fdc7d2a84025d63e89d5052bd45a4557ff7ef8e7eeadb6ed66f56d60bdd8a0d87a04e98c2c5709ebdbc300ea6dcbc8a01dc
+EBUILD texlive-langeuropean-2017.ebuild 3390 BLAKE2B 35576abb1724aeafc4cc8a8085c2c8a18187dcc51d1095e062cb309937a1e6f02c9bbfd197df566dee2ea1d6e6ad2273b1ce9e0c609c861084f90a731a688ffd SHA512 b4da00319bb8a49de04adfff3510f4dd760c0dc0d0c21f04da699a3394db47677435bc64ddf82b7b161d8239f83540cc99ae121a9e610cb70362256f69b12d16
 MISC metadata.xml 567 BLAKE2B 1529aa51facc0942b5c0c6e8463aef9b45946bac106e2e5a73357ccb738d724eb0bbdabb382d2d86e27b581f7f573f4544e8e4193efb763039a6109a326aeb00 SHA512 34c78d457f3560fbf5693c5e601a908605082a182c0933b0c00aff363f966e0251b06e5e4751741e0ab9359f3dc92b5ec2bf8fbe72fc0a09ae7a0eadeb100727
diff --git a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2017.ebuild b/dev-texlive/texlive-langeuropean/texlive-langeuropean-2017.ebuild
index c7e3d554f509..99a26d2a7f5d 100644
--- a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2017.ebuild
+++ b/dev-texlive/texlive-langeuropean/texlive-langeuropean-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Other European languages"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-langarmenian
diff --git a/dev-texlive/texlive-langfrench/Manifest b/dev-texlive/texlive-langfrench/Manifest
index c87adf370ea5..990566baf1a1 100644
--- a/dev-texlive/texlive-langfrench/Manifest
+++ b/dev-texlive/texlive-langfrench/Manifest
@@ -214,5 +214,5 @@ DIST texlive-module-visualtikz.doc-2016.tar.xz 5653552 BLAKE2B 3d7ff5529a25b0a45
 DIST texlive-module-visualtikz.doc-2017.tar.xz 3723460 BLAKE2B 4cbc3efaf7e628128b1ca6e9a67888e2bc654d32e460c7493b5f75ff9cbe9309dbfe2e03292bcd942643119c9b1fd6f7f7b66b4e223e8b16396a9431f7b1b7d6 SHA512 22729727d95cbceed8baa9d850bc218005d6b5ebabf5add3cf604fcd501f2b07529ef8203c69544e37952f5147f9b4926ba148527c76669a7fcf408c1d94ba62
 EBUILD texlive-langfrench-2015.ebuild 1640 BLAKE2B bb63c7bf5a41ab3bc68d95c5468ac6dc600a4502dd76e9b8a8a914e8532796db8365d8c79f59bc41ef0b01a2bfde5162854e492fe222e37c82dcfe574f92cba4 SHA512 1a57a22528fae6beb713aba8ff09f78a9cc964dc54e29ecb19683d25036b38ac0c671ad17255dc2f44cb8cc8f03172988d0f1bab6cfcaf5b9e72bd74e3c13b67
 EBUILD texlive-langfrench-2016.ebuild 1859 BLAKE2B fe0893111b6c9d090872431116d9dc903633030bd6f86eb9f260938bdc357ba16185785b2eaea06a84750ac15409f18fcb3c551142fea7bd881a1153dfc86dcf SHA512 2f72551f33dcf53097727824d84fb42cddc672e3274750fd75cace1782eecaf02a4824fcb3590d3d7632261bb3dcc5f6f48e4e4e6d8218c7e9189e80a4009432
-EBUILD texlive-langfrench-2017.ebuild 1873 BLAKE2B b52acfaab1a343312c02f649b395dab4855f8324a34a55f3a80408da15b7908760b3d8d25e21783011fe7305cbbf1e2b736575c1ab51d34b66d3d17d100b1e4d SHA512 00389b66a6f03ea191eb3f816925bafdd3a4c425867a7333b364aa221c8d7d2cbeb6cba21953ac974df2d2ca95825d94c2d67d0be30141c625db7743d8fb17a7
+EBUILD texlive-langfrench-2017.ebuild 1872 BLAKE2B 6eb20f3f7aec996d96990d1483ffb548735d5a6d591194df53323b169f521b12e17bb47d516cfb9260411ae4618141593269db9963c2341bd416665e942fbe8a SHA512 5e61f0ae6c241de83bbb5c263eabab27cbcfa0e518217610c014f302c0c4322f506be78cfa3d5a235fac81cd8cdf4b75f124828b1b87cbc504934c6c79d3530b
 MISC metadata.xml 441 BLAKE2B 6a36c72a1efc71db9ff852bf890e5303b85c080aba256e055f8dcd97000025ea3351d5293f186fee14497706a8644d67ef7b5fdf783b4c9764f88266fc776c74 SHA512 613ea7ab10d9808c61e8a0b62bf7a1a59c10ac796afb1c8067e8e0ca681530650348af075bc0d02e38f2af4c9131c43343c0c6d9431d8d91d756098f84a5aea2
diff --git a/dev-texlive/texlive-langfrench/texlive-langfrench-2017.ebuild b/dev-texlive/texlive-langfrench/texlive-langfrench-2017.ebuild
index 0a52deeeeeb2..ddcc1b50a4e3 100644
--- a/dev-texlive/texlive-langfrench/texlive-langfrench-2017.ebuild
+++ b/dev-texlive/texlive-langfrench/texlive-langfrench-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive French"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-documentation-french
diff --git a/dev-texlive/texlive-langgerman/Manifest b/dev-texlive/texlive-langgerman/Manifest
index 5087b9f1c673..1877e61daaaf 100644
--- a/dev-texlive/texlive-langgerman/Manifest
+++ b/dev-texlive/texlive-langgerman/Manifest
@@ -301,5 +301,5 @@ DIST texlive-module-voss-mathcol.doc-2016.tar.xz 230652 BLAKE2B 241c60d9b5384986
 DIST texlive-module-voss-mathcol.doc-2017.tar.xz 230640 BLAKE2B 8e71203fa3dc3958fffa93fe9bb2c36d2e2a520dfedf7a62b18d646e6879f8ae6eaa5374f04321de6561599e5c4b9d8bbf583926d89f7f5823ec53a93a9c867f SHA512 f2add19457add6311f59b8a8ecde14e53d0aabfa26698aa109cef1a3c63eb83eeeac32c16818d2ec3483373b9e42bc873a93cd899626b46a363772ff07466894
 EBUILD texlive-langgerman-2015.ebuild 2234 BLAKE2B 60d764b026e67183cdf963aa8286836a18ba4e67626e722d9272425be976f8540257a7a12f12c525a9b8054f96448cc65feddbc8a545c180cb11a938ac48e0fa SHA512 9de673f7ea085be19ea58b8521784d2e865d939b0830d5fd15af5815ec286663ad730d3de2151335affb462e9d566c5cd09adb4bf35eebcf1f572af9f71f2eb2
 EBUILD texlive-langgerman-2016.ebuild 2378 BLAKE2B 3110ae2ed3d58c25f1acf6812b16fc2ab6210c2aab161c7c08b2100000ec5ad04cad688ddd7e8bfc9399c2f53311abac8b218d593046d75b5799f9d822787535 SHA512 f8bf4fdcfada8dfc960c2ef7f3107e485523682e13b5d46a717c05d4f51616c710141aaa052b5c121eec5ebc2eb8222d5f609aaf89941c73e51c81ec7be76013
-EBUILD texlive-langgerman-2017.ebuild 2388 BLAKE2B b93a31eeda4d005738e6e8036f1e228c3b448445e6aa6bf4c6874f61b7d9e306b3df435627d92390baa160bb1213fdd9b30208c14031bfc2efe87d15a9a313b3 SHA512 fad6283ce844406cb36ed4513984e4347245eecbd05da42c17cc5b598973653f636a2a48f4a39718eefd64e4d5faa9890cd916f3e4bb52c3517de0979be4babc
+EBUILD texlive-langgerman-2017.ebuild 2387 BLAKE2B fb737327c983e7c8f1efdf6135629527a0d95e5b5d973a4d67dab5fd4f42274391831ef3d51b7dac489f8270eb998c4bc48d75bf210f9068bd39ffa1ba3959ee SHA512 c9653f411210a4239e5a70a0f3e53ebe4e2ff0af40771b25395b630b1395e70340e8c612cd873c6d3bfa4f403735a8e1b4a7e01784e8730e86fb8216ffeb4f79
 MISC metadata.xml 430 BLAKE2B 41e8c9acd74fe643e9c5dbeac94931be157c58d415956f514e80e9b4756ea3652fb7852058966e0754b48516f6554304eee95f2561aeb4d94ece0b77dbc459b9 SHA512 94807ed6a052b681bb2c080ff42a333ed33229f5b14047d8c669eb34351158cdf40448ae8d57eae7ed25aa74fbeaed05fe0d393944072cd21d4ac9986344530d
diff --git a/dev-texlive/texlive-langgerman/texlive-langgerman-2017.ebuild b/dev-texlive/texlive-langgerman/texlive-langgerman-2017.ebuild
index 3ce571ef976d..77568a74a146 100644
--- a/dev-texlive/texlive-langgerman/texlive-langgerman-2017.ebuild
+++ b/dev-texlive/texlive-langgerman/texlive-langgerman-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive German"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LPPL-1.3 MIT OPL TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !<dev-texlive/texlive-latexextra-2009
diff --git a/dev-texlive/texlive-langgreek/Manifest b/dev-texlive/texlive-langgreek/Manifest
index 4423807db30a..3e5637e40ab9 100644
--- a/dev-texlive/texlive-langgreek/Manifest
+++ b/dev-texlive/texlive-langgreek/Manifest
@@ -163,5 +163,5 @@ DIST texlive-module-yannisgr.doc-2016.tar.xz 28912 BLAKE2B 70c3fa5093ebb4ca06dbc
 DIST texlive-module-yannisgr.doc-2017.tar.xz 28908 BLAKE2B 162c85ea48dd27040d7f964d34c23d9e81210a27bcb6294d49d1a093f4c077dea08d9cbdb5ef65447e190887a184ff6665ab9e71ed36805c023273300a7375ac SHA512 174fdf12c5fa80bde25b5d519115a275d1fa41990b4167549cd7b5c1417af86cb5b342ea29d6dbf912d7b3ef50d008ed646094e41a1c0c68208e897279c5fb3b
 EBUILD texlive-langgreek-2015.ebuild 1345 BLAKE2B 5edae562bcfe19b95ad2c371e3d113a5796a1c9991fb6ef0f32fdf4953a3d11746964f7a684df45426a6e03910d544a86fe63a22b24e8f00beef7e11da9afed5 SHA512 950d2c080f22645444d7e4265019d036d5ef6b5bfae22e82f4ccc1411e25e81e936cb635f882a3dff0e2166ceaff4f4f992ae2d9ea4adee67bce8d0ae5395f75
 EBUILD texlive-langgreek-2016.ebuild 1430 BLAKE2B b29f77dc8dee13041428cf812365b0255e419d495077e962a9b8e250ba12f0cf62635babeb138177fd34407b9d351a0c9e1eca8deff459b2b6ea17cf4d5aab3b SHA512 ef1f871250d34e9eac1382bf81257843e55c1fdc1dfd5342ff2489cb5efcb375b2bebce0ec50ad3b109b214c3a422528309e446e70fb0bb717beb440ac4f7983
-EBUILD texlive-langgreek-2017.ebuild 1436 BLAKE2B ec11b4664032d2914a81daefa24e571cb0fa8374359f39bb0d86fbfd65d8c9ad6a88c06dbc2199925e25bcc2efe3a9015921e54ec5dc4d54e576c1c9dbc134bf SHA512 5274fc21759412ffe8980583f9089bb05f41655cb4ab5491c1a7020da7578cb2a2dee7414087cf4a9aa07a7b19fc0d95050293ac5fe376342beeab01b20d3f7e
+EBUILD texlive-langgreek-2017.ebuild 1435 BLAKE2B 904d10431114ca377474b828ca6fbe1a8486c00dc35ab5f1b480edda373662610a12cfbf0b54748d65641b4d26ff9d74c3c1a7033cbeef135ac92fcff1bef385 SHA512 63e981c2d6e6364545662e9203449a62439911c649b0f07298953d02acc5ef11e626d1629e52b72d1f17d3c6d8552d58fb8d6ac8c1035c30ccab29aaa5ed6bb9
 MISC metadata.xml 429 BLAKE2B 01e67263a2df3a5c42fc95f234933748d2e6fd741d2ef909646f39aae12a0bbf10611248f6c62ca71bf9a9bc71a30ec6ffc10fbb1b8e649a6aa732649a98900c SHA512 0bf25c8f6d55b298c60dee53a09d63e1d8b659b4b2585b35f8b3f0081a5e68073627f7ab4ea27b5cc135939845f0ad609373edb4265183ae4affec6cf0c700f3
diff --git a/dev-texlive/texlive-langgreek/texlive-langgreek-2017.ebuild b/dev-texlive/texlive-langgreek/texlive-langgreek-2017.ebuild
index e87a521d0d4d..19128d339385 100644
--- a/dev-texlive/texlive-langgreek/texlive-langgreek-2017.ebuild
+++ b/dev-texlive/texlive-langgreek/texlive-langgreek-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Greek"
 
 LICENSE=" GPL-1 GPL-2 LGPL-3 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !<dev-texlive/texlive-basic-2016
diff --git a/dev-texlive/texlive-langitalian/Manifest b/dev-texlive/texlive-langitalian/Manifest
index ac9789f1e930..76473c45fb82 100644
--- a/dev-texlive/texlive-langitalian/Manifest
+++ b/dev-texlive/texlive-langitalian/Manifest
@@ -114,5 +114,5 @@ DIST texlive-module-texlive-it.doc-2016.tar.xz 1026220 BLAKE2B 62008baebedecde0b
 DIST texlive-module-texlive-it.doc-2017.tar.xz 896808 BLAKE2B e9414135232cac146bb7dff72b6dce1e50c9789ea39f15908cd6927943577edd0f6c0136a9247a67ec52bad99c5e06017c92638bd38c140743b08e9bfd8e6148 SHA512 4f50a36da762c4ee000e93df770232d97726f7846c6d3dcdb9333849479371334f12c7acb454441f5985c44c0aeefcf1146136eae3ce69c4daf9c8e2af89fb9a
 EBUILD texlive-langitalian-2015.ebuild 1226 BLAKE2B 2377cec38bcb2fe414dcc007efa11f526d0180522cdbf5f383194d03b0ff0e098e50c534943b1203d79b134d4fb1fe39883fea0473e2fcc5c1d0917275d5e893 SHA512 1e265212d5f7ae230020279c83e452eb72106249ce512cbfb152b86e3c8f39ea868744824193fb7d6b561ca3d2cd8ae5eb5f4a1a5fe930c5e65f99468a5f2a5b
 EBUILD texlive-langitalian-2016.ebuild 1278 BLAKE2B 35292e791eddee046ba56b5c11312f9a2b67ab0d42feef2ad7d753e9663a68296b42895d69103124c9c4c18298311811a88a96967c8e9c58a3e5d9e88b2edec2 SHA512 44afe9a2fcd7edde0902c2c2e759e9817c1fb691a6807fed5d799214a176d64d9391a1b388b9e06853e0a158f0f2227c601a866a6fee241a42bc1fd08ca27c29
-EBUILD texlive-langitalian-2017.ebuild 1291 BLAKE2B 471bbf8e10c46610c00c6904859d3388c7c3494afc8279c3398dd619a3724b99e0db5516d16daef652e9b346dd85616dc64b8ff26ac4fa0627cb7564bcf1a5c9 SHA512 6b7779ace9eee9e91036ae6b3b8bfeaf005b97c9a40f16608b752361beb99f0a6c0b5483456d3c4e14c534058c06dd5e02fd2353967a3daac9121092e90be5ac
+EBUILD texlive-langitalian-2017.ebuild 1290 BLAKE2B 092c84dd01e596e9949ac5634e54633722169f7e1ff009e6f8a17f3b69c3585dabd737570f38df206beeefdc878858331155e86f6f764b92e3c569ed9383c111 SHA512 984957abce2136ebb5438a75d13f7cc50af907fb035e160196810fde390614469cd024a4e62b8e1fa8d66700e2b6ab1cf988b7924432cab1484a3b10adad73c7
 MISC metadata.xml 431 BLAKE2B 27fe61311c21a334ee4479de2505b23adc057f3b3307d19e4399b739a2c3a569ebba3918cfb1aa1ee19796615d1a0f52c474f2fa793ec8d7eb4c9cb64836326c SHA512 de7474642ce4d561760aa2302808ecf5d6d845f99fc6817543f60ba14f51e31ce809b08ee5b71f99e9efd43ef29b79827d73ba6888a8ed98e57551aff7664f92
diff --git a/dev-texlive/texlive-langitalian/texlive-langitalian-2017.ebuild b/dev-texlive/texlive-langitalian/texlive-langitalian-2017.ebuild
index affbb8f56016..bcbbb130f89d 100644
--- a/dev-texlive/texlive-langitalian/texlive-langitalian-2017.ebuild
+++ b/dev-texlive/texlive-langitalian/texlive-langitalian-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Italian"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-documentation-italian
diff --git a/dev-texlive/texlive-langjapanese/Manifest b/dev-texlive/texlive-langjapanese/Manifest
index a992c02b064b..5b62f567a187 100644
--- a/dev-texlive/texlive-langjapanese/Manifest
+++ b/dev-texlive/texlive-langjapanese/Manifest
@@ -223,5 +223,5 @@ DIST texlive-module-zxjatype.doc-2016.tar.xz 136636 BLAKE2B 099e45c8286afb60e6fd
 DIST texlive-module-zxjatype.doc-2017.tar.xz 136620 BLAKE2B 5db914ed47ae8bcf0630916db81962632124f24af585759440d97522820109ae72bb797700065740c24902ea9d3fb17efe2bc7fee29fe2d51115209488890de0 SHA512 215c9c6809b33dcb830a0aa477beb474f42d1eac162ef933a9ab36967a2c7d956e078aaf1944682c755d454ec74fae504cd2001435ad5f9eeffde92cb2d9bc9d
 EBUILD texlive-langjapanese-2015.ebuild 1639 BLAKE2B 1c4efe39d051b075f212b560a623ec663ebb0b01926fe546ffcd3e6e0c95180f7f305c0d2ba35dc8cabf83b653f728f67f8ab1cc564b24711715c606591dc0ef SHA512 dfda3d2131066bcb53690b809c562d10c85fde14d37d1bc86ed0b10388aa959d0b567f66abbcee8f06e22152c8b263e51c8701bc29403541b9f01d24a5d3ee77
 EBUILD texlive-langjapanese-2016.ebuild 2003 BLAKE2B f1672f7593df2ec5f071ea817534406df533d775b9a7cf0773e2219550bef45974743ec740b128004fed8bedd9233b75a9c7852ea0948b22c928f31714537817 SHA512 f0c78617091aa54247837538f1467b7f8ef72fdf25a9fd4258d0be842455738c3abbf373e2daa75f23e9f50ebe21a2ca5f58592a01a3a6fb6f2d89564dfae71f
-EBUILD texlive-langjapanese-2017.ebuild 2189 BLAKE2B 494e01cf691779a85a40742fd4fe323a37ccb19444bec1aa50add302182184fc23ba5a2d49ed57ed312e0e927954de007434b19c47b7c6566cb1a4df8cfb5ca2 SHA512 3ba1f8a6f4a3de861e42f379f0281b4e19e40c00d7f00aafbe7ab90928aed4152c591dd480278d46be4478578462f781a67ee82263e36846fd846ed66d3fce84
+EBUILD texlive-langjapanese-2017.ebuild 2188 BLAKE2B 318db0d207e0c3ae05cddd8d6be74de64005e6f6ca12c856e75eaae2c9dd48f8de5c0283f005f3de7778d5eaa794b07c5d46a9c8d6f50876a083f231de152d7e SHA512 9ca1721071dfccdf69b5af8bb17e4ca3c272bde6e889c57a0b919b9c724bcd11602e20c7d31dd378a106575b30f7dbda1e96c340788ac1a71d7a4c4ba049feae
 MISC metadata.xml 475 BLAKE2B ba6de588ea300f8ea1d0b7829c5281ee2b8db04e6a64984c3826950756cb7c3d78cbcb9ff7b751202c699c2c41601a30641410a21673a30f81524e8a0e7cd016 SHA512 3baa1973144345a57ce6b43971c69af9c529f1d62f8e128ff5b0558a98d52a6c07cb142ae27d5b76c0a579b2dd305c4b87a4136b974dda8bd5a6eed8b6c9ada7
diff --git a/dev-texlive/texlive-langjapanese/texlive-langjapanese-2017.ebuild b/dev-texlive/texlive-langjapanese/texlive-langjapanese-2017.ebuild
index 9cd9c85a74c3..c03b2df35ba0 100644
--- a/dev-texlive/texlive-langjapanese/texlive-langjapanese-2017.ebuild
+++ b/dev-texlive/texlive-langjapanese/texlive-langjapanese-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Japanese"
 
 LICENSE=" BSD BSD-2 GPL-1 GPL-2 GPL-3 LPPL-1.3 MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-langcjk-2017
 !<dev-texlive/texlive-langcjk-2014
diff --git a/dev-texlive/texlive-langkorean/Manifest b/dev-texlive/texlive-langkorean/Manifest
index 6eb5c88b5c47..8f3f4ea29048 100644
--- a/dev-texlive/texlive-langkorean/Manifest
+++ b/dev-texlive/texlive-langkorean/Manifest
@@ -63,5 +63,5 @@ DIST texlive-module-unfonts-extra.doc-2016.tar.xz 8064 BLAKE2B 7c3f53612c4ab16c0
 DIST texlive-module-unfonts-extra.doc-2017.tar.xz 8068 BLAKE2B 759d77ce36409524db5834237bdcdd85c525a9a01b440dff13e06be414910b847ede522c44b6da6d118c0f5e87bb2df053307aa8ba932e7ab5f9ec62b5a1e52f SHA512 1581e671688c88457227f54f9b35a37f4b3eb066528d4ee85c39d8330144a40d9cb5d0e967098be389bbbe1fee2d53f4437fa1c56d1735f53b49ce7699b2b845
 EBUILD texlive-langkorean-2015.ebuild 1008 BLAKE2B 0a8ef6c6c75d3db0436ba443e8d732ca6a602c4afdacb0d8b85c297e140475a39348b1492b2c0475bb57a9ac41317546a7c0c08a33490d2e3b55611423473b7a SHA512 a0e697d716ed50cc7d0436a1a8efc8b0a4c620e9b5370f88fbfcf1f5f8e1fa2345b5c8abe0a73cbc698228fe14da2a156325d51b588bc7b3e4c4186a6309a462
 EBUILD texlive-langkorean-2016.ebuild 1142 BLAKE2B 8a0ae6cca00845abc98fa59cd2a84759d2d7a266a85c49608136bd9da45899362c746d5092d925d13d94c838f9740a49ddc28ef94b1093f8fda24aa47cea9409 SHA512 c3c0a02cf3dd6b4787d5cbe4f79eb01d439987528a4e3e1c1dc8d6f469f576888ce94991e9e0438420f3fcb7cbbefc76bb2ec0e6c5fd37355c82be6934f15a6d
-EBUILD texlive-langkorean-2017.ebuild 1148 BLAKE2B 832700fa234bb4adcfbd7bb613f56f8c3169b3acdbc52a1121c267367fafdf0471386b63920f8ff504509dd7a19c88f7af3f41f6627297a38ee274fde03fa668 SHA512 00e2fbb774f49e8ce1a13219f4c292de251a90587e95c54960a2a2315c4ebe36d252470c997d6b263096f7d5a326bec78dec115b74bdb0dde2cd56feffb70a18
+EBUILD texlive-langkorean-2017.ebuild 1147 BLAKE2B 221962cbd53751ce1876edce15a7186a1f406511ec0e465c2257e13d09b1d776e7b730686550b91da3405541d1e13d1d3c5471b79712bf94f0c50bac9dd94d40 SHA512 193cd711baf19fb90fe8b5a9e79b65d76fb674021fb5ad7986d2b41812c8d1464a95e98adea20725d1da9beaf38974f1d1c60410c2cf04f93a42d1b0f1baeaf8
 MISC metadata.xml 473 BLAKE2B 3f98501738312fa8703259ad9c06be5c22e8e13cbeb3c073eb06409589fa54255cc721748f9b44670c2cf889b5d9884a9c84ca0f67595cc5e5eff66422bfec79 SHA512 74e1c1d392ea2aef8b16938b7d77867236548014132035d592e629755e4e2fd9aab59eaaf1384e493fc2d66b1655d0775a92d61020cbd5c01cc85bed041b6a66
diff --git a/dev-texlive/texlive-langkorean/texlive-langkorean-2017.ebuild b/dev-texlive/texlive-langkorean/texlive-langkorean-2017.ebuild
index 7a1a24a35523..600f59188e42 100644
--- a/dev-texlive/texlive-langkorean/texlive-langkorean-2017.ebuild
+++ b/dev-texlive/texlive-langkorean/texlive-langkorean-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Korean"
 
 LICENSE=" FDL-1.1 GPL-2 LPPL-1.3 OFL TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-langcjk-2017
 !<dev-texlive/texlive-langcjk-2014
diff --git a/dev-texlive/texlive-langother/Manifest b/dev-texlive/texlive-langother/Manifest
index 38e429701024..19cacd5ceaba 100644
--- a/dev-texlive/texlive-langother/Manifest
+++ b/dev-texlive/texlive-langother/Manifest
@@ -212,5 +212,5 @@ DIST texlive-module-xetex-devanagari-2017.tar.xz 12444 BLAKE2B f884d677eb3f303d6
 DIST texlive-module-xetex-devanagari.doc-2017.tar.xz 988 BLAKE2B 7590cedc25e6b10b7b50623373b0f4f643b23455fd3a97c2197f4336b0303796a8f1d665750baa732446f4aba63fab13daced7eed26af36285b6e3cb08b5ed73 SHA512 deb051cb19d44f438ac1f3b7716fb66fc6538ca1ce33c1b84976d6904715d17ef65e4a2fd015f168d908b6905d0a2de5621d8b03150e45b7f5dcfb68f2eeecc5
 EBUILD texlive-langother-2015.ebuild 1703 BLAKE2B a776e72562722025e3f4e3c7a2baf6d61e2573c20c965273224e3f74710da8cc52ce37d922f137fdb424548a00de885239a887b0f291c945e14cab1898f45293 SHA512 aebc6f82f9d2a1de983d652f0e1863d0cb7336180247ddd49f9a4439bac07682f334fd8eb627f00d769b6dfc9e0df739a18b88a2248ed6695b2f92e58b353ca1
 EBUILD texlive-langother-2016.ebuild 1820 BLAKE2B eae19257187024e8f659a47d7d8945cd3f5e080c889ea04a13f6204c476a4ed43f7c39ceacdcdeb76037b0a6bfd7d881557fff01f16e703e84764abab6833650 SHA512 e29a7f00c6c1cd796d1233c8f50c4d05104dcb74217ae27bc0855e61854c903bc618324e3a992bbceb0c9774e110069bb4fc36043ce8ec2ceb3c34732519c12d
-EBUILD texlive-langother-2017.ebuild 2668 BLAKE2B f68a3fd62024bf3988641a8e6d29c005cf1747d30e8588880fd53b4755e9884ee60055dc27806420b301863cde6e1171ceb11718a169c7101215818a69d51a83 SHA512 cbbcf7ae31414103b4682cd16c4eda0dc88ab513b166c5145ad8658649b005c07e6d023f8a838f84ca16d0e520a40aa5f0fbd35c31d1c820f740b1eb8b108097
+EBUILD texlive-langother-2017.ebuild 2667 BLAKE2B 2144ea1de54371b4d7d20a6eb93d53b9f682ac9053f12f1b8cd449ea7a3ea9c951a982f6f89c00305fc65e307e580d7dca5ae20763e27f1e33531b702ec6dbf8 SHA512 483b79dcbceb668c5fd3f2a82ef1e042a3e4626fd65533bec446ae90cd19f167420a76a704468f00a82d4b0c00e3082ba5c76a4906b47eadf58ab194dcdc7fd9
 MISC metadata.xml 692 BLAKE2B fa87041bafc6f25a3ee065fa21c064cb2109470b9833a4d20c5d3d8e9488ee91fff4364cb078287f481402219a77d1c0fd655b90951ae7d7226011e5352af5f6 SHA512 6c9fbac4fe09b5d24c5ce682f68801725f66857ec30418a8fcd2614319750936af116b30357ab03b2dc4ef761dd397a8786e81374f7f230a4d77660df67c083b
diff --git a/dev-texlive/texlive-langother/texlive-langother-2017.ebuild b/dev-texlive/texlive-langother/texlive-langother-2017.ebuild
index 708b1bc991b2..7d32163de398 100644
--- a/dev-texlive/texlive-langother/texlive-langother-2017.ebuild
+++ b/dev-texlive/texlive-langother/texlive-langother-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Other languages"
 
 LICENSE=" GPL-1 GPL-2 LGPL-2 LPPL-1.3 OFL public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !<dev-texlive/texlive-basic-2009
diff --git a/dev-texlive/texlive-langpolish/Manifest b/dev-texlive/texlive-langpolish/Manifest
index ccc414a92fb3..5292af4e92b5 100644
--- a/dev-texlive/texlive-langpolish/Manifest
+++ b/dev-texlive/texlive-langpolish/Manifest
@@ -110,5 +110,5 @@ DIST texlive-module-utf8mex.doc-2016.tar.xz 7496 BLAKE2B d32ef2bd413f0daa010a453
 DIST texlive-module-utf8mex.doc-2017.tar.xz 7496 BLAKE2B cd63a21dd1699b7ab117a9cf7c3ccc5c8c9368dbdf8f6a87f25d0e50bf0d19381f517085a64356571465edd2a3b2fa671b64ab8b398cdac6acad8ccf9650f5fe SHA512 3ae93491cd484e39552273cec22d7b295a7a8b12259b67bd803bdab60d2919678c72b4ee46d4a0e41425bdb2cb29fd53b5c880690141dffea8c9417561af4939
 EBUILD texlive-langpolish-2015.ebuild 1100 BLAKE2B 62e87d127307f315be93ae65bc1f8079e9233587f27bb67f654195901755fdbda4574acd3c34e21b28ce760679c7f441c283310046f3c4dac777601793d31598 SHA512 7c3e0f346cc9ca9fb75706cd87f843db18ab3267dbab01520e293054130ca63a77548c67a6b7c36c53a032542a2de320ccc8fb2141bbb50cbca18c34481b35e4
 EBUILD texlive-langpolish-2016.ebuild 1152 BLAKE2B c2bc2e33e5ecca1fe7cef3ff12310d7f00c542dc6d646f4762b83be22f888cd94a97f85fa13ed149720a2b87ea31be5afb45c2b6233a047c05654238b72dbe3e SHA512 08a03ac8d2113fcb46e677a0ecc59d749dd925e59900391302a3d34190a2c85a376d36214f023b323fb35ad2d64aafd3234c146ecd4f28ca454d063c731a3866
-EBUILD texlive-langpolish-2017.ebuild 1181 BLAKE2B e2b53ecc343cdd42f70ea26f7acfb52f3225d7f990a882762691ee716a4ea2eceb0745c34b82c4e0becea3996feff3699dde0139a67347c4d5f5e60f2687ffe8 SHA512 e36773e59d6e7cb55b6f671670ea9f3873c47ca5ab074a65bf378141b375feb731129fe39b178098bfa346ea2091966e2065eb961c1d44229ac8f45f3e17470d
+EBUILD texlive-langpolish-2017.ebuild 1180 BLAKE2B 779ceebc130f30b7ef54f2eed0f10be78c15ecbc9a9133f4357e375dcaebe390a2e687d712570b8439db02767dd98ce4513380e078aad74cdceeb313230e46f8 SHA512 8bea9b51a505b28ee3246cb8e0eb62ca9b2739ba5cde33ad1d478c6cf50448abe7fbfff051d59361d832591395a0a78e2299d49e4c21ffe4f3930d8ce0163ddf
 MISC metadata.xml 430 BLAKE2B e3f3794885f68e64219d24a8a9d38f2fde0fffd413f3233196641a3ea95035329fcd9d632a3fc9bfd9f34540402f4bdb0b2bae0c0613aceb660baa7e64d6ecbf SHA512 4fd41829665f79f87a77ebb3cedce3ecea4bcc767ed49cf40d7e424eb0a1836817a001852e67ead3f61f189a71eb022bc6ef415e616176c33c1d129b105732e8
diff --git a/dev-texlive/texlive-langpolish/texlive-langpolish-2017.ebuild b/dev-texlive/texlive-langpolish/texlive-langpolish-2017.ebuild
index 518a8345f3fd..fb7d2fbfaa46 100644
--- a/dev-texlive/texlive-langpolish/texlive-langpolish-2017.ebuild
+++ b/dev-texlive/texlive-langpolish/texlive-langpolish-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Polish"
 
 LICENSE=" GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2017
 >=dev-texlive/texlive-basic-2017
diff --git a/dev-texlive/texlive-langportuguese/Manifest b/dev-texlive/texlive-langportuguese/Manifest
index 6d5d47078d0f..058853d8dfb9 100644
--- a/dev-texlive/texlive-langportuguese/Manifest
+++ b/dev-texlive/texlive-langportuguese/Manifest
@@ -60,5 +60,5 @@ DIST texlive-module-xypic-tut-pt.doc-2016.tar.xz 225212 BLAKE2B 5439ab246f1df32e
 DIST texlive-module-xypic-tut-pt.doc-2017.tar.xz 225224 BLAKE2B 8b0095cdd853c248e968896248335f58165c3e4abe7d93fd0d4ee9242c73b6f8a5c8693211820b066a07cbbe7554b0d26c92eed4382d1b7c5be22edc45b9b8a0 SHA512 24bb3acdb66190e34bc56cb5696ea17be0a14fd25cf0a519e44b676bdf8b1bccf7987da307bf0d1f0288918dd15e589c05ecc0eeb351f7aeb2a870396a9d55fd
 EBUILD texlive-langportuguese-2015.ebuild 956 BLAKE2B 541f2e489aa22777dc81d1c69a2c14b2b1843ad707c11201714fc75e6981d1e9681a04ec159fa140bb647e60dd6d4495d8a6239fedf310233c4189b2f74e3a8e SHA512 25453a658f94ee1468e0517aa645473ca1f5d9d2ea9ba93f439556fd9ac09a7df09f92c2c79381f95691f8156a950a7bb6f6c9c7b1de4a970e60208f3ef79d2e
 EBUILD texlive-langportuguese-2016.ebuild 1008 BLAKE2B 08ae382e1bab87629d2125266f788ba61fa15f3d51d454d094233de33bdb2f0c6ecd5c383a4e47c2ab0275a3d61b9164e2d1c223dd4a372faf00493cdf9650c3 SHA512 5fe479bf4e4289e57f3cd7426453fd9ec5934aef7d407ade3841f63954006443720e24fc341c356e1b5ed69e5996e0adac6e9285beda7a4da76701f0cf3fe636
-EBUILD texlive-langportuguese-2017.ebuild 1014 BLAKE2B 6b240cbf3c9a0812f335be831a0da24614d1c9a26c02c3463dbeb47029d78b3bfadec2b23c9ea56ec6ddceb0874bdba5b20b4d6d62103016e7be0bfc1d23f39b SHA512 bf880dea4cb70c94bdcb4de969f5f1fa03f3433126f1abe65ab93f52b97d71323fefebbc6f676257ce8495e3f9911f1cc07d75ea5806d6b80d2bd5f6f0a960f9
+EBUILD texlive-langportuguese-2017.ebuild 1013 BLAKE2B 3d0fc93293f8aba3c8c7e74c7c4f0dcba43a3c7b9fe6940420e8a7f14a501ed00a7d34c3ef4d7214b9f67679b5e2a630837bc6d30567abf0bde375cb0c46d180 SHA512 d1822dc6d47e663769b45b6eb3f6a1da67d5038e97ba24d0e4e9e3cfe1edc1b061d1811734fa8882f330220421567e1654c0882017ae8312baf238d3103435f1
 MISC metadata.xml 434 BLAKE2B dcf4b081dc6c914dd2e249828f1512711394ee46c6100dbaccace8faaf713b3fd2988c14330fea99b123f5ab2c84a0c843aaf4642a32c060be94ddde18d332da SHA512 3a73611ae49dcc118cd89773bb2bb73a3bd4535a77379c44946f08fe84ffb846cfd1a8a68ad3daead16f2590803976b2b9b44b63c9bc21da43193f0c2979ad4d
diff --git a/dev-texlive/texlive-langportuguese/texlive-langportuguese-2017.ebuild b/dev-texlive/texlive-langportuguese/texlive-langportuguese-2017.ebuild
index 748d7fcc5492..77dd34917a6c 100644
--- a/dev-texlive/texlive-langportuguese/texlive-langportuguese-2017.ebuild
+++ b/dev-texlive/texlive-langportuguese/texlive-langportuguese-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Portuguese"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-documentation-portuguese
diff --git a/dev-texlive/texlive-langspanish/Manifest b/dev-texlive/texlive-langspanish/Manifest
index 55bab26a6013..e1104441bf81 100644
--- a/dev-texlive/texlive-langspanish/Manifest
+++ b/dev-texlive/texlive-langspanish/Manifest
@@ -91,5 +91,5 @@ DIST texlive-module-texlive-es.doc-2016.tar.xz 1026792 BLAKE2B d46a6cc74b57c07eb
 DIST texlive-module-texlive-es.doc-2017.tar.xz 1026792 BLAKE2B d46a6cc74b57c07ebbc873939bee1d8aeb26daea5641bdee56ec7071f2b841481cb179ab58f47354b32f520ecdb7e90177741c891a6f41b39ec2fa7d1a449e68 SHA512 d2a5c3f7626ffa447565a6c850e6edd736faaa87d460b961842a5ca3bb3d13766ee3ee25057644184af2c5a1306c75c89250fbb44a1c2920cd17fff7b6024e5b
 EBUILD texlive-langspanish-2015.ebuild 1109 BLAKE2B c45e2f789dce6409d7e8e957a4598b977324e4bbf40ccb2f7430a8c18f18b8073878ad557c087f266fc266b022e47231bab9a6776635ff1a884f44079b7f1d6d SHA512 4ae7db7978bb010a2eb6ab13537d8de2ba97182f691c4011904532a051e64056c2abb8196da3c352f282f7a6316fcdec27da2a62511c4918cc0bae5b2e0fa012
 EBUILD texlive-langspanish-2016.ebuild 1251 BLAKE2B e2f87cdf269ace40bc1298d72400eee0824fa68777497ce2521b49cf5c45afe7d4b8066fb4681f5af219fadcce21e4e8b593a3e22421082adf2ff2ca65b4d810 SHA512 5cc99ee9922382813deb3bf0f8ee5941563c93473f25c54feb50159907ec04f539b38ba69cf695dda250899540211a8a6ea39432500cc2946c8f8abd10c66bf1
-EBUILD texlive-langspanish-2017.ebuild 1257 BLAKE2B d021a26a0a4e65da6e965ed02f65dccc991d5cf82bfa66a36a7fa75b4ec52876d924d09a53a88fc36ee0924cf64291f893f88f5ecfe3d726e24bfd65fe3eeae7 SHA512 d69867a7f2c5737a0b89002136702fbbe9a58801c2ddfd4a90f6d123ae7dce5dc7f7d05ed490ed4102349039de4a59598e954cd48b865fe54636928234dc27b6
+EBUILD texlive-langspanish-2017.ebuild 1256 BLAKE2B 377174ce3c490f5c7b7ed447589f3e5fb013346ebc82722ae787a60a78a2fde03aed47a3b71637c460cc5ada51ff624ddefca97ea1c5be34c7eac71bd0208fd4 SHA512 cc079a5ff53bc91b663e47c0223019d4055f3cca0e8aa537ce866154d589dc636b0f790c1b21debca2d3d9852da9da8fdde7b3a22b2ea123b72077e2a74e7f75
 MISC metadata.xml 431 BLAKE2B 5b913256eb54147f95ff3804ef4e8975fed09563218bfcafbc6d664199b647f289e14e59e61d1cda1714c0295d3d7d4b03af7029ea3a642ff85db17a942eed33 SHA512 e7af474fa040a433df88f7d07f7ef410f4d5cc8086f8cbf397b08f40c03f2ce47a884ee7c994c7a6a75098f508ad73cc9aeaf74b84307b6aaedb9f16ff5873d2
diff --git a/dev-texlive/texlive-langspanish/texlive-langspanish-2017.ebuild b/dev-texlive/texlive-langspanish/texlive-langspanish-2017.ebuild
index 8d0d229e4515..c6f9f280b6a0 100644
--- a/dev-texlive/texlive-langspanish/texlive-langspanish-2017.ebuild
+++ b/dev-texlive/texlive-langspanish/texlive-langspanish-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Spanish"
 
 LICENSE=" GPL-2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-documentation-spanish
diff --git a/dev-texlive/texlive-latex/Manifest b/dev-texlive/texlive-latex/Manifest
index a45be44b823d..49f980bacfa2 100644
--- a/dev-texlive/texlive-latex/Manifest
+++ b/dev-texlive/texlive-latex/Manifest
@@ -218,5 +218,5 @@ DIST texlive-module-url.doc-2016.tar.xz 266856 BLAKE2B b20dab7bdddd79e71440befcb
 DIST texlive-module-url.doc-2017.tar.xz 266852 BLAKE2B 159ca5b010b9a66768c0b37760d39f93356e1ef81be55da03f360b2c9fef8f345af38cf7cb9432b038485d212d427b6db564fc773b7ad3d15638054b84112a1f SHA512 ec678563ea26b5e013d631b9ced49c870f95556bf9f29259b9f35e2ba1a25150e613cf7fd7cf03e12fdc2323e2124dc617b3cc3bb164a9e7df2365b252d75858
 EBUILD texlive-latex-2015.ebuild 1664 BLAKE2B ca23fa646440a7af7c4f447914bf67100c8cf2101bb715e01da310b3f7e220399e06bc373ba03ff9080b51b1612835bd931aba8b4775d19a8b9cc95fb614c76a SHA512 55ac48caaa06f6b065706ebaad54a16f4800b0f545184ece83257939435c14d39e1bba72e375b685c8e73edab3cb670de3e854c3cd2c4eb4c900a60bb0024571
 EBUILD texlive-latex-2016.ebuild 1749 BLAKE2B dbed9fe284e1737a13d9e8e6cd134754419c14489ed63a939b25602eb58a77fdfdf5ffc35dedaf9a051b8365d93e64444a2d1fd61a652a0ec5c878bf99f25599 SHA512 11fec719d43909cb6931af816f6526738a9f8de7ddaab3bcb6af95e0c08beb69783e48ed374b57cbe39114c87c26a79b18205abc9ec61a2d89ea845e824556db
-EBUILD texlive-latex-2017.ebuild 1756 BLAKE2B 43547ec731800aaf005e3bb2707d16be5e877b6636297c45044c3ef9bc31ed7dcfcb28eef0e0b25ea2756552684bc280ae86e60d015cdfad4b3a98dec9d8ffa6 SHA512 91bb9d1191b0260b31091ad919e189817b2cdb068ff0af286ab171ca491c7f02ec8e0b5fd3304aa690d8dae9037d31e2c7662bac90bf66d0681c27b933250c40
+EBUILD texlive-latex-2017.ebuild 1755 BLAKE2B 586fe3f7dfb0fd88505c6ce929ec858da265081320cb0b8352b830d5d8fa501b7b9ac0a981b0a32f44b3c259c73430349a878bdc8ae8cee630e28a5b21c4b15a SHA512 95fcd68efb2a8b11db29d7038648df9500da187100bb021f97d9d3fb22a5dd2b961db7a4c8e00b4c285b8df2299c2a8ecc150fc5ab3f49f4945202addf99580f
 MISC metadata.xml 529 BLAKE2B 59fc302f07f83452a60415a6ef75ae13bc314b3e2e0c3e8c58aedef8e2079e7184879908ec6d978a43a09a4429b3c1b79a3cc786a9695238b2a021916895269d SHA512 394556cea6402e78e83bb5ecb801bc9c6d4f0e85f368437953ccd1ce563954a3be99badee441c26d7791c965e13b17acd003ec325cc11b87a6fc605ffa2dd350
diff --git a/dev-texlive/texlive-latex/texlive-latex-2017.ebuild b/dev-texlive/texlive-latex/texlive-latex-2017.ebuild
index c4a46070ecbe..bd444944e29a 100644
--- a/dev-texlive/texlive-latex/texlive-latex-2017.ebuild
+++ b/dev-texlive/texlive-latex/texlive-latex-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LaTeX fundamental packages"
 
 LICENSE=" GPL-2 LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !!<dev-texlive/texlive-latex-2016
diff --git a/dev-texlive/texlive-latexextra/Manifest b/dev-texlive/texlive-latexextra/Manifest
index aa35cacc51f1..4197f1c12bd6 100644
--- a/dev-texlive/texlive-latexextra/Manifest
+++ b/dev-texlive/texlive-latexextra/Manifest
@@ -8557,5 +8557,5 @@ DIST texlive-module-zwpagelayout.doc-2016.tar.xz 591560 BLAKE2B b82dc9fa2ee968c3
 DIST texlive-module-zwpagelayout.doc-2017.tar.xz 591516 BLAKE2B 2c7a6199ffd8262858bdda2697b6f9aabde0c1d4cbcacaef223683be09fa1fc2db87be5a7542fc68de96a62ccab7f45468a41d1ba0303ddbbfd2a1947791864c SHA512 0a31ba65d49cbc111d6a5ca3ff1b2f9aa91614a23d6606aad1d5b9d37cd40f0f72c95bdfd56e56cb5f408279870e867282d862d0267d8e829fde608a49c079de
 EBUILD texlive-latexextra-2015-r1.ebuild 35701 BLAKE2B 46fdc6ce25f678528baa046d968c460f64c85ce8ab62663d5dd04405dc1d93c99f1ce10e361a2e9f6f034756a3e689326e43aeb8ef11acd3366ff7fdd5a93435 SHA512 8eafc43db3fca70cc31be8d4b3283cbb51e096c41bb45b6d930ed17fa32a4e899be8afaf25807cef3d4a0cf7c7e39eac06027cf642c02a8c6ad5fc1549c2d54b
 EBUILD texlive-latexextra-2016.ebuild 38864 BLAKE2B fb33ec8142e6175f326d62f259906592e0c379268f50ed472c171a54cd23826ac7a42ab35c9e71c88fd58cb6f4fc8a478bfb4f9927165415ab6326334874be73 SHA512 25639da7c812a1c920068252eeebe967ea498302e75e094345af966cd2aa0adaa0038d28300eca134f70edbdd471bdff54aa2c8e4f2202674da4aec05bf42d1c
-EBUILD texlive-latexextra-2017.ebuild 39389 BLAKE2B ed627780f02312834fb19b7a1d898260a91a30b530629d393dacf3a5d8b1bb2c85f69bddf35045e58438f114014747d23d8e6d4fdafbe260c6611f3b7c7378be SHA512 6202fde637dc6de4ee4d824efa8635697b32d75d041d141d7e062ea1c033aaf394cfb1e876b8035e08d0f8daca74c62e3f2adb8b60f89d75a3191abda72512e8
+EBUILD texlive-latexextra-2017.ebuild 39388 BLAKE2B 4ab9c924f48c371a9ba4aa38fe29c450cbefba7ee1b144f7dd61da8098f0b571a5ace6c5456b789dd8ffbe9ad0fe918fb8ac0153998e9a119e64fadb9173c9ee SHA512 b2bcb37ede411412aed67394ff14c67e2b0c8519e7cf0ef9a705a92c06e2bc72bff2f5b5572ddd20fd963920ca1dab8656a69f6ddb514ebaa80a8e690778d475
 MISC metadata.xml 464 BLAKE2B f44661c9ab79ec9d3ca261cea4af7b64fbef81b0d63218137c940e804a8254b7a8638564d51b4f843e4ec59fc15711bbebd09f4b1fefd5a070ce0819345ce778 SHA512 f2f516eb45d8d405e29e91886fd2ffeb54e6126028d2ac218eb0bf43e009ab225f0a0661ce99436dda82b5f63b47e5930ab047e2bf16a2e306da510453fbe6a0
diff --git a/dev-texlive/texlive-latexextra/texlive-latexextra-2017.ebuild b/dev-texlive/texlive-latexextra/texlive-latexextra-2017.ebuild
index b1385d2f84d6..029df83310bd 100644
--- a/dev-texlive/texlive-latexextra/texlive-latexextra-2017.ebuild
+++ b/dev-texlive/texlive-latexextra/texlive-latexextra-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LaTeX additional packages"
 
 LICENSE=" Apache-2.0 Artistic BSD GPL-1 GPL-2 GPL-3 GPL-3+ LGPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latexrecommended-2017
 >=dev-texlive/texlive-pictures-2017
diff --git a/dev-texlive/texlive-latexrecommended/Manifest b/dev-texlive/texlive-latexrecommended/Manifest
index 894adaffbaf4..69c4ed11afc3 100644
--- a/dev-texlive/texlive-latexrecommended/Manifest
+++ b/dev-texlive/texlive-latexrecommended/Manifest
@@ -433,5 +433,5 @@ DIST texlive-module-xunicode.doc-2016.tar.xz 588 BLAKE2B 323414d6b59493065bd9c03
 DIST texlive-module-xunicode.doc-2017.tar.xz 588 BLAKE2B d26d3f9960cc982a16cfdb2435d59d187b16370034e473a7f72439d4e41f24365df03bb8cc56dfa55d736a53b41baa43eb9ad9ef7790874265f4e8702dd9e6b3 SHA512 29ef434a1832f9c21b327856d074fff3db3d9e6094ac251b9e00cb224fff058806b7a491e9c166570b41ebbc2d1db084b90fac68a26f45e70196623b6754f9fc
 EBUILD texlive-latexrecommended-2015-r1.ebuild 2523 BLAKE2B 871965a20dc0d8485e86a7f21a6c9ed464bb2f34a7933aa835c60029bac591ceb31f20847cb81baa4ab14355732e441118d45800cb315c90ce2fc77458cbf09a SHA512 d554eac751c4d856768baf916f676302fa4ff47de94f92084ce3ce24ec773e6c6a297723d56b37c1a708a129250ba50c5cc8194b8810afb35197d53c97ce44ff
 EBUILD texlive-latexrecommended-2016.ebuild 2669 BLAKE2B aefccbfc5396277a5e45b271de1e083fe7698578a9da7e4a0f0a31e45901fa89b45f9c097749cc314103977211f96e5b5a6cb0a77bd6865d806462f5a94793b7 SHA512 d8a307c712528487358343fa9f0803283375ad3d66f60b7b546f3c818b3fae9f7f8d21381d6a293cc28870180e6907bd759f6f9e68beafe07badc40a079517ef
-EBUILD texlive-latexrecommended-2017.ebuild 2828 BLAKE2B 1a8fc9e0a865390dc14ad41333fa79e8127151e7e6781d850aa40343dabf11566883cbe6bf85c49cbbe2d0527b64876edae0d20b033af3564e19a88386ee74a8 SHA512 858039d10d8e409713c97b35fcf83566b174950b2b8947021d434059d7ee08b574a75676e8b3958fbafec973073ecfa48e5fc96ad1ae84a5d6c421bb8481fbbf
+EBUILD texlive-latexrecommended-2017.ebuild 2827 BLAKE2B 7c339e33e129cfbce4c7d92d1ef7fd4a54405d418f139815118c0b3d2f2930621f1a8a0f06c248e547c07bdc977f8c8428e82b35a1d7b676ba8ad43c04ca98fc SHA512 6bafec96e84fc859efa3a6322eff2b8b2a2afe792a373ecc6595e4578d8859ebfc0593a57184aad5ee239642fed5da18969541c618b479371809fc884e92d60a
 MISC metadata.xml 493 BLAKE2B 2863d00d1b302441682fdc631273218535ce353c050c295b9f9f0fd133cd687a281e4cb634eeb58c89421dc9cecb3bf32e7816dfa2745e139a90f5760e7d0927 SHA512 815d4e8c1dee309cee3f6f0fc553903a7129a3fb9be6dd413e3c0b81f8924c82e8377b11eddeae17192b2451209ecc25d15dc19a925a58ec979c10f2342a6869
diff --git a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2017.ebuild b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2017.ebuild
index b890f84c9d08..7b646ee5806d 100644
--- a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2017.ebuild
+++ b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LaTeX recommended packages"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2017
 !dev-tex/xkeyval
diff --git a/dev-texlive/texlive-luatex/Manifest b/dev-texlive/texlive-luatex/Manifest
index f4f3391829f7..7f986a41dafd 100644
--- a/dev-texlive/texlive-luatex/Manifest
+++ b/dev-texlive/texlive-luatex/Manifest
@@ -266,5 +266,5 @@ DIST texlive-module-ucharcat.source-2016.tar.xz 2324 BLAKE2B 32a496c2f876e38e6e0
 DIST texlive-module-ucharcat.source-2017.tar.xz 2316 BLAKE2B bf8293199b8b1f8207b13bea33e526db234b76080a85815a5c8ba1ef2b90cd0e6f41f607c179c06fca2d7e784400822965b0cf7099a9b22a22a28f687f9c6f4e SHA512 558e2895a44364217155323d0c7592fcd9c6730ae35d998e2135f95bd420ad8c8724627b0616cb649ed12cdb20fe75a02fcf545180d081537fe148a44cd1bc2c
 EBUILD texlive-luatex-2015.ebuild 1933 BLAKE2B 151dadac8277032b699389ff0076b09de2b797f4aa9aa0b80bb6af1a2087aa75bac4785fa58df761681f9a7169005309afa60f3a3b48dc579e5496b14234aec6 SHA512 3784c4eccd2b2c458d77050f3b2ee05c1b4e4856f1fe6751d787c3e342a1a06151a34e1eecb9fb61ad53b8a71f773bf6b52f15f804fb04ee5c305124f4b0ad88
 EBUILD texlive-luatex-2016.ebuild 2130 BLAKE2B f19caa4317b9fd487eea19b65c126f0e107331d5b187bc7a455c5d390ede3af9e02c6ba29c7614804c20175b2419a97c13a0ba48978ff86655579cfc2ba0b1f5 SHA512 03e91853717d21fa034638402c976762e59ac66a781e129ed71ac877333bf2a4d4dc726bbdc37732e1bb4b3eeab68c3aff194b90a109995d93c010fbf3a76ccd
-EBUILD texlive-luatex-2017.ebuild 2157 BLAKE2B 560b85f1e9459ee3bd3318f1c47e2e584721e0c1801959342094b405b1d063c15a2eaa1e90452b0bad824db6bfd617d44c0cea59d9e4c3e91be55e065d7e1537 SHA512 e39e40c6dbce7830bd4c85d730b88e49ff5477f988b2973c6be196555ed432ff6fbf3c774e1e7de6df1b7ba06c813092077534a8bfc27b06e8ab7cac2934d236
+EBUILD texlive-luatex-2017.ebuild 2156 BLAKE2B 4e53428950d243afd8126137c38cf144b119de841a311c938d5afa6b8db834eb3331e911dabc0eaef088115d9e892a126cd4e293e607d4a2104b7bb6a8471a9b SHA512 b1eaf035f70083c9c09df59373ff74c400519219dfacb1784905e870a8422797144b2feefdf99dbb7a5fbc2274596813d0b94b142f88608927d4ddf7830cb194
 MISC metadata.xml 548 BLAKE2B 12926c8cbe1c42799921e43f05ea4b2ed0e314855e01131d271d97f1b72914ee3eeee039e959a81d27e6c39469a42f68443245420a50b7177815858f3a92924d SHA512 9952f37d3ba08676efe90c13476b43140d0039a6b698ac91dc028c26fb7704dbf9da880d5f38123b219f0af0c6a029bd463625a6af5527ebb94f2d56b1b1b166
diff --git a/dev-texlive/texlive-luatex/texlive-luatex-2017.ebuild b/dev-texlive/texlive-luatex/texlive-luatex-2017.ebuild
index 111248c05776..1d92cbcaa173 100644
--- a/dev-texlive/texlive-luatex/texlive-luatex-2017.ebuild
+++ b/dev-texlive/texlive-luatex/texlive-luatex-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LuaTeX packages"
 
 LICENSE=" BSD FDL-1.1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 "
diff --git a/dev-texlive/texlive-mathscience/Manifest b/dev-texlive/texlive-mathscience/Manifest
index f8349e537d5b..a1370efc247a 100644
--- a/dev-texlive/texlive-mathscience/Manifest
+++ b/dev-texlive/texlive-mathscience/Manifest
@@ -760,5 +760,5 @@ DIST texlive-module-ytableau.doc-2017.tar.xz 360816 BLAKE2B 0acb1fbf39ef9de43869
 DIST texlive-module-ytableau.source-2016.tar.xz 15896 BLAKE2B 4e5573ebce1e66772b5486c79586d4cf33fd36f8b05dd302ecb20da33edbc84fdc6899b9dab6c52e066462c3958cca6f5fc8a6213865f53817addb214ce1b9f5 SHA512 76ec8e726ab8878e9ec7a1ce674da3a8d6dbd5c971d95cb6ddb68475493fc179ff3904a7f9b45da1c36ebd10f6d1d95678c0176b11ca48c4b598188713d94da0
 DIST texlive-module-ytableau.source-2017.tar.xz 15884 BLAKE2B 5474eb45ab176e7e03352eef9f87604052099bd385e804fb98795b9b68cc5c15c125fe8f5307a10ed6b7e282c3fca1ffa913cf9b0c4c128134e0113d95f92c79 SHA512 646fa552fadca33406c195ac17b2d20504439f39dd8f62d85fe4f66b6a476424cce08599e69571ac7d05a28252f406fb0c092f55bdbf00524d1967a231a9dc04
 EBUILD texlive-mathscience-2016.ebuild 5518 BLAKE2B 358d034a7ad2114c2097eb5758168f95b3be25e6f2df6c44e722fb0e053a16163925303a6656678b83f18c4b98d364ee1835323f09bb9af43eed6edaa8cb8255 SHA512 b38dfd37ca9ec6553ec0391ab0c7c9bb5648aa6ea9fa5234b18b0932e1305487ac4f5b83705c8c331ec9fd42100e6645b23f8b54ba216aa86d0c552618b15520
-EBUILD texlive-mathscience-2017.ebuild 5818 BLAKE2B eaf99b79d28aa1ff5d2041274d195bdb3d9b61ed5610232106f9dd734e7c2ed07782f6fe3d2f435212f738ed90eebadbab0402ed87d4bdccb332db6664fbcc5d SHA512 764b674dc8c292fa372e3bccb81c703fb146e11ee6f6b867d599fcfc40c659ea282362b68dbedf8046d0d23226feb7b5d76fff08fd90209aa31d039bf5715e86
+EBUILD texlive-mathscience-2017.ebuild 5817 BLAKE2B e384c050d0baf17f8b46f90d17a89971090aa64c1801787e9136977dcb3315acfe06168da4337758158f0d66d64e26f45274c577f995f9bc47ff37c533ea35e6 SHA512 421c37cd80241214b65663c6da83a97000254ee329d812ce463cb0b965dfcd41de2fe0475fdb760da8cb5cbe2c0647e6e23f11d6c69ae5bcaeb758e371ecbecd
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-mathscience/texlive-mathscience-2017.ebuild b/dev-texlive/texlive-mathscience/texlive-mathscience-2017.ebuild
index 32adc0716300..015a62c29d97 100644
--- a/dev-texlive/texlive-mathscience/texlive-mathscience-2017.ebuild
+++ b/dev-texlive/texlive-mathscience/texlive-mathscience-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Mathematics and science packages"
 
 LICENSE=" BSD BSD-2 GPL-1 GPL-2 GPL-3 LGPL-2 LPPL-1.2 LPPL-1.3 MIT public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-fontsrecommended-2017
 >=dev-texlive/texlive-latex-2017
diff --git a/dev-texlive/texlive-metapost/Manifest b/dev-texlive/texlive-metapost/Manifest
index 97735e6d5617..c525cd43fa1a 100644
--- a/dev-texlive/texlive-metapost/Manifest
+++ b/dev-texlive/texlive-metapost/Manifest
@@ -270,5 +270,5 @@ DIST texlive-module-threeddice.doc-2016.tar.xz 119012 BLAKE2B c27db6786bec940763
 DIST texlive-module-threeddice.doc-2017.tar.xz 119008 BLAKE2B e364557138a3dabc1eff4bef7ce2042a1f6522eb3b6ce84e1e3778c49707546271948e25c3650d3fdff3d07ee176f3071e3f7ba4778eff2ffda75b5d851bc0ee SHA512 976acf5671cdfab523ce1af8a3851a99bb154ae19e601d2cb6ee26f5f78d69b975fe8e73a6930c6dbbf086c5e574d83a279efac3d6fe3f376eaaaef7f05665b6
 EBUILD texlive-metapost-2015.ebuild 2087 BLAKE2B d1761344d2fd274f1e4f3cb111a187386e2ab2e4b29beb249340ea0ceeea52de4990d354518a7db5ae5a4d0f9ea4bb9303cc4ed454ec37853d6b2a12d42c0588 SHA512 a68c555617d120ff2c5b9799a0734dc5345e3da878d6db8fc49ab8273b8b2561ef1ca75fbe8d0cb755ccc84ebdb7bbbb113604702fc9067b580567e7b3ddc9a3
 EBUILD texlive-metapost-2016.ebuild 2194 BLAKE2B 2f93e3d25d7c77ddd8b392fe3c5349d8b3ec0ddbd462986f1200f73afb21d644ba2c8193b27af36ca4f8bd45ebf5c73e7fae967d2448800aeda2cb8405b3a514 SHA512 f586b069af46b2e854375c26dc035959682aa212056a7ab52f2a8f3af0d1e06bbaea4eccaefc03c1f2c0b69af74ba8a2088f301ffa8dc56e557334221869a012
-EBUILD texlive-metapost-2017.ebuild 2227 BLAKE2B a5885e81a1cb9e92389072ce14c81b823ecd3dd064f0ed89f9c89895a6ed7894a154c549d66c0cd8a43cdd11d11b4883be4362402ca370ea49c381716138d3bd SHA512 3d731edd0500e77a36e4aa654ac4d01b8066f5c58d174e9fea0c02fbf44d4ecfecb9a46d5812d3247fa3d5d0f68b9998c1edabf78a12f0fc1799f82e5f30d224
+EBUILD texlive-metapost-2017.ebuild 2226 BLAKE2B 5bbabd6eced79147e24ce82de91e2157118135f4184b198b968032f21198231ceafe8e3452fbf252dcdb1bf60b013f2c7dc4c128b598e09a1ff61736a66cdd19 SHA512 3964959c496773e5432475ec5efb11e72d86e1d322e31cffb2f6ad069a93da772f63e251b8c795a78d45cb432ec52c47faff8cd28f3071622f75024d7a301fc6
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-metapost/texlive-metapost-2017.ebuild b/dev-texlive/texlive-metapost/texlive-metapost-2017.ebuild
index 25dd4c84e4a8..8c1ec249015f 100644
--- a/dev-texlive/texlive-metapost/texlive-metapost-2017.ebuild
+++ b/dev-texlive/texlive-metapost/texlive-metapost-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive MetaPost and Metafont packages"
 
 LICENSE=" BSD GPL-1 GPL-2 LGPL-2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 "
diff --git a/dev-texlive/texlive-music/Manifest b/dev-texlive/texlive-music/Manifest
index a810caae1037..0157bd54dde7 100644
--- a/dev-texlive/texlive-music/Manifest
+++ b/dev-texlive/texlive-music/Manifest
@@ -158,5 +158,5 @@ DIST texlive-module-xpiano.source-2016.tar.xz 6324 BLAKE2B c3cf3e0a74df7994f2585
 DIST texlive-module-xpiano.source-2017.tar.xz 6324 BLAKE2B c3cf3e0a74df7994f25853fe895773f8b23733e71831060a4ba761fa1603ba4201e9e913e4c6008184c7159d1c331a6bd2c34d37b865d883b0e1b52f2d1b2687 SHA512 2566a4cd4070ae021ea0808b3c9ccf1d6a7add4f9e0a504c42f6c42ce659ddb6e9de7f7b8cd61f02a84c8bbb9163ac11aabb09c1b7efa4aa8a6e067ae3c129a6
 EBUILD texlive-music-2015.ebuild 1639 BLAKE2B ef6fcb260aca80084d8b6914808ca11194e5707589fd40ef348073fb592c82bef2abeaec1ae2affe3e1310d315776aad2416f137ac95df6fe0a3dd192e03507c SHA512 5984a2c6fa3e0fa3355ed7817496ab529efd02cfcec845058a284aace05ca459dda8da9ac317948f1e60e221b0bbfd65f0793799968539f41103afd83184879d
 EBUILD texlive-music-2016.ebuild 1707 BLAKE2B 13639fb9102b4b15c837183ec8a3ff8b97ba9acbcda5fc2e96950def41ecaea5988c009a738e81e1f940dfff5b5de9df1425d85eb548abaa06a743069e675044 SHA512 231669bffd8ff89c2afec839bab68363284e0384305eeb368030e1d699b55f16118777e759b9cf2a233200050e477dbf4a7fcf66adcdce8dda25be7c03cdda4f
-EBUILD texlive-music-2017.ebuild 1684 BLAKE2B 29ec326dbbc3fd17aa8bf543c024030a1d4a04e56b27e189e153f07384074015271568a86bc58626d0d74915421ed594a62ef0f523a0991b09c3935be97f3b84 SHA512 2738f42895a3af64fdd502aa22c198e85a1a47b031f20540b73f0c5580a626e950a80d19e1945e3d15ee259a7d433729dcbd6277443f6ae73a1d13c88dbd48e5
+EBUILD texlive-music-2017.ebuild 1683 BLAKE2B 2c3eca234416ac41e50d98d1a22a0ff7cf34a1cf0bc36ae2088ccd814c8102d60e868f31a147cf172b4029f92d8472d26340ac54b3b81866c58423f2733ee1bc SHA512 5f1217339b20598b61e47117399eb3aed746abd715b71fd23567d9b67857afbba378f7a4190fab838208a4eabc1ddafca6b2ebd7a6dca2e38f349efa2a900c4e
 MISC metadata.xml 444 BLAKE2B bcaf0689cbedb3dc02a63060d40765ba836651697d152028439119abff46f55cedd497220880d05ea00d5ac98dc61df77bd918c88e3d6fa783a356552be2b8b9 SHA512 2f4196a50ed70a2fe7a7f3d51ee5f3299682a7dcd06f0791ba128503d0bae27caf127eaa61e847644c06d40d3bc107977fe5546040e3eb14cae1705c570d6c7a
diff --git a/dev-texlive/texlive-music/texlive-music-2017.ebuild b/dev-texlive/texlive-music/texlive-music-2017.ebuild
index 11cb36f40f00..1079101ebf78 100644
--- a/dev-texlive/texlive-music/texlive-music-2017.ebuild
+++ b/dev-texlive/texlive-music/texlive-music-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Music packages"
 
 LICENSE=" GPL-1 GPL-2 GPL-3 LGPL-2.1 LPPL-1.2 LPPL-1.3 MIT "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2017
 !<app-text/texlive-core-2011
diff --git a/dev-texlive/texlive-pictures/Manifest b/dev-texlive/texlive-pictures/Manifest
index 56ab2e6a80c9..bc473df0a608 100644
--- a/dev-texlive/texlive-pictures/Manifest
+++ b/dev-texlive/texlive-pictures/Manifest
@@ -1011,5 +1011,5 @@ DIST texlive-module-xypic.doc-2016.tar.xz 3923200 BLAKE2B 3c0da6c849d411338568c1
 DIST texlive-module-xypic.doc-2017.tar.xz 3923164 BLAKE2B 05428b38455175d31fb3f6cd492a7209ad90370c15467637894e387836d7c25d669263c16382b24d1ed060b3e7d50282a06197cc79e5fd5731b9c92f1097baed SHA512 9f2ca1f120378e4ce52d96d7622a7f22a301c02ceaa2a19ce14d775073961aef01d1fb65202bce2ce1d8b88801749e2d642a0b2d52518d7c70317e8c62d9d2bc
 EBUILD texlive-pictures-2015-r2.ebuild 4702 BLAKE2B 0f3de68fba8f5c5ab1d7da53cf684a74327decca7dce8bb9d9319c3fec4602abf8bd40be33338de28146690abcee14b24b5c07e1e340d2a4ca06fd0837bab411 SHA512 9d139b8e5ae9b39ca353f3542ecded6f474f1146c8d3076ab96f1e1c229baffb298af4a63f721b7bc604be67c4113f69e8d5bb97a82bad587cc7b5cbf29e7d00
 EBUILD texlive-pictures-2016.ebuild 5350 BLAKE2B 236fa6ce487c989244bbf50ba5a20f0b045ea069e9e399458d5efec652c09c2f38a89146d1b76f575083ae8019296e5d85524b576b2a8b4e2a569cd5a8be4ae6 SHA512 154546a58d9e46cc4ee55aae6af764294d9705b54499608a7916580b56414248f181831581ffaafad94061a513b8a90b466e7ba7d5f9afcd9b23f9839e8c1758
-EBUILD texlive-pictures-2017.ebuild 5547 BLAKE2B a8e67e028b674e5c6ad5128dec65dac14f999dec51cd9723138e56250316186d8bb2192918beea36dca8e0bc550aa43ed97f76d0553d6ac0227157b92ad6e3a4 SHA512 e85b04bb4f4a2b553370450777a695d0c42ac07504cef5e1af98177f406e94f3feacc787b8b6da9dc92bba48579e44a7606f0994c9906187a476a541402b1883
+EBUILD texlive-pictures-2017.ebuild 5546 BLAKE2B 85368b9bd11a7e5138e9570d0da690c15a9505e19981ff4ffa3ab05090213f9a92153bca977ebfeee950da70ddca29660bbf2772efe1b8a146570a94ec25b821 SHA512 3768164ebb96f261180ea0586370b97c4f1c87e8efe787a89ec1988de00e882a0bfbfba63b241ad261804940e62e26dcb7d7ecb6d3f56b5ba1919266f2677d43
 MISC metadata.xml 478 BLAKE2B e113025fb506c77cc1f2a8099b1182d3ce057e8067145dfe921af4289f22f3894e4a20eb6f941f4bdcad739df93975766490d62ce253a0710ff428dcc045ec11 SHA512 547880e196d638109a84a159cf694f201dc6e01ae15d26e252fc7da697cc2c466da0a3403c149d5847049da06e682557293cda020b77a05b0684611b4562f957
diff --git a/dev-texlive/texlive-pictures/texlive-pictures-2017.ebuild b/dev-texlive/texlive-pictures/texlive-pictures-2017.ebuild
index a7e884dc2638..f99082439df4 100644
--- a/dev-texlive/texlive-pictures/texlive-pictures-2017.ebuild
+++ b/dev-texlive/texlive-pictures/texlive-pictures-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Graphics, pictures, diagrams"
 
 LICENSE=" Apache-2.0 BSD-2 GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !<dev-texlive/texlive-latexextra-2009
diff --git a/dev-texlive/texlive-plaingeneric/Manifest b/dev-texlive/texlive-plaingeneric/Manifest
index 22c071587a73..bf00cdd7420d 100644
--- a/dev-texlive/texlive-plaingeneric/Manifest
+++ b/dev-texlive/texlive-plaingeneric/Manifest
@@ -181,5 +181,5 @@ DIST texlive-module-xlop.doc-2017.tar.xz 537924 BLAKE2B 99ca47024e0a88404dc3dcbf
 DIST texlive-module-xlop.source-2017.tar.xz 916 BLAKE2B 13e151cd8bb0bf1b2912b7e9962a2da70e52f24b6f8ced1aa582ec974e20c680befc949f677dcfa54c4f8f0a6266b14611022a28f1118d6b8e85a4e5c3495fcd SHA512 246d2ff227d6ab8ff9367f0ab26458e408f4919f84edba84a06c97c057ad4c217fdac5efe8dbae56bea66f4ec0133e9e94ce444cbac4a3c70e3d88b413b7de08
 DIST texlive-module-yax-2017.tar.xz 5952 BLAKE2B 41a9fdfa93d7f50c7977ed2270ba0c62b80f329a9ddc9b86ac909217ea6614884c0a58904a94109d2347fb7e5ad627dde5464718fdfff364d9c402b59645b359 SHA512 2602ad4d5487fc3ff982b9921c0f16b19b658d0d225cc4b40be98be4b7d6ac86666475955644d04d8ec0fabca8c566b1fd219797d2dbbec8b6d9becfeeb6d0f3
 DIST texlive-module-yax.doc-2017.tar.xz 123708 BLAKE2B 7a64cdbd2a8e88238f331fc2dd9f4350e02ff4cc9cbe32741debbd7a47ea4bd934cb751eb9faad159e594f6fbaf86ecca86d497795c7e2985e5134ceb879def2 SHA512 ead74dc1ee40a1b28cda1665969e3e21f1c1f153d6af1b74e1c1473c0edd79225e74a054416f0d04c432721c7ad80540d28566735e570234371d290033c9afd1
-EBUILD texlive-plaingeneric-2017.ebuild 2909 BLAKE2B e3a87c0ae2df60bb6c0271f04979416fe52c6c5b134efc3d4e3959f9590153692df14694871caa2222fdb2f019435cb2bf6d8d198b6477a285d74bb8bc0b8b87 SHA512 39561cf1c5aca68f5f746f0fa0d988c94935b0869fc7aecdb25d56efe02d774ec502dad8ec6fe06f32f78cc19da6275d5a787aa17096d5909bec83f16b53462e
+EBUILD texlive-plaingeneric-2017.ebuild 2908 BLAKE2B fc7b639cc7708511535507e38cc335d6e6d87a1e63e976c63e0c0fed1557032e151a60eb7caf28af0725bce8dcfbfcf73b589a0934c43d38ea2d294996a25919 SHA512 6d4418e992421653ab5a9c3727f6fbcd880037f5fb6292207ca6db287bb2ee6c9ca06b3ea001cc221ba9b22d8b6241bb9b0383e2f9bdae85111825af81ef49ab
 MISC metadata.xml 510 BLAKE2B 499e22771e566c734ad5e8c6a239863e8ba931da1b0784f3320e07d4741afd647cc893a2f0646bb2ddc6b17cb340303efdeb5c8c6d866caa9abe7c97a133a620 SHA512 651f52d36fa1f4c9b767e600554cff9a6a38b702727ca17db398eba1ec732e60351cabb4521bff8a3234230f645fbb9e24af342df28e857fa6d1c6f5ceb3f9c8
diff --git a/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2017.ebuild b/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2017.ebuild
index 0774e33b87c5..c4734401855f 100644
--- a/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2017.ebuild
+++ b/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Plain (La)TeX packages"
 
 LICENSE=" GPL-1 GPL-2 GPL-3 LPPL-1.3 LPPL-1.3c public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !<dev-texlive/texlive-langvietnamese-2009
diff --git a/dev-texlive/texlive-pstricks/Manifest b/dev-texlive/texlive-pstricks/Manifest
index 6e302ba5ed62..b17d5de135fb 100644
--- a/dev-texlive/texlive-pstricks/Manifest
+++ b/dev-texlive/texlive-pstricks/Manifest
@@ -692,5 +692,5 @@ DIST texlive-module-vocaltract.doc-2016.tar.xz 15928 BLAKE2B 35c277d8ab65745bd41
 DIST texlive-module-vocaltract.doc-2017.tar.xz 15928 BLAKE2B 35c277d8ab65745bd415507cb2c3e056783327aab71d6918434675bb41febddd8b237abdbb5398e18d7ee959c3ab20597824a4ece759572f55871437e4cfc7d5 SHA512 38931f205f6a284a8e1397d74ea4987ed99317582f10fc5a28d3dcb06489cb6031d97edbc3a5a0c0bff25cb4a8c1b223da3491573bfaf26b6c76c5569617b037
 EBUILD texlive-pstricks-2015.ebuild 3837 BLAKE2B 988ad479cf87d9fcf47284366d8ff4c17a7dd863a4ab312d98bb7d1faca3910f99ac9cf11dcea7c2687a68d850dc1275933616d57c43f9dbb05dcda544eb0358 SHA512 7984d95ed298cc8bdf142b8d7d5826793cb0d0c0692625926fae792ac26ed8f634d91308c7a5916d2b0749e5895369078625ed64e8f7a01104100228f94a1dcc
 EBUILD texlive-pstricks-2016.ebuild 3906 BLAKE2B 48c1faa217c65c19a0b0dfc7f974c5e669b40dc2d6987cce7b3cf5fccc607e6a7a0469c447c020f3b185094cf48983a8cea2d79f9668398442d179cacbf92d2f SHA512 eab6117beb0d638c0c993a8a10a557a1002d96cb05f822231b3a89137b505fe2dfeaeb9ae3a4a49efbe4c9ce51612ae95327127b1062d13548c555660167b5ed
-EBUILD texlive-pstricks-2017.ebuild 3887 BLAKE2B 3a79c0f673f57186df2c172cb692edb37d4805c72f7e1fb90457c68ccff10dfc1cb4c29507e08248cb07ebd55ec2fca2e71b1e9cd7796d49f4ea8504f62e4a1d SHA512 e33fe830944bfe481d269793493beb80119c550d59bb9d93d8cf8bff4f1399f978cd23cadab4ac85e4d110d2e9e1c8d227e33dde9060ae2cf00f08564f58c2c5
+EBUILD texlive-pstricks-2017.ebuild 3886 BLAKE2B e7ffad7f3342ee4b5683c1d10b87f1847617e247dba3b7e6159a86455448290d9328b6ccd42e8e75c07aff53e5fff71e09204fe1fa68d0c570a0bc1c1d7f8ab7 SHA512 13d35845e5967821c1b117d44823641f056b8afe4a6aa16f47ccadb59f11fd9b0b55dc21e7ea8c7545168bfd594684f3783c8e4a602936366f15f7bb813a4ada
 MISC metadata.xml 449 BLAKE2B 524269780e1b502624f7ca03581ecaa6dc078802561231346bebefc0d9110aa0c8080b52e4ca3efa80c9ed5cd9a680d23a6228cbb693cd40c7d787ea24c7c06a SHA512 a3df336b00fc7b9c13cb71b5bbc2917fd5eabc00fe2cb341ecb845167a3f2d342025d4d81d22f421c79b2cd6fb14782cc1c5fcc54fe720b2e14d5e75f56eb58f
diff --git a/dev-texlive/texlive-pstricks/texlive-pstricks-2017.ebuild b/dev-texlive/texlive-pstricks/texlive-pstricks-2017.ebuild
index 8a34b2bc35b3..ecfd3f48955e 100644
--- a/dev-texlive/texlive-pstricks/texlive-pstricks-2017.ebuild
+++ b/dev-texlive/texlive-pstricks/texlive-pstricks-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive PSTricks"
 
 LICENSE=" GPL-1 GPL-2 LGPL-2 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 >=dev-texlive/texlive-plaingeneric-2017
diff --git a/dev-texlive/texlive-publishers/Manifest b/dev-texlive/texlive-publishers/Manifest
index 0afed7bbaaa3..10b0e8e2d9f0 100644
--- a/dev-texlive/texlive-publishers/Manifest
+++ b/dev-texlive/texlive-publishers/Manifest
@@ -1221,5 +1221,5 @@ DIST texlive-module-york-thesis.source-2016.tar.xz 12584 BLAKE2B 62d8fbc2d8e7195
 DIST texlive-module-york-thesis.source-2017.tar.xz 12580 BLAKE2B 1bae520b3031c8bdebef74a8391f9f89d40e9a0d0cd71a46285e0939f1c0fca4be0ef7edfc491f6f5eb4a48a61404a0026514fbf307ec6a3bc383fe95eb87ec9 SHA512 088375bfb5eb7d55150761e9e322f93e8282735740a30176c3c8e03e720692b3212ddbda85410429e477d95841f396b43a3998d6d03a55b8d3edde0ff592b1ca
 EBUILD texlive-publishers-2015.ebuild 5206 BLAKE2B 89eac7c490c9a707ab43b7c31b741b0af929fbaee896fe9f4cd3d002bf7379088f6ad89128a4ad4b97c7d6df882f5565bb44a4145cd1947794135e0480085763 SHA512 8b19b119e459b980432f71e41b89ed55887c79647facbe967821a282b7d4de691acc10da19634c6697240cdcf5e7d0970d6f11dbbb2afab200996d844f0b73b8
 EBUILD texlive-publishers-2016.ebuild 6003 BLAKE2B 51629da13cdd24d5e6992253133d21ff3cdb5fee110c7a349f59352def289b042aab1c1ed644604c06ff1480025451be33eb6d911cb811fe2363eacd5f6c2c65 SHA512 1698659d1889afd405fc2e94c2f4daab7ec18f0efb0c12267d2673a60e104e82711f1ef40fbca3d6cd6c34572dd991bfecf5fd1b1d78eea10ffa054a10d0a0d7
-EBUILD texlive-publishers-2017.ebuild 6175 BLAKE2B 758530dc5a216198db188c08344f112d154f48f6af64e3de4f09f871c61b674cbab0905e51517d4a34dc52d474494a260bdba35309dfabcc907e5c4d739da5d4 SHA512 d602a446acbbc5c8a7c084510441ab3a3b54c10850092cc15b96ea582def5da1f6d300cec1537904d386cf15e91812cb97978adea17e87e31f6bf2d4f869a1d5
+EBUILD texlive-publishers-2017.ebuild 6174 BLAKE2B 87a74b8a2fe879fce3ff656fbdaeb944850b59c459094d195c7736cf1bd39b3c89f55585c4bcfeb4260a7777be87cf6feb19dffd53f0dcaba04b2d0395fb5c0e SHA512 5d373491c9b89e6c364655f3c0c3190fbd666422772186ba1a8ea5900059c703fd4283c1d4f2ec1134d25d9ab4cbaa736bf83799900e0375387ead9d3d51d7d2
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-publishers/texlive-publishers-2017.ebuild b/dev-texlive/texlive-publishers/texlive-publishers-2017.ebuild
index 54afd0b38073..019ec75902e6 100644
--- a/dev-texlive/texlive-publishers/texlive-publishers-2017.ebuild
+++ b/dev-texlive/texlive-publishers/texlive-publishers-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Publisher styles, theses, etc."
 
 LICENSE=" Apache-2.0 BSD GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c OFL public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2017
 !<dev-texlive/texlive-latexextra-2014
diff --git a/dev-texlive/texlive-xetex/Manifest b/dev-texlive/texlive-xetex/Manifest
index 90373866fc53..c5c0cc643459 100644
--- a/dev-texlive/texlive-xetex/Manifest
+++ b/dev-texlive/texlive-xetex/Manifest
@@ -236,5 +236,5 @@ DIST texlive-module-xunicode-2015.tar.xz 25752 BLAKE2B cf329be8b01de223cec927cba
 DIST texlive-module-xunicode.doc-2015.tar.xz 588 BLAKE2B 6fd1bd78870423aac5f246596b46f120020199d00818701fa6a45e77d7dc3ebc547d352ee264c7b93b22b84586adb242f4e1aafbaf8a33259f8b2dda832069cf SHA512 25cb6d481074888a2a033950fce4779399b311b0fb0072abc41ad30e943e15b1321ebaaa2c34e0b90941ff3df1a2779aa1ef8c336ac93ddf1359bad674502baa
 EBUILD texlive-xetex-2015.ebuild 2137 BLAKE2B 718243970bedd524c327019733d9a32b15f9ef3163927113d783deb3721be873538c8fa6b0e092a6615ff3303784d3db56b7c8f8d95032b6fd5810403f2689a3 SHA512 1fa5f3642c6423469523e90670fed9fe21d45a8caf3abddf71219df821f7f956c89aa55370b899ea571bbe4dbf9aa8b7c6df38b58022da727350bb0946d502ff
 EBUILD texlive-xetex-2016.ebuild 2095 BLAKE2B 60f9f421b0a8e2eed9d21718422e93d0f97a50a6de7f5d9dfd128beb0eba742497ce87da878c16e651679d86b319fbf70135cd258b7c69b1cae0bf5c1a3de2b7 SHA512 1e14458de84ba0dfdc2d32594cb074981251b6915b7408cfe417d696c3d9e9af51de28c1135ae542fe0ec24710099da7198615c1da48e4cbe080c99a0bf01a67
-EBUILD texlive-xetex-2017.ebuild 2188 BLAKE2B c10af5825f1bf046a394f73a83d784ab5b8c24c48001a0a25d16666ed0e83498d0f102d392390dfac43db6056d1a6bd9b76a6492d8efef3b876765b1a2e576dd SHA512 a3535835926d1352e9ec4b682bb262f92716cc648d659f27cb920b923b823f53f93c3446521512b1dbf9fc058d64fbfab152b3b7bdd8832d0e0ce2e6c7c0ffe2
+EBUILD texlive-xetex-2017.ebuild 2187 BLAKE2B 9cc4ccb1b8868b3d23947d40d364542a5bb95d27117af0476d51e3437a6c6b2ae920fd5419a54af45afbde607b0cb3d90a471a8aef379a2f7b73f086db65bc6a SHA512 9898f5e2999519454f87badfa1e69770fcea88c2e05c6f5b0599cfd25c71c6768e1109a9d53afddd6613d8dcab5f6cea0b0cc1d7a0300d4a13f739ab9d9cb352
 MISC metadata.xml 504 BLAKE2B a78657320760b67ad93c4a3c8742b007639499446359800bc66c332b20dcdeec00835b9c17b576a45398efb5b15275427a74dfc1a474c513f8fb4eb0fc58d68a SHA512 c93e85dfe7e3cd8b815b3ceaa52f9fc91899eafa788904ccd10fea03bfbf40f5699e90f059899ed721a23f34b368885e38aa8e22e11f5950d3cae1bbe2626e96
diff --git a/dev-texlive/texlive-xetex/texlive-xetex-2017.ebuild b/dev-texlive/texlive-xetex/texlive-xetex-2017.ebuild
index 8c2dd571cce5..fc7b054d3431 100644
--- a/dev-texlive/texlive-xetex/texlive-xetex-2017.ebuild
+++ b/dev-texlive/texlive-xetex/texlive-xetex-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive XeTeX and packages"
 
 LICENSE=" Apache-2.0 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c OFL public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !=app-text/texlive-core-2007*