gentoo resync : 09.03.2018

23 files changed, 181 insertions, 19 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index e2f9cc4022b8..a1f326e79574 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 4dce327f6975..a6d208fd330d 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -3,11 +3,11 @@ DIST ca-certificates_20161130.tar.xz 298656 BLAKE2B 8574745d8ef62262b339035ca11d
 DIST ca-certificates_20170717.tar.xz 293028 BLAKE2B 85076cd980841f32e2544c7be020fca9bcd5ef7066ae3cef195cbf9755f8b8e800a8e4076662fa1b7da600c2235e49048eb6e1166b0618fc7685221ab790fed3 SHA512 dfeb5a19bb33bcb127a159b73fcc63b41c99827d77eb4a6069def0cffc7ae8dd10dab97c1ddfdd5b70d0c93e650a51ed5dcd03908516e7ca8b3022bf46eeb7e6
 DIST nss-3.30.2.tar.gz 9499119 BLAKE2B 720ebe79c791f80f1717548cc9a8afea455ee8d74c1489bcecf0229b6f19f5bbcc66e9625ac74b655c55897450400090c19eac92c035276c8815fcf98bac945c SHA512 02f14bc000cbde42268c4b6f42df80680b010d1491643ef9b11e0bac31a286a2e7fa251c40cb4ac70b64883a1b90efc64440ef9d797357f8a47cd37195fc5500
 DIST nss-3.30.tar.gz 9500552 BLAKE2B 634734400562db5b35f170c5d138fbad45cfdc972a4154db8e2ce7f810d66ef9bad972c1204bc88bae7374d03f4d5c7845d85eb340b387189c258d09b3d7b699 SHA512 c21e9b5e4b689ea8cbc6f4d7913df43e2a78c4435e0ce092f2ce00e46079ce2268e17ec8527b283ac69eff3d96ff0165a5b42b6579bfe0a720115ff2938260d3
-DIST nss-3.34.1.tar.gz 9562876 BLAKE2B 645fe06435dffa1a0dec688c7c10854dbd664e719889b36027dc2e52c4f585c2ce7bdcd947dcf5d938013246405c04e1b9dbd802b229e0acc96fc07f321bb51a SHA512 6cc4826df4202e865e903a2ed05b49f708a047347b7b4d58f9b83ed097115a128239c4596a033ddeb9ee3fbfe6345a024e11eacb6149bce2d71fbe82c0a41c63
 DIST nss-3.35.tar.gz 9620041 BLAKE2B a4115117ff017ce36f030d9f69c75111177166651968739353d112cc5d2c4732b33b8c684c5957a66bb969ecab1a15fb2cd6bb237d959d307cdee43ec638cd73 SHA512 8d466f4602427d278b6aa28af0e6bdb99326fc40c94ac6d517d1cbe7ce6b9332dadba52ea092762fac2fd6e72f17cb880cf81e1cf86bf6b4f7913a755419626d
+DIST nss-3.36.tar.gz 23025578 BLAKE2B c8dd8a4c2bcda15bfeab4e7b49e790aaa2ecc3021ab014ca4e7b9253cad2ce140bf719cc336ce74d5074722c63d5a73d4a4e75792aa779b008d635a765e0c5b8 SHA512 e4d5cc475f1fcca9a42a139a890b70dbc3fadf5ed8a626c8d6bf929a97bb91ca9a42fe967df95784e5d997a3ec5c5a87684256ddf91b8dafa827103a98ad39ae
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 EBUILD ca-certificates-20161130.3.30-r1.ebuild 5945 BLAKE2B 5b6b9a89b0c9d22f6199d0e57e257c96f3420b33a457554b8fa146fe7c291fe3117c2e2eedca4029d848c6068b1e6a5572c0785db455a795ca552dc13f022632 SHA512 58c4adc50e9dd6057ebf59cb87e545297aeef88444150edc88f0485be60cf00022c9f31196c10db52426a9a62249f0b87eb92b0dcf900c1a22f0a81ce575dfe7
 EBUILD ca-certificates-20161130.3.30.2.ebuild 6236 BLAKE2B 4c03bde354f763bdb5eec9a1301073d722958f4a43a70ffd44d838725a5cd40fcd165d19690298d0452df05e65e278581454b6b4d1a8467d8d9c8cb0f33643c8 SHA512 444a9cc25ce4e6d250c152d8b324548240bc759c08d6f230a3b6c274b34d65aa2e2ea9b15e87dbbb74dbe62739a345b21fb4c8c365ee2695f31d99ede256ea55
-EBUILD ca-certificates-20170717.3.34.1.ebuild 6266 BLAKE2B 8f07707c53e433729c098b978072ef4a5a89d21fc2f35480406668adf331e17c669e0d41e86d215b5acf49ff0fde2c5f14e5d14e63f7f6aa11318acd272c72ed SHA512 1bcaebdfacff61b3fb618f060cf15b050bc896ac6330082a834f31ba52c89bb924e194a7a347ced9321d05ee86e59b8c64900559e89d495f490c47b005405582
 EBUILD ca-certificates-20170717.3.35.ebuild 6266 BLAKE2B 8f07707c53e433729c098b978072ef4a5a89d21fc2f35480406668adf331e17c669e0d41e86d215b5acf49ff0fde2c5f14e5d14e63f7f6aa11318acd272c72ed SHA512 1bcaebdfacff61b3fb618f060cf15b050bc896ac6330082a834f31ba52c89bb924e194a7a347ced9321d05ee86e59b8c64900559e89d495f490c47b005405582
