gentoo resync : 13.10.2019

19 files changed, 20 insertions, 20 deletions

diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 56851dae28b2..f7bf86e5cab0 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/b5i2iso/Manifest b/app-cdr/b5i2iso/Manifest
index 7a57ad26daab..b62a4b6610b1 100644
--- a/app-cdr/b5i2iso/Manifest
+++ b/app-cdr/b5i2iso/Manifest
@@ -1,4 +1,4 @@
 AUX b5i2iso-0.2-segfault.patch 388 BLAKE2B 151e6f41afe5e241be181de2b0ce50a2ee0bff64ab1b04ff99501b2844705a1295cbfea28b85446d2aa899eb6e3a58b9f40e992c336965f8b07749e1698af53c SHA512 133fb1c4da9391e1465f0c820fea2038859c351dbf9b9a8de293294c66857a68f0f544bbca9b8a927a615cc3488a691db6a0bb532bea98362904876634966a5f
 DIST b5i2iso-0.2.tar.bz2 7503 BLAKE2B a1ac74596213845c49dd007390445640ebe6226ae6273f4e05d567c58badb2ca2698c06951be7348c63c89920dd8034e376343d387665ae08ee13747efcf903b SHA512 2ec6ce30225370898aee9876937b70ee38ed68b6515bef13eb010f1ef1970894995461d5dc5f44ac24d2e7e682774e4fc3c6d2bdde8f744129a3f6103b50f9e4
-EBUILD b5i2iso-0.2-r1.ebuild 594 BLAKE2B 13e612d861460dd99e10fed0c159bbbc27913876d9726f5a6f996074775298a8f67494644d3ab9fd4ae737cdfe34a921e1126065dfdbe94a45562bf5c045a39a SHA512 e7f6fe6d7b5777679e8b17d72da69045d5924fbb0c8bdcd1cae7c867a4fe6e946bfc0ce06c2ac4021f5122692e57da174827f0ed71709e12caddd39a0cde1738
+EBUILD b5i2iso-0.2-r1.ebuild 577 BLAKE2B 542ce92536cb3684798e0ba31ba39701051c6fb3c8a6eaebc5b43688fd64f709ee20e5564cde5d0f43b45eca74ffaff5b81d489026076ff0dc1e77669d67cc0f SHA512 9de12c90065bf198bb4320bf5829c6a389730715514ac17b1f03db778af65fde3bd14b5c88f99f3a1c7fd7beacb860a30d686a1df9838b155b6b6c5c574b7bcb
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-cdr/b5i2iso/b5i2iso-0.2-r1.ebuild b/app-cdr/b5i2iso/b5i2iso-0.2-r1.ebuild
index 66b67deee95d..3b1cee7804d0 100644
--- a/app-cdr/b5i2iso/b5i2iso-0.2-r1.ebuild
+++ b/app-cdr/b5i2iso/b5i2iso-0.2-r1.ebuild
@@ -6,7 +6,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Convert CD images from b5i (BlindWrite) to iso"
 HOMEPAGE="https://web.archive.org/web/20100116120705/b5i2iso.berlios.de"
-SRC_URI="mirror://gentoo/${PN}.tar.bz2 -> ${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-cdr/ccd2iso/Manifest b/app-cdr/ccd2iso/Manifest
index 559ab7130e16..2d34b17fcdc2 100644
--- a/app-cdr/ccd2iso/Manifest
+++ b/app-cdr/ccd2iso/Manifest
@@ -1,4 +1,4 @@
 AUX ccd2iso-0.3-headers.patch 240 BLAKE2B 536e0114f0485ae4e79f8801f737c380cafdc37c6d2dc1f272415385324839cfddd56af7f07085bfb181ae1a1e05531ecc6869b6f66b35dd89c8c9d50a1ead1e SHA512 e0d334fb378d5ad0dc25653ab810d3c55a0f8c19a03b4b2180352a20e2b9e405209b37448f57a72fd7c2628601e6f5528118db3fe9e431d580c7d9443bb440a3
 DIST ccd2iso-0.3.tar.gz 158221 BLAKE2B 5cb83f62f6b98e725c5c30e58e9082fd6eff612169d3b8fe0d244bd567f7319879c99792400f788b736874f5ae026ed53154b8e5599f82fbfea879e634f8f155 SHA512 40e0e5bd792c851dd0549a08a3a0d7226cc05893316dc9575d4c9131dce758d992081355de569e3e66dca310545bf3a17c1cd6431ab97e790fdbe5b19c09adc1
