diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 8f01fcb9cc78..3e1662111825 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -7,7 +7,7 @@ DIST httpd-2.4.25.tar.bz2 6398218 SHA256 f87ec2df1c9fee3e6bfde3c8b855a3ddb7ca1ab
 EBUILD apache-tools-2.2.31.ebuild 2161 SHA256 07f166c1e1a4378026f4f797e2fce4746752915c980c1857039bb954ae908825 SHA512 f7ad07c060f1f79641e2b5aff1d07c1b34dd4502e598c773d3ad56d543dd87598dd29512395c4fe2b28e6451fa60d5a1a3498edfd00191601cdb00888a270e22 WHIRLPOOL d889499ac4b78a99bca8f65fcf9769ef33e8700c61676507efc87d9765ca9f17077a6e0e71fbca54e1ad0353a7573ea41b4b183012c485bdf0d5e8894504aedd
 EBUILD apache-tools-2.4.20.ebuild 2685 SHA256 9d586f637b7a52649f7722572826b3745ad4581ce389af15a1ab1d2a8b717670 SHA512 0ef65b01d26d13a080edc88144659ed3dbd302dc9fbb2bd9ca99b30137be179d0518fc547eda8e8b76383c8ba281e0c60846d23f17015b946b0401ed20391772 WHIRLPOOL 776946d57a1adff3092d713626d4299e6b7e389cf5965a2b878af4360e156a011fb92e169fb0cd62269ca09e5d5609c798c4b1e6f15b33e74e4d83bf933f8a3a
 EBUILD apache-tools-2.4.23.ebuild 2684 SHA256 bfb93369e953088e236b7ccabef26eb9a178d4a5346a56d3a1adb4153a8998ae SHA512 290beaa7d46be1d36c7bf5202c460fafeef2989d482772732346cc4b9a88173b416f499dd72e38dd31f6cec44e760c1eb23c8439494bbc9dc78e15e303e23c5c WHIRLPOOL 11576d3054a84e486002ce5f70d6b4d7c292b8a672f41f3fd34a59131a2f69c71651ca06891f384b90906f5a17819810c4e97ef4492e08985183f4141e5ad7d5
-EBUILD apache-tools-2.4.25.ebuild 2690 SHA256 426207f3898aedf655f6e95a44be07963a4d5eb22721ea54d7635fdff8aa49b0 SHA512 3035c9b66d2d5eb4b544f81b803411271612907b205b5652e6871b9c397e939297cc6e211c4b7081f0a73f6d130c51aed39919de3607e67acfe5596756913883 WHIRLPOOL 66bc2ec1b42760905c943940236cb5f2861dc3de0e4820969ecafea40cb28fbcb925ea2bc61ff95b328c7b83a19b7b449398109d91fb60cbd4fcc4d60f1175f6
+EBUILD apache-tools-2.4.25.ebuild 2687 SHA256 9dba404e475bbfcea3dd8ce5058463ac5edf7b51a35a06207923c6b9d3e2a6b1 SHA512 604e5e693cced2c3f85c9ec0755b45d7b075fc9619c77f746143207dc9f64c68b54cd7c130c999a55e12f7d86fcef8d286c8da1484d56528b760b2785b40b266 WHIRLPOOL f27b0d152afe166a337da8b198be88c56cdf76ee74f2204a3e88f7b5d54fcb6e1d5717c93d9865b7248c7f7c29112f392adf332f460448ba4248ea753e5ca40f
 MISC ChangeLog 10183 SHA256 4160609514d162d5b28196a6b3a90b27cbb38ca71e9f4a8abdbae628d76a8e66 SHA512 b53f5eae871b1183b7230969cca04477a09cb263e5f6a95744831247d8c65aa95fbe5d639a184a4136de537223745500e43f36982c77d3bb0243158bd74ef664 WHIRLPOOL 8c9a2298544d2c4a91470ef3147e34e750a0cc687882511a8f6273c3073ec878a5e60536af3edab0d16d664daa57c6ce233016ca07536ae5784e2f332bed0c9a
 MISC ChangeLog-2015 27945 SHA256 5d6bee2eac0905e873ea8986ec7bc3d4bee37581d931c09e55e6ab8c414b2d83 SHA512 f2f602931d36aaec1068c643729dabc4cc30c2a936cd418f48cef14dcc25d0e6eebb79cd003667a38e82e0eddbc2c5f6b35801314c1d0fce08643713ceeb00e4 WHIRLPOOL 01ed580519a15a2b7d4b89a1ed5f7bd223eefbd6e4d3804802ae5970f08125c02b64db936c6f401075844f2a5e608499cad29963cc21d97bb3a625d58671146c
 MISC metadata.xml 508 SHA256 6278b055b895401969703dc8f7a8d49244543e693e77bf57be03485a76f518b2 SHA512 0837c71bf2c7d2c54b7f6e3fcc4f5f1f42b36d6e14a981e38d77089551318db72c731a5d0eef0fd95ca55e69629a790f2e6719ecb59368cd7dd935ebafaa89aa WHIRLPOOL e07c6e0a11487f30d482e847cef17aa6f6c9365f469e5f9debf057a93701d91ca82d014b1d89799abdbbf0203d3ff3713c502bc605c7b74a1179c3330dca256f
diff --git a/app-admin/apache-tools/apache-tools-2.4.25.ebuild b/app-admin/apache-tools/apache-tools-2.4.25.ebuild
index 30fcac57a526..49e766bb9a66 100644
--- a/app-admin/apache-tools/apache-tools-2.4.25.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.25.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 IUSE="libressl ssl"
 RESTRICT="test"
 
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 17caf7484055..53fe55785ac5 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -2,7 +2,7 @@ DIST sudo-1.8.16.tar.gz 2707358 SHA256 2d83826fc5125bf073acc203dbda1cf2abeee0170
 DIST sudo-1.8.18p1.tar.gz 2822109 SHA256 e5a0471c721281a693025bbde33ebd9d3db43245d83ab8516bbfc23980379434 SHA512 8dceeb5024c4f94fcc15e75fa2fd164af5e0597734f95df43207738b3258c4d396e102faf2b6811e399f1cdbdbf617b87e5bfcc1e591ea6722f45d81d1098fe5 WHIRLPOOL 094c1232517706a6da4a0548f7ab5c0c7b9e12f8ce584db97d0c4793a38c4044538637f2834b9f3104326bd5b4b826d08ab79b1dc2c5b950de7d7f558685ef7b
 DIST sudo-1.8.19p1.tar.gz 2860124 SHA256 b8afb1cf8736b6c61f171f2bf4b174818d9e00e92ef73da55fabcd01286ffc92 SHA512 99fd482d34166021210b96959404aec22b4e793d04fd2037f7ca07118a817fe17ce2133662f20b820aa1f409e8f153ee3c1635e775a667dd4c95bcc94bfd6474 WHIRLPOOL a8ae1ac6a1af8b4e23a61efa00372a67fce6d171ef1a13b60a2d93a1326098f016906875a097567002794e1d61d0b45966f12099ac21fa0de5f1db8b54b93a2a
 EBUILD sudo-1.8.16.ebuild 5580 SHA256 4a8e94518ece017d00e74ac94ff01035fd3ad7a3b65c75e1ebaa7870134f270c SHA512 db6578652e689791767e73f98765b845b1bdccfcfa8d72c5a466767ec06130bcdd6767f15ff711705fa1afdd1555b7bae174810565ceaa6c76a9ba1bfeec750f WHIRLPOOL 0fb55bcf86f0e1359eb394c42d4595cf5370327fec2509e7f96756a0bbda15c86ceca343359351d53371960690640a0719b4b657a342ae9a71c55177e2a690a9
-EBUILD sudo-1.8.18_p1.ebuild 5650 SHA256 1f30b0f3d5cdeb6cda9d5cfc00c0b8cc9437fa592eabce6a3afdd21df2f95555 SHA512 e400440a7764f2593e72c52d9dafdf30354ae47979e8fa9d8623b463a9d7615452a5261533652aab0ea561158c396c39b95b1b3c95efa9e9b22db7dddcb0a434 WHIRLPOOL 224bc49904312d11adca9f0d9e4a6fa5d0fbca752c6be083ac0ad3fb5afef7ab8b65d73c25a31417d1c6699b41a81b0a9e1d893c1d17889c4f9d4ddc59d7c72f
+EBUILD sudo-1.8.18_p1.ebuild 5647 SHA256 fbb2a26ce7d1b9e68c76a1080832903c5493476578fbb3f6d43702ad896a3711 SHA512 71872dcf1d20d5f25470403339ea10ae0c4155090d1a67473f853a71dc66cd094b264047911de54c1c66507431d39e24e6ab869d4452af6d9a1902940254b330 WHIRLPOOL 555abc2c53a89858fe1b74a9c6e43e7ae3274bc07de83f3be775855de085fd9b759ffc1c0503e9642c821a46bf3062a41ae2d6c538b9cc0d631ae8ff90fab86e
 EBUILD sudo-1.8.19_p1.ebuild 5654 SHA256 a85b7b1b8c7ce97e6b1aaaf60b40962f90a6b99882c29c880bf167bdc9f7f024 SHA512 d14d75ad3d25b85803727daa04a5306ed667867ebd21123051b3f19a93b57497cc092d1629e3c143e19315d40f51b27060f559dd0e1570126310f9f55cbf79be WHIRLPOOL 2fea60fb0d23fabd6db8dc95a792d7914d39218f5282585b85c3db68fc718ff10cbb3880288863c503cf99692aad85fe5c12549238cfefed516caba0318704e0
 EBUILD sudo-9999.ebuild 5678 SHA256 571d516503f916fd3b772fbf92c83872fd8d1e8ea4edf04ac91dc1535a736e7b SHA512 e8cbf729f6d8eb77be1c7103322488ee9aa6214890a7ba2faf13005b591e128c98d61f1a2f4261338432d13e4a52d6f3d7894e28f9ed90cfc8b2e4c6442164da WHIRLPOOL 02599a583105c3c8cc2e075f8aee72e421ae2d31d00c337a500fda1a6c9e5615792c2961fb8388bd3d1ff96dc2abf1fdee972acc5f079f663e00e461c7b6037d
 MISC ChangeLog 10568 SHA256 88c3586b178e3222f190930a0c39bbb7755261152ac866a3ab6142f9cd740fef SHA512 b06ee9dc63142e847ec5045a84baadb5e0790b63aa87f05a6c0584261648d4f2b10be30c4cf2040316d5c3ff193ce7fa3df20f3982ec8388b5998cba4798d878 WHIRLPOOL c78f7ec2b5eda9e68aaa6a0eea4d2bbb1498d43970465eaf0d5016bbd8b73a703689632a69a66d2775fa6b41d8f5dc80af8fbff0339603d5952d0edc73cea07a
diff --git a/app-admin/sudo/sudo-1.8.18_p1.ebuild b/app-admin/sudo/sudo-1.8.18_p1.ebuild
index 1d462cb24a2d..e73216fd1718 100644
--- a/app-admin/sudo/sudo-1.8.18_p1.ebuild
+++ b/app-admin/sudo/sudo-1.8.18_p1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 LICENSE="ISC BSD"
 SLOT="0"
 if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris"
 fi
 IUSE="ldap nls pam offensive selinux skey +sendmail"
 
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index eb7e89d2ca0d..0b8abf859799 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -6,12 +6,12 @@ AUX dpkg-1.18.12-rsyncable.patch 1245 SHA256 a8ded4f7cc0ce9c2874a93f5838ff2989a3
 AUX dpkg-1.18.9-strerror.patch 231 SHA256 0f860a40be8b9da4412ad987fcf9c2ee278c740e34ddb0b8e361f7dd57ee4343 SHA512 beadec2402d9e582d20ae3e08f9acfdbfb582f38582613b7be7a801a178e28ecec0ed71324e2d6f329b9e02e4fec358e372cea55050ac928e0f6efb5541b60f9 WHIRLPOOL ac9b3e7f25ab8af6d57b13cc0c627c3d8ddd8a0c1be8113f3c84e543faeb3493ed3621b052c65ba0eef17f0d095a2ae414b3767d95fe95fbad44126349c31628
 DIST dpkg_1.17.26.tar.xz 4410860 SHA256 aa4e758752cdfd7ecb118d7a7d31139a0c090c92aa494aa2e46603006deb1ec8 SHA512 4d2f2a7691dd34d47b62ec1f602d9bab612b151f05362607ec8e31037c4ba0baf5d609c46352240e9806e5781db8df9781e8a0ee9fd24faf54f8b43244a7e538 WHIRLPOOL 56decf0774f2d4405fb0934415c50749230c06fe9112e0ebb4458a8917538c83644eadb885d24350bbf713a6250dd5687956b70d47e22c06cf39ff87cb2d5a23
 DIST dpkg_1.17.27.tar.xz 4413092 SHA256 90749c31b9f1fceb46dd9fab5b50de34272efef333cc16d9e144f514fd944bb6 SHA512 6f0229bf6c6b76be22d0baf4af21b1175b5397c4a84eb47f0d02bb93173207cc087015a53a2ed9feb7195d313d447d71a0d7361eb1238377c38f8be4465f8bbd WHIRLPOOL cc8525d391bbb42e399e4a1ecb526db1071122272f7eb1b23bdbbad361dfa0f7af8f1fac867f5fb2028d74171ecd3b175b813b2370b2982b17c1d05b39921455
-DIST dpkg_1.18.14.tar.xz 4492628 SHA256 1788e418526049097fb3d8f68d5a75053c19693ab1fa47a506a7ef80db454d5a SHA512 9588d6827c1db39208408a0bb171580f564a97b216013a777cb956dffb039fd0f8241461e3a3a6bf5c4093b0e968f089d71d85af18ccc82c49a1e006aaf680f6 WHIRLPOOL 96f1ec8c1ed623b99600c9207643f18781b75008aae5e6085ee8148d147177b5db9d79ef6ad4e5f3ff8593b7ee2569448cb2b9dc51c646f2cc05ae2712baa0ec
 DIST dpkg_1.18.15.tar.xz 4494820 SHA256 aee936653b9c39403160c0a331ee7934563fbfa4e1f5adbc14a289c803cda371 SHA512 63b5853013868e89ab0d6c98d23fd704c189854bd08b771d10e8c906010421c58d23e79bc513d4034f90e6d91db04ff82c33312444f24392301802789684eb73 WHIRLPOOL fd74d3febcfa0a654267ba6dc68703e392d8c92ba633512a1cf4cea4e4438638eeb4104714be808c816f9f0904511bd7db1c260180c03b69c9bc0b9a514d2810
+DIST dpkg_1.18.18.tar.xz 4501988 SHA256 c88b61e3d4660500753142689e8ddbeff1c731f29549f3338e6975f655936ff5 SHA512 7682c8ac523ff710acd6742b9a884ed8ec8537e3b38496f871f112fdfd2f874af6d676cfef2d31d2474c5637df043838c814ef4038097b009cf06b3d4e66029c WHIRLPOOL aabdc0df8e07fc5190e3bfa3ee29537b655410f739f5c7930086aba8e30745aceccbe671963b045d74acb2ace704a846b650c83c8fb515abbbccf5d71d70dde8
 EBUILD dpkg-1.17.26.ebuild 2385 SHA256 6f7c1e553ad2b7853bf12267311443459cf79ea3bcbbfdddd59aba43a3b6138e SHA512 d57ff5ceec7f0cdb5e256b19e190d73a0164bd26c1e0a0bc52b2b70557830226068fb3bcdc6e94a730ec23f9cd57b4680f07bcb5e447755a725dda0b963de2fe WHIRLPOOL a09a65e80cfa1054ed0b6957b88a0285c306203288700ccf3b946a278228afcbc9bed604a4eb45800772046cb5842c8370a262f9d0dff03206518216e08b6497
 EBUILD dpkg-1.17.27.ebuild 2394 SHA256 7c3907b026cef28949147fd7add15a6e581db02d66d1753c9fb328616946c24c SHA512 f9300d71f90cc6fd37fe74331dcb6e12fd0560bf1ef33680dd1ecc4054c2c1a1c26e0dd5892a8166d63c323b4db9bd503fd0ba6182101d7449ef22754c123b67 WHIRLPOOL 4fff11e65581bdc2fe58838bc28fd111d766698f95f82ce62e9bfba337175f0a84f168afd546a0b463c97dfba600fc2dc1277fceccb894991808803ae078a2e1
-EBUILD dpkg-1.18.14.ebuild 2483 SHA256 8a09b9aaf8cf8cd82816495895590778b0a9ca867b6477bb6ce9b073389dd2ca SHA512 8877a41c5f9f5a8bc59b6ab25a60126303ea4e49e46168a4408d08a84df64b98fff8da297369084798e892d794e4f817267230ca1abccfd8f3a278928ef6de65 WHIRLPOOL 7043f79b5a744b5bdd41dd058bda76b02852c562f1d7e63ef338ce6f28a4b5cd740a535f29e38f28ef2ba862fbd3376dc7997d7b2dc877cd57a4ceadd925e654
 EBUILD dpkg-1.18.15.ebuild 1872 SHA256 543749eed61dd72bab2b032dcd20af20fec960820e2d2c162d6e37198e26e8f4 SHA512 fb98792dc0aedd37d301f83a15102cdbade17011fa276397fa81fcfac20ecf756138c64a03fed35a093360ca1ae61fd79dbf92d14b36cc1e01e218bf790b2b61 WHIRLPOOL d88ca31f63a68d54e105cdf3f1a38f903415fd6f3b819b2294ef116c574c3b0b32cda901604ecbd135e56563ad3f3c31e22b76a74b88bf6c73b001585c560265
+EBUILD dpkg-1.18.18.ebuild 1872 SHA256 543749eed61dd72bab2b032dcd20af20fec960820e2d2c162d6e37198e26e8f4 SHA512 fb98792dc0aedd37d301f83a15102cdbade17011fa276397fa81fcfac20ecf756138c64a03fed35a093360ca1ae61fd79dbf92d14b36cc1e01e218bf790b2b61 WHIRLPOOL d88ca31f63a68d54e105cdf3f1a38f903415fd6f3b819b2294ef116c574c3b0b32cda901604ecbd135e56563ad3f3c31e22b76a74b88bf6c73b001585c560265
 MISC ChangeLog 7721 SHA256 1e1c36cfd01473e82c9cc67664f45558e45b8c319f517890e9436b63d9c39d92 SHA512 2683ce4a540924cef2c096b3793bc0f453494aff39d52ab4a080d43a994e1215e546bc761be915af1fe9331c468f192e65a75d728fea298ac8fa7db83b28119e WHIRLPOOL dd7cf86b9ef389d004008c114af04e7095da91a6e4ab666f031f3b030b599ec606570b32891b6a4600ba4fd3718aa2d9e45e46fc03390a6bc297a91d9184eb59
 MISC ChangeLog-2015 41705 SHA256 f7f0188c3df33ab1fc331c9ca695b1eecd4ec0cf3b9e5b3ed08df7b754ff80ce SHA512 8e1c6d6fec58f5fda0a2b052ab7854b6251032d68e2f594c638d6d7978b248ae387ac1d178bb9e4d9dd2587386c2ecdadac03d0df81b9847dab03f23ec29d1ca WHIRLPOOL ad4693ad3c953fcb20ace7db867b1bd293a51a12ee37a0beab170b93be9503b780b023fd17568e9579cc4ca72bc030f19e044fb8ea09989880cb087e7f0937b3
 MISC metadata.xml 339 SHA256 7e03a6012cee00c3a0b649654cec8a24311ed416b5061f351a2a0af841b43292 SHA512 c3fbabc925c3e99f26c6441cdea9626dc93520f2a8d3c5e45bfa7e51d42095295624f0f82377240f0c11580a9eccc5b5b15bf149ce6cfa36960e52f8c77aa61b WHIRLPOOL aab452f864ee87d0b3477c03b4299b89d61fb0c1d23ba061993f729d9f44b0742611fae0c3d9b0cfe88ed4f4dd0d4d7a8e74b5cf84e71acdfab1c0b696204358
diff --git a/app-arch/dpkg/dpkg-1.18.14.ebuild b/app-arch/dpkg/dpkg-1.18.18.ebuild
similarity index 74%
rename from app-arch/dpkg/dpkg-1.18.14.ebuild
rename to app-arch/dpkg/dpkg-1.18.18.ebuild
index 94b5afef1557..52d054c0f957 100644
--- a/app-arch/dpkg/dpkg-1.18.14.ebuild
+++ b/app-arch/dpkg/dpkg-1.18.18.ebuild
@@ -15,8 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 IUSE="+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib"
 
 RDEPEND="
-	>=dev-lang/perl-5.6.0:=
-	dev-perl/TimeDate
+	>=dev-lang/perl-5.14.2:=
 	bzip2? ( app-arch/bzip2 )
 	lzma? ( app-arch/xz-utils )
 	selinux? ( sys-libs/libselinux )
