16 files changed, 28 insertions, 16 deletions
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index c2405d275e56..9636aff5eb86 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index 32a34305611b..035693db95a4 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -7,5 +7,5 @@ DIST alpine-2.00-chappa-115-all.patch.gz 212705 BLAKE2B 99c21a7b74a4ea04c3bb5494
 DIST alpine-2.00.tar.bz2 5222673 BLAKE2B 38a9cd1fe3e291119b889bca0d304333cdf9ad8c63bc7923ea0735d3528c933b7d4dfe70bb353fe7b6047dafdaee3218a35e561f542b6ac763b60cb986509371 SHA512 17c6e65fbe767d4f9ffb3d3c2bb3deeab9d3620cd046cbb0009290aa484c9254effa992957631f0603bd82b82aeca2923d391aee6d20a7684d5830fbca8ce4d2
 DIST alpine-2.21.1.tar.gz 7490699 BLAKE2B f3aeafb55697701f6edda43659c9d27c7d7dab74f8e332e867f354ce555c26037f4b642af80f18db249dd7269f80bd880bc315ba4ae08ae7f63abc7998cea073 SHA512 78b47bd9e9dfc652bc407fe736d8b7526625782c332803cf01e5214a2b0a5af21736b8a2e685348913f6e2b10c80dced12081202294e9c61e3168b3a2b9657b7
 EBUILD alpine-2.00-r7.ebuild 2683 BLAKE2B 8bdfd80a2561ce22fc8aa7a8fc63c1ef40f3bfd7bec025c3a19fca835963541a67a6f0fa64a54ea00624ed0d92b0a53e4ff0c040ea3786e48b7e6e63428698f9 SHA512 11901edf7ac5c494a1ad48a5f00d512b90b017f00413baef3682ebb2f33072fbd64c6fc3b2319df406bfa4b376534071ef25f07ecf41227e788fa62146e3b049
-EBUILD alpine-2.21.1.ebuild 2002 BLAKE2B 9d79d4adc98ac3ac093434bb1109efa2420d9c954477cdb1c69ff32c395580310ae34627102c137450c459884f206116269b951b1eb8157e7ad36db064c2b0bc SHA512 2d65a1fc53903c02f99e253ddf056c9403faa2812bb52ed8dffa6d30aea3a59d45a0a171cfc2d9874309d6a6ddfa5a7d4ea616e50de5201a204b2942f4990dc1
+EBUILD alpine-2.21.1.ebuild 2000 BLAKE2B 4f0f74f9e4e9d1d184942b9506c63b1e5f9823bd2ceb6586cbf02d8478e909186c0bcafe0cf126a846ce042b2145b16f7bfb6a720cc487005b74ed4538e2dbc0 SHA512 c9fbe15c930f74ef2a5f13a94717564f11b94ed7d8d2214ad46522a16e04aa5c71b018add73c824237fdcf59bcb9034df52c6c162ab4a913d1b5bdb3a8e7330e
 MISC metadata.xml 845 BLAKE2B 1a7529f7bbcb5464d3ea41f8fe9afdacf8ebe099a0cd109f8e4826a4538d7f2025477b0a817eff7e4c02096ad0d2083155e589ef143ef3fd7661909504ea97b8 SHA512 bd16db341dbade41763360c32ebf2d4a33111eb3b41ce43e2619c1fb184d15e9351d518316a603517e28a293f8de22308d6a6aa5f1b0c82adcb67837a3bd5773
diff --git a/mail-client/alpine/alpine-2.21.1.ebuild b/mail-client/alpine/alpine-2.21.1.ebuild
index a907b3392672..16763b37a146 100644
--- a/mail-client/alpine/alpine-2.21.1.ebuild
+++ b/mail-client/alpine/alpine-2.21.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://repo.or.cz/alpine.git/snapshot/${GIT_COMMIT}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ia64 ~ppc ~sparc ~x86"
 IUSE="doc ipv6 kerberos ldap libressl nls onlyalpine passfile smime spell ssl threads"
 
 DEPEND="virtual/pam