+EBUILD ca-certificates-20170717.3.36.ebuild 6266 BLAKE2B 8f07707c53e433729c098b978072ef4a5a89d21fc2f35480406668adf331e17c669e0d41e86d215b5acf49ff0fde2c5f14e5d14e63f7f6aa11318acd272c72ed SHA512 1bcaebdfacff61b3fb618f060cf15b050bc896ac6330082a834f31ba52c89bb924e194a7a347ced9321d05ee86e59b8c64900559e89d495f490c47b005405582
 MISC metadata.xml 538 BLAKE2B 20dd319e6f583b4b6b93fdfc7fb965c54c7b92426715cf287611ea58ed5040ffac4afa77df2e6464a387c120a8d80d508c6e997c820eae9395ba859b13c5702e SHA512 f2779da4ea4b24e196b64d6e4c94d47e426d431508db58355a08ca420498cbbe2f322c5f8dc6e132b612baf03ee6bb1561beade226bd2f71d6afa160064d7a7c
diff --git a/app-misc/ca-certificates/ca-certificates-20170717.3.34.1.ebuild b/app-misc/ca-certificates/ca-certificates-20170717.3.36.ebuild
index 198af98ddbf4..198af98ddbf4 100644
--- a/app-misc/ca-certificates/ca-certificates-20170717.3.34.1.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20170717.3.36.ebuild
diff --git a/app-misc/calendar/Manifest b/app-misc/calendar/Manifest
index 786b3e9af762..a5e816dea8b3 100644
--- a/app-misc/calendar/Manifest
+++ b/app-misc/calendar/Manifest
@@ -1,4 +1,4 @@
 DIST calendar-0.9.1.tar.bz2 65225 BLAKE2B b8ee591005d57fdb3e18412c9665ee3447f607224efad261ca0cf7a3dc88e94e8bfb8309b19996e38e7e18c26bafcaddc9ebf7d612ed25d7d1d159b63b7b6827 SHA512 c8f373ad06265720ab6ba1edb9066cb5474806d023bf0cb3a35876c5bad72de8bac8ab58c2b6d3a9f418d20d04b1811e256abce9296c9c8547c9b7f8005adfb3
-EBUILD calendar-0.9.1-r1.ebuild 633 BLAKE2B a1838e46dff6edcd0cbd3975609ac855aad4a1a46bc52707cb3b394cb208e61c8ffb0dadcf947970506465ce2c18bad1ef4ff77ef94dbcb95763c952b668181b SHA512 b9e2e60fc6b0fa27b49edef49828628c86adbd299ca386944ee458a711dd540dbdd9494ad749cef54764bee348fe797291327e79e6bbd444b6389d02a46c6718
+EBUILD calendar-0.9.1-r1.ebuild 632 BLAKE2B 3aab9f756c907ecb0afcc68f130b28aa60239f570b7c91393a79197d731a0fddcf940627c00d7acf3dd8e60bb587cfcc596b74285f8e4480338f13b4924061cb SHA512 23cc641518bf0ad3f674e16523a70a24051a0708d10e691c2c9a535be254586eeb1eab16cb5620b2178f7b130aabbf7a4683a678752f1d94deb9c4152867161f
 EBUILD calendar-0.9.1.ebuild 641 BLAKE2B 194b76a151bc43eb13e99f2ffa6cb0b3538f96b5aa3c79b52c1bc6f271c26492dc7cc7be4358f7138bfc5ea0819cdcb725e38788dc4ff69bb36c7b77059dd67b SHA512 24d3ca5ae255af3344c3ca2f9ff02af292ca388c7377d2f585e5be00ef6c4753f1ed2e81077138183be9b86eab087fe0861254fa1d3d651f9e4c42e2fc1d7651
 MISC metadata.xml 346 BLAKE2B 365bbcf4fca5fb793b4b9499b021c028eb13d1634d21a1c1627cd528c0fe77c195f7f789ee7cce987297ed8e8e20cc9937e83f6d5292b3878a25426488a3d691 SHA512 9fb15d47c1b5ea5eba7614339ed44e8812550589416f8fdb5aa02dfc899c95b782526577f97a24e024c0298e09af634b8a3dc27474755728d81866100c8d066d
diff --git a/app-misc/calendar/calendar-0.9.1-r1.ebuild b/app-misc/calendar/calendar-0.9.1-r1.ebuild
index 9ff0da301319..788efd4a52a0 100644
--- a/app-misc/calendar/calendar-0.9.1-r1.ebuild
+++ b/app-misc/calendar/calendar-0.9.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://bsdcalendar.sourceforge.net/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86"
 
 DOCS=( README )
 
