gentoo resync : 22.04.2018

15 files changed, 62 insertions, 29 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index e15b3166ec0c..f35615e33654 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 858d0190d5eb..ff50462855e4 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,6 +1,7 @@
-AUX libarchive-3.3.1-libressl.patch 825 BLAKE2B 63babd383dce64f836a84db3c336c865d1740f30df45838a7cba178499f110aae1883dc52189694ce52f8c7966dbe1af043a8043586a2476395168935713c3e7 SHA512 2418a281562ee5f0e4f54ca181c68265f6b72a80786d17f45547222a3fde83597a17d88075e5f9c5d52a2688d8890006f592a129ddc634397a9160d16724a12c
+AUX libarchive-3.3.1-libressl.patch 1069 BLAKE2B 0fb6c7c3d85b620387e76e6e2fb7b787effe8fb8c9bd911561e348eb7d0c7cbd504d8932ff5d7c2856649948c556b3807a0fc6019ef4d38fa37d873729275e17 SHA512 d82e3de1201168f6e187824e237f35a9581c34450043ce84478aca3ca74df7b00bbcba5bc462f354837e1720bcc135ce4864f81cfd499b398b1939b886b7fd3f
+AUX libarchive-3.3.2-libressl.patch 1105 BLAKE2B 9b62a5b4029b8c0fd97d4c5012fac9a7dd25655e3b0d8adbcb839f05c1999eb77b902ef476841af8eb8b9de76ce9bad893d065084121434f06717d5f4db93b29 SHA512 ffcc66414f72ee2262544f4d59ca2d0b83ba2eca4f58261ec4694f5cd5d5d7975d9626a1f9ad8a1047d3e656d4dc98dd28d991ef3e6311959d8bf797ad6bc936
 DIST libarchive-3.3.1.tar.gz 6219943 BLAKE2B fc951a613098060d55c000436ccdc6997126be2e1eeb41f348ca20c1ae3e54936ae053404fdd3211de90a2a223b29f5a80c580a937878a37265401d55655fff1 SHA512 90702b393b6f0943f42438e277b257af45eee4fa82420431f6a4f5f48bb846f2a72c8ff084dc3ee9c87bdf8b57f4d8dddf7814870fe2604fe86c55d8d744c164
 DIST libarchive-3.3.2.tar.gz 6236562 BLAKE2B da26474b4fd8111561c1e5ac12a6333a8ba8a23cce9e9cdce7b50647ab8dbae08609ea1bffbab60da74c6555ebf0815c456fe69c72129eb6071fb845141d0beb SHA512 1e538cd7d492f54b11c16c56f12c1632ba14302a3737ec0db786272aec0c8020f1e27616a7654d57e26737e5ed9bfc9a62f1fdda61a95c39eb726aa7c2f673e4
 EBUILD libarchive-3.3.1.ebuild 3422 BLAKE2B a22e236feb74e439b4eedab79813daebda1e39515ef943d5d34d2b20175fd1c443cfab11ff48f0bfcfadd3563297dbe4209e85b9a236cf753f8bfe8f037f2928 SHA512 a0a518a04f80992d5be71f637e90fda490444f0830d05621a914b78fda80fe7f17a9673c6059476394c5089bb79abc75e6d0cb92f6706bd0f0985bee74fbae3d
-EBUILD libarchive-3.3.2.ebuild 3437 BLAKE2B 97f69b52e9771389f33139b9515d71570bde74ac851eda944d625952c07887b3d8213ed18c078d7564b25a4706609cd93ffc6d95619383858a4c83fa487d3cbc SHA512 adfbd80e2ecbeccfe90b0533b4b7453e8c9963da68f92d22b6733e07cc5516bf6f16a863e85d629442dfb88fc0d966e528793dcaae5fb8d4321e1bd28c99c481
+EBUILD libarchive-3.3.2.ebuild 3495 BLAKE2B 8f3ec9e6ccd407f8443a052d705af0892b2cb299b3650135daba2f16320efede83ce358c860ff550ede83a74c85e8c98aad5f43a305ce2bc69a859cd9e10a447 SHA512 7fdcf7eada07ff3a756acfa7a7d55467408df2c17f00e3d4425f5fa6614430de56c649cfa32465b6f9458f90d5dfb259a5e738d53760f7ca3486dade5edeef46
 MISC metadata.xml 1322 BLAKE2B 71089cf0e8324981233467ce2a07d13689731ecb01b50b319081b442eae55f7b9c879826b572be84123d3decaab2672fd68f5494021559a36de1cd3f152010cc SHA512 0da2a58ed4e5ee5ee41c0bde97473fb50a7ea0248ade72a16b9b7ba2d9da811b68ab183c4d2e615a51954cd8338ba0a810529f47738847f6f9711628823a5680