diff --git a/mail-client/biabam/Manifest b/mail-client/biabam/Manifest
index b2c89b240b4b..9b4a1e5c192b 100644
--- a/mail-client/biabam/Manifest
+++ b/mail-client/biabam/Manifest
@@ -1,3 +1,3 @@
 DIST biabam-0.9.7.tar.bz2 8334 BLAKE2B 3fbec6a2c5b928ddc8bb8891623bc5bb71ea908b1c9b4b032fa02873af77d8c56e9fcd3e5142d8ae50964651817909923954381315f13c62c1b63abde0c82ba1 SHA512 c1745ef0c44967e48d2fe368fb2f1d5e9f3ce7d80577e95979480f917040e53d7b83fde70089ea8fd886e4fe027413283113cb02757aafc3e5fbe2adc8a19d84
-EBUILD biabam-0.9.7.ebuild 458 BLAKE2B bec72a412e51a37401c24bb2bc2d917d637d4bc5820b3717f37f2d1097db7468652237c158aebf01673e94f5a3e268c6de0babfc430b69f44a277755ca75e8ec SHA512 00e3cb891233610370992e8f60c89d7e155c1affd51dbb659d5a9301f477c5dc84aac69f1dbf7127ffafc379572fe3a5e413f030111fe48f1f70154e8e89073c
+EBUILD biabam-0.9.7.ebuild 466 BLAKE2B 2ccb2e28a4d3a2464bdaebcb4e316b892c6432eb4e67756a8e3c64509b0efb555488224dc35fe88b111c4b705839f8dfe71302fc3f6c5b9796c839ae89d761bf SHA512 a5ba3aca5255b602ffc3be4ce46f06454b2b01ff584cf40b193bbf9040c96b4b2c2c2414616b87bc46566f6ba1f53a99c431bbc9c5611100383a2dcb8945b706
 MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/mail-client/biabam/biabam-0.9.7.ebuild b/mail-client/biabam/biabam-0.9.7.ebuild
index a31a3b02dccb..f431ee26cbd9 100644
--- a/mail-client/biabam/biabam-0.9.7.ebuild
+++ b/mail-client/biabam/biabam-0.9.7.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 DESCRIPTION="Biabam is a small commandline tool for sending mail attachments"
 HOMEPAGE="http://www.mmj.dk/biabam/"
 SRC_URI="http://www.mmj.dk/biabam/${P}.tar.bz2"
diff --git a/mail-client/clawsker/Manifest b/mail-client/clawsker/Manifest
index 8c6260702332..47892477b1db 100644
--- a/mail-client/clawsker/Manifest
+++ b/mail-client/clawsker/Manifest
@@ -1,7 +1,7 @@
 DIST clawsker-0.7.10.tar.gz 67488 BLAKE2B acfd00bb1d27ddf011f06a09210570a76fd4f6cffc86a6d596ef84a60c170379395bcd2a1f241c5fd97e13297d01be8be14829d2e5605c807eaa70d14cb176ae SHA512 1b7b3638485af509e4b32be5cdb6ffa2e56b7ddb661dbde291ac4cb7804c98363ddcaa46d36ffba0699c77d0a66e84ff5b58be29ddb3d7d9f9ec0e6567a9075f
 DIST clawsker-0.7.8.tar.gz 66210 BLAKE2B 0e3bc8c17b5672922153f60d1c83da869565488e56d4354c93d5681f5b220caae3eb94b268626263269db09518d3b1ca7aee831b04ce3e7eaf3736763ae9f2e8 SHA512 2dd1cccc45641aeb58769630f095d23f68b0bdc8276711cea1d25597c2c3fd94ef5b318bafc5332f4c3880715052949f07e3a2b8ad554baa4b871434547abdca
 DIST clawsker-1.1.0.tar.xz 153404 BLAKE2B 8d19eaa94339b49689bd97921101e8c064f8cd35802a08248ddcebf6e595e1cfd8b577b68dcf1534c054d21dc1ea92d109a2c20ed30b7387aa88c60518576d34 SHA512 e76be7214e5f7568423890cc29e736c163678bb4501911467afd5a4ded2f61a6493c31ac08ca2f55cd143109a37c0f2f27481a0b556628cfaf6d477112375f2b