diff --git a/app-misc/dailystrips/Manifest b/app-misc/dailystrips/Manifest
index 0dd8fc4a35cf..5e13de71cb8d 100644
--- a/app-misc/dailystrips/Manifest
+++ b/app-misc/dailystrips/Manifest
@@ -1,4 +1,4 @@
 DIST dailystrips-1.0.28.tar.gz 58713 BLAKE2B c7d1c04c7bbb655898a21c042636655b058fcdfdba3843d6d42bcce0c0315f765c4080987c95256e37601773b6587654e8d9b9eee197253b7e93a1804823de10 SHA512 a5388d5bd45ce1b8b22420c3d53bbbf4d26fec9737c6edca3b579126443e4f88ae5a7ce5c6770264ca96ea1488ab69b73831ab6bbd20e0f68854fb08714565cb
 EBUILD dailystrips-1.0.28-r2.ebuild 810 BLAKE2B de7b86da861863a1df925985b36033df94d32ba4e919ceb78ec1567ec5ac59bc7ff797f2ab954fee4259df87e6c3e33e2fffd1c3e840fc49f40ba86ffbb1dd08 SHA512 ef444ddf3c8caee991aae8e23fe013b84be795640243ff10f6c3c5af61ec09e4c21a732661c1576dbc752766ff2b2b2c322a6fbe9083f95b7256740fc405a618
-EBUILD dailystrips-1.0.28-r3.ebuild 750 BLAKE2B e515204fce0717672a3241fe45bb49d8751b8ef8dafb8b0f585f9b02d9758f48844d240bb05f3c30b4cba71966739973e23cca53012a9bbcf046c5474859612d SHA512 b2e1cc28bc3949b3fe16de9c18ff747ad4470999aa228557e661929bf36dbc2119629a28858dea7f758d2cfbaec77e526e66aa8655dd9ce1fb2a1f42cd2de642
+EBUILD dailystrips-1.0.28-r3.ebuild 749 BLAKE2B 514484bb53c78d9e445c0b798a9763a2fce345544213517e55f9a921bc87a68c000fc710248f2d2d5d2a53b5e32fab6800e9ebb40bcef0c4458f1cc7d39dd7f0 SHA512 47be6b5b5228e32cff62f1647466e551bcf14bcb096f54db9df65a6ee24361d52fa6deec8a5ec166789b60b5c4a40f77e4a40bdcc4a65724e4a58d7523113c0b
 MISC metadata.xml 248 BLAKE2B f0ce888e7f1c4373cc6d4f88a6e2870bb26e24adc5a50f747425399e154b44a93827635635fa82be033506a79d4d033119fabeae8bf24367d1dae19ce4129e67 SHA512 d08bc57fb26bc08dd2c8eb96219fcf98dd63b1e9ac4725dd0bc246ec90db63ed13cf9653d94ad11789ae3efc933d9ed9781bbb4db6f439c5596bac12011b7552
diff --git a/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild b/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild
index bc2f4ac04ccb..6ad447cab8d6 100644
--- a/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild
+++ b/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/dailystrips/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc x86"
+KEYWORDS="alpha amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND=">=dev-perl/libwww-perl-5.50
diff --git a/app-misc/inputlircd/Manifest b/app-misc/inputlircd/Manifest
index 344a745a6e3c..d4234fa9604e 100644
--- a/app-misc/inputlircd/Manifest
+++ b/app-misc/inputlircd/Manifest
@@ -7,5 +7,5 @@ DIST inputlircd-0.0.1_pre15.tar.gz 5226 BLAKE2B 92339021451b2575de5adbf6123f1083
 EBUILD inputlircd-0.0.1_pre11-r2.ebuild 788 BLAKE2B 186c968570aa829bf7a4a947f7a6210db4edb38357ac59f3e30afacd97acc6b8473cee1c1e191db7391684c0c582a32921d1d4625e6f2aae3cc63f3440cb6db0 SHA512 dbb451f60f1da705f5d87273dafc96e145bad81f45a3789d900385c6c99d016c8efd71082c6ee9eacd96d25a440755d529a915d44f8e6ecf0d0276918ed5db70
 EBUILD inputlircd-0.0.1_pre11.ebuild 586 BLAKE2B abe1411ab4f1e339b4c4ae6737e3c8f644d15c1b704d6dcdad3ebf0b3754b1bdfbd03d2d9b0a2c0e22cd27e08a86b331a8a2b62809b31b7532b0eccdcd5de281 SHA512 62ca7270bbcc7d621d936753ed7f5fa3f6b572de4313b52ea3d8318f06e1ebb316259b78111aae9a8240ade4523a05b11ce6a286d837d7981f53f18d8d2c48bc
 EBUILD inputlircd-0.0.1_pre15-r1.ebuild 787 BLAKE2B eb23152b943475a63ed158407ec48945574adecf125f700287dc90180181731cb47b644e403bddf53e21a14ba895d41fbdbd9154cd9ad4bbb31b16d81fc9b8aa SHA512 0a6ef5f19829c0d63b2c54baefeae293f693e21af88df9d4a10cec4f27ccaf77f915c4d78c3db6a5b4e43c64ac596a07c654f04b3ede78b8c900945a3718a2fd