diff --git a/app-arch/libarchive/files/libarchive-3.3.1-libressl.patch b/app-arch/libarchive/files/libarchive-3.3.1-libressl.patch
index 8078bc09210d..7ee48d4e5f50 100644
--- a/app-arch/libarchive/files/libarchive-3.3.1-libressl.patch
+++ b/app-arch/libarchive/files/libarchive-3.3.1-libressl.patch
@@ -1,22 +1,25 @@
---- a/libarchive/archive_openssl_evp_private.h
-+++ b/libarchive/archive_openssl_evp_private.h
-@@ -28,7 +28,7 @@
+--- a/libarchive/archive_openssl_evp_private.h       2017-01-29 05:06:27.000000000 +0000
++++ b/libarchive/archive_openssl_evp_private.h   2018-04-19 04:00:14.061922747 +0000
+@@ -28,7 +28,8 @@
  #include <openssl/evp.h>
  #include <openssl/opensslv.h>
- 
+
 -#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
  #include <stdlib.h> /* malloc, free */
  #include <string.h> /* memset */
  static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
---- a/libarchive/archive_openssl_hmac_private.h
-+++ b/libarchive/archive_openssl_hmac_private.h
-@@ -28,7 +28,7 @@
+
+--- a/libarchive/archive_openssl_hmac_private.h	2017-01-29 05:06:27.000000000 +0000
++++ b/libarchive/archive_openssl_hmac_private.h	2018-04-19 04:02:18.309167446 +0000
+@@ -28,7 +28,8 @@
  #include <openssl/hmac.h>
  #include <openssl/opensslv.h>
  
 -#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
  #include <stdlib.h> /* malloc, free */
  #include <string.h> /* memset */
  static inline HMAC_CTX *HMAC_CTX_new(void)
diff --git a/app-arch/libarchive/files/libarchive-3.3.2-libressl.patch b/app-arch/libarchive/files/libarchive-3.3.2-libressl.patch
new file mode 100644
index 000000000000..e053a539fae8
--- /dev/null
+++ b/app-arch/libarchive/files/libarchive-3.3.2-libressl.patch
@@ -0,0 +1,25 @@
+--- a/libarchive/archive_openssl_evp_private.h       2017-01-29 05:06:27.000000000 +0000
++++ b/libarchive/archive_openssl_evp_private.h   2018-04-19 04:00:14.061922747 +0000
+@@ -28,7 +28,8 @@
+ #include <openssl/evp.h>
+ #include <openssl/opensslv.h>
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ #include <stdlib.h> /* malloc, free */
+ #include <string.h> /* memset */
+ static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
+
+--- a/libarchive/archive_openssl_hmac_private.h	2017-01-29 05:06:27.000000000 +0000
++++ b/libarchive/archive_openssl_hmac_private.h	2018-04-19 04:02:18.309167446 +0000
+@@ -28,7 +28,8 @@
+ #include <openssl/hmac.h>
+ #include <openssl/opensslv.h>
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ #include <stdlib.h> /* malloc, free */
+ #include <string.h> /* memset */
+ static inline HMAC_CTX *HMAC_CTX_new(void)
diff --git a/app-arch/libarchive/libarchive-3.3.2.ebuild b/app-arch/libarchive/libarchive-3.3.2.ebuild
index f68b736c9464..d82a2179cc3b 100644
--- a/app-arch/libarchive/libarchive-3.3.2.ebuild
+++ b/app-arch/libarchive/libarchive-3.3.2.ebuild
@@ -35,6 +35,10 @@ DEPEND="${RDEPEND}
 		e2fsprogs? ( sys-fs/e2fsprogs )
 	)"
 