-EBUILD clawsker-0.7.10.ebuild 550 BLAKE2B e1f8beb2dbe217909335720afc15159b61431ebd51f1e1914e84c8076119a691ca8ecdc4d8872635fba9336d250af855acc2c96c20f92c06969ab519bd8a51d3 SHA512 d24e8026cc223510ebdb725f776ce1a18a3315fd2051053d1d8d7d79d1a193f23da6c9e1feea55d6a1d99f706bf2e33b5e2704ddfa126131b746582e5b185530
-EBUILD clawsker-0.7.8.ebuild 548 BLAKE2B eac21c4694881c592aa14b8ebb590686de3378e43c704e444b7e58c2db03f6dae18820284b0db497b6b6322129dc4b33566cd637a1e97b9fa749d1da5feee3ec SHA512 d17f085cd8c117cd4d66d5a095a2b24cf18cc2e334d55b03d31d5c4775c74ab75599951805d29651c0287b0678a947f99877e36a67ece6f7f54c30e0e976d62a
+EBUILD clawsker-0.7.10.ebuild 558 BLAKE2B e187fae284d27a1e123c30b88e026a7dd80d0203c17d1fe63354f0460e39f6f86c7154010e2c05654b982001d00a4760549dc3f49014afa1130fc3fcfa474e83 SHA512 552d277281664c55279c71c8327d72992604a0990da4552b9c27a0afb384751a4c74bcde6b4cb2f655f0ce4d2a566b8e021e1a0ad43dcaed100760ab32913302
+EBUILD clawsker-0.7.8.ebuild 556 BLAKE2B 3be780a3ef4e76eac4242b4202e6c8f31e5e9f877272f9847d2526294b89afbb405242c822578fd5eaeb690bc190866528150fe74627313d0bd9bdb74709e260 SHA512 1cf91d8b93fa3590249cb0914d4db893f4f47a05433be07dd7a87fc5a11e443d3950cca8ee8097ecd21043a84c3a1b8faf60ce9ce4632294599344149e2bce62
 EBUILD clawsker-1.1.0.ebuild 540 BLAKE2B 0e3572301ae27f096ffcf8047c4a24a892b6c2a5dc905a78c0dc2bcfb468edcd0c85dc581ffb69e0cba4653490668f1af1f4b727ad6c26c232b9b65b92cfa605 SHA512 63efb159d09443a3a6282e7e6c186e2f8e32789e3426c087fa83b640574a0d348b581592e780d1c3d2e0f89ced1834452be410e39b53aea723d6542a0e72b0f5
 MISC metadata.xml 244 BLAKE2B 4c636cb2e4dd31b286d765d3c8724c3fc61051ff0653d1deae09a77fb1849928920749778c98dda893f27765d2ff0f94ce11582315cd95569e1b39092908df67 SHA512 0e856f808459b6d83c6eaeee418d87d85385968a39e6c1871a0eb76c04b533bbba16996a6f18613b7c550da90c76843bd01237be9b9f290394048e904535653c
diff --git a/mail-client/clawsker/clawsker-0.7.10.ebuild b/mail-client/clawsker/clawsker-0.7.10.ebuild
index 7023d5a0c375..0cc9ea4dbd1e 100644
--- a/mail-client/clawsker/clawsker-0.7.10.ebuild
+++ b/mail-client/clawsker/clawsker-0.7.10.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 DESCRIPTION="Applet to edit Claws Mail's hidden preferences"
 HOMEPAGE="http://www.claws-mail.org/clawsker.php"
 SRC_URI="http://www.claws-mail.org/tools/${P}.tar.gz"