@@ -32,7 +31,6 @@ DEPEND="
 		>=sys-devel/gettext-0.18.2
 	)
 	test? (
-		dev-perl/DateTime-Format-DateParse
 		dev-perl/IO-String
 		dev-perl/Test-Pod
 		virtual/perl-Test-Harness
@@ -45,29 +43,12 @@ DOCS=(
 	TODO
 )
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.18.9-strerror.patch
+	"${FILESDIR}"/${PN}-1.18.12-dpkg_buildpackage-test.patch
 	"${FILESDIR}"/${PN}-1.18.12-flags.patch
 	"${FILESDIR}"/${PN}-1.18.12-rsyncable.patch
-	"${FILESDIR}"/${PN}-1.18.12-dpkg_buildpackage-test.patch
 )
 
 src_prepare() {
-	# Force the use of the running bash for get-version (this file is never
-	# installed, so no need to worry about hardcoding a temporary bash)
-	sed -i -e '1c\#!'"${BASH}" get-version || die
-
-	if [[ ${CHOST} == mips64*-linux-gnu ]] ; then
-		# Debian targets use custom full tuples.  Map the default one
-		# based on the ABI we're using.
-		local abi
-		if [[ ${ABI} == "n64" ]] ; then
-			abi="mips64"
-		else
-			abi="mipsn32"
-		fi
-		printf "gnu-linux-mips64 ${abi}\ngnu-linux-mips64el ${abi}el\n" >> triplettable
-	fi
-
 	use nls && strip-linguas -i po
 
 	default
diff --git a/app-benchmarks/bonnie++/Manifest b/app-benchmarks/bonnie++/Manifest
index f853b30e73e7..c592dd69e0ab 100644
--- a/app-benchmarks/bonnie++/Manifest
+++ b/app-benchmarks/bonnie++/Manifest
@@ -4,7 +4,7 @@ DIST bonnie++-1.96.tgz 105183 SHA256 9c9d87bf09ac5a42a915ceeb9d8bb8358c0ca4642d8
 DIST bonnie++-1.97.2.tgz 102533 SHA256 3f34a4c52ae9b2c3d493af8f794ba18cbf6732e9b76c3a4fa64549d95d914ce3 SHA512 e8303720be9a4ebcc454dbc8906a6843d63909c5101d66524a126ce0db3db7113d01edb7ed2f292bf9d08a6799579c4960f0ee4595019fbacda1601eba52a170 WHIRLPOOL 1f66eef8a583ce9cb851a6c301019ba76d104bf3a6322d504cd7c8d1eb073c48235efcff6fec2b2f49207aa696db1071c55c94a3943a01917b2a7aa7349b0b73
 DIST bonnie++-1.97.tgz 102604 SHA256 44f5a05937648a6526ba99354555d7d15f2dd392e55d3436f6746da6f6c35982 SHA512 985fd4d0ef643fda5363e61609a5d73206ecfdd1c27470cc7babeaf9b7d87136c6bf40f62366d3f3ea58c50a307fa62aea59dc5efa69854fff9c43d1c940d3ab WHIRLPOOL 23af9926691868a208fd69f7ec401fa0c2332835ccc63e4b0143497faabb02f21ddd56a41014b532287f4418e0ac92c712aff2bc0657ad2512961fa5aa3567b9
 EBUILD bonnie++-1.96.ebuild 777 SHA256 a4b88b579a369fe12f2b714efcc8cf78467fc36cf1c53e5cff3e47f027f5f27e SHA512 8d13e2914166eb6cbc84ac1a46589dbefdc81507bfd528cf214785b5f1a88a33607b418c3d9a5952d44fc320a69a3f96b67d162fb94e25bd73bd0442cc47c48a WHIRLPOOL 7a3732fb7542bfcf72c138b5e8e37001410fe3584f7ac39cbed4070b43e75af004ab2d52ae1d792e75d3ffbe03296f16119b82455799a8b40b7a8385a56d9703
-EBUILD bonnie++-1.97-r1.ebuild 970 SHA256 800f86e5837bb38742897ace362bd61c7f4d27acb64b41de518b4639b66a0ebf SHA512 6d57eb1cad29a3c59e16f7bcd00d3627fdbcdc8a1bf2f7625aa128f397859712209db45acfc98172634f7c7ee71c498e2df9450962dd5daf4180b8e70ed87551 WHIRLPOOL 4093a71d0b3ee4ed60578da81e9c083b6d7393c660493ebd24c639ceca47601cea1cf8218f4163a6733e6eba389a3084510be3df6768320ae7e423830ec1b511
+EBUILD bonnie++-1.97-r1.ebuild 968 SHA256 c56b97c1d8cf27b76f6878f6b14a69ae36083a29bdf7a28a7cdf37fd6e0476b0 SHA512 cc9c96e43f267c701d8cfe7fe3e35ff9d149143ffe28690c22286718edebc7835b1beaac20fa3648d6370b25ce2709ff4d97556541e5389b290df9b76e803a9d WHIRLPOOL 0181d3f209f8eee258dd4dd189ebc849e374683671e383cd00c1154d43f075d00bf40a86c7bd0a8b9f8c0ca2174dcca13b24224f982ddb1f645be7dfa7a6b483
 EBUILD bonnie++-1.97.2.ebuild 980 SHA256 cb918c8bd19d4d36aacbb2f9bca31ba3a06552edd67665173c5927a019d514bb SHA512 03e1bdbe0c2a1e8b02b1d782042a7beef9c4e0c119f54f7fec3acca89684c13f2530d33cc433799e0d0d374e27e9a2c9ce9aa9abcd5ed23f7d91177cfda40a81 WHIRLPOOL c86b2d1e18636f1de35d574e37c575c4f9062dcbc5fe259f7febb3782699b28cc3ab05d8e3ffbd7403eb052e3fb8f9a30998edb5b5ea11622d7212d820cf9646
 MISC ChangeLog 6219 SHA256 41ad592e7d116226be01f0403f48189d31f87ec05c1de5d946d999d4486bb751 SHA512 02049d84691fc92247610d85c8b6b759fcd3a9ae2b3c59682a573485458a2b43cbda488f83d415dd6f145a70d6697d24c8021b7129cd60839206c6487c7960bb WHIRLPOOL 43ba359fe20064cb547e61c6a5d9ac417bb70b0cfaa6704c525bd61a954503e707ff939d8293cf5220ce8d17696b60e730994fb0a4eace37c109ad587e58e21b
 MISC ChangeLog-2015 6391 SHA256 3104a69df62423f66f37cd45aa8ce2828d774c3203372b07990eb5c463433aa9 SHA512 a589ebc39e14adbe8729ff33ac1612be6c63ccad132d290c5bc13f9b2a0992f058c3476f155a91d45b85c262b2dc065d56ddaf1baa78055c78c284d9c93e4927 WHIRLPOOL 4859d840cb4cf05c520cfba33bf2a31bfdd79fe3a074e971173aab6f3da535e6730ef226ee67663e4c1a60f67fc8a613e56e0090ca6fc006f89146a97dde4b7c
diff --git a/app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild b/app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild
index ee5927846571..1c7f1afd7ec8 100644
--- a/app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild
+++ b/app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="debug"
 
 S="${WORKDIR}/${P}.1"
diff --git a/app-editors/adie/Manifest b/app-editors/adie/Manifest
index b77281b08ad9..cb2ebc91eb21 100644
--- a/app-editors/adie/Manifest
+++ b/app-editors/adie/Manifest
@@ -7,7 +7,7 @@ EBUILD adie-1.6.49.ebuild 320 SHA256 db45e5f184f24eeec693111cbab3b0d52c0f1234a3f
 EBUILD adie-1.6.50.ebuild 326 SHA256 449f03da428bb435402d931045a8e499c3fd7c6f287438c1a7690981dba1ccf0 SHA512 c94853db90f38fa161b0e3c4684388129668c8d749e1b23c1408eba8a25f824fe3c143da0efa96125db6a1c2aa926e44764bbe43ba31962ca5dae076d255c294 WHIRLPOOL 63c314c1c3150aceb5dfdde16967734c8c76ef9fa4268b71ed928798a20e0012a6573ede8e7c2c0a42cfc0e7e9af8a1a9d4f0031591e551c7d6d0301cad2d240
 EBUILD adie-1.7.49.ebuild 356 SHA256 c4ae02857f4bf6c2a4a5391866e1a2a601011eb65a712ff4609e6c421e5b4111 SHA512 e11439376f4bfff7e7d18e523cb6dc9640b13ca120070dd4c2e90bcd0f9005d7e953c582849c1be5c47a18659580c666fd15cc8d04f9621b8b7734bad2d57249 WHIRLPOOL c583984a70e30cf53c78a59b1cd6f7874d413b19bed4bed41e43793dd984d5ff5e33cb856e7214a46d53b3cf45ee08fa396cc3016d482927500b05b157dd1487
 EBUILD adie-1.7.53.ebuild 359 SHA256 a77a94dc368c81a839fc792e113ccb084a7ae41cc1c2ff4454e11199596e673f SHA512 25001692094922afdb8594d526167438e0553570b4e517dbc683034c28b53a483822e56f827e380db2082913ab23516548038083cebd36e088025d15e9c07d8c WHIRLPOOL 5c564f845cebb455bbd90683c4c17f8abb7a2f57f13e4f27011042b6180145e6491600c08f6524e791ec5ff6aec8dd6e822c5b88e652540431748409ed53e8d5
-EBUILD adie-1.7.54.ebuild 357 SHA256 e696cfcd0797f5123772d685cda218bc53558b9e12992249b3453582a1aa3c9e SHA512 a03220a1db2e14de7760676cefa492a4d7a5f0deb68e2207819711b805d22a8b90acd01ef54a1ed40e5ca85506464777ec1fe13621b59f8b3598f2aa67451677 WHIRLPOOL d38d7a7565d1c3ededed1b4ea9d6dae40f9b67e97d636f3dde4cd132dd402d5dc50cb297c0da972a6e7838a07169af60cf6e43211a9c3f518e3e209834922a34
+EBUILD adie-1.7.54.ebuild 356 SHA256 ece2b278b9aaff7236f052a9d1c17b08428cca0fd13e3d928c69a647c25b585c SHA512 a842c5ded49b0ba71673c5a644e65d1ef992747a3725ab86c01abdb879f18646ebdcbaee645f9d487d09e0695974d814bb6e8c58421f3803a0523fc00a8bd6f7 WHIRLPOOL 66a33b5c4d06ea42107023aaa4fd6108bcbd71bf854df3d653dd91edc877c61497e0cc98390fbe32f22ea0a883f63a56eb9b57cf0b7ac0b9781c556eb9495971
 MISC ChangeLog 3173 SHA256 5943b5284e6d1444f6cb1bc622eec387a06aa8cb79f33d2e2747580ef12cfade SHA512 855df55848e1eb93f0087a48791c247dc27408e7e424a265c4c7958d51bc3c2b7182ea9fccec1ea4579b93a06345670e4e69f1cafc70fe86849b306bc410fb97 WHIRLPOOL 5beb1213a7f85c4d9ae0157e2ef76f811518a98d0e0e07d548e83812ca926c2322e62e6b5e792e49bb0af346984a8ca85eaef50bdf37add5ddd54af4551e6ee5
 MISC ChangeLog-2015 7419 SHA256 55b323734e8f5fd5078b66bbe06687775c64beab2bec00cf2dba0bf0fc320a65 SHA512 696331c19e26a6cf5d8df8e8960ab1a1d34d55a127bc55e1f7cb3016ed640dfc6c5f3555e6abf4ddad51861b9440fe799ec679bb851f9ed62d318ca729896ea2 WHIRLPOOL 7c48195df4dc0db3a3d2b125f61d18300f6db433f7720b008a705c7dcbf2ca729ae74742fccc14939a3eca5c2fbb726c003ef1c691f0acc19fb5d9d68e593727
 MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
diff --git a/app-editors/adie/adie-1.7.54.ebuild b/app-editors/adie/adie-1.7.54.ebuild
index 5debf0374423..66ec60e90c69 100644
--- a/app-editors/adie/adie-1.7.54.ebuild
+++ b/app-editors/adie/adie-1.7.54.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Text editor based on the FOX Toolkit"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="~x11-libs/fox-${PV}
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index fd80e1b99b72..cdf01b3d7c9d 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -13,7 +13,7 @@ EBUILD emacs-18.59-r11.ebuild 4151 SHA256 0a0e8eb5e069eb5899666d00a49bb665e30257
 EBUILD emacs-23.4-r14.ebuild 11228 SHA256 32ab86432e08eaa78c0c885f48d89e3f991e820887f8be2978875b960c6ff92b SHA512 79733bb6967f52ced679f6de8ebb491178181d4712993faa46976bd533bef7c68141d3d7083c5719c183dadf7556b32a2a3625896f9ef68fbc3d66c172e99256 WHIRLPOOL 230ebf0d82aee3b29435f81a78d778dec5aa1c5e91bce3f1daf23036457b9627c404f93ae3b0257c0282a86a34e5f052540f2a15cd27b67f21db176e3571fc4c
 EBUILD emacs-24.4-r4.ebuild 10569 SHA256 dd042ec78568cd60c6f5730546bf33b058ab98be2c5d57379748976a58553058 SHA512 3384c6a62fee6230ad0127924f65adb66010ea34acbb63872532532a602b86c99c39e83d698a6e86828463a6910f3c88b4d594dd16a140c7847f8981fa1fd75a WHIRLPOOL 28f24b5d6adbed4e14b970b50a3df6eb3ab5181db8224473755d45a4a02e455e457426664c40d9e56aa042a23db671855387a40a802a4a5e9d1f945147189d9d
 EBUILD emacs-24.5-r1.ebuild 11060 SHA256 43f8048e4c6f084158a8c37f840911e4370341c1aeebce4f31da9fe5d25cefcb SHA512 4b22b9a163aca1d6d5ace824546749cf03ff401018cabc8a2d59b93d1fcc37564a16d71498983083add38977a5007e40d0d95eadc9f848e1cf43c82b049df88f WHIRLPOOL 61e372668dcc1021350dcf242bb946d584bb2c81b6c0f4d15264f83569b6e6868f41e918aa46d6483cc92bcb383a337c594d39709a7f29d1f926684df5d0587d
-EBUILD emacs-24.5-r3.ebuild 11053 SHA256 cace5df3d3bcb0abb8b36bc7764171213a6e51254e74f88b56f9518f361e9099 SHA512 d1941a0f45f83ef7a811a2d8a12ac906cfa47bd1855b15a1067b7c91683244bf1266b00ef98bcb5f4651d2e8d81762dd904a55e93c0c91c6afd42d089f7d33cf WHIRLPOOL f1657b8a41e4ae2445cea9a8b69a5edf651d46928145dc849348a70b31410ce1ee7ec0945c930cde49446d4d8085c089b11db256deb071e1b6bcad7a5f29c42f
+EBUILD emacs-24.5-r3.ebuild 11051 SHA256 27ba0832a55b1deb2ae4bd6b0057bfefa43672050b23146d387abfa18091ddd1 SHA512 cfccbfca74ccafe5c2aed00d81ce951e82270071e337ac70aafdb62b9591f22da2091574d0c303ac5d83e4b473a53e440ccc2e32385e62839093088b7b229c21 WHIRLPOOL 4bd322e7654958ed01683cc88c162a44a6118558a4469a30e504025786425f545dde3db2a6c2482cb2673ffcab92a391420488e48f4f009354c9e0fea3f7a419
 EBUILD emacs-25.1.ebuild 11401 SHA256 a299734bc74b835c10034f36fcc5cb77c0e469d1a8dc6b5aff96865275deeda1 SHA512 bbed5c8f790edd3862a0a6e26c7fdd19cba5516b2791b4e3f0634ae0b6aeaf8635a3032c8dbc849043213506bffda30a5f91cf2b05b2736e8712d87887bfefcb WHIRLPOOL 25380f7add9f4348416e07d49ac55fec3044940ebe680fdf17ba805784a581755de068b62034a41873d3594aefcafb303f59b027a65ef2d7d2bbfd039b1d42a8
 MISC ChangeLog 12072 SHA256 cbbb16232ce5f7e640a63614a882cf80f25c86e6c47e693a5f6de8de093385ee SHA512 fb8e13e19fd88c032c01f2c248ffbab47947bb3c3b5e7e7c16ed6972515b850c30774c56493472ba9275e85e30c0b45d0b4aa77f5313b5a4a3a78633fdffa328 WHIRLPOOL 9c1c0ae2cdd9685a7476499b4a51cdb8236e923a50105745979e339e4c9264a8ee7bcf7376ac03d94b2a857421ee77e7b6db342c30ee0b546eaa40e5419dae71
 MISC ChangeLog-2015 93870 SHA256 0de5747f6d5fff7e3dfca0a37269e4c804d6ab3c9fdb34d39e51b650ce46117a SHA512 d41a91ed0454ab885df588edc8a7ee1b97faed64cd479dc12fadbb8056c36b81aabd43ea521171db511e7061ccbfbaec4c443924528dd1779147a4cf5537bf57 WHIRLPOOL c51fbaa8eae82fb02fc76683b2cdf0de65321b07fc1f5b9c2d929a605ac48ce7354f1d4fdc9a7bf1833e9e7280f4cd62e9130b94107b5860890d255ba1b14ea7
diff --git a/app-editors/emacs/emacs-24.5-r3.ebuild b/app-editors/emacs/emacs-24.5-r3.ebuild
index e8e11fef9d5a..70caa27f4e1d 100644
--- a/app-editors/emacs/emacs-24.5-r3.ebuild
+++ b/app-editors/emacs/emacs-24.5-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-i18n/unicode-data/Manifest b/app-i18n/unicode-data/Manifest
index 5b3dbde190b7..c0310ae4f035 100644
--- a/app-i18n/unicode-data/Manifest
+++ b/app-i18n/unicode-data/Manifest
@@ -2,7 +2,7 @@ DIST unicode-data-9.0.0-UCD.zip 5655592 SHA256 df9e028425816fd5117eaea7173704056
 DIST unicode-data-9.0.0-Unihan.zip 6558824 SHA256 6afdd48fb3c5d79a527ed27ce2582b2f684c09e16f5d0837fe7e5b0204f46362 SHA512 9856d30afe5d7b0b088bde36c12431eae267992b315944ca8a7ddb3559adee7474fedd2d0d6b22716439f9cddad573a4bb45c6209036b0066a85fbd19412852e WHIRLPOOL 91eeb47a3c933fdafb4277959a3aeeab72ca6f17e954ce6b65b378d36b94a821fd663ba56a67514e07ec3df3afa3bd1299803cee08ccfcd62b838721c0cdd8c1
 DIST unicode-data_6.1.0.orig.tar.gz 8549251 SHA256 e8c6f6ce45c6ab563173813b5817f66865c0c4c2aa577612ba68080e54a092e6 SHA512 8df65c837c686eff1c236d4325fb276928952c570f05224299f52528a4b80354da6e4e3db40acebd0247f328a511363fda62e3e357cdd3119947a495f437cff5 WHIRLPOOL a29824047f1c037948978ec9837f652ab010d08238e0c11564864d8125cfc3abde2526b1af7697b9f26deff9fee44050410a722d63adc3f4d8966cc6ed5ac0f9
 EBUILD unicode-data-6.1.0.ebuild 553 SHA256 45fcfcb437c32514939ee463554929ae49ccf2480b99693ee97b6322f5b2ab3d SHA512 98d97e5c2a5a612cefa9bf7806ee6e1a3a5671446f00ba0683803a0ad001c3295e5eb669c78db926f32accb85d157faf41a0eb95662f63ae93512bab1a9907a9 WHIRLPOOL 6cf6216a29d5828982f9871bd183a61b29a0fc4f0ac7f9899aa1b55bf219490dce5ae188ddf9af5cc5aa06b3abc88665e594c110c9a3232c933cae7be542f546
-EBUILD unicode-data-9.0.0.ebuild 801 SHA256 f4cd954612218f04bc1c1ba32de8b98d69fee22f6dff3f6b232d62379852afaf SHA512 cba58ad314f7abc71865236dea13025b1fa075b59f2d4f5bda1f3ee9742733b0088cfc567b019cb20746e831e725cce886963bcaf9feaf5f309008a5584a1485 WHIRLPOOL 14f45339f5f6e8d0b7ecc50a88f25ba87a965f7814bded80cc86d3feb0870d92b784beae77c4244add0f361b9124d10d918d251b0a0519244178d30d42139147
+EBUILD unicode-data-9.0.0.ebuild 800 SHA256 1e5405c61ec2c2156bd8c5d3850376ffb68bcd0c89ee7b2995b695af1f2edd6f SHA512 7b224663519ef0d887697a242b61044412afe5ee2c85d9817daf950bebdda680e8d7da968adcbba38ef44669435e9adcf32605328a093f90a064da7e6fd3d62a WHIRLPOOL 363ffce5e44ec41d4c052b149f1634e4fa2dc909248bf09f087b9fe16a92c3a312a10514b19e27800b87aaaa936df9f48db5f5e081f1c65159785bdfca036d4a
 MISC ChangeLog 3907 SHA256 ee84eb7c7cc88c0c9b7bafcf6f2b57f57505ec0e2d922771f61c6716f71dad34 SHA512 d80c6e00ced518c7094bac14d3950d1af1c5a72583a062f2ed072373f2ef1f95c0557339dca250614e4eb7bed881783280bd75a4a86a7d2164dd712c3f8cbd00 WHIRLPOOL c1aa32f911df27214802945df340c342a8632df788eacc38367ad575e728b1d675c08492769b98679ecf9f12aacd6fff08ad631c83838f82d93c05c976e02199
 MISC ChangeLog-2015 5029 SHA256 844c003a0e1ccc2a7316d3bd24f552a0e0a8ecaa2bd5b2e2bf6c5d1a8af0b20b SHA512 5fa79bb59cc073f9b909729b16d67064783381685644f44e5a7eb0c85cac6b178b1ba48c156bdc7acffcd3d3dfebdb810bb65c368a5508184e106dca6bc97797 WHIRLPOOL d83537c007e4146661de41727fceacbc80429c0aba5ab409b02ea0252d1089f1eabc7c5d4614b677afcd4f6e865c73718724990b55300e5a628a2336f26e4c21
 MISC metadata.xml 238 SHA256 cf46d2323e696a19598784249ea645ab43f8ceb10f74695b01f22b28a5426142 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e WHIRLPOOL 22b60503d853ec644c97f4dd9c0627d0297224b22d9ee0ad5ba4597118210c3918510e3cf763e4ebd9b1f4fcd6c339de2d8c0e164cdc614b4c04fee6b7475f24
diff --git a/app-i18n/unicode-data/unicode-data-9.0.0.ebuild b/app-i18n/unicode-data/unicode-data-9.0.0.ebuild
index dcd8a408083e..b3d3b2954770 100644
--- a/app-i18n/unicode-data/unicode-data-9.0.0.ebuild
+++ b/app-i18n/unicode-data/unicode-data-9.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/app-mobilephone/sobexsrv/Manifest b/app-mobilephone/sobexsrv/Manifest
index aff51875662c..69fa343971fd 100644
--- a/app-mobilephone/sobexsrv/Manifest
+++ b/app-mobilephone/sobexsrv/Manifest
@@ -3,7 +3,7 @@ AUX init.d_sobexsrv 1506 SHA256 29ac13abd045f5132af6a42738a7cc2cab902cdaac147d31
 AUX sobexsrv-1.0.1-openobex16.patch 1346 SHA256 260c36989eb9a5bb877ab2d41af913ade1ddfdf70200c8f9369d3d64bfe98e2e SHA512 a1db1a916c0c2f6f237a4434bf1f11b0b6f540ad62fa9687d886e4ff97f6bb916be7763a24bdc56bf8fd3334ead426e0ed2003c0208c3c743f49b13b2bf8ab2a WHIRLPOOL d0f002f1cf9421f5a09445e8c7230c04da93e559ae778d259ac4eb6768776670263221b5a7ed324f959fe135fa4f8b162017a9a5334ece5895e9a7887550393f
 DIST sobexsrv-1.0.1-fix64.patch 25040 SHA256 83e052e7a63fb53b74b81d51cd5d614a5df29626243700b632c0d14832497cf8 SHA512 9d555bee8d03c13061bbe132df6442daa4d8817ef713e92e5150b1994af110c5b01b34f8bcc1c3ae734529e36bb70f56976ab261f860e95e3de3ffe440a7b393 WHIRLPOOL 4b177c4b4afb921f6580b761ed74845ed27a800b7a0b89ea57e8ed6a28670d2499f44a92688d4c852fbd8562488cda355d5f96ae795dc4bad05a459883499f87
 DIST sobexsrv-1.0.1.tar.gz 27683 SHA256 d3b6db12eb8d0c06d0b7845ca64213e5beb042dd0f1a2e7a753cb7b4b0596069 SHA512 52fe5eff812596caa1f4b8579740ce8b2591db17950d68c093cfdb33ca5b899bfc5c142594843948a29ae0b1bdbe4499a1e24c270c92e61d02fd07a02d9d40cd WHIRLPOOL 984a9413b9e73d570918d115665220bb9beac1dd6a8afb5418eb199be7c369bf6ab81411d746ff51f6b427b2fa77045a3e9d19b2acd7b4de5d330a1c6ab33ba4
-EBUILD sobexsrv-1.0.1-r1.ebuild 2005 SHA256 05cce937d3dbc90f88611af9337bb13490588bc733bc01c9fb923080c901b256 SHA512 57d898c0e6ac8ad8cb40fe510fbc795804f15bc5cff610beea76aeade0a5d12d15e1b98b95a29fd9d6b930897a3a02b6b62ce2e8ec8fda0d17d02ad922a1467c WHIRLPOOL e08d793f50efd222098f15a8f104d62bb5759d6819d6377b9e2c870946937f26d6a790943c0975bd81e29d72961c90c7afdd3655136d6cab52c37dcc8002b221
+EBUILD sobexsrv-1.0.1-r1.ebuild 2004 SHA256 2fa32aa6972d9d8fa317598642e1c0859a3fe57617fd794ad277df834aee1bf0 SHA512 0383f07388a6e933df17fea23e164c2bf1d2547064e72306ba89082c98c203ff4a82c02756ab10b23dba5ae3ba5a01d35773761d234fea93c455ff5ef6e175e6 WHIRLPOOL 7856d6488bd3d00d20c8d16901dd12e4e34009833d41bcd38517c1164ce80bdc6318f20d1231fa9faa9a04569d1583764e9c2cd7164596128402f3fba34e2e5b
 EBUILD sobexsrv-1.0.1.ebuild 1719 SHA256 f04a1e9d2e44deb812f86bc60e058950089d84309a0b1b0dd0be4be09901dfab SHA512 5953f0715af61ea08511692c279dd0ff69368697b77c3f1b367387a3711076b2c5ef2ac626d81e79e36478d832c511a5f973b7f5b5c55386dce7a8f73dbaf00b WHIRLPOOL 0a2798e1d85d71520753d1d2c21d0a69dbc7449d9a5bce8852ae1a0531b214c641251a4289ba0f2fe30487a6c1859ea15e363fec7a19c76299629560ba5ae85b
 MISC ChangeLog 3514 SHA256 358bceb03fa7c739cba6dcfa6e3dcc903b7dd0ae4b43527c880dfa5a349f60e8 SHA512 f02198b89237ff72e7a0a9481a30ed7d3632c30c6b4eaa3b97cb6372240e33a145f1e0c829e12a7dfdb31f3f627b007c75539b401774968db190b1c10a234743 WHIRLPOOL c3b97325856c19b7f0b88ca651d396c5c7a5e24e9abb8a292ad92ec4b03869eb295a13a48e53077fbf1a2d572a46e07448fb939d47c762053b69e99fe059a11f
 MISC ChangeLog-2015 3182 SHA256 561718f9ea7955eb0bcd90b8823708a1b3c11d6163435f9c84b8eea23319e34c SHA512 2b8caa4486022fe57947b918ba2f67ebe88ef33fd8738e6e60509d5d9777ecaadc67f5cba094864a10df6667d9387285a6864dddc986043a42b707491b04cb55 WHIRLPOOL 0dfec961cf4677c83f66c64a9fa684d8c28f5888fed4402fcb0ee08f6b3858ea6f4b5e118dcc26844a7ff68751c9d1cfa09cf0774758fc679c0bce8f33b73ef8
diff --git a/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r1.ebuild b/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r1.ebuild
index e993ade946da..6cb334af6f46 100644
--- a/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r1.ebuild
+++ b/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.mulliner.org/bluetooth/sobexsrv.php"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="gtk"
 
 DEPEND="
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 5e0fd9353957..e7e8e7b3fb14 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -21,9 +21,9 @@ DIST python-gentoo-patches-3.4.3-0.tar.xz 11736 SHA256 917a9d98d40a91379c81ea579
 DIST python-gentoo-patches-3.4.5-0.tar.xz 12044 SHA256 84ee7630670a1dac4bbbc55fabf5f99b5b29007de4f140ad956e93d2e7aba8fa SHA512 108a4845667ecdf4001fcbeffab0cfbbac87439a449a7351428b0f3e2f159e3848ee0c0dfa45c9fba893b9f9584b33722fc8bb0bd7485a1d0909c3a35ede6ed8 WHIRLPOOL f0248faa0b4ce5679e37381bba90f8a4d361a49db792787bffc06a54a4bc82fea4d53255120f10e6dbf51b99e12417fc1b469be9624e73508fa3a212a38e7352
 DIST python-gentoo-patches-3.5.2-0.tar.xz 12008 SHA256 eb898fb448bd40f086ae2910e94c608faa932eb377fe40bd34f4390b4c37aac1 SHA512 e2ef1b8f10f9ea849bf52a0be65d48f7cfecf07bdf151cbbd7e3a1c9428a8d96e901650496c4ae7fd0093af8cc90de8df674dc1a4c66ad21916a4ee45a81efc8 WHIRLPOOL 66b99c7c50e3eaca783f773349b3e8a357f706a7da6a66bd2e0a53946bc81d965ac99d8fd4c50ba7e42052aa84508c8aede5eacedbb95f040a48cf1a5de6b6b0
 EBUILD python-2.7.10-r1.ebuild 10086 SHA256 a16f6ed9ad0819ea463c3200e856742be420858ba49e2d5c3fd924fa66136503 SHA512 ba5c633bcee4e9fa033cc5802b00f8516054778a93b57e2f12b70b0abff8dfa2f3273c6603c54a37fdbd3b1e9fbf2cf0e3290dc96321e094ff1928c7f0646ca1 WHIRLPOOL e1fa2532846ada26f15e65c3b7898dd164a128bc93d13abf1585a6eb8d60c166a919fa711d2b60f7b8feea1f6139bad5b261f23e95b1e91684dcc1cd88ff37bb
-EBUILD python-2.7.12.ebuild 10641 SHA256 9d87847f0fae2a563d6889eb2143daae5b40af21b1ae5852a6311dc77fd28823 SHA512 8ebd957d41fb0926e60bf0e7a25082d31c3e787e83303cb690af55ff47c92c3889f277745eeaf27efa64ff331a84c70639a7c91b36be619ca64cf252051f1ca9 WHIRLPOOL 0a610edd1c1a0462a264f73f7ef24afc109d29c563d4590347393118c3f5b718bb7c6129408ed50a453e2fefd4ec7457018e78b2ab5a53378f62d32b561d12ae
+EBUILD python-2.7.12.ebuild 10639 SHA256 c915cfe617d55700bdec19adc2ca1f22b6572b0dbc354276d171af8284624b5e SHA512 aa3d4931512381413f872acac89444a186bb10e75d68ea6425bedc74c913fc76dab89f76ba70388613c34758fc4630ee23f56e57c20327cdd22206a07cceb0bd WHIRLPOOL 0b22df8fd148411f1e781a4834f0978209ab98705ef5622a105ea2ebb0000f4e229effce1080841074cf9543f3654152297d49b6341a751532b05596a3804d4e
 EBUILD python-3.4.3-r1.ebuild 9269 SHA256 181b73d6fbab56ca77dca8f1f966cf70bfc04c645f783b0913d7974caffd5758 SHA512 91a43c9c11039f6bc7d916d1e38ed953843c70bc5180da4fc173ea454a4d962c784a412b2a6f91ffdb6c3814460740143483e411bf46333bd1e53d61eec48783 WHIRLPOOL a36af886f8800ae231364d5283fb8533b74f454f406cd22e54e5c154f4675c896acdb5cab53ec57aa6798e668e7d47372f705ef18291b029c15a9e6726dedfe0
-EBUILD python-3.4.5.ebuild 10505 SHA256 b231fc72718d7a5d38068001d852fe35c0609c64a5646786453164c97e760a3a SHA512 e836d3f1e01e8d37af0d9a541b551b4aaced7b3b52b5d81487313ba9146a1920d5bcf23904f09f6c99bd51ae6806b2caa17df37363d9446f3c0214aee3e39c40 WHIRLPOOL 7f7390d2c0f760cea01ae20170f525919399c96e087812a9c0ac64acc5b16002ed682990ce05282c37899133bb5fa55d55c36610224c9a87af616ec1182aca4b
+EBUILD python-3.4.5.ebuild 10503 SHA256 172b6ce1fae05aad206bc3a3be7b8aa4094875304d2df5f2d45ec492b5303603 SHA512 8ab8625d8ff4b43eb15db2e624d62966a09f3cfbc0029e430ff5e58b0e6aa4bbafe4d5e8faa76ac2a7397f5063fb67f41eb37943898d35825faa3daaa07b6be8 WHIRLPOOL da7ccf52805d962129481531f1d393bd7eb287cc8bc3a0f531d9bd599ab819a3fd130309c1c468ef5f8ceaae0c8af17b2fb6289d1dabe4f19aaad801a49fc423
 EBUILD python-3.5.2.ebuild 10621 SHA256 aa9cfc02188bc3505cab1bc48fbeb1775f12002431cac70b60f7df4e8999bb0b SHA512 2d55613564238b30da7b25cba3fab72eeb548726f7b9e691eea7c19c1636990a2bec20ce1b7202dcd072fc4dac3f68c4995c681d8e0ee83b8baa9eb3a8a057e4 WHIRLPOOL 95983e4a2aae4cf1377329bebcf27f851abcb651993ea91bb4e9e2658bc447e27b1f2bac3b4680b478edc8459c806f40db3396e6a563fda0c4a5bf961f37b4ca
 MISC ChangeLog 26323 SHA256 942a60afe8ad4d69f054645a4220ad8dc2eae24225f3c25acb6f71dead64fb82 SHA512 77a389f32babcce473a772076c963471c07c5c6dd6587d6df9c8a24384076b384ffcc3483848a08fa34032e61845bdfc17ddd2e15073cc68a66db8563470fc76 WHIRLPOOL 89485d421006e31d992195eb23af7cf0ddb37788550741b8f38a5fef97d003b59802f55c950128c06404d777a5dbf7a87e01eabe6554e19c17ada4bb713c696b
 MISC ChangeLog-2011 100599 SHA256 23129cb47321b2a6b1cb9323f1815d0cd11d6f30c3893908ed51575c270a0cc8 SHA512 4181ba9d965139ba58218da5b960c87b7a611b27606a1ab1ce1b4c3c9255b4e0e2947307cbfffc531f0f8b6b545ee11e083fcb29dc7b2b7ba31c6bb40b8ab128 WHIRLPOOL 4ceebb6a6ed58b906d3a7331795748ac6e4fe2e1401bcccae9024a8e81e2c444aebc5fec610398cfe6002354ad3b10487484598da5091867874727f07e239c56
diff --git a/dev-lang/python/python-2.7.12.ebuild b/dev-lang/python/python-2.7.12.ebuild
index a2717f59321d..1a336acdc33b 100644
--- a/dev-lang/python/python-2.7.12.ebuild
+++ b/dev-lang/python/python-2.7.12.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
 
 LICENSE="PSF-2"
 SLOT="2.7"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/python/python-3.4.5.ebuild b/dev-lang/python/python-3.4.5.ebuild
index fe4172070fd2..bbc0e3c82c0f 100644
--- a/dev-lang/python/python-3.4.5.ebuild
+++ b/dev-lang/python/python-3.4.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
 
 LICENSE="PSF-2"
 SLOT="3.4/3.4m"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-perl/LaTeX-Driver/LaTeX-Driver-0.200.4.ebuild b/dev-perl/LaTeX-Driver/LaTeX-Driver-0.200.4.ebuild
index 5f82de5d45d0..41fc22335151 100644
--- a/dev-perl/LaTeX-Driver/LaTeX-Driver-0.200.4.ebuild
+++ b/dev-perl/LaTeX-Driver/LaTeX-Driver-0.200.4.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl encapsulation of invoking the Latex programs"
 
 LICENSE="|| ( GPL-1+ Artistic )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/LaTeX-Driver/Manifest b/dev-perl/LaTeX-Driver/Manifest
index cfc29195b20a..0b5a27806236 100644
--- a/dev-perl/LaTeX-Driver/Manifest
+++ b/dev-perl/LaTeX-Driver/Manifest
@@ -1,5 +1,5 @@
 DIST LaTeX-Driver-0.200.4.tar.gz 63968 SHA256 f853501847ace834b786090bae6300edfbf020d9dec710497a4684ca4598b77b SHA512 7ed52118076460d84aa465cbe6c637d7289e2197aff0a40a654d4fdcea9e7a96ab945c7552709ba7cc65f818828e4107477da47b3fe184e474d4baf105048993 WHIRLPOOL 73e7102d817d3cbe7ea3496b245050c9261509d0f3df7e31945048fd811f1058cbd27eb194d6963e9b0faef5ee202b6dffc7f634e8cae6651dbfd283221c57ab
-EBUILD LaTeX-Driver-0.200.4.ebuild 686 SHA256 b48370ff412164a05f88e03d667987172795d9f944793227c7a35d67a4348aa4 SHA512 44a21a3784b7afdeb389ebd2843dff7bab5889321711888c3dd0416c12397dd5e28b543270107dc027f4523279f9714d86abf520de1ad1684cbbb665ce04ca33 WHIRLPOOL cd0ff9256b0a3dc5606f494afaaffaf0e4f91329cde58f6d85fef50ccef500c91afa9e720f6e595ae8f64490f2820d28787a85a3dbfa7ac7f41f458b037b649d
+EBUILD LaTeX-Driver-0.200.4.ebuild 685 SHA256 c8477580e1bc977bc77a735e876d75e2b1015f541cddbc5a064a6ee377fa224a SHA512 88b861f0d7ac3e1c6510d2d4b185d821360305f1c64186a09bcba84df0e0a486411a82616a2068ade046b82214a934d09a4b537a169ed889cac29706ed003b27 WHIRLPOOL da721f3868f5615ffe585ec179434ef60078047a6443e965308c1f3943dc7a042e4bb646b2fbcf346979a4b74e7d654069253d86719ff7042feb28da39af3707
 MISC ChangeLog 2446 SHA256 d7fddfd291ef1b6c9ac9e95b0f9979d99568acec8c1c05d007af4232c285f1e9 SHA512 667f9783e271e9090b56681ff8f7a07fd7951b5d29d9fc734ecea2e1e9ec264d5a27ddd5d07fc8cb6d697bbbcd8819367a2edb719e5250941176f3d22550a5f4 WHIRLPOOL 12f2bfc1b7ae1a0855adbf7582ade32ff78543fbfea0a5509ebd5ef33158d8df449894f74fa5a99f498e2c0b258920f0a40ae88ad57d448f17e1677fe2e8a7c5
 MISC ChangeLog-2015 748 SHA256 a6bfe0b826071590203a1338a410b3e8c616464dc4af579010b30e2e1d0c1dcc SHA512 c56fc0d8d6209c393709b437e42967978012b7d46509b49c3fda0c4897f777e7a735953e235bb7dff9061bdc7b4a10a66267ee5c93e4f872f5cde1a058968d39 WHIRLPOOL 679fa59e03a005983d030df9fb77db65c19dc48a1373927df4f3cfc663cdb0646711c765e7878823942896be23801eb110b1a8bf79dc5158481e7e281f410e0e
 MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
diff --git a/dev-perl/LaTeX-Encode/LaTeX-Encode-0.91.6.ebuild b/dev-perl/LaTeX-Encode/LaTeX-Encode-0.91.6.ebuild
index ae0a05a5daa2..1be4a9684cff 100644
--- a/dev-perl/LaTeX-Encode/LaTeX-Encode-0.91.6.ebuild
+++ b/dev-perl/LaTeX-Encode/LaTeX-Encode-0.91.6.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Encode characters for LaTeX formatting"
 
 LICENSE="|| ( GPL-1+ Artistic )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/LaTeX-Encode/Manifest b/dev-perl/LaTeX-Encode/Manifest
index 8e04e4cae03f..3fac6e8950cd 100644
--- a/dev-perl/LaTeX-Encode/Manifest
+++ b/dev-perl/LaTeX-Encode/Manifest
@@ -1,6 +1,6 @@
 DIST LaTeX-Encode-0.091.6.tar.gz 45887 SHA256 85b27f5fff1149016b5edb07ffb73cc7916f9525b66b0c7a07dbac5c0cf1fe52 SHA512 a0d6bb32a72aba07256b86fee134795792e52e90ddafd344f8bdc4aba318ac35a2fa62e47ac4586956f78db79ed6382bf859fe5151cc1319ca5a92f5712fd9ea WHIRLPOOL 01991a3d23fc674b804280763cbbf0f7335d7ebcfa4795be69dbb60ca76469c337450f24f3886da78181de2b5d23057b7671c81a83ec0b7837013e4f44f81fbb
 EBUILD LaTeX-Encode-0.91.6-r1.ebuild 506 SHA256 d70f9b47a71545ca54fe1ba080a43c0980f9d8af2cc40f5c455ef0a80fc13389 SHA512 a858463b6ea6b764be90a9fc26d98683a8c416045cc26ea9cd999a103b8e906b15fd3696036a06ae04a4c014448315310d4f8a8ba63537d4f1a0a134f46eb1d4 WHIRLPOOL daf92a85f35ea9762ff72476c13883dc967c7f5b351d327b95fa639cf470fcad5d59a20c8aa4ac91bf1f8111175fe8b5864fa5af08a087849b57f7a72b9d8257
-EBUILD LaTeX-Encode-0.91.6.ebuild 515 SHA256 6a5e3909847f233c899d14ce43cddda3c4c1fbad5f06230e438102c7e17e2ebd SHA512 446c335df28afd98ecf4e13c5e8276ab26dd2280a2b90965f207813a77a483badd1064951219dc9aee884d13c980c67fc5ef92de675f500a6f1949de00b32dee WHIRLPOOL 84326dd845ac8b151bd3b1ad4f89aa41de770fac27be9e56b7cd18ea6a28f786ab262e2acca45b17ca6e6506deb032ae1a61c843ec030adafe16e7d2cf510948
+EBUILD LaTeX-Encode-0.91.6.ebuild 514 SHA256 069ddced2f816aac970a3a341026b1db80fe9dc14d103c9164ce8be47beeef17 SHA512 1751022373c14f078d2f1c8fec48d3ee4408fc5c6942356acfd077dbc142b2c2905f4c4c94e9c9e4aa3e2a5486aacfc041fa25480e4535ec69548b57e5e3ca26 WHIRLPOOL 24ba179256a78c1cd90f47f3eab3b6cdb56a92922f96ad13ff151188aa03e5a2d57d750a135cce7242e105c274bbfc760cfea053719dd497a93e4d19cba1efe2
 MISC ChangeLog 2826 SHA256 d4cd6bb56e43d3b9dfb9217873a5339f8a07ef0e1a79439e33ca686bb01c3ec4 SHA512 24d91a9793797c6a48b0f3d10039b1ec1565da39960b366f81982c52dee9ca2717a6410e8630aa685b397ddbb20a4ef989436edcf54ed51589eeb94ce3622e5b WHIRLPOOL 1bad91b037e17c6a712d6348e96edef780a1c1de43fffab70a864ed31a7c596693f42dc2067a1c7501c28e2c44d92b22fd40de2b4fe4f894236226aa6a61e7c0
 MISC ChangeLog-2015 743 SHA256 de3a6e0f03565717eb0b1fdccca23afbd7ee9647c63b4e7a4af0c4034a3cc22d SHA512 6b8fd0ac38a6a1f94fe37b577b018e8822d7a0a543e13c11b5da660ab6951b8aa4ee3cb82a53a071a835faf4e0096b7679501beec8611f3349c8f90b2cb8bd11 WHIRLPOOL 3309aeab282f3acfad51bbe9a61be9a5278435c0522bb11f617f0de3f63d21d9e3a9892934259652c246f4c3634d3e330628ddf0de667cbc7b253f73ff50228f
 MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
diff --git a/dev-perl/LaTeX-Table/LaTeX-Table-1.0.6.ebuild b/dev-perl/LaTeX-Table/LaTeX-Table-1.0.6.ebuild
index eecce33e5642..3bb20abf9d53 100644
--- a/dev-perl/LaTeX-Table/LaTeX-Table-1.0.6.ebuild
+++ b/dev-perl/LaTeX-Table/LaTeX-Table-1.0.6.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl extension for the automatic generation of LaTeX tables"
 
 LICENSE="|| ( GPL-1+ Artistic )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/LaTeX-Table/Manifest b/dev-perl/LaTeX-Table/Manifest
index 13bdafe15513..f72eb93674dc 100644
--- a/dev-perl/LaTeX-Table/Manifest
+++ b/dev-perl/LaTeX-Table/Manifest
@@ -1,5 +1,5 @@
 DIST LaTeX-Table-v1.0.6.tar.gz 427725 SHA256 d6cca901d4787c646e8a6a633c44392e1ae9757bff6b18a06b13f2315d79433f SHA512 589b2b5f065348d15959af3d83040b54ab986bb8c5ec0c1e51f7a315230266dce5d6d3b43c9293ad2f6163fa3bddae62b825306c5a0a519f38903b50988f003a WHIRLPOOL c8669f6683dc012c48a07711287b9734fc8804ea9bcc7510b52df5cc1b3b67df010c01e5a88cc79d352ccab6eeecf96b6576a3461650f1e9bda832d980e31d33
-EBUILD LaTeX-Table-1.0.6.ebuild 666 SHA256 7f0bef6b5c1b2f242b64b7f6b214c33fcdaddffb183ae2b6b2cc831df4dd17b4 SHA512 906d93d5f959ef9e9998edc2ca5834009453b86a20bffbb091e82f01157706988061110274e3350ef7297b9fa81b90f7cd1132b67c705a6d728e7744850df193 WHIRLPOOL 7ede6528539486414ec921a622085c6be47fd6d9b4a78053570eb8ab8a678b1292593533193d668717b9c11823035c196b92bd8f881b6f89a766278683269005
+EBUILD LaTeX-Table-1.0.6.ebuild 665 SHA256 8ddcde4e249dba22b7b26dad6cd735e19ef3802b56cc943d3c2a139dd4ea4c0a SHA512 d745b5c35ad8543099c1c31f6275de42c35a9d75df07ccc75628f9b0f236ff8a2e75522e752b9b17d75ae4f66d329e1490772cef73b8e44b876a5a2bb3372b49 WHIRLPOOL 857980c0d3fa3728fc75c95300e5949bc06bb648d3136f0848be55a83d378be639b3fa7bba0e5d907792ad6255940dc0dadf345675234097ed734511804e2ab7
 MISC ChangeLog 2439 SHA256 cc6250b7d96b5f0c184c458b277d61a2a36e38d98b13a9d495222ed050bb55c5 SHA512 da4fb543f9d7085c923d0626cfaa7f2731aa01eaefe01feefd97c1b3e38793efc48941396de6f07db9373fcde5e6889b7e7b92d17ba222835b7337552904946f WHIRLPOOL 79fe3d31ba3a1546a5ddd00df5cde425011d3c6519192ec37558ac038bbde6676bd9b7b3cbd93dab0b48e7516e516b680037fa9d6febe90a065241efe46cf381
 MISC ChangeLog-2015 1076 SHA256 0d3efad2e6e1ad2a48bb4f47825ed351f22c2958ad81ada6fffd80e3342f0019 SHA512 9ab72f2561d86de0df388a4d20993127d4a3111db26202d58d6501332e9a00807320ae29a1305bd4326f38bcc2f8f3061fe469ea084c7d9b5a003eabd1295337 WHIRLPOOL c7afdd7bb047c94679620a2632903ec12a66353bac5c17924797125693453762c488edd540f23a1ca86873bd58f86d6a9086471074ae80ff65c751d94c4af2a5
 MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
diff --git a/dev-perl/MooseX-FollowPBP/Manifest b/dev-perl/MooseX-FollowPBP/Manifest
index 996ac97486e1..8eb27ae336d1 100644
--- a/dev-perl/MooseX-FollowPBP/Manifest
+++ b/dev-perl/MooseX-FollowPBP/Manifest
@@ -1,5 +1,5 @@
 DIST MooseX-FollowPBP-0.05.tar.gz 9517 SHA256 fb324951e7be22299f5f688b3ec3491da47360f9c4a23a59b6b928d28d3e2047 SHA512 40edd8219c6afc032901b3a692fb51aa0867eb5bb91d17fc806cb74a19a034ab11992fbaa8f3b2f711b667abe9cc911f819b1f0b572f152b199e226cf6dcb7f2 WHIRLPOOL 34ab20b32500e536d443ecc6ad2a4381d19cfdbf7a463d3773e59b728498ab262b151b8c0ff1348a8bc2c22ed61c44c9aca99e1e1972762ea8d43daaa68f0c67
-EBUILD MooseX-FollowPBP-0.50.0.ebuild 452 SHA256 f440b485e94a6b1f138a4cb2197b8558826d32c600d36e7822d709f93ad09c71 SHA512 2337c65a1f7025f5c0cd222a328917bbf5190b39e847cc23be280cd702b55a8c333cbd032aa5a5373631748396be7bb91a960d8608eb78bd5e35e72f4448674b WHIRLPOOL 7f96bb640e9931064af62f1b27fe25a893a886ee8d8e4e66f4854a04b0d93c9f04f42a297cdcf29400e0da7138dc0876441dc672c14e496fe89de4126b14d395
+EBUILD MooseX-FollowPBP-0.50.0.ebuild 451 SHA256 cafc321d1e998078001f80699cd01ee72af7f9010ba058d90cd1be75a9596c92 SHA512 6dd4c4afd712405d5ea962966b954d81756c475d79804b8651cc5829c35484e0dbfeb5218a416725afa44f162000fe4eb89ef67b5d084f8cef16f1df376794f4 WHIRLPOOL d6f9d3bede6131f2fa0000aa63481e2d30fe876cc5dcfd5d616e82ae30c0563bc109e9f7a9bc4eac8c7f6f6f761336ffa3bfeb4efa5761e8cf4357c6871d1caa
 MISC ChangeLog 2456 SHA256 2c99a0b2bdf8182422f2dec22f2d50825b94f79c4d435d1e6256ac6f1fce8856 SHA512 b3046402c8d4a7b4ee61206f6f0c97675663e2d5d104959193118f3727de4122490ac2d2b60dd7300af4b803807a8582e136a5cf36a661686e63caf31216c04e WHIRLPOOL ae7e6b4fe0cc7a199e265a6cb15bf05e15358e34c5f7659d166c181383533092fa7244f26c5040523bdda454370816c8bba9ccb3979e6129c759f0d352b76a39
 MISC ChangeLog-2015 757 SHA256 3839b1d2557898069462ffc14bfa453d623fb49ec5009ff24296dd83c1104b48 SHA512 8d100f30a3631126875a11a6a898ad77bf8107e20612bf6ff5c911f4a2325b476e2328291f61d074cd87b030ddc38182d9cf4cfbb2eac1ae7fa6665149ef603a WHIRLPOOL b951f24efe5a93eeae5a914604423e198024f7710c83e530d49f88be1f71dd6fd69acf52ff286a9a173a3debc778fbbf0c95a584829b7d9b17dc126bf8d15fdf
 MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
diff --git a/dev-perl/MooseX-FollowPBP/MooseX-FollowPBP-0.50.0.ebuild b/dev-perl/MooseX-FollowPBP/MooseX-FollowPBP-0.50.0.ebuild
index 8cd5e666df0b..346151c45695 100644
--- a/dev-perl/MooseX-FollowPBP/MooseX-FollowPBP-0.50.0.ebuild
+++ b/dev-perl/MooseX-FollowPBP/MooseX-FollowPBP-0.50.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Name your accessors get_foo() and set_foo(), whatever that may mean
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Pod-LaTeX/Manifest b/dev-perl/Pod-LaTeX/Manifest
index f4389ce0d6b2..f69f7971b075 100644
--- a/dev-perl/Pod-LaTeX/Manifest
+++ b/dev-perl/Pod-LaTeX/Manifest
@@ -1,5 +1,5 @@
 DIST Pod-LaTeX-0.61.tar.gz 32618 SHA256 15a840ea1c8a76cd3c865fbbf2fec33b03615c0daa50f9c800c54e0cf0659d46 SHA512 c9b5d8b50f630e25e1f913d95d83a1323e71d2c5a3a794a543bdc9962800e5979b3e58595e7a653a96f9aea1f321c1564e2062e9b9d70d8c4d1c6729cb8df498 WHIRLPOOL fa523640c5c2cdbc2306ffefb17740dc1fd7d6e0f7cd7d6bbcfa71e4ff0a6b1899e5ff5b9882b746db73a0a71d90ffe6292618dcb6a3ecc77b4f3abcbd66fe37
-EBUILD Pod-LaTeX-0.610.0.ebuild 449 SHA256 08ff60a1b442e001c45f4fd11a42982fc15f7b4ae92384e117221347fcd9808b SHA512 01d9d841c38be740ba9cb989471bb12e2503618bd12cd1c9605575dbc50eb43ddb2dd3edec3bde1b8701a3b1a1f9b570249033db48ae4deb7bd159f0ffe22553 WHIRLPOOL a7e88b320a16dc4d31d7506b9f77c46c9ed3be9788bd2bffed621b60227ad36240ee5cce5e334be9038762b4ade4b5fe1ac3347114bae87caa999d44f97b9f00
+EBUILD Pod-LaTeX-0.610.0.ebuild 448 SHA256 dd67b226f59a7338c23a8be6577175440d52149c1f8f1446d59fe61903670810 SHA512 b6a9bf22c4b848f799237368c37e6b6dea22ee87d9e159a7ff7c9fcc42205ddc8465f3b1651dc2a12ffe23bf260992da38fa19fcb3ed864a531feae65898d218 WHIRLPOOL e6ae636056643bcce18cb4e3e754182abf914e3e9a404ab051027dfd6ca0377123bfb91823358eae575966d331af89214de2f129512ad83e4ca07d08f40c3505
 MISC ChangeLog 2437 SHA256 bbbd937aac4d44c60f10ef234d3c90aabd2f385adb23767a0012c0fbcbe9f1dd SHA512 01bc18cd802a8336a9605164103f9a7b4179416dbd7bfd6edda1a23140cfa0a897e417f560f54e79d200188d5c0def997e28813dde70bc778d4635b2a779c628 WHIRLPOOL 8d92de661a614c8079323ccbaed18b253ada4a63a492f94d70616e5a91470cd5f88ea2b5251b43e99e4e85b8b35bec31c2f0b413e56c0d73b65fdab2e5ff74f1
 MISC ChangeLog-2015 891 SHA256 b084fb3e4d1c31703173adfa0d328cfdcfdbe86ee1f55cc64943638a584f82e3 SHA512 e5ad35fdfefde99cbc23d547ac15f5ec7ce2ca9ad2865bb4f7a7cbf1915f284f4f59dfd1cf68f394af940c589df2a6e3f9276247b3073e175fdeb166c47969ca WHIRLPOOL b69d00cd9b3a51ba8574dbfa2fad7ecec0643ef1df3244c72b3df6acff4a6ff3a519cbfb71b1224b7fbcba04dfae12a8ceed68cbcd2383d92aeadf0e3dc9d841
 MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
diff --git a/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild b/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild
index 457a0a1c1c8b..9efab4d2b3ef 100644
--- a/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild
+++ b/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Convert Pod data to formatted LaTeX"
 
 LICENSE="|| ( GPL-1+ Artistic )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Template-Plugin-Latex/Manifest b/dev-perl/Template-Plugin-Latex/Manifest
index 020bb583a1f9..cb451c883195 100644
--- a/dev-perl/Template-Plugin-Latex/Manifest
+++ b/dev-perl/Template-Plugin-Latex/Manifest
@@ -2,7 +2,7 @@ AUX Makefile.patch 699 SHA256 e2f52e6d633b0f883b5af0b3eb14ef39ec1d754621a8eef502
 DIST Template-Latex-2.17.tar.gz 12875 SHA256 f973f2779768d29cf46f794a58700037dfe401fd7f3721b0d23cbfddbb4c16f1 SHA512 19fe8e2a7dc51ec734c25d2d4fb3a01df3751be49d9b4c0ee90e792b321079e28ce29656b08f80e6205f6edad5e7f5ff91335fcb9821373e729ddb5482a7c1d6 WHIRLPOOL 57f8a024e86a0e3b142f9fba6d40f8aa99b11318107dc2feb0a0bf16433f66f8e022ee52b11e1d7b8da6b485102fc574a4eeb8ae35e0f17f3cfcdd7e34634dac
 DIST Template-Plugin-Latex-3.06.tar.gz 20487 SHA256 8d083ea7f465df817b173bf51ab4f8ab7e00063cf701f1c477a411d2225337bd SHA512 13baa205d2095eb25fb746bfd03dd9f75d7c48cf775cc0b2d5874e9e6a76f69971925729709136dc53276b210855dbc7bf71d79bb0aa3dd28c8383c8569a7441 WHIRLPOOL 4c4f8d8f610a0bdae276779675eb8aad793478f9b5890803fdc8e9b6036087c37b28bdf478bebfbb272cb31d27f305df26883f166086d171d01f7b94ded5438c
 EBUILD Template-Plugin-Latex-2.170.0-r1.ebuild 639 SHA256 c7cc1415b2ee9ddba46ec3a4751cdf7008f7a438ce91269f3bdce276b55effd1 SHA512 bb24fa77a04fb751d2ed57ff4e6b6fba1e87ba5f1b54997645a8f73ee48cc24ad7d8638e09aa9752e88827918b954f5a2b02923db6253db3c6d718eb7329acc9 WHIRLPOOL f0a222ee817e490600d4c5f9b815644b2253313ec9b22315d73e6aea95d8722878b6417936afe54898009fca7a67dfe1b4c23b49f4c8fd76440a9daf3aba3051
-EBUILD Template-Plugin-Latex-3.60.0.ebuild 590 SHA256 eab52d19768e8a084445e11734a049635e47e6de84ef96e9d636a2c40f29f7b3 SHA512 b2eaf01c5a8b816755240b5364452624014cd5b99cc5808f73c1740667dcc16b4bfd29a7a8d9ffa0736b1904b083a40ce42c6918b00606cfae8862c7148a1559 WHIRLPOOL 215331038fdc4e481d13a4189789e1525f2d9835bbfae3e919c87b22d3ffdd7b6a1534b2730756047f0ac6c1ff5de00a0fff43cb398f245b38dd162b89eb1015
+EBUILD Template-Plugin-Latex-3.60.0.ebuild 589 SHA256 30fd5d9e9c24a2fd2e3f0928482d46020569310fae357a8a4151a4d44c7e6748 SHA512 824f4393f26bcf0935a01e15ad3f44faff8f10aafd2337000b018ec165e4c1967b7aac0844338975a56167968712ff078636d2a2da9ad91d97ade01f0bdb2c65 WHIRLPOOL 9b2d875e5c6938f7b29d9b28e9f09d3783f9974dbf1bdb171f941aec2d63177fddfdbecd7c2511c129c1085f53e4d9d29f4ac4cbb500f6bf3ec74b3e8ca8df02
 MISC ChangeLog 2586 SHA256 5b8513c232e30ea69cbd6f474e2da59fef214fa49c766c1ac094f4201bd19dbb SHA512 126f20a40a1f5d13c47cf0f440e371ebd36bf0bebe952abe5d3a4b3b3c60204db7131ce4ce499ef65fd448189f4f64dde7f093f4c795f60d1d8b21ca4b9830c1 WHIRLPOOL 2a792a187bd933de0c8ed53c1a5de9e69f4f6ded933d79e19543fcddf567d2a3c2b5d00bc68c160ae93a4c7011bd92c1561b8cf4595a637db14dc966e71d2808
 MISC ChangeLog-2015 3963 SHA256 c2d9bbd35d20bfbcd94ad2ad012499ef1d4f1237119cd7ec0402ef1ab5d04329 SHA512 f43b04228ead0b3f2263fd33687559f1929364a8c4a7ad8ca156ef4dd62aa343afdb35f2c21764809ab8de3956fe06533b785b8cddcb33e9e9fd68823598b829 WHIRLPOOL 7d017363e064cb5ab7401d929ce201b78d8a4d6110a3173767ca2690bfb2427ca082594baa2cd3989d14c123c4c3afea79cb4dbdc66b323e97acbe607fad43e4
 MISC metadata.xml 338 SHA256 8cd980d15a3ecb56ef59fc15499d8f1e04670675d65825759b852551a19b4a68 SHA512 a6738b25fcf28b4dd73f72feef2ddff19c80dbebbdb6bb6b2b6b8692557ad378e5d5f63839fbb7c1835114bd26e362e0baca49bb06b9a9cc7dbef96b31c6e486 WHIRLPOOL 115f3efefdb0f47a1322e46e3f854504998f016841ea5e40576c186f7d15d982cf1805eb38354f5d645e7953e2c1489213ccb8e8880108a18dc32c333b032fb2
diff --git a/dev-perl/Template-Plugin-Latex/Template-Plugin-Latex-3.60.0.ebuild b/dev-perl/Template-Plugin-Latex/Template-Plugin-Latex-3.60.0.ebuild
index ca54b0b2075c..13b752dbc08d 100644
--- a/dev-perl/Template-Plugin-Latex/Template-Plugin-Latex-3.60.0.ebuild
+++ b/dev-perl/Template-Plugin-Latex/Template-Plugin-Latex-3.60.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="LaTeX support for the Template Toolkit"
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-php/xdebug-client/Manifest b/dev-php/xdebug-client/Manifest
index 55da535a683f..27cf5a596d14 100644
--- a/dev-php/xdebug-client/Manifest
+++ b/dev-php/xdebug-client/Manifest
@@ -2,7 +2,7 @@ DIST xdebug-2.2.6.tgz 256161 SHA256 6dd1cba0605e75009331aa3625a19ef49ade5a75aa9f
 DIST xdebug-2.4.1.tgz 265542 SHA256 23c8786e0f5aae67b1e5035972bfff282710fb84c483887cebceb8ef5bbdf8ef SHA512 64b345b4809fb0f020eb8fe7a0826056a64728ec9565bbb2d0e717ac7b3ca8aa0856b91c2ba47a7435b7500c5efa643682f245d6cd9d0a537f8bb9ab0d5cea3a WHIRLPOOL cad7d081414d5a55fb95e4cb6ae5d808f5c6b54e1c16ba78274fadf9b32dd10e60ecab3d09d420462b7c95f7d9364d9f886fe7732a21284c635e70c24259a610
 DIST xdebug-2.5.0.tgz 267640 SHA256 8bd6ad1e64948308e3e3a7437292f154b11e25acaf31b0d59d83bda18af0890d SHA512 75b1dbf32059eebb6ea3fb6ebb50ab26d73f8ce2964be1fec41ecfd9ae3d8bd55b6997daf03727b28b91ba06d08734865158bed6f038a46f00a1da5424ce5fe6 WHIRLPOOL 01901c73cf6d4ca8803a21eee8e1b5fcc668de75f0cb4318f6637a2d3a93e050664ee4dfa03ec0281e154e1e7660dc084b1b75c4b0451e1b4bab3db5ff00ea71
 EBUILD xdebug-client-2.2.6.ebuild 597 SHA256 84842874c29a7484b14468651be2ecc1964fc5fb71c4228a3f61e511c0c1b142 SHA512 ebaad330274636e4fdf76b958c965b6fb0e9ac70c1f7d08130fc7c4fe13574573e42b5217eafadb4e88282ddda76b904ec7ecfb16e411a0ae7a92cba2dfa5c0c WHIRLPOOL d73729ed209dc414c054aeff8066d1c6e27fc6ca3da8a376a98a2389e4c994f6b18943082b72431c68481429bd219c9687c886a55ed8e4f56b1d564e05c5a211
-EBUILD xdebug-client-2.4.1.ebuild 598 SHA256 5fbbd3c3b8aeaa699059b755387f0211b7ab27524c8fb1a15382129625d10d85 SHA512 49bd029fe04514260e62cf8873adcf9c89d48d703e5e0cb10263190df3b70b3e1cbb49034196d8fabd671ed26c111348091972b73dc77b0ecc34b0e90d4ee3f7 WHIRLPOOL 5f3a9166aa027d79ce74cd3a0e3b1338add29c91f9b60d2e63e17a8e691c8e8c42f1c48336688a8dcf0c0c968df6990fe6057729f14b08a59cad879496062fe0
+EBUILD xdebug-client-2.4.1.ebuild 597 SHA256 110db61211cf99f3f6420c56291b15545b8c7aa754357596bdbe5aea716e8d1b SHA512 d022a1783b66e046dcfaff23a56a2e1c2e8458c0e3448e6e267c33f66e8031804a84c5c7e19b8a6621d4e1fbc406757deba1befc2b9a514cfb53244ed0e25020 WHIRLPOOL 0b94a55407fc03cd6c4186549f6cb7661c07f63c56c5140bff9c20303ba2e51ac38313306067ff8fd9e9dcdf571191943387affa47ab5cdc7e24dd67badb67f5
 EBUILD xdebug-client-2.5.0.ebuild 601 SHA256 98daca9ffe8440c46b8230b2a0af07898a6ca86d1b5d951a4788f3f11314a36a SHA512 ac0b734975a8db6a3458968da3e5f1c773f0ad4333e47ffd477610b1f243f5079d77ea83cdafed6ab8cc23088a6bbe0bf309d5a1bbe8f761b82ed3ce99ee3241 WHIRLPOOL fce951df23b622ca45d98e42b63041be8c175b43ece10310079b4eade5ce0dc028ed71862f640a4afca4b24e929f75cf4cc3e7d2cdce1532926380b01d13ba4f
 MISC ChangeLog 4661 SHA256 0c746cbe7eada2b3705a8867c7ccf048741095e24b71f7b821bd6b672c0043b9 SHA512 a37ca22b46bc0ef506f450096dd5105b2cb6aa7e501ab0f68b5c1dd419a0ddb2d908a274ac641068db0f7ef7a96a655fd10e9087e712a72ca2c2e61f145f6cc3 WHIRLPOOL d8c9bf692cc6e6309a08691adf15dd2895803283e82fbfd515ad4baa409ae0c5c927b2cf8611cfb8526441f5a071b0940a963ba336284cde78b5de14246a00ed
 MISC ChangeLog-2015 10873 SHA256 edb7eb8afe9ef13b40f08f73957927f6b0f2d2d4106e09e88ae5f53e6ae739c3 SHA512 de9b200f84502cf48d16b3d84a876bd3717fba2591730b9b06d5e4543032ac3598dc134f97d4595848b44b1bb3dda1f8f429e2a8a7cb98523c3d39f77b279ef6 WHIRLPOOL 34c4303307ed65aff6fa7aaa2b8b05b2ebd60ee40dabe30489a43f4a7c90de6c9f5c95eb8789a61aff47c0139c45e0938a355c83b6a4636ca22b7422c31698b5
diff --git a/dev-php/xdebug-client/xdebug-client-2.4.1.ebuild b/dev-php/xdebug-client/xdebug-client-2.4.1.ebuild
index 12e84c5fba08..751a676ed3fe 100644
--- a/dev-php/xdebug-client/xdebug-client-2.4.1.ebuild
+++ b/dev-php/xdebug-client/xdebug-client-2.4.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-KEYWORDS="amd64 ~hppa ~ppc ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 
 MY_PV="${PV/_/}"
 MY_PV="${MY_PV/rc/RC}"
diff --git a/dev-php/xdebug/Manifest b/dev-php/xdebug/Manifest
index 119ecd050f36..cbe1607017ca 100644
--- a/dev-php/xdebug/Manifest
+++ b/dev-php/xdebug/Manifest
@@ -3,7 +3,7 @@ DIST xdebug-2.2.6.tgz 256161 SHA256 6dd1cba0605e75009331aa3625a19ef49ade5a75aa9f
 DIST xdebug-2.4.1.tgz 265542 SHA256 23c8786e0f5aae67b1e5035972bfff282710fb84c483887cebceb8ef5bbdf8ef SHA512 64b345b4809fb0f020eb8fe7a0826056a64728ec9565bbb2d0e717ac7b3ca8aa0856b91c2ba47a7435b7500c5efa643682f245d6cd9d0a537f8bb9ab0d5cea3a WHIRLPOOL cad7d081414d5a55fb95e4cb6ae5d808f5c6b54e1c16ba78274fadf9b32dd10e60ecab3d09d420462b7c95f7d9364d9f886fe7732a21284c635e70c24259a610
 DIST xdebug-2.5.0.tgz 267640 SHA256 8bd6ad1e64948308e3e3a7437292f154b11e25acaf31b0d59d83bda18af0890d SHA512 75b1dbf32059eebb6ea3fb6ebb50ab26d73f8ce2964be1fec41ecfd9ae3d8bd55b6997daf03727b28b91ba06d08734865158bed6f038a46f00a1da5424ce5fe6 WHIRLPOOL 01901c73cf6d4ca8803a21eee8e1b5fcc668de75f0cb4318f6637a2d3a93e050664ee4dfa03ec0281e154e1e7660dc084b1b75c4b0451e1b4bab3db5ff00ea71
 EBUILD xdebug-2.2.6.ebuild 3892 SHA256 126294316652238dd92728e7087066d59405f2b64fbe5cfd4c520dbedcc15f17 SHA512 d7b907db646feec50654bde3db8a4f459b1ee488a7db3985354aea4d3e1e73e57554ef3cd2caa071421f9358e6724fddda79788f5c334fd0b255d399b3152c2b WHIRLPOOL 77027a90d855f32743f0dfa76b5fb86b6a1d0eae86dc6be079f4e3fb45c13d2cb45a316606e31e22b8a67675bb87768373a1c80871bf1e55515d1fb220dec581
-EBUILD xdebug-2.4.1.ebuild 1014 SHA256 8ea63f58fe11085814039e69bf839109568099f0b9c085f92ba4d8e119ffc187 SHA512 029c145e8a36a7ac672e3c2f24ceff25267e61aa0b6291dfbf1fb7755e6a1ff01109c8b5e01de977bb0f0367cc56d79c7ffebda6443938f021975b198b8aa8e8 WHIRLPOOL 3ce8d3bb8cdcd41fc4aeacb8d417abc691a644bfd5447a74912e046f796b2c6c87e44284928c4c51225c2cc1cea2b3a525c539dcdb4ba6f24901d1aa4f01aaf3
+EBUILD xdebug-2.4.1.ebuild 1013 SHA256 ca98164e62d449ac247698e785565934b9333c2a718b776bb4bd1d56b1d24aae SHA512 afd1f8d13d57dd943ce570f24951c343812e8693e96ffc33733b5b00ff4877e175ab0ac48f4554733dab4b057ba6d8d8a322aa9065971453cd207fe2673241ca WHIRLPOOL e726ff72a177c370c9fae4ed83258238282d7afe92529f259171588d844da3d53be9e9a235c78a6d2448d06cbafaa760f4215defe0107018ae1f78724b385eb7
 EBUILD xdebug-2.5.0.ebuild 1046 SHA256 80ac35a1c53db125446ca464bd185b8a7f560a6211b8dc07b8575898fcc9bb9a SHA512 38d2c92448d2aac71f07b829cb168947feb34354f14575764b2b6e6cb4662de0fa9860fa30c53da1832344ca26ea730a7c0bdfc0ff036e519817eb62c06e2cef WHIRLPOOL 0aac0e4596aaf26d45e5ea568836756062f364096438fdccf80fc654aa0611dc124acb5961e25a876bbb83dca9f13acec02d25e890dc0b21548489ebe6a5eab9
 MISC ChangeLog 4305 SHA256 2c818d34bead5e48650bfb4a10d1e2ea0baa567bda5110dd7c98c998a3fff609 SHA512 0ea042e489cc46d024a4b3737fd0f00d492423bd840694c1e45fe997e3682031fb0aca0f9815fe0ed23a8f7ea70510de0b8593ea912dccd3644c50fe904e22b2 WHIRLPOOL b835acf665982561e1ed69664c649cd9e1f5d0cbf1332300512e5fa0fa363a8ed986fd207da97b570cd483395b9ae0870638c4f6d6ae0b633d4b0a9b4a31c34f
 MISC ChangeLog-2015 11516 SHA256 e402c2f5411ed1e5599a3093bbaf7da9cc224d3c0f9380914cfe94ba7a6e732f SHA512 9edad23f984343bc8912754a55758b6e2432343c9ae22dfe0f8f03ee765392a0629b098e71723d264bf6df42f286a344031154ca0e8a34c03e29f69bf0522cb8 WHIRLPOOL f119d9334a89600530570d8533ee6049b8c756af42e281025288b79972bfe06596e646f74cf048b9518cbc6f476f66297673d055edd42cf185a7a731f5361b43
diff --git a/dev-php/xdebug/xdebug-2.4.1.ebuild b/dev-php/xdebug/xdebug-2.4.1.ebuild
index 062fdbcbb1ab..d9263350b9d7 100644
--- a/dev-php/xdebug/xdebug-2.4.1.ebuild
+++ b/dev-php/xdebug/xdebug-2.4.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 inherit php-ext-source-r3
 
-KEYWORDS="amd64 ~hppa ~ppc ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 
 DESCRIPTION="A PHP debugging and profiling extension"
 HOMEPAGE="http://www.xdebug.org/"
diff --git a/dev-ruby/kpeg/Manifest b/dev-ruby/kpeg/Manifest
new file mode 100644
index 000000000000..7a33d06c15a3
--- /dev/null
+++ b/dev-ruby/kpeg/Manifest
@@ -0,0 +1,3 @@
+DIST kpeg-1.1.0.gem 57856 SHA256 2ad23fcf87a285e6e968ac61060cedd630bbf80cbe54ad6a18493ec5b2bb5374 SHA512 4ca7007bea74485ceb7c3f53eef1cd2e162fed45872f8f078d5b5d2ffd1ecaa0e8fc65ed6f1b220bf6f4642d455a582cb754cdc6350edf856b33d9908510cb66 WHIRLPOOL 86c6d19a3cdef40787737459ec205d9a15cf1b582926a61d287d92be235a48f8875fcb31bf9cdcb51a817e3860db191d1fd81dd29a67986b143386e006747c21
+EBUILD kpeg-1.1.0.ebuild 346 SHA256 59927827bf0d9aa6425ac6b01b61c8f6cdf7e627059be5d528bdffaeabfa7afb SHA512 a2581445d9716f403e3a1954e2ca86bc4b9ce6cfc41ee39b6438c0f3f1e7a56c8843d765266fdc40347a977b6574d7807ef2753cd7e63c8b013fdc2879256f04 WHIRLPOOL 13bcacaa46522ee60d1ea95559eb53290ab7a00990857f7c23c8b0d8dcebbec2f86049376f3cf559549a09cbcb1d8ac608574d1a416f5952c9e60c42f32db535
+MISC metadata.xml 338 SHA256 798e3ecb39ef0fb99d186cbefbf3af273626c6a7fdd0689b39c783147dfe6815 SHA512 981524b3599f2a7a812c468763137a4e38b445c87224f91dc12d128025bd42657b62ff1b5fa9797bf437f46b9f9195bb0469431e77646ad5f0cfbe2c6b5e1f21 WHIRLPOOL c8235a6dfed2f3eb221483d0e0b4d6d9641855713892eac481faf5f616254c91f293a8cbd57760adc8bc81d3e48256c0c9ad5a255db87f7e2fbcdf0201ac5582
diff --git a/dev-ruby/kpeg/kpeg-1.1.0.ebuild b/dev-ruby/kpeg/kpeg-1.1.0.ebuild
new file mode 100644
index 000000000000..81dc17531cd2
--- /dev/null
+++ b/dev-ruby/kpeg/kpeg-1.1.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple PEG library for Ruby"
+HOMEPAGE="https://github.com/evanphx/kpeg"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64"
+IUSE=""
diff --git a/dev-ruby/kpeg/metadata.xml b/dev-ruby/kpeg/metadata.xml
new file mode 100644
index 000000000000..562c37fb77a6
--- /dev/null
+++ b/dev-ruby/kpeg/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">evanphx/kpeg</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 654402d52058..ff9fd4c194a0 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -2,9 +2,11 @@ AUX rdoc-3.0.1-bin-require.patch 632 SHA256 5b8468ba10d6767620ee6ecad9719f213744
 DIST rdoc-4.2.0.gem 735232 SHA256 391bfe3484a69db2cfa0fa32eed9010a7878b33ae645d67558d1806c847290cc SHA512 d58aebd7969fa8ea795fd4a2b35ba92d0f7368526ae0fc7fa64956db4e3d80c1b61f472384fe7e5eaa628e9c1ee637c967caf1a52362422cb7c2757e486594de WHIRLPOOL b2b8ee2500c901b8638d1dcd1b8194ee12f447a8ecf56205f77999e75a0f038583382efc6147719d4782befd6a3e4106697ea3158deb00c6183c4388223a720c
 DIST rdoc-4.2.2.gem 738816 SHA256 f3341c252b1547be6ba042f5ca1ce1fc5c52e3c27d8e0d485d0486173edfed08 SHA512 446ac09e35806174dafc23939049c327693654a26fd2cec57c719359518ac53bee383564f9596ef5f569487e500970d24820127195ca2631603bccd14d037dc5 WHIRLPOOL 3ae6cb842173f961eac14f530c93cbaf198f61fe471471ad6f45530f599476781f6b6612984c136af76033382660062ad5ab12dc493a2f3850c6b1955576d1cc
 DIST rdoc-4.3.0.gem 738816 SHA256 8cd820f70ec4b315ffff8e0653c8ce46cc9e444f3f8e7ed21c57338c61156a8d SHA512 7ec5c8055262300c159ff2dbca3bcd09e169002acad8602db89086d2b9409a096209a1152dca68c79dcd1b5e3c1fdf55e7f89d82b33fa2ce65c816695350b029 WHIRLPOOL 98f36bf06b3cf1f6f7fc7ee57395d794d17100dc7d996f95780ecd46a2d7fb9a0990e8c8c5e424790ac5dd32382f4e3e876bfdb91ba419cc6963b7ba360c11ac
+DIST rdoc-5.0.0.tar.gz 701335 SHA256 bf7b8be4afbec4f4fe38ed2d5cb4bbcccf7c4c7288547cbee12739a867488318 SHA512 922c1fc36a3186eb2784754297930306b420a27ed2dcae879ed34b9325158e1e9c4e0721a44a027805c3e921f9b975b69009ffbf734173d668ba9df1d959c061 WHIRLPOOL af68197e6681ef8f17f9d857fdadd6b628eefe0ae65abfe663b399339877977fdbea63763e0293b00da045b84e3b673b4e262ac3b7be9bd97303a6bb187c6fc1
 EBUILD rdoc-4.2.0.ebuild 2809 SHA256 2dd452e3db988e003d502e8daaced2a8cad6df6bdf1e7697ef37c4c85bb7804e SHA512 29aaf0a0b44085be6d9fd0f76d82d5ecf0147f5102d2f5f9f326fdc65bef32128b5b96e0d1f4ca28df420547cd14b848085a03a7d42bf8e2646b839fc8826fc5 WHIRLPOOL 04e735d3830bd6b36ae9a657581fc4241c282dcdf9a6e313a779ceb378bb13f1ea1f52dd79b84741ac4b7cad83650dce1bf3b09bdd26b22fa41c2bc7d14cdc3f
 EBUILD rdoc-4.2.2.ebuild 2720 SHA256 e28ee99afa6ee441f704de3190ced57ff2e53d4e3e72217e605b6edeb5e39731 SHA512 37cc8daeb173b20b2f734a174e8597167a6b6399b39e877a4d2ebafd216b927dd3874c3230088af8721826e8d85d8cd28ee28f88fa00f76cb0352f19712392fd WHIRLPOOL 8d14a4a15f9926b13bc1042992fca8592ed0974575dd7c4f150f156ba6bb5652e49e7a19ad6046dd55ed91e52f0e763e112f00a5370a7e2a135a987b40b5c70c
 EBUILD rdoc-4.3.0.ebuild 2720 SHA256 e28ee99afa6ee441f704de3190ced57ff2e53d4e3e72217e605b6edeb5e39731 SHA512 37cc8daeb173b20b2f734a174e8597167a6b6399b39e877a4d2ebafd216b927dd3874c3230088af8721826e8d85d8cd28ee28f88fa00f76cb0352f19712392fd WHIRLPOOL 8d14a4a15f9926b13bc1042992fca8592ed0974575dd7c4f150f156ba6bb5652e49e7a19ad6046dd55ed91e52f0e763e112f00a5370a7e2a135a987b40b5c70c
+EBUILD rdoc-5.0.0.ebuild 2396 SHA256 fec4103227c553dabbee92fba0a88487655e84ea9942198eb41b4dda5b37ba93 SHA512 09dc6c5f348df81c64e9204a5d23aa79fd074229bed2455239262db9b3a367b0a12641081c09be575db67f3036e4e08a6383adff5b5f087f9fc6fc6106c51f2a WHIRLPOOL a370f0a4ecfd6964dba9138812e5af9f45adadc7f2dc380b207c7537bc987c82d03dcfd7159c6275d0b76d48810d04a0a6bf7557d4675deb3a3b23f78e8fef89
 MISC ChangeLog 7375 SHA256 11b8af1ae6136408f49085a04bd69da9d94cdc174ec3327c4ed08f501da89d06 SHA512 4d50340ba1c608edc89232038ecaef85287bccf4bc23634a4949245ff2b4c921c2de42fd16d38706b466718de20702a027c8f75634a932dbef673ea3673b8419 WHIRLPOOL 46f2bc8b24b5572e948c147f27e7a3234953f6301d299c712190f53f99a98a71efa0b103e7855274ba5d77bdcb0e2a6efb5288f17adc0e77bac1ed4c2b86a074
 MISC ChangeLog-2015 1169 SHA256 eb79450fb0018c43b243f325a52773abe90a10e7f709bd58e683d05b387ace05 SHA512 1b6af8635b601ef0865cd3e0766451ef5962ac068b280698886959c9f0d4b63da129a12e2f8b880389b5f801b374535f6b7d2e8d43bd9400c7a61587009c4494 WHIRLPOOL 813efe039bf038e3701e74da75d4fbfc1bdb403dcb67c1608984e99f3f27a8d906a34788ebd51b8a2c8420bbd9ed66afb6413584615266d3d4936aa7db542588
 MISC metadata.xml 335 SHA256 3d7aab0feada3fed8251ff4b84acc0ffbd490216eecb1e73ad3d9a2fcacdfc82 SHA512 3421081016cb99570f9ce9f775097669cd40a709efbbb3c76a20947717bc40d886195a5fda889407d1c436a387c126e07def1eeae01edff53c490ea9c630e992 WHIRLPOOL bfc4d6dc6360f545c3be0caa3af67cd8cdffe66e507320b7bb7a5675c1f19abbe0bb01329b974e4e58cc4d79aca394490a376505e2c81fc57c2997cb738bb671
diff --git a/dev-ruby/rdoc/rdoc-5.0.0.ebuild b/dev-ruby/rdoc/rdoc-5.0.0.ebuild
new file mode 100644
index 000000000000..acfd43a61598
--- /dev/null
+++ b/dev-ruby/rdoc/rdoc-5.0.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="exe"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
+HOMEPAGE="https://github.com/rdoc/rdoc/"
+SRC_URI="https://github.com/rdoc/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Ruby MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "
+	dev-ruby/kpeg
+	dev-ruby/racc
+	test? (
+		>=dev-ruby/minitest-5.8:5
+	)"
+
+ruby_add_rdepend ">=dev-ruby/json-1.4:0"
+
+all_ruby_prepare() {
+	# Other packages also have use for a nonexistent directory, bug 321059
+	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/test_rdoc*.rb || die
+
+	# Remove unavailable and unneeded isolate plugin for Hoe
+	sed -i -e '/isolate/d' Rakefile || die
+
+	# Remove licenses line from Hoe definitions so we also use older versions.
+	sed -i -e '/licenses/ s:^:#:' Rakefile || die
+
+	# Remove test that is depending on the locale, which we can't garantuee.
+	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
+
+	# Remove test depending on FEATURES=userpriv, bug 361959
+	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
+
+	# Remove tests for code that is not included and not listed in Manifest.txt
+	rm -f test/test_rdoc_i18n_{locale,text}.rb \
+	   test/test_rdoc_generator_pot* || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc ; then
+		ruby -Ilib -S exe/rdoc || die
+	fi
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake generate || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'gem "json", "~>1.4"; Dir["test/test_*.rb"].each{|f| require f}' || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	for bin in rdoc ri; do
+		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
+
+		for version in 20 21 22 23; do
+			if use ruby_targets_ruby${version}; then
+				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
+				sed -i -e "1s/env ruby/ruby${version}/" \
+					"${ED}/usr/bin/${bin}${version}" || die
+			fi
+		done
+	done
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/rdoc) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+}
diff --git a/dev-util/oprofile/Manifest b/dev-util/oprofile/Manifest
index 7b6e71212cd2..122c7cf97116 100644
--- a/dev-util/oprofile/Manifest
+++ b/dev-util/oprofile/Manifest
@@ -7,8 +7,8 @@ DIST oprofile-0.9.9.tar.gz 1502834 SHA256 1e523400daaba7b8d0d15269e977a08b40edfe
 DIST oprofile-1.1.0.tar.gz 1468502 SHA256 cf759a6de1a6033d5dfc93bda129a9f2e128aecc4238cc657feb0801d1b0366c SHA512 b26f67f20172a4912c0aafb3adf83f9084ea62b9ca89e4cfcb3e13276114a05b07587f7d250028995a10c39ae993e2bce271be11688010473ab9f0fd81715758 WHIRLPOOL b268af1578c485165624e0152751b6c5053c745e6813d6f13ea554993f311e540312854a36011e10560e82c378ef1fc357220a69cd713f73824ae249cc150650
 DIST oprofile-1.2.0_pre20161027.patch.xz 19496 SHA256 37f7a7cf2cd78a5131bcdac4f9d6d9847cf485a841590a1023e923a26dee9eec SHA512 e11f1adfee6cf78daf94d2f7ce6d05daaaec8937cc4074c6dddc06abab34aa3ec4dce350b632f3e240bf31339562f0c723b2c9816d05588e9ecfea49584f821f WHIRLPOOL bf6663a2771e1729452cf2897083edfbcd9e4934061e82553586eb0bf2602c906b033a449a615679839bf12578e5f5ef43bb73b923370b74158825693113e949
 EBUILD oprofile-0.9.9-r1.ebuild 1984 SHA256 6cc72044b1f7915e12e7f07b18910fb0f7f06649bfafa9929928697ace0f1558 SHA512 61f1b7aa2beeba0878b9d3c759afce63470bd7e0456bcad26630907c909ab93005ea05724dc3b5be15428f898d0c4878a3e2a4e31d74dd205209047fdfc53a41 WHIRLPOOL dc94784df831df3f2b34bceb51eb79f257a8957df5f37d14cee1df414b1d45b5b0714cb7f38d53c30f9781c1dcf839a3efc4f73615055484ba1a8ee778ce6757
