gentoo resync : 04.05.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-05-04 12:02:00 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-05-04 12:02:00 +0100
commit: eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 (patch)
tree: ce35c6d01b5ff5de95c3a20fef853b9a6518ad2e /media-libs
parent: b7ebc951da8800f711142f69d9d958bde67a112d (diff)
101 files changed, 405 insertions, 928 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 0d2eca81df89..a778e96c2da3 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 7d6f23ddf99e..04da18b48207 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -11,6 +11,6 @@ EBUILD babl-0.1.38.ebuild 1463 BLAKE2B 8aeb5ec689a4595cafe28fe9c7678d154f2f892b3
 EBUILD babl-0.1.56.ebuild 1537 BLAKE2B 1858b7fd4b0dd6eff9031c92150a4870b3edac208819e905ceb7635dd2ce603c0387cefb989fccca639adaa147d9d866040e437d7e70dfc11399181e8f499dda SHA512 add502c131a3691698aa68d7a2e00628675abc0e086c16ac97a1211017f18290470ba0c9044cb6266113aef45671a6bf6a474026393c8fd3eff4d87ff29d034d
 EBUILD babl-0.1.58.ebuild 1534 BLAKE2B b02f952cde0678f29087c7356252681e5a71d2be900689e9a07fa6dd8308ee4c75d43e15dee24266805d22b0844ddb2e61e86cbc6b14347b403fa5fcb31be374 SHA512 1cca3329bcb2441790e843ce0c5864e020b1bce31b09083d53d793aeda78e9f6604abd0d35cf434a69d7d01427bd9a575e4cf59a41c0646c882225e6331fde6f
 EBUILD babl-0.1.60.ebuild 1534 BLAKE2B b02f952cde0678f29087c7356252681e5a71d2be900689e9a07fa6dd8308ee4c75d43e15dee24266805d22b0844ddb2e61e86cbc6b14347b403fa5fcb31be374 SHA512 1cca3329bcb2441790e843ce0c5864e020b1bce31b09083d53d793aeda78e9f6604abd0d35cf434a69d7d01427bd9a575e4cf59a41c0646c882225e6331fde6f
-EBUILD babl-0.1.62.ebuild 1543 BLAKE2B 16b6d7d3d27feb2c848f1a774a697975e821c2b23e1fca96a93d2b2aec87daf8f10b272a48a2c84e235d32cce4a147c662dd21ea81a1007a7f36396d5853b501 SHA512 9787526ab94218c59083d7f93d5bad05ad2ee4fb41849ed8018119b788b451876f1892d227eae08280f87fb21bd3fcc6a17882b11b226245856cfc43ef7ad0b8
+EBUILD babl-0.1.62.ebuild 1541 BLAKE2B 0cf91fd3f1d7c4e02c59d182e261ecd3aa99ce5cd762309665c06127f77d647869d3a5dfe9ab14f6afe1575da93de48f402346063feac4e87e5e4aad799bfdd0 SHA512 77f7edbcda18c51fcbc0cd93a6fbadb8f69d6d43a4735521853ec5ece702f1be59dae12551ee699a00a717b90cae2302ecc813bd6ddf6bb3d165704783304dd3
 EBUILD babl-9999.ebuild 1545 BLAKE2B ffa68e0a1d0994f176767e2a5d4ffd30f4632685199a6a29de1aee57fec7cb16266805fadd190f2fe9f27c84bd96890b1be18cc7d9914ce6ba736c1e18cf2db8 SHA512 b3c6cb1abdfe65e7d86f1505c5d00ad0b2aef84dbbe5156a63913951452af30be13c8b339edefe831cdbd6eddd4ecb766c17cae2af75f1067d8f49bebe3ba506
 MISC metadata.xml 307 BLAKE2B 95a78257a39aec8fdf8c1c1c1fa0a6f2d911f6c7f22021021f3d1457d7beffad0a47b0f0131926e988340fccc4ca8ef49d086940e0e17acb89d4f3c6845b79f4 SHA512 a86588c27e62fec9d8474d9ba5edd9d235a6ffd1251d5ba729593ba7bdffdb272020567a7db2d596f17bba9c2a39a75eed9ac5eee5e0ba73af081a05fcb1af9e
diff --git a/media-libs/babl/babl-0.1.62.ebuild b/media-libs/babl/babl-0.1.62.ebuild
index 4bd957b7a291..9ede1d886122 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-fbsd ~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/ctl/Manifest b/media-libs/ctl/Manifest
index a5f17f618e44..8a78bb57054b 100644
--- a/media-libs/ctl/Manifest
+++ b/media-libs/ctl/Manifest
@@ -5,5 +5,5 @@ AUX ctl-1.5.2-openexr-2.3.patch 455 BLAKE2B b42032d28612bef6f6a3beeda67c6b6a20fb
 DIST ctl-1.4.1.tar.gz 996923 BLAKE2B 20dba7a3cb93e89ecb656a6ee34b35e1a35c3c4cda63bafe2162de15afca4b8e32f2156a0b1b2268d59bc5923c1687817433c41031be07b810762f9feea36fc8 SHA512 671efbdef287c69b416462d479be58c6cfba331b5b6faa1a694ece162aa2ee966482423babb49c61de3d5046499a81110e4cd30824d9d36a3d6b69068b075063
 DIST ctl-1.5.2.tar.gz 1411871 BLAKE2B 223740aa8b68630f449b65e17470c76b2825a77eead040724b65e9e69752a696f642ae6755116046e188305a7d043c4def7cb8a773ad08d51fba35e9273b3a71 SHA512 c92af23e897f30f96ecb27b4b865e2fe1a1e33c8616797fc18f68e7fcc89210ce8ae70a003169b2f449bfd5f90d192734f1e8038b1d3e03c5f48c81587c871c6
 EBUILD ctl-1.4.1.ebuild 746 BLAKE2B 95436778c6f9687dacc3969eda2530510b401e4c498e41c80b035d7a261caa2daee22f8f5ed5b0941c5b5c36a05d03f49cd6fe0105f811347b347703da753998 SHA512 f4e82d25b87b3704d60cc3701a4dbb91c0eb47716d33444a1fb2cdf5961d2b4e6e4d7b7666c51456bc2b2019f13afbfd3b239e4671085bce5d5723f2fa845802
-EBUILD ctl-1.5.2-r1.ebuild 721 BLAKE2B 2dd5935be43105ac9176568ebd909d317166987b60ff68fad952c10e730d271fcd67b4a912d0ab40c84a1c4e1465d418bda916851075223caba9e657db06e210 SHA512 d8a40ed6dd1b50bab13b8e4a23657e09ed6a241df531a7a415eb4c4d741f0de5d78ef82a9cd65c05ffac5e8ca4693730b7e8ed3a73a3c556547ce41f6e66dc5c
+EBUILD ctl-1.5.2-r1.ebuild 720 BLAKE2B 70aa8486f8ac2f5fdda0c1a05d862dbca2fb65ab1c2992fd38f0abe7b8b37d7a3265c0e54f8f0bba6afc3eb49dc1056ea059aad862e5f9438dc3de74e7b2a4a0 SHA512 9d123504189c82aa06247a94b6c50a53ba5074efad81a00239f913de0416bf39f8d2520685bc454d18867eeaffb8312d0e30027f0ca263d25530ae8ac2cb9df2
 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 e266c6fa8fd7..9d5b50a4cc01 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 ~x86-fbsd"
 
 RDEPEND="media-libs/ilmbase:=
 	media-libs/openexr:=
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index e088ea708b02..e5afe1f692d4 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -1,8 +1,10 @@
 DIST dav1d-0.1.0.tar.bz2 351745 BLAKE2B 302680ddfdc8d5a3eff90541ed156e820c3322bfb93316da1b2deabeac40062103af19e99dfa810678e62ad668c4aed944ac9bf8160afb301b100063919ed2a1 SHA512 5893ad40af7c4f5c3678ecc604ad360b5d1cd3fadaa16f7183d638745097fed091aeb3456540db61a2f4f0fc8bb93f2a20f428c76a7976d3fd186cc8b8baed53
 DIST dav1d-0.2.0.tar.bz2 408361 BLAKE2B 2c5f4d7777d85ab1453a744335ee5047b2e108a70e884c5116d8d1a56b81c1f852c93666bd0bb3f4d5105f2220bbc6c92f893848f0cf1bfc0bce1ee1f551287c SHA512 378060ed6762f9f6baf7addfa7382cb0873bbc606f0389eee4ed7537dcfc851f5b159a34af0f15d9f8d345a9b2a950f38078a419144b0458aa3464e54ea5d490
 DIST dav1d-0.2.1.tar.bz2 412003 BLAKE2B 51520f355f51f7fdc8c6e7981fd29f8d5339c2c72058ea05dff6bf0c3b191cf3c077fee1b46813f229d1bee16d1b884e834a5d61bf78459d83113aafe63bca89 SHA512 38d0a9e639579bf2046d3afd7ba0d4205081d8e26955be0216acc84ee2adcc81c790c858932009965b61a66fc3df66ed6b14da9d0e61e2505418c17bc4b75004
+DIST dav1d-0.3.0.tar.bz2 435690 BLAKE2B 57124b2a5bcde8a2de8e4ee8155ec736d2f4c13dc7347029c517d70495de1943feef7f0c7ce1d1051304fe9f3141775fbe07ceec0733fdca3dca166cbab6c417 SHA512 bc0933bbc7064555e8973c82390e414aca8f52a14c5de7ee3ff92c263722d5c9cc472ba5f1f8d1dd60c4ce9ab0ed880c8b4a53b3d33d3aff24bc8e7fb18b0b84
 EBUILD dav1d-0.1.0.ebuild 1128 BLAKE2B 20202e1f79289bf576003933bfae0e417974df92f810c2a6ed873e1143af297c2af37918fed3ead030206a4d96fe22722a943b11f2b66a8e1dce210256f7f2c1 SHA512 d25a735d98e03391640d290669a69fe225d28ec3a8a3a1137919d4cd47e97e11f03e1c30f0f2123153b4c0a34f6e8539da94b100a05c0c42e98247b1aabb2d38
 EBUILD dav1d-0.2.0-r1.ebuild 1135 BLAKE2B 081253071832f93fd96b216169ea0a1f29a2608ec058eebb41c1eb47922ae64134c3c027005abb56549d7b8e66d0831defc07eb95d963c37de07e730384c42d6 SHA512 35a638950d61cb3a79391f959fc8da3240dbf191f6db0ec55b8d80f08287a8ec1eefc9a611196e70449a89b0ec87aca4f304cd4ed46d6911d72e9343ec612ed4
 EBUILD dav1d-0.2.1.ebuild 1135 BLAKE2B 081253071832f93fd96b216169ea0a1f29a2608ec058eebb41c1eb47922ae64134c3c027005abb56549d7b8e66d0831defc07eb95d963c37de07e730384c42d6 SHA512 35a638950d61cb3a79391f959fc8da3240dbf191f6db0ec55b8d80f08287a8ec1eefc9a611196e70449a89b0ec87aca4f304cd4ed46d6911d72e9343ec612ed4
+EBUILD dav1d-0.3.0.ebuild 1135 BLAKE2B 081253071832f93fd96b216169ea0a1f29a2608ec058eebb41c1eb47922ae64134c3c027005abb56549d7b8e66d0831defc07eb95d963c37de07e730384c42d6 SHA512 35a638950d61cb3a79391f959fc8da3240dbf191f6db0ec55b8d80f08287a8ec1eefc9a611196e70449a89b0ec87aca4f304cd4ed46d6911d72e9343ec612ed4
 EBUILD dav1d-9999.ebuild 1135 BLAKE2B 081253071832f93fd96b216169ea0a1f29a2608ec058eebb41c1eb47922ae64134c3c027005abb56549d7b8e66d0831defc07eb95d963c37de07e730384c42d6 SHA512 35a638950d61cb3a79391f959fc8da3240dbf191f6db0ec55b8d80f08287a8ec1eefc9a611196e70449a89b0ec87aca4f304cd4ed46d6911d72e9343ec612ed4
 MISC metadata.xml 536 BLAKE2B 40ec2224aed078ad4748d3182defb6813cdd34a614d40db2fbbbeb8b63e24a59ba1cbe9d458fec17516c328a89f77927d9fbeb9a1e4a2b8c296b7de7235b1af4 SHA512 74e6595ce441bb313364f375a8afa9b2a0179f350e30d075ecf99e058874450e15f4005a0712e20a4feb047d57799dffacb3903af00a3c5a8d059f7025e49de6
