gentoo resync : 13.10.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-14 23:22:23 +0100
commit: 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree: 76e74807bc479502e13866b581b6bf86734ec634 /media-libs
parent: 30d6f67c98d149508509d5e86f176d558793acc0 (diff)
535 files changed, 1749 insertions, 3824 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 1feb319ce00d..e7ddef744665 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/a52dec/Manifest b/media-libs/a52dec/Manifest
index bb4b70d75235..10eabf10348c 100644
--- a/media-libs/a52dec/Manifest
+++ b/media-libs/a52dec/Manifest
@@ -3,6 +3,6 @@ AUX a52dec-0.7.4-freebsd.patch 343 BLAKE2B faa25733684a22eb18f27c34fec4d776e00d1
 AUX a52dec-0.7.4-test-hidden-symbols.patch 637 BLAKE2B 542d1bfbf8722d900b25fa6bce240924e82ca1b903a308634b23c23acf59e606adbad54951da39b3c1c60cf95fe9c8bad87da09cb10894ac82de3e670b199cca SHA512 097f4f9cb82f01cb42e5536bfb4fa5ed6cbe85da5f4a31c19e83e1d1e73f8724a3828f0585834142f861bad3417fb9c55b21581def85733278870c3c48c2e8fd
 AUX a52dec-0.7.4-tests-optional.patch 299 BLAKE2B af245be87277559c2fbc1695180d4e451ccc6a76157111d57fa86992c4cd4dd59e166b7a68a7d799bdda56d0ac5ae3ddfe5c433cbccf6eef4a999e2b336eda0e SHA512 9f5c0afbfd656287eafeba04eed34070f53a77cb53981d64ff71edb96bef6cc2c0638e0be6647086cbad87ead97aa0215cd6cb413258d0122bc3f45bcf4480b1
 DIST a52dec-0.7.4.tar.gz 241507 BLAKE2B e8475b391a3afe77883f5683f58a64d2babfcf93c08a3bcbd0208476323e9c86c5d268d2738efddd2093a1c47886deb22185cb8f00c4ec8b4153f64e1af1f49e SHA512 4b26fe9492f218b775fb190b76ecf06edaeb656adfe6dcbd24d0a0f86871c3ba917edb88a398eb12dccedaa1605b6f0a0be06b09f9fddd9a46e457b7dd244848
-EBUILD a52dec-0.7.4-r6.ebuild 1439 BLAKE2B b3d5cc7a25f0694ea9a771ae3af526a28a6522b0e2bf094dfc6eb6f56d424fe90502878a8697f12618288c27116deb5d4d4c861bf4b735ba889f8695f3209bdf SHA512 8437c6bdbb0ec560ad57829cf6a2227b07886c27db4a954c3c1b3e402313ad710ea8c0dad575c0f325deb64bb3ba9ddb064255aa37751a27f6f3b6578af54d50
-EBUILD a52dec-0.7.4-r7.ebuild 1566 BLAKE2B bc6e1c658067476153d9f046491dc0cd0e8aeaa77a3aae784f619d9ad93aee4905351e81795127b85e0eb7afcada94cf365d8aecce84444a71b5fe39a577c99e SHA512 4a33964a3d8a2bc42996060313aefbffee0780495ba0cc2bf91eb157c012ae2cad2d8dd8dcff411eca08125484dff972150484be007f131b95a6e54651420214
+EBUILD a52dec-0.7.4-r6.ebuild 1417 BLAKE2B fc3ca2ea9917b4bf8327d6d107cd19ec4ab6521124471af30f29867911a8ac9e19796a1917b8e695ac15991e82f6111c4307f1dfc10d687a145ffefc148bee3e SHA512 25dd3e085329a51a0e431aa9b0fcea366c56834192180f9954a9431b446ad56f7d34a12b1012154bf41bf529a6058824a0c28b06357883a88681ed04b92b2d07
+EBUILD a52dec-0.7.4-r7.ebuild 1544 BLAKE2B 67383e08b8cccaa1528d47a4b7aae9292a5c70f5db3a84401c24a15846c0a800b17a12ebc57361deb3d4d1a47806c67f584c568aa0d64140e019dceffc5f4726 SHA512 a66d844e9b2d606757379a5a351b54de45991740454f822d258010a50d4d8673fe6a32c74774ba07e84d86a2a68fee5e62cb65704ccf3bea2bb0b344714bcaee
 MISC metadata.xml 442 BLAKE2B 6e92f797dedf977ed4dd7321249af91b56488c98f9bb64cc8df4fd1ed1012a501d0f49ef5cb063d52e0636583dca77c4376df2e1071da889f598415aa91d801a SHA512 acc8d37733d5efebd4e65401dfff5926a64e13f641dd383343a26b666fe13963191782990ec4571c18803584808b249cb60646a06d91437f0a6793237eb99ca0
diff --git a/media-libs/a52dec/a52dec-0.7.4-r6.ebuild b/media-libs/a52dec/a52dec-0.7.4-r6.ebuild
index 8af3a605accc..04166c82ea81 100644
--- a/media-libs/a52dec/a52dec-0.7.4-r6.ebuild
+++ b/media-libs/a52dec/a52dec-0.7.4-r6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://liba52.sourceforge.net/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="djbfft oss static-libs"
 
 RDEPEND="djbfft? ( sci-libs/djbfft )"
diff --git a/media-libs/a52dec/a52dec-0.7.4-r7.ebuild b/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
index 0fe011bc5422..f87862b037be 100644
--- a/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
+++ b/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://liba52.sourceforge.net/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="djbfft oss static-libs"
 
 RDEPEND="djbfft? ( >=sci-libs/djbfft-0.76-r2[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/aalib/Manifest b/media-libs/aalib/Manifest
index 0f3e138e0603..b925c2d40a1a 100644
--- a/media-libs/aalib/Manifest
+++ b/media-libs/aalib/Manifest
@@ -6,7 +6,7 @@ AUX aalib-1.4_rc5-key-down-OOB.patch 504 BLAKE2B 1742e3d22889e7faabaf0fcacecc7db
 AUX aalib-1.4_rc5-more-protos.patch 1499 BLAKE2B abf425195f87f83dc019ded382c365f1f780c37f5d5282c27985ef064e53221d369974c3147634b1bfb1af6df7232088a71fdd12230e587c475c5817180a602c SHA512 c2b723af88a0ca70505086bc7436e5c213d2f52698b293392be2a6b18ef26ef285a09e460577a4a60b328df45b1d61c50064f3ba1f3df43a844082f2c5da25b2
 AUX aalib-1.4_rc5-tinfo.patch 709 BLAKE2B fb7dd0eb1e39046c66de0466b0411f97fa948d9da03719fcd759a7331c7da0a6cfcba92353ef5363cf651501d73ce4fd29a5baf94897f10f0518284ebb4db10c SHA512 2abab613af549f4c24f7d617cf65de773e7850ec8485dfa23de2405ed59cf14f7cb70c2f1b701e27ae541e5f75302f4d28c3f866303bfc901a96074c9d9d534b
 DIST aalib-1.4rc5.tar.gz 391028 BLAKE2B fd527716c0484d45fa3b75712a24301bd485fab8191ac1d5c6d35f8af093a00e11f0f8d2797ddcc32f4d87a39649fd50145dcc557e5ba98e67336cff2bb79002 SHA512 3e4506eccce3b81ccbbb79a4a1b90abd39e2259e6043fde90f70b9ca279bd4c37758a047167267b97c4ec92f64fb17c7c8f548114f0d0c6e78ddb9463b5f1299
-EBUILD aalib-1.4_rc5-r6.ebuild 1779 BLAKE2B e89ac319629bbe00158c7b9fee75e44681a050cc30e4beb6023274268e646ed8e0e27bc27ac982d70157807f71d8238d793c3c14fde689c6ea47674666e76fca SHA512 0217cdbdaacb10eef8148600c37623f63dd9682a9f652fe1c8da17676f4841fe501b5e3e8c9bf8f32463d66ef4d6520eec4787885756f5166eae1944667c2d78
-EBUILD aalib-1.4_rc5-r7.ebuild 1844 BLAKE2B c0da2a46a489a14d24268c78789fb2a381746533910ee313067dd577155711210ca2853e572e0cb9b9903dbf10fa8e6d6300cb2b199296e761f9f6bcb0dc39f0 SHA512 b8bb79cd21dd348258e0eb6fda05b75a009497d923801a742fc2dab142194e8bd1b60c3f640ae15063735721b6f0d387c4ec613f889e460ab982e1b5c3492477
-EBUILD aalib-1.4_rc5-r8.ebuild 1974 BLAKE2B 1f81b49b00fa524164e47efd3df390616d8768b7b2b2d886c21b0dd4c4446c4f3edbc103630647be6c07875ce96d01e1b30e03ec5d99f9fef215cb0264a12cce SHA512 d51d828d5f65486d1f12f2e4a0f599f6df99344d505b6f4a03e8d71457a83a44769da9b5758acb0c38c6ca8c539f58e2c5d23d5ad92f8a5b3fae0c5098efc40b
+EBUILD aalib-1.4_rc5-r6.ebuild 1757 BLAKE2B 96346a567f3ce645a81b21df05201aa04022e5fc64ff77e2c87480305efa81f488eadcaf0317b3e48d1f7267d2e387f7dea2387a4fc74878137be30bb79d9ea1 SHA512 d8dae2e701307d88184ccd85867feeda9ee190aec6031293fa8cd4d2e3055c17836b7bccc31ca2f726c25fa82bcbbeeafa795de76d0b2876c6daaedef407a72e
+EBUILD aalib-1.4_rc5-r7.ebuild 1822 BLAKE2B 94e890b7f75f4c6f77934380d3457f2009f446f8a5c24be9fcf779a6e57ec0d325be56ce32a90e5ef1b0d6978d5cc3c8708bea09ea2d54c7bf1f95ac08a8a5ed SHA512 2915a30e54341f8b94b27aacfe857a4f6a27e538836ce7ffd83bd0702d159ac5c43859bf0816839eb5175aeea147cfa09a640b7949824324d37fbaff6cab375c
+EBUILD aalib-1.4_rc5-r8.ebuild 1952 BLAKE2B e63df56ae0ff3bd304763f5ed09af2ad6bd875f812c24eaddc4eb9eccdaefaef9a2291e0861de3f6024c4c2f1427f589fa19b9bb86c1633decb07397895baabe SHA512 7a34dcbd79a379078fe37a0cbdd75d166180ad6903e693e62b72e26a580ac1b582982ff956ab8fc8cfe16b43aea686e35d249d5512c81fdafa9f692c7e511061
 MISC metadata.xml 415 BLAKE2B 3f7c9a9f7118b0fc7e4134f829c28bc47e637256ad0408e7964cdf617df77e4f5c7742d05850444debc0f6ed7aeac0e756bba5d746092cd9bda69797d5540f66 SHA512 f49d1e3652e86e14a048ad6944c108bec49ba19b961ea89b171d55e789e9c42bd4f981086dc643daf1c805fec79de3831488bdc9c29c2c1a6d6e4b00bb786def
diff --git a/media-libs/aalib/aalib-1.4_rc5-r6.ebuild b/media-libs/aalib/aalib-1.4_rc5-r6.ebuild
index 4c2a787d388f..b9c8de5910dc 100644
--- a/media-libs/aalib/aalib-1.4_rc5-r6.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5-r6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="X slang gpm static-libs"
 
 RDEPEND="
diff --git a/media-libs/aalib/aalib-1.4_rc5-r7.ebuild b/media-libs/aalib/aalib-1.4_rc5-r7.ebuild
index 33b7a1fe0432..64ea7bfd9bb9 100644
--- a/media-libs/aalib/aalib-1.4_rc5-r7.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5-r7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="X slang gpm static-libs"
 
 RDEPEND="
diff --git a/media-libs/aalib/aalib-1.4_rc5-r8.ebuild b/media-libs/aalib/aalib-1.4_rc5-r8.ebuild
index 6022782624d7..f95be8002a20 100644
--- a/media-libs/aalib/aalib-1.4_rc5-r8.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5-r8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 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 ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="X slang gpm static-libs"
 
 RDEPEND="
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 2c4d532ae1ea..89b1a601fc06 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -1,13 +1,15 @@
+AUX allegro-4.4.2-GLX_RGBA_FLOAT_BIT.patch 701 BLAKE2B 76b9a2aaca022bbdc143b25adf4d5ad5bc62a52d72222bff3b9fd7b115f62482e98d69919a73324265b3f4a4aa548eb39fe613576166d51ba676d47ed9bdd948 SHA512 d3cbf252917a3dea316475fb8add5f966d6317a8563ac4e15324bcc34585c71c0dd71287507d8ee1f62b223054f009d28eece16656954597a9d35a1406f68dfd
 AUX allegro-4.4.2-Werror-format-security.patch 5100 BLAKE2B 1e52bd5bb0eaa4df2c0c5ecb9d5421d9e41c074a7535dc29532ce976f5562de3c59979b33c042d33da4ee775d190e93036d3a5e3579786b10933f1ecec99110c SHA512 42a4f59d10a5bf3290178943181ba23ef08074abe94bd32d2f6f94f316424bbc0031350793c3d5610feef62a4a42080820fec5dbdb27802c1dc1abd0e64b13f9
 AUX allegro-4.4.2-gentoo.patch 756 BLAKE2B 9273b38794a904eedadf8210d5519eda46103e2441090eeff45bfa7810d0112177f334bff66f943f915f5a48fb41542c6aa1b9f2edbaac2130dcab15332e06b5 SHA512 8abac7ade02fe7592ea77f782562d74b9cd45006e63e71f2965f8fa53c37cd5c3fb2543301bb1610a8f41f5c50b734ab9497c52721495c59fae4f3e434cbb615
 AUX allegro-4.4.2-glibc228.patch 1586 BLAKE2B e25f3f34a6a980b1a2067daec2cfaba49bd650fe065b2ccc4f9ee70a191b8fc22f3fe2501b54ac8fb2dbdb4630958f68585895c4f813a67495690a8d830d4879 SHA512 8783c04c765c3f28afd0b94603056e4a28a968f329f8814f60b074327dbd0f22e0e124df17223f04f840fdbdb5db7c9b868ccb90062902699df44b59c3b91060
 AUX allegro-4.4.2-rpath.patch 182 BLAKE2B c6bae5a2ca5cd77022bf07690c5eb4d5b78f442f5951098bb30b036e37c0272fea6955908df73fdacef2e5f8698ae57a99dd73de32a056a9580a0e808a8f54f0 SHA512 6e262dc9dac274bdcbeeb2cf54b1c073a69db4a4abeb720caf5c58cb1d692286300c93fd9b7d3cea2f01aea4aeed33a34cb9e585a58ab083685c5f8c937c6536
 AUX allegro-4.4.2-shared.patch 247 BLAKE2B d5bada972b4c2555f9ad9da18b30b224f5aa70762d6d68883601df933cc44788b6e5a78289d0bde863f788b65cf583ea828ffb6455d03d1d7493b00ff6c40b77 SHA512 5b982f857197dd9256bb1a151b544484b0178fa8e90d6b876bf2d26ea37c6e6bf6f44d1b729f9d2ccd11899024dccc2afbfbbfb73b816cb17e97dc3eb4df51e5
+AUX allegro-4.4.2-static-func.patch 416 BLAKE2B 3f7436cf87dd66c6ac336a3d8be8901a4679ae3054c1fe8ecb1012b5da883d3bfffc41c7421af6d95171e24e5ed864c8a6b029a9b387ad76c082437b406a8891 SHA512 ad1cd77c66f75192ccf5048f0742b9f420e611b7790576c3915721d104299b9e91619451d615d3653737bb2333b1cb170acb3202f0293be92b8be3371445ac19
 AUX allegro-4.4.2-underlink.patch 456 BLAKE2B ede5f9e5195b1c54460f584924afd9daa64c795a0e083499084c7377f1989bc0df621339ff3988bc2a997447050ebf3fe0f5055fbcef8ee21dd66dfdf1ca003a SHA512 0e873aa6d1b6e72e2e4b46276f0a2a4ffe816c8d0b6a10dd9462cfed826b40d7b3461ebe51e595e9f2e7a5d2f19fd261b1ad0e05f60b77717224911e59a537d0
 DIST allegro-4.4.2.tar.gz 4674902 BLAKE2B 9f43fad416348425692481524f6c15808ee03946d93df4a072a46557817ccd5f6ae7eede908ca4a02a0a9e49f9a7c42909c48c14923b2155d3999ff370401006 SHA512 ad4bc1c15fc83bc8a019031fed82f37a793664bb6683cf023ec05fd9cd945f00f43764f3126892426036249c63afa5678fb4906407bb325ce5827b36aee0fa86
 DIST allegro-5.2.4.0.tar.gz 7822903 BLAKE2B 50538e27276fbe1572a660b3f1396bdb9b542dc2aafaa819a4108e0e2771731cb6924cf1d0b7a7bfea1ff5c12b4772ff58dc571c81bb6a601d31a2083f5f9bea SHA512 c5f80191005165331635464ffd345369943d37dcb55345176a7171614e12826b25d9d74ab656333302d6682d404f1b46a5d94c0dd23d7873151e6e488d62c776
 DIST allegro-5.2.5.0.tar.gz 7849326 BLAKE2B 8d8995b9ad252b81c534099ffd91d81bbdcf4a34f7ca7c4fb7dd97e5c075869c212fa68445a5fe479a675d755ad0414976c11cbc112ecdd61f1fa09704957b21 SHA512 c6341396ad7340233c1297ed122095e5c2d129a32da2350b4bb39c4b74f8d56d57ec4e608defec471d63fff51d786f0a9f3844be82f81cdb3d48d5bc49908b12
-EBUILD allegro-4.4.2-r2.ebuild 2586 BLAKE2B 9436548344a878ee11ffdd2fd20c6f7c6f7157ee1c8f73f9d55e376d386fb8fdbaa5a1178c3bfff2e0fecc9c83ec0275b9883935354746277c4ec0970e2090ea SHA512 8ca49bd5e811faa9e707cb0af64c07857286f6af9f962adc97ae33d3c267e996010bd4f3ce76faa99414ce922f6eb6bb123b9671da388019c8109ee6f8805fa0
+EBUILD allegro-4.4.2-r2.ebuild 2710 BLAKE2B e3355fae46eaeed67fd426adaffd704db607e2d5d3e0b5f158c131ea5034f7003e41e52772525d0e29d859c5a7788bcbc253a60208e6632d0cc9c0e236b2fe92 SHA512 2bb250aabb2a1d048ac2a0bb2fd9dfa3774a23539488ef9d79187bfb33e67c6aedcec6386b052d41047b625d0f06bd0328e8e3426cf7e8eeb742845ce25bacd4
 EBUILD allegro-5.2.4.0.ebuild 2704 BLAKE2B 00be6767ea9561888a856b5645d62b50b35d52881cfa39e0914e60bffb55409db6eb9c81280deb14307140527830428eb638221dee672eb545912946b04479a4 SHA512 6ed0efe4520dada386b2bf29b660696606afe69a723f64f699980a103e5a4b3206724dee9f4c6c77e43009146747973880ad96610cf410b6f5c698904d6a61e6
 EBUILD allegro-5.2.5.0.ebuild 2792 BLAKE2B c68cd10374a280e4e230954b1843c3e0c5d5c3854da9c7309bb7ffeaffeae8d8c69938aefb4dd3cec619f3de54da34b3d4b5aeb5a49da9696827cd395591bddd SHA512 d9771f255e1ce41b34c0c880bbcc8fed5ad81101b0beb57b2fa0d27dc648f73450de07376b08e9ccfb1bb2c28e278bfdd2889c1fe815995898b465b693c36d75
 MISC metadata.xml 1034 BLAKE2B c1cdd935feae4561903bde181428ef0d71743f85e7756f507087528641471b4af3d1339758c3d829f8244b5cec7cc74bb7563699b9e5b05146ae4c6abe8dd5af SHA512 21301cc66fe94a4d728900cd5856d3e0d27507b1d340e36246c183b13232cb7f9c9da9f8b20428bd387c7216a892dce169c2bc885caabacb08a32892faffc994
diff --git a/media-libs/allegro/allegro-4.4.2-r2.ebuild b/media-libs/allegro/allegro-4.4.2-r2.ebuild
index 5797f5829b3f..08dd7f1068c6 100644
--- a/media-libs/allegro/allegro-4.4.2-r2.ebuild
+++ b/media-libs/allegro/allegro-4.4.2-r2.ebuild
@@ -46,6 +46,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-rpath.patch
 	"${FILESDIR}"/${P}-Werror-format-security.patch # bug 540470
 	"${FILESDIR}"/${P}-glibc228.patch               # bug 670781
+	"${FILESDIR}"/${P}-GLX_RGBA_FLOAT_BIT.patch     # bug 672858
+	"${FILESDIR}"/${P}-static-func.patch            # bug 696034
 )
 
 src_prepare() {
@@ -61,9 +63,9 @@ src_configure() {
 	# WANT_EXAMPLES doesn't install anything
 	local mycmakeargs=(
 		-DDOCDIR=share/doc
-		-DINFODIR=share/info
 		-DMANDIR=share/man
 		-DWANT_ALSA=$(usex alsa)
+		-DWANT_DOCS_INFO=OFF
 		-DWANT_EXAMPLES=OFF
 		-DWANT_JACK=$(usex jack)
 		-DWANT_JPGALLEG=$(usex jpeg)
diff --git a/media-libs/allegro/files/allegro-4.4.2-GLX_RGBA_FLOAT_BIT.patch b/media-libs/allegro/files/allegro-4.4.2-GLX_RGBA_FLOAT_BIT.patch
new file mode 100644
index 000000000000..54ff4f97fbb1
--- /dev/null
+++ b/media-libs/allegro/files/allegro-4.4.2-GLX_RGBA_FLOAT_BIT.patch
@@ -0,0 +1,20 @@
+--- a/addons/allegrogl/src/x.c	2019-01-27 20:35:26.209055856 +0100
++++ b/addons/allegrogl/src/x.c	2019-01-27 20:38:54.135570782 +0100
+@@ -650,7 +650,7 @@
+ 		return -1;
+ 	}
+ 
+-	if (!(render_type & GLX_RGBA_BIT) && !(render_type & GLX_RGBA_FLOAT_BIT)) {
++	if (!(render_type & GLX_RGBA_BIT) && !(render_type & GLX_RGBA_FLOAT_BIT_ARB)) {
+ 		TRACE(PREFIX_I "decode_fbconfig: Not RGBA mode\n");
+ 		return -1;
+ 	}
+@@ -674,7 +674,7 @@
+ 	/* Floating-point depth is not supported as glx extension (yet). */
+ 	i->float_depth = 0;
+ 
+-	i->float_color = (render_type & GLX_RGBA_FLOAT_BIT);
++	i->float_color = (render_type & GLX_RGBA_FLOAT_BIT_ARB);
+ 
+ 	v = glXGetVisualFromFBConfig(_xwin.display, fbc);
+ 	if (!v) {
diff --git a/media-libs/allegro/files/allegro-4.4.2-static-func.patch b/media-libs/allegro/files/allegro-4.4.2-static-func.patch
new file mode 100644
index 000000000000..ac107d387d56
--- /dev/null
+++ b/media-libs/allegro/files/allegro-4.4.2-static-func.patch
@@ -0,0 +1,13 @@
+https://sourceforge.net/p/alleg/bugs/398/
+
+--- a/addons/jpgalleg/src/decode.c	2008-02-13 14:04:57.000000000 +0100
++++ b/addons/jpgalleg/src/decode.c	2015-09-03 14:57:57.888485546 +0200
+@@ -477,7 +477,7 @@
+  *  Reads a string of bits from the input stream and returns a properly signed
+  *  number given the category.
+  */
+-INLINE int
++static INLINE int
+ get_value(int category)
+ {
+ 	int result = get_bits(category);
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 233fed1ca70e..ff37be07bf9c 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -3,8 +3,8 @@ DIST alsa-lib-1.1.2.tar.bz2 947423 BLAKE2B 09cd6a625d8f681c5515fd925191fb5468158
 DIST alsa-lib-1.1.6.tar.bz2 989316 BLAKE2B 2aec62d262148571cc1b93ac8053002b61266951caf8b2855fc65b699ec928672748a21ba11a25e14e752a4a85f68b2f77b5ad6af9b2f1fc5e9de41313ace54a SHA512 00117769a3d5c609019b975188d6e7a07d035bd0461f54c5f291e14667620506f1adb6d61350f78d54648850f31965aae3ab0e697bf9e09c988e2d15bf6b09f0
 DIST alsa-lib-1.1.8.tar.bz2 1002562 BLAKE2B a531ab501943924d007f7ae0e4489deea805ccbc8f2f02d3ee392aa2dbe54ffe31f58ee1744308f851a68f693c83125088708e901d0d83e4a7a5f644ef448aa3 SHA512 50ae107c6efe8200b4c41e0463e099d16e149332f1d3a22c3e81d3e7d980b7f93f3610fc9711ef62067caeb1054e7ea612ba3903bf8a91ebeffa48687cf80eed
 DIST alsa-lib-1.1.9.tar.bz2 1058187 BLAKE2B 60454be162a0f36334602586762f8ce657d2883636bcb65ae91dedce62297bd40f3dbdc6213ef773542708b367f8796e143b1fc987c40de6d5d5a69a648f6b18 SHA512 402e39cca82d17555e3e52ef06b8ed9dcf58531da393809a7b5cf18658299fa90ee8a60bfc5213482d7a02b13140c441f1333b144556f44ab4adb786a2fb3c49
-EBUILD alsa-lib-1.1.2.ebuild 2105 BLAKE2B 2be4af40e69e4b3e06ce8ea954848c143090ed275f19dcbfd49b867d1edd03e497a248a2f16f5ed9181ea409be5ca46864445f729d634174e8376b256b877b8f SHA512 6f02e3234a638ebf9e88f5c6db7f6edca4f6f76acb1e7c09bc120825a6d1c994f83baa22d5c9b6c2f07fc6717a4e32714d7cab13ccddbc653e57ea489b17fdde
-EBUILD alsa-lib-1.1.6-r1.ebuild 2047 BLAKE2B 106e4eec3488a7f76a505f8afb0ed4687f11893aadec2afc393a2c198f387d848052954a110617cbbc451fc446a3a166b445eed101db544bfb9c44859ef92d05 SHA512 8c95080b33d5360f66e586544223f94bae816bcc94115c3f3a6b03c065ef9f54354ccdefcebd6f306facc05f258a89a80cf48465db9369492a88234ee17723ed
-EBUILD alsa-lib-1.1.8.ebuild 2054 BLAKE2B ef917bf820c98222c6261d119ff8ca6ab4c456835d72d696a17e7ffe2acfa58cff6011c1b28b06c0e75b53f48ffde12858b3149ac3c296ea1d0995e62f878e8c SHA512 fd96a3e11f9dc9978ffbc81b0ffcad643da78f8d8fc74d22fbe2207461e113b2a0836acc092b674c24003102563b6ea7fb41690ad2a463d82953debf2fb0667c
-EBUILD alsa-lib-1.1.9.ebuild 2060 BLAKE2B 862171dadddc859c404a2f7fbd795b72d64f9e76bdf44900eca9827fdcddb91bafde3120089dbe47d76c063aa94d1bf3b1b742f66a5e2dca11b9a9a2c69f8668 SHA512 7db838e58d526853a13174e92ee54f5250be04edd352facd471208d752cba2937069191669a4efbc416ac70a13f10e82d5377e6ed1366f2d86e554d6fc6673c7
+EBUILD alsa-lib-1.1.2.ebuild 2123 BLAKE2B 97a24d65932fdd5d1a08a94d77e1a456cdc20501c50bfbb5766df74a6246d4ba5f37578240543c9c2ede9544e0a50ea11e4f886e9c77e7ee872c7ccb30ab2aee SHA512 7368a2744004ceff3ea41b39f5417cc6f190bcf2823f1db76ecffcec753e855c3cc6d2668d02b95f4df4d507a0d087f0c7dd2fb5de7a94e95d4fba83e9757050
+EBUILD alsa-lib-1.1.6-r1.ebuild 2065 BLAKE2B 79c479da20df0e08706f803ee4d5dc5a2240371ee02c93095d8586ebf0ef5371063efb21fbc58973e9baa78d33046be01cb10a02e5f7b8d6ff6bd662690b7241 SHA512 e5f4b04898e2035e4f764ee41ee04dfc2814fd8d9500d709c0cd198a6a811c0f85c852cb18fd0c66b8517ff1dde17d13c349c2dd7ab49184856b50e1c5d29c5c
+EBUILD alsa-lib-1.1.8.ebuild 2071 BLAKE2B 529064b0608b135c5514f802ac6eae8184980d809c59082f71e4ae44c5853e8d29b48cdb6c489498dbd9ed4a8ef6b44546d47c1ba182cb1eecaa3a70480fabaf SHA512 93ffab825893c1ea5189021d4d7e8df6e267694d4628b2d700c34fbde0bda026d6268e754f5af853a2c3b9f3477eef0a4d8a153923712fe446ea806c8d7b3b55
+EBUILD alsa-lib-1.1.9.ebuild 2078 BLAKE2B e26d36574a8610f822ed53cdcca3a6199f4b6d23c544b39996684ca42dc51a13e5466499ecaabc9ad07bed13f1f44e97797eba99356559db63cc98e3a3c38018 SHA512 f37d9860383098876f1b8278cce9f7b9711f2a47f0d9b117927b8f5c3e41c9cfa7cc59a5d80bdc87f60ab406fbc36d95a63344338759501818f41815697a647c
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.2.ebuild
index abe8e719be71..9be87d91cb22 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.2.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.2.ebuild
@@ -10,7 +10,7 @@ inherit autotools eutils multilib multilib-minimal python-single-r1
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
 HOMEPAGE="https://alsa-project.org/"
-SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
+SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild
index 9c6322c42e45..fa05737670a5 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild
@@ -9,7 +9,7 @@ inherit autotools multilib multilib-minimal python-single-r1
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
 HOMEPAGE="https://alsa-project.org/"
-SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
+SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild
index 80efa633f902..6bd44f7bd1e4 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild
@@ -9,11 +9,11 @@ inherit autotools multilib multilib-minimal python-single-r1
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
 HOMEPAGE="https://alsa-project.org/"
-SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
+SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python +thread-safety"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.9.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.9.ebuild
index bd05d5482877..caa67002ec6e 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.9.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.9.ebuild
@@ -9,7 +9,7 @@ inherit autotools multilib multilib-minimal python-single-r1
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
 HOMEPAGE="https://alsa-project.org/"
-SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
+SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/media-libs/alsa-oss/Manifest b/media-libs/alsa-oss/Manifest
index 7f7a53f3cd3a..24eee5b5fe71 100644
--- a/media-libs/alsa-oss/Manifest
+++ b/media-libs/alsa-oss/Manifest
@@ -2,7 +2,7 @@ AUX alsa-oss-1.0.12-hardened.patch 370 BLAKE2B ed779e5565ece8412880faa806d7b595b
 DIST alsa-oss-1.0.28.tar.bz2 291500 BLAKE2B 8884c91809bbdb9a20a7ebad7c076786ac5896d312741abf612598429e3d476530a198d8b4e0adb3abe2aee118b0b4b875b2b99ac636403ec37a583a4e234bcd SHA512 7069b7d4d4c0b840608dcca99a660aae1f81f6ef45dcf48fc66553b05de260d033105aa685c8ca05fd4d157d12d83860746a05afdab4f310919c34fa235ab03e
 DIST alsa-oss-1.1.6.tar.bz2 291588 BLAKE2B 2db4b6d80a17518aeadff8a8f12a40eb4f9e549c46ef4df52d49333c039aa285320a179cb632df5dd48f51d56513499e59c71914236c9be1e0ba493d25bbb270 SHA512 f58ece2a5aeb846032a06d372eec0bfa1cde0bd0590b1700d4f7698aa29b10f13c8d53670297ec95a94448955ba6ea9e94a4a79129eb2cd734c8a3658197036d
 DIST alsa-oss-1.1.8.tar.bz2 291800 BLAKE2B 47124c4edd14878b202e6ff6866b5441ffa0991ac3011a3db1efcd1dd2a0c27c9f2b8b38c2a51e8b46cb5714a97393a462154cdfaf89f1238244f7b2635a7740 SHA512 42966af0ca1be33b4ab1e20b2e3320056ad6caf6ecc5ecde3ae19571809a2fa924dd91d9b2a5d5b6f345b29d937b079400d2a165dbe2b8a33b857cd406c4ac7c
-EBUILD alsa-oss-1.0.28.ebuild 876 BLAKE2B e322d42d78583a296b49e32e316d4f7e0bc41fd4cc40bbc8873e5bfe0cc47a46c84af4813cfe9f916da8d5cf30a0577e0fe9030f2387f62b99cc8ac2a2a675c5 SHA512 519092dd88cb74fdb8a2fb9e87de716dcbbf9e19c0c75f82245535c2827467f9a1f429f4477f68f23a9804026b90e265fef20b31db48db41396fcfaaf37a417a
-EBUILD alsa-oss-1.1.6.ebuild 914 BLAKE2B f4d40c1a5ba78451221491f5eb7da72cc3e228cf306dd0bd82097ba3a1b6e34a9896c34e903da06486752b893d116a243e89cca6fdc1b99dbe47b5ac2759fba0 SHA512 a05bfc6a2ee9e964c79f831a3854c4183781124250ca70110fe91ce03a2f3955a89417623c7798d89304e4431fd4fde670f31b5e82cc426515bf3a65589904da
-EBUILD alsa-oss-1.1.8.ebuild 1017 BLAKE2B 5573474b04d9cb1db0356cc877599ff6d2d0b2f259bac78b67e461e1760e1ee9a04a2bdd05087a8758dfd6ca06d1ca17957d20c5bcdb1679f4bf8e51529bc304 SHA512 c956b8a1fa829550caed1960ff0b5001f8712440dc29b161c3fcba93aa17cce5b19826c73f13e60e290b73267b77c3dd51454ef3385ffd95bb163bb7afbf7fc8
+EBUILD alsa-oss-1.0.28.ebuild 894 BLAKE2B 6e0b285df68d4521a637b974fd733a2b69a543ffc8a6421ac3d0044470b254f900118bf1a31dbba9601fe1ded18de55c8733e4a86865cc8278b4d9fed536ddee SHA512 4512d2e7d062e878be3fd9bfd4aee8d741cb07050e6a09398f64a6e41d2fda8ee35aa7ad52b68458f41744fc4376382da00e880558f3dcd96e58e19d1c6ffe2d
+EBUILD alsa-oss-1.1.6.ebuild 932 BLAKE2B e1387fb2b563da837866cefb6c602c5812caf7fc37038cca43cfe5a2879155531c519db72ff0c79b0b93c3829b89c5cc578ef192ef7db46f9813f829a2efa489 SHA512 8cd3d6fda6985870eab8fa0129d2ce125a8467fcd0875a28515f5e3fe2a4985865539d7b384538a7b1d65c0a938b55394290b5e8195950c7c3118764830ccb49
+EBUILD alsa-oss-1.1.8.ebuild 1034 BLAKE2B cc3843326253f600b76c3d035d6a4a34454e3f49d09a127a848766e386cf7f89e9f678a78220e29c9ecb79eec245c78eb0c2d934aacd6490f87d850f61272183 SHA512 efd41162c78313402f8cfee0d6bd041047d0e26250ac0d735b83c034aa65bdd9e662f213b25d2b8dfe99add028c75dde81082421b049c9ab5ed794cbcae867c0
 MISC metadata.xml 217 BLAKE2B ee5131ede673a41d69ab787db1d05f6d64afc4d625294c8314d0db362124dddca5b31ff6d29cc41ebb3f464f4665e2bc9bccfac84f69231ebe819d262e8ed7c7 SHA512 783364e33af22e28ba41661e2380968c95f6464ae9ebb300d542ca159a54c4e53cf5e8b1053a72e75902f433e90fa26f6456fa127fca6daa44542bda57779e5a
diff --git a/media-libs/alsa-oss/alsa-oss-1.0.28.ebuild b/media-libs/alsa-oss/alsa-oss-1.0.28.ebuild
index 17d4aa3aa1aa..71ea93cdfd5d 100644
--- a/media-libs/alsa-oss/alsa-oss-1.0.28.ebuild
+++ b/media-libs/alsa-oss/alsa-oss-1.0.28.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Advanced Linux Sound Architecture OSS compatibility layer"
 HOMEPAGE="https://alsa-project.org/"
-SRC_URI="mirror://alsaproject/oss-lib/${MY_P}.tar.bz2"
+SRC_URI="https://www.alsa-project.org/files/pub/oss-lib/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-libs/alsa-oss/alsa-oss-1.1.6.ebuild b/media-libs/alsa-oss/alsa-oss-1.1.6.ebuild
index 22382341b9fa..f02d30ddc372 100644
--- a/media-libs/alsa-oss/alsa-oss-1.1.6.ebuild
+++ b/media-libs/alsa-oss/alsa-oss-1.1.6.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Advanced Linux Sound Architecture OSS compatibility layer"
 HOMEPAGE="https://alsa-project.org/"
-SRC_URI="mirror://alsaproject/oss-lib/${MY_P}.tar.bz2"
+SRC_URI="https://www.alsa-project.org/files/pub/oss-lib/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild b/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
index ae4797fb418d..865ec9ed9ab5 100644
--- a/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
+++ b/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
@@ -10,11 +10,11 @@ S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Advanced Linux Sound Architecture OSS compatibility layer"
 HOMEPAGE="https://alsa-project.org/"
-SRC_URI="mirror://alsaproject/oss-lib/${MY_P}.tar.bz2"
+SRC_URI="https://www.alsa-project.org/files/pub/oss-lib/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/alsa-lib-${PV}[${MULTILIB_USEDEP}]"
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index c1c7188e2017..013edda01da5 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -1,11 +1,12 @@
 AUX assimp-4.0.1-disabletest.patch 298 BLAKE2B 49444fb1fdd3cb2aafd9b29de7a454ce8720707bb6f569d9697cd82303df7edf08d909ef8d8926b17203ad1126f13a6445080191649a96af837d1d7e02fa7667 SHA512 320f2f76ffbebf3a5d3064faa3bc16e0cb597ad994c35b1344aa3a60a07839e67a9d68b80f8723b663d491c6a37b6c95510e987acd04dd519d489a82e3d7e729
 AUX assimp-4.0.1-qt-5.11.0.patch 2230 BLAKE2B e99a1e8dcd5f3c5d8f2b5f116ccd2b5f9a7377e3c17f9d7fc6d4962c4a573c5fa68fced8a714c94cdc1e0bdeb7f2a0b2c4fb714f7c54bbe776efc68911ad5455 SHA512 44bd08a59de45bd6431e97c8165ab7d9c08fccc2bcf704fbf063db143152f9e4aa1e9f5ff7c104bd312a643a42259af6e370caaac92f40d369972b21e692c928
 AUX assimp-4.1.0-disabletest.patch 298 BLAKE2B 49444fb1fdd3cb2aafd9b29de7a454ce8720707bb6f569d9697cd82303df7edf08d909ef8d8926b17203ad1126f13a6445080191649a96af837d1d7e02fa7667 SHA512 320f2f76ffbebf3a5d3064faa3bc16e0cb597ad994c35b1344aa3a60a07839e67a9d68b80f8723b663d491c6a37b6c95510e987acd04dd519d489a82e3d7e729
+AUX assimp-4.1.0-findassimp.patch 744 BLAKE2B b78cbd88d16d58defbe2970d4969cc9296956c70469521dac7fbb90d2e8e478e077c401224739f6a5f343a2f4579c212cedf939dab482c9235e1065fbf37ed6a SHA512 7523363a5fe387cdfe3f927ede667718ae42223ebb615234f1b3c0cd80d17cd3590ac7af27279748685a263522029784b089f34765c9f5a7e98873a3ad62bd2a
 AUX assimp-4.1.0-unzip-of.patch 242 BLAKE2B c977c94d4ef44d9e185738e7f3c2e5bda59ea52e11c5900387f9e590201f4ffff3aa6dc9a60452f8f782ce37a510cb85cecd1f8df8b23b331688b75f69ea3890 SHA512 e8908f0c44afc4969b9fe670de418ae9df592cab47b0c9a67958c37414740c527a7ee1ef6d61de19c926f08bf20663be66dc54fc6e3d9164e6ecf34360dff37b
 AUX findassimp-3.3.1.patch 624 BLAKE2B 6e1df31dc55739e01807eacf90558be6af791c4054b438f765cd733639c5c6fb34046871577ddbc7194284f81228000e48218a5a890d21390976778928362d94 SHA512 5f8f7e061da89e7fb4705148b171e631e16a3b7ba7156b1cd3a4b8987adc066f0b4a36f7d70a9b174f3bb27ebe13353435d81cbe85a1166c75148e8419311be1
 DIST assimp-4.0.1.tar.gz 44625148 BLAKE2B 50cbb6096e89fa311a67cf4f526be57a19f41fe48d59bcdd8d6fd309a988cb19c0f1a4c175301e4c299cb644882a6e8042b0d9281319424faf7504688764e97e SHA512 260b4c7e738f857d8364c4878ea4e789ca676180821943f6d9bff8f56e5f9377ea29660dca4e130c681a8aa12fc32f155adb1d78ca260ba242e68b8afa6cc1bb
 DIST assimp-4.1.0.tar.gz 45417293 BLAKE2B 74170ab48b64ab357ddd9da58f1218d0c3c0a4039345dcd7ae396aca3bb47c2f5ea2ee8b61b7d81c68c2e1237cd3ba516b816038400e9960b6c0cfe031a41e54 SHA512 5f1292de873ae16c9921d1d44f2871474d74c0ddfd76cc928a7d9b3e03aa6eca4cc72af0513da20a86d09c55d48646e610fd4a4f2b05364f08ad09cf27cbc67a
 EBUILD assimp-4.0.1-r1.ebuild 1385 BLAKE2B c658a4892def26404509ced1538aa9635da5b5dda3ba00b53d5bfcc14efce0803e045aa687bb116dcdda93ad933fdaeea655dbb6f9c25160ded30d90638338db SHA512 8e003f3e6bb196f1085a7903add296153119d1fbb948f87c00332f3c970853f429406d037eed52449126fdc5566cc19b6650a518ba8fc9a6129735dda0ecfede
 EBUILD assimp-4.0.1.ebuild 1334 BLAKE2B 69cba811c5f5b0957c36b257c1bc52c30b15c58ade44c5cff8a1e3697eeda607d8ed5885362a5ad8e1b8ba1c982dd8155f325ae3798a982a39a8d0132e68cd4d SHA512 c47fddb39ed30f9c8cdd9fcdf5b43703c07134a8e7dd187518eaec8392792614716252d39f19262278b8cfe832cf92df602b08855d1d0724b74796f851068d7a
-EBUILD assimp-4.1.0.ebuild 1298 BLAKE2B 19052951f2e7af644bc6987b0960bbf778e265d6e3daa1db6531c0a84086d47f09e21cd15ba339882ae3a2506291048924ef8b416af3ebe9f43c192c8802df4f SHA512 1792c1643fe99b57c3a9ba5619a5e318b1533e405aa78eb6572bb35364cc1e8a18173bded6b1932d94e442794f83bbf6a52ec635b46843449ca8f39af0e39567
+EBUILD assimp-4.1.0.ebuild 1335 BLAKE2B 32beb38eb69125088c91f83c06261c4009010293b983334cd52244909eac316e4e8df042fa9a4450a0e53a67994240a0de3b55f7174b1e5d2703e62854ea9d10 SHA512 eac34e7a57c085d9b51d9415f9a4a09eeee0da8d88bc0b8e119208ef6f49f5262bfc2729275f2a2689efc5dfdd66641190b343113365a3a7968d217f2591027b
 MISC metadata.xml 463 BLAKE2B e8815466468672f2ebf597e0155adf205234f603ae9287a5743005d26ec240429ea5b98d006554abc69e08251613257130a258fe6cd5e1a79865005d98475eb5 SHA512 8daf9f83564ce1357b6a99441fc733b9d7a00db2071cb2fc47f1a0c6a1842cea57a1ec4aa628b86271abbdaaf5c17c60092f1e2de42e9604a5165e81b2f4bf2a
diff --git a/media-libs/assimp/assimp-4.1.0.ebuild b/media-libs/assimp/assimp-4.1.0.ebuild
index 050200305045..00b042528bb6 100644
--- a/media-libs/assimp/assimp-4.1.0.ebuild
+++ b/media-libs/assimp/assimp-4.1.0.ebuild
@@ -38,6 +38,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/${P}-disabletest.patch" # bug 659122
 	"${FILESDIR}/${P}-unzip-of.patch"
+	"${FILESDIR}/${P}-findassimp.patch"
 )
 
 src_configure() {
diff --git a/media-libs/assimp/files/assimp-4.1.0-findassimp.patch b/media-libs/assimp/files/assimp-4.1.0-findassimp.patch
new file mode 100644
index 000000000000..6056f4973c55
--- /dev/null
+++ b/media-libs/assimp/files/assimp-4.1.0-findassimp.patch
@@ -0,0 +1,28 @@
+--- a/cmake-modules/Findassimp.cmake	2019-10-08 08:08:29.025321121 +0200
++++ b/cmake-modules/Findassimp.cmake	2019-10-08 08:09:47.976323079 +0200
+@@ -54,14 +54,17 @@
+ 
+ 	find_path(
+ 	  assimp_INCLUDE_DIRS
+-	  NAMES postprocess.h scene.h version.h config.h cimport.h
++	  NAMES assimp/postprocess.h assimp/scene.h assimp/version.h assimp/config.h assimp/cimport.h
+ 	  PATHS /usr/local/include/
++	  PATHS /usr/include/
+ 	)
+ 
+ 	find_library(
+ 	  assimp_LIBRARIES
+ 	  NAMES assimp
+ 	  PATHS /usr/local/lib/
++	  PATHS /usr/lib/
++	  PATHS /usr/lib64/
+ 	)
+ 
+ 	if (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
+@@ -78,4 +81,4 @@
+ 	  endif (assimp_FIND_REQUIRED)
+ 	endif (assimp_FOUND)
+ 	
+-endif(WIN32)
+\ Brak znaku nowej linii na końcu pliku
++endif(WIN32)
diff --git a/media-libs/audiofile/Manifest b/media-libs/audiofile/Manifest
index 0cc697fd7337..285335a8ae72 100644
--- a/media-libs/audiofile/Manifest
+++ b/media-libs/audiofile/Manifest
@@ -3,5 +3,5 @@ AUX audiofile-0.3.6-gcc6-build-fixes.patch 3785 BLAKE2B 7f016bfa9af8a440e31bcc39
 AUX audiofile-0.3.6-mingw32.patch 687 BLAKE2B dec0680a401890f64a659a7303b089d03a40001d2b73da66c174663f818e5e72b7b8985e8fa220c15685b4cd857ba24cefb341c95059a4d9e10ae81a580a8f50 SHA512 b568b189f7316a41c724b02ee881adcdcb0e01fe22d4d6adc82fefef3296c34822943ec1cb299169dfd8fcdac9c260e1dd69fc9b5b6b4058382cc2f246c382f8
 AUX audiofile-0.3.6-system-gtest.patch 5209 BLAKE2B fa4a40165b37a6d33b929efbd79e20a1a7b953ee6d826dfbe88907255f217dcad1f9f4b14b910abe0d60a5c6b3956c92b3a7d6df76d1a47b7e5853bd7bc1d3a9 SHA512 ae821f7e4ea1684651e430007b2b52b369769d8b60cc7180aee3c80c55c7d01ad9e97792099d2d6694eec2f090552355688e2ee3cc527d7a8989e717d3de5b5d
 DIST audiofile-0.3.6.tar.xz 530760 BLAKE2B 5263e66b92471c8b7e8ad73a5065966fc93fd92d70481df804451353bafe44d670ec48b183bc19a7ac60025ea73b234d6aef1017fb220c16d14c68a27db027e4 SHA512 f3b58210a4ef3ac8e08a368a78e0f4b8345456d084bdebfd20d1631fa75e562aa58d31863a502b6ff18178327aa5b87403566bd34566fa52bdfc8e01de400bcb
-EBUILD audiofile-0.3.6-r3.ebuild 1256 BLAKE2B 9d7550af23e13132a3e77fada87185a05879a4cbe3fc811d55b4bafef553e8a0590c5c2d60164f6d185521d6901532a57afe1b33d386332ec8a51c244881ab4e SHA512 788cbe79dd9e368bb826d054a1c4f8e060fc23d9cc1d1ea92babb1077981f00661a53b0c2b02e58c3fc85e71874e0cc14719f58bb4adc7a4bd9011d073d2bc01
+EBUILD audiofile-0.3.6-r3.ebuild 1234 BLAKE2B 84d6d52e18c90176da0fa3b5bde83f132c2e7e64a2b29bbe57a6fa295fb45933006b6149848aa39419b04150939e2113814515254ae0a7ef4dbf74ea797fda5e SHA512 77c0f99ebb21062ef3ac4d818d9b6516fd90b8464c6e93bdb8d383d4e1f40cffd8b19901f2a80cefc1c0b12faf4c692d78e680d21e826bde4cf2911ec6f08da4
 MISC metadata.xml 359 BLAKE2B 3a6913b1f6e97d45f7d1c415879d82fec86642dc2a187907d1893ff9b81cf7781a5485e5140a901482913713ab4f7a5a8ce62df872fc75bf2f34f80d0dbeef9c SHA512 2f2ae33ca88cb3246c8419b88a800ba405123263a6cf2f94c9478d8303bf036ece9a6781a1fe83d8b1f329071623e76f6e909c0207289d6dad8166b163c3b897
diff --git a/media-libs/audiofile/audiofile-0.3.6-r3.ebuild b/media-libs/audiofile/audiofile-0.3.6-r3.ebuild
index f381e943508a..3c1b316b64a6 100644
--- a/media-libs/audiofile/audiofile-0.3.6-r3.ebuild
+++ b/media-libs/audiofile/audiofile-0.3.6-r3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.68k.org/~michael/audiofile/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1" # subslot = soname major version
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="flac static-libs test"
 
 RDEPEND="flac? ( >=media-libs/flac-1.2.1[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 2f49bd66b90a..09805939ce87 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -3,10 +3,10 @@ DIST babl-0.1.38.tar.bz2 653047 BLAKE2B 8bc43a7e0b7265f72122743ff4b3e25825e4bbe6
 DIST babl-0.1.62.tar.bz2 698161 BLAKE2B 21fdc009e56d40a8ee08509161dcad10c3f5b41c42ab7f2d64f888762a15b3dd4b6723a4caa4aea7c977179007db4b6e39b6ab9fde4c68bb24ea170ccf29dbd3 SHA512 4d2ba25e39b8dcb122913731861fa04cafd97388a1c354afb2188e8582ac78e9e32f838e2be8e9f41ee9ac582081fdee1d79accb60e824b8b2c12995f96a8293
 DIST babl-0.1.64.tar.bz2 705991 BLAKE2B a22522f3c9ce73b4a0d29f2dddae870e7d241c4456295cab8b3a1d6441dcc7221c510ace57ba22a86ad8aff605734430396b65dbad3a51d306344d0a230034bc SHA512 b728c2973f80b62e2ee62307880e00a95a90839e778644dd6ab4076e43708e4939c8162b9a6a474dc3c3c4c087475d51eb64d2effd6dcdf969696060cc22a8aa
 DIST babl-0.1.66.tar.bz2 706100 BLAKE2B 0de443dd4ea32cd025c8b121f042c24528677f32a6c201f3abedd13fb3a2ce2636d03f4b45eefce2c9f7a86426355af9b584602ca9ebb1a2140ee88f500c2843 SHA512 41534eea6cad21eae704af3fdce4857e9dc2b0efa48a7cfd7f98b23428198e95fc9ca2f30e522abf2fa06e907eaf4f7bbafc048b356cb5890fabcb9be21001b3
-EBUILD babl-0.1.12.ebuild 1340 BLAKE2B 5134dd30060cb44092b6915c3f88da469c319d760e8aff3960c36c991b1b15cb4f696fe05966cbbeaa09910a824067893fe19b853494aae34e09562101ec7161 SHA512 809652f63a16bcc6fee76a7f4d9d2f4460f9b5e79f3e3325ec368694004c1702e5bd57efc5ec5dd91bc66494080268b89d7cecc116943311bd347a32a18b9e8b
-EBUILD babl-0.1.38.ebuild 1463 BLAKE2B 8aeb5ec689a4595cafe28fe9c7678d154f2f892b306edbe483db2c26cce220ccc24d5b8c8435aa1f687642a3f3c88180f5d7bde43f6ffcb9ca5a71c2ac5fffe6 SHA512 d79e7597bb0d5fc2670d0991964051d08dc69c090838fa36ec6b188f5062190943ebe27d01bc46fc1aedd7da24e91d7e88c976dd67e85c36887494ba0d2d677a
-EBUILD babl-0.1.62.ebuild 1536 BLAKE2B 727d7fcbbd1805d9db269ea3066a0491f631ced1a04b6c2bbb2d642fe6812bf4dd1f8eaff06b507cb7ccb426b7a5120f7b0b60849929e6573ea10546aa7d98d4 SHA512 29ff68c9f01b55ac6078503eb16e5fabb8ae39ed7cd23daa41db8b31d803a3fee146721000de4d5c591e558178b8b36c6a12b052935f3bd091134f8d96e0743a
-EBUILD babl-0.1.64.ebuild 1545 BLAKE2B ffa68e0a1d0994f176767e2a5d4ffd30f4632685199a6a29de1aee57fec7cb16266805fadd190f2fe9f27c84bd96890b1be18cc7d9914ce6ba736c1e18cf2db8 SHA512 b3c6cb1abdfe65e7d86f1505c5d00ad0b2aef84dbbe5156a63913951452af30be13c8b339edefe831cdbd6eddd4ecb766c17cae2af75f1067d8f49bebe3ba506
-EBUILD babl-0.1.66.ebuild 1545 BLAKE2B ffa68e0a1d0994f176767e2a5d4ffd30f4632685199a6a29de1aee57fec7cb16266805fadd190f2fe9f27c84bd96890b1be18cc7d9914ce6ba736c1e18cf2db8 SHA512 b3c6cb1abdfe65e7d86f1505c5d00ad0b2aef84dbbe5156a63913951452af30be13c8b339edefe831cdbd6eddd4ecb766c17cae2af75f1067d8f49bebe3ba506
-EBUILD babl-9999.ebuild 1545 BLAKE2B ffa68e0a1d0994f176767e2a5d4ffd30f4632685199a6a29de1aee57fec7cb16266805fadd190f2fe9f27c84bd96890b1be18cc7d9914ce6ba736c1e18cf2db8 SHA512 b3c6cb1abdfe65e7d86f1505c5d00ad0b2aef84dbbe5156a63913951452af30be13c8b339edefe831cdbd6eddd4ecb766c17cae2af75f1067d8f49bebe3ba506
+EBUILD babl-0.1.12.ebuild 1328 BLAKE2B 800e1330f71eaffac72e111a35fa226b478051694f2cb6684f2f98c47b33511faf4f47d35d7e50ad8647c5caa06b961d12d53930ee32ea0139d9ed336753d59d SHA512 e8b6f06d0fe455b312f5cd1687d2f7eb50dcc4dadf8b7e38e49f91123aa3193ce3b663577e887c2356c400030c256ac30eb120cf5c06de863e7924c8bebf2d59
+EBUILD babl-0.1.38.ebuild 1451 BLAKE2B 9813a49605fae9ca6e5ff3a57205511a3e82ab6091e147a108398aff74ef260193df9306f7b67ccd67442d88f8811870a85ff512635e9cc6e6dcdcf4f3374a0c SHA512 b971cb3d4f1a1bf6d18482a1244eee5d566d02da0f9e683b8ce9420a9f0ca3446239ff7fee20900994efc2e515a02cc3fa0e3b2cc307d823e53efdcfe0b60a98
+EBUILD babl-0.1.62.ebuild 1524 BLAKE2B 534897c0657474eb7bc11e7936beae3b70885ee9f424bf87337b8a1f69c51112a564e45515036031e3f44d612de3558e81ad4990c0bb008a49d02013eefee359 SHA512 7d2b17d83e5b67602444ac9872756d91b17051747eb689b0bd0c32875d166cfb96f90ba084100aeed0085b95e2c2dbe4f76c359bce193ec9d009a732972a42b6
+EBUILD babl-0.1.64.ebuild 1533 BLAKE2B 04b78ca906fc77ca656bc43e246abb57e8f7643c703006ec013e9fca06084a0569b94f8f426b9d0923001f16bc8eb6058b6877cf055a302ec5c3d41994c2ef52 SHA512 0ba6b80c0d0540734a7789520794f3ebf6dbfab1f8ba992fbe921ad5d65ac9be201ebcab0e7bea145ab7d85b00d26ca0ab04ffe77b873ef1628c5eb61097f380
+EBUILD babl-0.1.66.ebuild 1533 BLAKE2B 04b78ca906fc77ca656bc43e246abb57e8f7643c703006ec013e9fca06084a0569b94f8f426b9d0923001f16bc8eb6058b6877cf055a302ec5c3d41994c2ef52 SHA512 0ba6b80c0d0540734a7789520794f3ebf6dbfab1f8ba992fbe921ad5d65ac9be201ebcab0e7bea145ab7d85b00d26ca0ab04ffe77b873ef1628c5eb61097f380
+EBUILD babl-9999.ebuild 1533 BLAKE2B 04b78ca906fc77ca656bc43e246abb57e8f7643c703006ec013e9fca06084a0569b94f8f426b9d0923001f16bc8eb6058b6877cf055a302ec5c3d41994c2ef52 SHA512 0ba6b80c0d0540734a7789520794f3ebf6dbfab1f8ba992fbe921ad5d65ac9be201ebcab0e7bea145ab7d85b00d26ca0ab04ffe77b873ef1628c5eb61097f380
 MISC metadata.xml 216 BLAKE2B a7f17874d9514cafd0bbab739d143a00ac66ad8446bce8e05932d122c1631d29ad8077c2bcda021bc92b7e89b77c03d55e8997cf250f3bb55f8a1aca046bb2a7 SHA512 1de1c9f4b223876125a0321126f2d7b1b564a113d24ae86b380c4d67bdf58ed4f2ae1a1f5d686211ccf4851eea8e970c20109977abbc79d0cd855164b6474e23
diff --git a/media-libs/babl/babl-0.1.12.ebuild b/media-libs/babl/babl-0.1.12.ebuild
index e37de3fd818c..ff19c765a87a 100644
--- a/media-libs/babl/babl-0.1.12.ebuild
+++ b/media-libs/babl/babl-0.1.12.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/babl/babl-0.1.38.ebuild b/media-libs/babl/babl-0.1.38.ebuild
index 140b2792c003..87c1f1ee4d15 100644
--- a/media-libs/babl/babl-0.1.38.ebuild
+++ b/media-libs/babl/babl-0.1.38.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/babl/babl-0.1.62.ebuild b/media-libs/babl/babl-0.1.62.ebuild
index 58bb27fcf618..61dffd8b9f21 100644
--- a/media-libs/babl/babl-0.1.62.ebuild
+++ b/media-libs/babl/babl-0.1.62.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/babl/babl-0.1.64.ebuild b/media-libs/babl/babl-0.1.64.ebuild
index c6f18423b435..634e2a1ade64 100644
--- a/media-libs/babl/babl-0.1.64.ebuild
+++ b/media-libs/babl/babl-0.1.64.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/babl/babl-0.1.66.ebuild b/media-libs/babl/babl-0.1.66.ebuild
index c6f18423b435..634e2a1ade64 100644
--- a/media-libs/babl/babl-0.1.66.ebuild
+++ b/media-libs/babl/babl-0.1.66.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/babl/babl-9999.ebuild b/media-libs/babl/babl-9999.ebuild
index c6f18423b435..634e2a1ade64 100644
--- a/media-libs/babl/babl-9999.ebuild
+++ b/media-libs/babl/babl-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/bcg729/Manifest b/media-libs/bcg729/Manifest
index 20fd9bf78f87..afeabf438516 100644
--- a/media-libs/bcg729/Manifest
+++ b/media-libs/bcg729/Manifest
@@ -1,3 +1,4 @@
 DIST bcg729-1.0.4.tar.gz 115641 BLAKE2B 5240fc10f8c4c32d9c9a6fc527a198fc896a8ff5ea12aa8a692808877582ac25b3fee122799cb7f6cea58db2f07cc07348da36d9f526e62f0bf62d61ef33bcfa SHA512 fdbbd2c9a807ed832ac3976301843bae854368ab281d16f792550bbda921d226fc6003c0a499561529f22eae08bc0d78b8826c2d06c859ab706d999a96967ffb
 EBUILD bcg729-1.0.4.ebuild 623 BLAKE2B e5933d4aa23c3898a13d050cd61bd2ca0452692bc029f9ade00abb8c70767e0e25a9f72d8ab8ea5df3867d0670272952263419de25c5f81ab8c8540920635651 SHA512 950ea02042115a4654841cb217d0615fb05d2d272f518d5ce6f0af6ad7874d30a1caa286516e02e13fc3b78a236fd170ec3b15cf7c2abcf700d55b2f04a0efad
+EBUILD bcg729-999999.ebuild 532 BLAKE2B 5c5477ece2be46fd1c9460317253f40be5898b7d736e722a4b9298c1e0c440c8ec5736ec136135e8a959ede7f9b5a042f5b0fa48b44fc910f7031c88747f4ec1 SHA512 87d0caa1f5a310d7eb22400437ce527fefce9893ee8c31c3d92b650e0dbb19eb3ff5e2d663e0c214199dc27f2419c3fee59e3a76e9073ff407d10d8b6e2fe910
 MISC metadata.xml 214 BLAKE2B 4446a18615c9ae6446000d6d87c369372cf676ce6d21f6ac5e11932fc97833478c6d42f7469ac5a0cccb3aecbda03850590c3fed13b1395c9272d366e13e08c1 SHA512 7a44c566c4d93dfca459487b5ccf51b49f02d11f56e766442953c12db49cf45fdf6aa12089e0a52b6942ea7adadcc90fc7814fc02f6ada5a0e91831e1a44149e
diff --git a/media-libs/bcg729/bcg729-999999.ebuild b/media-libs/bcg729/bcg729-999999.ebuild
new file mode 100644
index 000000000000..961164ae6e95
--- /dev/null
+++ b/media-libs/bcg729/bcg729-999999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit git-r3 cmake-multilib
+
+DESCRIPTION="encoder and decoder of the ITU G729 Annex A/B speech codec"
+HOMEPAGE="https://github.com/BelledonneCommunications/bcg729"
+EGIT_REPO_URI="${HOMEPAGE}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="static-libs"
+RDEPEND="
+	!media-plugins/mediastreamer-bcg729
+"
+
+multilib_src_configure() {
+	local mycmakeargs+=(
+		-DENABLE_STATIC=$(usex static-libs)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/cal3d/Manifest b/media-libs/cal3d/Manifest
index a20253bc1a0c..9cc3cffbd9b1 100644
--- a/media-libs/cal3d/Manifest
+++ b/media-libs/cal3d/Manifest
@@ -3,5 +3,5 @@ AUX cal3d-0.11.0-gcc6.patch 19938 BLAKE2B bb2cd317a004e33fdcd9a1d73f563a933b7b4a
 AUX cal3d-0.11.0-tests.patch 352 BLAKE2B af4d33ccb48a89c45e3de3dab7860ff3a60e29756681b63a0da9c886591ebc6e7cb41caacdd5bb5f477b65edb4d3f7ad147b224eb8309a546187606a5ae8cd9b SHA512 bf605596206935d7882ee878e6fd1bb42e474f2c59f5bb76e8f8f92c606fa7258271eabd14fa30793aee6cb55dd95fb8592ddf7895f513363c22d91d80099857
 AUX cal3d-0.11.0-verbose.patch 503 BLAKE2B 8efdf4a56cd1430b9632f9ba85172024f700afea081b896bfcd50fc126a85748b5fdf53dfee1d9b2c4b8a8d43593bb68c733b3c1b7ef15c52bf7b75eb1d84fb2 SHA512 e0dc8a17b644012f4c291d9ba667ba6c7c8c3f34491f35490ab92573c137d1a6a1d1bf88c846b457a0310aff1aef27eabbf8c92b8477685b5828930f68416793
 DIST cal3d-0.11.0.tar.gz 568532 BLAKE2B 6730b9d623c9fa3dddb9f90d3cdcfc70a80ea1d2decb3bc5e8e3137142565c2fa570512b59c807996c6dfb04edc92f21301aaffa064bd41e6de7809223167ccd SHA512 4dc4b36b8f18760bfe6f8c80cbd941c14e2ebe596d0cd514fdb1ae4175bf2706e125665272d67ff21d33bb4b34e7be22bad9c00d488c1da21f442550bf3f204f
-EBUILD cal3d-0.11.0-r1.ebuild 1128 BLAKE2B 1f45b33d676d2402961eab1c828c7a3a92f16a240856803e3946e242ecb0877f33fd80f57cd281897330a46044013bfd61498bb88dc510dcfea881b8b373542e SHA512 bff7599e5a968381e2faf8f7fe338bc4899934e97ab010dd751913d69f793d9e77c1e986e09218aec64adb63fb4cc35de0f315543db31eea9a933b992747b1da
+EBUILD cal3d-0.11.0-r1.ebuild 1118 BLAKE2B cca483fd25d165c71c4bfd44e2d87b06f1d9da04596bcfa3a9c8ba6854db8402a7ebad97277652bf36fae3d09fb2162d8d444784e91cb742286d8f57942cff71 SHA512 8ad10cae49cd4f0c13576eca4b976c8c46cfc8dc9b8f0d86359fe4fa6ed0306e6e78d8399a19e23564a07b133a4faf58b4d96019905066311c8b4d98a6f68e43
 MISC metadata.xml 337 BLAKE2B f8274b68600b791cf54ab621d4b5e03c9569c8375ea3826458917ca4b7eb8fe28251d55d1f66b24b764f5bfb9571fa75e9f651fa3866f906b259c7d6e947b813 SHA512 8fe1fe465fde44c700c1c690d1ca08e7eb2a80b69bf2229c3a1cb31cbabef4a89cb6b1b43c67336b87a6ab4eaaa344a7dcf1f43e21e93c2ba608a98d1ffe5b90
diff --git a/media-libs/cal3d/cal3d-0.11.0-r1.ebuild b/media-libs/cal3d/cal3d-0.11.0-r1.ebuild
index 40c49372639a..94d50870d372 100644
--- a/media-libs/cal3d/cal3d-0.11.0-r1.ebuild
+++ b/media-libs/cal3d/cal3d-0.11.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.gna.org/cal3d/sources/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 ppc x86"
 IUSE="16bit-indices debug doc"
 
 DEPEND="doc? (
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index 18db82bddc82..8fa22e638677 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -2,6 +2,6 @@ AUX chromaprint-1.4.3-test-bigendian.patch 1944 BLAKE2B e8441359f3d830451398c492
 DIST chromaprint-1.4.2.tar.gz 613367 BLAKE2B ffec54c952a35f8f5bf6bc74b5d58339af3f0ffc0a0c0e88ee5e864e9112ad96cced629dcb8422f5e74aca3c48f93f7fa153cc6aabf0659a4e90416c34f34e43 SHA512 69449adf1c95c1395a5545d36877afe95b409d045357cc675e9ac58aee2955b3a9a245f37805192804a9b7fddc792b9e9289bf6448fa3393131048d28e06d7e2
 DIST chromaprint-1.4.3.tar.gz 613741 BLAKE2B 728f08e14c46a36d98c3a32a7c7a221a48b51561b623a403d9bee6aeea5cb5254866da26d50db0dbc5b0b4ceddb8312d52a8aab4c2979709bd2c8221b9e84d0f SHA512 101360bd643d2410fafcdd4aef8fe4c716ec728f0e4b9b3a62ba125fe010b0315e55a1839a2ca8c29d9abfbf8171560b23d68b732e75632ce8f4a4698f77ea72
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
-EBUILD chromaprint-1.4.2.ebuild 1355 BLAKE2B 266f15e363ba036a702044d0e067e779e9db15cf6874cc1fc8f543f48ed877f56a430f66bd3f04a7898f9f73e6cdae54e3a6a0a6cc2ef24a0ee53c71f35d9f29 SHA512 9619edbec8b7c40e60985a65c7f146f56f2d3c380512b467ef37a0f02fce4c0ef921ea3ded9fc6c730dd9d7350829476ec7964c73cb4f3c0159e661eef9a1036
-EBUILD chromaprint-1.4.3.ebuild 1455 BLAKE2B 30a377aa69cfe7ef3634c8e903af9c579c65d1ede46b2eb9dd90d210c91bc65b1d3da79fb9d4420c8a50d6528c1620583b4bfd3558386890e86ce24cfefd6cc7 SHA512 c82f505335eea9f01d6d0924598c60b6f79820fc9282b7e8c6cdb60219b329e9021db3ed2af0eedd1697b6e0036f1d4ad3e1bd8f20b9a6106ff1a192bd516530
+EBUILD chromaprint-1.4.2.ebuild 1343 BLAKE2B 24428f0e9a39a15c1ab425325e1e860eca45a0d0a2a2e8f2086f1491663acb5510e726d17fc318689a98d83871258573d0e59d1b12fd07807d9a4f4e1f6bd1c9 SHA512 cd209880b290e50a80d52a6c64d34f72ed49c60da6b1b16bc661dd4ef8c889ba3d7d650cb0f668a56e3520a5b313ffde0bdf824c975f03b709ea063c5b1b12b0
+EBUILD chromaprint-1.4.3.ebuild 1443 BLAKE2B 01c52ce3b90ca5c691cd64c196989365c872a20b3b8db6986f05ce5b8addbf1e9e0142d54fb37e6b0b7f652dd15870c334c6a99e60cf96795f72adfa6ee6ac47 SHA512 82291e77365fe71b0a6dae7f46c14ec54ce31d3a427d27602e5d261a358cc1ffc13de6c9af6d7cc2829cf76036297be0b586e70061c786409547d95443188d18
 MISC metadata.xml 502 BLAKE2B b4f7420ba8b5e4004b6f8fa9cc70c0eddea04a0e1759c9724b94198e3df99c2505893706cb5232c643a43208822d7ef5bb56660c76029cadb52b9a0562fd8021 SHA512 229e807429496e637ba289f269af83eca274c53eb2fc2d9dc5f304c39118eaf1d0ae9a5cca01ffa1958d110c55537f1792e26343bf3309ad72b1f0411af9dafe
diff --git a/media-libs/chromaprint/chromaprint-1.4.2.ebuild b/media-libs/chromaprint/chromaprint-1.4.2.ebuild
index d24d84f8a801..9ff16c48df08 100644
--- a/media-libs/chromaprint/chromaprint-1.4.2.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0/1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="libav test tools"
 
 # note: use ffmpeg or libav instead of fftw because it's recommended and required for tools
diff --git a/media-libs/chromaprint/chromaprint-1.4.3.ebuild b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
index 5c817db6b18f..169011a15e18 100644
--- a/media-libs/chromaprint/chromaprint-1.4.3.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/acoustid/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0/1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="libav test tools"
 
 # note: use ffmpeg or libav instead of fftw because it's recommended and required for tools
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index 10a57e5e41a6..81d8f74d3d9d 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,4 +1,4 @@
 AUX codec2-0.8.1-unused-deps.patch 2966 BLAKE2B 886ea88d068b8c6058468c0dffa1071443ab993ff169a9b38b628767ebb866e0e05feba2fdb1a5f108dab15d2f4a06acc228d4fbee7b005ada1185e48ae26f94 SHA512 89c75477ce2ebed216c2239b237c5c9a502753ac55d73808702230b89f81e6a2ce176b0613f258655e6a83e85b5943ccbd7bccecf650117ff61e7d49e386be06
 DIST codec2-0.8.1.tar.xz 8868212 BLAKE2B 2c0ba40df02cc6791386243e75f97ce17026842b13384e4a330cf22ea4bef5db75ddbc764dd4045027a6e2bf2eeba9b509b372aeaef81bb235e3d6c2930b01fe SHA512 4f2633d510ab68102b77b15492d87d25fe5fa96d90dc1ca6b3bf7deea04a3765382bfbbde981c9cac70d3e9d091c56b2099544b09b36a84ed62cb9087c9bb819
-EBUILD codec2-0.8.1.ebuild 661 BLAKE2B 15659fe210b53f72e9ef05d38a80f77ba5d10e4057a214041ab895b5f4a55bd7e1c4ee0e0128c80c5327c42a591c32be7cb852a0ae6fd50bfa05d2caa2eb0ffc SHA512 5f32120d19446ba3ee56f166c774700cd258851f08ff93097f561252003b6ab108c1d794e1695096e82b11a86452d320f4f245758c040a62266238dfe071e365
+EBUILD codec2-0.8.1.ebuild 658 BLAKE2B 81815bec31e08f29946225924d675989dd41b970f5bf038fa9c8213137368e88cb47a06dc82e9146a36dcd6aecf96ebff434bce0624fc77d9d54efa7e1b69829 SHA512 5e605385cceec2b1c03fe1e9efa2b5b1df2037c5565268a35052e1ea0b063a2514f1926584c6fc058effe317cc6308d3a6538f305db26d788c2dd3f6e11fc76f
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/codec2/codec2-0.8.1.ebuild b/media-libs/codec2/codec2-0.8.1.ebuild
index 490849594285..29f29b27f097 100644
--- a/media-libs/codec2/codec2-0.8.1.ebuild
+++ b/media-libs/codec2/codec2-0.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://hobbes1069.fedorapeople.org/freetel/codec2/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="examples"
 
 PATCHES=( "${FILESDIR}/${P}-unused-deps.patch" )
diff --git a/media-libs/compface/Manifest b/media-libs/compface/Manifest
index a97ee3cc3097..e9a9861dbfd0 100644
--- a/media-libs/compface/Manifest
+++ b/media-libs/compface/Manifest
@@ -1,4 +1,4 @@
 AUX compface-1.5.2-destdir.diff 408 BLAKE2B 83798a6d80b57f29b06edc1ce931d5fe52357344693fb890cbbc1de81a7fd87a399c585de370b396d5ca180c41b7ff049a1d007c0e575306462df1a428510de0 SHA512 d9137aab3623907ee48d72f61593480f5a952dcecf794e69404b15a3b0be0b5098abd9aaff8966f82f14f797fb243e00d2b4b4a7f7951f1aef233fe24bfa543a
 DIST compface-1.5.2.tar.gz 46970 BLAKE2B d26c25a35b3a2e63ddfb50feace61930fa3be9f4150ad8f8c96a3820ccebf1422fda5703628d58ad646f1d1eeaccc5f2f08ed5f2e74b845f5d7328f2829e63d6 SHA512 0da9ee4c5fb2b5c712466d9fa6170e5687b23c038e6304baa42d7ede6d9bd50a1b84da416eb853a420c01a6b9eccd5e7d92a4ebc26295714b85254c05c9e3360
-EBUILD compface-1.5.2.ebuild 653 BLAKE2B d677a651cdbba75cfbc73fb3007ca981e50956ca6e46c2a947f7a12c3f5f6f6db71c5f97d51a3bded1c9604a22f9fbae4c9a44b6db1fe668b3f884e76de626d1 SHA512 5afc7e5219b8a404e0da2be62ed0e717caed9fec50a5509423d4f52fe148dfd4240dd83d57ef5905b348760000985abeb9dabd038f811dae2c791cdc3f69d1f3
+EBUILD compface-1.5.2.ebuild 631 BLAKE2B e9c3eb589b9dc6ed3ebcd7305adf7de21ba4815c39386da99bc50f73fcc9d71f0c492724013951808091eb73087fb25cd883023716d24b0a96e1bff8ee68eca0 SHA512 571fbef11ddff7bd26c76e5eddf8fa76057b9b04c749553f772d8101e334087c5b3e5bce314f28a3f1dd8835288154eac23b3fce8e10b9487c62c222465e9043
 MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0
diff --git a/media-libs/compface/compface-1.5.2.ebuild b/media-libs/compface/compface-1.5.2.ebuild
index 985757f29b0c..af03c528e505 100644
--- a/media-libs/compface/compface-1.5.2.ebuild
+++ b/media-libs/compface/compface-1.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.xemacs.org/pub/xemacs/aux/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 src_prepare() {
diff --git a/media-libs/ctl/Manifest b/media-libs/ctl/Manifest
index 50dd231fcabc..92811ab8e423 100644
--- a/media-libs/ctl/Manifest
+++ b/media-libs/ctl/Manifest
@@ -1,5 +1,5 @@
 AUX ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch 16825 BLAKE2B 4a732a2b461e81016d0d3e165d998b19904fbd9a77af4cc041b29a6c785beaedec109fe33ddcc6cb05c08f3001231b1e832a687dfccf96fbef70c4e517737fb0 SHA512 53df4449eb0acca2f20a42cf9945870e580de3be6be416c52428e300aca1833eda081d6fc17024aa61f1ecd0886098958d187249a9189fb6d1e62c82d0964afb
 AUX ctl-1.5.2-openexr-2.3.patch 455 BLAKE2B b42032d28612bef6f6a3beeda67c6b6a20fb4b99527003acd6a97eceec8286e073b3c6594c92ae99ad559c9d520b9d94fe93ea783e9d6021d81f66b258c3e2f1 SHA512 0e97065c78c6ef5c2a8f657c6c41031f66379483aaf2754f612d69261932a7f6ee1ccd01c5c0b1b450e511aa758a640cacf55629651d5974a92c519f4ff3a25a
 DIST ctl-1.5.2.tar.gz 1411871 BLAKE2B 223740aa8b68630f449b65e17470c76b2825a77eead040724b65e9e69752a696f642ae6755116046e188305a7d043c4def7cb8a773ad08d51fba35e9273b3a71 SHA512 c92af23e897f30f96ecb27b4b865e2fe1a1e33c8616797fc18f68e7fcc89210ce8ae70a003169b2f449bfd5f90d192734f1e8038b1d3e03c5f48c81587c871c6
-EBUILD ctl-1.5.2-r1.ebuild 717 BLAKE2B 101011f1a1a52b1301b22d6be822e577c4eea1f684b59c7d5c90b24bcfc016855ecd50d8f56bbe247b831a824a0be598759247401be719727415812b9068edf4 SHA512 4d1911d037f5c422fb09d191cc1a95bbd8918439f2e3d0acdb7819094c94dc94182832f46963053e80a095f8420370ef3af32e10348d157f5311e54db6a6a0c6
+EBUILD ctl-1.5.2-r1.ebuild 707 BLAKE2B 670c6973856cf284f9e877c99d9ce815a45b63ba3da0fa799a465c2cc56fb6d0d9a36354f8c539f7b72455363670747df93a4da3ad9fabb41317ac3feb15b51e SHA512 22b547e3d444f5fe8ce63e2cb98a9070c4a90b7090920a114e5499b7cedd5f1e50a98d4aec8b9914578b9ed646331eab544680d341fbe0cd0c53403e2476dc95
 MISC metadata.xml 297 BLAKE2B 773f2836e68b0405f210dc51fac01e9c40845d34e4d7ed036916af8f8d63bebcd91bbd672bf84e4dac6ab84135915db85914c07a8bdecdb1ce3c3ff1b5f6408b SHA512 e437384a215b9cd38ecc3e4721bb47c6acf9b8c17d6bc348ddb1272b899428cf7835371a3fca39e6b66f49f1760996fccc336bf15f6d4e36783bd12db84afe49
diff --git a/media-libs/ctl/ctl-1.5.2-r1.ebuild b/media-libs/ctl/ctl-1.5.2-r1.ebuild
index c431fdafe5e1..67aca511194e 100644
--- a/media-libs/ctl/ctl-1.5.2-r1.ebuild
+++ b/media-libs/ctl/ctl-1.5.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}/archive/ctl-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AMPAS"
 SLOT="0"
-KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86"
 
 RDEPEND="media-libs/ilmbase:=
 	media-libs/openexr:=
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index 67b24ec04ea1..79300a60d550 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -10,5 +10,5 @@ EBUILD dav1d-0.2.1.ebuild 1135 BLAKE2B 081253071832f93fd96b216169ea0a1f29a2608ec
 EBUILD dav1d-0.3.0.ebuild 1147 BLAKE2B fbceacf787e296094352daa0382eba35447e6c09aa5fa087cc25102a846537f08852fb86f1592fb06aa23a36acfab93ac6b40fd0af86f305663322076d4b1016 SHA512 50524008230f23b520ae3401af3ce65822b238c3300a4a3715034ac5f584bf76a3f1fd4e1591a539ca07f4f3005564b22bcbe07c30b4ce809ef928bfa00d6a82
 EBUILD dav1d-0.3.1.ebuild 1161 BLAKE2B 102cd9d3e438f66ad960b9542650acf2f1171d47c9c321d16dec7a6ffee4662820ced2732087a50b2faf706e891e7c707f8c3f4d163442bddb94db45848faa05 SHA512 610cfdd81df7f852c5fcbe0691e0274a11e1fabd37d51eea85c875ae36905eb54991b8bcf930378b2c640f93e6c175543d8d68ab3ed4e866ddac8cd6331dd05a
 EBUILD dav1d-0.4.0.ebuild 1166 BLAKE2B 69a6f25017ffe6e5869ba5faa36b5da6dcb291030979ac12229f475eabfaa7897aa54aed926958b728a16097155ccaf4d7d9b11d1932715dedc42e8e78f18369 SHA512 4e2187506d4db679a03663ef28f10cff9e671ac196e40d5804f63e960e71ff79a1906f85528c0bffe2062da2e50f92469064c428fd72811e156dbb421589d920
-EBUILD dav1d-9999.ebuild 1166 BLAKE2B 69a6f25017ffe6e5869ba5faa36b5da6dcb291030979ac12229f475eabfaa7897aa54aed926958b728a16097155ccaf4d7d9b11d1932715dedc42e8e78f18369 SHA512 4e2187506d4db679a03663ef28f10cff9e671ac196e40d5804f63e960e71ff79a1906f85528c0bffe2062da2e50f92469064c428fd72811e156dbb421589d920
+EBUILD dav1d-9999.ebuild 1166 BLAKE2B 908c968bb2e73b3ea76ab81a3a97de29473702a19b6a2e307f56b5653166ecde40f74e1044a065695816960c24639f1a864893ead89783824861fae7c63976ba SHA512 f18fb9963abde1bef4caa291641084c59b6a53531826f5c7773159668b33fcdab0c3cfb1b44fff897125bb40fc7905d607edfeaf256582caec384d5ad4ff8806
 MISC metadata.xml 536 BLAKE2B 40ec2224aed078ad4748d3182defb6813cdd34a614d40db2fbbbeb8b63e24a59ba1cbe9d458fec17516c328a89f77927d9fbeb9a1e4a2b8c296b7de7235b1af4 SHA512 74e6595ce441bb313364f375a8afa9b2a0179f350e30d075ecf99e058874450e15f4005a0712e20a4feb047d57799dffacb3903af00a3c5a8d059f7025e49de6
diff --git a/media-libs/dav1d/dav1d-9999.ebuild b/media-libs/dav1d/dav1d-9999.ebuild
index c344ddc2e4e4..c9ccd1968db6 100644
--- a/media-libs/dav1d/dav1d-9999.ebuild
+++ b/media-libs/dav1d/dav1d-9999.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="dav1d is an AV1 Decoder :)"
 HOMEPAGE="https://code.videolan.org/videolan/dav1d"
 
 LICENSE="BSD-2"
-SLOT="0/2"
+SLOT="0/3"
 IUSE="+8bit +10bit +asm"
 
 ASM_DEPEND=">=dev-lang/nasm-2.13"
diff --git a/media-libs/exempi/Manifest b/media-libs/exempi/Manifest
index 724185ee4311..975a5b008f57 100644
--- a/media-libs/exempi/Manifest
+++ b/media-libs/exempi/Manifest
@@ -1,5 +1,5 @@
 AUX exempi-2.4.2-iconv.patch 1440 BLAKE2B a3fccd3c268c28f1fe0b9e13544ba7b33d433a9a92ad9319301996c162766dac9d3fc14f97c3a3c795d787d0b7b9048dec830e1ce5d809b1a14ffa82097e2ff5 SHA512 09cc5ba46c8e0a0b0c1c3b0c86d9c49c21e64a64ca35a90053bf98ed81652b8d1c91bc29a321b5b3bf032b65af220129860f7d3f8c6e12ce608db19c01841736
 AUX exempi-2.4.5-CVE-2018-12648.patch 1556 BLAKE2B 154787079e9a1b3c747275aadd5fd2e47efd6079508b1f2db12ca5d0a83c1efb31ac87f869703e28e1b638a26d693fec6b6875d762c85c2ea63ff3adba70b036 SHA512 12594e62110d5d0e457102db94822c0920196420ca2321193b79736ed05dde6859723d66bba0177d55b0390c0716debfcf0e074ca27eaa12ef3e29e799d3913e
 DIST exempi-2.4.5.tar.gz 3901474 BLAKE2B 7db80266847a18464ee5d75e2ffa38a05b2b23a30fb02a16c0a4a512f853a625f00db3ee0de3f177af584e12d65c8ecd2acc96cae96ef02d7b39129ab4b5274a SHA512 2b3dd8b2d1763fbbfed1995635f625a8e909a4c3119147385737f349002b2fa038cfaca72b2b877db8f28b9022230e49264b58766a68060b0b7c322cad99b22c
-EBUILD exempi-2.4.5-r1.ebuild 1222 BLAKE2B 93e186963c5e5f3d7e147db76d39a92e9e981ee0446c8323fe9f0164df3ffb88426d5280856a20beacc75dec87ccb31ad069e678103a7f5b505b78d1ca890bf4 SHA512 0111c4a6373b0bcbb9541663afaca2603b8ee5c71a0bf452749b76dd313e90a55c2d57861681a95f777f0be9d3bca10c95dd118060b7392e1c64287f5d15d590
+EBUILD exempi-2.4.5-r1.ebuild 1212 BLAKE2B d2ed38a7ecf09f2132bdb0e10cb0bf4687ff2cf94cfb84a9f8b78b71442563187eb026baf3218a77ba0b0e56438987e0e8301dc0df2415c1af93141c8cf2ac72 SHA512 1950515248dc22c248cba2740dd3bf12674cc4021eb8e1beb4603877c241b0e85630940f06716e1c686f9316e3cac2025fbf42e93ce9aea5f216ca1523229870
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/media-libs/exempi/exempi-2.4.5-r1.ebuild b/media-libs/exempi/exempi-2.4.5-r1.ebuild
index de40c4624571..d5d4a561bd1a 100644
--- a/media-libs/exempi/exempi-2.4.5-r1.ebuild
+++ b/media-libs/exempi/exempi-2.4.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/3"
-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="examples static-libs test"
 
 RDEPEND="
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index ca1d388fa7b4..ba6684b09a58 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,7 +1,5 @@
-DIST Image-ExifTool-11.60.tar.gz 4610485 BLAKE2B 25cd45b20a1089be4894ccc645cee81b55099f46eed55b8d67f624bbac8618f46e1bb78ad19dc88c330231fa974a1a96311d305e09bd13f0dce2d69cf1acbb21 SHA512 e5d104a4b849af903f721bd9cc2898d84f4e7ea6d7a1e3619ba99626ac29ec8e0c02e7a63347787385af3262e77e6da7dbaec06d63c33a931ad1ffce059613fc
-DIST Image-ExifTool-11.63.tar.gz 4616559 BLAKE2B 343d3b19f18d1fc1b0c4073bd24bf596bea35ed3ef4c98899df89d8cc0ce24f07571333208a98b274a50726a051e84d7d1e02f25ed65201a7798320970afb0c6 SHA512 ba58e36c5ec55c521e5610bbbf39831cc76e64f3d9cd2179d0540b987dc4f182e39edf76a7ffa4270473f9eb41800390946b3ca567eef38b023b71ceabc48a3b
 DIST Image-ExifTool-11.65.tar.gz 4622048 BLAKE2B ed8359f40c897b9296450b1cbda1f107a2ee7bc40012e4c74e07712e002be29fd73dd6efa8ea1af5ede2ea868ff5ceab0ff375a9be576bf7277414a6b49854e5 SHA512 7e76fddf9e25b80dfa6c0d59c5ef80708261e1d5529d40051e43ebb476bf8ed1716892075d3faaa3ee2239bde236acb46b4a7906fb689707b90080a752f55011
-EBUILD exiftool-11.60.ebuild 605 BLAKE2B 321361a04e5d97128b6d1bfcb845150b287b4a47e57b8a512d7fda58684b67393a1455f6a40eee426c5240dd1160bbd656783c1c4b02966a7808be9b73d40c78 SHA512 88d9ba9249f429d2d36c516298b9461f36bfea90f6025b770fc9012ee4d182f83ffcce76e0010f19eaa1b8bfe5b80de1c7c07d76ff127a044f78e42accc1768a
-EBUILD exiftool-11.63.ebuild 610 BLAKE2B e3d631967c3970948f44d2fb65d4bd49e5520cf2bad7e2113db9d9ee699d676eb4e7c7f26fce256169aac4be26eb4d4c7e1ef6d07ce9d7f500a7f1a4d8317e8b SHA512 2f03d0599dc67f567878cdec992a41fa27fb6e137b0ead6efe41b411338d9dd4b6aca397ccdf0a9553f7315f2fbe68e50ece85d0e705fef7c1857b56b3c9f026
-EBUILD exiftool-11.65.ebuild 610 BLAKE2B e3d631967c3970948f44d2fb65d4bd49e5520cf2bad7e2113db9d9ee699d676eb4e7c7f26fce256169aac4be26eb4d4c7e1ef6d07ce9d7f500a7f1a4d8317e8b SHA512 2f03d0599dc67f567878cdec992a41fa27fb6e137b0ead6efe41b411338d9dd4b6aca397ccdf0a9553f7315f2fbe68e50ece85d0e705fef7c1857b56b3c9f026
+DIST Image-ExifTool-11.69.tar.gz 4628872 BLAKE2B 3e7aac9e23ab38f721a6ff778423fd2591a70197e06e0da48aba7e30ec4cdf8bb38a4a139c23ee3e2e1921e96086e16b4ae694be25a02b845766062f7b08684b SHA512 70d15d8f60cdcc7aaeb96057e90b6c228fa21b87a90448fb9285bbfd58287ad49b8d084419acdca329ac7d354fa849a1c77fde71ad39a3925b057595335c809d
+EBUILD exiftool-11.65.ebuild 605 BLAKE2B 321361a04e5d97128b6d1bfcb845150b287b4a47e57b8a512d7fda58684b67393a1455f6a40eee426c5240dd1160bbd656783c1c4b02966a7808be9b73d40c78 SHA512 88d9ba9249f429d2d36c516298b9461f36bfea90f6025b770fc9012ee4d182f83ffcce76e0010f19eaa1b8bfe5b80de1c7c07d76ff127a044f78e42accc1768a
+EBUILD exiftool-11.69.ebuild 610 BLAKE2B e3d631967c3970948f44d2fb65d4bd49e5520cf2bad7e2113db9d9ee699d676eb4e7c7f26fce256169aac4be26eb4d4c7e1ef6d07ce9d7f500a7f1a4d8317e8b SHA512 2f03d0599dc67f567878cdec992a41fa27fb6e137b0ead6efe41b411338d9dd4b6aca397ccdf0a9553f7315f2fbe68e50ece85d0e705fef7c1857b56b3c9f026
 MISC metadata.xml 10159 BLAKE2B 3b879f3679b07864e8e32d0223d1512919d56ede4b51bc5a550a83694c8c956c6e6e60a92309ceafef61ed738ccd0b5a6817094b4132be013560d3d7830f6349 SHA512 88662e634877bf2b67144fd37a862626e247f7df5daa82ed8d7a91a00611290d3976687221b5f58b78111a8894d45d55c8999966436f621baebf1bc7b3561484
diff --git a/media-libs/exiftool/exiftool-11.60.ebuild b/media-libs/exiftool/exiftool-11.60.ebuild
deleted file mode 100644
index 3afc7ec316dc..000000000000
--- a/media-libs/exiftool/exiftool-11.60.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_NAME=Image-ExifTool
-inherit perl-module
-
-DESCRIPTION="Read and write meta information in image, audio and video files"
-HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
-SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 x86 ~x64-macos"
-IUSE="doc"
-
-SRC_TEST="do"
-
-src_install() {
-	perl-module_src_install
-	use doc && dodoc -r html/
-
-	insinto /usr/share/${PN}
-	doins -r fmt_files config_files arg_files
-}
diff --git a/media-libs/exiftool/exiftool-11.65.ebuild b/media-libs/exiftool/exiftool-11.65.ebuild
index d65975820b77..3afc7ec316dc 100644
--- a/media-libs/exiftool/exiftool-11.65.ebuild
+++ b/media-libs/exiftool/exiftool-11.65.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
 SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 arm64 ppc ppc64 x86 ~x64-macos"
 IUSE="doc"
 
 SRC_TEST="do"
diff --git a/media-libs/exiftool/exiftool-11.63.ebuild b/media-libs/exiftool/exiftool-11.69.ebuild
index d65975820b77..d65975820b77 100644
--- a/media-libs/exiftool/exiftool-11.63.ebuild
+++ b/media-libs/exiftool/exiftool-11.69.ebuild
diff --git a/media-libs/faac/Manifest b/media-libs/faac/Manifest
index f7575a8bf946..979e4a439bb5 100644
--- a/media-libs/faac/Manifest
+++ b/media-libs/faac/Manifest
@@ -1,3 +1,3 @@
 DIST faac-1.29.9.2.tar.gz 483826 BLAKE2B f845e75ec640f2a6ac41ad10dfdf1dbc6a6ddef3cb8cc3fe63450515f888343126cb2ec1df4c4eaaefed3d7d5d56249078f14363fcb9d9484228e9b1754a8b99 SHA512 71aaf060d087e866700a3a7c7d447e85709f65709e148610c4b34f5a3e095fa4a5c19f49450610949fd7db12345422b8a116a1d061899c127ad9a1bc30e79c7c
-EBUILD faac-1.29.9.2.ebuild 1105 BLAKE2B e519265edb19db3666e5ba87e9d5c4ae8b05c4af180219afe3eccf09646af7ee4d448ab615e748b6a6eec23b860826f7bb1318af09dd024e46d9ea5cbdacf563 SHA512 67c260e2822015f791f1e172b39d9c3a647836061cdea603c71dae7a412dc70ce9eb5e3c36d247839f4e62a3a1c31fb91b9674f86d24077ee30b574adf85db5d
+EBUILD faac-1.29.9.2.ebuild 1083 BLAKE2B 4d8845676557c15602a3f75f99b7efe0234226baf6a1f13332c54da27a5a48de5056b946bcb1022d1cb5211d83bb157649269a546149903707adc6c2d4d844b3 SHA512 45fc486a8c3fe9e6700e9eeb8ee5f1b56e902f3b9ee85c4fb7c88bc5e543c1eee08500df7ff0247f346bd97b02626ec83d563caac202dade1aedde1e1ea51fe5
 MISC metadata.xml 327 BLAKE2B 3c3eabbf763b0f521edb87c8d91f43a9e64c22c2ef6b86d4b95b997208a5d575f55575cc97d2c2caf3b759cbfbba7ce91377cba0121dca9f7b1a18cdab7e0162 SHA512 a323b91cffc6e960e52f3aac94763767ba428361b736e635ddc6eaee7dab9bacc36cee8bbd38c4887f3243f3f060707f3533b1c4e4be49d14ba1f602e7bf6f80
diff --git a/media-libs/faac/faac-1.29.9.2.ebuild b/media-libs/faac/faac-1.29.9.2.ebuild
index 5099c155cd91..58776bbdaad1 100644
--- a/media-libs/faac/faac-1.29.9.2.ebuild
+++ b/media-libs/faac/faac-1.29.9.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MPEG-4"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND="${RDEPEND}"
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index d10c8ee7e9d8..89e20ac9f600 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,4 +1,4 @@
 AUX faad2-2.8.5-libmp4ff-shared-lib.patch 539 BLAKE2B 3ee6b86534612e6c96bc884e71559521c0ed464a66a07217caef0959eca0e2a0bdc5ef28367340d07d5ca1ab1686408b4c98c7ef718d4bcb0fa3d827c11074d3 SHA512 b5889dec7850ffcffa707a8594ef74f1e33848c22d2eb5e1a397ca57884b984633610f37f111b534724f2d8f0331e40ed90b01c9acf22c34053f740703e33fa4
 DIST faad2-2.8.8.tar.gz 1069044 BLAKE2B 3e22e695d89cce0ecb673caec73dd3115b2249d18daf6d0c8cf2b5cc90086889c9da733e037bc8b58c0bdc145c66bd4218b9b5e237adb7ad1c6f0caf0d97d304 SHA512 3275d292b2a9fe984842962f4d81202894bddd17033f7cd6df95466554cc968dfcbf2890ae8b1df37da0cd25d645cca0a687f07e39b9fc37dd004fd5956a82af
-EBUILD faad2-2.8.8.ebuild 1242 BLAKE2B 3dc8a0eec842ed70efd09286079280adeb90fb0be8cd8326d8e92960465f6a9fb1a4735a5850c44312d87f3206e67a2f999c6a745814a88891d51fa46f61e7da SHA512 82e5a871874c2c79cc1064619c4e4f6be13ef27b87b5bf893bf92cbd0f71e5d4ddfa0541ed18170997e0ca3df190ab9e25f54d4099ed54fa9fb298c113753066
+EBUILD faad2-2.8.8.ebuild 1220 BLAKE2B 6e18f84904d1d61e00dc5e9a8a5f70781061c860ce612c3b1ca370e8585532100150c545b7f3bb775e124150bf0d7fc4688fec7f98de3e60e146ad276af610da SHA512 f7daff248e4808ce217263390ef04ceeab68b4ef7ac4a8bc39d8e71fdbb6af1980773975c4cfabef0e7aadcddf50b6830b772f90e33f0db41d3cb4079a1ae251
 MISC metadata.xml 619 BLAKE2B 3eb4a78c845f019f564e15c8aecc41bac00aa7a814f761a6f6b4b5810e245c4645149defb09c998a615c8e3ba551e569373475e7dd8ebb5f8656e6ac6b2992dc SHA512 b62370a9ce905bb0e96001422baee1b75af853080d9ef795148e56ed8c2b8dca9c7eae3a3ff29869dac4e9af5835327649eafa20bc7831b14bec07cb901960fd
diff --git a/media-libs/faad2/faad2-2.8.8.ebuild b/media-libs/faad2/faad2-2.8.8.ebuild
index 52d52b03f259..aa48abd0ee29 100644
--- a/media-libs/faad2/faad2-2.8.8.ebuild
+++ b/media-libs/faad2/faad2-2.8.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/faac/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="digitalradio static-libs"
 
 RDEPEND=""
diff --git a/media-libs/fdk-aac/Manifest b/media-libs/fdk-aac/Manifest
index 937e7be813a2..be21e3474adc 100644
--- a/media-libs/fdk-aac/Manifest
+++ b/media-libs/fdk-aac/Manifest
@@ -1,7 +1,7 @@
 DIST fdk-aac-0.1.5.tar.gz 2091081 BLAKE2B 16dd8606f87480fbf13d06b9628ff8c4fef418b5c55fbf99931d25ee9de6c1dd710760be8766af995d0d678e8c94b2d3b17aa6cd0f5b2512ae9d4478d985d72a SHA512 579e96dae5638cfe2d3d5e84ab24a72ed50ed3b5a9d3c6eb2f434d3a5f4c575877a2ecf6cd7cf7a528eb2811b2014a861eaaac9ea5fc617c6423587525766f00
 DIST fdk-aac-0.1.6.tar.gz 2091618 BLAKE2B e3036879e21677ea0ba6d6a030aff0568572e420217479b19312bc64daf0a4e94c1a0a6de561baa79f362186777f1414a4a1eb89bf80c1268767564f1a82708b SHA512 d4d14debeb6e424f4e2a1458ed7bebaa2c45ce54170c6e679286fd965f52286b6a6c1e944edbb4ea2302c3bb789c0f3cdab9c0d89618014ba4250b2f04d71d12
 DIST fdk-aac-2.0.0.tar.gz 2864593 BLAKE2B beaefd5186a6253496a656ccea514e764e6c6515b46ea0fa324f66985af8374f3813afddb29018da12d28d1672ebe10821f5e4e98d131ad4fb77a3d01ffab234 SHA512 40b02a9e42e17015fa6531c7b7eb51098ab43224c11c1c85e981d950642ffc6884146367cb423062b1da11679020ee5c5779dce5f4dc62175c8bf471831ed918
-EBUILD fdk-aac-0.1.5.ebuild 1329 BLAKE2B 4b253218fe7f3792205f1f4a49f825cb2e3659256309189cbac4176744957a9739c365eac282a45f43f0294bdef2204844ad064c7aa0d4dc0980f103574b212b SHA512 4d1cf29c86faf68d62604d324cc68132a386486fb7c88b5c54b893019fa59c9b14438a0011c701e1286ec5a6f1078313acf0eb8df17d27e741762d00807ae49b
-EBUILD fdk-aac-0.1.6.ebuild 1360 BLAKE2B 140c2622a15b32a10e6c79f249c15a591d5ae2b68f2e695662d84a221ae031b8fbb460258aaf823b5efec4fc318b312d1e77fc6795599c26c2a79a092df42344 SHA512 aaa3428c0840753488d2019a8d58524868d237a3d0c0324fd5ce77e7500e2bf0be8520ee0dfeda7d44963a2fba5280009ab5e3c40b6a607b3bc3cf480f1bcb0f
-EBUILD fdk-aac-2.0.0.ebuild 1350 BLAKE2B 66c5217f6f661da2591d462e0cd94372e064d3c25fc163fd89a877a4025c21ec2a7c857260894f50442c050959e606ac77db2d52921bb03a5a910e0d28512c8c SHA512 a9585640e9d072d357ffd652388be2ddc923090bf62a17fb7ec988cd3a2de9a3c1b73925b0f84a475cd78c7b553785b25265534138efd2125fdf759ee44bd711
+EBUILD fdk-aac-0.1.5.ebuild 1307 BLAKE2B a802ea00113afa73b8e4c4178248f9ff21c810898226547fa55ff2b9e281c3af926137e90d5a22b1ad2ccc906fdbbbdc7e4f09db7bfaa0621c37f85d7411506d SHA512 9d1c91074e55a8181798a77e2b8bb790e5158aaecb3a25a55305c2667f017bdf5f3640982c2193389fc24a18461990ebdea724f513ac80f5665e486caeb2bdbc
+EBUILD fdk-aac-0.1.6.ebuild 1338 BLAKE2B 87627d786f70e811f549544522e802211050d6a150cc57b49784f814de88ff171529d89e2f88a54127912a14e7de7cfd26680d631800c25e969ec4cb68f69494 SHA512 165da2c688e835db2121fa0bc23b17db6e1cc0c13c64b8caae696b10499a77db3928e73b9e70321a8dfb27a0ee84d37d1daa2cfd64fbb5fb03094a0dec3b0797
+EBUILD fdk-aac-2.0.0.ebuild 1328 BLAKE2B 2115fac8a61dd82aadfb945f302986063c5acd153a35a7db0bee3da0ffab34ea82a3d604429c3b33d3262f1392a6bf55e3cd905bcc08aaf70b1c7e4e0712a9d9 SHA512 7022b77587d04fc0be13e2cf4d44900e1e18c19e34fab152180b96e1b13b6dade6e3295d9c13859d2f8645011965b1caa91cfb1ccb8287d5f508ada38eff0537
 MISC metadata.xml 426 BLAKE2B 701e014c8a2fb5649fc546c205d705e8c13e0b3acf2bd445c4058ffc96e607743c5e6c8c21e3c0f0941421064a169b18b3736bf5f34b979f36fedabdf0fe318d SHA512 217c0f757ba4c8bd4e649aab097900eebaa9097d6f56ea373e78de2f3a392d25401c8dbb654b80219bceaea7db7ff616f532174f4a5119bd1b3c093e9fc89da1
diff --git a/media-libs/fdk-aac/fdk-aac-0.1.5.ebuild b/media-libs/fdk-aac/fdk-aac-0.1.5.ebuild
index 0cdfb76e6377..3f58741c9d26 100644
--- a/media-libs/fdk-aac/fdk-aac-0.1.5.ebuild
+++ b/media-libs/fdk-aac/fdk-aac-0.1.5.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
 	inherit autotools git-r3
 else
-	KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+	KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~x64-macos"
 	if [[ ${PV%_p*} != ${PV} ]]; then # Gentoo snapshot
 		SRC_URI="mirror://gentoo/${P}.tar.xz"
 	else # Official release
diff --git a/media-libs/fdk-aac/fdk-aac-0.1.6.ebuild b/media-libs/fdk-aac/fdk-aac-0.1.6.ebuild
index 228a1c8a1bf6..b8197f01d0af 100644
--- a/media-libs/fdk-aac/fdk-aac-0.1.6.ebuild
+++ b/media-libs/fdk-aac/fdk-aac-0.1.6.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
 	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
 	inherit autotools git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
 	if [[ ${PV%_p*} != ${PV} ]]; then # Gentoo snapshot
 		SRC_URI="mirror://gentoo/${P}.tar.xz"
 	else # Official release
diff --git a/media-libs/fdk-aac/fdk-aac-2.0.0.ebuild b/media-libs/fdk-aac/fdk-aac-2.0.0.ebuild
index 00ecadc705fe..c28e667a221a 100644
--- a/media-libs/fdk-aac/fdk-aac-2.0.0.ebuild
+++ b/media-libs/fdk-aac/fdk-aac-2.0.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
 	inherit autotools git-r3
 else
-	KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~x64-macos"
 	if [[ ${PV%_p*} != ${PV} ]]; then # Gentoo snapshot
 		SRC_URI="mirror://gentoo/${P}.tar.xz"
 	else # Official release
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index e81c8e400713..97156e7d98ef 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -6,6 +6,6 @@ AUX flac-1.3.2-fortify-sources.patch 619 BLAKE2B 409c249f9937076da74e4270bc94236
 AUX flac-1.3.2-honor-htmldir.patch 2088 BLAKE2B 7dd5f79de44f5c2453bfe5137d22d8cfd77615fecf83170c3b9f2f4c68b00466ce0dd01ecea393fa1ae91cc04525dab766199778a7dc946ed3fc0ccb9c8af8fb SHA512 1617f13c469eaa71bd8c99833c50bc99eeebe37e5ccbb96d55ebd9b1b88587ae00d577e23dc11802d651a962ac1fa1ebf173fc8879270409a87ca3e2cf96aaec
 DIST flac-1.3.2.tar.xz 776192 BLAKE2B ff09df3fc4f985a00fcf6d497be675ceeda85cc57ea73b4f8ad6679cd40a33640f8502adc80c0a571d01fa0a17b8fcb6bfd8df7474620099d4f34bbc073bc7a3 SHA512 63910e8ebbe508316d446ffc9eb6d02efbd5f47d29d2ea7864da9371843c8e671854db6e89ba043fe08aef1845b8ece70db80f1cce853f591ca30d56ef7c3a15
 DIST flac-1.3.3.tar.xz 1044472 BLAKE2B 14acf10e5bce54767a8e3c9bfd0b80c388011e35c7e6a814672f8048d5350b4e6f54c6df4f704e611fa4a796fcfcb6aca1ed798f542cd6abe181210f9f6e33f6 SHA512 d6417e14fab0c41b2df369e5e39ce62a5f588e491af4d465b0162f74e171e5549b2f061867f344bfbf8aaccd246bf5f2acd697e532a2c7901c920c69429b1a28
-EBUILD flac-1.3.2-r1.ebuild 1847 BLAKE2B a5858c5fc7b69d0dd6fcce4b519b201d91562e817d5b7b7d49af2d18a8b911457911aa6a8956fc47a524736e3bbd87f3d1a3f0590ad4c01efb11519f1394cb08 SHA512 4f79efeef46e8929da857198e8609350fe9fa5d6d6eeb5eef7f11b3465d2e61ed25e240dfb141708b48f1cb629ee3c83be1739f53963d26c5ba387404ed62ade
-EBUILD flac-1.3.3.ebuild 1536 BLAKE2B db4e152c8b72cf7d0afede9a522aaa686b04a22070b7ac20400057bc0abe3f0397bee77bf3678d2fc920e284fbafefdb8fc6307587aac10093841f7c8abdf698 SHA512 6637c8b328a3b538098bc9423d895fd0a4861b26b45ba334bb1edcd6988dd323f06c681bec2157fb97ad3c3b9278abe637db67b355daa678e0106c45ab820d23
+EBUILD flac-1.3.2-r1.ebuild 1825 BLAKE2B 5c64304c1ccce92a9b77e188fa7f9a1e6be16dc8091449c335cff961701029caccc9cb2315f6df4db62903b3ed1a485e79c39c82cebbc2f7c3340088a37c4fae SHA512 837c11ef4176b2a643de7c5f2e1975d58ce67093341a1334735dc01cef7b86862de07445fef14d7a58de14c0b9cc58a1f8a8999704b8a66c0be51e87ba83ea4c
+EBUILD flac-1.3.3.ebuild 1514 BLAKE2B 25c5ffa18e05e7b4dc5c8554a524e74b628ba0950431ab2fd88ef85536d93e7c145549b5899781bc961df8cde7b263cd281c3ee830f6f709bd86bd236affc3a3 SHA512 4cfccc48cfa328ab73e291aa8ea2d987b811f22c869d873258ac140add01cdd7f508191cbbafe8ddfdd4e7ecd36d1f11a286e3a9a0acbffe31313d82fa6dea20
 MISC metadata.xml 327 BLAKE2B dee4aea4020b899879f83487d34853963264b68e7a7e8c509571bc353a5b20fde4d7f78899b900bf4214f5d488f088523090d4f41e8542f069e9a4eb7791c2ad SHA512 a4e6ad50d3089ff980a07a6ea6f7fcc22e3efc4da4c5721492aae001861fa185f12d68fc5effb55ccce8d67042b7a605c28096f4bca88f2ba9d5b4eb2593d14c
diff --git a/media-libs/flac/flac-1.3.2-r1.ebuild b/media-libs/flac/flac-1.3.2-r1.ebuild
index 634d03d1740a..7df4ecab2d9d 100644
--- a/media-libs/flac/flac-1.3.2-r1.ebuild
+++ b/media-libs/flac/flac-1.3.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.xz"
 
 LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="altivec +cxx debug ogg cpu_flags_x86_sse static-libs"
 
 RDEPEND="ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/flac/flac-1.3.3.ebuild b/media-libs/flac/flac-1.3.3.ebuild
index 77a1ef44f653..17a63399cd16 100644
--- a/media-libs/flac/flac-1.3.3.ebuild
+++ b/media-libs/flac/flac-1.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.xz"
 
 LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="altivec +cxx debug ogg cpu_flags_x86_sse static-libs"
 
 RDEPEND="ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/fmod/Manifest b/media-libs/fmod/Manifest
deleted file mode 100644
index db9d763cf759..000000000000
--- a/media-libs/fmod/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST fmodapi43802linux.tar.gz 21992247 BLAKE2B e0bb112ca47649390c7aba33a1cd75cb7b13c9a2d4cc5eb5c9a6bad02af9ae4958bdd8d458bd4fcc76eb42f5e09f8f989206c971bd7cbcb05359aaeab392fe38 SHA512 6a3f0f62acc71e24e48f8aaa03270d95ce09ace6d37f75a40452c84788b06f4cd6889772e9a6c00fc4799020c046905a9185d08900bc3b573a28b42cbb7f45b5
-DIST fmodapi43802linux64.tar.gz 22282269 BLAKE2B 733b3531f9e107332ab2c91e07f39363810f748e72fdbdcc865b87d86bee766859c01eb2357b5169cb79cad490d6186227d481335a1114968a1cbe2ab6e33ae6 SHA512 95b8688bbf54e19c2471f508d7ed9fbb93f6c88eaadc090813b02a86082e15dc7578220a40ae2b39358f8a4dfcacb4cb78823f4577f5ce9bc3d53af2f591d558
-EBUILD fmod-4.38.02.ebuild 1615 BLAKE2B 1dbf98382b28e8713b802904330529ad073b0ba7c416ae1f1796b0ee7d8e7cb416350797c50379f0939edc127fefaef45c804ac9c435c41d6fc6c982bc6f7748 SHA512 bfb573babc258de7e405e47fce8070893e8f56559d92a5a5921cd225c47c748f8e44379f096477b22960947f6540dfe722fb50f5f3e8403a19d5d13ee8a224cb
-MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/fmod/fmod-4.38.02.ebuild b/media-libs/fmod/fmod-4.38.02.ebuild
deleted file mode 100644
index 6a75cfb9a8b3..000000000000
--- a/media-libs/fmod/fmod-4.38.02.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit versionator
-
-MY_P=fmodapi$(delete_all_version_separators)linux
-
-DESCRIPTION="music and sound effects library, and a sound processing system"
-HOMEPAGE="http://www.fmod.org"
-SRC_URI="x86? ( http://www.fmod.org/index.php/release/version/${MY_P}.tar.gz )
-	amd64? ( http://www.fmod.org/index.php/release/version/${MY_P}64.tar.gz )"
-
-LICENSE="BSD BSD-2 fmod"
-SLOT="1"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-RESTRICT="strip test"
-
-QA_FLAGS_IGNORED="opt/fmodex/tools/fsbanklib/.*"
-
-QA_TEXTRELS="opt/fmodex/fmoddesignerapi/api/lib/*
-opt/fmodex/api/lib/*"
-
-src_compile() { :; }
-src_install() {
-	dodir /opt/fmodex
-
-	local fbits=""
-	use amd64 && fbits="64"
-
-	local fsource="${WORKDIR}/${MY_P}${fbits}"
-
-	cd "${fsource}"/api/lib
-
-	cp -f libfmodex${fbits}-${PV}.so libfmodex.so.${PV} || die
-	ln -sf libfmodex.so.${PV} libfmodex.so || die
-	ln -sf libfmodex.so.${PV} libfmodex.so.4 || die
-
-	cp -f libfmodexL${fbits}-${PV}.so libfmodexL.so.${PV} || die
-	ln -sf libfmodexL.so.${PV} libfmodexL.so || die
-	ln -sf libfmodexL.so.${PV} libfmodexL.so.4 || die
-
-	cp -dpR "${fsource}"/* "${D}"/opt/fmodex || die
-
-	dosym /opt/fmodex/api/inc /usr/include/fmodex || die
-
-	use examples || rm -rf "${D}"/opt/fmodex/{,fmoddesignerapi}/examples
-
-	insinto /usr/share/doc/${PF}/pdf
-	doins "${fsource}"/documentation/*.pdf
-	dodoc "${fsource}"/{documentation/*.txt,fmoddesignerapi/*.TXT}
-	rm -rf "${D}"/opt/fmodex/{documentation,fmoddesignerapi/*.TXT}
-
-	echo LDPATH="/opt/fmodex/api/lib" > "${T}"/65fmodex
-	doenvd "${T}"/65fmodex
-}
diff --git a/media-libs/fmod/metadata.xml b/media-libs/fmod/metadata.xml
deleted file mode 100644
index c870d0eef0ab..000000000000
--- a/media-libs/fmod/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 227de5f6671b..5eb3d6256b9d 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -9,7 +9,7 @@ AUX fontconfig-2.13.1-static_build.patch 2274 BLAKE2B 41dcaf492c8096d9d5d964f98f
 DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 48432f3d3cc90240ec19dffb6714e7f780eb6b401693b40e2efa2bb593bc89c42b03c99fce8f2ceb7c108da254dc248d91a790849d22feaa50a725338b80fd1f SHA512 2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06
 DIST fontconfig-2.13.0.tar.bz2 1700500 BLAKE2B bf137b27c9f73c5e2763b7a4a443a4aa5016bd3c0e35138249c2cf8841eb364c8e7bbea6495b53b88de26e3d5a429ebfb598a9f4fe7d875028a621df592ff35a SHA512 f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc
 DIST fontconfig-2.13.1.tar.bz2 1723639 BLAKE2B 08b9a522a9d89bc5e5ed0f0898182359efb110f22b6b7010f6bdda0d6d516957ea74ebe0703d684d4724fd9f44a2eaf50d8329d4e0f4e45e79f50466d808b9e1 SHA512 f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100
-EBUILD fontconfig-2.12.6.ebuild 4914 BLAKE2B 0088f7ef6b497b086c5f90a42330f1727e404e9818b29d25e30340679ddddf3df222cab240ee09021d99660a4fac2a5f16f59faf5b4ff4e56fc6fd6f689aa72b SHA512 7f78420ed60f3b575965e5088cde35c346f6a54ee1ee0ee1321c028a00e60f9df52bf6fcc13b3da53b0c1714209f513e5d49b64e24b5a9a4b4920fa0fadc1e79
-EBUILD fontconfig-2.13.0-r4.ebuild 5180 BLAKE2B 12970aacf5158fd728dcace781e5a93b77b3fb9e1103a0d7448e079651918c13473433c670cd0bbf675e2b0d264ac8341f24ca5cf6aabcf7ceb4e61c2bb7a429 SHA512 13dc7a15de128e158d45481bab5cffba0d504b28fc2cb71539dd11a08abc9810b2d09c8fadf6d25613854959a54da87d7c2fecff0853e26cc87ec3486b6cfb4a
-EBUILD fontconfig-2.13.1-r2.ebuild 5270 BLAKE2B 307e8d2fb618edfe95c70412c738b121490c1470536f70edfa2d93849cc13746de3153286668450ded2b6243a532798017df3e9d7cc0be006e482002faa3892c SHA512 2e9db68cc39fd3a20a3fd6f69da1d94482756a9119ddd6d816c6448a88f88d9dca41d9201f22d22f36818ca9af6b680a55ce36d146952f37dc4a3614d4432a4c
+EBUILD fontconfig-2.12.6.ebuild 4892 BLAKE2B be6d19108d34f30c1b4a4bd97f2380033ce4bdfc908a6e56ca6198ad414ffe92d88e1aab7b5dd127aa74fc6bca79762c7a0f4e1452beff743d35fd0f3a7fbeab SHA512 9a920d9cedfa9fba1dee25098d8bd77e98d9e60994947df23adec059bcab63f2cbff1d026a9f6afb8949b02663e824e3af78cbaa2872e59c2e386133b0bb9cc3
+EBUILD fontconfig-2.13.0-r4.ebuild 5168 BLAKE2B 7ff2fdbe8fc02cd0bbbfe08106ececcb10a224682f0a9b17199ed6fdcfb7d63140622060c431a06fb9a52dbb46d7103fcbeb8e728f8ea2ccb52cde14cc13fa80 SHA512 db016db5349112ba418fd806cf5879b530f4474331597a589234434b886911839065b44782c685697d2ef2341bc56cf5d023c9a50516799a628f2dc49d7c4690
+EBUILD fontconfig-2.13.1-r2.ebuild 5258 BLAKE2B b6aef46780cb131b6b969571efe565e96b1884e68103a6a9778adcfbf2ceac99b11ffef4618a8e964961a9f3c01ed10a00a7d009c98679e1a2fdf27a498d7ccb SHA512 c1b71bdea0cbd1d930ecb61505389032ed17b7c9f4332ffb5e161a5f79ba20d46d0315d3bb8441d6e6905a7cbe83dbe8c31d88aef17a5f73ec06729feb0d7956
 MISC metadata.xml 598 BLAKE2B 9dde998386dce5ea1c1a087103d18c0e0654bc2e8a59e1bd99ef92eab86584b52d0b1a00da4bd1921bf322f00752c9a1954aec1e5daff6c68497eb8cc8e82bf2 SHA512 fa7c42680f0108f22187ff0daac898161bbe7a74265c7370e1fcf1c3cc6f78987e88722b5159ee524b4245daa528474986e0ed69036f3d4b7a95948012acf324
diff --git a/media-libs/fontconfig/fontconfig-2.12.6.ebuild b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
index b053ccb18d9e..d1b119de4de2 100644
--- a/media-libs/fontconfig/fontconfig-2.12.6.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index 1f597094e178..eb2cc45cc827 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2"
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
index f12f3fa0ee3e..95b4c7c1cfbb 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2"
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc static-libs"
 
 BDEPEND="dev-util/gperf
diff --git a/media-libs/freealut/Manifest b/media-libs/freealut/Manifest
index 72c590e96fb7..0ebea71e12ae 100644
--- a/media-libs/freealut/Manifest
+++ b/media-libs/freealut/Manifest
@@ -1,3 +1,3 @@
 DIST freealut-1.1.0.tar.gz 461830 BLAKE2B e19c800e2d678dd41b9e41153e0f99d84300b3f6d0226bd81e7724515597a2641fc2203e46b193dd506a1c90e968d2d951f84afa29cf375fbf5acb72999c1305 SHA512 270f74972548b4ac6b98c52c51787ed43c20cf79979063d073bbee7bd08ac4f34c2b579fbf15c09c4e606a5ed38dcd0252f5c46fb3cfe43b727b6b53cf747933
-EBUILD freealut-1.1.0-r3.ebuild 863 BLAKE2B 6880f33b266871a73c91da3979c0788dd15bd5a7763c1c79a06a482a4aa699fcf31064f378a49b64342bab94cef917d2fb4c1f24374420062241da73dd1ab175 SHA512 08e883cefb43a508f41043c9d7b3a2b0f4bb19f965df6c253d05d1e2e3869a83c02f133bb53c8edbc34e30e250ef61f300309b846b0ca0aa09f8a2c1c6f1caf3
+EBUILD freealut-1.1.0-r3.ebuild 853 BLAKE2B a5f1ec164dd7043fb6d5a58bf2d11fff52b22ea6746482bad118b2af28916eaece171038099bd15d9ea2190f06a4438d75269b019929792cb12b7c952aff92c2 SHA512 9d646346a05fa3d94c96c5a7279e53172ad3efe05429772740e5a020cb1cf591003eb0a7f0c234d134ecff02ed89d39aea8124ca7fda980ac50d88d97a588790
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/freealut/freealut-1.1.0-r3.ebuild b/media-libs/freealut/freealut-1.1.0-r3.ebuild
index 6e80353c534c..2a7d3e3a944d 100644
--- a/media-libs/freealut/freealut-1.1.0-r3.ebuild
+++ b/media-libs/freealut/freealut-1.1.0-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://connect.creativelabs.com/openal/Downloads/ALUT/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index 8bc6abff9231..17f9a1f0474e 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -1,7 +1,7 @@
 AUX freeglut-3.0.0-bsd-usb-joystick.patch 23398 BLAKE2B a55c99083262409976a3074bdafbaf42e19ea980f7d8e3641cb65cd6d502668f1f8ec653eb7d23852276a0634ba5841e7b989f32b8a50036b6b26a69d6630988 SHA512 fe527efb2be40a87c6767e65315795efd632627503f6e43b6ba50d81b7a7d59608f4bf4387001ef1443f47dfb739d972259eb406e6f32996dd710a78a10976cf
 AUX freeglut-3.0.0-drop-unnecessary-x11-libs.patch 1158 BLAKE2B 85f025a23d1fb0e4866ffdeafcd563e6d752d5d56a5f4d0648a376e8a6b9dbc54f80f5ab6d35d4a6bd71f469e9fd7225df2f93eecd49916bd86cbca580d369aa SHA512 414ace62ec3b6db139e4667648d0af8c4ad1beb6a91ea86218aa4ef6e27bab1eb1d3749ad08bc55a028ed1d9020840763f20fe4c5a317cdf374fc8494eb8c2bf
 DIST freeglut-3.0.0.tar.gz 419095 BLAKE2B 6065044fb2816ddfebd363189cdb897e00fa433d79c09f5a705b80ff730e1312158ed5db8d7a2cbfc2ddac0d0a9400300c5c245d967c33c937da11303fc316de SHA512 9c45d5b203b26a7ff92331b3e080a48e806c92fbbe7c65d9262dd18c39cd6efdad8a795a80f499a2d23df84b4909dbd7c1bab20d7dd3555d3d88782ce9dd15b0
-DIST freeglut-3.2.0.tar.gz 443147 BLAKE2B e33ad6e0aae49350a0268413791ebf0b8a416a0c590a058063038a3d4f5405c24e743218633c25a4f5393754c41531631feaac1eb1a290ff1c4cc1dc3d97d98a SHA512 78da1eaa845607ddd97a6744f3a97ff26cdb562fdf990695c8ac97a60d9d692496e4bf3672acfc522add60823c2f3bc7435e19e8041fbbb5d95851c0b641a818
+DIST freeglut-3.2.1.tar.gz 440228 BLAKE2B ed8a4b2361416cfee5540350ee50c32a56e5ea75d6834c677c5cec676967a04e13b2adf3da1cc9a3a2c73fbc6147b3b0bc91953a6edf1e35ce8c933eeff6f97a SHA512 aced4bbcd36269ce6f4ee1982e0f9e3fffbf18c94f785d3215ac9f4809b992e166c7ada496ed6174e13d77c0f7ef3ca4c57d8a282e96cbbe6ff086339ade3b08
 EBUILD freeglut-3.0.0.ebuild 1322 BLAKE2B 40ee9faa939ac5e56c0f4c55607a47b2e1d88ce6c2968f2007ec4f8cc9966091fecf33b6069d5aeb54a6a3fe333602cf47d275290c7f04712f2ec47516fb428e SHA512 c503d74959f04442423e2b60b6f81fd3ba778bbfa1c2d59478aa75556de75c961354db2040f4c9934e690cb253f4460579196f11344a7fc71fc14791e0036005
-EBUILD freeglut-3.2.0.ebuild 1244 BLAKE2B fb5a414e44291cc40f338c4d71c125ee9114472dad6dc11c6f888b50677982a7e7a80a9fbaa6a50a25f8bde0d726d89968a5b2feba32ce0a244d0b4f9e7eb2a8 SHA512 d212343c83ea08a455fb85ad392ae0c4ac8365a00161de2ec2477b278d9137f15d498aa1d8ddb987f2a36c690298ab53abd8317b5987f3e2b286977f0b7a9ba6
+EBUILD freeglut-3.2.1.ebuild 1382 BLAKE2B 451d265b6a3fb046fb8dd4e85e59f3255ba00a9bb571f02ee4f6a8adb1549a475962869469630dc1db398bf38ba7144f499fad3b373ee7232d445543c979ec22 SHA512 3e7ab2f42252a77bd947d1b5a4eccb0c5d398570b19d7c246b327a9c20c13bde40da8234a66513216ee435e13671dcb7e834aa3090a5ed794a640eb0c8dfee97
 MISC metadata.xml 528 BLAKE2B ee8c09e46677ec77c1d6771b31ac1b28e75464d7e0e4405c41831e19446c5a442c782dbd32a79d0fe5e7ed85ecbd2404764f2121f5f4bff5483db4571fd89212 SHA512 94dc412f8f049bb88723fdba9f9b89645eb792547a768ea524a711ad9302c5cac38a7292ab09726154fc6829a05f41af05220f91d9f6eaed056e4cff8324370e
diff --git a/media-libs/freeglut/freeglut-3.2.0.ebuild b/media-libs/freeglut/freeglut-3.2.1.ebuild
index 78f9dc109c4f..a696fe8a8fdf 100644
--- a/media-libs/freeglut/freeglut-3.2.0.ebuild
+++ b/media-libs/freeglut/freeglut-3.2.1.ebuild
@@ -32,8 +32,14 @@ HTML_DOCS=( doc/. )
 src_configure() {
 	local mycmakeargs=(
 		"-DFREEGLUT_GLES=OFF"
+		"-DFREEGLUT_BUILD_DEMOS=OFF"
 		"-DFREEGLUT_BUILD_STATIC_LIBS=$(usex static-libs ON OFF)"
 	)
 #	$(cmake-utils_use gles FREEGLUT_GLES)
 	cmake-multilib_src_configure
 }
+
+multilib_src_install() {
+	cmake-utils_src_install
+	cp "${D}"/usr/$(get_libdir)/pkgconfig/{,free}glut.pc
+}
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index f5e4dfeafcad..1c3829131aa0 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -9,9 +9,9 @@ DIST freetype-doc-2.9.1.tar.bz2 2130292 BLAKE2B 667032fa447fbc28c0f753df3ade7a07
 DIST ft2demos-2.10.0.tar.bz2 237599 BLAKE2B 722e586f412059b8b29a26c832037a860dc1b26afed85b8b0aa5fc71245293f45d19b379c54993f64ba4b8de329799834656d00fc4b6f6610ddd0b08cfd05449 SHA512 d48cbabd5cc673e0af2e0c4056dba95cee8e08092f881958c6908ea2d4da7104ca81b701d47a17640ac36cbdfd8aa274cc26353bb43f026f55c00d565f2ad641
 DIST ft2demos-2.10.1.tar.xz 229228 BLAKE2B 015448f3f246fc7772b10f55037450866323e1b7410cf840fa15fa1da3e6a1c980167bfedbe197b6e6637a8e1dcef1f4fd83174e47f33f090d554fab2c40380c SHA512 f1c06fae3d5653d6d8f8d630e531d47b7be4429b122dc826c80791953e61df7374dfc151f90519fe110f78fcbf592d9dbd9e96c83200730a6f04e42760cc3142
 DIST ft2demos-2.9.1.tar.bz2 233462 BLAKE2B c689942b222b2c600b5ec3963791621ae87acefb9b01caa5dc35af52525d03e3a1094e48c0789d5eaabbce787bddd7c3055e12454e54ea3c7fae92bca47614de SHA512 38bee59184b20c2eb983deaa5c1f241e31c1b4793e47dc06b1b419601489cfece3b11fde4cf4fb6c5af12254ad0c1ce9a1547885c208e8e715655e9c48f22a46
-EBUILD freetype-2.10.0.ebuild 6747 BLAKE2B 6a98a5429e9c3f18397a1ab4be5fd1a513b28177c848017db5dea9c6fca75aef867fd36585d5eaf1b1eeddcffe347f19560cf56d21596b666204361b61b9f384 SHA512 9be59115d8f5d4f8a2815b280de89645b7ac5779b9da5422a42dae8c8e29de31ac3da19bec518b380e2407601c749709e060bf1e9fa14cde6357f5baf68ae9dd
-EBUILD freetype-2.10.1.ebuild 6741 BLAKE2B 5c32b49c9cabea00a632742792330e0b060cc851180cda49ebf28b205e25d232c68d52312fafcdde0be47c8408a9217e336f11edb60c1e9204973f4e776d3e90 SHA512 538e2a4c7c7d529492fd7aaa827a7d1bd3394ff8188ea79f0a2541ecc7daa7d0f33dfbc9514cd0835ce6e3633e12a1bfde759e58f30520828690ee6499b07554
-EBUILD freetype-2.9.1-r3.ebuild 6683 BLAKE2B d5479a651d75bcd4f668fb6bb145b0f4e20e9083a77cc54ab454d7176c13d671ab894d1de8d9800be6a842bc207323329460d056bca573178482e6b1f8df47ab SHA512 7c299ec881fb5eacd2982c21d85c68a15ad28b80367baac491ae655398a1c4587905799134a7ce9b49759b237ef4b1dc83ebb85b8120dcd95e582786e739c2dc
-EBUILD freetype-2.9.1-r4.ebuild 6695 BLAKE2B 2f332731ffd8ff4f62318a11f29d6153ad031e3b3c15e611c6a6128582fd53a1986cae0d8b64892b9206ebf3ecf4101df994a50eb8bb1b9a8fd6847c948d0676 SHA512 8af93af65bbf2df27d5c24ec09f8d64a39bcd66665b07375bdc86c5930c71e39fa45649fe7193d7835f67b0244ab101b5d544096c7456c7cd3d19c6e184634f6
-EBUILD freetype-9999.ebuild 6741 BLAKE2B 5c32b49c9cabea00a632742792330e0b060cc851180cda49ebf28b205e25d232c68d52312fafcdde0be47c8408a9217e336f11edb60c1e9204973f4e776d3e90 SHA512 538e2a4c7c7d529492fd7aaa827a7d1bd3394ff8188ea79f0a2541ecc7daa7d0f33dfbc9514cd0835ce6e3633e12a1bfde759e58f30520828690ee6499b07554
+EBUILD freetype-2.10.0.ebuild 6725 BLAKE2B 562797cd9f2e1e8721e53b99cff56444ee8fe5426f35255337f19c3700df54427738060d8586dd028ecd4d192a425c89c19371b6613f408b2004d522b0b2d0db SHA512 603bba6b74ec25efb931b18cdfb41729cc609aa29c35f9885c0c55b30f7d9668115adce6823cb958c1ef8f19a476b0fdda191456dcfd756c33939449fd5dd566
+EBUILD freetype-2.10.1.ebuild 6719 BLAKE2B 9b1fc84b473f860918103345646ba4dbe1048cd611c86e740d9003957a3ad22b42a338c62c5be4bef26c2356797738b013412fc2e6b1e946116fb6204f7f1d89 SHA512 a770ad464d192d694e95e697524e9ac7a0e751da1ad501db2a27556ff20ec10f5afe4cfeaa803fed214a633d9a5a4ec95ef14d17af10e7185f3e307b64165038
+EBUILD freetype-2.9.1-r3.ebuild 6661 BLAKE2B 777a32d1d9e44ae3b9862d3884d37347d0c8c2dd315cca94a465f237558652c4b14d16fb716b75a2c1b56aa0fb072e8415d9922899dd2a8b7e9953f3785b87df SHA512 96a7daddbae1fd4275435a4c407a064ff8c6dfc8e3ed4525ab49a2cbfe7aad89594a4cdd480608cff303e547b7c2ba96d2113f794f0ebac54d8959f106f02f50
+EBUILD freetype-2.9.1-r4.ebuild 6673 BLAKE2B ea3e3842e042065107e78bb7108d484f333d11a24e77430e562ad86d690b56895d0824fdc45acadcb128121a119c747b03be5fbb00026161d0eae1f8e6e7d23d SHA512 275b0943e2114ce8f333a855394fa57a9ba7e6f40975c6474b731dbcc4ee34c0f3a797907d56125b5f90c3a5f2e5938d9805a36f40df4cda447a92f3f9328c34
+EBUILD freetype-9999.ebuild 6719 BLAKE2B 9b1fc84b473f860918103345646ba4dbe1048cd611c86e740d9003957a3ad22b42a338c62c5be4bef26c2356797738b013412fc2e6b1e946116fb6204f7f1d89 SHA512 a770ad464d192d694e95e697524e9ac7a0e751da1ad501db2a27556ff20ec10f5afe4cfeaa803fed214a633d9a5a4ec95ef14d17af10e7185f3e307b64165038
 MISC metadata.xml 1363 BLAKE2B 2cadaca7ada476301e4fa15dabaf7e823a9bcf6e59fb018876e3d2ca61c528c7096cb65ac44d8311a8e9a5eada744f41db3ca2960622980a8f5438d2f003202c SHA512 a9272c439ffb4c9ca6597b2ef26e86e99830ff298940abf38fdecf5c8d794ffdb96a212c67e2e23526a0e2686deff48664da4a5af01d2977256038846e7221f8
diff --git a/media-libs/freetype/freetype-2.10.0.ebuild b/media-libs/freetype/freetype-2.10.0.ebuild
index 369fc05a86e7..0b8e98d60acc 100644
--- a/media-libs/freetype/freetype-2.10.0.ebuild
+++ b/media-libs/freetype/freetype-2.10.0.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit autotools git-r3
diff --git a/media-libs/freetype/freetype-2.10.1.ebuild b/media-libs/freetype/freetype-2.10.1.ebuild
index 0961aa456f44..091b3bccbba9 100644
--- a/media-libs/freetype/freetype-2.10.1.ebuild
+++ b/media-libs/freetype/freetype-2.10.1.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit autotools git-r3
diff --git a/media-libs/freetype/freetype-2.9.1-r3.ebuild b/media-libs/freetype/freetype-2.9.1-r3.ebuild
index ad7bc0626702..07218f0dae2d 100644
--- a/media-libs/freetype/freetype-2.9.1-r3.ebuild
+++ b/media-libs/freetype/freetype-2.9.1-r3.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit autotools git-r3
diff --git a/media-libs/freetype/freetype-2.9.1-r4.ebuild b/media-libs/freetype/freetype-2.9.1-r4.ebuild
index 48b9f12deaf6..2260eecc4cac 100644
--- a/media-libs/freetype/freetype-2.9.1-r4.ebuild
+++ b/media-libs/freetype/freetype-2.9.1-r4.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit autotools git-r3
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index 0961aa456f44..091b3bccbba9 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit autotools git-r3
diff --git a/media-libs/ftgl/Manifest b/media-libs/ftgl/Manifest
index 7c584196c012..a86cef418af3 100644
--- a/media-libs/ftgl/Manifest
+++ b/media-libs/ftgl/Manifest
@@ -2,5 +2,5 @@ AUX ftgl-2.1.3_rc5-freetype_pkgconfig.patch 263 BLAKE2B 3febbbfce31110345ade9af1
 AUX ftgl-2.1.3_rc5-gentoo.patch 1533 BLAKE2B af20eafea69c5936d7ed101ec1de46c35ab23a12bd4b408808cd8f6b0e354509e7772a7e911f457ad5e80f3baa136eef2181650c8c04d9abdc3efbecfb67efa5 SHA512 46a7657090849635473eaae94a84c3933054cf21d220b2bd5fb366c8fe67cc1c1ee0f60fdc573d951396d9baadb6a77af553490675fd68209533b6ab7f4ba5c6
 AUX ftgl-2.1.3_rc5-underlink.patch 277 BLAKE2B 31ee2c15c3b7a908b9430a200f98d4f01aa006c0ae7cd1fb609bb5f648848eb43926f14f504f883fd840949c108125c1221efb94604810aaa51f8183d09d846b SHA512 6690fa96a81613cdc5874bf29b6bff39eae00edc2d0e3ced2d199b0cfeacfebe4f0bd312d77ce096be89e91a0f031eca800ec705575f1b6f073f7a92a4da85fe
 DIST ftgl-2.1.3-rc5.tar.bz2 707854 BLAKE2B a2d91de57edfeb34dfa0bfc68808570ba698178e656c66b2bcff9df51e7cbe725d6a85ae51ef9910d2152481206419730ab634d1c87e1a1215ddce8cb90cf83f SHA512 9841bdbe7e299dd0ae3bcbef08dc3a8787a863389bf242aa023b1c2442f3ffc8a2c6768a35d093d27e3ad7197c8228a9b15e795a36824424f05bef66b68c89a4
-EBUILD ftgl-2.1.3_rc5.ebuild 1251 BLAKE2B 09e054b24c51d9c26e2303cbb39a724dee4e0bc4955ab029ebf7aecf07fd2d200081797736ac7bcdac6ad389fc8151d6ed565257e9ff293c817583956d4a1c88 SHA512 336b2a4f57184497b695ab85a94ebed299b0d803d0d5bdd6b963a2867e2077d3c6a808f2fc581aff120b34599733d2fe648aa52de2bb51a2e430f283013741ad
+EBUILD ftgl-2.1.3_rc5.ebuild 1229 BLAKE2B 9c1a687488ad58edb170dc3a729a9d34cd3977023a19d112050a10872e26edfbfb7edbcba7991d7ef5d7a211e177f6a6783468246782b7144f1068c5c84fcce5 SHA512 f563cf80d2a7fce0e5c85e9813ffa49c0248daa27907545228227a5caa1b75d9e2a9e4a3bc066e01c27b46d6dbe2b4c7494972766aa32ff0bbb7d10b14253ccb
 MISC metadata.xml 327 BLAKE2B 84a08c3564faec441b2c375d60326a01d2a60ec1a5390b1e4a8a7e317e85d7da7bc181dba11b84a5d387e32231a73ec9308466fa914d5b90cdbe12e255ba931b SHA512 d5fb9210e27a2e5687f6a223885f6f5ea023c0da51e594c12fb3b07521f3fd882bcc19829d0ccbfaebcfe7e4e15df897c70eabb2fab0d29f8f4b45dbfe710d56
diff --git a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
index 9ae8388a56d8..ca277b0ec0b2 100644
--- a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
+++ b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=">=media-libs/freetype-2.0.9
diff --git a/media-libs/game-music-emu/Manifest b/media-libs/game-music-emu/Manifest
index cb004f945a4f..8b2fdc0718ab 100644
--- a/media-libs/game-music-emu/Manifest
+++ b/media-libs/game-music-emu/Manifest
@@ -1,3 +1,3 @@
 DIST game-music-emu-0.6.2.tar.xz 163052 BLAKE2B 8bce2a5c09eef947f02cfc3521aa380564ddaad5f8a8f40ac38b645fc146332ba1cb6755592892dab00200c169a4d1f94978d80c52976c04e120d9d01c8db9dc SHA512 1808d28b54cbbd8dc5e3240eb27d2e546398fb62ab6577e59430a7543cfdaa06482f70b4750656b73a05f1c1bc0c0254db97d0940271ea2144724e1c44f5da10
-EBUILD game-music-emu-0.6.2.ebuild 486 BLAKE2B ab56c95d9c4a84cd37bfabd6e6395f4da9e6683c0daa3c05f9902b052fbbf06100caca3df4ed47cfc4e916a81cac93ece7f9358ccb7bb216f93551c038280fb8 SHA512 20db723db3aa15a5349477ee78ec853438627bc68a55265069aab153f75bc8a79d5f6c4eae4c100e196a5416c3dc0391ad76c5d14cd62085d9f6d5ebdb85ffb9
+EBUILD game-music-emu-0.6.2.ebuild 464 BLAKE2B 952cafd317e24379a76940e5b950f5f88752cfe2516ea1a78e4a8f6691cdf2d5557a06d27d4dbf23d177eeba831dea81d3441fe67812b9c6a582a65b3799326a SHA512 7ab841a283eb26ada8bc6ed8a08f9d1f1b7b35b09d1b8c933c4cb640a1e506ebcf6f777c2b49224814863fdd9ef6bb184137a85638b79817de79b745e093a62d
 MISC metadata.xml 400 BLAKE2B 1dd7cab3e13a3364222e52dc2e4c3dcbeb12e4169aaaa4196bc8ab325e42e04aa7b8aaa6fccb64db1de7ed6163d3060fdddb6df21c7243c4c0b3a7b7f28bd3ed SHA512 2abd1362876b6019d1538a6cd6a5740c29c1920037db3f3c622fb7c533a64b6d559ef8cdead9e2fdecc9c64c799fd1d2f8fc5887d493354604e4a99ed77cbf1d
diff --git a/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild b/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
index 6e5cbaaf415d..198e5fa76271 100644
--- a/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
+++ b/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://bitbucket.org/mpyne/game-music-emu/downloads/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ppc ppc64 x86"
 IUSE=""
 
 DOCS=( changes.txt design.txt gme.txt readme.txt )
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 69d2fff5a901..64b7ae9c5123 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -6,5 +6,5 @@ AUX gd-2.2.5-ossfuzz5700.patch 2680 BLAKE2B 55beecdf63e280ab54b83b214d704bccc83a
 DIST libgd-2.2.5-ossfuzz5700.dat 30 BLAKE2B 5ddd3d2be2adf05e1e2eb1852cc689be57d4d77c57b471e8b6021877f2fb137d15b4c73445fbb23a9ed585974a96dd154759a48712c1e7b5bdc5750d534aee4a SHA512 2394e92ff7a42c818e13a1ac9ad15bc81aa401adc917366ec8c440bb7f27a63777ab059aa03c501dafef0ac16b462dd23c7fb9f8086ce558203384a98a235fff
 DIST libgd-2.2.5-php_bug_75571.dat 1731 BLAKE2B 4b5d3f258b73e8089ede1b2c9f538855f410965a9e01e1f3f151ae52f072036172b184bd1a4d07b8355bb974bf088bebb0e812175a277bb67926274272bd80a0 SHA512 b3048640ce7828cca7901fadc989e867cfc6d31b44c0f5a1bda54d7428f317c8c8fc6403fef301e193869a95eb46eb7195d47710ec7f8c507ba049cb6cdcb281
 DIST libgd-2.2.5.tar.xz 2594092 BLAKE2B 222a7e012fbf9924ac391ee96c7cd3dec96afd78c6d43dfb680b33e7143e7df87fe6be75bbfe8fb93e916302d7daf08271214c84da28712e93a36465566cb2bd SHA512 e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b
-EBUILD gd-2.2.5-r2.ebuild 3140 BLAKE2B 0c3230a15c2342ba8ce7b6818b10944a4b99dc24f65ff1097c7d9365403ac51e0f4601475516c236857fb4aac24bc8b5824a16ceaa5ff1dbf53cf6828879be6b SHA512 faa020502b7e35085c085e63eac5c00f0ecb990131fc32f33c82115123e0082b53f983eb9ecd828128f3e00d47dd29eeb285938cd6cd457a5dbe061a1d5c3f38
+EBUILD gd-2.2.5-r2.ebuild 3118 BLAKE2B d11daab50fc5a02bfdb61e50c90e2d2f1edeaa4d263771a157220ae9e6eabcc0842dbb4d201f6eae6f5feed128da5c9addb3d67596cfd6b4e033ac114d856acc SHA512 2d1c7687d4517f126eb151a103460c226a44d3d82eac0f0385e1faf14b7c1565b756b50482fbe9a504d0368fa09fe6af49a88fb4586012e98d65fd6475da62c2
 MISC metadata.xml 1507 BLAKE2B 34dbcbc70165ebe74ea14e6394e2691bda7523e4c848b13a512de8f0707c194a7da3de41a8fe483d7a8b2aa1af8f0d164ea210605ae76480dbf22b976b53d2f5 SHA512 0ac3c1ca25c190333e7f97dbb05e197e62e76abeaa045966fa3024dbeb22d541d78794df08d450e887591909a25dfb6a4fef861ed62f7f055b129e17b1329919
diff --git a/media-libs/gd/gd-2.2.5-r2.ebuild b/media-libs/gd/gd-2.2.5-r2.ebuild
index e80c41907e40..69f41d061c59 100644
--- a/media-libs/gd/gd-2.2.5-r2.ebuild
+++ b/media-libs/gd/gd-2.2.5-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse fontconfig jpeg png static-libs test tiff truetype webp xpm zlib"
 
 # fontconfig has prefixed font paths, details see bug #518970
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 7409183ed7c8..2dcfeaa977e5 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -13,18 +13,14 @@ AUX gegl-0.4.0-ffmpeg-4-0-compat-1.patch 2181 BLAKE2B 8bf1c46395ee4981fad7c5518c
 AUX gegl-0.4.0-ffmpeg-4-0-compat-2.patch 786 BLAKE2B c2ee0da954aa16c755f76058c54ca9d19ceb70667aff40e126d52bb10b7ecaa6e346667fa9cf7f96605b87a1d41e511d4787a33b004409708d8e3496de391745 SHA512 1084d1cd802eebdeacc536115d4808ce310a85063110bfc06627c8836b86e65396d175a4c3bc6b2083a9a486b7fb21d0210e42fcc8ef3c404b6b930797ecc83a
 DIST gegl-0.2.0.tar.bz2 7502040 BLAKE2B 29b33bf6aa878b74461e929a96570fca9a56e52931ee66356ca9c3c4cec7cdc0668330aa25756d0baf531d0b90c4830c1f244e8327b238a63d68cb74d486e961 SHA512 16ef3f6852fd8efef2b6468a754342a2d003f2c2bef468d9465a448e6c89dedb8e791570f073a9faed05218a7c94c6c418eaa0f3abeadfb3e6b88d766ab792c8
 DIST gegl-0.3.0.tar.bz2 5463571 BLAKE2B 7ac52fb22bab3b84068e10610d8681a5bcf56f6cdf39dae4374d2749823f3a1af62995382a1247427dde1921e0b11304adb800a2157ca6e7e773fdd97fee47f5 SHA512 ff758df4689b0fa8f5e16ebcea32a7fe77bccfef70efc20d10669ce5139a70ec3533e78227fd4798812b31ac1ca5081b9d1d701a7449bf75356f879ece5fadd6
-DIST gegl-0.3.26.tar.bz2 6530788 BLAKE2B 1cd1a61737ec94cb30fdf16ca8dcb5667ebaa481d0e234f89b7e8bd9b05b3e515454bf768a66e64c88f61a57c83d51eecad9aab4450502dd3e02ce4f012df7a5 SHA512 1fafd6bb70b539bd31c052d2acfcb332fac92caf2a67e07a8c827db31b877aa373a184475952b6fc4dae455dcceccfd3943d782e9fe50f166323f698faf60957
 DIST gegl-0.3.34.tar.bz2 6707964 BLAKE2B 4424a2c218067bd0a77d79c2334528da393350db3062019f3889b8cdb8d222f6e436ccfc845b61fdf425a1634698a7a6963702a29bb1666f515b1395c50dc99f SHA512 a7a394dcce4137d5224163ca324f1585e64d1cc797e77d452ba444afe2bff39aa2e2d5d040d07b394697b75162bc310bc51490a5af80240b26aac14b6e7abe02
 DIST gegl-0.4.14.tar.bz2 7209142 BLAKE2B a056f02c3fa9e075aa62cb8cb0d8183560ac66ffed68072add3ea6afc9da3b47c9854eb4e1799c61f451287b244bee4dfc8942365f556a0e820dd7485b9fc305 SHA512 1fcec83a961c0b9c98487de99d26893f98a5401816fa6d7238af4c645672d0eb0474cdb7251b8ebcd344aff589e8979bee0304b50fcfae9513fdbf8a02068e3b
 DIST gegl-0.4.16.tar.bz2 7304904 BLAKE2B a3f6021ed7b9d8b784b909057fcdc39e73b6b8b811009adae3c4a6805263e9a887e874ad662d8cd5c673ae324fe39e8f0299651139783fd3ece08675b70896fd SHA512 38eacbd53d9993ca99d061bf6f80553a86ff06bf42d1710403ac5f15629ccc9b1f4395ee7700a04cebc954ed7fe8745c5bef85453c9c56d89681dd53a1552b27
-EBUILD gegl-0.2.0-r2.ebuild 4715 BLAKE2B 4c6e8445587cff6ad1c44eee4b40bcbf57e5d573242e8794aedeba19b6065a58d02c72a1951f2b31a5601c6b124e30ebb207a06f5aadc5e4b846294f717ec906 SHA512 16048b6ac471d9af936df2285380303012fd538d57b35c67b073ff54ad952417260cbea51403c11844547a4f69c16e65eb460fbfb43ef05bbb9e8dd338102b00
-EBUILD gegl-0.2.0-r5.ebuild 4922 BLAKE2B ede5b2bd0934ab7a5c82ce33532925f8c0b10b30bbc8cb89744cd9603c066398a787a99b308635760315aa231dae4eb35da1db25adb17ccf93c11f0c00b9e79e SHA512 d493f0217dc590c8b1df84fe43b08f44c6f55d6e720edf7a091b36cf7ea6c36ad06b4df2c930d6a7ff9595d15d220c8cf1d4256db2fef90d5bdf1b3ac8bf5a3d
-EBUILD gegl-0.2.0-r6.ebuild 4968 BLAKE2B c60c32f5b1ef68a1908de781b50e39d14dea65a3b01af8f9c63b7ac9ebd08aba7c92dbe55d1d7680a5f76ab44581c425c61eb220b8923c61ceefbecb9255c992 SHA512 93bed4a3686d8b242fc1c6ad7d3f1437e40636be0b450d942cd41a24b4db94ba78a4a376780e4f88df06777a3b7ac074e8f790fe35ffb971ec1d7e35807398f3
-EBUILD gegl-0.3.0-r1.ebuild 5321 BLAKE2B 917874f80c58690d7053366b5cbf11ebe10fca3d775515d9255b4d966c2d894617d75dc2134af61f497c5d09c4fe05c7b9bb156e3783fbab628ff89adb947257 SHA512 c01caae58f8008909e131ee03fcd92d225703d13a442df9371e77d0dafb3245778a244930b6827c714d66beb297e8829d220ed2a51bd02416ec010bd726aa35a
-EBUILD gegl-0.3.0.ebuild 5240 BLAKE2B 46019ac823a517365f33f28231b6f77b93c4b10eb9378e511a453b795eb5ba9ef08391e6a2687e724357befead82bce42cd4bf3c71962774f0e128c668191782 SHA512 31a7619e95d995f6fc4ae46bd404cd1a526970c4e49869c4b78623528588b708da6c8db60c2bbe010bae0601e3ca387bee520adcd3eea42c21cb02bf290ac9d3
-EBUILD gegl-0.3.26.ebuild 5174 BLAKE2B c7808b15a796bedce4067ab5ba961edad3f370119aedf81b17faf7d70a5a5f3da2f58acbe2f3c41edf59859a822cb07f7684d56db0bbec25f32b39854a4b4f6a SHA512 ff10de4870e4393e38036cd0dc81e2dfafd2ad713ba98f8c3847b96e5aac4e9ea842232f8c2dffe134eb08975dfd8063fc4dc7ec513e80d113916f84411977c6
-EBUILD gegl-0.3.34.ebuild 5307 BLAKE2B 6c03b2f9499b47e8b1986b0196cf4fa7ea8fb0df2c6e82e8508bda61591660e213269bf604d059718f7f9581c2e7661722521ce83c2f88e63bbef68c06966479 SHA512 b1b5c080f80c981b0a5ea2d40567ff283f181e08983401abfad5ec4449ed8509766a509f17b46eb5ddd00566a031d6371139b57c330ef978b6c57d8ce88261cf
-EBUILD gegl-0.4.14.ebuild 4975 BLAKE2B 7b035e9b96710d3dcb30b7d88d18deea3722ac491cdefce7c9b7d3d1611ba7ef30f700202f44d8a558b8f7b7116c6f7b9622e18e6b7df29b4baa8a9155533a5c SHA512 587511473e344d4b4e7b5b78c0830aa2982a1537f8e089a05775aa0b09d299b13e64b0b00fb4fe3ad9fce626442d9c12172eb8ea0705657e6767a844503ad0b0
-EBUILD gegl-0.4.16.ebuild 4862 BLAKE2B 14985dd5ed6c6979bdc62eb0920485b5d71a551c30485836db6996c74de00f215c6a5db1a6f672d127d28495fe69c7e8638f736d3a68c63421a7232016bd6e78 SHA512 10bb8071022ace6d447a5854d142527daf72763cf954a92dcb02a634e39e0fd9b3baadf1f472b50e0eb02706e98bcfebf88fae03e6f2af37a905a11b9c142678
-EBUILD gegl-9999.ebuild 4801 BLAKE2B a503b8a5be5862b6f574a794b77d160780982cae9e70d9a832888a97dc51e954193726e74ee9fa468fcc2fb2376614defb2f8c21766b35cf233c342fa88baf84 SHA512 63d36d57ae51e86b9ad9aca49af8616b4a1b2fd86c5b554aa12ad335a9c077aa32295c5fec0c6fd189744bd4bb8a9a74f4158c3ca96b416cf6041e7bab522ff2
+EBUILD gegl-0.2.0-r2.ebuild 4703 BLAKE2B e9dcbc55e332b3484435f1739b305f672f1af489c2b7bae9801529b765c8f12feabef63d64f828c059bc3510b792a6f5a2561c1517e79c6819860dfd7ec3a87d SHA512 443632d54bb065e465e9ff2b3b693cac33c49d4c6c9d14dbb4c45b1fade07adf79cac3841d1b63120912e6cc863e5f7eae9403c71bac3c973e4fca980fb1bbf9
+EBUILD gegl-0.2.0-r6.ebuild 4965 BLAKE2B 12066b7a2edc729653570a433bad8993d30dc24cd820ae24c6b3bc4f734f79a1206f29f3a1190883f094ed46c5516e6d976005cde91ff6050c90dcb90ede0216 SHA512 72bf6368f6e046a591956f65d249331d539902e6cba90c12e2f8939ec6910c869d1638f918820c68d92bbc8e0d1b7e72543a908cf4dbc6626cf78c7556f69285
+EBUILD gegl-0.3.0.ebuild 5228 BLAKE2B 04a228c189e9fdf2619cfc1467eae37ecd01ef35ad8c9a1a87c0e7a93a9e493c0aad4dbf2a7a8053bb47dbd6965f41c3ab032171c013ebca6405f543abcb0f12 SHA512 7cac050e006f38082e3093b3553774d70837ed632bfed6a5f2f1dd97297e8dc603256ec967e8fd898a0dfd0108ea23773e1f0d516c08f4b371b16b3a02cd427d
+EBUILD gegl-0.3.34.ebuild 5295 BLAKE2B f468df5f492a5cb4079ab021d10833a6d75ab97c28bb03a8091df0bb80f284171fe04476e522632264a795ae4f198d7a69d412eb378d25225b7f345a5bfd013b SHA512 376186430d951aced6ef210eee6f7ff7dc8f7f1fb7087083bb86ee6b12d46170df6293db136acfb3f696348b33e84c2657d0679f968b1dbca79291a232d6e1b0
+EBUILD gegl-0.4.14.ebuild 4963 BLAKE2B 155fd64e71878d62960a1beaf50b8e2b4fec41a8884b916319b498adc6393449d41f6a2fbff128e68eebcf688046bcca540c9e10382f805e8df536d28fa04244 SHA512 ed2796b93ef55352f51a8eace6ccb97e5352a203d6fa33d178307c0f215279d337efabd9aa2c0d41faa6757c5a0f34dda1f1907eced0712979413d03980b9de0
+EBUILD gegl-0.4.16.ebuild 4850 BLAKE2B 66b4108f521bc2e40f1789802ea618eab0dab0addae3dfdddd39b1b5b1d9fd845bd28df7e1d9d1bce7c45773a9e93b695cdaf6dd9b456da3e47de6f63278998c SHA512 c4bb2821ffcdddd8d8a42b11018e25873b622719eb94c0e8f12a949d1836d4921bc63817a6431f4a51655485021bdfaa24b09f0993c37feff954d3d961c4aca6
+EBUILD gegl-9999.ebuild 4789 BLAKE2B cdff77d21246229c50e307138c9de6883cdc801625fa65eeb57cbae2ea911c8b98c339f580e7dcc7787bb132b935a536b100399712bd392e0d3be6b14b2371e6 SHA512 948cf9c4eb70b506d6990f30d4c4a6aef8c030be937dfd4adc9c12ebb6f3ae42896d53d75415c4bb3d921543d016c850bf40da6c06d66e9fc7e60281ab0aaa1b
 MISC metadata.xml 396 BLAKE2B aeb29a940e3747b4ea2418e3723c549291cbfd49d8152c75fcc9116b46892eac29338b36875b32c7f3968deecf142296b0f9725d02a80a0380dfba6fba17d810 SHA512 7530e0bc7d86a57334d1dc6fc75b6acc1eb3512c2618d1ed47bbc025aa95f72fa1d41b78765ae53721ea794538d22df1be22189dd54e30fa4bf94e7f0cdced1a
diff --git a/media-libs/gegl/gegl-0.2.0-r2.ebuild b/media-libs/gegl/gegl-0.2.0-r2.ebuild
index aad4c1cd8862..47fa7ae928dd 100644
--- a/media-libs/gegl/gegl-0.2.0-r2.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="cairo debug ffmpeg jpeg lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
 
diff --git a/media-libs/gegl/gegl-0.2.0-r5.ebuild b/media-libs/gegl/gegl-0.2.0-r5.ebuild
deleted file mode 100644
index 6f8434819a09..000000000000
--- a/media-libs/gegl/gegl-0.2.0-r5.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WANT_AUTOMAKE=1.11  # see bug 471990, comment 3
-# vala and introspection support is broken, bug #468208
-#VALA_MIN_API_VERSION=0.14
-#VALA_USE_DEPEND=vapigen
-
-inherit versionator gnome2-utils eutils autotools #vala
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="http://www.gegl.org/"
-SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-IUSE="cairo debug ffmpeg jpeg lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
-
-RDEPEND="
-	>=media-libs/babl-0.1.10
-	>=dev-libs/glib-2.28:2
-	>=x11-libs/gdk-pixbuf-2.18:2
-	x11-libs/pango
-	sys-libs/zlib
-	cairo? ( x11-libs/cairo )
-	ffmpeg? (
-		libav? ( >=media-video/libav-11.3:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	jpeg? ( virtual/jpeg:0 )
-	openexr? ( media-libs/openexr )
-	png? ( media-libs/libpng:0= )
-	raw? ( >=media-libs/libopenraw-0.1:0= )
-	sdl? ( media-libs/libsdl )
-	svg? ( >=gnome-base/librsvg-2.14:2 )
-	umfpack? ( sci-libs/umfpack )
-	lensfun? ( >=media-libs/lensfun-0.2.5 )
-"
-#	>=media-libs/babl-0.1.10[introspection?]
-#	introspection? ( >=dev-libs/gobject-introspection-0.10
-#			>=dev-python/pygobject-2.26:2 )
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40.1
-	dev-lang/perl
-	virtual/pkgconfig
-	>=sys-devel/libtool-2.2
-"
-#	vala? ( $(vala_depend) )"
-
-DOCS=( ChangeLog INSTALL README NEWS )
-
-PATCHES=(
-	# https://bugs.gentoo.org/show_bug.cgi?id=636780
-	"${FILESDIR}/${P}-ffmpeg-av_frame_alloc.patch"
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=442016
-	"${FILESDIR}/${P}-cve-2012-4433-1e92e523.patch"
-	"${FILESDIR}/${P}-cve-2012-4433-4757cdf7.patch"
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=416587
-	"${FILESDIR}/${P}-introspection-version.patch"
-
-	"${FILESDIR}/${P}-ffmpeg-0.11.diff"
-	"${FILESDIR}"/${P}-g_log_domain.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=605216
-	# https://bugs.gentoo.org/show_bug.cgi?id=617430
-	"${FILESDIR}"/${P}-underlinking.patch
-	"${FILESDIR}"/${P}-libopenraw-0.1.patch  # bug 639834
-	"${FILESDIR}"/${P}-fix-without-exiv2.patch  # bug 641872
-
-)
-
-src_prepare() {
-	default
-	# fix OSX loadable module filename extension
-	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
-	# don't require Apple's OpenCL on versions of OSX that don't have it
-	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
-		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
-	fi
-
-	eautoreconf
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=468248
-	local deps_file="${PN}/${PN}-$(get_version_component_range 1-2).deps"
-	[[ -f "${deps_file}" ]] || touch "${deps_file}"
-
-#	use vala && vala_src_prepare
-}
-
-src_configure() {
-	# never enable altering of CFLAGS via profile option
-	# libspiro: not in portage main tree
-	# disable documentation as the generating is bit automagic
-	#    if anyone wants to work on it just create bug with patch
-
-	# Also please note that:
-	#
-	#  - Some auto-detections are not patched away since the docs are
-	#    not built (--disable-docs, lack of --enable-gtk-doc) and these
-	#    tools affect re-generation of docs, only
-	#    (e.g. ruby, asciidoc, dot (of graphviz), enscript)
-	#
-	#  - Parameter --with-exiv2 compiles a noinst-app only, no use
-	#
-	#  - Parameter --disable-workshop disables any use of Lua, effectivly
-	#
-	#  - v4l support does not work with our media-libs/libv4l-0.8.9,
-	#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
-	#
-	#  - There are two checks for dot, one controllable by --with(out)-graphviz
-	#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
-	#
-	# So that's why USE="exif graphviz lua v4l" got resolved.  More at:
-	# https://bugs.gentoo.org/show_bug.cgi?id=451136
-	#
-	econf \
-		--disable-silent-rules \
-		--disable-profile \
-		--without-libspiro \
-		--disable-docs --disable-workshop \
-		--with-pango --with-gdk-pixbuf \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable debug) \
-		$(use_with cairo) \
-		$(use_with cairo pangocairo) \
-		--without-exiv2 \
-		$(use_with ffmpeg libavformat) \
-		--without-graphviz \
-		$(use_with jpeg libjpeg) \
-		--without-jasper \
-		--without-lua \
-		$(use_with openexr) \
-		$(use_with png libpng) \
-		$(use_with raw libopenraw) \
-		$(use_with sdl) \
-		$(use_with svg librsvg) \
-		$(use_with umfpack) \
-		--without-libv4l \
-		$(use_with lensfun) \
-		--disable-introspection \
-		--without-vala
-#		$(use_enable introspection) \
-#		$(use_with vala)
-}
-
-src_test() {
-	gnome2_environment_reset  # sandbox issues
-	default
-}
-
-src_compile() {
-	gnome2_environment_reset  # sandbox issues (bug #396687)
-	default
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete
-}
diff --git a/media-libs/gegl/gegl-0.2.0-r6.ebuild b/media-libs/gegl/gegl-0.2.0-r6.ebuild
index a7573fa095ca..434a0bcd099c 100644
--- a/media-libs/gegl/gegl-0.2.0-r6.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="cairo debug ffmpeg jpeg lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
 
diff --git a/media-libs/gegl/gegl-0.3.0-r1.ebuild b/media-libs/gegl/gegl-0.3.0-r1.ebuild
deleted file mode 100644
index ce9b36b0372a..000000000000
--- a/media-libs/gegl/gegl-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-# vala and introspection support is broken, bug #468208
-VALA_MIN_API_VERSION=0.20
-VALA_USE_DEPEND=vapigen
-
-inherit versionator gnome2-utils eutils autotools python-any-r1 vala
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
-	SRC_URI=""
-else
-	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="http://www.gegl.org/"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0.3"
-
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg lcms lensfun libav openexr png raw sdl svg test umfpack vala v4l webp"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	dev-libs/json-glib
-	>=media-libs/babl-0.1.12
-	sys-libs/zlib
-	>=x11-libs/gdk-pixbuf-2.18:2
-	x11-libs/pango
-
-	cairo? ( x11-libs/cairo )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	introspection? ( >=dev-libs/gobject-introspection-1.32 )
-	jpeg? ( virtual/jpeg:0= )
-	lcms? ( >=media-libs/lcms-2.2:2 )
-	lensfun? ( >=media-libs/lensfun-0.2.5 )
-	openexr? ( media-libs/openexr )
-	png? ( media-libs/libpng:0= )
-	raw? ( =media-libs/libopenraw-0.0.9 )
-	sdl? ( media-libs/libsdl )
-	svg? ( >=gnome-base/librsvg-2.14:2 )
-	umfpack? ( sci-libs/umfpack )
-	v4l? ( >=media-libs/libv4l-1.0.1 )
-	webp? ( media-libs/libwebp )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1
-	>=dev-util/intltool-0.40.1
-	dev-lang/perl
-	virtual/pkgconfig
-	>=sys-devel/libtool-2.2
-	test? ( introspection? (
-		$(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') ) )
-	vala? ( $(vala_depend) )
-"
-
-pkg_setup() {
-	use test && use introspection && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# FIXME: the following should be proper patch sent to upstream
-	# fix OSX loadable module filename extension
-	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
-	# don't require Apple's OpenCL on versions of OSX that don't have it
-	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
-		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
-	fi
-
-	#epatch "${FILESDIR}"/${P}-g_log_domain.patch
-
-	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
-	sed -e '/clones.xml/d' \
-		-e '/composite-transform.xml/d' \
-		-i tests/compositions/Makefile.am || die
-
-	# commit 11a283ab : test-image-compare needs >=babl-0.1.13 (not released yet)
-	# for the new CIE conversions
-	sed -e '/test-image-compare/d' \
-		-i tests/simple/Makefile.am || die
-
-	# Skip broken test with >=dev-python/pygobject-3.14
-	sed -e '/test_buffer/ i\    @unittest.skip("broken")\' \
-		-i tests/python/test-gegl-format.py || die
-
-	epatch "${FILESDIR}"/${PN}-0.2.0-fix-without-exiv2.patch  # bug 641872
-
-	epatch_user
-	eautoreconf
-
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	# never enable altering of CFLAGS via profile option
-	# libspiro: not in portage main tree
-	# disable documentation as the generating is bit automagic
-	#    if anyone wants to work on it just create bug with patch
-
-	# Also please note that:
-	#
-	#  - Some auto-detections are not patched away since the docs are
-	#    not built (--disable-docs, lack of --enable-gtk-doc) and these
-	#    tools affect re-generation of docs, only
-	#    (e.g. ruby, asciidoc, dot (of graphviz), enscript)
-	#
-	#  - Parameter --with-exiv2 compiles a noinst-app only, no use
-	#
-	#  - Parameter --disable-workshop disables any use of Lua, effectivly
-	#
-	#  - v4l support does not work with our media-libs/libv4l-0.8.9,
-	#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
-	#
-	#  - There are two checks for dot, one controllable by --with(out)-graphviz
-	#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
-	#
-	# So that's why USE="exif graphviz lua v4l" got resolved.  More at:
-	# https://bugs.gentoo.org/show_bug.cgi?id=451136
-	#
-	econf \
-		--disable-docs \
-		--disable-profile \
-		--disable-silent-rules \
-		--disable-workshop \
-		--program-suffix=-${SLOT} \
-		--with-gdk-pixbuf \
-		--with-pango \
-		--without-libspiro \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable debug) \
-		$(use_with cairo) \
-		$(use_with cairo pangocairo) \
-		--without-exiv2 \
-		$(use_with ffmpeg libavformat) \
-		--without-graphviz \
-		$(use_with jpeg libjpeg) \
-		--without-jasper \
-		$(use_with lcms) \
-		$(use_with lensfun) \
-		--without-lua \
-		$(use_with openexr) \
-		$(use_with png libpng) \
-		$(use_with raw libopenraw) \
-		$(use_with sdl) \
-		$(use_with svg librsvg) \
-		$(use_with umfpack) \
-		$(use_with v4l libv4l) \
-		$(use_with v4l libv4l2) \
-		$(use_enable introspection) \
-		$(use_with vala) \
-		$(use_with webp)
-}
-
-src_test() {
-	gnome2_environment_reset  # sandbox issues
-	default
-}
-
-src_compile() {
-	gnome2_environment_reset  # sandbox issues (bug #396687)
-	default
-
-	[[ ${PV} == *9999* ]] && emake ./ChangeLog  # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/media-libs/gegl/gegl-0.3.0.ebuild b/media-libs/gegl/gegl-0.3.0.ebuild
index b86bd58c0880..a35131dde0e1 100644
--- a/media-libs/gegl/gegl-0.3.0.ebuild
+++ b/media-libs/gegl/gegl-0.3.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gegl/gegl-0.3.26.ebuild b/media-libs/gegl/gegl-0.3.26.ebuild
deleted file mode 100644
index 2efd65a82028..000000000000
--- a/media-libs/gegl/gegl-0.3.26.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit versionator gnome2-utils eutils autotools python-any-r1 vala
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
-	SRC_URI=""
-else
-	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="http://www.gegl.org/"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0.3"
-
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
-REQUIRED_USE="
-	svg? ( cairo )
-	vala? ( introspection )
-"
-
-# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-#       so there is no chance to support libav right now (Gentoo bug #567638)
-#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	dev-libs/json-glib
-	>=media-libs/babl-0.1.38
-	sys-libs/zlib
-	>=x11-libs/gdk-pixbuf-2.32:2
-	x11-libs/pango
-
-	cairo? ( >=x11-libs/cairo-1.12.2 )
-	ffmpeg? (
-		>=media-video/ffmpeg-2.8:0=
-	)
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	virtual/jpeg:0=
-	lcms? ( >=media-libs/lcms-2.8:2 )
-	lensfun? ( >=media-libs/lensfun-0.2.5 )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
-	>=media-libs/libpng-1.6.0:0=
-	raw? ( >=media-libs/libraw-0.15.4:0= )
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	svg? ( >=gnome-base/librsvg-2.40.6:2 )
-	tiff? ( >=media-libs/tiff-4:0 )
-	umfpack? ( sci-libs/umfpack )
-	v4l? ( >=media-libs/libv4l-1.0.1 )
-	webp? ( >=media-libs/libwebp-0.5.0:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1
-	>=sys-devel/gettext-0.19.8
-	dev-lang/perl
-	virtual/pkgconfig
-	>=sys-devel/libtool-2.2
-	test? ( introspection? (
-		$(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') ) )
-	vala? ( $(vala_depend) )
-"
-
-pkg_setup() {
-	use test && use introspection && python-any-r1_pkg_setup
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
-)
-
-src_prepare() {
-	default
-
-	# FIXME: the following should be proper patch sent to upstream
-	# fix OSX loadable module filename extension
-	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
-	# don't require Apple's OpenCL on versions of OSX that don't have it
-	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
-		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
-	fi
-
-	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
-	sed -e '/clones.xml/d' \
-		-e '/composite-transform.xml/d' \
-		-i tests/compositions/Makefile.am || die
-
-	eautoreconf
-
-	gnome2_environment_reset
-
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	# never enable altering of CFLAGS via profile option
-	# libspiro: not in portage main tree
-	# disable documentation as the generating is bit automagic
-	#    if anyone wants to work on it just create bug with patch
-
-	# Also please note that:
-	#
-	#  - Some auto-detections are not patched away since the docs are
-	#    not built (--disable-docs, lack of --enable-gtk-doc) and these
-	#    tools affect re-generation of docs, only
-	#    (e.g. ruby, asciidoc, dot (of graphviz), enscript)
-	#
-	#  - Parameter --with-exiv2 compiles a noinst-app only, no use
-	#
-	#  - Parameter --disable-workshop disables any use of Lua, effectivly
-	#
-	#  - v4l support does not work with our media-libs/libv4l-0.8.9,
-	#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
-	#
-	#  - There are two checks for dot, one controllable by --with(out)-graphviz
-	#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
-	#
-	#  - mrg is not in tree and gexiv2 support only has effect when mrg support
-	#    is enabled
-	#
-	# So that's why USE="exif graphviz lua v4l" got resolved.  More at:
-	# https://bugs.gentoo.org/show_bug.cgi?id=451136
-	#
-	econf \
-		--disable-docs \
-		--disable-profile \
-		--disable-silent-rules \
-		--disable-workshop \
-		--program-suffix=-${SLOT} \
-		--with-gdk-pixbuf \
-		--with-pango \
-		--without-libspiro \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable debug) \
-		$(use_with cairo) \
-		$(use_with cairo pangocairo) \
-		--without-exiv2 \
-		$(use_with ffmpeg libavformat) \
-		--without-gexiv2 \
-		--without-graphviz \
-		--without-jasper \
-		$(use_with lcms) \
-		$(use_with lensfun) \
-		--without-lua \
-		--without-mrg \
-		$(use_with openexr) \
-		$(use_with raw libraw) \
-		$(use_with sdl) \
-		$(use_with svg librsvg) \
-		$(use_with tiff libtiff) \
-		$(use_with umfpack) \
-		$(use_with v4l libv4l) \
-		$(use_with v4l libv4l2) \
-		$(use_enable introspection) \
-		$(use_with vala) \
-		$(use_with webp)
-}
-
-src_compile() {
-	default
-
-	[[ ${PV} == *9999* ]] && emake ./ChangeLog  # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/media-libs/gegl/gegl-0.3.34.ebuild b/media-libs/gegl/gegl-0.3.34.ebuild
index 5c8d5871daa0..730b532886d1 100644
--- a/media-libs/gegl/gegl-0.3.34.ebuild
+++ b/media-libs/gegl/gegl-0.3.34.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gegl/gegl-0.4.14.ebuild b/media-libs/gegl/gegl-0.4.14.ebuild
index aa1e3dfdf967..b46050046a84 100644
--- a/media-libs/gegl/gegl-0.4.14.ebuild
+++ b/media-libs/gegl/gegl-0.4.14.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gegl/gegl-0.4.16.ebuild b/media-libs/gegl/gegl-0.4.16.ebuild
index 53a84339c68b..12651446e600 100644
--- a/media-libs/gegl/gegl-0.4.16.ebuild
+++ b/media-libs/gegl/gegl-0.4.16.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 9655bb544e66..ec1e63cf3a00 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index 24680e5d95bb..4425eb175ba8 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,6 +1,8 @@
 AUX gexiv2-0.10.10-meson-fixup.patch 1718 BLAKE2B 0460652424a8314eeba8f0d677b5dff5b0efc9165079c9232824bbfffb2a13a1ca2acef89ae066bc13ec4c40baef4ac4b1c66c02d4365b999fdd4f54858ea7af SHA512 06f7b13502b9397770b0d9ab20dd70d902feb7d70fd42381cda53183859db15102bbf16d0e4ce5f9b124de99c58c8e4cb0ec85ca1c6f60e3e5287cafcdfadd64
 AUX gexiv2-0.10.10-vala-fixup.patch 1785 BLAKE2B d82ec357f2ee7d50b79fa1c82bd9c4b6d0a528561fcacc08e966c73f9d89daf3c2ce2e2712f69e246507e14e0f10a0a5470c830e43aeeb06fdceffc3484cbc0e SHA512 e9708245ddee0fb88939ae26987e4e5859fd5e13efb03f01d276eeb77d4361832eac11b2873e73984ef25dbdcf502f2f3a82a78330f3c7b57b2e186cfb49395f
 DIST gexiv2-0.10.10.tar.xz 638168 BLAKE2B ae75a06007dcaca4c22e463661073d796b77921a313a5bb450c488ee963f72c6095d7abc12dedc0d089a28905cf386062221073100ba3513d9fb13eb524365ee SHA512 41e5b4a9d81882ea4b1bc6f3b9ced95ca4d03f836de30ff90b7a43311e5319f7c0f46cbad767bf2b00926c8e5fd2c1e8ca2a2113c308e23b7a4c21205399abf7
-EBUILD gexiv2-0.10.10-r1.ebuild 1845 BLAKE2B de2fbffcddc6ac6c09171916520accea55068cc52ed43af73908c6cc4feb141fbe26cd187aa6362ba0b246a4d7b00aae9d6448741c4ba351009b84fb205caf64 SHA512 2192b65ee68d7ea41a1b0eb225cf773d05556f6b10df61db5245858da8ef790ef35dfb9e44b1c48b76f8b96cf2f3d125349a43a1537e0bbf0ffc50b5da7410a8
-EBUILD gexiv2-9999.ebuild 1650 BLAKE2B 648e3adfb789c2b410c155e5c5f9392327b017581c98893ed3fcf7a6e7b40c0558ee4417a7937ac98d82132747a492fff9d7d9e6c4bfca934173219a1dfb3b28 SHA512 0a3104e245f5ba7236c91cf6469398b997ad6eecf97caa80a1a8dead8af3cb2216d64ab587e1ee1d3d61b356401476ccc9d4423d534240fa348cb8eb764517fd
-MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
+DIST gexiv2-0.12.0.tar.xz 370816 BLAKE2B 7768cffafedf41948ca6ddd22614f0eb3b44a317a23ade3c8d39d5ec5ff77c0d8c61dd8dcca5108b3403e0e3ec8be6659c16445de27163e8689c6c40f5313566 SHA512 c89e7d307359c718dff1f3991acb4ece66bce985a3d8bee1c8fccf4ce39187af62684c87eaae9b0425a6fdbf147b7330902041d9588e52a4bad1da4255d245e9
+EBUILD gexiv2-0.10.10-r1.ebuild 1859 BLAKE2B 571cd27d784156fd7ad20f5abf31a49ca9f24bc2abe09fd4471e35c4c225d919453a890c86eda6e0a4beb0979228f3df2bf01be1abc0e1ab71796a86b7b11309 SHA512 b1af7fef73c5582137c3f28ed3c6eeb18b7eab5bc460aa26ef63a85abad92daeabd4b15d9253df1e9feafeff28760e85ca724eebcd1c3d1b398dd3def7aa839b
+EBUILD gexiv2-0.12.0.ebuild 1642 BLAKE2B f487bcc583c48a99a816b689ffabf1cc17ab58d848581e00149d3f8e852b7df96833e0cf9780d609cd39f4720132538e4994ab6f70848b0342c4007b9cd85ce0 SHA512 fc63ee66b2a63127a54a503ac9e0007c20df1f924b6aa1eaca46f0327348e91e62d70da13e0186e5268cb65033a53f1b64e1f0dd7396d5f4ecd8d5a95fa0f48f
+EBUILD gexiv2-9999.ebuild 1642 BLAKE2B f487bcc583c48a99a816b689ffabf1cc17ab58d848581e00149d3f8e852b7df96833e0cf9780d609cd39f4720132538e4994ab6f70848b0342c4007b9cd85ce0 SHA512 fc63ee66b2a63127a54a503ac9e0007c20df1f924b6aa1eaca46f0327348e91e62d70da13e0186e5268cb65033a53f1b64e1f0dd7396d5f4ecd8d5a95fa0f48f
+MISC metadata.xml 643 BLAKE2B 449e133d5846d7390b649aa2f101438c2305fec51f048ad5b29a5ff46f42f51ed47d27fef583e78a34b66cfc9dfa1e3e1e08e5a998a9127b5cbcd70f72420993 SHA512 9972f031fd8ea9451f59a4aa69fd45acbe8a119c32a2e81edafb7ef14b5be3475b3660eb141d1281c9483821cdadd29249c27a9f3ac0e9187037ae53f6f683f6
diff --git a/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
index c9cf2f6ea763..ed3b99e6bbd7 100644
--- a/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
@@ -15,18 +15,18 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86"
 fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="gtk-doc +introspection python static-libs test +vala"
-
 REQUIRED_USE="
 	python? ( introspection ${PYTHON_REQUIRED_USE} )
 	test? ( python introspection )
 	vala? ( introspection )
 "
+RESTRICT="!test? ( test )"
 
 RDEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.38.0:2
diff --git a/media-libs/gexiv2/gexiv2-0.12.0.ebuild b/media-libs/gexiv2/gexiv2-0.12.0.ebuild
new file mode 100644
index 000000000000..c83cec2f56ad
--- /dev/null
+++ b/media-libs/gexiv2/gexiv2-0.12.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit meson python-r1 vala
+
+DESCRIPTION="GObject-based wrapper around the Exiv2 library"
+HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gexiv2.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="LGPL-2.1+ GPL-2"
+SLOT="0"
+IUSE="gtk-doc +introspection python static-libs test +vala"
+REQUIRED_USE="
+	python? ( introspection ${PYTHON_REQUIRED_USE} )
+	test? ( python introspection )
+	vala? ( introspection )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+	test? (
+		dev-python/pygobject:3
+		media-gfx/exiv2[xmp]
+	)
+	vala? ( $(vala_depend) )
+"
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.38.0:2
+	>=media-gfx/exiv2-0.21:=
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc gtk_doc)
+		# Prevents installation of python modules (uses install_data from meson
+		# which does not optimize the modules)
+		-Dpython2_girdir=no
+		-Dpython3_girdir=no
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use python ; then
+		python_moduleinto gi/overrides/
+		python_foreach_impl python_domodule GExiv2.py
+	fi
+}
diff --git a/media-libs/gexiv2/gexiv2-9999.ebuild b/media-libs/gexiv2/gexiv2-9999.ebuild
index 91c86ef6de69..c83cec2f56ad 100644
--- a/media-libs/gexiv2/gexiv2-9999.ebuild
+++ b/media-libs/gexiv2/gexiv2-9999.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
-inherit meson python-r1 vala xdg-utils
+inherit meson python-r1 vala
 
 DESCRIPTION="GObject-based wrapper around the Exiv2 library"
 HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
@@ -15,25 +15,19 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+ GPL-2"
 SLOT="0"
-IUSE="gtk-doc +introspection python static-libs test vala"
-
+IUSE="gtk-doc +introspection python static-libs test +vala"
 REQUIRED_USE="
 	python? ( introspection ${PYTHON_REQUIRED_USE} )
 	test? ( python introspection )
 	vala? ( introspection )
 "
+RESTRICT="!test? ( test )"
 
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.38.0:2
-	>=media-gfx/exiv2-0.21:=
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/glib-utils
 	virtual/pkgconfig
@@ -44,11 +38,16 @@ BDEPEND="
 	)
 	vala? ( $(vala_depend) )
 "
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.38.0:2
+	>=media-gfx/exiv2-0.21:=
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-	xdg_environment_reset
-	use vala && vala_src_prepare
 	default
+	use vala && vala_src_prepare
 }
 
 src_configure() {
@@ -56,8 +55,8 @@ src_configure() {
 		$(meson_use introspection)
 		$(meson_use vala vapi)
 		$(meson_use gtk-doc gtk_doc)
-		# prevents installation of python modules (uses install_data from meson
-		# which does not optimize the modules
+		# Prevents installation of python modules (uses install_data from meson
+		# which does not optimize the modules)
 		-Dpython2_girdir=no
 		-Dpython3_girdir=no
 	)
diff --git a/media-libs/gexiv2/metadata.xml b/media-libs/gexiv2/metadata.xml
index 6ade85e1c642..5a1a3fffea91 100644
--- a/media-libs/gexiv2/metadata.xml
+++ b/media-libs/gexiv2/metadata.xml
@@ -1,8 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>bernardo@standard.ai</email>
+		<name>Bernardo Meurer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		gexiv2 is a GObject wrapper around the Exiv2 photo metadata library.
+		It allows for GNOME applications to easily inspect and update EXIF,
+		IPTC, and XMP metadata in photo and video files of various formats.
+	</longdescription>
 </pkgmetadata>
diff --git a/media-libs/giblib/Manifest b/media-libs/giblib/Manifest
index 020c40706cb3..1e394b7f8c45 100644
--- a/media-libs/giblib/Manifest
+++ b/media-libs/giblib/Manifest
@@ -1,3 +1,3 @@
 DIST giblib-1.2.4.tar.gz 287653 BLAKE2B 0b936fe3b56b933a5038751428ec56a872911d3c4ae972e9670cb1ce2496de6a8e21cb4718e7bab4eb1d547eb67ca71b25d77405ff04ebcb1ca0dc03fafea7ef SHA512 4866df223e6d219a5c9a327874bcd67260c83fba8f99862222df41ef86fb31efa0172a777bf46c853ca380dc2a64bbd41bf4fd658fcb84a924cab4e0f525dcfd
-EBUILD giblib-1.2.4-r1.ebuild 899 BLAKE2B f5b6dee111a89e991182d3b1abf6821fef098e3146b1b4931e92e0ebe3698e251f60a4b7588174a50dc610a2e300930ea34c8e8efe08b65ef89724fafb0f5e42 SHA512 41d7b33cfd56cc69436d50af7e9f984521a50fd41f522464b68cf1e2a5e82f34aa6a36083e8fecb5bc4ad737bbf3cc0648e80042a5c724bcdfe704609d1c45e1
+EBUILD giblib-1.2.4-r1.ebuild 877 BLAKE2B ecad038c51683f25ffeac4a9937425ee23b2aaf8200fb60525864465b71d18d9bf14f69bf2cacfb0d650ca6b66cc239ae61996c8a02568a28540777bcd9fc424 SHA512 53c6002d53293fe19f0532f591109b004f56f028ead71bf2ce011be3725c5ebc286b42173613edb66ca070dcdb9c0f37193b21438307bb21b1a96a88381d5682
 MISC metadata.xml 750 BLAKE2B d02c2f96076c9be5a95d8701e935ed802f3b8759d2c1cc220e6235e6a310773a05dcd5e77398ee3f32f7a55822c407c5d18c3cb79b674ba5124043934b04539b SHA512 4827fa23f4b181c3e0a76eb422bd05b1504f6982edd7b8de4ac0464043b9cb8339939629162ec0f2ca1a663940e3a52f8c95ca890ad1eb9aed6d9df4c6580c34
diff --git a/media-libs/giblib/giblib-1.2.4-r1.ebuild b/media-libs/giblib/giblib-1.2.4-r1.ebuild
index 8ce183b197b5..8c542462cf43 100644
--- a/media-libs/giblib/giblib-1.2.4-r1.ebuild
+++ b/media-libs/giblib/giblib-1.2.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
 
 LICENSE="feh"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~sh sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/imlib2-1.0.3[X]
diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest
index 1f272e94058a..e70a6e1ea4ee 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -8,11 +8,11 @@ DIST giflib-5.1.4.tar.bz2 639703 BLAKE2B 5176fbd94c37a86a7f7a3964b6b5f2637d76ba5
 DIST giflib-5.1.8.tar.gz 419065 BLAKE2B 4a42120758be15e765dae249d98d25164b40e64f933415412420163c0ed7fd6967d3958fff70478d5635a5bb9a6ed397f06ad6de510f2e97de5574b7c68d84d2 SHA512 d390917837a64de1912720ab8968e6b077c6be9f9a2f835faced44420f54d6d55d4e3543b9779ec65d399858856188fea93c170b253d0b83928f15548a14aba3
 DIST giflib-5.1.9.tar.gz 385068 BLAKE2B 0c6765eb9a017fee8de28c9440434f3054f87ae65139a3f9f4a41145d4d86dfbd88ece54ea6f40c58054e0ab728a1d346c2f725843bcc34bfd75825e58b8f650 SHA512 b6350b39755e3eeba58b5fccf319bbaeee2db6564e13c8ce44d3652cc32d243c391def74b6b1529bc5e0d4573eff94b2ffa5faa90fc564a049122d3e23f1d184
 DIST giflib-5.2.1.tar.gz 444187 BLAKE2B 8c1e105bbb65dc7ab103976caed70834356440f381ec5118311882fb1c558bb65f6c1081e5767f9835087860de44df5dfcd2826f89744dded548d535736f27f0 SHA512 4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736
-EBUILD giflib-4.1.6-r2.ebuild 1383 BLAKE2B 564dfc8776afe92c076aa5bec6c8f58b985bd8b8c3b14621c9946aa8984047a6cf4ffe776a803199ac0417615dc2df270ec8b4b35683f3a657d92f4ccbd415a2 SHA512 71a6621273dd6341e25de0150aa7b194a1143b6e344ba2a77317fd72394f585fe232d9eee5dbd28242773ebaf26072119d5ebe93ae540d4054d7e1d64410059c
-EBUILD giflib-4.1.6-r3.ebuild 1482 BLAKE2B 98f35d4ceb7bafcc67b9d66d273ca0362a49e0be0e804c4665c9c723d7e04689429362611b35cf37bd2c9d5df29f422be541ef796f4cda58ec0e6877aa23f5c3 SHA512 752ba45f1c9650a9268c5c9e555f239ec8302549573f508d5c9ce0ba9a1461b8497cde8dfabf180cc6ad8aaca420931b9025188d4743c526c3bdceaa93c1c1ae
-EBUILD giflib-5.0.6.ebuild 1060 BLAKE2B 9ee4bc54795eeef8850a5a94129dfb8c73b979d8b1e2f827fe434bf5c9966b5580e4ff0d7946fab757bfcfc18bce87368c2f8ca903e4dfe6c927281c3535041f SHA512 7c0abe0f1450dbdb2b72239e7876f3d2b3e13292c0883c92af6f85a764dd4a14f3391d55b2a21313041f07eebcb086f3fb28141093794b9fbb501c650a59f5a0
-EBUILD giflib-5.1.4.ebuild 1390 BLAKE2B 5e1719539fb2ee35bfc86c64c651534bf72057080c2f7d38e15df4ed4f6d5b7c91cea3ba55a47054455f9953a25c110733bb05e5b75da793c005d779a5dd3373 SHA512 f86b46958b2e977c56dfbd8df548d540a4b1873254abf4c6e1a69c24e696b4928a8f3d56145a545be3528497965e3e4898ab56fbdaf6b9d1c88d8066c170774d
-EBUILD giflib-5.1.8-r1.ebuild 1875 BLAKE2B 6b12c444b885ae0a0aa321c76a47281847c92ce4a01363515d8bc3933cc474eb146cc3007221a8c9fe94a3faf7d5b5c25535b5a756a2479eecc8f8e00eec94b8 SHA512 12d8a59b6940a27ff7c0d688f8f71bb808189ad668c50392bc4842b0b119de11792bd56ec5a0b01951d5cb1f369da14cf543b7824c56ab995f525bc6f8db0572
-EBUILD giflib-5.1.9.ebuild 1875 BLAKE2B 5a966e6a683117f6264f2f55bfd2df543114a2910197e1999d104cb4ab38c225901c228cf5827bdd11971871f18b118a816377b0e78899d8eceb0ea65165fc46 SHA512 7393a4903d1aafd1287e7b7fd6b527d930079761b97d659445323309cb8387e8c301077f24873646a85245082bd3ecca8b207ef16d141fd95930421409895608
-EBUILD giflib-5.2.1.ebuild 1875 BLAKE2B 5a966e6a683117f6264f2f55bfd2df543114a2910197e1999d104cb4ab38c225901c228cf5827bdd11971871f18b118a816377b0e78899d8eceb0ea65165fc46 SHA512 7393a4903d1aafd1287e7b7fd6b527d930079761b97d659445323309cb8387e8c301077f24873646a85245082bd3ecca8b207ef16d141fd95930421409895608
+EBUILD giflib-4.1.6-r2.ebuild 1361 BLAKE2B e86a7bd6b59ab7cbb83b97429087231e45d7161ddaa8b4dabbbc44ae62981147c455481170a125d9130571ce2c487969aeda3a19a6981067482dec13cb8f8cca SHA512 bea6bfe10ef247cdc4af4d3db04e4d5efaa9bbce91019c1bffa9dd8081c127af231b7243983d3a3cef58d7616ddefcd7303e59b7ac09419b5f6fbf70c3e20e70
+EBUILD giflib-4.1.6-r3.ebuild 1460 BLAKE2B 21b67902f8006966732c2641b23523b70c27a874bb235d667836a558147b4de5f8f8b5465fa42cbccbb92d1c3a9a07eb91a76ae4d7adc7644c0c083b0414f90d SHA512 73aa3bff51380ffe17e65979fda115a136317313f9a298b1c2bf9962be5ddc564d7b899c1de510f815ffa9f3769cdc2be2601cb6a2a278b1468e7c37b8b279d6
+EBUILD giflib-5.0.6.ebuild 1038 BLAKE2B 5a6c7ae4f88624995c3fd518eac4ea512ef0646c1b9e345ba44a0e6b3f9f3ee9bcf826c49f615eac1e507c4f4b9ecfb80e307dc5dad7d3b30f50c07b792b83e8 SHA512 99d325391763ba015c2b27173cff64c91cd8fc401c6e5d977bc966ab8d60d303eb2ba9dfdf13354822df3b56bacc7b52299052dc8aa99f734bdf3c033d022a17
+EBUILD giflib-5.1.4.ebuild 1368 BLAKE2B 485f64770f0e384adb3750a6c0272f475f37a8c16487ecb6d593e267aa5a462e79e6457cd0f39cb131a7eb9430d595b2064fcdebaded78484bd25c65bcab9334 SHA512 023b996bcf47bbe3350de231fe2aedf36a2c68655d44ad5afbd155b3e8b672d64bb83d3cb2623a5f37f58d45c691c89bbf9a3831c7677d1318d1740383ceb5fa
+EBUILD giflib-5.1.8-r1.ebuild 1853 BLAKE2B 677f21d9ef26c558242aa93ef640a96f5d4123e787b9f03d7a2e8080853e10649d84cd51896a8f1a95f3445dcc61dcc39b58b486552954e09c3f7c54f3e43b99 SHA512 7bfd62190a45aa343b8ec80f3d5a36cdebd270de1d8b9a89d98b7e4eff9e9f1a26b66f7a8fa46b5976f80db4f97af91a20588c9668dd2eeac2042805bd4bfaa1
+EBUILD giflib-5.1.9.ebuild 1853 BLAKE2B 547761c4aa17b33c224dcd4e17e58f0e8a2c629d7daf3cc3a559c7ad1a7c3c2596d15a3e24d901909ff51284fe30c9f4352982cf621f29598ac6550dba5bd4cd SHA512 b99e38eb5b4b5084bcc4a771451737ecfae9b45076ac40133a6397fff6bcfc386e2d86807422b80c0321af23e3d2af4fe60b5e32b2a16e83805d89496eb352c5
+EBUILD giflib-5.2.1.ebuild 1853 BLAKE2B 547761c4aa17b33c224dcd4e17e58f0e8a2c629d7daf3cc3a559c7ad1a7c3c2596d15a3e24d901909ff51284fe30c9f4352982cf621f29598ac6550dba5bd4cd SHA512 b99e38eb5b4b5084bcc4a771451737ecfae9b45076ac40133a6397fff6bcfc386e2d86807422b80c0321af23e3d2af4fe60b5e32b2a16e83805d89496eb352c5
 MISC metadata.xml 444 BLAKE2B 50913e89623c9855de9b3344c4f7a9f6266b42d99ab88cd4c6be63b8fb00a984dc05b89efbac92ed2b5980e9bed163473925a88384a61b3887ef86473f89b216 SHA512 10f7b2069a73ae9d488fba9febb6b8edcab5f278e1d68ef5b998037f02de5de81d07983b66f3c4ac8a59fa9a4836b92a909c66a4c1188a97aa03174cf4f546cf
diff --git a/media-libs/giflib/giflib-4.1.6-r2.ebuild b/media-libs/giflib/giflib-4.1.6-r2.ebuild
index e6dd91121a28..d26ea7adbd53 100644
--- a/media-libs/giflib/giflib-4.1.6-r2.ebuild
+++ b/media-libs/giflib/giflib-4.1.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="rle static-libs X"
 
 DEPEND="
diff --git a/media-libs/giflib/giflib-4.1.6-r3.ebuild b/media-libs/giflib/giflib-4.1.6-r3.ebuild
index 0d7822692362..c64647f31a60 100644
--- a/media-libs/giflib/giflib-4.1.6-r3.ebuild
+++ b/media-libs/giflib/giflib-4.1.6-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="rle static-libs X"
 
 RDEPEND="
diff --git a/media-libs/giflib/giflib-5.0.6.ebuild b/media-libs/giflib/giflib-5.0.6.ebuild
index 604b886a47a4..f80e51e8c669 100644
--- a/media-libs/giflib/giflib-5.0.6.ebuild
+++ b/media-libs/giflib/giflib-5.0.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2"
 LICENSE="MIT"
 SLOT="0/6"
 # Needs testing first.
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/media-libs/giflib/giflib-5.1.4.ebuild b/media-libs/giflib/giflib-5.1.4.ebuild
index b92da179a4f9..6374d819fb73 100644
--- a/media-libs/giflib/giflib-5.1.4.ebuild
+++ b/media-libs/giflib/giflib-5.1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0/7"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( app-text/xmlto )"
diff --git a/media-libs/giflib/giflib-5.1.8-r1.ebuild b/media-libs/giflib/giflib-5.1.8-r1.ebuild
index e16390f179c9..fcf9ffd016aa 100644
--- a/media-libs/giflib/giflib-5.1.8-r1.ebuild
+++ b/media-libs/giflib/giflib-5.1.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/giflib/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( app-text/xmlto )"
diff --git a/media-libs/giflib/giflib-5.1.9.ebuild b/media-libs/giflib/giflib-5.1.9.ebuild
index 87eaf2bc7006..55389387daec 100644
--- a/media-libs/giflib/giflib-5.1.9.ebuild
+++ b/media-libs/giflib/giflib-5.1.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/giflib/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( app-text/xmlto )"
diff --git a/media-libs/giflib/giflib-5.2.1.ebuild b/media-libs/giflib/giflib-5.2.1.ebuild
index 87eaf2bc7006..55389387daec 100644
--- a/media-libs/giflib/giflib-5.2.1.ebuild
+++ b/media-libs/giflib/giflib-5.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/giflib/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( app-text/xmlto )"
diff --git a/media-libs/glew/Manifest b/media-libs/glew/Manifest
index 4a385fcdfa7a..3074c1887dad 100644
--- a/media-libs/glew/Manifest
+++ b/media-libs/glew/Manifest
@@ -3,7 +3,7 @@ AUX glew-2.1.0-mesa-compat.patch 560 BLAKE2B 385adc6854a8b6cece3c1c5fa5452c7cdb5
 DIST glew-1.10.0.tgz 567605 BLAKE2B 18e2b3a4d60b69def1e68778554b43b85c69914daa20b8a64adb2e807df391a2eaff9c6cb2a3c46e5bbbf004655561ae4d2cd8a2fb883a2754f23564993a61b2 SHA512 0c998fda9fe01c9296a3453966c0449c9968f4f5f989065ca65f0da3830ae8d805699d0ee0362c3b18765420222ba18842b9db20986212afceb36c971ae1bdca
 DIST glew-1.6.0.tgz 494713 BLAKE2B 17e47092e2eefcad79220232b3aeaf856541f5024bdaa65be866dd7d63ef19ad88b389dd13c2ccf9bafd175d00d18ae94185f890a3d12d61b2445f7fa9d6ba58 SHA512 5b8ca9e97d01d49fde591b0c55683620e0a6ddfaf5e93e03536e6217bbb548adfcd4e945a39ed3cfddac3f239b3272be1b3491f4071689d02c4bfb7e0ec44904
 DIST glew-2.1.0.tgz 764073 BLAKE2B 081fb49ef286681657409f950fa03b97210dac3f90197b792d9128a2b9fa271181c9e64422a867b531683ab23010cfeb2f519adc32355839b67bf41934578fb3 SHA512 9a9b4d81482ccaac4b476c34ed537585ae754a82ebb51c3efa16d953c25cc3931be46ed2e49e79c730cd8afc6a1b78c97d52cd714044a339c3bc29734cd4d2ab
-EBUILD glew-1.10.0-r100.ebuild 1948 BLAKE2B 49358c8d4969c8ed80c551d6a8dc504a2368ddb5a96f6f8a3e41d38bc028e70f88b714913f6b55cf85d101cb4b8f5a1d8eeef0a64803291e3e553dfb3234fb5b SHA512 97b574ef48d5d88bd86299fd6a9cf3fb85440af015e50ecd5ed841b214b0e9fd278c4d9e70b57c3c6224a3105582cbbfd7da1d2fcb48a6165d51a9421d9c797c
-EBUILD glew-1.6.0-r100.ebuild 1921 BLAKE2B 634e76c202e3d4b08ef68b0faf4d8c8c88692b32e0b8536c9a3ab617361ad008030994517dc30146171f61d80bc75fafc1cc8e3e51a1ee76563c443ecc7033d7 SHA512 53e816516b5166ec273a9a722694c7aa0961b63144562630979b2db35d0da697f3bf4f8ff0c1cfa44d95a788d0b5304733db3470b6b245b0e2acd952df67a93f
-EBUILD glew-2.1.0-r1.ebuild 2520 BLAKE2B 5543cc51b32152b1ce958f9f2e8d7ca9228346a2516c614c4e0a51a9b755ba32c990d5d595e6f0c8d6f933d8fdad7619d43897b2cb3e37cb9297bf70b40f8d48 SHA512 f602d7dd1e8a2c3ac2bc0c67ba0014dcba6a7bca2e9a0b5d1935c78cbc34ae7a26a93861fa60b1d89044c9ffd459e951e173801afe8b23dda82abca12e347a5e
+EBUILD glew-1.10.0-r100.ebuild 1926 BLAKE2B d1bcaeffa4150cb42b4c8d04ada2cc5290fce92c33f48d9e674789a1d21221b26ca2914f6fcd10269206f7a978c88be8c6001eb2110a0fd3c140307c349f5a3f SHA512 1e6851e65dd0674cbed978e78be812b8929f232e949e8011b8494d053388aaff25459e5ef2dbca223ca74bd7b64c3c641cacce9bf95abf2445d8b347b7dfc540
+EBUILD glew-1.6.0-r100.ebuild 1899 BLAKE2B d5c3a07a8b9ff84120c806133a8f29103eae5083163bc201b21a5e10b13fe31d47062b25d65cd57550af328b1961f9427ea3a4bdfd40c5af9bf8b918c397efa6 SHA512 e2b027ab4156eea93a99325e6417509db93f10ce7ed3ff8ba82e82e79d96548ae89f6a318d9fec55b82fbe7b75db7e50a0021f2751e167d87052a5ff9aacc934
+EBUILD glew-2.1.0-r1.ebuild 2498 BLAKE2B 17f6a30497af5e1b6de9fe4ba0febe661aab70bd4f4fd83d16629231e45c032274ed6560103fdc3e42a302ed7ecbb017464c185a6db5337c4780145df46c36a7 SHA512 308e5e0a442b8a18fdc38afa53a3a38f85a498104ae5620e4871fe275e2aceec8c392f9582c0507b49883d501de9d234a8bec44b7f5f5957f76461db5cf0cfa0
 MISC metadata.xml 296 BLAKE2B 14e5921f53872e45c3b43dbe5d95fbb36162ce327eadfc41b34cbee17c11d1de02562152920026592f3dc508faf080e4e8b4150490a815cf7629b1ecfccda758 SHA512 60f31ba192f23a74365955e122ab54aae36c45b9158a2a5201bac68c46c07195025a9978fec01fa6e9804bc731bf1f7b495445bafb9e53d94f895c128075aa3d
diff --git a/media-libs/glew/glew-1.10.0-r100.ebuild b/media-libs/glew/glew-1.10.0-r100.ebuild
index cc4b3786ef67..0e2bd36ca8d9 100644
--- a/media-libs/glew/glew-1.10.0-r100.ebuild
+++ b/media-libs/glew/glew-1.10.0-r100.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
 	!=media-libs/glew-1.10*:0"
diff --git a/media-libs/glew/glew-1.6.0-r100.ebuild b/media-libs/glew/glew-1.6.0-r100.ebuild
index e730aa775712..818b61e28e28 100644
--- a/media-libs/glew/glew-1.6.0-r100.ebuild
+++ b/media-libs/glew/glew-1.6.0-r100.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
 
diff --git a/media-libs/glew/glew-2.1.0-r1.ebuild b/media-libs/glew/glew-2.1.0-r1.ebuild
index b488e1f74739..282fff5b38b2 100644
--- a/media-libs/glew/glew-2.1.0-r1.ebuild
+++ b/media-libs/glew/glew-2.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 DEPEND="
diff --git a/media-libs/glpng/Manifest b/media-libs/glpng/Manifest
index df5fa9457b22..24f2d67f2e70 100644
--- a/media-libs/glpng/Manifest
+++ b/media-libs/glpng/Manifest
@@ -1,3 +1,3 @@
 DIST glpng-1.46.tar.gz 41024 BLAKE2B a0e521ec5ebd3d6b9d62e64b001dfa0aac97be6a72f44222816f5cb2dda3949d33261f66e96ecaa1fc6feaf7ece67721d3606440d760b305fbb7cb57462b24b3 SHA512 82fbd6154a0ca16102b4c31f7fbd907cf8c18b20c1693c60f8dcdd1fe42ebe579f98da2b36c00fc080b2880c720e8099dac0d460a8de1b2bf1145abbf05a20ae
-EBUILD glpng-1.46-r1.ebuild 685 BLAKE2B 650323f988da970229ec6ee4221f6fddda4bc1a4cdd8a142c07a67a126a3d2d84e71f8007135bb2db3968c1093d8e4bbc4645ba8b11840215fa89893479a85a7 SHA512 8e2dc4cc9b22f4cc3fb11c298c94d83fd1cd064630a04f817d64d43a64a0b665f605849968c2e4f6466927b5d186a60cb10c2337c1b6001e456d9b4dfe86c15f
+EBUILD glpng-1.46-r1.ebuild 682 BLAKE2B ccdda31ad8bfe965e9d7632e7b428e57bf3760c59a86980c834df62bda5542cf06a7792af99be7bad3ac689bd75dc75e235e601934637a1720d18e4d904fbdef SHA512 3e47b2acf4b3bad6635e3c75c9329177ad5a669dc36ca091dd312faadac1c959b5afa3c37a395fc18fdd99d7446f4ae303b56d45f2c153717191aee4cc860420
 MISC metadata.xml 461 BLAKE2B e5bc7b8a1b80dd383a5187799bb3e43540ec0b26694fcc62c289e2df08544484b8aba3ef9e396512ffed6dfc9457358d4eb683dd27484b13d5c44def8a68063e SHA512 bc6e0802c3ca98c29fcef3b36d34d688b5249c0e9103fbe336653003c2142821a732d26a48a6052003fc2e6f82f42694fe8ba9a4b32e896f689b10ef186c30e1
diff --git a/media-libs/glpng/glpng-1.46-r1.ebuild b/media-libs/glpng/glpng-1.46-r1.ebuild
index 381438333a1c..3aa5db0f4ed1 100644
--- a/media-libs/glpng/glpng-1.46-r1.ebuild
+++ b/media-libs/glpng/glpng-1.46-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/media-libs/glu/Manifest b/media-libs/glu/Manifest
index 07b59618a8ff..ec4030a2cdc4 100644
--- a/media-libs/glu/Manifest
+++ b/media-libs/glu/Manifest
@@ -1,4 +1,4 @@
 DIST glu-9.0.1.tar.xz 434632 BLAKE2B ed624b107a97ac84517cd0fa740090746ab93c77498135bf6dae3ee488e04afc93b0d239aba15533de8ab407d3d3d5e7cb5086b29985d93037e78753b249741e SHA512 8a6dae5b4bd63efb96d15f23ccda4ad9c2ffaa964897e5fa63d1e58360d8d4e6732c5efd2109dba04155d5fc457ab1718a65cf9b544ce0d452679ba988d04018
-EBUILD glu-9.0.1.ebuild 1046 BLAKE2B ff1dbed4d6d0e80f3e1407467785110beeef9010299f52fbbcd2d55d68e1da1dd4761953ec24807a9fdb750d61cf7af691a45609a64a3f0f64911ffa7d07864b SHA512 65996089f3fffc482f441b257af31b34d8e631c58ad1060d8d583df53ea38696858af634bd1821c34c74a505a753dff027962b5c8c5636f210593f8813c43f93
-EBUILD glu-9999.ebuild 1057 BLAKE2B b643ab76123ed0a288e27d70a867b78e52b9c86ffdf98887018aed7408093fef81c5b2072658853fcad39fc44f8bb6d44f3d433edb7e34d8f015816c1c48bdcc SHA512 33a465a89ddf272688c17e1418190c94e4867c1ba77d9340dc4c49ec9c40fa6dd6bcfe88c2d4e680d1aec84ad75ac1311a2c9910179cb9ed88009ae574a1d8ad
+EBUILD glu-9.0.1.ebuild 1024 BLAKE2B f67db8db0f8d8875d3d4908b80eba69caba7fb316638cbcac4c7f0da81b20a3564e4cd42ab69dc965c18b6fb691822d3e2a886d4811532b0a9e198efae54dad9 SHA512 1bedd8d83d39d9dffbc99523cbf6a03579b1e8055921be513596394d2c17562b23eec238c5252bcf215233dff47aa6b3761af9d04028931c7d993121dd1bf48e
+EBUILD glu-9999.ebuild 1035 BLAKE2B 43d0aadb42708cb7b4beb03b10565bb709c92ad857375d2d84c7cfe09c101eefcf8e337a8fdcffadb9e2463d9816f90e23e2c04c8b858374f1c23f216c9e134f SHA512 7ab9c56db61a19adfe6fffc3283a35e5f86275bb517287b86c6c8e31cff0bf08f7241d21f99edab9a6aea48d7cdc00df98410a573534d3a87680cfcbcfe5e3a2
 MISC metadata.xml 240 BLAKE2B 7361e68ba9e9d62530d9e45896fa3473e5606d67f87f78f4be394145abb8ee5851fff417cbd973c913a05ce60530eca628c3864cfeef75bf7b5f69b3e8e87da8 SHA512 e23d56b08b47406b57f50a1028febb4c4e1809ce967715b2a46aed1124dfaf306a85a3b2398c4ce058df4305bfc8645b79e8ef3569e6cfe8ec467f63e967b5d1
diff --git a/media-libs/glu/glu-9.0.1.ebuild b/media-libs/glu/glu-9.0.1.ebuild
index 060ad7fa7c97..eeef467aa851 100644
--- a/media-libs/glu/glu-9.0.1.ebuild
+++ b/media-libs/glu/glu-9.0.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="SGI-B-2.0"
diff --git a/media-libs/glu/glu-9999.ebuild b/media-libs/glu/glu-9999.ebuild
index ec7ab407c722..dfaaeaefd9fe 100644
--- a/media-libs/glu/glu-9999.ebuild
+++ b/media-libs/glu/glu-9999.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="SGI-B-2.0"
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 867188095c98..34393ae675b9 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -4,10 +4,12 @@ DIST intel-gmmlib-18.4.1.tar.gz 621793 BLAKE2B 41d6f93ec68cf29b8bc2d01c103c69dd4
 DIST intel-gmmlib-19.1.2.tar.gz 632661 BLAKE2B 4a9995a9e4c8b5c8e081d757193212180fbae3a88040da24be4225149c4c0924b56d5969e125a0c21a5af7b2b3d249277d7e27cb3ce13135c69bb977a976879d SHA512 fcc0beedfc3716b6204627f7daa5e0a5aec720b2a29ab2f8262b613a11d31bfe14dc8476513515d8470cf7d66f58d109ed4d5cf203e041228f53a64cb4a6c243
 DIST intel-gmmlib-19.2.1.tar.gz 633194 BLAKE2B fe6105bd76d18f3c4e0d42550fa91a1cfa75413b7289d4cfd89c6edbd9c2104f11dbb9c549f3331259d3629eba5f3698f8289da5f551f55f9a76cb704680e9fb SHA512 686b47d9de54f96ff1b4b75e595175a08e5a619d1b3f3e71388d851263dcb12315be7834721c88c698d4dbf6f68845d7850ce7a238f4e639ca0896de724c408d
 DIST intel-gmmlib-19.2.3.tar.gz 633252 BLAKE2B 81fcb541cc1a5fe3bd8ebbb2d98b5d4d7d6af409f1b837327c4cc322da7cc77c80992cc22ef6920cfe3704d6cd030bbf5e36936cb7f205e38f65807297a58dcb SHA512 d82973a18804474708e252cd1f0d5205e72dea0b7b14401ff7bad351f94ad7a53ada7def16f62da0810bfa6a747135fb2c7649e4a1fa6fbc4e8f5a38cf948d6b
+DIST intel-gmmlib-19.2.4.tar.gz 633227 BLAKE2B e7ce9143ced27c8be87b807eeb6fa66dec7f0931dda83d7f1ee597682e593798fda6edf665471723df23bb0ca8b730ff88070211728b83478340d80ad982b089 SHA512 7921b11abc2c0658b614decf5bad92a63155aadd35439eb1885e0314ece1b9a983d44ed28b48ae2259f949cb913272583a0c4f064cfacd698dd5c7013d6bff52
 EBUILD gmmlib-18.3.0.ebuild 807 BLAKE2B 7a58c4ee12ab5d2d970742cf8199f71be6e66a44231b58c3ef618a94c0e07b04e27f0767c02545e5f50d667895c7841cfd97425419d0749c493c15807ed03f59 SHA512 9dbbf041162c336914f0877ad0adc74b91ab695eb9886b46e5efdb4a9635e5f77295d3fec65558993d271e70999ea6144430a3ed9f04a000f62e9ca8c4bc3ca8
 EBUILD gmmlib-18.4.1.ebuild 807 BLAKE2B 2800dcb9e11d3b6958c095a31f53c38e4b1633b36e727d0924c6842b862f307ed198ad0b2b23525f973de5720695fabbebe2f94be1ea4d997e56cfb92faec69c SHA512 9777b3431af111fe2ec7cd211bb29bbc242e5b1b07e2eb9ac2b82722c04f59d48a70f5df2bab5c1d3653d96774cd1336dd7b0d98c9f5b1d9e922f2dec49b046a
 EBUILD gmmlib-19.1.2.ebuild 883 BLAKE2B 5ef30d7f29660cebbb9d6e0d0146714c737108e4ec05c01819858d2ac6daaa3a5e0999daf0a20b648228da1aa54ce7cd8b458cad45ec00d0c8409b4ab7fafabc SHA512 cea321160c7b2b74d4b04e12ddcf86295dd680c3f77d4f4b40090a53f6444e6a81b43478059303f54d5cfad1f971acf4c1166777610141b3a86af9178eb279ed
 EBUILD gmmlib-19.2.1.ebuild 819 BLAKE2B b73f418ae95b025e76499a26e5b7bc04923bd1c6115fb1d7d3788ac24bb07c763fcd0fd2e953084f2cb5a476cee303b233afb2860911b7568f0208518e3a61c0 SHA512 43dfe602d4588bd394f0c4218cdf6b40a8094527393cddc5af7d5180b1bdead3f93e312f1a5f8fd7e780f624a765987ef833195b8e3ea727a2805ca8ae5a059c
 EBUILD gmmlib-19.2.3.ebuild 819 BLAKE2B b73f418ae95b025e76499a26e5b7bc04923bd1c6115fb1d7d3788ac24bb07c763fcd0fd2e953084f2cb5a476cee303b233afb2860911b7568f0208518e3a61c0 SHA512 43dfe602d4588bd394f0c4218cdf6b40a8094527393cddc5af7d5180b1bdead3f93e312f1a5f8fd7e780f624a765987ef833195b8e3ea727a2805ca8ae5a059c
+EBUILD gmmlib-19.2.4.ebuild 819 BLAKE2B b73f418ae95b025e76499a26e5b7bc04923bd1c6115fb1d7d3788ac24bb07c763fcd0fd2e953084f2cb5a476cee303b233afb2860911b7568f0208518e3a61c0 SHA512 43dfe602d4588bd394f0c4218cdf6b40a8094527393cddc5af7d5180b1bdead3f93e312f1a5f8fd7e780f624a765987ef833195b8e3ea727a2805ca8ae5a059c
 EBUILD gmmlib-9999.ebuild 819 BLAKE2B b73f418ae95b025e76499a26e5b7bc04923bd1c6115fb1d7d3788ac24bb07c763fcd0fd2e953084f2cb5a476cee303b233afb2860911b7568f0208518e3a61c0 SHA512 43dfe602d4588bd394f0c4218cdf6b40a8094527393cddc5af7d5180b1bdead3f93e312f1a5f8fd7e780f624a765987ef833195b8e3ea727a2805ca8ae5a059c
 MISC metadata.xml 322 BLAKE2B 802cb8da9b68866ac616c175586bc3651330ecbfb1b08fe3fad52ec8817e1994f347ae49815869d50296504d9607fcf6c41d40543d8896fafd8d36c4421604f6 SHA512 52324c98984d04659d8ee327850152e41b6146f45a35b147a1fba2043be7ca91e220dd57fc3712e5154b416d04f8a1b0f614259cd9fde8c66ad7734853bb50ec
diff --git a/media-libs/gmmlib/gmmlib-19.2.4.ebuild b/media-libs/gmmlib/gmmlib-19.2.4.ebuild
new file mode 100644
index 000000000000..aee2550263c0
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-19.2.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+fi
+
+DESCRIPTION="Intel Graphics Memory Management Library"
+HOMEPAGE="https://github.com/intel/gmmlib"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
+	S="${WORKDIR}/${PN}-intel-${P}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+multilib_src_configure() {
+# once upstream makes this optional
+#	local mycmakeargs=(
+#		-DMEDIA_RUN_TEST_SUITE=OFF
+#	)
+
+	cmake-utils_src_configure
+}
diff --git a/media-libs/graphene/Manifest b/media-libs/graphene/Manifest
index 44bd69f6e354..abd4fe5c9f51 100644
--- a/media-libs/graphene/Manifest
+++ b/media-libs/graphene/Manifest
@@ -1,3 +1,3 @@
 DIST graphene-1.8.6.tar.xz 127984 BLAKE2B 7f67b99796cca1a47324674b1871ddfbcce1193ded5f0a37c8c2894d52b6b5823b0fb1909018ea6adb90f7ed53ad6b09eeda9b1606a22a8b85cd0d661d500195 SHA512 ef6e9b5587bd540099216a7e3f7c86eb62368d49876dcd380c9767c6740c8267c9d510c5025dbe56402f3cd15084ef8fc634d3abe486b516f4f5328b87df277c
-EBUILD graphene-1.8.6.ebuild 1826 BLAKE2B 4ecab28c20a172f30360fd5d6637712105057858352a2f9f4f9d7a4efd5c6e239774b15d0dba2f05ece6e301bebf3baf71c9080b1aae69e7f3a52c727f7427ee SHA512 5f6de343071e11e0d21a3c3e5f5edde0a1db1ec4d2e4664e28600b68868e138051cf062f979c8fb50131b86dad1522f7ac0c9a2772f0843a3b093315dcd61b53
+EBUILD graphene-1.8.6.ebuild 1814 BLAKE2B f9451e89ebcf359fced81fa8b154e4ca05e29e4384c8d9fd239f026f528d1bdd82d26afb806b7f747b2caad323bafdeb6c5e7f53c40c9569031c39ef5447049b SHA512 9f8c5876827539706ae2553b5f8a3e11eecbb6b3e021fc0ddb502fe00960ad323d226ee2d45832e5a956bb2f610a228e542dd8e112d09fbddc41bd5f685c4f1f
 MISC metadata.xml 333 BLAKE2B 3d34baf2b84e2ca8cc20638b381fdb4771e94f07df133f5d997b5d7bdf3704f8b8f77d2c79815f70246affa2e399d1118e03eae7c7cf8e419fec3dae89ef0405 SHA512 aef6b787ac7f14b56e4eacd746c91671b9a115cb40b312b415c7302d4339f5d3b3a887bd52a2b30ba31b3e0f027360a9fa55f6d3065cf7baedc4bd28dbbcd056
diff --git a/media-libs/graphene/graphene-1.8.6.ebuild b/media-libs/graphene/graphene-1.8.6.ebuild
index aa45569e80e0..beadf7de4f46 100644
--- a/media-libs/graphene/graphene-1.8.6.ebuild
+++ b/media-libs/graphene/graphene-1.8.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ebassi/graphene/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
 
 RDEPEND="
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index b385d2e5df09..60de1b4a2072 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-EBUILD gst-plugins-bad-1.14.3.ebuild 2626 BLAKE2B bb5337c926fb53f010b1f3898c2a85a08ca429c1dff7bcfb7f88a00259a78b803c660948c3ff635b49725333ddd0dabef3b3373b433ef1af30e54489300a7d85 SHA512 7dfa4c012a4dd7b73b31ba59352c90a3a6ec5aebde1cce1b7262d4f2e6cb832e9bacdd90a82a71b8a8080a4c5b774d6f9088c44954e748267dce09c90cd23202
-EBUILD gst-plugins-bad-1.14.5.ebuild 2634 BLAKE2B 2c25a8926cc468bad259672fab60a9028340b2bf31d21cbfd62b7d7e5967decb0d0ed3ab37f60c03278a7cfd89122bf39520079cac4dc1c53461d6f7f5c6d222 SHA512 a6134e8969f7fa8eba3a7f46fa6e19b16c96e561fe8010260823d0d05a840d40719a2e9950b701013b99126963e512df63bd701ebb57d30b9247895f3c8ad6a5
+EBUILD gst-plugins-bad-1.14.3.ebuild 2604 BLAKE2B 1fa6fcd55addb2bc7ae21d6634700ac8a06e49b219702a0ee2569f067359fcc2e983740db79b27fee33f3fb273c68644cf9e3102cb72b70b1643622068778f08 SHA512 9187d53c7d79eefe88048e45e8df34f7133fd53f547f997534b6408f32ab49b545159f18d34495615e71c1840a4ed92f616f3e2aa1aeeb27412f48062bffcd74
+EBUILD gst-plugins-bad-1.14.5.ebuild 2612 BLAKE2B 1860fc212d06a15668ef22b1d111ba127c3e54ba52f9444a92e721a5e91d2ab1721c3ebe4dc8230fe3797cee180fc5fe2166bad2a86b54de00aa9d5fceeaf483 SHA512 819468969df1ba5f8c70453fe8fc1eea4837a935be02556dec207b5f43853873af8248c2730aa49aa23a58727e2f1e33624a997d5965c3a709877acee87fc0b0
 MISC metadata.xml 439 BLAKE2B 5a4a36ccf4bd485eaf1fa66650eec8fa592d4c5bbf9fa478f1645e1b39649b7115694bf55dee7aeb4a5c53b2ba3c4614591cdf4e7d745938397c304108e0aa7c SHA512 9bd27a1a513fc2d697f7d0f2ceb7fa0701c446fe21b597256afd4c2c1f44145e875323ed1ef6202bf7b85472ab4aab43a4b6db5795bb1d28ff53a2a7e484055e
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.3.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.3.ebuild
index 79dfca06e6ff..746a8fad7596 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.3.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 # TODO: egl and gtk IUSE only for transition
 IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild
index 1c39a3a7fbd8..43c5ed8cab99 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # TODO: egl and gtk IUSE only for transition
 IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index 166de97f7166..9cd7127226f4 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -1,7 +1,7 @@
 DIST gst-plugins-base-1.14.4.tar.xz 3703232 BLAKE2B b22c44b857bc4f1972f03752cc1afb35c8d76e2d0c4a06c574af0ac4f3a91080c584ae4e4fc2a263ee879a53d58505c24a756ebc051d81ec62661c4f9e532f0e SHA512 42c59df9f2d848108f12afa0466acbcfa5ccda64e4d0d44608d4268abed20f2e036713de04e7d71feaed1868ad742c5bcb55ae0eef5dec8e19e053dc8541b8af
 DIST gst-plugins-base-1.14.5.tar.xz 3717076 BLAKE2B 461e90df614c60d7efce6fabcf8ad7a5cb68b5fc01b05761fa441d838d3155b5a2e7f9b9420b7e48b2eec49e4bcfbd39009a662db03a923f42c6f45c782795cd SHA512 4e81c44a5ea3b910f96d3e9251ba38a79feacead4f96adb92eab5a650695ca8d5313e3ec1df78fec04376cf3152d2eefd4d39f6c11dadc98a11e55bbf8c8ccdc
 EBUILD gst-plugins-base-1.14.4-r1.ebuild 5919 BLAKE2B eb497ebed24ba4775e90d05236714a5c65c9576d6c61a7df3ca25b9677a614db7fcdcaf3f6afb61751fee435e0df296b878dd383c142d7d5d3c39e8a6cab7623 SHA512 298e7adb9daa3447aed8d67c9d3d3672c356d20b11b82fbe51bfb970833baa27c8f9be63ebab3913f34c98c2c50872369831177e307750a181b3962190f210f2
-EBUILD gst-plugins-base-1.14.4.ebuild 6061 BLAKE2B bf46ef975e9675c8d55bd807e11074cff4b31dc7d308750ceedd43bb67889473183dc1c83109f4783af4564180b23e14b92787bd4ac2ccc75d28917b03dc14e5 SHA512 9493adf3513a16e4f07fe15d9572e60285817396f43a8ec79fba0a3b37f1e35bf845e3edab2e92454d9b59bcaa69c21702e8de62243905cab45427d6a123f9c1
+EBUILD gst-plugins-base-1.14.4.ebuild 6039 BLAKE2B 8fd57fa801b5d500e70d895cc6036daf12ecabadacb0983c060f7154e739e643d9f60e158f786f7468f3f1dc9a0ca58d19c6be3466c18af04487ed1e7f017ec1 SHA512 9397f00f9f6a7c2944ba04da79e3b672d333b9104c6488d4ebd8d7edda130a64ea7e67c51b7742e83b3188abf8eeeb432ab3269c26dd34de8c0d7096ddc8269c
 EBUILD gst-plugins-base-1.14.5-r1.ebuild 5925 BLAKE2B a18cda341f3165e7b07babd24c5da5b79da835577b8df698f0e9e5a63b9356c88040d1c0ab638eb2489a93c9d042062cf3e34c8129f0f450bd2dde763867d804 SHA512 86332c0a762c8c19002245b7df5b2f117696c7f28ce74541d6e11107ef1c006b6e5abdd2022e04f0f97d3247e8a6bbbb397bfa27d32cc0340ae126f273abc900
-EBUILD gst-plugins-base-1.14.5.ebuild 6063 BLAKE2B dcd3142fe16e772125bf4f178b019c40e58c98ef293e9afac8e68d18ec6228a653acf11377f70071f50869b4d1fdbf0594d87ef13c8b816030cdbbd768fc6462 SHA512 77acc4ddcca654ce6bbc21f28038cd2d4b7a1aca8afecfb330d2889d43a9fa0e0ecb2fb86559ac077dc867cb121f316d8e2f36ae520f13f593bbd501b6336ada
+EBUILD gst-plugins-base-1.14.5.ebuild 6041 BLAKE2B f51eac6a9fdb00a02bfc29cf831c1ce37a57777ac0c2249bfdaf9dfe81968eb794db731ae6ecaa614fabb067bbadc70a36a342ce2158eb8847cb1dbdf367cf40 SHA512 958157b77bff773354a4284354ecbb8cbbe839a0bebe7bf23b0ac5b6c8a11d5205c3b06ac2522e1333c85dbb6863225e6133ab341ce6dd44e3b82275ff5407df
 MISC metadata.xml 1065 BLAKE2B 9736df3218c6157e5cc0f14e96a15ec6ab6140e8774c7361dd4fe9378efd37d1a3da593527313a81591818ad48a5585bd4395fbeb85d357449b00bf7e51bbb5c SHA512 520802b59fc6575e16edd765dacab4ff0ff6e51dd162f03fe7e4e07eb472aeb78f3974a32ba613939932e123179106a450c503234ed806a08416dc6b8dd534c2
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.4.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.4.ebuild
index 3b09b6da9fe6..8799cf46d1ed 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.4.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.4.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild
index b0288166ffca..60f43b861174 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index 975106b8634d..c627636ee802 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-EBUILD gst-plugins-good-1.14.4.ebuild 1431 BLAKE2B 7a88c207f331b2893d3ce9e8a245b45a6300d127eccb0b2a4680f8cc9e39d54874a4e24076fe4d990c094ffb79864ec662adb4a7bc009bfdc8f3bac05aec300c SHA512 8a4f1e7c155d1a55f2f93f98aceb1ff56cf2295a409891e6342ba9357d04c4be4d9bd1411447c992530ab98d4afe868bf4883805e11ea39f0e82cc22701d16ed
-EBUILD gst-plugins-good-1.14.5.ebuild 1439 BLAKE2B 0409679b2c37345ec80fe1bf49d40f690c44edee6cc78092d8748fd22ed9b30d292398758e63941ec1c6f90cbb7b34b08ad614c6a3c0e2efd3ec6bc31ee3add8 SHA512 bac683ae56efb8b9ab7dab3badfd457913f32e236f4770fff081ccb4386208c8f9ed677d6660b4f72aed39582e404ee42a7790487681542f6babc896d7f7bb8e
+EBUILD gst-plugins-good-1.14.4.ebuild 1409 BLAKE2B 7298669dbfa2c45587a11e9709ab8339ba280bd23b62f02a8ecc6565ffbee30a45740ee70b22535b571f7e9e96d8e6da9cccbde19de0fb0efe7018c96d8f4377 SHA512 f959728ae42ad0c0c75dd49e84ec05e2d3ca291810c379012bac1692311fbec86db3fd1b55a7da5a53438f32901e0c73b49c81532e8a39b1f0ac8413fec1e486
+EBUILD gst-plugins-good-1.14.5.ebuild 1417 BLAKE2B 4615e5d1bff4205bfbee3ca6876455db2f843b48de71002ab6774a24b8092861990f02805796c0fa814f8e4c1dd099edcf9bd9421804944ba4f754032b90ca28 SHA512 378cfc3e7a37ae34a87ce7fa24ae2dbf03252b71085c0cbe1b20734ad7484c78155bafcc924c55aebdc144c4919f476f1ef7cba5358f53de7341e0c8f24b34ff
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.14.4.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.14.4.ebuild
index 05b3cc07cca1..8926eb711350 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.14.4.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.14.4.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild
index d4b054018540..2cba91fdae95 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index 9ca8e84f52b4..abda5a1b13b4 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -1,3 +1,3 @@
 DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2af33536719913ec10229eb6bc64f1f957bc7f6afe45e1c528ab4015c25dec61b8b9d2c517fee78a8a992c76bd41ff9e75d1 SHA512 0866bbcc3f1d0d668e77b5ef83fa7469dc80c957d2c6526126e761db46e83ff18d941c247833d27336106d8ba043e9ad50cafbddbff241f95bb16f9b1a0fbacc
-EBUILD gst-plugins-ugly-1.14.3.ebuild 965 BLAKE2B 053d48a6de2524a7a87aeca9d55ae3da187437e66d142679f300b5799a282869c84df5460a294641a2d0ed2b591b1289e19f6d86eb4bfc40df73172dc57d70b4 SHA512 ee14e14b1e463814dd3e7dde4567e2b6bd7584f5855f6ef38685a966f29147b2900d103397101e95deaf6044090a556da52dd1f0f76feabd01c8f01a15a73a89
+EBUILD gst-plugins-ugly-1.14.3.ebuild 943 BLAKE2B e08cb22075770fa63d426688beef51a6f072f6eb3b7e05f06ea14ec2556d5ed22a6f7f967d24ce1985c532837d995c3f2a01c696f0056df4997d9923c6161143 SHA512 f4165363a5e38878e09836934c809243f2682fabcfc0653b1bbee703b36ca53c5bfcde42ad94c1faed3653f38cb30a7a6aaa8962bca0adee60dcbfd9df7a4f75
 MISC metadata.xml 345 BLAKE2B c8af39d4811da5ca9cad30110ed9b2a090fd27a957bf32f831b4c3f5a22bb87fcc15957151ce9752521d2a92c667568d8ab002c8f4f9ba3363d9b7ca79655ce8 SHA512 c8c693633f2fdbf66f2308a2ee82880bf0cdd58b0c1e42a2d3b2733b3a7411769da60e8beb375def6473fe50303f1a68a0c7712e48abf88935b045f93103b206
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild
index 18fdf4c9e2ab..05bf2184cd7f 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 954cd197dac4..9f4040ef24ca 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,6 +1,6 @@
 AUX 1.14-glib-2.60-tests-compat.patch 2173 BLAKE2B 1e7e3320d2eb52f968280e8204e5cbdb2d4fe085fcf77bd798cb474216b758bff3a70f6b0e3f93d656a6e41b44be6c3f931ed5543e4ca10b51d19b4f4f153bc9 SHA512 f559150ac5e40a2fe259a8346ed085a20df86d93e5292c9dcc024274f12e0beb90266395538943946ca01a2a5f56be3ab32f1f850e1c8c047848aebc13ab2350
 DIST gstreamer-1.14.4.tar.xz 3264324 BLAKE2B d51febcd7c317964a09dadb4d3bd3ee7a60ac38bef28cdd7d42f49a7b710d6f6180ca7edee1765c8d146f7e3e852e93d0d5f69962089a653cfc3e6bd4ab42f89 SHA512 7ece9f01d40df7c8358482eac94536c5e15261e9568962008e2029e1ee1b3ebb220d2e4802ed1c81c40d897576fafe52234065e273724bfb4df3a3ddf2711abe
 DIST gstreamer-1.14.5.tar.xz 3268756 BLAKE2B 6ef5bdcb103b4d8fd581ae7342d6d467f4c6919610bdd620e4a531755347d8e3276a50f2e637045b9b97cbf7726495608437c180d37a1019ec8a79ab1bc4e4d6 SHA512 1a97ae17f8fff041db5e24d712d33c7116e408be1fabc2abd7b652b067b6ebe6c0943845a33a21335a5b4fa0a1ba178873158659f761f1e3aab04a969029c5d8
-EBUILD gstreamer-1.14.4.ebuild 3457 BLAKE2B 120784600fd144634542473b1e538a9209e0a851374620404160605ecc8922012136d6ce1d762d8600061d3564ef43b498a5671917d13773fff7074c6bb38ffe SHA512 346cf940cf8931f1cb41eda98ff700f5b7bc8aecc462d753af9456ea5f41ae742dac1d3fe20774653ae108b1e8dfe336d10bbbfb9f44ffa1362895a8a5489eed
-EBUILD gstreamer-1.14.5.ebuild 3465 BLAKE2B ac4e74ddcbaac9b30728ba1a4593ae4a20407d3e2d0d413f0b96713cea178ad4dc2bb42b0779bea45ae2e1b8b26ebd80a81f49ef439c14e0c0419bd019715897 SHA512 8e548d5dc6df7b1363652e0d497c6c841a41410feeee095d7e9ac9843efb595b00f47fc7e8d6b4a076dac945b73b0dd08feb4a5a17f0c863928f51589e95a46f
+EBUILD gstreamer-1.14.4.ebuild 3435 BLAKE2B 43d1ef1c96c301a90983299fc2feb5574ea07d00ce4422c28119eb88df89f8c1a69e00a31fca98b34c80389157d099f0ae12f6acd3cc0f944daffd7ccb7d6cc4 SHA512 3bf41367597cf73de9347641edd748d1b1e152ce6a0d6ec5b52fe0d16b81074b588bed58b6a104be5ca6779daae7a6086bfa0bcc43fb2fe8af55198f4bb4b26d
+EBUILD gstreamer-1.14.5.ebuild 3443 BLAKE2B 9639ca96375b542e8b7e0bcd7ea4a94f60abbea41890152568e7f38630e6363583ce39123467202db2a6c68b10d19ead2f7a2df5a5836e22ada85bb7b357ddda SHA512 5603ab199c9cec7ee82a33f074dd9fbd1707d9fae80a5efe410ddbdb54f07eefe2bbacb6df594d4e6bbf10a5bc266d6d04d6ddd48e832cf783a2a691dfdca2e6
 MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57
diff --git a/media-libs/gstreamer/gstreamer-1.14.4.ebuild b/media-libs/gstreamer/gstreamer-1.14.4.ebuild
index 19677ed3d4f0..eb241bc65fd9 100644
--- a/media-libs/gstreamer/gstreamer-1.14.4.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.14.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps +introspection nls +orc test unwind"
 
 RDEPEND="
diff --git a/media-libs/gstreamer/gstreamer-1.14.5.ebuild b/media-libs/gstreamer/gstreamer-1.14.5.ebuild
index c57c39da037f..b9369fd6b6b5 100644
--- a/media-libs/gstreamer/gstreamer-1.14.5.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.14.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps +introspection nls +orc test unwind"
 
 RDEPEND="
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 4922002e83af..7840c5e48a4a 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,7 +1,7 @@
 DIST hamlib-3.1.tar.gz 2130615 BLAKE2B dbc348d5df04015e1706b6f165496f0b0d9a4f7ce5e5ba6c8589349c1c9c1119ef31e8c3d4ba14666d19f3638bf27ad9b4a566af2fd4054faafc0604b8aeafd0 SHA512 befc5c407379e30711bde2affb9c191add6dbb04a36c1309f8771170cf04156c48609a094775638036282e085de6c78d09ef8d2760d69c595471e16e985e0885
 DIST hamlib-3.2.tar.gz 2223125 BLAKE2B c9bffa2b4d2aa4b3f9c590276058c159aa1236f22d3f37a063124af09002dc3034a88fd6f1273b5f4562ae22618222ea50c254fb59384bfae778448fe029ef49 SHA512 9aec2d361980abafdedf7b80f5b8bcf5b71f4f0c32bbfecebc0a50e6f74eb263ddc5188cf77283ed7361baabedb8364a2ce94a12fdda1bbdfaa0a030f510f224
 DIST hamlib-3.3.tar.gz 2192119 BLAKE2B edefd8b8c75876c07fa498c98f7d6760985fdecc477bf6711e948071e45964bf7fdf6705b3172e56951366a7dfb0288e025eab66d3b6436d158649ae53ac39bd SHA512 4cf6c94d0238c8a13aed09413b3f4a027c8ded07f8840cdb2b9d38b39b6395a4a88a8105257015345f6de0658ab8c60292d11a9de3e16a493e153637af630a80
-EBUILD hamlib-3.1.ebuild 2201 BLAKE2B c32627db7df6714ad241a526c0fc18d3a3ee93d7db2a641028610926e1e45e1c27f71ac46f0030a07786b5b19932374d319c0756ae279e2310067a1bf5d4920c SHA512 3b8a200d30cb246aaefc8df5c9b200557abae9632b57e0232757679dba5f92da79e289f72902025fa799401f3b179367ba5004ba29f8118bebd57c3b01c3259e
-EBUILD hamlib-3.2.ebuild 2222 BLAKE2B 89f771a598c460f8fb1120f2cad4c7742a25a1eb15299ba4c1d9376b062418790eb6e452004f4ddb1a712769bcd65198b343a2f3797531ae15350b5f228af612 SHA512 6a4a7793939c404c8645770eff0f4830f99e19de813d9da2f429e27a2f645e44e051a816b8d4350c1ebfe1e3b9e972ec2cde282acbe8a8a948d377a8dd45524b
-EBUILD hamlib-3.3.ebuild 2077 BLAKE2B 75d28610f980fec3db21a65cc73c7c7128b3ff1d2018b72b24a72dd078908ab2ab116895e528e4e4af7356ae63c7f282981ab889d571ae08b31c8f6b0b0ec2a4 SHA512 681d1bbda463c7c01ed46fcbd3fdedd7c9a6b3aa7ee34836091c765309909a0b69cf16a8da4865e02a96bcfa1973cc257ce741e40f97602f4c4fbced05b4b9e9
+EBUILD hamlib-3.1.ebuild 2191 BLAKE2B 14b9108b0ddd6b76bfeea8736c404e85e721b2ec473f14f082f669c23c47f0432aa7f6fb067c1d4f3e456d206d1a0b5d1d7a6832cb2ffc68cf5fcd1b4e005f95 SHA512 d733f693a3d91252b785328a18010aeda739f17ef856f20f199ba75465b15ffccb5538a797826b1b384e9532e930b11a91782b8c7a30ca04fc5e45df0c47a5ee
+EBUILD hamlib-3.2.ebuild 2212 BLAKE2B a6ba2c987ed0600628e36f1de4699d1bee12edc16b8b8c3e247043f6610456ac3ebe6584a1a5e2ebd0e2d7adc22d07d17d0fa2956ce31b7cf7d2b0be242de53e SHA512 52f61bb45597bf6d410b07c546d930d20fd17ed34c1e99130ab5a2b727f444289e84556575e9a8ece0875c1ca282d71b0cc5da4812ed54c19087081de105584e
+EBUILD hamlib-3.3.ebuild 2067 BLAKE2B cbd584cd42d274330046a9fc7b439cc955c9ed41611090a63684d6847b0c0155c796263e113f1ebfc32d2486632931fa3174ee8188d8c0ee6265f924541beaf2 SHA512 cfb0e7199c25f75e1fa66e1cb9bac53c39d206bbc50be4c86a623d94b5105dfb214d61dd9c160fd66fbbea7fec08b2aba3781ea501763f5599ffe0b10a7bc48b
 MISC metadata.xml 325 BLAKE2B c1966def562280393eeb5b575d4e136525dc3cf36ef4e6c00dbeff7e0069a4d10eb16706f4b4e929eda1f046d18a8e25fd0025c74695eba1f9c10d19a9f55598 SHA512 fb6d5d77da29969e9b61921ae59e5d5c71b74cebd331867a546a6b2c568650f89191a39a3a1a73c58e1244fa5d13a090b45b866c21b3a3dd71cff0a812c149e5
diff --git a/media-libs/hamlib/hamlib-3.1.ebuild b/media-libs/hamlib/hamlib-3.1.ebuild
index 5d91795318c0..5cf4c9fed288 100644
--- a/media-libs/hamlib/hamlib-3.1.ebuild
+++ b/media-libs/hamlib/hamlib-3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE="doc perl python tcl"
 
 RESTRICT="test"
diff --git a/media-libs/hamlib/hamlib-3.2.ebuild b/media-libs/hamlib/hamlib-3.2.ebuild
index 02653279373c..e5eb1f9a6b1b 100644
--- a/media-libs/hamlib/hamlib-3.2.ebuild
+++ b/media-libs/hamlib/hamlib-3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.github.com/${PN}/${PN}/releases/download/${PVR}/${P}.tar.gz
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE="doc perl python tcl"
 
 RESTRICT="test"
diff --git a/media-libs/hamlib/hamlib-3.3.ebuild b/media-libs/hamlib/hamlib-3.3.ebuild
index 486e71723bd0..f8782dee5719 100644
--- a/media-libs/hamlib/hamlib-3.3.ebuild
+++ b/media-libs/hamlib/hamlib-3.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.github.com/${PN}/${PN}/releases/download/${PVR}/${P}.tar.gz
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE="doc perl python tcl"
 
 RESTRICT="test"
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 380d13239477..16055dd66f75 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -2,9 +2,11 @@ DIST harfbuzz-2.3.1.tar.bz2 17942960 BLAKE2B b1a29144b608463fa668bb66572c1530e90
 DIST harfbuzz-2.5.3.tar.xz 5685712 BLAKE2B a9d8a46b6a0667c598ea011f020b09d8fd795105483a8b307ee2a9399de2b84bf3b29659f9a3f7500250879bbb412003ee6f68aaba01b68824bd489615f737e6 SHA512 a2e6cedbe0e505fa31b540e0d0bc6c0b07080bd39879c27e04d351103e21201d75a809dd2fad559bf994b82b311f67ad85778cbbfb670d7e2580beafa09e93ff
 DIST harfbuzz-2.6.0.tar.xz 5736808 BLAKE2B 3dcdf71cce8cdb4596d6e622f6fbaeae1a36cf17c219a1bafe077a472f9d25f0a8b8ea7eb36a1e20558d982b36479ce5d3e19f022a5b7dadd563a017b5037767 SHA512 ab055183ae248710f7baee7ef45ac1a6cbd3522eb1e26b78248ac7bc9e421f5495b8fbbd19a339a26bd119f33624eb8742c15c2053407fbb74cce8dcf6c4b3a2
 DIST harfbuzz-2.6.1.tar.xz 5741372 BLAKE2B bb763eba23a37bd20d0ddb39824d5a0c655d6e098aea2e44b6943e7bd5cb1f9a5cd94e3de5520d962e3c476defac43af58f98d0a5b80e5c1506d00bc716ec876 SHA512 cea531ab9db0ae1b188ac56c3ea6e0344192c4321b97d4425f4a53e6bb34c88463a7453fd69fcadccb8574506c1fb5505422019e41a7938a04e7823e3f484c06
-EBUILD harfbuzz-2.3.1.ebuild 3023 BLAKE2B b9a3d08627e11d8b78a5b1c293e3fb929d5796527d4986796235e3e4a0f6ce54d90096eb931bbd6bfb943a36fca9db2ac207be4fdabbc355be407b89831bd9e3 SHA512 0774d1f803551979890e15ce733f400aeb1343af66bd5569c4ca23b3d90131ce82afb3ade7e516b3e5cbf36af0c7fafdd9b07a465b20654aab76eeaeaa6c2004
-EBUILD harfbuzz-2.5.3.ebuild 3033 BLAKE2B 1d4cdfa1b48bbd9d361db0325b2c2cbe4c4fd52b77ecbcca90975d486d37ae425776b59f855f6e68d0aa55bfe5e190ebd104435401f9789fd28b9ef66acbb88f SHA512 8ddd54e9a526244b6ae82e540c9052df45821a0e98d6a43a75b422e606e4f3bc9280b7963b579a673eb354a45dc2d10d8601f2b53e4e759d6c7b34b3c8b7ab43
-EBUILD harfbuzz-2.6.0.ebuild 3033 BLAKE2B 1d4cdfa1b48bbd9d361db0325b2c2cbe4c4fd52b77ecbcca90975d486d37ae425776b59f855f6e68d0aa55bfe5e190ebd104435401f9789fd28b9ef66acbb88f SHA512 8ddd54e9a526244b6ae82e540c9052df45821a0e98d6a43a75b422e606e4f3bc9280b7963b579a673eb354a45dc2d10d8601f2b53e4e759d6c7b34b3c8b7ab43
-EBUILD harfbuzz-2.6.1.ebuild 3022 BLAKE2B 0aaa2034c41c3337f194452b46fa707ee1aca832828da987e941f6b630a5b3590628de5d08bb6fac4e6b4d268c3c38cb5f5afb408c86c55a244dc6bb001d8e34 SHA512 d9cb622f2fa0b7c0f46cdb5317754ca4d5fc6ce3887894e23172a6dcb6c9d6ab4489fd79e6b075722bc6f01b75dc844e21d9294c61bc6d79707d4cf8b692f0b4
-EBUILD harfbuzz-9999.ebuild 3033 BLAKE2B 1d4cdfa1b48bbd9d361db0325b2c2cbe4c4fd52b77ecbcca90975d486d37ae425776b59f855f6e68d0aa55bfe5e190ebd104435401f9789fd28b9ef66acbb88f SHA512 8ddd54e9a526244b6ae82e540c9052df45821a0e98d6a43a75b422e606e4f3bc9280b7963b579a673eb354a45dc2d10d8601f2b53e4e759d6c7b34b3c8b7ab43
+DIST harfbuzz-2.6.2.tar.xz 5769792 BLAKE2B 8ab4f76e858cb6d120b59c62fcda783fb331ec750ed9e4a74ceea448cafab9aff814d8599442d8939d41d0b5cc176724753b16c7cd42d6d314a08ce27d6856f5 SHA512 0a98c2b49650d66cf11f3395504cba3b18aaca43482924d9b58babd2ccb986b74ed7478bef5c4c1937d7782b7b278504854eaa04a62b329df08d91d30fc879d5
+EBUILD harfbuzz-2.3.1.ebuild 3001 BLAKE2B 3e7f72d1fb68244813bfa7f575d8de02686a9a6f1a2ab93037f8ba34fddb2640a2592e78d931add449b2f9abbe487475f313f22256fd88cfac422539f9b3c72d SHA512 ee10be52b3b28892838e3b1ef0cd0a67c19bdac897f3600b7734ca82305275a58eaf31e5e487ed3b34f7aa1fc0e70b7437a14f20cccfe17720af6945b852a753
+EBUILD harfbuzz-2.5.3.ebuild 3011 BLAKE2B 34b919439695f4fd803de3d5cb5dd0e359243458ff371406b3e893fc096c6bbba41de9b040a970a1b03e94eea26aa4b98075f0043c261a4bab18bbf8c1bd469e SHA512 aaff2444906f005c5a5203614c63ea186ea7d9d432d1c8a3fe5756a9f4ed045469f3671c05008b7158aca8a7f97b0f7a1d8ca4b5b9e06ec2af1b0c26e7ae08a5
+EBUILD harfbuzz-2.6.0.ebuild 3011 BLAKE2B 34b919439695f4fd803de3d5cb5dd0e359243458ff371406b3e893fc096c6bbba41de9b040a970a1b03e94eea26aa4b98075f0043c261a4bab18bbf8c1bd469e SHA512 aaff2444906f005c5a5203614c63ea186ea7d9d432d1c8a3fe5756a9f4ed045469f3671c05008b7158aca8a7f97b0f7a1d8ca4b5b9e06ec2af1b0c26e7ae08a5
+EBUILD harfbuzz-2.6.1.ebuild 3000 BLAKE2B 97049127af537a9041db8b3b0fb2eb5317acf7b2f79bf8c69f94ee6ca2c843826ccd1d1748d3bdf03d3ff6e872d4493e8f9961d768e7fe5a0f7601b5c2fce13d SHA512 1e5207a9e6c666ba2eb7a2e3d6742640b0d90766e9fc397c2f54eccdf9436f18d24a7dd2ab6f638ceb46e744eb8e98f7f3e2dbc28ba0fecc9baa0cb0a7de3438
+EBUILD harfbuzz-2.6.2.ebuild 3011 BLAKE2B 34b919439695f4fd803de3d5cb5dd0e359243458ff371406b3e893fc096c6bbba41de9b040a970a1b03e94eea26aa4b98075f0043c261a4bab18bbf8c1bd469e SHA512 aaff2444906f005c5a5203614c63ea186ea7d9d432d1c8a3fe5756a9f4ed045469f3671c05008b7158aca8a7f97b0f7a1d8ca4b5b9e06ec2af1b0c26e7ae08a5
+EBUILD harfbuzz-9999.ebuild 3011 BLAKE2B 34b919439695f4fd803de3d5cb5dd0e359243458ff371406b3e893fc096c6bbba41de9b040a970a1b03e94eea26aa4b98075f0043c261a4bab18bbf8c1bd469e SHA512 aaff2444906f005c5a5203614c63ea186ea7d9d432d1c8a3fe5756a9f4ed045469f3671c05008b7158aca8a7f97b0f7a1d8ca4b5b9e06ec2af1b0c26e7ae08a5
 MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd
diff --git a/media-libs/harfbuzz/harfbuzz-2.3.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.3.1.ebuild
index ca088f9e04e6..79639b9b885e 100644
--- a/media-libs/harfbuzz/harfbuzz-2.3.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.3.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-2.5.3.ebuild b/media-libs/harfbuzz/harfbuzz-2.5.3.ebuild
index f03429a61fe5..8f3d354b0b08 100644
--- a/media-libs/harfbuzz/harfbuzz-2.5.3.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.5.3.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.0.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.0.ebuild
index f03429a61fe5..8f3d354b0b08 100644
--- a/media-libs/harfbuzz/harfbuzz-2.6.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.6.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild
index d6ff7020efd4..d8eb3a9c8943 100644
--- a/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.2.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.2.ebuild
new file mode 100644
index 000000000000..8f3d354b0b08
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-2.6.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+
+IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	test? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+if [[ ${PV} = 9999 ]] ; then
+	DEPEND+="
+		>=dev-libs/gobject-introspection-common-1.34
+		dev-util/ragel
+	"
+fi
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+		sed -i \
+			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+			test/api/Makefile.in || die
+	fi
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+	elibtoolize # for Solaris
+
+	# bug 618772
+	append-cxxflags -std=c++14
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	local myeconfargs=(
+		--without-coretext
+		--without-fontconfig #609300
+		--without-uniscribe
+		$(use_enable static-libs static)
+		$(multilib_native_use_with cairo)
+		$(use_with glib)
+		$(use_with introspection gobject)
+		$(use_with graphite graphite2)
+		$(use_with icu)
+		$(multilib_native_use_enable introspection)
+		$(use_with truetype freetype)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index f03429a61fe5..8f3d354b0b08 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/id3lib/Manifest b/media-libs/id3lib/Manifest
index a0ee918a8b4d..6de28b015721 100644
--- a/media-libs/id3lib/Manifest
+++ b/media-libs/id3lib/Manifest
@@ -7,5 +7,5 @@ AUX id3lib-3.8.3-test_io.patch 254 BLAKE2B 3b38a82fb990de47a8f65d46171ef8273b180
 AUX id3lib-3.8.3-unicode16.patch 1490 BLAKE2B 8e9c23cacc11fe87e846830c91946e16641a32baa9717647999fc32522d10e553480d9b5ac5e5e3f12fc4fa72e31667df1c90b734016d0c1adc88d74d0a1901e SHA512 270e498a0586d25ae7cee45dcd45d5d143b0ba5799be34ef10b1577d766a82239bb949c9463cb59d1bf3a92070063252680441cb0691829c963fb4b4520ff4ab
 AUX id3lib-3.8.3-zlib.patch 779 BLAKE2B e7379e6d3136ebc93ddc8b79ce52ba92a41d911b883a74bfdb58d0ac6f774483f821ef66b453fef96649e5e67dbb1afa9c871d104c0dd29a8e1bf11ae8caa853 SHA512 e9c29883731ef417602812d714a14e1b7547d89581ffe40d0d0400218b0491f38cf50b24ab6dd8bcfcc94c95af914c6d34b53429a2789d7c27f0cb7661474dae
 DIST id3lib-3.8.3.tar.gz 950726 BLAKE2B 37afb1292d598e8416251e18beb1d1b4402d11ebd971d3e9b151ae9e092884ec4b0b7f9c19bbd8296fbb7fe7320ced7ba1f733a367662d378d2d82b2b52b7bb2 SHA512 3787e261f86933c1c2f2bff2c4b349b42f5d8636e489e4f39f9d75e6dfbdc79b87009a0f4ce4b786f2fb3dbc01ca9d56c4112095b46244f897e6c9a28573adaf
-EBUILD id3lib-3.8.3-r8.ebuild 1354 BLAKE2B f29f8ce983523c1ffdc21f30a1bb8162273412b258c9657b910ffb142f146ae252350c1c2c349b2e58b4d819fee4392853b5396e5921983c3be05476371c6b5c SHA512 ee04e9c3f6f0c36f1505c9d999358678fd122b0be376b6f8c58ca4cab678c014ec3852e5d8300c8c3f68f2772be00c3e7a85c417ff10cf375af806faf38050a1
+EBUILD id3lib-3.8.3-r8.ebuild 1344 BLAKE2B 732d9a41f09f11f50bb805709c968b8921f17fec22157bb1e412bd852a93af55c014003fb1462489aef40123e862a13e0ffde8b8347a89f898847aeafe21f977 SHA512 b42e5ec170d95fe56c29147b1b141815fa8dd7f41a7ac4a01a6732033e7ff4f6afb891beec2ffc1bbf774da16b8b8957d1f82180978fe3421a7246fa4536849f
 MISC metadata.xml 339 BLAKE2B 7edd7b91c817463342d9d8123d07014bc77b8d1342a1bbf17811ec54ed2c749441de32f6d518b30ab718459a3edde8b1f4953b7202df294407da192f33c669b7 SHA512 e5d02d27394556f17ac426d2c87cc19aa8c603913d9c5ca3641154e87b54f5de6768dfa4334c371d3a65af5c39f265f561b1bac6ab497ed5b41ad10891d5a800
diff --git a/media-libs/id3lib/id3lib-3.8.3-r8.ebuild b/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
index 80713f9f8b3f..4e0801353db6 100644
--- a/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
+++ b/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND="sys-libs/zlib:="
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index f003e64bd522..bca641f124d6 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -1,4 +1,4 @@
 AUX ilmbase-2.3.0-testBox.patch 2826 BLAKE2B ddafd231e641cd518ca864e6aa27f88b24b81f1bed29fe05fe79accc033484479e891482529ead24ddc2b1b931d808eb20a6b960f7281da83357b637c3d937ca SHA512 81eb09823fed3841742ef8b85b262d9d6fbce97ae87fdc5e902c4d85c7f8c7a01b7be08acac23fee5c5cfdb8815f410b200f2af4039ade0cedd31866312015db
 DIST ilmbase-2.3.0.tar.gz 595490 BLAKE2B db956fe7dbabf94632eb98635f4ebda8e937f26e26ed69f33743069fa2bf6d5ed3711f00eb33377c98b4f8ea367bbfc51b11d4cb884ce02238b537857cc19a9c SHA512 db0804a7c37c2a97f9dbf81b20f40f7fdea73242baa2759d9dc3728e6849e7ecae0e178fa1c710add980d050499151650675e4b2cda6cbbaa61aca406a1f929a
-EBUILD ilmbase-2.3.0.ebuild 1040 BLAKE2B e8c99e5a82e864a5e511c7b5417c107646a9ddf580f198a2ed595ec9de89cc251d0fa54f8c4632760c797f9e0d7456b16bde35da77c3974b95dee51c98f3c4bb SHA512 eb63dd2a7b78bcb89fe2ed75670984c1bbdecf69fa981706c371eebaee18cc20847d84da9c80a3eb71379dacdeb5bcfaa41f203625d9a0a04f2e000a3a2e26a9
+EBUILD ilmbase-2.3.0.ebuild 1018 BLAKE2B b2a0d6961e7a0eac518a611a31f998906f19cd7eee7c63a08fad40ddeb984ff6c2ba3a3009c969f639140610dbdad2055caaa7c1fd6c088654321ae142a41afd SHA512 ddf98577f39dd65f7ca07a6cd75e55aeddb8b8747911aca00e88e9800f8dbdfce8d2897972e77db09567f56fdce3fd0113758dabc74a8561cf3a1e9f03773d14
 MISC metadata.xml 303 BLAKE2B 53fb5019bd6fe939d485f1eccb4a140ca9b7ce121b06744d8155842ccb6c5e1378ea39a9ae74c8d519be7b3926bd76040df4b8107137fcc2e25be97431e7a1be SHA512 0ab8d735dd7a8e0dc96b14cfde1ae06969d15cfbad956f4fda60b093660aee38fe98709376eedc9362a26858678d2f28eec795c1accb2560858fd804a11bb7ca
diff --git a/media-libs/ilmbase/ilmbase-2.3.0.ebuild b/media-libs/ilmbase/ilmbase-2.3.0.ebuild
index 10b9361e8527..6bcbebc9d107 100644
--- a/media-libs/ilmbase/ilmbase-2.3.0.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.3.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/24" # based on SONAME
-KEYWORDS="amd64 -arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 -arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND="virtual/pkgconfig[${MULTILIB_USEDEP}]"
diff --git a/media-libs/imlib/Manifest b/media-libs/imlib/Manifest
index 9adde2247374..b2c32929e935 100644
--- a/media-libs/imlib/Manifest
+++ b/media-libs/imlib/Manifest
@@ -10,5 +10,5 @@ AUX imlib-1.9.15.patch 2253 BLAKE2B 8ab175dd3c22790dadde804d6de2f78497a1553a0b6c
 AUX imlib-security.patch 13040 BLAKE2B 65eb4e5435dea0bba755ae21548fd7c25cc65a0f5ac7130905cf064c2f59b3dbe21d1cdd90de25e9f7e27fa1905bb51a38845b8ec92cff86cff6fbed789309d4 SHA512 a75537267e9e276920fbc0360cd4832f727c6c9857401889bdb1466f3088c98e5ea2ef84a94a5873a3c12dda0b9aed36a5e2039fece87e51154a3b773d97aa5c
 DIST gtk-1-for-imlib.m4.bz2 2742 BLAKE2B af16f586cbfb53522bb53b55d551d21ddf765e06694bebe93637b24c31bfdfff95f7ef250e66b784d7371bb309e4939c7db40c0ba1f1b1d73526e16cf745a93f SHA512 83708af1c7d7cf10960463b785bad096d77e985be5907dd59c73c2cb86c4b89fb5453a02ffddca1519185b91d205dbd96c4c4c1df4da4b67e64bad413cd8a40e
 DIST imlib-1.9.15.tar.bz2 683242 BLAKE2B 16cc11d2ddc69af7201215454c465d104354b63b4e0b1d8aadd07daf889368478dce28ea8ecf6b16daef3019891fcf7a794abccf02b236d1a6c737b0e9db08d3 SHA512 f50d9141b3c54b44921aa09c0a5ea848aefaa904efdd6da132dace42604671f8dbd3e4b71a596f054f0db4525ba2002864b5e5b21f8805cf1b5514b661ac254a
-EBUILD imlib-1.9.15-r5.ebuild 2153 BLAKE2B 35363265a87d45b2f888edd4b66e693bc70a5699cdd83b717b8cad4fe52c31384bcb3a60d9d2c1c8fbf4145759ae6411f762d6874b933bf18e340074fe722b2d SHA512 6850be17155da958d736adf291cf3f571b49b5997ff4940891cff3f6899147e7f7384edb34dfc9943db1d6893c3a9a250f8728be5a57779380b05307bb1305d6
+EBUILD imlib-1.9.15-r5.ebuild 2143 BLAKE2B 5b86792cdb771361de365b931f4a488be8fa2ea33a80baf6e87a58b558b5f924d317b4870206a04f0418bf5f333e923c1b8ce3fb0e9746c7541309d8b99b0745 SHA512 2b6b2c8ab87bf2a879b57bee400d1abe57055308ef13b6b7d5427a38804c0e19f2e99412ac8191586e826778631b55ce391ec23bede5f5eef71d0e6e96cc7d22
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-libs/imlib/imlib-1.9.15-r5.ebuild b/media-libs/imlib/imlib-1.9.15-r5.ebuild
index 786faa8856fe..fc5e7b6eb20c 100644
--- a/media-libs/imlib/imlib-1.9.15-r5.ebuild
+++ b/media-libs/imlib/imlib-1.9.15-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnome/sources/${PN}/${PVP[0]}.${PVP[1]}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 730d011d511c..77a9162b88a3 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,3 +1,3 @@
 DIST imlib2-1.5.1.tar.gz 1020701 BLAKE2B 33213a49293fba9e86cfec312d3cd8018c2284d60040b63899778d2fa65bffe173926eb14bc893c1a80e1472084a711423f77f6288779486512074e75d92acfd SHA512 9872aa3c4d45b1e9cbb0b1d0a7d5b47256e35f01a4fe19d84d276096c2da053c55bd28554441f92464d19edf1222b427571ba7b06d716031021ff1f9b4bc9656
-EBUILD imlib2-1.5.1-r1.ebuild 2170 BLAKE2B 8b9ab6c0fe358e9459771bcaa3bdf9e0621d261501893c87260be3fa79e00ecbf3569bd9d0a1fdf94d998f49ff87317410f606ec62c6464e5a3b1ce96fa634da SHA512 3368d44f6cafc9e1f17d837b47542258d002eb7298d77ab8c910183c9f8313c0452f053b9a10f72a0a5761d83e24aa3d956dbf90352ea68ff6e26eb7bd996f25
+EBUILD imlib2-1.5.1-r1.ebuild 2148 BLAKE2B a3ab5d15b8a28cec83cfa0a465519a4708504372edbbc1ed95f15ad14f57e23223e06224bf71d09d594f4d69b3ab19ecc2c891f1c279147f63648e7798a14f02 SHA512 b27de2fbc1670425e36ce6ce858d9fcdf3b2e431201a9b295bc6a2f55d845bee99766bb7e5a4f91d063e676966a641b678471d89fc73261c415d3890adca769a
 MISC metadata.xml 2448 BLAKE2B ca27be2f23b000d1121343dfe8d21c93062ca12cf358860b30be062744e54df49a0ba108c991f090de5f84945189e02fa1e936df081e564c777a880421e36045 SHA512 659e2887be742527de8386577bbcb0c0544b1526089e67d5bf99745b0c63eb9634f6daa4b09d31bad81bae12ec9d7c227b687ebcec2c34d052e60b9e65bd05c3
diff --git a/media-libs/imlib2/imlib2-1.5.1-r1.ebuild b/media-libs/imlib2/imlib2-1.5.1-r1.ebuild
index 6a4362b928bd..1e5aebc4f113 100644
--- a/media-libs/imlib2/imlib2-1.5.1-r1.ebuild
+++ b/media-libs/imlib2/imlib2-1.5.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
 
 LICENSE="BSD"
 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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 doc gif jpeg mp3 nls png +shm static-libs tiff +X zlib"
 
 REQUIRED_USE="shm? ( X )"
diff --git a/media-libs/jbig2dec/Manifest b/media-libs/jbig2dec/Manifest
index 7f78a34fdd88..81e5b12ab0bb 100644
--- a/media-libs/jbig2dec/Manifest
+++ b/media-libs/jbig2dec/Manifest
@@ -1,4 +1,7 @@
+AUX jbig2dec-0.17-fix-test_jbig2dec.py.patch 1550 BLAKE2B 274b37da363b9d09ae98fdba32b9d319b8e8646cabbdcd2d48defecae6fe048dc0d909906fa6096b2c1934267c91e217d2cdd348368fadd4256801884f098acd SHA512 f098733ca2aed78f3f45b821b6eb21cf268d64e715169b2683419116f83cc293c3d38e364d8edb44db3f414e5c911d7b51af8231e332e423ac210b3b513c605f
 DIST jb2streams.zip 1285838 BLAKE2B 9a2b6047a7b970439693d6f5fdefb9488019a562e7f831288b27df09bb19dec2f84854cf7fea50b5b041d331e925145f37f2f89848058ecdc074e7d6c238033f SHA512 382890b36345b8aaebb3554e776a53f3276c6d835335ce41f3f41829ff62bba7ae646602544103ba8541a7a824dca92d682b682c254ab2918c7fe45b3e358b45
 DIST jbig2dec-0.14.tar.gz 463572 BLAKE2B 91351a3879bd1906fabe2620cf5379fbbc32eaae808a8c2754c661d6dc592d3c9da13c558c8f7ced30c48b73fbd9ed4631f2817298f959b59ad4dff5fce9ac1a SHA512 066bd880ac0665fc1e42b0ae0e481008b125aab6e173b7f82d61a2a30e72c90085cbded9b2a68c6836f92dea3d8d8d5c2228dba76e0d99c79c922197d215705b
-EBUILD jbig2dec-0.14.ebuild 1165 BLAKE2B 163ecbbfd28ae3b3841a710e95ce0a9b5804e0847f9d1f4ce49c054250ccfc25efe8f9ebe6d370143ec6110b8564d522620710142b33b98870e36a65dcba1a2f SHA512 c4ae7cd45d6cb46b46effb5d897feed6fcd2920381265963962355d39098bad84877d64d80a8ec8d28aa8a6a2abd67f868fd82753e48dc8ee6ee353dda9c3318
+DIST jbig2dec-0.17.tar.gz 141195 BLAKE2B 858befb59c0b943cddbc4ae2e9ffc6cdb7e1dd2185cedbffb577f0152f27a548f565548b4b0a4867e3973692b8b019a565eabe2cf672334a6b2994fd7988dcaf SHA512 79b3957186a30fc304ecd571d31c5cc421364921eb4eba242c3ea941ea111f461773f86c975657fa2ce91f2f79ff9abf760ef9bed404c7a4f35c036e5642ba0f
+EBUILD jbig2dec-0.14.ebuild 1143 BLAKE2B ff3484d4768f8b7e0f2e744732e8a82a9bd6c4630b55469b9a8da428603cfcf68e6d7cb5a1d5257936aed687fa1db52b10741783dca78ff55ae9bf6e8434d5cb SHA512 719e7b390c4f9572d2d08192468bfd3a868a2bdcaa7ce30b2aaeb169c1c012cc041990148b33d92d1128bc394788c7aee01d5bcfe717bf5054c9d2397ea876ef
+EBUILD jbig2dec-0.17.ebuild 1590 BLAKE2B f1e7607a3b5ba05ea92a1b7420a2b247c67665f4f5f3747c2b3a6ffb060d7b3c538a9e831bfa852ee9ff3b4a72051012664d8fabc8f2090b3ca6a31adfff3383 SHA512 40a6e503f715d5ed0446757edb7119c7fe28cfabbf144972c3a40b1902730eec8cf08eac3952223c710d697ddee9670e2e0c541a1948190b14d316feab52ad2a
 MISC metadata.xml 473 BLAKE2B 6d374023a106375c7f5500968ed4ea2f4dd5584fb0db8f85b042844d08afb6196b7d7c019ae69b35917f43e496c9a25212aec328f0c3cf78aaa94b963de65c15 SHA512 501077ac27f5c6f8a616fa32cec23d28cb16dc0e0c19ce933cbc067494117c9c55fc3e00dfc21270892d57478a9e268f99215c8d074d6cc4114916f55a571a6f
diff --git a/media-libs/jbig2dec/files/jbig2dec-0.17-fix-test_jbig2dec.py.patch b/media-libs/jbig2dec/files/jbig2dec-0.17-fix-test_jbig2dec.py.patch
new file mode 100644
index 000000000000..e99a298f5de9
--- /dev/null
+++ b/media-libs/jbig2dec/files/jbig2dec-0.17-fix-test_jbig2dec.py.patch
@@ -0,0 +1,39 @@
+From c48d802aa6f65cc0284c8aa9824b6ae4e7dd5aa1 Mon Sep 17 00:00:00 2001
+From: Sebastian Rasmussen <sebras@gmail.com>
+Date: Fri, 14 Jun 2019 22:18:14 +0200
+Subject: [PATCH] jbig2dec: Make tests expect that some test files return white
+ image.
+
+Previously these tests would just error out and jbig2dec would not
+return any output file at all. Now, jbig2dec parses as much as
+possible, while emitting warning/error messages. In the case of a
+few of the test files the end result is a white image.
+---
+ test_jbig2dec.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/test_jbig2dec.py b/test_jbig2dec.py
+index a841438..33008e5 100755
+--- a/test_jbig2dec.py
++++ b/test_jbig2dec.py
+@@ -60,6 +60,7 @@ class KnownFileHash(SelfTest):
+ 
+   # hashes of known test inputs
+   known_NOTHING_DECODED = "da39a3ee5e6b4b0d3255bfef95601890afd80709"
++  known_WHITE_PAGE_DECODED = "28a6bd83a8a3a36910fbc1f5ce06c962e4332911"
+   known_042_DECODED = "ebfdf6e2fc5ff3ee2271c2fa19de0e52712046e8"
+   known_amb_DECODED = "3d4b7992d506894662b53415bd3d0d2a2f8b7953"
+ 
+@@ -103,10 +104,10 @@ class KnownFileHash(SelfTest):
+ 			known_042_DECODED),
+                    ('../ubc/042_13.jb2',
+ 			"7d428bd542f58591b254d9827f554b0552c950a7",
+-			known_NOTHING_DECODED),
++			known_WHITE_PAGE_DECODED),
+                    ('../ubc/042_14.jb2',
+ 			"c40fe3a02acb6359baf9b40fc9c49bc0800be589",
+-			known_NOTHING_DECODED),
++			known_WHITE_PAGE_DECODED),
+                    ('../ubc/042_15.jb2',
+ 			"a9e39fc1ecb178aec9f05039514d75ea3246246c",
+ 			known_042_DECODED),
diff --git a/media-libs/jbig2dec/jbig2dec-0.14.ebuild b/media-libs/jbig2dec/jbig2dec-0.14.ebuild
index 121c9ca08430..90c837e80573 100644
--- a/media-libs/jbig2dec/jbig2dec-0.14.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.ghostscript.com/public/${PN}/${P}.tar.gz
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="png static-libs test"
 
 RDEPEND="png? ( media-libs/libpng:0= )"
diff --git a/media-libs/jbig2dec/jbig2dec-0.17.ebuild b/media-libs/jbig2dec/jbig2dec-0.17.ebuild
new file mode 100644
index 000000000000..0a030167ed52
--- /dev/null
+++ b/media-libs/jbig2dec/jbig2dec-0.17.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit autotools python-any-r1
+
+DESCRIPTION="A decoder implementation of the JBIG2 image compression format"
+HOMEPAGE="https://jbig2dec.com/"
+SRC_URI="https://github.com/ArtifexSoftware/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? ( http://jbig2dec.sourceforge.net/ubc/jb2streams.zip )"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="png static-libs test"
+
+BDEPEND="
+	test? (
+		app-arch/unzip
+		${PYTHON_DEPS}
+	)"
+
+RDEPEND="png? ( media-libs/libpng:0= )"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES README )
+
+PATCHES=( "${FILESDIR}"/${PN}-0.17-fix-test_jbig2dec.py.patch )
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if use test; then
+		mkdir "${WORKDIR}/ubc" || die
+		mv -v "${WORKDIR}"/*.jb2 "${WORKDIR}/ubc/" || die
+		mv -v "${WORKDIR}"/*.bmp "${WORKDIR}/ubc/" || die
+	fi
+
+	# We only need configure.ac and config_types.h.in
+	sed -i \
+		-e '/^# do we need automake?/,/^autoheader/d' \
+		-e '/echo "  $AUTOM.*/,$d' \
+		autogen.sh \
+		|| die "failed to modify autogen.sh"
+
+	./autogen.sh || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with png libpng)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -exec rm {} + || die
+}
diff --git a/media-libs/jbigkit/Manifest b/media-libs/jbigkit/Manifest
index a0bacdbdcbc3..a67a512be748 100644
--- a/media-libs/jbigkit/Manifest
+++ b/media-libs/jbigkit/Manifest
@@ -1,4 +1,4 @@
 AUX jbigkit-2.1-build.patch 8817 BLAKE2B 5eb1137c933cf4079378dce30b9996bc698a3a8852f35131f9d138cd171c146cfd3b8267abafea3e6bd3a30a2029a7b73b149d5d8c560354ac8ae24bc2cc6c7c SHA512 d8f7c94676452cd36641240e6120972cdb7d03f62dcfdc3920ebc5971fe39c623a50cc7f5020c9458eaebadbb40ff1f2d8bfab2c0de7f9a138e7f0d88be86a07
 DIST jbigkit-2.1.tar.gz 438710 BLAKE2B 7bd82f0e10a2d3794739ee85b77c5407d58753a00e014e937735f9af3043347de88a6e567609bc26de488887a6d61b0a162387fb72732b9be7e550e3f9b9539e SHA512 c4127480470ef90db1ef3bd2caa444df10b50ed8df0bc9997db7612cb48b49278baf44965028f1807a21028eb965d677e015466306b44683c4ec75a23e1922cf
-EBUILD jbigkit-2.1.ebuild 1433 BLAKE2B ef4a705496d69d9def09e519cd7885ceae75afeda8f3b2c21cd3aa64e0feaa928a286d36a38483c1535144d56e5f35a71e178d864f2780f8e709c42b3a7ad755 SHA512 efa630815c3f1447ca2d631bb9bb8d5fd1beba604f0debc02bf9fec01dc96929d224c4fb4d34e083a06d33431fcc5717aedda4fee013092e58f889ee5c3b6c11
+EBUILD jbigkit-2.1.ebuild 1411 BLAKE2B 93980474266248cd0300d6cad9111a445cf9a15d2593d4891c4870ef8f730ca470677100027a61adb70bc6dd39ef1d291c402c6336ce5d04b6159d6cb05fe853 SHA512 f11141b4248a461697c5da67fe877e2b456200c99c290daeabae9cb9eaeea233717c1d28435f3332e77d53da2c72d460347a94a06ee444f44988681560ea24fc
 MISC metadata.xml 465 BLAKE2B fdf534bd45566d595255f6196cf5d8290a9aa2d7a716f61b90f2f3384610789dd3af84965b80f49b8eb7dc129f2c50052927ad5cc62a12092b6d7db32da2a977 SHA512 a328f6b53c517072f28a88360a31de1ecd5188516ac2a46338c9b6bb1fb92c3727a9823f22e075577bf02a9e937038e87b70932de511174c965b4e991ccc6769
diff --git a/media-libs/jbigkit/jbigkit-2.1.ebuild b/media-libs/jbigkit/jbigkit-2.1.ebuild
index 3e359b2c78c0..7857809354c7 100644
--- a/media-libs/jbigkit/jbigkit-2.1.ebuild
+++ b/media-libs/jbigkit/jbigkit-2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.cl.cam.ac.uk/~mgk25/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/2.1" # Since we install libjbig.so and libjbig85.so without version, use ${PV} like 2.1
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DOCS="ANNOUNCE CHANGES TODO libjbig/*.txt pbmtools/*.txt"
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index d9477d70eec4..045a0e0bf8e4 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -5,7 +5,7 @@ DIST jpegsrc.v6b.tar.gz 613261 BLAKE2B d08406bebcbec9aa0197ef7854f163dc12d916e7e
 DIST jpegsrc.v8d.tar.gz 991456 BLAKE2B 6644af7dd47a3b1cbcbc8f6bc111c882ed1790eaad6bee06e9b95b803bf756beb6ad61abc76c889d53dfcd05139286ec870372d50d2b79bf28b32d0e8d50a2ab SHA512 7a8b4cff5b1caf6a7281c5dce4e1efa1b68360bd64dd2e619b60c9e1d49f22624bc8780b681bfab073e7b1d4b7f41008a464a58f0eeeacb0a40ff996d7eb5753
 DIST jpegsrc.v9c.tar.gz 1028200 BLAKE2B 621ef910f3fa397da0d19da1e1771b13ae1e524ba541f7f2562de1da27a8a3b26abc63d01218ae56ddbf480ba5d6ea6a778a23693304f7b4364edb1bcd4839e7 SHA512 c95aacb0f1972a2271953ee17b5c6a6c3662d5f4fbc4d1e9aef59dece42a169b0f34d3fa1d385b88580ad11cefd194250094ee72843f4e0028204df6741cb611
 DIST libjpeg8_8d-1.debian.tar.gz 13676 BLAKE2B ac6fab3e52f91c9ece95ed809fc972afc92c55754a59358f7dacb056917b1878f6f9be85a20ccb34eb13489a9963a00659fe25c27e8b18b44961c6ba5f3214cd SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040
-EBUILD jpeg-6b-r12.ebuild 1126 BLAKE2B 8a161ddc45d213b874815518bbaf5d3b5f5053658153e60bdbf6c376c29d0964aff0f220e41135935d1276641fad69fd8f4ce042023a9d6e4460ca07c7929694 SHA512 97aa4b853ca53728cebf56da61468b0cba0c35f78ac37add53c403489c7c13df2530194f2876f0c49f13dd3ff2fe162c9472eca8ab87266c0b6aec38f6c9ff25
-EBUILD jpeg-8d-r2.ebuild 1405 BLAKE2B 5bea27ef13659ebfc7f4e3aa9605da42b49ba478f15abe9cf0aca65206641a89692f6b764d99df40e977299e4c233da8a481285768369dc5aefc03a472950afe SHA512 809b128963ac2a257d8eaf58e2df54c34fd42a7f1a8756552dd88758f572eb30edfa2378f49b765276fd0d83eda4bbf9682efcf6b739d34164687c0b0f9ed2cf
-EBUILD jpeg-9c.ebuild 1996 BLAKE2B 551b1beaea68d26e51597259209c60cb2134cc4a2367ca30e8461b7b334362852771ccd190307ece3bf1c09c32ef8935391c69d21f27d5dc0480b453e215f4bd SHA512 1712e96882b6643520f2b40df62bcf03e8a01f89051b8890c7a2b320fae095ed7cd7e524326a52a602f2d699309a74b08626cc8d28c33b08819b8d6441916fc6
+EBUILD jpeg-6b-r12.ebuild 1116 BLAKE2B 5ab98917177f74497d858094b0afc6c576bacca916ddc4c304a1655c436481facde60b4bf958e5dd1819e44f6490a99a3aabbff733e1a6e479a5790c5d67b565 SHA512 9d2b02ae061a13d43a0d4912253caa0ace48342bc0956b4379090dd5e7f4199abed3794a36ba0d5c1c447fc2dcc689d28084bc31826c32d137c0465736819cc4
+EBUILD jpeg-8d-r2.ebuild 1395 BLAKE2B d1d073f81df5a146dab6427a846ee56eb00248bf21032da6256d1d7cfbb298fb4168db5a1061f07efe3e43d5b5aa5957ca0318fb3ccff02dab63b292d84dcdec SHA512 4b775cedefa47f6f7d2b2af5d0626fba79b1eddee7f24493850836c28777753c836a98c4a5d14b309e666f1c5430572a43ed39c7967b8027f268f9f158c98c6f
+EBUILD jpeg-9c.ebuild 1986 BLAKE2B a495ed97759fee86b4dcb98cdfc14e8a3101a937412f3668bb3a5067d51224d4df33d3b6225ef45d28de6c49f9685427d4f8f093ed08c94ed4d82aa16ca43f49 SHA512 a2384870f2da6023e3476417a9aeae5e0def6309820f81781576d3faeab5b1c86b142be2ecc3325d5dc87d52fed02ffcdcf48e21e91869b3bc912c01cef5a03d
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-libs/jpeg/jpeg-6b-r12.ebuild b/media-libs/jpeg/jpeg-6b-r12.ebuild
index 1bd42de6f2c7..66c97bfd20e8 100644
--- a/media-libs/jpeg/jpeg-6b-r12.ebuild
+++ b/media-libs/jpeg/jpeg-6b-r12.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/jpegsrc.v${PV}.tar.gz
 
 LICENSE="IJG"
 SLOT="62"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DOCS=""
diff --git a/media-libs/jpeg/jpeg-8d-r2.ebuild b/media-libs/jpeg/jpeg-8d-r2.ebuild
index 410e55d3088d..0594e736d32c 100644
--- a/media-libs/jpeg/jpeg-8d-r2.ebuild
+++ b/media-libs/jpeg/jpeg-8d-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz"
 
 LICENSE="IJG"
 SLOT="8"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!=media-libs/jpeg-8*:0
diff --git a/media-libs/jpeg/jpeg-9c.ebuild b/media-libs/jpeg/jpeg-9c.ebuild
index 4620ec83b1bc..5adc06b19e53 100644
--- a/media-libs/jpeg/jpeg-9c.ebuild
+++ b/media-libs/jpeg/jpeg-9c.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
 
 LICENSE="IJG"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/media-libs/ladspa-cmt/Manifest b/media-libs/ladspa-cmt/Manifest
index 6457476ce979..21251cc4223c 100644
--- a/media-libs/ladspa-cmt/Manifest
+++ b/media-libs/ladspa-cmt/Manifest
@@ -4,5 +4,5 @@ AUX ladspa-cmt-1.16-mallocstdlib.patch 1992 BLAKE2B 0b1703227bb3d413fad609519a8c
 AUX ladspa-cmt-1.16-respect-ldflags.patch 369 BLAKE2B 4d64564551d56b9aad53e019c4b217f5d4e1fefdfce60995294783a74825a7bf356aab5ae48d5e4d83751e1fdd33e96fb2e814eb057a0a756ca28f9d7d13ee12 SHA512 3f4cfdab23de0b2fa2c841c4699a2f975b526575261f29756cdb3e9515dd7629e34bf847d027a305e32a9489e414dd59efd55e18a368f3ffc928ce86f80a5add
 AUX ladspa-cmt-1.16-sa.patch 666 BLAKE2B de5b533d76cece9d5ffb93ae9956218bd090ee0f5b88afa8eca3ca9d435af401e472831f1e91c954719eb7c59057464057ed17bd7ffb9d93829d21aed39f20f1 SHA512 162791653741af546a64cabd74f8737f965c9e8799a1d80ae5d2b292b200b1710702b901aaf759457b7737530f2b03824cd135150329f60a2aa56011f17fd244
 DIST cmt_src_1.16.tgz 63909 BLAKE2B b476b701f63125a11e2f03cb837552ddf26beba0c897873959c2577f3d897866bea0dccb480e4fcb0462a0ffea4d380b5a99998b082a46f7222049d2d2db4c9f SHA512 be4aaa064183b6121b4ca8d7d2535cb9a3bcb557e3a2f22b45ec9775b0e296f70a9a7edf697b78095d6ef1564bb5459bb742649082ac724d1774c0790379af21
-EBUILD ladspa-cmt-1.16-r4.ebuild 1379 BLAKE2B 3571f8a72c97cc8000fb0a961b64be3ce3ebb0232287e846b69a823844b272c9c0fbea3791cc466b28e2a22711f76b24b935f0591727774e96de25f7830fc053 SHA512 d2b8c3699b6771811ebcbb83a709792c013ac1a3a161f30385f532dc9c68b23d19811981b0907b634c2ae816e4641a07d1f1175a3ae5d3ce36a963771402aec3
+EBUILD ladspa-cmt-1.16-r4.ebuild 1369 BLAKE2B 2f4d292943b1a2be6476c1e912e5e0112ecca461a20b26dc337ac5b9550a67ed4be53799310cebf6a4b4ddd637094944959d4ba9405421cb1f6548863cfa874c SHA512 02140f087401908b0af22a62a8f399448dccdb3f1ad650589da5d008b43080f604ee572c8eaf42da394ba685393302c6dbfa753f39d18c6c98cd4bbf855c1564
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/ladspa-cmt/ladspa-cmt-1.16-r4.ebuild b/media-libs/ladspa-cmt/ladspa-cmt-1.16-r4.ebuild
index 774139588054..eab374067227 100644
--- a/media-libs/ladspa-cmt/ladspa-cmt-1.16-r4.ebuild
+++ b/media-libs/ladspa-cmt/ladspa-cmt-1.16-r4.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="CMT (computer music toolkit) LADSPA library plugins"
 HOMEPAGE="http://www.ladspa.org/"
 SRC_URI="http://www.ladspa.org/download/${MY_P}.tgz"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE=""
diff --git a/media-libs/ladspa-sdk/Manifest b/media-libs/ladspa-sdk/Manifest
index 6cabc7a4ce75..db49f153c5f7 100644
--- a/media-libs/ladspa-sdk/Manifest
+++ b/media-libs/ladspa-sdk/Manifest
@@ -3,5 +3,5 @@ AUX ladspa-sdk-1.13-fbsd.patch 440 BLAKE2B 687df7bcd5ea20d7f8827e8639177c47731e5
 AUX ladspa-sdk-1.13-no-LD.patch 730 BLAKE2B be0edb600bc1e8834b10d55ec04294c40681900edd87564b36d6f1a3354f8b8f6899e3516d3137c16cf5c431118d79e2c4668045c6183bf99dcfb5eb83a106f7 SHA512 215aa1ce1338532e6a8f4ab90b29bd823030f6544d66a9954e476d4b9d5d8f9304b8dd39e386aa2e93565970878bb3174537b7315dcde9bc4eeba9ceb1cc01c8
 AUX ladspa-sdk-1.13-properbuild.patch 3020 BLAKE2B 4fc412986b9912ec0bee326b111f558b806811f12d430fe39b84a8751529afc96534c78c2e753aca8ba089074aa4e38c0c201237c63020c8cd2d3d5c2a6aac17 SHA512 6e86f309f8029d0de50cc505d7924965bc00d89489d689a7babab55f447ef43fbdf26807bc6f206e331c367a2bb1e5c75867268ac601991e3b7edbb9bf8046b7
 DIST ladspa_sdk_1.13.tgz 70540 BLAKE2B cfc5dce5b02107f361cfff3881173d04ea0ff5856cb7e9fb0cf5e23ca62c7f61b8b3b1573b95f67d82eb039cda874a3ba66856b6408e5e6785823c9d53c8cd2e SHA512 a1dab807fda58e08869d3f519be5fa91c394690eb13006fbe7f20b332548e4676b32b01273f5695bf36c8da72190c07618662a76d50f991b3f05068ac2b346ef
-EBUILD ladspa-sdk-1.13-r2.ebuild 1480 BLAKE2B bc1e89390ecbdca3313120bcb27fb4ed4f00726f90cffb30e1c415e080e512776e1c7dec71e19a953a161166e285fac830ef340f18affde1811b525cefc685dd SHA512 16764bd212e81e0c4fb2b039c369760a8ee8936d1461ab1d99b44ed5baf5181ed7fa63806bd529a2a6b955483e25e942fc295867e52477bd56361344eff44cca
+EBUILD ladspa-sdk-1.13-r2.ebuild 1458 BLAKE2B d80a3a96e414c636ba523c8efcf3b43405793d5dd572092da878d8fec900c4df716d4981111a7da1d46015d2c0c4b91ac5f3ac6107bb2cba6ec9103247863608 SHA512 71ed72f394b996bb6cbb53bb09732d611e3fef987cbaa939d528b88a8d23d014a5cebc947e2330e529a1cf61c4c4418f59e35e604316ca8b475e5b8c8717a31f
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild b/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild
index c97387a9f1a2..4db804ef0e74 100644
--- a/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild
+++ b/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.ladspa.org/download/${MY_P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-libs/lasi/Manifest b/media-libs/lasi/Manifest
index a29de0f39864..71e040917724 100644
--- a/media-libs/lasi/Manifest
+++ b/media-libs/lasi/Manifest
@@ -1,5 +1,5 @@
 AUX lasi-1.1.0-cmake.patch 421 BLAKE2B 39ebb3759e055f045f406f59d9408c09f70a5496a76881f6a16621f3aa24364206360811f70f7db4b5a85f4583a525d1dd9de4fc28f45056bc8c4148cdfd6fd1 SHA512 f4218f6ed42c149dcbcefdee55e0332b83f5a6e039571cf9e0f600a60408071f9bd0d32fc0ea3286157719e164ec49221f84451353c1d3af7df5e58d7cae284b
 AUX lasi-1.1.0-pkgconfig.patch 701 BLAKE2B 50c59743897a07974e5329d1b0c039707533c4f3b0d51595b93faaf9abec034ae0407db59f4e112996210398fdabad4b4a0812f6888c1c6b83fe4b7bcb4a3854 SHA512 81b62d5491e19b6602bc622c5d1ed856a0950e209033de31773812815d221d741c78548edfc3fdc32230dca97de6e02ede79414aba1e803019299278d8c4e7da
 DIST libLASi-1.1.2.tar.gz 260948 BLAKE2B 044d906abadd902f91726c0e07e6ec364a3419bcea855a58cfeb44be30b2b9e0334c61931d3210750167ebc7599d8d4022960c40b0be68727385cf01b65780bb SHA512 5a03890b822946805025157497ce5f29fdfbcf5f2941bcd07841d9865cac9653697dbbba426f8527528affd4157e49d0f31a6dad79abdd52222dfcccf135ac91
-EBUILD lasi-1.1.2.ebuild 1313 BLAKE2B a99e5c18c8db6cd4d860b1811d047d2b1644b111dfab2a6930c6ea4d8d0cf7e3ba5efec9586bb19b45e9f49637f5d771dc495ec82175fa8a2058c482d66a660f SHA512 d35704407647de15ecd13fb9d4bdb184c457dd2792b735e68ae5bc52a1dd7de8a8b469e4f8e49d34b6e58c304051c83c9d52b36f9aa0c49d3e0e9e4a9a519c92
+EBUILD lasi-1.1.2.ebuild 1291 BLAKE2B 05c42ad69b3260ee68dd141a6b7f8becf7ed58111f33ca9900acdcefd4e5705818c8384d6c0ec1ecd4bcdb95d6f38183d325b34725417011bc9301819e0109cc SHA512 c3e3ac76adff508bf845f8b9251d4a0e53552c1eb206ef6e4c6c352e0696b042e1faea05fb68026239c33b66e689c104bac14385734210a51f4420e8e5241c21
 MISC metadata.xml 1344 BLAKE2B 493803ba65928eb023c4afd0b8e87182bddc64034c16a7cde193f0e567ec4629c620cb38ed98c2d877b8abfb4df75915221b0cb544008e10cf6ebb44fce2a656 SHA512 ee7b45b3da8adee8a7073890241d5fc318c5fe86a5815a252a52650999b0019576d5fa5a3627c947f08ec68e13c9efb5c56d837ba6ca8290c24084ed32b67493
diff --git a/media-libs/lasi/lasi-1.1.2.ebuild b/media-libs/lasi/lasi-1.1.2.ebuild
index 18fdbf671238..e7b15eb360c8 100644
--- a/media-libs/lasi/lasi-1.1.2.ebuild
+++ b/media-libs/lasi/lasi-1.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index e30f6a2ed36c..ac7c52a3d9fd 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,4 +1,4 @@
 AUX lcms-2.9-BE-test.patch 1367 BLAKE2B 5888ef7f7466c8a76c0b9ba1c87383e274fcfc0570ccc45f2a04c3409421415e7b466b93d9f3acb358ec16481c15cf2d466d0b5d9986f37f48d6fddf0e0be616 SHA512 17d4e612f4aeb6e62ac918aa5438e6ada16f456e4c740b4a13f4560956ff8ee7b6223360420c41de1d7284524460ebb1ba89784782671e258df19fc5a768f1e1
 DIST lcms2-2.9.tar.gz 10953949 BLAKE2B 6f22a0a8901562e8a84a82c077f31b0155bf81d2b5023211059fa157061e78ebe170bd4744f6d15ab76c96ff9dae521a7560e9665a230337d149e1f0c9018788 SHA512 d91e320a97ef9d64cce31585b7df7c85accb52a0c46a10ed0f45a0ba46cc2ad6687de5151e59ac62170ea878ab48595c1493125f4afb1872824afe1c3f3c459b
-EBUILD lcms-2.9.ebuild 1249 BLAKE2B 7ca1b1fa7999d23bd91800514d3bf648ccbba89caf26bd84b8ba732771bbf796203ea8a8b367efa068680509a6c08a6f75a0e4ae329917558e6f0ff2fcef9b3c SHA512 4833632de1375ad3554dc172c1248cb0aef785d2991845a43640eb5df9ef2efbb51b9f709825ec55043b31aee32b1837e5587b29a9d9eefe73602344e056bea3
+EBUILD lcms-2.9.ebuild 1227 BLAKE2B dd8a9599515eafb8be4840c48e09957c68edfe44162ecd36c402ab5067a315c592decc99d1f7419e244ee0f1be9cfb48e36dd249c13932e5bab5968cefaca4e8 SHA512 2c72abc28a802e3cb738c1feb2d17341ed1969de579974628d41ff8aea90e45707732b1e38163e18f9b43fdb6dd8b801f16757ea16862333c569949f3972e461
 MISC metadata.xml 410 BLAKE2B 9349e230ddeb0fe27ff503a24fcfecb247c3f314b0a68b31c3ae998aca9707a2b513228a98f92dcadc15fc9b91e2d8fdb4b6153b35d9eb9ba5492e1b7d929b7c SHA512 d010ff15cb753002aa9a0f9c6c246e3b633cd4ea4bd75521a4c3c6c5b336852e108dafd0835c7533bf07e30dec8c1237e53218b672a01bf0d838cd48f0033d43
diff --git a/media-libs/lcms/lcms-2.9.ebuild b/media-libs/lcms/lcms-2.9.ebuild
index 444bf4b11084..3efc857b69ff 100644
--- a/media-libs/lcms/lcms-2.9.ebuild
+++ b/media-libs/lcms/lcms-2.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc jpeg static-libs test +threads tiff"
 
 RDEPEND="
diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index d4f0dd290971..978816ef1380 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -1,3 +1,3 @@
 DIST lensfun-0.3.2.tar.gz 784825 BLAKE2B c77cd6b2f1bda0313a980fbd3bbc7ca9ad5ed0b9777cce924f66da5de3974ccfc8939d054c7a7532508b6b0913e2d436a825a83916800b625ff2c552c96a0ae3 SHA512 9c6f546fa70e6dc692e66ef378447345be6d3383812934780d326d772d775c1918cbf3447cd91c067655044cf659025763bf47ba2d938a82a3c2de4d60127446
-EBUILD lensfun-0.3.2-r1.ebuild 1396 BLAKE2B 4b8bb2b3ed85d20d77b4824dd78409102c047b64af756ceb7c900718868c6bbb4d9b04b12f09f9b981c08f2b019a5a2110dde6c47c8010392d620f8d5d5817ea SHA512 f91a004071f13682b50edce421d774968811f4779049a00d53c09e79b275207fcca9467c36ef830ebe54660ab3d6d5cfc2262f47ce0cba4459bf69005d105bcb
-MISC metadata.xml 609 BLAKE2B f9ebe22f93c9622961688f478f0f46c111fda47252c57c96aa4f566107705f27b6beb820c0d3c6df6414f7d31dd3d1c89e31a66b064ff96fc7e7e481faf47b7c SHA512 f3c9ae5432aaae9e83dec01dc9d6a4b8d01998183ef1c6ba7731ea9eb92b4960ddfdd0a2395bfb9f137224e83d4c938a7187f01579eb5c9e882e9f4d8008ee39
+EBUILD lensfun-0.3.2-r1.ebuild 1409 BLAKE2B 6d72d015d7f329e5b3d287ae0dc4d0bf8fce29c220c8e4d0a4a5a32d3db1c7cbcbcee127378e7b5b0d3fcbb486e40f02c2d9d8a225eabbf84e8f1e162a3e8e4e SHA512 d6784868b552962d714ae422617975829cb1a1c8a0b14066e0d9d27d982cbf40643e96d0b29e1551c74fc2b67b43e0c961f8b4f5a6c8c1707e085618909e0a79
+MISC metadata.xml 612 BLAKE2B e0e745eb0d418ebbd7461736d92c432b48d88823142bc2bebf9765c3b9270124fd4a9718e384fd46acd8667bbb602d10c74435acaedfa0449e3890a186671ea0 SHA512 f61a2e3333e7f8fa5f3a64f93eabccac5bfd6587a195c019a3f2ed786f2d996412921a8308fc48e70b4347f230704b8fc18f0f7274a5e00ab68e0e5667640faa
diff --git a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
index 31a03baf4c39..320f15307eb8 100644
--- a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
+++ b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
@@ -3,17 +3,17 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit python-single-r1 cmake-utils
 
 DESCRIPTION="Library for rectifying and simulating photographic lens distortions"
-HOMEPAGE="http://lensfun.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="https://lensfun.github.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc cpu_flags_x86_sse cpu_flags_x86_sse2 test"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/media-libs/lensfun/metadata.xml b/media-libs/lensfun/metadata.xml
index 02bc5f156b73..89c819c3b108 100644
--- a/media-libs/lensfun/metadata.xml
+++ b/media-libs/lensfun/metadata.xml
@@ -9,6 +9,6 @@
 The project provides a database of photographic lenses and a library that allows advanced access to the database including functions to correct images based on intimate knowledge of lens characteristics and calibration data.
 </longdescription>
 	<upstream>
-		<remote-id type="sourceforge">lensfun</remote-id>
+		<remote-id type="github">lensfun/lensfun</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/lib3ds/Manifest b/media-libs/lib3ds/Manifest
index a5b66753f2bf..1006f6529db8 100644
--- a/media-libs/lib3ds/Manifest
+++ b/media-libs/lib3ds/Manifest
@@ -1,9 +1,10 @@
-AUX lib3ds-1.3.0-r1-mesh.c.patch 682 BLAKE2B 01d62c09d0def3d7851550bb971b3695da887e396826bab935b3bf7fcb77e3ac3a0878daa4a0301c68edc03f7a7eb32919ecd918cf02e358ea727c276f11662e SHA512 d01466d08f0ffae7f97f510842f89d7b5b171bf5534e2348ea1e7d5e6588b4bc802d9a67fe992a00d4894a4c7194a7896740aaac85b398f191384656fcbb677e
-AUX lib3ds-1.3.0-r1-pkgconfig.patch 2345 BLAKE2B 9d1fddb8a14ccaf5d2747c39113e809ca61e2852af3e3ab7b06c72a9aea148dd242b003ef0be7ca9eb2ee710347e86cfb22f0f1909a53651d2064ba8fcf1feb5 SHA512 4f9ef4bb9a6716822a4310441f53954b02b18266b95db1d31dce8e3a46a944fde3af39ba74409939500a61387ba2f4f9c5af5b73c58ca91b1dab75d996f85394
+AUX lib3ds-1.3.0-mesh.c.patch 682 BLAKE2B 01d62c09d0def3d7851550bb971b3695da887e396826bab935b3bf7fcb77e3ac3a0878daa4a0301c68edc03f7a7eb32919ecd918cf02e358ea727c276f11662e SHA512 d01466d08f0ffae7f97f510842f89d7b5b171bf5534e2348ea1e7d5e6588b4bc802d9a67fe992a00d4894a4c7194a7896740aaac85b398f191384656fcbb677e
+AUX lib3ds-1.3.0-pkgconfig.patch 2345 BLAKE2B 9d1fddb8a14ccaf5d2747c39113e809ca61e2852af3e3ab7b06c72a9aea148dd242b003ef0be7ca9eb2ee710347e86cfb22f0f1909a53651d2064ba8fcf1feb5 SHA512 4f9ef4bb9a6716822a4310441f53954b02b18266b95db1d31dce8e3a46a944fde3af39ba74409939500a61387ba2f4f9c5af5b73c58ca91b1dab75d996f85394
 AUX lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch 1453 BLAKE2B bb196782a7da408412d7a1ae5c1c006ff9b59827dfbe6bb7092ae8b6d7ca1b7eaaeba167bb3804dd24ba369b90982dc97f10443424dea39b0f3ecaac378ed2e7 SHA512 63bc93b5cdf099a33b13ad84ebbd964607fe2824f102d5e4dd37c435cb84ca82e4de16a1796de8abe9e4dd43071b3bcb6b3f176d0d2c4019534d8d08decc8570
-AUX lib3ds-2.0.0_rc1-underlinking.patch 1584 BLAKE2B 9225bc7726483c6260970dfd1bc8ba9cf3de3907af4d7b0ec1b0a7d2d9be9356551ed8384b02c26a042ffdd4907c590869b8848e8164feec84c48c9af4d13b71 SHA512 be3a3470cba90beeac5f1bc161c6885c09483e197b5501208e338ef7256e66e1a27066f0f91403ae6abdeb311e2eb374a36e01c4e3c99a2e7b77422bf24b9799
 DIST lib3ds-1.3.0.zip 443675 BLAKE2B 7e9aa3b7d0c74013264430be24b1f8417f5ff7754bd77508fb85fee227c8675c023b6b805b3cda57a1ea3c1bbc7b0fbd37df8ed1c4d00ac295a39ffb0e3c1219 SHA512 7c866ea9721a7a124c25b4962e933a7066ec2e3c7998e5ae2ba93727f19b91bdb103699bada6d1e04b67e0a54b9f58d09382093569114a1846d86bb03821b8ac
 DIST lib3ds-20080909.zip 427233 BLAKE2B 862a4606206c59e357b0b8805998a497de140b5e80aa3f6f7dd41288ebb1ffc12475b41d5327ee3c619a22c549897b28b444bac5df58192979af5c236859d86f SHA512 ba7166dbd9fb97edc0f5cf0df56747b7e3c5aa1e62334ca995020a6ccd77284abc58e3fba80ec96ecf3765f5ce3121612c9f8c7dfedb2322f1cd2af85d567f87
-EBUILD lib3ds-1.3.0-r1.ebuild 579 BLAKE2B 414f5dad4772b72a8956bd682011d07c160e6f940e665067125f0bd8ceeae777edf0d9566dea5e442a7ff89a714d8d056638ba8f552ea38523dc81e46fe59c93 SHA512 e20f574320af7056f26396c0cdce1f0ffc76175b82ccf34da13c18fc6ce53c1e89e4e43b3244226c7e9c29bf90ff46040ef6b01472c1f1d90a4f633d71c82c6d
+EBUILD lib3ds-1.3.0-r1.ebuild 554 BLAKE2B 606e9436fbbe9d2f2f8c7ff27a611dc411b2e52af03bfac3e897211365036b9f7b95f97171f40ade5a943a8482c6f920874e22381d67e95459bbc25c15467793 SHA512 67812bdf404fd8be46b8c11d38f5c1da89f3e36849add8843aa16e63a2569438941f770ff6bf0e680f1dee356d02f8a99e6d6c8714aa37f62165c5c84bca200c
+EBUILD lib3ds-1.3.0-r2.ebuild 644 BLAKE2B 585ea5c886cda38e0a8bfb64bcbf5e4005ab7bbab0d3718436614ee649b44c8ae3ee0cc280727b03f3e648b0b364a7ffe2cf0aab0c114ab5e7589d66cb83ac0e SHA512 17cd4cd5b27b43dda3e2b6059f288d19b4ee26d7b9ec430f7143cd7365cc262c6de95ed8f3b7a324fbc672b2c21ad701552230fd93aaafcaf48f88e74efc556f
+EBUILD lib3ds-2.0.0_rc1-r1.ebuild 703 BLAKE2B c9f519bd4a18f47c98f619a7a7582bd8395a31579ee2401642f3afd7d8e92002d727538397f5ad0820d88ef6d8544afc11dc25b898dffc844497041e2794e17d SHA512 838f040fbc069d2f0fffa8572571b20ad7d8631555e7342b8f2c9834ff045d26c044cef63ec303c9e2e055c210927ff0cdca400a071e7b277bef8f05e8e98ccd
 EBUILD lib3ds-2.0.0_rc1.ebuild 652 BLAKE2B a85855fa5d699c0e592437ba23fad789905ade2d5a3d8bc4d331c6fb0683dc451f57bd6674984324a0619a71f8bc5ee687f386dd9c569ac7ce203f21bd129594 SHA512 a1bc042ebaabe3775150cc52bda1fc5509a677057082a836b27e27181b706b1f0f00d7961df7faf2ec4e4a8d1f81be0fdecbdd4c0e4ac72d58adab07a9a256fe
 MISC metadata.xml 559 BLAKE2B ef0091ec0f5a955a4bfce1522f879e68b2fe30bfa0dd4f7d5d098b37a5b5a6c2b921f0eb7583e672e224303e9c6bd894c26ba59647349aa2d49be442ae4a1910 SHA512 ccdb9124856024ed9737a0f941c97ceece7af753358eb17897dbfc3cf1b7cc7db4fcc5e22ee2da97ee728500c602885720811d790f489cfdd776890e0c04aca5
diff --git a/media-libs/lib3ds/files/lib3ds-1.3.0-r1-mesh.c.patch b/media-libs/lib3ds/files/lib3ds-1.3.0-mesh.c.patch
index 1455660596bf..1455660596bf 100644
--- a/media-libs/lib3ds/files/lib3ds-1.3.0-r1-mesh.c.patch
+++ b/media-libs/lib3ds/files/lib3ds-1.3.0-mesh.c.patch
diff --git a/media-libs/lib3ds/files/lib3ds-1.3.0-r1-pkgconfig.patch b/media-libs/lib3ds/files/lib3ds-1.3.0-pkgconfig.patch
index 41f658e5311b..41f658e5311b 100644
--- a/media-libs/lib3ds/files/lib3ds-1.3.0-r1-pkgconfig.patch
+++ b/media-libs/lib3ds/files/lib3ds-1.3.0-pkgconfig.patch
diff --git a/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking.patch b/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking.patch
deleted file mode 100644
index b9001af2993a..000000000000
--- a/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-commit 158cf6f8deaac69eba0c5941f809469cc3eefb43
-Author: hasufell <hasufell@gentoo.org>
-Date:   Thu Sep 26 20:49:01 2013 +0200
-
-    fix underlinking
-
-diff --git a/configure.in b/configure.in
-index 7bf17c2..fa5bd3f 100644
---- a/configure.in
-+++ b/configure.in
-@@ -16,6 +16,8 @@ AM_INIT_AUTOMAKE(lib3ds, $LIB3DS_VERSION)
- AC_PROG_CC
- AC_PROG_LIBTOOL
- 
-+AC_CHECK_LIBM
-+
- AC_OUTPUT([ \
-   lib3ds-config \
-   Makefile \
-diff --git a/examples/3ds2obj/Makefile.am b/examples/3ds2obj/Makefile.am
-index 8213225..4214675 100644
---- a/examples/3ds2obj/Makefile.am
-+++ b/examples/3ds2obj/Makefile.am
-@@ -3,6 +3,6 @@ INCLUDES = -I$(top_srcdir)/src
- bin_PROGRAMS = 3ds2obj
- 3ds2obj_SOURCES = 3ds2obj.c
-  
--LDADD = $(top_builddir)/src/lib3ds.la 
-+LDADD = $(top_builddir)/src/lib3ds.la $(LIBM)
- 
- EXTRA_DIST = 3ds2obj.vcproj
-diff --git a/examples/3dsdump/Makefile.am b/examples/3dsdump/Makefile.am
-index 98ec5d1..ef19b04 100644
---- a/examples/3dsdump/Makefile.am
-+++ b/examples/3dsdump/Makefile.am
-@@ -3,6 +3,6 @@ INCLUDES = -I$(top_srcdir)/src
- bin_PROGRAMS = 3dsdump
- 3dsdump_SOURCES = 3dsdump.c
-  
--LDADD = $(top_builddir)/src/lib3ds.la 
-+LDADD = $(top_builddir)/src/lib3ds.la $(LIBM)
- 
- EXTRA_DIST = 3dsdump.vcproj
-diff --git a/examples/cube/Makefile.am b/examples/cube/Makefile.am
-index c79c0ee..539813d 100644
---- a/examples/cube/Makefile.am
-+++ b/examples/cube/Makefile.am
-@@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/src
- bin_PROGRAMS = cube
- cube_SOURCES = cube.c
-  
--LDADD = $(top_builddir)/src/lib3ds.la 
-+LDADD = $(top_builddir)/src/lib3ds.la $(LIBM)
- 
- EXTRA_DIST = cube.vcproj cube.tga 
- 
diff --git a/media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild b/media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild
index 6bdace88421a..a15221ea080b 100644
--- a/media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild
+++ b/media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -19,6 +19,6 @@ RDEPEND="media-libs/freeglut
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 PATCHES=(
-	"${FILESDIR}/lib3ds-1.3.0-r1-pkgconfig.patch"
-	"${FILESDIR}/lib3ds-1.3.0-r1-mesh.c.patch"
+	"${FILESDIR}"/${P}-pkgconfig.patch
+	"${FILESDIR}"/${P}-mesh.c.patch
 )
diff --git a/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild b/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
new file mode 100644
index 000000000000..a6db6a0139e8
--- /dev/null
+++ b/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="library for managing 3D-Studio Release 3 and 4 .3DS files"
+HOMEPAGE="https://code.google.com/p/lib3ds/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="static-libs"
+
+BDEPEND="app-arch/unzip"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pkgconfig.patch
+	"${FILESDIR}"/${P}-mesh.c.patch
+)
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		rm "${ED}/usr/$(get_libdir)/${PN}.la" || die
+	fi
+}
diff --git a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
new file mode 100644
index 000000000000..b663c12a29cf
--- /dev/null
+++ b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="20080909"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="library for managing 3D-Studio Release 3 and 4 .3DS files"
+HOMEPAGE="https://code.google.com/p/lib3ds/"
+SRC_URI="https://lib3ds.googlecode.com/files/${MY_P}.zip"
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="static-libs"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-underlinking-no-autoreconf.patch
+)
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		rm "${ED}/usr/$(get_libdir)/${PN}.la" || die
+	fi
+}
diff --git a/media-libs/libaacplus/Manifest b/media-libs/libaacplus/Manifest
index 68275a4f4e7c..b019daca34ed 100644
--- a/media-libs/libaacplus/Manifest
+++ b/media-libs/libaacplus/Manifest
@@ -1,6 +1,6 @@
 AUX libaacplus-2.0.2-clang-inline-redefinition.patch 1277 BLAKE2B 6df3ac18034ad74bb46e1fe84ba616558ffc4635ed15414bced6e438c7f7f96db4ef2adc2e134e0495a16714e244ceefdb0c0e187fd35ae137e672b50f24480a SHA512 19fb221b29f1e65f26146358943bed62e0002dd8dc682d9af6134f8f497ce67901fb4ac1eea6c957536900715f82e36914e89f70bd5c50e364dc7f72a13bb340
 DIST 26410-800.zip 1348294 BLAKE2B ff774eb4c6db9a545ccd06611237d35bca192509b44cdfdcdc538c4aa4895e3ca6139904e25e44a457bbfdaa2306b17c3029b916b02c2e35bf9c267fb3007901 SHA512 a1d5a4d9b67b4e7292d3d07ba62090f92e9f6cd90e72aadb0e4067120941cc89b93ed136023461354567e845f34274a8097187a70d1477695b3e2024f86ee29d
 DIST libaacplus-2.0.2.tar.gz 42155 BLAKE2B fd65ac4d1a59136b1af1209f5ade9ba331ccb3d529e184329594c95654829e0bce29d107a221542b2ac3800610062774be52a1619aa0b591eaec3d8836b049a1 SHA512 05a6cc206fc187c96b065e94a80a57f6f1610fc5a3228f0163ac5acedabab2f2501dec8df3d196b9a1e2c2785277b0224cd5bb4d2a090bad2dcae44e023f9189
-EBUILD libaacplus-2.0.2-r2.ebuild 1388 BLAKE2B 43ad57a0d74847c633e10fb87184e4369fcaf0a156cc57037ab4a824dbc8b34a543bc1f7c266a4113e1a8a151b3c7f1280c28fdcd517cbf3fd9984d604ec345a SHA512 a066d2b1557944a0b5b9991ae018e0bfec5eec96b036a8341e4ee1f8a7eead15789a1f34c3520370e8191b07a5cfa1b6443b76399d62d1b648b048af6637206c
-EBUILD libaacplus-2.0.2-r3.ebuild 1421 BLAKE2B 78abd72acfe48c638865fc148014e7d706bd38c9263dfc0536da4ac6ab15d462249d8987d299cb9deea30e13172bcbe6d008a2bd9a283cfbba4dde035e6b99a7 SHA512 01f62042da39d02d48c4c0fa188681c8b7fc9476de82e122b56dcf55d1bf3f75b95be70481397d58f9057a458bfd4641c3e64d6cc08ed405c076e39c82675361
+EBUILD libaacplus-2.0.2-r2.ebuild 1301 BLAKE2B 88a165ceb2abc3e085e018fc9fbcd27d166ecf34a5733d20f29f68d75cbf099f026b523813e4df153a6c92ad0e5a3cee4f798704ecc5230402c414905ea86563 SHA512 27f593da552fb700be160598ef082e357d31a7ea5145ce3ba1f42c6d7f41c0513aab6d15c078a82f484ad26cd9ebf4f52ee1ce621a588e37b04b2de1e9677134
+EBUILD libaacplus-2.0.2-r3.ebuild 1353 BLAKE2B 06193f80152bcc41ad4e2270b358b6d8ae4b5f6ced34a959583481b9e3c258ba508ce7d9bbd537b8b281cff43339dfa756325ad61750302fd18a19d33833fbf5 SHA512 9ab67aa90118e115caf0b134f6a51453edf2508979f96d0b6eaadffebd9204c5a2c210815638b1762298ce6f72701f3b94bf61200c411a0e5e0054aae7a87eab
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libaacplus/libaacplus-2.0.2-r2.ebuild b/media-libs/libaacplus/libaacplus-2.0.2-r2.ebuild
index c6ab8a63576f..3ad714741989 100644
--- a/media-libs/libaacplus/libaacplus-2.0.2-r2.ebuild
+++ b/media-libs/libaacplus/libaacplus-2.0.2-r2.ebuild
@@ -14,13 +14,12 @@ DESCRIPTION="HE-AAC+ v2 library, based on the reference implementation"
 HOMEPAGE="http://tipok.org.ua/node/17"
 SRC_URI="
 	https://dev.gentoo.org/~aballier/${P}.tar.gz
-	http://tipok.ath.cx/downloads/media/aac+/libaacplus/${P}.tar.gz
 	http://217.20.164.161/~tipok/aacplus/${P}.tar.gz
 	http://www.3gpp.org/ftp/Specs/archive/26_series/26.410/${TGPPDIST}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 arm hppa ppc ppc64 x86"
 IUSE="fftw static-libs"
 RESTRICT="bindist mirror"
 
diff --git a/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild b/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild
index 9ca0645c9926..fd3aed6e9a4e 100644
--- a/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild
+++ b/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild
@@ -13,14 +13,13 @@ TGPPDIST=26410-800.zip
 DESCRIPTION="HE-AAC+ v2 library, based on the reference implementation"
 HOMEPAGE="http://tipok.org.ua/node/17"
 SRC_URI="
+	https://tipok.org.ua/downloads/media/aacplus/libaacplus/${P}.tar.gz
 	https://dev.gentoo.org/~aballier/${P}.tar.gz
-	http://tipok.ath.cx/downloads/media/aac+/libaacplus/${P}.tar.gz
-	http://217.20.164.161/~tipok/aacplus/${P}.tar.gz
 	http://www.3gpp.org/ftp/Specs/archive/26_series/26.410/${TGPPDIST}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 arm hppa ppc ppc64 x86"
 IUSE="fftw static-libs"
 RESTRICT="bindist mirror"
 
diff --git a/media-libs/libaacs/Manifest b/media-libs/libaacs/Manifest
index ff45fd5370f5..deaa73a434c8 100644
--- a/media-libs/libaacs/Manifest
+++ b/media-libs/libaacs/Manifest
@@ -1,3 +1,3 @@
 DIST libaacs-0.9.0.tar.bz2 316323 BLAKE2B 4fd1ecca0ba5106b1d0195884356a8a8d7163614ebc2fe09f85ed79fa1534b6376951ab90670b3a7d375129e76fae80e3c42f3e1971d0cbcabd6e4e8384bde1a SHA512 b9c658db22a0966486070d3b762509a7c0120469ab29d1e57c1b624cad309701de8b92455ec649db4d731be4a5c29c38fb4f99bb7617dbb4254270284a1903f6
-EBUILD libaacs-0.9.0.ebuild 818 BLAKE2B bce0b1712a3fe1892da27d08826f733fb56fac11c6230675f650a1daa080150b264f89e6c8279396411cc73424ea865d3f590585d82b468e724d44094338f726 SHA512 bc2efe38a18f0ede13475f2f7f97bba50be3642e23bbc90f52456d205ad30448d8c8a6e32220ab4140b368d65cac23db735a3178688bba4f66cb83e588048be5
+EBUILD libaacs-0.9.0.ebuild 806 BLAKE2B 1b4852f3be27474d53b4d185defdf8f68802ca9feb0fcafcfdc1b5c39f0033a3fe13d68e71ddc4dd3ab5c6edd79f8270b1dac9588c18435225d0ab57d935eddc SHA512 f8760dbd524681a777f6ac97d003d0b35c0519e2af18231bd0285063950307f1c1583f55bcebd9a33ca400223335600d45ee35e12f39e0f4ea9b420ead6e32b7
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-libs/libaacs/libaacs-0.9.0.ebuild b/media-libs/libaacs/libaacs-0.9.0.ebuild
index 94b9b1f46052..1d50bf2ab9a0 100644
--- a/media-libs/libaacs/libaacs-0.9.0.ebuild
+++ b/media-libs/libaacs/libaacs-0.9.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.videolan.org/pub/videolan/libaacs/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libafterimage/Manifest b/media-libs/libafterimage/Manifest
index 9e6f2d318d2e..32766143908a 100644
--- a/media-libs/libafterimage/Manifest
+++ b/media-libs/libafterimage/Manifest
@@ -4,6 +4,6 @@ AUX libafterimage-giflib5-v2.patch 11725 BLAKE2B 92ffc58146a513bb7aa0789d24ca3f3
 AUX libafterimage-libpng15.patch 1076 BLAKE2B 1de5fb2ea663842a0f843f5f2db14062021d4886bd4258da8e034cc6982086f532ff53fb0c2ed1cee7557ddd53be6d6baa9ccf6cd8f603d7d356e372fef594ec SHA512 67fff22ecb8d2027fecb50a6450b90d3be457c69c8d7c3c0cd16715ead2824634ae5b792cf3877585b74a1323c25934ab31d1462ea983557dc8acc4a6d11bc7a
 AUX libafterimage-makefile.in.patch 2168 BLAKE2B eae3d6ded2e08442d72014c9e054357ffc8dfa37b9f4be76debd6a3c6e4f54a661735eac54a5e4b12663e0365f46c49283efec21ec0e3130d6ede6c0be20e58c SHA512 0fab45a672d4cdecdbd792eb966a31d3ea7e7be7fae52b1e7080d96a513788502099dac41692b4cadfc062ee7fa24bfaceeed4931811488dc4f7c7c34a1e99ec
 DIST libAfterImage-1.20.tar.bz2 1017055 BLAKE2B 2a0c7de0a6e3369518e19d87c877401675533247f40bfc60f77ac48b52ee1ffc66feae34eb6f80a5e37415999d38db9f05ef06be88610d846a1077685decf1ce SHA512 4056c73d1ab401480803a3a932d647a66574df9f65efc0d30ba80800e1a3424b4fbfce8e9cdf82c4852862491d92cbb42392f8cce8d6ac21d3b49e4ffe1808c4
-EBUILD libafterimage-1.20-r2.ebuild 2688 BLAKE2B aea13f936d29281c4282b4c90baba653152870ad117bf1e729e05bf9d97b2215cebfe802074e1fc55ec440cae9a442dcb403833e4dc6c80463c7cbba9831d658 SHA512 1d52582cb20ca744e99b3e5da7fb59014ff7b4a369916d68c73060c007df6147fe6ec78c6751496805883cd3f7db52aa87324a4a0d6a343c3367aff2fb1eac2c
-EBUILD libafterimage-1.20-r3.ebuild 2623 BLAKE2B 7f81290a7c6e59d722402e88bfdac756c1b107da72e3ba7ab86f0e4429f35da48236258baa20b7a26473add5b036c01852f037efd97519f84cfa3ebc725145f8 SHA512 847ee835b0c65bed33e87389d5059d5020cab1bd1a7406dd3c3c46710ca22df3ef5983f1de7760b614cf344187a31d21235ecaa2e76a3b289370f4c207f920d9
+EBUILD libafterimage-1.20-r2.ebuild 2678 BLAKE2B 43dccf6d7647f090684b290ae0029c9d93b41d69f710c47550873b3c704e9cdcf7525fb5e2f899278908b883f524e865620af1deefccfcccf5efa2cec71bd082 SHA512 176c5de50fe1170b7aa4368059a57e69c8d2469fea421538c6681c76404d757864f7f34aa383b946b78add1373618350dd94d291692d43a792eccb55c8ea233d
+EBUILD libafterimage-1.20-r3.ebuild 2613 BLAKE2B e8f1bca9a58768f0c58d9812384d75b0630f2dcf5d4fa3d8dc504278564977e8744bfdcea67c5bd0340ac1fcb43a6fdf46ab1d9338eef9aa487ba7ca826b7285 SHA512 32fb031f11eaac3fde21edac327df8887fc5bd866f6ef7ae16327d2ec9cc356cec5737c224029cafb036489581781319eac981936a4080b838df3d7f86e1d48d
 MISC metadata.xml 1093 BLAKE2B e95588bdee3a0fbb8d586f551f79b704807f8677bf9bc6e81882f65262d3c74f01d295019d77a5486c227b8c78067a7fe05776c864dae04da2acebb5c99fbd5a SHA512 d0a2fcc071c5ebe0fff77f80c6e663885181001ce1e2ea3e39ca6950e50332d4d6eaf560008ade8e72d6294d182ecaead1e9b30e7d5abb193bae2f2c75318018
diff --git a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild b/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
index c811abb6f5d7..441d5bb7deb7 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls opengl png static-libs shm +shaping svg tiff truetype"
 
 RDEPEND="
diff --git a/media-libs/libafterimage/libafterimage-1.20-r3.ebuild b/media-libs/libafterimage/libafterimage-1.20-r3.ebuild
index 4d52a6cc3e26..c0d7ee8bdc37 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r3.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls png static-libs shm +shaping svg tiff truetype"
 
 RDEPEND="
diff --git a/media-libs/libao/Manifest b/media-libs/libao/Manifest
index 8a89512516d4..daea16621ead 100644
--- a/media-libs/libao/Manifest
+++ b/media-libs/libao/Manifest
@@ -1,3 +1,3 @@
 DIST libao-1.2.2.tar.gz 96134 BLAKE2B e5b5d87c4357ee113769732cb6a7e0afa28b2bc4923be8dacd1fa39ac5fb96d8a5e19bc45137ffc8ec63eef0382130ab9b311aad3a66be4566e0cb9761417b23 SHA512 d2736d25b60862e7d7469611ce31b1df40a4366ab160e2ff1b46919ae91692d1596c8468e4f016303b306fc3ac1bddc7b727f535a362f403c3fe7c6532e9045a
-EBUILD libao-1.2.2.ebuild 1523 BLAKE2B b4411784534a8bc852597f925ffcce6c8ef87f6e2b9374f3728ff77ef9baaa7bf33b0cd50444ed3cf1183172fb908b2591488f8c46b60fc3fa3f40a2fbaef1fb SHA512 ddc314cd6ae3efc80b21c399728c52203cd868ce0aee260ca76a65fdd422f4dee2d65b77c22178a61ef941c0665d19bb29b694aba33f6d45417542cea00c44bd
+EBUILD libao-1.2.2.ebuild 1513 BLAKE2B ed6ae7a6067fa5115936bb9c0446568c5c528e840b867ef98d3a1c795656ef23335cd57ab3885e8980f0d0a3310ee2ef701a6562b85dd96b12ce73397d94ba69 SHA512 b28055fbf0f708dbe793165702b0937b967fc123e5083f49f0a84c74c306463204738a98b3538f06c84876c80feed5c945e67fcc891816f95efd99906f7e2b1b
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libao/libao-1.2.2.ebuild b/media-libs/libao/libao-1.2.2.ebuild
index 63db88fef4b0..4b62b2071960 100644
--- a/media-libs/libao/libao-1.2.2.ebuild
+++ b/media-libs/libao/libao-1.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/xiph/libao/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="alsa nas mmap pulseaudio static-libs"
 
 RDEPEND="
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 28d08aaa1f6f..15f6ab862ee1 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -4,6 +4,6 @@ AUX libaom-1.0.0-version.patch 403 BLAKE2B 8ab115aecb2251750f964bafea7e74ea8e4ed
 AUX libdirpc2.patch 2481 BLAKE2B 6236c31784ebd76884e716857e665824f9b325a97c2cb8e01a38c97b0398141202d7cab0a8d9b69b037ad8ba0b7d5e293bda3e2c491906ac6dd9555f7d4631ec SHA512 ec47d5b026c4b687649a2ce46500376103ae3fef21cba2cb564771c3738dba4e61e51858875516f884ab4604b0c160e6ee07b98e6740643e18f596c624df1ccb
 AUX pthread_lib2.patch 535 BLAKE2B 17eabab9e5d7b9d22b4f25ec8006e7e48bc3683b88f560bcb092234a1448ff47ae20d6ba04efb1af5742d7fc253acf9c944322acc8e8ed1acfad0b08df358eda SHA512 be19983342bae014409dd22c2e94ce11a5003a8ded3547a287ff71f53ef63ce1a1cfd6cdfbbfbf36deece2d3c1d9fb3e8e679598698a045229f79ba704976001
 DIST libaom-1.0.0.tar.gz 2775454 BLAKE2B 09b891d365804f0c086785a00760af3191b40fc66fc752294e915b54454171fb47d3d1b037fb6d276727772ceec3177d78c14f90a2b01e28250d2de735bf02ec SHA512 131512ef286cb138047bb56dea54196f9a8d2b0d9f3d7689299f185338e5c03ee658b0cfe017a099f1a6be351a3a7157204dea70d2645a1d0a9249fd582c3fa4
-EBUILD libaom-1.0.0-r2.ebuild 2606 BLAKE2B b6dc10df92853a4954f48aa9903c16782d9dab22c1488bac1de4445a4683b2fb5071521e8ba18a08ea9b74a1697649455ecb01b9a2978878f06db0b140ed9330 SHA512 43656049aec79713a710d629b6de2457c5c8cbeb5aaf1b22acb43dab38b1a3f42c698c68df3b1cb757dc9ee8899be41a1efd8a1ecec3019211a2c09eb7976f63
+EBUILD libaom-1.0.0-r2.ebuild 2603 BLAKE2B 40d47ed48e2185694ab98325e61d17c0e99d717616e5695dcbc8151bb5fe00b7afbf2974023f0ea56488421b515025e87ef497f28a620ab14d2b8480e0d2ca54 SHA512 8abb5a13424d02f7671eb5aaf5b16c4bdc892b886c484a463936bcf05e97b05a046c551191be0a7c6e3c8a97a6dd426eb9c79ec0392d0f129024e7450501f638
 EBUILD libaom-9999.ebuild 2117 BLAKE2B 72780d6b75fd008e7b0693962e811a8dd14afcbfa23d2a25b8e5b63af5c9cffee49e5511645929a80f795d15ddeb015f5e513117034d0a09e39e5500df8209f5 SHA512 6dffb6b857531c56302d91953e09c84414bd8cf07ba0b0631e990c7edc1cdc8765f85f95f86a9bda9fbd4c851bce0f686638b2fb4b4dfddea3eb96ce6bc9ead2
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-libs/libaom/libaom-1.0.0-r2.ebuild b/media-libs/libaom/libaom-1.0.0-r2.ebuild
index 56a76c5768e5..c9488fffedbc 100644
--- a/media-libs/libaom/libaom-1.0.0-r2.ebuild
+++ b/media-libs/libaom/libaom-1.0.0-r2.ebuild
@@ -16,7 +16,7 @@ else
 		SRC_URI="mirror://gentoo/${P}.tar.gz"
 		S="${WORKDIR}"
 	fi
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
diff --git a/media-libs/libart_lgpl/Manifest b/media-libs/libart_lgpl/Manifest
index ff4e8f2b4715..a89a92f59e38 100644
--- a/media-libs/libart_lgpl/Manifest
+++ b/media-libs/libart_lgpl/Manifest
@@ -1,5 +1,5 @@
 AUX libart_lgpl-2.3.21-crosscompile.patch 2007 BLAKE2B b5a1ab145e5f33ea33d23ca6eace0dfbb156056dd82a195ed72e853cbcba4bd0d774425f8cfc0f8c7658302a5113c9deb9364b1cd0fa702d3e165d92e5e58e67 SHA512 d7710f23972b309b08a318a76ef58c0bb2303c52f1348e817be01298466b894e2b7ab3cc666ef94e8cc3571b5d0fdf543139a24d2c85cecab16a01d5af124ff0
 AUX libart_lgpl-2.3.21-no-test-build.patch 535 BLAKE2B b7752c0b0a84a56164bcca9fb30b10f5810112dd4829571185a5d759151de59473f8ee9621718440d29e5becd593d50ca819d26db7f88175fff55296ea917f1a SHA512 17baab4a8f572812d49a25abe6a455c3cf6637bb03833e8f4bd662e96d30a74a15cbc70bc2eb78b0d23d6f2448a8f272dc9317841f6dc9f27caee06933ee8e42
 DIST libart_lgpl-2.3.21.tar.bz2 329102 BLAKE2B 581fbe3b0c52e69543eebb244f9a49046437d907d498aff1fddead24930f7e33067c7ea657917860a1171251b77b09b9520244a2216122c28bf83a71dcb3128b SHA512 8a632a6a4da59e5e8c02ec2f5a57e36d182b325b46513765425e5f171ff9ae326af1b133725beba28f7e76654309e001aee9bace727b5b4c8589405256a3c020
-EBUILD libart_lgpl-2.3.21-r3.ebuild 1139 BLAKE2B 8579bce2dea0d3325722fe8d5edabff668a710324f5d15603d17a953cd32f89fc1ff74ee0029d6f54573776db9a55234975a0db1e03903823e1fd1554393b76b SHA512 77dabfc467f3689afa1cd92e501f69850390e86bbee233ead4ed1964280d2c638f673ebd9c0e8e62248fb9a088a65b1147e9b2725a6f1388069bb4eec84483c9
+EBUILD libart_lgpl-2.3.21-r3.ebuild 1117 BLAKE2B 88dbb706a8d2f3550d0fcb077f78b99d64222c1b515c374884b13555910a78607e02e469333fd5e7d28d1ceea89b2c4e964bb81221fd991f63c069a130fb879f SHA512 670309c0652e73ff4397b00b3ca2c5ec6bb8b423edf9cb16efdc4e2672562610fb1f6f87bb28171c61db23208c433eaf65f32a346f6978b59184bde90ce1efc7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild b/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
index 9229b8209dca..7c4ab51cf3d7 100644
--- a/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
+++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.levien.com/libart"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
 
diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index e418996d3185..dedec2e641ed 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -1,3 +1,3 @@
 DIST libass-0.14.0.tar.xz 356256 BLAKE2B cf38d472003d6590c69da9347310386559b1ce13425d47505daca881b504453802a60cd553bbe478044764c108586668886372b79a61ccba42cdf49b2ed9ca74 SHA512 0f5fe5d7e662ee1d649981f829e5ef7a53457754f74faaed5679252a5a6769c8f267b6119cda922ebc6a8e5b5b331569f13813ac74881b4e94da7b2e8143a9e6
-EBUILD libass-0.14.0.ebuild 1358 BLAKE2B 74172f30132024f1b307dde9ee518aa7a760c5b8c63c09b555c713ac4a889e3b819294cf2e9182b0d240b1ab5e8f18ca351b52c65513b338e3851494f7b0301d SHA512 6d6c89e36a827f31fe133cec3587b45b12978dfea06e4fd9c2c624dd50c024257a83c926be12f856037933e7fe2774616b87e7da6e88a03fc58fc508d30d5f34
+EBUILD libass-0.14.0.ebuild 1336 BLAKE2B 4a9ea758ee644583e358a692f78e690f25348a60c98049ecdb4f5a7da03269d59482b0dec58f06ea4c3aa36a4b0b0fe2bd91a17e5741a2017563409d13ab4f40 SHA512 93d66177a5be65286d395a0c802f74246b6d1ab66eb818ffc92ec4c516c6dc09910c2482384fa616a6f029df96cd8ffecac2756f6d92141d8803a9e3ef1f4003
 MISC metadata.xml 420 BLAKE2B 160123e29ca333ee5aa8cc197a986ae489ea578e54efebab089133db45a7d3ba5b554161c2a835fa0f53537a16043b627d41f26c752460e6bf3118aab185f0d6 SHA512 ea6cdb493942844567b8acc3dddf71983ab02ba05d849aaaa0cdf0c8e435a0acd159eca447c3e049ddf27d384fb0e94826ff9aad42322eea459e4313f0319964
diff --git a/media-libs/libass/libass-0.14.0.ebuild b/media-libs/libass/libass-0.14.0.ebuild
index af3abf1c6000..4346996ba537 100644
--- a/media-libs/libass/libass-0.14.0.ebuild
+++ b/media-libs/libass/libass-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0/9" # subslot = libass soname version
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+fontconfig +harfbuzz static-libs"
 
 RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index f10ec80a53a5..46a945ab548f 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -1,5 +1,5 @@
 AUX libbluray-jars.patch 1371 BLAKE2B 1c32115ec03db19b849248bcdbe4b9868527717b279d9222ad94bf4c3875522db75ba585566b0609d1a27cbd4e25066832b19351acf05f5b00295ed5364c2984 SHA512 2b376149680edf6891f2129de2fc074dfc32a236d8eb19b3d899e1f7d3ac98eaf8cdf6e13c7b548ab59354c558e2c149f06d85c1c5be61c5e05cc5ec4382d86d
 DIST libbluray-1.1.2.tar.bz2 745779 BLAKE2B 04803f67d9b0732df54e85d960539280ce26755c5874ae90cc8d787036ad279fca8c508695ea0607eed1183eea7b0be9326999dda473dc864fa4da131a27af40 SHA512 5a82af6c1840a1dcb31d06d90203c68e2c4f0bbadc9212eb0bb2776d42b0ab3793a769ebe07b3051be151e8b15876874d5a0658292f72b7126dd915a1ada3fe7
-EBUILD libbluray-1.1.2.ebuild 2037 BLAKE2B 8ef7fbce0496f46a7eaa56a4e06dc9ddd1142fbcfcdca3d4b021dc1f9f9d17d9fd9edb76f205853be249ea57a8b13280e3ef6e9eac532842ee742c539a704364 SHA512 a2706d7c46419bdd7a042db8697be2b86ebab9264ca44b713f6db6daf1de30771c6cf43cff3de3fbc8cf9432a1cd4a4dcfd33a3072c644fbb8552c1af1165a32
-EBUILD libbluray-9999.ebuild 2044 BLAKE2B 81912035ba4accc123015b7f2cdfc24f984a8a41db2042b65a7c34e09e7f897fbf24ecb91402961a31317928c504b4e47cf0610914191309d28281ec88c82721 SHA512 871c8eb5d856ec923380e89fe071772ef1f62d3466ba6dfa3d5b4c6b2f1d89f033e59fa4c38f5338e8fbd3e927a4ef7a945eecefae5ad0297fa6916a8a97302b
+EBUILD libbluray-1.1.2.ebuild 2015 BLAKE2B 7868fbdee506dfe595682abe6c973f25b01738372b7d993a6ed5fba63b23cee19edc1346ef222fe867c4b40275dd7461c567e2f9fe35651ecafe50a78f4e451f SHA512 4ffd3f4ee84ac1302c4a1c1f3d1fe965db06f6c1dd4ef57b607b5284ec2f3cbd2a2a15b9b67141600b409d610785258c96d6048cc90690f646b7cfa6c1f230cd
+EBUILD libbluray-9999.ebuild 2022 BLAKE2B e4809bc9c8afb1eca5917ebd4958c6d60133e5a4cb75971f6def95432cc1d055674ab91515ecf1df74b9b2797d54be9afbc1ca1bb25f60a7c0547676f071c1ae SHA512 9ebfd3ca32b2bdfb487714c382e73263c916803a1d25d5c01efd03dfeb8a0c8c929c3b6a0b86209c068ed45480ed09a32489b56bb852addcc39d95f15805a294
 MISC metadata.xml 540 BLAKE2B 1385b09e4a4a1a2ffe572ca02cc50ae5808a2d283841128258a906742ab8fd67d48b1a677d601990d84a587cc18e9ae68409bf6e9af40e084c05da6f73988aef SHA512 181c79234a6c7a88d6df5b8e2de071fd7746505b153a1f2d92c4d6bffb95cbfaa3f276656b95786e02bc7c097d1fdce65afcc953c569bd82639707c843b1e575
diff --git a/media-libs/libbluray/libbluray-1.1.2.ebuild b/media-libs/libbluray/libbluray-1.1.2.ebuild
index 8c5f865ee2a6..016d1a2c031a 100644
--- a/media-libs/libbluray/libbluray-1.1.2.ebuild
+++ b/media-libs/libbluray/libbluray-1.1.2.ebuild
@@ -7,7 +7,7 @@ if [[ "${PV#9999}" != "${PV}" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libbluray.git"
 else
-	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
 fi
 
diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-9999.ebuild
index d6504f9ac9df..e0edf9695213 100644
--- a/media-libs/libbluray/libbluray-9999.ebuild
+++ b/media-libs/libbluray/libbluray-9999.ebuild
@@ -7,7 +7,7 @@ if [[ "${PV#9999}" != "${PV}" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libbluray.git"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
 fi
 
diff --git a/media-libs/libbmp/Manifest b/media-libs/libbmp/Manifest
deleted file mode 100644
index 77b011b316c4..000000000000
--- a/media-libs/libbmp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libbmp-0.1.3.tar.bz2 254442 BLAKE2B 6b389e397cb99009017a629a51fde104007573a1e71a1175779946c72500be221337212b72655f5b45bd4873f9d5fcc5712c3f481f0afe84a7d83dc317ad590c SHA512 70eb81832c16b9ebd7005a643efe0362c91389d91ab9a9d5d7456b3bb87f508c3b56f12d4c6a546c60f263f656ff6a00145b31f7bb997921c552664b9bfbbd74
-EBUILD libbmp-0.1.3.ebuild 525 BLAKE2B f9ce751f8f7586947f9d666f04983d212d78190131a89c130a4744471d2af5dab19996da79af2ea3fc818421f79248f759eeaefcc01705cdc8664418fa58a46d SHA512 4ae25eb9d0122121d37e0181e973794498645dcc5b5204aeecc13efdbadc82dbbddfa89d27b24a513700787481ac9484dfc712b60d37afb51a3e58b36444bde4
-MISC metadata.xml 615 BLAKE2B 8409857550adda58b9e5da2ee379345e4d1c7378bc1d0df3c4fd6917dae3b1cdb4c8011a0af95d77bb1e293df52559ba11293679d0815540a1b8950312f8bbd5 SHA512 d53c2d832cd984f6f79a3389f326ef3266776f710eae442d6af7c1fdb59d1764eb6165c9e77757a0081d81cad3db3692f32d961612cbf9f68a3b30814295b2e4
diff --git a/media-libs/libbmp/libbmp-0.1.3.ebuild b/media-libs/libbmp/libbmp-0.1.3.ebuild
deleted file mode 100644
index dd12685224f8..000000000000
--- a/media-libs/libbmp/libbmp-0.1.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="C library for reading, writing, and modifying Windows bitmap image files"
-HOMEPAGE="https://code.google.com/p/libbmp/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0/2"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-RDEPEND=""
-RDEPEND=""
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/media-libs/libbmp/metadata.xml b/media-libs/libbmp/metadata.xml
deleted file mode 100644
index d95355c9226f..000000000000
--- a/media-libs/libbmp/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription lang="en">
-libbmp is a simple, cross-platform, open source (revised LGPL) C library designed for easily reading, writing, and modifying Windows bitmap (BMP) image files. The library is oriented towards the novice programmer with little formal experience, but it is sufficiently capable for anybody who desires to do I/O and pixel operations on uncompressed 1, 4, 8, 16, 24, and 32 bpp (bits per pixel) BMP files.
-</longdescription>
-</pkgmetadata>
diff --git a/media-libs/libbs2b/Manifest b/media-libs/libbs2b/Manifest
index bda6bfd5c14b..2b9880fe7a93 100644
--- a/media-libs/libbs2b/Manifest
+++ b/media-libs/libbs2b/Manifest
@@ -1,4 +1,4 @@
 AUX 3.1.0-format-security.patch 369 BLAKE2B f64d562fca5b305abbb3abed2c431fab6b3daa961406c83db5bfc39e2316dda288c6d6045e9a4f6fd045f8c05308744f7e01b2616a161a0f22aa5097c7a91c49 SHA512 77a803c030c4b6ce782584c9163299289e8a8cc748d08e5040ae912651ebdff92884be70f1efa1db9df4eba3f0060c77d430062dbe1143682685df3c7e7b1fbf
 DIST libbs2b-3.1.0.tar.bz2 606283 BLAKE2B e70becc06078ff72a4a4fb69d9ad4e906f1ca2062cd770e36fcf1ad2a6c58e6284afa7958fca89573ed83cf9a76b42f0c8367942075eb6c77ab12fa6c2e741b8 SHA512 50cf477ff9ce6adf26fa8a696831c3a4f219c80a21ec4c93be8ec3f67f077447c17abbd9588a9de5eeb3ddacac1564a7138807468fc80e853bc78f193b4afbc4
-EBUILD libbs2b-3.1.0-r2.ebuild 629 BLAKE2B 88d88a292a90a8961bf4a37436aa50bdd67f206be2c2f7bd6ad36db5c2daadc800141975ce03ff2397d987a19623cf0f5b82ad2f7df691e58307afd4b6c9d474 SHA512 b870a84a9aa5931266435de5ec969a911f1132322d8c5767bed0c6daeec3121b38447560f76400b24e439652e1a89ddd6c0c79f7f535d5f89bd1c01a1f0566e8
+EBUILD libbs2b-3.1.0-r2.ebuild 607 BLAKE2B 25a854db05cb15e04f534821a53f3106a16601adf029f9588880d0dcd22d35c66695245b929d7b3066698b5525a33fc0ad4e5f37b63bbb7d506c4ddda3f072c8 SHA512 b789cd50cbf25e14752b94573c675466b63af3f8ab6502826aa5d60b89b7007eca949848f1d78cf798d3ae7f65837a12c5293d15d9ca8f02d7ca3c5cbdf43a56
 MISC metadata.xml 449 BLAKE2B 05ac186d158a3c9ee695b8af52de5f695170ad925c0136422233df9e94010cdcce5224b8938d8b71ff260f4a468ae93898c7999163c8648d10987cdac17f289e SHA512 f9178657883acf1844ac273eaa5af2380f06fbf23641e76f6a32b08f54b410a5be6d6b0d82888637a51ad4ce13396dcdd04907cb1194eb5539be2e6d3c02e99d
diff --git a/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild b/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild
index f542874c78e2..b81cea9c1881 100644
--- a/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild
+++ b/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/bs2b/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libsndfile-1.0.25-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index ad8ea2d3444a..853890b2442a 100644
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -1,5 +1,5 @@
 AUX libcaca-0.99_beta18-fix-tests.patch 1874 BLAKE2B ff5537354ec12b336e6f0e9f35c41d973adc880656b8554b273ce92c3dce99491145e1398a8585bdb89b8f0054cd31c142f745f04dedeafa2cc6a2c445e05642 SHA512 1a10f0c4b006684471505b35bbe0369e6928c2dfc01e9d8c8ed706d9dc6890035c1fbf509e4a02c6030f0af382a982616c83128b92a2b5574a99e0963ae6b20f
 AUX libcaca-0.99_beta18-latex_hacks.patch 641 BLAKE2B ecaaed51bf3d8c7f75641da665bf8a4d25d2aab47de4bb0fe9e8ff40cacb628650a346074e2a57d220f7fa8a5c2063a8f16f65d52aad222dd81eba6269809e7e SHA512 66d878696ae237310cea20e3bd5802afce6fa94f66b07c1660456d17a33218a93e3aea6bcaf99bfada67bef6857089559aa48068a1761e7fe439a81d82a1ab6b
 DIST libcaca-0.99.beta19.tar.gz 1203495 BLAKE2B 65462090fc503d640d91753ff21b55ad1bac360fb6e5aae8f46d8162e62f8834f791a1db6e2045a63deaa7c409c3455b484750294cfb01e1027f0ca8dc2f2798 SHA512 780fc7684d40207cc10df3f87d6d8f1d47ddfffa0e76e41a5ce671b82d5c7f090facb054c3d49ca7c4ea1a619625bb9085ce52f837f50792b4a2d776a4c68e15
-EBUILD libcaca-0.99_beta19.ebuild 4151 BLAKE2B d23f54bc4baaaf55348c655bd811a9322212f40997c13d9db6b098f95f541ea7c331908352b995aca19034fa044290ac9366e30a865363725f285c531f4ce2c4 SHA512 8b2476b95c008c2dbff8eefe24326e58a2e1399d43c81ed1b6949482021b1f3a20eec0bfafc1418d4282fb56308e8c10ec23176a9c153588077bfe9d197fe2b0
+EBUILD libcaca-0.99_beta19.ebuild 4129 BLAKE2B 5de5e02638c4ad87cab687180bfbd50b7e540bdf22e5015b257002ddda43307995ddbd9b432ed437ff6d9d444192e35cb06ada92ba748a53f8a7c5d44fa54289 SHA512 e3c8e29dd7ebb9e5426017f8d047a5daae0fb899645835792f8292d9dfdd959e099f5f2d644fa31647642941528c271a9badddd955730bcdb253e888d6e0a67f
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-libs/libcaca/libcaca-0.99_beta19.ebuild b/media-libs/libcaca/libcaca-0.99_beta19.ebuild
index 42356744d5e7..941b299aae75 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://libcaca.zoy.org/files/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2 ISC LGPL-2.1 WTFPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="cxx doc imlib java mono ncurses opengl python ruby slang static-libs test truetype X"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/media-libs/libcanberra/Manifest b/media-libs/libcanberra/Manifest
index 6b528e5e2e34..b2dda4b5aef3 100644
--- a/media-libs/libcanberra/Manifest
+++ b/media-libs/libcanberra/Manifest
@@ -1,5 +1,5 @@
 AUX libcanberra-0.30-wayland.patch 2382 BLAKE2B bc2be1eb32541c80483538b8e3105f281023cee22a2a0f67c8210b8cfc97273f5323cf31e3b7955e8b944af1a414b30554c9dff7d2de97cb1bcfb13f4cd56baa SHA512 9822e67dea1b541fedb0fa9779cfcb101ba8bd24d9ff238af59920b937cb1f5fbe5854ee5e642ff53e65f8d2d0996f2c46be67a51a211d2e76ae89ae98ec553a
 AUX libcanberra-gtk-module.sh 275 BLAKE2B d7f863f77983d4144035eefc7ce3abb4eb411ecc3aac5f5737b7ce0f44e42cf713b963a17c6a6afdaa95833eedaa510ccd9371056c2c6f0e805febf16c245e36 SHA512 6c945211ad9d461e5bdac209c83e0fc0c714eb194f6d57e4f18db1d904528fe845cd628572d0ab9eb4d53005c00073b376b6d718bcd0cddaeee83dc90042643d
 DIST libcanberra-0.30.tar.xz 318960 BLAKE2B c90c6863738b103c256eeb0907060a0f74b73ef50ac0728d2114aa558a7a1ad7cbae4184860573d3fac0032eba77327a4de94c459b99a81c3dc19da0e98adfda SHA512 f7543582122256826cd01d0f5673e1e58d979941a93906400182305463d6166855cb51f35c56d807a56dc20b7a64f7ce4391368d24990c1b70782a7d0b4429c2
-EBUILD libcanberra-0.30-r5.ebuild 2481 BLAKE2B ff884faf9f1ce293710b3de4a974df4a08d41edb769ac609dfa4fe5f1b90adbeeb81adc040aac6a62fe8382f93a16dbef06721ad105066319526c5d09e5891d1 SHA512 1236bc9d589dbec9ff8b4fa4f5f8f7fa30cd3806e0e4f36c6ab18855c9a60b2736d3dd7338484189269854e2f48f72481cec06160e95323cae44981e68710d81
+EBUILD libcanberra-0.30-r5.ebuild 2459 BLAKE2B 50b90d5c73d25bc157ec31ab2ff93bdfe03576d14af6e6baf1a043f045ac1c735ddc013311f9e9c632fab456dd694acad2f242b4467144a93447b4c6216de4ca SHA512 d29316143299875a9f7af22d20283c5f8e02caa9799cfe4aa209ea3c506ea3fb53852483db2ee5989c6ccf296843f694c16c2b9a08caaaa29fc38a208e6ef0c2
 MISC metadata.xml 1730 BLAKE2B 8a3bef42abdbb7b229af42e8555eee2eb339275c55ffbfa89e62564d4ca28501de45fe99f6efbae91bcbd0c580ed99136bba751367deda70f137230ae7a5746d SHA512 14720aaeff663ff227dc7f59d1f69e636d8bbc7771dda7ed5a950c2ac75c09e0075223fad78b24feda994fa92dce8e5cfc186e08a3515db0645f4403641a9061
diff --git a/media-libs/libcanberra/libcanberra-0.30-r5.ebuild b/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
index 514e1435191e..7cda04c1847d 100644
--- a/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="alsa gnome gstreamer +gtk +gtk3 oss pulseaudio +sound tdb udev"
 
 COMMON_DEPEND="
diff --git a/media-libs/libcdaudio/Manifest b/media-libs/libcdaudio/Manifest
index 4c48f9d603a1..c63aebf886d4 100644
--- a/media-libs/libcdaudio/Manifest
+++ b/media-libs/libcdaudio/Manifest
@@ -1,5 +1,5 @@
 AUX libcdaudio-0.99-CAN-2005-0706.patch 457 BLAKE2B d1bf9fdd84e8fd66e4e66383c69a251a71d134f36365125879384bc638a4f7ae19308041658f98e27570b7e5255f945a504f520401fed44ceceb581f31abd335 SHA512 75c95893f64bb599e00ef96c303b8daad1e8d02f017deb428eb934fa1716f6736a3388e11ff5474103b1b5afafb89aff5e0ed038c8c93e90f5be0f97585c3ebb
 AUX libcdaudio-0.99.12-bug245649.patch 307 BLAKE2B 690a57ec23e24040b590b93cbff6d443f8d34a273fdb63b9aa0487cc2d3b787c6ca06294641cde3dc669dd26bf4eeda70c8e979b0400cb63793c40d59f49b3ef SHA512 693a43f3c09fa09425f06103cf2d52fbc2351fee1d37948f725103768f7f063384339e518a81be10e71d0e275582daecf5ec64aa12f12f72f370e46e4437bf33
 DIST libcdaudio-0.99.12.tar.gz 357150 BLAKE2B 406dcdeb801237e9aa88934bd7ca39bad0b121641de198b65a4137ff1d25500954f12f7f86b78912098a7acda3afb188a5965b69e99ccb0a84441b3bf1931327 SHA512 c00fbea7776e847da93bfbf4cbe74ccb3ee826da80e74eef84575fc211729e6a09599f5bfa332c91d678a31f9de5e5b333bdafe51438f266f6dea519652f5247
-EBUILD libcdaudio-0.99.12-r2.ebuild 511 BLAKE2B be0b612e4c142ed8633b93657d486f7f9c0d17ca9a9e9913c574c149e540ad146974fe40b9a5c65e70d8c5b0e08765632d9c22765e0b637a9e5066145addfc24 SHA512 e8800ced8ce04609d86077dcd330c5eabab5952059f6f726f131c5be7df5491eee2017dc581ceebec5f3227bb5f24c806003f7b8f2ac399452bee59782e71715
+EBUILD libcdaudio-0.99.12-r2.ebuild 501 BLAKE2B 2bb95abf7a7f15263e20a71659daa0aea1d5ebb62694bf1d94e7bdad338330001f561f3283d335b1409c7a3083ec1b625ff5759fc44798c8c4694a33de18724a SHA512 9e1cce18885d6bf185174561040ab6dc9968c203ec126231f2f620fd1301870fa416690ad82b3b3594fa01d032088e17a491a69bdde6a5f9866b48a06cc3e8da
 MISC metadata.xml 333 BLAKE2B f6d68462d464a5a381a3a09aa96646ecc510b0e0ddf855588b94ca2662caa4bf17112d57741d5e4b013b43ea621d856bc000c62477cc9c3273f23a6ffe2de7e8 SHA512 5ac86238b0db4069b133127f007fec468f87847cb219dc0c5dab8df5544a5e515057b4c44f44dfa843b5b81a62141a21352dec9e9a0fec98c300e9e9509cd034
diff --git a/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild b/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild
index 3938962357aa..fef78b2d7287 100644
--- a/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild
+++ b/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libcdaudio/${P}.tar.gz"
 
 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"
 IUSE=""
 
 PATCHES=(
diff --git a/media-libs/libcddb/Manifest b/media-libs/libcddb/Manifest
index 5519c073a83c..e9c5c0579d91 100644
--- a/media-libs/libcddb/Manifest
+++ b/media-libs/libcddb/Manifest
@@ -1,4 +1,4 @@
 DIST libcddb-1.3.2.tar.bz2 352909 BLAKE2B 8386ea051f23004396d53ad228a595d13c8c194361223026e901ff859f8e3d2dadb93d5e779902ec4698c164a3e06073fc82f331b22b4cf42f5ab8b1fae562e6 SHA512 0e07e7d37f2013164d75b530a5528f54847271fd20f3b7bedb192a05d1f61dcf006d10dc2927efe155a01eddcc57b940bc31d8ac88d5dfc4f1a09771caa84e0a
-EBUILD libcddb-1.3.2-r1.ebuild 1024 BLAKE2B 19b4014314b27b8e8a1a4034812764209f4f006668cfbd29a5add762d47e7f4e7177ba37a8739e1ae6b3846edf3eb5a4efd324ce5e04b51f2e4f7269577b5cbf SHA512 08d2b9b1174a6064906d34453b62db199e85bec7b1d3967e5cdf839b77f8445c233a12acb3018560df7d484628d502ecd4cf75ddf3c3d1770fc6f412b8345a03
-EBUILD libcddb-1.3.2.ebuild 919 BLAKE2B 4e781f83d377df35a65dfd16ec8d03c67da36f4ecf7b5aeeb04d77e125806b988407794d4a252f9bd147bdb80bc732522d7b9b158b526a946324e0ec1d467944 SHA512 a63f0d87d8e978dee164a485322a13f1cd46e2f28e8d034b365a1fef26964daf0144598fa5b54889a89b593ffe36eb1dad0539abd57c89cd75b40f1adacecfad
+EBUILD libcddb-1.3.2-r1.ebuild 1002 BLAKE2B f2bf9fa4de5013a4e1b786a067a8153a7138972b8cd65c97dc5d2d5973fcef1ab13ab3ba225370193c3aa19187d0928614f3d4391d9a47267b3bc482a0fee92b SHA512 257e242be6114d23bcb9c79b141b061568e92cbba4981600b8a34ef5596c3dbdfa31dbd311eacead50dd6d234639e3a35a43da82399af13d454380bee4808803
+EBUILD libcddb-1.3.2.ebuild 897 BLAKE2B b52827bf7e7d17d1739dcd75e51425eb6d677952d732cc6f2d0df8a46ee066ab03275049d4f3ffd56c0abff4d0b1905f55dabe0d0c456cee4306e056db1d3fbe SHA512 158bbc39b511755f48ddc86b4b113e288f1bb311c6746103d61291dbf10c48f598d374bcc0563c2dda629b1eb28494bfe301ccd208589dab1d8d528ef5403e4e
 MISC metadata.xml 330 BLAKE2B 5a8314f4fd530d9866bfc3d9bf50a83e247705353cd3744b9bca49627e30bd683565e2abdbbdd9d04c062aa4ddc16f26deb06d4d4887b237d6fdb42142332c8e SHA512 db4acf96ddc4640b5e328063fc76160a6294aa850569c4466fa741ee0e223f9a325f563701d0d096b8a639c5ab0af1040aa2bea431981808e58bd1c2482c2b34
diff --git a/media-libs/libcddb/libcddb-1.3.2-r1.ebuild b/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
index 1a75bacf899c..80b267d6b131 100644
--- a/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
+++ b/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libcddb/libcddb-1.3.2.ebuild b/media-libs/libcddb/libcddb-1.3.2.ebuild
index 90353509485b..daba49a4839e 100644
--- a/media-libs/libcddb/libcddb-1.3.2.ebuild
+++ b/media-libs/libcddb/libcddb-1.3.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND="virtual/libiconv"
diff --git a/media-libs/libcuefile/Manifest b/media-libs/libcuefile/Manifest
index ac54875e6eda..3cc86ac36fa1 100644
--- a/media-libs/libcuefile/Manifest
+++ b/media-libs/libcuefile/Manifest
@@ -1,3 +1,3 @@
 DIST libcuefile-477.tar.xz 41676 BLAKE2B 01232ed507386809cd7960f06251139fd5c11a251f68e59513b6b5e482b9b7977e5d3fd8d6147a47e4a74b8e5e320019383a4d69c6c3395ead3cee0d8c5c3b43 SHA512 9cf46f9fd1b178758b2d15fa65d67d069bba41a83354a5aedf7b57ed5752bb68ad1d10208ffbb22f2aac7bd5d938e9395f67d4248441743d45e0099638d60d5e
-EBUILD libcuefile-477-r1.ebuild 694 BLAKE2B 04afd1c006aa48fa91c366925267020a4d945fa886ed07d369cbbfc9544b46f77d19fd0e1b61f502ffa6a6e9a16fe12b3f91469649074d9be1fe9afe66975034 SHA512 be5deb209a3b9d977c84acc279c4d2c7d8db9b0ef267f3c315a462786d2f94e1ec32fa4ee9b787e02cf95c8f5651fb21d0c3549ed94ea0a2c0abed2986bb9b16
+EBUILD libcuefile-477-r1.ebuild 672 BLAKE2B 32dc9676e22ee85344277fda94b5b71093e0d70434129353b8b8f6c99b0d9eaddcffa83146902f4ce58eb64da688f8c211add755766ba2e1a29b21dd58085a99 SHA512 75c9711f118cf47a586778657726c4f0d5aa6bac9a15cb0de25be13f4ec8cdfbd95ab9a23e94a42bc6ff935e2a42103844ea59d179dd05646bee2b471551479a
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/libcuefile/libcuefile-477-r1.ebuild b/media-libs/libcuefile/libcuefile-477-r1.ebuild
index 54aee7bbfbfc..352236b6dc4c 100644
--- a/media-libs/libcuefile/libcuefile-477-r1.ebuild
+++ b/media-libs/libcuefile/libcuefile-477-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~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 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 src_install() {
diff --git a/media-libs/libdca/Manifest b/media-libs/libdca/Manifest
index 72924bb2285e..f062d065bf37 100644
--- a/media-libs/libdca/Manifest
+++ b/media-libs/libdca/Manifest
@@ -2,5 +2,5 @@ AUX libdca-0.0.5-cflags.patch 492 BLAKE2B 3090b187518cd899b76fff017bc544ccafaac0
 AUX libdca-0.0.5-tests-optional.patch 508 BLAKE2B ed77381970c59dee10e0b32d36183b390574acb0cfec1216f83bc4f2af784bc973d303d051f6348fd4d69dcbbcbc8b1bbb2f3dc7857fdaf05c46c885a463aad5 SHA512 0998e84e4855367b4c43e27e73d87c2b12c849a80864de66805e344eb32ad8463d46602d63b92edf1dd177d4fe77aa119c07952c6c2bc5de6add13468a9082a6
 DIST libdca-0.0.5-constant.patch.bz2 3424 BLAKE2B 048d7afd856090b5f9d0db1d5894b78d037fa1c03086271342527a1bf04f41ed379b38fe6d72eb9bbf74a864c67710b5f9abe53177cdb2f4f53a8e7502d77c44 SHA512 37bd56b8c240f16a6ee86b04d44571345278f8b9dd395cbc307e9fb7e6c001487411d1b4775af19dc97f18fcaed63be97fafeb4fe504f0a76b87022ec792d23e
 DIST libdca-0.0.5.tar.bz2 393291 BLAKE2B 093e941e8cd25ca52ae43ab16607f8ff3c5ebb95ffc4b29c3cb771b6bf9ba45da4cc8ebd83cd91ccd66b0dd981c32a6c77cb3e90f46093b64b9a483dd854ffb6 SHA512 d9f0ed34efeb3f27af8424fcb3e6df56744c6735854a65b5709c02b42b4513b9c4618dcc19eb44293afa051bd95616651bda5fc3b49dfabe975d0babfb1bc287
-EBUILD libdca-0.0.5-r3.ebuild 1504 BLAKE2B 803a0831fa470196a9195e4b75cee1a37fd37742e1f50f22c68c4a98fdbfd0e49dc81a129dbb7553925d99976d03ca278004b21c54ca16d2c3df19a815061d2a SHA512 dd402a25fbbc502b6dad9884576b62ee74dc5286f0596b2e27fa953112d1f5c03de5ac164c351a41dd0385588b536e3c42d16e815be37eabb4cdffd177c93761
+EBUILD libdca-0.0.5-r3.ebuild 1482 BLAKE2B 0bca35eac3ba34ac8a05250ddb88ff3fc938da49977bdd99d9eb9b3a845fe6d70925ac1fa35b3497d5f5c1707b37c1d07b611e39c1f73fca6e76dbe2ddaa8b4f SHA512 a6e10ec712f88fea01776d43ce73a81b7eb5deb03c4beb9aa079ad3d05774eb4d2b68a281c26c6832386ecd5315404bb9b87bd109ab84ba1b4e50f5541a18544
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libdca/libdca-0.0.5-r3.ebuild b/media-libs/libdca/libdca-0.0.5-r3.ebuild
index faee1c7a6532..5135522c6500 100644
--- a/media-libs/libdca/libdca-0.0.5-r3.ebuild
+++ b/media-libs/libdca/libdca-0.0.5-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug oss static-libs"
 
 RDEPEND="!media-libs/libdts"
diff --git a/media-libs/libdiscid/Manifest b/media-libs/libdiscid/Manifest
index b91253214bb4..ca48766b05dc 100644
--- a/media-libs/libdiscid/Manifest
+++ b/media-libs/libdiscid/Manifest
@@ -1,5 +1,5 @@
 DIST libdiscid-0.6.1.tar.gz 366393 BLAKE2B 551616a817922af5f90991690ea6d35523b3fb6606ab26ae7e0e4c51258fab5b653dbac96842526d9a4a51c81b5dfb63c9ec9b4fe723e88e758855cea381d46e SHA512 12808040b6bac7dd513d32b2f7a8424f0d9753a89c5703ede0454d0d8dea508a446adba20d899c3499e8621d2a752b3e8ca787b92e3ae92402c6df7bc2a3819d
 DIST libdiscid-0.6.2.tar.gz 401455 BLAKE2B 0b122f08de89af7863ed21158637e961d8cdbf4dc926e5ff641aad4f23e8b02d8e970221f51caae44d2943b894922134baeb9e99595dee74c085e31b0daefc99 SHA512 7ce9bb589f64644ef44400620bd3e65a329e52c5698b44c3dc1569fb143d9af15d540b95fbdce1b87db0263e2ff55c81133213ed1708cdb25af1b38a46c4e1ac
-EBUILD libdiscid-0.6.1.ebuild 544 BLAKE2B 19a0f87ab6c43899d626dab7e3ee83a833315cc22bfd7a30e5290b332e0fac5fbddea125411f8a314cf424afa8cdc400e1f4fdb984f78c7a7a2198681b14a4d2 SHA512 21ffcbde75c974acf5e1040aa18a279dd93a53929a2eda8094b7b5d8fa6c06f08ce01296b78c846cbeb9353be9895c8e3483b8e7d3b192aaad479d98a0076f01
-EBUILD libdiscid-0.6.2.ebuild 584 BLAKE2B aa3acfc4b14988c0c209012d1004601ed4c38ad9d87833120aa67dd5e5a29c0a965229fa95db4a798097ead7dc6cd4a5b102be3b24438b2d969acc48ffcb8163 SHA512 26d42bf20eb06820a0e7cb24641c1042999ba8713e520c1f6f35c2865b923330218ea4d5d5dfb10900782597dfdbd019e339ea81869e33493e916f675fb8211d
+EBUILD libdiscid-0.6.1.ebuild 522 BLAKE2B 8b4eab5ef4f950e19135f996d9517fd23e1277e952a2c89371ec52fd24bc3bc4ff072636a3312b908696704ce5cfc52f7efb9a47fc58a7896c0057a5117264ea SHA512 a3eb126f799fc03853b8ba62c1ad844c790cece05c035e1251d174fd5d4e94111ec1fdda54ce3234fb90ac3adcdcc6e538d754a22ccab86118e0433cce69648b
+EBUILD libdiscid-0.6.2.ebuild 562 BLAKE2B a1ce5d9a3618499e2deb4a31bf5b1e9ae98a237ce024437d5386006a28ddb7273680e777fb9ae1f5769b3daa0cba17593332aa44d2c39f129f02eda6699e2af9 SHA512 a3e7ab8001e760e97a3d9c729ffae805d12d5485e2f04681578fcdd5e8afa354f8615727997882db0169c0bc212d1a1ae6e72ac17b148ad6bd0e8db3b83672d7
 MISC metadata.xml 587 BLAKE2B e5d8e996c7015f2796f2ec687989c777e85dff7c64e14cedeb8067604841d13256d73ce81ba4601ecea644e1fa5a7ba05b18749b1233498ca193932952510c3c SHA512 02616572b6782adc2285210f4d3fcfcb1e188012eb97a322468e93755a0ccd0a6760885b345bb7845ef6aaaba114b22afcfd02ae5572fb2e4140209adc6db570
diff --git a/media-libs/libdiscid/libdiscid-0.6.1.ebuild b/media-libs/libdiscid/libdiscid-0.6.1.ebuild
index ef2399eab9d6..c475d184050e 100644
--- a/media-libs/libdiscid/libdiscid-0.6.1.ebuild
+++ b/media-libs/libdiscid/libdiscid-0.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DOCS=( AUTHORS ChangeLog examples/discid.c README )
diff --git a/media-libs/libdiscid/libdiscid-0.6.2.ebuild b/media-libs/libdiscid/libdiscid-0.6.2.ebuild
index e6b244837789..f21e59055a4c 100644
--- a/media-libs/libdiscid/libdiscid-0.6.2.ebuild
+++ b/media-libs/libdiscid/libdiscid-0.6.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DOCS=( AUTHORS ChangeLog examples/discid.c README )
diff --git a/media-libs/libdmtx/Manifest b/media-libs/libdmtx/Manifest
index a906f3eec4ad..e9e1e3a8c2dd 100644
--- a/media-libs/libdmtx/Manifest
+++ b/media-libs/libdmtx/Manifest
@@ -1,5 +1,5 @@
 DIST libdmtx-0.7.4.tar.gz 370999 BLAKE2B 7c87d1b1ca8a1466aed6dbd8b60b31c1acacbff46d99855a2366c89a0998acbc8e0b3d3e70612d6bfc736b48e2001d8de14b9169920e802490623009f3395ea9 SHA512 307aeb30506e60fc44550d1bb86081634f0718d53e7b878b45b0e704e75c5996e27285a16881b7c3a93cafa9a9b125175dadc0f0c2c2f976878666eb652108ae
 DIST libdmtx-0.7.5.tar.gz 790944 BLAKE2B af94a998e6ab0b06c17d64d6c720e874540830282fd1219260aa1e5fb44159b59f63fcfd1fbd750333ae50b080c341ec02b81216c2e975a8ef85628b23d4fb55 SHA512 c4bccc9eff4a93b6bb417ed23ed46e82cc98b650a94be40479d192af8537ee02a16700fbbd8f2271035ff8b804c40ab6461825d94bd80a3081d3a4b3988ea22a
-EBUILD libdmtx-0.7.4.ebuild 555 BLAKE2B 26f24731d334beda4d62b34c48b790d91e5c1137444cde0cdac388d9ca786ab71c6509b7b33182525e3f5ed42f4a07574ad709849d26b97004e03a09e7e0d94a SHA512 57f59f9cdbd5ced50c3dd0a2e0470422ca00b92e36444bac240546d76e357449399ea273586b3b619359cacf577e6192f7dbe52354608de61a87f7b1172fc968
-EBUILD libdmtx-0.7.5.ebuild 667 BLAKE2B 0016a960c64cb003682ad790ad8319f9bf0f8ed7bec7e7c09f083db71b80b5b040c5630f3a0d3f76b60245a6ef2741a72ac9c03c2bde6b3e743de1686fb41fd5 SHA512 aa74bfdc89d850c9781b7425f071921b59475e558d36a434011ebd53b4d7a681d59c10e87bcbe66b413cbee7bfb39a0396c633df6a81a947a3e16f5e8a44f394
+EBUILD libdmtx-0.7.4.ebuild 545 BLAKE2B a652c7ba1f0bc395581510b58fd9ed9b2ac4059a0f2636aac42655693950bf5a24bbe8e9d67cd3c7db3815e7ba3593ba3c3064ed001c00c9fe35121e7b22dff4 SHA512 ae786eef5934488ee79d96d6eae5871d27cae72db072926a44285f86f9c90eaffb923cb1e5c43bcb1983ac55b24048d5770dc11c5087dd3c3eab15aa3c9d5212
+EBUILD libdmtx-0.7.5.ebuild 657 BLAKE2B 87133f4c0003df800d767d4be55a2510e23ffab6a0893a1ae2e01e0309d930482827a4dedbf52a4e903e0f81f48182343b412997391422bd09daa17eb077b0f0 SHA512 737b972df330f0de017ff3d8d8f6a01fdc0b08f02f1fb2e45165043c9f6830ec101a4eeb4c0c1a3359ac711865009082b18b999fafc3c4d18cd10f6962345e57
 MISC metadata.xml 378 BLAKE2B 9dcdc2a67e0836e73a48174390263c6344f329beb3682a92ffc52a11856b87ce5a4338803ee67f07f9d2337b4292433727c3edca55b155ebd93200351231113a SHA512 f4374bbe8333e1e1700cedd7482667159e5c2e31d8b0f6e52074c9261a11327ca9eab2c857f768cdccd287728b3ab3f52628733e4d91725230fedd985d376a7d
diff --git a/media-libs/libdmtx/libdmtx-0.7.4.ebuild b/media-libs/libdmtx/libdmtx-0.7.4.ebuild
index 860a328be6d6..adce86c7d674 100644
--- a/media-libs/libdmtx/libdmtx-0.7.4.ebuild
+++ b/media-libs/libdmtx/libdmtx-0.7.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/media-libs/libdmtx/libdmtx-0.7.5.ebuild b/media-libs/libdmtx/libdmtx-0.7.5.ebuild
index e13c9ff42c43..7d934c512600 100644
--- a/media-libs/libdmtx/libdmtx-0.7.5.ebuild
+++ b/media-libs/libdmtx/libdmtx-0.7.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dmtx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/media-libs/libdv/Manifest b/media-libs/libdv/Manifest
index 296241b464e5..c0e85316c4da 100644
--- a/media-libs/libdv/Manifest
+++ b/media-libs/libdv/Manifest
@@ -3,7 +3,7 @@ AUX libdv-1.0.0-darwin.patch 1371 BLAKE2B c88fc5d63934b4fe5ac33b7d5d11e15051b266
 AUX libdv-1.0.0-solaris.patch 4318 BLAKE2B 46506a694d6635bbc5ac2f26a470ebe924017e07e0440274ab1831049d9b3b678eec4921ac4b3a6464092409af40487b9c3ab028caeccdf2d1bd865d28069edd SHA512 dc28e7828ec0348b761e47ea2a113412f8ca3a3cf42d2beeaa3a5e5586885fc2b495509b36cf3ac7de82473be86476da46e998d785a11fd2cb6b8a3bf2232647
 DIST libdv-1.0.0-pic.patch.bz2 9771 BLAKE2B b8a597b5fb5facab05845dae1d08a84a17067804ef873b97b7f975a96c622a5cf3b2bbb17d3f5a364dd1aba1afbf3dbf2b18695f9ae8ccf3fcc478b3d7a17a4f SHA512 18fbc341f9a9349f2325c4cbdf2fcf60bf0b35e2efeaacb9a3e541ace4ab2ffcf64d18409b2d76fd40c6096a69ffd151c2bdc8c33411d1640f150202eef12021
 DIST libdv-1.0.0.tar.gz 574565 BLAKE2B 42d17b07501fa508630afd1cdbaee9378f657a4ee4b77666f1a147ddfcf5a9d67d90e0a6da53bfe4f2b5418984579322565c9e8c76516e8193e75bd4751a731c SHA512 19887a6f452fa7da8924901ad841f5c4a434a3bde56c932ddb43717592aa744281e3a8ad220231e11d7e6bc3b0e704952a8324e5f85d4e088675edceeeca7dc8
-EBUILD libdv-1.0.0-r2.ebuild 1041 BLAKE2B 582bc4fd5a9b52f30cba35751b58fb461e04d4b1943f0ba3fe0efe4a16e56efd6a51b6b9544f18ce13a67b2891fd6e9911e885cbb4c7782ed7e211608a536ddc SHA512 7eda2a750a40693fd5ed7eb8b82432cec0670f06969913fe6ee70f484a3166812ead87db827a42506fb1fa42d4ebb2539c64d01620913a11cb42661749d23a93
-EBUILD libdv-1.0.0-r3.ebuild 1118 BLAKE2B 5dc3db44ea106f731a05a8c5cd334577c45188d62fc17234ea23cf9226152a6bcb5dbf466336eee7c2aafecb29adb8f9b8eee833f179b30db3c7c2b7a6d7beb4 SHA512 6997e92319032ffe047db42104175c4fda235dc7e9bbf2bdeb368918552a7efb6e18e9c509057278f24f8f523ef5b74c82148275ed1de79239d30bc766241a3b
-EBUILD libdv-1.0.0-r4.ebuild 1366 BLAKE2B be97be5e984f742d573d802fd3a28d5208f547ce7324a1791c42cba379a68fed840b9231bb8272fafbbfd26bf8173543ca8badcb86ab5f80cd23a133037afe34 SHA512 078c44d62e645d689efc7148cfb77e79db97b0a4833f1006d75d493cb930986b0ab6850005b9e179597426d97504433e7bba17fcb8aa8932921251cc3a012498
+EBUILD libdv-1.0.0-r2.ebuild 1019 BLAKE2B 1a5d72a950635c71968ab3e5cac8371624a632101ad3fe38c7cdf59d86884eea76caea86b5c46a14d147c9ea7dc58a267095683f24a80c00ebdbbed92196e36a SHA512 362becfe42d2d55878eadd9fe1886c5f5b6c788e6e992269f237f8bfa7d4395806859044db2a487e3586f6e20fafad9c2328fafbbfe4291a97ca436426ac68e0
+EBUILD libdv-1.0.0-r3.ebuild 1096 BLAKE2B a2858bf8bc1d4ddd37865f0ac19482ae5d2274454063cf1d163f926c81fbf4e17b87d483d9c8a3b0a23b7387929fea62c817539825ab05d8b265f117ede66045 SHA512 fb9420f7ef0c7717e6fb3e4d2abc684f0e19cb3c8a9235f19dabfb654b7909ecfd39daea6e845086ff6bf013c3a11843e06ecc82ca7df2e750a79d6b5bff938e
+EBUILD libdv-1.0.0-r4.ebuild 1344 BLAKE2B d0ea18cd95a43244a76a6913f133f68fde55a623988af7de9aa7c6eff70cfe693f3c19497a7b92e2b22e6ef83fc7031726b7f8761ff99e0b9a2e081477985c96 SHA512 6e39e98c1d746ede722d105388867b90ff32eb57e816b287dea6b77d41e4093b52ea993210670f0d98ea2e3a15c1dcf15efc39addb868160486a3b5f1187ffa5
 MISC metadata.xml 298 BLAKE2B 673bcb158cdfda64a33e7d107dfbe978badcbbd44312638f845fe3c1fe481d3060820f587d87277366955e47d65334e1365d87ae3b733ff22e1442bf399336be SHA512 7a9face79c85c9ddf6e562db5fe3c1702c20147adec5564dfb67695e5be198732c57d5592985466432ebf9201704dc848b9e8b73f9483096c942f0c5ecf87cb7
diff --git a/media-libs/libdv/libdv-1.0.0-r2.ebuild b/media-libs/libdv/libdv-1.0.0-r2.ebuild
index 20d6cbfa73de..8e93f4d028fa 100644
--- a/media-libs/libdv/libdv-1.0.0-r2.ebuild
+++ b/media-libs/libdv/libdv-1.0.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="debug sdl static-libs xv"
 
 RDEPEND="dev-libs/popt
diff --git a/media-libs/libdv/libdv-1.0.0-r3.ebuild b/media-libs/libdv/libdv-1.0.0-r3.ebuild
index 4aaa15a9ac6c..e73f715b82ff 100644
--- a/media-libs/libdv/libdv-1.0.0-r3.ebuild
+++ b/media-libs/libdv/libdv-1.0.0-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND="dev-libs/popt"
diff --git a/media-libs/libdv/libdv-1.0.0-r4.ebuild b/media-libs/libdv/libdv-1.0.0-r4.ebuild
index 4dc11d3f79b4..6788633e8d69 100644
--- a/media-libs/libdv/libdv-1.0.0-r4.ebuild
+++ b/media-libs/libdv/libdv-1.0.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="dev-libs/popt"
diff --git a/media-libs/libdvbpsi/Manifest b/media-libs/libdvbpsi/Manifest
index f18a5b9bc939..a947d4b61934 100644
--- a/media-libs/libdvbpsi/Manifest
+++ b/media-libs/libdvbpsi/Manifest
@@ -1,5 +1,5 @@
 DIST libdvbpsi-1.3.1.tar.bz2 479964 BLAKE2B a29522d39544d90b34915e2ca9fc9ca455a556097c63639d7604679275b57378822adfb4c022478884c897cdde2c0e5f84355fdecf35fd6bb305d1fc275eed8b SHA512 015d586d1ef1fd35fc4b6a5b79d1ce4570e07070840d7070938c38be64853fb987172ad225f000156166559709061de6f901237bfc0f7f26f219b5950b57c27a
 DIST libdvbpsi-1.3.2.tar.bz2 487807 BLAKE2B ea8d1e121e47d2257d8537beac792e3a420ac957dbf3ec6d89f0c4d063e249616bbc8f3e14ed37769b676ed18d5d4c3c6a33e2a706217854eb2ded91e7c503db SHA512 cb59c2e66a214cad7bb96aa1f80a178399fcd80da9fc05b22c72763f2cd818bfab3724d36eee4c6467fb8bc8bae18b1d8afec64c02e8e47cd7a6e887f0230309
-EBUILD libdvbpsi-1.3.1.ebuild 961 BLAKE2B 6fbc4e59378ee2267ceb69f740cabf84e3a2c4ce6775a93db3a890c1ecfb9219ceed8383e24323a3f9b306d2623b4266e6fde41190ba46e9eb0b5f7f779c7145 SHA512 04b0ef6a8239d868a357964bb97a54f188fd27f767ed52b0d14e6eb9932f286c1e1a2fbe134ab663461a9436afcebc781934ea0279cf4dacd2df11e0a6a16bed
-EBUILD libdvbpsi-1.3.2.ebuild 957 BLAKE2B 80145c8e053eabad5260a499cbd52f83f9696a36f25c6d7418e80b6266692b969e295878af00ddd615a413aac7b04949c41ef53dc57dd8b8960c1584a4c13be2 SHA512 dbd369691f87cefad14f8ed3d6c4698592ae69b27a92a777f4bfe76bea410de0fd654343a9e96806cf4d5675fb3d2e6bdf4a347c9006f04771ef75c5892bb239
+EBUILD libdvbpsi-1.3.1.ebuild 939 BLAKE2B 41433b58062ca6fd210c81d434077ba8015d3e5463a7ec2a18d3e04a6252aad19dfa92f020ac474ce8a298fa8c25f47e62866f9417cbb10d4c96607e9c6f00db SHA512 2deb08a7bb5056d101a7dc9a84968d1d5de064c43e3e6a4c0e7c9ea34b078e01243b8727f44f9f0c36af2bb45c2eb9fe1ee5a71fd40666d2e7befcf18e5fc338
+EBUILD libdvbpsi-1.3.2.ebuild 935 BLAKE2B d7972f5ec58721841bebe9bff5d0e3394637dd9e6428b404d08a8558376ae659544203fcb04610805be922b65edae6abb6d71b762771fc9e9b6eba98f5a911c3 SHA512 e26fe934665208d3e6c8ebb8e947a7df0d899c4e6fde29184109869f7bf4e5e669b45fc3d31740b1353fc703398a51cfc6f6a21dc4c15cfd0a7d41cd1872fe5f
 MISC metadata.xml 212 BLAKE2B f25483a51eb36c195e77aee58c9f94951dbbd719edb1d088524ef3db4f2d8ffc628b6c0c01efb9d5f3083a81e6cd0edeba56af12a9dc643bc3facbf16e89c0b7 SHA512 ad3eb85555c559c56e2fc097ed106671a78bb16ea63253de1786772a1b914833c2af673da087899e1b06f5db150c283cccb81fe8591c257f91913f2ae22a039b
diff --git a/media-libs/libdvbpsi/libdvbpsi-1.3.1.ebuild b/media-libs/libdvbpsi/libdvbpsi-1.3.1.ebuild
index a522c5ffad22..6d164d235666 100644
--- a/media-libs/libdvbpsi/libdvbpsi-1.3.1.ebuild
+++ b/media-libs/libdvbpsi/libdvbpsi-1.3.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 # Sublot == libdvbpsi.so major
 SLOT="0/10"
-KEYWORDS="alpha amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ppc ppc64 sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild b/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild
index 067915a1756f..b62ceb17db97 100644
--- a/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild
+++ b/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 # Sublot == libdvbpsi.so major
 SLOT="0/10"
-KEYWORDS="alpha amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ppc ppc64 sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libdvdcss/Manifest b/media-libs/libdvdcss/Manifest
index 14496eeb8fdd..2e4a0854f611 100644
--- a/media-libs/libdvdcss/Manifest
+++ b/media-libs/libdvdcss/Manifest
@@ -1,3 +1,3 @@
 DIST libdvdcss-1.4.2.tar.bz2 366824 BLAKE2B 106ec0f46eeb4969d0c878ef1e2ad05ac9c0b0ce0d2781c0d68d9d5e08f9c6154b43c4b2e0cd2db0d530eb0a94914161384e788b307af4c4fca3351d270cbe9a SHA512 e46ccded1951046ec481604c5b533c435be14cd0e734cd5315b61868836a20edf4cdc7c1466c2f4ed374de4382c5e758ace700e84aadcb29513001d696f1049c
-EBUILD libdvdcss-1.4.2.ebuild 805 BLAKE2B 765a03061328fd96edf4b661d9660662ffab8a85f2294bbc3be2dd8525c3fd287e307b3a725f11cd36d245b04ac0bdf290b110a9329995dcf9c788fc9ad63453 SHA512 9e6761ec85561ed0daea787e7efc21f24ac5f121e84bb5f0aece3a4bb084e06528f6bf412c3e785ab79ef99efbc258f62e8619ea855cf3d7a1c794447fbe98ab
+EBUILD libdvdcss-1.4.2.ebuild 783 BLAKE2B 12df4ea9468702c9946a15597a4893cd871388f013385cf140dba0f62572d5093c63eaddad9d1ecb37a5137928fed2951f75c18e7ebf8b618d0a875877434cd9 SHA512 c192abfa9c03505eb578442e6c2c6ce4c6efe8b0a77d46451a6c5142c66ea5eaf608a2084c10f9f652aa0cabc7748021cc38180bc25486bfd4b6130161cb0d44
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild b/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild
index 431e864bc694..4446b4830de2 100644
--- a/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild
+++ b/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1.2"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libdvdnav/Manifest b/media-libs/libdvdnav/Manifest
index d44cf8ba9676..c2102749f32e 100644
--- a/media-libs/libdvdnav/Manifest
+++ b/media-libs/libdvdnav/Manifest
@@ -1,4 +1,4 @@
 DIST libdvdnav-6.0.0.tar.bz2 369605 BLAKE2B 911b786f1cf37d32b0516df9f3ae3c388ad352206e67f73f758984795459ced7507f1454747a205b64c2d1f42922ee26ee9d434499ceaf05053dfbeb4d7e52c7 SHA512 89d1e976d8f1cc92692e86e793403759b4d705682ba7418dcfd7dd3c38861238cead303fe4baa2059ebd7e9b82a77bbdbf32e50b20848e78939ee9e75d1b96d4
-EBUILD libdvdnav-6.0.0.ebuild 1174 BLAKE2B 3480e5cb36aade63057fcf86227655b8ab55f1f71d37e22e49130d041b5b228c5278d689a2afff9d958046ee1556a00a1ed2df19530885a9f2f11dec23f4d4e3 SHA512 f3a8ee69794623296651e7d35d3788976e4472a525766c76b8db5f55e13832bb640b68eb9283558e7535916ce226a8a8faefb4c78a9fee8a4d81b2988dbef5f9
-EBUILD libdvdnav-9999.ebuild 1186 BLAKE2B 2f6ae269963f4ffe99400737fe9bf0b9abdb7ae2d162aeeaafbd2b9afc10feef07647f7059479956a6594e032e63b4ace45ad55cf0b1f215deb16ad0038d7b13 SHA512 5e86d911f940bce20f8e3e962c953116bc306d3fc020e845b104abeab1fd1017a9e6967d17ac5cc639bf2257ff01054ed0945e995e1683df006e06513cbd96d4
+EBUILD libdvdnav-6.0.0.ebuild 1152 BLAKE2B ca9f9bb335f5a44da1d2c5f638de98bbd65bba728f00d2c2f59e0364b378d31e8033dd2b0755719e40e8d8aa3a7c3b7cc37591957f784ac8e8f7dbf062f3b97a SHA512 53cb3c91f6b4db337b006ad90845154cfe2c268adef9c939e2d9220c0fc04bdc6a354ca61b470464c210f84ccdc3f1a22b95070cb3d673bd8e87f24e1d276fa6
+EBUILD libdvdnav-9999.ebuild 1164 BLAKE2B 46fde7ad092a80fec8fee0fa06303391f4d7b97120daf33950eaed76ef7bc0a32077ed2dbfb9f67905af947d0b1bcf61438c64f957f06a43c19d29bbbfa4e798 SHA512 94191cee0081cc3b732c6148fbdb4333f7616de40f0b96091f343828c6c5530d10d7eb597cc0bfd9f2f0865816ce6d26c65e7b58d3c01206d9055c0e63740a3e
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild b/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
index a2b8131348e8..678a15d69d04 100644
--- a/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdnav.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdnav/${PV}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-libs/libdvdnav/libdvdnav-9999.ebuild b/media-libs/libdvdnav/libdvdnav-9999.ebuild
index 61b7dbaa549a..4207a036e75a 100644
--- a/media-libs/libdvdnav/libdvdnav-9999.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdnav.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdnav/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-libs/libdvdread/Manifest b/media-libs/libdvdread/Manifest
index 26c40b95ee78..05982600fa8f 100644
--- a/media-libs/libdvdread/Manifest
+++ b/media-libs/libdvdread/Manifest
@@ -1,6 +1,6 @@
 DIST libdvdread-6.0.0.tar.bz2 394627 BLAKE2B 08007113d726f96d2b179aadd2e5737ab9eeee2a52864eeaab3d2633993c66ca076559c920bd291033de794f2037d7480e4ad6f704822303f5c5b29db6b8d7cd SHA512 b07179f2f665adf6ddd7bf8b7c48cd279f3f413c5719b8ca8467e53c7cd0cac02a40101f3717186dc0e4e69e5d9c7ac6bf98a76901412d74150b9fc7bfdd2479
 DIST libdvdread-6.0.1.tar.bz2 404512 BLAKE2B 7db1d9ef6b728ba732d9f3c9e5aef6da5b8a70ee0ef95902c8de231ad64c7ad39a9ff1d01169688d197094b2755e34b1416b9f2d063566cc89984cfd86483a26 SHA512 550c01f6afcaca217d8852fdd9f4a54790239b674a45bb7c1c23a58fb5dec009e3028049a54f0904c08f15f5ad994e66bd6bea9cc8d5a8808e8b638ff8e27c4b
-EBUILD libdvdread-6.0.0.ebuild 1144 BLAKE2B a0d3f6efbe7e2b40d220e7ea469a75e7bbfb614b32436b332395b72d2dddba0c6f01f88ab6ff9677aeb06c9e366b7232848302df7506d3b88eb904c3fb5a9ca7 SHA512 e999526b9683635dd1bbaef66f5f7f63616f1ee02e471b56a15a34b2b01a9d1971d3c5d414807266ea183229d405a0e550d06a5810aa3ccae2334de69c65a3fd
-EBUILD libdvdread-6.0.1.ebuild 1162 BLAKE2B 4b8308822337313a32e016441ab17f1eab9681adc280a316556a749306f2c74cf349c9958537b9b6f636ab993e76ef1c0e8b01877e99e91714f885b152db5b2e SHA512 9113cdf82860b9d09cd49b3ba7b30cc3ebf067c33ad8b037ab9397ea2c65bee7678422e5552d94ac008d4f8b3ab528734bdadc7a8c51b8b2dfb260746492e339
-EBUILD libdvdread-9999.ebuild 1188 BLAKE2B 5ec95c4cc59c72b8f369045a1ed8fd3b71558d63b81332b85f2dc83a772fbb1de67e0b396ca3f35d898959655a127c888783c4c6c577f3cde844964d82f68f2b SHA512 24c66b2566578e417b336fb77a165d1b656c83aa02ab84536c7028d234dd1de2302fc27e4f26686892ad34d180a9f49ed3f5def41aa38e618db6114ec9a80523
+EBUILD libdvdread-6.0.0.ebuild 1122 BLAKE2B 6bc501bf80770c0bdeae63ed4b76a3830589fc075aef0187440d74757a7ad1ba2e176fa8dedc1adf0425ff80bfa20b6a8ade603d10496dfb407bd4049d7d603d SHA512 75d43691f52f8390a7b02526e19a7db4778c1e5a7c253991d6acb6d236c839cb5d45723f1c7e620af58a1e6771deedd7b9b0bcf4e085a8d386e3a6eea12cb36c
+EBUILD libdvdread-6.0.1.ebuild 1140 BLAKE2B 2cac89f2021da851293465fa777221bd33f8ddcb7d18859cab977ee9f4131df788f913fb89801c5a73c1e363d90d500d621fba1a7f3bebc28396a13139c15029 SHA512 e8952f27f3670929240aa4c8809fefa6d318b4cdb3b5670c35c23d79a6cd6456fe2e8a3870c7439a8cf11fe82f7d7d9b8de81404127b52ce082094c6edd89833
+EBUILD libdvdread-9999.ebuild 1166 BLAKE2B c307b564a1cd1be0f21f7a8c84dc0938753b5b4de9687d810f417b51d3c6fa268d7462e02531feeb06d61d28d7b070ebeb7bc684e259277e4f3c8fa28e8fff30 SHA512 c2cd4357ac1e05080869356d8166d393fd9a1f1c5aeeb504b5c457179490ff68583ab78054a048ee02c860b49181b92a6b6b2812d4c8791284dbe2ad4b917163
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libdvdread/libdvdread-6.0.0.ebuild b/media-libs/libdvdread/libdvdread-6.0.0.ebuild
index 8231d5e177b8..eab7cde033d2 100644
--- a/media-libs/libdvdread/libdvdread-6.0.0.ebuild
+++ b/media-libs/libdvdread/libdvdread-6.0.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdread.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdread/${PV}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-libs/libdvdread/libdvdread-6.0.1.ebuild b/media-libs/libdvdread/libdvdread-6.0.1.ebuild
index eabac94a68c8..4cd3f34f6e8b 100644
--- a/media-libs/libdvdread/libdvdread-6.0.1.ebuild
+++ b/media-libs/libdvdread/libdvdread-6.0.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdread.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdread/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-libs/libdvdread/libdvdread-9999.ebuild b/media-libs/libdvdread/libdvdread-9999.ebuild
index 08894423e14a..25adfbb2701d 100644
--- a/media-libs/libdvdread/libdvdread-9999.ebuild
+++ b/media-libs/libdvdread/libdvdread-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdread.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdread/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-libs/libemf/Manifest b/media-libs/libemf/Manifest
index 5cb8948f20f2..b7fc6aa5ec2a 100644
--- a/media-libs/libemf/Manifest
+++ b/media-libs/libemf/Manifest
@@ -1,6 +1,6 @@
 AUX libemf-1.0.4-amd64-alpha.patch 3194 BLAKE2B 323edc7677dda422d6a3669ee7cd117fd7fb274265dcc2032b033e13bebfb027a0ee581fc2430283ef465e7fa75a2a087e18a57467c5045aad0d22e20b32c532 SHA512 6e37fcfb52724923ac20f6c6d42450834824e2003f2002802f89b4d9c8b9709af8b179ca94ec80938c20cd0a3ca895021777b088ea95ea593aad2746749d0ee1
 DIST libEMF-1.0.4.tar.gz 818060 BLAKE2B 0abc5f478d06ebc562323a515c51c46afd2a98fd2559d8a309c4b18f16da8063cd65fa7d19a83ba360e8c53a7e9788b590e810d615000069fe7c912194a8eec1 SHA512 8abd6081e79e6045b0a4a1575fbcc19921beeefb22036164ed906a35e4dbc67b6959899acf46bb5db5996ae07cf38aaecf8eb62dd6bf5f528200a4d20b13db55
 DIST libEMF-1.0.7.tar.gz 908973 BLAKE2B cfe2c67bfae9fd7387f5332fa7b5038510d81aab942fc87b04da625ecc39c3e2b711ed14fba46eabae4a2eced4621eb580cedf1c9e67f32fb33afb9bc1ceaa5e SHA512 eff5c46a6e1008d8f581fda59355faa608a825e4832c54dbb074bf20caeee5b038ce18ed3a13181de04bd0601837db7f5c5a0913eb1b8301100dbc26a9ee5888
-EBUILD libemf-1.0.4-r1.ebuild 888 BLAKE2B 8b234f8240cfb50c30a80ef7c5a7a2fce0b5a57f9e6ce5668b80f91a7915e39df7a1f01592278aa2cfaf1bcb5fcdc414aad2d43926217b2d24728fc54e882ca0 SHA512 0954d6e0eba01dcef17513577600ccc980e1810aef7b06283dc165505e0ee32d4815c9c15fc2b3b839791885bbf6a3081d15937507c591d1508f5854b73cd362
-EBUILD libemf-1.0.7.ebuild 836 BLAKE2B 146bbedd71bf6d684878da27290c8cdfde48cc1584e066a535d69c22acbb15844069687d21638994c0ac34d50ab57544eddb3aa344f2bb00ec5839d49b6b2210 SHA512 6bcdc76b4486eaa00e2d656ae2436fb84289081d1a2c1fd8d835a403ebda62797d9c61ff988daa957c604d8080fbe2262676325e1baa4c56ed9fbaf47c2caf2d
+EBUILD libemf-1.0.4-r1.ebuild 866 BLAKE2B 6768fc7613671dd38e8d1f9be488a857d706215b734c8c0a7aebff63cca70ca81b5c7908d5fcce835bb1571752c7e815b8722a9f0b340285a3085d98e1d43071 SHA512 4a4322363eaf6030af4c093f8bec408523244fd95a40e98449672a7fb32c7a89b5eee5e3a80a812cde282d4911c311621a583e753e52a77e4b34089912af9ba0
+EBUILD libemf-1.0.7.ebuild 814 BLAKE2B 1be439839cb779087f2bbecac7847e2e87c4e4052c89529e7fb250a81466aae0d0736032dbb2d1c934fa51cd6d56a177d94a558265d04704a50c5f3506df64e8 SHA512 cf8a5f7f03d9d9d7da8b9e971b6f81e04c3e79ba8b5270442ab88b9da65e3cfedab6858b941f350e2cafff39fd8cf9eb9580cf5a431e98ba90d81d22401d6e24
 MISC metadata.xml 248 BLAKE2B dce07ccd35cdf8117e7f05bbe068c807c381bb91d899d48834974c1d362cc25c3d114dffba55b67c669b96893cfcb7cc56451a6ad833cc5b5cf89f577e714b27 SHA512 89826cb9b2687c78bf585335d0f103d00a5c58d9e5902003e18710e9a8afff7304bc39f3909de99f2b14b4b8a6a007a1f0e3aa5f90bf31d0b8d7314a3c7edf05
diff --git a/media-libs/libemf/libemf-1.0.4-r1.ebuild b/media-libs/libemf/libemf-1.0.4-r1.ebuild
index bfa5e8a65b15..73fdf633c943 100644
--- a/media-libs/libemf/libemf-1.0.4-r1.ebuild
+++ b/media-libs/libemf/libemf-1.0.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/libemf/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 -arm ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 -arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 S=${WORKDIR}/${MY_P}
diff --git a/media-libs/libemf/libemf-1.0.7.ebuild b/media-libs/libemf/libemf-1.0.7.ebuild
index 0418a409840b..af83fb2002e7 100644
--- a/media-libs/libemf/libemf-1.0.7.ebuild
+++ b/media-libs/libemf/libemf-1.0.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/libemf/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 -arm ppc ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 -arm ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 S=${WORKDIR}/${MY_P}
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index c3e55e44a429..4399ebd7242b 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,4 +1,4 @@
 DIST libepoxy-1.5.3.tar.gz 326768 BLAKE2B 053665429a249adca4c9b3d57797949e3a0ffd0ed3f1c66cb8becfb884431e44a4cccb6b2fd3788a86ee01268ebad3cc36e67e391d2aa5cdea28837a162be9ad SHA512 e831f4f918f08fd5f799501efc0e23b8d404478651634f5e7b35f8ebcc29d91abc447ab20da062dde5be75e18cb39ffea708688e6534f7ab257b949f9c53ddc8
-EBUILD libepoxy-1.5.3-r1.ebuild 1301 BLAKE2B 5c8e86808489266b9a80e8145e56d0b4661f94566603a6d9ff4c5b82ee4897aa3a7732f8c20784b6497a580bcafe2a9733720d3f336d5d730b55cbc3ac9edcdb SHA512 a8fab6585d456d93b640edf809aa2d1235f974f2c6d503abe717d96c04486d48662ed174399d85d97b144981869b59addd77bc2305c481f217a69312a3dc2ac3
-EBUILD libepoxy-9999.ebuild 1306 BLAKE2B dc53961ad81f411e8697a115759beb9cffdbb4fa28677ee066d1b22ac4e1d0bca03149412170dbdb1e49f03519aa7c3763470890d0a6fdb5963e6410e34cd014 SHA512 7525396bbb4bbb58ebd821f17cc124898f1a91090ba9f54885909767f1f737ad2422e82b6a4e296135edae400a1123b094ccb71290f40b125772b7ef02f4321b
+EBUILD libepoxy-1.5.3-r1.ebuild 1289 BLAKE2B 9e159119dbebfdd182be34075c3d29c0aa1b827e6389d752a13d245ac56b187b9ce18ba442ee4e71f3f006dcba395c8776a4bd58769a70140a4bb22116b769ea SHA512 cc7cf93c2e54150e45ec68273b5ffca52153be81431ca25b1f0cfada0efc5393973ed4b6370130542ffe0ffcd7686455bcf29c93ac7a2a71eb7d9039509745df
+EBUILD libepoxy-9999.ebuild 1294 BLAKE2B d693bd46618793f86ac48d05ac49ac87716b987713c8ed0ff99fb7f53e9e2b11af343e8ec5a56671900d9a6b3a5fe6886ea5c5de1e854371dcb0f2ed86e2b030 SHA512 18c375fc8b8060c3f829095bb85a861f26bb90a4ef10cf43bc22ee70026078f878de331ec7a787bcd4c815049e60fc19bbee2eb7a9fb39fd8e4be1c83cb6bc7a
 MISC metadata.xml 375 BLAKE2B 09993b726e54558d32b0dfb2a221bdd8928b85f55bdaaeb2faf30a0711ed58b05022a9fb669ec43806aff223860e47db53226a0f8f34d7b35edf0a842ab45923 SHA512 fec0ce8c99534083afc197c156a7fbaf2e83b2e22887ef134984ea7a4e6226f2714db399a118cd96f22b20012e7b7572156fc13aa72516e2557880c716140ad6
diff --git a/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild b/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild
index a4335f623af9..ac36a7ad49c6 100644
--- a/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/anholt/libepoxy"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-9999.ebuild
index c8ed8a6047e1..6c2f3fa8e696 100644
--- a/media-libs/libepoxy/libepoxy-9999.ebuild
+++ b/media-libs/libepoxy/libepoxy-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/anholt/libepoxy"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index 3669e85569eb..c839027d4400 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -3,5 +3,5 @@ AUX libexif-0.6.21-CVE-2017-7544.patch 1060 BLAKE2B 130b95e5f4f44402385bb6825e87
 AUX libexif-0.6.21-CVE-2018-20030.patch 4629 BLAKE2B 574f95d21507887851da9486cbd8d263ad25e1df59dd8020f1e4b640d5cc4852667c689993e67a7d705c748b521a46cd5e187a99c9d92787bc9758631c8d7741 SHA512 c49437dffebb901209748b884d67192d2b77072b2fb96c77b95f398d3c68272b14ac4a6ddd33111df8dac49cd6ab8f38e230f8f3f0a842d4b40f2fd38f141a1d
 AUX libexif-0.6.21-fix-C89-compatibility-issue.patch 1138 BLAKE2B 5b3923a7fd82fc4c0f267684c67f329b4ff2dc43f9d088acd4a352a9f3c329b08c338c51c77b3f55654e5cf2dbb2f7ba317b10de7e963ccc7b4c1989332fd544 SHA512 a91c2f12141b7a0c399f08f038746ca44cbc468776e5b34672d38921b8a131df3938e400fea04d20c323d6d1363f8fb176a4abac7be4b1ea9bb9694aa902f19e
 DIST libexif-0.6.21.tar.bz2 1368435 BLAKE2B 151e3ddcdd45759fd70be91db27511f48a9b7d5de72c8af510e5a231e2f053f8b5d62d1269a1206e419461b07fb723788492604f1f1142edcb5ab7a0876dd307 SHA512 4e0fe2abe85d1c95b41cb3abe1f6333dc3a9eb69dba106a674a78d74a4d5b9c5a19647118fa1cc2d72b98a29853394f1519eda9e2889eb28d3be26b21c7cfc35
-EBUILD libexif-0.6.21-r3.ebuild 1364 BLAKE2B 05d4956de3c4d901780846ec77f11eee72424238e6f26d1a76152e8685db882e7312fcca3bf64f87a810cfc75f2a338c6bd41a19b48c4ff5d0bd6b7f1b7490af SHA512 2a921f46af9fd82ac4669b80c1346a36e2ec5564f2fc33c3022b909a219d6c9e05a47e801c056df291f8097212833c0a783b2becd434847c84ce00646271b428
+EBUILD libexif-0.6.21-r3.ebuild 1342 BLAKE2B 39a2197f786f83d6b6f72cb957d1edc6a3811513d2000e02a29bff46e161e51cabf224530e598655c7986728c8b435aaa5e9bd9cbba533b47096fc0ccdf3f4f1 SHA512 0a6d6a898d4aec4d741a63e82cd39ea6e794c3d7c48195230b15977b338dcd93fa7b3c1c36dbce447c15a7d5cbdadf6630c153add26912ed9c44d39d8cae3b73
 MISC metadata.xml 403 BLAKE2B 174c4d11ebb47cb6037799b340557bc258b854e276a893e70726eb7ae6d57bcf108bb4f17cec453e850bde5693221ae52e825ee73a73c1160c20ac8a86bc81e1 SHA512 43defe52eed54a1fcfdaf2a7057e56267e3286d55e2ee77e32c1c5ccc535d2c5415567d2fd923ccd7dce116a880db022e50d553786f83bae1f07e00b1e73159a
diff --git a/media-libs/libexif/libexif-0.6.21-r3.ebuild b/media-libs/libexif/libexif-0.6.21-r3.ebuild
index 4c5b6bc9155b..df6c8a6a3c11 100644
--- a/media-libs/libexif/libexif-0.6.21-r3.ebuild
+++ b/media-libs/libexif/libexif-0.6.21-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 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 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc nls static-libs"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/media-libs/libfpx/Manifest b/media-libs/libfpx/Manifest
index e7ca74da1726..3202902755e3 100644
--- a/media-libs/libfpx/Manifest
+++ b/media-libs/libfpx/Manifest
@@ -1,4 +1,4 @@
 AUX libfpx-1.2.0.13-export-symbols.patch 347 BLAKE2B d0bc3b1fecba641554a549c0241e098f801f0dd1a471427127c99f56945836ca679b14c2bdff3a85c3be32d399bae871911742fa1ea0c74c8a2e50741ae70938 SHA512 a8e9793f78902317fa2aacc9fc61160579fd211f6e36ae817afc1d8963c60eeb930b0f4574bb855b75bfbfa1b678882773b581db91462289132cd44bb2b0be6e
 DIST libfpx-1.3.1-10.tar.bz2 2358246 BLAKE2B d67b5a38e29d8916471ced46005983427ea1e77ff1fa682b67f80e8db71bd5460aafb59753bd901aa40e955cbeb453cf017109577b8d9357e86ac3e7d988d4b4 SHA512 afa96b240ead4d3c56e8e6c66db188d1f4441e7b4d08e12e0e96359cfa2cea9eae5625105d87df65ceacd97d84a386876c62dee5bc1916c420755d9bcc4655d4
-EBUILD libfpx-1.3.1_p10.ebuild 1012 BLAKE2B 79976bc1924274587dd60709d3a3446f3c865f16307d5a186e3c78a00030d3391a5109b01ad98eaef296129bd1414e9621dff18614420d2c167a25ef0e92940d SHA512 3ad3ca36f92e7db5aeee0b1107749a0554f6f8e94eca796999bae76dc9be554205a65b60512f416052dd7668b3a124c82f6ef01d30550310733e49855bdbae00
+EBUILD libfpx-1.3.1_p10.ebuild 990 BLAKE2B 68a5a7d57ea36635ea7ad83846e810f36b22c02436e975013e29dd7f5de964019680a0c1f6ff0da1d029973b1826966ca9e927d12122e469284f606deee6215b SHA512 908cd97e39119decf0817b0723442939159eab1dd101bec33259ec899a533798817673342ede88e930e5b36f9c7d3184605516fe87fb5fb73743a45b67da21f6
 MISC metadata.xml 430 BLAKE2B 06c7b8d737850306370a49f0d4ff7357a6a97de82bafb26c77f1525fc2b775a6aa03b954167dd7a27213dbbb56bb331cb5140ea4c78aafbd96993987bf998d00 SHA512 c041796d2ed0067ede9168e4212917751f7a7a4fb3463b9ca8343af1e2157cdbbdfaa763fc5b8390179b62b368ff7f098fcdce4e13a74193a34654c06f998f94
diff --git a/media-libs/libfpx/libfpx-1.3.1_p10.ebuild b/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
index b67400320110..232e5b12adac 100644
--- a/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
+++ b/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://imagemagick/delegates/${P/_p/-}.tar.bz2"
 
 LICENSE="Flashpix"
 SLOT="0/1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="static-libs"
 
 S=${WORKDIR}/${P/_p/-}
diff --git a/media-libs/libfreehand/Manifest b/media-libs/libfreehand/Manifest
index af2c24c7fd14..e01399307e7f 100644
--- a/media-libs/libfreehand/Manifest
+++ b/media-libs/libfreehand/Manifest
@@ -1,4 +1,4 @@
 DIST libfreehand-0.1.2.tar.xz 516132 BLAKE2B 7c2dc629fd2a84f23dcd721ed6f9d4644e3bf7a160be9ca5ec0f15a72ae63b3cf861f80fafa12ef1f99b02e0fbc1c806bc37c466010a420bb425f4f9e2757928 SHA512 4112a76ac99999801d97d1b282596d631d8496a5bf65778ab26aa06da86637b1e2b630648a67ea01bf3316ecec9f2715546baff27af090b900267c87a011b963
 EBUILD libfreehand-0.1.2.ebuild 1188 BLAKE2B 3a8bb50e8609ad253f17b3e7eaaaba8d07ece4273de198aafe7cf526fc644cda20e747241c007449bcfea6a23822c583e3abd2bcc8cb05a6ee7d5d7e04bd7e37 SHA512 b03c5417960418c4d0227597ca42b11b68135dcdfaf984a77db8527dbae2b9e6375bd52e2bd380d22dbe7543d992788730e92f63e18ca81c7bebdd310ceb12e1
-EBUILD libfreehand-9999.ebuild 1171 BLAKE2B edf9a99dd928bda98b3d15dcdb2c4943c3499fb14d0d51f0d0287b55236323f1ae0e9377d09bc221fdf42a2c00daace6a9fa26a3a79a797446a91451306c7fdd SHA512 ce17b320bd3c30f4f36d315a45309fd54eba638fe95bc12cef2cb08da575bad983406b1f4725ecd6a0bc7aa6766aea1a542cbdb0080f45e1e5cfd292042b7d80
+EBUILD libfreehand-9999.ebuild 1219 BLAKE2B 1492965e949240027d702e3d1dcae52ba2d2f755969db240321375ab465229b31ecf1bb020305e3c8e5adf96b032fd88a0260f679639c9135dcca39f69ddfa5b SHA512 e4999e91f63a9767373d46bacac7e5617f2544838261c37d6f84332fb37b6bcc78f94eee5e3cdebe20b228685803e9b8377ff7b96bc2b674e76b9ae886607ce9
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/media-libs/libfreehand/libfreehand-9999.ebuild b/media-libs/libfreehand/libfreehand-9999.ebuild
index be281349087b..b0b78cb0249e 100644
--- a/media-libs/libfreehand/libfreehand-9999.ebuild
+++ b/media-libs/libfreehand/libfreehand-9999.ebuild
@@ -1,23 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libfreehand.git"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
+if [[ ${PV} = *9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libfreehand.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://dev-www.libreoffice.org/src/libfreehand/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
 DESCRIPTION="Library for import of FreeHand drawings"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand"
-[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libfreehand/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="doc static-libs test"
 
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
 RDEPEND="
 	dev-libs/librevenge
 	sys-libs/zlib
@@ -28,29 +33,29 @@ DEPEND="${RDEPEND}
 	dev-util/gperf
 	media-libs/lcms
 	sys-devel/libtool
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
 	test? ( dev-util/cppunit )
 "
 
 src_prepare() {
 	default
 	[[ -d m4 ]] || mkdir "m4"
-	[[ ${PV} == 9999 ]] && eautoreconf
+	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 src_configure() {
 	# bug 619762
 	append-cxxflags -std=c++14
 
-	econf \
-		--disable-werror \
-		$(use_with doc docs) \
-		$(use_enable static-libs static) \
+	local myeconfargs=(
+		--disable-werror
+		$(use_with doc docs)
+		$(use_enable static-libs static)
 		$(use_enable test tests)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/media-libs/libggi/Manifest b/media-libs/libggi/Manifest
index db5f31389f30..474ba704a863 100644
--- a/media-libs/libggi/Manifest
+++ b/media-libs/libggi/Manifest
@@ -1,3 +1,3 @@
 DIST libggi-2.2.2.src.tar.bz2 1071939 BLAKE2B e583ed802cffe825cec2575ee8d33e619ca5537c841380e12e4b5d07e485b4a3d515936d8b2f4763522b26c5302ccdd2de98810d85243408acaca64b04e520ac SHA512 ee2038dc64cea43994fa1ac716f1062462d17b0bbf30fd9a9d2762e7424a43fedc7c573178d9472738a5069ff3bf977ac26957c0c262c51cdf1065b616370975
-EBUILD libggi-2.2.2-r1.ebuild 1378 BLAKE2B 237bcf61189c4d71bd119cddc4c257eda453a64c7fcc02d41f3a7ef44a0e7de0f62d6624a9a6353e6f138fcdfd3bed6a7547e5216b671b4ac7c54626cd046a62 SHA512 80c83cdeeb852f91acdbf0eb9073796fb1617dd28107cedd877b85c04f1068f4004c79be532ee66b6cdcd8d5cb315d98e4b4b3a4fde0be4d16134a195548ac8e
+EBUILD libggi-2.2.2-r1.ebuild 1356 BLAKE2B cae94eb10740dc5715d14a6eac84de1f78f037ac5866cca5a8bed3be0d6d1a63cfcfcabe30095af6b4328261bab49d6a0946e420568c618ef824b2be26a59dcd SHA512 b92246d2ff896147d85d0434bf14711851f3db35cbd0cac37e121fba4abb1d5a3e7899aabaec3ce2a06a969216be70523270be01a97103a69db6db60994d1ab9
 MISC metadata.xml 386 BLAKE2B 8e5a70d9b2afb8a35826b2742206a4470427ba4daa42159129226374836cc5d3bb254c0e64411208d836aa5bf1e615a987bc93a6d5dd874c7ad309ccd8f7550b SHA512 9ce52c323ecbb57d46f69ecffd48a406b800078e8f67fcdb744dc9b86a3806c30455a1ccf144b139619388668cefb7250e1708581a5954862d695d5f284fe3c4
diff --git a/media-libs/libggi/libggi-2.2.2-r1.ebuild b/media-libs/libggi/libggi-2.2.2-r1.ebuild
index b1652dcd2d95..d6038fa440f3 100644
--- a/media-libs/libggi/libggi-2.2.2-r1.ebuild
+++ b/media-libs/libggi/libggi-2.2.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86"
 IUSE="3dfx aalib cpu_flags_x86_mmx debug fbcon svga vis X"
 
 RDEPEND=">=media-libs/libgii-1.0.2
diff --git a/media-libs/libggiwmh/Manifest b/media-libs/libggiwmh/Manifest
index 71c89fae1e7f..d00f9e2549eb 100644
--- a/media-libs/libggiwmh/Manifest
+++ b/media-libs/libggiwmh/Manifest
@@ -1,3 +1,3 @@
 DIST libggiwmh-0.3.2.src.tar.bz2 316669 BLAKE2B b14f8df0849bbe6e4a59d2285423238c3409bea3a00ecb066042df095ea8c7c4f75de9c4b3a79f0c1eacd436aae71b67be1e084dd23243dd3cfcaca5dd137077 SHA512 d12a9f158ba76ca8077568cd48f26f0fd8ab561b68cc33e74a8898f7fd594b417cd514806f827a63a4315c546bb35f5b71a5f54f5a2b54562f276e37146224b8
-EBUILD libggiwmh-0.3.2-r1.ebuild 770 BLAKE2B 8bdc69251f98179115ae5abd0f67f1e6855a8ba5c8c93e3af9ec886d8a94c76a25bd6c10fe36195128a06c13edfe804dca5edbfe81a7011945c8f0db1a40c3bb SHA512 1915dac3dced93e8dd5c69e166e60edff21a6d9d35bbea0a7f785b4eb4307704b44345ee43fdda354929b09aa752b4e459360db1f0345780dcbc95e7fbdc6580
+EBUILD libggiwmh-0.3.2-r1.ebuild 748 BLAKE2B bf8f8bf83e7f14aa82c76c8eb3b85e5ec73130362913803ac4d3b45d579dae7767121405642c21adbd12efb5eb6935addd727f8b06b92b481baaab360272460c SHA512 20db7278664a6e4787ab85c8b54d0db6d1519554a281ee75b8333a2b7b4a7a6692a8e3c236f08d7465e02eccb439c1c33483ef2aeefb37884c7e81fedfde5d64
 MISC metadata.xml 296 BLAKE2B 6b8887bb428a63d2f6b54f6c170ad69d9c5d41f718b6ab9cd3312748e4fa9a74a79c155343a6434525054fccd74838b93026ffad7ff30a067d0c45f683267797 SHA512 5e1f45111c1b86547646ddeb2b1c8435e10bb2743132325bfc156e560874a9871baf81e621004fc03bad3b32e7266894636916b292b096c25be80ba828c264fc
diff --git a/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild b/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild
index d4a322807f20..9daceffa1b52 100644
--- a/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild
+++ b/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="X"
 
 RDEPEND=">=media-libs/libggi-2.2.2
diff --git a/media-libs/libgii/Manifest b/media-libs/libgii/Manifest
index e1cbca853441..d91fecf5558e 100644
--- a/media-libs/libgii/Manifest
+++ b/media-libs/libgii/Manifest
@@ -2,5 +2,5 @@ AUX libgii-0.9.0-linux26-headers.patch 422 BLAKE2B 630d1c98cc2e9b5424dbc41d2453e
 AUX libgii-1.0.2-configure-cpuid-pic.patch 451 BLAKE2B 2a19985eda7c5cafaf40d68b20338193996d18cfaa11639e31ea2c38c3e4eda5808c8efbbb39b46dd9ad2570adabf0195b287c9307a603c2e5497e6f5dfb1074 SHA512 94aa2b1996ac7ccc1275853c72bda6a0f050c79010354d87dd551484c8bf3fb8eaa2cbc6b13620cb317bddc9da938c3106af71e2f0da70f9b62db7e27c404743
 AUX libgii-1.0.2-libtool_1.5_compat.patch 468 BLAKE2B 32d18ef7cfa6e14be36e8eeccf321a988990b3f48caa422ec07988dd8cde0d4c5c1ae7233700c696e45933b56f7555a1b00efd1062be1f4f5d73074b1695cea7 SHA512 c7c2d3cd91ba91cdc60778f5d599f2ee428c3b41a213193f733c4fe86b8e2a778009f8816d6314ad7519e5732065cf51016441306bb05f7ba669ef4000769312
 DIST libgii-1.0.2.src.tar.bz2 701099 BLAKE2B 29e23c4f0b0045e05dac855bba10d03e5b38cc3b2fdd494892c52954b4c4bbd990148aff98540bef73048ae26bab79db3369e7731707bfa4eab2b39d256681ad SHA512 d45b236e08bb8c6a7a7741ae694650dfc5681712a174f923c9132c41acb388d0d6dbc5589104a7a6bc73c98088f2b5967ee726d83c1f3e913602661c8d30bf07
-EBUILD libgii-1.0.2-r2.ebuild 1259 BLAKE2B 468754125626dd72b21c39f7e463a55bbbc8376386d0c9663929833600cd09a9e817fd598b4c9e1ca0bc90fb76ee80a2307369f6f310bcdf9c77ffa945f0fa38 SHA512 90f35f055e20d3b0e8eb0ede452aa2b158cf779d4067b4fde036bafdba9a31915932d55336b770348ed7fa604d51989badf6e7e5434722b6ee9193ba7c6f8ade
+EBUILD libgii-1.0.2-r2.ebuild 1237 BLAKE2B 9f663c009787833cc7186a5c2b9999f4bfa236bcf6a2d84fc83bcae9d9fde889df13a573bf0c82f13a09e6fa9b9c0f25128222e355ab3369ba516088d4142c2d SHA512 5a4e04455efab1c484b101f060ec76ee21bf455c1df956fca88a5dbe33349b430a0db838efbf5a610ef4a543fe125ba2e74558e96d918d412e81d0797a4c7016
 MISC metadata.xml 296 BLAKE2B 6b8887bb428a63d2f6b54f6c170ad69d9c5d41f718b6ab9cd3312748e4fa9a74a79c155343a6434525054fccd74838b93026ffad7ff30a067d0c45f683267797 SHA512 5e1f45111c1b86547646ddeb2b1c8435e10bb2743132325bfc156e560874a9871baf81e621004fc03bad3b32e7266894636916b292b096c25be80ba828c264fc
diff --git a/media-libs/libgii/libgii-1.0.2-r2.ebuild b/media-libs/libgii/libgii-1.0.2-r2.ebuild
index 7e32b4039f7c..7b3bf87be60d 100644
--- a/media-libs/libgii/libgii-1.0.2-r2.ebuild
+++ b/media-libs/libgii/libgii-1.0.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index a08b7a0bbb23..bf4434decf83 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,11 +1,4 @@
-<<<<<<< HEAD
-AUX libglvnd-1.1.1-Add-pkg-config-files-for-EGL-GL-GLES-and-GLX.patch 6596 BLAKE2B 0528a825fbbfe8c7530e841c1542a9a4d3e08159abc379f09df3789ccbde583243c1ed478ab14638ffef7b7949090a24b2a9204cb5b4641f8b9bef4e1540bd3d SHA512 5c3ea6d4f0c683945ff2178fe43cc2ac3876bba5f66dc9291a8129213ba3235a732fe86b53bfeeb5df08134ed782967027b7387c12e9bc1a1be795e0c1400a55
-DIST libglvnd-1.1.1.tar.gz 1851222 BLAKE2B 58a6e997b64bd22c4af0136fb37959f45df4a738bfcff205d7efb7ac08e7897a19164cb36f11d556c5a1bd3d46f0f1df3f89a36b7352b8a880c3570b2cf462cf SHA512 9106ae3cd3bdce8f4def3c7e08645f76e1a65f51e184510088e79b834899061d357422376e0efd56e1bc9dc7d3150f74837f43bd3e6c4c44faa3859844ab21b7
 DIST libglvnd-1.2.0.tar.gz 2030275 BLAKE2B b6b147f431ba9a177be9eada7af0e4ffc05c412e29f3a257746d74ff99078ecf87f7e66a97f7c1ce2779b3224bf3e7d1c4ab57c437074ae754e646c9275dae7f SHA512 f09a3ab3f1ba7397616cf2b0baf4385bd2127abb06817f8b383549cb21f36802be24a29598d7bfdd4c410b9ea95335b4ffc52529824dc88a719af52432c6b74c
-EBUILD libglvnd-1.1.1-r1.ebuild 1050 BLAKE2B e01e103c7c4a719cfce84ffd9fe061646cecaac2a3cbdb34fbdf316f373c3f25c3dc398d3437aba41887a08c454f1c6799ff9221bee2d4c31a6f9ee5108d237a SHA512 fb754f35e79185a66351fbe62e82d4613a9c2a218c05354d58d5648e1358a3f29ae3018bfafcaa7487bec3a528c7354f16d57d16733563473138f35a868e034c
-=======
-DIST libglvnd-1.2.0.tar.gz 2030275 BLAKE2B b6b147f431ba9a177be9eada7af0e4ffc05c412e29f3a257746d74ff99078ecf87f7e66a97f7c1ce2779b3224bf3e7d1c4ab57c437074ae754e646c9275dae7f SHA512 f09a3ab3f1ba7397616cf2b0baf4385bd2127abb06817f8b383549cb21f36802be24a29598d7bfdd4c410b9ea95335b4ffc52529824dc88a719af52432c6b74c
->>>>>>> next
 EBUILD libglvnd-1.2.0.ebuild 1155 BLAKE2B 9d48e9c1637a31fb33d99cf674c22c73f7e2b7d8a746d3644c8b6113fe982b9848f3936f4900aa312d30c89dc4b1898da4daba6ccfaab694fee37a728f63ef2f SHA512 40c9c5e70595266c6835bece0765191767b5e3811fe49e86e94821cb44914351f812c7f4e9c7619ec8892f165b669fc9001e29a9c866304a081d81a33313d455
 EBUILD libglvnd-9999.ebuild 1199 BLAKE2B 029902c0c826c0ee71314c1a9c24fe022a04327bf5addd80bc937e9007bcd4e043a29dd94de5810b4d385ecbb68229d27ac05aa51d9c7a1417a61076f77dda74 SHA512 9b84a3b424481d5c069444bb76e2d2c9572b058e245ef4145a6833ad891b6aac3e95417e5c844da7ee7ec2fc8471871bba4dc4441f02c2e21308482def70169d
 MISC metadata.xml 314 BLAKE2B 34c95a3e321c3059bca39c7beb5b7b15e8085b54affb267947fb3676018fa183040a157716e979c5e0381acdea6e738294b37841e75da308c3632fb3587dec33 SHA512 fa12f7fa880b0721baf2eb40b9fd8a68e51c143dd8ede7a199c5afcd5a208f84c51a80fc1f4bc68b266338bac8bf4137b2443d88567150f2c54b2f11913df89c
diff --git a/media-libs/libglvnd/files/libglvnd-1.1.1-Add-pkg-config-files-for-EGL-GL-GLES-and-GLX.patch b/media-libs/libglvnd/files/libglvnd-1.1.1-Add-pkg-config-files-for-EGL-GL-GLES-and-GLX.patch
deleted file mode 100644
index 02996f4f3d34..000000000000
--- a/media-libs/libglvnd/files/libglvnd-1.1.1-Add-pkg-config-files-for-EGL-GL-GLES-and-GLX.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-From 0dfaea2bcb7cdcc785f95e244223bd004a2d7fba Mon Sep 17 00:00:00 2001
-From: Kyle Brenneman <kbrenneman@nvidia.com>
-Date: Tue, 3 Sep 2019 08:13:34 -0600
-Subject: [PATCH] Add pkg-config files for EGL, GL, GLES, and GLX.
-
-This preserves the names from Mesa's gl, glesv1_cm, glesv2, and egl pkgconfig
-data, and for compatibility with that, gl.pc gives you libGL.
-
-Also added glx.pc and opengl.pc for libglvnd's libGLX and libOpenGL libraries.
-If newer applications want to explicitly depend on libGLX and the appropriate
-rendering API they can ask for the new pkgconfig names.
-
-Note that the version numbers in each file are the API versions that each
-library exposes, not the libglvnd package version.
----
- configure.ac               |  6 ++++++
- src/EGL/Makefile.am        |  3 +++
- src/EGL/egl.pc.in          | 10 ++++++++++
- src/GL/Makefile.am         |  3 +++
- src/GL/gl.pc.in            | 10 ++++++++++
- src/GLESv1/Makefile.am     |  2 ++
- src/GLESv1/glesv1_cm.pc.in | 10 ++++++++++
- src/GLESv2/Makefile.am     |  2 ++
- src/GLESv2/glesv2.pc.in    | 10 ++++++++++
- src/GLX/Makefile.am        |  2 ++
- src/GLX/glx.pc.in          | 10 ++++++++++
- src/OpenGL/Makefile.am     |  2 ++
- src/OpenGL/opengl.pc.in    | 10 ++++++++++
- 13 files changed, 80 insertions(+)
- create mode 100644 src/EGL/egl.pc.in
- create mode 100644 src/GL/gl.pc.in
- create mode 100644 src/GLESv1/glesv1_cm.pc.in
- create mode 100644 src/GLESv2/glesv2.pc.in
- create mode 100644 src/GLX/glx.pc.in
- create mode 100644 src/OpenGL/opengl.pc.in
-
-diff --git a/configure.ac b/configure.ac
-index cdbb138..7feec30 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -324,11 +324,17 @@ AC_CONFIG_FILES([Makefile
-                  include/Makefile
-                  src/Makefile
-                  src/GL/Makefile
-+                 src/GL/gl.pc
-+                 src/OpenGL/opengl.pc
-                  src/OpenGL/Makefile
-+                 src/GLESv1/glesv1_cm.pc
-                  src/GLESv1/Makefile
-+                 src/GLESv2/glesv2.pc
-                  src/GLESv2/Makefile
-+                 src/GLX/glx.pc
-                  src/GLX/Makefile
-                  src/EGL/Makefile
-+                 src/EGL/egl.pc
-                  src/GLdispatch/Makefile
-                  src/GLdispatch/vnd-glapi/Makefile
-                  src/util/Makefile
-diff --git a/src/EGL/Makefile.am b/src/EGL/Makefile.am
-index 5c036dc..c55c83e 100644
---- a/src/EGL/Makefile.am
-+++ b/src/EGL/Makefile.am
-@@ -106,3 +106,6 @@ g_egldispatchstubs.c : $(GENERATE_DEPS)
- g_egldispatchstubs.h : $(GENERATE_DEPS)
- 	$(AM_V_GEN)$(PYTHON) $(GENERATE_DISPATCH_SCRIPT) header $(GENERATE_LIST_FILES) > $@
- endif
-+
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = egl.pc
-diff --git a/src/EGL/egl.pc.in b/src/EGL/egl.pc.in
-new file mode 100644
-index 0000000..ffae9e2
---- /dev/null
-+++ b/src/EGL/egl.pc.in
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=${prefix}
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: egl
-+Description: EGL library and headers
-+Version: 1.5
-+Libs: -L${libdir} -lEGL
-+Cflags: -I${includedir}
-diff --git a/src/GL/Makefile.am b/src/GL/Makefile.am
-index ecdcbd0..225fdcb 100644
---- a/src/GL/Makefile.am
-+++ b/src/GL/Makefile.am
-@@ -70,3 +70,6 @@ libGL_la_LIBADD += ../GLdispatch/libGLdispatch.la
- libGL_la_LIBADD += ../GLdispatch/vnd-glapi/libglapi_gl.la
- libGL_la_LIBADD += ../util/libutils_misc.la
- libGL_la_LIBADD += @LIB_DL@
-+
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = gl.pc
-diff --git a/src/GL/gl.pc.in b/src/GL/gl.pc.in
-new file mode 100644
-index 0000000..0eaa149
---- /dev/null
-+++ b/src/GL/gl.pc.in
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=${prefix}
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: gl
-+Description: Legacy OpenGL and GLX library and headers
-+Version: 1.2
-+Libs: -L${libdir} -lGL
-+Cflags: -I${includedir}
-diff --git a/src/GLESv1/Makefile.am b/src/GLESv1/Makefile.am
-index d20017d..88e07bc 100644
---- a/src/GLESv1/Makefile.am
-+++ b/src/GLESv1/Makefile.am
-@@ -38,3 +38,5 @@ libGLESv1_CM_la_LIBADD = \
- 	../GLdispatch/vnd-glapi/libglapi_glesv1.la \
- 	../util/libutils_misc.la
- 
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = glesv1_cm.pc
-diff --git a/src/GLESv1/glesv1_cm.pc.in b/src/GLESv1/glesv1_cm.pc.in
-new file mode 100644
-index 0000000..daa247f
---- /dev/null
-+++ b/src/GLESv1/glesv1_cm.pc.in
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=${prefix}
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: glesv1_cm
-+Description: OpenGL ES-CM v1 library and headers
-+Version: 1.0
-+Libs: -L${libdir} -lGLESv1_CM
-+Cflags: -I${includedir}
-diff --git a/src/GLESv2/Makefile.am b/src/GLESv2/Makefile.am
-index a9c2351..f40e06f 100644
---- a/src/GLESv2/Makefile.am
-+++ b/src/GLESv2/Makefile.am
-@@ -38,3 +38,5 @@ libGLESv2_la_LIBADD = \
- 	../GLdispatch/vnd-glapi/libglapi_glesv2.la \
- 	../util/libutils_misc.la
- 
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = glesv2.pc
-diff --git a/src/GLESv2/glesv2.pc.in b/src/GLESv2/glesv2.pc.in
-new file mode 100644
-index 0000000..a9fe839
---- /dev/null
-+++ b/src/GLESv2/glesv2.pc.in
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=${prefix}
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: gles2
-+Description: OpenGL ES v2/v3 library and headers
-+Version: 3.2
-+Libs: -L${libdir} -lGLESv2
-+Cflags: -I${includedir}
-diff --git a/src/GLX/Makefile.am b/src/GLX/Makefile.am
-index 030836b..0d19674 100644
---- a/src/GLX/Makefile.am
-+++ b/src/GLX/Makefile.am
-@@ -69,3 +69,5 @@ libGLX_la_SOURCES = \
- 	libglxmapping.c \
- 	libglxproto.c
- 
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = glx.pc
-diff --git a/src/GLX/glx.pc.in b/src/GLX/glx.pc.in
-new file mode 100644
-index 0000000..1561181
---- /dev/null
-+++ b/src/GLX/glx.pc.in
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=${prefix}
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: glx
-+Description: GLX library and headers
-+Version: 1.4
-+Libs: -L${libdir} -lGLX
-+Cflags: -I${includedir}
-diff --git a/src/OpenGL/Makefile.am b/src/OpenGL/Makefile.am
-index 647d9e4..4b34dd5 100644
---- a/src/OpenGL/Makefile.am
-+++ b/src/OpenGL/Makefile.am
-@@ -47,3 +47,5 @@ libOpenGL_la_LIBADD = \
- 	../GLdispatch/vnd-glapi/libglapi_opengl.la \
- 	../util/libutils_misc.la
- 
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = opengl.pc
-diff --git a/src/OpenGL/opengl.pc.in b/src/OpenGL/opengl.pc.in
-new file mode 100644
-index 0000000..d560c06
---- /dev/null
-+++ b/src/OpenGL/opengl.pc.in
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=${prefix}
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: opengl
-+Description: OpenGL (without GLX) headers and interface
-+Version: 4.5
-+Libs: -L${libdir} -lOpenGL
-+Cflags: -I${includedir}
--- 
-2.21.0
-
diff --git a/media-libs/libglvnd/libglvnd-1.1.1-r1.ebuild b/media-libs/libglvnd/libglvnd-1.1.1-r1.ebuild
deleted file mode 100644
index 090fdd736c49..000000000000
--- a/media-libs/libglvnd/libglvnd-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2018-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://github.com/NVIDIA/${PN}.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-inherit autotools ${GIT_ECLASS} multilib-minimal python-any-r1
-
-DESCRIPTION="The GL Vendor-Neutral Dispatch library"
-HOMEPAGE="https://github.com/NVIDIA/libglvnd"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/NVIDIA/${PN}/releases/download/v${PV}/${P}.tar.gz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	!media-libs/mesa[-libglvnd(-)]
-	!<media-libs/mesa-19.2.0_rc1
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	"
-DEPEND="${PYTHON_DEPS}
-	${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-Add-pkg-config-files-for-EGL-GL-GLES-and-GLX.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf
-}
-
-multilib_src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-multilib_src_test() {
-	emake check
-}
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 61f3ec7b4d7e..030fb5b57f0a 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,5 +1,5 @@
 DIST libgphoto2-2.5.20.tar.bz2 7290524 BLAKE2B 0b616863fa74430f16d96a37955f655620a88fb2df2220fbe9337eb0f61b7babd9d36e1f1d58f45ca617c57feab93e9714228eae54c742385c3e4b0fc3667ff5 SHA512 13364a8fdfe137a21ebf04dfd2b30b20c7fb652e11e1b98cd06176e9a1576ef8f67121523111395100ed39d1d3e6e5d6d458b86d58502f7056a1c06a5623640a
 DIST libgphoto2-2.5.22.tar.bz2 7169810 BLAKE2B d4947a4b5cf4a6f48ec619e0531ab29a035143031529436f566ade26d11b354328dc70e5d20533a3c023fd8b87afd0db9d85617fea9d06ee433137da6a1d9413 SHA512 8f02c460324c115810f56a9408ecba7aabb801947249c1ee79f0f0a1db1d785d34992508232bad7af112aed2dfc6b213365cee694dd0e7d5edf4072c63fa01cb
-EBUILD libgphoto2-2.5.20.ebuild 6211 BLAKE2B 7d3997b57e384300a92039756e999ba0c547563771859f04923cbf9fd21d03a8ee06a2be7f94dcc9fc79594f7a11f18be7fff03f6cc4f92a867dfd0e41870706 SHA512 26f1b44af1fa2575801da2b78339f17e539af77532b87f7b3c2e77bb4cb8e5e7673a25052941665a2454c320dc4a1df6c8d5cf43087da3bdd805bcf81804522f
-EBUILD libgphoto2-2.5.22.ebuild 6210 BLAKE2B 939c02b7ce8508a61e7387053d1972e7a989d820eded908fadfd971d195b12a53cfc81b052eea2c8f08384a276227447c82f2744fd187eaf5787f124efb56682 SHA512 ed29844dbbd72cdb6a9beffd2399af4031827075fd79ef8a17cb2862a37446cfe4768581bbd60510c5ca974f04ca5d302c58bbd58217142d1ededb9f81f1a769
+EBUILD libgphoto2-2.5.20.ebuild 6189 BLAKE2B 9596e72e751fa4dd92e6b9d76710d2f43adc3fab5eec4235d643addb36c5d1632990b59705a7677bca0f14f8c6df5a043aed8819a9cde1becf4c4a0c245fbd33 SHA512 4cf5cd7a96e3c751168e3ad16b556193ddacd9bb09114c97b3dcd18c7c17cf32103d04b00a1c0c61a8dcf333f4efe1d188cc913a4b5ca6207030adbb54c098b6
+EBUILD libgphoto2-2.5.22.ebuild 6188 BLAKE2B 60a0385303ef3475bb8e96bd61bea7fdeaeae71055303c6fb05bf450651866f2f9f78eb1b929c4fb86d25b4715e2e2e75f84f0ec8fcf0fd8ff11ed0e406ad607 SHA512 f4f613fc9111ec60c3c0152e46bc1ce61fde1649a1748aa604699ab12b9a26caddd6cca366f19c0d83a5a07f2753ad95ffa2b4ccb9be18420a690518a65eaecd
 MISC metadata.xml 520 BLAKE2B 113ca8821b8ba1d594d64f86facadebf238372742380ce99c6f3172712873d1ebb3d0bf32eb072d7af1771f6099f5bde84114d6e45468a0d33503fbbe393a19b SHA512 905b25e683f85a23323e1205c0492e3b955e11f9d93a9c9c360108ecdd3608fa2f9f4c2572444c0a4be0df3f5e350dd13ca4ebb5ca523c0fd70fed3f40e39ed0
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.20.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.20.ebuild
index 177492cd3233..45a8bc7ef47f 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.20.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.20.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild
index ae1ae90567d3..6d4fc0766e01 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index 2f338ee08217..c57158c93da5 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,7 +1,11 @@
 AUX libheif-1.3.2-openjpeg-2.patch 2512 BLAKE2B 165576cb3da35534a9e628f3dfb3c47b52718109ffb3582acfde093a22284053fd1e7986216f670491652f1362011409888084b37a79777e393002b1d9ea7237 SHA512 c8bb96ef7091d2f0e46bbe61e05a30e8a3e93f7b5925d45a30a045cac39e26000c04166d5ea0417ebf530b8bff5992de0b46ca112041e1aa87ecf7eb5928e844
 DIST libheif-1.3.2.tar.gz 1328174 BLAKE2B 4c0f82bb90d48f89a4ce9aed525c5823bb5d008e54e580e761f6fa4f5493f265929a0607e7b81046ba7c249bd2ca21a0c5ab91da83b7e7f3a2a63e8f24df88ed SHA512 bcc8b4b2522ef6fe68f5a9ffd5312c2c8f6bc3718394eef1860e199c30fb735bb214f665ed6480b5f5fe5d578b3ed77a4301af93775ae2349ba5038b3f3ef63a
 DIST libheif-1.4.0.tar.gz 1366030 BLAKE2B a93b3b59a4f89e0aa5a5069fdebc54b9d09adeeff05ebf28b9535baa2fb26e4122b4c5d96b7015fdd181720f10e3dd0887038f0c5567c94509aa76d2ef119dd9 SHA512 fc48caaadb71ffa87227de75c9e13d5006c66f1c966ce454552defb8947999f5242a9bbd1413f58be1ccbf61df7f118defe96d67376e3b4e7b12fe5dfa0fe0c7
+DIST libheif-1.4.1.tar.gz 950721 BLAKE2B 39793dbf4334b7ca93993ba518f9c935eb6d29a2debea12a3f1727d245572945e456b7997d79403da53bb5701ee62af8235a9815221402e5b901d9c07aa015a0 SHA512 c6e7d00c040885c506dde40469ba51b0346126689ed238abce123b471f748431cb29914015b3ca97749855a0f1f7c8e9a58388d4468da3c2d17c7a3a15270af0
+DIST libheif-1.5.1.tar.gz 1510087 BLAKE2B 1dd5e913c8913c6b62b770653585f8ccf7cda14c4dd79ff2073bf085da4d730accaef8d0f8008ac941238a7e3e131add1a218e0c78a886847b3bcf253d66c9b6 SHA512 05e32ebff08d5f0e82e9b1107253c27882ae1694150033fe7b3ca07db8c64567f09002081276e92a3b490a63022a1522d577b094a7f489742139758d17f484b8
 EBUILD libheif-1.3.2-r1.ebuild 1253 BLAKE2B 2c16caae78c6ae8858ea3c9db14ca532768b10b7c748804c8e79705eb9f61cf59c2d8a4b40f633b2cdface010bdaa411370c057a541affb644f7d796d993bb8b SHA512 5851eeaf4b4f45414cf5c61c4a62685c40298e490353df573818f3467832c5bf712a82822e8c339234e15edd774b239d352dab0d8ca7ee7f2fcae55fb1e47d41
-EBUILD libheif-1.4.0.ebuild 1318 BLAKE2B 1b48eff2e13cef37b2fb31e9d816f0bd6d1e19bc293ca330c7d93b328699b6537da93aa508ab80d21920918a95227b7ae3d5da36e0989a935603041983c855e5 SHA512 3366e8ec40259561bc5b6a76a6c0093ae56c8b9fb10c0bd48b25eff0f3abcf4585754ab5af2ec37b416dc614f89a733554df29d3f643d9f097476b4ed8f9c565
-EBUILD libheif-9999.ebuild 1318 BLAKE2B 1b48eff2e13cef37b2fb31e9d816f0bd6d1e19bc293ca330c7d93b328699b6537da93aa508ab80d21920918a95227b7ae3d5da36e0989a935603041983c855e5 SHA512 3366e8ec40259561bc5b6a76a6c0093ae56c8b9fb10c0bd48b25eff0f3abcf4585754ab5af2ec37b416dc614f89a733554df29d3f643d9f097476b4ed8f9c565
+EBUILD libheif-1.4.0.ebuild 1325 BLAKE2B 727a9fa06e8be8dba18699868d68dc454052ba1d7d23fe700b0aebd8673801800e2656aa68955bdfd945533d72cf30ce9c927a11b814aec3e41c22ccbc6fe9e1 SHA512 7c2b033ca4906b9a913ee6d8954355caad882371e1cc65dfe6b2f5f1e376b1e3e2461c3cb9079655c22c1292f6c5666c0d602bd21efb8438c20139c2ae0e1f86
+EBUILD libheif-1.4.1.ebuild 1433 BLAKE2B c7b2773058f3158b8b41f71fd814eab2b72e1a59ecd14630c65a5932a65c4b50c1fe961d16e4a4586a97064273779aeb1665390085fc9250376193587f2543de SHA512 8aedeee2697ac95d078df28e575ad2b032443e72b4d92bb8aaca601f1d85dad5795106ee235ac94a02a6e2b0a7300fd25d461a5843f89b81f24065de4776eb75
+EBUILD libheif-1.5.1.ebuild 1430 BLAKE2B 22f4dc1704f359e3f8dbba6365a9c7c228a959ff59957a96f3a3cf99827bbec8355ef6b9e6f12d8e5f819272cd3233158ce4379965ca54ef01c229a547e3d24a SHA512 ec9eb1aa4c8e071bc237668e50400658059939cfb3bf081dc44686c84cf7a8dcd195bb1ff9ae2ee172e48a44f6b400f60921ea63ce054337e9b48d8587fbd178
+EBUILD libheif-9999.ebuild 1433 BLAKE2B d081d416eda7b42dc78e5d14b25cd4587b9c9052a5ea16f9d5a9d865f7b8e1e88cdbc615f4520ffa7a475e5e5db0ffd2f336b1129ad32e5d8374fc867832fcaa SHA512 c58157d6add0a2160e3b05e4f170706b8b3758a904bc798a1256d5b12c264a66dd94ba01cfa2789e0d35b7315add323d0cbc9781e470590838ba7db5a3998857
 MISC metadata.xml 369 BLAKE2B e85296d149b4ebfe852a79ed951dff87e3586617cac09f2e81bc501f2739599e7fda1835f1d677cd923a1324e4f6d85e4f1552eb0589511372dd603d239880c5 SHA512 70bbaa03beb93f3649271be35d4c90e7d79395efefd0cfb9915525a5c736629bcf56bd66e2d1bbf2a746c62a5f21ddb8874cdf28f61180fe9abc3ad22ab51fc8
diff --git a/media-libs/libheif/libheif-1.4.0.ebuild b/media-libs/libheif/libheif-1.4.0.ebuild
index a03be0af6d3d..4950607eb42b 100644
--- a/media-libs/libheif/libheif-1.4.0.ebuild
+++ b/media-libs/libheif/libheif-1.4.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
diff --git a/media-libs/libheif/libheif-1.4.1.ebuild b/media-libs/libheif/libheif-1.4.1.ebuild
new file mode 100644
index 000000000000..cdb69afd0939
--- /dev/null
+++ b/media-libs/libheif/libheif-1.4.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools xdg-utils multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/strukturag/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
+HOMEPAGE="https://github.com/strukturag/libheif"
+
+LICENSE="GPL-3"
+SLOT="0/1.4"
+IUSE="static-libs test +threads"
+
+BDEPEND="test? ( dev-lang/go )"
+DEPEND="
+	media-libs/libde265:=[${MULTILIB_USEDEP}]
+	media-libs/libpng:0=[${MULTILIB_USEDEP}]
+	media-libs/x265:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	virtual/jpeg:0=[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i -e 's:-Werror::' \
+		configure.ac || die
+
+	eautoreconf
+
+	# prevent "stat heif-test.go: no such file or directory"
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable threads multithreading)
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+}
diff --git a/media-libs/libheif/libheif-1.5.1.ebuild b/media-libs/libheif/libheif-1.5.1.ebuild
new file mode 100644
index 000000000000..9ec9a7f716d2
--- /dev/null
+++ b/media-libs/libheif/libheif-1.5.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools xdg-utils multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/strukturag/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="amd64 arm64 x86"
+fi
+
+DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
+HOMEPAGE="https://github.com/strukturag/libheif"
+
+LICENSE="GPL-3"
+SLOT="0/1.5"
+IUSE="static-libs test +threads"
+
+BDEPEND="test? ( dev-lang/go )"
+DEPEND="
+	media-libs/libde265:=[${MULTILIB_USEDEP}]
+	media-libs/libpng:0=[${MULTILIB_USEDEP}]
+	media-libs/x265:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	virtual/jpeg:0=[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i -e 's:-Werror::' \
+		configure.ac || die
+
+	eautoreconf
+
+	# prevent "stat heif-test.go: no such file or directory"
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable threads multithreading)
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+}
diff --git a/media-libs/libheif/libheif-9999.ebuild b/media-libs/libheif/libheif-9999.ebuild
index a03be0af6d3d..0d11fc08e5b2 100644
--- a/media-libs/libheif/libheif-9999.ebuild
+++ b/media-libs/libheif/libheif-9999.ebuild
@@ -3,21 +3,21 @@
 
 EAPI="7"
 
-inherit autotools multilib-minimal
+inherit autotools xdg-utils multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/strukturag/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
 HOMEPAGE="https://github.com/strukturag/libheif"
 
 LICENSE="GPL-3"
-SLOT="0/1.4"
+SLOT="0/1.5"
 IUSE="static-libs test +threads"
 
 BDEPEND="test? ( dev-lang/go )"
@@ -56,3 +56,11 @@ multilib_src_install_all() {
 		find "${ED}" -name "*.a" -delete || die
 	fi
 }
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+}
diff --git a/media-libs/libid3tag/Manifest b/media-libs/libid3tag/Manifest
index f0cc66ead166..122f99560ba0 100644
--- a/media-libs/libid3tag/Manifest
+++ b/media-libs/libid3tag/Manifest
@@ -9,5 +9,5 @@ AUX 0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch 583 BLAKE
 AUX id3tag.pc 222 BLAKE2B 3ad47be06f4752c8398f12a598e2955e8164bd633681995aa1aee925a335a0f8472a91288a13374ce8db6b1c554b6c1077c3ee1b6c713e455136f9ed0dc91142 SHA512 591fdff509376a3afeb43d6dc7f9063f2388d024494952d366dae2ba8ffc3d2d5e430e0ad7470951d6c740f794529994b882d12840ff06d2fffffe70c2feae84
 AUX libid3tag-0.15.1b-fix-signature.patch 424 BLAKE2B f3dce1cb1372f175758b7c48b3ee3a6f1c95c840f7103116f9ea3ef805c5aa186c2c87747f02cb67fda1e4c13c806c5a0b32b304c2f66941fddac0942761b62e SHA512 3f320d1d8719afd84aa0cf2a9e5615f3f535f84d1987f12df0a9d3f2b7c02e2c87fbc3aa41d538cdc4f8a30e629de6f3fc3a4e79f23448fd39d4c0c438c803fb
 DIST libid3tag-0.15.1b.tar.gz 338143 BLAKE2B a4e4e66177eae9aaa251c71d605034488fdd9a0a207a41a41f85793ecbb763dd4a4c8f01183eb45a5c8563c4ad120e73b29578fd4c3bb8e467e39c5427b530b5 SHA512 ade7ce2a43c3646b4c9fdc642095174b9d4938b078b205cd40906d525acd17e87ad76064054a961f391edcba6495441450af2f68be69f116549ca666b069e6d3
-EBUILD libid3tag-0.15.1b-r4.ebuild 1640 BLAKE2B 2f24a8169dd1872e415e79cd27a565394e0603a4ce6c2bbe2ff90817e49e74390ef4546e622b2e3edbf51f7b1a9d1bf4c52795afdc7a33c8ae6a31a19fb0a8f0 SHA512 419a138bd154474eba12f17e6593241c050c53c6e447a90dcf1db97ce4ed8e4ea0770846073f0899d8a2eb11f7081ea82a953cecd56fc1e222f2fca66817b993
+EBUILD libid3tag-0.15.1b-r4.ebuild 1618 BLAKE2B 9ab8e36538eafb82efdaa914eafb02dab1ca9450b8385a851ce53073c73fd4b76a495984e981a045dfd805f55f3adb24dc2762ccac0c15efa4b97a9b6378504b SHA512 ee91f687bb0353bd017763c0ffc79477a5dbdfa9c21b4a662216042734452255c5924f861b823901d2c46b1ef52d9bd40a803af51f7bdc91bd750d6bae228a51
 MISC metadata.xml 326 BLAKE2B a9064ce28313804fb873d3e0b4fcb96681a2fcdcf60011d629268f73ab47f6c00ff6e0d95d2d075ec6af89bbe7aea4b6346ef2500815f08a69318a8736e7201d SHA512 b6c3a0765c5d00fd44caf7266edb75a373d8d4e813ac7f68507067f57713090fdc84f95886e73401d9c912f7f64453c975117030692526a49aebd6f5276751c9
diff --git a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild b/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
index 1b98abd5cf02..0a3a7443ad69 100644
--- a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
+++ b/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libiec61883/Manifest b/media-libs/libiec61883/Manifest
index 22126e57b132..00f5242de2fc 100644
--- a/media-libs/libiec61883/Manifest
+++ b/media-libs/libiec61883/Manifest
@@ -1,3 +1,3 @@
 DIST libiec61883-1.2.0.tar.xz 233640 BLAKE2B c1fdd4d6fbfd96eea9f1c22b20a1e71e4cafbe064091ef6211d097342f8751955f2d8a68cb3e5235d733f7ecd3725144abb329331bfa3497be1911bb8773d4a9 SHA512 817177081a229c6253340e5911369aab746bd657d5b3d6a1ef3cf639cceee667bdb677fb0536163468cc9e719c4e81c6beaf42c93e5a56eb52684964b6dd1e23
-EBUILD libiec61883-1.2.0-r1.ebuild 930 BLAKE2B 7301b691a29d27c1a1763f31da6edf6510190fd985b5f3175303fb5f2df8721ed97d8e372d9d1afe359910b3a78865061c0a82def58444faf736456c46605b09 SHA512 ac5bcaa9943e5227ba7e485cd84bb3f8525ef690e0a6b98aa20489f58cf9e164836e03097c4894e502b258eebb2c8ac61fba285ecdc3387337292589f6380ffe
+EBUILD libiec61883-1.2.0-r1.ebuild 941 BLAKE2B 843c8909c544e230c8020f1c249f54266adae9a1944363951d100ae1d0fcd4bc35f9524da4f5899867993457e60b2bcedeadca9af01c533ce93cb5509433c198 SHA512 adc1927a676cf66872c7a33c6ed64a5d53904f6dde1229b4232107a8789c92fc43604d69a699c9ae5b87a061b0f5b34a55bc5c774fa251988291af24e3a638cd
 MISC metadata.xml 531 BLAKE2B b3f4a2efce5fb0eb30e14c02ab34a58d4dd4e38b7b5a8b799816fa4ac50fec6e2656652629f351388519f6bf05275448f22fd10b4565884c12bdf054130639d1 SHA512 bbf4b45023f2a7f1ed7769fa4513cc13ec9697eeb677fde7ec882f5f787e00d0b291ef6be1c2d0ace4d35059782d85678c9ac38f8913ffd63f35a82ebfcab933
diff --git a/media-libs/libiec61883/libiec61883-1.2.0-r1.ebuild b/media-libs/libiec61883/libiec61883-1.2.0-r1.ebuild
index 95c6b28fc0ca..ec9bbdec376e 100644
--- a/media-libs/libiec61883/libiec61883-1.2.0-r1.ebuild
+++ b/media-libs/libiec61883/libiec61883-1.2.0-r1.ebuild
@@ -7,7 +7,7 @@ inherit autotools-multilib eutils unpacker autotools
 
 DESCRIPTION="Library for capturing video (dv or mpeg2) over the IEEE 1394 bus"
 HOMEPAGE="http://dennedy.org/cgi-bin/gitweb.cgi?p=dennedy.org/libiec61883.git"
-SRC_URI="mirror://kernel/linux/libs/ieee1394/${P}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/libs/ieee1394/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 GPL-2 )"
 SLOT="0"
diff --git a/media-libs/libipod/Manifest b/media-libs/libipod/Manifest
deleted file mode 100644
index 44eb81f0192c..000000000000
--- a/media-libs/libipod/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX libipod-0.1-prototypes.patch 2814 BLAKE2B c1fa7a30923b064d9bf9f44360e7a6f310286b2973469049a97bf4a8c83ce52aa5c60adfd41e18f7945bb106ba41fc01a58bc533be436500d8ccd97a9efdf2ce SHA512 9281ed1af8accbffc64f2a89ac1c42866925446d4516f022dd5e7e12cd02c3bdf6cca7477f7496775e288137e464300b384f8eecef48e0071a4d8e3d5a15fb14
-DIST libipod-0.1.tgz 396009 BLAKE2B 36f08693acb126f1c39eadeb1a483319f7b28ce8d386aa8ec064a01449e2d370455e68f4a18f43b05c822dfb98aeee3b96bb4f87b01c7d490eff6da7857e3a79 SHA512 88f5a27406f5137d70bbb04ecb56614591c71a7eac09e4a94de2b68e3625cf6771c2ddb90107e6acf402ec70d7bf263ecb0c6de5d79d359f0cfff68248feac2c
-EBUILD libipod-0.1.ebuild 552 BLAKE2B 6a33fec3723e8b834ce7a57a727c62e963199dca7402859493ecad08fb4f34db759fd8980403fcfcbe751089cd898c941d6bac26c91100ffa2c526eed6186002 SHA512 6fbb2cad21979296b64ef68c013028e448763b954290d830c92151363e5bab5cee3bab8bebd01f0567ffea5ea9e3315abf945348024853bceff1ab1cfc2e86ad
-MISC metadata.xml 244 BLAKE2B a142221e20a57c5b548d5e3ae7423c1e855495e97c6a2de7742e9d4a788eb17474488e40950949eddb5ab741743a56edfed5b4f50e9735c0a8369cff465361bb SHA512 9dce6a8c83e25dc96b4e4369b1afd8ec3cf0f8772acdcb00a57f0c1445ce8ec8c5f06a8cf5c8e1444eb498c5388816a9c1b749e169d3a5f81464146e1ee5689c
diff --git a/media-libs/libipod/files/libipod-0.1-prototypes.patch b/media-libs/libipod/files/libipod-0.1-prototypes.patch
deleted file mode 100644
index dc6106894128..000000000000
--- a/media-libs/libipod/files/libipod-0.1-prototypes.patch
+++ /dev/null
@@ -1,101 +0,0 @@
---- libipod-0.1/src/ipod_atom_list.c
-+++ libipod-0.1/src/ipod_atom_list.c
-@@ -23,6 +23,7 @@
- #include <ipod/ipod_memory.h>
- #include <ipod/ipod_constants.h>
- #include "ipod_atom.h"
-+#include <string.h>
-  
- static long ipod_atom_list_allocs;
- static long ipod_atom_list_frees;
---- libipod-0.1/src/ipod_atom_mhod.c
-+++ libipod-0.1/src/ipod_atom_mhod.c
-@@ -30,6 +30,7 @@
- #include "ipod_atom_mhlt.h"
- #include "ipod_atom_mhit.h"
- #include "ipod_private_constants.h"
-+#include <string.h>
- 
- static void ipod_atom_init_mhod(uint32_t version,void *data)
- {
---- libipod-0.1/src/ipod.c
-+++ libipod-0.1/src/ipod.c
-@@ -37,6 +37,7 @@
- #include "ipod_atom_mhod.h"
- #include "ipod_atom_mqed.h"
- #include "ipod_atom_pqed.h"
-+#include <string.h>
- #include <sys/stat.h>
- #include <sys/statfs.h>
- #include <dirent.h>
---- libipod-0.1/src/ipod_file_utils.c
-+++ libipod-0.1/src/ipod_file_utils.c
-@@ -21,6 +21,8 @@
- 
- #include <ipod/ipod_file_utils.h>
- #include <ipod/ipod_error.h>
-+#include <ipod/ipod_memory.h>
-+#include <string.h>
- #include <stdio.h>
- #include <sys/types.h>
- #include <sys/stat.h>
---- libipod-0.1/src/ipod_io_memory.c
-+++ libipod-0.1/src/ipod_io_memory.c
-@@ -21,6 +21,7 @@
- 
- #include <ipod/ipod_io_memory.h>
- #include <ipod/ipod_memory.h>
-+#include <string.h>
- 
- #define MEMORY_CHUNK_SIZE 8192
- #define IPOD_IO_MEMORY_MAGIC 0x05675309
---- libipod-0.1/src/ipod_string.c
-+++ libipod-0.1/src/ipod_string.c
-@@ -23,6 +23,7 @@
- #include <ipod/ipod_memory.h>
- #include <ipod/ipod_error.h>
- #include <stdio.h>
-+#include <string.h>
- 
- static unsigned long ipod_string_allocs;
- static unsigned long ipod_string_frees;
---- libipod-0.1/src/ipod_track_add.c
-+++ libipod-0.1/src/ipod_track_add.c
-@@ -26,6 +26,7 @@
- #include <ipod/ipod_constants.h>
- #include <ipod/ipod_error.h>
- #include <stdio.h>
-+#include <string.h>
- 
- extern ipod_track_t ipod_track_from_m4a(ipod_t ipod,ipod_io io);
- extern ipod_track_t ipod_track_from_mp3(ipod_t ipod,ipod_io io);
---- libipod-0.1/examples/teststrings.c
-+++ libipod-0.1/examples/teststrings.c
-@@ -6,6 +6,7 @@
- #include <ipod/ipod_string.h>
- #include <ipod/ipod_memory.h>
- #include <stdio.h>
-+#include <string.h>
- 
- void compare(const char *testDesc,const char *s1,const char *s2,size_t numBytes)
- {
---- libipod-0.1/src/ipod_track_from_mp3.c
-+++ libipod-0.1/src/ipod_track_from_mp3.c
-@@ -25,6 +25,7 @@
- #include <ipod/ipod_constants.h>
- #include <ipod/ipod_string.h>
- #include <ipod/ipod_error.h>
-+#include <ipod/ipod_memory.h>
- #include <stdio.h>
- 
- #define IPOD_MPEG_VERSION_1		3
---- libipod-0.1/src/ipod_atom_mhyp.c
-+++ libipod-0.1/src/ipod_atom_mhyp.c
-@@ -29,6 +29,7 @@
- #include "ipod_atom_mhsd.h"
- #include "ipod_atom_mhbd.h"
- #include "ipod_atom_mhlt.h"
-+#include "ipod_atom_mhit.h"
- #include "ipod_private_constants.h"
- 
- static void ipod_atom_init_mhyp(uint32_t version,void *data)
diff --git a/media-libs/libipod/libipod-0.1.ebuild b/media-libs/libipod/libipod-0.1.ebuild
deleted file mode 100644
index d63d93a2fa69..000000000000
--- a/media-libs/libipod/libipod-0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="lightweight and fast library written in C for managing Apple iPods"
-HOMEPAGE="http://libipod.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libipod/${P}.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-prototypes.patch
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/media-libs/libipod/metadata.xml b/media-libs/libipod/metadata.xml
deleted file mode 100644
index cdaccdfae7a8..000000000000
--- a/media-libs/libipod/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">libipod</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-libs/libjackasyn/Manifest b/media-libs/libjackasyn/Manifest
deleted file mode 100644
index 6248ce3e9241..000000000000
--- a/media-libs/libjackasyn/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX libjackasyn-0.13-execprefix.patch 449 BLAKE2B dbc7a75a5f0f09950a3357fb76b3241057f4acec90dfec95e4d0128da40f9c7474abc91e876823fca02f468efe920044d9379a7930ab9a053c8c71d4b00a4357 SHA512 95af9c7b2c154ad55177a5ae6272c615ec262072d1d975a143ac1f6b7935e8016bfa6609dd281ba3a9180c53f4d448a09fd1cbb2998fcedbdb33a3864e43ef54
-AUX libjackasyn-0.13-libdir.patch 715 BLAKE2B 49c5456d25347679617ad909834a0ff8f21ecfac9637ad1984f9771f49bab599c114cb4c940037377bb4d9ed17f2ca695b7bd9de16cdcc3986872f0fc4004689 SHA512 bc1c3bf7aac6180cadf5fd0ea11866f1ae46fc17ace61325d80cf16e17f790657794d262768c70ef772c1795a6773343e99805832517876383ac6b7dfa96b8c2
-AUX libjackasyn-0.13-pic.patch 1456 BLAKE2B 67d6c05657ef9a99e26411e93a9d3b47c4fcb99de81b5a4936d41eae4c48703bda1c52f56a730ce7601fd65a6c2446f30ca50a3d3daa42416fc5442213ef4ab9 SHA512 211247e706e9fa731c375ba36fd186652a090661930961fa4486547d064268f6c502ff425d27db0e6f73e09e02d9b63e0be079a2c8b24238bd065fab92b6a594
-AUX libjackasyn-0.13-qa.patch 1751 BLAKE2B b373827f67518babce9c5b028e3f147fe323401d682aea1a6971d7b15f24db3356a3fc507dfb4669769ab1c3b0c44b9f719ea8fdcb3f47c83574845d0b4bad44 SHA512 277cd971c6c4aa297096f08f9b0acb6e266ef93606522daf5ed6ec9af58b60668e04fc6b7e1fed2248788d2d8065b32996004599089446bb52f61e8e3541fdbd
-AUX libjackasyn-0.13-tests.patch 415 BLAKE2B 29a1922960c439cef59a6e266c1cb270e3ea8a6d0ad8e3b763d14d12f4d337ae2665ad72f0d1659c2d4a6ad2d5b322e0cb27d20cc682a03251f1f6efd857aa50 SHA512 c0355b48a079700b8f3aa7925dd0e3ef5dcf90088d7597c9c600892532dc9ae41c4b0dbcc1b792a1ffae9a8797ddbbeaf3c9b46d7946966d9ab618fd6361f44a
-DIST libjackasyn-0.13.tar.gz 74041 BLAKE2B f952ecbd27fe22f7d227050b2d0532709c188cab1437c0d98d8a8100de7c06e11184161d1175e92c094584ec65c7eade4d542c9c7eb252375e4ee5b8fb6c0396 SHA512 5e311f9a4ed6eaf5086233cfe072e9303e4b1cd39a9613263f37dfbee2139434cd161a90a5a6c0989a9274645cc792477a66aac1f8045964ea4df6983ac2ad10
-EBUILD libjackasyn-0.13.ebuild 953 BLAKE2B 5c602533c38e9658ecfdf9c0130bc38f3b5ac550c7c82fe501ad3cd42e2b693763e55c974b25a8c14befdba23eee40719496c43a354402f3d7f9893e89c67540 SHA512 d9529cd745641b6803c9b255b7373087241f957b0f14f21af97af4f06b7cea9139ee12b2b587f950f534fe587ed909bf497725248f80d0a1740ae499644dc85a
-MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/libjackasyn/files/libjackasyn-0.13-execprefix.patch b/media-libs/libjackasyn/files/libjackasyn-0.13-execprefix.patch
deleted file mode 100644
index 418d4eea3c3f..000000000000
--- a/media-libs/libjackasyn/files/libjackasyn-0.13-execprefix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- Makefile.in.old	2007-02-13 23:03:12.000000000 +0100
-+++ Makefile.in	2007-02-13 23:03:22.000000000 +0100
-@@ -15,6 +15,8 @@
- 
- prefix = @prefix@
- 
-+exec_prefix=@prefix@
-+
- libdir = @libdir@
- 
- all: static shared
---- jacklaunch.in.old	2007-02-13 23:03:37.000000000 +0100
-+++ jacklaunch.in	2007-02-13 23:03:53.000000000 +0100
-@@ -26,6 +26,9 @@
- 
- PREFIX=@prefix@
- 
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+
- LIBDIR=@libdir@
- 
- LD_PRELOAD_OLD=""
diff --git a/media-libs/libjackasyn/files/libjackasyn-0.13-libdir.patch b/media-libs/libjackasyn/files/libjackasyn-0.13-libdir.patch
deleted file mode 100644
index d6a855bda6b8..000000000000
--- a/media-libs/libjackasyn/files/libjackasyn-0.13-libdir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -u -r libjackasyn-0.13.old/jacklaunch.in libjackasyn-0.13/jacklaunch.in
---- libjackasyn-0.13.old/jacklaunch.in	2007-02-04 14:07:28.000000000 +0100
-+++ libjackasyn-0.13/jacklaunch.in	2007-02-04 14:08:17.000000000 +0100
-@@ -26,18 +26,20 @@
- 
- PREFIX=@prefix@
- 
-+LIBDIR=@libdir@
-+
- LD_PRELOAD_OLD=""
- 
- if test "$LD_PRELOAD" != ""
- then
-  LD_PRELOAD_OLD=$LD_PRELOAD
-- PRELOAD=$LD_PRELOAD:$PREFIX/lib/libjackasyn.so.0
-+ PRELOAD=$LD_PRELOAD:$LIBDIR/libjackasyn.so.0
- else
-- PRELOAD=$PREFIX/lib/libjackasyn.so.0
-+ PRELOAD=$LIBDIR/libjackasyn.so.0
- fi
- 
- 
--if test -f $PREFIX/lib/libjackasyn.so.0 -a "$jackcnt" != "0"
-+if test -f $LIBDIR/libjackasyn.so.0 -a "$jackcnt" != "0"
- then 
-   export LD_PRELOAD=$PRELOAD
- fi
diff --git a/media-libs/libjackasyn/files/libjackasyn-0.13-pic.patch b/media-libs/libjackasyn/files/libjackasyn-0.13-pic.patch
deleted file mode 100644
index c52d6b65a6b1..000000000000
--- a/media-libs/libjackasyn/files/libjackasyn-0.13-pic.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -u -r libjackasyn-0.13.old/Makefile.in libjackasyn-0.13/Makefile.in
---- libjackasyn-0.13.old/Makefile.in	2007-02-04 14:17:35.000000000 +0100
-+++ libjackasyn-0.13/Makefile.in	2007-02-04 14:18:05.000000000 +0100
-@@ -5,10 +5,11 @@
- 
- TARGET = libjackasyn
- 
--SRC_FILES = libjackasyn.c libjackoss.c clientfuncs.c
-+SRC_FILES = libjackasyn.c libjackoss.c 
- OBJ_FILES = $(SRC_FILES:.c=.o) libjackoss_pl.o
-+OBJ_PIC = $(OBJ_FILES:.o=.opic)
- HEADERS = libjackasyn.h libjackoss.h
--CFLAGS = -O2 -Wall -I. -fPIC -rdynamic -DMAJOR=$(MAJOR) -DMINOR=$(MINOR) @DEBUG@
-+CFLAGS_ADD = -I. -rdynamic -DMAJOR=$(MAJOR) -DMINOR=$(MINOR) @DEBUG@
- LIBS =  -lc @LIBS@
- 
- 
-@@ -18,12 +19,17 @@
- 
- all: static shared
- 
-+%.o : %.c
-+	$(CC) $(CFLAGS) $(CFLAGS_ADD) -c $< -o $@
-+
-+%.opic : %.c
-+	$(CC) $(CFLAGS) $(CFLAGS_ADD) -fPIC -c $< -o $@
- 
- static: $(OBJ_FILES)
--	ar cr libjackasyn.a *.o 
-+	ar cr libjackasyn.a $(OBJ_FILES)
- 
--shared:
--	$(CC) -shared -Wl,-soname=libjackasyn.so.0 $(LDFLAGS) -o libjackasyn.so.$(VERSION) *.o $(LIBS)
-+shared: $(OBJ_PIC)
-+	$(CC) -shared -Wl,-soname=libjackasyn.so.0 $(LDFLAGS) -o libjackasyn.so.$(VERSION) $(OBJ_PIC) $(LIBS)
- 
- install:
- 	-install -d $(DESTDIR)/$(libdir)
-@@ -58,4 +64,7 @@
- $(OBJ_FILES) : $(HEADERS)
- 
- libjackoss_pl.o: libjackoss.c
--	$(CC) -c $(CFLAGS) -DLD_PRELOAD -o $@ $<
-+	$(CC) -c $(CFLAGS) $(CFLAGS_ADD) -DLD_PRELOAD -o $@ $<
-+
-+libjackoss_pl.opic: libjackoss.c
-+	$(CC) -c $(CFLAGS) $(CFLAGS_ADD) -fPIC -DLD_PRELOAD -o $@ $<
diff --git a/media-libs/libjackasyn/files/libjackasyn-0.13-qa.patch b/media-libs/libjackasyn/files/libjackasyn-0.13-qa.patch
deleted file mode 100644
index 437faa9a6adf..000000000000
--- a/media-libs/libjackasyn/files/libjackasyn-0.13-qa.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -u -r libjackasyn-0.13.old/Makefile.in libjackasyn-0.13/Makefile.in
---- libjackasyn-0.13.old/Makefile.in	2007-02-04 13:26:52.000000000 +0100
-+++ libjackasyn-0.13/Makefile.in	2007-02-04 13:27:14.000000000 +0100
-@@ -14,6 +14,7 @@
- 
- prefix = @prefix@
- 
-+libdir = @libdir@
- 
- all: static shared
- 
-@@ -22,22 +23,21 @@
- 	ar cr libjackasyn.a *.o 
- 
- shared:
--	gcc -shared -Wl,-soname=libjackasyn.so.0 -o libjackasyn.so.$(VERSION) *.o $(LIBS)
-+	$(CC) -shared -Wl,-soname=libjackasyn.so.0 $(LDFLAGS) -o libjackasyn.so.$(VERSION) *.o $(LIBS)
- 
- install:
--	-rm $(DESTDIR)/$(prefix)/lib/libjackasyn.so*
--	-install -d $(DESTDIR)/$(prefix)/lib
-+	-install -d $(DESTDIR)/$(libdir)
- 	-install -d $(DESTDIR)/$(prefix)/include
--	install -m 644 libjackasyn.a $(DESTDIR)/$(prefix)/lib
--	install -m 644 libjackasyn.so.$(VERSION) $(DESTDIR)/$(prefix)/lib
-+	install -m 644 libjackasyn.a $(DESTDIR)/$(libdir)
-+	install -m 644 libjackasyn.so.$(VERSION) $(DESTDIR)/$(libdir)
- 	install -m 644 libjackoss.h $(DESTDIR)/$(prefix)/include
--	ln -s libjackasyn.so.$(VERSION) $(DESTDIR)/$(prefix)/lib/libjackasyn.so.0
--	ln -s libjackasyn.so.$(VERSION) $(DESTDIR)/$(prefix)/lib/libjackasyn.so
-+	ln -s libjackasyn.so.$(VERSION) $(DESTDIR)/$(libdir)/libjackasyn.so.0
-+	ln -s libjackasyn.so.$(VERSION) $(DESTDIR)/$(libdir)/libjackasyn.so
- 	-install -d $(DESTDIR)/$(prefix)/bin
- 	install -m 755 jacklaunch $(DESTDIR)/$(prefix)/bin
- 
- test:
--	gcc -o test test.c libjackasyn.a -ljack -ldl -lm
-+	$(CC) -o test test.c libjackasyn.a -ljack -ldl -lm
- 
- clean:
- 	-rm *~ $(OBJ_FILES)
-@@ -58,4 +58,4 @@
- $(OBJ_FILES) : $(HEADERS)
- 
- libjackoss_pl.o: libjackoss.c
--	gcc -c $(CFLAGS) -DLD_PRELOAD -o $@ $<
-+	$(CC) -c $(CFLAGS) -DLD_PRELOAD -o $@ $<
-Only in libjackasyn-0.13.old: Makefile.in.orig
diff --git a/media-libs/libjackasyn/files/libjackasyn-0.13-tests.patch b/media-libs/libjackasyn/files/libjackasyn-0.13-tests.patch
deleted file mode 100644
index 8d48b1f47d7e..000000000000
--- a/media-libs/libjackasyn/files/libjackasyn-0.13-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: libjackasyn-0.13/Makefile.in
-===================================================================
---- libjackasyn-0.13.orig/Makefile.in
-+++ libjackasyn-0.13/Makefile.in
-@@ -45,7 +45,7 @@ install:
- 	install -m 755 jacklaunch $(DESTDIR)/$(prefix)/bin
- 
- test:
--	$(CC) -o test test.c libjackasyn.a -ljack -ldl -lm
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o test test.c libjackasyn.a $(LIBS)
- 
- clean:
- 	-rm *~ $(OBJ_FILES)
diff --git a/media-libs/libjackasyn/libjackasyn-0.13.ebuild b/media-libs/libjackasyn/libjackasyn-0.13.ebuild
deleted file mode 100644
index e9620fa44f37..000000000000
--- a/media-libs/libjackasyn/libjackasyn-0.13.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-IUSE="debug"
-
-DESCRIPTION="An application/library for connecting OSS apps to Jackit"
-HOMEPAGE="http://gige.xdv.org/soft/libjackasyn"
-SRC_URI="http://gige.xdv.org/soft/libjackasyn/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 sparc x86"
-
-DEPEND="media-sound/jack-audio-connection-kit
-	media-libs/libsamplerate"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-qa.patch"
-	epatch "${FILESDIR}/${P}-pic.patch"
-	epatch "${FILESDIR}/${P}-libdir.patch"
-	epatch "${FILESDIR}/${P}-execprefix.patch"
-	epatch "${FILESDIR}/${P}-tests.patch"
-}
-
-src_compile() {
-	tc-export CC
-	local myconf
-	use debug && myconf="--enable-debug"
-	econf ${myconf} || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS CHANGELOG WORKING TODO README
-}
diff --git a/media-libs/libjackasyn/metadata.xml b/media-libs/libjackasyn/metadata.xml
deleted file mode 100644
index f79bb67acbd9..000000000000
--- a/media-libs/libjackasyn/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>proaudio@gentoo.org</email>
-	<name>Gentoo ProAudio Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 6ab934bd06b6..984260a876f2 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -5,7 +5,7 @@ DIST libjpeg-turbo-1.5.3.tar.gz 1658672 BLAKE2B 4d2182802aa9963fa57ec2c4fb5cf0a5
 DIST libjpeg-turbo-2.0.2.tar.gz 2159562 BLAKE2B 3524c5577322c9fa6556ec263da35c85a6e7b7849dbdc51ec76606f975a46d1a8c40c32de5bb9add62a2dfc9c2ec131e5528591cf63d356bdf70496211e56a01 SHA512 204b6d083e99488c975c75efb08699e4dc1c409556e4dee4f21e3ee67e9c6682eb342f2e5712816b0342c00399fbe6e43fbce30c3d22f30f7ef91db006b3be08
 DIST libjpeg-turbo-2.0.3.tar.gz 2161279 BLAKE2B c0def6d6d402eb2070f4861741f9579e5c360e8bc9a64924c7d53c3c65cc8d4577c01e2cf6acf8ddbe7bddc96540f605ddb47d1651a7400738638fb06928824b SHA512 ca7d4dcc5b34e23831ac450b65b8f92894d35e4afba0c52ac9e0c7dc6b41d4fa2bad66eb79198245032ec02b0b2e88cef39b8c696de17b6a869e3093a6b70e36
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
-EBUILD libjpeg-turbo-1.5.3-r2.ebuild 2999 BLAKE2B c2b3c72a5eeea74b455c2d095d25d2663ced9cd4e53d35d68faede4345eaa2532c9abc64dcad6cf46b82503ab5a6b908b3e268d1f1932a04a2de34bcc383c095 SHA512 0e1532ea6e04cc05fd4f3d303877095dca0095c35632c27e47840e34eb3e153f4953d948b8dbc62edbc02f655114a79e07ce82d557813c58d6f54afda3074c69
-EBUILD libjpeg-turbo-2.0.2.ebuild 2681 BLAKE2B 72b792db6168a998bd63ea3eac62d9aff3898d294aa8258ed6848b82e6226eda05890226d40b3c71429d37e3b00cfe5f10a8e7da3ec498c72b337c71b17d0df3 SHA512 68acfa84e14b9a9adf905c07e528871945e6fcdd16c826b46b380b93c5402fd0c41a917d814ff14d3fbbd29d7082ea0687de3ae80e51ebbd55f7f8dabe44edc4
-EBUILD libjpeg-turbo-2.0.3.ebuild 2679 BLAKE2B 2149e4cf39edff83db255090c92c3f85e3d963b66735cdd415a01e54bfbedbb68dce0e0a5e005ce23f63485a87d63b9b2e742701debafa8fedd8b20fa673cf36 SHA512 07d23d291af353ae17d9d4478f9bf9d88d8cb03f047ba75b5c6061f5b0e0c95525048b0e37b63568f438149a488a7cbc4ccba5adcec39cdc63552d581b36f440
+EBUILD libjpeg-turbo-1.5.3-r2.ebuild 2977 BLAKE2B 1cf872b7308510e14eb9c55cf60287cf297f71275d0d0aababbae34c260d903ec9d6337b9e6b63bf18ca25458a9f5ad46fd773d82a99b70d26552f6fbdf0296d SHA512 fe0954fb131f32a783501e58c094329429c34580a649a911f01030ef1d99af0fe1fbbd1d5f2fadc2db34be6e16097d3ffa9d66184f0dcbecb3a3bbe5e71eb00e
+EBUILD libjpeg-turbo-2.0.2.ebuild 2659 BLAKE2B 071d9d2d4464716dabf134e987c04db6f9f38c70ebb72a64273eef88f6da32c14f055dbce351b2f9e02ed445b6b9c38397aa80295308dc78f46c2f20db1f03d1 SHA512 a712aa0f7a869f7a7fe45a77db8833b632143845a541cb6ad772688f04872342e2e2b48ac39d65c2e3318f068f6cb620146853b99fcbde892f1778ab64062fbf
+EBUILD libjpeg-turbo-2.0.3.ebuild 2657 BLAKE2B 24547c8a01104a4b07e930572dc9d94f4636150d2d8c024d8f2f7a7ce4380c18b20474b94c90f8ec653260c54916cfb441dcb5f1cfb724267ba0354e2bf4d88b SHA512 16748399592d749b628586fdd17bbf91456e0cdb4975f44f31f493df2194cc82ad9fb28d9f697c7bc26ff9d6460a48c975725b95caa96135f4b5d151d4b3a552
 MISC metadata.xml 539 BLAKE2B 6daa06f2aab2c89c5519369550061055eb37612bd8696ca44dc7c3658f81bb38dcd3715419559fc580b0d62d5e54b4aee2c126aadb6845315a3bcf2ca413f76a SHA512 b47273474a5ab74e5b10ec672b326043f5c3699bd6531cea33ac1ba9f38a42f42bda960360f01314bca5461c3b40ee74470c78e6562aebd93ec54944908a2932
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild
index 8b5aba9b9ad2..31680fc1a4fd 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="BSD IJG"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.2.ebuild
index 3f2b6ad87348..9110be06553a 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.2.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 LICENSE="BSD IJG"
 SLOT="0"
 [[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
index 7f78841d499a..924d4efea841 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 LICENSE="BSD IJG"
 SLOT="0"
 [[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
diff --git a/media-libs/libkate/Manifest b/media-libs/libkate/Manifest
index 274b14211c5c..815b5f03b4cc 100644
--- a/media-libs/libkate/Manifest
+++ b/media-libs/libkate/Manifest
@@ -1,3 +1,3 @@
 DIST libkate-0.4.1.tar.gz 906896 BLAKE2B 99e755a365fcd9983fcce59f38a313b4c0c23c3a274e3b98c8756aafae29d19dc3ed3d200cf2207dd2d4985d8e99ec0d47dcdadc273a78ff84c4be11330b1e0a SHA512 2635237753abc0f6c43fc07bd0ecc57c2f3c893efa6c62ad08de9191045612477302ed45acd61cdfea7447efd654ebbe0ed2d6a2cbf867eb834581d7ee43377b
-EBUILD libkate-0.4.1-r3.ebuild 1306 BLAKE2B 78f34a4556924ed6335f47611209fafdd842032674886f8a548f0007877ca079ffb81615c2b18ef231bd2b16c9c77ad435b9bfd344e70bfad9f0c304e94a762f SHA512 d9ad9ab1320e54d0bb388c5a2db1830c70083bfd01ad9576f097de7155e483d791a9c2a4a1bf8e50bf527a6f9f0f5a3f18123cc982e86304ece43851fe4f7812
+EBUILD libkate-0.4.1-r3.ebuild 1284 BLAKE2B b80ced13539f40befb232c2005c27090dbea9f67f0e6a7a2d2764067ceb09e621baddb549faf442602a9206cb7e480a8b6c13acf6164b0ea920d1117c0c884d9 SHA512 fbd2c265dad84920df61b21e6d31d0f94d62667a7b6963ccb2c4ca4eb86a5a0f5f33ad68586ec51b8e51d19d03e24665b76863a41941ba23e425525da7857a78
 MISC metadata.xml 1066 BLAKE2B 61b532ca7ea79a560df1ea1d4e36a0ff5d00a3c1dc81b520d0c9e1a077206d6c9249711f9d76100ed9394a65ab29bbb74d02f4caa51f8f800c14b24ce9a17b47 SHA512 510dadea430ae39da68a3cd97b4a7717b91fcc26cbb0303155718ba5e46d69d2e52e099b272ffe26f34149ef8fe01df80e332009fc905a4f262ef8030327da29
diff --git a/media-libs/libkate/libkate-0.4.1-r3.ebuild b/media-libs/libkate/libkate-0.4.1-r3.ebuild
index accaa364ea7e..cd225b680f44 100644
--- a/media-libs/libkate/libkate-0.4.1-r3.ebuild
+++ b/media-libs/libkate/libkate-0.4.1-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://libkate.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86"
 
 IUSE="debug doc wxwidgets"
 REQUIRED_USE="wxwidgets? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/libldac/Manifest b/media-libs/libldac/Manifest
index 214f1d57c93d..b39df7c2790a 100644
--- a/media-libs/libldac/Manifest
+++ b/media-libs/libldac/Manifest
@@ -1,3 +1,3 @@
 DIST libldac-2.0.2-1.1.tar.gz 282323 BLAKE2B f8e4a05130b47e4c46070c3a9f0a085451bf480e3d90579342f66edeb77df665c89bf1c81d65d5366e704c5396335de8263ebd6ac1e1d1350714acb3775511e9 SHA512 f1aedb3edc0421b7a9d49a9d2e347d8ab19d54e37f0e77b3673f92413eaccdbbacb678e2e89a23016b22c768156148a82b7fc996bebc3a4cd4451ffb606dba3e
-EBUILD libldac-2.0.2-r1.ebuild 758 BLAKE2B 0feb4f0096abbf04876bd5861fac0431e439ca4cba4fdd782221f83e4acd7e5a4f5f39a324da8403accbdad03a6b19022269a510cf4436464fd41aafd28148c5 SHA512 f583b9371b852bcc98bcc93226f3ab2647703d76e6ea1634ae829a082da097067c37201ba88009288ae950f76ac9011b8c23c7c0b7e82e10f1d30768c8e4c50b
+EBUILD libldac-2.0.2-r1.ebuild 746 BLAKE2B 1e6553173c7d021296eede84886f273b7dc3879536da6d1afb93ab6a2dda06741abb5cee98f940165054ab0a6109dd577ddad56cc8b592a1f5e69d3e02312765 SHA512 35ef07123e3c8297a9eced8e84d4b8b7fa1e3d99d9da2f398a4de5cbbfea4204f2f1c7c3b06bbbd988d6e6bf7255243b200af4de253098a322f0a339224df8a6
 MISC metadata.xml 212 BLAKE2B cc81de7077d569b2a0afc40390d2be47ddc84045da2c51b7a2e19fca5a5f28548ec0bbc2010b6936d5ab5c96442011ddd0833b7b594df2c2cf9abab99d99a3ed SHA512 1d2f2ca333bf8a1aba058691921bf03d664a0d4c213c4435a068893b2e50a6e86c01e07a17819600eaee93b72d9deff052fc12b10ee3ae8437e13eb17a40bc08
diff --git a/media-libs/libldac/libldac-2.0.2-r1.ebuild b/media-libs/libldac/libldac-2.0.2-r1.ebuild
index b7c2e612d12e..209f09bd340d 100644
--- a/media-libs/libldac/libldac-2.0.2-r1.ebuild
+++ b/media-libs/libldac/libldac-2.0.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/EHfive/ldacBT/releases/download/${PACKAGING_VERSION}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=""
diff --git a/media-libs/liblqr/Manifest b/media-libs/liblqr/Manifest
index 0bb27549228f..c4bbb8f93b82 100644
--- a/media-libs/liblqr/Manifest
+++ b/media-libs/liblqr/Manifest
@@ -1,3 +1,3 @@
 DIST liblqr-1-0.4.2.tar.bz2 344739 BLAKE2B 90ae891603dc525d460b1f180342b2a998ef3081a7504c642d0ddbbc5feef1ceb512a046a5366311d2a86869c8988f24f03faaafd3e7c77b1ff1f82b8a23acc0 SHA512 57d9ed67d5a11c970262263a34b6797576088e14f2ccb01b393eff55bfd22c8bb2b2189e3ed5ff6c187f709c556225fc1fb1038bd0d7e0c03d8839ef0ce998a3
-EBUILD liblqr-0.4.2-r1.ebuild 610 BLAKE2B 7246b6c25183d57ebc2405e625ebd23cc5b9a9cf4358ba11b702807f9c1b3f9a096a65de914d2c0d30f60a8a1fe209baf77cc1743ac61fd5e9ce3e07a6a69567 SHA512 ae668eb2866bd1f65d50bbfcbd0ce1c0e92ec7afe6c2b84ad79d19f61511c2e8533d0b72d959ee9ace538063d6dcd9bc15a02a7b049dcf0d8ca7be586a4561aa
+EBUILD liblqr-0.4.2-r1.ebuild 588 BLAKE2B 7e4d57e293833265088bcc8ecb2fc7b980d56026439990daa614d30ea48a76191c064b9b1217decc2e22c56ba009400fee1bc63feee2076514b767b386b157e4 SHA512 cf797924b5d7cf9276994e067564677cd2c392152fd027cef09f08a7f35389ea5343f36451ea73f1f986652e85f973f7c1b170727d8621ba15b31e3249721c69
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/liblqr/liblqr-0.4.2-r1.ebuild b/media-libs/liblqr/liblqr-0.4.2-r1.ebuild
index a069cc95cc5e..c041cec6fdc3 100644
--- a/media-libs/liblqr/liblqr-0.4.2-r1.ebuild
+++ b/media-libs/liblqr/liblqr-0.4.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://liblqr.wikidot.com/local--files/en:download-page/${PN}-1-${PV}.t
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ~mips ppc ppc64 x86"
 
 RDEPEND="dev-libs/glib:2"
 DEPEND="${RDEPEND}
diff --git a/media-libs/libmad/Manifest b/media-libs/libmad/Manifest
index 3ad697578bee..d2aeae7f1625 100644
--- a/media-libs/libmad/Manifest
+++ b/media-libs/libmad/Manifest
@@ -4,5 +4,5 @@ AUX libmad-0.15.1b-cflags.patch 4867 BLAKE2B adcfc2732f6b8b2310f50d234a695820d8f
 AUX libmad-0.15.1b-gcc44-mips-h-constraint-removal.patch 2377 BLAKE2B aff2507810157aec4062d157546b921a43cdf63a4e0684f5864ea71b36b4fa726f4ce33d558b7aaec8bb927876abe23c017ef3a1ba9b55715202887010cba3a3 SHA512 de08e0ce3c39b76c2838f940279a39c26e9c7e5b1e762c44f0db1ce3f65364e51036ad4f4ccdc160d80660c723a1bede70a4b505a9a01583de43ebc47aaeedb9
 AUX mad.pc 211 BLAKE2B 3b8678e667461caa6ddc2479687d92a8bab9e7e05be73640e63c9eaf070fcd69d9e26dac1d5e753171795236f5a461c7f59ad46e899ea3227902b9773f9bcfc3 SHA512 ec0b14bd0c6236a216107b507b92c06e295352f1657ba5e45f37fff220a73e1454b262ac36fc715d698c4ffd210d348fca71cf0198e2c49d16fe0ec5ea839f08
 DIST libmad-0.15.1b.tar.gz 502379 BLAKE2B b00de857a0634d7193f656b74cdd5c0642b674f3ee3303a642f8a6fcb64eebaf2b100c6e09d85d892880b5fc4f224c0a5d1ecf5bd95bc5caf00e959c7beac4a5 SHA512 2cad30347fb310dc605c46bacd9da117f447a5cabedd8fefdb24ab5de641429e5ec5ce8af7aefa6a75a3f545d3adfa255e3fa0a2d50971f76bc0c4fc0400cc45
-EBUILD libmad-0.15.1b-r9.ebuild 2209 BLAKE2B d6ad47c53af33d47cc8e581d8b5f90db6c359989ac14a6bd69e2877759d75c1765c6066d60eeaf66dcc2e486200be820c472c326ee9f27b2cd243a55e423a36f SHA512 18f6535ab32073bd313f64f71c31dbba60bc24db636a9d3cad1c227a93da181c3eb952e8b5fffd577ae738d94a209ea0a17f3619ec7b33ea82bd78278f8df8f2
+EBUILD libmad-0.15.1b-r9.ebuild 2187 BLAKE2B d994472cfa00f9264932ff8f1b16dbc0f013c703686609d866ed94c5c1ffd8f3eac9a068a2c9db2e12d5c601d22e7c76efbec9854236b69a901e39bb1894e3b8 SHA512 8731a263ac8e3fcab7614ac13df82e7f98ce07c81db4a5d571db284e0daeaae662c1f9494bb7b46b92addddc229acf8b7f504f76cee0114a8a4f009d2c9a4398
 MISC metadata.xml 326 BLAKE2B a9064ce28313804fb873d3e0b4fcb96681a2fcdcf60011d629268f73ab47f6c00ff6e0d95d2d075ec6af89bbe7aea4b6346ef2500815f08a69318a8736e7201d SHA512 b6c3a0765c5d00fd44caf7266edb75a373d8d4e813ac7f68507067f57713090fdc84f95886e73401d9c912f7f64453c975117030692526a49aebd6f5276751c9
diff --git a/media-libs/libmad/libmad-0.15.1b-r9.ebuild b/media-libs/libmad/libmad-0.15.1b-r9.ebuild
index 0cbe0cd6f483..dcccc96d4093 100644
--- a/media-libs/libmad/libmad-0.15.1b-r9.ebuild
+++ b/media-libs/libmad/libmad-0.15.1b-r9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug static-libs"
 
 DEPEND=""
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index 61be35b9bb76..a2cceefa8509 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -1,3 +1,3 @@
 DIST libmatroska-1.5.2.tar.xz 64996 BLAKE2B 6af202b9817ed54feca76c0a9ed60a0eca0431ffc4ebc9aeae2df191066501c16fb7bb8dc37cb6353eb22c87dfe9fa22420cbbf18d3a6a6edeec4900a59bc0cf SHA512 122b71b91ae89e2a7cc89db17655a006248d58f18d913b4f9ffc885aef7e39681a3a16eed43cd8ecd949c570a939007797c79829f5ee87d08562aee3f0224ba2
-EBUILD libmatroska-1.5.2.ebuild 661 BLAKE2B cc6818261f4825ea41ddb8581460eb39b55a6178e22a51de99b54927eff4e84a2b0b0fd7d9ead73de59f68ccc3650f27d1ab66b1cb095195ae0d4fb5ddf90bae SHA512 6c88b451c9e3e9be32d2459af125bf3f560c49e56bf7cf23ff09802c10861802b42142a50523456a529c25a2505a03b41893e8b3acf38d48c53476578525b42c
+EBUILD libmatroska-1.5.2.ebuild 639 BLAKE2B 269f32f45a309fa465b9a76881d31c719fe5f540235d0cc44b07566f905f65c580274198e3a88688c695f7720b0b821c04d4774fb8627bea6372a1f730ea57c0 SHA512 f65009cd6e87bf20a7ae3bec6062fd65f666edb849ec9c73b4c89fe68385b6ae6081bb055101dc9824b7d838a266ed6496fa4885e23897a19db675f5e80abacb
 MISC metadata.xml 320 BLAKE2B edd6b2e35a7833d3510edec80f3771a319cbb257cbb203e0f71f33636431496c620cb3307b2bebb44360d6932a7e4376b0d134f3f42d26fc9271423c2eed11f6 SHA512 5c1dad06e1fef24b1ec68fb6b12d0d17b4bd05f22b1953f713c25a513340cb08540eebaec32fbe7c6607ba2142a057b8e6e5743a929b7368665d91bc014f35a9
diff --git a/media-libs/libmatroska/libmatroska-1.5.2.ebuild b/media-libs/libmatroska/libmatroska-1.5.2.ebuild
index a84fbb11012c..62097ee093e6 100644
--- a/media-libs/libmatroska/libmatroska-1.5.2.ebuild
+++ b/media-libs/libmatroska/libmatroska-1.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # subslot = soname major version
-KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/libebml-1.3.9:="
diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest
index c71d70e1e985..5e0d646cf462 100644
--- a/media-libs/libmikmod/Manifest
+++ b/media-libs/libmikmod/Manifest
@@ -1,3 +1,3 @@
 DIST libmikmod-3.3.11.1.tar.gz 1240373 BLAKE2B 9de58eea739f8f7a5c4ff482093974f67a623fd0acd3b65752b0832b1376fb05ca00e7fbd09c242a25fb76d90d662afc3886808fbe6cabb15332f263adba37ad SHA512 f2439e2b691613847cd0787dd4e050116683ce7b05c215b8afecde5c6add819ea6c18e678e258c0a80786bef463f406072de15127f64368f694287a5e8e1a9de
-EBUILD libmikmod-3.3.11.1.ebuild 2153 BLAKE2B 87bc7ff96df31c3ee2ed272cbbc676e74034557540e0cbf124d98fd3255ed20f5ebd9eaedf99194d20684609752e7e2e49b19fa2f598d309ca5859c06ad4a2bf SHA512 2dde178747d840f2b2e9c2d82bd79e3d5516854522e90c49e6a277cf7a9884dd536394fa262a4b1ad6545678e5f1062c33db23afa5ba4719cd49f61e2ad2492e
+EBUILD libmikmod-3.3.11.1.ebuild 2143 BLAKE2B a553df20880fa0761fb55141c1f4403169a1deee3dcd65d64d4e797699aec06dd16db1302ea07e26837943a02b91e5ad01084ff1a0264a13552dcf465be9ecb4 SHA512 45e8fc0a847570acc0411bdc8b8344f6adbc31f12e7d868da6ee4939d51e2902e87902a88fdc7f0d63c487eaea85ce34a30cf177cc37907e498234582a54c0f6
 MISC metadata.xml 329 BLAKE2B f5950a51c451bd95614667a932e0799427831bed04505850b99dc77173b773cb8c158b50053b6c3a41755c8a1bb87077fb538207d56fbcf94fdce44ea0709093 SHA512 5deced2e8ecff6e1098f1ff339281cebfb8027bb052af10c9d95c7ae1eb80db0448cf5b350d40e5d5f76ed9948ffb5e4f8802f200f9b7f139a40992311eedb55
diff --git a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
index 51735588106b..46dd5abdae5e 100644
--- a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
 
 LICENSE="LGPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
 
 REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"
diff --git a/media-libs/libmkv/Manifest b/media-libs/libmkv/Manifest
deleted file mode 100644
index 8e407ac87ead..000000000000
--- a/media-libs/libmkv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libmkv-0.6.5.1.tar.gz 32737 BLAKE2B 3b83d7b8beafdbb7209765317ad8c6ead5834a5cb9a54022dd24c021d62dcdf89e43d2991c84491059915f4fdb9b0f8f5d5c462ba82647e95764128c037aa4e6 SHA512 ce8046442d4e72536708b9820559a1b971a557e1eeee11e5974031df8ef24e2f1d0ab2b71933d191454f137a2dc042b771af9b0480633dca0f7977fd5b7b4a55
-EBUILD libmkv-0.6.5.1.ebuild 406 BLAKE2B 09044849474c767f5a8f973a2afe958776fb9b5cf42a4a3454c6d8503d2d686c93ebf17e77b177b542326b7480019c4e4c79ce6b113f811f3d8f7192fbf16120 SHA512 dfdda871a3b9f2383e533d9bc67f4cf72e4b4d524ebd3e208a8e8d13a1b557293c45f28e037acefb40bbcf8e2a6216288d53ee1ea3c3be4f59021d0007618a55
-MISC metadata.xml 347 BLAKE2B 659fd1196902b36a78d3bd3bdd7c12d550b43ecd4291b3e1102a3ac6830a37cee059c4507d7cabe1f83e84828fa7f5ab34494ab19721f88463ed832a47e06f7f SHA512 4ee7313be6d0c72e5685eb7666a582388f1c3645a22e07b69f2f448b91a0d3b33346d022640c24e5f7088518167bbb70a1a9b89e93df976c222c8c351eb14a68
diff --git a/media-libs/libmkv/libmkv-0.6.5.1.ebuild b/media-libs/libmkv/libmkv-0.6.5.1.ebuild
deleted file mode 100644
index 466875327318..000000000000
--- a/media-libs/libmkv/libmkv-0.6.5.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools
-
-SRC_URI="https://github.com/saintdev/libmkv/archive/${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Lightweight Matroska muxer written for HandBrake"
-HOMEPAGE="https://github.com/saintdev/libmkv"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-src_prepare()
-{
-	eautoreconf
-}
diff --git a/media-libs/libmkv/metadata.xml b/media-libs/libmkv/metadata.xml
deleted file mode 100644
index f686dc29d731..000000000000
--- a/media-libs/libmkv/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>
-    Lightweight Matroska muxer written for HandBrake.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">saintdev/libmkv</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/media-libs/libmms/Manifest b/media-libs/libmms/Manifest
index 8cf93cfcd394..e46dc7cc355f 100644
--- a/media-libs/libmms/Manifest
+++ b/media-libs/libmms/Manifest
@@ -1,3 +1,3 @@
 DIST libmms-0.6.4.tar.gz 356217 BLAKE2B 2b0029cde3e985b1a0310e7d00acafb54a53606c656fee1b87a086a31ecc1e488aec31e86880959f23a077a20594a6c939efea3e08545a3d47f804ed762395a4 SHA512 9771c697515f5232eaeaff79e68fe15e34d8aa38aa5d3d68525216357223f314c544d71b5fe18d79a77682f41b1b5d9fb5e7c3c99d0cba5723d2e3de31faec96
-EBUILD libmms-0.6.4.ebuild 659 BLAKE2B b25b19b2b47b7f0053d53439650ecaa3bb5ee2ecc4d5f264a734289090862d8e8fe848ec86a6846bcc774bcbac6c609da4283313adae4fa5110ec0687b0b75c5 SHA512 abe6bc10f702e6a5f64baea1202525556da7e474162318c993601bcefb87d8706f0a5520c7ff23a1d12b119a3f7806950ad24254e5b9488240a47a6866286091
+EBUILD libmms-0.6.4.ebuild 637 BLAKE2B 14b0740da891de901d327dd2e5cc8915877917eba86b16c590ca04ee8c51db808bf6cd06472cab461bf7716a0f182ef7d871e8c904afd51126b1f70ac3130ac5 SHA512 91450a36d0e7973edd8ec7e64e5b717f2f38758100b9d6b5ffef210e03396092ab9ea612fcd0dcfa4986dc4fc45c1f40c94cc7bcf3a757b69f801840108ace58
 MISC metadata.xml 358 BLAKE2B f61ee71ee2acfcaf289a33d28efed96cae45933a0a0434f53e2fd2196722eb3c2f4d2f75a39f31bbbb630d11b67bca1f6d43c95349d3f97560f6260bbfa50082 SHA512 c9c5cc18c8b1ea6dcd96d280d74a811f19f7a93a866b95263454d46975f876791559799dd2e036b24f41e8c10d8130e2a4b200aa71f087f44044ebadd5d9aa95
diff --git a/media-libs/libmms/libmms-0.6.4.ebuild b/media-libs/libmms/libmms-0.6.4.ebuild
index b06b1fc08425..bde47cef4e47 100644
--- a/media-libs/libmms/libmms-0.6.4.ebuild
+++ b/media-libs/libmms/libmms-0.6.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libmng/Manifest b/media-libs/libmng/Manifest
index 58c0784ae992..f7125dc40edf 100644
--- a/media-libs/libmng/Manifest
+++ b/media-libs/libmng/Manifest
@@ -1,4 +1,4 @@
 AUX libmng-2.0.3-jpeg-9a.patch 1378 BLAKE2B 72a3cdd738dd480bb216589bdfc1b935cf966c2e6d3e1029eaef539f67cd8e01977de71dd0c0e22321238af2963a615ca180c3efda3096cdb4fceedffc6e8db3 SHA512 d30bc5aeb586b88698695762594a238e339e5790831fea45d0ef54c8107951791c87662fa555454528ea8591dd5f42c55ff4225c1b8f83228c925eccd6f0eb71
 DIST libmng-2.0.3.tar.xz 951808 BLAKE2B 18f29d270d8c646da1eef41da094271acd5ce86094441f7f4d78dadab9dbc147619c4226bc642722639eb6d1a49567c517acaadea823f38c7bdd8ee3f498b927 SHA512 764efd94643c17c449abcb8f676ec2aa750a2461cf46bc961343f8d443a16ac2caa135c27d846deb2351b9f25d6170c42a500d21f63c13276905fdd743b8fec6
-EBUILD libmng-2.0.3.ebuild 1170 BLAKE2B a45699461cc634933191ea2aa1f1bc2ecce7c56fc98ed62a8a70ed4209d1fda71beaa2ef28b11d93fb6255ebc1579b4e530065ea402e8d65c4de8f6761a25738 SHA512 759ef1d46f734efb332d4ca12b87b498f551415d51549a7107fad491a41b9e4ce4421f7f2ae6a57d6773e759d91e78c1e86e376096d42cf9b55a87e0233d7d1b
+EBUILD libmng-2.0.3.ebuild 1148 BLAKE2B fbc8baad37fb7bddccba7fab03becee94d2bd1f2513756e29f591c52bb9f13b7c8d7af2c8773b3afeec0c61257a71e8db0d1b465349608c901dc4084b9236731 SHA512 46b4d28f3d9c33137a4c158c852272a43da58cebbb30e6ad34d76462cbf232c6112da6ee3d60d26f2fe19579c84f02a2eb273d5817c6bf67ac81bba20611b9e6
 MISC metadata.xml 335 BLAKE2B d1fae8ad219bf09d9bd3588fedaaca1599c795811ea024f726dc3e37e88e5b776e05c3c40eefa6d100e393fcf439aff9d67c77d85010f6e1e8e2319067386fee SHA512 a870b439c25b0dc7d251b15c53eded27ed9a4c708dd81bb4facc7cda49b57abb4a24c013b36c11db4d8a27af2cd55ad012792fe81e8893f5c92007790c4fd8f8
diff --git a/media-libs/libmng/libmng-2.0.3.ebuild b/media-libs/libmng/libmng-2.0.3.ebuild
index 5d30d4adf54d..551d20b6f981 100644
--- a/media-libs/libmng/libmng-2.0.3.ebuild
+++ b/media-libs/libmng/libmng-2.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/libmng/${P}.tar.xz"
 
 LICENSE="libmng"
 SLOT="0/2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="lcms static-libs"
 
 RDEPEND="
diff --git a/media-libs/libmodplug/Manifest b/media-libs/libmodplug/Manifest
index d48c2edf6598..55b8a72a0953 100644
--- a/media-libs/libmodplug/Manifest
+++ b/media-libs/libmodplug/Manifest
@@ -1,5 +1,5 @@
 AUX libmodplug-0.8.4-timidity-patches.patch 592 BLAKE2B 7bbee6d0ff833a6ead5e1a1d25953fbdbe0f3fe3f9efb6de560ed93e69dc6d4b74a8096d4517f9c46d3be4772e6eb682a0b068d68dcd30efd705090cebe2cf60 SHA512 9a01299e9886d2e1fb9db18283fdf2d926ed0899fc6068f66739d6f462fdfbd6500fae70da43edd9a20532ab8ac83cc2ed2ed019f33725a964b9b4aae5ad8219
 AUX libmodplug-0.8.9.0-no-fast-math.patch 515 BLAKE2B d1068b8647b59daecbf60470d7d0f6cf6884438c3a833aefb16181b50201f33879ca0d8dd6f341c1690b5e160e0a6eb706aebd28533aa5fbf5bdde0eb47196f2 SHA512 dfcf1497343f5bb145ac41ada3e313c2eaf8b18827dd1dbb55024a945300eb9054503f20d8a60f835dce50820c99eb4edf20109056ce929e7284f247312cd9c1
 DIST libmodplug-0.8.9.0.tar.gz 576566 BLAKE2B 534ce23f37ae60593fcbf0b8984140badcf7d868a7559ea6aef282a4d14dc6ad05847dc128a0221772e1dc2abb8c870ff8d6d46da0c04232169f905468a3ba19 SHA512 880e10154fd367ee24ace53ca7e32a5c1fee7dfff1f934e6499944c12779427da63e2f55f8d6ce25db0a42a5b4424053bf64305b31dbfc4ef6a8909924d655fd
-EBUILD libmodplug-0.8.9.0.ebuild 776 BLAKE2B d4bb5e23658ab04973407c1b9407b3575edcd8ffda032d36aa353b3f7014bdc36ea73377b4cf5587a7b40e70fdd492845aad09e5d3c0ceb746e1bcfe44231060 SHA512 7f8d520d00a9d16d140bc9821816768104439372be7666e87e506369bb76f99d5763d4fb9c213742f9406edd929335eb69ad81ca8ad563d25f8bc7669e228544
+EBUILD libmodplug-0.8.9.0.ebuild 754 BLAKE2B acd2a6985dc7da32aae0a34c8aa1ece3a1a7ccd0b3e0e221e5b43ca48bbe8bacc76d6cb680fca3f8933430a1affb250f83bc9eb16a7e71ff809bf054b9bc1d53 SHA512 2355df1453f5fff6a977d1ba0fbf2b731c0dbccdb9a1e77e56dde22589f381f66e2abfc825f8d88ebef170714a36b36b2fc8c0e03f5d6d04e00264dcd554ca00
 MISC metadata.xml 457 BLAKE2B 2aa3262e69e5eb85c8ee24f912b126c38554bb324652b7a2b91620236a72b1717ce0ada193193d9655883f8ce48be622e85934a8acb69f35e78bc59616d051af SHA512 6b4cb6e098ed3d743e76d98da648ef475288ec82273b7fbdd73bd60cd14e58d98f0798244bbd4432e504402655557aa0ffb5a4104261c5916261e8040430e46d
diff --git a/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild b/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
index 9f909c151c14..133570a9b373 100644
--- a/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
+++ b/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://modplug-xmms.sourceforge.net/"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libmp4v2/Manifest b/media-libs/libmp4v2/Manifest
index e3cf723c18b3..3923082d3a6c 100644
--- a/media-libs/libmp4v2/Manifest
+++ b/media-libs/libmp4v2/Manifest
@@ -2,5 +2,5 @@ AUX libmp4v2-2.0.0-clang.patch 1157 BLAKE2B cf4763c29017840322d0d31fd859057b2c51
 AUX libmp4v2-2.0.0-gcc7.patch 747 BLAKE2B 5bed55f8c9e9593261d9738871de162fdfaec6239078e3ffc0fc85352e60687ba93e37f63edd8fbaf576ffa5966aef07fd58171366ec60ac5969a80eb92f6016 SHA512 18433209711b88cf4a09dcf6ad26d7d717d6593d9b006258e80aac85fee01da17bbf7e67e60c75c82e18652eaddcdb2d945dec52f2f75aa0f236bd5328aab760
 AUX libmp4v2-2.0.0-mp4tags-corruption.patch 642 BLAKE2B 86a1b614dfc2e4dbcee97ebe9b029feac2078eb3d6c25793f291f625ad1e0dc1df85d028813fe96e980e2d8fef4a5eb821da8622f3ce3f8b28835dd020812d7f SHA512 565959560941ec0503b17a1e6a9cae85a03d6f97e4f4ea66cf457c941de96148606f23471525bf786bd95f78097b3376020a40d53fc7a4675c1db9819e7e8593
 DIST mp4v2-2.0.0.tar.bz2 495672 BLAKE2B 966c90b443bd6f7a81c96fd12f95b00c3ec89cd476aa0fff3e0450b315d54543578ef953c5e3f28d52ca800a0768c601dddc8e99a32ff512767cd65c12832bd5 SHA512 15eb882f33d72d4209053b54c883b67715f539c33096705a0e7bc79015b93f6f3ac80ae29c65a0ffe9eab1bf0dedf07198bdee23fa6eafcd6ccb34f984484be0
-EBUILD libmp4v2-2.0.0-r1.ebuild 1097 BLAKE2B a50858560c9b7c561d19108b40c889c8c692b5edefefbcd83d83d4ccf5d81501a658c2ef94272b48799c67fc26b676d12cea14a33c25e6cdcc3f8f5f77c31b98 SHA512 2b233f4fe415691e90d4a76f87500ae815e66af3fa9559f084bdeecbb9eb0cc70230b8b7a54987240593a3ac8d234bf04764e8d04a33a74c138de6e3fbd59d79
+EBUILD libmp4v2-2.0.0-r1.ebuild 1075 BLAKE2B 6ed35e97037d47949517530ac16e43bf5600513db70ce6689ec408e6825fd1e57618d18d5c5b736af26800a4b09658e84432118555bc0df2d95ad2ed81e8a1b1 SHA512 7aa00e3d133e9254ea3c57b032324a5215f192b39334beec19f1f8da9936b5dfe32e11d57e0b21639ac042c4189f85dbb100b0b9be5abe8ae1676d12e7b7b725
 MISC metadata.xml 402 BLAKE2B ed37dabc480f00cf0f23df37f1e1f9203d81415f9c030f307f1265f9550f5e6a2466de8387b0f16eb7c40dd6e3705bff031df7b264594a7319751ba83c1c7d6b SHA512 63643195e04ecdb3a79a862991760894a4fc52aa073ee1aba1efba4babdd926002fe271d04f82e4e40dbf4cad2fa77fd7853620fe11badb14cc83d27c342ad70
diff --git a/media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild b/media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild
index dd63588d66ce..0a87c1961563 100644
--- a/media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild
+++ b/media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mp4v2.googlecode.com/files/${MY_P}.tar.bz2"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs test utils"
 
 BDEPEND="
diff --git a/media-libs/libmpeg2/Manifest b/media-libs/libmpeg2/Manifest
index a6d475e7f9a3..cbb4384045c4 100644
--- a/media-libs/libmpeg2/Manifest
+++ b/media-libs/libmpeg2/Manifest
@@ -3,5 +3,5 @@ AUX libmpeg2-0.5.1-arm-private-symbols.patch 1222 BLAKE2B d4f3102461c76167286cbf
 AUX libmpeg2-0.5.1-armv4l.patch 749 BLAKE2B 205d8f512eda9b357f0c2902aa8799d897a42a6cdcc131aa6f1d746c6af3c264dd17a2f9e86c6b1c0b9c8bd8f49599f8b99b85f761e64f328a37e9d68e02be01 SHA512 d11fb2196ba5c4a08b28693e069146b69f2a1034606b14981db9ca8d4ed09fd92ab99c9656950cc5d3a547177cd9dd7413698a50bd6b8f69080bcf10e8463e66
 AUX libmpeg2-0.5.1-global-symbol-test.patch 1931 BLAKE2B cc9ace2ef9d6b9f6fa8d0918b627a4f6dc47e5a5d1ed05d60e8a6b9a01451e33be5c5a2732a2aaf1e1ee97eb61590e1f2b0cf568919fc379ac974ec7a849ca55 SHA512 a9425f3cc3a3d6c660bd5c780906927827cdaad27a9526fa57d9026a100ba44b99aeea34c9467d1373316164cd7b36f8357c9aec2c46fa5c8b4557fab5cba2eb
 DIST libmpeg2-0.5.1.tar.gz 524776 BLAKE2B 29b71740fa601c668a8f5b0a43aa763bda2fc66587f5bff847d4bc6d03dd831abe46428616b770aaaabf2d42877daad8c305ab4dd988cc91a4c90decfcc19c9a SHA512 3648a2b3d7e2056d5adb328acd2fb983a1fa9a05ccb6f9388cc686c819445421811f42e8439418a0491a13080977f074a0d8bf8fa6bc101ff245ddea65a46fbc
-EBUILD libmpeg2-0.5.1-r2.ebuild 1494 BLAKE2B 3f841df84a9883be9b40931612d11e2d797dd99debfbee40cc9b006de7d591d213a76f0e55e742b2bfb7bd65f1f0ec34db28bcf07cf52efa9879197a5dba4cf6 SHA512 e9c7206c92b242945e3c2137cb7d8a7be4b0a0b5361f6c63e370151011f3168e39f2d2d0ef833c1241fff2ddd7b36de2690f5f265965095f8077e10a104e96bc
+EBUILD libmpeg2-0.5.1-r2.ebuild 1472 BLAKE2B 3bdec4a53e6c07ddb7e3bd082bb88251363599ee058954e2280000967f5cc3e77b664c1bcf2420cf38c702a8c79dd4cbf2f15323b18e5cdd69555c755743194d SHA512 fb5bef476c3178c82ff894d04c752239620304b44b14239a5bf42710496ef46a1aa68ba5796e70b1ea948451fcfa7b0a3358ad266f1bd08f2984c43931a76b3e
 MISC metadata.xml 301 BLAKE2B 4d9999b8b7aa1066cb76987da82251084f2fb73a2891392a1b3686119454f7c19ef34d3f5e362bff0db40050790c819606c79fffc74cee1bb780d3edeb7afa8c SHA512 ae5643be12156110bdfe381eef32d7586350eb5d70ee8b431f34a19a1b45dfa2cd1ee28d5b0101fef05f90b5d72ed767163051ce91cc1e9107c23432a29a1b46
diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild b/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
index 1595b7ed9cfe..697731ffe353 100644
--- a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://libmpeg2.sourceforge.net/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="sdl static-libs X"
 
 RDEPEND="sdl? ( media-libs/libsdl )
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index b4db22e96858..780e42114aa8 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,4 +1,4 @@
 DIST libmtp-1.1.16.tar.gz 820516 BLAKE2B debc0755b91f44a878c4a5d4eb8d23c92ac17a80cf59ca13ada80bc1884ee7ab771153252258e33c834aba718a064d9e9a1b4618b3e0abe81bbffdfc7e5a2c88 SHA512 0540271930c1c932c5d06dcdd30142d407a4fadd022b195e8339d614fa3ec9b050605bf013b28ac6451f4dfcddf7add949c928acb1382802ab5fd6311c1628a0
-EBUILD libmtp-1.1.16.ebuild 1603 BLAKE2B ed4530b60667621002cede314e06b4d98acd8745d983a0ace464b12629b1a6536f37cbecb4aea61270e668c353555fe1b870c7930d7b4bbbe23e055bc1e1ae9e SHA512 56fa1ffdc209caad56d620c2162bf7eef3a57d737a08124c84a56c333cc5f21528c1d9cca5f32d3df0bfc41f516485bcedbb1b10a71fd1b157dc84da14823082
-EBUILD libmtp-9999.ebuild 1609 BLAKE2B ed0793b93aaba8a6671f1618d912e97b0eb94ee4c45e949b7c7c68aafeb68036950c01131441e7cbe4dbfdc5d82d2bd49db58d1a915fac97e7616a41a7d860b6 SHA512 e83ce0daef077f3343d56c52f0e826e64ce8634b20af89d1dfafec5a5f085c9d5682a881974ffb41f8d8c6b5f267480708a55901125bc654d0595cc68071c749
+EBUILD libmtp-1.1.16.ebuild 1581 BLAKE2B ec0a0cd75ee28b4cf6f9a342ecb17b4132139a644be348eb52ea7361509da804c42ea8e96801088b53819fe60f1b146fbccfef7c2fe231a523425590d2eace05 SHA512 4d7a94107cdd6c220a5f9e739f3c4f399e83109c1a72f2ad3dff93fdf88ac3c9b50bb4ed346359d6da3c6a7303f4f4f5fe131ab7b93e6ebb19e77bc9946a03e1
+EBUILD libmtp-9999.ebuild 1587 BLAKE2B db65f8bbe716f8ecc2b2700c56b430fe239230e2950acca1f6f732d3d92c25e2f2d8a77f55735ece0b31075b1e131d9704f39d1e5865ff60de6edd37791c8218 SHA512 c35a6b0fc775992d78b84e6028c6480e7744e400b1543c25f64936c4b46816aa63104f82602e00f7af25705e9d7832b7f049a36ea6edc739e672ad57649a837c
 MISC metadata.xml 394 BLAKE2B bf7cc1e63c4f81e160cdb34f21a1c9412f917c3183d3728da53c11830413ccc23c835d13798fd4c09d5b9d5424d8e711f13a0d3dd39acea3e5370dd26beca355 SHA512 48695d6eda543de340c36dc778647b753cce9000fde558de1932cf8a0533266d2300993c605d2d340c96f665e4782f62aefca45390322c1614a9dbdcbab44e35
diff --git a/media-libs/libmtp/libmtp-1.1.16.ebuild b/media-libs/libmtp/libmtp-1.1.16.ebuild
index fa0a23bd8d61..05c94bad71d4 100644
--- a/media-libs/libmtp/libmtp-1.1.16.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.16.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ia64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"
diff --git a/media-libs/libmtp/libmtp-9999.ebuild b/media-libs/libmtp/libmtp-9999.ebuild
index 1bc630134db3..588ac3b3b254 100644
--- a/media-libs/libmtp/libmtp-9999.ebuild
+++ b/media-libs/libmtp/libmtp-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"
diff --git a/media-libs/libnjb/Manifest b/media-libs/libnjb/Manifest
index bffa2fa083d1..b9899fbb487c 100644
--- a/media-libs/libnjb/Manifest
+++ b/media-libs/libnjb/Manifest
@@ -1,5 +1,5 @@
 AUX libnjb-2.2.7-exclude-samples.patch 288 BLAKE2B 8d9646562a8b7a07460577a563ae576bc1793ba7fb330a5a141a076ecc443872759dfbd51c0425fa52fd1460d3a5347fd4f0b46c4a5bef9165bb6dbedacacb73 SHA512 218ad125a74545340bb3c1295e7bde74701ae656ebf0955d96d23f554dc1119d20e8ebe530d658883c799d0552144f094e1c825f2dc6daae529ea8d37114d7f6
 AUX libnjb.rules 1773 BLAKE2B 3fdc3a8ceaec9b065e5ea174738642311b57f4cf41f2759375160ef0cdd6044434427f82dae8dc4cad167bfd4578b51bb019a3e4924883f8a6f9efc06a7fe6be SHA512 21d9aa5b0d0c170c3f8071a81981590714f6bbf203d5b6f973aea6a2365f69cde5008969748a2136b9791db327fc476d33fe8937cc7c7d26168ac1803738419a
 DIST libnjb-2.2.7.tar.gz 497862 BLAKE2B e6b7ba77d99f2f4e777ebdca6793d6a348073d9696b9b38b51bc7e29ddacff9a5d19116ca538416ef068496a8827700ed4f740e8ce0c0c1402751c97eb45ed58 SHA512 d217beb772024ec122739327dae9f1e991ace4c3dfe79a4960d1d7421c3d663f924304331025a1790ea7b697ac84d8926f3ab507c6d919e781e90ca82ef6fd06
-EBUILD libnjb-2.2.7.ebuild 850 BLAKE2B 0060fb046d3fdc28fa9788ca8f44ecae213e3e34fc4b95a26fc2a04f63b9bf2cadfe66a28a306f7b5581de62f55dd8f26af169812526b6cb23d4a21423d7bc0b SHA512 408a6de816e4e09aabdec27907a1df7c39734a10e97a6eb666c778606c49479f8ef4d3d8067ee7d411a4867782f68814e3caae287fdc9907077527c0a185aaa7
+EBUILD libnjb-2.2.7.ebuild 840 BLAKE2B b4ca7bd2ba4dff746f4de6707e9c2e74b281a4f80e8f16ebf05137fcdad49b9bd0f6155974568c64fb814e183cb96c0aa10863a005f1de97d0063e3b5fd1d9db SHA512 6778ff560f616ac427d2a89cbcdd19a97f50fd75e215663fe584178560df6c7008fc5750bf5b8eed1028478e54798a950d83577752a0f6731e1f4fba39bf6fd0
 MISC metadata.xml 329 BLAKE2B 113696bd928069036fefb90161fd3e1ce0ba24f9539b16ec7a7199893fe45aa05e5f69343f51c1f0fd90407977be6f698df03d982c3163a7290e60097a9cc2ee SHA512 c431cf889d0fb22891d12ed46abf92d356c162d5bb9b897519ba90faa9effdf44db671028ec8775d0e4ec09c3bdc89a58b2f27db55ff34e83a0cdd76b9bac5d7
diff --git a/media-libs/libnjb/libnjb-2.2.7.ebuild b/media-libs/libnjb/libnjb-2.2.7.ebuild
index 48e23269a9ca..db6b951fbf00 100644
--- a/media-libs/libnjb/libnjb-2.2.7.ebuild
+++ b/media-libs/libnjb/libnjb-2.2.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="doc static-libs"
 
 RDEPEND="virtual/libusb:0"
diff --git a/media-libs/libnut/Manifest b/media-libs/libnut/Manifest
deleted file mode 100644
index d15f5734ad49..000000000000
--- a/media-libs/libnut/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libnut-661.tar.bz2 41997 BLAKE2B 99c6768a5828f53d138aee69c386840a46e345853b9a41bf2804217427e55ef08bc307d7455ccef9fdc8df21557529f3d291282294fda82583d6d26314a6fa4b SHA512 5982244c0bfe3cd81ec9dd03288f51abb2a736508ad966746d16439cf5abd50ec2829f5d75da160b88484da7e246232f994ac2aaba8427a1370ad3fd95144c06
-EBUILD libnut-661.ebuild 628 BLAKE2B 11b4012c427ce077e92f5cd6af9d072734f90eb807cc0c26e1682fd29e9173e00fea0ebf7d3a597511256d4fbf10bd723eb75f071e7138db2706390381d2ba6e SHA512 9144b3de21c7083e579622d17a35539a63a2dfeca69a4568fbc3b5ea27029de4d33e250caf84276678e7e16bf696109db22651e1e676d636f2549457e27595e8
-MISC metadata.xml 345 BLAKE2B da5089a02aa2e2a0c4af8e0ba61aac288a4eeed2c39eb6c5c1abbbb69f39d6e123840db9f2e9cfb5401b8724f82b36a283a2e377896499e44aa0bba96be42523 SHA512 d61418a2da815d98789d4c10767467f966afc9962dac582a2c9d54c753bd5a1c58019a584c1a94b5a5db3d4e66e6bc17152fb5375d671a9d4ba619491893e1ee
diff --git a/media-libs/libnut/libnut-661.ebuild b/media-libs/libnut/libnut-661.ebuild
deleted file mode 100644
index 024eed8a0b34..000000000000
--- a/media-libs/libnut/libnut-661.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit flag-o-matic
-
-DESCRIPTION="Library and tools to create NUT multimedia files"
-HOMEPAGE="http://svn.mplayerhq.hu/nut/
-	http://wiki.multimedia.cx/index.php?title=NUT
-	http://www.nut-container.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	emake PREFIX="${D}/usr" install || die "make install died"
-	dodoc README
-	cd "${S}"/nututils
-	dobin nutindex nutmerge nutparse
-}
diff --git a/media-libs/libnut/metadata.xml b/media-libs/libnut/metadata.xml
deleted file mode 100644
index 95e3c8e9377a..000000000000
--- a/media-libs/libnut/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-<email>media-video@gentoo.org</email>
-</maintainer>
-<longdescription lang="en">
-NUT is a container format under construction by MPlayer and FFmpeg developers.
-</longdescription>
-</pkgmetadata>
diff --git a/media-libs/libogg/Manifest b/media-libs/libogg/Manifest
index 4f479b1f8d01..aefa1a9260b0 100644
--- a/media-libs/libogg/Manifest
+++ b/media-libs/libogg/Manifest
@@ -1,5 +1,5 @@
 DIST libogg-1.3.3.tar.xz 417636 BLAKE2B 2fc69580ed94be520c8e6b764e6271ec60e9d83d4265ca0408df4b2e6233a0f1d68e79400bc3871cc130034697ba97cedc453a574b9c6f618c9b819a93a2d3e8 SHA512 37d8e4329bf7a997a95d84a55c325a5a893ec84bb4d5b7ea638e5cb13201a0619e71ecd9710a8371def69f092c62dcc59ec0a607db246028ee8a62678386260b
 DIST libogg-1.3.4.tar.xz 428696 BLAKE2B 21814db2d45e32be56da1b56afacce4b906b34c7b71e7915ceb7b4a240b9a1c271085a4d19362c97c5bb825569094bd2940a92140204f0449eeeadaa40cc6b30 SHA512 09ffb72c3cbde5c05140f5879bd457106ed4070bd7aa5ea7720cf8910167f1d0fa6312f1f71625d51f21e3033219da858e1a8a2701bfd768b35061f7586f976c
-EBUILD libogg-1.3.3.ebuild 884 BLAKE2B 16850456835208a7d115e7d8412618fa7dce0133fb3a367828c829c237677f89cdf64b679eeb973174467d3bb22485476907779661cf70dd861db725a570a76e SHA512 23fdda66a88d23f3e11c71368357733abc3065a147b122ee1f9aac640bf9ba1c69c97d389e060aafca6b4562d3663db234a149d0eeb4a059225ecd332b1898cb
-EBUILD libogg-1.3.4.ebuild 899 BLAKE2B d92381ec4a5e39700be5360c656adebc91a0e471e0eb3a38502b41242668df1e260e04e6b98fb2e055aae6524a80c9f79f063d6a08550be1f01d4beb59f05e74 SHA512 e9ef61c0bf92544be27cfad8464673d8c1067c5cce79b287f5ab28afcd1e6a60539b4ec3d5d2db76b36e4152d0b8730d1ac76f419eab529e1f06d5d57c30623f
+EBUILD libogg-1.3.3.ebuild 862 BLAKE2B a0a2edde1f4f512b414c336527390281ddac6841c1cfa4d9726212f1690acaa7dd872430b8eaa415618b43a41f882125c817f803fe2d5ae520e6354a336270bd SHA512 67ef486913a0ef8210478ca59c34fb4da7c14312dd86cf3b77659879e70ca299f4738d578f2095d490321ba9b00e9fe3e7796be4e59fc03bc525ddcb297d7122
+EBUILD libogg-1.3.4.ebuild 877 BLAKE2B 1228a4557f1d7200fe734a413fb5af96df94227961275f31f8d45c3854938a36efb3c9b05d78004759b5d1d0792fea6efeea61cc4c3a52c76cf5c1ccde07a310 SHA512 e199e2ffa57731dd0f0e79df6ca6ffbe3fcdc972f1a2d56e32c92834731e7ab30462bc8e05a2dbf00c3ea755f2b51bab5af3016c9b3f06b11860a825cdee69ea
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libogg/libogg-1.3.3.ebuild b/media-libs/libogg/libogg-1.3.3.ebuild
index 4ca9f62beb0e..d8234fb4fd55 100644
--- a/media-libs/libogg/libogg-1.3.3.ebuild
+++ b/media-libs/libogg/libogg-1.3.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DOCS=( AUTHORS CHANGES )
diff --git a/media-libs/libogg/libogg-1.3.4.ebuild b/media-libs/libogg/libogg-1.3.4.ebuild
index 87444316d676..f4e3f98c0479 100644
--- a/media-libs/libogg/libogg-1.3.4.ebuild
+++ b/media-libs/libogg/libogg-1.3.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DOCS=( AUTHORS CHANGES )
diff --git a/media-libs/libopendaap/Manifest b/media-libs/libopendaap/Manifest
deleted file mode 100644
index ac65be9215c9..000000000000
--- a/media-libs/libopendaap/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX libopendaap-0.4.0-freebsd.patch 282 BLAKE2B 9f067b0c630e7fb0f05d753a9752e478850e7776fdc790a80f84c5916eb8c117e9ac0b48d9d6c2d1bba57e6ce87ad2eb64e4af2ae9b6ce9b33ba3ef42ced8093 SHA512 0bd845dcba5363f96e382500b753d0b809ecba4dac6bc7a026687b7b6efcba6e036f35c56120bca7e079805c3aaf8e4b4b0fe2d74907add11a02dc08daeec6bf
-DIST libopendaap-0.4.0.tar.bz2 241953 BLAKE2B 9ed2c4e3a67b6e5c3e205b96a1ae8b57e08f64630be6d7f660309e206044042abf96ceabfebe25308d1b500ef986a99f2ca86fb97d6fb4dd813e895556dd7248 SHA512 1928b7987fb106c0072df7af8b68286f314321ccdae98d1b32cb0b1b316067bf50f8ca8caef669f1d0a844d0abb353cf7b70f621238b874759abf4bcb753c435
-EBUILD libopendaap-0.4.0.ebuild 559 BLAKE2B d4c12d7ddf2418a174fc9f416079b0687a57d0c00246ef2351b003e44597e9a5342a843940872264f06184e4eb9204159bc696cd70b33ddc372ce5e7e701aa69 SHA512 0e35cd1e1c34f9e613ce1780dc31751f185de02bf23ba588f0fca39da76e600ac860a01cc25c33f59e42cae4c6102067b11c9ef63df5675f46efad779f479d7b
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/libopendaap/files/libopendaap-0.4.0-freebsd.patch b/media-libs/libopendaap/files/libopendaap-0.4.0-freebsd.patch
deleted file mode 100644
index d98569f4db64..000000000000
--- a/media-libs/libopendaap/files/libopendaap-0.4.0-freebsd.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- http_client.c.orig	Fri Dec 17 00:27:43 2004
-+++ http_client.c	Wed Feb  2 21:33:28 2005
-@@ -37,6 +37,7 @@
- # include <sys/socket.h>
- # include <sys/select.h>
- # include <netdb.h>
-+# include <netinet/in.h>
- # include <fcntl.h>
- #elif defined(SYSTEM_WIN32)
- # include <winsock2.h>
diff --git a/media-libs/libopendaap/libopendaap-0.4.0.ebuild b/media-libs/libopendaap/libopendaap-0.4.0.ebuild
deleted file mode 100644
index 6e4a0351388e..000000000000
--- a/media-libs/libopendaap/libopendaap-0.4.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="A library to connect to iTunes(R) music shares"
-SRC_URI="http://crazney.net/programs/itunes/files/${P}.tar.bz2"
-HOMEPAGE="http://crazney.net/programs/itunes/libopendaap.html"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-freebsd.patch
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog
-}
diff --git a/media-libs/libopendaap/metadata.xml b/media-libs/libopendaap/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/media-libs/libopendaap/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/media-libs/libopenraw/Manifest b/media-libs/libopenraw/Manifest
index dc4b4b77d747..705d800fb55a 100644
--- a/media-libs/libopenraw/Manifest
+++ b/media-libs/libopenraw/Manifest
@@ -2,7 +2,7 @@ AUX libopenraw-0.0.9-jpeg-9a.patch 590 BLAKE2B e43ddad7d7c3e48a633bc8e8acc480ac6
 DIST libopenraw-0.0.9.tar.bz2 478687 BLAKE2B d51410aa2a4ce297c660f80f99c912374faf05c0920be0c9dff78c5979c553cd74aafed0591bd62d479825cb0fd7064b47b86747ecddc75cc177b54184eb42b1 SHA512 88d475d27719212686a0a5a08da04d6879fd456ec8f7531f401217df97f4f3d4c52dc8c4fb1c6ca88c12d6a67ecd516b151c5e9dceba9cbfcd13150fe81d6db5
 DIST libopenraw-0.1.2.tar.bz2 563981 BLAKE2B 60332274c72602e5b3eea3e41dfee8c62303a2f09028df4a637cea6f07391d912f354752cb6f354e06dd9e223dfabe5dbed1d50e0f325d85be42fb5012ecede6 SHA512 edd7e5a71feecbce1d5a20622bd3c7111acd2d4792038fd19920367ebb55d2cc7614627b9739512bbe34d6b5ae2eb65a4da9cee70c400b5cb846bf5fff08efc8
 DIST libopenraw-0.1.3.tar.bz2 565458 BLAKE2B dec7cda78b6ff4b1411b93c0d48758920b73e087eaca3c262a0850eb5a3423fee38ba7537694b1a04bdafa6bbb34b290c059f483a5a6af339b76c132ac77c413 SHA512 c56d84610f0cf5da970c4c0c791fccf2f7e9f7c7dacf2aeac0b2702ce9a0cd3aaa2f6db0794b0466e1dd8316771973db1e64d013f635c1166b7ff2eebdcbf029
-EBUILD libopenraw-0.0.9.ebuild 1176 BLAKE2B b9fa4bbf8321a60b9e7ead13e84fcd5db9b4f857519c2af477faa512226904bcdaf41216158098d172d2bbc323e3c75df4f21ed92c55584cbcd751e769c41666 SHA512 29dbb8a80ca71dc8da754e60ef28a858237cf115d73d368acd8100106720fa5f8e12cde3f2a51c40873cb989e63ff3c0f9bb644922f29ce166abcc1dec4f1a43
-EBUILD libopenraw-0.1.2.ebuild 1115 BLAKE2B d3509cb3c2a4d530a2114b3314ce0774e7c662c8e21fbb5a2d814769d7cbb2c6590002f72bcb248f845fb2b3d2f03b73e7082d8aa3c2318d58e0adc94faaf89d SHA512 c2827b3824dd2531de17ff16985fe39ffd883397b745851d7a87e5b00ce9a50581c43b8a8fd14410dccbb9acafb83f8c9703b0515d0ea6ca3609131dc2442238
-EBUILD libopenraw-0.1.3.ebuild 1124 BLAKE2B ea136cf2e4aab14fdc615676cf42f6a3ca871d1fe5df04062b97458a8f1d3953d6ea92328621972c0d583f406f291df2f01ee1aecaafe57bf8adadbd7c7e5edc SHA512 d0ed033fee92c83588faf1e25d12118b2ad0f16162493ebd78ee53591625a163789e1b020cc77b9847f5cb2e64bc396f5d41635802f35bb23694e38a6a183aba
+EBUILD libopenraw-0.0.9.ebuild 1154 BLAKE2B d3ad9a06d27602c7ce3e32fc774b692f0cbe9e317c536ec10f2f6f243fc9e4d810c26211d28f5f71143963655238aac700467df5d550fccc9176be97e1c08eff SHA512 43df9bfb3f2b19e2511c7f19ecb753d1a87a664a1d8db49bd4d49ff52ede31077151915f39a3f16c6be69ff90fa5e0781a9cbfd113e20d3272e4ed61f504b47e
+EBUILD libopenraw-0.1.2.ebuild 1093 BLAKE2B 2e5db979081de80cf3ad2b372ab4f6f73508632bdf5dd229cb4765b4c3716fe235e647a0ebb1e121ebdcb906fe71ae91ee6f2f6e1496cb5920945b14ee23137d SHA512 0ba7daa38f4bba45d6006c80887aadeb641502729ca37d9272f70486659ed44efc1af04a6c35567976d8425be469e63c15a61e5e1153168b37866b41521cb8b7
+EBUILD libopenraw-0.1.3.ebuild 1102 BLAKE2B 78d425a8ca9c028fbf7a8fce0e62580d99bfd00362f7e327a56abf47b89973c8747fdecd70887fc9cad84e6f96a5905a4cd3ecfa9c3c6406e2da9dbcb7488798 SHA512 967cc9878969b0be159d52ab2abcdc613f6e2e703c625f26302147b2c4e5d5c23345eb4447e28a011e718a12e19fc9af7115662c3900b9fb52792d3aec624f17
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/media-libs/libopenraw/libopenraw-0.0.9.ebuild b/media-libs/libopenraw/libopenraw-0.0.9.ebuild
index 5c269828d8fa..d741bde0c6b5 100644
--- a/media-libs/libopenraw/libopenraw-0.0.9.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.0.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="gtk static-libs test"
 
 RDEPEND="virtual/jpeg:0
diff --git a/media-libs/libopenraw/libopenraw-0.1.2.ebuild b/media-libs/libopenraw/libopenraw-0.1.2.ebuild
index 571c1c4692d4..e05da6d6a4e6 100644
--- a/media-libs/libopenraw/libopenraw-0.1.2.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0/7"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="gtk static-libs test"
 
 RDEPEND="
diff --git a/media-libs/libopenraw/libopenraw-0.1.3.ebuild b/media-libs/libopenraw/libopenraw-0.1.3.ebuild
index cb9866416daa..f6574ac22c96 100644
--- a/media-libs/libopenraw/libopenraw-0.1.3.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="gtk static-libs test"
 
 RDEPEND="
diff --git a/media-libs/libpagemaker/Manifest b/media-libs/libpagemaker/Manifest
index b890b44df724..09b32dc9fe20 100644
--- a/media-libs/libpagemaker/Manifest
+++ b/media-libs/libpagemaker/Manifest
@@ -1,4 +1,4 @@
 DIST libpagemaker-0.0.4.tar.xz 306496 BLAKE2B 9928d5759c35359c4983724477e432b6876fa4d6e3039296a880661a4587de612ce93908a93d1d2dfbd033c6478748a4329a1682e327db528ddb7dc0947374ef SHA512 d9d9436622ae378da2a3c8e50a35b6133582a595c9ff0fe0e3b124fd0b83f1f12afdfc6a27d16b509ca9bab33067215d7300e505d4bf6b280be7e4bf46da6c64
 EBUILD libpagemaker-0.0.4.ebuild 963 BLAKE2B bd7058b441a96b4888dbc446cfcb08b978903132f8177830cc0d782dd28df273918a41c72c55aa9d8205806a04d23b9db7b0072ff18600fb006e8e6cad983bf4 SHA512 0d292c6474ac837be80f508ab584956b66a573d5d1f0cb281c70a485d4491a6e9b801a380f35926f5990587484c941eb796af0cdd4237f39f73d3da43efff2d7
-EBUILD libpagemaker-9999.ebuild 964 BLAKE2B 84883f3284ea13c357ac2fdd2cb825810618db084123a883b64d894e11885e41203d497bf5a8f9c798f2566c7eedf67f88c3d15167e3a25fa268bb2d179a2f1c SHA512 7c02bb4f8fe43d9a7ddcdf218e3be98a40e966b547f49751a430a8e41e0b27870e48082c56641dd20264033401795cac9e41b382879457c7344b3d7fd7294851
+EBUILD libpagemaker-9999.ebuild 994 BLAKE2B 3bd85ea89d3df0520d91b4116152a339c88e45f04aaace7f868d0c9dca9d9d618b3a1b94b365da73797c51bce3014e18cd8be952a270ba4e0b84e91c24b05f45 SHA512 474a672aaf43ab3cf144d465b58f934f0a21f56553501d1fb1a7c971d6e2168c7af7acea842b2a238928d2fdc3cde0c3f581c6099fec92459327b10400872874
 MISC metadata.xml 346 BLAKE2B 3957184c53e81e9b9727c3da9593b8c4e9c3ab4b59c03f4a6deeae528d397affac28282108c760ac4ddd0c6699b3027158ba33abb0540d12aa15c56302b3110d SHA512 2585fb6fd9ef4008842e0a5c7b1db3d86f152e2d012fdddeba02d1ca0c6e1e457f10c01c8e76b030a0316807f38f6a6853c0111790d7cb6a93437259dbdf503c
diff --git a/media-libs/libpagemaker/libpagemaker-9999.ebuild b/media-libs/libpagemaker/libpagemaker-9999.ebuild
index ce90d99852b3..35b64943085a 100644
--- a/media-libs/libpagemaker/libpagemaker-9999.ebuild
+++ b/media-libs/libpagemaker/libpagemaker-9999.ebuild
@@ -1,44 +1,48 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-EGIT_REPO_URI="git://gerrit.libreoffice.org/${PN}.git"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
-DESCRIPTION="C++ Library that parses the file format of Aldus/Adobe PageMaker documents."
+if [[ ${PV} = *9999 ]]; then
+	EGIT_REPO_URI="git://gerrit.libreoffice.org/${PN}.git"
+	inherit autotools git-r3
+else
+	SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+DESCRIPTION="C++ Library that parses the file format of Aldus/Adobe PageMaker documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/${PN}"
-[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc tools"
 
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
 RDEPEND="
 	dev-libs/librevenge
 "
 DEPEND="${RDEPEND}
 	dev-libs/boost
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
 "
 
 src_prepare() {
 	default
-	[[ ${PV} == 9999 ]] && eautoreconf
+	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 src_configure() {
-	econf \
-		--disable-werror \
-		$(use_with doc docs) \
+	local myeconfargs=(
+		--disable-werror
+		$(use_with doc docs)
 		$(use_enable tools)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index e228c8dcd632..b3ab87db8954 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -3,7 +3,7 @@ DIST libpng-1.5.30-apng.patch.gz 10272 BLAKE2B 335b99e30a476b358483b0ca44d895580
 DIST libpng-1.5.30.tar.xz 756992 BLAKE2B 02813c7cf06e61d429fe963ae2c1e68bfb390b8eeea52147f582729b4a86c73055c2c79eb3d0b533587dd5a16dc0abf7afd986794c01ec59ae0a7dfe3333a989 SHA512 8716c6720c1ddbb38f439df42dbb472d37490fd207efe59bd872ce9adec7359025dc84544efddd19c8e339ecc28389a746e6987ff41ac6e76915c1e1d2c6f20d
 DIST libpng-1.6.37-apng.patch.gz 10334 BLAKE2B 98660f2c13a78c93f937adf2859447cb0e6fa014b2ef6f0571c910593d94cc0a50137d271dbded0b571a3bc0ce4e9f765be48130ee4ae89884fb7292a1b0cf6e SHA512 a9365257a33d67d7e7284494a37747bb1f3ab89f42a1730f2745c604538f59861828dc91d9bc1d08a5b79ab2f4eef1bb9e438dda1774b3548a1c56be77f8435f
 DIST libpng-1.6.37.tar.xz 1012272 BLAKE2B 48e8f48a88e0db6fcbc0c0f1a4d5bda6e6c8b03255bacdc60e353256ae41ccc01b5b2a7e0e7b0dea236c53a3b9d1dd89d4bb19445afbebc37bf0f92691452424 SHA512 59e8c1059013497ae616a14c3abbe239322d3873c6ded0912403fc62fb260561768230b6ab997e2cccc3b868c09f539fd13635616b9fa0dd6279a3f63ec7e074
-EBUILD libpng-1.2.59.ebuild 873 BLAKE2B e19aeca3f3b0595193b7b6ae55d0c9d4f8aa63a4475d305f764870ffa45cf7adf2b18c9203794d4516b2acbe1f10b7a1856fd09203078ee922bc60aceb559a61 SHA512 8b178d6afd6588e14225260442d63082aec001ad187e6acc9a8192140b5e8dac321ac3ea18d36f2194c885120b3c5a71a6daaa1d020a270bb1cd5199f918321f
-EBUILD libpng-1.5.30.ebuild 1644 BLAKE2B 059c2e421bc2955c6ebe7ca95b173f5e85e1fadd8721eb23d0964f786a5497751ee8c01de67370351e4a0b5ca99fda3dfe157d2489e194e145ed636134ef05b4 SHA512 64e8f007c376d46f9d7314b7d4bc322a9c25ca9e470f52fa607175f95e05e2c00f932a406daeab634710b0825a5a5714b4401d2e1285b3b23f0da1435142eebf
-EBUILD libpng-1.6.37.ebuild 1372 BLAKE2B 79c18b86aec3af6bfd0f54228b7dcfea480f6dd85c0db4156b5ed2325dbef10fb5a7d52dab74ababcef7eb8733f7cd4f03ea6d0f7779db32e95764eeba6d3790 SHA512 5ee8d91834b74cb013358d1a61d1e330ab1d073abd5285bc830d4432f4b93535a9afe9bda04774fc606ec6b81a798582c8bf679d936f581cbb3719a14c79ac04
+EBUILD libpng-1.2.59.ebuild 863 BLAKE2B 19efbbd1f3dc7993a237e7e938cd105dd211f1d219f5a85bb6c5cd235694e058af6a9508cb9aa31422c06082bbd791764e24afbbb6faf9ed90da335d5b778018 SHA512 cc45e9f92d4259b3a50bfffb541f9f7133299609b63477b533162db63cbbd2f97cdbcc46a91862066b642b8e2f814adad331636d2cacde0b6d5b5703fa846038
+EBUILD libpng-1.5.30.ebuild 1622 BLAKE2B 443e92626b2f96ea15e0bbfd94bb01a87e6bc37191c9ec2fca0b8772ef0eedfcd3d7f5d1ef774c9188ace91c00f8066136d2b3185119ca51d910cc3d773696ae SHA512 df0ae9a9b0f78e2c35377974fb5abf7d96af6eaf1300e210645e7e50618d27722e7bfbc6ac2ff68ee16429dcc1681181777cea568fb31c4ee8b3cf96ceefb383
+EBUILD libpng-1.6.37.ebuild 1350 BLAKE2B c54583731f27a4813c0393267875bfccc9ee02361d6040ff6b7ec05b60b4b6fe220f6dbbdde9fce9b6df67b02f48c812c35b7ff2558a923015d09f5576ebfcf7 SHA512 8f6d28d81e306e0a38ce89dc3b7b9ed270196bc6e545ecf357a23d30b8a55d58ded41af69bbe1b67951950bc384fb0d42ec048a91deb8c1f5bfd667c092e557b
 MISC metadata.xml 843 BLAKE2B e8736137db2c0e06193b3bbc9d933b1b8e2b8609d050a93a5369a8de81acf02af1d7ff6eb3c1e1967d7dbd6fec38373e389011d290cda1577203075f2f679167 SHA512 43cd4bd8981c828f2de943bb5ee90958f6a4f555d824be1325a7663219b0386ebaeb99406697affa8086b5b50f3d185e01ed12ace030557aa66a8e7b9af006b3
diff --git a/media-libs/libpng/libpng-1.2.59.ebuild b/media-libs/libpng/libpng-1.2.59.ebuild
index 1cc6dadbc698..d2562b0303b2 100644
--- a/media-libs/libpng/libpng-1.2.59.ebuild
+++ b/media-libs/libpng/libpng-1.2.59.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="libpng"
 SLOT="1.2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libpng/libpng-1.5.30.ebuild b/media-libs/libpng/libpng-1.5.30.ebuild
index 0d291a42e7aa..2963c5a06bab 100644
--- a/media-libs/libpng/libpng-1.5.30.ebuild
+++ b/media-libs/libpng/libpng-1.5.30.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="1.5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng neon"
 
 RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libpng/libpng-1.6.37.ebuild b/media-libs/libpng/libpng-1.6.37.ebuild
index fda499f3c369..41ff59e88c4e 100644
--- a/media-libs/libpng/libpng-1.6.37.ebuild
+++ b/media-libs/libpng/libpng-1.6.37.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng2"
 SLOT="0/16"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng cpu_flags_x86_sse neon static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libpostproc/Manifest b/media-libs/libpostproc/Manifest
index 8b2b6ef85ac0..f12e0667d898 100644
--- a/media-libs/libpostproc/Manifest
+++ b/media-libs/libpostproc/Manifest
@@ -1,8 +1,8 @@
 AUX libpostproc-10.20140517-support-MMXEXT.patch 976 BLAKE2B 529f8770ea4424506d16ad2a68d04948d4e0570f2ab95548d37398e9c878d412d37799c05402225c4775a4074362167dd9ec890af3a661711d45a863a814d6c6 SHA512 18e7c377e4d67f43e39307670a10f23795df441173456c6f57098f259a78ebc93e43ef884cc7b518275d3886e4bd8ccb2d952855c41f5857ceccd5c289ce0177
 DIST libpostproc-0.8.0.20121125.tar.xz 65376 BLAKE2B 7745fc0d495a3a6ea45f4e0b012f343d8db0838f7b26f778a646011e3ef01cdc8b7b37b1148b3ea4d838b3a51decb912a6b4328559929f6d38ab01ef8453f990 SHA512 7f1451dbe822d143793c12bb7c18fd9eeb98b5347bbfc54172f0aceb2f18cf31b2c0c888c33a9ce2e9f519b4bbb0a900b729188ce83cda9ad5499a8f6ea2d62a
 DIST libpostproc-10.20140517.tar.xz 65556 BLAKE2B 374dc84fb52f32958bcf9daeaabf2be1405d444f72d1f1ccb22e42b657489adad55199e5be27fa80cdcc21ed4480bae901925fbd833bcd30625d82720d481800 SHA512 0d6dca077c99ac569d892bc92cd08c6bf3e3a5e30e623ced20227b5bd1bd1aa3ecd150bfc900659accd77b997eb64b4d6f0538f9b6161d190ef6c69dcaf47893
-EBUILD libpostproc-0.8.0.20121125.ebuild 2331 BLAKE2B 8561815d2f54feea81ecec29b9080c3d20416ad62be0dc44d4131052095cce339a1c2590433b8d778663841aaffa4dd489a5d8f1987ec3bb57362997bd833c23 SHA512 d95e666bb622c2a60b582199eb7e2e8c33a6ff1e1a346c69a6a64b8eaf17957abe9ee01c33c32771dc9ef6a546dd1e14f0cf6d623cbd8bd0c14dc7f171fe3a96
-EBUILD libpostproc-10.20140517-r1.ebuild 2365 BLAKE2B eace9e22fbeb32af50a8043d643df33e14cb67fc8e7f396c61a497d2e58172dca768b24f46d04cb9775ad80ec6d41ecc7092eb12634064ffc341b5b279f328bf SHA512 b6f5bcc654573c7bf0c039c7e6677707c3a4f930c042884f8a737b8e6f79b2fc34efcb68cd7bf634daf18ea421b7077bd2a33d5ffb337a3167e858f3b17b937c
-EBUILD libpostproc-10.20140517.ebuild 2335 BLAKE2B f7f97bced80be871c8036bb3c7ec60e027c29610dadc1bd84489755201ed69e7ce1b2eb1d33ab8aa5c1cb8ef24bbb9c1e83275b0b082b5d816791871df82229b SHA512 16d3c875f4239d8f7e476031397cff007ed5cf7a254f3dc957121715c2bc2df78055fedbb18baed06dff440d629b51ea4bfca162d3a45d8673259edb10c9681a
-EBUILD libpostproc-9999.ebuild 2304 BLAKE2B 10648a622982411f1cc1f1f8b7e65a39d58116acc8cc7b500d8c1bd4814af38d48b800d948d10273c96741598e6807f8026c5de5f309414d8a634716aa5caf5d SHA512 31565525f5c0da1585fb8318f742de382c95fa6650ec5f84fbb7129ef6f3bf3b261beff11c0cc85def19385a9b7b61a8eb0b74ffe109dea2136403ff718ac04d
+EBUILD libpostproc-0.8.0.20121125.ebuild 2321 BLAKE2B 735bfcfb7138871980afe9fb09234d94c8f977f7841377c884fb533c207336da76d3f6e2fff37ea6751f8c8a14c7525f18e5e8b801854770d0394222c48677e2 SHA512 f40a12c6e80abd666b707fa1f3762a5c0c1e3ab517612431ae6fb4b66a62332f8207f1de056caa74b58cb45146517ccf7cdc91ea426b5d3b28df1d297ee44e6b
+EBUILD libpostproc-10.20140517-r1.ebuild 2355 BLAKE2B 1874052a6f8d2759b2a3ddc7419a89cab0ac0594c6d7025cafc15ea98af660b2cceae9d4908c98d3d1c78bec01dd88b0a62cb395aaef907a4f703c8082474a48 SHA512 85e9e0d8a6ba71885c95ca29683f8fe3273cf65febbec4578d35f4bab4904947ec843a99d5d75e0160795243684a5f4249590e8d8c88bd9055887c911b6f0267
+EBUILD libpostproc-10.20140517.ebuild 2325 BLAKE2B b758d1539410c38f6e91deeea0830dc776254cd18f69a10f2f1a86b0e7222d41034d8d74bdf94e47fce8944ed503c3e338c71b0db1e890df7de2ddeab65b82f4 SHA512 0fe1a162fa8eb5169adefc8b647cd889a693ab536e467cd857bd349c4745e24a716acaa4214617d84062cf9018e3aa9da4c9c59cfccb25f05f725725a388effd
+EBUILD libpostproc-9999.ebuild 2294 BLAKE2B 2ae2ef65943be3fac273c4c8ef103cda020da8a8bcdbbb203c93ca8fbe89baa4fa4d7f94a72f96ab43634e521183bab8b76089fb28bd0398eecb345adf71f98f SHA512 ccaa388c17cd8e29457c26678c6102792a17de7310841fb84da1f97982039b5beae84383a974dfcdec24653ea7e4d8ba2b89877feb3469230a159b241602ef61
 MISC metadata.xml 405 BLAKE2B 5249780527d1e7eb098411f01da236035ae3d9459da2fb7c69194a758e84a92bd02338e5d23490f310b1b59eedca9b2e7333d96d4cd18a055da40da1bcdaa2c3 SHA512 f6a4bb0b0fe497133fe3a1d4781472ccbdf30ab5e9c9aabb272b990bd7c5f048da8c430212dfb3b0f41f2a5ad5ebf3c6ae774474601e250444324ef4faf9ccab
diff --git a/media-libs/libpostproc/libpostproc-0.8.0.20121125.ebuild b/media-libs/libpostproc/libpostproc-0.8.0.20121125.ebuild
index 263c068b3163..a6b424d6d4a7 100644
--- a/media-libs/libpostproc/libpostproc-0.8.0.20121125.ebuild
+++ b/media-libs/libpostproc/libpostproc-0.8.0.20121125.ebuild
@@ -24,7 +24,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 IUSE="pic static-libs"
 
diff --git a/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild b/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild
index 80721f40f19d..9c85a41b48a9 100644
--- a/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild
+++ b/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild
@@ -24,7 +24,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 IUSE="pic static-libs"
 
diff --git a/media-libs/libpostproc/libpostproc-10.20140517.ebuild b/media-libs/libpostproc/libpostproc-10.20140517.ebuild
index 4e1693b0428f..38adba08f33d 100644
--- a/media-libs/libpostproc/libpostproc-10.20140517.ebuild
+++ b/media-libs/libpostproc/libpostproc-10.20140517.ebuild
@@ -24,7 +24,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 IUSE="pic static-libs"
 
diff --git a/media-libs/libpostproc/libpostproc-9999.ebuild b/media-libs/libpostproc/libpostproc-9999.ebuild
index 23a7caeab9fb..cdce6896ff15 100644
--- a/media-libs/libpostproc/libpostproc-9999.ebuild
+++ b/media-libs/libpostproc/libpostproc-9999.ebuild
@@ -24,7 +24,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 IUSE="pic static-libs"
 
diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index c532147a6a50..b6bf255cd553 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -3,8 +3,13 @@ AUX libprojectm-2.1.0-multilib.patch 1245 BLAKE2B 83f75a317b225816b5649c95fdd046
 AUX libprojectm-2.1.0-path.patch 593 BLAKE2B b4f23ca265e02310e1f7e70ab012e2cdf911182a63108f51957641b02ca7ea782ce1bab506bc7e2df2ebb32a2291256e16d22e776a083ee7d185b4ddd7538fe6 SHA512 c2c7a26de1166dada74e7ee3c50da9548992eaf3e3d3881e637ccbef76649c99639f0e2d64e2db4622ce1beb90670504222de3576efc13c35527f9ef064b5bc3
 AUX libprojectm-3.1.0-datadir.patch 6569 BLAKE2B 08dc8a6fee7ad8560a7b6c675b2fd5ebb8562fe2e59dfb29bff17646a85c70e65b510b5bc817c7954b7a9f6f3f88f915f6df6814de52a15450e90f3f6e69ffc1 SHA512 ffcb7401022178311844f6f87aef488995b06e83d9f7b82ed4d943d5531252767075b1c8412e55521fb079d303027d178c2cd795a1ea70f7b86959e82b13dcf1
 DIST libprojectm-3.1.0.tar.gz 52123464 BLAKE2B 9027adbbbd3458b0ac6c2a822b06d25965ee90f6764095d7f509a578c52127899caf886fd2eea5cec1c3f566580766442faade8f8964fb1cfe2abf8d41ffc547 SHA512 79216b227808d14ca3f897fd33247ead27c48b734475dc507272ba192b8f239683a28cbf89b5c4fb420ed2b90f936c8dfddd545ee000caf2471fb596f867ba66
+DIST libprojectm-3.1.1_rc4.tar.gz 51812800 BLAKE2B 5d300de10c18ff28ab63dcbaf6ab42e1094fe285443484b93020d7d66c36451238257cae57804aeaa192188826b0c8380d1cc82c1b1ffebd332207e4c3e7d44f SHA512 9b50da8389657bd6cd3a99155a5f231a7f94eda1cfeb4140757cc4e74234c38cda2cf0c3a8dcb22fb9e9ef0f6d31cceca3f598dbd9db50d64cbb380c87ec4040
+DIST libprojectm-3.1.1_rc5.tar.gz 54442291 BLAKE2B bc97843d0293aeac1b67ef48c08db146d48f809106113b8985921a6ba391ff96f37bf5f2f8701de73b95b4909b0cb0cf38675751df6dbd502d11b03e55ab4251 SHA512 09b91db8270eb5ae3ccce1efdcfddac3052ada6dca135ab5e67c1f000bdbd954cab409dcf336933d52b733e514a755391500583e55ce5ab7e38c04365aea6103
 DIST projectM-complete-2.1.0-Source.tar.gz 31130351 BLAKE2B ec3540326751aba45b9620adfe1e7aed21347c97278de6d23b53ed7fb03878c2d02982fba17b4cda4f713d2cf624fd24adeb15b28fed9d2ab165567f9ff49eaa SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f
-EBUILD libprojectm-2.1.0-r2.ebuild 1496 BLAKE2B 9665eeed7e0f6ea72600b6b244ef453b75cecc4968b2422403a756d12c8c9cd90d6dcd1445e836f3961625da5e73f570e515a82beac874747819e5daf0ab1448 SHA512 7d45406ac58d6560eb1efbf2715db05539242c7c90e5f1aab504168e6d6cbfb176ef5198a16f88f63bcec4744ad93aca7712600fdf7db593188f41212cb99914
+EBUILD libprojectm-2.1.0-r2.ebuild 1474 BLAKE2B 68770604ffd40765826cad33ab29d2be3cdb415aaa14b8df3ec753e3dcde9db9dd4313361b49518326dbfb4076a5b986069dda0d41d99bf56e80b59fcd209dd7 SHA512 1a8fc1ce450a4e4433037f843d6ba55f160486738eb52938493680a9ccb9079b85341a1f90f366665a32b0c7b2620144143fcf9b46b6e0d0047672f539f688c4
 EBUILD libprojectm-3.1.0-r1.ebuild 1129 BLAKE2B f0a35d6b66e3c921af45c55ff8bacdc3b876848a98349392de50df8cd0cfc2f251dbbeccad025ed6ccef72109add791e90efe0fd7337148516b1a23cee9a9ea5 SHA512 d9a84e29a066c2d8bc1e868a91e138b9177fd3671eff91eaa8b606afedadf31aac7265353c4cab1a98b57216897f3973ca7c30d802fddca40364b6bba3edc8d5
-EBUILD libprojectm-9999.ebuild 1087 BLAKE2B cabd999da82f1c7df09909f6bbdf81cb09265a7a22d92c43033983a6f5ec7b0d4de9f804471bdd96333ae480070fe03a8b126bf3ce131398b044a62612a35329 SHA512 c0d7718532b35b072e5f0917774dfabcb5014d82c16de0bf3f3aa46efa32dbb75ddecc49e8fa017ef0d960f9a7c8437671a39a2708ea112512138722f18d3728
+EBUILD libprojectm-3.1.1_rc4.ebuild 1106 BLAKE2B dff46a700cb153575eec55334aabf730bd32a0fc64deccbeddcac1403b873a535c905a8a4233ee4d6a8d65d71b7f348bee6c142902569b93aad43104f85e011f SHA512 1160198f098e3faabf790cc31c8612c41ffdeb1ef4531e823ba2c8208b1bd4e0d4ac2857391687b1eab0efe9b81642911cadd80af4e7928cb428d98aa2b6c2f9
+EBUILD libprojectm-3.1.1_rc5-r1.ebuild 1154 BLAKE2B 685c52406b461d66b74e495f5aa2c54ce4b7e84f8cda7c3d6e84561641393d7047d193063ae7a6dfab2f95bc0e630db0964e13f9068795fc07bcecc2eb7acc62 SHA512 716b5fc4348cdfca53bef24b598600602a56acbaf7f29548509b2ff1de8988fb8b8e95c5f91e5bde5acd8ff86940dc309468ffc7cdee0d4686ea704929940d45
+EBUILD libprojectm-3.1.1_rc5.ebuild 1107 BLAKE2B 79a6a20446cc5b54b52a32bbed793ac95f6f69e4b51e221bf2b927b171067ad7686a855fe407b6a12cc06e4b11b9ca626544946a90aec1017cf2a06012d995f2 SHA512 bd5b12c2f2355ad2a22c396df652ab23613982110223e6df9c4370662ca966a7c153edf595dd26b0f2cc5c841e356fa7bd923cab763d0eb7f25f17a8e595d7fe
+EBUILD libprojectm-9999.ebuild 1154 BLAKE2B 685c52406b461d66b74e495f5aa2c54ce4b7e84f8cda7c3d6e84561641393d7047d193063ae7a6dfab2f95bc0e630db0964e13f9068795fc07bcecc2eb7acc62 SHA512 716b5fc4348cdfca53bef24b598600602a56acbaf7f29548509b2ff1de8988fb8b8e95c5f91e5bde5acd8ff86940dc309468ffc7cdee0d4686ea704929940d45
 MISC metadata.xml 536 BLAKE2B 097c6a56c2e21ee9badc9f08053423f76341ade802b23ffc0ceb3c88c87daafbd5b8d614ffa7f2e4698211cc873412270ddc477ea58a33ffaed76b1f93012e00 SHA512 5f9fede51b40d834ba1078c410b1644f70c6b239b1ff8b1b343e13a0efe33f90464f9300ebe98c138bdf201014c6b6d22e90805efce2a80110007b00b99bdaa0
diff --git a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
index 9f4e4a71fdae..5bacac1be0a5 100644
--- a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
+++ b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/projectm/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="debug openmp video_cards_nvidia"
 
 RDEPEND="media-fonts/dejavu
diff --git a/media-libs/libprojectm/libprojectm-3.1.1_rc4.ebuild b/media-libs/libprojectm/libprojectm-3.1.1_rc4.ebuild
new file mode 100644
index 000000000000..631db2e18352
--- /dev/null
+++ b/media-libs/libprojectm/libprojectm-3.1.1_rc4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A graphical music visualization plugin similar to milkdrop"
+HOMEPAGE="https://github.com/projectM-visualizer/projectm"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/projectM-visualizer/projectm.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_/-}"
+	SRC_URI="https://github.com/projectM-visualizer/projectm/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+	S=${WORKDIR}/projectm-${MY_PV}/
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="gles2 qt5 sdl"
+
+RDEPEND="gles2? ( media-libs/mesa[gles2] )
+	media-libs/glm
+	media-libs/mesa[X(+)]
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtopengl:5
+		media-sound/pulseaudio
+	)
+	sdl? ( >=media-libs/libsdl2-2.0.5 )
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable gles2 gles ) \
+		$(use_enable qt5 qt ) \
+		$(use_enable sdl ) \
+		--enable-emscripten=no
+}
diff --git a/media-libs/libprojectm/libprojectm-3.1.1_rc5-r1.ebuild b/media-libs/libprojectm/libprojectm-3.1.1_rc5-r1.ebuild
new file mode 100644
index 000000000000..19885a4052bc
--- /dev/null
+++ b/media-libs/libprojectm/libprojectm-3.1.1_rc5-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A graphical music visualization plugin similar to milkdrop"
+HOMEPAGE="https://github.com/projectM-visualizer/projectm"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/projectM-visualizer/projectm.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_/-}"
+	SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+	S=${WORKDIR}/projectm-${MY_PV}/
+fi
+
+LICENSE="LGPL-2"
+SLOT="0/2"
+IUSE="gles2 qt5 sdl"
+
+RDEPEND="gles2? ( media-libs/mesa[gles2] )
+	media-libs/glm
+	media-libs/mesa[X(+)]
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtopengl:5
+		media-sound/pulseaudio
+	)
+	sdl? ( >=media-libs/libsdl2-2.0.5 )
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable gles2 gles)
+		$(use_enable qt5 qt)
+		$(use_enable sdl)
+		--enable-emscripten=no
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/media-libs/libprojectm/libprojectm-3.1.1_rc5.ebuild b/media-libs/libprojectm/libprojectm-3.1.1_rc5.ebuild
new file mode 100644
index 000000000000..cd934b85fae9
--- /dev/null
+++ b/media-libs/libprojectm/libprojectm-3.1.1_rc5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A graphical music visualization plugin similar to milkdrop"
+HOMEPAGE="https://github.com/projectM-visualizer/projectm"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/projectM-visualizer/projectm.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_/-}"
+	SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+	S=${WORKDIR}/projectm-${MY_PV}/
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="gles2 qt5 sdl"
+
+RDEPEND="gles2? ( media-libs/mesa[gles2] )
+	media-libs/glm
+	media-libs/mesa[X(+)]
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtopengl:5
+		media-sound/pulseaudio
+	)
+	sdl? ( >=media-libs/libsdl2-2.0.5 )
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable gles2 gles ) \
+		$(use_enable qt5 qt ) \
+		$(use_enable sdl ) \
+		--enable-emscripten=no
+}
diff --git a/media-libs/libprojectm/libprojectm-9999.ebuild b/media-libs/libprojectm/libprojectm-9999.ebuild
index d7628bbc1c4d..19885a4052bc 100644
--- a/media-libs/libprojectm/libprojectm-9999.ebuild
+++ b/media-libs/libprojectm/libprojectm-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -12,13 +12,14 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/projectM-visualizer/projectm.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-	S=${WORKDIR}/projectm-${PV}/
+	MY_PV="${PV/_/-}"
+	SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+	S=${WORKDIR}/projectm-${MY_PV}/
 fi
 
 LICENSE="LGPL-2"
-SLOT="0"
+SLOT="0/2"
 IUSE="gles2 qt5 sdl"
 
 RDEPEND="gles2? ( media-libs/mesa[gles2] )
@@ -34,8 +35,10 @@ RDEPEND="gles2? ( media-libs/mesa[gles2] )
 	sdl? ( >=media-libs/libsdl2-2.0.5 )
 	sys-libs/zlib"
 
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 src_prepare() {
 	default
@@ -43,9 +46,11 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		$(use_enable gles2 gles ) \
-		$(use_enable qt5 qt ) \
-		$(use_enable sdl ) \
+	local myeconfargs=(
+		$(use_enable gles2 gles)
+		$(use_enable qt5 qt)
+		$(use_enable sdl)
 		--enable-emscripten=no
+	)
+	econf "${myeconfargs[@]}"
 }
diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index bc038ce208b3..24cbfd117b19 100644
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -5,5 +5,5 @@ AUX libquicktime-1.2.4-ffmpeg2.patch 4046 BLAKE2B 1db6a761fa94a32741a05919d12d02
 AUX libquicktime-1.2.4-ffmpeg29.patch 13436 BLAKE2B 8a1e7b5df65f5297f59aa17c4a52706413c1ffd88d8645de7359ec26f7059101ab81ac135cf7ef707a8acbeb709e1a6dae03d6a7e7f70c7e88185ebb271acbe4 SHA512 2a7e06c03b0f64f02b923c1a0e7121f4e1ea735f19a6df8ce8daf18177ead132d1ae921c64f3770042db3bbf29f15a7fcceece835d475e052c4c3bb7139c9e2e
 AUX libquicktime-1.2.4-ffmpeg4.patch 14723 BLAKE2B bd1299c24b738b3752e4d8d50ed1b2fa2f208c83e577876118d115fca22293e102614ae0cdc168060115f7145d951d290bccf21154fda4aabf55329d310b6aca SHA512 1b11a82d694654976a5f79cd8feb27eec3810e09a66dc58ca576eaf1f96e4948abd4dae7955a7da6cf99ae6ffef9e183b39090d96cc6b5fe216b4c4f4faff7a8
 DIST libquicktime-1.2.4.tar.gz 1028626 BLAKE2B 6c50965be5d19fb4c57ea6b36f2581ebd575d78a34f2df7029ce2c6ee560e8135a953a2e85d91d189e2c01b97c99804d0eab602866b88a5f07c36351174680f0 SHA512 6ab6cd62ae2361bb3ad73725e9e8baa2b03361bc23e9e34b24f90c0e2bec4337de950ed7f30a6a1d2e67ab33e8f0c43538369fd07e417f54b84583a3c331f8dd
-EBUILD libquicktime-1.2.4-r3.ebuild 3750 BLAKE2B b900b782261c9b666dbac317665f0fe9bf6fa9a73141dba3797fd33be940d1d10f74c78482b79a46d4671d0b244890cd8f90e8d2d544fb830a6d88319e6a51b5 SHA512 68515250e5a9c42a675acc5bb4ba9b7bee791b0d2700df791ddee17a8e6631e11e03e5c2de1906c7282b88359fa3d168b945693e0b202e265d75df6775ad2cfb
+EBUILD libquicktime-1.2.4-r3.ebuild 3728 BLAKE2B 9abd8af90cba5efe9e8f17bd6f32ae5c21749fcc8f2b405d0683818ec3ac93f63327520e5e01d3a6caafd8bf9060a427852445487c792fb963c97b411da7283e SHA512 6945cc7e7edc46f31b4ca849e04e01974abb90b99798923b47e2945bd185b37d17c868d7f4fc2fc5c40457806abf0d96456a854d4cd5595ba9dcb4dc3b94642b
 MISC metadata.xml 305 BLAKE2B 6d9bada3e0a351337e65ebe3b38f821d76707bf4fd85c5d91fe186d019a2e179614d132cacf99d4d9d72ac0d15b93f6ebaac5758773736f2ac867ee5fbd1d473 SHA512 2f35d071d5211038792c700f90bf585c5d427ccf6aa98f41b38ca3faad0bcf6f2445c98985b7a51f751a2cf6287693ce21966cb1e98ce8162fc57fa0617ff166
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
index eaddbd6d2a7b..376312d1885f 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame libav cpu_flags_x86_mmx opengl png static-libs vorbis X x264"
 
 RDEPEND="
diff --git a/media-libs/libreplaygain/Manifest b/media-libs/libreplaygain/Manifest
index 08bfbbf3c4d8..afef79c67ef6 100644
--- a/media-libs/libreplaygain/Manifest
+++ b/media-libs/libreplaygain/Manifest
@@ -1,3 +1,3 @@
 DIST libreplaygain-477.tar.xz 8272 BLAKE2B 6382984643aad155b3e5e0dac8a7ca698320068c62fa87ac7f466e34e850f05df1e823d87f7cb477bd22f59c97f7e5ac8757e9bd6f59c2f5f1852efe9f083d72 SHA512 9e81deb237e35e63d67efabcbfe40f5a6fd34f4a6b0239a21e6ab8ba3c9ca172297cf323fbc4ada749dcfcdf0b711c354e39f12af9a9576900384c441657ff8e
-EBUILD libreplaygain-477-r1.ebuild 802 BLAKE2B 0134bb01bbe0406765ea0a2c112bf66f7cbe54417967a2d54ccaa5803dfa85291399cb4a6556dbbefbe7bc8f07074bd1d51ec758253ecc10be4b0f4d5f6129ea SHA512 21ed328820b16d1b1dbc25cf74694a018f530a7ff13c655c96a35a0275d020e31ebde8747a2c4eccc55b397b5cd23ca306560b6312682c63c1c2ad31fae83295
+EBUILD libreplaygain-477-r1.ebuild 780 BLAKE2B a9d94e144dc14a3931ccce4e643726a50f980e7ad3ef6109030ad915025b54b0cc55f24b45bb03a0a448e1072cdd5c37c259632a6cf7c01818193b6cf5b961c7 SHA512 28db8d1da3aa80f007999e09cc3fd256f161e37151e0b60656aa63af4e44a708f593fd8b3661545b3275bd38c973b8cc7282817c7726df642faeda4aa4dc8620
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/libreplaygain/libreplaygain-477-r1.ebuild b/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
index b0c94883cfbd..ad7cef3a6c08 100644
--- a/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
+++ b/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~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 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 src_prepare() {
diff --git a/media-libs/libsamplerate/Manifest b/media-libs/libsamplerate/Manifest
index 77ae42c9e92c..a640557e1b4f 100644
--- a/media-libs/libsamplerate/Manifest
+++ b/media-libs/libsamplerate/Manifest
@@ -1,6 +1,6 @@
 AUX libsamplerate-0.1.3-dontbuild-tests-examples.patch 1187 BLAKE2B e6acec51e3a8dcfaa50074734e55ba64d416882334e80e9fbf5a079d236e1ed358173efd84faf568c29962dc5655b11e8cf7adeb007159f8fdd0b0e14904c457 SHA512 93fce01981c831ced0fd83c315841660a7d194a706ba8b1fb775cc327d8e526c1b65abc8556dfde808672143d51b5e70f005f569034e6921e8af53af1ad45eee
 AUX libsamplerate-0.1.8-lm.patch 215 BLAKE2B 1123b4aab36476f89505daaa0d0ddf842819d8a70930469dc35140f648d71a29f3ed84eb36016c69a0738358a03d58930acc8381cacf3c047552b1fdcb7bae60 SHA512 acc63d2b6a547d9b480c4752864b474b478a753c88bd535833a5b1ca745c54d1e323bbe985f96430158307c0f1d1d1cf1171ec00bdbb31e9e888b3ed2c55019a
 DIST libsamplerate-0.1.9.tar.gz 4336641 BLAKE2B f1cf4c669315ef6a93bfa0c5c73284187068b9b049299afbfd45da5c133372cfd6fdd00fda2dbb2a6740446219203ceda8b46385c844d9ef480e8578aa0b3928 SHA512 78596657963cbf06785e3e6e1190b093df71da52ca340e75bd8246a962cd79dd1c90fa5527c607cebcb296e2c1ee605015278b274e3b768f2f3fbeb0eadfb728
-EBUILD libsamplerate-0.1.9.ebuild 1416 BLAKE2B e479d0f3678a088f289456ea042b5e45c59e67ed2b81a6aba460ec347879580083549b926ad8db1cf4e9ad25c025de37e94619dfcc7ccab8375a6f3e5938c36e SHA512 3fcf3bfc84b4d457cfadfedd42fe75153eff27965ff545b2b15fa68d9e435fd2f405246910cc49fb64a77f730148d7129c96e2726db3ecfeba30080e10650570
-EBUILD libsamplerate-9999.ebuild 1300 BLAKE2B 04ce2d1e21e31f24c0d653a41c912ea70f78fab450cd2438e7473100f67cde8238a81868437aa3e3e331df5a0959675682560f6b0d96526f349f6c8b50279820 SHA512 776bd88b30e5fba3383af725ab05648863c3168335706959532f456cbb7c2835513fdd144ea36fae6919f8ed99eeb13bb7e6fd5f66e4ac97c601297ff5d594d6
+EBUILD libsamplerate-0.1.9.ebuild 1394 BLAKE2B 76f020b0ccaf18d4af9094d800df9b7471d90648965074fd865b4412d9908bd48ec7492082dae4bd70b71d0582e4e883aca13a63333ee168b7b140f49d63a31d SHA512 93806979a4d2617a9a92cb5ac28222555b507f5c0aeb1853c18916c821e9a170e947de21cd0f35d08e479a772d509538771ef6c6dd28c80cc9aa37ab82de1179
+EBUILD libsamplerate-9999.ebuild 1278 BLAKE2B 27c41f97d9021af553f7ca90f23ae863d45ff5bf31de0002e4670082468a7c3df9e6f6a424b5808db8f54f650da0d570f7c99943011373f0ab01c86d517b5e7c SHA512 e60b495c25fed008ea8e3a7000640af87619c1ee6357ec0287666648e4bc9fb28e2882306882a4faf32ff63cfd01eb4cbafd45e4ebda1f854d13d14c7b00875d
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild b/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild
index e62042abd4c0..3bb9a3f0495b 100644
--- a/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.mega-nerd.com/SRC/${P}.tar.gz"
 
 LICENSE="BSD-2"
 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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="sndfile static-libs"
 
 RDEPEND="sndfile? ( >=media-libs/libsndfile-1.0.2 )"
diff --git a/media-libs/libsamplerate/libsamplerate-9999.ebuild b/media-libs/libsamplerate/libsamplerate-9999.ebuild
index 5fd3fc1ba457..64a39257945f 100644
--- a/media-libs/libsamplerate/libsamplerate-9999.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/erikd/libsamplerate.git"
 else
 	SRC_URI="http://www.mega-nerd.com/SRC/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 fi
 
 LICENSE="BSD-2"
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 650e2e605204..42676217eb63 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -7,5 +7,5 @@ AUX libsdl-1.2.15-joystick.patch 315 BLAKE2B e1adc864e4d660ef21ce2401f29c61c380b
 AUX libsdl-1.2.15-resizing.patch 2098 BLAKE2B 6f8e7832262384b1c710f8353b0b0654b0a951a83e198ef7c8781a5d6ad20c806677f99da93f14e2731b3330662ac4506d687c594116651a148c2833d803dc0b SHA512 afa82d81e03fe974b2c1a4f3c9ed48a15472784548c8e88f988bb03ea992e8ce86bbad74f7e5980dd1476139cf82180eda72e77041e065925cb373cda47c268b
 AUX libsdl-1.2.15-sdl-config.patch 780 BLAKE2B e62be7f44481b48ea226200f382dc8c20c5110997ed26672e5dcd8798e748529826b0951e3803e3fd5f30f8c3050a5fb298e5f880ab7e495dde9c0c8fff6cf1e SHA512 c79b0b5674a2a70862425150d8b481f1a0ed0bc400bc69835e53932422583bdde061d1f72da8d3ad0aaaa4499126bc2770f11941435e6c848bd4d90d040a0d03
 DIST SDL-1.2.15.tar.gz 3920622 BLAKE2B ecd4b82d7de6e4ca0de1317ad34bcd957a5a0d319e94c5b705f8b30aa53136ac08c88a6dcd90ad0ac84e607ba9483c2366921c4b25c8c53973cee62cfe97d204 SHA512 ac392d916e6953b0925a7cbb0f232affea33339ef69b47a0a7898492afb9784b93138986df53d6da6d3e2ad79af1e9482df565ecca30f89428be0ae6851b1adc
-EBUILD libsdl-1.2.15-r9.ebuild 4101 BLAKE2B cd4d23f57dfca5379911e735eafe6503e2b41502efd1634d3589f5bf1072685e0e3635a8b6f2ca7e52b4cee60e8415f28cfed4d311d4339dc5a5b14791dec7d0 SHA512 31e23c47e7e1376fc6329bb970dc437d2049392a61d6dbac721093355434877f640a52bb3fb31da89c60f237f0a498f2b886633fd4f438d0ca8e32b38d53396d
+EBUILD libsdl-1.2.15-r9.ebuild 4079 BLAKE2B ce22ec4dd3e21634c226927d8f0952ac9468a5ce62e8dd026c2c21b613d912569e21b6f4f98100568706e2b97537a4cf276a86cb3d981bf583eb50dcc2d1134d SHA512 438f9071015b44a75c5a8d3ec0061c3d575438bf27c7df0e22404f82ea22a2343466a60540d768a1063e033fef75d59297c9864ccefe68729a73ac569c1f7d00
 MISC metadata.xml 1415 BLAKE2B e1f07f85768757045a516c548dfb8c9a014e0291ca13d32b3e6164d38de389d718dc5d7e9dc4f98bc67cc16d043f92cafc2819fd02d18d72b17472500a8245dc SHA512 52c647d06adee1c595d45caf05e1781c692d700726c9c0ce182ce74796f2480fada765a2772d1679589dd7919d30edfcf5a0668e525cd8e30f78455c525d5446
diff --git a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
index 79464c2542bf..37f9058f92bf 100644
--- a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 # WARNING:
 # If you turn on the custom-cflags use flag in USE and something breaks,
 # you pick up the pieces.  Be prepared for bug reports to be marked INVALID.
diff --git a/media-libs/libshout/Manifest b/media-libs/libshout/Manifest
index d4d11792ebd3..795d66c2f8e1 100644
--- a/media-libs/libshout/Manifest
+++ b/media-libs/libshout/Manifest
@@ -4,7 +4,7 @@ AUX libshout-2.4.2-tls-compile-with-OpenSSL-1.1.0.patch 1862 BLAKE2B d478fa25f07
 DIST libshout-2.4.1.tar.gz 516161 BLAKE2B bedea3c043018eff4675fdb8b95e0bb8ff02a98994a4afcc76537124ebf7357f012f2e9445ebd207b576fc4166fb761d65066fe166fc8b611b96f5c5482a0e92 SHA512 4d4b958947e020de3330d49d39d59220fc89315f25f653a7456b9aa24ca9566fca30bb3d65e6348e79958656096b6b864ea8885157d24e55c8d84d6604670219
 DIST libshout-2.4.2.tar.gz 519249 BLAKE2B 15bd6a552eeb39654a07f5a43f670e53b37c0b239424d2530f09f156e1404da8133e557d614aa7c89aa36e3cec093fecd25aa05d855f283d4af51e1b543eb631 SHA512 ae4b042009887de22d105eb8238f4362f6ff51bd645fd51b5a87c4b5e3f5fdc99e9f99f85c24ae2e9d23eab92b854a7e733bf9f8cc61a8362ce984f02a014e93
 DIST libshout-2.4.3.tar.gz 529563 BLAKE2B 30d982fcf52507e07af23113560cfc9e43ca4ce37c286854326ea09215dc30c3c0d57320dce46dd4faec43b3d473df2f7882ad759479fb023166cec3f24327c5 SHA512 fe36778c6640e620f27504cb21234940e18a65a33f9178bf7e77d4baf854a9affc82d85db8ed8c1c8e2d80399685d8be10106fff5be1ddf76e03e2ffeeed1d34
-EBUILD libshout-2.4.1-r2.ebuild 1421 BLAKE2B b814eab2c4ae2e3b6b2b7a82f1185ba6ea9e55a0d984910ea9b4810d6a93ebe070ff31de5adba3b6c153958d0db467c57f719f1a011852036077d1297a00b672 SHA512 aa3401795a97f89075b00515aa33ee9b8a2ed681aec0197bcc4a70b87d3570c2686b56881b20b4e452bfacf7e2068fcb2ca1fcb328f9783ba5bf8f9d5d87681d
-EBUILD libshout-2.4.2.ebuild 1408 BLAKE2B d326f61d38ddd063bd728a735ee5a16b51d968ed847f51152c7c70beefa4539cdea2bd404ad2ec789f96e2819bada1ffb92d39fd8903a9476be830ed23c4b966 SHA512 f63419d790238f0e50ba5d9e0a1e92e0d2a377d0716b4be0f9eb05c2ced2b0ba295a6122f142c05e2faa47940b6b693da2777ca3da7af9de314e3c8ba1d1ce78
-EBUILD libshout-2.4.3.ebuild 1344 BLAKE2B b7fa4461f2b1828d6c29a3a1c51db554efb92a9a8651ab2720dd022b76b4f068c02924b820b4bd29652839748a8d6d4987508ed276065733d2e1d52dcf93820b SHA512 11d9ae449dc34c4c5f126e8e0f7a127cb83bcee5a236e25896a65547e52b2e1f305f670d3ff169add38ba15d76b4f9fbdae771831ad52d498c3a4cdfef058a46
+EBUILD libshout-2.4.1-r2.ebuild 1399 BLAKE2B 45b4646c9b91605a997485dd277173c4786e3b6f899c9f4a513c063a92b3bbaf7ecfa6a569c8f35e39ca8d44dc97e6b1cd4db899b9604ccdc350c8567de0855f SHA512 9632fe6d0bc8d1b77cc0cb216b32dbadd46eb9d4d7e534ab7b16b002351614ff5e4919a7ba686545f331f8f047574abfcb5dfa003d09f27b16f401de226b55ff
+EBUILD libshout-2.4.2.ebuild 1386 BLAKE2B 61d51d9de79455f9dda811fbb8529d8a7e89c69653174151b6e8a68a38ed98a08766c94abfe3d69e752dcc77b04978ae9d68cb50b8d30d1950426becf4e3a2b9 SHA512 5690b80f51ce03929d80c0e40994ce426b8f69e96cfaf012a3b6a411f745f1f6af10d9544f3d0c76cc9215052ad8e34a10a9df3f986d39c6a3c26ccaab311173
+EBUILD libshout-2.4.3.ebuild 1322 BLAKE2B 6e654babaf39a4de2e46cc471d886f817a1180cb538404883e930e8049588dcc49b6c800ed88a70ce2fa56c2546acf136f21917bc09cd949151b9bcd386bc7db SHA512 3a75537a6f711564abe78c50716158df9b35623a33b4ccc5a47a2efb9bd4feea59507bcc5d7ecf96eb6dc6a2a95a5bc6cb89427e31e1d8acfa23f7acc7a90612
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libshout/libshout-2.4.1-r2.ebuild b/media-libs/libshout/libshout-2.4.1-r2.ebuild
index 74a48b8d3e35..424a2fd384e0 100644
--- a/media-libs/libshout/libshout-2.4.1-r2.ebuild
+++ b/media-libs/libshout/libshout-2.4.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86"
 IUSE="libressl speex static-libs theora"
 
 RDEPEND="
diff --git a/media-libs/libshout/libshout-2.4.2.ebuild b/media-libs/libshout/libshout-2.4.2.ebuild
index e478485c81ce..3f47fb37583e 100644
--- a/media-libs/libshout/libshout-2.4.2.ebuild
+++ b/media-libs/libshout/libshout-2.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="libressl speex static-libs theora"
 
 RDEPEND="
diff --git a/media-libs/libshout/libshout-2.4.3.ebuild b/media-libs/libshout/libshout-2.4.3.ebuild
index e3730421c58a..96a7f60e203c 100644
--- a/media-libs/libshout/libshout-2.4.3.ebuild
+++ b/media-libs/libshout/libshout-2.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="libressl speex static-libs theora"
 
 RDEPEND="
diff --git a/media-libs/libsidplay/Manifest b/media-libs/libsidplay/Manifest
index 150498d175a2..58483db69d0e 100644
--- a/media-libs/libsidplay/Manifest
+++ b/media-libs/libsidplay/Manifest
@@ -8,6 +8,6 @@ AUX libsidplay-2.1.1-gcc6.patch 906 BLAKE2B 8d9682c5a3a9ee2b44547d1ce2091c6f727f
 AUX libsidplay-2.1.1-no_libtool_reference.patch 558 BLAKE2B 7f115c941dc0f9dd8201fd42368d55ee247032ecc4b70c20b89253593e7f6259d533ac724aed22e2229c0c0168f465ac41cb49f3a634e8c9bd618100a5d98dc0 SHA512 826531798593a0e597d2a8a310da584e0097256fe580f7858aa84d9be70f77e1a0b0f9af7e6c94a91602e73f9aff6197f10f2a22ecf1f6fce85ce1f408e04b86
 DIST libsidplay-1.36.59.tgz 390097 BLAKE2B bcb7e9eab4884270c8047af7f61e0afb2cf6ba24465b4859ac404f34cacec9a8c67ad42f3adf0c5f109cedecaa7710919296e30401c2dc0ca6f337186c9a329a SHA512 e7b0859e1389683d3e6aad7040b78ba37bb0a393c85f68ddb8a064371f978b34cc2e951ec564fa1117d12885cd976d10b02937e132d9a11badecd8652cf4d410
 DIST sidplay-libs-2.1.1.tar.gz 1900252 BLAKE2B f04e34f4cfc641a8222e5d53575108bd52deb2de2dc0b0d58e91581ade7128ac87f320f16e044baa23b54de6b5b6b833e9f6c0d37a1885341a329e778c0a0228 SHA512 754cd41f3d2d76754049522c395022bc090f99ea838e6d1ffb8d7689f3aedad9b3879be0312d0af49ba108563296c1176d1e533d1151d5b33368bfda0a1910e3
-EBUILD libsidplay-1.36.59-r2.ebuild 769 BLAKE2B 958c67f849ad398c6f4ea6d685a0b33f924884859a32e199d6dff19d1fb4819403eb3e9455bfaa350864335bc12f51a4a71c748684bf80ff6c4f51dfefad947a SHA512 eb762f63d10c9e4c67b6a51523d8e36bce10a5ee837da7a6841536c9b249a371cb4b1488c9041dbddfa0d04d9adc6508276e8890f57b369eed73ccd3e1d0244e
-EBUILD libsidplay-2.1.1-r5.ebuild 1245 BLAKE2B 6bd8a692a5d7f93249b2fc9cfc138746b8bf2c172b2247954312591d823143533d483344602052d5a05c4312cf4f7bd9492e3e382a74bafa75d6d552d17b91da SHA512 1a3c3a8b3ee1e487f0132692176212bcabbb74bb22861f0c22ac60888ab322ddfda90bab47b47a0578dee8cbf1c4608c9dd21c35271fc956be49ca2770756930
+EBUILD libsidplay-1.36.59-r2.ebuild 759 BLAKE2B 1f624af2258ed39723a55cda902641ecea86c389da633b7ba787a5932b6fceeaa3db3b61865f69f456f5123beaf7092683df42a4aa6a9618f47c8a7e9ce3f08d SHA512 4f2518bd0feea97cd9d96e717f8ea4db5c2fd2e40ea40d2606a69c6d610d677c9cb2c8a962631754e2242cfc21c82153a76724a7df35443a7c05c664b830ab46
+EBUILD libsidplay-2.1.1-r5.ebuild 1223 BLAKE2B a0991db33fe4af979fb2f360831ea3b32c166fb7f3c5dfec4007f0a18665c2a38038565614435b93a782cea4eab245bedc7238f985a6c0d68205c10e01adeeb2 SHA512 51db60fc968d4b98e6ad922a2a98a6389e308ae2f2cf274fff08f4778f7a6d41d7c5bc9f157f42d1949700ef0df1cb33b531367ad2674d20d5b4dd070337a91b
 MISC metadata.xml 294 BLAKE2B 8fcfebdeea5012bebd45c78bf374aadf8092aa88fe731a66e0ec56e642745d613139b6c2cc080f49394d87ff3d04c2e6f84dcf4538e22cbb4299e0decfa83fa7 SHA512 f2ca3b91c3f0f046bc5fd9eafb91a8acfa5a7987d0db24a6e1e6b79bb54a4a466f660953699ca4a84d500a42542e403e12523220e881a466d54b4ea6a4508998
diff --git a/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild b/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild
index 5ed3715ef487..24488c17b258 100644
--- a/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild
+++ b/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://critical.ch/distfiles/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 DEPEND=""
 RDEPEND=""
diff --git a/media-libs/libsidplay/libsidplay-2.1.1-r5.ebuild b/media-libs/libsidplay/libsidplay-2.1.1-r5.ebuild
index d6ca6ea99269..922562932d88 100644
--- a/media-libs/libsidplay/libsidplay-2.1.1-r5.ebuild
+++ b/media-libs/libsidplay/libsidplay-2.1.1-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/sidplay2/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 MULTILIB_WRAPPED_HEADERS=(
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index e057af799f47..34d101a0a411 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -7,6 +7,6 @@ AUX libsndfile-1.0.28-CVE-2017-8365.patch 2577 BLAKE2B 3e9af3996f9e859717281b1e5
 AUX libsndfile-1.0.28-CVE-2018-13139.patch 921 BLAKE2B 4fe567555b1c6e5a0c8098eee40441671a623f4ba91a03c059babc4a7a49eb4903bde38d52333335749fd6a0f6501bf524add119658226f6b169565a579b8f2d SHA512 33817e7c85180635fa239e4ea38973b18312878522639f43071188a995f0e1a35dbca6d133555fb0875292b4b609950ae38e747a6b1949f8ae840db9dc3a2805
 AUX libsndfile-1.0.28-arm-varargs-failure.patch 1329 BLAKE2B d8a995e6596db880d2188cfc3243b7aff2dc13ed617b0bf589e918c5a852d4fc1d69c00eec26ec8c8b258ab00eb860872e01b149254d554cd563fd6d7b532891 SHA512 4577282dc0b71d456a562d06d8b22958f24caf383c6c4c8aa2c9006614d3110b7d6bbf896ce393468455460cb8d466c09a48416cdf159e30de6d5ecaa0d4cf09
 DIST libsndfile-1.0.28.tar.gz 1202833 BLAKE2B 102735766e2c22b5278fde43feaaa664598c08fadb5264d5130e4bf1e354bd4202948db38e2912d7487bd7f8c0b9faf1616c0873eed886a56b1d7f49452bf488 SHA512 890731a6b8173f714155ce05eaf6d991b31632c8ab207fbae860968861a107552df26fcf85602df2e7f65502c7256c1b41735e1122485a3a07ddb580aa83b57f
-EBUILD libsndfile-1.0.28-r4.ebuild 1879 BLAKE2B fbe9ac494948b6a8db6a91dca40b52a0280ed09bb863d84856f12dd1de8cf0f4f734606c208ada4294014eadf7292015c1a634f7fa4a3259e046ed091f3bb285 SHA512 f44b94792424a2855c0cc2d127bc59bdb6336a37a7cc27819d7b4347b5f0233c28ac5fca4628d1e0f8200b31984afabf061d90ffa94e421c9ff0ccc47155127b
-EBUILD libsndfile-9999.ebuild 1781 BLAKE2B 311f58ead67a65b184cc7f3ea594a7f6145d929990d46ebc2326ac7e826555c089d76f70b749ac21cd4b375185d9140f6898502899629527dd787ee2453650a9 SHA512 6da5bb0a8ad27f93a0916caa2c1d07ffd57fc3735d520fd645d04321c35d03722880360c63c52aa4ac7e35a3d28498940dfb1423d733ed485402a9528204da35
+EBUILD libsndfile-1.0.28-r4.ebuild 1857 BLAKE2B b6ad10928efd8a8fd049a95e5e9e61b9ae0ecd3b788deebdb304f7a84ee8ee786d06075480eb4ca3f67a6ab845321f568b85323a2eac8fdb665f00bf63df315a SHA512 2320d8655dd167f4f3cfc73b7a030d7387c411cd1c3aafb9887187508c67674f23c3008122bd836762d8209f2e252b7837fbeaea95c221527b029b46ffb0aaf3
+EBUILD libsndfile-9999.ebuild 1759 BLAKE2B 18e141b3625b8ee1569159637abdf1459a9921d23887291fd3804f9829dd20545393eeba72f16d79cf647859cb6a3648d89a043a5bd8795e12c1391f27297352 SHA512 d4411f4ce5486001d7cc15897fab5cf934ca57d7e9d29478416ccbc3985e54c7166a1d1b1cdd2caeb3bac1bc76e41b8d7eb3b45661eefb92e76d8fa430a4c35f
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild b/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
index 3097c0887094..b316eb15ff8a 100644
--- a/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="LGPL-2.1"
 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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="alsa minimal sqlite static-libs test"
 
 RDEPEND="
diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-9999.ebuild
index fe5341352a3d..aa94640fb8f2 100644
--- a/media-libs/libsndfile/libsndfile-9999.ebuild
+++ b/media-libs/libsndfile/libsndfile-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/erikd/libsndfile.git"
 else
 	SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 inherit python-any-r1 multilib-minimal
 
diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index c29d59f7abc3..c5f71a2a1eb6 100644
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -3,5 +3,5 @@ AUX libtheora-1.1.1-fix-UB.patch 1499 BLAKE2B b2336cac99a2810d1ba5733e09dde80d42
 AUX libtheora-1.1.1-libpng16.patch 516 BLAKE2B 7c4d6fd0e086b74f68cbc3e46e43879b42ef39f0f83d306666caf80808de023e2c4c77de51009c5dd668e230b169e5073539ee11e69e3e0201d6def1a4c7401d SHA512 5ed8c35eee6fb533fbbfc835fe62eddea18ddc956b453b1062a4d1534b6d69db2e70a03bdf3300a8b1a5832feef2c7536bfad4274e8e89769e07a8a3f635b1b5
 AUX libtheora-1.1.1-underlinking.patch 481 BLAKE2B 0939e1789eee97d999d229bb37620fe787b0da17253e15e6fbdf3109dd2c11cf201c6d77133529a779730acdd23806a52bb033d909509a6065ff6ac08db4b4d5 SHA512 9e8219ab32993470a4566b59b544eb04175577f4c82174924aa53b2ef61f0b94496a0de5afa630da291322fc6fbc640978152de8b61edd50231818838a330b0b
 DIST libtheora-1.1.1.tar.bz2 1903175 BLAKE2B 261655cfdb8ba38a462e4701d69a074c6d8d81fb801359059b1c2c11592fd5ab1b724652e667aa5c1f117dbbc198b7794d22a7b1c9782e2b6dabe5fb62524be8 SHA512 9ab9b3af1c35d16a7d6d84f61f59ef3180132e30c27bdd7c0fa2683e0d00e2c791accbc7fd2c90718cc947d8bd10ee4a5940fb55f90f1fd7b0ed30583a47dbbd
-EBUILD libtheora-1.1.1-r2.ebuild 2370 BLAKE2B 39365ee057c7c92ad1559e6937c16b89e7aafb5804295ac1d47b47e57fe2813ac8f20c6a3fb0b00007de4fffb608fa7f4dcd8204bb847256eb0f316a26d81b57 SHA512 1a8597942e837dd38404befe0292b2f613cc56619b58d95b76319bb926e47914f32949d1809689b710faa5a3398b8dabf9d5260560bd63a47f265fafc43a05e4
+EBUILD libtheora-1.1.1-r2.ebuild 2348 BLAKE2B 6141ea9238da6465bdf3b12f9ab2825ccdd30131dc80f106c383f03cee468564850f0bb1990163629a55634d513a8c754e1eb59d7d993af760a38e816e8e8708 SHA512 0b3296a465cbea9732903decc04104ea425f1ded6ba23c2b9160d1b14428cced3031f0ea4a7560b5b6c99f533fe4fd166da0b3fd138290714839a4baf30ad99d
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
index 34fe86706c51..503d97c7aeba 100644
--- a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
+++ b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/theora/${P/_}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc +encode examples static-libs"
 
 REQUIRED_USE="examples? ( encode )" #285895
diff --git a/media-libs/libtiger/Manifest b/media-libs/libtiger/Manifest
index c77aad13ad95..85d4c9be0d94 100644
--- a/media-libs/libtiger/Manifest
+++ b/media-libs/libtiger/Manifest
@@ -1,3 +1,3 @@
 DIST libtiger-0.3.4.tar.gz 383685 BLAKE2B 92bfb1ec5879c9d4af2eb1ecb26eda007fd583121eaa6e3bb23de9f8b477612eb4c87359ec61869c5a70233f1055eedcef270cb79cdd94944013147e04a85bcf SHA512 559e522b5127f32fdd08d62c40dfb493dc2db1efd1e21707d723ef27cbe03e7e38fb04d40856d824ed0c3c94a223ed1a0358fc11ecb30446b5ee5c7a3b802e6d
-EBUILD libtiger-0.3.4-r1.ebuild 885 BLAKE2B 3bef64ed9041b18566ecba0db0b9ccc6886f0c4b12c033f7824f6071d7fa365fae734b8c7f73ca65456b91da9d822b4db93211d47ef8f93a986828c387855a03 SHA512 8be03794d2ee0b123578d08eda9465ed771827da5f6da582a4281fad777b728e57cff66d892e6d836fa071c10ffecf59cb8fe8a8275f288f74628a702879c9ba
+EBUILD libtiger-0.3.4-r1.ebuild 863 BLAKE2B c1771a202344e1ef26057e18b3ab92eabfdf8c0795d4edc50b301cb2bbe36c7e90a115d6ea75ac5667f599847c17f2b2d33cb016870ff9b0d3251bd6abe58508 SHA512 d2d96ef7ce00cdc8700873a150119760c5612df614a02a6896bba2492178447f4bb432c46eb13f7c9bd0145a8956962629a0261056b69eed38e45d63d68a09cb
 MISC metadata.xml 550 BLAKE2B 58756433fc1ab142f1f2dc2c465371e19c3838874b697297cf3cd62c88bbfd5805807db521135ab76972cc176b131657caf6ba1c8b75ca792f539816a3baa3d1 SHA512 2590f113bd0261f583083f51aee3beb97771b4a112ed23d2b75028daba956278ad3a56cb7de84973c9bbcc72d1c0ee0e4281531a01a8a44f6e55289d8081a500
diff --git a/media-libs/libtiger/libtiger-0.3.4-r1.ebuild b/media-libs/libtiger/libtiger-0.3.4-r1.ebuild
index d39f030f2840..4389cf919cda 100644
--- a/media-libs/libtiger/libtiger-0.3.4-r1.ebuild
+++ b/media-libs/libtiger/libtiger-0.3.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://libtiger.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ppc ppc64 sparc x86"
 IUSE="doc"
 
 RDEPEND="x11-libs/pango[${MULTILIB_USEDEP}]
diff --git a/media-libs/libuninameslist/Manifest b/media-libs/libuninameslist/Manifest
index 9d3324b94519..62c855f1b116 100644
--- a/media-libs/libuninameslist/Manifest
+++ b/media-libs/libuninameslist/Manifest
@@ -1,3 +1,3 @@
 DIST libuninameslist-20091231.tar.bz2 568820 BLAKE2B 09574729cc8b655bc9921c49b6f81a7c242a761d70865a0ca6b9ef479582f158f05580e81b94100994ede623ebf8e16f482ae2bacbd596d195b2201023a8ee7e SHA512 3780759428ef2bf2fd808de6ea87a44cf85952f926240ea355d692ef08b5e50c1cf068a2ee05b00cf0fc6b725d71142306aae01e9d6e5144291f6e5dc4505bc2
-EBUILD libuninameslist-20091231-r1.ebuild 602 BLAKE2B d8446be6b03b008fafdb3230fcee0d8c9de258060266f59cb2f219a70fadf2914639c26f7bf3cdf4621069f64caa16bef5453b1fffdb1451f425628cd567c0c6 SHA512 15a9fdfa599c3be6c2cb463eda6bf427a0264b5901b8f59b7774a31941eff2092bfa1dddeafb010a4e4f63bc84e94bfa4589457ad3284f089a5a2139716cc7b4
+EBUILD libuninameslist-20091231-r1.ebuild 580 BLAKE2B 69733f11439968ed8d7ff29976cbcb05c4fb27ac6d5fe4935d1199f3b9bfb355035b6157169ecb1994cc55756b6fb040efac61ca91e20657866723c1ecb325b6 SHA512 ee0c2dc88d28b2d0c473ab1b23bd4545626f9f14b73165b8e65efcb67ca458c6cbb71ecfa833babad126951fdd28175dfd6550f61a7dcd34c3b79eb4a79c43a6
 MISC metadata.xml 418 BLAKE2B af32b153bb118f182f452c92fbe3847c3e2402647daff56972e66aabe631bfd82da9427c8a46e9ff415aa99f9df1dcefaad21f79e8119da26d95d3e798c1f631 SHA512 35b1f463cb8d9c67f640b4adf5081d16100ad1277bac95222c499b8837b8eafe6619fa0d5ef7d0089eeb43515205feaed55157e8c5412bc7a065ffe774b41e71
diff --git a/media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild b/media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild
index 3e6efeac8829..6b6e93a21b6c 100644
--- a/media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild
+++ b/media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libuninameslist/${P}.tar.bz2"
 
 LICENSE="BSD"
 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-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 S="${WORKDIR}/${PN}"
diff --git a/media-libs/libvisual/Manifest b/media-libs/libvisual/Manifest
index 913a7930f6d2..8ed35e42a06d 100644
--- a/media-libs/libvisual/Manifest
+++ b/media-libs/libvisual/Manifest
@@ -4,5 +4,5 @@ AUX libvisual-0.4.0-conditions.patch 889 BLAKE2B 6c197b4d47249d341efa434165c9681
 AUX libvisual-0.4.0-detect_amd64.patch 431 BLAKE2B 2be06d4606c73867b44c62c154bd0a309e76545469fee02e2840f41be9271b17b1edd26717e16f74cc63af7d4627d7792270c5cf75e89f9a8f146fe318952b72 SHA512 b102f61acf60a7faa1495087c96c8cba893c250454ea1b5ed60c14ba0578d2fb794d2722f24e9d6b5bf37369fcf83bb2bba3929fcd49e24c4078f2a9fde317f3
 AUX libvisual-0.4.0-inlinedefineconflict.patch 1870 BLAKE2B 3c20d445a0f94d81361cd12429e2572a17656cb9049bb83a25f1fb12e17606a94c1a005582c08a90bf8cd10cf25adcf9f9420e48a561bdbcb84eeb3b15399957 SHA512 2951ca778e732685409911c05f24e8e85492e5af4d8eceb0558636b4ace53b8967250250712c5995239bc5f7af01d20774042f3ccc9f90b370ca3cff673bb0b7
 DIST libvisual-0.4.0.tar.gz 583386 BLAKE2B 277348dacae1382da7e9212f7338a9cbc8aa867637d7db10ee22551c5e33b2d09870e94437958379245acf609dd70d3fa85f9ac14b40413424a7a14ca09e7360 SHA512 ab2286de30d33582a92f16e46436fcbc44b74649952df6e94d96aedc2cabb18d3361496c0b8ab6f52f7178214bf735673c8f1820c3d149304787ba8407201b95
-EBUILD libvisual-0.4.0-r3.ebuild 1278 BLAKE2B 2915bde921c021f3428ac535d9bcd7d06d9c020ec9b11b2bf706f81c03c4f8e2fba9ef0039c0b7a267729fdbde14007bc9dfb9674811eb4a4d2e73e8c8c929e4 SHA512 949cab8efc8fd8516899472f0b0fe8c6094487142c28491e56c42012d2d81a4cd08a5e80bcc466883a9eadb2833446a1520c9b8c037e66154710627bbbad4152
+EBUILD libvisual-0.4.0-r3.ebuild 1256 BLAKE2B f1d0fa2d929f93097d515ccbe14fb0def4b80007d22af3944d6a921231768ed56e1d1a79d575957451cc482e81fdf44848aa2a1d3f7f3595dd0f3fd35f7e5175 SHA512 efe5081ca7b4b7056387c619ecd969ab374246d75c51f756d4889110f058d53df09eb537c41134d805f5094ef07df99d3fc26436cd26cced79d6a9b5c6530b41
 MISC metadata.xml 332 BLAKE2B c29c386b29c500e0f8a7827985e0c26ee50f9f0465b92c42feed113b3b1fdceae581a6b8d7089ba2d304428f604b531d8e8833da12f2d44e8a1643d952b11445 SHA512 62db2eb31068dc2c0adf100ff0a9782bf9f92118fb2c2322fbde5fff6a22dfe16ff826b22218b44a86b7350ffbbc3e9fc6f0135f0a43feff8f83e3e6365b7288
diff --git a/media-libs/libvisual/libvisual-0.4.0-r3.ebuild b/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
index f5253190906d..cad7f9764d7e 100644
--- a/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
+++ b/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0.4"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="debug nls static-libs threads"
 
 DEPEND="
diff --git a/media-libs/libvorbis/Manifest b/media-libs/libvorbis/Manifest
index 12b41b558132..fabd783fc72a 100644
--- a/media-libs/libvorbis/Manifest
+++ b/media-libs/libvorbis/Manifest
@@ -1,3 +1,3 @@
 DIST libvorbis-1.3.6.tar.xz 1195388 BLAKE2B 9fc1dd125fdecb95687ea159b75cd66eed21329ec0795a3050e52e6cc58e1aac7b084ca25c4e52ca6f251ff474f6d71a716c0fbb2367beda8eb6a51a8fa9049a SHA512 a5d990bb88db2501b16f8eaee9f2ecb599cefd7dab2134d16538d8905263a972157c7671867848c2a8a358bf5e5dbc7721205ece001032482f168be7bda4f132
-EBUILD libvorbis-1.3.6.ebuild 1057 BLAKE2B 5633c69a61a40cd406d4c1e4e6b13bc37efc265af077ac12a9b560af0568ac97aac7bea6d5d0ded1360f9709bbfec0bac27dbbe56ecfaa8c683e8934f7222035 SHA512 61921c5138a00fb34a3f5a66e810115cb2eb22c0ab09a413947f8cffa7e3b04f8ccd1a7259cc228905c73852b3275b36137308b9701639fa36a164d35cdcb01a
+EBUILD libvorbis-1.3.6.ebuild 1035 BLAKE2B c4c5e4045311b4e9ddd5f226024f7cd8e6fb1b2a02e94741612d83369594c551424c17ce953e57cb1d274a4f2a601c5e11a4eda77afb7623529c799d54366e7e SHA512 28992e302e610af02c665710cef8ae0503151aeb3a30d0a5463cb5991fb0c321001dac1179cf8065f329453a60e965f0bf04d3acab454bfd74f3b6634644ef9a
 MISC metadata.xml 329 BLAKE2B a6d5d9be9186aaf3d6735d864b6cb04bffa351cc1a1ddc13e469ca002502048e74ae672f4079626afcb89798faa4628b6b859d200b241c4d643b65ff9c23e6ca SHA512 2fde69847e03cd50deb51ecb44508c41ffbdada22e1838a4e4a6f8165f550aa107849705b666166fe5cd9b1372a76bc5c50eeadb560a76043563dfdc98ce14bf
diff --git a/media-libs/libvorbis/libvorbis-1.3.6.ebuild b/media-libs/libvorbis/libvorbis-1.3.6.ebuild
index 846302b72c71..cafa1791a4e2 100644
--- a/media-libs/libvorbis/libvorbis-1.3.6.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.3.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/vorbis/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index 00b5599de8df..bbdaf71f28e3 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -10,10 +10,10 @@ DIST libvpx-testdata-1.6.0.tar.bz2 121020858 BLAKE2B 93bbaa4514e46b762fbf86d6639
 DIST libvpx-testdata-1.6.1.tar.bz2 158774682 BLAKE2B 0ba1897e015c69cbf98b645cc634f98fdaf58aa814ad2cf93ee1812a38d279a570b856017822db0b21215c0e6d2d069c3f40692317c885ffbc3b59c236a754ba SHA512 9038774a6955cb6664ea664b4d8e08b0e7a2acba85429da9fd84f522bc7a03d57f6d9f1302481136a718507113babbe4786ff7a648130298ad2c0b3cbe8e82ab
 DIST libvpx-testdata-1.7.0.tar.xz 238790100 BLAKE2B 1d14e794341d35402eaf54d398ebed56b0983908e397ae677737e0f313ea0bfc9c4a39be91765b02a07a8eb9b55529d5f998efcc87b1b493b0e326e02193d982 SHA512 1556345e41674f0846a7419828972ec27c3c37fe270fa1deb45e03665f60ec088d79134aee0d2e27003b130636eeed4a15ea3f701c9d7014f3ca2785467767a8
 DIST libvpx-testdata-1.8.0.tar.xz 418337232 BLAKE2B 1336e522f18a8f7812b4e7e4de7b27d32778c38fe902c62a4415a17e857868bfcdcbdcab528617db89e9f57449a486333feccffc4a250bfe79fc460c790071ed SHA512 991066467121614106455522b3651f194b45a37125c1b4e6bade59044756f26d914c95388e3c0bd3dc22159525aa6478df36801767bb7506fa7e77b93c6c2ede
-EBUILD libvpx-1.5.0.ebuild 3954 BLAKE2B f83ffbdd1a1f157f57f28184e1103bc172d6330d6e1146ae6014fe7792a118d8c7a4237ad638af4b4e441c81a6d0dc9e1edb0e430eb5155921c77d6f2c39283a SHA512 ae28b6eafcbb42b447a715236594c0cd72665925cf763c8579a668d0424ec86f6258ec10a8bdd0baa0ce332f792e9cb919223e5e4b1fedd2fcd49dce14b15c1c
-EBUILD libvpx-1.6.0-r1.ebuild 3566 BLAKE2B a3d55b41879c3b407bc8fdda418574c4d4a3bb5fc4cd6000af3841c28384f50e8d5f2faf72d33cafa65c6a3037876c471b660e6d48d0de26351c9d038555e1c2 SHA512 8b69bee233977ba30075c2330c0713f9e5615a4bb4c6668af182eb622a1cdb6aeb8318659e1fb397330ebfddb096bd158fddfecf8b6680aabb146a69f173dee6
-EBUILD libvpx-1.6.1.ebuild 3920 BLAKE2B e1350052f0e7542d4e5458305eb7b93b8e9f2399894ca52cbdad78145189429b338deafdfd63b5ef42c55a3e0da9d8c6182113e65cdc60f5608e0bf39ada8abe SHA512 fe68cbf448458d1b36434e5ecc5902577d6e557c06a090cb5695360cd32795052d74ffc1994e6e263c896fa463097224d9ec8d6b08f2a187efa6664b2a1f55ad
-EBUILD libvpx-1.7.0.ebuild 3877 BLAKE2B a757e8d46b9da389ffbe7f832a75d934d5a3afddbb5d501c2165137a2104db0af5403642ba812a6625c9dfffe9375961b9686e2c759184e0f589148007d368e1 SHA512 2791ce4aa2c47f440164b45c7f7ddaaa519d4171c0c8a00ad5a4bc621a41097e9a66748bf987f7f3c09e931a638a37213fe4298bbe58454a342de9f651ac9ada
-EBUILD libvpx-1.8.0-r1.ebuild 3352 BLAKE2B 2c43ff1789cdfe7858b17435f7e14db4a32c357d8f63d5c32ade679e088d6e8382552b2238ab84b2d608198bf8b7fa60dc73042ac9df64b83ed346c18fe5cffe SHA512 38e95bac7f2bdf989fcebf4f41c609424d1a27771e105e65ab6daa17639a5e3c0465a3ec5c6821e96e110d47df020e812ef2b5c59520dbd4fb8c46362f4ecdca
-EBUILD libvpx-1.8.0.ebuild 3917 BLAKE2B 7519a4bb61ceede17f50345bc1746cd6fef84f4942e8647bf74360ee6c42500351acef6ac0099a6400a902f910fc636db3be03c1fefe1a0f39b9a1ad02c3cdf7 SHA512 798f2eeb93e0e13539c1dea71d34516c31e95d4d3330f5d9e5adbacb26c8eb5be6b421b98a5a1559aba6e600bf7b71031e31e660cf4a77a09c00dd79b214a30d
+EBUILD libvpx-1.5.0.ebuild 3898 BLAKE2B 14c4c97a91d5c5b65ef34939298b9db89443dd326e7d319f515c474bd7cb76b01a674af73e899f218393babb209414c553e6123f55be4a862fa409d74af93fd5 SHA512 afdeb1ccd286f61c1110f2732afd23f48655d043156aa970c219c142a93a174cfd6c6219174fcf694086f8ce95ac45472ab040f361608e77366ce160303169c0
+EBUILD libvpx-1.6.0-r1.ebuild 3537 BLAKE2B 451ca91917ba72e0205bb13027492fdb41432fe666b4908bef7920814173bbccc4981ce7ad59f4dce33cc965a3e2ce0e3b51cb10a4c2f3cb48bd52c944982d91 SHA512 5fca0e189e810119a38bea11e86b9fd3c6395ecb6a7ad5aa0065abafaebd17a3e9969ecfb2e9235ed62309bd56a51b08576c3a75532a8b92c6a47b243d99b71b
+EBUILD libvpx-1.6.1.ebuild 3891 BLAKE2B 91615fc62757be283bed2f5c8511fe5e102ce9905703f569a5ee4e9e6880f9bd8283e83ead212637c7a4425667472a5e317b8d2c569fb6254c677d105c14ff67 SHA512 6927bc3dbbf1f60243f0d7ee9417d7df54692f74a98cd8613a32ac6c0e6beb00b4365bbc86396c956f3bd9fbf196b947f6c46f1c3045d73fb3c1cda47f992086
+EBUILD libvpx-1.7.0.ebuild 3848 BLAKE2B 6743ea2c0a8666be466e52c23024df59d92a4fceffbd00ffe988def6573da2d61cb5e30648a7f061efd998411736e2c462275d26a58b6f8cdb56cb08432c530c SHA512 6a2999393782d28265d26f4899a0d57cdd55b2bdd37cfda8b391e6714c3dea9346b7df99773cac70855eca9d5b53d236773e4f9691bec1cbaa6104304757620d
+EBUILD libvpx-1.8.0-r1.ebuild 3323 BLAKE2B f0160a133f3a58f45c10c0ccbf21202177cf323a43ee697c59307917e20e6e8b92e70ba65616d699b71748e69260ba18230c2e9057578f050edab3c3c4906f07 SHA512 8789e6b3fba102a6daf800358b911fb975dd3f123ae76b86d8db968cfb458ef096d5b776eae76af20043148841959dbd186d74b5303f80dc92a195248cb693a5
+EBUILD libvpx-1.8.0.ebuild 3888 BLAKE2B 6b9c8f3d68cddbb4335fc83e9c5f6abed17c171c6e7f85dc4cb8d3ad5d886baead1dbb6c70e4dc809e74319ff583b0ae7cd7aad15df5a84c484fa6dcd8f87224 SHA512 87eae08aef062dc5b28d530a6075df0c5ee243ab8f61231fa2b341ee54a48dc2b073c9e35b6f67bd1f95fd9a76d957c9174c4f8434963a297b71f1ece7a843c3
 MISC metadata.xml 664 BLAKE2B 78c866b8ee8a4b266156652bd6352d1ad0b7f28c88922dd31868623b1eca6530aab0a391c7264e5f1dffb9c1379adeb3b115846e99e1ab8a2ae1e58f527234ca SHA512 96644cef2185474da831eb928645cb7607216242097e8d1f1b887071817e282e22ae5646583208bfacf4467029b9dc2d3cfb888bba085bbf5b493dc98c3a7ef9
diff --git a/media-libs/libvpx/libvpx-1.5.0.ebuild b/media-libs/libvpx/libvpx-1.5.0.ebuild
index b3650dcdba78..c91b6542ea3b 100644
--- a/media-libs/libvpx/libvpx-1.5.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.5.0.ebuild
@@ -11,10 +11,10 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://chromium.googlesource.com/webm/${PN}.git"
 elif [[ ${PV} == *pre* ]]; then
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 else
 	SRC_URI="https://storage.googleapis.com/downloads.webmproject.org/releases/webm/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 # generated by: make LIBVPX_TEST_DATA_PATH=libvpx-testdata testdata + tar'ing
 # it.
diff --git a/media-libs/libvpx/libvpx-1.6.0-r1.ebuild b/media-libs/libvpx/libvpx-1.6.0-r1.ebuild
index cbe4a96a7c60..ad0ecc13f11c 100644
--- a/media-libs/libvpx/libvpx-1.6.0-r1.ebuild
+++ b/media-libs/libvpx/libvpx-1.6.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://storage.googleapis.com/downloads.webmproject.org/releases/webm/
 
 LICENSE="BSD"
 SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 +highbitdepth static-libs svc test +threads"
 
 RDEPEND=""
diff --git a/media-libs/libvpx/libvpx-1.6.1.ebuild b/media-libs/libvpx/libvpx-1.6.1.ebuild
index 8b1114c6fbc9..8c124aa2f4f1 100644
--- a/media-libs/libvpx/libvpx-1.6.1.ebuild
+++ b/media-libs/libvpx/libvpx-1.6.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://storage.googleapis.com/downloads.webmproject.org/releases/webm/
 
 LICENSE="BSD"
 SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 +highbitdepth static-libs svc test +threads"
 
 REQUIRED_USE="
diff --git a/media-libs/libvpx/libvpx-1.7.0.ebuild b/media-libs/libvpx/libvpx-1.7.0.ebuild
index 1e5f44ad1f82..4bfe6c358c9f 100644
--- a/media-libs/libvpx/libvpx-1.7.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.7.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ia64 ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 +highbitdepth static-libs svc test +threads"
 
 REQUIRED_USE="
diff --git a/media-libs/libvpx/libvpx-1.8.0-r1.ebuild b/media-libs/libvpx/libvpx-1.8.0-r1.ebuild
index c45449b70d2d..ac8ba2f43d62 100644
--- a/media-libs/libvpx/libvpx-1.8.0-r1.ebuild
+++ b/media-libs/libvpx/libvpx-1.8.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD"
 SLOT="0/6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc +highbitdepth postproc static-libs svc test +threads"
 
 REQUIRED_USE="test? ( threads )"
diff --git a/media-libs/libvpx/libvpx-1.8.0.ebuild b/media-libs/libvpx/libvpx-1.8.0.ebuild
index cc1164e1ea8e..0016bd89c420 100644
--- a/media-libs/libvpx/libvpx-1.8.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.8.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD"
 SLOT="0/6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 +highbitdepth static-libs svc test +threads"
 
 REQUIRED_USE="
diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index 7e8739fc6d97..c2af921dd454 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -1,5 +1,5 @@
 DIST libwebp-1.0.2.tar.gz 4036397 BLAKE2B 708c1083f62bdb3526f8319d9b6ce1e8aeba2bc785105ff7db07c9c7041311cedcfff000de5b8fd8e93550fc86ec149f6dd4a21f576709b80cb6a4b20ddd2863 SHA512 e095b8fdf0096395daf12892b3b74c472868e727f23640ba7aa5922a5a028b778a6a60d8a94f696f6c0ca49577dfc9a0b599ecb74ad831ade48c6db812b71d2e
 DIST libwebp-1.0.3.tar.gz 4029909 BLAKE2B c2b7f65515e455658153ef3042c50d35f3a1e11668f3c75bdcedeee91d232d8724ca34cad0b893912463efc28658b48ff7ea08d98d7f02050a831f50d77691a4 SHA512 3ccdc62e5906f8de791053560e932b39df3cfdd7793617bd4562b7d95e2f6feac1535bc035e1b02591cab14b117ab15e51af6f9e4e3af1df0869c63945ec86b9
-EBUILD libwebp-1.0.2.ebuild 1831 BLAKE2B 2bcb206a9a857c95c9b75bb0a589b0da2a7e620b7100c4c3cb4c9a3bd3590f5371fe6dd91daa18357134e31b9eea11f3e258786387576bc2d7f983e1866d554a SHA512 5e0476b0553ec4823225c2f540369385bafe1b675442f3f4427f3ed0e4528872cfa2f77bf09880fb26e656e298872bcf9f40858ac28f194c67a7d6be03813330
-EBUILD libwebp-1.0.3.ebuild 1850 BLAKE2B e942f2cbd7f28edad3f78b723a17b3a1dd16f74a8f6f868f0c6fa5d864e51b60d841fd6fa965448e807b59ed83298594f06f6e414836785dfda44e6e79362126 SHA512 f335ebf94adde8dd90aea6e67e2c5ae390ceef750cf8ca3e4089b97d131207bee38b52d906f0a1be50da190fff39e039bab8d18f212f9ed4d9b018c6564b7260
+EBUILD libwebp-1.0.2.ebuild 1809 BLAKE2B 8d0b0dcfddd5d6b37a5e55ec9437fe71cbdc7f32a080198c44a92f547f72e75345bc1d77dd9a69557f3bc7b940eec949a8546b189b30e50835f27cb4dd05d64b SHA512 1acb6820e1f66b27c09c97fd6163378861c44c91cf9de982069209286a464488190923a69b60f3c94db2213abfea8c466dcc518a02822644a77aa1bdfcf5e4e4
+EBUILD libwebp-1.0.3.ebuild 1828 BLAKE2B 7e3a2203d5dc2f5da598fdaab1089a1d386cf99bb6280b97b08a0497be420180565df6d3c552049faf6c42459a8a1a6f27b3652ad194b728dca51f99b6e12b1e SHA512 86fc9fa50a4daf7f2d0da10f3117b5a10dd020525d89ac92b4e156116fe45611c663120a551c714be7eb53c0f5e9291c1ff3f9346e42ba153e73e8e86bca4792
 MISC metadata.xml 551 BLAKE2B be0c5dde4ced33103958fc19f5c5f4e9f17c417ced75f9ca065f35fadd50cf286c2a5dba0889dbbe439aa59a5a60d975725984687c1e008cf338cf1cff0ff7ed SHA512 8557a448b4d83f68911d02ef4d2cc003eddae753f28a57f3f87670cbe7e89fbce784416270ecf4f471c883e2bfcabafc3340e16026c883712b96f8b295c868be
diff --git a/media-libs/libwebp/libwebp-1.0.2.ebuild b/media-libs/libwebp/libwebp-1.0.2.ebuild
index a28d7e1a2475..ac156cbefe94 100644
--- a/media-libs/libwebp/libwebp-1.0.2.ebuild
+++ b/media-libs/libwebp/libwebp-1.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/7" # subslot = libwebp soname version
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-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 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg neon opengl +png static-libs swap-16bit-csp tiff"
 
 # TODO: dev-lang/swig bindings in swig/ subdirectory
diff --git a/media-libs/libwebp/libwebp-1.0.3.ebuild b/media-libs/libwebp/libwebp-1.0.3.ebuild
index 87c3f6593331..ac73ea539ef2 100644
--- a/media-libs/libwebp/libwebp-1.0.3.ebuild
+++ b/media-libs/libwebp/libwebp-1.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/7" # subslot = libwebp soname version
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg neon opengl +png static-libs swap-16bit-csp tiff"
 
 # TODO: dev-lang/swig bindings in swig/ subdirectory
diff --git a/media-libs/libwmf/Manifest b/media-libs/libwmf/Manifest
index dae93bd4f970..545b6357aa98 100644
--- a/media-libs/libwmf/Manifest
+++ b/media-libs/libwmf/Manifest
@@ -9,5 +9,5 @@ AUX libwmf-0.2.8.4-pngfix.patch 582 BLAKE2B 942d02776eb50d71222224f5c11fe2457fae
 AUX libwmf-0.2.8.4-use-freetype2-pkg-config.patch 2050 BLAKE2B 1ea7515753b2f3153c78d80573f219279e76021549ac85131ad9e139a5dd787c107cf83af18529429c4d250b77300a8b553d24ba9030735bac6acd68af833734 SHA512 311189d58d8bca7d91967bda84c6475ccec59fa4e11b535ff6919664cdeaa4b668ea688a021911dd7ea77393189c762c3800214acbed9f09d8591c70efa6b058
 AUX libwmf-0.2.8.4-use-system-fonts.patch 840 BLAKE2B b81b973aeb8b1e59c0fdf8a4dfbbad05285dcb3e4fe9f61002a6997c8988fc8e931dda1c2c3d6f250e287bd084f96c6ada464686ccbc22f6224edaa5fb461196 SHA512 0b5536cf6ac5812f88cada38afa94a7c51044aff44c4fa4a74b8fabd41c001aed7acf7911cebe967ad9764525aef8cbc048796b60db7b60b12bee3cfc846c50c
 DIST libwmf-0.2.8.4.tar.gz 2169375 BLAKE2B d86de4483201a07639779e024752d5c00a3dbc7399be353879b828850b74612651bbcf1851f322d62352259b73647038790580a9a4aeb43b7aeb4c1affedcabe SHA512 d98df8e76a52245487b13e5ab3d2fbba9d246f97ee04a7344c0e5861bb2d0f990fc6d662dbd849ce621768b06eaebd4270fb34bec4ee004334a98b14ba6044a5
-EBUILD libwmf-0.2.8.4-r7.ebuild 2570 BLAKE2B c5e1248ae289ccd5928ab7a930af8b2663f8744c756d5bd058bad1940d3536677a0e7c00736b1868db7d3d751850244664cd3aff637f901d55c087bd4a996b33 SHA512 a21c5e888cd3c5dfb98bc93c9cec25a28d2437e166711e9bf736d45db020991ea3cbcbc9765d5b700bc235d92764c49b49a0e7ec882cff4eafead46a7604fd05
+EBUILD libwmf-0.2.8.4-r7.ebuild 2548 BLAKE2B d1a6b51ea7355069fc0b564425bf4a59c7632789a5b351e5516e38b1af4747bf969e2f43829fab9872a430e06ad9e16a4f88c82b1d5c5d0b67531cd875beb51d SHA512 3e535f6dc6f93979aec6db228aa3d7a83385c6a8b1af9b2c81e8e9112bf89f78fb0daaee53d053a4cbacf671a42a797f61dc3dcb69b535bc8093507f1fece936
 MISC metadata.xml 303 BLAKE2B 6ec9acd2a49b905ced51d2fe9ebc14b8c51008bf684cab000a260db8017ef8a99a7710188a3e5e222aa4bb7bccbec3922445ca39eb07250587fa27f7e07061a3 SHA512 548f41b0b51ebf83dfded3b373434f2866fbdbd1f8a709457787d122bef05a21651adc313f63bfea58473c28b209abce34841cb0eac40c7bd8f84dd233d5bcec
diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
index be9a5235f948..a6cffc66d999 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A library for reading vector images in Microsoft's Windows Metafile
 HOMEPAGE="https://wvware.sourceforge.net/"
 SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="debug doc expat X"
diff --git a/media-libs/libxmi/Manifest b/media-libs/libxmi/Manifest
index bc73e9219e70..c9d47f123cbd 100644
--- a/media-libs/libxmi/Manifest
+++ b/media-libs/libxmi/Manifest
@@ -1,3 +1,3 @@
 DIST libxmi-1.3.tar.xz 258672 BLAKE2B 7eb50a9a7804bd37fdacd238e41241d54e9b0ee00aac9267e9d6a62a1a61338522c26df56021821fd7af74123550f99305a233dadb55a6a9514feb124fd70d32 SHA512 f54b0925e2b848f7cfb31bd0f9eed27df6fd6e704ffeeb58eb490d49e7ca76f46e03eee6ed89d6644f6a3bad05c7b0b986f9634d0cd23c49f31ee80f23ff8262
-EBUILD libxmi-1.3.ebuild 638 BLAKE2B 1d2f8a8568afead5341881d8eb8e23ddb200b39ca4ec11fe93200c909fb9b34de8bb53eff13fe8626d9548bb1f45220f728afe8ef68bb3cc7d04d70516b4eaf7 SHA512 333ec015c641217f3616dc7c88cbf8586ea031037b0be6f45c7e63124526479f6c8f129104eff525f6d9f5ea55ca5cd67c54f34ee3c8824a4caef825b2ba501b
+EBUILD libxmi-1.3.ebuild 616 BLAKE2B 33501d7ee052e4c17de0eea8139c4c5d096a4fab32b156acec6b454960181a9ae5aa51154f55d3a6dbba7de05f948ca78d43df0c6f638201653c4cb85bd3525b SHA512 75383462baa99d385a7c42357248c19906126076ed27d4cdb50278a597fbd37066ef91542cfb49655f11247f70a774c3a5f116c03413934e0dcc7bf2c4cd3842
 MISC metadata.xml 1174 BLAKE2B 9dae17714124bc3fbb5625b58a78353eb64aa9131e541943819b35ec6231fc1009d11bf90219fab08e34187eff0c0902d5e6a2a6ad64e586bc8e7cb464edef62 SHA512 0fc60c658a5e56b8d6d49c0251b2678c07d19e9a32ad59f08ae98120f28b412642030692f8c51bef994c14b4d01d9979f3286b22cd417c8a1b1211a27355b03a
diff --git a/media-libs/libxmi/libxmi-1.3.ebuild b/media-libs/libxmi/libxmi-1.3.ebuild
index 03eaea71110a..ad55e31a5ac1 100644
--- a/media-libs/libxmi/libxmi-1.3.ebuild
+++ b/media-libs/libxmi/libxmi-1.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND="!<=media-libs/plotutils-2.6"
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 10d7c3100f14..819165747574 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,16 +1,8 @@
-DIST mesa-19.0.8.tar.xz 11967592 BLAKE2B 91a46b67bdb8cb3ab4c7337be7c2b0dc6ab5ec8cc126afc2d8af8d056bff0392a5b443c26304bf4c68472eb6ba16d29ca248c1fc0c0f2dd6af03d3e10d3ec1b3 SHA512 fbddc3a74f223564343027380af776b3fa5d63fe1af4e34121273235d1c6eced96439f601eb19bf658eb927aff3965b520f0329fcbd4650f3112167303e1746d
 DIST mesa-19.1.7.tar.xz 10941152 BLAKE2B 6be14ddac404668bdd8b7b8756388019c3610ac41b65a7723a419b97b7eccbca666ad6d904f4cde186c4b171e056636a8a6a5727e30963c8fa177d7861bd6cfb SHA512 0865b5f91e5daa00e1da2b3d8b65fe5d2ff6332372bf8fec7d671d05d8d64ec5a7abea1858cdfc506c76b7226d2bea0af3426565f156b796d8e0f949ea33dc15
-<<<<<<< HEAD
-DIST mesa-19.2.0-rc4.tar.xz 11458940 BLAKE2B e173143f01efbbe98e11d37be4e66ac5d1fb739f15796cd25b6fee3b86cb384803e21d9b65880f7b0ccbd51f956e5cf5c99a2edbf5ec1ff472a90cf26bb7640b SHA512 a00422b4278951e4706671fe1507d5ba323a3badaceb03649dde425216fbb3cd83a21785374c75135e90fc5c6c67963f8aad0c33dac1cedaed3b69f2cd9f1c9b
-EBUILD mesa-19.0.8.ebuild 13852 BLAKE2B c005b9103e2bac385a5c4889ab89a5809ea9a989aa657cf9899b94634d49dc4eb1f31a791aa0aa40482b9a0b64a85200006dbfa1758e7d2a73a5029d585ac320 SHA512 3f496e20c5248ca8c4c83ad18db01bd3ad129496d24020621e85ff68e90b89d4ec5c80b7ebe651f6ee106d340e0afe017f6e9b985d27f012c3c770e601cb7a0d
-EBUILD mesa-19.1.7.ebuild 14263 BLAKE2B 3ee726125703fdb9475f26c34640b8af851a0b4364452fd8becb435d2442649d251e4b591756ca6e5e5c2961428be452005b13f4d6754e42a32d58d52b9f35e5 SHA512 3015fd097bebc9b8f299b3bba9b723aae05d037757f118054667f16dfe73c5e003ce790bc1ebe5778c3b196650b2094e0a5b1f572153bdfababe765351bfa112
-EBUILD mesa-19.2.0_rc4.ebuild 14394 BLAKE2B 2aa8740cce7c6fe3973dba6da9d0223f6263dda594a046c1267f96b799dc8b9429e8cdcfe8968dd57891dd90faeb1c3ab454cdaae00a3a2bee47421905f65055 SHA512 61949a0e14489d8850ab94de369120457be092cd68ee033fb818a0c8ab36462e1d07cfd9c9bcb65bdfa8b382d7404acbc6df7b857813b966b3334c7598055b1d
-EBUILD mesa-9999.ebuild 14394 BLAKE2B 2aa8740cce7c6fe3973dba6da9d0223f6263dda594a046c1267f96b799dc8b9429e8cdcfe8968dd57891dd90faeb1c3ab454cdaae00a3a2bee47421905f65055 SHA512 61949a0e14489d8850ab94de369120457be092cd68ee033fb818a0c8ab36462e1d07cfd9c9bcb65bdfa8b382d7404acbc6df7b857813b966b3334c7598055b1d
-=======
 DIST mesa-19.2.0.tar.xz 11464180 BLAKE2B f2f260e9efb928532501ff4f1c0137621f954991ef6d30fbdc61c28fb95e3ddb9e81276d345bc7bff6871e603dcbb29073b788427d0dea565dfa9b7f8b88966d SHA512 7278bbfba9c29fe91d1959ff1a48422e917db85287460523d12ae8c6d7f49f76e9636bf4c0d8d7d89e5569b3c67135f1b23b8f6c9d52d39413d8ec22e3bb40f0
-EBUILD mesa-19.0.8.ebuild 13852 BLAKE2B c005b9103e2bac385a5c4889ab89a5809ea9a989aa657cf9899b94634d49dc4eb1f31a791aa0aa40482b9a0b64a85200006dbfa1758e7d2a73a5029d585ac320 SHA512 3f496e20c5248ca8c4c83ad18db01bd3ad129496d24020621e85ff68e90b89d4ec5c80b7ebe651f6ee106d340e0afe017f6e9b985d27f012c3c770e601cb7a0d
-EBUILD mesa-19.1.7.ebuild 14263 BLAKE2B 3ee726125703fdb9475f26c34640b8af851a0b4364452fd8becb435d2442649d251e4b591756ca6e5e5c2961428be452005b13f4d6754e42a32d58d52b9f35e5 SHA512 3015fd097bebc9b8f299b3bba9b723aae05d037757f118054667f16dfe73c5e003ce790bc1ebe5778c3b196650b2094e0a5b1f572153bdfababe765351bfa112
-EBUILD mesa-19.2.0.ebuild 14548 BLAKE2B a648da33f288b199cec41d64f360bfdfd3917a0a3935ee22598f5bbfbcb3586d7af124e4053345b1b635202ae856b2906543c3b8cb7b056eed18d284301fcc0d SHA512 66ef9c515e95339cf30cdb36d8e3664aae93584ca5562fcfd113c97faa9e8706baf80af1626cc24b821f80e855baebe3f6338afef142811e80e68c021ac0f33a
-EBUILD mesa-9999.ebuild 14548 BLAKE2B a648da33f288b199cec41d64f360bfdfd3917a0a3935ee22598f5bbfbcb3586d7af124e4053345b1b635202ae856b2906543c3b8cb7b056eed18d284301fcc0d SHA512 66ef9c515e95339cf30cdb36d8e3664aae93584ca5562fcfd113c97faa9e8706baf80af1626cc24b821f80e855baebe3f6338afef142811e80e68c021ac0f33a
->>>>>>> next
+DIST mesa-19.2.1.tar.xz 11468492 BLAKE2B 9f6a1a5426343213a19dccb07917326b887ddc6ec02426b0604bea35a529f33c18ca46e2db09eb44c5b4a3b6e70da5f8fc7e049b1a0febd35d0de8f2ec4d2641 SHA512 decd74976fe866bf67fac4ae55a62d8e33ad24278dd58effe533e7d258b249f0ead848360e7e71444265184c6d9d9b04361caf0c6df99504e33599e7a0cd6c5d
+EBUILD mesa-19.1.7.ebuild 14241 BLAKE2B dbdd629eb1f7ec6ad67de25e693e5a05217e425f107ced5cae65e8410112b686cbd1f71098eda8943ba728f0e038860e347c147fa75b1e6e67e7420d2421576f SHA512 b5b86b2f9866bcc8494493bd38bc9cdba20596f129fafcb37804758a387d4d2d61ca17d2f06876029b59619ce2699f0334d6ec7198b2758924f5d4c1c26c8d45
+EBUILD mesa-19.2.0.ebuild 14526 BLAKE2B 8ca920ff157fed73f06017bf652f6198b1bc3e15eb61b14bd5913db2229102c71e059c49548916c6f74c8f2b970b6e2e150ea1457ba505afc742f21b878916f7 SHA512 b55adfd15be011702608b1d02c04633bb31de958db3dd971fb9594d5411a8a3dfaed38de96325c7754c598202b436f9c0cb994345b055d0857c5804181041ced
+EBUILD mesa-19.2.1.ebuild 14526 BLAKE2B 8ca920ff157fed73f06017bf652f6198b1bc3e15eb61b14bd5913db2229102c71e059c49548916c6f74c8f2b970b6e2e150ea1457ba505afc742f21b878916f7 SHA512 b55adfd15be011702608b1d02c04633bb31de958db3dd971fb9594d5411a8a3dfaed38de96325c7754c598202b436f9c0cb994345b055d0857c5804181041ced
+EBUILD mesa-9999.ebuild 14526 BLAKE2B 8ca920ff157fed73f06017bf652f6198b1bc3e15eb61b14bd5913db2229102c71e059c49548916c6f74c8f2b970b6e2e150ea1457ba505afc742f21b878916f7 SHA512 b55adfd15be011702608b1d02c04633bb31de958db3dd971fb9594d5411a8a3dfaed38de96325c7754c598202b436f9c0cb994345b055d0857c5804181041ced
 MISC metadata.xml 2000 BLAKE2B c38c6f85a08bdb71f3921847d03c8a2849a43def253c200cb3f21d68142f3a5065cb2e1a2170093d91f3aba34c99fdd9bab840f2bc62ce05f11484b2edb3cb40 SHA512 d55b9c0ff6a97d995a150ee10643c869359370222ab29712da25f69c5671a4e6988e2d508c956082cc7165db96f42289d25daecf230d36efe2240e4f377d1c72
diff --git a/media-libs/mesa/mesa-19.0.8.ebuild b/media-libs/mesa/mesa-19.0.8.ebuild
deleted file mode 100644
index 67340d9d392b..000000000000
--- a/media-libs/mesa/mesa-19.0.8.ebuild
+++ /dev/null
@@ -1,525 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
-
-inherit llvm meson multilib-minimal pax-utils python-any-r1
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	EXPERIMENTAL="true"
-	inherit git-r3
-else
-	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
-	lm-sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
-	vdpau vulkan wayland xa xvmc"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vulkan? ( dri3
-			  || ( video_cards_i965 video_cards_radeonsi )
-			  video_cards_radeonsi? ( llvm ) )
-	wayland? ( egl gbm )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_imx?    ( gallium video_cards_vivante )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	libglvnd? (
-		media-libs/libglvnd[${MULTILIB_USEDEP}]
-		!app-eselect/eselect-opengl
-	)
-	!libglvnd? (
-		>=app-eselect/eselect-opengl-1.3.0
-	)
-	gallium? (
-		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-		llvm? (
-			video_cards_radeonsi? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_r600? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_radeon? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-		)
-		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	wayland? (
-		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 9.
-# 3. Specify LLVM_MAX_SLOT, e.g. 8.
-LLVM_MAX_SLOT="8"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:8[${MULTILIB_USEDEP}]
-		sys-devel/llvm:7[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-9:=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	valgrind? ( dev-util/valgrind )
-	x11-base/xorg-proto
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	!pic? (
-		usr/lib*/libglapi.so.0.0.0
-		usr/lib*/libGLESv1_CM.so.1.0.0
-		usr/lib*/libGLESv2.so.2.0.0
-		usr/lib*/libGL.so.1.2.0
-		usr/lib*/libOSMesa.so.8.0.0
-	)
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version --host-root ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_use llvm)
-			$(meson_use lm-sensors lmsensors)
-			$(meson_use unwind libunwind)
-		)
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=false)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=false)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=false)
-		fi
-
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_imx imx
-
-		# Only one i915 driver (classic vs gallium). Default to classic.
-		if ! use classic; then
-			gallium_enable video_cards_i915 i915
-			if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-				gallium_enable video_cards_intel i915
-			fi
-		fi
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-			! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_radeonsi amd
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		emesonargs+=( -Dasm=false )
-	fi
-
-	if use gallium; then
-		gallium_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
-	else
-		dri_driver_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=dri
-		-Dshared-glapi=true
-		$(meson_use dri3)
-		$(meson_use egl)
-		$(meson_use gbm)
-		$(meson_use gles1)
-		$(meson_use gles2)
-		$(meson_use libglvnd glvnd)
-		$(meson_use selinux)
-		-Dvalgrind=$(usex valgrind auto false)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-
-	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson test -v -C "${BUILD_DIR}" -t 100
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
-
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-19.1.7.ebuild b/media-libs/mesa/mesa-19.1.7.ebuild
index 8222ce52ac6f..9f078435bae0 100644
--- a/media-libs/mesa/mesa-19.1.7.ebuild
+++ b/media-libs/mesa/mesa-19.1.7.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-19.2.0.ebuild b/media-libs/mesa/mesa-19.2.0.ebuild
index 27301deb54b0..cad8a11cea0e 100644
--- a/media-libs/mesa/mesa-19.2.0.ebuild
+++ b/media-libs/mesa/mesa-19.2.0.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-19.2.0_rc4.ebuild b/media-libs/mesa/mesa-19.2.1.ebuild
index b7b3a5803880..cad8a11cea0e 100644
--- a/media-libs/mesa/mesa-19.2.0_rc4.ebuild
+++ b/media-libs/mesa/mesa-19.2.1.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
@@ -35,7 +35,7 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 libglvnd +llvm
 	lm-sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind
 	vdpau vulkan vulkan-overlay wayland +X xa xvmc"
 
@@ -77,7 +77,7 @@ RDEPEND="
 	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
 	libglvnd? (
-		media-libs/libglvnd[${MULTILIB_USEDEP}]
+		>=media-libs/libglvnd-1.2.0[${MULTILIB_USEDEP}]
 		!app-eselect/eselect-opengl
 	)
 	!libglvnd? (
@@ -243,6 +243,7 @@ x86? (
 	usr/lib*/libGLESv2.so.2.0.0
 	usr/lib*/libGL.so.1.2.0
 	usr/lib*/libOSMesa.so.8.0.0
+	libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 )
 )"
 
 llvm_check_deps() {
@@ -503,6 +504,8 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	meson_src_install
+
+	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/pkgconfig/{egl,gl}.pc
 }
 
 multilib_src_install_all() {
@@ -514,9 +517,11 @@ multilib_src_test() {
 }
 
 pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
+	if ! use libglvnd; then
+		# Switch to the xorg implementation.
+		echo
+		eselect opengl set --use-old ${OPENGL_DIR}
+	fi
 }
 
 # $1 - VIDEO_CARDS flag (check skipped for "--")
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 27301deb54b0..cad8a11cea0e 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/musicbrainz/Manifest b/media-libs/musicbrainz/Manifest
index edfd6b75736b..680023217f76 100644
--- a/media-libs/musicbrainz/Manifest
+++ b/media-libs/musicbrainz/Manifest
@@ -1,3 +1,3 @@
 DIST libmusicbrainz-5.1.0.tar.gz 77220 BLAKE2B c655ae4a9a11adb15de559a1e518b5c5aab47ce3c36e3a264faddda36112d9caccc42d2013e451ffdf200147ffca4cbba883affa1a6465f6071fa14e1d67fbe5 SHA512 daa7ccb94e517e90f7d88a0659c84b00f04c6a73ef7771b7e3bd9101fa6569b1935a68a3689502ed0cc8c0d71ba9d2d0ebd9c074dd5eed9f75a3db390b222e03
-EBUILD musicbrainz-5.1.0.ebuild 1037 BLAKE2B db6ff99fcf43aed4f17e8fc5a5ec33a0032f348256860b81c2f78d43212067a496992e88a3d3c8e30a98923f548eff96e61c97d144a6c143fc19fe889c0cb714 SHA512 62c26c32c4cb82c2f899933c1a7bc41b6b98651c11cadac88d7ed685e54a93d4589f9773215609652aab53959b7709b3403b8142d70e955ed1a5a805b5cd1c66
+EBUILD musicbrainz-5.1.0.ebuild 1027 BLAKE2B 440be7ce8494dfb767dc0f196057335c2c01921bc73f982b0764fab5556b5138eb1f0e2b75387aec6b5897aa2011027874a95d5e58dac5a795f2c0d079bdbfdd SHA512 9f935e29be6f8b67df836eaccb9ea50df531ed30dd8d7b6138675aac5b28f66f4fb992b481f33c58a377d00c90bbbfcf1011351981e389847422a56a4094f5af
 MISC metadata.xml 416 BLAKE2B 07504a54a7396e2213d1a031ed5c2aef46c3d321da8aee0dad87ca63c4d257574c3a06bfc57116557ec4a81017eca9a193e236f5119f504fafd6752250368511 SHA512 c2517eaf706a3672812c02189fc33a866b4a27950010c5d1d3e957cab1097d2bb011a6958342f5a840af7b787089bfccde5e7c044873c0dd2d4247ff9b294a6b
diff --git a/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild b/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild
index fae42e7057e0..9ea4846387ed 100644
--- a/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild
+++ b/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/metabrainz/lib${PN}/releases/download/release-${PV}/
 
 LICENSE="LGPL-2.1"
 SLOT="5/1"	# soname of libmusicbrainz5.so
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
 
 RDEPEND="
diff --git a/media-libs/nas/Manifest b/media-libs/nas/Manifest
index 6bbd6174caf4..34ed56a8fa97 100644
--- a/media-libs/nas/Manifest
+++ b/media-libs/nas/Manifest
@@ -4,5 +4,5 @@ AUX nas-1.9.4-remove-abs-fabs.patch 1164 BLAKE2B 1fd8fb65a12cb340c47ee80929e2617
 AUX nas.conf.d 229 BLAKE2B 2ac8a6d914d02bc92258d7dfe3118e89ed6e3fe9d98e7a24eb8d72ded22dbb68a2d8129d066dc1457c0b8959f1762197b61f90502d3c60cdefd8aaeced04bbb3 SHA512 53cb9906d169b63b3592443bc0b63d59c4d0683e4b2194c60b1bc4297e6556f04b3ee9bf81da3a7f144757354de9aebe08c8445fccaa9a458a3b6537da68a2ac
 AUX nas.init.d 347 BLAKE2B 8b87c877fafd0e5993f909a4e132ed9f7042a3d8bdced8c7487afc962dfcad24a586ac754b99cbff815475f1326f44d52effb8eefd65cd0e25e6bc45991233af SHA512 556fc5d5135f789b0691de889aeaadce29319964443052787db5cb4cda480ed68c547c772de97c07ba2e0800f25cfa859376a3d80e9518995aae8136fe171468
 DIST nas-1.9.4.src.tar.gz 1464598 BLAKE2B d79ecda9f86a89d2d61bfadfeee4bb6a9feca6754bb88249b1eb3c1964e784d18098465f30f1b5bbb13d0550aebf48bb1b98aeb1b7c712f344a2eddc7720531b SHA512 3f8bd60f8ce0f25a2605af17caaadfe4f21223ba4cd3fa02078d1427b17cdf33ebda887e5dc30cd68eb7f64bfad80aafc9071ff0a26f0d3a4a93caacac03b5bb
-EBUILD nas-1.9.4-r2.ebuild 2442 BLAKE2B 3befb3a5c7bd8e7f8c8e6405e462d21dd9885471b7e978510e1eca63ec8a3de966a4897c337b532dbd85bcba8f33811291b41be899eb47b28368db8c681337ca SHA512 20d098dc2a31b472dc8dea4af60ea8a95be0618eece1a8abbf78b52f3995132fe917333711d2b9ea944e0995b63990b2379d1848a2ec178c96343de333279b26
+EBUILD nas-1.9.4-r2.ebuild 2432 BLAKE2B 55f27ff6094d1e16b0acc3f1b87bc0b76516b9d531da548d46d6536ea68b318bcca5156316a52f8f53ee79cd5ea10592c24509432a8173bcac4122d2a7557078 SHA512 b4e92fcbd1e85aaff88cba3bb9c5e13c672b237b8fc2d3e6c6c7444c8c000ebcce31410443736e33bd52dacf30b849d735d21604e2d55e489e9b2fbf8df71666
 MISC metadata.xml 326 BLAKE2B 837bd2d88bfc59121d0e166ae65c8d4732b8cdc6a898183bfb1fd984b5bc3e8e3a2c3f22d763a26664da7f97c9091fc9c3af8c419b3e9e39a7410989434ed739 SHA512 7a2a048b46af5cfd9167aec79f8a4f4e8a10f8327d1aec4b59330cdfdc7e4b90d9b9ab85e73e2b0a0e5db6b71bb729e7886dc3763a4d75d8ed4602b7b6cb61e7
diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild b/media-libs/nas/nas-1.9.4-r2.ebuild
index 891727056835..87fbe235ad14 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index e8f6b63dea9f..a9726cf07934 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -15,7 +15,7 @@ AUX netpbm-10.76.00-test.patch 6005 BLAKE2B 0c8b0d9b1d7a0c5b139f85eb3a91838cc496
 DIST netpbm-10.66.00.tar.xz 2575356 BLAKE2B db6336aaf6051d6b651b57d8d6692792698840546e82e61e4bff6c2dfa55041e8441eb3e4b7f09279181720bcbbaf3676903daf5ae85327b5cf742ec150df61c SHA512 44348eb1155353d5cd5a2ce025bc6d9301cc3239acea6b68418c14432f4bd61fc5a8669bb51b3e86b96abaf5b02cc20115c662e40fa5b41aee202b0c2ae605af
 DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4
 DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa39096f4f9c079b523d8e28ce62301797ee50f55c84f85a6d832b723da7449531e725bf60a4a89975c51382b2cbc4a94 SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3
-EBUILD netpbm-10.66.00.ebuild 5574 BLAKE2B 493ee7587d52bd88f2f64e6cd07707f69181aa8043016845fce991553c2c4387a0b46b62878850246a4682f77bf7f1fe787e65605ffd513dd14c49b61597c2a4 SHA512 177862ad6c682bb5ed506abefbdbdc7fe709f4013663c6858fdcd0f4b5aad57fcf1593e504c673062e8c8394a5b2bf05e7c78aa51a5200c27684c1f2ad2635eb
-EBUILD netpbm-10.70.00.ebuild 5315 BLAKE2B bfa0d92288326dd24e7603f52fd0fce2b1da33748c3285670748ebb2db186f0fb4788d2905199081736c526a778c6a681216f43bf5dbf05580b9f50264126e7c SHA512 9f1c6e869297c52d1232cfdbffd7ebb14343d96ab49c620896e0a69fcfac32be0b34731e7a5a67ca60aa981f4aba6787b74cdd3233150957195c84909a2949d4
-EBUILD netpbm-10.76.00.ebuild 5205 BLAKE2B 27bfe092440c6889d3d43c1c31e5ede375ac856d01d602fb3ffde2cc08ea68e52bc5d12cefe486c9155b870fc60be1b74ba9ae7cedfa34267131affa26bb524d SHA512 4d70735e1029fd633d4cbde1c9f768ce71030dd48dc7c0f27045671cb9bff0a288bbb157e2ac123c09090162ca5a73360217f4ed1af46f540327465768181bbe
+EBUILD netpbm-10.66.00.ebuild 5552 BLAKE2B c6d50fccb0f6af65e4e868bb7cdf9e7bbe65e6d20a7e9463914301cf1e35b7d76d6af1b0042f36f015d93d72f0b875da91d7a273a5819774d8ce36167067202d SHA512 e5a7652d40f9661ad89b45a6cacd1e30441c242d275e1ed80066e0ebb2ae3fe0d0aed3479db7d18a65778007cb2aa64a1f0b308dc92f6ed1408804389d823f4f
+EBUILD netpbm-10.70.00.ebuild 5293 BLAKE2B f6101155b341e53bc27f46c2207d9dabfc932ebf9943ae973f1d6af3e378e81c0e634e9aab64c3b2d817b04f2a8a018c0f7ab455c2e4896209806cc45efc4aaa SHA512 dbaf6cdcd5d36f81e94a3c0685197990473978527e4a4e8d1f3e3841e6feb5b0b77f9dfbaaa4dbb7de39b4facbf83be6924ead3d1f95c3c29d14d68e0c9ef66a
+EBUILD netpbm-10.76.00.ebuild 5183 BLAKE2B 929b64a0b3984b01ddcd677613facdf5a67a58895846783daab792ca69fc4318d3f81a9e0f5abc21d239349c811ae8d9be75307af72fe2d8ea47a5cd34f3ace4 SHA512 849d3070206d9bd62fa651bda3a1c113f5c2752d6d6cfd441fd29a3ec886c6d292cd4b8838e3a4db153485b6096bcebe05db3efd0fccc4640dd00d9713744c7e
 MISC metadata.xml 434 BLAKE2B 255ab7ddedd5e4558e9303c0c9fe5d1d6e13096e3ef7ba269d68908f1cb74d63af273ef9b2ceb97a7462750fa795a6d6f54dae1e70972b44cfbb749250ed65e6 SHA512 41fe0623d1efe7cff26ed9307756f045bd40f275abd38095affc9394efc2c940e63978c79328e43583d5bb466fad0d5339d158422037587cebd3b1f4c22a459f
diff --git a/media-libs/netpbm/netpbm-10.66.00.ebuild b/media-libs/netpbm/netpbm-10.66.00.ebuild
index 82fe3af25620..8806ce988f0e 100644
--- a/media-libs/netpbm/netpbm-10.66.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.66.00.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc jbig jpeg png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
 
 RDEPEND="jbig? ( media-libs/jbigkit )
diff --git a/media-libs/netpbm/netpbm-10.70.00.ebuild b/media-libs/netpbm/netpbm-10.70.00.ebuild
index 97a05287f209..4d22f142cc9f 100644
--- a/media-libs/netpbm/netpbm-10.70.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.70.00.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc jbig jpeg png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
 
 RDEPEND="jbig? ( media-libs/jbigkit )
diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild
index 10dd2b062d5d..e4ed0080f680 100644
--- a/media-libs/netpbm/netpbm-10.76.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.76.00.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
 
 RDEPEND="jbig? ( media-libs/jbigkit )
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index ab7867511806..2ef2dcda14d5 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,3 +1,3 @@
 DIST openal-soft-1.19.1.tar.bz2 577310 BLAKE2B f6ed5b2bce1bfcaa7f8085375d5d3e3323ea2f03896ba871fe3ec247e6e1bf524a9c5180399b0f0908aa69756a1f2ee8095f14a69e6a7eac55a25cc7c2ac545b SHA512 356a3f12bbe284bfac71f4f2a9f83d084083a832012222e73743042ac27812cf051c12b0ddcf53c010ff77e44ae2e9033cea9b9324d316a22a59a154307a64a4
-EBUILD openal-1.19.1.ebuild 2099 BLAKE2B 08a50d129d53901ce5d7d424535a55277fd933c3136961b99b6257d5338dd3df8b8ba89635270fa71fb0e3e6c16b1e945f1d4f458a27df162db569756c99c40a SHA512 2826fbd423748e2f746fcf96c48640ffbafadf6338a0bb5a1329e6972634cb26a5bb6eece91d7d1fa2194be5f4542bf7a2392225e78b1972d2b62b1ea3b36bea
+EBUILD openal-1.19.1.ebuild 2077 BLAKE2B adb207ddfb34dc5ec327a8cd65501f02ff2913ad8675394e257f344b1481fbdc9a8f429d5453b4c1513dc3b529bc4c5af51e0453ab4cb3910b631231501efbed SHA512 3a06ba9352be0e80a3f278d1a1e8c511cc57fb2ced986cc5b3e0863063a7e99ca56a658558397eab32f343c95055993fbc4cd046cf8aa8084c85e919a13c5001
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/openal/openal-1.19.1.ebuild b/media-libs/openal/openal-1.19.1.ebuild
index a2051502df92..e1a74e794ce3 100644
--- a/media-libs/openal/openal-1.19.1.ebuild
+++ b/media-libs/openal/openal-1.19.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="
 	alsa coreaudio debug jack oss portaudio pulseaudio sdl qt5
 	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index 44e699b2cc5e..ed13b25156aa 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -3,5 +3,5 @@ AUX opencollada-1.6.63-pcre-fix.patch 530 BLAKE2B c0f96d1f3d93570f49670d5dc63f6f
 DIST opencollada-1.6.62.tar.gz 12094443 BLAKE2B 6cd0ec893fc212bf3e8f166ad9c51c894dc298a3627e65dd41ece850a5638d91b8839830d5456bf3ba072a0b23f8c01247d8c676cc79d98464cdf0c1b55fd3c5 SHA512 bd39406b9a833409303ef7cd4e93beee0675fa57c267af95a34699348a81650d50ae042dbb1837cd41c72433533a3a9b827a44e9775a5b06c7c4f1a351146574
 DIST opencollada-1.6.63.tar.gz 12094044 BLAKE2B dbe38ab2976f72d47a38bd147e05a58555acc2b70618d4d47d2beff87ace54f7fcd2f116b9ba9908cfb38b5699e547375e902128c2f378c295308f1601a18b17 SHA512 e1b92e932d0256224b026281fb5691219c5171f57b968307288b6e5481b5d6fee39825702e18017055bd0fb0e3d4c40b6ce526d3ce4defe2994138db54220d01
 EBUILD opencollada-1.6.62.ebuild 1628 BLAKE2B a29e1f0236cc8f4abc7a486b03b6e67e04e07022ea14e93e39b8835fe40da5d8b75c683264beb8b96158b114bcf33ee7ec9ee216f74e1cbed38e4e5325c4639c SHA512 0cb788227b1eb0581239463b7ce3af50c5bb4928a8377ae2bdeb37065535da5096fa35df67a3fda9f06e48d14ef232920dcdd22a758ed2cd4a7938372f036fae
-EBUILD opencollada-1.6.63.ebuild 1657 BLAKE2B a35b086ac9651e4360df3913b31aa8ff41ba7cdbabe325c1d712c561e93002b03989c6cd5c84d7f2bf0c9b227ede1313daa8da04485f44e97f6c92abed7cc040 SHA512 6719a2a2fcedd078474304a0aa357c6d09aa090a6ca50764e5b954c1b4afdae6262fc913d544020d7836d1cc03f2fac0690a5e108d6c21166070c2438cc28a1c
+EBUILD opencollada-1.6.63-r1.ebuild 1635 BLAKE2B ff873765d294e722e5cce7752433f4f4dea1cb9eb637d9e43d7ca743bfa35ffb8aa46305fc085c5e560674b5f28cd277961a5739af416bb1a6aa70fa32e27268 SHA512 b6ce66e702225926b49c02bf287629235bd28cab42107cee59a8d767f545e0e5ff391c55951521f627b3eb700ef05ba7caf83dbb39f2fe25039238648026a033
 MISC metadata.xml 256 BLAKE2B 9e83a301f9fadaeea1559fbf7774e1d353df51a19661d95134705312a6f1465807f815f733b0ba72a6e891a551891fefc05de9a37f9c8cb2c2236e6e475962c5 SHA512 4ffbc8e0ad4a1456f33e5b568166f3e6285ffd42218fbc0d9f8f04c319a341c367aec0b92a1074029cd11ededf0c110a22f3358a47e2cdce5946a6d42c82fc30
diff --git a/media-libs/opencollada/opencollada-1.6.63.ebuild b/media-libs/opencollada/opencollada-1.6.63-r1.ebuild
index ad9d4681dfa8..f83d0770c2fd 100644
--- a/media-libs/opencollada/opencollada-1.6.63.ebuild
+++ b/media-libs/opencollada/opencollada-1.6.63-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,6 @@ IUSE="static-libs"
 RDEPEND="dev-libs/libpcre
 	dev-libs/libxml2
 	dev-libs/zziplib
-	media-libs/lib3ds
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}
diff --git a/media-libs/opencore-amr/Manifest b/media-libs/opencore-amr/Manifest
index b37f5ad7a542..6d66ec73e0e2 100644
--- a/media-libs/opencore-amr/Manifest
+++ b/media-libs/opencore-amr/Manifest
@@ -1,7 +1,7 @@
 DIST opencore-amr-0.1.3.tar.gz 881105 BLAKE2B e9e1d40b90aa819d1b4fce328ae8ff199c7656f3326199c005e8f0a47e4e3282ae02f93826e923c5128c4ec4cebc3f35b6f5ca9f3f49c7dd15d541fb77383d28 SHA512 f67e84604fe3fbb87d608343e595503e2057272fa0b3bf9158a176e88a96d272c35149483c3ee47ba2b064bd6b17cdb315888a5285aa82edc0401f17d2ae761b
 DIST opencore-amr-0.1.4.tar.gz 929807 BLAKE2B ee3068a90589c9b9511fd0a5e1bbe945a50f72ef7ef7b919607c382ce820f357e6c2087bd1f16a4e5fe142377a94c452a5ae429e95c2e58c464d5457c6ec2457 SHA512 94251bd8fe4ac434f588722cbd180ac7de51296b820d68c85327ef1c88c56ede500b283832823988995371c3086e28f7dee048622aed799d3063982d03c3b867
 DIST opencore-amr-0.1.5.tar.gz 929581 BLAKE2B 4943a27f0df3d874720c87f48c523d9aa4cce849dd0a3c9183466416a0629aa02dac8f01646e469e8c45438bf3c57047eb11e69f3f1b261449a0989a36639e59 SHA512 c324db9dcac5a31bfac633153bc054bfe42d5ff98202c4adb3c75a3fae9792f07f60d48cd659acf106dacd307174a62b2aeee22a4af53caa20d2bfba46488faf
-EBUILD opencore-amr-0.1.3-r1.ebuild 559 BLAKE2B 9ca3e80be962ea67ab18acd123cd2efaa214a5d1d533e2f61e762ecf3705460111af51a207de1463a0789c70f8fba0a43b652abc9effcd922eb69a79c5f0145b SHA512 da7828d60b21cd439b1852a22066e02a1ca34371d11b7c35df76e36d5b7ced7db292bccf41183fa807b44fb98a8dee80edcfd0e0f5de21d8df6a703f9f6494b8
-EBUILD opencore-amr-0.1.4.ebuild 560 BLAKE2B 3c902dbeec92bb54451b5964694064815fd25180d347e6066510ca53453e16db71f86cbe88f698b935bdfab3b2be0700f75e94a3503bba4c81ca79429c78dd74 SHA512 99a855468b8954faef0907baa6a10a7d0d84bafa8139ac7914bf7dfab2981cd6a4d18c73d8b73f641bf4fdc480779bd05741b4093cb062b89f6ff75602c801bd
-EBUILD opencore-amr-0.1.5.ebuild 567 BLAKE2B 8c1f6192d3e5abb4f647e84ec30f0b2a63ddf724787135fb4ea6512008c492dc15baffbb4b17cd65cbc22b9179aa9a6fda7ecf30e26e41d2390b1af3c7bd0ace SHA512 3feb833618f619d115c9689be4e29f8c75122656e4f59df7a496fe7143ad9d523e8b81bee53c29e30c21f62e366b44b2d3de569e3375df3a8cdb75205c8570f9
+EBUILD opencore-amr-0.1.3-r1.ebuild 537 BLAKE2B 726169c34bf56a0b847abb0c2911c2e033a4ad6d9598fe0227e5990544612c6d9874e1517fa640bde4c34b139a4d7af864b175ebed6585e0b50bc23e7f21d9b8 SHA512 f8eab1546cd7118a4e7b69a5bd440d2557ae37257080dd3577d8a132526ec7b8e7ed68eb382938a4d4ebe978459aef14a7e46a772253facff396f47027614fac
+EBUILD opencore-amr-0.1.4.ebuild 538 BLAKE2B 196f22d01752e049c91d3582da072795a92b442ea30b112407b75250b4a4e7f29519469c638a4b0bc74ecacde869cf5ff69c11cbf9000cb2cc2c5841884e2f7b SHA512 316149cd0ee82b750a2f00bc8f6ad720447999c7ad7a1124ce9eb03461eb2cc48d4d947c636849d2a29f0cd2e84fb4ea9d4cf4b72b01c52be3d7b7693596b3d7
+EBUILD opencore-amr-0.1.5.ebuild 545 BLAKE2B 1cefaf3cd50e6a185f4e5e0059e3d89396e514c0ebcf73c1e395f33cddf0584b48bae2fc15bc21f338a2c6c97a74acb037f697d95150da1606ab2861928489b9 SHA512 a35cde60fb74ac2a94d61a561203deb47fc7c8ef14dd93c4279271ef53efcd8c8693eaba9c3417b739dc83a53917b8d08a1fb6de25ea28131c1295e8c6f84b2c
 MISC metadata.xml 335 BLAKE2B 62ac5499e6bf0ca4ebb5cef78982a734cbc068fad39764b545089233f2c611937c4d8cddfa7f042705c7f7849a44f1e971431667eae02e7622d45f5b5ccdfb14 SHA512 25f894f204476ffe7bf81e7e81b16f569b34ac57572cba903bf447a53699f0e4cf5448fa27689b4baf60753e7f605f47c4a7d60f19616446b0c1f871d9b866e3
diff --git a/media-libs/opencore-amr/opencore-amr-0.1.3-r1.ebuild b/media-libs/opencore-amr/opencore-amr-0.1.3-r1.ebuild
index b70540563fc5..27ae9e737e26 100644
--- a/media-libs/opencore-amr/opencore-amr-0.1.3-r1.ebuild
+++ b/media-libs/opencore-amr/opencore-amr-0.1.3-r1.ebuild
@@ -11,6 +11,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 DOCS=( AUTHORS ChangeLog README )
diff --git a/media-libs/opencore-amr/opencore-amr-0.1.4.ebuild b/media-libs/opencore-amr/opencore-amr-0.1.4.ebuild
index 7b52e1e9fb6e..57398d12e5f5 100644
--- a/media-libs/opencore-amr/opencore-amr-0.1.4.ebuild
+++ b/media-libs/opencore-amr/opencore-amr-0.1.4.ebuild
@@ -11,6 +11,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 DOCS=( ChangeLog README )
diff --git a/media-libs/opencore-amr/opencore-amr-0.1.5.ebuild b/media-libs/opencore-amr/opencore-amr-0.1.5.ebuild
index 84c706c89b85..d08d3e451123 100644
--- a/media-libs/opencore-amr/opencore-amr-0.1.5.ebuild
+++ b/media-libs/opencore-amr/opencore-amr-0.1.5.ebuild
@@ -11,6 +11,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 DOCS=( ChangeLog README )
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index db80e58ccecb..eaf3fa754343 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -8,5 +8,5 @@ AUX openexr-2.3.0-skip-bogus-tests.patch 1429 BLAKE2B fe9dcafb4ea5990cfcf36b16f3
 AUX openexr-2.3.0-tests-32bits-2.patch 586 BLAKE2B 83d36040f751e07f30c5cc3be10f8ac43d62d91b87b87bc2735ecc22426401b3b671d0b397e6a9a1fba351ae66e022c9bb488f95d29a9fbcca479d3d70501eac SHA512 5ffc8bda7e476ce71ee103b519c76e630371e5cc005b04f99d2c054580e387cc2b3b9598cbe4442415c5dfe85b0de8ceedf87079c3f738b7ebb737ea23ea7729
 AUX openexr-2.3.0-tests-32bits.patch 1537 BLAKE2B 96cc98ef34a6c18102e5b96f4373f41b77d25aaf04f9a20d0d406eeae17988cc6f3eecf805f6bac1e42805b283f3123455ca1b069d7c0dc04628835ded2d8dec SHA512 58ad1d8f5dc28be60cdc290c7829d8b50708d26f3a769530e054c629170457f6b7e2b526455f6f86d2ee24931d8afdb61345ada99ae49897d926c0d50fb579f6
 DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B c73c4db4e414010ed8cc9f9631f3e8b17f47edf89b4ecb459aa00ff54a316b3bb1489e332bc029e0917ac4ffe7e152082244102029fd375f183da6741788dab7 SHA512 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123
-EBUILD openexr-2.3.0.ebuild 2231 BLAKE2B aafed485669a0df49d901b87d36ee5402ff34dc6a43913c6f53d5a9262b9f41d20d8b3a8f424c3885125c5cb1ac6393bdd3bb93f9e9b0b4c44c4b6bc38a57082 SHA512 c4e79e2f79a680faff20e31d45cb049eb08624eea6db9d00cb9124cc2c45352254ae5ce54ca1ab4ab78360ded4027aa28db19c0a053ccfc0d66cce24e4480ceb
+EBUILD openexr-2.3.0.ebuild 2209 BLAKE2B daea4206e53459cf2d706053c3234ba24c2d355f519de32aedbf1436f3a66c47527a0b475a904d4cb9798c4bcbc38b80ec8812d28a113de355c50af983d7aab3 SHA512 f3bdec40e619595da630b9ac3e85c7736ea5f4915e3608678070e59bcd784f9809b55c8ff2e62857cb9bbd19b084da83a7bb50bdc18e3b2b15151918af011901
 MISC metadata.xml 303 BLAKE2B 53fb5019bd6fe939d485f1eccb4a140ca9b7ce121b06744d8155842ccb6c5e1378ea39a9ae74c8d519be7b3926bd76040df4b8107137fcc2e25be97431e7a1be SHA512 0ab8d735dd7a8e0dc96b14cfde1ae06969d15cfbad956f4fda60b093660aee38fe98709376eedc9362a26858678d2f28eec795c1accb2560858fd804a11bb7ca
diff --git a/media-libs/openexr/openexr-2.3.0.ebuild b/media-libs/openexr/openexr-2.3.0.ebuild
index c09ccb9802a9..1be2025d58c0 100644
--- a/media-libs/openexr/openexr-2.3.0.ebuild
+++ b/media-libs/openexr/openexr-2.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/24" # based on SONAME
-KEYWORDS="amd64 -arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 -arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="cpu_flags_x86_avx examples static-libs"
 
 RDEPEND="
diff --git a/media-libs/openexr_ctl/Manifest b/media-libs/openexr_ctl/Manifest
index bc6363ecb255..1b00423e4f07 100644
--- a/media-libs/openexr_ctl/Manifest
+++ b/media-libs/openexr_ctl/Manifest
@@ -4,5 +4,5 @@ AUX openexr_ctl-1.0.1-gcc44.patch 457 BLAKE2B 574e0a606769c996ec8eeb556165a0327b
 AUX openexr_ctl-1.0.1-namespace.patch 348 BLAKE2B 4bb257667565106034c687efd5d142380c5e1bb662c9d552d8abca29f1e5d0bff96ce1fcbbf6aefc205c7921dd930b21e56a33ac1aef54e5868c8e6a838fde82 SHA512 28f3b0964ccb7ee81dfc4c4600f0747e28d11ada1fe3a3b5beec17c56bdd8d66c37f6d4974272d6a0c54a397445665eda06a81f5ada64cfd96f74c2461cb896f
 AUX openexr_ctl-1.0.1-pkgconfig.patch 632 BLAKE2B 2adfca932aed12a83634c917b5af224e5fceb3e404fc0c4aff3fd4ac225c21813d919d2d2d05902193cd9fb47532c7692deb5eb9b4c04a1641416691ce3973cd SHA512 38c683204ded3aa0c0e5d83506a2eb49cdf33dfa7b44f5dce1502783f18aa154f8f4b5357aa4a07932ccacafb3d8cf32b80ce288cbcf0e75ca917adc2ff5e271
 DIST openexr_ctl-1.0.1.tar.gz 362864 BLAKE2B 4ac3daaeeab91bbf9d8b1e23ade7934d5917b69df4e6b717a1b5a2b27a73b68d6e0fe06eb2b420d7fb5fe3e284c1615a56cc46973eb2de3604c2a321c5456cfb SHA512 831a06dc83ac53ae9b520629dbd24d3a7cd24f3ab5f484de37d1b232dd16fcf71392d163a7b9f9059bb8f30ff249f7f5a9fbc35730211ff98c8e13dcf386898a
-EBUILD openexr_ctl-1.0.1-r2.ebuild 858 BLAKE2B 6047594b81476e64413751b0a14f36c3fc9ecac4440abbcbb1fe7e20a9468b0d2f388b19fec2126bb147ed2cfc5e6fb9a74dbd0270894154b01c38df01ad9dda SHA512 f8e83e541c4fc5b66f6d4bc81eff9f1039412a06f50b0a29d00b3b9060c6a87025a1a3a77379db4b513cae6bffe6b23160d6d2a0f982f9cdbbbaec958630fb22
+EBUILD openexr_ctl-1.0.1-r2.ebuild 848 BLAKE2B 207c0b85914593cd468ab29314f0d867d62fd3853187d170e3ac46a3a2b110a889b98014558d280e8a1f17028b201d3c0008860f987a0a49d3fc419c0658107e SHA512 4b24309e094f6144664577e1674ec27268e050b27db8db142aa1989aa550b1f671a78b6a0abf45634b2237bdc8d3a6f201bc1afac03a2cd35149e1ffd272dd81
 MISC metadata.xml 301 BLAKE2B 149874bca2d8b5957909f8749f1b274cec115425510904811eebe3cf19b76b28924a060d86f57f3fb6953c8e8ea55da59dfd8c4d4f83fdc8ee0b7f23f9dbf264 SHA512 6df4d1d337a4c00e4a2415c19a46d07d1a151135fbf29a92de300b077de3ae4fb64277b639448edeb0e64bec87d120f67d829f569cce2368388f3b4478dcd1bf
diff --git a/media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild b/media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild
index 1c79c6eb84a4..71f4124efb1f 100644
--- a/media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild
+++ b/media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/ampasctl/${P}.tar.gz"
 
 LICENSE="AMPAS"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/ilmbase-2.0.1:=
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 41f64a4e49ff..dcc546f68fd5 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,9 +1,7 @@
-AUX openjpeg-2.3.0-fix-disable-static-libs.patch 868 BLAKE2B c3d72cc6428467388eed401dbb07f3c66a6f53bc1d0f66934a27ec7ab3c47244c026e5d316df67a471e7888207f0128541a9c55221e4a224a788d5844229d208 SHA512 8509b256d01f11f5d9c8317d5def3dff7275ad024c83306fe658d64d42101e69bc82ef65740599e3a596c382d2f2497ef910efb8f648113de09daac793ba074b
-AUX openjpeg-2.3.0-gnuinstalldirs.patch 19232 BLAKE2B efce79a56f389008d6f90ea97319b2b87738fbdb9580d69824817e881e35311e969abf70eafb0694d7b856b039ec7e7305435ecc0ca0d79c2d9b0b87abfd57c8 SHA512 61cd1284b0d69fc42dfb4027c27ffa6573557e662b1ab646293a835b393166723fbe5a77998821a60739af17eb53af6bdc71529860bf217f91be49c076ccd564
 AUX openjpeg-2.3.1-gnuinstalldirs.patch 19036 BLAKE2B a387c87b543cf3453a6f481b50b958b721105aaadb974cd7ea1dd24bfa15d4b792bfa3b0d894abf2ce4b20c5bc15b077329c0658afd136990daea3471805833a SHA512 1a99381781beea259f96fdc4b310aac41a3c1b6c21320500c5e4642ce222eae09f7f728b7748ad627bb93fd7450ac16c5cbe33853525695576d28feaff524698
 DIST openjpeg-1.5.2.tar.gz 1385702 BLAKE2B 936ab6e0fb48f2839df13113c716c39b9572bd590206cd823dedccfd4001444d73a81ccbf82616a40a35ad8b1fae8d2f08d7c265a771d9d9ef413beac5e84ac1 SHA512 b945cf4f8b5e3227a0c07120c94b0ed5bf30c901de73059ee1d47975f46744fb62bbe84cdb2917c6431128f400020874eb07160af870b5448ced897998b08862
 DIST openjpeg-2.3.1.tar.gz 2214401 BLAKE2B ecc7e573592a5302dcdbade791f6aa6e48f6791c7412fdd44976f3619c8fc0cca7d904fa42013f33ab17dd0f569a76d3c49a73eccaf0a749d34f305362367af9 SHA512 339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03
 DIST openjpeg-data_20180620.tar.gz 497894373 BLAKE2B 3a596f8f9ee56037bf567b6f2d3731b97299dba24e0c9d3562d38c15ddf58d352a918edaccb528f054cf288f87d6362d90d3450d4a5b968e9c8dfe05f54d89fe SHA512 32189a10c4d8cf00c23cda455f9e4353deb2175189d85f9b3aab1c4375a02a491ec2de89815725ebbcaea86c2c7ab274b89ee2583ffd8bf0dc32d4fc2d8f7507
-EBUILD openjpeg-1.5.2-r1.ebuild 1948 BLAKE2B 08ae38cae98a197e1bd980101b9e5938e8d29dc9a37421adb14f421a4df84b5cca4ed216d939d757e519684493b5b58c1f5273922e9fc335ee65a958ee898550 SHA512 8b18759b5eb0ca3e5446453f6f3e550a20519147af5026169b28eae43ff51a94c6522efbc07edc39438e3372b16452fce4f41f32b2ae848ec779a1ea25f6513b
-EBUILD openjpeg-2.3.1.ebuild 4172 BLAKE2B e86042605b98834b562baa2aa938a610df17e120a0f19e36e9a40f404713fbfd5724fd645848cc0526fbbc935111bb60f2a4a0b58f3631fbc3a5793736275d1e SHA512 41516dccbe5512f0fd9b1a1ea94180ef7fd521e241d0bf234dff6f3c2167105faf485a7b189ab6d554b781a2151262ab9b3daccab82c6832fe140291f35a7ffa
+EBUILD openjpeg-1.5.2-r1.ebuild 1926 BLAKE2B ecaa03b2f054924e3ac9b24e035dabbf287e05d948b32645a18e2234d8376ffc2b8381985608598d0cecbdf683e60173b38f712ef9be7f1ebb8404e66bdf86fd SHA512 e2ebb2fc49222f9983d839384e1e5405a349905193dcaf3c6fe19087522f5d59bf3631a43a2bec8caaf2366e076b162945debc5ea099a2b78a110ea35380e8b7
+EBUILD openjpeg-2.3.1.ebuild 4150 BLAKE2B 01764bc1f11779d8b666fe5eab6ec67fa30c617fa2eb28846d390fdc40d62c4dc0d2098c98b834c2879c8f96c645d64db3338684da93a880535043d392a42123 SHA512 4e4acd20ec2b778ef44c4fb80b2f19ef2eff4d6004db73a9cda879511d70e89a94e22a6ad46c55d8a625ab18ebc69646f8168cd1b6e6d0b776e595e6710f02c7
 MISC metadata.xml 455 BLAKE2B ee0da6c575d6fd05b1aa361cb11e09eaffc18f24f57010a66c31127bd1e55073262c1c0789f07779ef864d6cb27670e8653c6b1269681b5b6497185b5d0583aa SHA512 b956f115708b8afff16126117cacfa9bb51fb55660e19cb6b295081d81790c5c6e8858bc28193f3d9a5b0da66189490938c83c32124e33dedb37ea4a8c8ef99d
diff --git a/media-libs/openjpeg/files/openjpeg-2.3.0-fix-disable-static-libs.patch b/media-libs/openjpeg/files/openjpeg-2.3.0-fix-disable-static-libs.patch
deleted file mode 100644
index 9e30f4694f3e..000000000000
--- a/media-libs/openjpeg/files/openjpeg-2.3.0-fix-disable-static-libs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 66297f07a43d2770a97c8456d20202f3d051d980 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 9 Oct 2017 11:40:43 +0200
-Subject: [PATCH] Unix build: fix regression of 2.3.0 where a shared-only or
- static-only build lacks the installation target for the library (#1019, fixes
- regression introduced by 3dfc6ca2bcf06fd1adb6b6b4cecc6c092f08ba0b)
-
----
- src/lib/openjp2/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt
-index 0b4520384..f8990ccf0 100644
---- a/src/lib/openjp2/CMakeLists.txt
-+++ b/src/lib/openjp2/CMakeLists.txt
-@@ -99,6 +99,7 @@ else()
-     set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME} openjp2_static)
-   else()
-     add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
-+    set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME})
-   endif()
- endif()
- 
diff --git a/media-libs/openjpeg/files/openjpeg-2.3.0-gnuinstalldirs.patch b/media-libs/openjpeg/files/openjpeg-2.3.0-gnuinstalldirs.patch
deleted file mode 100644
index 41942e451556..000000000000
--- a/media-libs/openjpeg/files/openjpeg-2.3.0-gnuinstalldirs.patch
+++ /dev/null
@@ -1,501 +0,0 @@
-From: Andreas Sturmlechner <asturm@gentoo.com>
-Date: Fri, 2 Nov 2018 17:23:49 +0100
-Subject: Use GNUInstallDirs for standard installation directories
-
-Raises minimum cmake version by a little.
-
-
-commit 24fd3ce777a64b8b315cfe1ee642ec7b1cc6aa97
-Author: Libor Bukata <libor.bukata@oracle.com>
-Date:   Fri Aug 31 12:57:40 2018 +0200
-
-    The change makes a relative path to header files
-    always correct regardless of the number of sub-
-    directories in OPENJPEG_INSTALL_PACKAGE_DIR variable.
-
-diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in
-index b20294ca..2925108a 100644
---- a/cmake/OpenJPEGConfig.cmake.in
-+++ b/cmake/OpenJPEGConfig.cmake.in
-@@ -26,8 +26,13 @@ get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
- if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
-   # This is an install tree
-   include(${SELF_DIR}/OpenJPEGTargets.cmake)
--  get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE)
--  set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT})
-+
-+  # We find a relative path from the PKG directory to header files.
-+  set(PKG_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_PACKAGE_DIR@")
-+  set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
-+  file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")
-+
-+  get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE)
- 
- else()
-   if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cb545666..2ff3b00a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,7 +7,7 @@
- # For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever you like
- # e.g.:
- # set(OPENJPEG_NAMESPACE "GDCMOPENJPEG")
--cmake_minimum_required(VERSION 2.8.2)
-+cmake_minimum_required(VERSION 2.8.5)
- 
- if(COMMAND CMAKE_POLICY)
-   cmake_policy(SET CMP0003 NEW)
-@@ -102,59 +102,28 @@ endif()
- 
- # --------------------------------------------------------------------------
- # Install directories
-+include(GNUInstallDirs)
-+
- # Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
- option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF)
- 
- string(TOLOWER ${PROJECT_NAME} projectname)
- set(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
- 
--if(NOT OPENJPEG_INSTALL_BIN_DIR)
--  set(OPENJPEG_INSTALL_BIN_DIR "bin")
--endif()
--
--if(NOT OPENJPEG_INSTALL_LIB_DIR)
--  set(OPENJPEG_INSTALL_LIB_DIR "lib")
--endif()
--
--if(NOT OPENJPEG_INSTALL_SHARE_DIR)
--  set(OPENJPEG_INSTALL_SHARE_DIR "share")
--endif()
--
--if(NOT OPENJPEG_INSTALL_DATA_DIR)
--  set(OPENJPEG_INSTALL_DATA_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
--endif()
--
--if(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
--  set(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}")
--endif()
--
--if(BUILD_DOC)
--if(NOT OPENJPEG_INSTALL_MAN_DIR)
--  set(OPENJPEG_INSTALL_MAN_DIR "share/man/")
--endif()
--
--if(NOT OPENJPEG_INSTALL_DOC_DIR)
--  set(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}")
--endif()
--endif()
--
- if(NOT OPENJPEG_INSTALL_JNI_DIR)
-   if(WIN32)
--    set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR})
-+    set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_BINDIR})
-   else()
--    set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR})
-+    set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_LIBDIR})
-   endif()
- endif()
- 
- if(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
--  # We could install *.cmake files in share/ however those files contains
--  # hardcoded path to libraries on a multi-arch system (fedora/debian) those
--  # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu)
--  set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
-+  set(OPENJPEG_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${OPENJPEG_INSTALL_SUBDIR}")
- endif()
- 
- if (APPLE)
--	list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}")
-+	list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
- 	option(OPJ_USE_DSYMUTIL "Call dsymutil on binaries after build." OFF)
- endif()
- 
-@@ -338,14 +307,6 @@ install( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
- )
- 
- #-----------------------------------------------------------------------------
--# install CHANGES and LICENSE
--if(BUILD_DOC)
--if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
--  install(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
--endif()
--
--install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
--endif()
- 
- include (cmake/OpenJPEGCPack.cmake)
- 
-@@ -362,14 +323,14 @@ if(BUILD_PKGCONFIG_FILES)
-   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
-     ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY)
-   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION
--    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
-+    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
- #
-   if(BUILD_JPWL)
-   # install in lib and not share (see multi-arch note above)
-   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpwl/libopenjpwl.pc.cmake.in
-     ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc @ONLY)
-   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc DESTINATION
--    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
-+    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
-   endif()
- #
-   if(BUILD_JPIP)
-@@ -377,7 +338,7 @@ if(BUILD_PKGCONFIG_FILES)
-   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in
-     ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY)
-   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION
--    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
-+    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
-   endif()
- #
-   if(BUILD_JP3D)
-@@ -385,7 +346,7 @@ if(BUILD_PKGCONFIG_FILES)
-   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp3d/libopenjp3d.pc.cmake.in
-     ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY)
-   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc DESTINATION
--    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
-+    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
-   endif()
- endif()
- 
-diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in
-index 2925108a..702e2790 100644
---- a/cmake/OpenJPEGConfig.cmake.in
-+++ b/cmake/OpenJPEGConfig.cmake.in
-@@ -29,7 +29,7 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
- 
-   # We find a relative path from the PKG directory to header files.
-   set(PKG_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_PACKAGE_DIR@")
--  set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
-+  set(INC_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@")
-   file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")
- 
-   get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE)
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index d4f3ddbe..ed5cb44c 100644
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -44,7 +44,7 @@ if(DOXYGEN_FOUND)
- 
-   # install HTML documentation (install png files too):
-   install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html
--    DESTINATION share/doc
-+    DESTINATION ${CMAKE_INSTALL_DOCDIR}
-     PATTERN ".svn" EXCLUDE
-   )
- else()
-diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt
-index 4d4bd952..29b4dd20 100644
---- a/src/bin/jp2/CMakeLists.txt
-+++ b/src/bin/jp2/CMakeLists.txt
-@@ -67,7 +67,7 @@ foreach(exe opj_decompress opj_compress opj_dump)
-   # Install exe
-   install(TARGETS ${exe}
-     EXPORT OpenJPEGTargets
--    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
-+    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
-   )
-   if(OPJ_USE_DSYMUTIL)
-     add_custom_command(TARGET ${exe} POST_BUILD
-@@ -83,6 +83,6 @@ install(
-   FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_compress.1
-               ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_decompress.1
-               ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_dump.1
--  DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1)
-+  DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
- #
- endif()
-diff --git a/src/bin/jp3d/CMakeLists.txt b/src/bin/jp3d/CMakeLists.txt
-index 3cac1a8f..ed62b4f3 100644
---- a/src/bin/jp3d/CMakeLists.txt
-+++ b/src/bin/jp3d/CMakeLists.txt
-@@ -36,6 +36,6 @@ foreach(exe opj_jp3d_compress opj_jp3d_decompress)
-   # Install exe
-   install(TARGETS ${exe}
-     EXPORT OpenJP3DTargets
--    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
-+    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
-   )
- endforeach()
-diff --git a/src/bin/jpip/CMakeLists.txt b/src/bin/jpip/CMakeLists.txt
-index 301d885b..ddd867dc 100644
---- a/src/bin/jpip/CMakeLists.txt
-+++ b/src/bin/jpip/CMakeLists.txt
-@@ -13,7 +13,7 @@ add_executable(opj_jpip_addxml opj_jpip_addxml.c)
- # Install exe
- install(TARGETS opj_jpip_addxml
-   EXPORT OpenJPEGTargets
--  DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
-+  DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
-   )
- 
- if(BUILD_JPIP_SERVER)
-@@ -38,7 +38,7 @@ if(BUILD_JPIP_SERVER)
-   # Install exe
-   install(TARGETS opj_server
-     EXPORT OpenJPEGTargets
--    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
-+    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
-     )
- endif()
- 
-@@ -52,7 +52,7 @@ add_executable(${exe} ${exe}.c)
-   target_link_libraries(${exe} openjpip)
-   install(TARGETS ${exe}
-     EXPORT OpenJPEGTargets
--    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
-+    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
-     )
- endforeach()
- 
-@@ -123,7 +123,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE)
-       )
- 
-     install(FILES ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar
--      DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
-+      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule
-       )
-   else()
-     # opj_viewer (simple, no xerces)
-@@ -153,7 +153,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE)
-       )
- 
-     install(FILES ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar
--      DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
-+      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule
-       )
-   endif()
- else()
-diff --git a/src/bin/jpwl/CMakeLists.txt b/src/bin/jpwl/CMakeLists.txt
-index 5df225de..8a798e61 100644
---- a/src/bin/jpwl/CMakeLists.txt
-+++ b/src/bin/jpwl/CMakeLists.txt
-@@ -57,6 +57,6 @@ foreach(exe decompress compress)
-   endif()
- 
-   install(TARGETS ${jpwl_exe}
--    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
-+    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
-   )
- endforeach()
-diff --git a/src/bin/mj2/CMakeLists.txt b/src/bin/mj2/CMakeLists.txt
-index 5d3e288b..6669c502 100644
---- a/src/bin/mj2/CMakeLists.txt
-+++ b/src/bin/mj2/CMakeLists.txt
-@@ -43,5 +43,5 @@ foreach(exe
-   endif()
- 
-   install(TARGETS ${exe}
--  	DESTINATION ${OPENJPEG_INSTALL_BIN_DIR})
-+    DESTINATION ${CMAKE_INSTALL_BINDIR})
- endforeach()
-diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt
-index b2714858..9cbc4c3f 100644
---- a/src/lib/openjp2/CMakeLists.txt
-+++ b/src/lib/openjp2/CMakeLists.txt
-@@ -2,7 +2,7 @@ include_regular_expression("^.*$")
- 
- #
- install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h
-- DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers)
-+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers)
- 
- include_directories(
-   ${${OPENJPEG_NAMESPACE}_BINARY_DIR}/src/lib/openjp2 # opj_config.h and opj_config_private.h
-@@ -114,21 +114,21 @@ endif()
- # Install library
- install(TARGETS ${INSTALL_LIBS}
-   EXPORT OpenJPEGTargets
--  RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
--  LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
--  ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
-+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
-+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
-+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
- )
- 
- # Install includes files
- install(FILES openjpeg.h opj_stdint.h
--  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers
-+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers
- )
- 
- if(BUILD_DOC)
- # install man page of the library
- install(
-   FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man3/libopenjp2.3
--  DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man3)
-+  DESTINATION ${CMAKE_INSTALL_MANDIR}/man3)
- endif()
- 
- if(BUILD_LUTS_GENERATOR)
-diff --git a/src/lib/openjp2/libopenjp2.pc.cmake.in b/src/lib/openjp2/libopenjp2.pc.cmake.in
-index 62159b00..ebad9578 100644
---- a/src/lib/openjp2/libopenjp2.pc.cmake.in
-+++ b/src/lib/openjp2/libopenjp2.pc.cmake.in
-@@ -1,9 +1,9 @@
- prefix=@CMAKE_INSTALL_PREFIX@
--bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
--mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
--docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
--libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
--includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
-+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
-+mandir=${prefix}/@CMAKE_INSTALL_MANDIR@
-+docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
- 
- Name: openjp2
- Description: JPEG2000 library (Part 1 and 2)
-diff --git a/src/lib/openjp3d/CMakeLists.txt b/src/lib/openjp3d/CMakeLists.txt
-index b0469af1..6e251984 100644
---- a/src/lib/openjp3d/CMakeLists.txt
-+++ b/src/lib/openjp3d/CMakeLists.txt
-@@ -34,12 +34,12 @@ endif()
- # Install library
- install(TARGETS ${OPENJP3D_LIBRARY_NAME}
-   EXPORT OpenJP3DTargets
--  DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
-   COMPONENT Libraries
- )
- 
- # Install includes files
- install(FILES openjp3d.h
--  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}
-+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR}
-   COMPONENT Headers
- )
-diff --git a/src/lib/openjp3d/libopenjp3d.pc.cmake.in b/src/lib/openjp3d/libopenjp3d.pc.cmake.in
-index e9b6c404..866a0174 100644
---- a/src/lib/openjp3d/libopenjp3d.pc.cmake.in
-+++ b/src/lib/openjp3d/libopenjp3d.pc.cmake.in
-@@ -1,9 +1,9 @@
- prefix=@CMAKE_INSTALL_PREFIX@
--bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
--mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
--docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
--libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
--includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
-+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
-+mandir=${prefix}/@CMAKE_INSTALL_MANDIR@
-+docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
- 
- Name: openjp3d
- Description: JPEG2000 Extensions for three-dimensional data (Part 10)
-diff --git a/src/lib/openjpip/CMakeLists.txt b/src/lib/openjpip/CMakeLists.txt
-index b3cb8ce8..aace36d4 100644
---- a/src/lib/openjpip/CMakeLists.txt
-+++ b/src/lib/openjpip/CMakeLists.txt
-@@ -74,9 +74,9 @@ endif()
- # Install library
- install(TARGETS openjpip
-   EXPORT OpenJPEGTargets
--  RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
--  LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
--  ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
-+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
-+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
-+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
-   )
- 
- if(BUILD_JPIP_SERVER)
-@@ -86,6 +86,6 @@ if(BUILD_JPIP_SERVER)
-     PROPERTIES COMPILE_FLAGS "-DSERVER")
-   install(TARGETS openjpip_server
-     EXPORT OpenJPEGTargets
--    DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
-+    DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
-     )
- endif()
-diff --git a/src/lib/openjpip/libopenjpip.pc.cmake.in b/src/lib/openjpip/libopenjpip.pc.cmake.in
-index 7c3f29af..4cfa6fce 100644
---- a/src/lib/openjpip/libopenjpip.pc.cmake.in
-+++ b/src/lib/openjpip/libopenjpip.pc.cmake.in
-@@ -1,9 +1,9 @@
- prefix=@CMAKE_INSTALL_PREFIX@
--bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
--mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
--docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
--libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
--includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
-+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
-+mandir=${prefix}/@CMAKE_INSTALL_MANDIR@
-+docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
- 
- Name: openjpip
- Description: JPEG2000 Interactivity tools, APIs and protocols (Part 9)
-diff --git a/src/lib/openjpwl/CMakeLists.txt b/src/lib/openjpwl/CMakeLists.txt
-index 1b33adbe..bb90c87c 100644
---- a/src/lib/openjpwl/CMakeLists.txt
-+++ b/src/lib/openjpwl/CMakeLists.txt
-@@ -58,7 +58,7 @@ endif()
- # Install library
- install(TARGETS openjpwl
-   EXPORT OpenJPEGTargets
--  RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
--  LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
--  ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
-+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
-+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
-+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
- )
-diff --git a/src/lib/openjpwl/libopenjpwl.pc.cmake.in b/src/lib/openjpwl/libopenjpwl.pc.cmake.in
-index b1244197..8acc1457 100644
---- a/src/lib/openjpwl/libopenjpwl.pc.cmake.in
-+++ b/src/lib/openjpwl/libopenjpwl.pc.cmake.in
-@@ -1,9 +1,9 @@
- prefix=@CMAKE_INSTALL_PREFIX@
--bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
--mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
--docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
--libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
--includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
-+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
-+mandir=${prefix}/@CMAKE_INSTALL_MANDIR@
-+docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
- 
- Name: openjpwl
- Description: JPEG2000 Wireless library (Part 11)
-diff --git a/src/lib/openmj2/CMakeLists.txt b/src/lib/openmj2/CMakeLists.txt
-index 25294b20..dced53f6 100644
---- a/src/lib/openmj2/CMakeLists.txt
-+++ b/src/lib/openmj2/CMakeLists.txt
-@@ -53,12 +53,12 @@ endif()
- # Install library
- install(TARGETS ${OPENMJ2_LIBRARY_NAME}
-   EXPORT OpenMJ2Targets
--  DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
-   COMPONENT Libraries
- )
- 
- # Install includes files
- #install(FILES mj2.h
--#  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir}
-+#  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR}
- #  COMPONENT Headers
- #)
-diff --git a/wrapping/java/openjp2/CMakeLists.txt b/wrapping/java/openjp2/CMakeLists.txt
-index eb3da0ed..4504da5f 100644
---- a/wrapping/java/openjp2/CMakeLists.txt
-+++ b/wrapping/java/openjp2/CMakeLists.txt
-@@ -69,5 +69,5 @@ add_custom_target(OpenJPEGJavaJar ALL
- )
- 
- install(FILES ${LIBRARY_OUTPUT_PATH}/openjpeg.jar
--  DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
-+  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule
- )
diff --git a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
index a12928765e77..8842077a1fb1 100644
--- a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}.mirror/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/5" # based on SONAME
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="
diff --git a/media-libs/openjpeg/openjpeg-2.3.1.ebuild b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
index faf9ac61c7c5..041bd067b459 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="
diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
index f278cf85bdf4..c3f13f57883f 100644
--- a/media-libs/opus/Manifest
+++ b/media-libs/opus/Manifest
@@ -1,6 +1,6 @@
 DIST opus-1.3.1.tar.gz 1040054 BLAKE2B e0aab38518938157a6ef27307f52d9d3f9c12a2fef4c7e5b4168c2f6fc04d79e333ebe477059b3e6a0518fcf6aa089b5eb1c8de68d83474e237c0f73e5a221cb SHA512 6cd5e4d8a0551ed5fb59488c07a5cc18a241d1fde5f9eb9f16cd4e77abcdb4134dd51ad1d737be1e6039bfa56912510b8648152f2478a1f21c7c1d9ce32933cd
 DIST opus-1.3.tar.gz 1032750 BLAKE2B 7c79cecb957b0353e35758989b07502f2d4531869985639a069dec8737c15061b56ebff5babe31ad316afa9f7787bde6a7c544fa5be10c1e02ccfdff1a80d5c7 SHA512 438635667e72c326d6d06a30e0b3a5564ba6cf5d484066456e1118e1c2fe3a61b959d0afa77a1084b177b72f9230618b6b55c78bc4e24e9127a09fd345b42518
-EBUILD opus-1.3.1-r1.ebuild 1076 BLAKE2B 1c000ae3c6c4b41f2248b691deb56f372c1edc1927b0e08762105ba2e21ef4d01aa28531f8a5ff80b5b1b3bb8877ae221658710908f8a568820350bd40ef5d4a SHA512 c230cb39ccbec327464687d9b4b97ca206a7626cffbbcbb317df282c42be54b29b0e50072f9f421ffeb590d82569e5a34b5b185b5ba8a6cd7b7d74a17d44dcbe
-EBUILD opus-1.3.1.ebuild 964 BLAKE2B 82538fba16a8dee170c25bc980d1bb1ee7f385a5c3cab51189e9f5f99bfc0415f4c556df33867c2ba97918e8742e17eea128abda22fda92b5b0620939198b03a SHA512 715f7aad4d3abe10b3dde5bf7c5010f3a9d0eb12c5b6ccd819ce754633089c3b35cee2d51bf366ea879e22844c2c25b29128f1828b836b00dff43cef967e70ae
-EBUILD opus-1.3.ebuild 1180 BLAKE2B 1765b021157f54843049a524b645eb65b1b2d2cea298447c281a89e8c60bfedfed3197695b07b9c5f950bb1707a35c3d1dcc121a29923731410a2eacf3830db2 SHA512 d601b387e877d1b72a1672a9cc5eab1b650e595f6cf7010676e57250fbfc2a8f9a157a562cf52a8cf9ec1ef197a318e76e6e61a797ff2606f725d07c43c2820a
+EBUILD opus-1.3.1-r1.ebuild 1064 BLAKE2B 2e2ec38a2a20ad4037e8d473abd2e5594e5e87ef3fca7a698932dc023be1666aa143ad7569d4fc5bd87fa0a0c43140dc023436d5899442c3ca8ac8089978c14a SHA512 8d874857b52b72f22d63c6875e9e43a5cd2ed32e8d67f5c68e01b3f1a14c6fa8cfd4d0cb302ad20f6fb82e56d9769d5ef43946228bbd22b84a4890c44ae0f5e5
+EBUILD opus-1.3.1.ebuild 952 BLAKE2B 67ae11d184681007655fc1270938cf1e41a6cc172f8f57d1459dae30ec0da9d0f41bcc5e9cad21464de723c25ae7ab9ef559cd5cec4ae3a7d34bfbca872ad284 SHA512 7d60bbf645bc0b6d0558ba7b36363fd1ea7f463edf0c7cf51953fc1b8e8dfd9a0e2b0ec265aac31587e945efdb788f65c4bd13e73ac06b80552488ebfabb46a3
+EBUILD opus-1.3.ebuild 1168 BLAKE2B 7a0854789b16e6b1d9384400d74dcbd6da6d690b4ba6a6e2cbacccda04217c9d8ae04bfe0ddd6442ff84b89b0f1fac09154de3f2822f68c8623627d57e9b9acd SHA512 2bf405398879005a2f3f3ce3d284a5c8f123a074031302365c80452b5101148c8a66910e2ba5ef70368c4122fbcfb142a5b4a636352c1965b4f95a31f832eee1
 MISC metadata.xml 463 BLAKE2B 6ca3d25d23b9fdea5d785b95c46939cd5f2c4e8a46b4cbaa15952ada640111f1be6b2c428d65b76aa784ca52fa2e8a99857f56b530f58cadaec04665478bcd26 SHA512 f3eb519adc1044337a1c2bc2cd3659ac57c3ee96bba83e5904d1edf0ca3a3dfa7ab03bd3d1b12b695c066dd6c63142cd3c1b0e39343025c43091a4bf33e8f387
diff --git a/media-libs/opus/opus-1.3.1-r1.ebuild b/media-libs/opus/opus-1.3.1-r1.ebuild
index 6658b6af7997..ae3328a25fd9 100644
--- a/media-libs/opus/opus-1.3.1-r1.ebuild
+++ b/media-libs/opus/opus-1.3.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon"
 IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}"
 
diff --git a/media-libs/opus/opus-1.3.1.ebuild b/media-libs/opus/opus-1.3.1.ebuild
index 8fef1d8dec56..eeda2865a899 100644
--- a/media-libs/opus/opus-1.3.1.ebuild
+++ b/media-libs/opus/opus-1.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon"
 IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}"
 
diff --git a/media-libs/opus/opus-1.3.ebuild b/media-libs/opus/opus-1.3.ebuild
index 80e9181a6d4a..9cc76e20d7b0 100644
--- a/media-libs/opus/opus-1.3.ebuild
+++ b/media-libs/opus/opus-1.3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://archive.mozilla.org/pub/opus/${MY_P}.tar.gz"
 	if [[ "${PV}" != *_alpha* ]] && [[ "${PV}" != *_beta* ]] ; then
-		KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+		KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 	fi
 fi
 
diff --git a/media-libs/phonon-gstreamer/Manifest b/media-libs/phonon-gstreamer/Manifest
index ff5aa2f1bffb..8d25ef5fb26b 100644
--- a/media-libs/phonon-gstreamer/Manifest
+++ b/media-libs/phonon-gstreamer/Manifest
@@ -2,6 +2,6 @@ AUX phonon-gstreamer-4.9.0-no-paused-on-zero-vol.patch 998 BLAKE2B 6f659a6a6aad1
 AUX phonon-gstreamer-4.9.0-qt-5.11.patch 2144 BLAKE2B a11065fab61037e11f54ab2b3a41f55231ac2175372077b302b033bbf7483030e763e50e8dce00886394ce94feb205b75d3bf5f4ea4b0c11f3e0c0fba42f14f3 SHA512 b13fe80bf493d33ef942babf084f823e9d6314f489496007dd43e9c0efba4c8e354067cba5ccae53806156d631a8bbf115b84e654052086aeb1d5d32f15b6f08
 DIST phonon-backend-gstreamer-4.10.0.tar.xz 98532 BLAKE2B b9182a50810536c46999266bd40996bb59ac982e44d2066c2afd897d3a2feb99e5570e36dcc869098f5b171018f4c339a2e3b8df124eaeb88236073245069859 SHA512 3beaba9ea3a332a6908ebdaa966958e8e8056d79cfb210e82a8edaf08f0a8bacbf8094e91b1b1b936406aa634dabb962e6c1468e4dde3febd9efac1a63ea70a4
 DIST phonon-backend-gstreamer-4.9.0.tar.xz 75960 BLAKE2B 676810dc99f3734a6932bfe355a37df1334c3460eba9a6d96e039442ce2729b61db61798c1f7207aef68a30f79355703c80e6aeb1a2ca7156f22e9fd7e07027b SHA512 9c13d37c6c7070c2bd8fcc562f743ac2f55289bc7cc82147ef0ae990e5d380d541cc1d9ce61e6ad1549ed1935d41faafaeeb0cd5463e4c656ea8fee636ff4dfe
-EBUILD phonon-gstreamer-4.10.0.ebuild 964 BLAKE2B 24f9747529e4038e764e5979f03bf7431f755042a12a2fcfaf2dff165533225897e60794af3aa52ed5ceb9be2e3d759f3164e0f7aa31d8f0bd837edb2982b43f SHA512 127701917ba63d4a52fba8d88f692b5a18dd5ce1107750d6f84bb968a3016f27f3cfdbec12a7b1d1fbb6c329591552315cdf1d90c3a28c6a68bb61a71d464133
-EBUILD phonon-gstreamer-4.9.0-r3.ebuild 1262 BLAKE2B a3b5ea35d373f02fae13ab3461f31b12a629e3017375de6ec7112686d11b8b87aad215377aa26671fbbbd16a33cfa94d517874101195123a2b1b689fb5f46f80 SHA512 1aa2be3410239b3549cac802f74f61309a6a06cd01bbfcb5e805e8e012ebbb945e1e4a0d24fd0533a8e8cc3395df212a65a7f850f5710b7480e573e3e4d31b1f
+EBUILD phonon-gstreamer-4.10.0.ebuild 952 BLAKE2B a3c9c2c2904bc168b6cc5bfa456f037e4aec45f564e8c9f8219990395df847cd27e5eff0cbddcf9f3d75c716f89c2e93df5379020373faa4d10739ed3812204c SHA512 01e1d30999f20bc0060d0cda70f82a8ebf940f1da8dbf1797d2360c64897a3f03aadea3e6a3866621f8ebc76cb33b6eb578e9f4678e0a3043560b287d3aa8378
+EBUILD phonon-gstreamer-4.9.0-r3.ebuild 1250 BLAKE2B 759dcf7e4bf9fb29b2fb3fc788d5e00a8586490cdfc97ed4cab79bc03ed2869a8327a533ba4ba157849a51822ee574d15bb63f8519e9a5e10a8dfc68bda88fc3 SHA512 706b83e5c5c1079cb467558b88eae314f1b3eb9d31a34fd4b4e917272fb0850c57460971b357dba222cda8d74ceea6ea9abba919e1cadfbda25c4c5717ecc721
 MISC metadata.xml 339 BLAKE2B 2e6fd710b9791c7dd1f8836dac9209a84608dcb54d5ebef458acef6651c03eb55d8733d23df0a6cd0dbe470f00d43e0413b3d18b432f8a38a765af458e5662fc SHA512 c481721ab8e7762b2b951501cc99f7e2d2263ffd682dce3731fb415b677b74f7fbfe7770e9d2b1b1ce496c10254b84bb7489ff971593dac90c151a9ff1623e9a
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0.ebuild
index 34230a07d8eb..b514032550e7 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://phonon.kde.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
index 17981927f53d..5af2b0308fcf 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
@@ -8,7 +8,7 @@ MY_P=${MY_PN}-${PV}
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 	inherit git-r3
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index 39b33ac8cd56..fd47d9e33c0e 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,5 +1,5 @@
 DIST phonon-4.10.2.tar.xz 322176 BLAKE2B a73fa78e732ba56745e0791559a1ab195e9a5d867d368935ebc779cc1705a405dfd8302f6b5d92678098da8b6fdb52ec4cc2d553c361c3fefc738d502e3c38b6 SHA512 205c2f41691ed37a2b24aa5e900f7720ba024d2046ea4bf0a9b9c46235ffd72dfb4010287ccf753b13e395f84c2a202cbb76454806de3519faf52c3ac7001c4e
 DIST phonon-4.11.1.tar.xz 314732 BLAKE2B 9be341f8df643b352392a208c7f24d799edcc94146b71c73d93974a7ef02cc75b5baa1e2ddd037e7e2d3afeb52347d96caaa8b3a2319631802261735a3a751df SHA512 858b2b0d7b0336af76d226b30f3acd1914e7297e0879d5a417fa1b87b13c812f9aab7e20adcad33ce1a03624ce78323dd9968b4b277caf85f800ca60aa134f74
-EBUILD phonon-4.10.2.ebuild 1323 BLAKE2B 005ac868e7b70caed892e2996cc8f670aac6c1f570d8509a7a82daabae23d59bf5f5165d5ca504fcfe450c802fb6770e1f274ba48c2dc097f3d36d4045dfd6d9 SHA512 cd537e3be7548d6db5d847d35f0ad22a4823772e2f5cd42ae89f0fb90c919752a9a55d5324d29d90aaaf8497b0518b2c5aca373607edf4df3e75b0df6dfeb413
-EBUILD phonon-4.11.1.ebuild 1255 BLAKE2B 002cd7347317a831560e5619a2e68f538aba2d80b4ab326df66b7906eb5c04755f3d18116efd7028fd756a644fe4958e7f75360cfa0970f4a2c25e417f27de3b SHA512 acd0120942cb22978790babc84aafd913d9845dd230a1ed4f5b394ac0099f531956b2ff66f28a622b1c7541670be3e0e897a927cf30943935724bce699820bff
+EBUILD phonon-4.10.2.ebuild 1311 BLAKE2B f9b4f8cca3197c50af85aa3c38be8cf8e85850d25a576685db9d387c1658cce58a59d0c9b9dfd03897189c99e129ada3e5e70ba5a9458c3a7e30d17c9b1020c4 SHA512 5f0ed443fb5678c60cea87ad5322451e39207558612054e34d9b0cf77275b7c8ddf55f75eec22bedda8d875dc2e6032970ed441634d00cdae95ce02f6ba0ed91
+EBUILD phonon-4.11.1.ebuild 1243 BLAKE2B 200e53b67c925dada8a49c7386191c6213d0a57827187c0e69bb8f3b87c4da61b1bb4de9b6968d2ee77db9c3c7f1a1868b311090df91cec5c9119ca61acd9489 SHA512 847b1cd8c70b7283405087541d9064e1cac321d14e48e6b729962da8b70db80f3ec59aa876777394f95879095788aae8149f46c284b66a5c093f227aa45a7831
 MISC metadata.xml 394 BLAKE2B e551fa12fcce92bd237d1cdb3fcbd496768e012004ace1e08a89f1e0e5f5c997d5b9d1488afce03925337d28a9c431994ce23244ffcb46f7138cde951dc26662 SHA512 963308198d2057bc2869eb21b644c59211f3c4bb04a46de3cca04dc85cdcf67b113555870149b971c8c43a0c64fb88cd141ccf20740f6428d1573485844574a6
diff --git a/media-libs/phonon/phonon-4.10.2.ebuild b/media-libs/phonon/phonon-4.10.2.ebuild
index fb59dd89f044..1899bbdc0c79 100644
--- a/media-libs/phonon/phonon-4.10.2.ebuild
+++ b/media-libs/phonon/phonon-4.10.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 	inherit git-r3
diff --git a/media-libs/phonon/phonon-4.11.1.ebuild b/media-libs/phonon/phonon-4.11.1.ebuild
index 6edaf832b5a2..a5cdbac1015f 100644
--- a/media-libs/phonon/phonon-4.11.1.ebuild
+++ b/media-libs/phonon/phonon-4.11.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://phonon.kde.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
diff --git a/media-libs/plotutils/Manifest b/media-libs/plotutils/Manifest
index 40da4604feb5..75f09f49b49b 100644
--- a/media-libs/plotutils/Manifest
+++ b/media-libs/plotutils/Manifest
@@ -4,5 +4,5 @@ AUX plotutils-2.6-libpng-1.5.patch 575 BLAKE2B b35dc9895e5a2f17ad1d5b71d8dfc1d04
 AUX plotutils-2.6-libxmi.patch 5076 BLAKE2B ca028895b5af74e38176b3fe43747196033d39f01aa763f5388de8dc502ca5119f5bc153ec9537a1f1934940fe253125460844e8090459890132d4ade90e446b SHA512 157824dce491a06c15091eae8129e0c2269ffecaff168485e17535d61eabfade4007fd7e799921d91d674f28b2a9f67ac957155f0661821b1363fe5045dacae1
 AUX plotutils-2.6-makefile.patch 2921 BLAKE2B db41feef6b6f25cd5fe3b9e2329c142805d8cc2b3698042846f91275eb968f1eea797c482dd153f97ab63d0a0f937d3efa4fc01a52e97d0f72cf05614a403cb3 SHA512 ac98f183d19d36c4380d0bbb25a2f86569d79136729a6c265cbc51ce4aa7ad1fc279f9ae7c0ac1db7b4e49325032bbf082db900eb740f394d890ecca57f19a84
 DIST plotutils-2.6.tar.gz 3657562 BLAKE2B d77d62ba4e632001d056da7333d1300b2e3d7966029a130e6836fa88545a1749e15b5dc7322d03575432fc5e1342c839f4769ed821962f711848c2d8523904fb SHA512 4e5982605e5c1fbdb7325069c3ab2edd736e37a2eb30a1ec01fdc3541fcee6ed49937d4814c6baf79dab5b6fa42f909e4800c851d0ace3c7cf6d5a8681d0f0e7
-EBUILD plotutils-2.6-r2.ebuild 2051 BLAKE2B 75b581a2fa74367e04ab519c79254149f0c932df755b76513ffa491cfc6fb16f106ed22e03e94146f2ae184bfc5198d7fadde0d554d12a0c0cfb047782bbc67c SHA512 40c295166cb3296cc682532eb1b4ebc1411b0946c4d6d7f1c4f21b0451f0bd066c01ed327874439f9fd9f24f77f600d533066898014af905c91fdbb215f17f41
+EBUILD plotutils-2.6-r2.ebuild 2029 BLAKE2B ecc961705b30748ccb024c071ca8ce01fe7efa51fa6d383c37304d6c7539d34b59b0a696737f2937a806b0a2b6dea53795616434ca1646595f90af685751e73d SHA512 98f728712f3fb6be50b1e4dab5691116e94040da138c497033eec7e3f762fca472f23624dcac9c83cb5b8f52417f6948a7b234ce05818108b8bb8b6f2f61cff9
 MISC metadata.xml 265 BLAKE2B 90437751c83b28b75582d0e1588732b99bfc1da98cfeedf982178e01192da161352633d821465f38c4f31a6a75c562b54c5d1a6dff0173ff6c064d524073d56c SHA512 6546f5402491a7065802409af29815ec26d09fc6fe196be110860059a5af6511b01abfc8bb4c8dbe4954c90d2fb2c85fe9ffb221c0dadc90b302fb58369d2ba4
diff --git a/media-libs/plotutils/plotutils-2.6-r2.ebuild b/media-libs/plotutils/plotutils-2.6-r2.ebuild
index e0e81ef5577f..5c8530cac0dc 100644
--- a/media-libs/plotutils/plotutils-2.6-r2.ebuild
+++ b/media-libs/plotutils/plotutils-2.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/plotutils/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+png static-libs X"
 
 DEPEND="
diff --git a/media-libs/portaudio/Manifest b/media-libs/portaudio/Manifest
index abc2bbd847b5..eee50043fd82 100644
--- a/media-libs/portaudio/Manifest
+++ b/media-libs/portaudio/Manifest
@@ -1,5 +1,5 @@
 DIST pa_stable_v190600_20161030.tgz 1450572 BLAKE2B 3cd63cca55ff222f452d306a1ab9035739545f48dbc9bc58196052cb51e518d86568059c7528533a6932c39c68d1a5210e06470a16343b92c7e4132b71cc552e SHA512 7ec692cbd8c23878b029fad9d9fd63a021f57e60c4921f602995a2fca070c29f17a280c7f2da5966c4aad29d28434538452f4c822eacf3a60af59a6dc8e9704c
 DIST portaudio-19.06.00-audacity-portmixer.patch 8722 BLAKE2B 2b69bcf26e55be46d354dc44756fd03b16031fa86a334b776eb4326a4c64a7e22abd6bf60794847526102391c8e65813b41338cf94c647e3e9b68d82ea5dc5f5 SHA512 f693aef477b516c7a03eb021260cbecb23200422a927a117e3e59a1b4e6c6c2983fbea8ee3a3714ebc55728933654bd7909327a0bab4450ccf4e6a02c86a63b5
-EBUILD portaudio-19.06.00-r1.ebuild 1299 BLAKE2B 65b2ccc4ac4352593fad8e42d7d5ff80b67f9e82f6f0b7f92434dfbaf55ce305fc8c190eccd26f6983b35e0b0c0ad63df7cbb1ece95d945f72804a4b71bc257e SHA512 3413bc83d334aa5092a0365f7e9cf69011736c450041e48f25604cbca2f69457fc91182339899ac964343ed705c51e7675a3b306308bd0f4a78c6c9d381e9d96
-EBUILD portaudio-19.06.00-r2.ebuild 1547 BLAKE2B 80c4c05d4039e408ab4ff6f7b331deecbf3c76f2cac2087e26cfae75d80444830310f214696c0c44db5d6eecdca8b9cb89554cbd95e2484a4bd10f4a3b1e4f50 SHA512 e3c4a4f27f3ef9837589b4825a12d55b039884c669564e2919410cba6d64fd25139c297295463185d6471d483adeaa34e6d15bd774ed3ec86b558336252b0868
+EBUILD portaudio-19.06.00-r1.ebuild 1287 BLAKE2B 67e645c2abac9baddc5611373670f39b5d3d096c95fb16d69b7710de7057d9fad712bba264a1246100525eaf1abced43853fb94923ea0d6ae22978a92a080a39 SHA512 5a9af847fd34c8a4f11d795833c69c51b4164f4a7c035010d10c010441e556c3cf753429f190e4985f7331c1166a937ee9a3d8763f986b4f3672760607bdb09e
+EBUILD portaudio-19.06.00-r2.ebuild 1535 BLAKE2B 4e05883ef6d2bfbe607c61f43fa165661edef1dbacebe48343eef4ab992f606ae80345dcd890c90af6424c14a657499dfce0df06e26d435d932a1fac294fcbb7 SHA512 e4585acf5206b318570eca9b4792e1dad04c2cd8b4d194b217a0698b21583992a7d83f90aefb28d50cf78d0e947045a4acce15e51e6cd31fae2ed4b37c78a955
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/portaudio/portaudio-19.06.00-r1.ebuild b/media-libs/portaudio/portaudio-19.06.00-r1.ebuild
index 91a5125e11ac..fe5ea34a8ccc 100644
--- a/media-libs/portaudio/portaudio-19.06.00-r1.ebuild
+++ b/media-libs/portaudio/portaudio-19.06.00-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alsa +cxx debug doc jack oss static-libs"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
diff --git a/media-libs/portaudio/portaudio-19.06.00-r2.ebuild b/media-libs/portaudio/portaudio-19.06.00-r2.ebuild
index 6cfde7247b8c..ba41ecb8438a 100644
--- a/media-libs/portaudio/portaudio-19.06.00-r2.ebuild
+++ b/media-libs/portaudio/portaudio-19.06.00-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="alsa +cxx debug doc jack oss static-libs"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest
index a4a3a36f2ecb..488a1ade2d09 100644
--- a/media-libs/qhull/Manifest
+++ b/media-libs/qhull/Manifest
@@ -1,4 +1,4 @@
 AUX qhull-2012.1-64bit.patch 1509 BLAKE2B d5f50bfb5229109f13ac88f46eff36d130830339c43265981b00a8e5defaf3229cd50870e379e13a2726312efd8a15e99a2683c3b3a9b1eb9bf1503b7f6b1fbe SHA512 e23c7bb4d6fb64a77647980e045b36df4f596eb64a32b27d7d6462cb2f5f7a35e0fa9985e885ed58222ec1741b2a2d1806bba155f1042bd470dcd5c721ac48c5
 DIST qhull-2015.2.tar.gz 1010153 BLAKE2B 854d1897ad5a92b2e13f6b2304d707b21023a47d60fcc7065b487c24dad06fa016536311e224155b879ad699c046f15991a840f5f04283ffdeef8a68dfbf7c15 SHA512 a544f88b5fbabc592fdc4c5533ba58a8f856e018b85128f43d0532a1143123ceb0d5ca9ae1d27722efa5d08092c017bf7715c157d1019f447e6746f23f02dcd4
-EBUILD qhull-2015.2.ebuild 1036 BLAKE2B 9db340744c21e68cbe6591bad519c93b43e82041fd7872bda3e5372c228d3feb8ac6400c3b7c9c9c3af8d71bb9f46fbe3dd747cc58931aef24d2b1e876d71ef4 SHA512 e60fe0a0287216fb6c8099e682a4eebd5b913bf884fe267993428cf6a9ee69e8b7f6668be28eed50a24aba36f63fad368b1b6bddb463c0c9d4afb765cd5b9708
+EBUILD qhull-2015.2.ebuild 1026 BLAKE2B c096a92af8a7b44c5bdf7f994c304f5508c32b75e29f3b82e408e8e554c7b85ab28fd3ea83142e1d47b2636138d9dec678163824145f12394c68784289c2b7d4 SHA512 0b3b46e7d7dec6c7ebde18a155586f1c7b62ea875841bc371c34af9d4a6f5551f41b78b282aac7c7e4fe66309c43909c89982abc839dbc670aa8d1d72ff944d7
 MISC metadata.xml 977 BLAKE2B 57a86855387223c875830b8d60eb02f89f469dc4949f094255f43e0251cb537049d0a99a0eb9500c639730f6a0db518ec2b3a4ae050e3c9ea2f508cdbe790e98 SHA512 6e676d2faff561e67e077869a61747c834131ea67acb098497153c98d3bca38032ffa2ab57d6b612cfa4f1fbdb8b05b0c9a9132ab0cdeae5579bdac236b9a1f2
diff --git a/media-libs/qhull/qhull-2015.2.ebuild b/media-libs/qhull/qhull-2015.2.ebuild
index f88a8b84a6e4..c63282d1cc21 100644
--- a/media-libs/qhull/qhull-2015.2.ebuild
+++ b/media-libs/qhull/qhull-2015.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}/download/${PN}-2015-src-7.2.0.tgz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs"
 
 DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt )
diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index 88b9b694eea6..0e27d3c0359d 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -1,5 +1,5 @@
 AUX raptor-2.0.15-dont_use_curl-config.patch 1681 BLAKE2B 5c3b241836e04dabbcd6fd9db6e89225fcd8cf4c1eed24dff7bb5348d7a0985633a7f9173a5279b04ec277ad0f775a18c52ae33af86b6522a21a3e63123d162d SHA512 28e3137592c14dcf9fc1d8401e6bc58af7f1abcab4886acde42a03dd7b61aa9b176672300951f7b4fcdf5128ce445f12594f7a09444331d1d6c34aaa7a4b9cfc
 AUX raptor-2.0.15-heap-overflow.patch 1708 BLAKE2B cea8df63861760fe55f1320cbc0833d814c38148b3d5f2b7163348de48bd95a37ee3000d312ce76879c798182f74d60f49fcef89f5f051bd40febc0c1da68099 SHA512 f7df0ec3123ac8ec9f2852dfb54e380d210446a36ab2f74aa9d2dcb8346162046d239b4db9a0747b18e3d19f4dc1ce41d194557c5e53027a3618e81b7b251d3d
 DIST raptor2-2.0.15.tar.gz 1886657 BLAKE2B 0a39c7b5705bfbf2daa0ca633f79693953b4dfe24c144008d1646a9840a36d4d7ce153b527450647127ec2522047dbd0a6e71f307ee5656951f7e4b610adfd22 SHA512 563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee
-EBUILD raptor-2.0.15-r2.ebuild 1664 BLAKE2B c2bc61e5c28247d8105361a6f37e4d8539ec242c1feefe6ca1b77fcf5ded6e629906ba7f192a3653b93cf7384fc55a6bd55fc2afa114fa00f328af0f3528670b SHA512 bdd9ea7e7ba7f5852a41fe4d4001fb9ad68ac573d102b2037be366a016065b88c9777094436290e3f2b3531dc25aadd3fc059c1fd9ce00a857dc8e884174811d
+EBUILD raptor-2.0.15-r2.ebuild 1642 BLAKE2B 9eb364220db165993fe7d22298c86ad70e75a15559cfa3df506c11210f217eb4f0c17d45c49b5ff49d4c6c35178650913d181134c18c5c03e32d67d523275761 SHA512 c3de32b65761f98af40a794176fd45ee23b2ad71210b2c290e5b10add747b4bf29edaa783dd04899e6162d8438f90ceeeb843ad23ac2070fcdf9e1087f2ff5a1
 MISC metadata.xml 337 BLAKE2B 6244cd4ab5d8d13437590c4bbb672cb9b5ad47f7e70d30adda368737d745daf4df249eb2166d2ab8335fe0a0fec5b8d3afa9ec091cc6ddcaaf0f2d05f9425741 SHA512 3a2c420495274cfca80f0103066b282b9f1301786a8cbde76b894fac721030bee949fc468c92841698038b991b07fa66f15891392784041a87f655d1860fd11c
diff --git a/media-libs/raptor/raptor-2.0.15-r2.ebuild b/media-libs/raptor/raptor-2.0.15-r2.ebuild
index 82b00ae97d3b..48f7ca1a8b94 100644
--- a/media-libs/raptor/raptor-2.0.15-r2.ebuild
+++ b/media-libs/raptor/raptor-2.0.15-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+curl debug json static-libs unicode"
 
 DEPEND="
diff --git a/media-libs/sampleicc/Manifest b/media-libs/sampleicc/Manifest
deleted file mode 100644
index 3e4b8607914e..000000000000
--- a/media-libs/sampleicc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST SampleICC-1.6.8.tar.gz 708069 BLAKE2B 96d5c34db8f8c5235b53fd7516125ac359788f8e0cf559f6471f54cd269d917c796415e717522cc53ed64f953b8205d1e11cf4ee26ce8c5a0b0d0199cf5b4b8a SHA512 54d9f1fd9a7606d0c723bc0f86b3d54c4d1a54ecc4a3aeea665cb8c58df6555e65dd3706dee05e4c89e8a4ff7abf9f726c54c572b32db710e5b2c22b124bddc8
-EBUILD sampleicc-1.6.8.ebuild 499 BLAKE2B a02d501efeb97c5668fc99954cd7d263bdc33624e0c2d15f246c4e57a6ee4e9b2cb599248d71e3bbd12d0e93950c43b33c1efa2ff3c9b8bc2328c8ec9c5a1c2a SHA512 9877459c97a42e46e0be2a54b5b05bfa7aed280bb6d14439018afc5839c77fb28c8740f36398621781cf5ca994b73b23d420426ebc42274eacd1582b9b0567f8
-MISC metadata.xml 246 BLAKE2B f3b3c9c701ad58602f628c8f5b05570af41c39c8d178cacd8e1e03442d1aeeac0b7e9e8c422e3e5ad574e17d05353bacfed9f29c7a09f28cf91ed611bf613f32 SHA512 280cb836dc57e47036d50a501f9dd3df4ec84dadb5c96cee06d2b10db1cc208b9bf0f6b23181f6d71af611b5fdf32940f0a6d80a74917ff0b2636af0f122b50f
diff --git a/media-libs/sampleicc/metadata.xml b/media-libs/sampleicc/metadata.xml
deleted file mode 100644
index 23528a112a45..000000000000
--- a/media-libs/sampleicc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">sampleicc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-libs/sampleicc/sampleicc-1.6.8.ebuild b/media-libs/sampleicc/sampleicc-1.6.8.ebuild
deleted file mode 100644
index a7961560c496..000000000000
--- a/media-libs/sampleicc/sampleicc-1.6.8.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="C++ library for reading, writing, manipulating, and applying ICC profiles"
-HOMEPAGE="http://sampleicc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/SampleICC-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND="media-libs/tiff"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/SampleICC-${PV}
diff --git a/media-libs/sbc/Manifest b/media-libs/sbc/Manifest
index 9372baf40f12..11b95fb5bb9b 100644
--- a/media-libs/sbc/Manifest
+++ b/media-libs/sbc/Manifest
@@ -1,3 +1,3 @@
 DIST sbc-1.4.tar.xz 250656 BLAKE2B a5b59a0ac209b44843af49e63f7b6a6b397b3905f0efc52c18a3b92785d297d39dad80f5b124e97c50a9535f892f1451bf0a2945ba223a522eafbcad46eaad9d SHA512 f35250c202034e93ce4046d29883d76b162164d42fb59e6af8ff5e57f197244238f5f8087309cef2d44755c179e7f0869cf096735c8de510b1ac7e0f6c29d84f
-EBUILD sbc-1.4.ebuild 861 BLAKE2B 572d860d22e8611e8f1498c308d9299cc6aa153081a16e140afab1dca84a7e4ca91f813c1cf3ac2dbf83c1d771e00e0459e2d0e38250605149ffde688a4826f4 SHA512 75f0e3accef30d6621409433cb7a44a0b6710aad128eed495be3e03a2d83934dd96e94d9fb9f87f548996985cc394d16ba05eb5b6f99dacd56c51f877ba9abbd
+EBUILD sbc-1.4.ebuild 872 BLAKE2B 026bffe695c742e931128c2c69e442abcd8c40309e22c7366396c42cd0d8dfd03fb184f7f4d9fcc106579f8e64495580c454f7fa35e45b5f21da34ce1da288e4 SHA512 8536569bebcd7ca416a5dc3901f70092118d8acf153936c08d04baa90ac1dbdd5827753e3de00d0152206a7200baf601f1dde83c5e86370d027df2119f2497f8
 MISC metadata.xml 356 BLAKE2B 37e1eb09d0de357b5f84cc88a36d602c1522fb5e1a80542390297eca08bef82e30a85af697c5bcf1e042b98a63943f49b3e7902ef866207998583ff0c1a96c00 SHA512 c9b1f0a337ecc94fb295f536d18166b9bae68ca96e27f96a17b38b2374203bc6979e9f168e423e2eb87520919ba76c433a6b60c866b82c449b48d84e92165524
diff --git a/media-libs/sbc/sbc-1.4.ebuild b/media-libs/sbc/sbc-1.4.ebuild
index 4c3b18491e96..5d515bb6474c 100644
--- a/media-libs/sbc/sbc-1.4.ebuild
+++ b/media-libs/sbc/sbc-1.4.ebuild
@@ -6,7 +6,7 @@ inherit multilib multilib-minimal
 
 DESCRIPTION="Audio codec to connect bluetooth HQ audio devices as headphones or loudspeakers"
 HOMEPAGE="https://git.kernel.org/?p=bluetooth/sbc.git http://www.bluez.org/sbc-10/"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
diff --git a/media-libs/sdif/Manifest b/media-libs/sdif/Manifest
deleted file mode 100644
index 5903f5303945..000000000000
--- a/media-libs/sdif/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX sdif-3.11.4-fix-buildsystem.patch 2325 BLAKE2B 7192e2d0c4cc1c4203a6613a975c4458888499e524c95c7706ed98948ce9ab0bd0c7fb37fe6a3223c9373167f3105fa6f51c9e3a0889a346db024c0c1c7ba68b SHA512 50321ac50d622959aed59be2462af30e8cb0a3d159f24e9a0837cf72a98d6b0b19799d20c824bcfeb4d3e2952972e6849294f4b79b13f1accc32975e885f7b5a
-AUX sdif-3.8.6-cflags.patch 1369 BLAKE2B a5ee59d74809f75e305852df1db521561cb1724042a7227354b9c61cede9c91294d1c57c9423ffaf276a05e80d33f6d4d6d9a73e91aac701e5dddc1168dd9c54 SHA512 d07bdfc045d8283b4800a758b7a902550b298c7220bff1e4c8c39c2b446ef52b5d1952d9ae3828a79c5360092536ed8276af85785d8e5ce15cf52b26115552ad
-DIST SDIF-3.11.4-src.zip 1230479 BLAKE2B 2883083bbb8555f27532964965afd02fdeb023d15d28629c070259f057552b3227aed7f9add78b7315eb94c569a754fd4bc85df2439d24d3f17d3a41bc6dfdb8 SHA512 3730fdb527909403e43ea793ab97e0a3175bb63dee3d0183db831bb6be85837823c42ae2a3559b6ec94218b4338d04017353282fdc7bb79bbee467e09685d3e9
-DIST SDIF-3.8.6-src.tar.gz 786261 BLAKE2B 406d6e51a9fe00f3d25de6d6a1e682bc049b56333d27a015c9e7eb44a4b4e78a765c22743f63f083e24518fb95e17e0cc0a5c25868ed649709cc94051fbac0b3 SHA512 5b9603bed121afe4e4bd524372332c48a226711c029271ce0a26ae644990f060104b03983a3b49afe141897bdf6e878dbfd31a853c38ab14b8d4eb98f868f9e7
-DIST SDIF-doc.tar.gz 534161 BLAKE2B 0508a0824ab737e76aeeef11f240d1166e8e2731f4ccde127e202aeddd3880abf768266c6130a670ea8810e6ff0e9671431f5c7e05f6abe7f33cd257af12373f SHA512 df03d8dcb69603a5ad96dbee77789b0422e39b5dfbe1f944dff1d3763a59d9dce779ef714fa041a44d9fe30ab4714c0f2343502004c1e9b03286ae701fb14e22
-EBUILD sdif-3.11.4.ebuild 788 BLAKE2B 2707fab4d453b9fc78719ad0c9adc639be5b674d86efea80640b1b90f068cdeac440632de723a922bb8062cdf36dda7d929af2a5aac27e6e1b9740ce6a4d7a7c SHA512 8be7f0fcf6d6e34c2b4db6af554ddcb182d51d6f0b669a294084140fae64a425b6025ba720d29a38b2e15df13903e0a5f85f14073acabbeea15f6ac55940ed0e
-EBUILD sdif-3.8.6.ebuild 1226 BLAKE2B c57b1b2a535f18749be98ad7ee2d39d4775fdd0d2003eb96c97941a72108179c4d64b505339ef158009a32c3319daa46f7d64fd0a4b47b0f5701e46af27080b1 SHA512 ed0bfdcf7b1a9062a45a560d9750407afcfa79f01f99eec85b222cb9f69e64d7a1f3affaf8cc4006454d8e648cefbd553f025609560a4b11008a6273eef88247
-MISC metadata.xml 725 BLAKE2B 66d8d7bd0aa41ac85d2f544bb902c9ebdf740d2ec74587511ea4ab609a4bec2f8aabc1e839c0a02f59c0d93f4882a8d9df00672034b55f14b7c3ec1dc4ae64f3 SHA512 3836d62692b81ac8a290194e3dc0079a34e80add8d2e4b253e5396674be20058901db7beeb2fb3aee30b3cdc4966263852105666bfbf910a1b0ea56ac50d0cbc
diff --git a/media-libs/sdif/files/sdif-3.11.4-fix-buildsystem.patch b/media-libs/sdif/files/sdif-3.11.4-fix-buildsystem.patch
deleted file mode 100644
index 162976c6ab45..000000000000
--- a/media-libs/sdif/files/sdif-3.11.4-fix-buildsystem.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Remove hardcoded CFLAGS, fix broken example generation.
-
---- SDIF-3.11.4-src/configure.ac
-+++ SDIF-3.11.4-src/configure.ac
-@@ -518,15 +518,15 @@
- [--enable-debug            support additional library/programs with debug enabled],
- [echo FEATURE enable-debug... $enableval; 
- if test "$enableval" = "yes"; then
--	SELLIB=libsdif-debug.la; CFLAGS="$EXTERNAL_CFLAGS -g2 -Wall";
-+	SELLIB=libsdif-debug.la;
- 	PROGLIST="querysdif-debug\$(EXEEXT) sdifextract-debug\$(EXEEXT) sdiftotext-debug\$(EXEEXT) tosdif-debug\$(EXEEXT)";
- 
- else 
--	SELLIB=libsdif.la;  CFLAGS="$EXTERNAL_CFLAGS -O3";
-+	SELLIB=libsdif.la;
- 	PROGLIST="querysdif\$(EXEEXT) sdifextract\$(EXEEXT) sdiftotext\$(EXEEXT) tosdif\$(EXEEXT)";
- fi ],
- [
--SELLIB=libsdif.la; CFLAGS="$EXTERNAL_CFLAGS -O3";
-+SELLIB=libsdif.la;
- PROGLIST="querysdif\$(EXEEXT) sdifextract\$(EXEEXT) sdiftotext\$(EXEEXT) tosdif\$(EXEEXT)";
- ])
- 
-@@ -538,7 +538,7 @@
- [--enable-profile          generate additional library/programs with profiling output enabled],
- [echo FEATURE enable-profile... $enableval; 
- if test "$enableval" = "yes"; then
--	SELLIB=libsdif-profile.la; CFLAGS="$CFLAGS -g -pg -fprofile-arcs";
-+	SELLIB=libsdif-profile.la;
- 	PROGLIST="querysdif-profile\$(EXEEXT) sdifextract-profile\$(EXEEXT) sdiftotext-profile\$(EXEEXT) tosdif-profile\$(EXEEXT)";
- dnl else use the one selected above
- fi ], 
---- SDIF-3.11.4-src/examples/Makefile.am
-+++ SDIF-3.11.4-src/examples/Makefile.am
-@@ -18,18 +18,14 @@
- # trying to add source code to dist, not working yet
- #
- 
--INCLUDES  = -I../include -I$(top_srcdir)/include -I$(top_srcdir)/sdif
--CFLAGS   = @CFLAGS@ '-DVERSION="$(VERSION)"'
-+AM_CPPFLAGS  = -I../include -I$(top_srcdir)/include -I$(top_srcdir)/sdif
-+AM_CFLAGS    = '-DVERSION="$(VERSION)"' @PTHREAD_CFLAGS@
- 
--libsdif = $(top_srcdir)/sdif/.libs/libsdif.a
-+bin_PROGRAMS = list-types list-nvt
- 
--# this is for automake
--EXTRA_DIST = list-types.c list-nvt.c
-+list_types_SOURCES = list-types.c
-+list_types_LDADD = $(top_srcdir)/sdif/.libs/libsdif.a @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
- 
--all:		list-types list-nvt
-+list_nvt_SOURCES = list-nvt.c
-+list_nvt_LDADD   = $(top_srcdir)/sdif/.libs/libsdif.a @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
- 
--list-types: 	list-types.c $(libsdif)
--		gcc -I../include -g  -o $@ $^
--
--list-nvt: 	list-nvt.c  $(libsdif)
--		gcc $(LDFLAGS) -I../include -g  -o $@ $^
diff --git a/media-libs/sdif/files/sdif-3.8.6-cflags.patch b/media-libs/sdif/files/sdif-3.8.6-cflags.patch
deleted file mode 100644
index 27debd5b67c5..000000000000
--- a/media-libs/sdif/files/sdif-3.8.6-cflags.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- configure.old	2004-09-03 06:49:36.454205056 +0900
-+++ configure	2004-09-03 09:24:10.924271296 +0900
-@@ -19247,6 +19247,7 @@
- done
- 
- 
-+CFLAGS="${CFLAGS}"
- 
- # Check whether --enable-doc-compilation or --disable-doc-compilation was given.
- if test "${enable_doc_compilation+set}" = set; then
-@@ -19844,16 +19845,16 @@
-   enableval="$enable_debug"
-   echo FEATURE enable-debug... $enableval;
- if test "$enableval" = "yes"; then
--	SELLIB=libsdif-debug.la; CFLAGS="-g2";
-+	SELLIB=libsdif-debug.la; CFLAGS="${CFLAGS} -g2";
- 	PROGLIST="querysdif-debug\$(EXEEXT) sdifextract-debug\$(EXEEXT) sdiftotext-debug\$(EXEEXT) tosdif-debug\$(EXEEXT)";
- 
- else
--	SELLIB=libsdif.la;  CFLAGS="-O3";
-+	SELLIB=libsdif.la;
- 	PROGLIST="querysdif\$(EXEEXT) sdifextract\$(EXEEXT) sdiftotext\$(EXEEXT) tosdif\$(EXEEXT)";
- fi
- else
- 
--SELLIB=libsdif.la; CFLAGS="-O3";
-+SELLIB=libsdif.la;
- PROGLIST="querysdif\$(EXEXT) sdifextract\$(EXEEXT) sdiftotext\$(EXEEXT) tosdif\$(EXEEXT)";
- 
- fi;
-@@ -19865,7 +19866,7 @@
-   enableval="$enable_profile"
-   echo FEATURE enable-profile... $enableval;
- if test "$enableval" = "yes"; then
--	SELLIB=libsdif-profile.la; CFLAGS="-g -pg -fprofile-arcs";
-+	SELLIB=libsdif-profile.la; CFLAGS="${CFLAGS} -g -pg -fprofile-arcs";
- 	PROGLIST="querysdif-profile\$(EXEEXT) sdifextract-profile\$(EXEEXT) sdiftotext-profile\$(EXEEXT) tosdif-profile\$(EXEEXT)";
- fi
- else
diff --git a/media-libs/sdif/metadata.xml b/media-libs/sdif/metadata.xml
deleted file mode 100644
index 1adcb2a99c94..000000000000
--- a/media-libs/sdif/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sound@gentoo.org</email>
-    <name>Gentoo Sound project</name>
-  </maintainer>
-  <longdescription>
-    The general idea of SDIF is to store information related to signal
-    processing and specifically of sound, in files, according to a common
-    format to all data types. Thus, it is possible to store results or
-    parameters of analyses, syntheses...
-  </longdescription>
-  <use>
-    <flag name="ftruncate">Enables usage of ftruncate v. truncate</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">sdif</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/media-libs/sdif/sdif-3.11.4.ebuild b/media-libs/sdif/sdif-3.11.4.ebuild
deleted file mode 100644
index 274f5729f910..000000000000
--- a/media-libs/sdif/sdif-3.11.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-DESCRIPTION="Sound Description Interchange Format Library for audio and wave processing"
-HOMEPAGE="https://sourceforge.net/projects/sdif/"
-SRC_URI="https://sourceforge.net/projects/sdif/files/sdif/SDIF-${PV}/SDIF-${PV}-src.zip"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="debug ftruncate threads"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-buildsystem.patch"
-)
-S="${WORKDIR}/SDIF-${PV}-src"
-
-src_prepare() {
-	mv configure.{in,ac} || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable ftruncate) \
-		$(use_enable threads pthreads)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/media-libs/sdif/sdif-3.8.6.ebuild b/media-libs/sdif/sdif-3.8.6.ebuild
deleted file mode 100644
index 75665aac5501..000000000000
--- a/media-libs/sdif/sdif-3.8.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-IUSE="doc threads ftruncate debug"
-
-inherit eutils
-
-MY_PN="${PN/sdif/SDIF}"
-MY_P=${MY_PN}-${PV}-src
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="The Sound Description Interchange Format Library deals with audio and wave processing"
-HOMEPAGE="http://www.ircam.fr/anasyn/sdif"
-SRC_URI="http://www.ircam.fr/anasyn/sdif/download/${MY_P}.tar.gz
-	 doc? ( http://www.ircam.fr/anasyn/sdif/download/${MY_PN}-doc.tar.gz  )"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-
-DEPEND=""
-
-src_unpack() {
-	# a hack that I need to bother upstream about
-	# they don't want to use the "Package-Name-Docs/file1.html" format
-	# instead it's just file1.html :|
-	unpack "${MY_P}.tar.gz"
-	mkdir "${WORKDIR}/SDIF-doc"
-	use doc && tar xfz "${DISTDIR}/${MY_PN}-doc.tar.gz" -C "${WORKDIR}/SDIF-doc"
-
-	cd "${S}"
-	#custom cflags...
-	epatch "${FILESDIR}/${P}-cflags.patch"
-}
-
-src_compile() {
-	econf $(use_enable debug) \
-	$(use_enable ftruncate) \
-	$(use_enable threads pthreads) \
-	|| die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	use doc && dohtml -r "${WORKDIR}/SDIF-doc"
-}
diff --git a/media-libs/sdl-gfx/Manifest b/media-libs/sdl-gfx/Manifest
index b4ce68c7a1a1..5a1618d0acff 100644
--- a/media-libs/sdl-gfx/Manifest
+++ b/media-libs/sdl-gfx/Manifest
@@ -1,5 +1,5 @@
 DIST SDL_gfx-2.0.25.tar.gz 1760656 BLAKE2B f0779c725529d52b675312a3f6fffac7581f2e3a6f609c433e0c1fc636a3f73660727ce8996764578dcb486252ceaf6064a6710a6b60a82fc3cc106097d2e7ab SHA512 42a5d78fe1a9b644d329fb688ed6c98558f8dd0aa029a1a0d99b1c59f94859269e0aef8f9e420b8018b687d8eae151652890be3994775644e1d3a80ba7b6fe8c
 DIST SDL_gfx-2.0.26.tar.gz 1771164 BLAKE2B 09556762bd9f3e19989d9db4117ec63deff466c015fe0d7b40595b8d3d0f2e7f17d142d101a1463a71144b6ee7700370513057f4f4753a4b4c605308cd42bc64 SHA512 e571caa0d7575683efd4cf8f0a41ab10f4acf913f9ece216ac823af11da22c8734fc2c0ea049009a3e1a53715e49622f5bfcfdbdafb95e5151990d0a4eb69c01
-EBUILD sdl-gfx-2.0.25.ebuild 1141 BLAKE2B ac05c4fb48d1b9c72e12d22f8eb9e1e59349a67b996d5d86eb24b76975d4bc26afa4ae2132f9a01036b0584c790d67abf8b0aaa5a5e7f15edf68150b262b02a4 SHA512 b9c6f177340f2eddcf8b91620c1992d2bf804c6c721dd17acedf325ce5651f8ff3d52f388ff93517ca65e2318ebad2d9e2b2c0734fcc7b264d667e2cb050f39b
-EBUILD sdl-gfx-2.0.26.ebuild 1242 BLAKE2B 24313e26c2bda44dcd8d2796ffd58eb58338adce493c8fb06e104a88d6e033ebce875bde0b9b980c3433837298f7ec6f42979fbe8c582724d6b44e2cf34a0f77 SHA512 83259454884a8e4b352ca6b0a6f45f67b275502607c2b79a5c3ba8d735960a41e9c5e932fd411baa41f734e7f4879b89569761357c3ccd2c8aa38ab840927944
+EBUILD sdl-gfx-2.0.25.ebuild 1119 BLAKE2B 12db74cd8bf45e6b1518ab25db7128dbb1e58b15728d6b51f9d55d969df44e92dce6452f18d092275db934b70c2c29f6bbcc453a0bf812126f7767fff9fdd53e SHA512 644f2b574b30ec751f6f32e2bea5692383d0ba09f477feef5dbea701ab59b55ae72c841b674f1c44751bfc57b0873a777c7a545c1065dbf3ddbdf8bd5ba6f2e5
+EBUILD sdl-gfx-2.0.26.ebuild 1220 BLAKE2B 5ea1af9e474d34a245d9de040b08a0b3491a878405b5b8886403efdc5d1fef315bc956c4e7050ce1f9223b9fce7f57d955ad5d75f85f193e4bc3bfeb2a19ee2a SHA512 645bef39cfb28896d013d512b285cbc587b483fb79687b1c6fc1e0821d89a658a291717852046f014bbb1a639a1c410bb4b613d758f0f5439344c77f7523fb16
 MISC metadata.xml 913 BLAKE2B 24b8ef9a2b333c6df842a85ec91f6d3a70c4439ed6bcd829641b158d4fb6f100ac20134cba4b2b2e5732825730ed0a214f55b10ff38a328e6a004770b3d246a5 SHA512 495205062ad772f808daa2da58de9abf6ec504665e06ba9f38392bcae2b4ee343a935be43d5d82e56353d1b282c6e293a859d495f98face961f9c5921503c162
diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.25.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.25.ebuild
index 32fe586605e3..0d67f84876fc 100644
--- a/media-libs/sdl-gfx/sdl-gfx-2.0.25.ebuild
+++ b/media-libs/sdl-gfx/sdl-gfx-2.0.25.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc cpu_flags_x86_mmx static-libs"
 
 RDEPEND=">=media-libs/libsdl-1.2.15-r4[video,${MULTILIB_USEDEP}]"
diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild
index 36fd5ef48bcf..a785ec3d6742 100644
--- a/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild
+++ b/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc cpu_flags_x86_mmx static-libs"
 
 RDEPEND=">=media-libs/libsdl-1.2.15-r4[video,${MULTILIB_USEDEP}]"
diff --git a/media-libs/sdl-image/Manifest b/media-libs/sdl-image/Manifest
index 0d974208237e..c7bf728678eb 100644
--- a/media-libs/sdl-image/Manifest
+++ b/media-libs/sdl-image/Manifest
@@ -1,3 +1,3 @@
 DIST SDL_image-1.2.12.tar.gz 2231074 BLAKE2B 0d63e0b2207d1d347ec882e610eb37a625811febc215f089eb00dddec92b1a9fe026d2ab7823677c46e595585f3b5e176c35f9ac1f9ec2debf430ecc3ea950a6 SHA512 0e71b280abc2a7f15755e4480a3c1b52d41f9f8b0c9216a6f5bd9fc0e939456fb5d6c10419e1d1904785783f9a1891ead278c03e88b0466fecc6871c3ca40136
-EBUILD sdl-image-1.2.12-r2.ebuild 1567 BLAKE2B f82c035c4dcb6e0fea028f51de86af261a9824b2880b64aad9d2bff24f62c9097f6ad936a7acc777ddd60555a4f63b4d12938b62d7f72574fb6b112068909a15 SHA512 7f1d37b4667404864b5baac84c94b417e21e996f557261b96f3d0d0b2a6bebc131642123009efa81bcc68492a440bb16f2fc747a13b96a977c01a136b04f48f2
+EBUILD sdl-image-1.2.12-r2.ebuild 1545 BLAKE2B b520dd52a1c9b4434016ca63960aa814d3c154f23e838d9e5b72e7011218888603ff38ee4420052739c875cce5144853f9e362bc526cff659ec2bd5a0400441a SHA512 b75fa3696cd8589147c6840cc2385e863dd301163b038c0967d7d479e3ebe10b4be87513f51f74481c9a4c4c2645b92edadd5e63d65867000f93addc8a1b2c61
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild b/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild
index d9578965e6d6..da05ea60d6ea 100644
--- a/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild
+++ b/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="gif jpeg png static-libs tiff webp"
 
 RDEPEND="
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index 97124cbd65e8..d8c59eb6f72e 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -4,5 +4,5 @@ AUX sdl-mixer-1.2.12-mikmod-r587.patch 1416 BLAKE2B b353de5432714f3968c5f69ff439
 AUX sdl-mixer-1.2.12-mikmod-r588.patch 1128 BLAKE2B cc6ff884b3e157064a583d64adf978a091c7786a3c5417c5efd911f80407d30c866c527400122866bcffea25ab645533ae8e972834a2085a4bd8563ef5e8607b SHA512 36bbc5d10a63a73b7860a6f381a88849cc465dcabbfe3db21d6bd156110eb01e03e8369f0ed234f72f0227566919f5f823d0350d431575f0ae0f2a4b244cf704
 AUX sdl-mixer-1.2.12-wav.patch 796 BLAKE2B a0b310db2b789d24fd60927d23859582a8ab1449ba0934e10abdd1361a0d92fb5925625d9c3a0885f812dde12af9931cbae06c652b51e76d18759db03cacfc2a SHA512 9fed330d6bcae546752434a0ea29168e2a8fa432c8670d7290e70905f3431746b15126e5ce05820e4dd4dd09c982c880a6ce901ab9b3cff298e7f2c8d6a8b491
 DIST SDL_mixer-1.2.12.tar.gz 3707781 BLAKE2B b2fa822204fdaad860ff30307120bff7badbcc042d0b891563973794f715099aa961983e0dbf7e3d936179cbc615517c268f01f4619fcdcd48f18ff66dc49bd1 SHA512 230f6c5a73f4bea364f8aa3d75f76694305571dea45f357def742b2b50849b2d896af71e08689981207edc99a9836088bee2d0bd98d92c7f4ca52b12b3d8cf96
-EBUILD sdl-mixer-1.2.12-r4.ebuild 3258 BLAKE2B 402500bfcedeb3ebf28e28e8eb3574ca0156c706593334e396a12b8f4655eeffa717b3d9af4b6aada4944cb54f87da0c9885b35ae4e052673dbec45569b15bb3 SHA512 300a5d27d27e22eafbdf727ff2621bdb74221c4b9f23703c9b48946d9aebd95e7b27216e1d8f2cebd9635a8f166bf0244c6c65791a9cbf9d1a033864ef205e1a
+EBUILD sdl-mixer-1.2.12-r4.ebuild 3248 BLAKE2B 2d2ff2b553860134822a33845a23ea5b115a54ce711af01f90b97588b4571aa0c1366e1a7c2094a212eabcbd3bd47b02b939e116a68474b978166685e537cb55 SHA512 0915c1a12083273eaf36105785aff525aa5cd23d52cf3560eaf44d4e429f6017172f93bd48c2a0942378034adca4b8ce5c74c4202b45af72d0929824c08bf6ba
 MISC metadata.xml 663 BLAKE2B 5d86fe5c016f831f870da2f9b3d0192b6719bc6a98c0101c06c382d62e6100af314f46980ad5c246c8bea9db8ea99e9cd47afe2e5aee5b7887f5f6d529dddee2 SHA512 16a16403ac93fe964330da05038a0e904d0c6e895413994db9ef587170eaf7161f3cc2ce7fb0fe13ded675306b489837d96e837c1002f216b8ffe72d6fd49591
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
index 8d73e8e50b67..51aed975758f 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav"
 REQUIRED_USE="
 	midi? ( || ( timidity fluidsynth ) )
diff --git a/media-libs/sdl-net/Manifest b/media-libs/sdl-net/Manifest
index f5cd99f4548f..78d0b6e076e6 100644
--- a/media-libs/sdl-net/Manifest
+++ b/media-libs/sdl-net/Manifest
@@ -1,3 +1,3 @@
 DIST SDL_net-1.2.8.tar.gz 360958 BLAKE2B 656fb9c86949bc962656edc7b950e64eee9b9b1ce1b257e6c4974c2d9be99714128c5556d3a3b7ea92cc6d294846af7a51a1925d17418afc8409e44a7b71099a SHA512 2766ca55343127c619958ab3a3ae3052a27a676839f10a158f7dfc071b8db38c2f1fc853e8add32b9fef94ab07eaa986f46a68e264e8087b57c990af30ea9a0b
-EBUILD sdl-net-1.2.8-r1.ebuild 1005 BLAKE2B 268687766a8da0bcfae2e3f4f45af3a6884bcbfed6311147be3ea1cd8d17e3a52b87606e1ec9631b6264a5382cbfa41b0d1338fc8f3e5951a7df782ec45986ee SHA512 b5b77320d3e5e31d91f578b83615122cdd0847653bc623a27f2dd8732e796d1bc12f1a7ff4afea9406a2ae1ade88b0cf92e823b1f6125c711612d75dff832c66
+EBUILD sdl-net-1.2.8-r1.ebuild 995 BLAKE2B 38014564a92cc3365b53b7c1f90119a4d7d2d30d054a8c1233355ccfb48defd0b7046486debb4ffba4b57923f1882391cc71ead5ac989652be40e0d2762b5d87 SHA512 57dc8f43aba716e63dacbf0230cb23fb8f3d6e622a8ade74fa059185fcb0545239d8fd684e7b3f912b0d7a981fe2a1608b17b12a2154eab44b76e17457a40a03
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild b/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild
index 126aa18d9a2a..94eb2ba069db 100644
--- a/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild
+++ b/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_net/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/media-libs/sdl-sound/Manifest b/media-libs/sdl-sound/Manifest
index d364479e6b60..6757eb923689 100644
--- a/media-libs/sdl-sound/Manifest
+++ b/media-libs/sdl-sound/Manifest
@@ -2,6 +2,5 @@ AUX sdl-sound-1.0.3-automake-1.13.patch 231 BLAKE2B cc17a9d7a9f8ea42f84b6a65505d
 AUX sdl-sound-1.0.3-physfs-3.0.1.patch 1574 BLAKE2B 9829f6429041322c0eaa41d547dbebfe03bf730e80d76b5b15afc66c123a87e0ab1fd9819372e37ed505c1a9e214c27583cb56e12920b3fe0c88a211177c79bc SHA512 ac228520e1c8e682b58919335ea117289087962b4b98fae23e743830709d8dca60a3d22c7171ee13bdbf84f528cfddcad70231edbba64a7cec88c7dd77295eca
 AUX sdl-sound-1.0.3-underlinking.patch 413 BLAKE2B 594339dae9a0230ddc1b821ca90d1650800610b0a7904fc00e33f1e3ff183ece1c8715b1d27b0c80cecbf5bda9e7b15255fba00fdc293f5e0841452efde447ef SHA512 1f67d72313abc44080a47b70c210bd6c03b2a204e85e2f5d1eb95f40367470bab4f14956f0404c5025fb4af7d72731dd1df3196ee316a2c5d9bb775e27d58a8c
 DIST SDL_sound-1.0.3.tar.gz 1127100 BLAKE2B 6fff5ea22ae82f9692a51910d5415288d5a1ebc1c463b2c741f9ee9fabeabb385de12f781d4f40aaf0628598824758376c51b442f434d77d96d0376379908ff6 SHA512 3e60671777d804e6104d7d441f4a29866492c9412040eea3fd2283c0914a0a1ebc550260631c2bf500e7d982e05a6f9feeda81e9eeef8257303750c1be582824
-EBUILD sdl-sound-1.0.3-r1.ebuild 1859 BLAKE2B 34700a6ec4e72aaa5da68fcf7b6cfaf8be86e3d2d03b6efdd92f09243776972ecdf074b163bb5a84a41959ab850af6e567676915c1bb13d54e62ae8d559019a2 SHA512 65da9213c7657a44ebc0b8d2e54cc095b0338c2e8b9b53071f51cce4dbca096eee15267d5ab5c1377eafb7b7ab7226fb8be2090fed4364d1fbdb6221321a82e5
-EBUILD sdl-sound-1.0.3-r2.ebuild 1985 BLAKE2B bb8b5b653c96760522be04dd0ab462d9f87fd519767ba1edbca2af48efabf78c6594089c14ae1f3a29461a5ee001aa28b724b1774a264051d47335e471c09a7b SHA512 20c9a225e830b33a4eb2669e14c85ba284c191bc85e6126a038fb6b55d3bc13090dabcdfa59556fc73ec47a4ae4f3270897b29d97adc791724fe06a653564d8a
+EBUILD sdl-sound-1.0.3-r2.ebuild 1971 BLAKE2B b791129c6811ee4f85e04a4d56687473aa522a60e154d6a55783d8ba5b2c2116ba5e196d362f17b3726b4e3ab2d6969d9903df66dfd7cf467f7a706f8085f0c6 SHA512 99f4e2ebe8c7465a6a6ccd60cd5baabaae0ffa7f7a4a9b824d887142e190953275b56d71106117c2a855949918488f0abca70c010c0ab031e39d430dcc271346
 MISC metadata.xml 443 BLAKE2B 5ca8d53cd8244754cc018b9cc771a6c02d20613a6bcb79adc7a16ff869655dc2a54b7253f8bc16d0675a7536188729f913a03f5c0c5187eb604742a2d7ac4cbc SHA512 522c8dcd761d563136729cca7317ba139e36e85cb7f052113e7317ba0c2b8e8a2d207b1901def3d14b0d57602038d3d32b7091c2175a28709305e7c340de4933
diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3-r1.ebuild b/media-libs/sdl-sound/sdl-sound-1.0.3-r1.ebuild
deleted file mode 100644
index ac7df0c6202b..000000000000
--- a/media-libs/sdl-sound/sdl-sound-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib-minimal
-
-MY_P="${P/sdl-/SDL_}"
-DESCRIPTION="A library that handles the decoding of sound file formats"
-HOMEPAGE="http://icculus.org/SDL_sound/"
-SRC_URI="http://icculus.org/SDL_sound/downloads/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-macos"
-IUSE="flac mikmod modplug mp3 mpeg physfs speex static-libs vorbis"
-
-RDEPEND="
-	>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
-	flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
-	mikmod? ( >=media-libs/libmikmod-3.2.0[${MULTILIB_USEDEP}] )
-	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
-	physfs? ( >=dev-games/physfs-2.0.3-r1[${MULTILIB_USEDEP}] )
-	mpeg? ( >=media-libs/smpeg-0.4.4-r10[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-{underlinking,automake-1.13}.patch
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-dependency-tracking \
-		--enable-midi \
-		$(use_enable mpeg smpeg) \
-		$(use_enable mp3 mpglib) \
-		$(use_enable flac) \
-		$(use_enable speex) \
-		$(use_enable static-libs static) \
-		$(use_enable mikmod) \
-		$(use_enable modplug) \
-		$(use_enable physfs) \
-		$(use_enable vorbis ogg)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	dodoc CHANGELOG CREDITS README TODO
-	if ! use static-libs ; then
-		find "${D}" -type f -name '*.la' -exec rm {} + \
-			|| die "la removal failed"
-	fi
-}
diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3-r2.ebuild b/media-libs/sdl-sound/sdl-sound-1.0.3-r2.ebuild
index 36b7858b9a62..02c6018c0b60 100644
--- a/media-libs/sdl-sound/sdl-sound-1.0.3-r2.ebuild
+++ b/media-libs/sdl-sound/sdl-sound-1.0.3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://icculus.org/${MY_PN}/downloads/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="flac mikmod modplug mp3 mpeg physfs speex static-libs vorbis"
 
 RDEPEND="
diff --git a/media-libs/sdl-ttf/Manifest b/media-libs/sdl-ttf/Manifest
index 2983aa78bfb6..d6a9fbe3e25c 100644
--- a/media-libs/sdl-ttf/Manifest
+++ b/media-libs/sdl-ttf/Manifest
@@ -1,5 +1,5 @@
 AUX sdl-ttf-2.0.11-freetype_pkgconfig.patch 1229 BLAKE2B 79ee75681d33ba925a29066b818cd32409c1eff159cd827606c6ea893a739eb698586d8cc292b1d3c21b3963112a26f5685aba532b47d1e83bc21fcce6995253 SHA512 abb3fd400c5d44789b891bad53124ca135ea3125affb95621623ab22fc43f5fbfeb79c63a97648936faf4698180837f76ca57143ee401610106d08741610e937
 AUX sdl-ttf-2.0.11-underlink.patch 244 BLAKE2B 2eb1782f89a72c94a1d90e4560895aafc9beda72a1537d41186de0e2816b6d37486b1211ac274d72c1b369f82d2b977c173443145a4a49b9592379e667881d32 SHA512 22495819ad0972183d850496acdcae1358bd37d25191e62c293f8d5fc50c617507631a202d46bd1ec380c70d89c61d050763919d48912b9a527908e8ad1ef1ac
 DIST SDL_ttf-2.0.11.tar.gz 4053686 BLAKE2B 3a78eeec91d7f6983b851cdd52925890c168cdf85dd34c7722183cc5a8848dab530c0c2d76493e0a380aa7e4f81967eeefd7cb34dc74faafc40497ffcb0e577b SHA512 64e04d1cd77e525e0f2413ad928841e5d3d09d551c030fc577b50777116580e430cb272b2aeb6191dfcc464669cf2f7a5a50d10e7c75637a3b1e8c8fca7fc78b
-EBUILD sdl-ttf-2.0.11-r1.ebuild 1275 BLAKE2B 0b1ed90933ef406f9cc7dd5cf38c11deac3c3eac1752c5fe058868a1f0b0c86db8647619f04524f95537a690cf6e24343193dc5f9bb5574faa5f8e2bb89fbee8 SHA512 917936e002759a4f1a9f129d222508e13a9ec0cc4937e143f71f3eddd33c60216a301b6cc1ea8f9fd4c37651315c72b8bce7f17f764c0ffdef9708a4ebea5a45
+EBUILD sdl-ttf-2.0.11-r1.ebuild 1265 BLAKE2B c203c72ebd32ffb57d706ced2712363b8abd812f3755e6511ec5d27a7947ed901864ed5fc2d75e8f13ba5b672e35b2da09ee0f4ec11af9f6ac633ab25992392c SHA512 9e4088df8c7fe092ebd6acb4c77d6c587829efc7b3c5448dff00a5208b9999656637e25b5078c7dd56c0b34705783e05b040207a42edbe02402bc775be9dfbe7
 MISC metadata.xml 487 BLAKE2B 95ce74adcba0d3325dbcbf132d27ec7e09a56bb5043d44ced349f0a8318f7a7ba6a3f77cf164292af4f789c4c058b6825a733338245d9434f689ce3c84060565 SHA512 8da59a1be8aa7ca22c2f8b14e4c4fd288a9bc4b508157bb38b0cbb8f1f5f7dce3904861e419b8a6b40a0b895e8866c53b677c1467c0531b9615d70806bdee360
diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
index 61ff98347e5a..4b26ca7cab5a 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="static-libs X"
 
 RDEPEND="
diff --git a/media-libs/sdlmm/Manifest b/media-libs/sdlmm/Manifest
deleted file mode 100644
index be902cc1a9ab..000000000000
--- a/media-libs/sdlmm/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST SDLmm-0.1.8.tar.bz2 399529 BLAKE2B 9ed90ee44fc659f329686c1e90d9734c89e54a693dd770884077960616269587acefe66f3e7d208a297d08d51b4bfe36a89be3b6d5151e418f5af1f10019c9c2 SHA512 c1e228748530d833eb87e99b17ceb860fbbe792b04290cca89e3cc64a535f2e7116900e1a25e6fda8b6b607a46e81d3a5634dbad49086fc40f646f82b4414e0b
-EBUILD sdlmm-0.1.8-r1.ebuild 529 BLAKE2B df82d441686154f66867efdf742dd05014a56e6d4fdcec0b8a5ba3733ed30b807fea77698de234687e93c397ab61fcd52b95027bec7ef0dd8cb097c1527ba6ce SHA512 7e6cfbc7e24f306a27afcf72576a4490fd6668f86b147f1519e3429dda78ea4e7d0536226d0bca00cd66e0198f94af3d2965dea2b2fd2d7e59f56bb519196857
-MISC metadata.xml 247 BLAKE2B 5ec1b67648395d686b5a699006d98ac0b7996db9f1c5eeaeb1822dee1b0b1eb2f3c802bb7f4ad089bfea0f511288f578729af035d9aef979dcfed623c503f92f SHA512 e3418fb0f776396c9512f83441017d7419e49c531d449b1ab8101f0d558fe38d79b3a90249dbe38041afbfe7bc9d0382f07af9e1895a46a982265323b8986983
diff --git a/media-libs/sdlmm/metadata.xml b/media-libs/sdlmm/metadata.xml
deleted file mode 100644
index 97f6021b9bdd..000000000000
--- a/media-libs/sdlmm/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="sourceforge">sdlmm</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/media-libs/sdlmm/sdlmm-0.1.8-r1.ebuild b/media-libs/sdlmm/sdlmm-0.1.8-r1.ebuild
deleted file mode 100644
index 8e7c320ef6e3..000000000000
--- a/media-libs/sdlmm/sdlmm-0.1.8-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P=${P/sdl/SDL}
-
-DESCRIPTION="A C++ Wrapper for the Simple DirectMedia Layer"
-HOMEPAGE="http://sdlmm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sdlmm/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc ~sparc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libsdl-1.2.4"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS README THANKS
-}
diff --git a/media-libs/sge/Manifest b/media-libs/sge/Manifest
index c3bcbbb03aaa..afe9a6bba455 100644
--- a/media-libs/sge/Manifest
+++ b/media-libs/sge/Manifest
@@ -3,5 +3,5 @@ AUX sge-030809-cmap.patch 684 BLAKE2B 951a434b5aa8fbf890b62c9cfaa420137ae5898a91
 AUX sge-030809-freetype.patch 625 BLAKE2B c075614e5c163344661a8628bd9b612ab154e8bee063c52e0c64575a5c5e8905da9f0d3edc553c6e5570f395aebf6ef533962f306604402d0abed891f412a890 SHA512 ec7fbcf0d072b6f1b51de6838113d8f1e030a8b91036f6e6674d63728adf1b81e6f31edff7e6bc28d270f200b907c6ecdc924730d9195e563f3da807a519764a
 AUX sge-030809-freetype_pkgconfig.patch 708 BLAKE2B afbbf5b8e6bc7c3404d822464b3b99056bb12c639f61b52285f41acc460d6f6f8826b1511f6147b7a2ece90f28512c9fce8e8695f9d84ae68b4f8b00108a0ef0 SHA512 cd17e10e43ebccca33b876203417aae4fd40d8c0cfda616ee29620cefe4c028fcaccb55adb61902755b8704110291105bb4fd7985a70261065d0bc4ded4c9581
 DIST sge030809.tar.gz 251698 BLAKE2B fbb8ac88e6328c160af95e8922eb401f5ae34b296ba5e5bc161d5236b94ed7fc3b1502cdc684092d73276d1120c2f1eb56bc7571ec44b941cdc6ebcbc51f0176 SHA512 59144d573f254cc451a22a2d60ba68c7d9437b5095f63fc7ec36c21c3caf7580c5365267a004e08b9d08cf187a59ddefb76a5829f4a6aa1ff4d45f7d044bb2fb
-EBUILD sge-030809.ebuild 1325 BLAKE2B a05e59e3d3bbbacaebdd20cf084b17980a78fb26f9a3be18b7c4e2701764040288fde9a0f8e237ec39dbcffa473df3affa6844a89f1ffd1ac236fc665cce2177 SHA512 e956073120c740ffb6f8fc6a0ba82ac7e0f67b883de56d68360c3dee903f9473b91a37108b9f5e7690ef112cccb6fa950ea518fc8d16bc30769717441988c493
+EBUILD sge-030809.ebuild 1315 BLAKE2B d6c88b708608c60471486e36e8801f6b6a30051b80329ce9c1c9520fca056704f5d96c4520948236f5842b1aa0b2efcb3a25a7190c84f5967c5330c71e6362c2 SHA512 35bbbe4607507d23ae23a0b36ff0367919404dfcf1997d5800d10fdb82d33887f7ce0f1cb826f77c72dfe5cd5076d8ceddf5ed218dae43b6a1bd7e2ecc1072c8
 MISC metadata.xml 331 BLAKE2B 0d4e5d5cb7ea39a3404a3b0708d61022a77962c30767cfd801f923749bb5ad2211d6d4ed26e9ada97dbb045cf16542e774b2327bd7d0505df33b3a4333733570 SHA512 65e4d002bc5d040804fd5b43a1b33e89cc8404d1048fea0459a55dc9aca010135ac0944d57282ebf09ccc5d7d8125728a963d08c45837aca4fc92565a77a8ae6
diff --git a/media-libs/sge/sge-030809.ebuild b/media-libs/sge/sge-030809.ebuild
index 159379bb02fd..b3eb1819a16f 100644
--- a/media-libs/sge/sge-030809.ebuild
+++ b/media-libs/sge/sge-030809.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.etek.chalmers.se/~e8cal1/sge/files/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 ppc x86"
 IUSE="doc examples image truetype"
 
 RDEPEND="media-libs/libsdl
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 0ca5550c8726..f37ce44ad894 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,8 +1,4 @@
-AUX shaderc-2017.2-fix-glslang-link-order.patch 1803 BLAKE2B b5c880d6869a3a6d70405e12290bbb7f22d83c9903fdec62d0672f4e475bbb92ff377ed71121f7d8f935c1043d9c15949158aef616d45452dc3024ca24d8e4d5 SHA512 f8204ed66381864ee2f682f4e948d3e426fa4031b702e31ee5be7e1d963d7d64aea72b5e9234d621e0708c35f4009d788235b6d8c4bd45b91fa1957c1f641c0d
 AUX shaderc-2018.0-fix-glslang-link-order.patch 1059 BLAKE2B e8985d1de7f6e425eabbd05201aeff854304fe227f2a83878ed41e5494e71742d46c49b86aa97c3a9b364909f5d6adcc2a3aed21128935febbc7765b90b2f2b3 SHA512 09a61e04dd68674d159c69a497ce412b924967d595526a54693e1999345fd45c88999b5e793b5bfd21a0a555b535d89d1611c44a76f81e1ce308bff821c86f87
 DIST shaderc-2018.0.tar.gz 206013 BLAKE2B b45fb6e959f621566817f8e31b1947e479b6ea392eb64f334dca9ad24cc4e8b736dd236e634de3f96342f48d8138722a2b769efb9db65025def5ed59bf5b911b SHA512 7a420fde73c9f2aae3f13558d538a1f4ae43bba19e2b4d2da8fbbd017e9e4f328ece5f330f1bbcb9fe84c91b7eb84b9158dc2e3d144c82939090a0fa6f5b4ef0
-DIST shaderc-7a23a01742b88329fb2260eda007172135ba25d4.tar.gz 186291 BLAKE2B e91f57ba5c9339fed17d409b82df284a7897ed8bcabb203a0b8aab439df1d460ff5efdaa49e9140801b1430e831bbdca6920181fd1ddd07d8d35eb17b519246b SHA512 558447bc29b0c7610fda0f6c2a6b66f3c8fc7f2f5e336ad190ae959caa8c7aa1e09d3c2efe0e197cb2cbe1fa97e0c68623ce423c658b29fcbd1f1e1ea4c85f18
-EBUILD shaderc-2017.2-r1.ebuild 2103 BLAKE2B c49adc567edf01fef06dc5104d0eb8a71d2b90f68dc707dd762120255f3e423da5a8dca55ce4efeeba29235081bd6dca76d323bdc274b9d801ca1a2ef51f3535 SHA512 c61eac14ff14c1a3edcbe4edd0da5ca3c4b349ac7cc74212c2c16e8534ec58101a77c3c31609b5ad6e92bd051fbd794ae27ed8ae7604d6a58e159c7d1092555c
-EBUILD shaderc-2018.0.ebuild 1984 BLAKE2B 00cd26db078ce879fae3903e851d6d37b9511ed4c849fcedf60a3747f3574e1d343ee31634906bdba8c1c19aeb155e4fb3d916e3c36fe2c8d8af13a683d3d109 SHA512 0d80b7648f59a56b63eed9579cc3ce400522bccde8d149e3497584fa259db0852502acc4bdfa2c828fab9a96975508a8940bfb62f5db41daaec3050c5bcef489
-EBUILD shaderc-9999.ebuild 1977 BLAKE2B 02bea7c2871d68dbe22ac47e22d062787ab7ef084fe740eeb71b1b7fa35be38b54fa1dc9f571c033be0fc6a0b108078ef1290fcf3654f5f9275de780adcb67d6 SHA512 c8d1fda68fc6162d3fcea9b4e9f8df21852ecf5c2546e990aeff03b730b9bce02c9e39ec40c3e0dd97e0f62031ae80f00fc5f7220844e983fd2b0daf7404fe0b
+EBUILD shaderc-2018.0.ebuild 1982 BLAKE2B 65f9c467b19222fc0d74454ae5564fe9f807cf4ec03f204b1dea7cef0c3898146b690771787953be671b9adcd4d77624a56ab209cd91055edf89b54914af202f SHA512 89ec6b3a50cff8021cf51eea7c11ac6c106f6e6a9bf0fae44ef881749ece590660947a86bd358089c87ea3c623f4f5268602241f16ccd9885fef10e3caf7af20
 MISC metadata.xml 246 BLAKE2B 1b5ed67f52168f632fd290d848b5cff1b99d79ce844a73d99fec57c671b0788d9e7c83b9e657a8a7172f89cbf0728bb7f3d8016db2e3575f686e60dabafef941 SHA512 ed75da45f240a95d52b0b1d6164e68c174c8083997636a3ddae0ee8c7b1921b18d09a8da0e7fe289b829e076f4d914828e830428aebe82d3274ee83aa44e98dc
diff --git a/media-libs/shaderc/files/shaderc-2017.2-fix-glslang-link-order.patch b/media-libs/shaderc/files/shaderc-2017.2-fix-glslang-link-order.patch
deleted file mode 100644
index 2cd24a165e5c..000000000000
--- a/media-libs/shaderc/files/shaderc-2017.2-fix-glslang-link-order.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Original upstream PR: https://github.com/google/shaderc/pull/463
-
-From 21c8be385b3fab5edcb934a6d99f69fd389c4e67 Mon Sep 17 00:00:00 2001
-From: Niklas Haas <git@haasn.xyz>
-Date: Tue, 29 May 2018 07:34:00 +0200
-Subject: [PATCH] Fix the link order of libglslang and libHLSL
-
-libglslang depends on libHLSL, so the latter needs to be specified last.
-This fixes an issue when trying to build shaderc against system-wide
-versions of libglslang/libHLSL, rather than the in-tree versions from
-third_party.
-
-Additionally, libshaderc_util also depends on SPIRV-Tools
----
- glslc/CMakeLists.txt           | 2 +-
- libshaderc_util/CMakeLists.txt | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
-index acf6fb0..0f5d888 100644
---- a/glslc/CMakeLists.txt
-+++ b/glslc/CMakeLists.txt
-@@ -18,7 +18,7 @@ add_library(glslc STATIC
- shaderc_default_compile_options(glslc)
- target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR})
- target_link_libraries(glslc PRIVATE glslang OSDependent OGLCompiler
--  HLSL glslang SPIRV ${CMAKE_THREAD_LIBS_INIT})
-+  glslang SPIRV HLSL ${CMAKE_THREAD_LIBS_INIT})
- target_link_libraries(glslc PRIVATE shaderc_util shaderc)
-
- add_executable(glslc_exe src/main.cc)
-diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
-index 873540a..6d0c465 100644
---- a/libshaderc_util/CMakeLists.txt
-+++ b/libshaderc_util/CMakeLists.txt
-@@ -34,8 +34,8 @@ endif(SHADERC_ENABLE_INSTALL)
-
- find_package(Threads)
- target_link_libraries(shaderc_util PRIVATE
--  glslang OSDependent OGLCompiler HLSL glslang SPIRV
--  SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
-+  glslang OSDependent OGLCompiler glslang HLSL SPIRV
-+  SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT})
-
- shaderc_add_tests(
-   TEST_PREFIX shaderc_util
diff --git a/media-libs/shaderc/shaderc-2017.2-r1.ebuild b/media-libs/shaderc/shaderc-2017.2-r1.ebuild
deleted file mode 100644
index 133e87ec05e2..000000000000
--- a/media-libs/shaderc/shaderc-2017.2-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_COMMIT="7a23a01742b88329fb2260eda007172135ba25d4"
-MY_P="${PN}-${EGIT_COMMIT}"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
-HOMEPAGE="https://github.com/google/shaderc"
-SRC_URI="https://github.com/google/shaderc/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	<dev-util/glslang-7.10[${MULTILIB_USEDEP}]
-	dev-util/spirv-tools[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/spirv-headers
-	doc? ( dev-ruby/asciidoctor )
-	test? (
-		dev-cpp/gtest
-		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
-	)
-"
-
-# https://github.com/google/shaderc/issues/470
-RESTRICT=test
-
-PATCHES=( "${FILESDIR}/${P}-fix-glslang-link-order.patch" )
-
-S="${WORKDIR}/${MY_P}"
-
-python_check_deps() {
-	if use test; then
-		has_version --host-root "dev-python/nose[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_prepare() {
-	cmake_comment_add_subdirectory examples
-
-	# Unbundle glslang, spirv-headers, spirv-tools
-	cmake_comment_add_subdirectory third_party
-	sed -i \
-		-e "s|\$<TARGET_FILE:spirv-dis>|${EPREFIX}/usr/bin/spirv-dis|" \
-		glslc/test/CMakeLists.txt || die
-
-	# Disable git versioning
-	sed -i -e '/build-version/d' glslc/CMakeLists.txt || die
-
-	# Manually create build-version.inc as we disabled git versioning
-	cat <<- EOF > glslc/src/build-version.inc || die
-		"${P}\n"
-		"$(best_version dev-util/spirv-tools)\n"
-		"$(best_version dev-util/glslang)\n"
-	EOF
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DSHADERC_SKIP_TESTS="$(usex !test)"
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi && use doc; then
-		cmake-utils_src_make glslc_doc_README
-	fi
-	cmake-utils_src_compile
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
-	fi
-	cmake-utils_src_install
-}
diff --git a/media-libs/shaderc/shaderc-2018.0.ebuild b/media-libs/shaderc/shaderc-2018.0.ebuild
index b766cee080e9..1f712cb201dd 100644
--- a/media-libs/shaderc/shaderc-2018.0.ebuild
+++ b/media-libs/shaderc/shaderc-2018.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/media-libs/shaderc/shaderc-9999.ebuild b/media-libs/shaderc/shaderc-9999.ebuild
deleted file mode 100644
index aad02e3ab3f7..000000000000
--- a/media-libs/shaderc/shaderc-9999.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit cmake-multilib python-any-r1 git-r3
-
-DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
-HOMEPAGE="https://github.com/google/shaderc"
-EGIT_REPO_URI="https://github.com/google/shaderc.git"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc test"
-
-RDEPEND="
-	~dev-util/glslang-9999[${MULTILIB_USEDEP}]
-	~dev-util/spirv-tools-9999[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	~dev-util/spirv-headers-9999
-	doc? ( dev-ruby/asciidoctor )
-	test? (
-		dev-cpp/gtest
-		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
-	)
-"
-
-# https://github.com/google/shaderc/issues/470
-RESTRICT=test
-
-PATCHES=( "${FILESDIR}/${PN}-2017.2-fix-glslang-link-order.patch" )
-
-python_check_deps() {
-	if use test; then
-		has_version --host-root "dev-python/nose[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_prepare() {
-	cmake_comment_add_subdirectory examples
-
-	# Unbundle glslang, spirv-headers, spirv-tools
-	cmake_comment_add_subdirectory third_party
-	sed -i \
-		-e "s|\$<TARGET_FILE:spirv-dis>|${EPREFIX}/usr/bin/spirv-dis|" \
-		glslc/test/CMakeLists.txt || die
-
-	# Disable git versioning
-	sed -i -e '/build-version/d' glslc/CMakeLists.txt || die
-
-	# Manually create build-version.inc as we disabled git versioning
-	cat <<- EOF > glslc/src/build-version.inc || die
-		"${P}\n"
-		"$(best_version dev-util/spirv-tools)\n"
-		"$(best_version dev-util/glslang)\n"
-	EOF
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DSHADERC_SKIP_TESTS="$(usex !test)"
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi && use doc; then
-		cmake-utils_src_make glslc_doc_README
-	fi
-	cmake-utils_src_compile
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
-	fi
-	cmake-utils_src_install
-}
diff --git a/media-libs/smpeg/Manifest b/media-libs/smpeg/Manifest
index 95208f96097a..1a5f58b3c64a 100644
--- a/media-libs/smpeg/Manifest
+++ b/media-libs/smpeg/Manifest
@@ -12,5 +12,5 @@ AUX smpeg-0.4.4-missing-init.patch 266 BLAKE2B 6476eed877a31ff26ff83936e137da8d9
 AUX smpeg-0.4.4-mmx.patch 352 BLAKE2B 02e060104c7fa0a817a9929c8a9911b24dd1ae131b26939edc7a1ac752a181e1db3cd0539d33d1548d1766f0a9ca2ecac31f6d0408711f54f04e6ed9ca5a35c5 SHA512 f83a04a6a8edb008dee9b76d96ad45b76e8ffcbb3086e6d97b64ee05ad400778bab97890811548274521504f502a904bc2f13598dfca33a872e6fb8800c0d974
 DIST smpeg-0.4.4-gtkm4.patch.bz2 3894 BLAKE2B 0ea9258a057108a462d9c4b9d9bcb21cdff71714507a3d09538f56817b206ec54681b3d2546b64c07f239ea3381f3644d26234853a239a2fe49353ba1c9b2759 SHA512 30370e0edd41767ce260d10de515be0087f47b479ec0085ec186506c93be0b2a404c1bcb1626f9a6a1f575160d9c382708d2769dddfe6dca6236fe0eaa58602d
 DIST smpeg-0.4.4.tar.gz 315054 BLAKE2B 16a7b87a207874deaaad64b5233964d4b0e244d35cc475cf0ed37302529ca4eb044393777fc98c202b5965de420f75bc5fb398ecc3eb0f97992d90e365f8a039 SHA512 d566bb68b0caacecdf61cd766b26e003fd4e153c243d873f7aae33ab69919202bd121bb9c10f494bd9530267ddec2a9e018eb46ee8bb9d502a29cd2de2f1bbfb
-EBUILD smpeg-0.4.4-r10.ebuild 2073 BLAKE2B cfec05cca840ced4285b7da7e56edc980431bcebb0064eb542b6f2917819b0f2b708b62f720dd7b0d3288f5d00ee9763f1b3ac65d8dd4312ed652604a3fabc36 SHA512 48c7ab70cddab6e17a1f2158a0606bb482f2848432ea55f15555d6164532ca5bba23721c3cc9e7ed7cdbc88ab956a7c35c3c58bee2d4381b019355a27ecf6722
+EBUILD smpeg-0.4.4-r10.ebuild 2063 BLAKE2B fc9de24425139ae3f4d63e3148a226c3a71621e65f2e8f6300cad2efaa7d58d8dd7bb10a2c37ed3427b8a0c840dd4efda5608d6d8f6193f444ded9b4bd0d5cb4 SHA512 2652fae53a050fe6653de3f5de59f842d229d9beff0c5eb26ed43d4c181a15a589b019ab4cf1c8577ec1fecdb6804789ff0b59d25e8e8175fc6801a7015d1074
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/media-libs/smpeg/smpeg-0.4.4-r10.ebuild b/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
index b564a43ad5f9..d2de598ee104 100644
--- a/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
+++ b/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.lokigames.com/pub/open-source/smpeg/${P}.tar.gz
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="X debug cpu_flags_x86_mmx opengl static-libs"
 
 RDEPEND="
diff --git a/media-libs/soxr/Manifest b/media-libs/soxr/Manifest
index 09154fae4491..d77d71bd49ab 100644
--- a/media-libs/soxr/Manifest
+++ b/media-libs/soxr/Manifest
@@ -1,5 +1,5 @@
 AUX soxr-0.1.1-nodoc.patch 480 BLAKE2B e7e31df74004b58e584964eed26acb18717faa912fa5eae84d03a62f40d2260e039595c33518ff6fdcf2c5db7fe0bc7f73680bc64418e387ff30f2488d0ebae1 SHA512 6c585eacc6919bfe6f158f1ab45fe5dd0b3a0b3f534ff5d2f5e07e3e8e505a7c7da3bb16d2d4b6dc2f0a361190bd21639f74ae09abd3e0209b33ae2174726017
 AUX soxr-0.1.3-fix-pkgconfig.patch 595 BLAKE2B f35e4c8ca382db0d05b9c50c3a02c568befc1dbf671fb503c610f2b4fa05dd7361d6b8184aeb4be050d224bc534e87ae760130e1e3ce1c36e6042ff4208411fe SHA512 45206a00747d387e4bec62edf93e9fa19b04096240f567773070b7c87667713ca7bcfea2e2df665f128b6b4d4c53fdb87571bdf018e2066ff6e6acf39870b762
 DIST soxr-0.1.3-Source.tar.xz 94384 BLAKE2B 5b7078f71404b9ef83917dcabc0c99cf17fd625d3e033d1b934382a7b60e55e359931a6ab53f8adaf955c0d811d6cbf231cd6a226549560b3506a3867e845607 SHA512 f4883ed298d5650399283238aac3dbe78d605b988246bea51fa343d4a8ce5ce97c6e143f6c3f50a3ff81795d9c19e7a07217c586d4020f6ced102aceac46aaa8
-EBUILD soxr-0.1.3-r1.ebuild 1084 BLAKE2B 760f6338426dedcc8a77576f87fa08758e4faf911754b2103da697baa0a5167b78c93f078af0ae0c322601f6d882fd875bf818cd181652cbd578b9b7c07571b2 SHA512 4bc893ade39c131e1d855da4ad52585c06c973a21129d7b8e441b0405d47ebfcdef76856f345c18db8f440d4472387ddc27b26eb5bad3f0646127b5b4c84d3f7
+EBUILD soxr-0.1.3-r1.ebuild 1072 BLAKE2B fc5ec6632e8562c68e13df59a93dd37693a12c79f111b1d2f532b49b0272c43e73b5385d16cf06e6c748e22959e79e106bb82dfacc5d2d3213f76097a3e95038 SHA512 291f6749edaa84654948e72f948af86070d39f3a57dfef84f3d7efdf7843698a1d088b2c40a3338eccd839f3977793655f8226079c848c732f676555555b0264
 MISC metadata.xml 337 BLAKE2B 9b011942361de08f2263ad43a16d18bc8940e539b045a4907ced6c93dce455450bd754bce933ad33591b001dab99c253c781b26ffc26f0972425f75837186f7b SHA512 7f028b48874ab0d30aadbf0370e3ef5b555785aa4e7ab1bd1755ec2cb5c33d3e99e83ed166d011a94773b3c50b0e5a5403b42ed6d9d0c51ff7f7f2ddf48d064e
diff --git a/media-libs/soxr/soxr-0.1.3-r1.ebuild b/media-libs/soxr/soxr-0.1.3-r1.ebuild
index 6d3d97f3ddd8..d78d648f10af 100644
--- a/media-libs/soxr/soxr-0.1.3-r1.ebuild
+++ b/media-libs/soxr/soxr-0.1.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/soxr/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="examples test"
 
 # CMakeLists.txt builds examples if either test or examples USE flag is enabled.
diff --git a/media-libs/speex/Manifest b/media-libs/speex/Manifest
index 07a4585008f0..9044d4839c80 100644
--- a/media-libs/speex/Manifest
+++ b/media-libs/speex/Manifest
@@ -1,4 +1,4 @@
 AUX speex-1.2.0-configure.patch 920 BLAKE2B 57b43aee0c57d6f0bf29202573d8f5caa65d41823ca073fb6b8edc1d35dee7b90ec79d52ef08affb0a1cb88b577e0fa3bc62844ded3c4e3235c268e31a0121a6 SHA512 71e6934f104d12bfb7bfb19812ff868dc22a323e2fbd7a480c270650a14842dd03e53e11853e7ddaa9469239a538d0bf09469770fd30f23601406011fe626ffd
 DIST speex-1.2.0.tar.gz 1047080 BLAKE2B 928e044e1195d4d977497cd1275a07323df233ee85e3ec188f362720f96303c2fc2002c1147c2ac93ca03570ff98428d983eb7d00439c9cdbe131041d9aa2697 SHA512 7fe10838c7d1bafcbe42295b82b79262420dba793b8a4388e2f73a3007850b5572face1b5308d9f4e8d7dfc9cb1c016cbad88cd65b2892667986107ed946836b
-EBUILD speex-1.2.0-r1.ebuild 1665 BLAKE2B a36c01a68e9602909eeaf86aee736fc7d8703406c36b93f05a3adae8a951dd0dabaa60e4a744a3cce650d8a0246813c9c205f384a9315d9f5d180ff9c593d4a1 SHA512 52c5f1b69fa0a16a0e4851dbaf3b1b9bfe1eccf3e51c0007f5059b17631eec40a18fc670d8c3a12d310948e9cc01ed7fd90d0ed2c7752be286f5c0f06c757a7b
+EBUILD speex-1.2.0-r1.ebuild 1643 BLAKE2B 79b1f53ca2191ae08550a1bc6da678e8c3209449679c12f94ed906d130bd53bc17dfe6422ddde0c92a49f1ae3d5fe5c4ec7191d4fb21a3cfa8d02fe1b71e7c18 SHA512 5986168ea6eb602b1153c0c66651b308c692e3162223fd37bb9cd0794ed049f2b60320cbc06343d82d188728372a64b89d52a664d3a1d4fdc3aa39fac248ce6b
 MISC metadata.xml 495 BLAKE2B a93e81b5e5b7c39cd680dbd8294451e3b034f1506e0c48d36d2a6e7525638bfc7dee964541b0e03847e43a344689d97de94e245dc4bc8099674a24b12a0a4115 SHA512 6b6a16e69139c71477c76a96c2aec025992a28079a15db234bc624619dc6ee5b3d20025418a49a0119d75b9964dd91fb38459c642c53a98b6bb444c6698beeb8
diff --git a/media-libs/speex/speex-1.2.0-r1.ebuild b/media-libs/speex/speex-1.2.0-r1.ebuild
index 2a8671bf2443..c815e2a2a0e9 100644
--- a/media-libs/speex/speex-1.2.0-r1.ebuild
+++ b/media-libs/speex/speex-1.2.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_arm_v4 cpu_flags_arm_v5 cpu_flags_arm_v6 cpu_flags_x86_sse static-libs utils +vbr"
 
 RDEPEND="
diff --git a/media-libs/speexdsp/Manifest b/media-libs/speexdsp/Manifest
index 16d4b847fd3b..cb2f4698eea3 100644
--- a/media-libs/speexdsp/Manifest
+++ b/media-libs/speexdsp/Manifest
@@ -2,5 +2,5 @@ AUX speexdsp-1.2_rc3-config_types.h.patch 2188 BLAKE2B 1e0c25b5e65a5999f5284abf0
 AUX speexdsp-1.2_rc3-configure.patch 1506 BLAKE2B 76276ba7cc0c7143da55d90be9a60ea697dc13f9ad65d7d24a83606b14c543700788e9213d1562371203ace9d45131cb52103d7f045ddf17adc0e30fd3876013 SHA512 95a95e5ca052b6ab3091ce9c461e7356f029e65b47a0a0f291448325acceb23c5cb12d81dbdecec13945b70fa8161e479bc6767de484c2c2f13a5299a3b9304c
 AUX speexdsp-1.2_rc3-overflow.patch 2211 BLAKE2B 36a5aaedd730d8847046ce8cb9453678cf7aa503e060b25fb24e57516bbaaa7b987d3abb93fab741933c3fd43c490a090ac9fd64a6fbb2496f3a0364029c6b50 SHA512 f948be7513ed33a133a19bf571b8b1395f37b86715e2426a59105494d16c269c54c3a32c916f89af7e5b4b1d4aff90839e2b1ed2b13de482e54ac05bef449b31
 DIST speexdsp-1.2rc3.tar.gz 901771 BLAKE2B 85d047df82fc06906598da39ae653aa245c246bfea75c02d25f7811983babdab6a8499c9b563e0d7d2145fa490674df2cf0a05989884ffb3c2c2a183415ce841 SHA512 29dfa8345df025eeb076561648a9b5c0485692be699b6da3c2a3734b4329187a1c2eb181252f4df12b21f1309ecdf59797437dfb123d160fd723491ab216e858
-EBUILD speexdsp-1.2_rc3-r2.ebuild 1488 BLAKE2B f3c35a20ea333108938b936fc1c1d4b483b4c0dda34ed03fac0b7e2c0caf30f780d4ecb8997187311c3e0e30ab4f58f053c9bd12c9e844bc16e075bc631cc560 SHA512 9bfb850c500785f2ee7d5c7a0b9eb7fa52bf1e2134894e4c35116de8a5d84de2d8fc07a5124366745dc80da7a9227296309eee5ee81ea8c30920656421097d20
+EBUILD speexdsp-1.2_rc3-r2.ebuild 1466 BLAKE2B 15fda894837fe5ae0bc1023956063a92024cfff84288c3a137cefd39772f710cd21c30d31e3604ee67a5ce51a114b2e14afd491902f904d8d309979fa883504e SHA512 52e9379decd06debe3eeee45bb68bd107ecb7d36239359b4550c8ad3f9ae0b4ee30309ea04aa8dbfb3db3c9d32c760233ee5631eb8a1a5216ce3bb6871567ab7
 MISC metadata.xml 342 BLAKE2B 5b793ea5060e3e8359d6b50ebd5211471de0d72608086d1d0a67c655cc30c15e0b0db4545a578882144f9f1f4913779037ff76aeeb94002db2b162db78a6364e SHA512 32081e424d3f4ad3fd0ef4979c339d1139cb2298e6703210ff741b77a8b3bf2e1d4b550b0d76a1bd0c4dc5ac465b3ebdd1fe86da45d46586cd3560261f73c457
diff --git a/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild b/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
index e010f35b0a29..9779da23f9de 100644
--- a/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
+++ b/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon static-libs"
 
 RDEPEND="!<media-libs/speex-1.2.0"
diff --git a/media-libs/t1lib/Manifest b/media-libs/t1lib/Manifest
index b35030029d69..1185de3adcd9 100644
--- a/media-libs/t1lib/Manifest
+++ b/media-libs/t1lib/Manifest
@@ -5,5 +5,5 @@ AUX t1lib-5.1.2-CVE-2011-1552_1553_1554.patch 5085 BLAKE2B aa10c8ceaffe6d827c38d
 AUX t1lib-5.1.2-format-security.patch 1357 BLAKE2B ba340f40284dd24b5e49ef9aca1a8fa3773d547e382cf5abd5e600ee696e615d050f69d1b974a7e442f70cc3cf80fedce6d55c6e40d12170a60376a3ebdb0a47 SHA512 7c7ecc3851c675780b15b185db1b6c0b412fc1eef7505c822b75163ebdf14762ba999486db3238adbefe1571b762e9014669a585a886e537068b8a38bdb85ec1
 AUX t1lib-do-not-install-t1lib_doc-r1.patch 522 BLAKE2B 37989b16132d84d67b5692fc7c15654f28156fb3162ba4c545ab01e238e95c60e422aa1b86d34d2c160600f0f55728ed637094a2b8fc951b7d338594510c104a SHA512 d77beebb581739f5646137d5c1aa5cf3d9906a010f07e3822040812822782db7712d4d18d6235dc22da6e4531daf81fa891db4c1047ad95ee702da88cb01688b
 DIST t1lib-5.1.2.tar.gz 1872534 BLAKE2B b6f2c17b8009feef3c0ab3a8314e89e421d90349c4465885c3478a9493b30ada9ad0a2f58e70ba863d91e305fbb52f90e6a42b492a0239e5245ff9132c2ba92d SHA512 9f424b19c6f35cc4f194ff7351a4c2352216462c7d1b1d9650ad3a05cf48c6e90c89ccbcda5ecc47a4169a39a850cf84a1fcbf88b3b15614860c27364b631ae3
-EBUILD t1lib-5.1.2-r2.ebuild 1831 BLAKE2B 9cfc9594e9026da63d6aacf49be5d547528a755e720959eba20f1713669fdf21e55db723239d4c63dea1da0ac0b7692d42bc9e30690555e3bd17435b598c6695 SHA512 873abde5b9ebe02bf7965eca48e336aca2fa56b6a9fcbf43547c54d2b8569562f364cee536d9a2ed00ea107cce447a1d65558e13cda902d5e70e44e048a326cc
+EBUILD t1lib-5.1.2-r2.ebuild 1809 BLAKE2B 9e50687765374edc356af154ffe0bfbb2e8d8666f61a9861e04008ae67e2784c0cc8be58998fbf0a840074676d89105c8bb83266aeeea7e375a7a4ed45e02bfa SHA512 083b6a27dd3aff56eb7dc23c6cc16e25bc940c37619733c755f0bf401ea162f5e70e111edab6b15326c2e525f3c6ee722a6f3807bae05c1572b460df98311433
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-libs/t1lib/t1lib-5.1.2-r2.ebuild b/media-libs/t1lib/t1lib-5.1.2-r2.ebuild
index 73c4cebaad8e..5e3c53648e27 100644
--- a/media-libs/t1lib/t1lib-5.1.2-r2.ebuild
+++ b/media-libs/t1lib/t1lib-5.1.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://sunsite.unc.edu/pub/Linux/libs/graphics/${P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="5"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="X doc static-libs"
 
 RDEPEND="X? (
diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index 71d857189525..59604aeb463b 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -1,5 +1,7 @@
 AUX taglib-1.11-install-examples.patch 371 BLAKE2B ee42b80e8c6093dbfc4c89c25bcb6bd25e2f5152c14743fa49c6c44a14f93a961f08a4d53337efe0800d98126a8aa58627a330e19386283cc16d8f20c9637262 SHA512 149ce1256ec557ee1e896b56e361f2fcf69633424f9b125666827eda610e84c35bf28e5c3fe5f38d4d87f1eacf977fc5b8b8c2d9c6634997bfe4e4bac122fc37
 AUX taglib-1.11.1_p20181028-version-1.11.2.patch 486 BLAKE2B a0b9021a01268eaeb32cb7a6b333b54df522aaf9d07d9b89870f0dbc38a9648ab9173a916bd8a29537b454631be5cd32c2dfb256ebf2f2b86000fec8d2f32bb6 SHA512 e5c3d814ae7c4b2cb84eded86e909d2db985ec21409767a9bdd502d562b55edf30c74834e2829199f1fd20ca8b1dab832a78b05246ae82fe6ff94cb1266d98d0
 DIST taglib-1.11.1_p20181028.tar.gz 1299993 BLAKE2B d281873a87742ba417ea764bb01f9a4c5553a4624d2c257dd82bbb2f0b7e3103ab6ca253f78c0167908f449aac833873ca1cce6f24b1eb5f608131382833262a SHA512 e26439b65ab579455f79e87a94c33a98e17209b31a19b531e5964a2c0ded395c35067655e31ad22b6205149e2e920d7bd145993f064d3ad13e1de8a9f7e37256
-EBUILD taglib-1.11.1_p20181028.ebuild 1428 BLAKE2B 4fa5f30b2b22a2a0869fff9813af396fb86190e2f8d4a69d5bb40691653923599a87bb5465da3d15c3d29ff65b95f41a9fbe247a1f021a8872c6c2467e283b82 SHA512 7d42ca1c304ac2b01f89c96b684186a44c78d74ea62a3e5dd76596a0e093db181bba34a7360624ecde9f77a2b4ff897cd2a3400dfbc38872c6a77b42bc2210ab
+DIST taglib-1.11.1_p20190920.tar.gz 1290100 BLAKE2B 38f65450b5e7c33b14187ab461bfd18d77f93d1ecab5ccf0c898ca6e67fd05aebac09318d4e1cabf1fdbca38800332ef9d0d5d1317087e69672734d1dec1dfe2 SHA512 4f7ad2a0713d38e8885b10d08041abdfb6c669369edd16e8345d7d679c16c15f191ca378e6690e06347f29e0e9cadebcb95ba26dc583c1127c4531558df27173
+EBUILD taglib-1.11.1_p20181028.ebuild 1406 BLAKE2B 830c53acc2e2f09b53908c5d287a8cb1c7c0ea0d7e7a5c1cd1a63a7c25f6c45082194619ad251eac83adb27d9120612ba615352516b96b942e040f031db96ace SHA512 9c8432a4579e5b55a9b5a825bc6503e4b3cf43cecce312e34f00a8e0b0bd106ec46f6815f3f92126d56895eaa07325df23138546bec09759472f974af6426448
+EBUILD taglib-1.11.1_p20190920.ebuild 1360 BLAKE2B ae2e8cf63660bc931c791643af8f112ed80d6338416ddcdd1b4b1081f4710a0af4a2e6527a9eb932cf2a685cae8ed51b33c103d770d43b18c86ffc616a5283aa SHA512 68abddc56f79988a583f451fcc83d91d2c6ce82eb720977d82fdc250d45b9841afc78148fae2df8a4eeeac82b84aae463c9de380f3f4d8531d086cb2797e9e77
 MISC metadata.xml 327 BLAKE2B 3972cb6de796dc7ba0d48715a30f265c10bfebe2e192d634267ffa0dc2323283b16c38f9bd891dbd1b7c646929e41116a5924d426fb1df46e63f3a4b4f5920be SHA512 05909165d6fff2283a6d55d1c454d97541e4e5ac35a6997123f548b3a86d108231928a4136cea35a323c942a82d50072f66840347fd1b651d4c1f3a53928c721
diff --git a/media-libs/taglib/taglib-1.11.1_p20181028.ebuild b/media-libs/taglib/taglib-1.11.1_p20181028.ebuild
index 0c375210d93a..09fcc98658bc 100644
--- a/media-libs/taglib/taglib-1.11.1_p20181028.ebuild
+++ b/media-libs/taglib/taglib-1.11.1_p20181028.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://taglib.github.io/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MPL-1.1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 SLOT="0"
 IUSE="debug examples test"
 
diff --git a/media-libs/taglib/taglib-1.11.1_p20190920.ebuild b/media-libs/taglib/taglib-1.11.1_p20190920.ebuild
new file mode 100644
index 000000000000..b83996484d65
--- /dev/null
+++ b/media-libs/taglib/taglib-1.11.1_p20190920.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT=54508df30bc888c4d2359576ceb0cc8f2fa8dbdf
+inherit cmake-multilib
+
+DESCRIPTION="Library for reading and editing audio meta data"
+HOMEPAGE="https://taglib.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1 MPL-1.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+SLOT="0"
+IUSE="debug examples test"
+
+BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.11-install-examples.patch
+	"${FILESDIR}"/${PN}-1.11.1_p20181028-version-1.11.2.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/taglib-config
+)
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e "s/BUILD_TESTS AND NOT BUILD_SHARED_LIBS/BUILD_TESTS/" \
+		-i CMakeLists.txt \
+		-i ConfigureChecks.cmake || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
+		-DBUILD_TESTS=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	# ctest does not work
+	emake -C "${BUILD_DIR}" check
+}
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 02385655694e..7b224a1e1872 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -5,7 +5,7 @@ AUX tiff-4.0.10-CVE-2019-7663-tiffcpIntegerOverflow.patch 1996 BLAKE2B 1e654cc81
 AUX tiff-4.0.7-pdfium-0006-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch 930 BLAKE2B 52d77fcdd773ce52232257da2c60f8b90417f102238df2039262e3afa7275908c74817ddd6958e430d7cfcff58d2d04ebd6ddd49f553f0f261883b67f557c599 SHA512 822ccc22304d23b4f50efe1f0fb7890fda8b9edf2075b8add814c0bac0a153fa0ed5d7ee5f47e23799b24f11678c8e0bf9c90ad59c5cc61fd9546b2dca4714a9
 AUX tiff-4.0.7-pdfium-0008-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch 924 BLAKE2B 03160ce33639620b1deb918d358f559b8bc6296d28530b440d0d770438453c25aecc393b8cfcc582ed2d0ec1decd557a212c91f43f7923c9e94387e235680021 SHA512 43973cc5512eb8fe2e0beab1a98ff0d3bd999ed1adbf7c08c344b3442559cc2cdc99a9f2e9c1bb2bffa4be027945b12b120fa27ec6c8006367932039b8d8dd37
 DIST tiff-4.0.10.tar.gz 2402867 BLAKE2B 0305453f22150c31d00d2de756736f58c49a288e19b2a66bdd01319ce4688742f6eab4009eaf1817125d41f53a23de17eb6265a3ebae458ec24f5dbb3d49764e SHA512 d213e5db09fd56b8977b187c5a756f60d6e3e998be172550c2892dbdb4b2a8e8c750202bc863fe27d0d1c577ab9de1710d15e9f6ed665aadbfd857525a81eea8
-EBUILD tiff-4.0.10-r1.ebuild 2491 BLAKE2B f6be096bf9b99b9dd9626043df11d965e5282b87c6ae48098efa30a565604e16c21fa81a5723925ec8061b332b68fd0da43fb3782b59b446b739234ccfb929f1 SHA512 da78f5770d10676770ab31d8c5fe490a5ba41a49f9ba7db5da6f26f52be988125425168e8ff163692373d35df17f29ba7f1a1c16a12c0b4a750ead111eef840a
-EBUILD tiff-4.0.10-r2.ebuild 2365 BLAKE2B 3a6ebf2e57d0dce24d85b86e2e42838921665324873f3409823a2c6207bd68e274780b2eed19d4c840508e8275afcd60e5b6e10d15fba872ab65c8bdb1135b36 SHA512 4d318a5b56eec9a8feb9a3941afcbfb2c08ea0eceaf361b52bcc60136be90841268a8c7ff70e4d4fd14356c9f4e1ed1cb3ff8fbdf58aab038ab71558530f24d5
-EBUILD tiff-4.0.10.ebuild 2278 BLAKE2B 590019a51d49fe8486427702957bbf51680a69fc4e4158f74fdfde44bc85d7243ff1fbc08cec658287a742f14069a3c231df5d5388b7ad1db7940c3cc3d2cf3f SHA512 3d6285a44f2744091f2e321c96934986fbdfeb81eee94f340fa969a81f462c7c4a2658821827d317f2313319de079dc08217c2f3849701fba391845b1e09b2b1
+EBUILD tiff-4.0.10-r1.ebuild 2469 BLAKE2B 874a6d3fdb27330736a8ba1a68bcd59b89c25470adcfcc46c8bcc24f579f049082a4ce0c35ba3ad994a833652e7ef1c09e8b093d09c235d45f4235cbb147994d SHA512 f587188f959f6ca380e703c8534222ee6e6479671d990f209663aeafc058b117fefbf2cd6571ef022e485b53782c8c98fdcf3e7c2202ce4a6d06fd5e87f16172
+EBUILD tiff-4.0.10-r2.ebuild 2343 BLAKE2B 8ccd4ca01e86c20d58ab562f4ae9672b2e31586fb12a0296c60e67873cdacca1d14fdb72e02aab03abd59fe9e98763282f1f650a788f313d3dbc5fe6ec551581 SHA512 41f07eea415bd89520633882030192081ae2ea1363b6ad0ed0b23e1f98294a20fd8b433d1c28da6a8495bf71c92924abfd068b9a5439356100ea6ba21cfc30b9
+EBUILD tiff-4.0.10.ebuild 2256 BLAKE2B 1006b6d3e946aabb232e1b17e1d041a4b21d3256863635c44c81771b9a941bd227ca7dbcf265d5e7583b6cbfe06a282e92a6f14da1284cfb3b5519e77ff111fd SHA512 4c1d1da4cd11fc9cf0566cfcf5f764c82abc96cf93736066db7947b0af7ad1368990fbca4a08779ae5a4162110bdedf0614a1276621c01ad664180e9487838b5
 MISC metadata.xml 565 BLAKE2B 3d487835599974795ba6007439bf1d08756ab1c5dbe191509832b302f3199e4ffc05be64df3e26b4d4a1c11d1292c48cbb59ffa6e412831d16d7415e076f1062 SHA512 289043206dbb512c97e4bb703b32549ac4a77f40e212548b80ea865052b80fed9d4562f9fc94638fda54da9bc3e0c19ba303c027e66e7b75c772aeec91aebe6f
diff --git a/media-libs/tiff/tiff-4.0.10-r1.ebuild b/media-libs/tiff/tiff-4.0.10-r1.ebuild
index b6af817e8800..3a79093c5f7f 100644
--- a/media-libs/tiff/tiff-4.0.10-r1.ebuild
+++ b/media-libs/tiff/tiff-4.0.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
 
 LICENSE="libtiff"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
 
 RDEPEND="
diff --git a/media-libs/tiff/tiff-4.0.10-r2.ebuild b/media-libs/tiff/tiff-4.0.10-r2.ebuild
index 2ad237dee89c..6aceef3241c3 100644
--- a/media-libs/tiff/tiff-4.0.10-r2.ebuild
+++ b/media-libs/tiff/tiff-4.0.10-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
 
 LICENSE="libtiff"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
 
 RDEPEND="
diff --git a/media-libs/tiff/tiff-4.0.10.ebuild b/media-libs/tiff/tiff-4.0.10.ebuild
index d416ce569405..afe7c58676b3 100644
--- a/media-libs/tiff/tiff-4.0.10.ebuild
+++ b/media-libs/tiff/tiff-4.0.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
 
 LICENSE="libtiff"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
 
 RDEPEND="
diff --git a/media-libs/tremor/Manifest b/media-libs/tremor/Manifest
index 53d97dc613f0..e07a4113b05d 100644
--- a/media-libs/tremor/Manifest
+++ b/media-libs/tremor/Manifest
@@ -1,3 +1,3 @@
 DIST tremor-0_pre20130223.tar.xz 110096 BLAKE2B aec25548c971d2021a3b5f81469d3bf74434f2bcf215601e79a2663fd044085519fde449736f0513c949de5a79e297cac65a7abd50f5fcd8b940f655b966b164 SHA512 3fc109dfc6f9f33da9d2da7d5c1708d6fe4b22179048c4acd5b4b037eafbdda392d5ba74ffec5d8a225d56ebd860f67d28e4460f0b54cb170152a0b9fd89c514
-EBUILD tremor-0_pre20130223-r1.ebuild 1004 BLAKE2B aa986fac6249ae8784be69a62bca84970a4bfc26fba8d326e30c4f1daf4ec2702052a6d839819ed8d04caa31e5eb8ad54d93794055ae61083f2d88f2c81d8f8f SHA512 1692c2e92b1aa1e35b9776c8ed10b7f7346fedeae9f750790ff6600a89021b15cbb7ba183ea9431aa4e0e6be989384ee604e18fe22ff40cf24b63cfca75bebf5
+EBUILD tremor-0_pre20130223-r1.ebuild 992 BLAKE2B e517405d814f170c81a5a24fcac72517b3aae713e04f95a690d1e94c6a47ba74822c78aaf68179f989f9b0905b24deb498e91151939bb266dc47ae49d3f1f19d SHA512 bbc060db05c0277075fe60335e38aaacf7eaaf2852d0cb87850860128516d6573e70db510daaff824c7d5fc7f85fced649fe43068933ba3b935321c58f7feca4
 MISC metadata.xml 341 BLAKE2B f36ce19410676996a1ea63ed668fc17bb9d6bd795f4cc83d3fe4a01c4fc71bb43ec4982474f549a87b7d38ddd08a8d24c049a9243c1adeee5da8dc59f1fb265b SHA512 d386b0e5f226a6459d41ef8ac18fb129ecff461db36e5b26faeabc52b8814535d669ba1cf816e921eabc8786c6d073ed1ce8c9dde57c91bc186f282706b0c7c0
diff --git a/media-libs/tremor/tremor-0_pre20130223-r1.ebuild b/media-libs/tremor/tremor-0_pre20130223-r1.ebuild
index 24edfaf465b4..60ba8b2fd7cc 100644
--- a/media-libs/tremor/tremor-0_pre20130223-r1.ebuild
+++ b/media-libs/tremor/tremor-0_pre20130223-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="low-accuracy static-libs"
 
 RDEPEND=">=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/urt/Manifest b/media-libs/urt/Manifest
index 9f6b3d6ab15b..e4966f6ed3ae 100644
--- a/media-libs/urt/Manifest
+++ b/media-libs/urt/Manifest
@@ -9,6 +9,6 @@ AUX urt-3.1b-rle-fixes.patch 5108 BLAKE2B 0aca69e90f54386a654d1a20958239c988b48d
 AUX urt-3.1b-solaris.patch 281 BLAKE2B 55cc8b4824624c5b9f6db6ff6e62c841950c222981de896c8c6e9d66a8dbb1cbe5b90e54e3f24b07bea23c508c260e0639720b4103ada81fea3277e06ca63939 SHA512 6403f48e858af2f8a177588e231367c09f8c939fc614198a10e45ca83ec000f9d5baf67681c5a65fe75177d59d34ab10c19c3621ac0eda6382793ed3b6bd8d84
 AUX urt-3.1b-tempfile.patch 597 BLAKE2B 9f032e0b4dab232d4540a5e7043ff73ace2e6fcdc69e0b2ba1ecedc7f2b62902e0dfadaa78a2e1cddf6f0c173767afe36ee20af0a586072472c77d8f7d81212a SHA512 83784725f216d387771698b0f29c6d5b2bd5e79e5f6deb091905bbb87839824314217641df760cfb18ce87c9d58196860a4c9d12f08da6020fc80a2e7d40347f
 DIST urt-3.1b.tar.Z 1016405 BLAKE2B 68742773591e2ae28702efb4286939c4000d32edd93110548abc25ab62bfa85e36354f20de6aa74c805ea1c4c8dfa23219c9e6fb08e1c73d90d2625404583aa1 SHA512 6c9070cd106f1d696d22f862cc1c4e10325fafc7bae51e8bb1fb98f6bf8babe21a133e21b3acc0c11cf1b28a23123c8ee7bb064c9d86301b14a1c217fbe1a12d
-EBUILD urt-3.1b-r1.ebuild 2048 BLAKE2B ebc3ba7771fc3d28fa320bb582a0633967b0f66ddd338894fa2b8cf47094e8b1b445bcb761bd0fff7620c280f45b821f9915a5dabbde8bd9636c542a0a0de3be SHA512 aac4efadbcc839df66b3538fb43c0dd0659bc8f8b3c362a358763a2a911c538993fb7ab7f05eeaf96e2d325df0b977a2271202cb9aa798dfee70924538e05e2a
-EBUILD urt-3.1b-r3.ebuild 2381 BLAKE2B 66b8a88be20f1e3e9d3503b752389c4492d4d27dd8574c9538a611d25c3ea6961f1dd2e3abc0b5a8c32a6f3b734dc9d0b5fac6628122531fc7d4fa4f8fca020d SHA512 004deb4647104d3ea53ced1bae6443e6bb693a8c086363f8df2b3b002bfc037b904fdf52edf590a227697c81fad1505762b5b78b08213ff0b5238e9f7e762e67
+EBUILD urt-3.1b-r1.ebuild 2026 BLAKE2B 4654be00f160c960feef4d2c05ea658e66405695b582695239b0112d236b63dfb74e23f3c86f22333ba4b84fc934d8b6f953748905a56e7113d427b862f3e88c SHA512 eaaefb23b4c4e4fe3e0a12b6bf9843047706cf7b11c7593e661bec344721f151ceb4b492e57524ec1a05417aca8b82039824223b1eb12a58479fdbc158350121
+EBUILD urt-3.1b-r3.ebuild 2359 BLAKE2B e6d31798822f53c016b5fa018b3571ee189503628109324b50ac02cabb653190c64f8991566b7c71c3da886e7bc0a1980ef06372188b49ecdfec74eac27fbcff SHA512 25be21b8d9e1594e642f99ac8fab1af5b27a81332bd0b9c10d68799e0c340c95ba21ee2d6571741eaa7541080109df914508e34fe3c5c80962fc300987c5b2fc
 MISC metadata.xml 308 BLAKE2B 6006038e97bc7af97fd7e4c95f87d19d2458452da5ba066df88aff58fd10bf0f29daef641aaf39ec14a102f4e23a0b3be30006a6aed3830322e2f148a13dc5b7 SHA512 1056a163d7f6c3f2e540e6f1b315ea23aa4e9664c14ba51d094e33ab8ac4e3888fc9b049b91e3f2596e9458efe6041a7e2c5c40979171f7fd473fa6994862ffd
diff --git a/media-libs/urt/urt-3.1b-r1.ebuild b/media-libs/urt/urt-3.1b-r1.ebuild
index 710fd2e1797e..25014ef8eff5 100644
--- a/media-libs/urt/urt-3.1b-r1.ebuild
+++ b/media-libs/urt/urt-3.1b-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.iastate.edu/pub/utah-raster/${P}.tar.Z"
 
 LICENSE="URT gif? ( free-noncomm )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="gif postscript tiff X"
 
 RDEPEND="X? ( x11-libs/libXext )
diff --git a/media-libs/urt/urt-3.1b-r3.ebuild b/media-libs/urt/urt-3.1b-r3.ebuild
index c3e32304cf6a..e10b1db914a0 100644
--- a/media-libs/urt/urt-3.1b-r3.ebuild
+++ b/media-libs/urt/urt-3.1b-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.iastate.edu/pub/utah-raster/${P}.tar.Z"
 
 LICENSE="URT gif? ( free-noncomm )"
 SLOT="0/3.1b-r2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="gif postscript static-libs tiff tools X"
 
 RDEPEND="
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 38602dcc95c3..35cedbbd4e5e 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -2,5 +2,5 @@ AUX vigra-1.11.1-fix-incorrect-template-parameter-type.patch 7890 BLAKE2B 523eec
 AUX vigra-1.11.1-lib_suffix.patch 1032 BLAKE2B ce1b73b89c4d10c3b2ef3185a3c9a7ca791f58efe85eb205bb5f4e638ddc18d171bb7f4a9487670bb1a276c998f0e5096e2efa4fee0f167907d3d02df01bcb42 SHA512 c1cb242eb2ebdf398c81e16acc5a493312b310836caa7f25717dd20d23e885800beeef9ca0589c75ec3a0bd1ba2d879b1e999094cfef3956134e0d6d13f25d0f
 DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3
 EBUILD vigra-1.11.1-r2.ebuild 3617 BLAKE2B 0fd6ace945e05d9d155f7eaa6f2d0f8f73a64e5b72e2e0ab6467e8af983f9d02f524d4ed96d0f811989dcf92b3fa97f9bb42bbf64a434fa8beffc1abe50afbe3 SHA512 b7793841d2b02ef95207aea37370a654c570bae3be099eb8871f4194f4845bda6112de9c8a488191745bfee8b9913c4d1c42605ac535f1199d308cbc2f4266b5
-EBUILD vigra-9999.ebuild 3556 BLAKE2B 3284010b2ec1871f26d960b6805a6593742ffdba62d92dcc6dc36c89fc284a06fd2f7c7dc8dcad1dce308848a41b035bd663685440aa8e2cef8b3b1dca79c20f SHA512 97cce6937d77611f715dca8d719429f8cb94ba54e6e35ce7bc2dd09edf78e9f6064619bba78259b4992b1ba25bcd421fcc1aff4058cc094b97aa1cc1e0dc9997
+EBUILD vigra-9999.ebuild 3428 BLAKE2B 9fac09906787ac8702282205b4a1ebea4bb08787993e065d3333968c4754e0de41366109fbe431ecb4ab64c325ca3f25151c7f3bc88381c746ba6496f6bdc974 SHA512 cfca4d6d34b67b2aa860ddd2a8c1eb6e6451fd3b24bff341332e18ab20da2e1b2f537b962fa739985d74b8c8a8d10bbd701fd09f1f3432c77a9b83ba2b9bff46
 MISC metadata.xml 413 BLAKE2B 985f005fa338d566dddb20126e0a83cb8e9ec5aa4ac9ed2d5ec6a42743eeb92f521375b74f8caaa94500c42450d68d0a4bf5c036c9a2909e13c922f50896824a SHA512 e5c2a32f7495cfceffc8da8464131b918134b7255fbcde9a10175a24698f5a6aff17630436935c6cda7d8a3cd8b182c299845a24528f3a9c40dff1022dce4f71
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 6f78ecb71516..fb010ab449ce 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_P="${P}-src"
 MY_V="${PV//\./-}"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE="threads,xml"
 inherit cmake-utils python-r1
 
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${MY_V}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
@@ -91,9 +91,6 @@ src_prepare() {
 	vigra_disable png
 	vigra_disable tiff
 	vigra_disable zlib
-
-	# Don't use python_fix_shebang because we can't put this behind USE="python"
-	sed -i -e '/env/s:python:python2:' config/vigra-config.in || die
 }
 
 src_configure() {
diff --git a/media-libs/vo-aacenc/Manifest b/media-libs/vo-aacenc/Manifest
index b6cac37c21c7..7b28a92b2ca6 100644
--- a/media-libs/vo-aacenc/Manifest
+++ b/media-libs/vo-aacenc/Manifest
@@ -1,4 +1,4 @@
 DIST vo-aacenc-0.1.3.tar.gz 612463 BLAKE2B d75f497c9e0c8b0b962593787c1a13ce2bba095d1ac15c49b6b55235219b22f7c8116da12c2f1fb0bf1cb7e175d2f0ca212ae50333c0d9e0a4a5b77c71698b89 SHA512 c8f00dfa758270ba9cad35dd6e24905dc7cf33d7717454b7c2c56c40dbf54f682450aa010a410a0350d70119d2aaa2e5ba4471b5bbe05ccec1f9d20ab3e57853
-EBUILD vo-aacenc-0.1.3.ebuild 1083 BLAKE2B 73b3386bcd1c930c26143302517d9011fe866fab96e0103633009e89eb549ce1513c3dc65d11a99cd21a157ddff46b3c05e3bff7153b7b0c123cec9381990cd4 SHA512 592211b501e13081d909325d3c87383f61c12ad16ab8cf7f4d8d685178eeafe7442138cc09a3c3fea3be249bb91379812d0242e5d9f295cc087f7f7de4777b28
-EBUILD vo-aacenc-9999.ebuild 1093 BLAKE2B a07a4c5b73e9f8d504b3dfc0b213d462cadcce610c3e22c924fb92d08e3a8300ba34a01ffb99e5047f82513d52d145ff6b391d77d80590f0c0ed46e2ff1ed007 SHA512 896f02554a72f2c5d0a136f4dff5c95caf78ee02773590038a0cb8cb3790bfe4d60cfd3a8c216a8f9b824a0c031156a7b5b853982763baaf3fa349dbc0f891ab
+EBUILD vo-aacenc-0.1.3.ebuild 1061 BLAKE2B 0204492f7d00d28918ba66e8220329ab6c74959feeb0066c7ec1f16da2ca5d1a6b66b6fdf5dfea0e37cba8a05c712b66acc664e7fca395e856c43ae55b9475e0 SHA512 4e256432d21efa18197f7327cafb215ba1b5f1976763121143427518e8760cc89f0fb52aec7c579ac6f6f0ad8f6ef7a5cca060b5b487084e44a947bb25245390
+EBUILD vo-aacenc-9999.ebuild 1071 BLAKE2B f034673910f20d3638f4c2607491dfe913b099ac65bb856f40215ecf5131b22489f16b42c96b1804f353b592d875c9d6fbf4c7309d12394b6019fe5ad8ed6b5e SHA512 711fe84ab777dfb5ce1d098cdc14e31f518bcdea62bae96785be4a7723af60a5fbe96dd1d439f0c4ff0c9aea99a3852ad6207d3acb6a53a091fb6f271e1c7c57
 MISC metadata.xml 633 BLAKE2B 965a7d171a4ced000c73cee40fc2b2c752ff988668f8906bfaa2c7721d5b328290184fc8f0c1c24a21775a5b0cc066df9457e747159b4c3ec5907d6cce4b47fa SHA512 13dcd74fb4a9f1f003a8031cbf70620871bf2e3487cff75df3ec5b413e859d541f8a336b062d8cbed561e88dac51cc19a19329c3383fa7687e047236729871d4
diff --git a/media-libs/vo-aacenc/vo-aacenc-0.1.3.ebuild b/media-libs/vo-aacenc/vo-aacenc-0.1.3.ebuild
index 7511d4823b83..d01db2abc7f3 100644
--- a/media-libs/vo-aacenc/vo-aacenc-0.1.3.ebuild
+++ b/media-libs/vo-aacenc/vo-aacenc-0.1.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mstorsjo/${PN}.git"
 else
 	SRC_URI="mirror://sourceforge/opencore-amr/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="VisualOn AAC encoder library"
diff --git a/media-libs/vo-aacenc/vo-aacenc-9999.ebuild b/media-libs/vo-aacenc/vo-aacenc-9999.ebuild
index 022f13cf020f..55096b3dbc2f 100644
--- a/media-libs/vo-aacenc/vo-aacenc-9999.ebuild
+++ b/media-libs/vo-aacenc/vo-aacenc-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mstorsjo/${PN}.git"
 else
 	SRC_URI="mirror://sourceforge/opencore-amr/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="VisualOn AAC encoder library"
diff --git a/media-libs/vo-amrwbenc/Manifest b/media-libs/vo-amrwbenc/Manifest
index b792823c2cc8..21db718b50ca 100644
--- a/media-libs/vo-amrwbenc/Manifest
+++ b/media-libs/vo-amrwbenc/Manifest
@@ -1,4 +1,4 @@
 DIST vo-amrwbenc-0.1.3.tar.gz 608936 BLAKE2B 7283ef12c40e25d768d9d0be6cede6a514fc881cd67185700c0afe4e03c97c660d74f28fccbad436b4067ec07be574c10b73f00a162195697714ffe0c127b168 SHA512 5f132f798f00ec2c0619700ab1ce456897792b45631af4b538c866636af9c9de5600af5f79040c41c3dc69c17cf4be7032139a9518a46a4276431e091f3dd6a9
-EBUILD vo-amrwbenc-0.1.3.ebuild 894 BLAKE2B 38ebb6f83f28c2948d2834a433f94c710c43823a0f1e74028c150fb0122d162ba7fcb0434c440da57ea07ca151f74db62023db045af7e84777856738f40ba3bc SHA512 0c58a5944c291cf572ffeecfc2d784451582b94b621753778ff13096b29bfba2ed367e21dd70687d81ad3d57b4e7a239a72112b842e6649af7f57d07d565aac1
-EBUILD vo-amrwbenc-9999.ebuild 904 BLAKE2B 1acaa6608bb7f467ef75d3153c1373d768db1e485fd1277bb7aeb56f231ea73663eefdedb7063146295765b98d2896760817f0c537909ae8ce9fad842f94a6a1 SHA512 8925e0f3e7e919e4479dbb63b980dc32dd264d06391a75fd982bf33225789cf182cb0e24b2e374bc0882fec9a64c2691d1cb2d77f2dd9386fc4367e164096d42
+EBUILD vo-amrwbenc-0.1.3.ebuild 872 BLAKE2B 263b1984dc0687b40e270701b907df66bfd90ed565ea3d6f893f1da76d91473575d719d2a80008b154eb4f8018a7fed28a14f43a68ec3bb80b3a840ae627e4a5 SHA512 fa0f3e4c35c6a84f1164155686014575837a1925fff3e8b5dc5e8e4453925e379ae92b66feeae3b2049ca4b7ee5aab768096f25c2dbe71f04b521fc6cff9da84
+EBUILD vo-amrwbenc-9999.ebuild 882 BLAKE2B 3a780e442e889b3d613488a1b6ecd568d94d31fddc594fab3e6c6da4343c7d3375fa62c866774f9c1581d554f9fa95be29f30db5466d1972d1872ae337d52572 SHA512 33b53fa43a749f029547c309f46d96c5db2afdcd219ca2d13cbc17430c2f517ca8311cba43a59f5ab8d43caf62317d4baea59b930f4ef70fd26753bda0c595c9
 MISC metadata.xml 648 BLAKE2B e51d5f1ea7ae926d6e085eeebf7cf066dff76eba5e8ff611382093b25055f119f903eb7c8a91c28d04ecdb389a571072d8cfe6e2a456c243ec896c7bec877136 SHA512 db2c18bbf40481d5a3b2582ab07e0ace0538f629fabeff219f77a875a27ca6387884e5c3c8fc49916a11e53224b85f7fed28f4b8ec7921a0db15ee7cbd5ce951
diff --git a/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild b/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild
index 12491d041120..787a6c655393 100644
--- a/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild
+++ b/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mstorsjo/vo-amrwbenc.git"
 else
 	SRC_URI="mirror://sourceforge/opencore-amr/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="VisualOn AMR-WB encoder library"
diff --git a/media-libs/vo-amrwbenc/vo-amrwbenc-9999.ebuild b/media-libs/vo-amrwbenc/vo-amrwbenc-9999.ebuild
index 0e3e35eee5ff..df26e3f268ee 100644
--- a/media-libs/vo-amrwbenc/vo-amrwbenc-9999.ebuild
+++ b/media-libs/vo-amrwbenc/vo-amrwbenc-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mstorsjo/vo-amrwbenc.git"
 else
 	SRC_URI="mirror://sourceforge/opencore-amr/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="VisualOn AMR-WB encoder library"
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index 2c9f6c4dcc5e..445efa9bd829 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,6 +1,4 @@
-DIST waffle-1.5.2.tar.xz 179284 BLAKE2B 40befb3e4463605e303b404677268d4758f6a43f5d83bee5e74222e2e2bf949f51444c0df68291ef0edc76be313363eca3e59e642b0356451c10703e66d96e56 SHA512 04f90f70421c88418d1d98175b552de9e036ea36b6c870a6c968c7fcc2d4cb2fa4ce08b0adcdd50f4853a7503558eae7a05ef75b292cf85d3c9796e7b342ca62
 DIST waffle-1.6.0.tar.xz 224400 BLAKE2B 458add99b346bd75dc757243b9e7db6ac269fb2c1e488333d921c640e10efd182e51e8a5e0312d334593033936adf047fc2339d21e675654d89d66edfb8922b3 SHA512 c8796ab8adf968df2c5c88e2941c83955fe41e87eb2b75b6a5cc61b0d0c06eaa44df2f255f573a51816036dc8bc3ec63f3fb51ccfb7efbfe83cdd50b3f1be13f
-EBUILD waffle-1.5.2.ebuild 1414 BLAKE2B a88cd403d6173d0af963f2534d9df66a1b4ff184de9fcc98f88981eaea50bb338e58c12f165d5c320eb2071e6716d1dee3b6155c6367b13586e42b6cd8b9e1f2 SHA512 d0fca799279802a5deb3e8f32e85d3d63058f96ac78c8839c91f8bd2644f0fd35ea7bba647d24a57c6723f1f36340a63c5be6de264db71b8231a3ed692f85feb
-EBUILD waffle-1.6.0.ebuild 1642 BLAKE2B 7262ae28599b42db5f96adb1687e8db28fee31045c5066cc12d8807aaa1884f7c553bfb8ba45863f06556ef663e9d12334f496e9d1cc8ad6553970a46436fbdd SHA512 ca8b3cd470a01234ba8cd85140245155933df0679438cb65c13f86a5c34199793063c1be440a482fed9a4f2b0d164249d778615eba54be766533e75bf322ac2b
-EBUILD waffle-9999.ebuild 1645 BLAKE2B 3d6c0a12d5484a9b4336d56a153a811804bdebd6aca67068b42a4824c21da01f5d1796d2ba704ed23833aa1a465bdade7208a21dadc902d60158bf81373f49b3 SHA512 15b9a381dc3b869bbdce9165ecf62582b37159a78f5b082c1b9d1eb6018b8fc2c0bbc83f7986296f5a027fab4b8dbac4405d166d372a6124d69c282f6b05ceda
+EBUILD waffle-1.6.0.ebuild 1644 BLAKE2B df24a6ba36c9cde52116a594f6eda58dde0b04dd7e631ce9b289047fe1ec0e8ee5e25be3386006b8fc6add1bc46fa7eaf0d9d84fab7dee2ed774cf89e0b86b6d SHA512 b85123a6a8cc4fdeb19ccc96b783c4f4828b4f51ccc02177f06db67b1489168c5d2bf19f1dd7816e82ac917a2e3a8dae0a6565a491dd177b43ccb6adce16ff28
+EBUILD waffle-9999.ebuild 1647 BLAKE2B bd565769059852f4a15c9f3362177c6307d8231a45abac074bfbbd2a2909c4a24db5935691303bfe32edd2d556391ebcae913ad19fe29fbb184067a54a1868ae SHA512 45fc09985650274ab570a65c5a221760435ce1007ad911fced36f3cd13aba650c7c9fef2525606e57ce275af9aeb0744a0a349fcde77c536e1c34f419e197a64
 MISC metadata.xml 416 BLAKE2B 961afc9a4ed531bd3816c8e7b1c37a9f6be25b912d94b6f79811da67cecd8476964934b9ff943fc98be6177feee1c2eacd3295777a1d873ec1cf3cd58cf20e82 SHA512 850db93f3892afdb36d471b55e911c9cdfc114bcd69b4ce9e59246eb688b145ab5916d9529ded4b913f0cfb6da5fd2d64b7854c9501abec9fd9d860e1953100d
diff --git a/media-libs/waffle/waffle-1.5.2.ebuild b/media-libs/waffle/waffle-1.5.2.ebuild
deleted file mode 100644
index 2be51a342803..000000000000
--- a/media-libs/waffle/waffle-1.5.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/waffle-gl/${PN}.git"
-	GIT_ECLASS="git-r3"
-else
-	SRC_URI="https://people.freedesktop.org/~chadversary/${PN}/files/release/${P}/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
-fi
-inherit cmake-multilib ${GIT_ECLASS}
-
-DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
-HOMEPAGE="https://people.freedesktop.org/~chadversary/waffle/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="doc egl gbm test wayland"
-
-RDEPEND="
-	>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xml-dtd:4.2
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-Dwaffle_has_glx=ON
-		-Dwaffle_build_examples=OFF
-		-Dwaffle_build_manpages=$(usex doc )
-		-Dwaffle_has_x11_egl=$(usex egl)
-		-Dwaffle_has_gbm=$(usex gbm)
-		-Dwaffle_build_tests=$(usex test)
-		-Dwaffle_has_wayland=$(usex wayland)
-	)
-
-	cmake-multilib_src_configure
-}
-
-src_test() {
-	emake -C "${CMAKE_BUILD_DIR}" check
-}
diff --git a/media-libs/waffle/waffle-1.6.0.ebuild b/media-libs/waffle/waffle-1.6.0.ebuild
index ccfc41d0c8ca..c1eb3cfd333e 100644
--- a/media-libs/waffle/waffle-1.6.0.ebuild
+++ b/media-libs/waffle/waffle-1.6.0.ebuild
@@ -65,5 +65,5 @@ multilib_src_test() {
 multilib_src_install() {
 	meson_src_install
 
-	rm -rf ${D}/usr/share/doc/waffle1
+	rm -rf "${D}"/usr/share/doc/waffle1
 }
diff --git a/media-libs/waffle/waffle-9999.ebuild b/media-libs/waffle/waffle-9999.ebuild
index a7c32a6cf596..56a48b843787 100644
--- a/media-libs/waffle/waffle-9999.ebuild
+++ b/media-libs/waffle/waffle-9999.ebuild
@@ -65,5 +65,5 @@ multilib_src_test() {
 multilib_src_install() {
 	meson_src_install
 
-	rm -rf ${D}/usr/share/doc/waffle1
+	rm -rf "${D}"/usr/share/doc/waffle1
 }
diff --git a/media-libs/woff2/Manifest b/media-libs/woff2/Manifest
index d0492a6f4797..80be00b926e5 100644
--- a/media-libs/woff2/Manifest
+++ b/media-libs/woff2/Manifest
@@ -1,3 +1,3 @@
 DIST woff2-1.0.2.tar.gz 38934 BLAKE2B b4a762cb2377b896147d9ebdae97f17e80bdb94fa8ec1b04e28e9df48c2f3456f83fc548b10a49bbc271bead349348f7582a85c5011f60a9feb4dda84920b6f3 SHA512 c788bba1530aec463e755e901f9342f4b599e3a07f54645fef1dc388ab5d5c30625535e5dd38e9e792e04a640574baa50eeefb6b7338ab403755f4a4e0c3044d
-EBUILD woff2-1.0.2-r1.ebuild 711 BLAKE2B 050f033d0929925b16c340a506ab5a167b584401e26673fc46614bede2d16a2447b00adafcffec0356e9f88acdaa1de0444594d7feaa84ab6e11bf3f29757c9b SHA512 1f5c30de4a405d2c648330dcea7e3126f19bd5ea28f0285bca823d72fc93a76eed73bf83aea54574fb2dde36b920ae5da63d4a78d247f845bc8b37deab5fd589
+EBUILD woff2-1.0.2-r1.ebuild 699 BLAKE2B 549698dd68c60f0963b7257f458f877ee4c3697518ceb4a23594284d004cc4060c874bc07bc364341832b6f782173acd7e2695562d5ed464bc66a49960087d5b SHA512 bc806aeb737d212b0942e503294e816b2663b729474d50eea6c0dbd249db8b83d319f1e25c62fba4569a08fb41205793c05c37bae8757e4781b63babbb6a3321
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-libs/woff2/woff2-1.0.2-r1.ebuild b/media-libs/woff2/woff2-1.0.2-r1.ebuild
index 7b44c261487b..5be3db079769 100644
--- a/media-libs/woff2/woff2-1.0.2-r1.ebuild
+++ b/media-libs/woff2/woff2-1.0.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="app-arch/brotli"
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 2d8329a310d9..64a1d52f1c4b 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,6 +1,6 @@
 DIST x264-snapshot-20190214-2245.tar.bz2 770462 BLAKE2B d90a3bafb88febe12526b225617616a62c32fa3d3eacf410267e1fbd7e0fafaadca7c146172c08fc525bce8791d81c7d87dc27b06d61a6a44bf2ad92f6c1def6 SHA512 c8b1b46d4e6c0ef653dab35083a454c635ebf72c6a5255ce30bbb5d9d6bb8e23fca0e6cc197ea99f3c702fbfec096587df6fa82dec338d8bd45e35fa89c43039
 DIST x264-snapshot-20190903-2245.tar.bz2 774515 BLAKE2B 0b19fc1d3cedea32bfac9c5247bce7b3c04dead35458d61f3b5c0694040dc852b0110b620faf4118ed265a5605aafce3c49d468d38fb91e4c515b2860c486920 SHA512 c357c9025ffdf653c974eb7ccc2e9a4de86c02881372a6a8270ae59ce948c284da48a2aba37763bd29359d2a6dfc76ea56a52fed6082f8483912c8f948488a2d
-EBUILD x264-0.0.20190214.ebuild 1815 BLAKE2B ef9a8e82e7859922afc7f496a7a70b5ebdd01442bd11b5990b14b6a5384faf87123529398ed8bdc21f1685eed839aeb5cbd4ad9614c6073d0dd0e0f04651d9b1 SHA512 9d1e2c6ae46dd73d71929e1d46eea7f8e63517653b17aa3d88b884cd59a1b3fb1646560363e52c517eaf33afc11ca9f6b36d094162259faea8b2aee94bbf8f58
-EBUILD x264-0.0.20190903.ebuild 1824 BLAKE2B dc38712d74f047f47b84e99ad9f2c78c5d452fbc7dd8e503d0f74136559fe5e5b3e858a7edb1dc7210e46935d1af02fd0966b984cd2dcfc8ad20c8c1d6cc5286 SHA512 8b4d908028140b4b592e556a338abbe92143b80381008e34b9a2e822e009537c22a2544d36b9ab5cf1bcbc5d33ad329cf6353c099201cd3365bde9258f6a4cd4
-EBUILD x264-9999.ebuild 1824 BLAKE2B dc38712d74f047f47b84e99ad9f2c78c5d452fbc7dd8e503d0f74136559fe5e5b3e858a7edb1dc7210e46935d1af02fd0966b984cd2dcfc8ad20c8c1d6cc5286 SHA512 8b4d908028140b4b592e556a338abbe92143b80381008e34b9a2e822e009537c22a2544d36b9ab5cf1bcbc5d33ad329cf6353c099201cd3365bde9258f6a4cd4
+EBUILD x264-0.0.20190214.ebuild 1793 BLAKE2B 2a4fb700986dcf17215eca221d61390dba0b66cd60c3ec5a059d8770bcca98515fa8eec147032787f2e2ae175ec7ff3954d1c352cecd04d8dbf64e23f835a659 SHA512 97f3301b4d30b68fbdd7e6d53dfa6565e130767fe71d0461c07c3b04a3a841456402def3646f6ec9e2026ff4935bb8928beb8b3bca4d147172379921b8a9d1f3
+EBUILD x264-0.0.20190903.ebuild 1802 BLAKE2B 153c3d6f00bcb4f56d5993daaa030b8203bef2cdf3b93aed258d8a86a80609b7aefdfbd732e2b1eab432a259d312c2862a99f4f5845230002274761b9f82c5fc SHA512 134d54a9cef4ab21f3a73b3063a8110680048499867051b9a24a981d1919ff261f0459d9be61c4a333ffd2971f0436919802f12b23c239841075567d6da21e2a
+EBUILD x264-9999.ebuild 1802 BLAKE2B a490e72a524f8d3197c7c6a883ed3b0558c72af8eec39d6462003edc9da92d8320480da10d3239e1d181c3d0c58e8d998f255ae86befc1308ec96a678eea24d3 SHA512 e79cbb081cb364f34ff1dfc932dc9a601cc73b6eac7a2497a7216458e638a1e5dc5f3c0be8d30a48b562a266829326e83ced19a07faa4b1b544a647877f26843
 MISC metadata.xml 488 BLAKE2B 3e6982e1bbd45194bb664ddb4b34e307ef4030f4fba9905d0a292c8a5ce73e27bc1c687758cc4fb18d38cc2c93ed21b64dfa35b2aaa63dc6fbd1110b9e1daf1f SHA512 2dc9d360de31770d2e8eebc3bab9662a00ad328ba41380052c3e7502a4da85c7b0ce29cf229670d917c93d7b508282dd9f1694a718da65f1110c785a2bc68394
diff --git a/media-libs/x264/x264-0.0.20190214.ebuild b/media-libs/x264/x264-0.0.20190214.ebuild
index 25efcae6f52c..53eb3fb20528 100644
--- a/media-libs/x264/x264-0.0.20190214.ebuild
+++ b/media-libs/x264/x264-0.0.20190214.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="x264-snapshot-$(ver_cut 3)-2245"
 	SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/media-libs/x264/x264-0.0.20190903.ebuild b/media-libs/x264/x264-0.0.20190903.ebuild
index ee5e6ace2cd2..bb3c2d15e52e 100644
--- a/media-libs/x264/x264-0.0.20190903.ebuild
+++ b/media-libs/x264/x264-0.0.20190903.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="x264-snapshot-$(ver_cut 3)-2245"
 	SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild
index ee5e6ace2cd2..4cdfe6a9bba3 100644
--- a/media-libs/x264/x264-9999.ebuild
+++ b/media-libs/x264/x264-9999.ebuild
@@ -13,11 +13,11 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="x264-snapshot-$(ver_cut 3)-2245"
 	SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	S="${WORKDIR}/${MY_P}"
 fi
 
-SLOT="0/157" # SONAME
+SLOT="0/158" # SONAME
 
 LICENSE="GPL-2"
 IUSE="altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 3e512c821843..ab4f68bf8a0f 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -8,10 +8,12 @@ DIST x265_2.9.tar.gz 1385848 BLAKE2B ff14eba55cea0646ad0ffc12f9032c9033d23c9d805
 DIST x265_3.0.tar.gz 1398519 BLAKE2B e3ac28b01e89ce8a428f294c759644a8177e1b79941aba5e1b53033c236e3445f9afeea96f8adf7e5cdcfff8c790ca9fcadcc8b2de6c31ba3fe9ba87321a8ca8 SHA512 bb7665194ddd4bccbb91c16337463ad4ef32111a1e7779e4cc16964df0992aa99e578cb74fef0edbf41119105e4085574247f60541b0558cc36730ea12d2c6ba
 DIST x265_3.1.2.tar.gz 1419864 BLAKE2B 1eeb210e58d6977f9a048b84e924d690868aa350b6e736f577b5c1a62b9c5b71cfb2b03f004f26839ea44b9db871313bc9888af95999a576dcc167e79d297c61 SHA512 00fc2d8460657c0d2edcc54fd8c4521785c632f8811b74d0cd0a3efa0f06f1fb8cdd6233ad4917c1f40b3c1f1660a6c97ad947e656b7c3e9a51f8ae84afef65a
 DIST x265_3.1.tar.gz 1419649 BLAKE2B b9151f136fdc6c0512f481af6c8d4d575ce4c75ef8891b42ca24ddfd1f4802bfe8cd47bb07dfc1834243560a8d36ddd5ca4d79d7b9f140fbd411b5b80ea6b8d4 SHA512 81905b6286a61fada7cb1632d7f8461295a28e8d53ccd53d3c26c60c7d8091df47a1b694de28caa721f632d66940f5ceeb44d3405dc3b079edd17d21c30e7a7d
+DIST x265_3.2.tar.gz 1425689 BLAKE2B 58da4aa52381ec89b0aea1dc896fef92d9ec9fc781fd279acd0a338cd872f52482c81c558dde749c1205dbc13341a9851c381d01e2f312f5e2b4712d2242b7d3 SHA512 08c779026fe4c03797efef9d6a898b16c308355311e167c81b976345eb78039725a31294c77a60b76b4ef648d8720e16b2d6524e7108755531a5375231f5313e
 EBUILD x265-2.8.ebuild 5680 BLAKE2B 0ee62251a5dc184a5cda01be4d0c779e5101b3f90f1d9a5921c5ba300798fac1acb298e7066d715d6923ce4505292ebafdf005b04745b1e3f615f0d8319fd3a3 SHA512 9e75cf8f636fa69550739f0fa56cb94b564a257d97f776df22e9c90a79adbf3ebcf86a0a62e3cec9e672caeb6798e1ffa639d15edd293b7f2e068fdfb3ac8d98
 EBUILD x265-2.9.ebuild 5699 BLAKE2B 7ee30b5f06d51afdebf6ee278eb0e7ca8908fc703e2fcdb80c0b7095d9ae9edd83393e61c699343a53bc0d0786f1e558431e826a281d8ebd943ae5825e6bfb20 SHA512 cf9da7ce4f15df6afd31915869f426bde0306a381d8a7f1fb05987ccf2a618123d361c553d24d28681382022223e8775342cb575e387df87c28a327c5237f0d6
 EBUILD x265-3.0.ebuild 5657 BLAKE2B eb173bf8779ed016deb3f86abdcf9c9aaa1b82e36676f82f730928f66dc0861ad6e2ada815b9269643ce8f3384429271ebe08bac82720b1cb06304de891c4fa6 SHA512 939fb4ec038b6ce4c226a0ca3e58650a9891d9b1a06f15b5276c649773454d1265c115816b3a98ab894a17363b107407e8fda71004e3f4f408e7a69062292c61
 EBUILD x265-3.1.2.ebuild 5658 BLAKE2B e5e0a591c1e9898bf5b63856b06b6d8798f48e9a8dda35d2d5c9765282496f423488277f6a7cb7daac0836a5ef89e5beb284dc3c793d76be9722bd6538207d34 SHA512 29ccdbc5900a9aede013a39c81f7c7f3a7ddcf7aa8ae619df08e69a112b4df93ae7682eeb39344751bc3504afe4f9a1a9c5934b689e3e736001cb8249d0d8bf8
 EBUILD x265-3.1.ebuild 5658 BLAKE2B e5e0a591c1e9898bf5b63856b06b6d8798f48e9a8dda35d2d5c9765282496f423488277f6a7cb7daac0836a5ef89e5beb284dc3c793d76be9722bd6538207d34 SHA512 29ccdbc5900a9aede013a39c81f7c7f3a7ddcf7aa8ae619df08e69a112b4df93ae7682eeb39344751bc3504afe4f9a1a9c5934b689e3e736001cb8249d0d8bf8
-EBUILD x265-9999.ebuild 5658 BLAKE2B e5e0a591c1e9898bf5b63856b06b6d8798f48e9a8dda35d2d5c9765282496f423488277f6a7cb7daac0836a5ef89e5beb284dc3c793d76be9722bd6538207d34 SHA512 29ccdbc5900a9aede013a39c81f7c7f3a7ddcf7aa8ae619df08e69a112b4df93ae7682eeb39344751bc3504afe4f9a1a9c5934b689e3e736001cb8249d0d8bf8
+EBUILD x265-3.2.ebuild 5658 BLAKE2B e18838812d2720a043e4135c4f44e00de1bac79b3dfe054013abef71faf0d3f4a8efafd8bcfb4e1422f33e96f1fd07c6c7a1e436e358d130d49edfa5efdcd752 SHA512 d1d8b7d5a12836127e5dd20162dfc3f670699c3908910f279eb2b04d329b6f423e5e4e2165ff6c9e322db372d2d9facb57cfdb4a0c86a78ba92d788a19607f38
+EBUILD x265-9999.ebuild 5658 BLAKE2B 1bb3d807485e16850eef4d58ad30a03d8ad0906f3e46c44b4ec7bad6e8bad16571a3dcf72924700982c504036e61698e84260a20176a2f5100184dfaad639e82 SHA512 d13f42256341a57e6a88301904df3d3bced65014f017d092a30689df2c24d200125d1c3d46e031c71dba29ee10ecf9daf84442d70335073d5a44f1b09dc98556
 MISC metadata.xml 703 BLAKE2B c71ecd74be6e4fcdf70dcdc197e6830875f6cae0b1ee4e96b0edc4b16db4e512b2b8e8962fa75c7f4f380d74ff713158fd6124d4a22229b3c213c197124a59c6 SHA512 b9f2ac6ed88fce31fa7459321cc7cc2114caee48066b0ae1773a8711f2d652370d154a6167d8c8eb0dc47f55ca211812b99d11c4a1941a3a2553c62a6f21abf6
diff --git a/media-libs/x265/x265-3.2.ebuild b/media-libs/x265/x265-3.2.ebuild
new file mode 100644
index 000000000000..a020423d9d59
--- /dev/null
+++ b/media-libs/x265/x265-3.2.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
+
+if [[ ${PV} = 9999* ]]; then
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
+else
+	SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
+HOMEPAGE="http://x265.org/"
+
+LICENSE="GPL-2"
+# subslot = libx265 soname
+SLOT="0/179"
+IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+
+ASM_DEPEND=">=dev-lang/yasm-1.2.0"
+RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	abi_x86_32? ( ${ASM_DEPEND} )
+	abi_x86_64? ( ${ASM_DEPEND} )"
+
+PATCHES=(
+	"${FILESDIR}/arm.patch"
+	"${FILESDIR}/neon.patch"
+	"${FILESDIR}/ppc64.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} = 9999* ]]; then
+		mercurial_src_unpack
+		# Can't set it at global scope due to mercurial.eclass limitations...
+		export S=${WORKDIR}/${P}/source
+	else
+		unpack ${A}
+		export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
+	fi
+}
+
+# By default, the library and the encoder is configured for only one output bit
+# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
+# files with a different bit depth, which is annoying. However, upstream
+# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
+# that together so that the resulting library can produce all three of them
+# instead of only one.
+# The API requires the bit depth parameter, so that libx265 can then chose which
+# variant of the encoder to use.
+# To achieve this, we have to build one (static) library for each non-main
+# variant, and link it into the main library.
+# Upstream documents using the 8bit variant as main library, hence we do not
+# allow disabling it: "main" *MUST* come last in the following list.
+
+x265_get_variants() {
+	local variants=""
+	use 12bit && variants+="main12 "
+	use 10bit && variants+="main10 "
+	variants+="main"
+	echo "${variants}"
+}
+
+x265_variant_src_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+
+	local mycmakeargs=( "${myabicmakeargs[@]}" )
+	case "${MULTIBUILD_VARIANT}" in
+		"main12")
+			mycmakeargs+=(
+				-DHIGH_BIT_DEPTH=ON
+				-DEXPORT_C_API=OFF
+				-DENABLE_SHARED=OFF
+				-DENABLE_CLI=OFF
+				-DMAIN12=ON
+			)
+			if [[ ${ABI} = x86 ]] ; then
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = arm ]] ; then
+				# 589674
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = ppc64 ]] ; then
+				# https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
+			fi
+			;;
+		"main10")
+			mycmakeargs+=(
+				-DHIGH_BIT_DEPTH=ON
+				-DEXPORT_C_API=OFF
+				-DENABLE_SHARED=OFF
+				-DENABLE_CLI=OFF
+			)
+			if [[ ${ABI} = x86 ]] ; then
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = arm ]] ; then
+				# 589674
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = ppc64 ]] ; then
+				# https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
+			fi
+			;;
+		"main")
+			if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
+				local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
+				unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
+				local liblist=""
+				for v in "${myvariants[@]}" ; do
+					ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" ||	die
+					liblist+="libx265_${v}.a;"
+				done
+				mycmakeargs+=(
+					-DEXTRA_LIB="${liblist}"
+					-DEXTRA_LINK_FLAGS=-L.
+					-DLINKED_10BIT=$(usex 10bit)
+					-DLINKED_12BIT=$(usex 12bit)
+				)
+			fi
+			;;
+		*)
+			die "Unknown variant: ${MULTIBUILD_VARIANT}";;
+	esac
+	cmake-utils_src_configure
+	popd >/dev/null || die
+}
+
+multilib_src_configure() {
+	append-cflags -fPIC
+	append-cxxflags -fPIC
+	local myabicmakeargs=(
+		$(cmake-utils_use_enable test TESTS)
+		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
+		-DENABLE_LIBNUMA=$(usex numa ON OFF)
+		-DCPU_POWER8=$(usex power8 ON OFF)
+		-DENABLE_ALTIVEC=$(usex power8 ON OFF)
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+	)
+
+	if [[ ${ABI} = x86 ]] ; then
+		# Bug #528202
+		if use pic ; then
+			ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
+			myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+		fi
+	elif [[ ${ABI} = x32 ]] ; then
+		# bug #510890
+		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+	elif [[ ${ABI} = arm ]] ; then
+		myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) )
+		use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
+	fi
+
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant x265_variant_src_configure
+}
+
+multilib_src_compile() {
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant cmake-utils_src_compile
+}
+
+x265_variant_src_test() {
+	if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
+		"${BUILD_DIR}/test/TestBench" || die
+	else
+		einfo "Unit tests check only assembly."
+		einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
+		einfo "Skipping tests."
+	fi
+}
+
+multilib_src_test() {
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant x265_variant_src_test
+}
+
+multilib_src_install() {
+	# Install only "main" variant since the others are already linked into it.
+	local MULTIBUILD_VARIANTS=( "main" )
+	multibuild_foreach_variant cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+	dodoc -r "${S}/../doc/"*
+}
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 599c13412516..e946da2c3db5 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://x265.org/"
 
 LICENSE="GPL-2"
 # subslot = libx265 soname
-SLOT="0/176"
+SLOT="0/180"
 IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
 
 ASM_DEPEND=">=dev-lang/yasm-1.2.0"
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index dd89a7d2738e..5ce206b9c639 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,5 +1,5 @@
 AUX xine-lib-1.2.6-imagemagick7.patch 384 BLAKE2B 876c66e9e06b8f2437b1ec9945d4f1cf09efe1e57774280af501abf1a4214785dc875d6ca68515d48ebad37a90184b2db922034705df83592e1479741f15e726 SHA512 13badc72163f41a14fa85d84cbc835a396ab2bc195125025962257de4a41925e29c74159c3941472334f9eb10feee4278ea96288201689d5fcc48c494940ceb9
 DIST xine-lib-1.2.9.tar.xz 5180452 BLAKE2B 43d977d31bf2fcabd896c806e56d5cd12cf579951a4e0df5451df7323fb43cff2770fb2bf1b65b9041e761ec9e9e68d55f761e18522c787aa643f71bb73bd0b7 SHA512 bc672b32d6d72e6fa5641319e0bd15d721ea4b65e6d025e3cdbf6ba3655a7b2c714809d919a53fca8a908a7ce37541a341c13dd8a336799c2e942d5f86b84d3c
-EBUILD xine-lib-1.2.9-r2.ebuild 5351 BLAKE2B 0ec852662e113d0e05617babcec1019ce1db51c86847dfbb58bd7923dee33cc525c159eb7a7a469510ed33ec87d178c7753b355fdecb80ee5f55d0e84862cfc8 SHA512 ea39781f1d8c8375c87d1536fb0354a0f53fdccbe7c11a7c76673f34ac80feb98e1c304ecba9db8f9e8a35ea95f48e8dd2b860fd127db0a4bc600b9edf0d9058
-EBUILD xine-lib-1.2.9999.ebuild 5243 BLAKE2B 8888c9919af784852b6559444a68a9893bda5c12eca5b930f026231c686eb8aba342345e5848c40ae73f4a138bd1c43194290f07df15927f992da0f09fab022f SHA512 9501d294ecb056060f1cbc9b3367ab48ca56e30bd3448f13027ec51764a707a70db707852587a68a29896fffd302e00cc22c602436e90a049f3d3a161bedbf66
+EBUILD xine-lib-1.2.9-r2.ebuild 5329 BLAKE2B 1212e9a8eb7929bc6eb024cd69dbb61ae89e957f429c8bb21debed1f4bc4da5f57ee1add472e42153de78527871c6f5995cf29198aa8f6daeb78f53efa097cf7 SHA512 b6d886a2fa3bbf8c29b7ccbcb54352e6424db4b7ec20111bfce182bf7b7d8eebb3869ba546c2ffe8d65d9b8a22e0a8a6e92e7c5dfb6e74f5d279449f3af3900c
+EBUILD xine-lib-1.2.9999.ebuild 5221 BLAKE2B 863c8b316c062d8132e747697c6ddbd61fc7a880ae1bc1fed38f8467ef38151c45da91ab29bbcf353533a3f7cd17fec842d388a84ecd5be863c2fb107803f921 SHA512 f3d37b3c8332e538395f12db2a7c8b63e08460bf274ac0fe656a093cd62e7df85efd708aca08b326844ad9193029535bd57a547964e28a92942e4245f51b3a57
 MISC metadata.xml 2580 BLAKE2B 15f578e1434e0e507eee410a4e28cb87528998e6041569dbfbd65858829697e234987ec773dcb2328ea4dfd56b3992cf92ff1f185dd08d68605f2e10f950ba56 SHA512 85e34bb9a10120c27e144cfc56b9a4f5aa26f29593d0bc6382741549b75e0a8cb0192bdb3960b3482cecc49cd9d0ea3d65a5b30183b0fceb222ac635d1a236a8
diff --git a/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild b/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
index d0dac86ff295..b5af0deb05ee 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	NLS_DEPEND="sys-devel/gettext"
 	NLS_RDEPEND="virtual/libintl"
 else
-	KEYWORDS="amd64 arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="amd64 arm64 ~hppa ppc ppc64 x86"
 	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 	NLS_IUSE="nls"
 	NLS_DEPEND="nls? ( sys-devel/gettext )"
diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index 07cffc7a62f0..585781521f87 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	NLS_DEPEND="sys-devel/gettext"
 	NLS_RDEPEND="virtual/libintl"
 else
-	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 	NLS_IUSE="nls"
 	NLS_DEPEND="nls? ( sys-devel/gettext )"
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index 793244bee55f..9f99b5a7f6fb 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -1,3 +1,3 @@
 DIST xvidcore-1.3.5.tar.bz2 698846 BLAKE2B c65c90a2a51d993af65becd760364b495ca1714f888c640b577ee3cb509afc5dbe56d1f536aa710a5322106ca65bed4ad162ad97440e9c14deeabbcbe00984b5 SHA512 3297243400ce9ed2d0083559ee15fdfa422e585114c4e92c72fe702f43fea4af9fe4e9e794630959c220222379fa329452c4163a395f4ba1998c9be03a2e9441
-EBUILD xvid-1.3.5.ebuild 1701 BLAKE2B 3cb300ef1d86c673eb4740a0223e2863b0a9f8b9ee82b82fda445944ceccf2fb30010fe3df092179e6f0354e8b35841a539f36602d2192ad1d5ab216baf0632f SHA512 c3d7c16bcfd040bc557d57baed7ebb91c6597c351a11b6ba512ce4f4bd99e8c74818c1a702c5d1003bf4f06c5d092f24199ac29e37a9b9d384211649ce86f2dc
+EBUILD xvid-1.3.5.ebuild 1679 BLAKE2B 8826b33b760d67b78bd430d13e3ac5f5aa64039a11f99dbb9d64c8bef6af45b80e6e81155f0698bd611b74c08c0b028446114f7704a264877641f1a8f6b07409 SHA512 e62545c2d3ae03203e333a31218fba89d2bedbb3406350b122980326358eafe58f500592000554e95419aeb44c5544244809514699ef9c2aa24705cb24d0a652
 MISC metadata.xml 321 BLAKE2B cb6de1ddc565513350b010042d99dd2cb34c0cfa80d26d1324266b6621bea5fe50f4e9233348d0c5d9b9c214d48b9c94e8fc4b08f9c0b43c779b238a65559c03 SHA512 640a21ce70c9b74f86e27bca3153b920ad7ad8313f3f5d6032e41791ab99f7463718f99bfc7fd15613e682769be6fe322c15d3bc841f674bc0322afa130c8b98
diff --git a/media-libs/xvid/xvid-1.3.5.ebuild b/media-libs/xvid/xvid-1.3.5.ebuild
index 9128d5c7c578..96fead717c12 100644
--- a/media-libs/xvid/xvid-1.3.5.ebuild
+++ b/media-libs/xvid/xvid-1.3.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.xvid.org/downloads/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="elibc_FreeBSD examples pic +threads"
 
 NASM=">=dev-lang/nasm-2"
diff --git a/media-libs/zvbi/Manifest b/media-libs/zvbi/Manifest
index 2e480cb6a415..544f972ca890 100644
--- a/media-libs/zvbi/Manifest
+++ b/media-libs/zvbi/Manifest
@@ -1,4 +1,4 @@
 AUX tests-gcc7.patch 677 BLAKE2B 23258f8fd35fd650524b8b79a324206e73ae8921792898f3b57ad9f2412b79517e4bdd9925ebb997b5066dacdad3d9c480ac8cd54d65b7eba44219ecd2f91f9b SHA512 88e19bbb5e81f506dc031a2d8c2232396840784d3b22cdc67f8358792020c060432881c3a8ca126a96e779f83a12dd8209d7691c14cd2857a536dc0c84f3f074
 DIST zvbi-0.2.35.tar.bz2 1047761 BLAKE2B 5fa5fec7e39c9adc6590f3f6841a40ca723ffb6a017854f71f92f32232103672a6f48678b244a84f0cad742c378ffdb247fe33e5e3cdb1ee4d737e92f650a548 SHA512 3d73eb0a7d05fdf1e3f8a74cc9d4fcb2a0287285904d59230c832f42b91afb072e96bda7e396ef07f268348061a51242925746db124bbb713cf56bdfabdada5d
-EBUILD zvbi-0.2.35-r1.ebuild 1322 BLAKE2B 05e20cd52c5b3f5071bd06b081cb6ef04bc7bc322ce91ab254a5ae0be94f9153a6daf5ff6aa22d492806277e9ea18198664a162b373a097f2217d86297b6f2a4 SHA512 e4fb50f210d9beee3ec657a4546ba52f61f8c33851a3eb4c9d2c4d79846ccf784285b9c69d043500846a9759f00244d24af8d94f89de9029cd08ec17841af658
+EBUILD zvbi-0.2.35-r1.ebuild 1300 BLAKE2B 9a09140c4250d00c55804129e6fe71b632ae737b609ac1c7b49c55f21506a11efb4c468aa8281cf1771135b334939ce45afcb99a7fc984815a250cfa307641cc SHA512 c234a087b10fa676caf48e71d45b2368a5cb2c7a12695b32d329e329b0cb9dfaa38e881c62ccebfff8592120f4736eb20c202a89bc93aeb2477af3357cd47c8e
 MISC metadata.xml 244 BLAKE2B 55571cd41428f715036d3a2362fed34732d4e7508383a83799d507ec234175db13ca329b3c7b53487a3775149a8f16d26ea027ce67eba4bd8015a74810082cb1 SHA512 af9d2d89aee60846c292c11e0b2615eaedac9dddde3ff9ad6d4869892bd078ee0a16f8b87e17360d2c82561dd36c3c22bcd110e63835f4cba593e4f5f35db1a5
diff --git a/media-libs/zvbi/zvbi-0.2.35-r1.ebuild b/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
index 8b2f9be52bee..5783acdcf86c 100644
--- a/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
+++ b/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://zapping.sourceforge.net"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="doc dvb nls static-libs v4l X"
 
 RDEPEND=">=media-libs/libpng-1.5.18:0=[${MULTILIB_USEDEP}]
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-14 23:22:23 +0100
commit	4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree	76e74807bc479502e13866b581b6bf86734ec634 /media-libs
parent	30d6f67c98d149508509d5e86f176d558793acc0 (diff)