+PATCHES=(
+    "${FILESDIR}"/${PN}-3.3.2-libressl.patch
+)
+
 # Various test problems, starting with the fact that sandbox
 # explodes on long paths. https://bugs.gentoo.org/598806
 RESTRICT="test"
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index a8ee14f046b5..b8eec8a7022c 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -4,7 +4,7 @@ DIST lz4-1.8.1.2.tar.gz 228640 BLAKE2B e5e7176dcce5319e2dcb1f6d69c47749976fd7e8c
 DIST lz4-r131.tar.gz 133784 BLAKE2B f072d1f97ac6f804140c3896dfa95c16eb3c2c2208cfeb35a07535bb345fa100e4169ea91b2aa05655fb61f6f2d64a7c25444778b99841d3e3d0f09b10f570d8 SHA512 60bd95d529691ffee2c43f0d8a62484c3cff74c0154094f073192606806ac8182dced61e0534ffa7e0ccf5f18e9a8cfd2738883a83814c0711a6d7f1d1b252e5
 EBUILD lz4-0_p131.ebuild 1521 BLAKE2B 5748445c1b995930382c846a6ffdca206f008a447b63660f07b6817f9710f0c434c29e775f635e1928d781053dc16142546f5c9d9606df3ee4465eaa85f4d799 SHA512 466cf8f24471af82f9789dc02ff9b93d69a450f7ec768e3d5c4f2a374ae36a46209d39859701cbd7856b7600dc1d33fbf993d1651cc56338601390f72f78e61c
 EBUILD lz4-1.7.5-r1.ebuild 1033 BLAKE2B 1e6724ddeb18f9e4ffe78a84e96d0593b2501e96bad632db32e10082559c1ea77c38686ec77b953dc0c981796a14bbabf38985ed953617e02ea0d704cdebe59e SHA512 763b64264b063b7066052ead680c262ce1019ddd41dd627dc76d38eb72b2ba9e1da23df7356188901fc92984822563179df9e06df975976c988e7bfd86c7b9ee
-EBUILD lz4-1.8.0.ebuild 1059 BLAKE2B c5614523bdaf07125aaa18b2c1e38b0087e656ad32584bbcc1e8f0de903be311c14088764d0fe8621144ac2c50cdc11030c095e07df52219ec969fce87085b0a SHA512 3cf414d69580e6210e44645b5ab7537dde0ee992f079110cba6dd10a82665b041a33c42a76f4c48ecf38f1f38a875150b7fc45e7788065db303de39c6c4d7629
+EBUILD lz4-1.8.0.ebuild 1058 BLAKE2B 3a3c63fd72df58c8e69c4e9981fe7e06f6dbdefd939b4638536898a407bb508ca7873ffa9d8b34bdea23523b52af3bd14571f4ae1b48e3c115f92465e4674f9b SHA512 ae91981fc93118aa57d261292412aac4141d04974e5358819b27dbeaca8902bb995e4439373d35b625e5c19b5f3cf50073e4c22c2293ab8c2390ad7ddaf3ccf7
 EBUILD lz4-1.8.1.2.ebuild 1068 BLAKE2B c29f13447c24f824d19816f9c8bd97e5be475a39ca4fc94c3dbabcf476779d1ce7177ebdf3cf97ec7ff899b7bb27b6867793ec5852b95b57093bafbad07d9a56 SHA512 e300a60ac5575a1fc16577efec351f886d98e7ecfa389098e72f4ec393fecf6b675caea554647eddf91edae1c0e01f2784602f4e94ac7fed5285a28801ef7cb6
 EBUILD lz4-9999.ebuild 824 BLAKE2B dbc4eeaf3f65d527eaafd48a1083c43b76fd564b9dec1e6393c93445be4a0d9b56e540a4dd24df5438ea9b2ffeeb8a53a113a69b40f9b1ded3af4567b00122d8 SHA512 f28250733aa50bab0d908f5288d69d3d78af865433864716474d6d8fc639a44de61fb25dff06614bee003b9fee1d1a71528f9b96d2347c3562a5eb5736a340a9
 MISC metadata.xml 516 BLAKE2B 89b858097e6409d3b6f9855c0eb82ef02ee9c705516a1c32d1eb81730b03733e7abca122e59e43c193367429bb277dc1f044d09276f7b3db37f79d6f5c3a8054 SHA512 b559b65a4eebe71824ad3cd46c1ef3aabcc1c43f4312cb2e1072f0e7ab4396890696ef7450d7a41a2e03498db9da9e6823f9d8de4d413a0244607b85192efaa8