diff --git a/media-libs/dav1d/dav1d-0.3.0.ebuild b/media-libs/dav1d/dav1d-0.3.0.ebuild
new file mode 100644
index 000000000000..361df4a791a4
--- /dev/null
+++ b/media-libs/dav1d/dav1d-0.3.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SCM=""
+if [[ "${PV}" == "9999" ]]; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
+fi
+
+inherit ${SCM} meson ninja-utils multilib-minimal
+
+DESCRIPTION="dav1d is an AV1 Decoder :)"
+HOMEPAGE="https://code.videolan.org/videolan/dav1d"
+
+LICENSE="BSD-2"
+SLOT="0/1"
+IUSE="+8bit +10bit +asm"
+
+ASM_DEPEND=">=dev-lang/nasm-2.13"
+RDEPEND=""
+DEPEND="${RDEPEND}
+	asm? (
+		abi_x86_32? ( ${ASM_DEPEND} )
+		abi_x86_64? ( ${ASM_DEPEND} )
+	)"
+
+DOCS=( README.md doc/PATENTS )
+
+multilib_src_configure() {
+	local -a bits=()
+	use 8bit  && bits+=( 8 )
+	use 10bit && bits+=( 16 )
+
+	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then
+		build_asm=false
+	else
+		build_asm=$(usex asm true false)
+	fi
+
+	local emesonargs=(
+		-D bitdepths=$(IFS=,; echo "${bits[*]}")
+		-D build_asm=$build_asm
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
diff --git a/media-libs/fmod/Manifest b/media-libs/fmod/Manifest
index e9668d8003ff..db9d763cf759 100644
--- a/media-libs/fmod/Manifest
+++ b/media-libs/fmod/Manifest
@@ -1,7 +1,4 @@
-DIST fmodapi43800linux.tar.gz 21990250 BLAKE2B 7a2d26cb0c9eb9fe3d229cf5e5314ab13190209214c1676193f204954802ceaef958671f9c3ea3d8880d4f3bab28e6f10cdec7297c0f8210e320877c038c290d SHA512 009297a708fa445576dc89a258e4049d2c0d1eed2cb4bff7981dc29353feb0c1b02ccd7ef9402172659a7f5705af3f9af2e469c4cec0b0ae6ac01aa6f201f0ef
-DIST fmodapi43800linux64.tar.gz 22276575 BLAKE2B 652cd504e7bae1429a8fcde93cbefcf8787c04062535ed4052e017bda50c6e1758a6f70e34e86664ccc957923a5bd38c836ad3df89f4e8518d985f2186523701 SHA512 d2485e3dba3a1b23927f2d324c1b9a6ac3e324820ce6f9acaba36d6a1c109965507d306db55c623cfaf72ff456487ec67af877ace253e773d6bdb9180df7fe0b
 DIST fmodapi43802linux.tar.gz 21992247 BLAKE2B e0bb112ca47649390c7aba33a1cd75cb7b13c9a2d4cc5eb5c9a6bad02af9ae4958bdd8d458bd4fcc76eb42f5e09f8f989206c971bd7cbcb05359aaeab392fe38 SHA512 6a3f0f62acc71e24e48f8aaa03270d95ce09ace6d37f75a40452c84788b06f4cd6889772e9a6c00fc4799020c046905a9185d08900bc3b573a28b42cbb7f45b5
 DIST fmodapi43802linux64.tar.gz 22282269 BLAKE2B 733b3531f9e107332ab2c91e07f39363810f748e72fdbdcc865b87d86bee766859c01eb2357b5169cb79cad490d6186227d481335a1114968a1cbe2ab6e33ae6 SHA512 95b8688bbf54e19c2471f508d7ed9fbb93f6c88eaadc090813b02a86082e15dc7578220a40ae2b39358f8a4dfcacb4cb78823f4577f5ce9bc3d53af2f591d558
-EBUILD fmod-4.38.00.ebuild 1618 BLAKE2B 84dda179833fc68824f41e1931ee12f27eebc6d7fc77c381dff9ffed5fe85b368b45aee032fbff80cfb3f0764b7a22bedfb6c241d5d4dccfb398a4f93c20f7a2 SHA512 33f236d08e96784d53c1c560badbdc030d7f33e258ef58b2bc9f819942f3ceb23258116c55d3cfcbb1119b9f4497c5d37d1664384842a6392e955808355463ad
-EBUILD fmod-4.38.02.ebuild 1616 BLAKE2B 5cef5a33687a8cfabebfa6c7a0244d08d74b2a5095d8ed6940342f634148920be9b739fd5415aeb891be38d4c72c8951ba778739369ecb40ebc6045b77c62dcd SHA512 a3dcf8b251aaef998528c4be3f48ce3cd6156b7e9ec9b263a50a79857b4b82db0acc1d8aa90a23479202406ee50d412248b1ebfe89299554a6ed6835b760ee5b
+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.00.ebuild b/media-libs/fmod/fmod-4.38.00.ebuild
deleted file mode 100644
index 59008bd38de3..000000000000
--- a/media-libs/fmod/fmod-4.38.00.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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/fmod-4.38.02.ebuild b/media-libs/fmod/fmod-4.38.02.ebuild
index 18d0fe0d9053..6a75cfb9a8b3 100644
--- a/media-libs/fmod/fmod-4.38.02.ebuild
+++ b/media-libs/fmod/fmod-4.38.02.ebuild
@@ -14,7 +14,7 @@ SRC_URI="x86? ( http://www.fmod.org/index.php/release/version/${MY_P}.tar.gz )
 
 LICENSE="BSD BSD-2 fmod"
 SLOT="1"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 RESTRICT="strip test"
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 4e3ea23f2ec1..b0da2a9b0b63 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -7,5 +7,5 @@ DIST libgd-2.2.5-ossfuzz5700.dat 30 BLAKE2B 5ddd3d2be2adf05e1e2eb1852cc689be57d4
 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-r1.ebuild 2098 BLAKE2B 618b894c17512da414cafcb7c483519d115567f64069e0aef6773eee7cdeedc488f328956f7ef58dec5a366d43a6fee969a882a013bb8debd7c8cf9da34279e6 SHA512 a26a8fc9d231d5d2acf7093f415e3b2431e79739f7b96be0067fe36610754357f6ca997c6cf05648ec47919dd7a01e620c77b1d985e1694b2360e1ab89e74671
-EBUILD gd-2.2.5-r2.ebuild 3143 BLAKE2B 947ee8383ba1e25be2791ea661597ce3d681da95948ff3d73a1403d99a8032e4ecae75c39ee2245bb3ddfa0e12ed6291b535be389e5d4dffe7290fc79c594437 SHA512 2f2508525ebaacce2c8691e67ec86bf747096a5a942bd2b8b7bf604d0b10b06141c72422a6f350cbf668354992cd757dc1a19bf0b6ff75d9b0299cdc80bd16d8
+EBUILD gd-2.2.5-r2.ebuild 3142 BLAKE2B 9fd07fc3f526a80f573cfe7d4eed293749dd8e64b37d6e9070d53bb81418a81f9d2256d98a5b8801d4ea2c1a3bd0fd154ac3ccf52bf05107f12482542977bb44 SHA512 7c3c9220e1e3fa982b2c3fdea07e91aa2eab9c42198cd69c4afb1e335a2f64e881a7da24cd13321e9f18e4720f56f0e62e30ea8965156382d6e85cd14fb6f27a
 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 ed5c3a96905b..a5719a6acc53 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-fbsd ~x86-fbsd ~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/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index ba899b6aa2ab..ee991cd4d4c0 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,6 +1,9 @@
+AUX gmmlib-19.1.2_so_patch_version.patch 371 BLAKE2B 2a11045d40729e3d5c931a79638b5cefcac9c4f365ac2dea3b38a749a6928f977bb6201db4f0e2a429997cadb36991b241afe636dcf34f58d8045f13d82e8727 SHA512 9b5cf0b90df9b43e22c203e3812689b192af73cd6580976a82744497ff6f3386d8c0782e83b9736ad698a5955b7af61859016794791b13b4152f7c0bcef09169
 DIST intel-gmmlib-18.3.0.tar.gz 620491 BLAKE2B 555a733b42b8e4c40170db9ecabc25bb04779c3aba38b9141f021df1dbe83d74e385a3437d4a87577d9e5ff4df21ce618393909cd98fce4a59ec19aeff4eb44d SHA512 358598873556822be6748a282cd1447ca3e0bcaeb11c2bb8862414bac2ab8e57deee9581fa14bfe22d33d712e567db936332b7fe715dae9816b31121af934dec
 DIST intel-gmmlib-18.4.1.tar.gz 621793 BLAKE2B 41d6f93ec68cf29b8bc2d01c103c69dd4f732ce1aaf72cc959f993af73df9b355f0c4c7c97af4102cc1996e7732597dac4fe0abaf359806e2accbee1bf852d90 SHA512 8dcb5892cfc98822e8173d0a71dfb4883e1ef838de8c936a9b36fb05d61137b7c7d7edf941d3ebd532a1126d8d8b978b95843afb3514ba8cbf3eec54f05c8b8b
+DIST intel-gmmlib-19.1.2.tar.gz 632661 BLAKE2B 4a9995a9e4c8b5c8e081d757193212180fbae3a88040da24be4225149c4c0924b56d5969e125a0c21a5af7b2b3d249277d7e27cb3ce13135c69bb977a976879d SHA512 fcc0beedfc3716b6204627f7daa5e0a5aec720b2a29ab2f8262b613a11d31bfe14dc8476513515d8470cf7d66f58d109ed4d5cf203e041228f53a64cb4a6c243
 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-9999.ebuild 807 BLAKE2B 7a58c4ee12ab5d2d970742cf8199f71be6e66a44231b58c3ef618a94c0e07b04e27f0767c02545e5f50d667895c7841cfd97425419d0749c493c15807ed03f59 SHA512 9dbbf041162c336914f0877ad0adc74b91ab695eb9886b46e5efdb4a9635e5f77295d3fec65558993d271e70999ea6144430a3ed9f04a000f62e9ca8c4bc3ca8
-MISC metadata.xml 220 BLAKE2B 84f977d8ddafd6841e5bb33f6184f7bbba42eca7a00feae5a214221a0a6b37ddd3dc13d3dac223c8285daba53629fb9ef2f278675d51ce5b3da8dda6f419867b SHA512 33be2ee02959063935caf88639b7b116430ccacd420b40f9aee5708f081a8cec58d82b9bcbef803e6a4e0084d6f2dccd75cfd3144f15dacfbd783a52397765c3
+MISC metadata.xml 322 BLAKE2B 802cb8da9b68866ac616c175586bc3651330ecbfb1b08fe3fad52ec8817e1994f347ae49815869d50296504d9607fcf6c41d40543d8896fafd8d36c4421604f6 SHA512 52324c98984d04659d8ee327850152e41b6146f45a35b147a1fba2043be7ca91e220dd57fc3712e5154b416d04f8a1b0f614259cd9fde8c66ad7734853bb50ec
diff --git a/media-libs/gmmlib/files/gmmlib-19.1.2_so_patch_version.patch b/media-libs/gmmlib/files/gmmlib-19.1.2_so_patch_version.patch
new file mode 100644
index 000000000000..1fd45de157f2
--- /dev/null
+++ b/media-libs/gmmlib/files/gmmlib-19.1.2_so_patch_version.patch
@@ -0,0 +1,11 @@
+--- a/Source/GmmLib/CMakeLists.txt
++++ b/Source/GmmLib/CMakeLists.txt
+@@ -40,7 +40,7 @@
+ endif()
+ 
+ if(NOT DEFINED GMMLIB_API_PATCH_VERSION)
+-    set(GMMLIB_API_PATCH_VERSION PATCH_VERSION)
++    set(GMMLIB_API_PATCH_VERSION "${PATCH_VERSION}")
+ endif()
+ 
+ message(STATUS "API version: ${GMMLIB_API_MAJOR_VERSION}.${GMMLIB_API_MINOR_VERSION}.${GMMLIB_API_PATCH_VERSION}")
diff --git a/media-libs/gmmlib/gmmlib-19.1.2.ebuild b/media-libs/gmmlib/gmmlib-19.1.2.ebuild
new file mode 100644
index 000000000000..dd16c51e2ef0
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-19.1.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-19.1.2_so_patch_version.patch
+)
+
+multilib_src_configure() {
+# once upstream makes this optional
+#	local mycmakeargs=(
+#		-DMEDIA_RUN_TEST_SUITE=OFF
+#	)
+
+	cmake-utils_src_configure
+}
diff --git a/media-libs/gmmlib/metadata.xml b/media-libs/gmmlib/metadata.xml
index 80088c21d0ab..7ed71e55dc04 100644
--- a/media-libs/gmmlib/metadata.xml
+++ b/media-libs/gmmlib/metadata.xml
@@ -4,4 +4,8 @@
 <maintainer type="project">
 	<email>media-video@gentoo.org</email>
 </maintainer>
+<maintainer type="person">
+	<email>marecki@gentoo.org</email>
+	<name>Marek Szuba</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-libs/graphene/Manifest b/media-libs/graphene/Manifest
index 41a01665fe63..15a1369fd05d 100644
--- a/media-libs/graphene/Manifest
+++ b/media-libs/graphene/Manifest
@@ -1,5 +1,5 @@
 DIST graphene-1.8.2.tar.xz 127436 BLAKE2B a22251db7cf4719c8a6cde49e6feb0a998d1ec7296fee549a4797d72fa575d4266e48fb5a6d9ebd204b93954a6278b4fa88dc56e5f86d7cf8625a5edc685a09b SHA512 8d250dccac345251081419f4ad7079c8035cb6225e10b23d25799386b067288831c23be667d608228ef44a2f6107ac47fc86bb495eda7881b1336598d6c43234
 DIST graphene-1.8.6.tar.xz 127984 BLAKE2B 7f67b99796cca1a47324674b1871ddfbcce1193ded5f0a37c8c2894d52b6b5823b0fb1909018ea6adb90f7ed53ad6b09eeda9b1606a22a8b85cd0d661d500195 SHA512 ef6e9b5587bd540099216a7e3f7c86eb62368d49876dcd380c9767c6740c8267c9d510c5025dbe56402f3cd15084ef8fc634d3abe486b516f4f5328b87df277c
 EBUILD graphene-1.8.2.ebuild 1743 BLAKE2B ee7cf602d60a917cbf63d825e0ce2c82c702f1719f7bc772645a956b1889c133cdd284b397bbbfd9cd4f3521f4e29d47c9a1df626f7c820e7026adfe689a509a SHA512 02c21c16bffaed406bd4cd1d3c0a439ec571d2e9c88981bbfe7c5983a840ac6df3bccb74c42ed7562ea0b00f2cb2efffe7a7b20f8a4f50173f5c4d2cc01d6962
-EBUILD graphene-1.8.6.ebuild 1826 BLAKE2B 12809ef5fca294e35d6a528b66ec5749c52bda09e809976ea80b0cb9b4b9d6401b09b468a18efe0d452ae292011e5f281b01b7a3b148336bb9f49dcd3ab6c22c SHA512 30cb4c18125cf39027892453eb509162ba16bc39e1b023cb80623f6500e8e654af42966300e045314b492c8b830b0a5179246ba62cea9bfd987014a011053cc2
+EBUILD graphene-1.8.6.ebuild 1832 BLAKE2B 63a9afa0bb27e02756bdbbb9bd609e68f4d2904860ac0a8b13482787dd28ac9438017b5287ceb5a4f461216729ca473f940c3177de234844b3d080b314f22162 SHA512 d890ad42f078bb2ab09eafb265f311863b81f73f131f0ee5d057ae6c4f03510578a30064dbe329ee5538e857d12850c72c3a2340f874fc8191afb567aafa37f2
 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 d5f4356f18b6..6d52d6b3ded2 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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
 
 RDEPEND="
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index 8ae257c67ed9..f083a356809b 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -3,6 +3,6 @@ AUX gst-plugins-base-0.10.36-resync-ringbuffer.patch 530 BLAKE2B cbf4d51313e94df
 DIST gst-plugins-base-0.10.36.tar.xz 2364108 BLAKE2B a71ef5d5c7462d60937602681c060e85ed086a753b7ef354dad48354d6c3741d809f2c0c6a321ef9ac60fb12d24ec65e1baa63e51211134d2a5e03aae16f73d2 SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8
 DIST gst-plugins-base-1.14.4.tar.xz 3703232 BLAKE2B b22c44b857bc4f1972f03752cc1afb35c8d76e2d0c4a06c574af0ac4f3a91080c584ae4e4fc2a263ee879a53d58505c24a756ebc051d81ec62661c4f9e532f0e SHA512 42c59df9f2d848108f12afa0466acbcfa5ccda64e4d0d44608d4268abed20f2e036713de04e7d71feaed1868ad742c5bcb55ae0eef5dec8e19e053dc8541b8af
 EBUILD gst-plugins-base-0.10.36-r2.ebuild 2120 BLAKE2B 5e670a72e651af6a8ef1e4992fc42a7a444e9a77e708b86cdf5d373d96cc549c2953df5da5b001479938f77498eb09de861e89e705ce555618cd45227209a769 SHA512 bc9f491322b473f7ae2a55a7fab8315584b1ef3f71f94ec4968705fb1063d72e6dd2dd80342bd85b7abb29315abb26adbe3002c94c7a7ec27517c8edcf32eafb
-EBUILD gst-plugins-base-1.14.4-r1.ebuild 5908 BLAKE2B b6728c8bb4a9e1345f14896e711c468bb2f00dbd7d965e7d8fa549e06985ee02767e9c1ece9cdd4ffded5d59fff481e83b9ee4a22eda360f78b7877d457f3ae8 SHA512 df14406e13b77d286a01044a3f27bcb7182952b1bc34cc330f37ea4a5310124c7df7f90cca96b3df78f0bbc6f18d5246a6c21e722f1511b89f3a81c7b899ebcf
+EBUILD gst-plugins-base-1.14.4-r1.ebuild 5914 BLAKE2B c9cc4839954a48588207bce4025f1966d8c333ba435ded4c10fa876a93d44469529c28d94fbf87bd27e3e419bd07d871edf96dc6cb77db087f761e362ab62657 SHA512 bf6df658ad1401000229e2a953abe72c82f1294c31d86070bb0204f6c56498566fec1b5a1541455608f1293be8510381a5c57ad96015e4cabf62587b34e70806
 EBUILD gst-plugins-base-1.14.4.ebuild 6061 BLAKE2B bf46ef975e9675c8d55bd807e11074cff4b31dc7d308750ceedd43bb67889473183dc1c83109f4783af4564180b23e14b92787bd4ac2ccc75d28917b03dc14e5 SHA512 9493adf3513a16e4f07fe15d9572e60285817396f43a8ec79fba0a3b37f1e35bf845e3edab2e92454d9b59bcaa69c21702e8de62243905cab45427d6a123f9c1
 MISC metadata.xml 1065 BLAKE2B 9736df3218c6157e5cc0f14e96a15ec6ab6140e8774c7361dd4fe9378efd37d1a3da593527313a81591818ad48a5585bd4395fbeb85d357449b00bf7e51bbb5c SHA512 520802b59fc6575e16edd765dacab4ff0ff6e51dd162f03fe7e4e07eb472aeb78f3974a32ba613939932e123179106a450c503234ed806a08416dc6b8dd534c2
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.4-r1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.4-r1.ebuild
index 1843a1f8dc2a..c4e2b5ed7110 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.4-r1.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.4-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
 
 # 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/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index c802ee7ac91f..f3944e8d71c2 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -12,5 +12,5 @@ EBUILD ilmbase-2.0.1-r1.ebuild 591 BLAKE2B b196bf67401ac210bc4846e69ddd011281d26
 EBUILD ilmbase-2.1.0.ebuild 758 BLAKE2B 20825fee87f24bc2e31d4c01e690ed7d6ed4827ea9422dd83354da8a8c85c832f0d8d172ac802193b56a482f0d656f79a5aa483a995ae05e17e91ac8b4e8a202 SHA512 fdb41c8dc58900b21d3dd42e8cd65b99639f343985ae8b99e04a8a4e5eb0b68b13725d03b3bd03776d528d2998f62d0f6496bb6ef13b0cc9dda1d804d84b7e2e
 EBUILD ilmbase-2.2.0-r1.ebuild 970 BLAKE2B 322ac4df65286c9aedaf85b43fc8d1fecbc3816fff231695f59647d55ba978610a3156f072416f7e7f211c59606b4364917d98c93034a6a7a532dab47a401978 SHA512 c3b4313c5f67e0082ec5b0f5d7c793e99be3c1c85f9ce1ef923c784b1307a22ca82c47bb2547dd7db30a4a67a98b729ac34ca32791c0d0b62d66e089ac38db11
 EBUILD ilmbase-2.2.0.ebuild 773 BLAKE2B e2ce76ff50489895805194179dd647ff70f7cfae2e3960689a95c6b9b4d0aa543155c45fa12e461ceaadb6249df80dd75398c7841441adcfdfdbd75b01bc43b2 SHA512 a11bcce9aa6cd8a818ad2d8e9ab391e83b4a2b70155b1524d8b00b0f6c8a726aa1c4ad4f75acec1c8a81cd1d12626e0dd80da7b74a3410c7dc9aa12454b98c58
-EBUILD ilmbase-2.3.0.ebuild 1042 BLAKE2B b1fe229848863224f1bc5f8629f0d6fbcb75c450ee78b3f8089f410a43a2058111ed9f8f63427af3b4ed5aa1157977b58b7ca867e996aecd5b90d452053eaafd SHA512 12ee90923697b5bbd3690c00a43019eced5900943acc776a30aa6c03c24cab46ee9e145d72c711e4208ae1e835f38d017aa9384a5772e5cb0432dc179ddc02e8
+EBUILD ilmbase-2.3.0.ebuild 1041 BLAKE2B a53b7f81ad6f2ce916280a5f59f869ae0d6d3984727f0faf360f0bc9b41270b9bfea7f8e825dd861baa36182b56fe262460664c79431f6314b4bfe859e2ac4a5 SHA512 a7f6924497a066ce26c712de0e67e050d9978ce80aa575b5d5bb5b009b829ea61814612760ec4c6ddcef0383c4f1aba0f64ac258a368a7f45b92cf5e2f14220b
 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 e48e632932dd..d528540b5d81 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND="virtual/pkgconfig[${MULTILIB_USEDEP}]"
diff --git a/media-libs/jbig2dec/Manifest b/media-libs/jbig2dec/Manifest
index 851a2ff286fc..98d5293a9ebd 100644
--- a/media-libs/jbig2dec/Manifest
+++ b/media-libs/jbig2dec/Manifest
@@ -3,5 +3,5 @@ DIST jbig2dec-0.13-patchset.tar.bz2 8452 BLAKE2B 473a338b460c8a66991fb50e110f438
 DIST jbig2dec-0.13.tar.gz 442571 BLAKE2B 6a973f91502d8effc00cd49b68bb2f853edd41286fdc5cb159460607db8627c2c959ba1c96e65b2ef1df3d4072c9993ce66c06bc5dc1837c89f87c6da0025550 SHA512 ef64a65c54bec65f61602de7130dc9594aae58aaea7958f7cc987f25d0794511e15a423e86501ace4f40c0364796fb97ceab72edb0b69232926767ba16c1b05d
 DIST jbig2dec-0.14.tar.gz 463572 BLAKE2B 91351a3879bd1906fabe2620cf5379fbbc32eaae808a8c2754c661d6dc592d3c9da13c558c8f7ced30c48b73fbd9ed4631f2817298f959b59ad4dff5fce9ac1a SHA512 066bd880ac0665fc1e42b0ae0e481008b125aab6e173b7f82d61a2a30e72c90085cbded9b2a68c6836f92dea3d8d8d5c2228dba76e0d99c79c922197d215705b
 EBUILD jbig2dec-0.13-r4.ebuild 1473 BLAKE2B acad9053091c1be3d6b7c72ed249cdbb90a92f2c532c250ae863deff76c5142d67d27ab77b6e05b42b74087d223e861b9d71278ccd007931d588c1bc3802b315 SHA512 035196ce25a11ac4c73ee2f8cf2dadd2c1d869d9f5625cbd894f50807af7cb85438b4b7783f775655059ef108d367fc084c1123aabc674d275216831c15fce47
-EBUILD jbig2dec-0.14.ebuild 1170 BLAKE2B 1c3fee5070bd716f63750b1c00208fa1724115d101d63ba2b128b5f07f0738aa9fdb126a4bc52207a2c57d237f9fbce5a6d07c60f643c788d226162b2ad56a52 SHA512 e003e0e9e8a1a2ec72e9a8e0d018723aa06a9c6d25be7fc5f01ce6979e3464270ca8333dec4dc1030210e8255dd1ef0452906b7599b33019ea358f2a0d36fcc7
+EBUILD jbig2dec-0.14.ebuild 1169 BLAKE2B d6de95b32e94427f87053993c33321f66153798ae86875da0a247796a0d92bc790474226229301687d1b86df7a7342b9cf34bc3065ee1cad25a950a35a1c41b7 SHA512 22d6761ba49f0dc1461a05d98ce13daa5b65e96d2219826b9ee4b8afdfd14b2b7463afb70b4888851d0112f69fd76d8ca1401641b4797e24250af144b7186c30
 MISC metadata.xml 473 BLAKE2B 6d374023a106375c7f5500968ed4ea2f4dd5584fb0db8f85b042844d08afb6196b7d7c019ae69b35917f43e496c9a25212aec328f0c3cf78aaa94b963de65c15 SHA512 501077ac27f5c6f8a616fa32cec23d28cb16dc0e0c19ce933cbc067494117c9c55fc3e00dfc21270892d57478a9e268f99215c8d074d6cc4114916f55a571a6f
diff --git a/media-libs/jbig2dec/jbig2dec-0.14.ebuild b/media-libs/jbig2dec/jbig2dec-0.14.ebuild
index 9911b82c53ba..22e6450211d8 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-fbsd ~x86-fbsd ~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/kodi-platform/Manifest b/media-libs/kodi-platform/Manifest
index 49fcedd1fdcc..35a21d78ba25 100644
--- a/media-libs/kodi-platform/Manifest
+++ b/media-libs/kodi-platform/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-platform-17.1.0.1.tar.gz 8538 BLAKE2B 3264ef2b480d6b8e0f3c0b7dbf6427a39cdd3b882ccb50d76977e169d49fa46e7716969a15f0de1bdf787f327a2a551027be762c1d16eb0482747531c89e45d1 SHA512 c3501b30d6e643239d1a5726eae79d734392709240b21fd314c97fa8a98b0c4ba912c8a246bd53e7049fadde0f695274ae4d1920442ab9a22337258388f80bcb
 DIST kodi-platform-18.0_pre20180301.tar.gz 8605 BLAKE2B 8486c0777373de75c0120b3e62ef1ff43107b36471696a7329f15fc62670f230737ee382695dbcb61ca5215fa2898cf3c6ecdfc0b48043b57f48cf15adc9fbf5 SHA512 35bb8d27db3b1e9debef647e02c2cf4ba7f2b2bdde07cb57eedd5859800d0614426d82f4be9cdeb11dba6576cad93e43095a05047411dcbcb749609d51f53ec7
+DIST kodi-platform-18.0_pre20190429.tar.gz 8616 BLAKE2B 424fa1da5f2dda5343ebe8414555382be6391d9467e73a07088a9e46674508bd83aeec59277f5d0b6e4bf0e1a6c56910a338f1774b17ef4ad21ca7b1e4198fef SHA512 acbe478c2167cbd90ef8cd0ba6ea9ac657a4140f5337e840e960358b26cb3d7880e52527c0d7f6d0ae8068b92b3a3cc5719110163ecfa4520469fc64b8e1b9b7
 EBUILD kodi-platform-17.1.0.1.ebuild 631 BLAKE2B 9802aacfb11ba042ade388a72d0edd1072cba7262748f2617a81b91c62496400490bcd2e57a65c9a04a69610c8b83ffa58a0d9e1594352531b5855a93a7741c0 SHA512 ba397a196de116bee6806c9a5b4a2917731c204a0ef12b00bbdede133793806a13087558ee63c1f032614ca29e6cf02864332d507c03fe86357fe304926924e2
 EBUILD kodi-platform-18.0_pre20180301.ebuild 628 BLAKE2B 03929d9e7863fc872d5cda7d580a6d91539846f213ef5bbb1e0bd572c9fa9211ec249d8e6fadc3b8b3bd26c7bd206268ebac6c995073d9063c0edca9fcb5e0f2 SHA512 466496d3c19431d76f9760460b36d69219627c9a4af7c3ec79aa53f62ced3c884770f0ce1e82c02b24cf5e72ee073b4421f0f1648ecee9b113c7cda8601d57f2
-EBUILD kodi-platform-9999.ebuild 629 BLAKE2B b7d5bfeae22d946ee48fd2f6fe927616c0c83c0c6e0ef622ebbb9ddd0cab28fb02d448cd0c37c9939ad46a6620c7c120ad88c8d91ee9ebf104b8af120c681079 SHA512 b59c92fa347118f75e3b78e297350dca1e872fa26c8b1767c8068de50f620cb52100aa816a21ff21b60c10ce5880a3a955444a7b1efc6ce05b9b7308f829a9ff
-MISC metadata.xml 398 BLAKE2B ca04165840f53749e48d8610cd350db947d2f17afd8526dd3b94648eaa2ca120792ef1465be8872d349859a9fa8a6f7b59b84ffc41fe982bb757a5a059fc37d7 SHA512 1db940ad831c7f4857c9904170d05a07f81872a4fdecd220e76a3761de78209ad3fd588309253ae62430124020e339dd22ab04ec0f6c4c6dfbc0bc112af71441
+EBUILD kodi-platform-18.0_pre20190429.ebuild 628 BLAKE2B df78d9e7544b8322f55637615ddc0c7be309616d9f8b39fc03b125b547c9759520c099c8ca8816cd4148f4eca73e3a1f94905f6f6efd95dd4afa38ef9b249996 SHA512 6bece6573b6d767e53ca96f91fb3f0456117321e8660c9521ac25df6a7550f06c65f03670a1031e76de4c76e564c2302da5b2aadc613bff13ebe864b51620c33
+EBUILD kodi-platform-9999.ebuild 629 BLAKE2B 3d38ae45b6948b1dc6e8cfbdc408542b48fa34af8e46417aca223042ffcba9ff4cf229044fc030bd50822227611b851d1edc671d771f5cba9feaac0ec5bf52bc SHA512 b0571f8ad5b50694fb1daae48ce34cc58f2e4f1a4884786a53b80625aa2f221cb3a5568c4f6f609ed19baaab80fa877bc4c8fc080fb61ba829293da0265c3c8d
+MISC metadata.xml 507 BLAKE2B d2f9a4bf2b904a20c489879e019d4280fa5fa9b94d1887ce64b96da46c64543865d46d823eb32b262121d1cbb936fe15a4df0d8042aef23a3927a0bb81ba2a89 SHA512 cb4626340b4a2aa62e652aec196440c5b0f66e560e1a92fc0bcbba17e67374d46ed74c6e8cc53e0c17db961247ae3aece65c2afd904ae3d1685cde8cedfd5a3a
diff --git a/media-libs/kodi-platform/kodi-platform-18.0_pre20190429.ebuild b/media-libs/kodi-platform/kodi-platform-18.0_pre20190429.ebuild
new file mode 100644
index 000000000000..88901d491fec
--- /dev/null
+++ b/media-libs/kodi-platform/kodi-platform-18.0_pre20190429.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	GIT_COMMIT="915da08"
+	SRC_URI="https://github.com/xbmc/${PN}/tarball/${GIT_COMMIT} -> ${P}.tar.gz"
+	S="${WORKDIR}/xbmc-kodi-platform-${GIT_COMMIT}"
+fi
+
+DESCRIPTION="Kodi platform support library"
+HOMEPAGE="https://kodi.tv"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=dev-libs/libplatform-2*
+	dev-libs/tinyxml
+	"
+
+RDEPEND="${DEPEND}"
diff --git a/media-libs/kodi-platform/kodi-platform-9999.ebuild b/media-libs/kodi-platform/kodi-platform-9999.ebuild
index c2c88c58a52f..df88789daf7f 100644
--- a/media-libs/kodi-platform/kodi-platform-9999.ebuild
+++ b/media-libs/kodi-platform/kodi-platform-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 cmake-utils
 
diff --git a/media-libs/kodi-platform/metadata.xml b/media-libs/kodi-platform/metadata.xml
index 1b27787029b3..d3027d4287fd 100644
--- a/media-libs/kodi-platform/metadata.xml
+++ b/media-libs/kodi-platform/metadata.xml
@@ -5,6 +5,10 @@
 		<email>fordfrog@gentoo.org</email>
 		<name>Miroslav Šulc</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>candrews@gentoo.org</email>
+		<name>Craig Andrews</name>
+	</maintainer>
 	<longdescription>Kodi platform support library</longdescription>
 	<upstream>
 		<remote-id type="github">xbmc/kodi-platform</remote-id>
diff --git a/media-libs/libaacplus/Manifest b/media-libs/libaacplus/Manifest
index 24149c4a7dcc..4d6389cf327f 100644
--- a/media-libs/libaacplus/Manifest
+++ b/media-libs/libaacplus/Manifest
@@ -2,5 +2,5 @@ AUX libaacplus-2.0.2-clang-inline-redefinition.patch 1277 BLAKE2B 6df3ac18034ad7
 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 1423 BLAKE2B 3acecddc9573ca3a9e70e9655a7cfb9d2489b00bcb2f1247586d515e777a4d22c6bc085eba9157ce79db5336d49c0ad937498b5e664b57cbd37e21efc6cc9806 SHA512 cc0be87e9e5f5ecba823701769e9792585ab1dc717941b924aacf9d6444a51dd25e79b0f7fde06d4d00475b408baebc31703b21e104e6a66fa44ab2f539c21d2
+EBUILD libaacplus-2.0.2-r3.ebuild 1422 BLAKE2B e3929ecbe45ab9987c40392504f1a2e1e763d4f7ede988c0c30669e4ca7e4df306ae7d9b3b2857b7c41c5022c30448740478dc503daac5f40996f7006751abdf SHA512 7be33cc6064c16873fcf4048ee9826036d4ab32957a4cd321ffc158184d82dab3681c6d04a7e15457643d50ba2a6928669de47f3919b2fd17d2bcaa1029646ec
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild b/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild
index e95ddf9bd4ba..90c09d935596 100644
--- a/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild
+++ b/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="fftw static-libs"
 RESTRICT="bindist mirror"
 
diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index 4facc698a2cb..e41aaf977ab3 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -3,5 +3,5 @@ DIST libass-0.13.7.tar.xz 352752 BLAKE2B 7ab5dd5656b58b090718e000893e6eb1a05512f
 DIST libass-0.14.0.tar.xz 356256 BLAKE2B cf38d472003d6590c69da9347310386559b1ce13425d47505daca881b504453802a60cd553bbe478044764c108586668886372b79a61ccba42cdf49b2ed9ca74 SHA512 0f5fe5d7e662ee1d649981f829e5ef7a53457754f74faaed5679252a5a6769c8f267b6119cda922ebc6a8e5b5b331569f13813ac74881b4e94da7b2e8143a9e6
 EBUILD libass-0.13.6.ebuild 1340 BLAKE2B dcdca280de6863af783fc81a57d803f284771eae3c38a6938f9135c1f04f2875890d28827949b87ecfce895b484d7256d29e799577644f14a06dbe5bcfea8ec2 SHA512 11fa0782ccad86072400819dc309c18c197f54f561bfac24ef53cc6f7462220c8dadfb4e9589fc14dd30bb46cc2f8768830db1a41ff7971d052aa8dbf8b693d4
 EBUILD libass-0.13.7.ebuild 1350 BLAKE2B 2b9c7009fbad3743ec1d53abab5c8eb72b5d49d9c625ddb2e22a109c3857d93eba2d08fc91197337f144e8fc77dd492181f19cbd997a7b445c81a8083ff3b855 SHA512 6db190fb50a10ef1ceab912daf9c8822bf35451f1f05e64292002887903400c89967e23685bf35fbab451036a8e4d221016d212f18a80849af4dffd857f915f4
-EBUILD libass-0.14.0.ebuild 1341 BLAKE2B dab1f1b18dbcdf97887d19620794f3f2a850d1c7f2a7458fcef2478e569d752dc677d64be134fc35383233f14b9af82c076d91d484b5d48c7f7b676bf5448208 SHA512 73e5298b6b65fe18630f8a1418c530b207f162068c4885052f5f539650e76c98ca7bc4414355f02b7d8d8fedb728de2d89fc76e4cec4c249db033b3cf6f0860a
+EBUILD libass-0.14.0.ebuild 1340 BLAKE2B f179ad055c06273da8250058379bf7f2b5f7a4bb39a42a193a9db1e69d3c906550ca3bfaa717845cec388f928e3c57b6e41c476b17b39d69601f67fe248caa41 SHA512 c415bd9e6aefb5681443bf9a84c97c2f17f6e48dd22e7a01304f4d1f525a751cae91e662fd07596e4003b266f3fb95e56af10e0105d913c46695609e688c56af
 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 8defa629259b..389ad1535b13 100644
--- a/media-libs/libass/libass-0.14.0.ebuild
+++ b/media-libs/libass/libass-0.14.0.ebuild
@@ -10,7 +10,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-fbsd ~x86-fbsd ~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/libcdr/Manifest b/media-libs/libcdr/Manifest
index 3e456efe368e..93ad02cfc61d 100644
--- a/media-libs/libcdr/Manifest
+++ b/media-libs/libcdr/Manifest
@@ -1,6 +1,4 @@
-DIST libcdr-0.1.4.tar.xz 609592 BLAKE2B 201ed19cfe9aa93137279dfa6b9c3908691b2bddd1e8b7fb25505ab475cb8ae533d1b27857c99e36f618938aa7ee88075c3c7f5780872abe68994f380dc893c8 SHA512 769b0319b5a904ce9f727b7076f82cd915ecd8c9e5e2456416e3e6739c6403bbd4108787ab124d36efb1b47d5c9e37c48b0e12d096eb440ae8f9979ec06048a6
 DIST libcdr-0.1.5.tar.xz 612252 BLAKE2B d23c7ae0d0f5cbdb535bfba4dff4ad40e8b0633115cbc8c5b3a40343d941eaeafbffafe99ba2107640eafdd8181ab6eed7917095d05644a43f2b11cfcc66f8f1 SHA512 e985389b0cbad65dbfa9f59d7f9dba55f1684f63e852f9acca9abb863cdaab17072e761b48dca690673360d643686b5e9bc9878530f0a3a8b5b98d917f892cf0
-EBUILD libcdr-0.1.4.ebuild 1165 BLAKE2B 52b9a6e747d26e2ab7d649faa3c9f7ba7e02973194fcb259963790ab387d1580ee6e35ef2f93d32017329d322a8476d0a312c13f624f7bb9816f9a438495f539 SHA512 50105446ee1d69d75fe6583c123f66832803da3987d9b67402d6e415ca2cc31a430a48b85e455bb43798a5660c0b6ece8e01d4b09596d066f1cc45a2fde8a842
 EBUILD libcdr-0.1.5.ebuild 1160 BLAKE2B d0928d3a66257d38b2332b56605f626c130d5e9de79beedd8689137014b111591fbfd7f2059cac7ac8704648324b9de52c27546f4784e3fa67db64cd0396d7a8 SHA512 a111403928d5e6cbef9def49c3f2860ea7d0810b3cf72aa57f0d2acd81b8f9d014fcd491546d5ffed26dc4ab6bdc4be66cd1fddc20d7eb0062794972b26bc3ac
 EBUILD libcdr-9999.ebuild 1164 BLAKE2B 2ebed7c2dbd73964ea5a203693681b51c9e4dd4fcbfe24723dd3a92ee82ac286edbb9eef311fc891cff3cab2990084e176b6453b17dfbfb7df6120d29acd5389 SHA512 c4d2fdaeb651c2fa6065b7c7355375cfd813547d4007e0bdc37de70c785f99eee0f435b568e2dc7825390ee1832fc6b6e5d572ec6ea50a9a8b379cd254b55c94
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/media-libs/libcdr/libcdr-0.1.4.ebuild b/media-libs/libcdr/libcdr-0.1.4.ebuild
deleted file mode 100644
index 44206df91764..000000000000
--- a/media-libs/libcdr/libcdr-0.1.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libcdr.git"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
-DESCRIPTION="Library parsing the Corel cdr documents"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
-[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libcdr/${P}.tar.xz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
-IUSE="doc static-libs test"
-
-RDEPEND="
-	dev-libs/icu:=
-	dev-libs/librevenge
-	media-libs/lcms:2
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	sys-devel/libtool
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cppunit )
-"
-
-src_prepare() {
-	default
-	[[ -d m4 ]] || mkdir "m4"
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	# bug 619448
-	append-cxxflags -std=c++14
-
-	econf \
-		--disable-werror \
-		$(use_with doc docs) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libclalsadrv/Manifest b/media-libs/libclalsadrv/Manifest
index 3fdc0943db5a..687ec1360997 100644
--- a/media-libs/libclalsadrv/Manifest
+++ b/media-libs/libclalsadrv/Manifest
@@ -1,8 +1,4 @@
-AUX libclalsadrv-1.2.2-makefile.patch 1069 BLAKE2B 774de63a62920b35a300b8da252e962b1efe0eb884162ad9948e9695dd67c4dcf562ccf205cc1968be3553d5a22d9119fd6bf599843a3d1c2943c0c9b2915a5e SHA512 07c812f168a4d51439b1d1c135bec7d6512b4d0fb8010272e35e184f988eed6e2abc3d6a547fe5894e0741f542c817a45660798205e3bd69baadb5e877bfa6cc
 AUX libclalsadrv-2.0.0-makefile.patch 980 BLAKE2B 1d52c923cb57e0279e3cff4dcd9cc9b47426ca9f6bae2e3f5208b59d64ad591df903e4482be94dd36a7ac3106eb31d4144214614e46a872036aea78dcb03e321 SHA512 1eb4f2ce611f7677a6cf547a0439a276c8788b165d2f6b0ee6aea02d72af6da9a6e94faa04791ba16a25243338d25cb23a8987813e0e6b82110c7b1e9d0d9ac5
-DIST clalsadrv-1.2.2.tar.bz2 12593 BLAKE2B a01976bc2af473c6bd9689626e5e7bc22c9cae6e872f6a67aef5fc379ba437737d4ecc95e0ee3c6d54b4a5fc447a361d511a7cb422eb896178426e55c1629875 SHA512 a1b15551488d0bb597339804b36ed4cbb2459db24a3f71c1a068e3874eba10059668d358d8e0202b2964d3b80ed41d51f6db657614102a9a2b99597a7cd87106
 DIST clalsadrv-2.0.0.tar.bz2 14373 BLAKE2B 22166ac4591470cf49f9ede4be9567b33e101f0c9d24d1916376cf016c9dccdf29d94c645be95f0d02444000bc79800a22edcf97dc43ac080254f1233132e24f SHA512 6913fefa913ef50a8245541a7a1cafe76d1768bb4fa302d6ac0db86b40cc8b702ae3d257d0998809cc26f116a69db591b73f01a4ca0021bd062189438ca69ab8
-EBUILD libclalsadrv-1.2.2.ebuild 777 BLAKE2B 0df5dc638a513e3b8ab16fff6049075246d8134831ae11558f299f9c18f36a68abde009b1ed15775caf1fb7b2e7f464a0218af01c019a9dcd23aa30c95b3e71c SHA512 e7424c2de29b4876cb60cf2f45e45677db41ff4ae3f53270c94aef86bdd5e3f2ece13e3461c88fb7dd7f64768ccb3e5c0e1492e5beff663649b1722a000f8dcb
-EBUILD libclalsadrv-2.0.0-r1.ebuild 620 BLAKE2B 8d8f01d0ee8bb17adadbc416167ddeb90644664afc1d72f1912ec3c0443a55efe24f6608f9fe5858e6105175186cd78f79b31f2662b2b29f7ed971efe6d09780 SHA512 c4db11b0e5769596a7906d6a2560b5e4fd16713c8eb0efee8ab25b70dbc6818154d3c5a6db8d8f9681bc981ba5c3c0f8168efd96bd1e76c0c79809ca97c62609
-EBUILD libclalsadrv-2.0.0.ebuild 650 BLAKE2B 190d33353fe7a24f306b045ffaf981592578ce995a00df8dc05b7fb6fb6fb1cb1241c6e73e34a41db86d91af2bffe218bc873c19cbc8a0e326e7ac121f8fd6e0 SHA512 99277fb3cca1205193a120d6960d170505cb246e81cb9a4d727c26f84b4bd7bcdf5d749a1263a452c29ee677e2a7b3b737afb1a23470b302eff8347270005b5d
+EBUILD libclalsadrv-2.0.0-r1.ebuild 619 BLAKE2B 4a65afa895bc5f25677178e257a2969db8911a0d0f02832fb5f6b8e0da8cbc42007df2603535ef2915217b0389f62fe202365909682286d515f6374e94fe40c8 SHA512 122131ec2dab5f0985592aada4e85ef4e87d60a212823c4667f805a840ac7430381fe55006d4b004e975fec0f67252576a9fb0bb39e5bb9436d09566f0ad2634
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libclalsadrv/files/libclalsadrv-1.2.2-makefile.patch b/media-libs/libclalsadrv/files/libclalsadrv-1.2.2-makefile.patch
deleted file mode 100644
index dd7845f6c52e..000000000000
--- a/media-libs/libclalsadrv/files/libclalsadrv-1.2.2-makefile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: clalsadrv/Makefile
-===================================================================
---- clalsadrv.orig/Makefile
-+++ clalsadrv/Makefile
-@@ -28,7 +28,7 @@ VERSION = $(MAJVERS).$(MINVERS)
- DISTDIR = clalsadrv-$(VERSION)
- 
- 
--CPPFLAGS += -Wall -I. -fpic -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2 
-+CPPFLAGS += -Wall -I. -fpic -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
- LDLFAGS +=
- LDLIBS += -lclalsadrv -lclthreads -lrt 
- 
-@@ -42,14 +42,14 @@ CLALSADRV_H = clalsadrv.h
- 
- 
- $(CLALSADRV_MIN): $(CLALSADRV_O)
--	g++ -shared $(LDFLAGS) -Wl,-soname,$(CLALSADRV_MAJ) -o $(CLALSADRV_MIN) $(CLALSADRV_O) $(CLALSADRV_DEP)
-+	$(CXX) -shared $(LDFLAGS) -Wl,-soname,$(CLALSADRV_MAJ) -o $(CLALSADRV_MIN) $(CLALSADRV_O) $(CLALSADRV_DEP)
- 
- 
- install:	$(CLALSADRV_MIN)
- 	/usr/bin/install -d $(PREFIX)/$(LIBDIR)
-+	/usr/bin/install -d $(PREFIX)/include
- 	/usr/bin/install -m 644 $(CLALSADRV_H) $(PREFIX)/include
- 	/usr/bin/install -m 755 $(CLALSADRV_MIN) $(PREFIX)/$(LIBDIR)
--	/sbin/ldconfig -n $(PREFIX)/$(LIBDIR)
- 	ln -sf $(CLALSADRV_MIN) $(PREFIX)/$(LIBDIR)/$(CLALSADRV_SO)
- 
- 
diff --git a/media-libs/libclalsadrv/libclalsadrv-1.2.2.ebuild b/media-libs/libclalsadrv/libclalsadrv-1.2.2.ebuild
deleted file mode 100644
index 47f606a66596..000000000000
--- a/media-libs/libclalsadrv/libclalsadrv-1.2.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib toolchain-funcs
-
-MY_P="${P/lib/}"
-
-S="${WORKDIR}/${PN/lib/}"
-
-DESCRIPTION="An audio library by Fons Adriaensen <fons.adriaensen@skynet.be>"
-HOMEPAGE="http://www.kokkinizita.net/linuxaudio/"
-SRC_URI="http://www.kokkinizita.net/linuxaudio/downloads/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-DEPEND="media-libs/alsa-lib"
-
-src_unpack() {
-	unpack ${A} || die
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-makefile.patch"
-}
-
-src_compile() {
-	tc-export CC CXX
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake LIBDIR="$(get_libdir)" PREFIX="${D}/usr" install || die "make install failed"
-	dodoc AUTHORS
-}
diff --git a/media-libs/libclalsadrv/libclalsadrv-2.0.0-r1.ebuild b/media-libs/libclalsadrv/libclalsadrv-2.0.0-r1.ebuild
index e93a49b9e1cf..8c8c6d31553e 100644
--- a/media-libs/libclalsadrv/libclalsadrv-2.0.0-r1.ebuild
+++ b/media-libs/libclalsadrv/libclalsadrv-2.0.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="media-libs/alsa-lib"
diff --git a/media-libs/libclalsadrv/libclalsadrv-2.0.0.ebuild b/media-libs/libclalsadrv/libclalsadrv-2.0.0.ebuild
deleted file mode 100644
index 54f5b2432558..000000000000
--- a/media-libs/libclalsadrv/libclalsadrv-2.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils multilib toolchain-funcs
-
-MY_P=${P/lib}
-
-DESCRIPTION="ALSA driver C++ access library"
-HOMEPAGE="http://packages.debian.org/libclalsadrv"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="media-libs/alsa-lib"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P/lib}/libs
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	tc-export CXX
-	emake
-}
-
-src_install() {
-	emake LIBDIR="$(get_libdir)" PREFIX="${D}/usr" install
-	dodoc ../AUTHORS
-}
diff --git a/media-libs/libdiscid/Manifest b/media-libs/libdiscid/Manifest
index b0629072efa5..88c0f66b7876 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 580 BLAKE2B 7a3e57298b9d826276b4e8d56840ab1d35a4e0e148269e46962c70fd3f2c0f5b3f74bfa27494cd0d47905ec422f64b27cbd179b2db0eaffd350b182f6a93f8bc SHA512 b52253ebcf412e321fc39fb89ffc5853e5c7e90102c6cca6f5fc9e266c92312c84c0b0f1aa799513176a6f5564dac851323bc4f644a5fb281547928e6a54e08e
+EBUILD libdiscid-0.6.2.ebuild 578 BLAKE2B b0281073042e29442d203bcfd892545c908d53d08a64d1f1b7dea95f0b0023f804d6a4f30a81508ec5c9a24f0ca9f4ae6cc58b48d6ff6d1a874572fc4ee38725 SHA512 2adeba174cb1cbe7c49a58d1ba333faec0f6a19cc75362142c9f02e22504fbbdffb32352626d2d520d71911070dcd9602c08083789edcb0a84b1fd907d483489
 MISC metadata.xml 587 BLAKE2B e5d8e996c7015f2796f2ec687989c777e85dff7c64e14cedeb8067604841d13256d73ce81ba4601ecea644e1fa5a7ba05b18749b1233498ca193932952510c3c SHA512 02616572b6782adc2285210f4d3fcfcb1e188012eb97a322468e93755a0ccd0a6760885b345bb7845ef6aaaba114b22afcfd02ae5572fb2e4140209adc6db570