diff --git a/mail-client/clawsker/clawsker-0.7.8.ebuild b/mail-client/clawsker/clawsker-0.7.8.ebuild
index 9e38381337fc..47ff07ea6cd5 100644
--- a/mail-client/clawsker/clawsker-0.7.8.ebuild
+++ b/mail-client/clawsker/clawsker-0.7.8.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 DESCRIPTION="Applet to edit Claws Mail's hidden preferences"
 HOMEPAGE="http://www.claws-mail.org/clawsker.php"
 SRC_URI="http://www.claws-mail.org/tools/${P}.tar.gz"
diff --git a/mail-client/mailx-support/Manifest b/mail-client/mailx-support/Manifest
index 163678fb42d9..0e99e597a256 100644
--- a/mail-client/mailx-support/Manifest
+++ b/mail-client/mailx-support/Manifest
@@ -1,6 +1,6 @@
 AUX mailx-support-20060102-add-sys_file_h.patch 397 BLAKE2B c560eb7a53f2c318873f17c2a3543bd02912c7f635a864e987ac333eca8f4fbe33e5c39ae5bc6122607fdf4c1f73ac40618b6a050eec2d520a0fce32da626c46 SHA512 d2906ca15610090ab93d0f839a0687b67556dccc0cd8dcfe1c5ae52d23c45e74d008376d57d84eaa4272a56f209628819a60108eebaf645cc1c3106ae5a954d6
 AUX mailx-support-20060102-respect-ldflags.patch 537 BLAKE2B 34dbdd5f8a9b3537657f98f8ea274349e043618dfba3d20f004be3cb0fe58438b6c3dd9af91e921f776ee8b38bfe296718add6da217893dae001c904bcebf225 SHA512 cec6b2cf6a3f8b85ebdfcd3bdbbeac9ded468b7f34053ef6473aefd413292d9d7dc350782488481a3ae2db273ad9a7005193acc0e601c5556a2fdd49640dfe1f
 DIST mailx-support-20060102.tar.bz2 8822 BLAKE2B aee5141916f3d59f730e52f5e80fc465e7a3d961ff38e5e3d3feead4b772682c999925b7d900e2d3f87d178a6730994c2e0ec3d1625b5794bed5945a219aef81 SHA512 a4bd84253fcb5a97119e75290dfda01004115c3eb5898bb792c75f7b01c7e48fa1189b9ec4ed195c404196893af8b9390062f2f258da68889b464b53aa0ecbc2
-EBUILD mailx-support-20060102-r1.ebuild 839 BLAKE2B adbfa6751d39d9f1e04d75b36a86330485d2231d251a5d7cafa5a9eb8f7ae34460c6d53d88f00cbf793ab3640de0439838586b1b3734057e4831896bd805e959 SHA512 e4e0749a0e93bb2e43c239ba611fd2f2a394647ef8584c64acde75a0ebaaa9d14c04462f9d828d8c589f5459834d3abd5c45018460cc9e660dc8961b621f4376
+EBUILD mailx-support-20060102-r1.ebuild 847 BLAKE2B 21cc2de483bca78bfb46fa77e1ad9a34d0c335eae7f6a34d987b7b204c422631d239f0a95f0f1a8e719ce008539970ec13a218059825e5c5949686f535166bc1 SHA512 9d9320a9f6c509b32f78b3accabb17341c3cfe71a569eb3b311606b0bb0acbb95345e02141547e32b882acd6780ada1a1970fa3bfbc828e336d8fc790a536569
 EBUILD mailx-support-20060102-r2.ebuild 875 BLAKE2B ce70097e4bf1193d8042638516cd3fc41fa0e5a8efcb8eff599ff675364c45aed6dfce06e8f05217a1403898e2714e14147bb37c7a92b3564dbe356f2b508344 SHA512 fc635527b9fd6fa8e29cd81c3b5c04e16d5f84cc732b4970eb0cb9b49ab33f697dddf10e3d2c15e9967d04b1f2db52d4ef29bd7ada487c0253b03b4cf0390d8b
 MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/mail-client/mailx-support/mailx-support-20060102-r1.ebuild b/mail-client/mailx-support/mailx-support-20060102-r1.ebuild