-EBUILD oprofile-0.9.9-r2.ebuild 1999 SHA256 86e287e7de91cd168b02145f02e5112f81cc5477cd6c89594008902b4a1e5fb2 SHA512 71c73deb849bf621c0731143ec81266ecc7080f0584bef2aa4927342a0474b3e59ddd2021b85239d649e9562336fed970e3a4e2d69d71cded66a393f74950e19 WHIRLPOOL cca88e6d429b603d2d64743663a3da14f94083887245b512516d71f79ab078c582d0318e58bf34cacba2def61fdcc43b64f853cb60dd24d6dbac2f2d455bf7c2
-EBUILD oprofile-1.1.0-r1.ebuild 1842 SHA256 bdfd8b1fdaac2891da8f0ee712c3de5eabb6d3b86600719e023b896fbea64491 SHA512 7ec217b1e0580a2a33692c977a6921e3a6153c6d0056734547861acdfa6ed6adeaf12e521df28ba72f0ce720a3205bbd4253ea7a54f827a187bef8cdc84ab0ed WHIRLPOOL 4ce1c16bc3da28b6e01b8dedfba9a4d493bcb0fe2c86195379d08d2a189e387fc6d335f8255cb3afb8a620a59a788aa95b9642a6dc47db35cf285c878ed97160
+EBUILD oprofile-0.9.9-r2.ebuild 1997 SHA256 751c1dc5b5e5f9c83722f2b16a85a29befde725bf535056a3413caf7e3a27e9a SHA512 db2f8d2110d84394f18315847a3bb917e4a1b2ff04483ba34e4d706e8ae235edfbbe347a42a8c9e5453404a7eef1628b72eafc64169ce20088b67687c9e1ab3f WHIRLPOOL 48a77a6135405b4071bc45212e6e29fff14c462bebc2468a3509dbe2f876769b5ce5b08d529bdef3542221dac9d634015e0ced7032b97e0c8bc6a88579549a88
+EBUILD oprofile-1.1.0-r1.ebuild 1840 SHA256 cbcff1c65b53b6d657b199d4ebb8322a87d9a111d7d9ff84c8ce0fd779545b04 SHA512 298291353bac48d523b5f2f21df846a94747f02e02ff50ff91a8f1310114953b3014e87a564aadc2ad8be9e0d911131c492d5a569e9ca25d71a760d28e364778 WHIRLPOOL b0f63e016ae646a5ce0c5260b70030a0d948f77b3aa91b2d6b198b62111440ed23f83389a0352e2988f0d2f84a955857fbc5cce697ed49276717c8e28f1c21b5
 EBUILD oprofile-1.2.0_pre20161027.ebuild 2172 SHA256 bbc4fc2f270a6edeee726d70a184dd3c2159dea4736496b34680455e2a8163ce SHA512 ca91d622ae960847b7c2f22a3c8a0e425bd5e2b4eae2be0756bbccc7591d747580e2609634aa788e99ca469fa7d114c2826db894e2a2e59ed2954e32c6bda7f7 WHIRLPOOL 277b11e09ba14da35c66466becf91c99d278dd83432bbb8b06bdb710cfd92056f97f502326c8aaaf99aa573b77a28ad5625f34f4677798281b9bfc1239d4d14c
 MISC ChangeLog 7191 SHA256 caff7df5f7f7f4498331b093a727a0c3e78e40584cb8e153340e9478d938c24f SHA512 395f7bb7f6fdfbe7de14d66d484df39124395ba7f9045263e2540b6efe8c0ea64e9eaeed291e90e18caaff6e00d257a8161b431c094a4e4e5934f05a4845038a WHIRLPOOL c444c187143ac8904d5dceed7cdc9178ddb73c99c11a25caae08be5143b83773afd46f7ae0ad50fe24131e482778f8cb9c925821386b6aaa35c776f595ab1952
 MISC ChangeLog-2015 16859 SHA256 7da2ca27ee9cca6121d43a39383f43f55ac89b427785b0ca060babcef596e53c SHA512 50bb462e603642a869da7be3479b4a7fe95c85f8be7a2ee49e5c33dc4a36a9d93e89e9acc6841ce49d49c2a9ef32b4b0b57eb57ef6f1e315204ad181541995ef WHIRLPOOL fb1589b46ec17b4f513fa4067caaa2bbe9d784c9b2d89446a6be9e6b103e0c3b415aaf23ac89de2eb1f4d3db24cec7d2049bf175fa7431f1c3b30ded86b4d223