-EBUILD inputlircd-0.0.1_pre15-r2.ebuild 916 BLAKE2B c940152e33cc29998993abd6d8c0412126bd86d6f3b151c7154b531a51804fb79fa9984d248b4d838e825329e27bcdd392f62c0e6a61d995d27a82dfefb5d5f9 SHA512 12877201ebb8a5641210f19b0b14a03b73ad4d0eb450fe416bd6d1529f8c353478d5f0c20387626f1b9d598bb4119861fb55e572f0c398602af68c54bc3e4d58
+EBUILD inputlircd-0.0.1_pre15-r2.ebuild 915 BLAKE2B f1651c621f844888537b03fb297de41b3052ae86ff8ff9d8a730607f70e524f90ca0afee12718672ce8a526a378f0b6ece6e09326b74ca46a4a705224325bb92 SHA512 6098adbefbd84118e01a06c5ac956cbc8735c568bbba5f214c21c7402505e265d81ac1027ffc68c5c98bdd7c37a4094c7cabb75419d977d8067223418de074ea
 MISC metadata.xml 258 BLAKE2B 1878517d827956dbd45c2d86e97fc066cd4293c3cc94d6d4beaff553462c1badb68aa38b3082c01fe6e21ca1519fc482e2670931d007382b8b2c38af715fe02d SHA512 33d52c9b472999f5722ba6a13598524745093ff45394dd1c9f560b051c9d28be465f72db260a148831b1ff8bc175f41d0c1e4b2d038afc0afdd230b039c67c2b