diff --git a/media-libs/libdiscid/libdiscid-0.6.2.ebuild b/media-libs/libdiscid/libdiscid-0.6.2.ebuild
index 12e8b233e9ca..b0365d4f5759 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 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DOCS=( AUTHORS ChangeLog examples/discid.c README )
diff --git a/media-libs/libgii/Manifest b/media-libs/libgii/Manifest
index ea283119bb02..07cbe413685a 100644
--- a/media-libs/libgii/Manifest
+++ b/media-libs/libgii/Manifest
@@ -3,5 +3,5 @@ AUX libgii-1.0.2-configure-cpuid-pic.patch 451 BLAKE2B 2a19985eda7c5cafaf40d68b2
 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-r1.ebuild 1154 BLAKE2B a718acbc16b40036f3407fc063622cd6b26afb84e9ddb2f9bd652c6719519445054b66d8085bacb142acdf433b3a6818460ca38a6f4f28fb0b8d53ffa9b1dd01 SHA512 2113ec3bb1b239d64b167cba172e135027d575873740b6bf238f49a4db386048cefa43dcc734b3eabdf601608464b7ea7975ba50384506f140790f5fbfd29ec0
-EBUILD libgii-1.0.2-r2.ebuild 1262 BLAKE2B fe6267a42375aaf4291f9827b5667d2d6ae424d8e4acd9f466255f7fa9f879bc1d58a609fc49929a003ec4694435966e8b7164ae4d3c813ccd5d7b3caee456c6 SHA512 55d38240e014150e7a36970af12391b11c677b6fbd85eda2515a3c9c076247ffd9e20a828a5741458dd3b361fd9c3cb25f4412171cbf5f741b5cbde6ed512b41
+EBUILD libgii-1.0.2-r2.ebuild 1260 BLAKE2B 30977687e7c60707578be4f961fc9fe0e9231837ec8c0f7123acbebf4a6d3e2cf228f303569261d9143c43387152913a798e3c12165350ee8f3e55714169d706 SHA512 3c379d9c627b517a46e8746908665cf98dd21c248e625758477b7b0532e65ca48967420dcee0fb16940c0752c1c78f841233b5521502ea0411e8e4acf96ab96e
 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 774b98cb6aab..d731617ef338 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 ~amd64-fbsd ~x86-fbsd"
 IUSE="X"
 
 RDEPEND="
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 7d7a2e034503..197178328967 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -2,6 +2,6 @@ DIST libgphoto2-2.5.16.tar.bz2 7006551 BLAKE2B 79082e691d4d9061cc35c35cabd7d0d16
 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.16.ebuild 6230 BLAKE2B 14a4b1f316a0f4ba439c42a729cd5fc763662f4c78199edff7765ed5bf70e36e2234f07f7fca9e7a4f42a0d888317449b2342e7eb50412e26048f08cebfb5f4c SHA512 91baa693f5cecc6d54f3d1cf55d703fcfb62bb11b266f49c99e615fb924e20ff70ad736ffca98b67677f2e340b3fb9b55dc4e6215ca41237182b56c5702bc00f