index 66f906bc438c..5e114e7c496b 100644
--- a/mail-client/mailx-support/mailx-support-20060102-r1.ebuild
+++ b/mail-client/mailx-support/mailx-support-20060102-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Provides lockspool utility"
diff --git a/mail-client/mailx/Manifest b/mail-client/mailx/Manifest
index 3cf2b98cfb9f..e2a0b97dac10 100644
--- a/mail-client/mailx/Manifest
+++ b/mail-client/mailx/Manifest
@@ -4,6 +4,6 @@ DIST bsd-mailx_8.1.2-0.20160123cvs-4.debian.tar.xz 45768 BLAKE2B 7e5ae62dee74250
 DIST bsd-mailx_8.1.2-0.20160123cvs.orig.tar.bz2 76715 BLAKE2B c6491cd88e99b62184da60cc6f8a42aac5f7f5a828c80c05d3dc4493c77727e553b916cb646dade38214d3a6738c084559764abb812a1dfe1fcce2e4d6a04960 SHA512 b66dd0fc5a150c0e1068b9aedda8425c73be7ac7e22d91f2c52de3f2d416016886f46dd54ec5024c0cd4c7e736aee7bdb68d9117f9b2b455fc42d05e1a677373
 DIST mailx_8.1.2-0.20050715cvs-1.diff.gz 36758 BLAKE2B 825e4a62fa2d33e29c25092ec466e07be6be2abed0f1da5623f37be179cbb1212baade400a621fa838eced88a84393078c67c3126774ff08030680f4f0dbdd54 SHA512 6506261f24d5a022fd9cee596a78488a279a0b39b7281cdad9c3e52b5c7f6c2506a1b24970c28cf7b4ffa4ce2d71fec650f42d22959b53aeca0f160b2885b2fe
 DIST mailx_8.1.2-0.20050715cvs.orig.tar.gz 94664 BLAKE2B 0b0b9f4db18bda8b6572c97c33784f7e29c16d500b3658b79f31fb80947035e2bfc7eaf6e8bc50e621ee13ae5e61d7760aa882c29f0b082ce8974f7b1aa8416f SHA512 1c1d991a0e522b2e78a49b9c78eed80b1f6d4f68ca0427ef720ebe77a3a2881bcd3d63967ab04f5d6f75fbf2212e260e4a841152f8a69d300c46acd90bb48d68
-EBUILD mailx-8.1.2.20050715-r6.ebuild 1611 BLAKE2B b0ee36ea309f4aa4cf1f691f931e3bc303e0d15425425fa439d3b8101b74e27c09b21130062dd582cd0b2fb9b288d3b971c4cbff4703a7400d4b1cbb77331dd8 SHA512 08097bbdade032ffd4ec92527b56ff4aaaaf356e7c6ea990fca3a8210567abf9f5e0c31c46beaf9fb803306fd83642b600a0dc16ef80b4f6bca7ff59eb9cb711
+EBUILD mailx-8.1.2.20050715-r6.ebuild 1619 BLAKE2B a2365ea4db6e9881935455836728cb496fad5341895441278c22f45514738c73cc601f8ff043d6858e81e13949af026fbf28745a096e567e36ce2ac0aa1072ae SHA512 ab3c2b6ec40370585cdfba80d29743aab1d8899b4d0da82f134db9f5e72a504599cbef9c526aa16b1a07ec8392f829cf20b1745cd84610326f60a08f5d5f6813
 EBUILD mailx-8.1.2.20160123.ebuild 1254 BLAKE2B da2a38227d81628be9591b41b338f136c484bccbdbc80141b8309a5e2f1398eeaaf15b6e87652f601170b3638c3194ac757e47dea8721787a4d766a666976ae6 SHA512 ef33d5566cd54bdff85a352488882f8ca1783c3747262ba25564b80d8fb69f6be58dbb793ebad2cfa36b1e0da94bb7991e98b46cd06df4f77ccb0580ac7ac8df
 MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/mail-client/mailx/mailx-8.1.2.20050715-r6.ebuild b/mail-client/mailx/mailx-8.1.2.20050715-r6.ebuild