diff --git a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
index 945592c7f128..504daacd2695 100644
--- a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
+++ b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ia64 ~ppc ~ppc64 x86"
+KEYWORDS="alpha amd64 ~arm64 ia64 ~ppc ~ppc64 x86"
 
 src_prepare() {
 	local ver="$(best_version sys-kernel/linux-headers)"
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 3de313bd91cb..6b697e545ea8 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -5,6 +5,6 @@ DIST pax-utils-1.1.7.tar.xz 648376 BLAKE2B 676551b2391b2ba27281d26fba61da7d0d277
 DIST pax-utils-1.2.2.tar.xz 655964 BLAKE2B 5e43b52648f1f0cc1f46616ebd9a554cf2e5909292337c84f9ee0e2eceb4879a5f16ca20700e5a16267b38ffea529814949817ea6054cd1b2ea38e267455de00 SHA512 6bafe93f3b84d4595b6adfa09b46a3dd249f309fe836d90115e9aa5fcc7da37b03f743e80719dfe6bcdb739ce6ec3843170a5513e196c348721f850e19d3e38c
 DIST pax-utils-1.2.3.tar.xz 661828 BLAKE2B 4764c47b7a31e7470a454127b9db3b5b27c703a96a66973a6248529a2d858ea38adb246a270a1f343a499515f55b25613bb20c46978e2e0dddc03e5ddb9a2aa7 SHA512 efcbce49aa7e5cd433f9b3fbc8fa82f6d7b0eb80ec40aafde453d6fe96e3565e066e5020f04d71537d8d4e820147f4203c0df2dd330ebb1358a26def3dd5484c
 EBUILD pax-utils-1.1.7.ebuild 1472 BLAKE2B ac8f899442a870fe81f1d5c80bd3ccf24082ecb029de9520bd45cf1efccf6e0ced8685af3c16ae25c9d57733a3e2bf57bb5d0e543e7f1e43244867807b35bd2a SHA512 7e166188a86da296040f1407377526f444af689e2aeead564f28089b996b5f34d658b3197b881ef84b3aa7600309f71d54cbbd86fdc61ce71706a64f8bb12368
-EBUILD pax-utils-1.2.2-r2.ebuild 1631 BLAKE2B 93325fab783633b6ad3c677febc206754fe12fa58b0f4b193bf3ef9575ed29473c4da569c1b35a25d5ea5fa42b299293adc33066434faa5eb0fa4ad6878543b7 SHA512 9eee026d4e51a66c33ea0126fb47b90cdb1b2a469a3a97e982351e387d7f3b05c7dcab70578d1e15ad9225501f6b1dbbebf435973295c8a11c300c8f3ec8911d
+EBUILD pax-utils-1.2.2-r2.ebuild 1630 BLAKE2B 95cb45f9b0ab86419cd59a3f2c48e35bb800716c1ba020241ffa79efa94cd1681e210a56362918d9994b04f22e84ea59a18c003ecbe07520a4486ed50b75f864 SHA512 1dbdccc6f69088f375a74f729bb58b4af4964ffdfbadb5d0547171c260aa8b86e2ed0b217427dbb98b6e8ed2d66503c0379049d4a5f39dc0479dcda05c2a2b6b
 EBUILD pax-utils-1.2.3.ebuild 1488 BLAKE2B 578a405210bc5e0beb2725cbc59ff3b1d39a9740fdec4d032e381fa87999f139e2face9830914b79d631d92d293005898549a79914d47011c8e097d3029de8fa SHA512 1f3d96207ef7a9a5f13814bf85edb2b601fd2c915dc0c498880a294f85cd703774b897b17f91a6f5308bba1640eee9901084d000192e8baa8791fe9f88396dc9
 MISC metadata.xml 706 BLAKE2B 1660bd83c0164ecb4c187d6271cd1f27a8140906bef315bcfc4be37594f91a79cfa9da8fb9dfd1af66c6c7028ed4d40ef891b025fb12b9486b7ee366a3e5c354 SHA512 3691bf431cb24ad3498b137f0e264562451db583201e1cae327ed201f36d838f01dfe78e3569a2d24593c67f747dff17eec645bacf0855148c72354ebeaa26f1
diff --git a/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild b/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild
index c04fad8a2291..e1a84f81fed2 100644
--- a/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-misc/rbutil/Manifest b/app-misc/rbutil/Manifest
new file mode 100644
index 000000000000..2d3028feb209
--- /dev/null
+++ b/app-misc/rbutil/Manifest
@@ -0,0 +1,4 @@
+AUX quazip.patch 2401 BLAKE2B c011701e4f416289a5bfc681f2ce3184db091a744192e4b48ae9a42939e862739b030d88caff41a74c4b2ec5ad19e2e0bfa9c3ca0b9dc39f3413cbac41f06714 SHA512 34f2cb3d95ae3ed94adb25964f9009be8f5bab9a93df7ea993797065d297993d1f83a495eef9ee9c3339f8ba6f1e2b6778f8ecd667cf9538d84387373e7322dc
+DIST RockboxUtility-v1.4.0-src.tar.bz2 1181116 BLAKE2B 64d0cbedb3917a8f3f79e2b47b8eb230bb5fd6627ffd0647d5fbb42973d07675ee8a8f0eb9ae6e3481a8bd4cb4a183fb463bf97a1edbb2a74076e7a595f09ade SHA512 705723d6ee2231c3b79d0c67cabc7c6c00d3f1a76a970c1bd15e028a98b4a25de987b0921ea932ca0098defbec0bc9bde9d9ed3a79dd46f81da18bb5472be9fe
+EBUILD rbutil-1.4.0.ebuild 1368 BLAKE2B ea42c5d6fb96eb01e93487f4e05a8747c9395cf033544a51b1b6f37474356af846aeed0b765c6ab0049b2cdf1230e90a10550a6d715545a2400c5f1bb1dbb759 SHA512 90867d25c0140517d1df46bd0fb78670a5a9e430bc935d91a0b475bce706c087749fe47f17ecac8a78807e60541ef4834943c2c4904e771406202568b105dda0
+MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/app-misc/rbutil/files/quazip.patch b/app-misc/rbutil/files/quazip.patch
new file mode 100644
index 000000000000..9d803712209e
--- /dev/null
+++ b/app-misc/rbutil/files/quazip.patch
@@ -0,0 +1,88 @@
+This patch is a simplified version of a patch I have sent upstream.
+http://gerrit.rockbox.org/1825
+
+-- Chewi
+
+diff -Naur a/base/ziputil.cpp b/base/ziputil.cpp
+--- a/base/ziputil.cpp	2014-01-05 22:44:53.000000000 +0000
++++ b/base/ziputil.cpp	2018-02-25 10:55:36.994002648 +0000
+@@ -22,9 +22,9 @@
+ #include "progressloggerinterface.h"
+ #include "Logger.h"
+ 
+-#include "quazip/quazip.h"
+-#include "quazip/quazipfile.h"
+-#include "quazip/quazipfileinfo.h"
++#include <quazip5/quazip.h>
++#include <quazip5/quazipfile.h>
++#include <quazip5/quazipfileinfo.h>
+ 
+ 
+ ZipUtil::ZipUtil(QObject* parent) : ArchiveUtil(parent)
+diff -Naur a/base/ziputil.h b/base/ziputil.h
+--- a/base/ziputil.h	2014-01-05 22:44:54.000000000 +0000
++++ b/base/ziputil.h	2018-02-25 10:55:28.513838004 +0000
+@@ -21,9 +21,9 @@
+ 
+ #include <QtCore>
+ #include "archiveutil.h"
+-#include "quazip/quazip.h"
+-#include "quazip/quazipfile.h"
+-#include "quazip/quazipfileinfo.h"
++#include <quazip5/quazip.h>
++#include <quazip5/quazipfile.h>
++#include <quazip5/quazipfileinfo.h>
+ 
+ class ZipUtil : public ArchiveUtil
+ {
+diff -Naur a/rbutilqt.pri b/rbutilqt.pri
+--- a/rbutilqt.pri	2014-01-05 22:44:57.000000000 +0000
++++ b/rbutilqt.pri	2018-02-25 10:54:39.793852035 +0000
+@@ -69,12 +69,6 @@
+  base/rockboxinfo.cpp \
+  ../../tools/mkboot.c \
+  ../../tools/iriver.c \
+- quazip/quazip.cpp \
+- quazip/quazipfile.cpp \
+- quazip/quazipnewinfo.cpp \
+- quazip/unzip.c \
+- quazip/zip.c \
+- quazip/ioapi.c \
+  base/ziputil.cpp \
+  gui/comboboxviewdelegate.cpp \
+  gui/selectiveinstallwidget.cpp \
+@@ -156,14 +150,6 @@
+  base/rockboxinfo.h \
+  ../../tools/mkboot.h \
+  ../../tools/iriver.h \
+- quazip/crypt.h \
+- quazip/ioapi.h \
+- quazip/quazipfile.h \
+- quazip/quazipfileinfo.h \
+- quazip/quazip.h \
+- quazip/quazipnewinfo.h \
+- quazip/unzip.h \
+- quazip/zip.h \
+  base/ziputil.h \
+  lame/lame.h \
+  gui/comboboxviewdelegate.h \
+diff -Naur a/rbutilqt.pro b/rbutilqt.pro
+--- a/rbutilqt.pro	2014-01-05 22:45:00.000000000 +0000
++++ b/rbutilqt.pro	2018-02-25 10:55:04.577357613 +0000
+@@ -114,7 +114,7 @@
+ 
+ DEPENDPATH = $$INCLUDEPATH
+ 
+-LIBS += -L$$OUT_PWD -L$$MYLIBBUILDDIR
++LIBS += -L$$OUT_PWD -L$$MYLIBBUILDDIR -lquazip5
+ # append all RBLIBS to LIBS
+ for(rblib, RBLIBS) {
+     LIBS += -l$$rblib
+@@ -122,7 +122,6 @@
+ 
+ # on win32 libz is linked implicitly.
+ !win32 {
+-    LIBS += -lz
+ }
+ 
+ # Add a (possibly found) libspeex now, don't do this before -lrbspeex!
diff --git a/app-misc/rbutil/metadata.xml b/app-misc/rbutil/metadata.xml
new file mode 100644
index 000000000000..54be7ff7e5d6
--- /dev/null
+++ b/app-misc/rbutil/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-misc/rbutil/rbutil-1.4.0.ebuild b/app-misc/rbutil/rbutil-1.4.0.ebuild
new file mode 100644
index 000000000000..0982dffdb4b5
--- /dev/null
+++ b/app-misc/rbutil/rbutil-1.4.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils qmake-utils
+
+DESCRIPTION="Rockbox open source firmware manager for music players"
+HOMEPAGE="https://www.rockbox.org/wiki/RockboxUtility"
+SRC_URI="https://download.rockbox.org/${PN}/source/RockboxUtility-v${PV}-src.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+RDEPEND="dev-libs/quazip
+	dev-qt/qtcore:5=
+	dev-qt/qtgui:5=
+	dev-qt/qtnetwork:5=
+	dev-qt/qtwidgets:5=
+	media-libs/speex
+	media-libs/speexdsp
+	virtual/libusb:1"
+
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/RockboxUtility-v${PV}/${PN}/${PN}qt"
+
+PATCHES=(
+	"${FILESDIR}"/quazip.patch
+)
+
+src_prepare() {
+	default
+	rm -rv quazip/ zlib/ || die
+}
+
+src_configure() {
+	# Generate binary translations.
+	lrelease ${PN}qt.pro || die
+
+	# noccache is required to call the correct compiler.
+	eqmake5 CONFIG+="noccache $(use debug && echo dbg)"
+}
+
+src_install() {
+	local icon size
+	for icon in icons/rockbox-*.png; do
+		size=${icon##*-}
+		size=${size%%.*}
+		newicon -s "${size}" "${icon}" rockbox.png
+	done
+
+	dobin RockboxUtility
+	make_desktop_entry RockboxUtility "Rockbox Utility" rockbox
+	dodoc changelog.txt
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/app-misc/tmux-xpanes/Manifest b/app-misc/tmux-xpanes/Manifest
index 15b4bff43c75..d782b22c4a9f 100644
--- a/app-misc/tmux-xpanes/Manifest
+++ b/app-misc/tmux-xpanes/Manifest
@@ -1,3 +1,3 @@
 DIST tmux-xpanes-2.2.2.tar.gz 34457 BLAKE2B b4f33ac6576db4100a4d6895c3c705fe3d44093a1c63d89c20f4203fb71160415903ae70880387f0419ec5bebdb9244a9e5802d9ae8a9c441e3ceebea1e70582 SHA512 0d5242daf95c0af78b64184ba1473620783072851f34fe2a91d4806dc529402bd506ada2e8a455b687f4504bac5cac8300249d555446edaa54a41f3b2eddd45c
-EBUILD tmux-xpanes-2.2.2.ebuild 704 BLAKE2B 5e492bffdc077f4b317d7d0b3eff712c9ed810a0cdfac637c53ef8db72f5e6610e26ae1d97999b0296e3418c6ae90fd4b0c52c683027ed34d0c249d46b1d2686 SHA512 51311239f20fb092771105521d3cc70c30e4e5aeb94dbcfea5499d3688453126278757a86b3eb02aad2d8711d48187fb9439da379e9a89baaa95dc02441eca00
+EBUILD tmux-xpanes-2.2.2.ebuild 702 BLAKE2B 814208eb19707396bb17779664288de0ab1c220daee34438a749ff752026738c882414547dc22eb6f1f10b19767d3b89ad461112202b936516b62ef8ae6c552d SHA512 1826a0673fd24ff1a5b16e8ee5a312b76be2267087c41239fa83482f56bffd43b9aacd74310f3405c408ab762d5ff5e3e875573db75bfccc6304aa0523b3e56f
 MISC metadata.xml 460 BLAKE2B 2f0ffe7b708299dbcacb08b48bc4cc78ab360310e1234b0d06efb65543de75996ad5f1469bab45f912ba44817072b4f1b845bea50ec9ced322b90bbeab07042b SHA512 b275a2b153cbe7d0a1f4bb5492bb0b884e16aba4baa543f050e316d9086d6d1661d6b49c11ff49711b91672fe1f4c8ffb54cf98abca409e6c50ea0001ca2516f
diff --git a/app-misc/tmux-xpanes/tmux-xpanes-2.2.2.ebuild b/app-misc/tmux-xpanes/tmux-xpanes-2.2.2.ebuild
index eb9cd315795c..8b1b598c9eab 100644
--- a/app-misc/tmux-xpanes/tmux-xpanes-2.2.2.ebuild
+++ b/app-misc/tmux-xpanes/tmux-xpanes-2.2.2.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="tmux-based terminal divider"
 HOMEPAGE="https://github.com/greymd/tmux-xpanes"
 SRC_URI="https://github.com/greymd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 27df45df720c..58ec224b4fe6 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -15,6 +15,6 @@ EBUILD tmux-2.3-r1.ebuild 2234 BLAKE2B 3bb0de689495b69f479ad605480a0c93a13cbdbd5
 EBUILD tmux-2.3-r2.ebuild 2242 BLAKE2B 75da9813dc3ab1ecb854a15c8c06e84b88feb51bf21f876eaf385040ef07071be1dff7f34c6f9b62402a85f042f0088c4da088b1b882fbafbe292c4d7ec01d1f SHA512 ac9454dafba18b5f76c0f77a620ece677b8d195cb6f50fc57116bea4985e7c01e692d758ac42eb3a20d7c2c18f73c8bfcc2460f9535fc2c80180d3efb1462e6e
 EBUILD tmux-2.5-r2.ebuild 2073 BLAKE2B 1c3ee0f7eb1e2a26f5c7a0bc73442dcdd160d1bdd9a7bdad62a2397854b8ad08b4c055b985df9d8ba3d1bcf49033c30ff28443f8f7abbae55b54a622035c13d0 SHA512 fa557f19858c312918d6190cbd029dcbfec05a494236027e3be78bd8be8843823f5112150387986709881577b0bb3fc66bba42a4001729456136dd89739844d5
 EBUILD tmux-2.5.ebuild 2263 BLAKE2B f03e993159487bd92fe3e328d5f79d7bb3bc6b75ab3ecabae51dc64b156db260c7e2242a173e77a32a16dc14ab6276feec77cf7d94f2145c98d6209e9a8fed4d SHA512 d5abbfd108431a47bab4195e9397d0b2748fd59c0036c0c71caa34b741069eb0a5a3d14fe98d0874d312e740a5831a7df3aecc0de2eb3163842663a94638a389
-EBUILD tmux-2.6.ebuild 2144 BLAKE2B 3a59af25ae6fe4f50546180489cda3b1cdf97fac0685e176487556ccea7551c5d1e68e3d3f1ea1a0eb26900a54cdd161e5eee0a26d58a6da13c9671e02b04860 SHA512 c31938eeb6ff25b52737e99da1aa041e25908345063668d2bde4b94e84c7da36449c826392394de3868118995281d97e129caa692ddb64bab94b78faf0f3ba1d
+EBUILD tmux-2.6.ebuild 2143 BLAKE2B 60ac538726dc9c5e6024853390e3015020c06ff0b7db68687f4e0380370e1d29ee9b1ab5f44360e4aff8d566541f680ea68870471eaeeafd9655ba7d9fe760ef SHA512 759df785e3fa157d427af7c1bb7e1cdd99da4647bf53e340b3a9729779dcad901064b1767e5ff2f577439d6938fa24f594abef3ef52d2860458dabde79abafd3
 EBUILD tmux-9999.ebuild 2349 BLAKE2B e4f633dc28e278873941f66efb8adfff9735fd04ad98e505b474dfa657303033ba8cf1cc22f64f7e66ef248c2621858461bf133b2aaad9ee817ae80eba4de847 SHA512 0fd75b67ac3e782f9c6aec6e36bafd69f025555c493961da7945994b0cb3dc1d8991d5a41ad68f85bd176564427e0b5f21ffc53ee9a4db41d50caa043ac0dec2
 MISC metadata.xml 708 BLAKE2B f89d9daf3de56b07d231b4fa3dec0179d8e32579a76142085b96611fd08db4c26af40d1ac92684f9d1e378ce624647bab26ddf877aceb86af4987aa4e555e045 SHA512 2d676e2d9a5427a287d7dbe0d73e6ea96b2eba3328c8380a503e814e263a5c6ea5b4bf33aef7c9e0840f37d75b40e5e4a4feca5cc07c38de50b35e9da497f8ce
diff --git a/app-misc/tmux/tmux-2.6.ebuild b/app-misc/tmux/tmux-2.6.ebuild
index dabbb790530a..5c212fbbb4e1 100644
--- a/app-misc/tmux/tmux-2.6.ebuild
+++ b/app-misc/tmux/tmux-2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_*}/${P/_/-}.tar.
 
 LICENSE="ISC"
 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"
+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"
 IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
 
 CDEPEND="
diff --git a/app-misc/utimer/Manifest b/app-misc/utimer/Manifest
index 0e742677c76d..ad5938b9a835 100644
--- a/app-misc/utimer/Manifest
+++ b/app-misc/utimer/Manifest
@@ -1,4 +1,4 @@
 DIST utimer-0.4.tar.gz 144408 BLAKE2B c23178e8501034c491d5350ef5d6ec4c251dac982f453f0b99cf6b4aeca81132acaa6abd40981ae9f8054f00c27c8f05404d0e2cd806cafc130f0a8d3c23f814 SHA512 f1a375de4b4b5b0f478e208e055badb12a49524137cbd9626238bc5fc35cf3576e7a7c66759dd00a061d12dc7a0ad3ee6974abc8213f5f6f8e22c50eb2901032
-EBUILD utimer-0.4-r1.ebuild 667 BLAKE2B 8211030152e3d2da3387584340bb33288c2c1d682bd4b0b21969a4df13ab0ccd3d7e6829b695d2868eb9c5e15482f38cd18ca844adba9ee6cc6b8510000ba647 SHA512 207b5da0de9d9007d5e9701007cc0144d8469fdc55adabf3e79c32924aa3eb4731c14ad62aec7d32ae642c002ebae1a340c140e7655d6e7f0a4c8e3f8ee4527a
+EBUILD utimer-0.4-r1.ebuild 666 BLAKE2B 8ac6c22568f8d3f377131801d3a78c083f7a7601014492ec7864a562b7ac9c22445d5f12fc57553820eedcbc4aeda8d09e58cede047d000a06559e076d6c2fbf SHA512 fcc1f3dccb12ac606636578938f5a7b368d9a1f620a036df31d3e2163111ef830e8a745603595ba4260c2ea36026561c7b53079d548273bd7059390b7805da30
 EBUILD utimer-0.4.ebuild 729 BLAKE2B f18c8bdacdde799cc1d52bdc80bbce8158a3dc48b55186247f29fb861a1bb7d6868057f557fd9e72b838b4a6bf173979a9193f2a7217bf26536233f92ffb9353 SHA512 191bac43e0e2487b459c5249116e1c8c7b50120e68c1068465481db646869536c9118c00246d649e6395ef2d4a687c18125f792af1bebc1f227d315bec6784e4
 MISC metadata.xml 454 BLAKE2B 466406ecad60f09bb43e8bf07c58b6f04194f5241c29ba16afc59ffb08b03c5db848bf53162df6131a07d0c366d614cc4f069c532174f32fc9bd85248c9a3c26 SHA512 18656dd0b9eccf673087a5b3fd055453e4c28bbb407b19f275a654527e5a8f2d75f5fbf4f44b1575579c5809b2acf0e99a170946d91374c74125390e813c3751
diff --git a/app-misc/utimer/utimer-0.4-r1.ebuild b/app-misc/utimer/utimer-0.4-r1.ebuild
index 9d08dec525d9..ce9c047fa62b 100644
--- a/app-misc/utimer/utimer-0.4-r1.ebuild
+++ b/app-misc/utimer/utimer-0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://utimer.codealpha.net/dl.php?file=${P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug nls"
 
 DEPEND="
diff --git a/app-misc/vcp/Manifest b/app-misc/vcp/Manifest
index f4d1f355a995..a02d77770f76 100644
--- a/app-misc/vcp/Manifest
+++ b/app-misc/vcp/Manifest
@@ -1,5 +1,5 @@
 AUX vcp-2.2-tinfo.patch 310 BLAKE2B 31ebbb498615f7eb9c0472cd99f85643a44a84e94dcae7d671044cc2aea9001e31e925506958db397516074f45d62ea834b28302448d158ab87038c0208244b8 SHA512 886a20474591c5fee3c70bf978977b2bc19f362dc38898eff6f44365b6edebd2eaff1cf09befc764163d32f0f2a84a80d032647266af0e7fb343b9ee6c5f82d3
 DIST vcp-2.2.tar.gz 20075 BLAKE2B 862ed1a816c45e50374e17d387d33bda3d758e155e6a38c1636000ce87de3b54928acaac5f89b0580098acb9b796e803406c9d95dec76c029fdc580d65a496b2 SHA512 3f9f60bce875f16a825b935fd241b11cc75d45b85b66133b27d16b86644c4bbfe69fa5f22571703e0ed6d235498f920a8796f6d74259db51a1abbd626c6f5137
 EBUILD vcp-2.2-r1.ebuild 829 BLAKE2B c8df56cefd1edaf23cc6f9a2168438e6a7b6c1f94ea8a778af5e141f23ab3c74f4494445cc4547a6ff3572264864bae65ba849d99fed5eeceae43cd36c8e14e7 SHA512 a25a27c4cfe12343c4aed26eda370effdd57520622a664bf96d8af67642af2f63ac4fa7a746913045fd6ed205094a6444e3c3c2fb88c302199a7245b9249079c
-EBUILD vcp-2.2-r2.ebuild 744 BLAKE2B bbd0673f49abf296a0d5980ad5767f168f922369278031f15fcda84d750163c5801cbe67edd57ebec58be4ab2b49f7f26e26b47ef4ed067f638f8381220d6ac9 SHA512 c90a35e2109da34873397376b81a1a4b735297f73b57b74adaa763226654a60bf2ac299f8fed121b929fceb9d669e92cc470756bf7d88655fe649e2e8a8a5939
+EBUILD vcp-2.2-r2.ebuild 743 BLAKE2B 9f400884ef8685628f4c0ad69ede6219dd222ec91158be9258941a74d45939f2e23596e9173db7eb7dc51a5deb75fb43acd152ed9e1cd09afe4e08d47cae3d24 SHA512 06a5521caa265b15e0bf37519597537336326220a0ee2b954de26ffc5041a4e5bdacfb51847b0ae500e70f9c0751ecf6e7f912e6aad2dd7f49c093133d083716
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/vcp/vcp-2.2-r2.ebuild b/app-misc/vcp/vcp-2.2-r2.ebuild
index 469e80c56dd4..7fbe72c85f85 100644
--- a/app-misc/vcp/vcp-2.2-r2.ebuild
+++ b/app-misc/vcp/vcp-2.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://members.iinet.net.au/~lynx/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
 
 DEPEND="sys-libs/ncurses:0="
 RDEPEND="${DEPEND}"