diff --git a/app-arch/lz4/lz4-1.8.0.ebuild b/app-arch/lz4/lz4-1.8.0.ebuild
index e2cc72e82f06..f7df4f35bfad 100644
--- a/app-arch/lz4/lz4-1.8.0.ebuild
+++ b/app-arch/lz4/lz4-1.8.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH=dev
 else
 	SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Extremely Fast Compression algorithm"
diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
index 2259a6ba18c4..d4596d64d116 100644
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@@ -1,13 +1,13 @@
 DIST rarlinux-5.5.0_p20170811.tar.gz 546839 BLAKE2B d90bda3092fb636fee1db4f222632cf3d45c99f330298521b2a0957cd7bd4845f4518cf394e03a4e302d45cf73a37f5da5ac0cd7eba08a4859fd221697656c20 SHA512 c437d0be55ea90ae1dd9d657517d17d9edbba07cd77325785d8d503883847edeece2cc3993d3beec3a5b36b6830383b7026fbfc53b18f490288395994bc532cb
-DIST rarlinux-5.6.0_beta1_p20180311.tar.gz 551336 BLAKE2B d56bc53f729641cbf5cbc7b4abf9b3260e164e7cbf37e1faa227736456fff00d418699d05d628c5dfa0bf8517aa2c181a231e520e7c66c37288707808526d3d2 SHA512 9061ad96f8c933f942eb9e7d383a38b7056895ff542fdc26980f4d1140180f7a5c21ed288d4068edd0b25898645ff7977aad4b646882f5f8f57bbb8b89a40bd2
 DIST rarlinux-5.6.0_beta2_p20180331.tar.gz 551421 BLAKE2B 150b3a46b3230d6be39d25ed7d26894402abf879c45160e2003cb678cabf42f89dd58e4e61cdde27d5c4c2e14d2d83c30d1d9614be2a7ab6e2f86661057940fc SHA512 d07824c3604122451e7482960a48f7ff50cdc6450b223c5ff5b22880f909215d7842ef538138156bc19d64e93b0cc74521ab8b6d97573d9e44cc754267ee3949
+DIST rarlinux-5.6.0_beta3_p20180421.tar.gz 551736 BLAKE2B d35e6b377e7e31963361f132d1e424ef17f706f21e780a4a66083e487ec837a83d25cc3830572fd397958b05d595fd7f7cf23db99d3160d78a4efb0392a03c3c SHA512 71d23b3d8627eb1d67edee2c1c647d832861567443145a34f374b57ce283d6777b2ffebd13f7282f9a22df796e2c6590bd5a8afb98894284a30ab7bba18a1086
 DIST rarlinux-x64-5.5.0_p20170811.tar.gz 536028 BLAKE2B be453cab6720abc4b01f5aef6c5874b0ff328656f8452b2a671b1b5305427dbb0de2af4084e25e972c69fe4ca4072b10f21d66f7fee23a3e205b0b4f533c8b7f SHA512 1ca8cf7fbe526b43bdc9aeeccb6a0d86efd3bbaeee554e807d58ab62857294abc89662bb42b17b2cfe7e6739876c6345455cd027abbc4cb84312c58314278a66
-DIST rarlinux-x64-5.6.0_beta1_p20180311.tar.gz 540817 BLAKE2B 4ea8121df7dc57880cb148a8bf81c69b596011d3bfe462c90aaf9da4ce26d3fac1eb16324c55aaf79380f604493b9ecba1a1ed5ada76f76df1d9a1b97d522af3 SHA512 ca6624bdf55fe732a3aac18733b3ea35a519567474a49f549c27272a0107b60fa93ee16e0e49d5822d4fa33b11c355f67b047c42ed0393ef3a9d840eb8b4c783
 DIST rarlinux-x64-5.6.0_beta2_p20180331.tar.gz 540942 BLAKE2B b52dda0a52442c8aca930d800f4c3e6d69356a3265cc64f0b1e974fe61c463aeffbbc0fe2ae455426f2727dd71c12df473e78b42200ef2f25cd683e1259e8554 SHA512 117cdc30b8c1aef8784773160bd641cd3e6698a35f7c83c13cfe9a23784cef67fdf62f2f828101bb04cae58beb00ad0851ed89a73e0a77d703220d3f44d12bd5