-EBUILD ccd2iso-0.3.ebuild 552 BLAKE2B acfd988539d01d0a97a2871a61a421cf8f732e051bd287d3413cf886b872aab5678620a6b6a9ba389c4d4828bcae80b5fe9560a256f0633d44320032f4da5c7b SHA512 933868f8f4c257195b488eb774d9d2d805345538da81bf1e65bb230eb3a8f577f2d68a58fbcc78bf24df0da9c0a85b2edbbc1108dc04ccabadf85c0e1cb1ee40
+EBUILD ccd2iso-0.3.ebuild 542 BLAKE2B cd3b513a8c4f7d39f77343d8f25558f0c884b8aca909f8aa7e0b398cfba7e36e30ea2fe0a184deeb4cab7a71cc1d45bea98f55144a5f471e33b3aa6004fab636 SHA512 443eb2dfb80bf01a250c6832106e5017984b6a08b1d8fcc6fcd3cd525875fd1cadc5122e6b7a2f3f147f8d83210e760ef719159c35ff41d5dea4fb457484842b
 MISC metadata.xml 241 BLAKE2B f90be0c12adaf844accdc218553814e3e325c943055dcfb4f4b6041909ff8fb99a1f7bdd8f948f721f7face33363d917874a0d8f82355d1271fe3b2ff6c0b94b SHA512 2a6542d23b7ab38216d47177060122b4850c76f519984c2f65f9db8d06bc19b0261db695002209efedf047cc693b59bd3387ad5e88c214f6a34ed73339e4615f