-EBUILD libgphoto2-2.5.20.ebuild 6233 BLAKE2B 445fa8609fe2ad6c4661074fe31c4712c6c45326094cc8a0aaf6916bdfe6d356c98d4c0a179e818c3ddcbd280840c0ea028db66c880a94ac11a09c54059773d5 SHA512 770eae80cdd089c695d14cda014c740e9d466e9920bc9dd2bfddd7f5c4ecfddfa7b45e5a0b8de5a110fe9532d5959126755f43c38f0b5c402130eb7c46e85399
+EBUILD libgphoto2-2.5.20.ebuild 6232 BLAKE2B 3617e5aaababfd54a469f77eb01508fe7341d25e013df88ea76c3775410d615702debc961bffebe69bf885bace54a01b979d1c0a3a0f5e54163af07dc25e1fcd SHA512 4e1d7c288187641e8201f6370134b6e8b379e2e02f56fd713af3477781d6b2df1dc6b6796ea30e24457f9f8919926f308f025236f2d7572becc12f48148bf056
 EBUILD libgphoto2-2.5.22.ebuild 6239 BLAKE2B 2fd9815fc3a3739455c511bb0674a74f023f098403e5f87b697768d8cc00f5fe6e9833f0a01aea2ad094617d687d12b900af216039135e763ef56178e9cce4bd SHA512 62ceef36668d07096784f243b1dcbb2e92ed7299725db4189fbc2056cf34578d52e7df52bf430352f5a3e10add49fa527bbed228d3e996f54223716e1e579604
 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 9e9990c9a10a..ca608de3fc29 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-fbsd ~x86-fbsd ~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/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index a2a821f6bbca..ddfed906e3aa 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -6,6 +6,6 @@ DIST libmatroska-1.5.0.tar.xz 64596 BLAKE2B a14f3f1aef87e2bc05989d3166b562edf852
 EBUILD libmatroska-1.4.5.ebuild 694 BLAKE2B bd3cb928ea029955ea64ca953c29df990e9f433f91f0dd08ffce3e12afd5be04256bba6447f73afe681150242a06d750f3c4bc84c51ce64defd3d1e650543d67 SHA512 58d2222582303d3b556071b46e0fc141836ebbc2b16b5d8c7120a6508e9b798b83b755fe8312f786451ba1fb08bcf62cd30453873b39a73f2c4d9ca3b7aeb353
 EBUILD libmatroska-1.4.7.ebuild 709 BLAKE2B 0cd3c996b2583541cd0db22420d46beb73aade0e6884ac4dca86341df70387d2e513f331b77c08b49dc7dcbe4f0072647996e4c4012bc40f3a2b3d6cc38a8175 SHA512 c1fd7b67325fd6895676f0391809dc71aa77b2d2b2bbfcc22b454f19ef692ae080ced026e1189d387a454723d6573831a0e9cb3d48691a1690f2235b7f98f5b5
 EBUILD libmatroska-1.4.8.ebuild 701 BLAKE2B 8db0db6e5a931f685f76fe67e9dba35ecdf54eaad1f4b4e496e2df77a8d3f468ec2ace53b7b906047cc3cb716f5919f0b37001a640233a7f853d8241a0857efa SHA512 a7a35513c071dd2f660f77dc3f2c062e183d062b913bd6d305b178ab1f9f87dd82bd6e3d0ca0a366b4133c322025f8b025bf211ef8e955770ce41a609d34d1f3
-EBUILD libmatroska-1.4.9.ebuild 664 BLAKE2B 1231641eeedea1089c315c28ff4be133afedd5fcda0348cc3a6a4b000790461713b161484b61eed6dd9fa598c0e530b689fb0e8dc5fd9f04031e372d21ea8a23 SHA512 b261cf12d71a9ac41d77e9b0efcf74a691fdc8203f4e66c4129e72af96fcf06c253163bc4e93520730ff25eda514970530181c639b54ab1c197efd4399b33b5e
+EBUILD libmatroska-1.4.9.ebuild 663 BLAKE2B 32c6ce1248c12b8aa8139fa4e11694b2c72d99130b3121f0b2d8756aa8babb48473f5b2463b32f99c7b23facee266b8246bab17367d6242462dec5f819b01474 SHA512 a7ac97ef3af5a85252ebcc1ef7baaf47c9f1b1a740502748ba4c1758ff0fb225bfb1056e4605228c0c10ec638c5c7ca6f3ea68f43583bb076dc49d66273f8de3
 EBUILD libmatroska-1.5.0.ebuild 670 BLAKE2B e78268605d9dbe15a367f23354efb9e284b3fefc092892c4de2956edb3ba158b12340894f4a375351aaab639a09999a54dfdc76ebcf653668e0bbd9eab6545fe SHA512 1138fb82839cbcee9a9b0438d937ff047012e88151615cfa5027b1f12adb4d4a76cea3b41cad591ed1c247479a5c269d93fbacb9bd5638a5036b771d6ac0cb5d
 MISC metadata.xml 320 BLAKE2B edd6b2e35a7833d3510edec80f3771a319cbb257cbb203e0f71f33636431496c620cb3307b2bebb44360d6932a7e4376b0d134f3f42d26fc9271423c2eed11f6 SHA512 5c1dad06e1fef24b1ec68fb6b12d0d17b4bd05f22b1953f713c25a513340cb08540eebaec32fbe7c6607ba2142a057b8e6e5743a929b7368665d91bc014f35a9
diff --git a/media-libs/libmatroska/libmatroska-1.4.9.ebuild b/media-libs/libmatroska/libmatroska-1.4.9.ebuild
index d6fdadb7c1a2..9b9b4b1e6944 100644
--- a/media-libs/libmatroska/libmatroska-1.4.9.ebuild
+++ b/media-libs/libmatroska/libmatroska-1.4.9.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 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/libebml-1.3.6:="
diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest
index f0637e179c06..dc831a23153e 100644
--- a/media-libs/libmikmod/Manifest
+++ b/media-libs/libmikmod/Manifest
@@ -3,7 +3,7 @@ DIST libmikmod-3.3.11.1.tar.gz 1240373 BLAKE2B 9de58eea739f8f7a5c4ff482093974f67
 DIST libmikmod-3.3.11.tar.gz 1240329 BLAKE2B 7f5ceb26cae2e7e53ba5e07bd6e8f29384d9b62863b3c62e147efb1581a62d104d5abefc12eae12d97d55d672436d613679cdaef81365d34af14f240e48bd680 SHA512 61866fee68d91ff967ac2bad041e70034abbb4c095bba0475ed02cb81a467621a41a0685957cd9b5c19ec5218885ad42dc655443d67e01aa2623d91c0496dd63
 DIST libmikmod-3.3.8.tar.gz 1254702 BLAKE2B 4131dffd201061d6573cf46d78b569bbfa0e828261914bad2c278986b64aa4b9de3525e28b64eda4cebbce12a5ec512ed525b9c18e20b51166e40653f64b4e71 SHA512 033e3977d5723c42af697bf1b9ba6b1912fff1bfbef1894e2b1919d55415efa8024046579ff6a1e9ec752a3c793acc60b616c223b3cb5d79a814746c0cf55e15
 EBUILD libmikmod-3.3.10.ebuild 2047 BLAKE2B 94b45940812e21e9784217bf46d75b3f5997e0c7776238a8587af37fd50696cd268c081cb1525973e526302416d22eb1e586c3cc1224ec5f7a7f2de1f33c850e SHA512 36369710a60751bfa25646e83e8370b5a9d1a1972fc80714b374bb7a26ffc7fb1b2112a2f5dc86ff078e782bba8d3f2045cfccb6b663ee3855b4fe80995cb5a7
-EBUILD libmikmod-3.3.11.1.ebuild 2156 BLAKE2B fc8e0074293d41381b452a0a4db6ea2fe15a2c9e9d1e5346cc9076c4979cf251f0ec8a51c08d4237ee2fc5f628229a12da53e21b51b2465b7ac20d9d13beca66 SHA512 0858a6fc79eb75dc92edac4783762d0a4197f35f1f81c54c3ea851c6a98d7a93c277a3dd40e9ee3fabbd7f77db5a230ec41ff7dc536df25d5152429c23dd53ec
+EBUILD libmikmod-3.3.11.1.ebuild 2155 BLAKE2B 3a082cb5134e787025fa9c2274d51fd6aa190e709e950af65dc8eaa935bd3ae368765fad9cd5294bb8f87ec59201266507a426eb2b1b344f78146f5d30f27e79 SHA512 bf88093b6c74a998a17f765fd21d1d58c1254b18bde8dc6225d333538e12645ba64ab5dbfa2b3d2b306e07a084fff30d53aac2a2104d5176a3cbba1caacae856
 EBUILD libmikmod-3.3.11.ebuild 2158 BLAKE2B f746c9fbaf02bf7fdcbb23fc9ea76a1df5f5322784ed9c88bd3104cb07d129ce96ff3c9af26b46cf005aaaae35e436a851da5898da7c9bd23127ad4e49ca5a77 SHA512 749ed3eb424efbc6517bb3825f52d97048f8a48f194df3b668244521d1ac5647d72fa1b8ca08aecbb9941b7200c5fbee4dbd2e3bb71275e63ad5b1c2bbe9f46d
 EBUILD libmikmod-3.3.8.ebuild 2025 BLAKE2B 17652c792f297c2df7796a0701a90695cc66849a7ac4426ed3cc41657249c98d5c7b83732ac5a3d199f2ff7a5f47831db153fdeda8093408d5d96d9319c65afb SHA512 fb49e02feb167be764d6c0e0a92a5d9d847a0d7f0e1a639f28e0245bf2a8e569d2e03850b7b6f878252f5b0ebf4e3d4598c8bf6dccad73b7beef1a744652413d
 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 b134201129d3..0d732af395e4 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 ~x86-fbsd ~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/libmp3splt/Manifest b/media-libs/libmp3splt/Manifest
index 96ead25d5e2f..941fd8a87418 100644
--- a/media-libs/libmp3splt/Manifest
+++ b/media-libs/libmp3splt/Manifest
@@ -1,8 +1,5 @@
 AUX CVE-2017-15185.patch 1132 BLAKE2B ae218573443dc724c4136cd5602c14965a146479212c769929e1a60be2f2056b2703351adb8dcee92851666557db71d8303347921343d94a4db96848da827086 SHA512 5336c71917c34b84c882b2afd01d31141db816c1a6293ab1cbc87138b4d7a8288d4ebea8fc7cf882d907c0c07f5b827d9293dda082d6c8ecf3aafd002e540951
 AUX libmp3splt-0.7-libltdl.patch 672 BLAKE2B adca950fbde7d41e6c657711964b8db2ce0b607750aa1227eeb1f620c3cc47306ea1f5c064a297e563bc9ef83e99e2d5a658b6292b301ff4d3d12fb3906a7d32 SHA512 8707dcf0a23f6466c0f8d0bfcce8ecfd8840ffec09f3c7a66f039be5f707b0b561d5462ad9b170e2bca9dc4872a61114a8d515f702b9e7e79af2deddbce6385f
-DIST libmp3splt-0.9.1a.tar.gz 702948 BLAKE2B 96661e2fdc96d1ce4555bfc9b84f44bb1ecf9bd05f6b6038274a3097a657707bb6c6ef8b2b6ecf673c390f52a1885a6c91b555c1971d490df7089523d0739329 SHA512 07229c048c4f999c7c723ab2f7bb06807d264609c8c1e38f8ff40f11e54285212de71548bbd66ba3100287d563673d80a8704bd384d7ffcd2145a098faabd389
 DIST libmp3splt-0.9.2.tar.gz 707598 BLAKE2B 4e8223472a7cd05d71d7df81a88b7d545a726a45d62dc6284d694e8cf8ad9406b037e274dbe28f2cf95febc87d8ba30aa15291f58df95b83a3aa0b5d3469ffea SHA512 e5c98e8b173bc86302ccee4ca5eb0c8a8d93f225357eb7b14dea8d0700ed62ed6316506c182f6b295130f7924ff0b38e865d5e49fa9cd7882c648360d68872ed
-EBUILD libmp3splt-0.9.1a.ebuild 1244 BLAKE2B 1809d4d5b3da03405fa6080259ddd79967f51ec40c9975f0a22a785f26aec47eeebd34005a592164c43f9d1798320af7813828e6a2fdd76ba02ae606abf0dfd9 SHA512 39cd447f9f20810b14b4864df837d58952ffc52d6947cb0ba672e1b4bed87da12eba7391a19cab3fcda5336b9de36d565da917a1f99f140d455a72eb3a96e285
 EBUILD libmp3splt-0.9.2-r1.ebuild 1288 BLAKE2B bc0b8c40c8ebb4071f1a5c83fbb935f8ae7b12ed58cbe2c793aa322af1df66a198f514d753c6167d1ca097fbffb04fa25f5c061adb3710f8aaea8324e5b007b4 SHA512 da69ea6d241db86f016bbb417dbeb358cd4c3dd4cf3aa8428d2e355dc3ae6f0df163982283c7d9c26decc3f1ff43c61f196dc1599ae954094a2cb024dde5c42f
-EBUILD libmp3splt-0.9.2.ebuild 1245 BLAKE2B 23dda3aa0055c03908bc81994f2e7e819be9e79066b939d4fc23bf3f0cc55ce66b85d7bd3194a9405ea3e43c8829285f94319c149568aba6febbb6f8afe9980a SHA512 899074eb64a40a328a0ec8afa7784ae362cf13d76167d6427417f0c99a4aad3068134ce7ae866c55e6a855c83bb0507f8afd0b407b9479197f16dc47dcfe9005
 MISC metadata.xml 330 BLAKE2B f237f66bdf5752ca2864a72cd27918776b88b73d113a2aff324dbbe53956973421724b3babd3e25892d0894184bf842dbe3cb48cd3514285e500110c7d7bb1ac SHA512 46486e0840a5f4891a1d611ba22e1e540d0e16d3cf61ef362e1085d188a75b5297e6ac2abf8c3af40eeabf246c076958dc2fc8b9cce5f5bdd248b282491afc38
diff --git a/media-libs/libmp3splt/libmp3splt-0.9.1a.ebuild b/media-libs/libmp3splt/libmp3splt-0.9.1a.ebuild
deleted file mode 100644
index 0a8e12de1cc7..000000000000
--- a/media-libs/libmp3splt/libmp3splt-0.9.1a.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit versionator autotools eutils multilib
-
-DESCRIPTION="a library for mp3splt to split mp3 and ogg files without decoding"
-HOMEPAGE="http://mp3splt.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN:3}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
-IUSE="doc flac pcre"
-
-RDEPEND="media-libs/libmad
-	media-libs/libvorbis
-	media-libs/libogg
-	media-libs/libid3tag
-	flac? ( >=media-libs/flac-1.2.1 )
-	pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.8.3.1 media-gfx/graphviz )
-	sys-apps/findutils"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7-libltdl.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-static \
-		$(use_enable pcre) \
-		$(use_enable flac) \
-		$(use_enable doc doxygen_doc) \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-optimise \
-		--disable-cutter  # TODO package cutter <http://cutter.sourceforge.net/>
-}
-
-src_install() {
-	default
-	use	doc && docompress -x /usr/share/doc/${PF}/doxygen/${PN}_ico.svg
-
-	dodoc AUTHORS ChangeLog LIMITS NEWS README TODO
-
-	find "${D}"/usr -name '*.la' -delete
-}
diff --git a/media-libs/libmp3splt/libmp3splt-0.9.2.ebuild b/media-libs/libmp3splt/libmp3splt-0.9.2.ebuild
deleted file mode 100644
index 78ab615c50ec..000000000000
--- a/media-libs/libmp3splt/libmp3splt-0.9.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator autotools eutils multilib
-
-DESCRIPTION="a library for mp3splt to split mp3 and ogg files without decoding"
-HOMEPAGE="http://mp3splt.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN:3}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
-IUSE="doc flac pcre"
-
-RDEPEND="media-libs/libmad
-	media-libs/libvorbis
-	media-libs/libogg
-	media-libs/libid3tag
-	flac? ( >=media-libs/flac-1.2.1 )
-	pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.8.3.1 media-gfx/graphviz )
-	sys-apps/findutils"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7-libltdl.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-static \
-		$(use_enable pcre) \
-		$(use_enable flac) \
-		$(use_enable doc doxygen_doc) \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-optimise \
-		--disable-cutter  # TODO package cutter <http://cutter.sourceforge.net/>
-}
-
-src_install() {
-	default
-	use	doc && docompress -x /usr/share/doc/${PF}/doxygen/${PN}_ico.svg
-
-	dodoc AUTHORS ChangeLog LIMITS NEWS README TODO
-
-	find "${D}"/usr -name '*.la' -delete
-}
diff --git a/media-libs/libmygpo-qt/Manifest b/media-libs/libmygpo-qt/Manifest
index f8be36eb1853..a2a6517a1abf 100644
--- a/media-libs/libmygpo-qt/Manifest
+++ b/media-libs/libmygpo-qt/Manifest
@@ -1,5 +1,5 @@
 AUX libmygpo-qt-1.1.0-qt-5.11b3.patch 4991 BLAKE2B b79e01b8c72c9248ebcdda72f7051e799a399a8153785ec35cc223ff64e0707baa856846720e79acd5fc93bd73ea7e1ac8b48e8fc4a853970019b0eaac227a55 SHA512 91617ce03cfb94c9524f06dc5dd3af0c84b5b7af279cc8e13b8d4cc221b6d86c4f28347039a944f9002c57ba65bdf8c870e6076b7877ee1c88e1fefa31c1776c
 DIST libmygpo-qt-1.1.0.tar.gz 64959 BLAKE2B 85c8eebe036b5755ce6c765c2c19796532dcebbef1a7342a0f47b84ba7466de87334fd85f844c9f3f6ecf87352d8a5ba523480f1550b4928c67a3f0fe12ea902 SHA512 a24243a98b8e3544127b09e5c678d692e11ad0ad7ee8427e71b0d7cfd9455d068e4445bcd4d8d5ba94d8c0ef1b8f42390b544585ef258b5ec175546ee7bcd86a
 EBUILD libmygpo-qt-1.1.0.ebuild 917 BLAKE2B ba6028461c4fe1b3f3f98ec90bbbd241a2370ecdfe9a44f9ce219db3bab73e5c6debdc42a31db2db1d0f57fd0f9784e2067517435f72809bfd40c6af3494c1d2 SHA512 c263ad175340f7d69c461df692940ff2f5dd082a9c6c61fdf32396e8ffb114069e2d078691aa9687928f121031bf103454f98e7d144ee9abaf31b0d945e9ea69
