gentoo resync : 19.11.2017

8 files changed, 52 insertions, 8 deletions

diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index 725bd930e231..5f9ddc364e22 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -1,5 +1,6 @@
 AUX ragel-6.7+gcc-4.7.patch 5585 SHA256 bcdee795c9a063d4a42f49f2ba642a922aa705769c455b9b375bfab47c7e137c SHA512 160aea4100328accbe423e98f7f5741309b9e293aea992f287cb5d9fab25ae74c76933e924658dd4670d317b01e76d37c3defeeb47ada07370b819a16515ebf4 WHIRLPOOL 332ea976cc95139491b767ce31142a8408fbf79cdd16434c7527c270fe42cc1911581124fde5a33dcefe4d61a78c2ea38f0e484015d0fe3b40611305da45c46b
 AUX ragel-6.7-cross-compile.patch 576 SHA256 b393221908d6524567c2b9a08e51e8b1998313ac457a7a04ac3d00db031b84d5 SHA512 0ab26720537bdb77194159145d5fc2e01ee96f3d197d947693141e0559e18b4da3ac7b058d7de4a9d4d9cf9c4ab63649839da359ed3aabcb5ea7163ec975d5b1 WHIRLPOOL 0b38984463c4178cbeca5c6253eb9da992d0e095df22ecf97a6894e5660a846bc6adbc657ec04de554f4263ad3816afafb939a54047f85e4da00a123d8482059
+AUX ragel-6.9-gcc6.patch 1902 SHA256 bb430d9ece632bf3bd46182a7b2d819a5f5f3541e394fed42176120887afbf7b SHA512 3258201336296fd8d0ae7e3008ddbcee9112023801e7ba280de09398bbf7bcf4010e3f5d3e819bff7cdefb26a346e361be84fe5c84354fe03302e5bd9fb92c68 WHIRLPOOL 4c267584b6dc0381edafec9705b79d8e2aeccbfa6bf6cb303e9e9dcfb8bfddd90cded8c77102dccae24222c941505ae857d1316d5a20d1dcc1c0f126d5e0985c
 DIST ragel-6.10.tar.gz 1232993 SHA256 5f156edb65d20b856d638dd9ee2dfb43285914d9aa2b6ec779dac0270cd56c3f SHA512 6c1fe4f6fa8546ae28b92ccfbae94355ff0d3cea346b9ae8ce4cf6c2bdbeb823e0ccd355332643ea72d3befd533a8b3030ddbf82be7ffa811c2c58cbb01aaa38 WHIRLPOOL 12f8557fb665dba46d63ddb05d0dab87b990e6743471652bb608dfcb7cb24dafb4105e42cc91897cde4cad2c2fb58f50d5fbed68a468ca9fc33e5b1047d36f74
 DIST ragel-6.7.tar.gz 1182734 SHA256 46df8e3f117a730f8896061c95ea8e8f53e9789cb053c2eea047833724fd7a30 SHA512 a85c1d5d4fd7d903c823c2ddc8b5f1d5dd5f715f11bc04f10fb78ea5632b3aa33c5b4861f89179fa9d6b4944484216ee93bbd25dd0b5958d2419e434b781b78a WHIRLPOOL 52f1614e16390949fe070df46c9929b5871e35923b38e6c277f0d4688e45f610a16a6635240cea0622892c675aebf092e3f6a9c626684ed1a4af8191ff3c6d6f
 DIST ragel-6.8.tar.gz 1211146 SHA256 dd7f7d22f3a58147379bda61334d341c2caa0caf9f71897e3e4ec05c8f398764 SHA512 3c7fa4ca0cfcd5d19e0ff8746ca427f5a1eefb0af09db5d2ee55ced9bcc35c588a5db146dcfdec46b83fb63d94ff9ace117b4cfcb07e2c57aec67a6cbe249458 WHIRLPOOL 540ba0c5a712ae0426982e08e7aa7b1fa1ff33e3d9c2095353939ed2c45e04048ebcdf93292ead8e70abbd8fa230dddbfeea8d485955142d0615ddb94c8a0b9a