+DIST rarlinux-x64-5.6.0_beta3_p20180421.tar.gz 541021 BLAKE2B 9feabd97f42beeca5cf23aeac52723477ed0047e42abb14112f953e66843d15b2104c3a8d96e61d3a3cd3f577e0f1dcc663813ffe21edd33b5e4697b546936c2 SHA512 22b51e8d6afa16dd7231c292c9496c0e167798d042654c44a4cedd13daddd5efa463ba62e473983cac57667802689240c621c8099d74af8a892ce2bd4d05a5ee
 DIST winrar-x64-5.5.0_p20170811.exe 2220872 BLAKE2B a37783f427440a5166021475f024ca6e281b4f0d39926e55c00588e51d371bdd1bd16bd04ed65c363f7aeef6d7e2b0ba796325f7f290e45cfd8c09048ae25489 SHA512 f2aa40bb875be7f88cd618b1f5e02cfe0c5fb584f4e27d06531aaee018e613a70be7b7d3e8b92448381dc83605db6bf044cbecc52f63b6045193fef07601be66
-DIST winrar-x64-5.6.0_beta1_p20180311.exe 3186432 BLAKE2B 13063c52488f3a1e1d6a9f0b85761194d14feb549aede1c8653351cce8527794c88a37b177988328ac2293cf993848e1b0b4865a6f0adeef7c49a33a71f2f366 SHA512 2af5dabd88a0a70bdc2ffdbb1488e6b0b1c4cbe52d91bef86991c40b31fd8ef7482f47c134a13197798366eceee7ae6f8d39e0ef3660245ee89265cb65d43ffe
 DIST winrar-x64-5.6.0_beta2_p20180331.exe 3185320 BLAKE2B a3a859d57a72d92df8c752358184dd41fb59303b52c2d47f155d727b6555bba24a67b1a801a7b5e3653d27b6f72b4c1f05cd03cf02af6432845551f3052be753 SHA512 8b4cfa1db475edbb71464ae890c1f23b699637a17a0abd40145e396097888b8fe3e057b05a6fd20dd287494985f291ee3f717acb6fd9478752859221694ab6f7
+DIST winrar-x64-5.6.0_beta3_p20180421.exe 3179544 BLAKE2B e08ec6e628fc1b3dd03e5cdc68a3d07195bfd0367a24c8bc1a6f325672c5f0309e8045191918473b209ff1ace41c7741c3bf992bafea5f2f9ca0c13d216c7369 SHA512 3996eb0188d906356bcf8aa4d60fc7a303141bbb88886cdedc7bc5f08e545266a0a5d066bdd618ad50b31b3a77b7499318ea04d5ccfe11560a5d0f7fe768303d
 EBUILD rar-5.5.0_p20170811.ebuild 2281 BLAKE2B 936018068fa7ea883561da7ce0a3919b54c6ee8ab3d67522cf072be3627baa01bd2872b84f3a8b25100a4e76a165270e81281cc93730969d9688d61b97f64347 SHA512 aa68c6bc07bca69dc599dfd7553bdcd23f884fcf353ea6ceecd1c0822f799016d2958eb75bcbe937c10352bf1aab7d60bd8b6f6934244fd842d01da749f6dd28
-EBUILD rar-5.6.0_beta1_p20180311.ebuild 2283 BLAKE2B 96451364b5c7c2ab8ee26471fc60a4cec3a7a82e6ec82a5c41f45ac4620dc61c4c52a58ca3fac594f823ff1e5c344b033070b8ad3c6504ce3687a6c29a7bffc5 SHA512 61497692253b6f099c52b3d52e02e42e8c41de1ba4be34a22d95c2ba1c9b303238fdae4770d893da5343ae0e7147f2902c2fc1301cf6c4ddf3fff58fa46c20ba
 EBUILD rar-5.6.0_beta2_p20180331.ebuild 2283 BLAKE2B 96451364b5c7c2ab8ee26471fc60a4cec3a7a82e6ec82a5c41f45ac4620dc61c4c52a58ca3fac594f823ff1e5c344b033070b8ad3c6504ce3687a6c29a7bffc5 SHA512 61497692253b6f099c52b3d52e02e42e8c41de1ba4be34a22d95c2ba1c9b303238fdae4770d893da5343ae0e7147f2902c2fc1301cf6c4ddf3fff58fa46c20ba