-EBUILD libmygpo-qt-9999.ebuild 763 BLAKE2B f939dd1c0f26fb2a940b83d3a709dfac0c7e6ebf25c07c56175313015a4b109333dfbe3bea6c64184a7c3488f3d6faba8c53842a044c990c2daa2dcd75403990 SHA512 3e010b8c420eb3a605f2490cfea52d30e5147abcd5601575dff993743f3a459bdba7abcbe0e5c5371f6f4905f6d7ac5c70e34b9cfff7d71b06994c08d90c9a74
+EBUILD libmygpo-qt-9999.ebuild 772 BLAKE2B 0ff6f24271b4a5058ecda315855ee351a5e5ed04b546aaac5f3175ca0c31892928363c4a5c3c610a7d33feac880040c8d092585646bda54ec4375fde839d2fc1 SHA512 52834c2a3279fb8b27691e7277aa76a598c2896298171de7d607595dec71af81d94edce39aa61a24922ab9cf771a3f0cb9efd2aac60fca23b89157b181614ce7
 MISC metadata.xml 347 BLAKE2B 22a365b5f63dd847e2b9ed77d778fd645c8ebb5cbe30f933488739b5e039f879eecb5d07b176a29cd43defc9bb9a73d241c898623c11b60e753fd9a801b823ea SHA512 c9a3b16cdced1a5876ed473cce964ed24e72fac4ed6e78de8d74ac0bac4c3d1a9b6d372e4f2271e1aca75125f22c25c84a2acae448e514d623d524e844bb68db
diff --git a/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild
index bbdf31f17c53..0074f5e52b91 100644
--- a/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild
+++ b/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild
@@ -1,7 +1,7 @@
-# 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 cmake-utils
 
@@ -20,12 +20,14 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="test"
 
+BDEPEND="
+	virtual/pkgconfig
+"
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtnetwork:5
 "
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	test? ( dev-qt/qttest:5 )
 "
 
diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest
index 2bcf8207e3c7..5b8718da74c1 100644
--- a/media-libs/libmypaint/Manifest
+++ b/media-libs/libmypaint/Manifest
@@ -1,7 +1,9 @@
+AUX libmypaint-1.3.0-gegl-0.4.14.patch 4368 BLAKE2B f4094718153e1cf08a173f2a350fc63e0993de839763b1e733214c1966c00f14e8c5e760b0ccc113401d82078af92b19938f9bd6ea96ca3caf41883eef82d548 SHA512 cb0cf38330d820681d6b089884ac8af13ac24c0600807a5c301bd03a5387df9e1a17caf3519985deb188a28b4a9c8d6c5f9d19cf2a481a4a696c871f997244d2
 AUX libmypaint-1.3.0_beta1-as-needed.patch 804 BLAKE2B 8aa4f9215651b540cb9517851f13bea57df56b4ad9cacfe7d2e176060773a6ae4f0e7506cc4325b72cdb8b99e1c4bd0bb274dd1956262909a33d66834cdce618 SHA512 49853d92f723690d67edb35b01e0907c314b07f99f468e73256faaaa49d4d3a7a35fd4b7b0d897223c14f4567d2f8d33689a21deee80d82413f72e840fea888c
 DIST libmypaint-1.3.0-beta.1.tar.xz 421424 BLAKE2B 3ca1718035de301ffe037ab25b5e6e7c48f92a31ba337b6652977cae71d94e2fa11f01f81b87598e71392d51e13747e82d813d35e981753c85674f0f8b5bb167 SHA512 ae98ec8947d521749d82bc1e683efcace2da7e3c8b8453e79e5191d65225f0963394344628d646947f79b141503d268277d26ce2eeaf482bbe24f1bfb1d103fa
 DIST libmypaint-1.3.0.tar.xz 438160 BLAKE2B a018ba2dc2b2cf2f771e871a0cb769887d962c18f83315d1c77864f567ae69aa16a1d55b770f46527990995f0dc940516371485d6f3d4f3cc332623fc408c248 SHA512 553eeb3439ffd0c013e33254a16334242583b8bab76d1a3e937f3ed1d7e05a832c6eb26acd7220dce20c6a7d997c32afe828202ce48e25a5fe57b67efd853fcf
 EBUILD libmypaint-1.3.0-r1.ebuild 1380 BLAKE2B c17825bf21bfbf5774a85a2f2b088ada6b700d3ea7f39b7a5a87c190a4ee18b209dec2b50524c0e24f0d206305f4adb553c9e990ba40b1d4277dd7361d0f2e01 SHA512 f8ce3da4972b0138025522aaa5cba4f78bb10d049b94fe13af1b1b3a53d4f26c3b5ab6bf4b213458f95ed65ba8f16b197fca6a70c5d1ef88c9df70d9958e0ec0
+EBUILD libmypaint-1.3.0-r2.ebuild 1461 BLAKE2B 2f6429f2b99c144dba254bce0f20d8110f553d6007c23b8d933090d2adbfe749249415ac42bcea68f4d0cd874fab7cc2b1c3791e899b05f85ed2689e5314cb8b SHA512 e21750363fc23262d7614ee879bd9580e95cfa0bf10cef555eea73a39f52edbe4cb8db7f71b5e755dca05170245326b244f8509111c7a87a31128ee39b0a1189
 EBUILD libmypaint-1.3.0.ebuild 1308 BLAKE2B 3687ae2f158f53afe6768ae4db384098f0f34a606562224831bfc6a44f6aef8921067a93b8fad5678413abe6de328aed787ba8d5069d32c3e7ea5ba9622adca3 SHA512 b7efa95bd8315bedf22a8415e742507569ee38243c167d4f09668cc6477878f25642a4947867e550030f244b1c97f16647f0e90ebf8c8b52daa163608c200c9b
 EBUILD libmypaint-1.3.0_beta1.ebuild 1346 BLAKE2B 84a0e4528d9ce0096f39d2f3f495f1809d1e49f20230f06f9411aec57097197a7aae94724807e85879eee30a1692dbf6b843c2b24f1aef96279aca4f81119bf1 SHA512 4ff1f158d528fac42e70c268a89884ff23b46810fcba8452a7426657537fd246c65e45e8e0e75280f8d0e03b863b2c5552b1c16164cfa97bf6d7a7096b0257e8
 MISC metadata.xml 417 BLAKE2B 475b260c1300908d836d6ab22ac6d302b28502a817c5e0bd2cd3be2d4331b91db0d4579b4a38c78d81b02e37549fad8511f2b964f9020719bee38f531c627798 SHA512 2e106cc8c3dc9249aa34eefedefb2dbc72e9992e19f6bfef425393629d3e676ebfbaadba9c8fcc13014158d98fa463ff49c812103b11524c851cb0b457ad0f7a