index 9c54aeba8a5c..c51ce8d07a7c 100644
--- a/mail-client/mailx/mailx-8.1.2.20050715-r6.ebuild
+++ b/mail-client/mailx/mailx-8.1.2.20050715-r6.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils flag-o-matic toolchain-funcs
 
 MX_MAJ_VER=${PV%.*}
diff --git a/mail-client/pinepgp/Manifest b/mail-client/pinepgp/Manifest
index f9594adf5306..9f1d2d100a2f 100644
--- a/mail-client/pinepgp/Manifest
+++ b/mail-client/pinepgp/Manifest
@@ -1,4 +1,4 @@
 AUX pinepgp-0.18.0-makefile-sed-fix.patch 3349 BLAKE2B 00d93e404210a8fbabfe5e8cdc441a434a8cab30f6e6584564090bb2590bbe3dbfb1509822a9df9f17ff5e688e43469ef7c1fa62f7076a60560938d92ef19177 SHA512 5c2c87ea5ab1e8cc64b7223f5f56d5211d1c024f84ab8ed6ba15d0b221010a080a6843133d0b29e72b15db08028175073fbb7dd883584da87e3a753e362c9b31
 DIST pinepgp-0.18.0.tar.gz 38103 BLAKE2B 21c8dfad016ba1c35c0d4c30ec92960a54519c85db55253c41a85d077eefbf556cc9d3748808a61b9c856460f588e1f8a13259be7ef2152f9648ff4812a27439 SHA512 b28b71d4d5132b451ff4a2a9489f830cedade300d18ad05a0aa443bffa6fe5ece7be4f166e7428fc999b2d1b550cf8dccf7982314868db8597117d0f8d74686e
-EBUILD pinepgp-0.18.0-r1.ebuild 593 BLAKE2B 44b9d7536f4cb3ab6e6d06e6d23590a35e636468577df4fb38c4b7b70a4868c7865fd7b81504f126d80694890bcc9548d8c62b9091096a228263c9524fde88a1 SHA512 219ad80e89a959f38f1eef93eeebd3390ed56c62eb957a1cf64b0a25f2f83bd5332afe1badee06a52beaee03ef04b717c494e9b9286084c3816ad2238e3ee90e
+EBUILD pinepgp-0.18.0-r1.ebuild 601 BLAKE2B 4a0d5b93d967804a247a04a0a2cfe0b4d0711ab3d4f932e039f73a81ce5d88d9b3907e551bf30a92975c362a3a6da082c165dfb0d0c1f5803f813689add52af3 SHA512 863f3649315fd11b636ca73a3a86fce4f130cd0b4176e85556dd09087327147189b96451eac479bc10dddf64425d9a43b498835e2d736f386c8107814815887a
 MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/mail-client/pinepgp/pinepgp-0.18.0-r1.ebuild b/mail-client/pinepgp/pinepgp-0.18.0-r1.ebuild