+EBUILD rar-5.6.0_beta3_p20180421.ebuild 2283 BLAKE2B 96451364b5c7c2ab8ee26471fc60a4cec3a7a82e6ec82a5c41f45ac4620dc61c4c52a58ca3fac594f823ff1e5c344b033070b8ad3c6504ce3687a6c29a7bffc5 SHA512 61497692253b6f099c52b3d52e02e42e8c41de1ba4be34a22d95c2ba1c9b303238fdae4770d893da5343ae0e7147f2902c2fc1301cf6c4ddf3fff58fa46c20ba
 MISC metadata.xml 436 BLAKE2B 772b97d33730af0ec24c126f46634735b661470d99fe1c2fc90d36653d0143014cf45f84686f3621b3b276c70b859f6551ffe764089d0fb646f99cd04b7d0def SHA512 9748890b95ef59d0fc815cc71757c10e77914ea73d254770a8669d8b766d95c65a90eb941a360b361d4e0c28f1abde6ba15a84a77609820aea7eaa25d2e913a1
diff --git a/app-arch/rar/rar-5.6.0_beta1_p20180311.ebuild b/app-arch/rar/rar-5.6.0_beta3_p20180421.ebuild
index 182140ef84a4..182140ef84a4 100644
--- a/app-arch/rar/rar-5.6.0_beta1_p20180311.ebuild
+++ b/app-arch/rar/rar-5.6.0_beta3_p20180421.ebuild
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 9e8d822fd11f..3f16d6e132be 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -3,7 +3,7 @@ AUX unrar-5.5.5-honor-flags.patch 1211 BLAKE2B 8104ac7bf12579218e71147865823da40
 DIST unrar-5.5.8.tar.gz 222285 BLAKE2B ec6317fc95674a3f282f92762ee89d2fd21d162a96b7b1ea29de9f4ab0ebf0bdb9c3e7141c7146d4bd2e570620db7d7850bc9a8c45a42ef745af1d75d4df5a71 SHA512 9eac83707fa47a03925e5f3e8adf47889064d748304b732d12a2d379ab525b441f1aa33216377d4ef445f45c4e8ad73d2cd0b560601ceac344c60571b77fd6aa
 DIST unrar-5.6.1.tar.gz 225408 BLAKE2B 1b4cef7b55dec0658d4eca09e9dc933ed1ad10d87dabe3626a01974bddb51dabf89c39f2db200cbe4388a682c0a756c720d116b9654e4539bfca1658396d0768 SHA512 62f37f9e3deb86651c92832190fa27a8e4490084c6a95f42e8a5f5668fbc7aafd9c273a2c60683c3534b614e0ca44b20d18598296f67edb0812850a50b807e77
 DIST unrar-5.6.2.tar.gz 225677 BLAKE2B a8eaf1ca3262caedb1f1a44109d26e688208d62c2424b476e40b90406be8d6274073bae4f1963b0f7eec4e978a25347b36be8561e74143c6a6ce84e2c4956130 SHA512 67f958330bc58fecc2fde3a16073bb44b61b5fd4a0ff19c5e345ce830a1ff3f00f3fb2507455912b7b3252804b9d27a92c4469f31513337569fed298d6af7655