diff --git a/media-libs/libmypaint/files/libmypaint-1.3.0-gegl-0.4.14.patch b/media-libs/libmypaint/files/libmypaint-1.3.0-gegl-0.4.14.patch
new file mode 100644
index 000000000000..d59cacb3a5d3
--- /dev/null
+++ b/media-libs/libmypaint/files/libmypaint-1.3.0-gegl-0.4.14.patch
@@ -0,0 +1,100 @@
+From 068e5f7ecacf152a9872441fb2f67b8578448a5b Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 28 Apr 2019 20:24:05 +0200
+Subject: [PATCH] Depend on Gegl >=0.4.14 rather than 0.3.x
+
+Inspired by
+https://src.fedoraproject.org/rpms/libmypaint/raw/master/f/libmypaint-1.3.0-gegl04.patch
+
+Gegl commit introducing breaking change to GeglBufferIterator:
+https://gitlab.gnome.org/GNOME/gegl/commit/9dcd2cde63f95a080bf16a58c10e9ffbdd99aace
+---
+ configure.ac                | 4 ++--
+ gegl/Makefile.am            | 4 ++--
+ gegl/libmypaint-gegl.pc.in  | 2 +-
+ gegl/mypaint-gegl-surface.c | 5 +++--
+ 4 files changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7a5b231..95473d0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,7 +22,7 @@ m4_define([libmypaint_version_full],
+           [libmypaint_api_major().libmypaint_api_minor().libmypaint_api_micro()m4_bpatsubst(libmypaint_api_prerelease(), [^\(.\)], [-\1])])
+ 
+ # Dependencies.
+-m4_define([gegl_required_version], [0.3])
++m4_define([gegl_required_version], [0.4.14])
+ m4_define([introspection_required_version], [1.32.0])
+ 
+ AC_INIT([libmypaint],
+@@ -312,7 +312,7 @@ AC_ARG_ENABLE(gegl,
+ )
+ 
+ if eval "test x$enable_gegl = xyes"; then
+-  PKG_CHECK_MODULES(GEGL, gegl-0.3 >= gegl_required_version)
++  PKG_CHECK_MODULES(GEGL, gegl-0.4 >= gegl_required_version)
+ fi
+ AM_CONDITIONAL(ENABLE_GEGL, test "x$enable_gegl" = "xyes")
+ 
+diff --git a/gegl/Makefile.am b/gegl/Makefile.am
+index b45707d..5ef22c1 100644
+--- a/gegl/Makefile.am
++++ b/gegl/Makefile.am
+@@ -11,7 +11,7 @@ AM_CPPFLAGS = \
+ INTROSPECTION_GIRS =
+ INTROSPECTION_SCANNER_ARGS = \
+     --warn-all \
+-    --pkg="gegl-0.3" \
++    --pkg="gegl-0.4" \
+     --pkg="glib-2.0" \
+     --namespace="MyPaintGegl" \
+     --nsversion="$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION)" \
+@@ -38,7 +38,7 @@ introspection_sources = \
+ 	mypaint-gegl-surface.c
+ 
+ MyPaintGegl-@LIBMYPAINT_MAJOR_VERSION@.@LIBMYPAINT_MINOR_VERSION@.gir: libmypaint-gegl.la Makefile
+-MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.3
++MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.4
+ MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) -I. -I..
+ MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_LIBS = libmypaint-gegl.la ../libmypaint.la
+ MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_FILES = $(introspection_sources)
+diff --git a/gegl/libmypaint-gegl.pc.in b/gegl/libmypaint-gegl.pc.in
+index 75aa729..9184980 100644
+--- a/gegl/libmypaint-gegl.pc.in
++++ b/gegl/libmypaint-gegl.pc.in
+@@ -6,6 +6,6 @@ includedir=@includedir@
+ Name: libmypaint
+ Description: MyPaint brush engine library, with GEGL integration.
+ Version: @LIBMYPAINT_VERSION@
+-Requires: gegl-0.3 libmypaint
++Requires: gegl-0.4 libmypaint
+ Cflags: -I${includedir}/libmypaint-gegl
+ Libs: -L${libdir} -lmypaint-gegl
+diff --git a/gegl/mypaint-gegl-surface.c b/gegl/mypaint-gegl-surface.c
+index 5c86d3c..e51bb5f 100644
+--- a/gegl/mypaint-gegl-surface.c
++++ b/gegl/mypaint-gegl-surface.c
+@@ -77,8 +77,9 @@ tile_request_start(MyPaintTiledSurface *tiled_surface, MyPaintTileRequest *reque
+     }
+ 
+     if (buffer_is_native(self)) {
++        const gint max_slots = 6;  /* i.e. <0.4.14 internal GEGL_BUFFER_MAX_ITERATORS */
+         GeglBufferIterator *iterator = gegl_buffer_iterator_new(self->buffer, &tile_bbox, 0, self->format,
+-                                      read_write_flags, GEGL_ABYSS_NONE);
++                                      read_write_flags, GEGL_ABYSS_NONE, max_slots);
+ 
+         // Read out
+         gboolean completed = gegl_buffer_iterator_next(iterator);
+@@ -88,7 +89,7 @@ tile_request_start(MyPaintTiledSurface *tiled_surface, MyPaintTileRequest *reque
+             g_critical("Unable to get tile aligned access to GeglBuffer");
+             request->buffer = NULL;
+         } else {
+-            request->buffer = (uint16_t *)(iterator->data[0]);
++            request->buffer = (uint16_t *)(iterator->items[0].data);
+         }
+ 
+         // So we can finish the iterator in tile_request_end()
+-- 
+2.21.0
+
diff --git a/media-libs/libmypaint/libmypaint-1.3.0-r2.ebuild b/media-libs/libmypaint/libmypaint-1.3.0-r2.ebuild
new file mode 100644
index 000000000000..4b4cf2fa1944
--- /dev/null
+++ b/media-libs/libmypaint/libmypaint-1.3.0-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools python-any-r1 xdg-utils toolchain-funcs
+
+MY_PV=${PV/_beta/-beta.}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Library for making brushstrokes"
+HOMEPAGE="https://github.com/mypaint/libmypaint"
+SRC_URI="https://github.com/mypaint/libmypaint/releases/download/v${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0/0"  # first soname component for subslot
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+gegl introspection nls openmp"
+
+CDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-c:=
+	gegl? (
+		media-libs/babl
+		>=media-libs/gegl-0.4.14:0.4[introspection?]
+	)
+	introspection? ( >=dev-libs/gobject-introspection-1.32 )
+	openmp? ( sys-devel/gcc:*[openmp] )
+	nls? ( sys-devel/gettext )
+	"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	nls? ( dev-util/intltool )
+	"
+RDEPEND="${CDEPEND}
+	!<media-gfx/mypaint-1.2.1
+	"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.0-gegl-0.4.14.patch
+)
+
+src_prepare() {
+	xdg_environment_reset
+	default
+	eautoreconf
+}
+
+src_configure() {
+	tc-ld-disable-gold  # bug 589266
+	econf \
+			--disable-debug \
+			--disable-docs \
+			$(use_enable gegl) \
+			--disable-gperftools \
+			$(use_enable nls i18n) \
+			$(use_enable introspection) \
+			$(use_enable openmp) \
+			--disable-profiling
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/media-libs/libofa/Manifest b/media-libs/libofa/Manifest
index a4ad436b75de..6ad3c4f5b325 100644
--- a/media-libs/libofa/Manifest
+++ b/media-libs/libofa/Manifest
@@ -3,6 +3,5 @@ AUX libofa-0.9.3-gcc-4.4.patch 251 BLAKE2B 89e4dbfb168e528a753e7c114f8568411a2c5
 AUX libofa-0.9.3-gcc-4.7.patch 651 BLAKE2B 52a20e9242f5899ad0c08b91ae2d9169642ceb51b87a22ddc0ca641f57f1ae6a342d3b658265caf1d1d3b938fc13b3b717c118839adbcf3e10a78d35cf68827c SHA512 ec337bb839ef2b7477cc4a5c45cf751c1d0371898591865725fe6db05ab25fd8c0297ecbe44d1157b2de56d9bf7284634c668cf5b72ff03a7dca66dba8d99522
 AUX libofa-0.9.3-gcc-4.patch 818 BLAKE2B c49d0f1bc2c364a25c20792ad79d53a5a8abdc9370c272e4159c5a37844061cbc03aecf97933d0c2e2c4b18225d004fb0484456169f78f5caee0fa5ae5a1145b SHA512 7e80ddb700da74d1e2b6c5e65588e6329e8ae231534b3d74b98815bc4919964a9fad87fcdfa2bef0d4adf9d478efd5c1649d018fb347a93c7ae1685cccab8834
 DIST libofa-0.9.3.tar.gz 384043 BLAKE2B 1b4c89e1a26e3bec1b2bde16c5d2c86ae7a66cbe8e450b96974ffd8be434062ccf21779c0eed5a809012a419d65f9de327c6b94fe6ac5365270fe382dbfa2c08 SHA512 058fb43ea296325d2f7ad1762e1fd3f2ad772754b5d53dbaa1c5cd91ac5041ef82c7ea9ac580825e2391fa7db6803ff7fd5b24faf319280211a4641516126967
-EBUILD libofa-0.9.3-r1.ebuild 1225 BLAKE2B 64aa485bf1431f2998034bf693030e4340c259646fde1fb76a453f57d78bbf908197e7b6a26c9ff84314dd40cf07fcb42c9a97201d2940fc0f1cd69360e6c561 SHA512 d1fe57bcd6c8c778b4f940ccd8d8b480cdab008cb93ccd8f39ccf371e9cde85d85ee327ddb7562b72783bd3c4bb2e3e690bc2e3192f9c868abfabb19018a16b3
-EBUILD libofa-0.9.3-r2.ebuild 1114 BLAKE2B afea9f75820526fb172334a1d43b4a5a368f29f4425cbf97bba77e166fcbc7afa411b8e99f39f2ec538fc923c22260df19af0ce32de4fe39eb22f2e2337c3ac8 SHA512 6f1cf4f49160cdd22fa8dc9ce1fc7c14621f1dafa84d56402e313d7265300395bcbe467235516df70ecff336dd398331b24ec30bf13841da9beae531c2ed7c0e
+EBUILD libofa-0.9.3-r2.ebuild 1112 BLAKE2B b6bc28f46bb36cbd78846a4c76e67915e1d6eaf85ed669da11139be417bc9c9dd7c138774e35192a369df18000f8a1c78c433161978eb7ba4d606a29d04d1c6f SHA512 5882b91f05c053f66d6b6776237fc055bbbb28c2d5f7460c6f92df6b73782a093fb959b8270fcc0883ecf6af7ff6546ad456ab7f1d575dab2a54224ad2b1ece4
 MISC metadata.xml 337 BLAKE2B 3cf5fbbe6cea6c48b832cd4be4ae506a319b7d21d27b1e98c83602adf8ff4948736a7eb46e7156bb328fae2fd27886d4af194f340e06488a7f5adf266bf84e7b SHA512 ccfab3198ba95caba25340c8254d465b23aae4edff3f63a0acbc0fc7283efb45b5ad4fd250df09e1e2442b5cb2977a228375daf25ffde08004eb887f624941c8
diff --git a/media-libs/libofa/libofa-0.9.3-r1.ebuild b/media-libs/libofa/libofa-0.9.3-r1.ebuild
deleted file mode 100644
index e85125f172c6..000000000000
--- a/media-libs/libofa/libofa-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib-minimal
-
-DESCRIPTION="Open Fingerprint Architecture"
-HOMEPAGE="https://code.google.com/p/musicip-libofa/"
-SRC_URI="https://musicip-libofa.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="|| ( APL-1.0 GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-libs/expat
-	net-misc/curl
-	>=sci-libs/fftw-3.3.3-r2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-4.patch
-	"${FILESDIR}"/${P}-gcc-4.3.patch
-	"${FILESDIR}"/${P}-gcc-4.4.patch
-	"${FILESDIR}"/${P}-gcc-4.7.patch
-)
-
-src_prepare() {
-	# disable building non-installed examples
-	sed -i -e '/SUBDIRS/s:examples::' Makefile.{am,in} || die
-
-	epatch "${PATCHES[@]}"
-	epatch_user
-
-	is-flag -ffast-math && append-flags -fno-fast-math
-}
-
-multilib_src_configure() {
-	# disable dependencies that were used for the noinst_ example only
-
-	ECONF_SOURCE=${S} \
-	econf \
-		ac_cv_lib_expat_XML_ExpatVersion=yes \
-		ac_cv_lib_curl_curl_global_init=yes
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS README
-}
diff --git a/media-libs/libofa/libofa-0.9.3-r2.ebuild b/media-libs/libofa/libofa-0.9.3-r2.ebuild
index 57e6cbfcbbc6..b86f6a31617b 100644
--- a/media-libs/libofa/libofa-0.9.3-r2.ebuild
+++ b/media-libs/libofa/libofa-0.9.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://musicip-libofa.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="|| ( APL-1.0 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libopusenc/Manifest b/media-libs/libopusenc/Manifest
index 32cbb7c93c4f..e5897304696a 100644
--- a/media-libs/libopusenc/Manifest
+++ b/media-libs/libopusenc/Manifest
@@ -1,3 +1,3 @@
 DIST libopusenc-0.2.1.tar.gz 388071 BLAKE2B de3a69aeb6bb955352e097e41b12cf0c627ce5278687124d00996f52ccf5e8e39277e7c345bb26e75dd7d29b6a70f50396fa5a157913e0906a18acd007b1621b SHA512 adf30cacea9ac2e5889a40147f53943a1bec5279c5ff3a9b09de8ca52727a6cbaeecd338417fc5856e337ae183c85b0d366d14ec4ec329de12d50709a6f6507a
-EBUILD libopusenc-0.2.1.ebuild 608 BLAKE2B d7522e132bf32071719e0ebb3773c03215da453aac7dd94b65059e6558ef941f8ba1c52bd9a348a58008ede8534881960b9892882b85775ebbe48bf2e5508433 SHA512 0f27f6ada515f16c41545fee6275aa14c8ce76ea66f61c4bb781cab51da3103536cdb293c6f78964de928e306dbca7f0d67ef9688051e5306990c4afcbfe5b38
+EBUILD libopusenc-0.2.1.ebuild 607 BLAKE2B 00c37365939808e64cd2bdd150173f9a34e197a307c9d47f2f8be8aafbda2eea0d4b6ed619532e9aeaf3541d526558be6dc3ce5b220feebfe537047c1fae7a32 SHA512 02554640e156a31ce7791f85ced1fe1ee13ecd6a40e48773d2aaafa8062d37dae8cd56ddd12999d068b7e6f5ddef84d27331a24c53864298d5f29e59a06f1bb4
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libopusenc/libopusenc-0.2.1.ebuild b/media-libs/libopusenc/libopusenc-0.2.1.ebuild
index e3775dd16e75..391a3a75be00 100644
--- a/media-libs/libopusenc/libopusenc-0.2.1.ebuild
+++ b/media-libs/libopusenc/libopusenc-0.2.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="doc"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 6fd8e0fb6a45..439c265ba0b1 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,15 +1,9 @@
 DIST libpng-1.2.59.tar.xz 657424 BLAKE2B a64a8e5c914a20b1f16a219b508b06d12ff28903083792cf07dae841ad13b3636b9d715d9bbfc459a134dfdf2a9b37bac1fbcff14a91c214340325ba8266431e SHA512 bfdc51eca72a76697f1396611a08aa4ce6a169837197699c55d845fdef17850e8f7665b7b81ba815c277453737f12eeb41409ff9c7eca1ac0c0d134c44492a6e
 DIST libpng-1.5.30-apng.patch.gz 10272 BLAKE2B 335b99e30a476b358483b0ca44d895580bddad05d18ab7f47b4cfa383a04c53c1db7d5773919445c281b0b0921485b946cb67c36db07aad494f051d4db19e4e1 SHA512 1c06e2e1b2420580d4399b7b752df9ed193c81febcc9983351fc72ce3900dc43a433780e7a0184b612b7723d8870a514db7398ec0c081dabe6cb4ea824880236
 DIST libpng-1.5.30.tar.xz 756992 BLAKE2B 02813c7cf06e61d429fe963ae2c1e68bfb390b8eeea52147f582729b4a86c73055c2c79eb3d0b533587dd5a16dc0abf7afd986794c01ec59ae0a7dfe3333a989 SHA512 8716c6720c1ddbb38f439df42dbb472d37490fd207efe59bd872ce9adec7359025dc84544efddd19c8e339ecc28389a746e6987ff41ac6e76915c1e1d2c6f20d
-DIST libpng-1.6.35-apng.patch.gz 10396 BLAKE2B 5f69db106909f690f3fc96dc14db3c7281c3abb0ea9cd119fcf0cb6584eb1eb5f244d57e4ec7198614f3df5f9b302c0de2b447ed0cbacaa7b15821c2e3c23cf7 SHA512 40cda24d003089c31786b70fd581cdd960f338ae89535646a2188bc8e25e603a6ad2080406017bd45edb298442a88dd60ada1ec650b001596d216e8194a3dda1
-DIST libpng-1.6.35.tar.xz 1014320 BLAKE2B 2c1d8a4a1af8d5c67c8c18414fc1c32ad41b81e5300b3fe72c2bb89afece764087c7829308243e5eb24e7d685c56ba6c151b66ef64603528ac0406d89dd4cc4d SHA512 b69152bc7869e98536effa8e45e2dac7bffee26aa9e31fc90b37506a702256919bcf4dd9cadc42fa4e45143bc023ffd7c637742367e58707e8c2226b3a09eee0
-DIST libpng-1.6.36-apng.patch.gz 10329 BLAKE2B 8c97da493a1eed697d8bbba96dea992b17360f5e4844b8d43c63a73684f09094d28d0032a8311e39f633c449674e7aec7bab0e923d9df8ff2a7e17caaccdef5d SHA512 1c82e2399dd6dea14955a4e8da8d3f50bbcee42676dda5d7abdd36f27d1228924b0107d0174258adeb2eec8ba74b267d8a778b72b72f6dcef176608d5ff7c912
-DIST libpng-1.6.36.tar.xz 1012544 BLAKE2B 6b89e39e5a301e9e4d7fe93d97e4b8695a214b5b102cc1b21455baea2608b99003110f6f20beb3464e1cf62762a35917bdc07f31ba5aa041776601cc9651809c SHA512 a86ee977df69748e5039fb0ead883f1d3f88b8a701fa24cf8e62dd77c5871bb46397d794fa33ec1d0be1ac488246832ad79d0e6117ac093bdce1b2a1cfcb2bb0
 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.35-r1.ebuild 1364 BLAKE2B faddeabf1a0aee8ee88b124800bec19063239e02e78eb159328df92bc2f2f85572ebe9e30a44283f9bbac831a7c1216b4d213c6bb6314813cc469bf2862ca45d SHA512 59f6e5f5761d3d6ebd7070e2e11d6d722522b1aa0daeba61facb045f9c6e420bba5f2e0187d89fb6d5cc4860653524665c02a4d69b06d6e20b52ac7f39fad251
-EBUILD libpng-1.6.36.ebuild 1376 BLAKE2B 8568a0c815ff76fc690d8c7d1c8b82a66277b8c279ff993f8b4054eba531a2662e0de15a17a0f037b179270d2bdc03561a962d8c1955572cbfb00a233e72cbd5 SHA512 4587ce5d6a135be7c4f5d9926bc3c6bb4c5bc1a13930daea5f5d6e38cc37d318e357a8e5ab0b4241ce4a63d897bff8288ff42e2391cfd372445a31fd5c71b3b8
-EBUILD libpng-1.6.37.ebuild 1366 BLAKE2B a74a8091194629ed86277c2f2f7d07a150aec9d9e58dd8ff29a24078a042cb6a577e959dad958660c6cfd4147784dc75bae9f28244d8de4bded5114f207a8d73 SHA512 ba197d383e375fc644a0bf5c3a89197a0925cca6fa629c0aef2cb6b5d13de3af204f516a23acf5ad56e09c061ac7d993a1c040608203de791772d688fdbdb38e
+EBUILD libpng-1.6.37.ebuild 1365 BLAKE2B 5afc18298758ca823534f0ceac625a8a30edfdb31a3c7265b90c0c05882879812a749808f5580b9add835a9269947b0c2dd370d3d49b72d18c27fffd5a043cf9 SHA512 dbd994a0f140e05b62d6d754b7026ea68c520771e5794800122c82aedc7a52cedee9c278612cffb42c26310be13abd2a72235e8c2fcd35722ef21481de2caeda
 MISC metadata.xml 843 BLAKE2B e8736137db2c0e06193b3bbc9d933b1b8e2b8609d050a93a5369a8de81acf02af1d7ff6eb3c1e1967d7dbd6fec38373e389011d290cda1577203075f2f679167 SHA512 43cd4bd8981c828f2de943bb5ee90958f6a4f555d824be1325a7663219b0386ebaeb99406697affa8086b5b50f3d185e01ed12ace030557aa66a8e7b9af006b3
diff --git a/media-libs/libpng/libpng-1.6.35-r1.ebuild b/media-libs/libpng/libpng-1.6.35-r1.ebuild
deleted file mode 100644
index 442c01532f55..000000000000
--- a/media-libs/libpng/libpng-1.6.35-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="Portable Network Graphics library"
-HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
-	apng? ( mirror://sourceforge/apng/${P}-apng.patch.gz )"
-
-LICENSE="libpng"
-SLOT="0/16"
-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"
-IUSE="apng cpu_flags_x86_sse neon static-libs"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-src_prepare() {
-	default
-	if use apng; then
-		eapply -p0 "${WORKDIR}"/${PN}-*-apng.patch
-		# Don't execute symbols check with apng patch wrt #378111
-		sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
-	fi
-	elibtoolize
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable cpu_flags_x86_sse intel-sse)
-		$(use_enable static-libs static)
-		--enable-arm-neon=$(usex neon)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	DOCS=( ANNOUNCE CHANGES libpng-manual.txt README TODO )
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libpng/libpng-1.6.36.ebuild b/media-libs/libpng/libpng-1.6.36.ebuild
deleted file mode 100644
index 30db848bda4c..000000000000
--- a/media-libs/libpng/libpng-1.6.36.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="Portable Network Graphics library"
-HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
-	apng? ( mirror://sourceforge/apng/${P}-apng.patch.gz )"
-
-LICENSE="libpng2"
-SLOT="0/16"
-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"
-IUSE="apng cpu_flags_x86_sse neon static-libs"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-src_prepare() {
-	default
-	if use apng; then
-		eapply -p0 "${WORKDIR}"/${PN}-*-apng.patch
-		# Don't execute symbols check with apng patch wrt #378111
-		sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
-	fi
-	elibtoolize
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable cpu_flags_x86_sse intel-sse)
-		$(use_enable static-libs static)
-		--enable-arm-neon=$(usex neon)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	DOCS=( ANNOUNCE CHANGES libpng-manual.txt README TODO )
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libpng/libpng-1.6.37.ebuild b/media-libs/libpng/libpng-1.6.37.ebuild
index 116b7cb6b526..e9519907ac8d 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 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-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"
 IUSE="apng cpu_flags_x86_sse neon static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libshout/Manifest b/media-libs/libshout/Manifest
index 2e403141e7b5..d48651e5f92d 100644
--- a/media-libs/libshout/Manifest
+++ b/media-libs/libshout/Manifest
@@ -2,5 +2,5 @@ AUX libshout-2.4.1-tls-compile-with-OpenSSL-1.1.0.patch 1727 BLAKE2B d270ff05d53
 AUX libshout-2.4.1-underlinking.patch 529 BLAKE2B 993ab69f011caa49b96f28ede17bbe3fe68b304521a1d7185e865f4ac254d2bd313686e0d6a59e5aa50a0fe41a0e0214980aefe1fe3dcb8a45d827d4962fb153 SHA512 4717ee913ff50e276cca9983543a046271c34385bca2525bc64f6de90a25c7becc7e780807ff2534147dc17b1f57b57e23746948ea78288addfbeca7c495f78e
 DIST libshout-2.4.1.tar.gz 516161 BLAKE2B bedea3c043018eff4675fdb8b95e0bb8ff02a98994a4afcc76537124ebf7357f012f2e9445ebd207b576fc4166fb761d65066fe166fc8b611b96f5c5482a0e92 SHA512 4d4b958947e020de3330d49d39d59220fc89315f25f653a7456b9aa24ca9566fca30bb3d65e6348e79958656096b6b864ea8885157d24e55c8d84d6604670219
 EBUILD libshout-2.4.1-r1.ebuild 1317 BLAKE2B 34e99363db05398190a065358d1fde860372deb4750c5d22d8f128d1fe5d257881faba01e42f3b3bbc1f4094e7ec7a6576776a63712d44987e1732eb3efc4618 SHA512 d3e14eaf24dc7bc450274cb106ba2c2720318d295db20f3a9305849e53f72cd9d4d371ae64a18bd74ec90c4b854ce1c6c831e147b5c086acb62e619fff04619a
-EBUILD libshout-2.4.1-r2.ebuild 1423 BLAKE2B 323251a7b1278bb9ec851686dca303b229ce926fe8ba0859f447a59b2a8b2b4a4eefb14b87ef6755dfc4c6675422947581b5c6bbf5105ca12cb5f43940be7727 SHA512 4518940540266f2200db31a2f98bf448fd738526ef6926c8921c7a82d62503a4731b8b75e9236d26f250015c24571665a8ed7bded0731d2d67b50aadab3ec020
+EBUILD libshout-2.4.1-r2.ebuild 1422 BLAKE2B 2c9b7ecce83ae62e785938cb85ad900b1d520bb6db20ebd6c92f4d140c8cea405a3bd78d1630b040c1117eed42f9b14ef6bf80c9319a132a0eabc82e0bda486a SHA512 042e66ae246f32c88c40ff6e5768ad9f1cd03473a286d0ec254a94f26c838766550d1dba9d5053f4e92cce09d06410d970bb0fec3f7ec29fa0cf068281b6c67c
 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 05aa961800ab..e30940ddffb8 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 ~amd64-fbsd ~x86-fbsd"
 IUSE="libressl speex static-libs theora"
 
 RDEPEND="
diff --git a/media-libs/libsoundtouch/Manifest b/media-libs/libsoundtouch/Manifest
index 7a307fc9562e..3f3088874048 100644
--- a/media-libs/libsoundtouch/Manifest
+++ b/media-libs/libsoundtouch/Manifest
@@ -1,8 +1,3 @@
-AUX libsoundtouch-2.0.0-CVE-2017-92xx.patch 1587 BLAKE2B 29cbb252a2a161e890a354291b6e83f0271ec83f2683bde43c56ca96eeb1dcca5eea3534777158939bfbec288acd2d4404bf8e70987663f43693c259a41dccb3 SHA512 aec797125ac6e0891baedf36552686342e83a2e362544e8d81ae960356227f275c5ec906f595f676497763dc411506b85de06a35e540f173c0d0e966451b1783
-DIST soundtouch-2.0.0.tar.gz 455148 BLAKE2B e38358b0b773edc03a1b227222418d1e79a97f7a1c7abd22f2cb96bb2a7e3427802214775c908329eeec87710b4d199fba819ad7b99f3d58071749cf372991a1 SHA512 c916bdd2cb3d7547f264b1caf09b739b48a161c8c6288c3893fc97379546ed6b41dafaf603b583fbf64ae91270fdeb90811e5b0df0e9c051dc9f6ddca4d319f9
-DIST soundtouch-2.1.1.tar.bz2 526206 BLAKE2B bc5d2edef5ae7d297cd017968fb1206d14306c117a847ba34090dcd284a174edcc8f4694be4a98fee7a7d100e7a912e81c2e14a998a22ab2c50eb0d27ca823f7 SHA512 9272141e5c1a4def7356add524d861f2c78eb9574ebca2bab3a57190821fb1eb5c85624aa7b31d90ada38a5165bafd8445f6fdd51e2b3a262ca9a2f2db35a9aa
 DIST soundtouch-2.1.2.tar.bz2 526281 BLAKE2B f15f004fd6abdf4cd6fdb842c650480c670a517c6d94365633a7cc4beb95447d7a8bee965d4b258da6c31630e370e3c1c1fc73abfe8568ace465ce41a87397cf SHA512 d45cb0f94e3df32e9c76722a148f201277b2ddc3e390394c1f4ae1263f13557c6b664e90301b5f62d7561d743ab4903a44a34ab7248880b343d581cebd5f0cd9
-EBUILD libsoundtouch-2.0.0-r1.ebuild 1499 BLAKE2B 43b32e874493bdfbe22bd07a7a0f78f4952ab5cd192496d1b26bc0918f18f22f2df5b6985dd27727de5097f068897d3a612d2729392450c2f638be5344cd6536 SHA512 ec0e8a610460293f89f743f3457178475b4c4c913cb80a94cdca4ac059c60eaa079252bef940afdfb222bb2b1cb524d1c23cf2a55a2280050602c8cf00aa242b
-EBUILD libsoundtouch-2.1.1.ebuild 1526 BLAKE2B bed4c40cc3e7fddb0a98185b4086ff145515cae22c9b73401bd3b7f6f8260e7c9ca62aaa453aa36a656d7bad7cc2c236f3dc73b24a56292bae1f4d1cfb5ea338 SHA512 fece8e9f6aee68d1bbcba65280f3b578635375af1023bdcc8080eb6f945322bae924d694cfbf26caf7e81d785e4f2d75ade19dffa945091c1b9a91b86a9b84c8
-EBUILD libsoundtouch-2.1.2.ebuild 1524 BLAKE2B cc5857293f5b9e1e6c4360a69308a94f51c8c0517555d9494025cbafccde61533e44d82c2d94686799d2e068b493ef3668ef5b20c04296a1628d9a1c79f4ef48 SHA512 bcb347846bab8b9708e1eab1df4200b4d5d7897f2a788384e65310c7a523101c340fe4c163b5215008f04910da7ea6f30bb5bfd40b4449f8be4a39dac95c245d
+EBUILD libsoundtouch-2.1.2.ebuild 1523 BLAKE2B 538efefc1981e1c3e332f490dd0892a76b25b9fedb528ccca5ecdce5544847155440fd37c5944961499cb576d4f05110a68561378373ad20f7ad55af293e551d SHA512 895e1678aa2fc0b01501df8ee81b4dc8b27c263b5f82a63c9b34db715b750815e1ca227d29954d9b0696ba1cededff1bbe1f5a092fd47cbe05d1004f63591602
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/libsoundtouch/files/libsoundtouch-2.0.0-CVE-2017-92xx.patch b/media-libs/libsoundtouch/files/libsoundtouch-2.0.0-CVE-2017-92xx.patch
deleted file mode 100644
index 0e475a3e44e6..000000000000
--- a/media-libs/libsoundtouch/files/libsoundtouch-2.0.0-CVE-2017-92xx.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Fix CVE-2017-9258, CVE-2017-9259, CVE-2017-9260
- Based on an upstream commit, original commit message was: "Added sanity
- checks against illegal input audio stream parameters e.g. wildly excessive
- samplerate".
- . 
- There is no reference to CVEs or bugs, the commit was made after disclosure
- of the CVEs and all three proofs of concept (crafted wav files) fail after
- this commit.
- . 
- The commit was made after version 2.0.0, so that version is also vulnerable.
- .
- Unrelated changes were stripped away by patch author, upstream commit author
- is Olli Parviainen <oparviai@iki.fi>.
-Author: Gabor Karsay <gabor.karsay@gmx.at>
-Origin: upstream, https://sourceforge.net/p/soundtouch/code/256/
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=870854
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=870856
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=870857
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/source/SoundTouch/TDStretch.cpp
-+++ b/source/SoundTouch/TDStretch.cpp
-@@ -128,7 +128,12 @@
-                               int aSeekWindowMS, int aOverlapMS)
- {
-     // accept only positive parameter values - if zero or negative, use old values instead
--    if (aSampleRate > 0)   this->sampleRate = aSampleRate;
-+    if (aSampleRate > 0)
-+    {
-+        if (aSampleRate > 192000) ST_THROW_RT_ERROR("Error: Excessive samplerate");
-+        this->sampleRate = aSampleRate;
-+    }
-+
-     if (aOverlapMS > 0)    this->overlapMs = aOverlapMS;
- 
-     if (aSequenceMS > 0)
diff --git a/media-libs/libsoundtouch/libsoundtouch-2.0.0-r1.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.0.0-r1.ebuild
deleted file mode 100644
index e57c4115a6f5..000000000000
--- a/media-libs/libsoundtouch/libsoundtouch-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/lib}"
-inherit autotools flag-o-matic multilib-minimal
-
-DESCRIPTION="Audio processing library for changing tempo, pitch and playback rates"
-HOMEPAGE="https://www.surina.net/soundtouch/"
-SRC_URI="https://www.surina.net/soundtouch/${P/lib}.tar.gz"
-
-LICENSE="LGPL-2.1"
-# subslot = libSoundTouch.so soname
-SLOT="0/1"
-KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="cpu_flags_x86_sse openmp static-libs"
-
-DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-S="${WORKDIR}/${MY_PN}"
-
-PATCHES=( "${FILESDIR}/${P}-CVE-2017-92xx.patch" )
-
-src_prepare() {
-	default
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-	sed -i "s:^\(dist_doc_DATA=\)COPYING.TXT :\1:" Makefile.am || die
-	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' configure.ac || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		--disable-integer-samples
-		$(use_enable cpu_flags_x86_sse x86-optimizations)
-		$(use_enable openmp)
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}/html install
-}
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libsoundtouch/libsoundtouch-2.1.1.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.1.1.ebuild
deleted file mode 100644
index d9b61b4636ad..000000000000
--- a/media-libs/libsoundtouch/libsoundtouch-2.1.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal
-
-MY_PN=${PN/lib}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Audio processing library for changing tempo, pitch and playback rates"
-HOMEPAGE="https://www.surina.net/soundtouch/ https://gitlab.com/soundtouch/soundtouch"
-SRC_URI="https://gitlab.com/${MY_PN}/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-# subslot = libSoundTouch.so soname
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="cpu_flags_x86_sse openmp static-libs"
-
-DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-	sed -i "s:^\(dist_doc_DATA=\)COPYING.TXT :\1:" Makefile.am || die
-	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' configure.ac || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		--disable-integer-samples
-		$(use_enable cpu_flags_x86_sse x86-optimizations)
-		$(use_enable openmp)
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}/html install
-}
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild
index 80e689588dc4..d09a077c84c7 100644
--- a/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild
+++ b/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/${MY_PN}/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1"
 # subslot = libSoundTouch.so soname
 SLOT="0/1"
-KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="cpu_flags_x86_sse openmp static-libs"
 
 BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libtimidity/Manifest b/media-libs/libtimidity/Manifest