index 95a81a524881..1e81cafec6c8 100644
--- a/mail-client/pinepgp/pinepgp-0.18.0-r1.ebuild
+++ b/mail-client/pinepgp/pinepgp-0.18.0-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils
 
 DESCRIPTION="Use GPG/PGP with Pine"
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 3d26821851cf..992ee191f5ae 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -6,5 +6,5 @@ DIST roundcubemail-1.3.6-complete.tar.gz 5529370 BLAKE2B 49fd04d81b7047c61d33007
 EBUILD roundcube-1.2.7.ebuild 2286 BLAKE2B c7b34d0d45035d02fcfb59f5b43e1c49ffc60219579d709bff1c5b8d6b4cc5fcc426b94989079aba16e2a43defeb57460fdd2af9d3c8f5a4478ca8f8ab3d9a76 SHA512 b4b0075658f1331f086ca0bf34b1118475836468c7735dca32d77fac9981f60fd929c7ae24b736fa71eaec472e95699f0dc6fe1fb034c88c26bf457140f5632f
 EBUILD roundcube-1.3.3-r1.ebuild 2380 BLAKE2B c58468a39a852201afc0b4233fb18d49967535187c3cd4d20b7ac5d67932388238d08a79b891e912d674afd5d8e5a230deb630aba4ce9a83d91096813811ae57 SHA512 89d66b6fe22a4797935d809d9a6518fc6c36c3b166906d6d9702fa4f1964fdda4197215ef84459e2b8c20eee18d75e6b421c0361811900d9f160b141708c1831
 EBUILD roundcube-1.3.4.ebuild 2575 BLAKE2B e5b4dbc799a81eec29fee1450374bd6612591af3162f9afcc2a409eb58403d8277d5ad80c78c2df9c53257cada33eeb623c32644427082c6d556af82c5ac709b SHA512 166a7d2a6c6170eed3d8a226c69628096f4bed573394491601b9cb9ecbdd8d37fc5b698d8dad50043d90f574e2bcd201d52a0256c5eb1aa7097960b3b77a8437
-EBUILD roundcube-1.3.6.ebuild 2577 BLAKE2B f7c99dd7867936839bd0994ca42bc9ec91a5214cb0c974b69b89e04a80183596cec8a1f74125c204e43012d76e56151486619a2227f544d30d59cd048e4a88bc SHA512 b9c705d627e2a1c35cfd22a53ab7ec6069b61b273dad826b4f77bbe3352ccbd3a84063b0d2149f4f97e5d73c2889e32017a002f575f041f97f75064a5ad18a52
+EBUILD roundcube-1.3.6.ebuild 2573 BLAKE2B fe8366da66738483a876bd8c2f481905a73ff24eb3f2cda13f879500ee12bb158bd6950a57806f2d628384d32ed1e8d82f28ae2e7b470f10605fa918593401c8 SHA512 a1eae4d3c3d1eedbda34664a4b225efdcbc3dc95b45a202a7a0ec499a576f6f08de5094cc5b9684e748958925ed4f75da41f58bcc483ba4dfef9342836c85868
 MISC metadata.xml 860 BLAKE2B 8135a487928f879b6dd9665e171dc18e53f4cdbada44b71e41891e376ce6e4c76a80cb85d3dbbb9303fdb2c4be330952c144305499c5193f52b2d3ab9e538307 SHA512 b17b6d05898493d08d52f08b333f762518442ae519b23e8f2811fb6a369c6b26688a380656e8e95d7da706834547d6fe7d52db6992ebf0bf5b9a30ad0d21c56f
diff --git a/mail-client/roundcube/roundcube-1.3.6.ebuild b/mail-client/roundcube/roundcube-1.3.6.ebuild
index 58391a85615a..1c2eadee9c8a 100644
--- a/mail-client/roundcube/roundcube-1.3.6.ebuild
+++ b/mail-client/roundcube/roundcube-1.3.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${PV}/${MY_P}-compl
 # roundcube is GPL-licensed, the rest of the licenses here are
 # for bundled PEAR components, googiespell and utf8.class.php
 LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
 
 IUSE="enigma ldap managesieve mysql postgres sqlite ssl spell"
 REQUIRED_USE="|| ( mysql postgres sqlite )"