-EBUILD unrar-5.5.8.ebuild 1860 BLAKE2B 05707ae5839ec56d2f6238a68fbd52749809e32484bb251a6691191507776996561ac0febf1efad0de6c16bdb82b67ae5f49517b55604953267b7fbae4f347eb SHA512 0f7e829f935d4ad1417b733e384bb9332e12397c18a458c0c456021ce7350862862ac39afa1857faefb013745b0ae823b8d624523f2e3c24d5d27278aa3e650d
-EBUILD unrar-5.6.1.ebuild 1869 BLAKE2B 702bb407612b4c273d486f049c1e130bf6065ac7b11ee269d33822052898b5c7202c7493122015b77bf5389ca4e9f14d88ebd130055bf1d5a8945e4a3c82c371 SHA512 207b7433322a4b96fc1d7d7d33ef093fe199f4457fd7fee2f0a61cd41d373c08a20e5bd61f4c4a175b24d578be4640487af647932aea1ddba99ea1f49d04ce2a
-EBUILD unrar-5.6.2.ebuild 1869 BLAKE2B 702bb407612b4c273d486f049c1e130bf6065ac7b11ee269d33822052898b5c7202c7493122015b77bf5389ca4e9f14d88ebd130055bf1d5a8945e4a3c82c371 SHA512 207b7433322a4b96fc1d7d7d33ef093fe199f4457fd7fee2f0a61cd41d373c08a20e5bd61f4c4a175b24d578be4640487af647932aea1ddba99ea1f49d04ce2a
+EBUILD unrar-5.5.8.ebuild 1862 BLAKE2B 0b70c50aac539ba810e1764dc0baf9e7eb69a049d48f3eae43e8cc4d1754b3b728ae1a4d8903f8e7a95f0f9429394e85766a34b20b4a54f1355fab7eba64eb86 SHA512 9fc24eb6ed0aa9b333eb6369c529acc062ea89ac95a943b7b7553f69dd0767eadd7e1a6af13a34b62e4717d8996f010c9f6af997b44df134cce4770c48f32fd3
+EBUILD unrar-5.6.1.ebuild 1871 BLAKE2B 8d47dff20a045cf38d56778a5ea2908eb426fe4f277c7912f6d04dcd6706db12495db7d20f4d46f35a982d37811a4847f6a90c15d862c0c5f4ba527fa61da110 SHA512 a0230126c72f4a46daa9e648d5314c7a42a9d1c0ba5cb048fd09fda5349fedbf2fcafdd252571ed8e3bce7202d9bb4a96f2d3e93b3669ea0b8b7ff83f09ea3f0
+EBUILD unrar-5.6.2.ebuild 1871 BLAKE2B 8d47dff20a045cf38d56778a5ea2908eb426fe4f277c7912f6d04dcd6706db12495db7d20f4d46f35a982d37811a4847f6a90c15d862c0c5f4ba527fa61da110 SHA512 a0230126c72f4a46daa9e648d5314c7a42a9d1c0ba5cb048fd09fda5349fedbf2fcafdd252571ed8e3bce7202d9bb4a96f2d3e93b3669ea0b8b7ff83f09ea3f0
 MISC metadata.xml 512 BLAKE2B 260947f2fad1c57508f689b2db22fff72276f40fb91789cfd0b0a2ae63d6710ed186d6350e4a23d19566e3469a097294f95074810652d61cb752a54dfe92ac80 SHA512 4a8c151dbda173dada5635cbd844459a1d999c6c41a2e140a09ba31536e1856d896141471c65b5cb52c9c92229f55c211e01ba23b975f4d25442ffc55ae6a13d
diff --git a/app-arch/unrar/unrar-5.5.8.ebuild b/app-arch/unrar/unrar-5.5.8.ebuild
index 870cc370fd97..560952a8c5bc 100644
--- a/app-arch/unrar/unrar-5.5.8.ebuild
+++ b/app-arch/unrar/unrar-5.5.8.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"
@@ -8,8 +8,8 @@ inherit eutils flag-o-matic multilib toolchain-funcs
 MY_PN=${PN}src
 
 DESCRIPTION="Uncompress rar files"
-HOMEPAGE="http://www.rarlab.com/rar_add.htm"
-SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="unRAR"
 # subslot = soname version
diff --git a/app-arch/unrar/unrar-5.6.1.ebuild b/app-arch/unrar/unrar-5.6.1.ebuild
index a5e2977fed6f..78288603ed4f 100644
--- a/app-arch/unrar/unrar-5.6.1.ebuild
+++ b/app-arch/unrar/unrar-5.6.1.ebuild
@@ -8,8 +8,8 @@ inherit eutils flag-o-matic multilib toolchain-funcs
 MY_PN=${PN}src
 
 DESCRIPTION="Uncompress rar files"
-HOMEPAGE="http://www.rarlab.com/rar_add.htm"
-SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="unRAR"
 # subslot = soname version
diff --git a/app-arch/unrar/unrar-5.6.2.ebuild b/app-arch/unrar/unrar-5.6.2.ebuild
index a5e2977fed6f..78288603ed4f 100644
--- a/app-arch/unrar/unrar-5.6.2.ebuild
+++ b/app-arch/unrar/unrar-5.6.2.ebuild
@@ -8,8 +8,8 @@ inherit eutils flag-o-matic multilib toolchain-funcs
 MY_PN=${PN}src
 
 DESCRIPTION="Uncompress rar files"