@@ -9,7 +10,7 @@ DIST ragel-7.0.0.9.tar.gz 850078 SHA256 b9e6cac5d388398ac05d8ef15a07628f5e6de292
 EBUILD ragel-6.10.ebuild 958 SHA256 8b45425e61cde1e0bbf1ec1355283cbc1761335a16d012ed54bf2bace5af6aee SHA512 87ff03ccebba39317af5320658412ddca8486678b673e5a0541490240da799fc67ceabe533b61f7ee8dfe09f5aa07e5afee81f8f6e9cbd411872b5aef597271b WHIRLPOOL ad90dde591b1336ee5200d590de36bad2ff37066ec6bde1477ba78342ae528077cffbf6014e882ceea95403c59e9830e395548beaea86a6c474d2550f2f40a05
 EBUILD ragel-6.7-r1.ebuild 1152 SHA256 e99b2083ae13a8d1a7d784b5a9cb4a6e02fa4d91a35dd5184c31d190813acc9e SHA512 46bee68ca0e22ef5f64a827af52f3dc14374920a31e2817a4430726bb2278447b0515acf1e0b77d58e3a6330e580f71c735e2170e4503734dd31186c10907822 WHIRLPOOL 92150dac5227a015f614531a3670e713167233b27067644ad98788d5d8e0fd49ae44a5ed05edfeda66f5ea0ff76f1befd3ab47903e4ca351839d3b894cd5ff31
 EBUILD ragel-6.8.ebuild 1094 SHA256 507b280002f2df0a5a5cde11713ebce68d9d2f07a9936c39efe5e9ed475e6db3 SHA512 f290a2edb43b60b52a563927343cb5f3672dcac30a598b6e95afe66858cfb33f0af5bc1d960e9b8efc05e9eea9a369045fe8dc7dc77abd596813d80f324d03ce WHIRLPOOL 77384425e2ecfbfc453a876e43387533ff7c97773bf42f6348f83f3745d7751a177f38c172ef574ec81195f4d0b1bdf7b876f7341dfc1ba4d2684df900cdfaca
-EBUILD ragel-6.9.ebuild 966 SHA256 d96f2cfa1bf988e10b3ff77cb4dfaba1dfc93d59d9351e33d8d859c7d0bd5f95 SHA512 14f09d54403f9eb38ad6a6b2640940475514a819f134102920c57700327886094aa94c723e829076540e9cef02b763c6e2204bc665f9ab80aa60f5d47ccff41a WHIRLPOOL 6ff83b36c3401f88b9d6be1a27f78bae62bf35cbe8306edde993297cd5d550bfebd90688a330087998cc8fa6ee7af059b01748a4a85cae3f626aa450b7e0d90b
+EBUILD ragel-6.9.ebuild 1008 SHA256 deaef3f03840bc9cd18b7ad9a235f05f805c9f4e4fad9238a84c7a0e7cc6712c SHA512 539763d6d3b96efc6d47b82474126058859e176050380521c473211927c074cb98256050ece6557e7692867fd571d82f8fd2bb0cb03e4855aff7b8ebb060f51e WHIRLPOOL 0bac98999403e9882d1f99f6725ea4e96ae8f9a37c7f7b436015913d18bbe7c8bbe2118e4c86f0cf24e571c2654b91b4be6156c39f92103f808865424d59ab70
 EBUILD ragel-7.0.0.10.ebuild 627 SHA256 2f6d1b55711efc362534ec9cda95bbd57b2ebff59996f1dd868a37dc24a8a693 SHA512 023290b91413f0a249aa409de73a22ab622290c81281f699187ea64ceb6393819a9e0e4b9b2eecaf5c25d519d09ba080f7bfbe085dc86c228ab3f7400980d9d5 WHIRLPOOL 2d77548ed757d8649161be1ed31bf4800f601ea5e46fe393dfc6a82e52dba8d8a677232679e054dd28ebdfae3a18fb8be97e1031b69aa23b251effdae6b110b9
 EBUILD ragel-7.0.0.9.ebuild 627 SHA256 d509a44548536bd7cc12b55ac8f52d569122c24ebbfb07695d94b96c2c661030 SHA512 1f88ee8f0bac60c073a2be525ea1dcc9128961d8383f36d992121064746d7c154b1338f4582797145fe782485c8d322119aa7ac8ee903315d056cf17a635a3c6 WHIRLPOOL bee7b21c1a50a04d560356cc78f330311e0fecaca759dc362920707354ebc14d50e4e6ce6a49bdda1b20acc28c39a1c683e1c4221c2271021fbefed8c4f15945
 MISC ChangeLog 2452 SHA256 de1aaa84731ddf8bb9a0f59127336b3572e841557624e6b63716af57e0c1732e SHA512 1ba6a8f3da6816e4bc8a4ef01109880fa81947be416578550323abeb8081e22f9d9386b8059b57cc33ce7e181630b6d113710511d59a7b915988a9dcad070a22 WHIRLPOOL 7e83a1608239a2fec6e67ef79ea847a91c1209458a09ff80dc68b9773dabf53753add3ad404291ba6bcbad164ff830a36be90efb6357167cc7f45681c093f22e