diff --git a/dev-util/oprofile/oprofile-0.9.9-r2.ebuild b/dev-util/oprofile/oprofile-0.9.9-r2.ebuild
index e23197ca4f6e..24312e1afc60 100644
--- a/dev-util/oprofile/oprofile-0.9.9-r2.ebuild
+++ b/dev-util/oprofile/oprofile-0.9.9-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86"
 IUSE="java pch qt4"
 
 DEPEND=">=dev-libs/popt-1.7-r1
diff --git a/dev-util/oprofile/oprofile-1.1.0-r1.ebuild b/dev-util/oprofile/oprofile-1.1.0-r1.ebuild
index b8d68be34b75..5790525f7349 100644
--- a/dev-util/oprofile/oprofile-1.1.0-r1.ebuild
+++ b/dev-util/oprofile/oprofile-1.1.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86"
 IUSE="java pch"
 
 RDEPEND=">=dev-libs/popt-1.7-r1
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 40e700cb3b7c..4055bb1326cf 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,14 +1,14 @@
 DIST darktable-1.6.9.tar.xz 3124940 SHA256 0f721e9d298a9407f6c0325d9c95b9dc37fa60f3b6a2f2e3b5675ff97c423173 SHA512 c0e8e83cf1cb10b663e5486f2bdde3cba2db5dbaabacd260999be1173c67618023e785e9087a517959835459f8d54c245d190f63a9422a17f3472f5aa316d492 WHIRLPOOL 0a2446ff7f98cf0297c5948009414dbf828f1cc60a9fb117f1e110f454dd68df611310bd9ff287f1f2345a8ee9818c1918b4ac7791aeb094c01e71a1ecdfce9d
 DIST darktable-2.0.6.tar.xz 3018300 SHA256 2368c1865221032061645342ba8c00bcd6d224e9829a55bc610e6cb67de738c1 SHA512 6ed9fe1d031bff7d27051111997b5da1cbebaef35ebfff42a3f0e2c8ca9ac6c46fc271d13468df7b2dd887553e06454ca24030d226a725f04f5b0b4635e62355 WHIRLPOOL d58dea18a3a75e16d8895b668a375d179ce6250cafeb399e89bb7f4baeeee25b8de2151d5eeed14030a8e154855b8d3d1e9789f33b9169b7905641858385cc4f
 DIST darktable-2.0.7.tar.xz 2960436 SHA256 a9226157404538183549079e3b8707c910fedbb669bd018106bdf584b88a1dab SHA512 568db128bdf1d639d387f32a65ea40e0a706f16b6ec0915c9580255c0385033e3d80c3ddf5c15c3f8adccd1f23530f430c9eb28f9d2771f61ae5a5c479726928 WHIRLPOOL 2d8df1d69c367df83d7933c2b4d6a904b4a56c5f13ca67820263669067ee938dbddb514129827abeec02fd01b82a23512d57e95461f6a44e5327516205dae3c4
-DIST darktable-2.2.0.rc3.tar.xz 3262016 SHA256 f7b9e8f5f56b2a52a4fa51e085b8aefe016ab08daf7b4a6ebf3af3464b1d2c29 SHA512 8565c142e8d44dd7627c94b556a6a491269ae26f3a239e4c24372e3d8e149a9ad95099fb5ac1f7bfd331102094db6ea0f5db8a96463ccf8a2749d502dfdfc6fb WHIRLPOOL e1be197c01ae80fa6046bf32607c95a804f91f9cd2c3c94cc0093958c61920ff5a2f03d89d13e6bad23adbc3bc252bdad77730b9a5b24c9a665849dd753a9e40
+DIST darktable-2.2.0.tar.xz 3061716 SHA256 3eca193831faae58200bb1cb6ef29e658bce43a81706b54420953a7c33d79377 SHA512 b1acdaacc397d8752d32c5d8a8329222da7d87f159c21b467c950cd9ad61ec331d6dfc3f9e034c44484e8bf082d4df4e9dc01394e018f97c2adc6d09641a9085 WHIRLPOOL d3ccfd2f77303040ad18dabd3096bc1670009ae54740814a7ce01b313f93f965549250d55f6a2533928bd89f2a647af7bf5e03da94860988824f1df236159405
 DIST darktable-usermanual-1.6.0.pdf 12827069 SHA256 f5c46dbf0a2dd2d391f92555abdefe735c6362e51a755b296d71779492b7e945 SHA512 39ee8c1b4f23883025750416d9d1f73d1dfbec0e6ac3eeef0f15778ced66a373c00b0a46cb3a54b1cfd6e04313313f63e8e3cd3d0cbea011acaa07a725d0ab02 WHIRLPOOL 49a234e57c14d23ccb85eadf2ad03c52eae7f90b0371dce025c04019a7a5cca41858084f735fe0965f93958ab83601571ab3e33acd27c2bcbd381bb0c9da4794
 DIST darktable-usermanual-2.0.0.pdf 13875563 SHA256 ee1714011b05e872cd9d7cd5101e9b936d1aa787a19865bcb50774a2ad0e67a4 SHA512 3f51dc6b96cfb0f205a7abd3264945217b9c885ba30ac2359f13489362ed8e2a9212b80aa714c511546b5f4067fffe060858acff60f13b90c4f232583941281e WHIRLPOOL 5ff5f9ca968fdfafbd99a46593e1c2e43d1f33734fcf7262a8a5d87db2458d372dc981aec38f100694e00d13242add4576ad8e7ff857d0275f631e513d58ba2b
 EBUILD darktable-1.6.9.ebuild 4042 SHA256 2e4f1c8a5adbd8e5b681bac2cb08291f291c2696fb67cb9dfe5b8dbeb8c83e69 SHA512 332bc23662cc7e303d6a8849905bd78ea517aa5429887d49e4012d52768bb0cca5935458e4235ab1dd0a4e79ae59bd6f7667f6d0aac0e88c5b4977b36271f6f3 WHIRLPOOL fe37f6bbd5e16395af4e64a329c97928f42bb017abf8fa2c7b96a2022142fecb6cbe41c4927f9330683fa6ab0195dc2c54d657eb346f8737cf499ad2a9b506c7
 EBUILD darktable-2.0.6.ebuild 4086 SHA256 c54dfe5b5c416e4c8cb96adb62a99ed66fbaa786bd89158abe8eaa1556301314 SHA512 cac9401fdc1cab4ed796f9792820d0f38f268510bcf43102b38fdd22a3787bb398b1c24f75e953cfbc0d64d0e01cda280041510d75db7f0bdb259a20e5c0e619 WHIRLPOOL f47a72af803c6740dcae3102460b3edae6875f465932b18fd706f101478d75f59338727f2091f0554d96c9ba7ff7fd6a7ecb5add1fba0fa3ed0a875b6a5f42f4
 EBUILD darktable-2.0.7.ebuild 4061 SHA256 2e5d89b17da369460956089c5adbee683d459c19ccc78139e92388ce2ab4a6df SHA512 3101758a72b759cd336886b6e969c0aa26e8ea5317a3119f594a7a47fc3a9582c1c1fb1ac72f013ed0b65d4c747337d673339cd9480353d45b1890be03a31793 WHIRLPOOL 3bc69dc6436085d4c4f9f98216e3e57d8ccab0ef30074e3dd75894305f080fb780700ae945756daff6ab2a99ef56b01b62a213b1e43b7c2d5c67a6189e3a743f
-EBUILD darktable-2.2.0_rc3.ebuild 3830 SHA256 ecdd565ba569810c871d599dd564b6f5a6d1628bf8da75a12f4027adbe306860 SHA512 ddb241825b9f6da3847c7ce255898bc77f1172c69ff7d517205596d5d21332042485cc20cba7aed67cbaaea1553428dbf952da65d2913cd7b53779ec2a0778cf WHIRLPOOL 3ed680d6faaff7390959a71a9486a690f35981ab64e0f8e3ae08b08c21662888feaad487b1ef9c710d234f764303f5c1786eb3f402acfeda1ca5c323e58f6999
-EBUILD darktable-9999.ebuild 3265 SHA256 a3d20e9ef2d13ca6eb66a4e523590d428cce637a2acd2ce237791e591b4c0d41 SHA512 82be785910dc7a380f4555302285532fc8359dd5b4aa0feae8187edbe32f3c86a3d4f33aa390c1c706b184574faa14bc64c67e3441fd1d79bd18c44071d25d22 WHIRLPOOL ded93e3c3d2004997d7a2fba4997ce6d7a99217f123d5fd2a94b41652c9b4542daec5da2e3e5a117f2df667e69b543d754b20f6d4158e43da9352e58c434b0ef
+EBUILD darktable-2.2.0.ebuild 3815 SHA256 eecb3051391d32f57d950f8ea98354b23dc6ebaa58809a3626ee43d669061d02 SHA512 0cc0cc3425e01ad249f8a25377a384bb0cb9db8d59e9476fed6046d2cb56796b762a078d837771c6a8b93314519502576c343d4ae73e9732d29ccb409e49b786 WHIRLPOOL 133230cdd69bed39e227da06e7a404b9e411fc3e82ddd4520886e8ce7e71e59973b02b39602214c3e06f08087c93244db12b87537457e23946599b8dc552fa49
+EBUILD darktable-9999.ebuild 3226 SHA256 fe80a2c1b58e1a9195ef37d10b54eba2b48f170fc5dad03632bc031cda9b2002 SHA512 7a7e5b2a217d4040d5484a9a9367fae7d03ccef17e1d538c06347d074d83bd6f15d33ad4f1b742f66e3ce9945d9f03173417a1160eb1e6e4f021ca31e46ed1cb WHIRLPOOL 0c06f8bc35f513b5acddfea1454de625e38f530b47cdcfdd5c7e3a25c28e1dd0a5532b38e6a5e65cd0d76818315aac9bedd566ac1a6a2b9240f65ccce65cd084
 MISC ChangeLog 8544 SHA256 c5917767635a5b3a91c81eb80394aeada8a04ae56e589c5521ee9422c5af867c SHA512 cc2921413890b697cd808f46515bd086f821048ebfac7ac9795a7aa3a8096e344681707a1512f4630d3eb821a32322ab7e52a20967dbb64d992860c05546e578 WHIRLPOOL 61011e7fcceaa9de7147d8d092657dd6574cde72e77d59c340e08cb60ffbc988ca1a557ed6efe968644677512cc546e91755a626c45f0a2787d5406376e81531
 MISC ChangeLog-2015 13218 SHA256 2e74cf67c6afb107905954bf003d989cf1e40ee55b12f1191774171a18d0a375 SHA512 07ad379b5909eff25a85108aff1ddbf4eda0b62091dda4f3b0dba1103354fe08cef88555ce71bc1ef9d937803826651818d5ec4b8f6ece9f511324bf7c9052e5 WHIRLPOOL 41a0d2ad9ffb0f5707bb409f00a1f862ace081227fa58d2fd0ef9a13c641c424eef7f1bdda48d058c6f6ef959e2a964a5a0800d55c7b0a6c2fac003510a69735
 MISC metadata.xml 1279 SHA256 327b6d53c04bf8d88767be7bde1ba1e92079df3ca8423ea16d915edf435ee0e2 SHA512 3c5f67e3f01b97dc152b76bc206487c50bf6ae8acdaeb40f23891e714f3a939ad70ae471ac30db1f1c6458408fdfca0f77c4daaa53241289e5f5c5bff7ac2189 WHIRLPOOL cecb738c4fc2223c084a3e6045595c7663bc5595cd69c8e107e5268025b63c90dc4d1cd264abf66d6716f8eaa3ae6a9db251a4b2892ff4ea22c5f676d0591d6c
diff --git a/media-gfx/darktable/darktable-2.2.0_rc3.ebuild b/media-gfx/darktable/darktable-2.2.0.ebuild
similarity index 97%
rename from media-gfx/darktable/darktable-2.2.0_rc3.ebuild
rename to media-gfx/darktable/darktable-2.2.0.ebuild
index 8df8d8f039ae..d5613faeedf9 100644
--- a/media-gfx/darktable/darktable-2.2.0_rc3.ebuild
+++ b/media-gfx/darktable/darktable-2.2.0.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=6
+CMAKE_MIN_VERSION="3.0"
 
 inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils fdo-mime pax-utils eutils
 
@@ -18,7 +19,7 @@ SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_P
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-LANGS=" af ca cs da de el es fi fr gl he hu it ja nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN"
+LANGS=" ca cs da de es fr he hu it ja nl pl ru sk sl sv uk"
 # TODO add lua once dev-lang/lua-5.2 is unmasked
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kde libsecret
 nls opencl openmp openexr pax_kernel webp
diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
index 02f181440205..143bc6314006 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.darktable.org/"
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
 #KEYWORDS="~amd64 ~x86"
-LANGS=" af ca cs da de el es fi fr gl he hu it ja nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN"
+LANGS=" ca cs da de es fr he hu it ja nl pl ru sk sl sv uk"
 # TODO add lua once dev-lang/lua-5.2 is unmasked
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kde libsecret
 nls opencl openmp openexr pax_kernel webp
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index 7d3f2551cf88..ade68edb3870 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -4,7 +4,7 @@ DIST qrencode-3.4.3.tar.bz2 370709 SHA256 dfd71487513c871bad485806bfd1fdb304dedc
 DIST qrencode-3.4.4.tar.bz2 369136 SHA256 efe5188b1ddbcbf98763b819b146be6a90481aac30cfc8d858ab78a19cde1fa5 SHA512 4835d462542e37e5460635e0dd84e291ff0976a6aec61c63f9950c1e60b446bc913220726e14f6379322bfd32ccd9bcd5fceed9ca10cb95343c952d8472b983d WHIRLPOOL fb5ce83ba422c361717514956e72157b5d611dc7eb33416bc621ec3fb57032ff57c3aa2eb1b1d5780608649d3424ed312c5cf7c15718baa5042542b3a42987fa
 EBUILD qrencode-3.3.1.ebuild 559 SHA256 b8add2ce6c7532b5180fb2d7c8e4b474b60bed31c2dfe21c73707c319036244e SHA512 c9034a0cb1b04cc4eb08d38d5cff5c2c23c0138694afdd3168eff056e466e26f6f7cfa7d3eeee6d8c1d20bae11721d41f44f868baf4906f0dc48e6115b801c5f WHIRLPOOL c0b8f2a0705ebaed281ae207a1c896fe4eecf303f7fe8105cfb13c6c43ed9b1a546a82e2492afda34f1a694917f15ac11a3d8eff6fb949eca8046684875e1796
 EBUILD qrencode-3.4.3.ebuild 565 SHA256 405a0b244b23cd9ff455d6e62634388e9bf3a92af1ac0b6073040f641439e792 SHA512 2fc9cf08a758c9337201b313231ff7bc4b4ef0fc52c981aaf34b58a74cb67afbe4b09c800d0f905c1c469a6629a48c68dc5afaff6b6c537e2fcab11942d9932d WHIRLPOOL c8be95750f427b4819c1e921e201a750fd5b351017d9f6d9d649d98709cd8530dbea4be231493d1d46fda6a61bfbda25140b729930fbbc19b4fcf544130adf25
-EBUILD qrencode-3.4.4-r1.ebuild 578 SHA256 c466b5042777eb789ee2468a183993ddb686b2283bec0872dd5ff358b1c9d9a5 SHA512 59118e15c9537befd2788e1227a991585201e50cf33539f1a8f092b6cf73dc77d531368680add316bd5af1540683bde568158d61f886a896c001d8ce89216eb7 WHIRLPOOL b70ccdca9cc4516eafa44a617913d74e965b93f0279bb57b00c2aef57a5fdb73bba4493a812a22d31c688b07b8d25df709a9040dc5b12045f49792930038bf3d
+EBUILD qrencode-3.4.4-r1.ebuild 575 SHA256 126d0b853702261586028fb7433f62afe55dc4b913c628207db04fb473365c66 SHA512 a12078d2546b70d3499134b6373c01545a2ee11beafb9e8a12da34cada7ed21e71640aae346342a2535f9917285f5ea9424820fdebda4f0d998b427b56fe7ffe WHIRLPOOL 0ff521193076fe68cf9ff9ff644d65d8bba5e2f83de32864f0718c40851b1d9e2f00aa2f35a6dd59c37249a6953aae1ce9a096e947fdd5d1f111ddaa76428eae
 MISC ChangeLog 4046 SHA256 e171d6ae225ae9cf6b65454421aa1adc9454449f78b1de1939c85194f0136aa3 SHA512 9299d24ee13802c2b75ce20cabbe860b6bfb6c3ec1c091200780bfa1e9612554d422a868f6f77887f5f2eb6d5399f10e12e2ec448a6e0f1f27e4254929c8ca95 WHIRLPOOL 870c9589e192bea889df43876ba07057f88defb789701ad963a91b134d51df9b8da2a9513f57c4e7d490c5e830898c8a135063f2794844b22c3579937c70d513
 MISC ChangeLog-2015 6911 SHA256 ddabb7f7f63af9b265e33bb1534ee80e56420db65b0cea157b7d3ec6b81332dd SHA512 92b15103255e66db685c9f4c0d80787fc08a74570ebf9655b6f586d7ff9d96e3ea446b3cf68e5ea97881383fb3ac801d853318c90fecba323d899ddf6f9cc279 WHIRLPOOL 72ccd189c79a2375b01e9f2bb85f7b192c4b9c8ebca1c3fbe971c862a24de1fe6b2cc9f189db0209ea75a3179392492bd0c140f1c075059359a12d81e767baf6
 MISC metadata.xml 370 SHA256 ec4a78ec46ab9a85615df225063f763895e8a43fc2a191d377fb56de2dec0502 SHA512 f5987a8aab3b861bbe4961c69d0c72b07826c43320fd383075036ad63a070204c6ed41297b2490b4a14224f5c4269c37c40e5abc9bce4d1c5857e68e98d6428c WHIRLPOOL 7d4267e10127af3a24437c86adc941e93c98cca91ccba435e4038ff4c8855bc4113b97c43473f4742f597a070bc79c8e3b8975155e93c1e224ce981a37538772
diff --git a/media-gfx/qrencode/qrencode-3.4.4-r1.ebuild b/media-gfx/qrencode/qrencode-3.4.4-r1.ebuild
index 5b1b111a8730..28b737f0ead2 100644
--- a/media-gfx/qrencode/qrencode-3.4.4-r1.ebuild
+++ b/media-gfx/qrencode/qrencode-3.4.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://fukuchi.org/works/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="media-libs/libpng:0="
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index a5c6231b30b1..c591ec2ae38c 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 25 Dec 2016 09:43:23 +0000
+Sun, 25 Dec 2016 10:43:21 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index a5c6231b30b1..c591ec2ae38c 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 25 Dec 2016 09:43:23 +0000
+Sun, 25 Dec 2016 10:43:21 +0000
diff --git a/metadata/md5-cache/app-admin/apache-tools-2.4.25 b/metadata/md5-cache/app-admin/apache-tools-2.4.25
index 5f586cfa0d44..a8ec5aa24ea7 100644
--- a/metadata/md5-cache/app-admin/apache-tools-2.4.25
+++ b/metadata/md5-cache/app-admin/apache-tools-2.4.25
@@ -4,11 +4,11 @@ DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
 EAPI=6
 HOMEPAGE=https://httpd.apache.org/
 IUSE=libressl ssl
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/apr-1.5.0:1 dev-libs/apr-util:1 dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/httpd/httpd-2.4.25.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=cb98d50dd0f3566f2495da3a603cf80a
+_md5_=0ce4aa16c57e6fea18f8f42cbe22f516
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.18_p1 b/metadata/md5-cache/app-admin/sudo-1.8.18_p1
index f6af91920ed9..07f6b68879e0 100644
--- a/metadata/md5-cache/app-admin/sudo-1.8.18_p1
+++ b/metadata/md5-cache/app-admin/sudo-1.8.18_p1
@@ -4,11 +4,11 @@ DESCRIPTION=Allows users or groups to run commands as other users
 EAPI=6
 HOMEPAGE=http://www.sudo.ws/
 IUSE=ldap nls pam offensive selinux skey +sendmail
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris
 LICENSE=ISC BSD
 RDEPEND=pam? ( virtual/pam ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) >=app-misc/editor-wrapper-3 virtual/editor sendmail? ( virtual/mta )
 REQUIRED_USE=pam? ( !skey ) skey? ( !pam )
 SLOT=0
 SRC_URI=http://www.sudo.ws/sudo/dist/sudo-1.8.18p1.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.18p1.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=ed8260b6f3e630119ce390dd0545d248
+_md5_=24bd92e6b39f15f83df67efa22bb9678
diff --git a/metadata/md5-cache/app-arch/dpkg-1.18.14 b/metadata/md5-cache/app-arch/dpkg-1.18.14
deleted file mode 100644
index e24256ba960b..000000000000
--- a/metadata/md5-cache/app-arch/dpkg-1.18.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/perl-5.6.0:= dev-perl/TimeDate bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 ) app-arch/xz-utils sys-devel/flex virtual/pkgconfig nls? ( app-text/po4a >=sys-devel/gettext-0.18.2 ) test? ( dev-perl/DateTime-Format-DateParse dev-perl/IO-String dev-perl/Test-Pod virtual/perl-Test-Harness ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Package maintenance system for Debian
-EAPI=6
-HOMEPAGE=http://packages.qa.debian.org/dpkg
-IUSE=+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=>=dev-lang/perl-5.6.0:= dev-perl/TimeDate bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.18.14.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=03bf9c61ad16bc616034b20e060a4a5c
diff --git a/metadata/md5-cache/app-arch/dpkg-1.18.18 b/metadata/md5-cache/app-arch/dpkg-1.18.18
new file mode 100644
index 000000000000..bcea86555a15
--- /dev/null
+++ b/metadata/md5-cache/app-arch/dpkg-1.18.18
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 ) app-arch/xz-utils sys-devel/flex virtual/pkgconfig nls? ( app-text/po4a >=sys-devel/gettext-0.18.2 ) test? ( dev-perl/IO-String dev-perl/Test-Pod virtual/perl-Test-Harness ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Package maintenance system for Debian
+EAPI=6
+HOMEPAGE=http://packages.qa.debian.org/dpkg
+IUSE=+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=>=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.18.18.tar.xz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=5d070095bcffec75d76f2d5db6d58cf0
diff --git a/metadata/md5-cache/app-benchmarks/bonnie++-1.97-r1 b/metadata/md5-cache/app-benchmarks/bonnie++-1.97-r1
index 0def3a30f33e..1e13ab29b91a 100644
--- a/metadata/md5-cache/app-benchmarks/bonnie++-1.97-r1
+++ b/metadata/md5-cache/app-benchmarks/bonnie++-1.97-r1
@@ -3,8 +3,8 @@ DESCRIPTION=Hard drive bottleneck testing benchmark suite
 EAPI=6
 HOMEPAGE=http://www.coker.com.au/bonnie++/
 IUSE=debug
-KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.coker.com.au/bonnie++/experimental/bonnie++-1.97.tgz
-_md5_=b2bca450ed7ced7592069f8b84e0943c
+_md5_=65da96e028e40d1f20a58ebc98aaf8df
diff --git a/metadata/md5-cache/app-editors/adie-1.7.54 b/metadata/md5-cache/app-editors/adie-1.7.54
index ee26122b7925..9582b20e4621 100644
--- a/metadata/md5-cache/app-editors/adie-1.7.54
+++ b/metadata/md5-cache/app-editors/adie-1.7.54
@@ -4,10 +4,10 @@ DESCRIPTION=Text editor based on the FOX Toolkit
 EAPI=5
 HOMEPAGE=http://www.fox-toolkit.org/
 IUSE=debug doc profile
-KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~hppa ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=~x11-libs/fox-1.7.54 x11-libs/libICE x11-libs/libSM
 SLOT=0
 SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.7.54.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	fox	83ccbb53af419d6651a10292aa01fc4c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0c77fadf573a52dce9ce4813206e66a3
+_md5_=8a299cb5a2cf12595ac6fac048e564e9
diff --git a/metadata/md5-cache/app-editors/emacs-24.5-r3 b/metadata/md5-cache/app-editors/emacs-24.5-r3
index a2d2d99f4cc5..6b43bf341df3 100644
--- a/metadata/md5-cache/app-editors/emacs-24.5-r3
+++ b/metadata/md5-cache/app-editors/emacs-24.5-r3
@@ -4,11 +4,11 @@ DESCRIPTION=The extensible, customizable, self-documenting real-time display edi
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IUSE=acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=sys-libs/ncurses:0 >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) !<app-editors/emacs-vcs-24.5
 REQUIRED_USE=?? ( aqua X )
 SLOT=24
 SRC_URI=mirror://gnu/emacs/emacs-24.5.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-24.5-patches-2.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=edb490728916ce005923184d8cd77474
+_md5_=dae0afc1d702be0b01e74d3d757e2f41
diff --git a/metadata/md5-cache/app-i18n/unicode-data-9.0.0 b/metadata/md5-cache/app-i18n/unicode-data-9.0.0
index a773d2a55bb3..831f6353d004 100644
--- a/metadata/md5-cache/app-i18n/unicode-data-9.0.0
+++ b/metadata/md5-cache/app-i18n/unicode-data-9.0.0
@@ -3,8 +3,8 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Unicode data from unicode.org
 EAPI=6
 HOMEPAGE=http://www.unicode.org/ucd/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=unicode
 SLOT=0
 SRC_URI=http://www.unicode.org/Public/zipped/9.0.0/UCD.zip -> unicode-data-9.0.0-UCD.zip http://www.unicode.org/Public/zipped/9.0.0/Unihan.zip -> unicode-data-9.0.0-Unihan.zip
-_md5_=81a91e8106a6134a777b6f5a4fb8dddb
+_md5_=bc4c3f09f3bffb55e49dcf0cffa50a54
diff --git a/metadata/md5-cache/app-mobilephone/sobexsrv-1.0.1-r1 b/metadata/md5-cache/app-mobilephone/sobexsrv-1.0.1-r1
index 26889378e183..c5510360d4c2 100644
--- a/metadata/md5-cache/app-mobilephone/sobexsrv-1.0.1-r1
+++ b/metadata/md5-cache/app-mobilephone/sobexsrv-1.0.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Scripting/Secure OBEX Server (for BlueZ Linux)
 EAPI=6
 HOMEPAGE=http://www.mulliner.org/bluetooth/sobexsrv.php
 IUSE=gtk python_targets_python2_7
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/openobex net-wireless/bluez gtk? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) gtk? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.2 )
 REQUIRED_USE=gtk? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.mulliner.org/bluetooth/sobexsrv-1.0.1.tar.gz https://dev.gentoo.org/~joker/sobexsrv-1.0.1-fix64.patch
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=c0776d1f9d2f1c6ebd033c2163df60b9
+_md5_=528a201bd17777ba078c1e0732ff7301
diff --git a/metadata/md5-cache/dev-lang/python-2.7.12 b/metadata/md5-cache/dev-lang/python-2.7.12
index 5c48df03b2f4..1516b2a9420b 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.12
+++ b/metadata/md5-cache/dev-lang/python-2.7.12
@@ -4,11 +4,11 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=http://www.python.org/
 IUSE=-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=PSF-2
 PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=app-arch/bzip2:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 )
 SLOT=2.7
 SRC_URI=https://www.python.org/ftp/python/2.7.12/Python-2.7.12.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.12-0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=5e956ddf611f620ed352cdf93aee09eb
+_md5_=2950cec86967a2c66f028765d62a3bdf
diff --git a/metadata/md5-cache/dev-lang/python-3.4.5 b/metadata/md5-cache/dev-lang/python-3.4.5
index d65313b81aac..d13b1b9bf372 100644
--- a/metadata/md5-cache/dev-lang/python-3.4.5
+++ b/metadata/md5-cache/dev-lang/python-3.4.5
@@ -4,11 +4,11 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=http://www.python.org/
 IUSE=build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=PSF-2
 PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
 SLOT=3.4/3.4m
 SRC_URI=http://www.python.org/ftp/python/3.4.5/Python-3.4.5.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.4.5-0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=ab199dcf361c722dfff6dab440e991b4
+_md5_=2c1990d090cb1e7072aa72a85d71b33c
diff --git a/metadata/md5-cache/dev-perl/LaTeX-Driver-0.200.4 b/metadata/md5-cache/dev-perl/LaTeX-Driver-0.200.4
index 4c57c74b8f0e..3f053e106ff1 100644
--- a/metadata/md5-cache/dev-perl/LaTeX-Driver-0.200.4
+++ b/metadata/md5-cache/dev-perl/LaTeX-Driver-0.200.4
@@ -4,10 +4,10 @@ DESCRIPTION=Perl encapsulation of invoking the Latex programs
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/LaTeX-Driver/
 IUSE=test
-KEYWORDS=amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd
 LICENSE=|| ( GPL-1+ Artistic )
 RDEPEND=dev-perl/Class-Accessor dev-perl/Exception-Class dev-perl/File-Slurp virtual/perl-File-Spec dev-perl/File-pushd virtual/perl-Getopt-Long dev-perl/Readonly virtual/perl-parent dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EI/EINHVERFR/LaTeX-Driver-0.200.4.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=51378e98af1d4f35f5cda9630805b29c
+_md5_=c1e8aceb6bd4136f265519c2ccaf80c8
diff --git a/metadata/md5-cache/dev-perl/LaTeX-Encode-0.91.6 b/metadata/md5-cache/dev-perl/LaTeX-Encode-0.91.6
index 46576cadfc31..c69961556ca8 100644
--- a/metadata/md5-cache/dev-perl/LaTeX-Encode-0.91.6
+++ b/metadata/md5-cache/dev-perl/LaTeX-Encode-0.91.6
@@ -4,10 +4,10 @@ DESCRIPTION=Encode characters for LaTeX formatting
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/LaTeX-Encode/
 IUSE=test