diff --git a/app-cdr/ccd2iso/ccd2iso-0.3.ebuild b/app-cdr/ccd2iso/ccd2iso-0.3.ebuild
index 5de8728f6ab2..27a136490d28 100644
--- a/app-cdr/ccd2iso/ccd2iso-0.3.ebuild
+++ b/app-cdr/ccd2iso/ccd2iso-0.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/ccd2iso/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 PATCHES=( "${FILESDIR}/${P}-headers.patch" )
 
 src_install() {
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index 6013f3468e98..4f434345015b 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -1,5 +1,5 @@
 AUX cdrdao-1.2.4-ax_pthread.patch 16846 BLAKE2B a76c7c68c53a57731e652325d98f9f2ce434c9c9385e8583fb948fe2e1c120ad564a95bc247993493afbef1163206c30fc8a141d72ee723b3bcabb20a5f9f36a SHA512 83789963569dbaa599294bd79447e3351309675817eef683e2f90974d68fda00c705eca43c015128d6c6e9ec98f14bf7f205f8e3ab46f33c1bf0afaf0f055694
 AUX cdrdao-1.2.4-wformat-security.patch 4864 BLAKE2B fa300eefe5d714de0245a9e745d13f051dcbc14590efb33a367dd113474984618e62e347fc3cdc26a057169ff95bdde25b36d9b7bcb25aa9cdd5fd9b07a42ec1 SHA512 a40fd8c91fa207ad52f3cde9318fc4422f14aeea15bab4d2cd1e04d3f09a2fc2b666397cdbddc89245c97a6a98ac155c0ecf71c1e2993a366a21016bd337a33e
 DIST cdrdao-1.2.4.tar.bz2 1442181 BLAKE2B e1163b25c165a7acd7ec8c53069794724d93f09a486150255a58985e3fd0a222ba7ac5c124cb7a6991cf440ac701651be38754615fd3d0d295affa93595dc388 SHA512 41f20275ca44ec9003d0e3ed280cc98012353005cda6f544ebfa44f3f79f991845c0ef17af74db9456f1bacc342a7fd48c9e942d757927a4a9ff91808f7bbb09
-EBUILD cdrdao-1.2.4.ebuild 1288 BLAKE2B de36a17653fde3a59a5098bc3773fc7e230e2c7c24397f62b3df1ad94a09914383074da5e4285acf0d3bc1d9d0b1d3642e35a3ba36ab829639172f61738022c9 SHA512 ef39204fa7034fdae5357bc041701feb750a144e9d43293c932f87ea6838d630c634571fafdde3c261f69e723935c4a4d286f03d6253074aced906ba574b6042
+EBUILD cdrdao-1.2.4.ebuild 1278 BLAKE2B 65a3964b50946c86cf9bec4e375e159c131c382897950df530aa87a2d4977b73fccb101439350e4d153432185941f3872180192cbebf62891dfd4a627ff4d3df SHA512 6fec4cc11fe4f78eb8cdf2c7f79d451d233ccb22c0c42e13259be16c3e36d0633c7d5af4fdb69caf8ea959d141f1cb84729c4d7cb8486c26c8a1d8615aaec31a
 MISC metadata.xml 395 BLAKE2B 271ac8836e1bc4bd8b8405ab9fdfdaaa4046b47bb44b07bdb78d063853a82433117d69d4dd46e89b4f42008b55f10e69d8262340bd29fe396061add32ed9959a SHA512 66d6f12a07e09dd91c828d34941963b1a498e1be14f0cadcb145b47471e148559280fb237a68c1d99ba3c2360e0603a231f124b950b3debde76fe476a5491351
diff --git a/app-cdr/cdrdao/cdrdao-1.2.4.ebuild b/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
index d48dcaef29dc..453abb57b57f 100644
--- a/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
@@ -16,7 +16,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
 IUSE="encode mad vorbis"
 
 COMMON_DEPEND="
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 44cc33a5168d..03df80493f53 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,5 +1,5 @@
 AUX cdrtools-fix-clone-uclibc.patch 2582 BLAKE2B dfa564f67e15dfcdab9e654572c95f89787fded558e88edecde89237ea5097b6a6cc0233b5950f0df460490af415255a56130d27b7198b3c1fee279e288835f9 SHA512 23031747c1d7bc0292beb754f059381df1f1ac7851c9fdb7f296c933f3a9d7c4e52848f90ab50c459432628d74a7546752b299d74199259d84eb89ce92ae0077
 DIST cdrtools-3.02a09.tar.bz2 2156745 BLAKE2B 3e7a7ed65faffc67d53df8dff78562dd28f2e71bb01c36f9c57c033a4a812e6a5579a212322a15c8abb5c8005d38e6e9ba5a5bfab46d9a729a673aa8ce3425e7 SHA512 59c31186f163c7aaa96083efeb0bc31e697c5d53d3343ec487eddd90dc8df6cfee50a69859a64a7004585c73a081cc453cc647c563b32ef74070d075039342d4
-EBUILD cdrtools-3.02_alpha09-r2.ebuild 8341 BLAKE2B 8e79f49060382bc560ec36e7921365c4f3691ef28d43132a0810d11af8833ab926938045f57e7ce665ff7aa410c76dc764f96eaec4f3482be84005b8d6497ade SHA512 617e083f76882f03ed486c123d622926a5a76da4b25774d2e8cc39ca26fde2c5adcf037494e113aa5016b8c2cbed70250e758cb30d129d68436adf8ff21251e4
-EBUILD cdrtools-3.02_alpha09.ebuild 8265 BLAKE2B 33dc93262e7030aa38808cf24cc48953f25c02104ee9f4277685ce2765b997c2eeb6bd0314bff3834131ecedb9c05b31c3cb9b4b04cc0e8d80f0126caa9a0b38 SHA512 1bcbbd468dff045dc536553223f7b478dc73aad258df3f5a52d9e391d858c8d7f1b29a46fa8148ea373b0190af7317f96045eb3953181effe29048516484c39c
+EBUILD cdrtools-3.02_alpha09-r2.ebuild 8319 BLAKE2B ba0bb2b0a734f3eafb229450e0e3975d931037078acb6ba8b150587dcb5b453e0f15fe02936a5c795effd34d470473f9b07649d50c9800f5c30050cec98e30dc SHA512 44dde2b5a613443676eafdbb461189b22725cd86c0e3fe0f6b66fa80f7bb2f9c984a578b8ec76f08ddd3519efa9f612a4844ae62adc63d33a5eb94920466b0e3
+EBUILD cdrtools-3.02_alpha09.ebuild 8243 BLAKE2B 9bd51603cdd2ba6a8e5e525ef5cfb2799695acdb088997221e0862e95d03b051f0e0cea014599420647799329a43b38b94bf5a30d7a45dc9fbbe542d42929521 SHA512 d5cae780aec3321a277cc84479b729c1e00d3ae4417018c757c511d16e13e2e8f9d3bc3c0e1cffe425e196f7db7f425dc13f8ac2ee730929183f5b30fafbd748
 MISC metadata.xml 533 BLAKE2B 13eeaf0e3fd17234f44138fc6b6fe1b0ef5e369b823a1adb9063743702b9afe86f1d939bb451df1cc6337c2e3790e38b1f890e68c46eeed9210ccc6d96e0944e SHA512 ddf004043b6d96ef6ec697f2452df1df68b234e4b899c047743a8cdd971167607f91c05435bc0a7978f65e13895fecec31a20a2b2f659a696fa3e4e704e18818
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
index 5bf70f56e71d..2743c501d42e 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
 
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode selinux"
 
 BDEPEND="
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
index 52dd6b39b287..85f1b5f37ad4 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
 
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode"
 
 RDEPEND="acl? ( virtual/acl )
diff --git a/app-cdr/cue2toc/Manifest b/app-cdr/cue2toc/Manifest
index 12d4549cbdd5..3a58aa928ff1 100644
--- a/app-cdr/cue2toc/Manifest
+++ b/app-cdr/cue2toc/Manifest
@@ -1,3 +1,3 @@
 DIST cue2toc-0.4.tar.gz 76689 BLAKE2B f5171457f0061ca1062501b54dc360b8b76a3fb402a0041fa0db4541eb41ebc04e332fafa918fac7d7ace9e50348d867ecb9e41ee09c8b3d5e621fa64a72de2e SHA512 37fd4680890a38681331d4fb83a37daa9ddc39e45b2822930328796f1f57ac39635c609b27340b1ab06dd5b73720e77d96b601d1ee994c5ce836077a368cd95d
-EBUILD cue2toc-0.4.ebuild 405 BLAKE2B 29f03818e8f33818f88a72cbc031ce3900c557bcd8aea4dd333b09b76f54ee4250c8745402382a3bfff859d01754af3a54ff7a63717631425a55f25e11f3c075 SHA512 409b926c4c5184c8f2800d562647fabb5e2d19d6eb457781f9227a762b4882d85d3f11158d4cb6cf83f579595901e584aa694d6cdd47533cbba4c5a3cf607f77
+EBUILD cue2toc-0.4.ebuild 395 BLAKE2B 573906540bf1ea60db6f583166af6f4ac6ebb7d9fdc069adccab30240ec0c9780f26ef2cef1b6686389de2a67a831731ba1d6651a8c2b36fa673e25cb6f68c08 SHA512 96c4434bdb5e179048d1b294619b37f259dc1ea3258e5f161a13730aaed86042287005f361c6011c385d6aaa5dcfdfb0e1e5081528e7a4affc1b3d1453d5866e
 MISC metadata.xml 724 BLAKE2B a402466ee09177145cf5854ef3a48fb0edbe2a99f09b8c31a5400f66475d5d0350c93e4a55c5220a1cd3af5efba8dbbb5d5cec8a13a46ca9a8c6ec087c17c420 SHA512 2759d0408975e9fe04b825956c9957826cc290f36ff277779dea87250618f0774eeaddaaad73e96ef8068fd130b94e2b52bb6b3a45dcb17edd116cd4fcef966a
diff --git a/app-cdr/cue2toc/cue2toc-0.4.ebuild b/app-cdr/cue2toc/cue2toc-0.4.ebuild
index f93c0b309e98..53717f1601d8 100644
--- a/app-cdr/cue2toc/cue2toc-0.4.ebuild
+++ b/app-cdr/cue2toc/cue2toc-0.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/cue2toc/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sh ~sparc ~x86"
 IUSE=""
 
 DEPEND="!app-cdr/cdrdao"
diff --git a/app-cdr/isomaster/Manifest b/app-cdr/isomaster/Manifest
index b39b29c07f35..af8190aa9446 100644
--- a/app-cdr/isomaster/Manifest
+++ b/app-cdr/isomaster/Manifest
@@ -1,6 +1,6 @@
 AUX isomaster-1.3.9-iniparser-3.0.0.patch 780 BLAKE2B bd7f3cff83b01bb241e005ce200016dd7ee30ac8798a9c250924f20da55f1f774558b64d37bf0a4e30dc44f18ed06f585bda4e3c2c0edf31b203ce5554d7cc50 SHA512 0681ab5b4578f67b1eb9e8180fde951d4a34dbf40452ee29a6f09992afed6da5084791d86778296964cb39d59d2eaf51b97972e02582a5d6ff3698655bf09134
 DIST isomaster-1.3.13.tar.bz2 245085 BLAKE2B ae2333f5511aae8deed76e556cf6055f7ad257d613dcf5c85274946f31f0da879b5fb7953d065046371c6f20faa15663ecb3c5d976c4dff404140cd09d23207c SHA512 dbc6a77fabf8d454bbde25a7540e68820bf773bc991176e5684e87aeb6044ad1bbbcf1c4f537148c18ec8847572949a52d6578a14f68b8ad3f21d542685859ba
 DIST isomaster-1.3.14.tar.bz2 257674 BLAKE2B 7b7abeb586eb8c6964d7959222195c1999f81275dea305e7c4efec1fef6dd9d9d4969552e6a6a4a882a9fe227ea072c6639879896e50799db9e67732e1331ad4 SHA512 5454baa4ce4e09df8ec4331718df3e1d81c0647867a21cfc4c4b15d90e509371a636e8fada7e624c0cf6d1b03b564bf89a2a26e13b5ec1b4cca91407bbc518f5
-EBUILD isomaster-1.3.13.ebuild 1507 BLAKE2B 7376caeaac6a4cafafe18935bde267b56b09bbc30255598c0d66a1bb7f67b22bb5e23abfc94dac2d9a7db4947144e293c3046331093ac7ba786d9f2942a1774d SHA512 7504b26b144abf3c32e9fbceaa0768db744d4934df495c9c40dcea003c7f5edc3ff5abcde9c5f5c9fa1e857b72e9d3a251bade719859776168848f8ed3e1444b
-EBUILD isomaster-1.3.14.ebuild 1463 BLAKE2B 94b41867d4993b287787ec280f8c0547ec0aba5dc44a44a820fae1a96eb1e78dcb562412d3ec8d6ecdeaffe5e598990957e820598af15bdf0528bcc960f1467d SHA512 d4d890cb728f0a3169c3f404010b03b23981913756717d991278325e4aee788258e039b2bf4be1b8c5eed9cd59e63ad74c9b7348d22383cebf9eeea30091e927
+EBUILD isomaster-1.3.13.ebuild 1497 BLAKE2B 88afc28b4f0f546da3653fb9c12eb3516f2ebf83942a1642af18f6903bfb49dfa38b7146c2d332f56008226e18aee4392c16f8432cb57a9b6afbc2655cafc626 SHA512 35738b6a1c753d438320d07c67da6026b789df4a5a993f458b7b93703a326d8f35f5caddce3748eb3ad81198968ae3a0e98efb23ecc16eb4b08090e7d205ef33
+EBUILD isomaster-1.3.14.ebuild 1453 BLAKE2B c62f70400e33d1235eff34f570b52ebb654fd63b9a5ce721b073a751c0f1770ce582363812a1a449d60966829320a3534659c1bf3c991141048c0195b7e8e376 SHA512 03766e4094a9febdba590203940c21f8be1a2b10f69c230c59ab94424de3ddfb59176d3899e74c43933effbf9a2e3574bbb26a063f0c30afffc79349d470b55a
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/app-cdr/isomaster/isomaster-1.3.13.ebuild b/app-cdr/isomaster/isomaster-1.3.13.ebuild
index 5497413a82de..09ec9cd68ee2 100644
--- a/app-cdr/isomaster/isomaster-1.3.13.ebuild
+++ b/app-cdr/isomaster/isomaster-1.3.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 RDEPEND=">=dev-libs/iniparser-3.0.0:0
diff --git a/app-cdr/isomaster/isomaster-1.3.14.ebuild b/app-cdr/isomaster/isomaster-1.3.14.ebuild
index 8dd88dcd9ad1..324c31de4479 100644
--- a/app-cdr/isomaster/isomaster-1.3.14.ebuild
+++ b/app-cdr/isomaster/isomaster-1.3.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND=">=dev-libs/iniparser-4.1:4
diff --git a/app-cdr/nrg2iso/Manifest b/app-cdr/nrg2iso/Manifest
index e0dcb3edd5b6..c7b1623c1bfd 100644
--- a/app-cdr/nrg2iso/Manifest
+++ b/app-cdr/nrg2iso/Manifest
@@ -1,5 +1,5 @@
 DIST nrg2iso-0.4.tar.gz 8553 BLAKE2B 2bd7907dc027c1bf602447c32f24f82d1627a90922aa32ebabecc15a3b3bb8d021f0dc3e13661351626a36365c76e325cded37046d7ac0f84ce6239c034a87e1 SHA512 fa9e081984345770fad713cdfc5711c8c9ace3981d1cc8130b4c2b83eca517c7765eaab758a34dd5e59846f24c6e3f76f3fc89e984305c4358859b0b28e1ec68
 DIST nrg2iso-test.iso 55452 BLAKE2B c4bd651bde0bc66b781332cc186828fbe3fbff2c77150f5ac5cea5f42824b0016fd8b007991d94801a64edc43ce84e050a2db654380e3a0497b33d3abb11cdf5 SHA512 905c0b30482a3b411e786a4cc225dab7513a33c32bfd312717f4666543323456d2b6b6ddbeee75ed194e04cf28d472c87ffbdbf783c63abd06fae7e433601fba
 DIST nrg2iso-test.nrg 362652 BLAKE2B c122ae3b0c310e5c823ccbf33906135aa74f1001b02dc31f7fc0fa77b87b5627d31ea8746a64f0e8a2450e0ec20dc25f5fd72e202113237a95bc219f321c79df SHA512 c29f7e7d3f692a03fdbc5d0c1a112ead73efb45b102302f7f1685f9f2ccfe1eed9b690a3c3f1c7d7d79da9197fdb40dd06ca7bab4187e5dfca81d47268b550b7
-EBUILD nrg2iso-0.4-r2.ebuild 965 BLAKE2B aa2f6ae8666fb3f816683fc803b3f7b534858f5290b612519c8a1f1a71e9f182181c35390634580ed67e2640eef73b2b148cce95bab662d0d373495273db009b SHA512 778e679f7d0d828dddf9f94cfb8b339d303ed1a7c6ccfea25f9d942b0674faef02b15b2c83a21677d24d1333effd7e428829ab7f3db5251e4e58fc7a1ea0f3e8
+EBUILD nrg2iso-0.4-r2.ebuild 955 BLAKE2B 5800361a8ec2dc9533e4b9483e16aded2b9ae0500cd45c4e11b33235b8f4ed052cf6b1516021a480ed5efe4ecdfabcd95b258de435926a0b4b49231832f1f2a0 SHA512 30ec8219c3625a2e7bf664f03de2e322cce16b46e18e716e81298845dcb94999af1cc4c52ae1b0dd16c32fb1a126f4cb2792ead953baa8c0b75fc477b32f04be
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-cdr/nrg2iso/nrg2iso-0.4-r2.ebuild b/app-cdr/nrg2iso/nrg2iso-0.4-r2.ebuild
index 25312a18564b..85852d7f6da5 100644
--- a/app-cdr/nrg2iso/nrg2iso-0.4-r2.ebuild
+++ b/app-cdr/nrg2iso/nrg2iso-0.4-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://gregory.kokanosky.free.fr/v4/linux/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 DOCS=( CHANGELOG )
 
diff --git a/app-cdr/xfburn/Manifest b/app-cdr/xfburn/Manifest
index 0678c67638c9..65077f8710a9 100644
--- a/app-cdr/xfburn/Manifest
+++ b/app-cdr/xfburn/Manifest
@@ -1,3 +1,3 @@
 DIST xfburn-0.5.5.tar.bz2 819546 BLAKE2B 180f50e9dc8e9bb2372ac7335374b09eade93b6477e557b4282ee65705e55d1f391578343e3473061921cfe296e0da9dae0ddb8823fc5daadc673537331f3085 SHA512 37574aa7dcec65c26a8fd5019c3776196763fa1ebb0f531002f5bcb72a6eb0ec19ed994dd14726988766d890ef257c39c26e64ca3f5944386c03d9b54c26a90a
-EBUILD xfburn-0.5.5-r1.ebuild 1053 BLAKE2B af433a5afc037674ec8c39c25649033512b802e5d7dd03fc12dc5fd7a1b7ddc2632f3ad951440a2cd79386f5544f89ebe33e290c832b42963048ca98df0f4aa2 SHA512 708fb2f20d69e08c3a0648155bc6a199bd489fbcab4d09d3fa86d011239f691d7dd5454f4778c0284bc025d8434267c41d34bce964b933c292c89c8727c9886a
+EBUILD xfburn-0.5.5-r2.ebuild 1047 BLAKE2B 0207f3ddfffd357f38f842b5fe8c8ae8f1ea672cfb0f2ad1d3a0ab4b1cca429c985a3c7af2e50edf5977a70ee4dd0673c57a5ea4eaa462125da716e936eb6f6b SHA512 4f76d4b3de84628ba7dc326a5eef0a17e4dec7b53488d1dc070386c79bdb2b76168398c7c06bae93e8f1b6de3621bdb46e377b7af7f05b63a4d40037e021b16b
 MISC metadata.xml 481 BLAKE2B 336b6da9e50fab974d5d320a93ffa10e24cb4621f13835e6a0fa86a95067b28e26fc3c9ca2e17eeecc69f0c842f98bdcebc273bc164cb26baa6b87f39f7c85ca SHA512 1ef204c9fe28b54edffac8132485e3bc326b0452a3014f7be50378be871621e62771f53810b441e4db18b657707e875b67fd2e1231609f62534adbfee2270fc4
diff --git a/app-cdr/xfburn/xfburn-0.5.5-r1.ebuild b/app-cdr/xfburn/xfburn-0.5.5-r2.ebuild
index a72eefa99623..c9c6a6592466 100644
--- a/app-cdr/xfburn/xfburn-0.5.5-r1.ebuild
+++ b/app-cdr/xfburn/xfburn-0.5.5-r2.ebuild
@@ -18,7 +18,7 @@ RDEPEND=">=dev-libs/glib-2.32:=
 	>=dev-libs/libburn-0.4.2:=
 	>=dev-libs/libisofs-0.6.2:=
 	>=x11-libs/gtk+-2.24:2=
-	<xfce-base/exo-0.12.5-r100:=
+	xfce-base/exo[gtk2(+)]
 	>=xfce-base/libxfce4ui-4.10:=[gtk2(+)]
 	gstreamer? (
 		media-libs/gstreamer:1.0=