diff --git a/dev-util/ragel/files/ragel-6.9-gcc6.patch b/dev-util/ragel/files/ragel-6.9-gcc6.patch
new file mode 100644
index 000000000000..fb10d9fd2b79
--- /dev/null
+++ b/dev-util/ragel/files/ragel-6.9-gcc6.patch
@@ -0,0 +1,42 @@
+Bug: https://bugs.gentoo.org/582606
+
+--- a/ragel/common.cpp
++++ b/ragel/common.cpp
+@@ -34,7 +34,7 @@
+ 	{ "int",      0,       "int",     true,   true,  false,  INT_MIN,   INT_MAX,    sizeof(int) },
+ 	{ "unsigned", "int",   "uint",    false,  true,  false,  0,         UINT_MAX,   sizeof(unsigned int) },
+ 	{ "long",     0,       "long",    true,   true,  false,  LONG_MIN,  LONG_MAX,   sizeof(long) },
+-	{ "unsigned", "long",  "ulong",   false,  true,  false,  0,         ULONG_MAX,  sizeof(unsigned long) }
++	{ "unsigned", "long",  "ulong",   false,  true,  false,  0,         (long long) ULONG_MAX,  sizeof(unsigned long) }
+ };
+ 
+ #define S8BIT_MIN  -128
+@@ -87,7 +87,7 @@
+ 	{ "int32",   0,  "int32",   true,   true,  false,  S32BIT_MIN, S32BIT_MAX,  4 },
+ 	{ "uint32",  0,  "uint32",  false,  true,  false,  U32BIT_MIN, U32BIT_MAX,  4 },
+ 	{ "int64",   0,  "int64",   true,   true,  false,  S64BIT_MIN, S64BIT_MAX,  8 },
+-	{ "uint64",  0,  "uint64",  false,  true,  false,  U64BIT_MIN, U64BIT_MAX,  8 },
++	{ "uint64",  0,  "uint64",  false,  true,  false,  U64BIT_MIN, (long long) U64BIT_MAX,  8 },
+ 	{ "rune",    0,  "int32",   true,   true,  true,   S32BIT_MIN, S32BIT_MAX,  4 }
+ };
+ 
+@@ -116,7 +116,7 @@
+ 	{ "int",     0,  "int",     true,   true,  false,  INT_MIN,   INT_MAX,     4 },
+ 	{ "uint",    0,  "uint",    false,  true,  false,  0,         UINT_MAX,    4 },
+ 	{ "long",    0,  "long",    true,   true,  false,  LONG_MIN,  LONG_MAX,    8 },
+-	{ "ulong",   0,  "ulong",   false,  true,  false,  0,         ULONG_MAX,   8 }
++	{ "ulong",   0,  "ulong",   false,  true,  false,  0,         (long long) ULONG_MAX,   8 }
+ };
+ 
+ HostType hostTypesOCaml[] =
+--- a/ragel/rbxgoto.cpp
++++ b/ragel/rbxgoto.cpp
+@@ -658,7 +658,7 @@
+ 	out <<
+ 		"	begin\n"
+ 		"		" << P() << " += 1\n"
+-		"		" << rbxGoto(ret, "_out") << "\n" 
++		"		" << static_cast<bool>(rbxGoto(ret, "_out")) << "\n"
+ 		"	end\n";
+ }
+ 
diff --git a/dev-util/ragel/ragel-6.9.ebuild b/dev-util/ragel/ragel-6.9.ebuild
index bfa5a8aa1948..9de48f66793e 100644
--- a/dev-util/ragel/ragel-6.9.ebuild
+++ b/dev-util/ragel/ragel-6.9.ebuild
@@ -20,6 +20,7 @@ RDEPEND=""
 # We need to get the txl language in Portage to have the tests :(
 RESTRICT=test
 
+PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
 DOCS=( ChangeLog CREDITS README TODO )
 
 src_test() {
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index f1c0f74b7f07..46182a60aed1 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -4,7 +4,7 @@ DIST systemtap-2.9.tar.gz 3258026 SHA256 04f2c607512f4867f345a3d173940e1023441c5
 DIST systemtap-3.1.tar.gz 4885480 SHA256 a7b679877502db9b3ac9dfb658c05b49f77e29d42ad2eb36105b62bf2d32f676 SHA512 07b322d5745f570296e287db80f1e370da87eb65073815cf24d532827900453c1cb9ee74b5496b4f3919d176b960caad4479edc2dadf27b5c58898fb7398264d WHIRLPOOL ebb6c085c74747e54434c4ca6b6cf840bc3268dfb66cf95cd7a51553c73b75f4b34ab76ea715163986b601e5ffbaa8340a88dfa5cc203537856c30a3d88fa5c4
 EBUILD systemtap-2.4-r1.ebuild 1999 SHA256 e036dc241ba8779ebf27d0fd21dac609a466931d37b8741a532b07db7e521136 SHA512 930ff6b23986fa9c6ddaa5655db7fd7eb3dbe4e0e1039d14aeedc1993aa89eda63029e50768413c1182793c209a55c41fefac9ea03a673108e142d92f45491d1 WHIRLPOOL 5b4cf502cdfaf6fe13e8da1e69072d1e545820a2e6fc1b5a0c544c7f4501442950325f4b2d8c4c5e846a787630813608ef5462f9c4ad40dc995b68f01cc9012c
 EBUILD systemtap-2.9.ebuild 2029 SHA256 7e227ab12188ea134f435871faa79e98e7e2dd0b59fe4fcfb00474b48599db99 SHA512 e85f7c8f9bdf73b54f11090850e2a401f7ed0978a80281e9b1b6a126dea14f0dc117c71a63e1cd48fec96008812b47b40aa375fd5eae31bd04777666c7955b06 WHIRLPOOL d5861dfcd84548beff94ce6dc8e0124b6258224883634ff058e15f76d1c326ec59563324ca4fb959f964dde1b6e8d87f7bc6dead54a05fab96f7483e6f315b4c
-EBUILD systemtap-3.1-r1.ebuild 2149 SHA256 d69ec4663ff7307c04c3b1b314029f068e98c9d118360a266a614bf833b9f651 SHA512 171686fc58e82bc152cafe06915d7e14e4ff1c61dfcd50ed6658451bbc373f28d7ccdc9c57d5f23fe8d9c87378a0e91d33b0184c87a7e8b9cb7378fe05a60c85 WHIRLPOOL d779f808b11ec0c37cfe998247097a80578122408d88c3bdd4c4febbd9cd5ec7f64de01387db5c1be8c3235ff24630795ce8ca9e0cd1e76350654bda1d16472e
+EBUILD systemtap-3.1-r1.ebuild 2148 SHA256 736685870371be228fe5d899280f5d3d94c78f0ca36b311c62712709484e76c5 SHA512 383151fc2d776bcbc7eae810aae2a829e385baf23a5be953a8fe919ecb8d7895f58fd0dc9ea219f9b06448faf81675eb19bbe3e069af4b6f7fe937c48452e165 WHIRLPOOL e52a1868a7d733fe3379b10305460f7fd81eceb4bb23662e9dbc98e824e1d467f4f00b6762285c1bbf1f9dfaaf9eb0b2ed5fb638fad26c769b0110924ebd7e30
 EBUILD systemtap-3.1.ebuild 2025 SHA256 f9f8c5e5256023182a9c4133728ff881f3b71e93c83cd92e02a2184c270a309d SHA512 eaf7f9e37a7ea1ad61b4193f20414c500f662a61bb19d799b60d84722dc7dffbfecb112326e9cb23fd14e26b4a6d9bc46f1f6431736b8e7f63f4c772ac103893 WHIRLPOOL b3208f7e9f5bf3d5fd70b4acebb0d9919cb2a417367d91c43ef608827516237e686e2541d8d772f43ca566d98ccabbe92aa5fc793719fa1b9b95dc26a93a5e10
 MISC ChangeLog 2897 SHA256 9f126d03a53fc3e6ee4f1b2564fd12afbb5562e0a4ea532c94e977dbf1704a9f SHA512 1ff92e3ab4904c650618a708255eb87d07a60650f9f587d5b1b582465037cc88b9e4fcaa46f5b8cd9689ba7efbe2ec01acec021580e0a273e3db0d67d4725fd4 WHIRLPOOL 55526412784dfb2d328b33e41f06ee657a31f7e2ba947a62fea51415356360e7f300160f3bb99676e011503fb7beacc163980fb132f4dabe593dace786e8a542
 MISC ChangeLog-2015 20184 SHA256 959e517e7b3fe2cfb593f1d9181aacdfbb1ddacbfc972f80f1312f71db215751 SHA512 3dc443727de960e7a94365e886d94303b2801d51b491d9b602c2b536280789662c8c67f2834d3531aafbb13b16f3102d6584074cf477b8ed27761d8a62d4f344 WHIRLPOOL e82a32819f5e23419694d0ad2c707e81460a7e781c501b61d8e4b5f5468ff87baafcb3a7dac53b4b5b5c543c82eca9c734438a04860e32ab78a2af79f21a1b4d
diff --git a/dev-util/systemtap/systemtap-3.1-r1.ebuild b/dev-util/systemtap/systemtap-3.1-r1.ebuild
index f51b8647fdbd..08eb17bdfdcd 100644
--- a/dev-util/systemtap/systemtap-3.1-r1.ebuild
+++ b/dev-util/systemtap/systemtap-3.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="libvirt sqlite"
 
 RDEPEND=">=dev-libs/elfutils-0.142
diff --git a/dev-util/xdelta/Manifest b/dev-util/xdelta/Manifest
index 4c981391bfc5..e71a7636de02 100644
--- a/dev-util/xdelta/Manifest
+++ b/dev-util/xdelta/Manifest
@@ -5,8 +5,8 @@ DIST xdelta-1.1.4.tar.gz 423529 SHA256 345503b60432812840991ea1d79cb10db5f34bfab
 DIST xdelta3-3.0.11.tar.gz 683605 SHA256 0ccc9751ceaa4d90d6b06938a4deddb481816f5d9284bd07d2e728609cb300aa SHA512 41c48e28f92ad50a737cf0acac150fe17d1132e9a652c482d751c8c4e745c6922d576a183eeabae343a1a238ed8c53353e537977628c86eb599ab3d1c01e7c52 WHIRLPOOL 212950d31369e8fbbeb65ae2f6b489f15b259cbbf42242653eace6e3f59b8d592e31ba4994475ba3c79e8c0f7d62ef09b1437548f13c9e7f5b439274eee07e82
 DIST xdelta3-3.1.0.tar.gz 727607 SHA256 114543336ab6cee3764e3c03202701ef79d7e5e8e4863fe64811e4d9e61884dc SHA512 848c90a28018ec3c541ec43be59ea90328142c4705d3b59907fd89e8f6ac2758e288b1a1112fea601884c50ef7f6cf2c1634f539a76bea65a2741d3bb0e9b990 WHIRLPOOL 3183e51fb1d2b2bf5a3e8e4392cd36a7fa4c756b38a4701f9bf46cda47ede87607fc1fda11876f724c8aa4ba9adee800540ca55f014a6b44d547352792d2b02c
 EBUILD xdelta-1.1.4-r1.ebuild 888 SHA256 cb257325d4a74db0048b49a475026bee94f4587b2fb191ae8a81b989801bd47a SHA512 c40d4253bf9b226fd2a5f863170ecbc53a0bef5590aa5d5f3a88305958367bd97c042d0efdf0a9f95dc65d0351ebd271bfc5ea994d20bddaa896fdbc0f5d31c8 WHIRLPOOL a9c0e5854c8c8e2aeb6ca219a32ac5d8317fb690a01f152c1a45a8a0ba9aa9c56275f09de18e96cb9c252bbb8272f5ded6380e0ed01d944213ea040da0e096ef
-EBUILD xdelta-3.0.11.ebuild 871 SHA256 36240c8085b8b1db3ed39d8796c4c56143722bc99718b2353d83dca7e7348d55 SHA512 2ec513f7ae5a37db2d00b7c83ce117c442c8d76ea274834a2fade35795d347c2cfbc55032931c1d4949fbaeabe00f0b8ee69015fc4ab4c51389ecda9c3248ae4 WHIRLPOOL d1149c513b0b938a77e81ab076ea7da5937fbf76a149c1de5dbd0727cb2e50a27e2d61e7b0189224092e668cd4a4e2b4bf069016cd6f6f07b47b6a75962b5614
-EBUILD xdelta-3.1.0.ebuild 1143 SHA256 ea981ac7342582a3c4fc6792e0b36014131787df0e2380d3aae43b77183bedb9 SHA512 c4643a90fd33543e07febf5fb6fa9e08d4efe251658fe6c4d74111071388a9b35fd2e6e9708f227cd2233a3a0b76565d998dd084a2c544fcd894c4d7d2053bb1 WHIRLPOOL ec64741b227fc57c1641d7f951d4e7b22a3a0c681c0dc9faa32dae3036b2c7ca4e8a368cf23160f0f35efbe8f14e20302985240ed3bf0f04cbf931b8758f1321
+EBUILD xdelta-3.0.11.ebuild 883 SHA256 b4509f499de2976efa5aa54809d004332f47b123c80b8b0663c728394ab59d4f SHA512 98acfb3f087ba266531c6fc6928f0cd652c8b1747a6235ab578a45f539bc59758a1242eb118e70f106647ce5178d6d25641f4c11e10651e84d34df78418de49e WHIRLPOOL f559e64c14adc34190cb53efe0083ca4cbb8e27b0d25be1a0f3a047cc521295f3b9bf26209eb6fd1be7aa66d5b1967c996673b87afef18452dbf0b0a9828054f
+EBUILD xdelta-3.1.0.ebuild 1155 SHA256 115e341cac3cf3922961aca000a51fa7e99aca9d402c9ac76793c3585761c9c9 SHA512 94fed6fbd47e2a3449b321c9c44e1723ef40b4c258f7e8d044f8dc0c4876277aea642b7718e6960df8db69a1bf02a6e1c18a83710c25415ba656d7db704db37e WHIRLPOOL 00a3b3c7fab7a1d94a58ffc9053ce7b73c987b537c31d02e2014286f599cd74e477e230c96e96830aa8c7f88fc217faf3463dd0b82dc846e1987ca70cddee832
 MISC ChangeLog 4417 SHA256 7523f8c27c63b2e2cf96de89ebcc4ee000de2c0c1c067c6524f6f41876700c1c SHA512 c1c145449bd0d42370eaa3dea661e2dfc1063d2e43dec8f53ba14fc21e54844f73607b54ef1b73d74ceaa92496eda3e710004cfb7bea36719c2d07bd092dddf6 WHIRLPOOL 58d89cb2016189ca3761cbcbfc27c8c20eabd9832a73211c09f682474f084a6c778abae947751f96d58e7ef824bfbf86f23ccbdd636b56a0dab0ceedaafa838b
 MISC ChangeLog-2015 12875 SHA256 05c6c133701079a084ff5efab3cc7293335aa501ae95127329a9b37537c7ef9c SHA512 6cdda923ff5472760b2864c24542c0d400c8c9cd0b07f5591837cb331ed96981038e3db60c674cf51407fbd27009af1a6b959d08851c9ea8ce775b18bdb4cfbf WHIRLPOOL f503909f94ac9c0f1dfc5eb1910bbfd59334965a54984436e6259ff3066bcf97a662b619c87489d6a86ec7a4ad740c8d476a7131ac399ec6f95985c1ae06f3ce
 MISC metadata.xml 381 SHA256 96c29bf628ac991cf94828f8d37c9a4567a476b4d93fe4b364b1fab5025b23e1 SHA512 2c439c35f726e18396d3a0f2e923cf2f2d0eb7a9798907fd0f039dddcc9fdbac95d6e89d113fc8a937ceb260c90901e0657ecdea2f0bf423ca9456627b2912d3 WHIRLPOOL edf7e6e2f9940d6093759f4914c389bfef7ae4991d9e8b5bad56f102e174df42e2065a68b88851601677095925b1b84568adc079373b6f17802d92507e93338f
diff --git a/dev-util/xdelta/xdelta-3.0.11.ebuild b/dev-util/xdelta/xdelta-3.0.11.ebuild
index 7afc64d68730..9aec8203f46c 100644
--- a/dev-util/xdelta/xdelta-3.0.11.ebuild
+++ b/dev-util/xdelta/xdelta-3.0.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jmacd/xdelta-gpl/releases/download/v${PV}/${MY_P}.ta
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-fbsd"
 IUSE="examples lzma"
 
 RDEPEND="lzma? ( app-arch/xz-utils:= )"
diff --git a/dev-util/xdelta/xdelta-3.1.0.ebuild b/dev-util/xdelta/xdelta-3.1.0.ebuild
index 1203efc69ce0..b9ae9918aa94 100644
--- a/dev-util/xdelta/xdelta-3.1.0.ebuild
+++ b/dev-util/xdelta/xdelta-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/jmacd/xdelta-gpl/releases/download/v${PV}/${MY_P}.ta
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="examples test"
 
 RDEPEND="app-arch/xz-utils"