index 69dd83d48ae7..5156c4ffd001 100644
--- a/media-libs/libtimidity/Manifest
+++ b/media-libs/libtimidity/Manifest
@@ -1,11 +1,3 @@
-AUX libtimidity-0.1.0-automagic.patch 872 BLAKE2B b8a0dd094165bc55184c736e2d85a0fe70da1829d8694453b1aa9c686be5c4aaecfd0e31ebf05efe4ebe8bd47798794fe2680a72c90fcec837e7bb5a09dbf65a SHA512 6b9d562fa81089e32752406cfe6e5135d457e94f8c95a0c103fab7becbe9b41515f9039756f63f96c558c8a5b9db66eaa728c169935ac664e7601480e494ac1f
-AUX libtimidity-0.1.0-newlen-overflow.patch 863 BLAKE2B e05106cac40348462a7872cbe20a271e7cb1df8290db6466456a83809d0a04ae37d147a580455afd630bc7d1753279e78fae2864be4dc3be0deb05b118c01293 SHA512 1028723c90a5a4ccb249f3d8e60d2b69f6956b37fcb0904fcd0476c590637073e8fa94eba2cdb1b06e62a88e2d4eab6ba1874e9153c87b793fa3a48c6af55ede
-DIST libtimidity-0.1.0.tar.bz2 273410 BLAKE2B 63bc62a586c3649a8906c256d778fcc9a320448141a8e87805545aecfd123187c453e9be15640a995db367c347f87063ada29dda9e6b8343061b8adc8ae22966 SHA512 7401e9b85c7e93c17871a9d767dfa9434808bf90d7d693522862c5f534f56dcac6c39fe24fc38b097505df349dad9f57e7ea2c6ae2deb9adce7d2ec861184ed1
-DIST libtimidity-0.2.0.tar.gz 420643 BLAKE2B beee2a11176f07068654e7ca90f552f8690a7291957d13efccd564345145c18a03c08663beef81cea5114c251f9e219587d7b16a85a73708d72f6ad92cbd31dc SHA512 691f38c69e344d328aa0a98846d6023f22fcb81bac33a6cb4df0c2c05df9c84a1818732f7498ff9aa942c9939dab8f0a318b49769e9f934e417c3ee540af2c55
-DIST libtimidity-0.2.2.tar.gz 420174 BLAKE2B 3414277e42bab31d0f23539f2f33c072e430b5b5323e1375a9a2614a45415d914cd7c07ee9c7caec4124cf166ad14220852dec397275122458409518b466fa7a SHA512 07b0a0d0467e746b0e61656b76157e1291f21a9eac1249457feec49d661a423069e2aca95e45819591d2c29f9cd9a8b5f5cb7ce6cb0e8d2c30eb28c80293e624
 DIST libtimidity-0.2.4.tar.gz 421572 BLAKE2B b92a87ed0adbf00d74c482e17375fe42adbc86896435ebef858b87952f31f5bd4bcc61993aa03fca07f1f85367f57e227f5828f8cb5ff44561a11e5066e84b1b SHA512 185c4ae58a14f69873869a9586cc23a1f7c9b681c67bb7cc9fe3c4ce51f53600004970af6a0d76d3055d9f2cb82a7fd062699006b0c26f90340fb751cb976930
-EBUILD libtimidity-0.1.0-r2.ebuild 803 BLAKE2B 5e71c520bfda38ff9b10b10e69d352459ad52878e9c5e88365cd903df96823946e054908d87ec0eea04efcb8508ad890957954b17b6aa2fe52f30eed5c550d24 SHA512 5ba40895e3fb107dbbc1748963d63bf6d936be966b555efe3941ab36344377b9320ae0bc14d1a12f7aeaa9293f1b8731fe8b0394da53a7fbd21972bfc289e26b
-EBUILD libtimidity-0.2.0.ebuild 673 BLAKE2B 8ef2f681c407d59a7824f7f7c3d3f245532ea62d45d497e803a2ec706b7d99a31474d2d8e6fd0d6504829356ee646d3f532684493e0dbcf7aec3aa50c07fd13d SHA512 51ec7f7f7f6904d92cd56b4eea39d7f0916454dfeec560563839badc35a468575cc92b4097e7c483f80bd4b3ebbc815e1639a8f6dc67d2e3969704462936c133
-EBUILD libtimidity-0.2.2.ebuild 658 BLAKE2B 1bc3a144e9d6888ce7b0118a160369ce3a78d3d44c764056202ee61bbc3f78826f6128e5527d4d5152a10fabbe8944ca72be2b20df677a7cf9b394964c73d0d9 SHA512 52b514ee0a2975568b1ecd5deda3b28702adea2eda82b693937bf20aebf75cf70e3463fcb4a6dfb7bd0b81c404ba994054a22f16396d4bceff7854cf7cb30c7c
-EBUILD libtimidity-0.2.4.ebuild 657 BLAKE2B 3cd2d0d6c67ed59e9305a164bea3c260b1bb609153eedcfcc4bd16c59385c32002ffaa05f501572fbbe4c6ab79445f13bc490375e16a3b23c2b4f27dabc4f94d SHA512 a15de8e10bd0bafb6af039dcaa930107e05fefd717e5c0438f8d5b663520f50ec1bcccfd57faea3e6c9150cf33de54e28b536249ffec8cb58acf3f10fb963bc0
+EBUILD libtimidity-0.2.4.ebuild 656 BLAKE2B a7aa688be6f1788d6ae7d81c395267410280e13e2f73fbd07f2cf9377566a45974095212bba990434538cface1e8ffbbc6f071baa774e38272ff4476e6607d59 SHA512 a6083399cb5c29e617ec3b1badd5bcd52f0b0f29b9be7495f696cc300c9701ef239f559587a00c3456b886e751eea4f38592c433b281e762ff20b8dfcfb2f249
 MISC metadata.xml 334 BLAKE2B dae2cde17ce0b3493754cd7984b7c74a937ac7694cbe125d6137fa00062fe5f8406e311502cc09400b720f0f11d233726c3061f1039408236651ebab1f1b449b SHA512 9b744ea46e81fa07fdbed4bd7b71840eeb1500bc35651e9c8461f91e8041e76567fd5b20472767d2b8ebb16967005ae025bb7a8165b14c2e33ec1a891770d91b
diff --git a/media-libs/libtimidity/files/libtimidity-0.1.0-automagic.patch b/media-libs/libtimidity/files/libtimidity-0.1.0-automagic.patch
deleted file mode 100644
index ead93ffd32dd..000000000000
--- a/media-libs/libtimidity/files/libtimidity-0.1.0-automagic.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur libtimidity-0.1.0.orig/configure.ac libtimidity-0.1.0/configure.ac
---- libtimidity-0.1.0.orig/configure.ac	2004-11-23 06:30:46.000000000 +0200
-+++ libtimidity-0.1.0/configure.ac	2007-08-02 15:51:47.000000000 +0300
-@@ -39,9 +39,24 @@
- # Checks for libraries.
- LIBTIMIDITY_LIBS=""
- AC_CHECK_LIB([m], [pow], [LIBTIMIDITY_LIBS="$TIMIDITY_LIBS -lm"])
--have_ao=no
--XIPH_PATH_AO([have_ao=yes])
-+
-+AC_ARG_ENABLE([ao],
-+    [AS_HELP_STRING([--enable-ao], [Enable libao (default=disabled)])],
-+    [have_ao="$enableval"],
-+    [have_ao="no"]
-+)
-+
-+if test "$have_ao" = "yes"; then
-+    PKG_CHECK_MODULES([AO], [ao >= 0.8.5])
-+    AC_DEFINE([AO], [], [Define when building with ao])
-+    HAVE_AO="true"
-+else
-+    HAVE_AO="false"
-+fi
-+
-+AC_SUBST([ENABLE_AO])
- AM_CONDITIONAL([HAVE_AO], [test $have_ao = yes])
-+AC_SUBST(AO_LIBS)
- 
- # Checks for header files.
- AC_HEADER_STDC
diff --git a/media-libs/libtimidity/files/libtimidity-0.1.0-newlen-overflow.patch b/media-libs/libtimidity/files/libtimidity-0.1.0-newlen-overflow.patch
deleted file mode 100644
index 22952a5ebba1..000000000000
--- a/media-libs/libtimidity/files/libtimidity-0.1.0-newlen-overflow.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur libtimidity-0.1.0/src/resample.c libtimidity-0.1.0-r1/src/resample.c
---- libtimidity-0.1.0/src/resample.c	2004-11-21 23:02:53.000000000 +0100
-+++ libtimidity-0.1.0-r1/src/resample.c	2008-02-24 18:46:36.000000000 +0100
-@@ -545,7 +545,8 @@
- void pre_resample(MidSong *song, MidSample *sp)
- {
-   double a, xdiff;
--  sint32 incr, ofs, newlen, count;
-+  sint32 incr, ofs, count;
-+  unsigned int newlen;
-   sint16 *newdata, *dest, *src = (sint16 *) sp->data;
-   sint16 v1, v2, v3, v4, *vptr;
- #ifdef DEBUG_CHATTER
-@@ -561,7 +562,7 @@
- 
-   a = ((double) (sp->sample_rate) * freq_table[(int) (sp->note_to_use)]) /
-     ((double) (sp->root_freq) * song->rate);
--  newlen = (sint32)(sp->data_length / a);
-+  newlen = (unsigned int)(sp->data_length / a);
-   dest = newdata = safe_malloc(newlen >> (FRACTION_BITS - 1));
- 
-   count = (newlen >> FRACTION_BITS) - 1;
diff --git a/media-libs/libtimidity/libtimidity-0.1.0-r2.ebuild b/media-libs/libtimidity/libtimidity-0.1.0-r2.ebuild
deleted file mode 100644
index 565472056916..000000000000
--- a/media-libs/libtimidity/libtimidity-0.1.0-r2.ebuild
+++ /dev/null
@@ -1,34 +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
-
-DESCRIPTION="MIDI to WAVE converter library"
-HOMEPAGE="http://libtimidity.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
-IUSE="ao debug"
-
-RDEPEND="ao? ( >=media-libs/libao-1.1.0-r2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-RESTRICT="test"
-DOCS="AUTHORS ChangeLog CHANGES NEWS TODO README*"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-newlen-overflow.patch \
-		"${FILESDIR}"/${P}-automagic.patch
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-static \
-		$(use_enable ao) \
-		$(use_enable debug)
-}
diff --git a/media-libs/libtimidity/libtimidity-0.2.0.ebuild b/media-libs/libtimidity/libtimidity-0.2.0.ebuild
deleted file mode 100644
index 3a948d94033d..000000000000
--- a/media-libs/libtimidity/libtimidity-0.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib-minimal
-
-DESCRIPTION="MIDI to WAVE converter library"
-HOMEPAGE="http://libtimidity.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ao debug"
-
-RDEPEND="ao? ( >=media-libs/libao-1.1.0-r2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-RESTRICT="test"
-DOCS="AUTHORS ChangeLog CHANGES NEWS TODO README*"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-static \
-		$(use_enable ao) \
-		$(use_enable debug)
-}
diff --git a/media-libs/libtimidity/libtimidity-0.2.2.ebuild b/media-libs/libtimidity/libtimidity-0.2.2.ebuild
deleted file mode 100644
index 3f7018d75c80..000000000000
--- a/media-libs/libtimidity/libtimidity-0.2.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib-minimal
-
-DESCRIPTION="MIDI to WAVE converter library"
-HOMEPAGE="http://libtimidity.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ao debug"
-
-RDEPEND="ao? ( >=media-libs/libao-1.1.0-r2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-RESTRICT="test"
-DOCS="AUTHORS CHANGES TODO README*"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-static \
-		$(use_enable ao) \
-		$(use_enable debug)
-}
diff --git a/media-libs/libtimidity/libtimidity-0.2.4.ebuild b/media-libs/libtimidity/libtimidity-0.2.4.ebuild
index 10c852bd6a52..a7f4066567ab 100644
--- a/media-libs/libtimidity/libtimidity-0.2.4.ebuild
+++ b/media-libs/libtimidity/libtimidity-0.2.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/2"
-KEYWORDS="amd64 ~arm64 hppa ppc ppc64 sparc ~x86"
+KEYWORDS="amd64 ~arm64 hppa ppc ppc64 sparc x86"
 IUSE="ao debug"
 
 RDEPEND="ao? ( >=media-libs/libao-1.1.0-r2[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index 5528cdb181e0..62339f413736 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -7,5 +7,5 @@ EBUILD libwebp-0.5.2.ebuild 1770 BLAKE2B 3ad8b99c05e38a51755fd047be8e51339dafff3
 EBUILD libwebp-0.6.1.ebuild 1780 BLAKE2B afaa8d09c4ea4ae4e7c6c9a9f58620518e46b2b9946dbb148291c507c7daa568831063db2ce1dd0e7ae4539114ee3e82ce0a0f4ad1f07a739d8e6409e39c22b7 SHA512 b258c8ab17c12ccf7c5daf68edfb6bbde1fcb32f65949ecdb6ca8df8c48fd437971e4bf4ef6890b4fe4ee5438c7ad96e772fb4f20925f4012b7a6b87d80b5115
 EBUILD libwebp-1.0.0.ebuild 1824 BLAKE2B c1d551960e915c4c6984182b1211a007373f32dbc16612a355dd7c53dc0701da7672b1e75d1ea6a1c8d4689c54684047efb553f30d3ad321524aa7ef85b68f47 SHA512 06800280eaefc56b6cb8dd8cafb7531ab24ffcb15b05163b9adc0a5509c1a7fabc5f1dedd3637a1efb0ec1b38b754ec6c4657fdd9acc6aba14cb6739f53f5e5d
 EBUILD libwebp-1.0.1.ebuild 1842 BLAKE2B acca7da3a910aac00296c93582ead28869a9e17c5abc6bd2f9b6dc978119e49a3b2dae13bad5ffe9f3dbaabfecb072e2e1bd4b1e0e6dfd777e0c1f4b3c1bcb9c SHA512 82bf2cff0dd2c8da705c0818e6e122334d56b3fbcbe57e708ee29e3d303785afb4ac71b75a9bbdb7fadecb02f69966a4799134305daecb433b905b7fd20c5598
-EBUILD libwebp-1.0.2.ebuild 1835 BLAKE2B ea3c21c88a338430bf89b0b6208fa75d947e31d158f2a57137d01c5eaccebb80ccab2c0e6f5c8e127cd6e467c93759342d64e3baaf23315344ee3aead0101809 SHA512 16fa1b28354d519bdeb0e7b2b54efe3a166523473abce4c6ab298212aebd74bf2b710943025e8737793ce3ac6c598b9dce4b734f21f31c066554aa00b184adc3
+EBUILD libwebp-1.0.2.ebuild 1834 BLAKE2B 4b20df420ba6245eff98ca76b52128f57e7a132aba3c0cf75849339d5597fed6b46e00773f6fcad8b1b07753114b555edbd9f9dc41b4069909aa033094e5c301 SHA512 2e508298ebc42c37c915950ec76ae87705b6f5e4c94a83d675a60bfbe217cc4dc34742c4f547bd7bbf0202a518f9e41f60135cd0cc2d937a98176e84d79e0b0f
 MISC metadata.xml 626 BLAKE2B b3ca86f5241deb376b10d159d67eb6001b2a3d8700167b0bc512c067a6b7c72e6a53173e6f22a8a8a923097d67eec93642ed92c132743980cbf27af022f15e1a SHA512 b7348f6c830bb9537f97fcc0f3cbf8b55491913ea45020005734088e7c1aa71dfcacab9dd87bf3085e79554a3326f90b6c30543ad41f08d863639732132be78b
diff --git a/media-libs/libwebp/libwebp-1.0.2.ebuild b/media-libs/libwebp/libwebp-1.0.2.ebuild
index e271eb38f101..4d1454118eac 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-fbsd ~x86-fbsd ~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/mutagen/Manifest b/media-libs/mutagen/Manifest
index fd113b953044..ba5185750309 100644
--- a/media-libs/mutagen/Manifest
+++ b/media-libs/mutagen/Manifest
@@ -9,5 +9,5 @@ EBUILD mutagen-1.38.ebuild 1031 BLAKE2B eef55684a41c17d279d3e58041a1b7ae42bf4eff
 EBUILD mutagen-1.39.ebuild 1076 BLAKE2B 0883613d632c85c68008af015ddc38c0737b020e9118a7f87a0c7cdbf60b52565f46aa86516b21557dd102e939af2d1cc683456932a9ab5be766d8395ae3a63d SHA512 27b94a87fdd1c01c80d3e37844918766a6f17b74e1b24f15e40892502fdebcd63e1c7fcb1390a683ca27487b3d924b219cdfce44b26fc05931ccc80d2bc55be7
 EBUILD mutagen-1.40.0.ebuild 1085 BLAKE2B 8a4e6f2aa3d65a3c6342e033e7c73931aafd133ce2313d517eff837ad4f1164d4c7ee3c79e893a01c8c88f351ed38b4dd9b8e49581c995c89ee9d8a75b1357a4 SHA512 d226ad490c6033dcaefb83d00fd26e1c0d94322f3274f4a043c1f1ef6198e9d1576d3dcdf6814ef91f366805c1ec858d5872e00dc0d997ef1c95bbd82b20476e
 EBUILD mutagen-1.41.1.ebuild 1093 BLAKE2B c09f23a432d820b157f7eb0d7dd79ebe9531e2666332e860989b205093d57505a5a66df012963ad4ae7e512c0573d00c83a853f50ef5d185cf4fecc8a430062d SHA512 e9e175cafef034d670853150b79a3b5148608396a68515b398ed5e9cb0b93dea081609936b40532a1ec939a729f1f5fb6b2cf327ee25943df33ff3dbef839b0c
-EBUILD mutagen-1.42.0.ebuild 1090 BLAKE2B 64a4c51a0f4ff168bc93d4f1f70c92c5891e3bd67ca489138b762d4e4799912307a09a48db09edc9eb968ca1271190a09196c4a3f97dac983c62c4a78572e631 SHA512 f0542c4f321729b4cffead13015f37ef43a67bcfd1e59e66c01a1bc03ef48ef5db5d9c773043f5b720e32521bcf30f3d717147bfa3afae8ad1b353de9972f575
+EBUILD mutagen-1.42.0.ebuild 1089 BLAKE2B 9a9be1ac4a36ff5e97707a7b6f2fd580f6d9f53a48415bdec4bfaded4a2b6fc95b6ff94536e26002e562deee2f4d46f93879d9215786cf0ac04ca46cbeb390e8 SHA512 c3562ab5ba51eab90f34cb586b35b2ff4f2fd88a1d4217de09f361035ec4434e2b939177b12020edbd4939ec3052b07820e5b9ff5091004a3649274b5b3e8d9b
 MISC metadata.xml 380 BLAKE2B 9fd70ca6ca6e8d17b66ea703f65885b87714ed0560ffe7502d85da3ee8fdf1d62545c1166b64d99f2bd2bfa6105f8f8865bc28769069c1ae3da4b1c3c174fd69 SHA512 87ce1f85bd6aff7c159fd22a412eb9ea95ac4f58fb2cc70fd4c4f470bfe9f6366b906bc9cef833ae5c10b7a3601c15edab9e8418cf78d7d9e993191873f41d59
diff --git a/media-libs/mutagen/mutagen-1.42.0.ebuild b/media-libs/mutagen/mutagen-1.42.0.ebuild
index bb12ba937a66..7fcf6da82a18 100644
--- a/media-libs/mutagen/mutagen-1.42.0.ebuild
+++ b/media-libs/mutagen/mutagen-1.42.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 # TODO: Missing support for >=dev-python/eyeD3-0.7 API
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index ff0b7af11e21..c96965569e87 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -17,5 +17,5 @@ DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d
 DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa39096f4f9c079b523d8e28ce62301797ee50f55c84f85a6d832b723da7449531e725bf60a4a89975c51382b2cbc4a94 SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3
 EBUILD netpbm-10.66.00.ebuild 5635 BLAKE2B 67ac7c65d38383dcbb448c4f3d4ebc47e7bc290a1f5c47e394d5946fc15ab6635c2980993472da0a3ecad886414bd4ce17e9b429914fa162b84ff357350a4d99 SHA512 768b550d7dd600b849fd31ce60204c76194eaebca4de61709e1c214d7e13841f701096915d4d1357148d7533a40946598a77799378216242f9da7645113b9a15
 EBUILD netpbm-10.70.00.ebuild 5376 BLAKE2B 0bbf72c60c2c6fd4c843885b2674d3120e48c172a5932cf3d43db0334851a240038ecb3fb14e5ab31c7bbff26dff20021cc1aa429df8897e642dfc6ed3a0448b SHA512 9787fae7edf2669e450896a65c0cd99f23d2d9acefbb108fb6dd12580ce0f87d3fa0de136648c7ba681e06f9f6109d8ad1b8525cb340d01415947df75103cd34
-EBUILD netpbm-10.76.00.ebuild 5270 BLAKE2B 74146d261d6645220c34b8fd68f51f162482ca435f76af5c853770fc72d31cb8c3a03b4605185fda7524377d6caf5c8e118986ffe607f14e0a05794a7febc8b7 SHA512 e5965cc226c1051abbedf344364427439ae34bf6335e2d4eba0596d25e691ad5feaca0735ad057bcfe6c36daee5344dda33650bc4ebaadd0f8ea045b030f52cb
+EBUILD netpbm-10.76.00.ebuild 5269 BLAKE2B aeb0adb71ffec5f6d1d0f3fc3b6adcdad5aaa64c61111b775d68b130314c68de512ae4e997af72d0105c7ada16057891aa98d7fdd30a3b612e226689749b9e54 SHA512 1da8159a4911df0b233632c3a2b955384efb369bd4d4f521203fdef3809ce872ea423721cd2e59ab8d3706886c47be88c6939d5718e2b03d542ae2580e6d4efe
 MISC metadata.xml 434 BLAKE2B 255ab7ddedd5e4558e9303c0c9fe5d1d6e13096e3ef7ba269d68908f1cb74d63af273ef9b2ceb97a7462750fa795a6d6f54dae1e70972b44cfbb749250ed65e6 SHA512 41fe0623d1efe7cff26ed9307756f045bd40f275abd38095affc9394efc2c940e63978c79328e43583d5bb466fad0d5339d158422037587cebd3b1f4c22a459f
diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild
index 3b7f33582c58..af7d4100ce2d 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc jbig jpeg jpeg2k png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
 
 RDEPEND="jbig? ( media-libs/jbigkit )
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index ea88b51d53d3..e626749ed0b3 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -16,5 +16,5 @@ DIST openexr-2.2.0.tar.gz 14489661 BLAKE2B fae3c5a255e8bf5121561687e9d704d7de365
 DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B c73c4db4e414010ed8cc9f9631f3e8b17f47edf89b4ecb459aa00ff54a316b3bb1489e332bc029e0917ac4ffe7e152082244102029fd375f183da6741788dab7 SHA512 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123
 EBUILD openexr-2.1.0.ebuild 1256 BLAKE2B 0c8154e2bf910e9d3994c28f9a29f725efc1c677d1a587162e6766d24e6f6ac7d0ab7fd98b46d5ea3103321d12de217678d4de97ab555733af8e99cb1aed97fb SHA512 c5a8158b4ebb432479f7edfb39b41d3742d0bcd3cca4782dac1bfa1b4aaa6191355dc0a4b2a5c643874c19829c2118052ef1841975b6f7c97ee23542dd3063fd
 EBUILD openexr-2.2.0-r2.ebuild 1862 BLAKE2B 2ddcfb899e3213db76211cbacf9fe7afa597ac0fece9ec4655e390fd6501a5cb15f3553d374408d748c2a4364b519f15f71e82af7d93402736b9c1c245b50266 SHA512 028067478c69a1eade6bda177b734f6530de91e6350e9057aadef4028c0a5c3cc5ca8989186fe59c9b9075d9d17e119e7b53d3713acc29228af52100250a9fda
-EBUILD openexr-2.3.0.ebuild 2233 BLAKE2B 2a7644dfe44203aa435684ce454cc4dd0fddd7dc495a9c9d044e95c02194090e898b688d582fb444859935e02bd9e46eaabd00d860b4d6ebe3184daa524aa66b SHA512 28e7b5580b6d19f0584b80b8d3fadef1707412007c41a2fcb5317d6b6b4d8a5a08e5ee320529e974f0e7ccc81c561479075ec12d8f25c8cb2fd4f702b9003baa
+EBUILD openexr-2.3.0.ebuild 2232 BLAKE2B e4fd31a280d2a1f7c02903178da0ebcf91ebfbde833d14847ed23a3d4ca3089d5945d7115409f7d317a41bf42856a3ee552ce30e3ec81369b9f6f2b7090b271f SHA512 7f6256cf42b8b69cc71ac4f22cb0f3524406dfad622123b129c0e4e7566d6c46e57e30e98e9f70a8cd1986f4f6865bf1488779394b6381ea74f750319876e7d6
 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 d617628cbfa7..b573a649c33d 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="cpu_flags_x86_avx examples static-libs"
 
 RDEPEND="
diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
index 5faa611d5582..d8ef43a29f4d 100644
--- a/media-libs/opus/Manifest
+++ b/media-libs/opus/Manifest
@@ -1,5 +1,3 @@
-DIST opus-1.2.1.tar.gz 1011070 BLAKE2B eff3e20c22cd5370a6a3aabf90cfe6f950a3a8d33cbaed8e053ff637c3c45d1d007a10da2f7983564c0bfcc3768f79ffbc041489fc8835f1faaa2fb6c0ef3800 SHA512 4a98d0a7dbd1a313e89407576805fd733c1192e8ef7e1137e3260025478a1cf1c5a8b71b48c372a0cffe6340524137fe47f181651888284f8221fb4d673f7cd5
 DIST opus-1.3.tar.gz 1032750 BLAKE2B 7c79cecb957b0353e35758989b07502f2d4531869985639a069dec8737c15061b56ebff5babe31ad316afa9f7787bde6a7c544fa5be10c1e02ccfdff1a80d5c7 SHA512 438635667e72c326d6d06a30e0b3a5564ba6cf5d484066456e1118e1c2fe3a61b959d0afa77a1084b177b72f9230618b6b55c78bc4e24e9127a09fd345b42518
-EBUILD opus-1.2.1.ebuild 1092 BLAKE2B b20442c5544e25e21f2b1236876a68a697cfbe9108ded8df77727c9cc8b98184f180a7b902f5324ed8e17232e7843d861ee89cc71baac657542c77f2bd67295f SHA512 adc7b0ba8cc8c6b8a44925b744cce35f31cc3702597e17820f9e894013ec9d75ba2578f101ea283f7e32321ea67033d60d856cb890d8c585a16b90108e147605
-EBUILD opus-1.3.ebuild 1181 BLAKE2B 4c24f4c62da72f599539218a74944ec84aa290c04fa214be495f2de33b24a4b4d33049708e1b76ce201a704d86ede27642e725a73cb1a66488daf98095e72a9c SHA512 4cb1b2d38ad55ade24161a202a918ceb6d7c1ec0c9c825d7057bdd762d15cd9989b94c96bbcf174878a1f731a69211b8f921b99150da16db7dceed4b29944a28
-MISC metadata.xml 415 BLAKE2B 17b08c77ce2fde1c129cbbe276fc1ffe28d7f200769ac2e811c3923d3c069a00c359f42a1aecc01d13fff5ee78e8c786935d1234ac49557be55028daf3136bac SHA512 0138063170ab15d60dace8a720fbde24bbc6c8406835dc5098a70c78b21b39a2d8046844652014734c2121f03200fcaa25a22418c864aa22999a1dc1a6023800
+EBUILD opus-1.3.ebuild 1180 BLAKE2B 1765b021157f54843049a524b645eb65b1b2d2cea298447c281a89e8c60bfedfed3197695b07b9c5f950bb1707a35c3d1dcc121a29923731410a2eacf3830db2 SHA512 d601b387e877d1b72a1672a9cc5eab1b650e595f6cf7010676e57250fbfc2a8f9a157a562cf52a8cf9ec1ef197a318e76e6e61a797ff2606f725d07c43c2820a
+MISC metadata.xml 338 BLAKE2B cf5eb32d38bb8664581bd6806c38d36d1b2c79e2db5a2256afc09b1cc2235f4580a3f72290359496b7ac0553f39146c01f46529cbfb43dcba1149ea97e1893f4 SHA512 b31305b9bf5a8b1b6d44881ac23ad8de393b068e4fd6c868d576148d8bf252b74bacf3b6ddbc501e0aa44a5e6fb598c1fe344ab8379292b45e002c9a8e8d0fab
diff --git a/media-libs/opus/metadata.xml b/media-libs/opus/metadata.xml
index 5149d56c5f0d..f3553eca22f3 100644
--- a/media-libs/opus/metadata.xml
+++ b/media-libs/opus/metadata.xml
@@ -6,7 +6,6 @@
     <name>Gentoo Sound project</name>
   </maintainer>
   <use>
-    <flag name="ambisonics">Enable ambisonics support (experimental).</flag>
     <flag name="custom-modes">Build with custom-modes.</flag>
   </use>
 </pkgmetadata>
diff --git a/media-libs/opus/opus-1.2.1.ebuild b/media-libs/opus/opus-1.2.1.ebuild
deleted file mode 100644
index 3c5cc10addd3..000000000000
--- a/media-libs/opus/opus-1.2.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib-minimal
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.xiph.org/opus.git"
-else
-	SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
-	if [[ "${PV}" != *_alpha* ]] &&  [[ "${PV}" != *_beta* ]] ; then
-		KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
-	fi
-fi
-
-DESCRIPTION="Open codec designed for internet transmission of interactive speech and audio"
-HOMEPAGE="https://opus-codec.org/"
-
-LICENSE="BSD-2"
-SLOT="0"
-INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon"
-IUSE="ambisonics custom-modes doc static-libs ${INTRINSIC_FLAGS}"
-
-DEPEND="doc? ( app-doc/doxygen media-gfx/graphviz )"
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable ambisonics)
-		$(use_enable custom-modes)
-		$(use_enable doc)
-		$(use_enable static-libs static)
-	)
-	for i in ${INTRINSIC_FLAGS} ; do
-		use ${i} && myeconfargs+=( --enable-intrinsics )
-	done
-	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
-}
diff --git a/media-libs/opus/opus-1.3.ebuild b/media-libs/opus/opus-1.3.ebuild
index 3e052eeae51c..80e9181a6d4a 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 ~amd64-fbsd"
 	fi
 fi
 
diff --git a/media-libs/opusfile/Manifest b/media-libs/opusfile/Manifest
index 1d1c20f5bccd..ce77d60eda4c 100644
--- a/media-libs/opusfile/Manifest
+++ b/media-libs/opusfile/Manifest
@@ -3,6 +3,6 @@ DIST opusfile-0.10.tar.gz 467700 BLAKE2B eab1c5eadd13ad574590c5b6a4bf8cc7f82ec0d
 DIST opusfile-0.11.tar.gz 467420 BLAKE2B e3e6ee2d1d4c7030bdd5f7ec14503d46ebbfcbc4481ab4652a0be9171d45fe2e855e0f17801cf28fda66f44496ba9f9a2996af7e5aaf5b008e4c3b14263f3160 SHA512 ec3e282310cc4f25475c27b7bc8d1652dcb25d3ac6badf87bd1b4e5397fbe106a0dab81c60d88d198003a23d8a2c9bae8b661edc9b31433effeca438ce56a349
 DIST opusfile-0.6.tar.gz 437980 BLAKE2B 13250d08f9cc9564541bbe116c5482e5b9a0de1c28a8a9e9509b1019cb75d40caefc2b8eb0ad444bb67e05cc4d0813b7b3f1783e4d136201c71200b04f7690c2 SHA512 6fee48f3da21eeffed1ee5a3852234032aa559335225b07383c1104f5efba2f88aebe41c453ab2de472a69766e0fa9b48bec2f97d2a096b27afa96901802ba02
 EBUILD opusfile-0.10.ebuild 890 BLAKE2B 35e7a73420a5aac646805f1175d627c6e3227b7ae5bea191cbc102da955b3ff319099994d440853e9094d33e02a9307729da28be38ad82a04aa0c6df524f90d9 SHA512 36d9df9967f117c7a65354e949eff47e5e78ae681004c1d5f4a287d39fafe4d943c2b9390eb98a1aeb6c4f142911ec2d83271c477e0da3bf3e4cd8f1641fe6d6
-EBUILD opusfile-0.11.ebuild 1018 BLAKE2B 6d7837450a3520d05413694b3659edb42cde1e91a7a59a3198256af70b99c8c4b1c531eb55a76ae32160e60e391422f1d1f8b457a2375823261fbcc3f9cdebee SHA512 04c2eb4a284b689b078ddb2a812a59251613cac8d6345e7e68a15b25ce61b7cf50be259240889f6a507208c3711a55592cf15c86f55488df3da77b15ddbf8aec
+EBUILD opusfile-0.11.ebuild 1017 BLAKE2B a7990aba568dcd9ba45948d658d101b568f3dc72464e91d64a0d25460dd4eb3c575dbd46f90d6f8ecfd1459a25d7692139703137a5fa3df9e56b3e2c6a807df1 SHA512 07f8e3aab8f9dbbf911b926e0d3235ccfb8b95f4ccf74e8e8d7c0a353a1037a3c37f44a451f49dfb3df759b11733bea7f2cba5d60f9fcb4561cf9c8a311ceb43
 EBUILD opusfile-0.6.ebuild 774 BLAKE2B 524fdfebca63b5cc98d8306131210453659d905c8528952f6fe245910f84504216a6514194ffc3790f57853479e6a0eef2a515a4ffabf2b3bb3fefc2b5a8522c SHA512 8cd751db321e6e25c4ddd3028503d2621af55130a89106b44823385aedb07101c4f30d6a00d395641102bdb3efa90dd3c5b0e31269dc12fa498ee7fc12e16c79
 MISC metadata.xml 584 BLAKE2B da2277516b7f14b1a800d3b511ff10579b9544679e5d71535598d2e4a476f0f7cc9bce41247363ee7c50384e5d678379ab0a42fb6172013f873bc1e727d2b5db SHA512 4a4a0c3766de010ae39d0ee2339c21df051e082a36fefa9b8c53ef3ecb184072c1f8cf42aed0e4baa70f5b93d507e942a052a02a6a53ce4ed90496eb445f74c3
diff --git a/media-libs/opusfile/opusfile-0.11.ebuild b/media-libs/opusfile/opusfile-0.11.ebuild
index 1a1222ef8021..949489b0f499 100644
--- a/media-libs/opusfile/opusfile-0.11.ebuild
+++ b/media-libs/opusfile/opusfile-0.11.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.xiph.org/releases/opus/${P}.tar.gz"
 
 LICENSE="BSD"
 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="doc fixed-point +float +http libressl static-libs"
 
 RDEPEND="media-libs/libogg
diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index 4f99978dc768..f26c01c39392 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -2,5 +2,5 @@ AUX raptor-2.0.15-dont_use_curl-config.patch 1681 BLAKE2B 5c3b241836e04dabbcd6fd
 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-r1.ebuild 1578 BLAKE2B cf5d475a87c1805262504fd1b4a954f87a2db961bd03d507908edfaf6b128e83dee0d4a4852d5d574c0a71601fe29b772181d1302c87f6cfcaef727aee113828 SHA512 64b803714dd662028a16e66b0c802cd919ede858473d5a0c8da8d68d4218b1c9608903d86587ca40e20a424f2c984c03dcd31ca9fe2b3fad6d9f365e753555ac
-EBUILD raptor-2.0.15-r2.ebuild 1669 BLAKE2B 5cd2a3b1be0edbee1ffd7c97203562ee4022310ce5e16a4b1e7a8d3c038ea0a644a519978161b7b252e56a17369320875effea66befd17142d0072e96d5213e0 SHA512 c37201e65104536f2ea63eb2ec5de8964eb34ac77d66d6176796f2f6863bf3ec3655c0e3d50c90ba11a7c4839b711462df163d6b98dcd69b7988642ea1104919
+EBUILD raptor-2.0.15-r2.ebuild 1668 BLAKE2B 2d134617476e85b5ed91e987ca2c072132e19fec15c9d93ff125ddd6f7e752366511509e88ae998b3c3892e1ac5dc064bef15422a4c52e28c7990c48757a7e60 SHA512 557c7da7f686d901be84a3c811083a914c7b7ea60b98b3f4f1a0e5e4447fb5f8a0349707f950b2411335a44ca6c0325b9469b3144185af33347b9da1b1bb1e02
 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 e03f0a25cb09..19c65a6a774c 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-fbsd ~x86-fbsd ~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/sbc/Manifest b/media-libs/sbc/Manifest
index 04d944b9b802..40077afd0c15 100644
--- a/media-libs/sbc/Manifest
+++ b/media-libs/sbc/Manifest
@@ -1,5 +1,3 @@
-DIST sbc-1.3.tar.xz 246292 BLAKE2B 6d628f4f5fe592b04255a965b08a85736c75d16e4caa3a5fda1dad57a5a47a82accd5e61ae48adfaf9ac1a478e20b5fa02e7a34c87fda0ac79666f616c4356e6 SHA512 c11cb1ede8abdb226d404ce34307d217b716b91cbe550ed90cb5387b062b7b97a6b7a81371de6f462d8c1429cb3299869a1bda347fa175e9d81cfa2bc2056c8b
 DIST sbc-1.4.tar.xz 250656 BLAKE2B a5b59a0ac209b44843af49e63f7b6a6b397b3905f0efc52c18a3b92785d297d39dad80f5b124e97c50a9535f892f1451bf0a2945ba223a522eafbcad46eaad9d SHA512 f35250c202034e93ce4046d29883d76b162164d42fb59e6af8ff5e57f197244238f5f8087309cef2d44755c179e7f0869cf096735c8de510b1ac7e0f6c29d84f
-EBUILD sbc-1.3.ebuild 865 BLAKE2B 4f889f142268ddb390da6485a3a2d413a37a2d850f8624bf095b1d4abe57def3754431608b23144ca94b4742b4f11d201f6e3f5d0fac0e366e2a6b6387520adf SHA512 eb366a5d5e5497c5d650c365b31334bd1a528f85d2ec7940d524f0786b92927e2d2f6a2a61bcf61a14b34d8fb54f3facbf64a3637484ad8ff65aace88def2737
-EBUILD sbc-1.4.ebuild 863 BLAKE2B 207e0776f78b76eb2669c93f98a8a302a0a2be783f1d0f63489af6c1c80876998a704134161d3f9e2c98dd0ae04d29ee7d4065ad8d766062b9ce08ffaad6b65b SHA512 74e49bee9284b2d896db233cd9835ddef81577d4774fd50c24fa96ba0df3989da45726bb6dea15d16eb569c84c47e7900d0fac548173def22de2a3b93bf756ad
+EBUILD sbc-1.4.ebuild 862 BLAKE2B 697595fbc541b3d3ad41e701b4f2a67b314c91a2aa5d8976537da77d3144074d137aebafcdc6cb6ee17d850abb0c078069588949745261b873141bd3dad13d06 SHA512 aa0b198287a1533697390dfd8f208f3e9ccf615fa3b2e0c8e275891208db0cad85a1afe337b55438242dc96af5f6ec26d90064b370789709bb1d655dabcbec4f
 MISC metadata.xml 356 BLAKE2B 37e1eb09d0de357b5f84cc88a36d602c1522fb5e1a80542390297eca08bef82e30a85af697c5bcf1e042b98a63943f49b3e7902ef866207998583ff0c1a96c00 SHA512 c9b1f0a337ecc94fb295f536d18166b9bae68ca96e27f96a17b38b2374203bc6979e9f168e423e2eb87520919ba76c433a6b60c866b82c449b48d84e92165524
diff --git a/media-libs/sbc/sbc-1.3.ebuild b/media-libs/sbc/sbc-1.3.ebuild
deleted file mode 100644
index 2fc75c06ff3e..000000000000
--- a/media-libs/sbc/sbc-1.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="static-libs"
-
-# --enable-tester is building src/sbctester but the tarball is missing required
-# .wav file to execute it
-RESTRICT="test"
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		--disable-tester
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/sbc/sbc-1.4.ebuild b/media-libs/sbc/sbc-1.4.ebuild
index 5540703abc41..1ca770b993e9 100644
--- a/media-libs/sbc/sbc-1.4.ebuild
+++ b/media-libs/sbc/sbc-1.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2 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="static-libs"
 
 # --enable-tester is building src/sbctester but the tarball is missing required
diff --git a/media-libs/urt/Manifest b/media-libs/urt/Manifest
index b9383ca66b10..84de8e92ae87 100644
--- a/media-libs/urt/Manifest
+++ b/media-libs/urt/Manifest
@@ -10,5 +10,5 @@ AUX urt-3.1b-solaris.patch 281 BLAKE2B 55cc8b4824624c5b9f6db6ff6e62c841950c22298
 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 2385 BLAKE2B 15375dcaafd22fca0cb7549a8f24cda62fb36e25b533e26f00d849091b5bc04193752adb17b00ef484e90f521915151e55f8e41ac0e28573481d105597066769 SHA512 e60f36e959f2a7f0b101a0eeb35786397878b6931fbe36efd7ba8dd4f8163c633b3390fa7025b477a851f08a3b9871cb894f512b1351c5c10bf09f9eba78b940
+EBUILD urt-3.1b-r3.ebuild 2384 BLAKE2B 809829e5b242e5a1f661482fa8de994db839baa883e90a387ecdf3aa5f0f33095fbf85445b8ddd4755ecf2fdb7eff413c4188f4f43d7a014f7aa224d333ff9af SHA512 76cc36c2d3fc94cc7bb642890e36c814e9982735aaf928d99f5c7d24afa2e426993e9e6cf66d9c8884b44af61d2205f2f912e0062dc64347cc4d43324c185206
 MISC metadata.xml 308 BLAKE2B 6006038e97bc7af97fd7e4c95f87d19d2458452da5ba066df88aff58fd10bf0f29daef641aaf39ec14a102f4e23a0b3be30006a6aed3830322e2f148a13dc5b7 SHA512 1056a163d7f6c3f2e540e6f1b315ea23aa4e9664c14ba51d094e33ab8ac4e3888fc9b049b91e3f2596e9458efe6041a7e2c5c40979171f7fd473fa6994862ffd
diff --git a/media-libs/urt/urt-3.1b-r3.ebuild b/media-libs/urt/urt-3.1b-r3.ebuild
index 1ac168645eb8..c7d6649cd9f9 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="gif postscript static-libs tiff tools X"
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2019-05-04 12:02:00 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-05-04 12:02:00 +0100
commit	eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 (patch)
tree	ce35c6d01b5ff5de95c3a20fef853b9a6518ad2e /media-libs
parent	b7ebc951da8800f711142f69d9d958bde67a112d (diff)