-KEYWORDS=amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd
 LICENSE=|| ( GPL-1+ Artistic )
 RDEPEND=virtual/perl-Getopt-Long dev-perl/HTML-Parser dev-perl/Pod-LaTeX dev-perl/Readonly dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EI/EINHVERFR/LaTeX-Encode-0.091.6.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=34906dd3ad9dcacbb1cc7a3e50aa9576
+_md5_=511fa665899f6e868da79c03630ca860
diff --git a/metadata/md5-cache/dev-perl/LaTeX-Table-1.0.6 b/metadata/md5-cache/dev-perl/LaTeX-Table-1.0.6
index 406c053bce4f..fd806925348a 100644
--- a/metadata/md5-cache/dev-perl/LaTeX-Table-1.0.6
+++ b/metadata/md5-cache/dev-perl/LaTeX-Table-1.0.6
@@ -4,10 +4,10 @@ DESCRIPTION=Perl extension for the automatic generation of LaTeX tables
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/LaTeX-Table/
 IUSE=test
-KEYWORDS=amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd
 LICENSE=|| ( GPL-1+ Artistic )
 RDEPEND=virtual/perl-Carp dev-perl/Module-Pluggable dev-perl/Moose dev-perl/MooseX-FollowPBP virtual/perl-Scalar-List-Utils dev-perl/Template-Toolkit virtual/perl-version dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LI/LIMAONE/LaTeX-Table-v1.0.6.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=d93adc0d9c986ef9ae410b82392e097f
+_md5_=b460473eb75ad047f84ca41eae401083
diff --git a/metadata/md5-cache/dev-perl/MooseX-FollowPBP-0.50.0 b/metadata/md5-cache/dev-perl/MooseX-FollowPBP-0.50.0
index e7dd18a4a68d..f3c51662b0e8 100644
--- a/metadata/md5-cache/dev-perl/MooseX-FollowPBP-0.50.0
+++ b/metadata/md5-cache/dev-perl/MooseX-FollowPBP-0.50.0
@@ -3,10 +3,10 @@ DEPEND=dev-perl/Moose virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)]
 DESCRIPTION=Name your accessors get_foo() and set_foo(), whatever that may mean
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/MooseX-FollowPBP/
-KEYWORDS=amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd
 LICENSE=Artistic-2
 RDEPEND=dev-perl/Moose dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-FollowPBP-0.05.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=0355c0fde5611d06b0f8333eebca74af
+_md5_=a20c8006d7ed5a4b9b54250682a016b5
diff --git a/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0 b/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0
index 1ddc28df6adf..52cd03469ee4 100644
--- a/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0
+++ b/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Pod-Parser virtual/perl-if dev-perl/Module-Build dev-lang/pe
 DESCRIPTION=Convert Pod data to formatted LaTeX
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Pod-LaTeX/
-KEYWORDS=amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd
 LICENSE=|| ( GPL-1+ Artistic )
 RDEPEND=virtual/perl-Pod-Parser virtual/perl-if dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TJ/TJENNESS/Pod-LaTeX-0.61.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=5c4de3c6783c2ca584be9dad35138866
+_md5_=82da5acec1685c0f462a5e8e559e4b2c
diff --git a/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.60.0 b/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.60.0
index 1c8c28aba8da..942d318fced6 100644
--- a/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.60.0
+++ b/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.60.0
@@ -4,10 +4,10 @@ DESCRIPTION=LaTeX support for the Template Toolkit
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Template-Plugin-Latex/
 IUSE=test
-KEYWORDS=amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-perl/LaTeX-Driver dev-perl/LaTeX-Encode dev-perl/LaTeX-Table >=dev-perl/Template-Toolkit-2.16 virtual/latex-base dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EI/EINHVERFR/Template-Plugin-Latex-3.06.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=f6b9c2ab15314306cd0749a4b1d1636c
+_md5_=a143bae520f99210fd29100cd4ca7d51
diff --git a/metadata/md5-cache/dev-php/xdebug-2.4.1 b/metadata/md5-cache/dev-php/xdebug-2.4.1
index 3e1c07c2f70c..79673a37ae55 100644
--- a/metadata/md5-cache/dev-php/xdebug-2.4.1
+++ b/metadata/md5-cache/dev-php/xdebug-2.4.1
@@ -4,11 +4,11 @@ DESCRIPTION=A PHP debugging and profiling extension
 EAPI=6
 HOMEPAGE=http://www.xdebug.org/
 IUSE=php_targets_php7-0 php_targets_php5-6
-KEYWORDS=amd64 ~hppa ~ppc ppc64 x86
+KEYWORDS=amd64 ~hppa ppc ppc64 x86
 LICENSE=Xdebug
 RDEPEND=~dev-php/xdebug-client-2.4.1 php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php5-6? ( dev-lang/php:5.6 )
 REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php5-6 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/xdebug-2.4.1.tgz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	php-ext-source-r3	a30f64f44cd0439913e37281006faaca	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=61b07c32fa3a0358be562dd0a8071663
+_md5_=878d7ce807f7b1b882f4d8d37f5afce8
diff --git a/metadata/md5-cache/dev-php/xdebug-client-2.4.1 b/metadata/md5-cache/dev-php/xdebug-client-2.4.1
index 5c3a24164fc3..fd29b12789aa 100644
--- a/metadata/md5-cache/dev-php/xdebug-client-2.4.1
+++ b/metadata/md5-cache/dev-php/xdebug-client-2.4.1
@@ -4,9 +4,9 @@ DESCRIPTION=Xdebug client for the Common Debugger Protocol (DBGP)
 EAPI=6
 HOMEPAGE=http://www.xdebug.org/
 IUSE=libedit
-KEYWORDS=amd64 ~hppa ~ppc ppc64 x86
+KEYWORDS=amd64 ~hppa ppc ppc64 x86
 LICENSE=Xdebug
 RDEPEND=libedit? ( dev-libs/libedit )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/xdebug-2.4.1.tgz