-HOMEPAGE="http://www.rarlab.com/rar_add.htm"
-SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="unRAR"
 # subslot = soname version
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
index 1b74a58d9f61..0d12bfd91d93 100644
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -5,6 +5,6 @@ DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a04
 DIST unzip_6.0-20.debian.tar.xz 16680 BLAKE2B 17ce9234ac485eab4e5188b555af31dcb0db577b199e0c58991ba7211c4c80edce52b72e89cc4d82b000b70bed1ac90262c0972507f28f054af2cebd0ca33b48 SHA512 7212cb110291581c2e465dc8ea5130eabffc4e0369d6245e8c26fa9d350bed904847d6e1191afaaa2d3fc23bd05fda7da80439d0c06b88f5331b01c9eff97fbe
 DIST unzip_6.0-21.debian.tar.xz 17740 BLAKE2B 098a84e5b05f819f9c8c6a6656fdb2359dfb5b93f63444e55347e0bef9735fa48bf1631a658a2cb6d0c604e7e740e47b57910d251b74e5df7c8b9468acfe55f4 SHA512 f7bce4156ac13c34da3f991df3ae88b0db99b0810c7f8904ea3ac666a4cb2788d7182056f2bbd82d7519d0e0ee31a10af47bee08f360ceb859e5fbfc6e15ef36
 EBUILD unzip-6.0_p20.ebuild 2557 BLAKE2B 55203420f8676c64899a6e8572ea31ce3318018402e7f02790f7510d955d69fd3371e08ffa50bcb2867025e8542e6d745f20a0ba60562b2f8f7e7b42c25f53b8 SHA512 72014935da1e7acec784f189568fbec2756968811d348594d98e5a4f440579471b9e6348aa57877a18e0e34b6434aa144cd7015a88c5b999805428d4192dd212
-EBUILD unzip-6.0_p21-r2.ebuild 2604 BLAKE2B 5a8b2b331d5febdb8c109fb62516b9aab2fd3fc7a2fdd0d67be545c7402a96f9b1195952eb901b9f03b2fdf654ff95b7252ebdf72c07c4ca039aa2cfb4a5c1f6 SHA512 dc167f83ddc92dcf06625c14c91f6a99f178f1a4b30b22faddd0a87a267ee26e9b4ec1e43e2aa303ffb794e05d4c9a358e66f330cff4b533e3c26be6a2075f38
+EBUILD unzip-6.0_p21-r2.ebuild 2603 BLAKE2B 3048169f536561dbefb24bdf58a6d6bd9cd765debea8a96d29af7583313a73d20de06c18301df70205bec6c4829aa6dc54340413a758a5aeb249b4ee5f567f9f SHA512 66197722dae7909378d5b7f66c81924ca1a6d04947549460708bf63aaf19e833fb958b0d5b0e90e07900c25cdb14530983fc98132f8509f779a254e0434d2e61
 EBUILD unzip-6.0_p21.ebuild 2539 BLAKE2B 10ad8ccadfbd15b18449b61c3e3ed2c73d428ed85595e0065f2e397a4821221fd6dcb20be3c6d41b13c99f6b20de57fda263eabab2b842204e09ecde1f729d56 SHA512 df4efaf0e18777f9ffacc1e72100b33c60a35f535f15934fd9b1a5c5d287a3dd1fe9ab0442ca03fb316b7a792ab737bc130cae75116cb5b8adf7d825fceebdd5
 MISC metadata.xml 476 BLAKE2B 4cd0cc36008b6ec9ee618ef2e8a9c48e7fc6228e051a5c24e922faace6645de951a6836cc5d49a6041102944bf5b1901a5febcd6db86b67eb4182cad46a2a100 SHA512 0b82799f21ec8d57451ce8f231d24eabb02f637ee6fd2c32af12f9806f104ea53dc4d848b29950c1d5e848ea81f04a58422fa37f39287937dfb54e186f30b653
diff --git a/app-arch/unzip/unzip-6.0_p21-r2.ebuild b/app-arch/unzip/unzip-6.0_p21-r2.ebuild
index 3f3860b3db03..18b5f0bae4c1 100644
--- a/app-arch/unzip/unzip-6.0_p21-r2.ebuild
+++ b/app-arch/unzip/unzip-6.0_p21-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
 
 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="bzip2 natspec unicode"
 
 DEPEND="bzip2? ( app-arch/bzip2 )