-_md5_=2ebb0673050ccb2edd4d1044174278c3
+_md5_=ad5f794de12e0a406eb24127d35385a6
diff --git a/metadata/md5-cache/dev-ruby/kpeg-1.1.0 b/metadata/md5-cache/dev-ruby/kpeg-1.1.0
new file mode 100644
index 000000000000..b0f03473be8f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/kpeg-1.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=A simple PEG library for Ruby
+EAPI=5
+HOMEPAGE=https://github.com/evanphx/kpeg
+IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=1
+SRC_URI=mirror://rubygems/kpeg-1.1.0.gem
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=320161aae0a4ecb812fab10ba3dd2029
diff --git a/metadata/md5-cache/dev-ruby/rdoc-5.0.0 b/metadata/md5-cache/dev-ruby/rdoc-5.0.0
new file mode 100644
index 000000000000..182b3da407e4
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rdoc-5.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=ruby_targets_ruby20? ( dev-ruby/kpeg[ruby_targets_ruby20] dev-ruby/racc[ruby_targets_ruby20] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( dev-ruby/kpeg[ruby_targets_ruby21] dev-ruby/racc[ruby_targets_ruby21] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/kpeg[ruby_targets_ruby22] dev-ruby/racc[ruby_targets_ruby22] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/kpeg[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby20? ( >=dev-ruby/json-1.4:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/json-1.4:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/json-1.4:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.4:0[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=An extended version of the RDoc library from Ruby 1.8
+EAPI=5
+HOMEPAGE=https://github.com/rdoc/rdoc/
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=~amd64
+LICENSE=Ruby MIT
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/json-1.4:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/json-1.4:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/json-1.4:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/json-1.4:0[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=https://github.com/rdoc/rdoc/archive/v5.0.0.tar.gz -> rdoc-5.0.0.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=fb3b29f4a5a274b78d83df4eadcd5ba0
diff --git a/metadata/md5-cache/dev-util/oprofile-0.9.9-r2 b/metadata/md5-cache/dev-util/oprofile-0.9.9-r2
index 357099c709d2..adbbad3a0469 100644
--- a/metadata/md5-cache/dev-util/oprofile-0.9.9-r2
+++ b/metadata/md5-cache/dev-util/oprofile-0.9.9-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A transparent low-overhead system-wide profiler
 EAPI=5
 HOMEPAGE=http://oprofile.sourceforge.net
 IUSE=java pch qt4 elibc_FreeBSD java
-KEYWORDS=alpha amd64 arm hppa ~mips ~ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.7-r1 sys-libs/binutils-libs >=sys-libs/glibc-2.3.2-r1 ppc64? ( dev-libs/libpfm ) qt4? ( dev-qt/qtgui:4[qt3support] ) java? ( >=virtual/jdk-1.5:= ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/oprofile/oprofile-0.9.9.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a50950a73b5d5db46f42638e2996a087	libtool	4890219c51da247200223277f993e054	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9b6fc4702103991c5bfcc58e77b6fb47
+_md5_=ea6f985d4c7b3d6c35a35b95cef30eda
diff --git a/metadata/md5-cache/dev-util/oprofile-1.1.0-r1 b/metadata/md5-cache/dev-util/oprofile-1.1.0-r1
index b9201a271e43..3e84e0865712 100644
--- a/metadata/md5-cache/dev-util/oprofile-1.1.0-r1
+++ b/metadata/md5-cache/dev-util/oprofile-1.1.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A transparent low-overhead system-wide profiler
 EAPI=5
 HOMEPAGE=http://oprofile.sourceforge.net
 IUSE=java pch elibc_FreeBSD java
-KEYWORDS=alpha amd64 arm hppa ~mips ~ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.7-r1 sys-libs/binutils-libs >=sys-libs/glibc-2.3.2-r1 java? ( >=virtual/jdk-1.5:= ) ppc64? ( dev-libs/libpfm ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/oprofile/oprofile-1.1.0.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a50950a73b5d5db46f42638e2996a087	libtool	4890219c51da247200223277f993e054	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e40f1de708d686e36b7803fbbdfebaaa
+_md5_=9947546f76a40874a12f1b3f265aaa45
diff --git a/metadata/md5-cache/media-gfx/darktable-2.2.0_rc3 b/metadata/md5-cache/media-gfx/darktable-2.2.0
similarity index 81%
rename from metadata/md5-cache/media-gfx/darktable-2.2.0_rc3
rename to metadata/md5-cache/media-gfx/darktable-2.2.0
index 947c4766b965..1d82b2c3e73a 100644
--- a/metadata/md5-cache/media-gfx/darktable-2.2.0_rc3
+++ b/metadata/md5-cache/media-gfx/darktable-2.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend test
-DEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-misc/curl virtual/jpeg:0 virtual/glu virtual/opengl x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) libsecret? ( >=app-crypt/libsecret-0.18 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.2.2 >=sys-apps/sed-4
+DEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-misc/curl virtual/jpeg:0 virtual/glu virtual/opengl x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) libsecret? ( >=app-crypt/libsecret-0.18 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.0 >=sys-apps/sed-4
 DESCRIPTION=A virtual lighttable and darkroom for photographers
 EAPI=6
 HOMEPAGE=http://www.darktable.org/
-IUSE=colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kde libsecret nls opencl openmp openexr pax_kernel webp l10n_af l10n_ca l10n_cs l10n_da l10n_de l10n_el l10n_es l10n_fi l10n_fr l10n_gl l10n_he l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sv l10n_th l10n_uk l10n_zh-CN
+IUSE=colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kde libsecret nls opencl openmp openexr pax_kernel webp l10n_ca l10n_cs l10n_da l10n_de l10n_es l10n_fr l10n_he l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_ru l10n_sk l10n_sl l10n_sv l10n_uk
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 CC-BY-3.0
 RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-misc/curl virtual/jpeg:0 virtual/glu virtual/opengl x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) libsecret? ( >=app-crypt/libsecret-0.18 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kde? ( kde-apps/kwalletd:4 )
 REQUIRED_USE=cpu_flags_x86_sse3
 SLOT=0
-SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-2.2.0rc3/darktable-2.2.0.rc3.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-2.0.0/darktable-usermanual.pdf -> darktable-usermanual-2.0.0.pdf )
+SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-2.2.0/darktable-2.2.0.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-2.0.0/darktable-usermanual.pdf -> darktable-usermanual-2.0.0.pdf )
 _eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ea051fbaa323a85345b7a345336cf5b4
+_md5_=dd246aa86a2c49a916b7be64038eb169
diff --git a/metadata/md5-cache/media-gfx/darktable-9999 b/metadata/md5-cache/media-gfx/darktable-9999
index 9975c2a6f6ab..2a9f95fa071e 100644
--- a/metadata/md5-cache/media-gfx/darktable-9999
+++ b/metadata/md5-cache/media-gfx/darktable-9999
@@ -3,10 +3,10 @@ DEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0=
 DESCRIPTION=A virtual lighttable and darkroom for photographers
 EAPI=6
 HOMEPAGE=http://www.darktable.org/
-IUSE=colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kde libsecret nls opencl openmp openexr pax_kernel webp l10n_af l10n_ca l10n_cs l10n_da l10n_de l10n_el l10n_es l10n_fi l10n_fr l10n_gl l10n_he l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sv l10n_th l10n_uk l10n_zh-CN
+IUSE=colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kde libsecret nls opencl openmp openexr pax_kernel webp l10n_ca l10n_cs l10n_da l10n_de l10n_es l10n_fr l10n_he l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_ru l10n_sk l10n_sl l10n_sv l10n_uk
 LICENSE=GPL-3 CC-BY-3.0
 RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-misc/curl virtual/jpeg:0 virtual/glu virtual/opengl x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) libsecret? ( >=app-crypt/libsecret-0.18 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kde? ( kde-apps/kwalletd:4 )
 REQUIRED_USE=cpu_flags_x86_sse3
 SLOT=0
 _eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b2c80aebb112049271520925af323276
+_md5_=4d7b08baab246e825bd8a8d10512a01c
diff --git a/metadata/md5-cache/media-gfx/qrencode-3.4.4-r1 b/metadata/md5-cache/media-gfx/qrencode-3.4.4-r1
index e45056e6c7fa..2c47929d474c 100644
--- a/metadata/md5-cache/media-gfx/qrencode-3.4.4-r1
+++ b/metadata/md5-cache/media-gfx/qrencode-3.4.4-r1
@@ -3,10 +3,10 @@ DEPEND=media-libs/libpng:0= virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 ||
 DESCRIPTION=C library for encoding data in a QR Code symbol
 EAPI=6
 HOMEPAGE=http://fukuchi.org/works/qrencode/
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=media-libs/libpng:0=
 SLOT=0
 SRC_URI=http://fukuchi.org/works/qrencode/qrencode-3.4.4.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=a89995a527f26e398414f74cab29225b
+_md5_=0fc0bb4b537e845496ad8e4e06e0d56b
diff --git a/metadata/md5-cache/net-fs/openafs-1.6.18.3 b/metadata/md5-cache/net-fs/openafs-1.6.18.3
index 1e1e2ab9aad2..ff56691f557b 100644
--- a/metadata/md5-cache/net-fs/openafs-1.6.18.3
+++ b/metadata/md5-cache/net-fs/openafs-1.6.18.3
@@ -4,10 +4,10 @@ DESCRIPTION=The OpenAFS distributed file system
 EAPI=6
 HOMEPAGE=https://www.openafs.org/
 IUSE=bitmap-later debug doc fuse kerberos +modules ncurses pam pthreaded-ubik +supergroups
-KEYWORDS=amd64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=IBM BSD openafs-krb5-a APSL-2
 RDEPEND=virtual/libintl fuse? ( sys-fs/fuse ) kerberos? ( virtual/krb5 ) ncurses? ( sys-libs/ncurses:0= ) pam? ( virtual/pam ) modules? ( ~net-fs/openafs-kernel-1.6.18.3 )
 SLOT=0
 SRC_URI=https://openafs.org/dl/openafs/1.6.18.3/openafs-1.6.18.3-src.tar.bz2 https://openafs.org/dl/openafs/1.6.18.3/openafs-1.6.18.3-doc.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20160801-2.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b70992d2dbd53a0d25168bcd1266ea9f
+_md5_=d3f934c689ca6678bcfafdc1b92ade79
diff --git a/metadata/md5-cache/net-fs/openafs-kernel-1.6.18.3 b/metadata/md5-cache/net-fs/openafs-kernel-1.6.18.3
index 65337ba29d8a..5e477a73ba3a 100644
--- a/metadata/md5-cache/net-fs/openafs-kernel-1.6.18.3
+++ b/metadata/md5-cache/net-fs/openafs-kernel-1.6.18.3
@@ -4,10 +4,10 @@ DESCRIPTION=The OpenAFS distributed file system kernel module
 EAPI=6
 HOMEPAGE=https://www.openafs.org/
 IUSE=debug kernel_linux
-KEYWORDS=amd64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=IBM BSD openafs-krb5-a APSL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://openafs.org/dl/openafs/1.6.18.3/openafs-1.6.18.3-src.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20160801-2.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	linux-mod	0ccff2c1a7d70cf1678059b64bcf9183	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c0e4a114e654a0557babc62ee2d72085
+_md5_=0a023870ed4f21d9eb62dfd5cfdd7258
diff --git a/metadata/md5-cache/net-p2p/transmission-2.92-r1 b/metadata/md5-cache/net-p2p/transmission-2.92-r1
index c991b3f8cfc0..5ebcc42e2a7a 100644
--- a/metadata/md5-cache/net-p2p/transmission-2.92-r1
+++ b/metadata/md5-cache/net-p2p/transmission-2.92-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Fast, Easy and Free BitTorrent client
 EAPI=6
 HOMEPAGE=http://www.transmissionbt.com/
 IUSE=ayatana gtk libressl lightweight systemd qt5 xfs
-KEYWORDS=amd64 ~arm ~mips ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux
+KEYWORDS=amd64 ~arm ~mips ppc ppc64 x86 ~x86-fbsd ~amd64-linux
 LICENSE=|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT
 RDEPEND=>=dev-libs/libevent-2.0.10:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 ayatana? ( >=dev-libs/libappindicator-0.4.90:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) systemd? ( >=sys-apps/systemd-209:= )
 REQUIRED_USE=ayatana? ( gtk )
 SLOT=0
 SRC_URI=http://download.transmissionbt.com/transmission/files/transmission-2.92.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6f2f072083b181619536836311ce0c90
+_md5_=7e621be82e07b42fafc165d5e2834312
diff --git a/metadata/md5-cache/net-proxy/squid-3.5.23 b/metadata/md5-cache/net-proxy/squid-3.5.23
index 2aed51f3764e..30c37e0c3aac 100644
--- a/metadata/md5-cache/net-proxy/squid-3.5.23
+++ b/metadata/md5-cache/net-proxy/squid-3.5.23
@@ -4,11 +4,11 @@ DESCRIPTION=A full-featured web proxy cache
 EAPI=6
 HOMEPAGE=http://www.squid-cache.org/
 IUSE=caps ipv6 pam ldap libressl samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap esi ssl-crtd mysql postgres sqlite qos tproxy +htcp +wccp +wccpv2 pf-transparent ipf-transparent kqueue elibc_uclibc kernel_linux
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( libressl? ( dev-libs/libressl:0 ) !libressl? ( dev-libs/openssl:0 ) dev-libs/nettle >=net-libs/gnutls-3.1.5 ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4:* dev-lang/perl dev-libs/libltdl:0 samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) selinux? ( sec-policy/selinux-squid ) sqlite? ( dev-perl/DBD-SQLite ) !<=sci-biology/meme-4.8.1-r1
 REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.23.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0d934b70f62c460f17217d40f78d3d35
+_md5_=a0d8ee655687fa9bb2dacb8a7c7b2ec9
diff --git a/metadata/md5-cache/sci-calculators/calculator-1.7.54 b/metadata/md5-cache/sci-calculators/calculator-1.7.54
index 6ea7278799ec..3e28c6062f51 100644
--- a/metadata/md5-cache/sci-calculators/calculator-1.7.54
+++ b/metadata/md5-cache/sci-calculators/calculator-1.7.54
@@ -4,10 +4,10 @@ DESCRIPTION=Scientific calculator based on the FOX Toolkit
 EAPI=6
 HOMEPAGE=http://www.fox-toolkit.org/
 IUSE=debug doc profile
-KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~hppa ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=~x11-libs/fox-1.7.54 x11-libs/libICE x11-libs/libSM
 SLOT=0
 SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.7.54.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	fox	83ccbb53af419d6651a10292aa01fc4c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fc04285c533d9fe2bfb087e194690b59
+_md5_=292586e970cb2db0305d5ce8e5e7e859
diff --git a/metadata/md5-cache/sys-apps/less-487 b/metadata/md5-cache/sys-apps/less-487
index d0cdb94e92c1..9e2164d1407f 100644
--- a/metadata/md5-cache/sys-apps/less-487
+++ b/metadata/md5-cache/sys-apps/less-487
@@ -4,9 +4,9 @@ DESCRIPTION=Excellent text file viewer
 EAPI=5
 HOMEPAGE=http://www.greenwoodsoftware.com/less/
 IUSE=pcre unicode
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 BSD-2 )
 RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=http://www.greenwoodsoftware.com/less/less-487.tar.gz
-_md5_=a84560cd172e488b059d7f2e5adb6bc7
+_md5_=296e9205f5dbb6bd3020f7a08cc146f4
diff --git a/metadata/md5-cache/sys-apps/portage-2.2.28 b/metadata/md5-cache/sys-apps/portage-2.2.28
index 5c022184857f..9e034a7a1d2d 100644
--- a/metadata/md5-cache/sys-apps/portage-2.2.28
+++ b/metadata/md5-cache/sys-apps/portage-2.2.28
@@ -4,7 +4,7 @@ DESCRIPTION=Portage is the package management and distribution system for Gentoo
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
 IUSE=build doc epydoc +ipc linguas_ru selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
 RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy? ( virtual/pypy:0=[bzip2(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy pytho
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.2.28.tar.bz2 https://dev.gentoo.org/~dolsen/releases/portage/portage-2.2.28.tar.bz2
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b137e63c9c1270c91d43b02a71ee3d02
+_md5_=42e5985763fa7789a3141091b0dc3fba
diff --git a/metadata/md5-cache/sys-devel/qconf-2.0 b/metadata/md5-cache/sys-devel/qconf-2.0
index 779735bcfec0..c3ff6acb4c2b 100644
--- a/metadata/md5-cache/sys-devel/qconf-2.0
+++ b/metadata/md5-cache/sys-devel/qconf-2.0
@@ -4,11 +4,11 @@ DESCRIPTION=./configure like generator for qmake-based projects
 EAPI=6
 HOMEPAGE=http://delta.affinix.com/qconf/
 IUSE=+qt4 qt5
-KEYWORDS=amd64 ~arm hppa ~ppc ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=qt4? ( dev-qt/qtcore:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtxml:5 )
 REQUIRED_USE=^^ ( qt4 qt5 )
 SLOT=0
 SRC_URI=http://delta.affinix.com/download/qconf-2.0.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=1b76e03b0f91c2345b5523bfc5e9d4bd
+_md5_=6ce553cdb41701bd03550ade4ae43634
diff --git a/metadata/md5-cache/www-client/firefox-45.6.0 b/metadata/md5-cache/www-client/firefox-45.6.0
index 417520486d0e..e669d9f207b1 100644
--- a/metadata/md5-cache/www-client/firefox-45.6.0
+++ b/metadata/md5-cache/www-client/firefox-45.6.0
@@ -4,7 +4,7 @@ DESCRIPTION=Firefox Web Browser
 EAPI=6
 HOMEPAGE=http://www.mozilla.com/firefox
 IUSE=bindist hardened +hwaccel pgo selinux +gmp-autoupdate test custom-cflags custom-optimization dbus debug ffmpeg +gstreamer gstreamer-0 +jemalloc3 neon pulseaudio selinux startup-notification system-cairo system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx wifi +jit pgo l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_be l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_kk l10n_km l10n_kn l10n_ko l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/nss-3.21.1 >=dev-libs/nspr-4.12 selinux? ( sec-policy/selinux-mozilla ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.19:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 ffmpeg? ( virtual/ffmpeg ) gstreamer? ( >=media-libs/gstreamer-1.4.5:1.0 >=media-libs/gst-plugins-base-1.4.5:1.0 >=media-libs/gst-plugins-good-1.4.5:1.0 >=media-plugins/gst-plugins-libav-1.4.5:1.0 ) gstreamer-0? ( >=media-libs/gstreamer-0.10.25:0.10 media-plugins/gst-plugins-meta:0.10[ffmpeg] ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-51.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( =dev-libs/libevent-2.0*:0= ) system-sqlite? ( >=dev-db/sqlite-3.9.1:3[secure-delete,debug=] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.1.3:0=[graphite,icu] >=media-gfx/graphite2-1.3.8 ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) selinux? ( sec-policy/selinux-mozilla )
 REQUIRED_USE=?? ( gstreamer gstreamer-0 ) system-harfbuzz? ( system-icu )
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/ach.xpi -> firefox-45.6.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/af.xpi -> firefox-45.6.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/an.xpi -> firefox-45.6.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/ar.xpi -> firefox-45.6.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/as.xpi -> firefox-45.6.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/ast.xpi -> firefox-45.6.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/az.xpi -> firefox-45.6.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/be.xpi -> firefox-45.6.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/bg.xpi -> firefox-45.6.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/bn-BD.xpi -> firefox-45.6.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/bn-IN.xpi -> firefox-45.6.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/br.xpi -> firefox-45.6.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/bs.xpi -> firefox-45.6.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/ca.xpi -> firefox-45.6.0esr-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/cs.xpi -> firefox-45.6.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/cy.xpi -> firefox-45.6.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/da.xpi -> firefox-45.6.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/de.xpi -> firefox-45.6.0esr-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/el.xpi -> firefox-45.6.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/en-GB.xpi -> firefox-45.6.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/en-ZA.xpi -> firefox-45.6.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/eo.xpi -> firefox-45.6.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/es-AR.xpi -> firefox-45.6.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/es-CL.xpi -> firefox-45.6.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/es-ES.xpi -> firefox-45.6.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/es-MX.xpi -> firefox-45.6.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/et.xpi -> firefox-45.6.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/eu.xpi -> firefox-45.6.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/fa.xpi -> firefox-45.6.0esr-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/fi.xpi -> firefox-45.6.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/fr.xpi -> firefox-45.6.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-45.6.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-45.6.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/gd.xpi -> firefox-45.6.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/gl.xpi -> firefox-45.6.0esr-gl.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-45.6.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/he.xpi -> firefox-45.6.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-45.6.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/hr.xpi -> firefox-45.6.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/hsb.xpi -> firefox-45.6.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/hu.xpi -> firefox-45.6.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-45.6.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/id.xpi -> firefox-45.6.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/is.xpi -> firefox-45.6.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/it.xpi -> firefox-45.6.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/ja.xpi -> firefox-45.6.0esr-ja.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/kk.xpi -> firefox-45.6.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/km.xpi -> firefox-45.6.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/kn.xpi -> firefox-45.6.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/ko.xpi -> firefox-45.6.0esr-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/lt.xpi -> firefox-45.6.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/lv.xpi -> firefox-45.6.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/mai.xpi -> firefox-45.6.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/mk.xpi -> firefox-45.6.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/ml.xpi -> firefox-45.6.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/mr.xpi -> firefox-45.6.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/ms.xpi -> firefox-45.6.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-45.6.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/nl.xpi -> firefox-45.6.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-45.6.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/or.xpi -> firefox-45.6.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-45.6.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/pl.xpi -> firefox-45.6.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-45.6.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-45.6.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/rm.xpi -> firefox-45.6.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/ro.xpi -> firefox-45.6.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/ru.xpi -> firefox-45.6.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/si.xpi -> firefox-45.6.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/sk.xpi -> firefox-45.6.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/sl.xpi -> firefox-45.6.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/son.xpi -> firefox-45.6.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/sq.xpi -> firefox-45.6.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/sr.xpi -> firefox-45.6.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-45.6.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/ta.xpi -> firefox-45.6.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/te.xpi -> firefox-45.6.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/th.xpi -> firefox-45.6.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/tr.xpi -> firefox-45.6.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/uk.xpi -> firefox-45.6.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/uz.xpi -> firefox-45.6.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/vi.xpi -> firefox-45.6.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/xh.xpi -> firefox-45.6.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-45.6.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-45.6.0esr-zh-TW.xpi ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-45.0-patches-08.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-45.0-patches-08.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-45.0-patches-08.tar.xz https://archive.mozilla.org/pub/firefox/releases/45.6.0esr/source/firefox-45.6.0esr.source.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	mozconfig-v6.45	29ada5452237b6eaf6ee0af9dccd5068	mozcoreconf-v4	3c687d11553a52e70dc3baad2d2a1864	mozextension	3d8ee4835f89ff39d4666656aa603433	mozlinguas-v2	b9f0deaff27b0dc5ca44cdd61be2a3fa	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=15069437e61b9db7f62b73ed5311e91c
+_md5_=3e1abf1667af46e7a97321117bfcc6dc
diff --git a/metadata/md5-cache/www-servers/apache-2.4.25 b/metadata/md5-cache/www-servers/apache-2.4.25
index 3b2e7663233c..bcb81dd16f2a 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.25
+++ b/metadata/md5-cache/www-servers/apache-2.4.25
@@ -4,7 +4,7 @@ DESCRIPTION=The Apache Web Server
 EAPI=5
 HOMEPAGE=https://httpd.apache.org/
 IUSE=ssl debug doc ldap libressl selinux ssl static suexec threads apache2_modules_access_compat apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authz_core apache2_modules_authz_dbd apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_cache apache2_modules_cache_disk apache2_modules_cache_socache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers apache2_modules_http2 apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_lbmethod_byrequests apache2_modules_lbmethod_bytraffic apache2_modules_lbmethod_bybusyness apache2_modules_lbmethod_heartbeat apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_macro apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_html apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_proxy_fcgi apache2_modules_proxy_wstunnel apache2_modules_rewrite apache2_modules_ratelimit apache2_modules_remoteip apache2_modules_reqtimeout apache2_modules_setenvif apache2_modules_slotmem_shm apache2_modules_speling apache2_modules_socache_shmcb apache2_modules_status apache2_modules_substitute apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_unixd apache2_modules_version apache2_modules_vhost_alias apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0 Apache-1.1
 PDEPEND=~app-admin/apache-tools-2.4.25
 RDEPEND=>=dev-libs/apr-1.5.1 !www-apache/mod_macro dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:= ) ) !=www-servers/apache-1* selinux? ( sec-policy/selinux-apache )
@@ -12,4 +12,4 @@ REQUIRED_USE=apache2_modules_http2? ( ssl )
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.25.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.18-r1-20160303.tar.bz2
 _eclasses_=apache-2	35b195143f6b5edeba0876f19b1c8107	autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	ssl-cert	b031e94f4c7c34e1d677376b8929821a	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=30e41fc15354d15b209d6a12c6b4ffee
+_md5_=d9861ae9600318db6bd4ae9e86b84e67
diff --git a/metadata/md5-cache/x11-libs/fox-1.7.54 b/metadata/md5-cache/x11-libs/fox-1.7.54
index cad655fe69b5..8854a9425a01 100644
--- a/metadata/md5-cache/x11-libs/fox-1.7.54
+++ b/metadata/md5-cache/x11-libs/fox-1.7.54
@@ -4,10 +4,10 @@ DESCRIPTION=C++ based Toolkit for developing Graphical User Interfaces easily an
 EAPI=5
 HOMEPAGE=http://www.fox-toolkit.org/
 IUSE=+bzip2 +jpeg +opengl +png tiff +truetype +zlib debug doc profile
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=x11-libs/libXrandr x11-libs/libXcursor x11-libs/fox-wrapper >=sys-devel/autoconf-2.67 bzip2? ( app-arch/bzip2 ) jpeg? ( virtual/jpeg:= ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype? ( media-libs/freetype:2 x11-libs/libXft ) zlib? ( sys-libs/zlib )
 SLOT=1.7
 SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.7.54.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	fox	83ccbb53af419d6651a10292aa01fc4c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d217380a117068507c3baf70fac42157
+_md5_=37444139b09e7abde86e4db057fca3b8
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a5c6231b30b1..c591ec2ae38c 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 25 Dec 2016 09:43:23 +0000
+Sun, 25 Dec 2016 10:43:21 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 2c00afb48137..d76a4e90129c 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Dec 25 09:39:33 UTC 2016
+Sun Dec 25 10:39:35 UTC 2016
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 43fca1777d39..58d1fbb43053 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -60,7 +60,7 @@
 1508090338 ./app-mobilephone/smstools/smstools-3.1.15-r2.ebuild
 1508090338 ./app-mobilephone/smstools/smstools-3.1.15-r1.ebuild
 1508090338 ./app-mobilephone/smsclient/smsclient-2.0.9a-r1.ebuild
-1612241317 ./app-mobilephone/sobexsrv/sobexsrv-1.0.1-r1.ebuild
+1612251320 ./app-mobilephone/sobexsrv/sobexsrv-1.0.1-r1.ebuild
 1508241349 ./app-mobilephone/sobexsrv/sobexsrv-1.0.1.ebuild
 1611271420 ./app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.69-r1.ebuild
 1508090338 ./app-mobilephone/cobex/cobex-0.2.13.ebuild
@@ -1083,7 +1083,7 @@
 1612010415 ./app-admin/salt/salt-2016.3.4.ebuild
 1608280217 ./app-admin/sudo/sudo-9999.ebuild
 1612071132 ./app-admin/sudo/sudo-1.8.16.ebuild
-1612241323 ./app-admin/sudo/sudo-1.8.18_p1.ebuild
+1612251321 ./app-admin/sudo/sudo-1.8.18_p1.ebuild
 1612211117 ./app-admin/sudo/sudo-1.8.19_p1.ebuild
 1612180403 ./app-admin/keepass/keepass-2.34-r1.ebuild
 1607172216 ./app-admin/keepass/keepass-2.34.ebuild
@@ -1411,7 +1411,7 @@
 1508090338 ./app-admin/procinfo/procinfo-18-r2.ebuild
 1612211428 ./app-admin/swatchdog/swatchdog-3.2.4.ebuild
 1606012252 ./app-admin/apache-tools/apache-tools-2.2.31.ebuild
-1612241325 ./app-admin/apache-tools/apache-tools-2.4.25.ebuild
+1612251323 ./app-admin/apache-tools/apache-tools-2.4.25.ebuild
 1611132341 ./app-admin/apache-tools/apache-tools-2.4.23.ebuild
 1611132341 ./app-admin/apache-tools/apache-tools-2.4.20.ebuild
 1512070500 ./app-admin/restart_services/restart_services-0.13.1.ebuild
@@ -6182,7 +6182,7 @@
 1612222126 ./media-gfx/openscad/openscad-2015.03_p2-r1.ebuild
 1508090338 ./media-gfx/qrencode/qrencode-3.3.1.ebuild
 1508090338 ./media-gfx/qrencode/qrencode-3.4.3.ebuild
-1612241317 ./media-gfx/qrencode/qrencode-3.4.4-r1.ebuild
+1612251320 ./media-gfx/qrencode/qrencode-3.4.4-r1.ebuild
 1601120901 ./media-gfx/farbfeld/farbfeld-1.ebuild
 1603191001 ./media-gfx/farbfeld/farbfeld-2.ebuild
 1601180010 ./media-gfx/farbfeld/farbfeld-9999.ebuild
@@ -6293,9 +6293,9 @@
 1508090338 ./media-gfx/icc_examin/icc_examin-0.55-r1.ebuild
 1508090338 ./media-gfx/xli/xli-1.17.0-r5.ebuild
 1612182002 ./media-gfx/darktable/darktable-2.0.6.ebuild
-1612062241 ./media-gfx/darktable/darktable-9999.ebuild
-1612231311 ./media-gfx/darktable/darktable-2.2.0_rc3.ebuild
+1612251254 ./media-gfx/darktable/darktable-9999.ebuild
 1612182002 ./media-gfx/darktable/darktable-2.0.7.ebuild
+1612251254 ./media-gfx/darktable/darktable-2.2.0.ebuild
 1607062306 ./media-gfx/darktable/darktable-1.6.9.ebuild
 1603240023 ./media-gfx/fbgrab/fbgrab-1.3.ebuild
 1508090338 ./media-gfx/fbgrab/fbgrab-1.0-r2.ebuild
@@ -7635,7 +7635,7 @@
 1601090825 ./net-p2p/transmission-remote-cli/transmission-remote-cli-1.7.1.ebuild
 1512032041 ./net-p2p/transmission/transmission-2.84-r4.ebuild
 1609261535 ./net-p2p/transmission/transmission-2.92.ebuild
-1612221234 ./net-p2p/transmission/transmission-2.92-r1.ebuild
+1612251322 ./net-p2p/transmission/transmission-2.92-r1.ebuild
 1612182145 ./net-p2p/transmission/transmission-9999.ebuild
 1612151144 ./net-p2p/retroshare/retroshare-0.6.9999.ebuild
 1608171718 ./net-p2p/retroshare/retroshare-0.6.0.ebuild
@@ -7922,7 +7922,7 @@
 1508090338 ./app-i18n/libskk/libskk-0.0.11.ebuild
 1610122110 ./app-i18n/ibus-handwrite/ibus-handwrite-2.1.4-r1.ebuild
 1508090338 ./app-i18n/unicode-data/unicode-data-6.1.0.ebuild
-1612201244 ./app-i18n/unicode-data/unicode-data-9.0.0.ebuild
+1612251308 ./app-i18n/unicode-data/unicode-data-9.0.0.ebuild
 1508090338 ./app-i18n/man-pages-ro/man-pages-ro-0.2.ebuild
 1508241641 ./app-i18n/fcitx-chewing/fcitx-chewing-0.2.0.ebuild
 1508090338 ./app-i18n/fcitx-chewing/fcitx-chewing-0.2.2.ebuild
@@ -8560,7 +8560,7 @@
 1508090338 ./net-nntp/suck/suck-4.3.2.ebuild
 1611210636 ./dev-perl/Config-INI/Config-INI-0.25.0.ebuild
 1508090338 ./dev-perl/Data-DumpXML/Data-DumpXML-1.60.0-r1.ebuild
-1612221234 ./dev-perl/LaTeX-Driver/LaTeX-Driver-0.200.4.ebuild
+1612251322 ./dev-perl/LaTeX-Driver/LaTeX-Driver-0.200.4.ebuild
 1604120154 ./dev-perl/Stream-Buffered/Stream-Buffered-0.30.0.ebuild
 1608050348 ./dev-perl/Email-Date-Format/Email-Date-Format-1.2.0-r1.ebuild
 1612080629 ./dev-perl/Email-Date-Format/Email-Date-Format-1.5.0.ebuild
@@ -8764,7 +8764,7 @@
 1609261535 ./dev-perl/UNIVERSAL-can/UNIVERSAL-can-1.201.403.280.ebuild
 1509120138 ./dev-perl/DBI-Shell/DBI-Shell-11.950.0-r1.ebuild
 1612102100 ./dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0-r1.ebuild
-1612221234 ./dev-perl/MooseX-FollowPBP/MooseX-FollowPBP-0.50.0.ebuild
+1612251322 ./dev-perl/MooseX-FollowPBP/MooseX-FollowPBP-0.50.0.ebuild
 1610250040 ./dev-perl/UNIVERSAL-require/UNIVERSAL-require-0.180.0.ebuild
 1611221312 ./dev-perl/Dist-Zilla-Plugin-Test-Perl-Critic/Dist-Zilla-Plugin-Test-Perl-Critic-3.0.0.ebuild
 1611101814 ./dev-perl/DB_File-Lock/DB_File-Lock-0.50.0-r1.ebuild
@@ -9220,7 +9220,7 @@
 1508090338 ./dev-perl/Text-Glob/Text-Glob-0.90.0-r1.ebuild
 1508090338 ./dev-perl/Lingua-Stem/Lingua-Stem-0.840.0-r1.ebuild
 1608041119 ./dev-perl/Error/Error-0.170.240.ebuild
-1612221234 ./dev-perl/LaTeX-Table/LaTeX-Table-1.0.6.ebuild
+1612251322 ./dev-perl/LaTeX-Table/LaTeX-Table-1.0.6.ebuild
 1508090338 ./dev-perl/mime-construct/mime-construct-1.900.0-r1.ebuild
 1612150140 ./dev-perl/MIME-tools/MIME-tools-5.507.0.ebuild
 1603170148 ./dev-perl/Ogg-Vorbis-Header/Ogg-Vorbis-Header-0.30.0-r1.ebuild
@@ -10102,7 +10102,7 @@
 1508090338 ./dev-perl/Authen-Htpasswd/Authen-Htpasswd-0.171.0-r1.ebuild
 1604040023 ./dev-perl/constant-defer/constant-defer-6.0.0.ebuild
 1608160805 ./dev-perl/WWW-RobotRules/WWW-RobotRules-6.20.0.ebuild
-1612221234 ./dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild
+1612251322 ./dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild
 1509070008 ./dev-perl/B-Hooks-Parser/B-Hooks-Parser-0.160.0.ebuild
 1508090338 ./dev-perl/GnuPG-Interface/GnuPG-Interface-0.460.0-r1.ebuild
 1608131048 ./dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r1.ebuild
@@ -10157,7 +10157,7 @@
 1605250128 ./dev-perl/Parallel-ForkManager/Parallel-ForkManager-1.170.0.ebuild
 1604130036 ./dev-perl/Parallel-ForkManager/Parallel-ForkManager-1.180.0.ebuild
 1610232146 ./dev-perl/XML-Catalog/XML-Catalog-1.30.0.ebuild
-1612221234 ./dev-perl/LaTeX-Encode/LaTeX-Encode-0.91.6.ebuild
+1612251322 ./dev-perl/LaTeX-Encode/LaTeX-Encode-0.91.6.ebuild
 1606142228 ./dev-perl/LaTeX-Encode/LaTeX-Encode-0.91.6-r1.ebuild
 1508090338 ./dev-perl/Bio-Das/Bio-Das-1.170.0-r1.ebuild
 1508090338 ./dev-perl/Symbol-Global-Name/Symbol-Global-Name-0.50.0.ebuild
@@ -10433,7 +10433,7 @@
 1602061057 ./dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.4.0.ebuild
 1508090338 ./dev-perl/Crypt-Simple/Crypt-Simple-0.60.0-r1.ebuild
 1508090338 ./dev-perl/Template-Plugin-Latex/Template-Plugin-Latex-2.170.0-r1.ebuild
-1612221234 ./dev-perl/Template-Plugin-Latex/Template-Plugin-Latex-3.60.0.ebuild
+1612251322 ./dev-perl/Template-Plugin-Latex/Template-Plugin-Latex-3.60.0.ebuild
 1508090338 ./dev-perl/Crypt-RC4/Crypt-RC4-2.020.0-r1.ebuild
 1508090338 ./dev-perl/Class-XPath/Class-XPath-1.400.0-r1.ebuild
 1601010306 ./dev-perl/common-sense/common-sense-3.740.0.ebuild
@@ -10686,7 +10686,7 @@
 1611012358 ./www-servers/uwsgi/uwsgi-2.0.9.ebuild
 1612122321 ./www-servers/uwsgi/uwsgi-2.0.14.ebuild
 1511110040 ./www-servers/servefile/servefile-0.4.4.ebuild
-1612241325 ./www-servers/apache/apache-2.4.25.ebuild
+1612251323 ./www-servers/apache/apache-2.4.25.ebuild
 1606012252 ./www-servers/apache/apache-2.2.31.ebuild
 1612201244 ./www-servers/apache/apache-2.4.23-r2.ebuild
 1607161629 ./www-servers/apache/apache-2.4.23.ebuild
@@ -11567,12 +11567,12 @@
 1606252313 ./games-emulation/stella/stella-4.7.2.ebuild
 1608011511 ./net-fs/openafs/openafs-1.6.18.2.ebuild
 1608011511 ./net-fs/openafs/openafs-1.6.17.ebuild
-1612241317 ./net-fs/openafs/openafs-1.6.18.3.ebuild
+1612251309 ./net-fs/openafs/openafs-1.6.18.3.ebuild
 1508090338 ./net-fs/wdfs/wdfs-1.4.2-r1.ebuild
 1612241324 ./net-fs/netatalk/netatalk-3.1.10.ebuild
 1612051802 ./net-fs/netatalk/netatalk-3.1.8.ebuild
 1508090338 ./net-fs/openafs-legacy/openafs-legacy-0.1.ebuild
-1612241317 ./net-fs/openafs-kernel/openafs-kernel-1.6.18.3.ebuild
+1612251309 ./net-fs/openafs-kernel/openafs-kernel-1.6.18.3.ebuild
 1608110728 ./net-fs/openafs-kernel/openafs-kernel-1.6.18.2.ebuild
 1608011516 ./net-fs/openafs-kernel/openafs-kernel-1.6.17.ebuild
 1508090338 ./net-fs/curlftpfs/curlftpfs-0.9.2-r3.ebuild
@@ -12331,7 +12331,7 @@
 1509071254 ./app-arch/unrar-gpl/unrar-gpl-0.0.1_p20080417-r2.ebuild
 1605081236 ./app-arch/dpkg/dpkg-1.17.27.ebuild
 1601111205 ./app-arch/dpkg/dpkg-1.17.26.ebuild
-1611111306 ./app-arch/dpkg/dpkg-1.18.14.ebuild
+1612251239 ./app-arch/dpkg/dpkg-1.18.18.ebuild
 1611161920 ./app-arch/dpkg/dpkg-1.18.15.ebuild
 1601192135 ./app-arch/upx-ucl/upx-ucl-3.91.ebuild
 1508090338 ./app-arch/bloscpack/bloscpack-0.5.0.ebuild
@@ -13402,7 +13402,7 @@
 1508090338 ./sci-calculators/keurocalc/keurocalc-1.2.3.ebuild
 1509072030 ./sci-calculators/calculator/calculator-1.7.49.ebuild
 1508090338 ./sci-calculators/calculator/calculator-1.6.43.ebuild
-1612221155 ./sci-calculators/calculator/calculator-1.7.54.ebuild
+1612251321 ./sci-calculators/calculator/calculator-1.7.54.ebuild
 1511111120 ./sci-calculators/galculator/galculator-2.1.4.ebuild
 1508090338 ./sci-calculators/galculator/galculator-2.1.3.ebuild
 1612060153 ./sci-calculators/qalculate-gtk/qalculate-gtk-0.9.9.ebuild
@@ -15909,7 +15909,7 @@
 1611201309 ./sys-devel/clang-runtime/clang-runtime-9999.ebuild
 1508090338 ./sys-devel/cons/cons-2.2.0.ebuild
 1508090338 ./sys-devel/qconf/qconf-1.5_pre717-r1.ebuild
-1612221155 ./sys-devel/qconf/qconf-2.0.ebuild
+1612251321 ./sys-devel/qconf/qconf-2.0.ebuild
 1612050132 ./sys-devel/slibtool/slibtool-0.5.12.ebuild
 1508241435 ./sys-devel/ucpp/ucpp-1.3.4.ebuild
 1508241435 ./sys-devel/ucpp/ucpp-9999.ebuild
@@ -18420,7 +18420,7 @@
 1610271743 ./app-benchmarks/sysbench/sysbench-1.0_pre20161017.ebuild
 1508090338 ./app-benchmarks/dbench/dbench-4.0.ebuild
 1508090338 ./app-benchmarks/bonnie++/bonnie++-1.96.ebuild
-1610060838 ./app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild
+1612251313 ./app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild
 1610181857 ./app-benchmarks/bonnie++/bonnie++-1.97.2.ebuild
 1508090338 ./app-benchmarks/stress/stress-1.0.4.ebuild
 1508090338 ./app-benchmarks/stress/stress-1.0.1.ebuild
@@ -19321,7 +19321,7 @@
 1602281116 ./app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3.ebuild
 1603201448 ./app-editors/emacs/emacs-23.4-r14.ebuild
 1612222151 ./app-editors/emacs/emacs-25.1.ebuild
-1612222151 ./app-editors/emacs/emacs-24.5-r3.ebuild
+1612251313 ./app-editors/emacs/emacs-24.5-r3.ebuild
 1612222151 ./app-editors/emacs/emacs-24.5-r1.ebuild
 1603151823 ./app-editors/emacs/emacs-18.59-r11.ebuild
 1612222151 ./app-editors/emacs/emacs-24.4-r4.ebuild
@@ -19392,7 +19392,7 @@
 1611012358 ./app-editors/gedit/gedit-3.20.2.ebuild
 1611012358 ./app-editors/gedit/gedit-3.22.0.ebuild
 1511252047 ./app-editors/adie/adie-1.7.53.ebuild
-1612221155 ./app-editors/adie/adie-1.7.54.ebuild
+1612251321 ./app-editors/adie/adie-1.7.54.ebuild
 1508090338 ./app-editors/adie/adie-1.7.49.ebuild
 1508090338 ./app-editors/adie/adie-1.6.49.ebuild
 1511252047 ./app-editors/adie/adie-1.6.50.ebuild
@@ -23016,7 +23016,7 @@
 1612082305 ./dev-php/pecl-event/pecl-event-2.2.1.ebuild
 1511080253 ./dev-php/pecl-event/pecl-event-1.11.1-r1.ebuild
 1508090338 ./dev-php/PEAR-Net_LMTP/PEAR-Net_LMTP-1.0.2.ebuild
-1612221234 ./dev-php/xdebug-client/xdebug-client-2.4.1.ebuild
+1612251320 ./dev-php/xdebug-client/xdebug-client-2.4.1.ebuild
 1508090338 ./dev-php/xdebug-client/xdebug-client-2.2.6.ebuild
 1612082128 ./dev-php/xdebug-client/xdebug-client-2.5.0.ebuild
 1508090338 ./dev-php/PEAR-Text_Wiki_Mediawiki/PEAR-Text_Wiki_Mediawiki-0.2.0-r1.ebuild
@@ -23165,7 +23165,7 @@
 1612182227 ./dev-php/libchart/libchart-1.3.ebuild
 1508090338 ./dev-php/PEAR-HTTP_Session2/PEAR-HTTP_Session2-0.7.3-r1.ebuild
 1508090338 ./dev-php/xdebug/xdebug-2.2.6.ebuild
-1612221234 ./dev-php/xdebug/xdebug-2.4.1.ebuild
+1612251320 ./dev-php/xdebug/xdebug-2.4.1.ebuild
 1612082128 ./dev-php/xdebug/xdebug-2.5.0.ebuild
 1612082128 ./dev-php/xhprof/xhprof-0.9.4_p20150226-r1.ebuild
 1508090338 ./dev-php/mockery/mockery-0.9.0.ebuild
@@ -24460,7 +24460,7 @@
 1508090338 ./x11-libs/fox/fox-1.7.49.ebuild
 1508090338 ./x11-libs/fox/fox-1.6.49.ebuild
 1511251503 ./x11-libs/fox/fox-1.7.53.ebuild
-1612221155 ./x11-libs/fox/fox-1.7.54.ebuild
+1612251321 ./x11-libs/fox/fox-1.7.54.ebuild
 1511251503 ./x11-libs/fox/fox-1.6.50.ebuild
 1611041347 ./x11-libs/libcryptui/libcryptui-3.12.2.ebuild
 1611012006 ./x11-libs/gtk+/gtk+-3.22.2.ebuild
@@ -25298,9 +25298,9 @@
 1508241641 ./dev-util/ddd/ddd-3.3.12-r4.ebuild
 1508241641 ./dev-util/ddd/ddd-3.3.12-r3.ebuild
 1609291921 ./dev-util/oprofile/oprofile-0.9.9-r1.ebuild
-1612241317 ./dev-util/oprofile/oprofile-1.1.0-r1.ebuild
+1612251322 ./dev-util/oprofile/oprofile-1.1.0-r1.ebuild
 1611222010 ./dev-util/oprofile/oprofile-1.2.0_pre20161027.ebuild
-1612241316 ./dev-util/oprofile/oprofile-0.9.9-r2.ebuild
+1612251320 ./dev-util/oprofile/oprofile-0.9.9-r2.ebuild
 1508090338 ./dev-util/splint/splint-3.1.2-r1.ebuild
 1509150846 ./dev-util/splint/splint-3.1.2-r2.ebuild
 1611082259 ./dev-util/buildbot/buildbot-0.9.1.ebuild
@@ -26561,7 +26561,7 @@
 1612140325 ./www-client/firefox/firefox-50.1.0.ebuild
 1612131439 ./www-client/firefox/firefox-45.5.1.ebuild
 1611060959 ./www-client/firefox/firefox-45.4.0.ebuild
-1612140325 ./www-client/firefox/firefox-45.6.0.ebuild
+1612251321 ./www-client/firefox/firefox-45.6.0.ebuild
 1611201921 ./www-client/firefox/firefox-45.5.0.ebuild
 1512241640 ./www-client/jd/jd-2.8.5_p120826.ebuild
 1610302304 ./www-client/uget/uget-1.10.3-r1.ebuild
@@ -27558,7 +27558,7 @@
 1604291932 ./sys-apps/install-xattr/install-xattr-9999.ebuild
 1510162126 ./sys-apps/install-xattr/install-xattr-0.5.ebuild
 1604291932 ./sys-apps/install-xattr/install-xattr-0.5-r1.ebuild
-1607100936 ./sys-apps/portage/portage-2.2.28.ebuild
+1612251314 ./sys-apps/portage/portage-2.2.28.ebuild
 1611120727 ./sys-apps/portage/portage-2.3.0.ebuild
 1610112338 ./sys-apps/portage/portage-2.2.26.ebuild
 1609191700 ./sys-apps/portage/portage-2.3.1.ebuild
@@ -27955,7 +27955,7 @@
 1508090338 ./sys-apps/restartd/restartd-0.2.2.ebuild
 1604070109 ./sys-apps/less/less-481.ebuild
 1604070109 ./sys-apps/less/less-483-r1.ebuild
-1612241324 ./sys-apps/less/less-487.ebuild
+1612251323 ./sys-apps/less/less-487.ebuild
 1508090338 ./sys-apps/man/man-1.6g-r1.ebuild
 1508090338 ./sys-apps/man/man-1.6g.ebuild
 1508241641 ./sys-apps/ed/ed-1.12.ebuild
@@ -28280,7 +28280,7 @@
 1508090338 ./net-proxy/dante/dante-1.4.0-r2.ebuild
 1610141338 ./net-proxy/squid/squid-3.5.22.ebuild
 1610141338 ./net-proxy/squid/squid-3.5.19.ebuild
-1612241323 ./net-proxy/squid/squid-3.5.23.ebuild
+1612251321 ./net-proxy/squid/squid-3.5.23.ebuild
 1610141338 ./net-proxy/squid/squid-3.5.20.ebuild
 1610141338 ./net-proxy/squid/squid-3.5.21.ebuild
 1603232121 ./net-proxy/3proxy/3proxy-0.7.1.4.ebuild
@@ -30316,8 +30316,8 @@
 1609240411 ./dev-lang/python/python-3.4.3-r1.ebuild
 1609240411 ./dev-lang/python/python-3.5.2.ebuild
 1609240411 ./dev-lang/python/python-2.7.10-r1.ebuild
-1612221234 ./dev-lang/python/python-2.7.12.ebuild
-1612221234 ./dev-lang/python/python-3.4.5.ebuild
+1612251314 ./dev-lang/python/python-2.7.12.ebuild
+1612251314 ./dev-lang/python/python-3.4.5.ebuild
 1604220942 ./dev-lang/idb/idb-13.0.5.192.ebuild
 1604220942 ./dev-lang/idb/idb-14.0.3.174.ebuild
 1508090338 ./dev-lang/opendylan/opendylan-2013.1-r1.ebuild
@@ -33238,6 +33238,7 @@
 1603282232 ./dev-ruby/amq-client/amq-client-1.0.4.ebuild
 1610021214 ./dev-ruby/rdoc/rdoc-4.2.0.ebuild
 1608051116 ./dev-ruby/rdoc/rdoc-4.2.2.ebuild
+1612251258 ./dev-ruby/rdoc/rdoc-5.0.0.ebuild
 1611060939 ./dev-ruby/rdoc/rdoc-4.3.0.ebuild
 1603080844 ./dev-ruby/activesupport/activesupport-4.2.6.ebuild
 1611031739 ./dev-ruby/activesupport/activesupport-5.0.0.1.ebuild
@@ -33465,6 +33466,7 @@
 1609012249 ./dev-ruby/will_paginate/will_paginate-3.1.0.ebuild
 1609012249 ./dev-ruby/will_paginate/will_paginate-3.1.0-r1.ebuild
 1610161753 ./dev-ruby/will_paginate/will_paginate-3.1.5.ebuild
+1612251257 ./dev-ruby/kpeg/kpeg-1.1.0.ebuild
 1611061733 ./dev-ruby/ruby-atk/ruby-atk-3.0.7.ebuild
 1606251220 ./dev-ruby/ruby-atk/ruby-atk-3.0.8.ebuild
 1610110814 ./dev-ruby/log4r/log4r-1.1.10-r2.ebuild
@@ -39185,7 +39187,7 @@
 1610221339 metadata/md5-cache/app-mobilephone/heimdall-1.4.1
 1611060208 metadata/md5-cache/app-mobilephone/ganyremote-6.3.3
 1610021609 metadata/md5-cache/app-mobilephone/anyremote-6.5
-1612241338 metadata/md5-cache/app-mobilephone/sobexsrv-1.0.1-r1
+1612251338 metadata/md5-cache/app-mobilephone/sobexsrv-1.0.1-r1
 1612181708 metadata/md5-cache/app-mobilephone/bitpim-1.0.6-r2
 1610221339 metadata/md5-cache/app-mobilephone/smsclient-2.0.9a-r1
 1610221339 metadata/md5-cache/app-mobilephone/smstools-3.1.15-r1
@@ -40227,7 +40229,7 @@
 1610301938 metadata/md5-cache/app-admin/systemrescuecd-x86-4.9.0
 1610221338 metadata/md5-cache/app-admin/logsurfer+-1.8-r2
 1612181708 metadata/md5-cache/app-admin/evtxtools-1.1.1-r1
-1612241338 metadata/md5-cache/app-admin/sudo-1.8.18_p1
+1612251338 metadata/md5-cache/app-admin/sudo-1.8.18_p1
 1611120138 metadata/md5-cache/app-admin/fsvs-1.2.5-r2
 1610221338 metadata/md5-cache/app-admin/puppet-agent-1.7.1
 1612181708 metadata/md5-cache/app-admin/supervisor-3.3.1-r1
@@ -40390,7 +40392,7 @@
 1610251939 metadata/md5-cache/app-admin/consul-0.7.0
 1604092236 metadata/md5-cache/app-admin/consul-replicate-0.2.0
 1611290239 metadata/md5-cache/app-admin/github-backup-utils-2.8.2
-1612241338 metadata/md5-cache/app-admin/apache-tools-2.4.25
+1612251338 metadata/md5-cache/app-admin/apache-tools-2.4.25
 1508100507 metadata/md5-cache/app-admin/aws-elb-tools-1.0.15.1
 1612231138 metadata/md5-cache/app-admin/logstash-bin-5.1.1
 1610221338 metadata/md5-cache/app-admin/drush-6.5.0
@@ -44983,6 +44985,7 @@
 1610221354 metadata/md5-cache/media-gfx/gnofract4d-3.13
 1509012308 metadata/md5-cache/media-gfx/raw-thumbnailer-0.2.1
 1611120143 metadata/md5-cache/media-gfx/freewrl-9999
+1612251309 metadata/md5-cache/media-gfx/darktable-2.2.0
 1612231342 metadata/md5-cache/media-gfx/photoqt-1.4.1
 1610221354 metadata/md5-cache/media-gfx/gif2apng-1.7
 1611051508 metadata/md5-cache/media-gfx/evoluspencil-2.0.5
@@ -45076,7 +45079,7 @@
 1612201908 metadata/md5-cache/media-gfx/mirage-0.9.5.2-r1
 1610221354 metadata/md5-cache/media-gfx/tachyon-0.99_beta6
 1610221354 metadata/md5-cache/media-gfx/brlcad-7.18.4
-1612231342 metadata/md5-cache/media-gfx/darktable-9999
+1612251309 metadata/md5-cache/media-gfx/darktable-9999
 1610221354 metadata/md5-cache/media-gfx/gthumb-3.4.3
 1611130308 metadata/md5-cache/media-gfx/gimp-2.8.16
 1612181713 metadata/md5-cache/media-gfx/xdot-0.6
@@ -45319,7 +45322,7 @@
 1610221354 metadata/md5-cache/media-gfx/mandelbulber-1.21.1
 1612181713 metadata/md5-cache/media-gfx/pycam-0.6_pre20130416-r1
 1612231342 metadata/md5-cache/media-gfx/darktable-1.6.9
-1612241338 metadata/md5-cache/media-gfx/qrencode-3.4.4-r1
+1612251339 metadata/md5-cache/media-gfx/qrencode-3.4.4-r1
 1610221354 metadata/md5-cache/media-gfx/aewan-1.0.01-r1
 1610221354 metadata/md5-cache/media-gfx/ristretto-0.8.1
 1611271439 metadata/md5-cache/media-gfx/pinta-9999
@@ -45374,7 +45377,6 @@
 1610221354 metadata/md5-cache/media-gfx/exact-image-0.8.1-r1
 1612231342 metadata/md5-cache/media-gfx/hugin-2016.2.0
 1610221354 metadata/md5-cache/media-gfx/fbida-2.12
-1612231342 metadata/md5-cache/media-gfx/darktable-2.2.0_rc3
 1511090807 metadata/md5-cache/media-gfx/splash-themes-livecd-2006.0
 1612231342 metadata/md5-cache/media-gfx/symboleditor-2.0.0
 1610280513 metadata/md5-cache/media-gfx/gnome-photos-3.22.1
@@ -46806,7 +46808,7 @@
 1612221909 metadata/md5-cache/net-p2p/deluge-1.3.9999
 1610221358 metadata/md5-cache/net-p2p/tribler-6.3.3-r1
 1612151208 metadata/md5-cache/net-p2p/retroshare-0.6.9999
-1612221309 metadata/md5-cache/net-p2p/transmission-2.92-r1
+1612251339 metadata/md5-cache/net-p2p/transmission-2.92-r1
 1611120144 metadata/md5-cache/net-p2p/ed2k_hash-0.4.0-r2
 1610221358 metadata/md5-cache/net-p2p/transmission-remote-gtk-1.1.1
 1610221358 metadata/md5-cache/net-p2p/datacoin-hp-9999
@@ -46953,7 +46955,7 @@
 1612231338 metadata/md5-cache/app-i18n/fcitx-sayura-9999
 1610221339 metadata/md5-cache/app-i18n/kcc-1.0
 1610221339 metadata/md5-cache/app-i18n/im-chooser-1.6.2
-1612201308 metadata/md5-cache/app-i18n/unicode-data-9.0.0
+1612251338 metadata/md5-cache/app-i18n/unicode-data-9.0.0
 1610221339 metadata/md5-cache/app-i18n/canfep-1.0
 1610221339 metadata/md5-cache/app-i18n/scim-wnn-1.0.0-r1
 1612181708 metadata/md5-cache/app-i18n/xsunpinyin-2.0.3-r3
@@ -47894,7 +47896,7 @@
 1612181709 metadata/md5-cache/dev-perl/File-MMagic-1.300.0-r1
 1612181710 metadata/md5-cache/dev-perl/Test-Perl-Critic-1.30.0
 1612181709 metadata/md5-cache/dev-perl/Data-Utilities-0.40.0-r1
-1612221308 metadata/md5-cache/dev-perl/LaTeX-Encode-0.91.6
+1612251339 metadata/md5-cache/dev-perl/LaTeX-Encode-0.91.6
 1612181709 metadata/md5-cache/dev-perl/CryptX-0.39.0
 1612181709 metadata/md5-cache/dev-perl/Math-Random-Secure-0.60.0-r1
 1612181709 metadata/md5-cache/dev-perl/Config-AutoConf-0.313.0
@@ -48386,7 +48388,7 @@
 1612181709 metadata/md5-cache/dev-perl/DBIx-Class-InflateColumn-IP-0.20.30
 1612181709 metadata/md5-cache/dev-perl/HTML-Tree-4.200.0-r1
 1612181709 metadata/md5-cache/dev-perl/Gtk2-AppIndicator-0.150.0
-1612221308 metadata/md5-cache/dev-perl/LaTeX-Driver-0.200.4
+1612251339 metadata/md5-cache/dev-perl/LaTeX-Driver-0.200.4
 1612181710 metadata/md5-cache/dev-perl/Test-Distribution-2.0.0-r1
 1612181710 metadata/md5-cache/dev-perl/Spreadsheet-ParseExcel-0.650.0
 1612181709 metadata/md5-cache/dev-perl/Net-DNS-1.40.0
@@ -48745,7 +48747,7 @@
 1612181709 metadata/md5-cache/dev-perl/Math-BigInt-GMP-1.380.0
 1612181710 metadata/md5-cache/dev-perl/String-Escape-2010.002
 1612181709 metadata/md5-cache/dev-perl/JavaScript-Minifier-1.140.0
-1612221308 metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0
+1612251338 metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0
 1612181709 metadata/md5-cache/dev-perl/Convert-TNEF-0.180.0-r1
 1612181709 metadata/md5-cache/dev-perl/Jcode-2.70.0-r1
 1612181710 metadata/md5-cache/dev-perl/Perlbal-XS-HTTPHeaders-0.200.0-r1
@@ -48831,7 +48833,7 @@
 1612181709 metadata/md5-cache/dev-perl/Devel-GlobalDestruction-0.140.0
 1612181709 metadata/md5-cache/dev-perl/Audio-WMA-1.300.0
 1612181709 metadata/md5-cache/dev-perl/Exception-Class-1.410.0
-1612221308 metadata/md5-cache/dev-perl/LaTeX-Table-1.0.6
+1612251338 metadata/md5-cache/dev-perl/LaTeX-Table-1.0.6
 1612181709 metadata/md5-cache/dev-perl/Email-Address-1.908.0
 1612181710 metadata/md5-cache/dev-perl/PerlIO-gzip-0.180.0-r1
 1612181709 metadata/md5-cache/dev-perl/Gtk2-Ex-PodViewer-0.180.0-r1
@@ -49000,7 +49002,7 @@
 1612181709 metadata/md5-cache/dev-perl/Compress-Bzip2-2.240.0
 1612181709 metadata/md5-cache/dev-perl/App-cpanminus-1.703.900
 1612181710 metadata/md5-cache/dev-perl/XML-XPath-1.370.0
-1612221308 metadata/md5-cache/dev-perl/MooseX-FollowPBP-0.50.0
+1612251338 metadata/md5-cache/dev-perl/MooseX-FollowPBP-0.50.0
 1612181710 metadata/md5-cache/dev-perl/Text-Aligner-0.130.0
 1612181709 metadata/md5-cache/dev-perl/Log-Dispatch-Array-1.3.0
 1612181709 metadata/md5-cache/dev-perl/Lingua-EN-NameParse-1.330.0
@@ -49421,7 +49423,7 @@
 1612181710 metadata/md5-cache/dev-perl/Wx-0.992.700-r1
 1612181709 metadata/md5-cache/dev-perl/Crypt-Primes-0.500.0-r1
 1612181709 metadata/md5-cache/dev-perl/Data-FormValidator-4.810.0-r1
-1612221308 metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.60.0
+1612251338 metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.60.0
 1612181710 metadata/md5-cache/dev-perl/XML-Parser-Lite-0.721.0
 1612181709 metadata/md5-cache/dev-perl/Glib-Object-Introspection-0.40.0
 1612181709 metadata/md5-cache/dev-perl/File-Slurp-Unicode-0.7.1-r1
@@ -49831,7 +49833,7 @@
 1612231739 metadata/md5-cache/www-servers/hiawatha-9.15
 1610221402 metadata/md5-cache/www-servers/pound-2.7d
 1610221402 metadata/md5-cache/www-servers/pound-2.7f-r1
-1612241338 metadata/md5-cache/www-servers/apache-2.4.25
+1612251339 metadata/md5-cache/www-servers/apache-2.4.25
 1612181714 metadata/md5-cache/www-servers/servefile-0.4.4
 1612181714 metadata/md5-cache/www-servers/gunicorn-19.6.0
 1611060214 metadata/md5-cache/www-servers/varnish-4.1.3
@@ -50757,14 +50759,14 @@
 1612232039 metadata/md5-cache/net-fs/smbnetfs-0.6.0-r1
 1612151939 metadata/md5-cache/net-fs/cifs-utils-6.6
 1611082139 metadata/md5-cache/net-fs/torus-0.1.2
-1612241338 metadata/md5-cache/net-fs/openafs-1.6.18.3
+1612251339 metadata/md5-cache/net-fs/openafs-1.6.18.3
 1612181713 metadata/md5-cache/net-fs/s3ql-2.20
 1612181713 metadata/md5-cache/net-fs/s3ql-2.21
 1611120144 metadata/md5-cache/net-fs/openafs-1.6.18.2
 1612151939 metadata/md5-cache/net-fs/cifs-utils-6.6-r2
 1612221138 metadata/md5-cache/net-fs/openafs-kernel-1.6.18.2
 1611120144 metadata/md5-cache/net-fs/ncpfs-2.2.6-r3
-1612241338 metadata/md5-cache/net-fs/openafs-kernel-1.6.18.3
+1612251339 metadata/md5-cache/net-fs/openafs-kernel-1.6.18.3
 1612151939 metadata/md5-cache/net-fs/autofs-5.0.7-r4
 1611060213 metadata/md5-cache/net-fs/btfs-2.12
 1612181713 metadata/md5-cache/net-fs/s3ql-2.14
@@ -51446,7 +51448,6 @@
 1610221338 metadata/md5-cache/app-arch/par2cmdline-0.6.12
 1610221338 metadata/md5-cache/app-arch/pdv-1.5.1-r2
 1611120138 metadata/md5-cache/app-arch/mscompress-0.3-r1
-1611111339 metadata/md5-cache/app-arch/dpkg-1.18.14
 1610221338 metadata/md5-cache/app-arch/gtk-splitter-2.2.1-r1
 1612231338 metadata/md5-cache/app-arch/innoextract-1.4
 1610221338 metadata/md5-cache/app-arch/tapeutils-0.4
@@ -51465,6 +51466,7 @@
 1612181708 metadata/md5-cache/app-arch/ipkg-utils-1.7.050831-r2
 1610221338 metadata/md5-cache/app-arch/lzlib-1.8
 1611120138 metadata/md5-cache/app-arch/unzip-6.0_p20
+1612251309 metadata/md5-cache/app-arch/dpkg-1.18.18
 1610221338 metadata/md5-cache/app-arch/pdlzip-1.6
 1611120138 metadata/md5-cache/app-arch/zip-3.0-r3
 1611120138 metadata/md5-cache/app-arch/lha-114i-r7
@@ -52574,7 +52576,7 @@
 1610221358 metadata/md5-cache/sci-calculators/tilp2-1.17-r1
 1610221358 metadata/md5-cache/sci-calculators/qalculate-gtk-0.9.7
 1610221358 metadata/md5-cache/sci-calculators/galculator-2.1.3
-1612221209 metadata/md5-cache/sci-calculators/calculator-1.7.54
+1612251339 metadata/md5-cache/sci-calculators/calculator-1.7.54
 1610212209 metadata/md5-cache/sci-calculators/transcalc-0.14-r2
 1612060209 metadata/md5-cache/sci-calculators/qalculate-gtk-0.9.9
 1610221358 metadata/md5-cache/sci-calculators/qalculator-0.4b-r1
@@ -55183,7 +55185,7 @@
 1611120145 metadata/md5-cache/sys-devel/byfl-9999
 1611120145 metadata/md5-cache/sys-devel/binutils-apple-6.3-r1
 1610221401 metadata/md5-cache/sys-devel/automake-1.11.6-r2
-1612221209 metadata/md5-cache/sys-devel/qconf-2.0
+1612251339 metadata/md5-cache/sys-devel/qconf-2.0
 1611120145 metadata/md5-cache/sys-devel/gdb-apple-768-r1
 1610302338 metadata/md5-cache/sys-devel/parity-1.2.4
 1610221401 metadata/md5-cache/sys-devel/automake-1.15-r2
@@ -57584,7 +57586,7 @@
 1610221338 metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r6
 1610221338 metadata/md5-cache/app-benchmarks/os-autoinst-9999
 1511090807 metadata/md5-cache/app-benchmarks/forkbomb-1.4
-1610060909 metadata/md5-cache/app-benchmarks/bonnie++-1.97-r1
+1612251338 metadata/md5-cache/app-benchmarks/bonnie++-1.97-r1
 1611120138 metadata/md5-cache/app-benchmarks/i7z-93_p20131012
 1610181939 metadata/md5-cache/app-benchmarks/bonnie++-1.97.2
 1610311939 metadata/md5-cache/app-benchmarks/sysbench-9999
@@ -58394,7 +58396,7 @@
 1508100508 metadata/md5-cache/app-editors/vile-9.8n
 1610221339 metadata/md5-cache/app-editors/shed-1.15
 1611120138 metadata/md5-cache/app-editors/kakoune-0_pre20160620
-1612221208 metadata/md5-cache/app-editors/adie-1.7.54
+1612251338 metadata/md5-cache/app-editors/adie-1.7.54
 1610221339 metadata/md5-cache/app-editors/joe-4.3-r1
 1612231338 metadata/md5-cache/app-editors/efte-1.1-r1
 1610221339 metadata/md5-cache/app-editors/xvile-9.8k
@@ -58562,7 +58564,7 @@
 1508100508 metadata/md5-cache/app-editors/emact-2.56.0
 1610221339 metadata/md5-cache/app-editors/scite-3.6.4-r1
 1610221339 metadata/md5-cache/app-editors/ee-1.5.2
-1612222209 metadata/md5-cache/app-editors/emacs-24.5-r3
+1612251338 metadata/md5-cache/app-editors/emacs-24.5-r3
 1611120138 metadata/md5-cache/app-editors/xmlcopyeditor-1.2.1.3
 1612041109 metadata/md5-cache/app-editors/vim-qt-20150102-r1
 1508100508 metadata/md5-cache/app-editors/yudit-2.9.2
@@ -62082,7 +62084,7 @@
 1612190238 metadata/md5-cache/dev-php/cli-prompt-1.0.0
 1611120139 metadata/md5-cache/dev-php/pecl-redis-2.2.7-r1
 1612190238 metadata/md5-cache/dev-php/fedora-autoloader-0.2.1
-1612221308 metadata/md5-cache/dev-php/xdebug-client-2.4.1
+1612251338 metadata/md5-cache/dev-php/xdebug-client-2.4.1
 1610221344 metadata/md5-cache/dev-php/PEAR-XML_Beautifier-1.2.2-r1
 1610221344 metadata/md5-cache/dev-php/Savant3-Plugin-Form-0.2.1
 1610221344 metadata/md5-cache/dev-php/PEAR-MDB2_Driver_mssql-1.5.0_beta4
@@ -62293,7 +62295,7 @@
 1611282309 metadata/md5-cache/dev-php/magickwand-1.0.9-r2
 1610221344 metadata/md5-cache/dev-php/PEAR-Net_IPv6-1.2.1-r1
 1611290009 metadata/md5-cache/dev-php/pecl-eio-2.0.1
-1612221308 metadata/md5-cache/dev-php/xdebug-2.4.1
+1612251338 metadata/md5-cache/dev-php/xdebug-2.4.1
 1610221344 metadata/md5-cache/dev-php/PEAR-Text_CAPTCHA-0.5.0
 1610221344 metadata/md5-cache/dev-php/PEAR-Net_Socket-1.0.14
 1610221344 metadata/md5-cache/dev-php/twig-1.20.0
@@ -63648,7 +63650,7 @@
 1610221403 metadata/md5-cache/x11-libs/compizconfig-backend-gconf-0.8.8
 1610221403 metadata/md5-cache/x11-libs/gnome-pty-helper-0.36.3
 1612150308 metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.1
-1612221209 metadata/md5-cache/x11-libs/fox-1.7.54
+1612251339 metadata/md5-cache/x11-libs/fox-1.7.54
 1612222139 metadata/md5-cache/x11-libs/qscintilla-2.9.2-r1
 1611232009 metadata/md5-cache/x11-libs/libpciaccess-0.13.4
 1611232009 metadata/md5-cache/x11-libs/xcb-util-0.4.0
@@ -64028,7 +64030,7 @@
 1610221351 metadata/md5-cache/dev-util/yacc-1.9.1-r6
 1610221350 metadata/md5-cache/dev-util/monodevelop-database-3.0.2
 1611120141 metadata/md5-cache/dev-util/cunit-2.1_p3
-1612241338 metadata/md5-cache/dev-util/oprofile-1.1.0-r1
+1612251339 metadata/md5-cache/dev-util/oprofile-1.1.0-r1
 1611120141 metadata/md5-cache/dev-util/valgrind-3.12.0
 1602250107 metadata/md5-cache/dev-util/shards-0.6.1
 1610221351 metadata/md5-cache/dev-util/suse-build-2014.09.18
@@ -64599,7 +64601,7 @@
 1611060212 metadata/md5-cache/dev-util/d-feet-0.3.11
 1611120408 metadata/md5-cache/dev-util/geany-plugins-1.28
 1610221350 metadata/md5-cache/dev-util/amtterm-1.3-r1
-1612241338 metadata/md5-cache/dev-util/oprofile-0.9.9-r2
+1612251339 metadata/md5-cache/dev-util/oprofile-0.9.9-r2
 1603210207 metadata/md5-cache/dev-util/shards-0.6.2
 1612231340 metadata/md5-cache/dev-util/cmake-3.5.2-r1
 1610221351 metadata/md5-cache/dev-util/qbs-1.5.2
@@ -65711,7 +65713,7 @@
 1612231739 metadata/md5-cache/www-client/otter-9999
 1607271009 metadata/md5-cache/www-client/fetch-1.0-r2
 1612231739 metadata/md5-cache/www-client/otter-0.9.11
-1612140339 metadata/md5-cache/www-client/firefox-45.6.0
+1612251339 metadata/md5-cache/www-client/firefox-45.6.0
 1612181714 metadata/md5-cache/www-client/qutebrowser-0.8.4
 1612011939 metadata/md5-cache/www-client/firefox-bin-45.5.1
 1612181714 metadata/md5-cache/www-client/chromium-55.0.2883.75
@@ -66493,7 +66495,7 @@
 1610221401 metadata/md5-cache/sys-apps/moreutils-0.52
 1612151939 metadata/md5-cache/sys-apps/lm_sensors-3.3.4-r1
 1610221401 metadata/md5-cache/sys-apps/s6-linux-utils-2.0.2.3
-1612241338 metadata/md5-cache/sys-apps/less-487
+1612251339 metadata/md5-cache/sys-apps/less-487
 1612181714 metadata/md5-cache/sys-apps/pkgcore-0.9.1
 1612202109 metadata/md5-cache/sys-apps/hwloc-1.11.2
 1610230139 metadata/md5-cache/sys-apps/gentoo-systemd-integration-9999
@@ -67039,7 +67041,7 @@
 1610221400 metadata/md5-cache/sys-apps/baselayout-2.2-r1
 1610221401 metadata/md5-cache/sys-apps/lnxhc-1.2-r1
 1612221109 metadata/md5-cache/sys-apps/shadow-4.1.5.1-r1
-1612181714 metadata/md5-cache/sys-apps/portage-2.2.28
+1612251339 metadata/md5-cache/sys-apps/portage-2.2.28
 1610221401 metadata/md5-cache/sys-apps/progress-0.13
 1611120145 metadata/md5-cache/sys-apps/gsmartcontrol-0.8.7
 1611120145 metadata/md5-cache/sys-apps/hwsetup-1.2-r3
@@ -67472,7 +67474,7 @@
 1611281939 metadata/md5-cache/net-proxy/obfs4proxy-0.0.7
 1611130309 metadata/md5-cache/net-proxy/ziproxy-3.3.1-r1
 1610221358 metadata/md5-cache/net-proxy/cntlm-0.93_beta5-r2
-1612241338 metadata/md5-cache/net-proxy/squid-3.5.23
+1612251339 metadata/md5-cache/net-proxy/squid-3.5.23
 1611060213 metadata/md5-cache/net-proxy/http-replicator-3.0-r6
 1610221358 metadata/md5-cache/net-proxy/shadowsocks-libev-2.5.4
 1610221358 metadata/md5-cache/net-proxy/squidclamav-6.10
@@ -69391,7 +69393,7 @@
 1610221342 metadata/md5-cache/dev-lang/icc-15.0.6.233
 1610221342 metadata/md5-cache/dev-lang/mozart-1.4.0-r3
 1610221342 metadata/md5-cache/dev-lang/teyjus-2.0.2
-1612221308 metadata/md5-cache/dev-lang/python-3.4.5
+1612251338 metadata/md5-cache/dev-lang/python-3.4.5
 1610221342 metadata/md5-cache/dev-lang/blassic-0.10.2
 1611120139 metadata/md5-cache/dev-lang/tk-8.5.17-r100
 1612181709 metadata/md5-cache/dev-lang/jimtcl-0.75-r1
@@ -69478,7 +69480,7 @@
 1610221342 metadata/md5-cache/dev-lang/closure-compiler-bin-20150126
 1611120139 metadata/md5-cache/dev-lang/ocaml-3.12.1
 1610221342 metadata/md5-cache/dev-lang/scala-2.11.6-r1
-1612221308 metadata/md5-cache/dev-lang/python-2.7.12
+1612251338 metadata/md5-cache/dev-lang/python-2.7.12
 1508100513 metadata/md5-cache/dev-lang/snobol-1.1
 1610221342 metadata/md5-cache/dev-lang/ekopath-6.0.619_p20151213-r1
 1610221342 metadata/md5-cache/dev-lang/rakudo-2016.08.1
@@ -72394,6 +72396,7 @@
 1612081009 metadata/md5-cache/dev-ruby/ragol-1.0.1-r2
 1611131808 metadata/md5-cache/dev-ruby/listen-3.0.8
 1612212209 metadata/md5-cache/dev-ruby/rrdtool-bindings-1.6.0
+1612251309 metadata/md5-cache/dev-ruby/rdoc-5.0.0
 1611131809 metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.9
 1611131809 metadata/md5-cache/dev-ruby/rspec-support-3.4.0
 1611131809 metadata/md5-cache/dev-ruby/roadie-3.2.0
@@ -73050,6 +73053,7 @@
 1611131809 metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.0.8
 1611131808 metadata/md5-cache/dev-ruby/i18n-0.7.0
 1611131809 metadata/md5-cache/dev-ruby/rake-11.2.2-r1
+1612251309 metadata/md5-cache/dev-ruby/kpeg-1.1.0
 1611251809 metadata/md5-cache/dev-ruby/webrobots-0.1.1-r2
 1611291108 metadata/md5-cache/dev-ruby/qed-2.9.2
 1611131809 metadata/md5-cache/dev-ruby/mustache-1.0.3
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index ce7fd78563ab..39ee7dffc8dc 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 25 Dec 2016 10:00:01 +0000
+Sun, 25 Dec 2016 11:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 377dfff42da2..1bbd1c2e315b 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1482658801 Sun 25 Dec 2016 09:40:01 AM UTC
+1482662401 Sun 25 Dec 2016 10:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index a5c6231b30b1..c591ec2ae38c 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 25 Dec 2016 09:43:23 +0000
+Sun, 25 Dec 2016 10:43:21 +0000
diff --git a/net-fs/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest
index d1c1699f9326..17cd4d6dcf33 100644
--- a/net-fs/openafs-kernel/Manifest
+++ b/net-fs/openafs-kernel/Manifest
@@ -5,7 +5,7 @@ DIST openafs-patches-20160801-1.tar.xz 10908 SHA256 d81c46d12e49fc917dc5171ddabd
 DIST openafs-patches-20160801-2.tar.xz 11004 SHA256 7037d9657bd3c90725fd8b2b063bef80cedcc9fbf0605c7a3bf3543b64eecb58 SHA512 42768bc54cbeafea2c8042b84368d9fcfc4e54681d1077eb1fd6a3d1633aa1a0ba2f6fd291a182a9f2f930f111d2ff587be9fe8a8b941b1e9535136ee344633b WHIRLPOOL 786c2155142916594f178cdc66631da5514f60ee0155e4420d702b4a934968e99ebb5d2de03beb8e22f00742972aeb3d9fb84d9051d9d67091264781deaa2108
 EBUILD openafs-kernel-1.6.17.ebuild 3457 SHA256 53dd5893bf7a24117cea0e7db83a7c9e7096cd5cacca925566c593ae100b9f05 SHA512 d965de8ef24ed95e67c54f03ccdbae11821865eb1fca8988e953365698c7ccb254b9d7609d1b32c045e9c646ce5f33d6f7aab59f56ad939e4ce466e4ad50ee74 WHIRLPOOL c88a3183cbe061b1ffb1431cc3d7d44c5f6ea02a60dba4074a0d25c4d9e2565bc1cb6a0def8325d3e7b56dfcae9dfa5c6c8bc859a0f3f77017ed5455e400593b
 EBUILD openafs-kernel-1.6.18.2.ebuild 3845 SHA256 3da05673426f765589675e3914280576a7720db879edf9bcf24486456fae1483 SHA512 d12a9c5fde9807bb7bde53891bd6f35416ba512b98c064f6b40a4f43f5453d46492d9a0867f322aa54130984261c59de976c6e555aa96c53dacf516bca6447d6 WHIRLPOOL 66ec7d90b0fb77911f07671f5654ec89dc60cafa2727e11c47fccff34a32dacc89e5b408b18c1045fee82982217e787c7c202c7e62c6c51a6fb0b7e23d72326b
-EBUILD openafs-kernel-1.6.18.3.ebuild 3843 SHA256 a4d821d8aea553f9a47f7d41a9b73b5bb2eb2030e388ffb913a1fa95b56b2e93 SHA512 8d6fb5538a14f52b75f246c9b841ffb01e642e0e35f3bd340531d5740ad5f7b6b9b4898f2b1c8178909d20ce57dfc4d7948c091d6eca610cd0e117aa23772da9 WHIRLPOOL f4069f376ed686346ecdf21319e95372e7ba0dd4046cea3689196889a6f104179233b84db41958483836976a8f718dac7a1a662c53f82c50f15d8bdc77c3fe8e
+EBUILD openafs-kernel-1.6.18.3.ebuild 3842 SHA256 4565f2b4eeffc5acfece183f3da1ab9a2e08311a18614d195890956d6ea5d2a4 SHA512 f0a37d01af4375df63498de395f29745748ea34d0cf192f83847999ca7dbed7976163d38a4508f9f7204f9c89d28e063610b366485404bdf2ca1dbc3860a48fc WHIRLPOOL c8d15c20c0767d4cfba06aececc8d873e959ae6c7633ab83be3ade225f42aad32c942df90ae4350b494f458a696921b18e43edd0432348da04f610831916bfbb
 MISC ChangeLog 9463 SHA256 a36d3ae0e209ccf27249c656adfe28b486076491688e928c12c53f308dbc1437 SHA512 fefd6b64fca313b9cc0f8ed9890d6c0e49a9777c05541213a470c692593be0e135675345c78e0a1295305d54b72a68e4a0369e7d9bbc7a6c873092feccfc21c9 WHIRLPOOL 5857ff37713a457fb377435e7d6478072230fe535f99326159de5ebcc95f17ab9e4d97f821c3d5a0f80e36c107c8fc84ab723f62209f4392a4b2058bd552cd2a
 MISC ChangeLog-2015 29123 SHA256 4c95ef686475550fea49c59d4152cb2ba69cae32e2a673ff1fdc8c7097d54552 SHA512 0607f7e09958af3974b853cbd7c5fd970d5a3907d94748842cd1c9489bfcc63f51c834756c46c276d7cb1dc2dccfb36fac7ddde8ae7f974b8132b8e897d22b24 WHIRLPOOL 66b7476c37147f79d75eff1f4737dc9c254bf97d25cb97fc54b6ce5a2d2ff24b601a43528c09dce51d85fe0a89509f19065efc176b78dfdfcf2bc820447974bc
 MISC metadata.xml 421 SHA256 90586e9016d105142026e51835747c1c69ecde000f17af953fd8671eab8c39bb SHA512 66972c2fff54dc80eae78500b81957e2a2ca1516feb747172055cc44c288e6d0ecd25a3b0a9b179e84c4da68f857094d4936b0a9b836b5b9fafdca5489edb864 WHIRLPOOL 8d654a6ffbc4fb7bd73b0d3d7e81fe66c6813401a26686cbe356f178d9b5e06968da9ba7973780d71bf0388a9cdc651deeec9a8b9554a3b770bd0dea356f2694
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.18.3.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.18.3.ebuild
index 07cf98599fe4..7c98b4d38ae1 100644
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.18.3.ebuild
+++ b/net-fs/openafs-kernel/openafs-kernel-1.6.18.3.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="IBM BSD openafs-krb5-a APSL-2"
 SLOT="0"
-KEYWORDS="amd64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 S=${WORKDIR}/${MY_P}
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index 7d10d148c33f..eadf506b0f9c 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -8,7 +8,7 @@ DIST openafs-patches-20160801-1.tar.xz 10908 SHA256 d81c46d12e49fc917dc5171ddabd
 DIST openafs-patches-20160801-2.tar.xz 11004 SHA256 7037d9657bd3c90725fd8b2b063bef80cedcc9fbf0605c7a3bf3543b64eecb58 SHA512 42768bc54cbeafea2c8042b84368d9fcfc4e54681d1077eb1fd6a3d1633aa1a0ba2f6fd291a182a9f2f930f111d2ff587be9fe8a8b941b1e9535136ee344633b WHIRLPOOL 786c2155142916594f178cdc66631da5514f60ee0155e4420d702b4a934968e99ebb5d2de03beb8e22f00742972aeb3d9fb84d9051d9d67091264781deaa2108
 EBUILD openafs-1.6.17.ebuild 6630 SHA256 c5157e996e22c430ea7e157756b4f457b719c09664acba38ef4139eb8de5d641 SHA512 17a81592b5c750e1489e3dac1e613cbe36228d32c9f8b5da8ce4202f03408422f39955c4a55047bca322141e80c8fb35ca91b96d74f1299e518cdfdfaa5d4962 WHIRLPOOL d532f0b6db935b464946658122f1501ef6df7892c7f560c10472e919282d4411328fa47b9aa5518b00019630f6819de7d007c3bb9004bbea4053bab417b371e6
 EBUILD openafs-1.6.18.2.ebuild 7036 SHA256 816effac61dff982dd91087122a6423e28ceda750f7a3a87335b53c52dedcfba SHA512 ac8e53bed7f4df7a18eab823fde896bb8f9acbd1bb226993740d31ff5c73c24fcdbf53c28f718141318f97afe9e28f2edb41f9048648a83086169d3cda9e4f5b WHIRLPOOL c49e801a650b03c70d0db4e86b332ebbc62e3a77ac6f795290864fa782598fb168d04d3a7e1b271642ff5d725c2e708ed53706196f76afa90cec3ccf3ddf0613
-EBUILD openafs-1.6.18.3.ebuild 7034 SHA256 ae76b3e29e0c6c8182536f6f292faf152f1bb625882166deae4c2928f9a33f72 SHA512 46409886f9023ebbbed345f9367f8dbf7788c271c54bb026869035916c9822ad2d3b06ba602bcc26bb14460f7beee65be882600706e0b7138c876ae03d090b14 WHIRLPOOL 71c52f8e33ce488fc1a941f54afeef6e3090c3d2110b02ed74c855f473e8ffb40fe60b8a15143a1d73b718fcfec1d172d23cc03dc15873989ed272fd53565e53
+EBUILD openafs-1.6.18.3.ebuild 7033 SHA256 4ea66b59f8d2262554504f2d8bd3c91924e5173035412d7ef056b7fbfe7c59f5 SHA512 34f4dc805fd61ef8b2f7863c8479fa2360420ae60f8c7829762b5e3981ef699c5606b19b69c40319ecc030f9e6fcb77d078821c6583c0d556ca35cd1a64970bc WHIRLPOOL f45c0439e00a54cb6638474c3454ac086aee5f1002a22be42e4463cc30587acba1f7e8e013b2644c79186cbe2aea855c562d053f8318223b495791e8e9f871a7
 MISC ChangeLog 9965 SHA256 33525babae1c3e7bce50868fc94442bb1d58d2e3032a8824626bca8645010e2a SHA512 a67aef521490207fad6daec3d80082108198757fc2602c73451a66dd7429bf253cbe9060b1a67ea50a6a12697a42cc369ab05f87b6586c069c02f320f2c121fc WHIRLPOOL dc0dd5452e5bf6ddff75c954d67720f1c881ef4f81f844b607924971a427f415d6eb3cab72a0d5755b219ed110b4b88a076e64f79d226983b4cb442324e20668
 MISC ChangeLog-2015 33669 SHA256 3539de64902e3aac237f7fe68420761eaf5d75c6461ed517e8c00542f2b0ec5c SHA512 17a9562f2503cc0aded229cd52fd5d398516fd42e25c891c350356211862fa2bf05f8650617d46688578b6ba9f468b76a7e30e54565c6f804586404703aa7d7a WHIRLPOOL 32eebb47cbfa97526c3a1b2197c492476d83e1f366b8ff799460a865eddbe180cf69d896cfd5cbef567c2e8e8520a8e5491a73ec713ba4b2daa901e6f7fe4890
 MISC metadata.xml 895 SHA256 d28acb20b11582bf152c2abe2464fa8e2defca8b7dd5ce433c7fcb6660685fea SHA512 5117449a47343db76f8d88a91beb18a2aade828fcbef6133f2307225b8160418fa407faaa550728d8916a5ff06e610198ccdb6fec1f975e7cc892a38fc590534 WHIRLPOOL cc9459daf0be99c19abac29d369974ab891437f4992d5e6212102d3bbae1870090cd71a141ace06e65e657e3cbc0c7397079063670bbc0142670e39f5d460941
diff --git a/net-fs/openafs/openafs-1.6.18.3.ebuild b/net-fs/openafs/openafs-1.6.18.3.ebuild
index 3dafbcf0910d..a36ee080094a 100644
--- a/net-fs/openafs/openafs-1.6.18.3.ebuild
+++ b/net-fs/openafs/openafs-1.6.18.3.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="IBM BSD openafs-krb5-a APSL-2"
 SLOT="0"
-KEYWORDS="amd64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 IUSE="bitmap-later debug doc fuse kerberos +modules ncurses pam pthreaded-ubik +supergroups"
 
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index e6d114930d43..308845e6049c 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -13,7 +13,7 @@ DIST libutp-7c4f19abdf.tar.gz 71062 SHA256 3a85f50ad9f5be75375c96cbf9124ada1c626
 DIST transmission-2.84.tar.xz 3077836 SHA256 a9fc1936b4ee414acc732ada04e84339d6755cd0d097bcbd11ba2cfc540db9eb SHA512 d6c2b17e7f8180a41ac70f5b503dfdb0353c6419db25df1b393b18c987c56fda9e2fd4c3f4cda7f08c301877bd0b4711842c28121ceaaaae87f5792cc6c29a3d WHIRLPOOL 375f9c981d9d2ac308896e8b7d66d3643796c8e97d64a1e0d6fd2bffaafa55988b90ddb4eb98330edf062e835c0c5ce76749e7e66bf6806333673beb7569f342
 DIST transmission-2.92.tar.xz 3378116 SHA256 3a8d045c306ad9acb7bf81126939b9594553a388482efa0ec1bfb67b22acd35f SHA512 4d99476bee88cedcc4238a0eee64a4089016933cbfc1cfb1cca023ad4ebcfe46375c9e7651a17af4aeaaf1feb19cbd8166aa56ef7992d9e745a7bbcbe8efca11 WHIRLPOOL a2eab113fd895001cf72cd79c4ac9a4767eb9fb756a3fb9b1d0db6aa283d19a6aec739b8681a3a5a26ef630cec68f004e14f8654221f0528e30927f37339887f
 EBUILD transmission-2.84-r4.ebuild 4563 SHA256 7d61a262dabe7e3c1bf1318b1361b3efb120f709fdc8555dcf8b2788f47c78d0 SHA512 b4c3194a8a9f1e0db9f3f8b7338a6d781f02004d387b61f6603fd4b9b77889495582749c075d3e9d2fc7f56d5c2b896bc806622acb07fbf5d8025c3f7cfa1cf3 WHIRLPOOL c0438060a796462ccfafbbed18c663abdda2028a631d51c1de8226fc1423a56468f40e9dbf39643cd142ccf823d4301e3fcd4b88f73e22133e20562e45441552
-EBUILD transmission-2.92-r1.ebuild 4319 SHA256 4ecb5f149e403b7b498b7be839bf15ddaedb724ce517df4d0e210091dda96a6f SHA512 93c5b304455b7a123dc0fea87f11276d89bea923fab6655fd9a07626284d85fa8b0054fcbfcff33f32aa354962a135eaf1e79566390c6f2c46b4773f750e0277 WHIRLPOOL e8b737c0eae54365308f304fd46f6d2398a6df0b917c591f84c83ce92dd0ef1a563130b31aa1d142eef2ec9c52466489b3dcd6c9b6af1d5de16ec6a14bc26752
+EBUILD transmission-2.92-r1.ebuild 4318 SHA256 9b0b98e56ddf23be90b9843f3192bb9c90c30eca1fd04a3f9fbce2b0482d2587 SHA512 1c29dc745ee4610b871dda21004faacbbedab8cb43757f28ac28a23d7f1f506afeecaff96a946ccfb0d3cc717a7ff169a1784ae6b321520974a9a794cff34086 WHIRLPOOL eaf0e8a756eb51038dfe59af267a2c6b8fc6b1205271c296e11696ff934a8e6f8f515c6e5719f7348fcc803dc4c77958932530095109b3964d3d467899441e5c
 EBUILD transmission-2.92.ebuild 4631 SHA256 f26a991ad2f09fcf2fbd233cb9df1edbb060b11c1a1dddf69498c4ad4cd5b4e0 SHA512 3249d52bf50388b2d3ec5325b249ec4d24c191abed6eda5fd054279f16e81c8ec6ac214ecaee6b3ccae60bb710cb50c86a510195f2e025dd19effc286916e3c7 WHIRLPOOL 6c9019fcace31d1ba196f1a0db8f7c1bd1f65a14ef25090c062ee6e5ebf8b2238f3a4bc10d4de30c1390892404b8df0156c1452f6df2b43810bb2ea38183f839
 EBUILD transmission-9999.ebuild 4386 SHA256 756b5e561ced2b4bf37b523b0392d0dab839c0c0a15a40edbfce4c78f981982d SHA512 853bc10e105df47ae9d4177a537d24c7c0605cedb94275e8dd93800e53a94774cfb4dbdeb3331e37c159bf48f126c9490f26e422f10d5b037fee533b613ba658 WHIRLPOOL be4c68a83d2f86bf9df2531697b9796cbbd0ee3c09d7c8262ac4345fdc8fcc24915071524be89e374217066ca26bfb704549f11649794ddd94160038c11e5369
 MISC ChangeLog 9562 SHA256 3575a0a2436aa49457b377f1d66626137db3c6c303ab9c9045013a8b11f5481a SHA512 baaed0881db9085b81c8bee5318715b06bc041f4d320487f4c490208cce9e46aaf5056e6361f46c7b6be059b967875131056cf69155ce0a1864c7eec6037c0ee WHIRLPOOL 24083aadbe5a5ba6b9331a43f88825b98a187f810339caa9b4eb842101fd7cd4e66f319b6ee683025ce69f5352681e597b64a5c42aa7b94e41d9e257af5e7e20
diff --git a/net-p2p/transmission/transmission-2.92-r1.ebuild b/net-p2p/transmission/transmission-2.92-r1.ebuild
index 2aaf5301335a..92210158e30a 100644
--- a/net-p2p/transmission/transmission-2.92-r1.ebuild
+++ b/net-p2p/transmission/transmission-2.92-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.xz"
 LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
 SLOT=0
 IUSE="ayatana gtk libressl lightweight systemd qt5 xfs"
-KEYWORDS="amd64 ~arm ~mips ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux"
+KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86 ~x86-fbsd ~amd64-linux"
 
 RDEPEND=">=dev-libs/libevent-2.0.10:=
 	!libressl? ( dev-libs/openssl:0= )
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 55732d6b4657..022fba72bc2f 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -13,7 +13,7 @@ EBUILD squid-3.5.19.ebuild 7249 SHA256 ba323342e1f476897936d36c751b6537d6f32aaa3
 EBUILD squid-3.5.20.ebuild 7258 SHA256 f1679015dae6fb119f442284034ae366f9074c0f72c37317bd189fd200911a7d SHA512 1facfc8386f36c001db88b5aef8cd7c6ea8f4f3069104cdb2170b2af301bf1f7068ec90886c1a07d266683df3168294ec82648f631ad1365f030efab516ca836 WHIRLPOOL 82f79b936a7354961f58b51407d545c3ceed5c504a99837740b93199c405bbc7c4be628a7429cae026c8905a78af540f71e8cf63502c91cf4c4455b296890a88
 EBUILD squid-3.5.21.ebuild 7322 SHA256 1785323b442179b1a3666c742e295c81a7790f11dbf22ea84a9dc8a2c101e6c6 SHA512 caefa37855602c45d5d1ea17e96af27b94ab6a759222fcb5f4973e2b37d9bf0f199b03b359452e0530ae05dd4aa643365e7d724ed61ce1ab255dad3423e856c9 WHIRLPOOL 12c62730c4c48adf71d6ce87bf71432682f27800b4f9c9e4ef000751c21e06ea640dcbc5eaf300255a6da3906a78d1ac2a2414d425ebdda8a60fa7dfab428746
 EBUILD squid-3.5.22.ebuild 7322 SHA256 1785323b442179b1a3666c742e295c81a7790f11dbf22ea84a9dc8a2c101e6c6 SHA512 caefa37855602c45d5d1ea17e96af27b94ab6a759222fcb5f4973e2b37d9bf0f199b03b359452e0530ae05dd4aa643365e7d724ed61ce1ab255dad3423e856c9 WHIRLPOOL 12c62730c4c48adf71d6ce87bf71432682f27800b4f9c9e4ef000751c21e06ea640dcbc5eaf300255a6da3906a78d1ac2a2414d425ebdda8a60fa7dfab428746
-EBUILD squid-3.5.23.ebuild 7319 SHA256 6aaae99a0bcc800a3cd287fb82849959b0a747f87589a9181010eed23a1fd9c4 SHA512 d8399e0f53937957bb3c4281096321f69dfef15a75603adb5ec6e2358f477cc71167c6c754d276c913ce4464842817a9d7bdb4e1324418f16ea12d99f8ccf6be WHIRLPOOL 3f2b4f89ea1b43c1091cfda50bc56b130131fb1b7a116f459c9527a18a24db53dfa0b945ff53691561a98ba798e652ee9531cbc68b4c5fd8428c7aef7ec1287b
+EBUILD squid-3.5.23.ebuild 7316 SHA256 52e713e5aae45578f110e7be08ff765818330f75f5d2a0abdb5b0a180c14b94a SHA512 c2280921e2a3e09ee03e3a630cb4be24eb6b76a5477985d7a9f667da0bea0a3e6c29a81c242a7d78034818115877c0743226bf6ff871e8a560349119a9b79cf1 WHIRLPOOL ef5ccb0a029524c07e840bec3f6889bd46d849dfd925696f27ae8ad9bac9e32241c282ae80a5aaeecfdee3bb8c54a369cbf9a212596d348e108d2a28d690dbe0
 MISC ChangeLog 11617 SHA256 3462208cfe311d6e2774fa69c877135f42fab56369aa97d18084d4d4977f7c15 SHA512 eb447e3bd41d33f62d0a96105b5923ca658f28ca2d7eb7c4cef7f48f10229342cbd86bd11dcd9b535872fb75666a04438c0a82e7397c9de30a2cc9c37daee7a7 WHIRLPOOL 17fee0a65c4f561ae04ad80352b0057355c7fa7a9f302ecce225d2b28eb58d5cdfa6d94b0f3f110fb7aa8014e96cdf0e8b0c3fb388a4b553fb4dbeea36144158
 MISC ChangeLog-2015 97633 SHA256 1015b1d282884c639ec17fcaec41953e1e9b1fccb1cda1db913707e7e6e62288 SHA512 a9373b0624bc2a8f47b7ca5be6243e5d0ec183023374dad843ccffb8daf451042a7e9771b38eb6027369e3e31314c62776b7ae5f075bcf738c35c8ba31d367f5 WHIRLPOOL 0baca988640a5320a7b27d6fc57731b1fbc7a3231af566527cb38fcf7fd80d7c335206c87fec297b892e2ce470e4f0144187bfac17c05af6041b2561584995cc
 MISC metadata.xml 1498 SHA256 d94753189c6dad425a7e95e6b0890a7cfa6cff7b55feee7b3a7a1dd9d249c12d SHA512 68406b22fe008c1daea11971d5a249cdd7d46197e7cb0f4ff322ca5dd98069f548cacd5394ca4f8aa885e58e83831d31b4a7ae0492be480a46f919b581abf4ca WHIRLPOOL 9b27304e084bcaf731381cb848345706352fffc4b971d306a6ee28d66321ed15f4bfa0581871d7d1683c4426aa6f58204c4370b9ae5d7eb45ca2e4c4e4b13a33
diff --git a/net-proxy/squid/squid-3.5.23.ebuild b/net-proxy/squid/squid-3.5.23.ebuild
index 17dabe4f72e2..22a03e88ae92 100644
--- a/net-proxy/squid/squid-3.5.23.ebuild
+++ b/net-proxy/squid/squid-3.5.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd"
 IUSE="caps ipv6 pam ldap libressl samba sasl kerberos nis radius ssl snmp selinux logrotate test \
 	ecap esi ssl-crtd \
 	mysql postgres sqlite \
diff --git a/sci-calculators/calculator/Manifest b/sci-calculators/calculator/Manifest
index fae6f1d2fcbb..2cc4cf38d927 100644
--- a/sci-calculators/calculator/Manifest
+++ b/sci-calculators/calculator/Manifest
@@ -3,7 +3,7 @@ DIST fox-1.7.49.tar.gz 5336321 SHA256 2435c56cde3ba6617c638af4f3bac39e8f4d5dd5a5
 DIST fox-1.7.54.tar.gz 5384000 SHA256 c6b749b1392d13e60b20525ed2e2107b40b4d25e757b2ee1e3fb96f59db9f053 SHA512 cf14a09f9a6a812ac87839a5df8fd68f693e59050695e8da5dbfe018676f29bc263e4f9208dc06419068e4140b826a0dcf70a8925fec379edf3e4d0d0b693795 WHIRLPOOL bb2829e16921e9171c6dd7f24be76803485c7f884f16c8e45f4adbbe91b0128a0024617a6f35c705149aeac921f891042605cff3499c200ba916de114547fca3
 EBUILD calculator-1.6.43.ebuild 309 SHA256 0c9655fb353c0c9771bdca8c2df19a693b865b03c9c76e5f927440fb82b2f399 SHA512 a020c4d0f727de670efd305bcc278d7fc923d5e522abd6448a64403633f95bf95311dee5abdde8108cf642a15c612c27370efa89013e7e386df92f116291fec7 WHIRLPOOL 16dd5d030aa943a6936e6d068c7cb5852e05812211617706bb4483624e730f0529fd2a79bba5222cf4b2da2bfe9eb060dd19a0b00eec5c12ad4bd07ee67c6adf
 EBUILD calculator-1.7.49.ebuild 369 SHA256 66c2267bf1e0cb01743bfae27e70f85e97212061b6bbd66903883d9ed95f3982 SHA512 95009ed6cf77c9200770780c8779d9d6bff2f86a522b2becd27881cb5d1f17cecbd9fca107bdbbf18655bdde03024c44f531a0c5baff0a9ee34ff15fc95c1952 WHIRLPOOL b18d5ce35e74f2a6b5607214037224574974157296c8f15704bfdda857abe8d6ab401f5c94ae76f3e2bc1344a50f1c966c5f4bb1c46fc708ac323e7477682cf3
-EBUILD calculator-1.7.54.ebuild 368 SHA256 1646abee722f1ddb34183dedf458c48b34eca36a11d02387134bc96c255401fb SHA512 2f52095eda0deb60b4ad989e60e3b127f0131aafb7b02b8242cb3d473df54c9c3f4f28ddfcf11139963d5d9ef81b8024bd59001b6d984432b5780f68a9fec239 WHIRLPOOL 87d80ced11c69959f946db58b9a255122ff75fead28b01750b5fafdecdcfc4839a820e4dc0055b46b2de35846a7d4f3db5e7ae5661ee2fbd59b47dd55c3f1241
+EBUILD calculator-1.7.54.ebuild 367 SHA256 e8137320af619ac835ce531d7eecaed1710d94e6c41de7c81cecc0fae807f7ba SHA512 6650a39573a1925b20ce295c06c956ad9887c8a1584277b63db0bf74863e70052e2fa4598969b6cce4474eb07e9aa509fcef3d220862a922d73eb431f823247c WHIRLPOOL 2a637ec660665aba6d545f748d077006c87e11fb0e8b0c765a3708ec98236748be79c4c7c4e16be309aa9bb4534811e0210336ee9efe303e42ac09448cdc585d
 MISC ChangeLog 3062 SHA256 f463a275e3ce32fc034465fbedb4f9d7a86811f2009a3bd481bd1f3d207e11c8 SHA512 d9319efffa8832a80b86588aa362712a7d57df2374fdf62a65de829603e8180cd14b534dd281e72fbf6b80a4962825a5a184498cc1b7ed8588788dfc7fdc265a WHIRLPOOL 2de78684abc723ec6f981e4ed9466991832c9c1945333866c7e46ddb23edd1e89cacdae3af9f78b0357572d7541ce596b4ea6d43ad0b420457e60b92b032a629
 MISC ChangeLog-2015 7029 SHA256 f8bad2226a2c60c1b6d57e0c14ce8d2fddadd3fb183f8f0b3d5e42476b1ef86e SHA512 d5732dc411657259733765e1bc1f174688507b34c611dcd417310362dec4d38cdccd7167325f44b13884ebaaf82b62da337a3df028c9acf5bd66e164734caeb9 WHIRLPOOL bc9a9760dd4f3c6fb40226984213e0c22c4f2e3278a73393502662be21c7dd9449f27050f880148605c2fcd6c29eb77d5a30e0c15e4d3282a0afa748affb9a22
 MISC metadata.xml 945 SHA256 45fe36727676cd465d634be4d62e9e2e8591c895ef1f4dace271f794e74a5064 SHA512 518844efe7b8a5d9333da013de0afec182d46291189ddd4ce6bdd795c81546e255058af326e10c32462ce3573da5426322cc9d7c6fabf1cb0be466db2702c667 WHIRLPOOL ee00f31de2fc47c3d7a93f2ce3fd937266fb4262c2e455e40afc7cf4e239acec3360de67e2a92d7f94031de3375e4442191fcc826a0ef43500da3a8a3b9733e8
diff --git a/sci-calculators/calculator/calculator-1.7.54.ebuild b/sci-calculators/calculator/calculator-1.7.54.ebuild
index c965f0f3e8fd..373460ab914c 100644
--- a/sci-calculators/calculator/calculator-1.7.54.ebuild
+++ b/sci-calculators/calculator/calculator-1.7.54.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Scientific calculator based on the FOX Toolkit"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="~x11-libs/fox-${PV}
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 9da66e98f9b7..9d031d44cf77 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -8,7 +8,7 @@ DIST less-483.tar.gz 316897 SHA256 7ebb1a0a141a94f863c0b83eff94fb115d716802fabe8
 DIST less-487.tar.gz 318488 SHA256 f3dc8455cb0b2b66e0c6b816c00197a71bf6d1787078adeee0bcf2aea4b12706 SHA512 d31274fdada570fbc6706d7c52637d1accbd18ce947ec062e10b1624c251a8533c6638bc3a1d89d3c70a0c7b9c6d45740598bec9003f281d64c587b1f829125a WHIRLPOOL e1a6c5dc2ea17e57226083f022d3c39b8a9d17428b7aa15385138680e78fa1ee22800e216a40fe5aa0ca38ca4c0025792a2839031faabdf8f9384dec3c750f74
 EBUILD less-481.ebuild 1645 SHA256 2a9cc84a49ea0253d595fe380ec705cb7b684b21de1e81e93a66d77b21579b03 SHA512 f5e8487f22c13ae2a6512e084217d5c4a265cd742a13eb437cec19080db7f2cae32ca2e07a0859ad2e5e7e61174574243172b764f263997d2b24b0e6d0c9f4ab WHIRLPOOL 8f57724483c7534a636a5705a73062be506c69c864ec016981627f89e637f3695e78255067ed5ac8d9fed46fb7214540a4ea2b770a3dcb2928ea0c477565973e
 EBUILD less-483-r1.ebuild 1521 SHA256 f37e08f4b5835f053a706efac0d810f82ebef9b67ffd1a797a3a849aceea2f3d SHA512 8751292c1a82b9f1004778aeacfecca41afd4bbd50bc320c4eb086fb320d2474797f5962a521c9c3e26ad4a55affdc028993dc4d53bc4d1168c73aa6e1d4e712 WHIRLPOOL 274579c391bb5cc434eefe2e74afe34c2697be50b216cd8136e6b5516cfd702be910d7625e6cf1dd19366934a7507947c1f8dca66d0131dd638dde52d16b3131
-EBUILD less-487.ebuild 1518 SHA256 bd2d76e0759a9e32ef364f9ee811efa029e0c2660d3296a87cd3e0ac93c6d007 SHA512 3d85879257d071d12cccab52b18685314d4f28497b9364173559f3c403cd570f085f76b59d0a013621361dd9a2349a9893fc968321c5ae6893b236ca46edd244 WHIRLPOOL ba69fe6ef3cc47b858e60ae228c1be10fa10f1f697eef761fea06adc4b5f165d79aee5eb7fd9e2c9cb0c67907083f825802337c6bd3124edda8d171554f7cde0
+EBUILD less-487.ebuild 1515 SHA256 afc61100cba2de8e72aa57af0d23f9b3fdbed01805baab724322bcb8bb1a7a76 SHA512 38a7b51995b864466e7296181bd07a6b664205122e0bf342fb4c056a315250350ea6d140a08c6ebbf21bcd0d6b2c1180a5e537b2854f97b975b57aec1a3fc5e0 WHIRLPOOL e46aa061a1521ee4a178b5f039cb8fd5fb3c9136ad767f5decc468e2fc8e6f6ca1c2db668e363d29e62f8a14329b0c4c0f34966172f8a7d5cd9f1919f2567ef0
 MISC ChangeLog 6770 SHA256 231ea462342a5410001f601c3b5be0b8aecddd4bda45ced16d823e54588943ff SHA512 1eeea73307e6c68f8c4026bc22d42fed0b4b3fc6eadf00967cd7f525b3c5843353c2be38591892e6444d2f3d6a374e58a960a0e969c4d9153a373a286c2590ee WHIRLPOOL 15496a1ff7dad80804d3bb76da1508d45e3bccb22bb8452cf6d63438c1d30913dc3da6159e0d426ebac27d1d68e3dcbde154f6c8e7fcc0198225bb4f1469f466
 MISC ChangeLog-2015 23847 SHA256 825f54e1e57d50358f5dc9a197553cb4e9472a7aea705968075815cfd5f90527 SHA512 99e9ed06109e4967a2cdba06c9116fbd1ae7a33489a758ae001c809e3bba6dfa107b3d67dfa69ccdb0ebeaae51c24cb144b13f8c1f46d0e26a274cb1b2e1ece8 WHIRLPOOL a27d97c7da86ff507da122e0e54eb5729e55c2eed535cc86a9d3775f59a2b70c35e70fc6220728c36d893aff0ff546cb8ecccc86a3e61c284966f50dc21ef7fb
 MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/sys-apps/less/less-487.ebuild b/sys-apps/less/less-487.ebuild
index 6ab5fd6ce34e..6bd537da2fc8 100644
--- a/sys-apps/less/less-487.ebuild
+++ b/sys-apps/less/less-487.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 6841d73c63c4..c608d75091bc 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -8,7 +8,7 @@ DIST portage-2.3.1.tar.bz2 918411 SHA256 a3c5ee98791c579687ad5ec6a7882a6b6a486a5
 DIST portage-2.3.2.tar.bz2 919270 SHA256 724a9924209c5da5e7ba7f19812db0675bb3b4309f911e37da8c35bbc3fede67 SHA512 bee95d0308a613083a28b05e5276bc3c4eb5841e17985e3c943a92bc5b9a659eb18ae822219d26da80144febf47b5ad30766536f820162812549f0bc83975bec WHIRLPOOL 0836aac5d9e331d896053160d8e829f997697f83bd3dbe4f14b924b9aa7c41a7c53e48e4ea5873fba05d4d23d715b310e92a10fed348b7ad55afbde149864f20
 DIST portage-2.3.3.tar.bz2 920984 SHA256 beec3923e14fb98d9992ede0b7718df594c50f366c3e58c2f0ba10102e77271f SHA512 7dec90a980ce6bb1266bb9c9c9979bc6cb8bdb4f37d8908c78cddf053979aef44424be86ea1fe16a072f6ed21b26233df84f6dd22d6f0c9435816090c675b53c WHIRLPOOL cc4a7e63b797766cc99ab712902b96e38fe22a482d7eeb3e29843a6070f6601b8bbe9c435b0a9c3cc1947e49c23291f1064f3d01c010d822dcb2686a103b4c3d
 EBUILD portage-2.2.26.ebuild 11722 SHA256 3abbcc1f425c59a727b8d93dff79158ccb74eac33540b706b5823cd3305f75f4 SHA512 06d656fef44def71bfe110d34fe560cdf8d9c133da848b971fadb3396c5e4f633bc13f8c2f94bf09e0e313724af7dcc4af8b84fd3af320aacd21ff3da928c384 WHIRLPOOL a9fcb2878e726388e582e36bca3ba0a99e54791f269af23b9c2bc4dfded1aae2d99ffeb5066e3d78028ced91944f4e4cd5615f94aedb95d271d373aa958641fe
-EBUILD portage-2.2.28.ebuild 11768 SHA256 9f5245b53f88dff923a9b54db4e760f8f9aa776f4b48efc9f52e7845289f0c56 SHA512 ae7b864a74bab0b0ca4766389f7da52057251fed9e5a6486c9de674e46c658c9647790916b308407ffd075290ae817c9134f2986899724cc19ff5e500c24c543 WHIRLPOOL 44f75482c93b365f6ca01219ce016a82f74fdfcf6b5174313b0230aef05dece9f0d7a445b40d290869f9bc3a94a28b9263a1df22c80b7defe7132a3cfb846778
+EBUILD portage-2.2.28.ebuild 11766 SHA256 79284e36730201d0195b13b604ab759b16d5ca63fadb86603a1191cc9b9a5c35 SHA512 7b47b462a336769be8e5fc6031905b064817a0892546e588068cb164c8943ac402c2da4ebe47f41ef96716dc499bb178816f9ad3a6dacc2174e100a0d9399bb3 WHIRLPOOL 62f684d52030a8077692a2723744f381b2d440d97142216f498f36cd79621749f062efe8e7f6cfb7a7bdd21ffb3a36e930700b8a58b8e823f3557e2566811c3e
 EBUILD portage-2.3.0.ebuild 11619 SHA256 79ef920fa92ad921bcfdfc32c91b7fa0886a717247e4579c115984a25042e85d SHA512 70e1339aa9058a19e762ec779673ab3f1d704ddf3d2d23baaef060bd2b73b4b61b3c596f7914c457f0ba9ee75dfb795516ca70c05e3e240695f4cc2dcc54c726 WHIRLPOOL 8e30932c1f3434cfcbe998a58015927fbbeff172096ff77c1de9eb5fb051bab4d74be642d31148b5140ca3b7c1c75132a7376629333fc86c68a1b23543e615a8
 EBUILD portage-2.3.1.ebuild 11497 SHA256 e57d8b1c9f0af5d320affb1f7e2e38e8abca6d8b7168538df6de4e19c61186a2 SHA512 28a4de1da9a7a720d012d762685d075a481135b4b15ba1116c544e8a5f0d6d5629b561d810af9fc49cab990612a137b35caee9e144674e015a276e6acb11887d WHIRLPOOL 396c3b1543af19f540370daa3981b2964ce25c382293cb92a11a6b00c2407034f8599f448b5850ed4734ed3430f6900b40f308333c60fc9564ed867e2f1a6604
 EBUILD portage-2.3.2.ebuild 11419 SHA256 3e5d0935e4aeddc1faa8712090ca73c1ae48a9a5f7f267cd559c7538f0c78853 SHA512 ce44cf5770389a23a3d8018c0c18dda5b7032ab5c8763656a53308c26206203ed90469a1e57dddac6da74fe769c7823269ca4b36a1faed69302097b51fb3be9c WHIRLPOOL ea7d1aedeefd1aa9f6128078fbd579dbe4256e053bb9860503f529c116fb16663e0bc3d62378098e26616647ce8e36101b19b36b95aea4da9e875ed21da4039f
diff --git a/sys-apps/portage/portage-2.2.28.ebuild b/sys-apps/portage/portage-2.2.28.ebuild
index 266027f4747a..5896a9739966 100644
--- a/sys-apps/portage/portage-2.2.28.ebuild
+++ b/sys-apps/portage/portage-2.2.28.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 SLOT="0"
 IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
 
diff --git a/sys-devel/qconf/Manifest b/sys-devel/qconf/Manifest
index 4f74713f97c2..9b5f8b311fb7 100644
--- a/sys-devel/qconf/Manifest
+++ b/sys-devel/qconf/Manifest
@@ -1,7 +1,7 @@
 DIST qconf-1.5_pre717.tar.bz2 42010 SHA256 16ece50ac3f9533cf05d7abb44a025503ef8a3ea985fb70ba4c2224f27fdf903 SHA512 c3dcabe1d8aeaf1cabacd6e2e37dcbaaea85b28ec212fa2a0a48cfeec6b0bddea35eb2bd1828a5985daad3f2ad5e2cb6edaa2fbf3fda54b9fd3cfa64d5d3aa99 WHIRLPOOL e351cc97b30b1d166d8a6cf6327833c49a95c55c68ae50959e2b0fd0d12b86ade638348cc816e665d01692abf3ea0f8721400ba89243badd2c8cda0380f2d1e6
 DIST qconf-2.0.tar.bz2 50507 SHA256 772022c9757530c192d3bb1d31c4d6076b3464a8395dc06d3019923c44f999f2 SHA512 8820dfe191149b8bf7aa2cd631a6c4900b821c30817c6bffcf79734271c47165daceef11507690d495881c8dc8d19f8dec441c7adeb2a3e36b355b66b4f5c43a WHIRLPOOL facc512a3df046e131825a45afc928b76d8c87446b8d4161695165e6551cebfb586497b2cad3c69a9a75afa0791b9c915e6f7019ead9925d867c01d7bd573f09
 EBUILD qconf-1.5_pre717-r1.ebuild 841 SHA256 795e3a5d4d63f27d2e7774fecc2b9a79bd3a1cc0b38a46a47c3e58f09989bbed SHA512 f78d266db236a3ce33dce5980ed519d306ece6b10fbc2940e10284b84122300f892f9b1ad9f02d20a184db4e5421b50d7ce26ff82d728d8c51a8a5d416a45a0d WHIRLPOOL 4b4a3ffa5b9cf196f29bc867086e8283d7738d1fc3fcf401fc025d9c28cfaee55894b3eba51b31e03dbda6efb063184162fdd886ce85b68a65c6f68654be4875
-EBUILD qconf-2.0.ebuild 1062 SHA256 45fcb2b501403c44b61327e7d490d8a6d74b822ae5fc287d2d456750913a3347 SHA512 b7d8952df5088e4ced57d6f7f637f872758c4cdbc78e974fd94f31aed297b3e1f8e4e9c28734a05ac2ee3dc3c8ad9f3a2d95bd81879dc815eb87eca08c0ad887 WHIRLPOOL 3896c9c44e12d90b1eb50e052b48ef2a154019856841ad14a1ead07cf2eac0e7106785aa1ed6351890b92b076c7b8b2c000f25594f49a55aef19897ad0b88559
+EBUILD qconf-2.0.ebuild 1060 SHA256 c0df2938cbea8683f5489e348352b9eb9bdd066424a703482c25db742c706bbf SHA512 c06f91d219a533791dcd706b2e70153b207196b8b41af96ae7da24a578c59f02c8d93c155280cbbebf1066066c18ec0375c55356012a7fefacf74763de4f76db WHIRLPOOL 2bd67f5eb041a71b2543bca82277f85e4748edf0431b9fe890b6d73dea66010436447071235cad040bbead536534d205a310686f449d95c6622f5c34890a33e6
 MISC ChangeLog 2634 SHA256 bbe3f98df9430d39a94d48af9794490e8b5663ffed4092d7fdeb2e0d4b4bb3ae SHA512 78bdc5e1bf259f416cb7f1e6669225b90c2707383b5e0d665950c0783c348599a1aa8c77febcfb194c1264f87568c68138906331081e59da89c282010316944d WHIRLPOOL 6ea5342e8f36542d2a2d7e6648ac0df9a849190ff603861d01ac944c2dcbc81089891c95f9e5ed0fc5849022ab003fb394f434397cb338cf0573bc49c8355cf0
 MISC ChangeLog-2015 2733 SHA256 72774813246201b18625b7947300174e92e3e4718a0b4746773ca02be7bc893a SHA512 3a4d6f2d3d231a069f97cfd34cb78989eae3e41cfd9259994062f802298d560805e987a7d3e9338283e8d485bde736da864de95bb9699779d34b178026ea11c9 WHIRLPOOL 61188a83eadb098c815aafd8bf31aa2b8e146459567acaf078d79cedcb455b477c53591b0c2a90416b58ea8c2bebde1775f23ca54c6befcc3bd28a1175ae676b
 MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
diff --git a/sys-devel/qconf/qconf-2.0.ebuild b/sys-devel/qconf/qconf-2.0.ebuild
index ab00f2f38213..eee65b87f1ce 100644
--- a/sys-devel/qconf/qconf-2.0.ebuild
+++ b/sys-devel/qconf/qconf-2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://delta.affinix.com/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="+qt4 qt5"
 
 RDEPEND="
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index aeb5bad3408c..b06c6eb27409 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -443,7 +443,7 @@ DIST firefox-50.1.0.source.tar.xz 195823768 SHA256 54bb9bccbf9eed0c7715ae7f45330
 EBUILD firefox-45.4.0.ebuild 11269 SHA256 7f66786432a85433982a6bd9b62134282773e6343c9177676bdf215144720104 SHA512 1a5338c5c34e1c91f45ad6b6f5ee086cdf985bde03cf7d215f3250c49dd64c6cc6052981f3c6ec86f724689bffdf89d418673ca08821ea58e1218bd568efaaf5 WHIRLPOOL b564d1d489092779f4e576299e729fb3ad231a439e094b10e4f63dd31520aad5abfc28ca159ac219babdd0e64ad568c38216ce112efd1e978078234a7163b47a
 EBUILD firefox-45.5.0.ebuild 11271 SHA256 88058d155d0e03c51c8c62b3490dbd839e4c6dded6ff7b6096622bb3e6c68c54 SHA512 fa87f6fc65c0b7e2cdb0e28d62341a5d4ebf06df1a0fe00c10651844820aa34412c42e3710ce12259874a2b4e953b8c6558db54962e3e4a678741be196ecbde9 WHIRLPOOL 72409a11b119639d98a2016b5ded233c06677947cd5ddd74a1789245410d58122a22cac2662c392c2c999cb49b2bf9417b462a3037e2502e0f498e7de7247304
 EBUILD firefox-45.5.1.ebuild 11271 SHA256 88058d155d0e03c51c8c62b3490dbd839e4c6dded6ff7b6096622bb3e6c68c54 SHA512 fa87f6fc65c0b7e2cdb0e28d62341a5d4ebf06df1a0fe00c10651844820aa34412c42e3710ce12259874a2b4e953b8c6558db54962e3e4a678741be196ecbde9 WHIRLPOOL 72409a11b119639d98a2016b5ded233c06677947cd5ddd74a1789245410d58122a22cac2662c392c2c999cb49b2bf9417b462a3037e2502e0f498e7de7247304
-EBUILD firefox-45.6.0.ebuild 11271 SHA256 88058d155d0e03c51c8c62b3490dbd839e4c6dded6ff7b6096622bb3e6c68c54 SHA512 fa87f6fc65c0b7e2cdb0e28d62341a5d4ebf06df1a0fe00c10651844820aa34412c42e3710ce12259874a2b4e953b8c6558db54962e3e4a678741be196ecbde9 WHIRLPOOL 72409a11b119639d98a2016b5ded233c06677947cd5ddd74a1789245410d58122a22cac2662c392c2c999cb49b2bf9417b462a3037e2502e0f498e7de7247304
+EBUILD firefox-45.6.0.ebuild 11270 SHA256 efd3d4311a596cdb19ab056e2e6d3778792adfc5026e95bbd2331f326df95ebe SHA512 6018235187a7f31ba5c1cf8f5b9e5dbea44d85c21815e50b6d616975dd719649f3e4a9462988cd4b36e2932dc4a8e91426740c2088b8588af92e6f55888e8853 WHIRLPOOL 3d64bb25ed8276377617561dc08e8511f91721b01222f72ff20f9ab221e7811fe05c1239c88d4dea0870514131d1a0cc6d5344572dd5e14c8ae68bd7abd5cc1c
 EBUILD firefox-50.1.0.ebuild 11693 SHA256 aabfac1b0a6754de9480949d7d1eb95f31b595dcfacc2bb89cb3d6490298a781 SHA512 851ecc48a2a6fba73418f6d561cc89ad377bde81933153a92ed1471fc9418f780985b832a14aed35c2de75254ef8837a9d16ccbee1e0ad2a47e604220bc0f978 WHIRLPOOL 185f76b32919fed08ffedb86657a8c7d9a9034224060cc176e4c11de2e8a40c036f9def83f0d832d8969617852b46fda672c4d3cf91ecbabbb7f4e20f4827901
 MISC ChangeLog 34792 SHA256 d336f594410c6933437ace75ede314860cb222bc4eb3813558bdf672225bdf48 SHA512 825bc90d76e73653658ddfb711009db73bf2ab536236d481b2d90ff19a39d7c4ef67a4584fedcb85ba2c648f075698518e3ce8569e551f2e074673ccc2745472 WHIRLPOOL 125d5858791e8fd845c496378af20762b3eaaecf8d71273d7b4ffcc2776b1344e6354a924c9894c0842f049a09bc1065125502bf4d4b5be14b194279a680c015
 MISC ChangeLog-2009 109736 SHA256 6a3f47a190cb2146174953971b193f7d75f408ea2cd1ad7d029fb848dd66f3c8 SHA512 db43c51ba072bd47d8bdf313481156b2e6238c9905147033dc7d7ce5a634ca01b7cfdd399c7b03a4f4af8c44eabf353c7b7e22642220975f1bd33d5a109cce10 WHIRLPOOL 7bdbc95d44e2a564cada83e831ee80b849d468138a6d5e75f23fd4e165408e07af4891bc6989af8e1f792f8d963613de20d013e5a610ee58855c0aad0de475fe
diff --git a/www-client/firefox/firefox-45.6.0.ebuild b/www-client/firefox/firefox-45.6.0.ebuild
index aec960e0115e..d4dba55bb9d7 100644
--- a/www-client/firefox/firefox-45.6.0.ebuild
+++ b/www-client/firefox/firefox-45.6.0.ebuild
@@ -38,7 +38,7 @@ inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="http://www.mozilla.com/firefox"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 0e7b6fd1d611..c164409a2902 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -14,7 +14,7 @@ EBUILD apache-2.2.31-r1.ebuild 3053 SHA256 a1aa639b058114d647272c9179b61c8640d8d
 EBUILD apache-2.2.31.ebuild 3001 SHA256 c08db0122f0f21459674de3928652fe94b6cec0acda9e97cd90978163a2fe6f9 SHA512 64e2416cf6ed8b52430c2f667ca5c7c7bce89d41e0703695920c9137edb1898c55e7c0be4c4abf1ee986db3e8ec9b68c5a84014de0b69f0bc994ac14d5bfc64e WHIRLPOOL 4f57a1669ab98979a86e97581d19d366b21357f118dc3856b0e62c57377b69273db8ec788f84618c6436ef93bd836ed2a58dd4589682609cd4ed6900b8bd7ef9
 EBUILD apache-2.4.23-r2.ebuild 7938 SHA256 dda33d827ab69e799581335be4934151f9ef48a6f3e4ff40f9dc8d8c60a4a4b2 SHA512 856751b525cb288161c4670493e33854695feb7ea16cca39c5d8570246fd9f57d969cfbcc8ed3f5551fff0a2a1a29ed0120d73df5a308bb5c73c2b497ae778d2 WHIRLPOOL a3d446cc020b19d93a142c88afc7b711148ae996bcf4d3dba794bccd530f07e01b8884018dbac08fe6bbb6bc033ac3e5b6fc742083d5a2ae78cceb726b0ae34d
 EBUILD apache-2.4.23.ebuild 7654 SHA256 773fef45359d84c76c81f2cd6eb1ceae900e8152c7ffb5aaf9dd3149e0ad58a0 SHA512 aa5e6c459d30a80c3eb236be63309745ced16be1a3d121c4987f07655c237167e92185bcd4eea5789d89d8eb430c858f375becde0fb6266677006fe37262227e WHIRLPOOL 10d2c69098b176b3dbac7e09d7bf3e6dd64d10579d753c3fdf23fe4810137b72d896356ff5cb83188ff09b5eaae3abf2e5396881e1fba07f20f4c77eac9250f3
-EBUILD apache-2.4.25.ebuild 7724 SHA256 e6e6d80e4893225f715b78024af7c0051b81537bc4e8ade82ab1ebbc523cda53 SHA512 a2e538e773ace01c7a98855a68d8ca54f47c17f10110896dd5e03d493b8692f2fd4cab6c09912c969af9afa9f6bc625e27b122310ede4afe61a7c6ebd5e49417 WHIRLPOOL e76688982ea6b0022f29ffbccfda60b03a23cd8d86b95a262168772d9d66d93dbd6517b0749ad93527c02e70999a0ef3b721dbd651cf9fe6a0087574c99eee7e
+EBUILD apache-2.4.25.ebuild 7721 SHA256 29c43617051834b6d6197cb185e23788666e462eb326a186ba4c380917964e7a SHA512 c70d8c2e3d524272ae1659520a68e981f874beaf79d1f0fa76ecb5ef75c79ac2975582b2f712faa7e4d49efc430be7545c009655e78d4493dde6e559c668fd35 WHIRLPOOL df1238d685fc3163e5d7ae14948ef096f8f34c67f87bb9791f7805b77e6afc63f763b8c3397cab901565617f0600fa92f28549b0902be7ab790aa03b1919d22a
 MISC ChangeLog 13802 SHA256 23fdf1fc5c8aedb3511251cc41d097c99895ab24e50f48377fe91a39c17b9ddc SHA512 1b92ff6422e0db92f25546ffc37b1d2200060959cb7f1af91159e08b181d66df45baae15df31586a3333877e78cc49e2fa3621a950f52193e43e861fc03babf0 WHIRLPOOL 42e008d07b470d3620d2bfd02049f97463f4dfffe9756bbcde277eb4c1b6ce21f6b2a0f8853226166510012316e22ca3a4b730180c18aa692a929041dc127830
 MISC ChangeLog-2008 105137 SHA256 4afec18ad3c76df40314edb37b5512f81ca6223c38a899534d9d15342481accf SHA512 92dfd339b1c4ddec29222076a597220dc7faa504e2ee770339892f155febbf34004e60395f9eb21b43d3b1feb5f362c2946b69cc65151b5ba00fb53b35ccb9c6 WHIRLPOOL 89d77300aafb53ae0632904118064de19313fe51f635512314471e845574e7a624a770ae4ca4e335cff67d4fee92e062d28ef985a54c577a1b8b3ea0f621c0f8
 MISC ChangeLog-2015 30572 SHA256 2608174e0cdfe351d5c8d25d21cbe9c6b7b98c6de9ee6d04da23c3de9fb95d6b SHA512 b76aaa5b8bc20f2fb45346e5d6f1f094e9f6b6f740054755bdc0399f581c78fd0c087f183ca756a63a08e8d96eedb292ffc4d2f6ddc00c8374435866e15fac9b WHIRLPOOL 8dd5292ae8fa15422c6d663420e7655cb13247380831d2f147dfdd0deaa51d6899e1c7f3b8ae9ae111074c8464e0bd94a38d491981ce84fc6268ab83c0af9396
diff --git a/www-servers/apache/apache-2.4.25.ebuild b/www-servers/apache/apache-2.4.25.ebuild
index 33ccd22a24db..d969e3ae92d4 100644
--- a/www-servers/apache/apache-2.4.25.ebuild
+++ b/www-servers/apache/apache-2.4.25.ebuild
@@ -127,7 +127,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 
 DEPEND+="apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )"
 
diff --git a/x11-libs/fox/Manifest b/x11-libs/fox/Manifest
index 41bf59ebb26e..8c24df05d6d7 100644
--- a/x11-libs/fox/Manifest
+++ b/x11-libs/fox/Manifest
@@ -8,7 +8,7 @@ EBUILD fox-1.6.49.ebuild 999 SHA256 50d3519d9402a755f75cca0066b2a6c2f3a6ab3e9fe2
 EBUILD fox-1.6.50.ebuild 1013 SHA256 9c798ea35dcd22b6daecf236052cd198f134cef0abae47ced2e5fa821c494100 SHA512 0776809a7190b1b7ade917da9a4fc38917a53baf113fd2314b14759465a3daa234338b128c0997f5ed7990dae0f61323e14701e2ba26831b58b5b8f6e7b5ecc7 WHIRLPOOL 83e80df10bb52662199406ea70cfcf416a5b65c5095a84fb887f7502a47afb96f866904deaa3408877c723f3351d3cb963a7401a7ccb242d4a1e9870b06c407b
 EBUILD fox-1.7.49.ebuild 1362 SHA256 420067d14471e380ef60a924ad22d2e71ec77f9db59650dd3431f75785829e0c SHA512 b386869fcd7a0d6be296788b5d78c996182ee059ced3d831df547ea5069416d694cc8fffae2b34d4ff697e2125301a76d581c9b4a0dcb1db3bfb35a50030afaf WHIRLPOOL 5753711a20090ffc9146e6311cfe672a7772dc1e41af9c9050c0039e1aea4ff4b76c4d667420bc410ee7ad20eed7ec9614b51ff5e53af0bd515f614e70241e9d
 EBUILD fox-1.7.53.ebuild 1302 SHA256 c2ca6f06d50e0295fe005a378d88480b6bfb59eb613bf478707047ede4463d1a SHA512 dfda73935ea9284aa0601557d2c528a23208078c8db5480dc51e46a3d93693d254cbeb31f30819d7f27a0ea7d93eba352b40fb072be423c00f3e1783b3f77674 WHIRLPOOL 99478efcec84a628c409851b16729ff996dd66993b8fd605c4019b4dd32dde5c11f0fe453d4137ace604f6826b4c57fd52c2c780ea54ac4cfad9bbe538eb44fe
-EBUILD fox-1.7.54.ebuild 1300 SHA256 7f715da4105040e23747435679427ad15e1b2b90d84d8e9962fc0ed0ff26b673 SHA512 e650805ea38700e3b1b88fda027bfaf4f20c965f25e9e8be7cc7ca48f33e4c4fd5206fe01d8d715b081b5a56648c0173d48ce1609e24177c0682b8b636203478 WHIRLPOOL ed5080a14b66acd796fe992fca97835ce4b55a3f26b0ff29ad66eeae832a561dd1e668470a3a0adeb689e914a698a796612e8a725ccb3be2b90e264ad13a5723
+EBUILD fox-1.7.54.ebuild 1299 SHA256 9a1b5387a77a73d349d709c72b4965b357dd41644fd927af7c9fffe064e24aa7 SHA512 e26955ac88c08da60eb3c82a5c24576c58c6709cf2ebb5cd019e0e490ac6e4002fcf35a834cba7963aec2c0b65233f2e585ef903962af73558bb011cce9c9f6b WHIRLPOOL 8e36c8f35225abf08ae2655712ca2fe8e2013708141ad01b4f0cd864ce4ed3ea88c74354b966efed2098cd619cdde6a37651c6132996eca2d34d700d4fb35740
 MISC ChangeLog 3285 SHA256 6f88a1aec66f5d6b773ee6b7ac9174e19d3e38a161727c2ee2d93e6a65a2a95e SHA512 0b67084953bb9cf25ccb4fd45891628a6a46cdccb9f158e010cc985d3579b70e14264c94630171e19dd545e08bd6a8df08366153111915fbc59c4e035bd9492f WHIRLPOOL 50c297e11768d0db7b3f1a6aa4d58cf0317ecd1c4caa28f1ea748f12095bf6264a5e291084066e237bf241945e22ad7aaa9649c9538c2b5840b76f041fece3f0
 MISC ChangeLog-2015 23632 SHA256 3f616be81af1416a5e890fb6dea86b89a32799194856afd8a19bc5a2ea87b52e SHA512 d4dbf6819f82be4ae91182b88086a3b65f173aa501dfec72951486ab194461a0276796dc2cd332dac9a082d663feb8ddf821137ffce9c661a0342dde9a516ec9 WHIRLPOOL 98c95db1bd4149baf668caf95e19b1c4d6d9e79b64b27db4d3977477a75e86db76a3dc83dc937c91b18f27f318032fb54b1cf5f5a0cc682f4b6b0a0db4f0af96
 MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
diff --git a/x11-libs/fox/fox-1.7.54.ebuild b/x11-libs/fox/fox-1.7.54.ebuild
index 5e886051b132..ee839ba902c4 100644
--- a/x11-libs/fox/fox-1.7.54.ebuild
+++ b/x11-libs/fox/fox-1.7.54.ebuild
@@ -8,7 +8,7 @@ inherit fox
 
 LICENSE="LGPL-2.1"
 SLOT="1.7"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
 
 # newish autoconf needed for working mmap check