gentoo resync : 31.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-31 18:57:01 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-31 18:57:01 +0000
commit: 69051588e2f955485fe5d45d45e616bc60a2de57 (patch)
tree: ef8699cca7ce3773b1de747b167ceeacdc60cb92 /media-libs
parent: d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 (diff)
147 files changed, 940 insertions, 398 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index e595a4bd4b99..0a1bf778f198 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index a6b0b8d8b274..e394ebc451c5 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -4,7 +4,7 @@ AUX alsa-lib-1.2.2-namehint-add-omit_noargs.patch 3450 BLAKE2B f5fc66626a8f99d01
 DIST alsa-lib-1.2.2.tar.bz2 1030747 BLAKE2B 176054c7783452fcd0b30482f4d85fb88a1364a97f79830f2c22cd578275280fa64537d00a08f3e3b1420e4aeb4e4269c7523cb4296db3ed095bcf078b452726 SHA512 d21adb3ff998918c7d1820f9ce2aaf4202dd45ccb87cb092d49da8b2402b6ddaad06325be0fd59f17393a5d9958e3743bfccb4b14bdb947a42e7d791d73c7033
 DIST alsa-lib-1.2.3.2.tar.bz2 1038591 BLAKE2B 70ba972953f71fc6ac20f6f3e91361b5aed72c8c7887252331a01334ec4cc154c1bfea02dfaf0f76f8244b8cf73426d83577dcf55aa0033f80ee303d23386df6 SHA512 1fbc6360fda841bd9ca488739bdc9f4142c1b4a07ff767f48f1e160e3d4dff914aed422c97088e238b5e77d7e30aa79ff72569c3348a4cf4a412e1e4bce0bf2a
 DIST alsa-lib-1.2.4.tar.bz2 1044405 BLAKE2B e1d5d9afe21dac693645274ae4ec8a607c9fcc9915ba4ebccfdb539d44b9353ba07529e2c8eaca119884b926d4467285313c945c9015a788101fe532064442db SHA512 12086952dc8f16f1cb6946517858e17b1c3276aeda9ff5703a84bb38aa78eb4c4e9cb4485c5b3f21f174fdbd976b3bcbbc481e85cb2460652858490df51ae844
-EBUILD alsa-lib-1.2.2-r1.ebuild 2168 BLAKE2B 1d3273b0b8a45678ee5740130c684398d234479ce46f60648127f6ef029b158ce4a6ff8d225d79637edcf4b7837122afc447f2e6e3b644678f36dcff1f06d7b1 SHA512 d9f9441425caa11c3105cf48db2c0e43bbf376db788274e1c78be014d5cb195c6abc459c2bce08bae6812909cc65aab30066611f18b1e70245eac1d2cf9bcddd
-EBUILD alsa-lib-1.2.3.2-r1.ebuild 2105 BLAKE2B fcacdf2ae688478c64b25513dd8481f8e1f26edf20f089688ec952aca24250302552c7a36b7094c80f2b160958de196d1c26d6a63d792d3fac09a8034a048f76 SHA512 31559370c76269d35b062257fa6ade631630b8f0bd02c681afc580ea0f3aa1af52ffa4cd88c1abcc4522144372f6d685da7c60647092dc7b8361245e8868e44e
-EBUILD alsa-lib-1.2.4.ebuild 2112 BLAKE2B db57cf3e7d6353c6ff1cb5c824cd6b3504faaa1c0160b596384fe84020267e49ea4dd68c572126a4de3947d14f3150a4c30032a7ac8b0de3a7c63ed6a928e6e7 SHA512 f510ce16df02a18412e3395866e7361ed7abf205aab0f34648af18ae2f1b37910633c3033177b32412a929ca5bd002f70cfe325cdb1eff0bea5829bf14992a99
+EBUILD alsa-lib-1.2.2-r1.ebuild 2166 BLAKE2B 58967742d15b0a540b7e2fe327c99380904d7ac04937896c0720965a9fd35e170a53f8549355e5b96c498ae0b9f1fdb21a3085aa1eb02a9a93daa8f0a63968fb SHA512 bc1f41efe336615cbd10d236aacbcbdd1b65a6ffeccd1f20cb4107153e7ceb1d1f3bffd0bc2ef9c39a320dc7bfafbc54c2078aa5288e9f6a50d6f720478aa55b
+EBUILD alsa-lib-1.2.3.2-r1.ebuild 2103 BLAKE2B 124b90973277ca6e2c491a9cecdd5431eefac44f945735d2beeb237b9085194aab6e9b9cbc4c2218f922f387bae104557f8d9e0c9dd4aaf9ca7f2150dc9c37e7 SHA512 35f88e0b6228c8ea9aa87c10b2cca397f5d03a679cbaf61f080a43d633bc789bea3abe7efdb52c80188b8a5af36929378abea999a5bc8c4fc81d63368ad30160
+EBUILD alsa-lib-1.2.4.ebuild 2110 BLAKE2B d501431e7ba57a22cf823e1540e7cd92f4fe8a19f772cfdc57a3b89fcd13b0045d3e44258ac36e3584660b389d5cd06c9faa6049dbc814e34e1f64e6ade5ed8a SHA512 c4ecf78aa256aa2876badd84f2d2c0e5a4473e4f0cab6bbd71fb79fc7cfce1ef1c2cd236f3228e97ff6ad09d15ae6f107d8252de7a349554173c5313928ba1fa
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
index c87f725d9c82..05f90764647c 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 inherit autotools multilib-minimal python-single-r1
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild
index 5239b6635174..726c108f049b 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 inherit autotools multilib-minimal python-single-r1
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
index 11fed2e2aa98..0ca96e710bcc 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 inherit autotools multilib-minimal python-single-r1
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest
index 24bcd0d00aba..0d0e6fc9e2a1 100644
--- a/media-libs/aubio/Manifest
+++ b/media-libs/aubio/Manifest
@@ -1,4 +1,4 @@
 AUX aubio-0.4.9-docdir.patch 1192 BLAKE2B 617f5a63d51440eba157687b752822b3e14316781d3534c63194c9bef214574f195d3dfb949fc357862c7ddab01e0f9bb58ea54a75dac4c90f27a24f0c1cf477 SHA512 dffe872bd5c63eb874f00b1303e63f241d9b349d5f32fbf34b659b6211cc9cc828784bb3f5ddd2210c9e6b8459a73e842988bad4474b19e319145971de138526
 DIST aubio-0.4.9.tar.bz2 397604 BLAKE2B b849d92678ea8fb20e17921b1a61fdc85a84d4a528acfefa3278169ab5f7fe935217ec37dd9f931202f0f0a1fd3a9518372afbce34cc2dd3ca30c6b4e5d9a301 SHA512 0cb81bb4b15051db3f3f4d160d500af56fdfb237e0a74e3f366f53c2870030aa0a7cee8469a611a9694c36b8866d3d42ffb48241c999de08f3fee43e6d903130
-EBUILD aubio-0.4.9.ebuild 2894 BLAKE2B 3592db8aadd7adfc9fd1db1d1bbfd35954945f33114b687ec466472cb6e15cd54ef1362f6b472504d8b7288dd3e950bc561e3cc68ef3fbe011956cbbbdded3cf SHA512 adb0219db61d71876ffc24b29f4b88b58466a317c43e125c727fe6f98aff90fc74d5aad33c4e5f1e74c18efc6bef2dc3a4dc1669d25b468620927fead23369c3
+EBUILD aubio-0.4.9.ebuild 2894 BLAKE2B 64ac074903ced4eccb7c12812977fe4cc241b313011a603af532883d48e6f53d2a2ed1b7bf2d5678d76fe0c9894dad849f3665b12e8a5142e56c1a9c737a5b2e SHA512 0c5c1098ee248deba4a291d53abfb33bae7702b0e62de693a5f90f1abc6095ba85f223a08a8b38fd0190e1dc3242ab6d99f63446ed8a1de29a112a615f026bec
 MISC metadata.xml 346 BLAKE2B 00429033f506bf3818f26f13062d21d0d04d8fc84185244615a09d008c5da6e350df5f32bdcba2c07103039ed64f802cc563a0ca8cd79e117741b947e421142d SHA512 ff3830c2d2322fabdb34458fd27c3e05ad825b1d707eee6150417e4c21480bdffbe4e639ff33a9914cc28189b91e970719326f065746f4241e186f7b27b168d1
diff --git a/media-libs/aubio/aubio-0.4.9.ebuild b/media-libs/aubio/aubio-0.4.9.ebuild
index d5ac80ce71d9..3e1e243b1c38 100644
--- a/media-libs/aubio/aubio-0.4.9.ebuild
+++ b/media-libs/aubio/aubio-0.4.9.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE='threads(+)'
 inherit distutils-r1 waf-utils
 
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 4b312bdebc96..b1f2e24a770f 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1,4 +1,4 @@
 AUX avidemux-plugins-2.6.20-optional-pulse.patch 743 BLAKE2B e60a7433e539d49d5bff7dea62bfda984866dd72b93158827ee5ed785d77174db3fbde9e67c9c3fdc8d652485d8e704c075811c65848ef48f78490c6a3061b7f SHA512 dcec29c63aa7eb828fc1aaf4b54edb76290e3c7655b00002efa8036f0572b1c0111c30e873b925bb606e8e672e177ba8d103100b1fb55dcc830b83e4a5556710
 DIST avidemux-2.7.6.tar.gz 21963753 BLAKE2B 6ca343f90c37844ebfd61123badccefb7327cbf500723c031257cf26500a5b6d98955568c2a9c0d182af68f162e878459a51e6049485937f9b01b4439b32e5e0 SHA512 bc60c733168d40d5b39cc7dd1f74b3f1315e9727302478ef1621e18748bad3400bcfd4d5199862c3093ad9df51385b6b2a96f0f8fedf9bf1c00060327545fb0f
-EBUILD avidemux-plugins-2.7.6.ebuild 4221 BLAKE2B 9a1e7991f8bbfc928a2aa5d8afa14fdc1b1b2184ddbf0422d26ccb46e8ae224f172ad7bb9abd6237c602b065a561946f02c1663e68787c764afd7efc0f7aff77 SHA512 61b79694874224d165567fe18880b299c6799e0888724218f2ab08cd58faaf3c6b7f76b10e786a90c2bbe62a80d0ffe382761e51304731ab1668a5e7b886312a
+EBUILD avidemux-plugins-2.7.6.ebuild 4219 BLAKE2B 3c898da7cfd15fc2aba0794656c88dce1bea1c785848100ca2ee4f9f59eb4a62d30793be332c8bb5aa7f696bb684f24e62529869996ef46998f1fa6c396f6884 SHA512 d3abc534168f7a84917e6c52cbef6dba3be04aaa949ba40895241b3671a2944bf623835a928559bcd96a0960f8ae131066e7e033674a04552c6e5719b089404c
 MISC metadata.xml 1313 BLAKE2B 931af633c34ab1bf1f45705ac5b6e2fd6ea3b3fa86dc870c404d29e7fbdb723f1f3d1bf60f051fd9ab30ac8ee83142c1082d0ca3994019d527c3b2f66884ed20 SHA512 26aa4c4bb69ea3d2b41c2f6b8147019b79d8b740690ac7381f28abbc51232e9340b007a53562e4b74ff8a46cbbdb6d9091b2d1981720f4bfe89656cbde28fb3d
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.6.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.6.ebuild
index d478680028ef..05c23cdcca6a 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.6.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit cmake flag-o-matic python-single-r1
 
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index 08900880ac70..3e60ac097b1a 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,5 +1,3 @@
-AUX codec2-0.8.1-fno-common.patch 269 BLAKE2B 181d25b915a6dfc21450004e0da53a41888a04210dc944ec58adf8bab40b0216bb8a98c56f8cfcb74c88d91b18916ac05886c3471da92525d6c4bdba3789e55c SHA512 c3d691159dda7d9d398e182dc233302adddc3c21f2a2d1a92934c660021357d5378c7e17c4cae48573fc94f180d9ce5732b36e76363a74f738c9916d12b7f1b8
-AUX codec2-0.8.1-unused-deps.patch 2966 BLAKE2B 886ea88d068b8c6058468c0dffa1071443ab993ff169a9b38b628767ebb866e0e05feba2fdb1a5f108dab15d2f4a06acc228d4fbee7b005ada1185e48ae26f94 SHA512 89c75477ce2ebed216c2239b237c5c9a502753ac55d73808702230b89f81e6a2ce176b0613f258655e6a83e85b5943ccbd7bccecf650117ff61e7d49e386be06
 DIST codec2-0.9.2.tar.gz 12244006 BLAKE2B b7fdff34e41f93f237235db5cf1352e7165565ae13bc88cfe41bc6eb280e16f49c71f6b9947ced81612b0fa6b2630a9f2f75fe257ff09bae5eef1a0b6b39c95b SHA512 30a2eb95f7b0f47f0c0c7f08c9118f089acc32adf8b27f5b4354c89139efe80607d6d0ca5e0a9eefddf3640f02c483b9c804ad52c5dec6295968b7267f3a716c
 EBUILD codec2-0.9.2-r1.ebuild 671 BLAKE2B 526e1c54cc71b7f1700ea74d7bd6e9b922cb565d878f78bbafa73f97f6f63f798c53d9ca9d33000a9b82bebdcc1a6adc99d7bd0600f484da5025ce1d6726b74f SHA512 76b3231baf3f12383ece2889a7fdf22f2207329fe465b0bc3a47d848bfabb1a5a10e33788c04443406ffe146a464f2a2aa095370d7490f483ae6051cdccfc297
 MISC metadata.xml 325 BLAKE2B 8895125c208d04f4583087f7d5d6bcf5fb84db2800feb33ec8f0370ea2eabd36bbbf4914df33bb7d580fb966af35873bb39633d7248d9d69d48b8968a8f7776c SHA512 427760a65fe9d84a527287e815ff6e4f783bbb5ebf28fd52c225721c649eaab738edf090a6af72547b57e2c1a80fd616d8af1a2af931398819de748c4306c0b7
diff --git a/media-libs/codec2/files/codec2-0.8.1-fno-common.patch b/media-libs/codec2/files/codec2-0.8.1-fno-common.patch
deleted file mode 100644
index d5818a01f5c5..000000000000
--- a/media-libs/codec2/files/codec2-0.8.1-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/codec2_ofdm.h
-+++ b/src/codec2_ofdm.h
-@@ -51,7 +51,7 @@
- struct OFDM;
- 
- /* Default configuration for '700D' mode */
--const struct OFDM_CONFIG * OFDM_CONFIG_700D;
-+extern const struct OFDM_CONFIG * OFDM_CONFIG_700D;
- 
- /* create and destroy modem states */
- 
diff --git a/media-libs/codec2/files/codec2-0.8.1-unused-deps.patch b/media-libs/codec2/files/codec2-0.8.1-unused-deps.patch
deleted file mode 100644
index 174e5173aa66..000000000000
--- a/media-libs/codec2/files/codec2-0.8.1-unused-deps.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 3f786481d49e25a089586df4656cab563c90ae41 Mon Sep 17 00:00:00 2001
-From: David <david@rowetel.com>
-Date: Thu, 25 Apr 2019 06:47:06 +0930
-Subject: [PATCH] removed unneeded dependancy on libspeex and libsamplerate,
- these were just used for random misc programs
-
----
- CMakeLists.txt      | 30 ------------------------------
- unittest/CMakeLists.txt |  9 ---------
- 2 files changed, 8 insertions(+), 48 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 669b8be1..6c8eae19 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -195,36 +195,6 @@ if(UNITTEST)
-     find_package(Threads REQUIRED)
-     message(STATUS "Threads library flags: ${CMAKE_THREAD_LIBS_INIT}")
- 
--    #
--    # Find speex library
--    #
--    message(STATUS "Looking for Speex DSP library.")
--    find_path(SPEEXDSP_INCLUDE_DIR speex/speex_preprocess.h)
--    find_library(SPEEXDSP_LIBRARY speexdsp)
--    message(STATUS "  Speex DSP headers: ${SPEEXDSP_INCLUDE_DIR}")
--    message(STATUS "  Speex DSP library: ${SPEEXDSP_LIBRARY}")
--    if(NOT SPEEXDSP_INCLUDE_DIR AND NOT SPEEXDSP_LIBRARY)
--        message(FATAL_ERROR "Speex DSP library not found!")
--    endif()
--
--    #
--    # Samplerate Library
--    #
--    message(STATUS "Looking for samplerate...")
--    find_library(LIBSAMPLERATE samplerate)
--    find_path(LIBSAMPLERATE_INCLUDE_DIR samplerate.h)
--    message(STATUS "  samplerate headers: ${LIBSAMPLERATE_INCLUDE_DIR}")
--    message(STATUS "  samplerate library: ${LIBSAMPLERATE}")
--    if(LIBSAMPLERATE AND LIBSAMPLERATE_INCLUDE_DIR)
--        list(APPEND FREEDV_LINK_LIBS ${CMAKE_REQUIRED_LIBRARIES})
--        include_directories(${LIBSAMPLERATE_INCLUDE_DIR})
--    else(LIBSTAMPLERATE AND LIBSAMPLERATE_INCLUDE_DIR)
--        message(FATAL_ERROR "samplerate library not found.
--On Linux systems try installing:
--    samplerate-devel  (RPM based systems)
--    libsamplerate-dev (DEB based systems)")
--    endif(LIBSAMPLERATE AND LIBSAMPLERATE_INCLUDE_DIR)
--
-     add_subdirectory(unittest)
-     add_subdirectory(misc)
- endif(UNITTEST)
-diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
-index 35a944fe..9b2e0e95 100644
---- a/unittest/CMakeLists.txt
-+++ b/unittest/CMakeLists.txt
-@@ -73,12 +73,6 @@
- add_executable(tfifo tfifo.c ../src/fifo.c)
- target_link_libraries(tfifo codec2 ${CMAKE_THREAD_LIBS_INIT})
- 
--add_executable(speexnoisesup speexnoisesup.c)
--target_link_libraries(speexnoisesup ${SPEEXDSP_LIBRARY})
--set_target_properties(speexnoisesup
--    PROPERTIES INCLUDE_DIRECTORIES ${SPEEXDSP_INCLUDE_DIR}
--)
--
- add_executable(fdmdv_mem fdmdv_mem.c)
- 
- add_executable(raw2h raw2h.c)
-@@ -91,9 +85,6 @@
- add_executable(tnewamp1 tnewamp1.c ../src/quantise.c ../src/newamp1.c ../src/mbest.c ../src/kiss_fft.c ../src/sine.c ../src/nlp.c ../src/dump.c ../src/octave.c ${CODEBOOKS})
- target_link_libraries(tnewamp1 codec2)
- 
--add_executable(tsrc tsrc.c)
--target_link_libraries(tsrc samplerate)
--
- add_executable(tlininterp tlininterp.c)
- add_executable(tdec tdec.c)
- 
diff --git a/media-libs/elgato-streamdeck/Manifest b/media-libs/elgato-streamdeck/Manifest
index 6aac3033d2b7..eac4aeba155b 100644
--- a/media-libs/elgato-streamdeck/Manifest
+++ b/media-libs/elgato-streamdeck/Manifest
@@ -1,4 +1,4 @@
 DIST elgato-streamdeck-0.8.1.tar.gz 2552919 BLAKE2B 505a7ad71b04473b3eb2c719304c224829ebf5abc366bea0d38daf882099d92308b1099815435ac03f65542bdb908a2cafbdc96f10168351fd06644050b69f06 SHA512 c65b90ab0ee5c6e17a6f7af670c54a12c96b705ef4bec359a51ba6671a3908626a9658f5a5829266102fa249628b82ee04c525db995f4984f26f802620598e6c
-EBUILD elgato-streamdeck-0.8.1.ebuild 678 BLAKE2B 27bcf7be0cb80a4a5e0bf7dd6d53eb1cf0b5dbeca0af5881fe13de907fa86cb3c1759d65a6c2b59148310e6d35bb8b40c63ee86fea1e52a23297fa249261d0f1 SHA512 780bff4e526982e83803b69d9dc4809dcc589c3aeaded440c10bdaaec4f13a9658f4ef18b9cc0b8cada02e3defc9a549331d6d6d7354f3dd30e8f8b817c20968
-EBUILD elgato-streamdeck-9999.ebuild 678 BLAKE2B 27bcf7be0cb80a4a5e0bf7dd6d53eb1cf0b5dbeca0af5881fe13de907fa86cb3c1759d65a6c2b59148310e6d35bb8b40c63ee86fea1e52a23297fa249261d0f1 SHA512 780bff4e526982e83803b69d9dc4809dcc589c3aeaded440c10bdaaec4f13a9658f4ef18b9cc0b8cada02e3defc9a549331d6d6d7354f3dd30e8f8b817c20968
+EBUILD elgato-streamdeck-0.8.1.ebuild 676 BLAKE2B d8bcd86606eee419cf0c5be22641cf0c31ea3cab98b7b4e70051aabde3ec24aa0a0de2a9b9437a82d8b578f1f2eccccee3f822b620841d9067eaf4f1b5a8f502 SHA512 75cd80cc0b91d9a213f83ba60ac8a31953973577ed5a5bf5a753a32e639e852f2dc3afda3e31c105170eddf77e2975654dc8df244b0665b97ccddae3f892b1e8
+EBUILD elgato-streamdeck-9999.ebuild 676 BLAKE2B d8bcd86606eee419cf0c5be22641cf0c31ea3cab98b7b4e70051aabde3ec24aa0a0de2a9b9437a82d8b578f1f2eccccee3f822b620841d9067eaf4f1b5a8f502 SHA512 75cd80cc0b91d9a213f83ba60ac8a31953973577ed5a5bf5a753a32e639e852f2dc3afda3e31c105170eddf77e2975654dc8df244b0665b97ccddae3f892b1e8
 MISC metadata.xml 348 BLAKE2B cb56a80dd311cb9182715619ad17b40dc832adbc3800410aa788684b39890f164eccc98025616ea42ed6098cb7bdf5de2b074d04cd8ed89a71ba7a9b427b63e2 SHA512 95599f43d0440d499b92acb9fe90f1e93514672aec977f7be692e1957be3b255c18a3b0e54eebfa1b80868fd34c1141376a2ff10316e371fe4c55c2cdad0d60e
diff --git a/media-libs/elgato-streamdeck/elgato-streamdeck-0.8.1.ebuild b/media-libs/elgato-streamdeck/elgato-streamdeck-0.8.1.ebuild
index 07a7469b980d..1cd62855b0b4 100644
--- a/media-libs/elgato-streamdeck/elgato-streamdeck-0.8.1.ebuild
+++ b/media-libs/elgato-streamdeck/elgato-streamdeck-0.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Python library to control the Elgato Stream Deck"
diff --git a/media-libs/elgato-streamdeck/elgato-streamdeck-9999.ebuild b/media-libs/elgato-streamdeck/elgato-streamdeck-9999.ebuild
index 07a7469b980d..1cd62855b0b4 100644
--- a/media-libs/elgato-streamdeck/elgato-streamdeck-9999.ebuild
+++ b/media-libs/elgato-streamdeck/elgato-streamdeck-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Python library to control the Elgato Stream Deck"
diff --git a/media-libs/ganv/Manifest b/media-libs/ganv/Manifest
index 5dab1606df4e..e85c9aee6731 100644
--- a/media-libs/ganv/Manifest
+++ b/media-libs/ganv/Manifest
@@ -1,5 +1,5 @@
 DIST ganv-1.6.0.tar.bz2 377068 BLAKE2B f78c4783f0188fd163b087c789d50eb67a54a77d26d261d3557fba46a7bee09fc3326204273ad496d6b2ae262368015c3f186c290f2b85e6d5297eeed7596677 SHA512 05900aa63e65646e75f805dfe6ae5901efb19ae31a3f0a6730a713bfaffc47bb93f683879ce2a75093ea09e84a9d3137966b68b4ad307707753dead1df439a09
 DIST ganv-1.8.0.tar.bz2 382822 BLAKE2B 4936b7f87fa7cf17ed86b8165558684f0f59387c9673144d57d8505e41f367735117e9f5b08508dcecb831b77b6bbc6559323417824a9f8defc43c81cc91d469 SHA512 00969879592af11d211ad790b970a8a3765ec0591515af856230e3fc9371b1611f2a4edc73d1fc59371a4c4a49c7479f279dc6f298d843296e6707cd2d495af4
-EBUILD ganv-1.6.0-r1.ebuild 989 BLAKE2B 220776bd6eb12032155ce483ede6fa5c9c781a01d72bce681af492683a7e8b0065dc76a9f889dd78f5219cd93b35f2dc22cdeec316b086a6860c959d5b0fef1f SHA512 2e32a7f133e96a0e6f6ab28db8fef64505a2bdac81f31d68d62c11b4cfc46608256db7c84e1de1aaa027f024e86a0b7b7499072855b9ead722b35fe042ef199d
-EBUILD ganv-1.8.0.ebuild 991 BLAKE2B 7816da3720c870a86fdeedf59df26218c97af5666cd5242a8743b5ebfe3e4bd158dbbd119f791e27d2b2773d23d8cf52278fb7a03e0b8f6cd542d196f932d808 SHA512 57d98f6bd91228968628562352066324309cc6210c980967b22e29f4b42320da3c866805e744f91099131199a81d2003126d57d2911a1f5d7ca9c7af366089a8
+EBUILD ganv-1.6.0-r1.ebuild 987 BLAKE2B 228b9642a9eaf93b06f90ef12c3aadce32fa4e493afd901c5c9ed1279d3714753cc283565cbb822b728834a0d432c0f9a59fbb67e841de324d8c9acf222535fc SHA512 8ac137065435e1e5ceb7a5be97cd8bbd7682869e848c4307b78c2a15b94559613189b68a63197c16ba2e132b564093b87e561a85084ac87ac9e9448f61da302c
+EBUILD ganv-1.8.0.ebuild 989 BLAKE2B 61b0c5760462c2c51edb417f2ad02624f60563e735b95f5e6dc68610e7e1ad8e2c89147792dabcac6fbf084e7c1706ede8179569be9b806603afcb7b9d07a18a SHA512 805ec99663db18953bb323f00bf5474d378ad46e125d90e51af836eab94ee667a59d8825b7bcaf5e12c52c0c45b80687db8d67605a88c47ae9f18768aaedb084
 MISC metadata.xml 356 BLAKE2B 0ca0ad63495c9f314c3fe7bfc48a7538d07ad65f9b772996b86ffc268420bf9548002a920a9a7f53f25984c309fc50d9a1735281dd18421a82cef913e10d49da SHA512 f2b5f01deb2f8d879b4a4107571ac469caf163bd2c44a066b8758a9596445f0baaa125b5e3ea883008221aee90d98982222b40b43c10f694d2672842bc1103ef
diff --git a/media-libs/ganv/ganv-1.6.0-r1.ebuild b/media-libs/ganv/ganv-1.6.0-r1.ebuild
index 11074c981301..28aa4c0f5514 100644
--- a/media-libs/ganv/ganv-1.6.0-r1.ebuild
+++ b/media-libs/ganv/ganv-1.6.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE='threads(+)'
 inherit eutils flag-o-matic waf-utils python-any-r1
 
diff --git a/media-libs/ganv/ganv-1.8.0.ebuild b/media-libs/ganv/ganv-1.8.0.ebuild
index eaeb8d96462a..a71cd3506df1 100644
--- a/media-libs/ganv/ganv-1.8.0.ebuild
+++ b/media-libs/ganv/ganv-1.8.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE='threads(+)'
 inherit eutils flag-o-matic waf-utils python-any-r1
 
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index d7dc9640fc88..876bfcc4259b 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -2,5 +2,7 @@ AUX gd-2.3.0-disable-flaky-tests.patch 792 BLAKE2B 81d4d56f0365e51fd1f406f3f27cd
 AUX gd-2.3.0-fix-tests-bug722448.patch 2231 BLAKE2B 629caa9cd7dbd63cab93c97466921ee9131c5542618fdb5ce772a9b1bd3fcf2e64f93da999ca9011917cf8e726cae914c76529eca1a24cd2c31f55c4e75aaa7c SHA512 6d66af4e5d70e1e919f81bf0fd7261bd13216da4873927826d5c4925cf1673a9a3e98d588f693bab7505ee02e7a231c19687e27c1efc1a606bab3b3ab20a93dd
 AUX gd-2.3.0-getlib.patch 2848 BLAKE2B 308577a8fce5b764cf96139d21d4aa6a6deb86244d0b858f520da1835547853d693f7c71621222744fe438f393aaaefa1fc6316ef27442a426af09df95c0faa2 SHA512 24d4774af36ca832504063c8327ff9a84956ae1a48cda3ef6f27d819e8a18b31a9083f2ce6d2587d5acb237d8c96c3d68cfe8eb8350a10715c15d16aca1cf37c
 DIST libgd-2.3.0.tar.xz 2539188 BLAKE2B a90f48be959d1bb6774ec44960e191b8be134ff3e74401eba4cbf9b165c72665f3dffe3beaaf92fa6069e0ef79533be5d57a5946a1839f55446072fa322ed808 SHA512 5b201d22560e147a3d5471010b898ad0268c3a2453b870d1267b6ba92e540cf9f75099336c1ab08217e41827ac86fe04525726bf29ad117e5dcbaef9a8d0622a
+DIST libgd-2.3.1.tar.xz 2632076 BLAKE2B 22457c4a2fc493872ccbc8a2c45283e785ab200ca671c48f00f3f22a037fac3b97afb35534f5ec7288714a16dfaa59ed53acbbd39c3e7f89f16cdec72ef1bed1 SHA512 0b96406a1d62129d7d63f78fc4558062c223a3bfbf9719be86362fd922b72b5dac294524dd1b0a996a4a7a709ee9d2dfc790ee32564add70adad41d044a0ed80
 EBUILD gd-2.3.0.ebuild 2561 BLAKE2B 916cc3bc7b44afee22557e424d8296890e0d5bd8d009eb939470e7fb6c5750b2d0347b909e872aabbc88551ee71005ab9d59de2fe8b85c5e68145127d4ecdfe8 SHA512 2605629f9c96f1c9b0121639d989888f422b37611066deb73ad76843d4a7cd5fcfc093c3492f76169faa27872e6e66cf9405f1c75aac0251cd1a3881df4b2529
+EBUILD gd-2.3.1.ebuild 2482 BLAKE2B 90387f225d6e6b7b1baca1b0e2825816653e8245622f03d2328066a4a9f6713b7005b9f78321d58f609076009e0b06b0121f2fdacc8e41cd7b2e23dbe70b8589 SHA512 d773c116c5b94e29c699ced4298a354640be7913895e67d3df1c547f6afd14b24e1c850eea4d6fd4ab786f19ce987f8988bffa471bab8b532f3d7016ec4763f9
 MISC metadata.xml 1444 BLAKE2B 39e3cd90d98350aa1c4d1ff96f3633db5084f181fa0b01c280d88b4dc87d425090f720c329543c42af9b92a03c27ca823e890190bbb92e5feb492fb69e7cf20d SHA512 76e5dfdfcd85ca4dbec0736b145cde370d692c805297fcf82636dd1dc3915690c895db5d4da319e1cf16c21ff27e5b9d40b11efac60386360fcb04e31fb39e50
diff --git a/media-libs/gd/gd-2.3.1.ebuild b/media-libs/gd/gd-2.3.1.ebuild
new file mode 100644
index 000000000000..698406d51559
--- /dev/null
+++ b/media-libs/gd/gd-2.3.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal
+
+DESCRIPTION="Graphics library for fast image creation"
+HOMEPAGE="https://libgd.org/ https://www.boutell.com/gd/"
+SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
+S="${WORKDIR}/lib${P}"
+
+LICENSE="gd IJG HPND BSD"
+SLOT="2/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="cpu_flags_x86_sse fontconfig +jpeg +png static-libs test tiff truetype webp xpm zlib"
+RESTRICT="!test? ( test )"
+
+# fontconfig has prefixed font paths, details see bug #518970
+REQUIRED_USE="
+	prefix? ( fontconfig )
+	test? ( png )
+"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
+	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	xpm? ( >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.0-disable-flaky-tests.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# bug 603360, https://github.com/libgd/libgd/blob/fd06f7f83c5e78bf5b7f5397746b4e5ee4366250/docs/README.TESTING#L65
+	if use cpu_flags_x86_sse ; then
+		append-cflags -msse -mfpmath=sse
+	else
+		append-cflags -ffloat-store
+	fi
+
+	# bug 632076, https://github.com/libgd/libgd/issues/278
+	if use arm64 || use ppc64 || use s390 ; then
+		append-cflags -ffp-contract=off
+	fi
+
+	# we aren't actually {en,dis}abling X here ... the configure
+	# script uses it just to add explicit -I/-L paths which we
+	# don't care about on Gentoo systems.
+	local myeconfargs=(
+		--disable-werror
+		--without-x
+		--without-liq
+		$(use_enable static-libs static)
+		$(use_with fontconfig)
+		$(use_with png)
+		$(use_with tiff)
+		$(use_with truetype freetype)
+		$(use_with jpeg)
+		$(use_with webp)
+		$(use_with xpm)
+		$(use_with zlib)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	dodoc README.md
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index d3dd839a9e3a..bbfbdb776e45 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -3,9 +3,9 @@ AUX gegl-0.4.18-program-suffix.patch 1071 BLAKE2B c529fe0cea80688201dfd4064fc54c
 DIST gegl-0.4.24.tar.xz 4937056 BLAKE2B a6237d0642713e2dc6fb5aa889dea31aad688608b99e985d69dfa43580caae634a6fc41ff050372d8b364f2f002e260335159325c01f73a10719c3d1bda70d36 SHA512 09d857332eeabe39327d312b1a1692b7c6c9f8f952ae3e3cc06b5a5c262757d8b86467c25a4e66c90c37922fd3548fc1342a9864732d17924f97e7b6c6c1786d
 DIST gegl-0.4.26.tar.xz 4942492 BLAKE2B 656a9c0d339d136f3f2efbb1484fbfea27deab241821503b31d74b015fe8766ee8d931ea0bf1a354200581bc54fea307a2cfb9b469e73a211a77d109d33707f3 SHA512 634778df0060ffe630121c24044a6ddcc7f2de0ff61b02be24db4054c6f3def24373b28dd1152d62882d58383a3aa7a1f74cd5b743a299fd0719a2a2ff992d24
 DIST gegl-0.4.28.tar.xz 4966580 BLAKE2B fcf4fb0e4fac0357d25987348c6abe2434db17bd974ab39f15c3e11a6a6ee8630469d0b53fe2cc76a3af90c9b3a6ba88972301d6fac8df693f5fa12919e0bfa0 SHA512 ad02dc4e4ff7c5beddb3cc8e1c05b6f858e7164dfd239bada70cc138a541a36f82c0e415c6fb81d4799ae8acdcb95ddb607c6b24481a73c5ae0d6e87c73fdbb7
-EBUILD gegl-0.4.24.ebuild 4722 BLAKE2B 768487bbd09552408a209b26b9e1684b4cade9a90d83bafaf4d15ba199b38f6b82ab5a6cd885683eba8a4561200d91b8a809bb42dfa41c6619839b0f34258519 SHA512 7d0a8adbebd7abf090db4b760d015af7d5e296fd71f3412b20fa2a223a00448443e6ecbd73841aa72cc1825c1496f58e800bc00fa5dd72829479c2b31161a58d
-EBUILD gegl-0.4.26-r1.ebuild 4924 BLAKE2B e60c73eac7e641d730961ba9688f96bb5e8d065bf73a05f18c6ca81a76b9f464137f8456dbfd694f2e3c968028aa551005d2d13712ea1a84fca04c25aac81fab SHA512 59f470fd33ce8c446cd19cd6a32f9d7c357cb2f32754e1bcd3e82d7b808fcb927e00c1f3c3076cf66e5b3926ed37ce82f84c986cb9fdd18ff5eae3b45c6e3c35
-EBUILD gegl-0.4.26.ebuild 4728 BLAKE2B 1c88d9b6bc615b2f3a2f653437184e0a639514656c32cb8aa42be46b66be46f4724d82583e83d36aa460d11c0e1d53254984f0db4fbae40c3bcaf816813dd9d0 SHA512 43c1769f377855207d3f5c7f240f2c91d89477aebbefa3746c3abffb048d5e68df1072ed51979e0d80b996e718213d2f216d226d668a56af62d3559e5eef0816
-EBUILD gegl-0.4.28.ebuild 4924 BLAKE2B cf3e83d2ec4405b5e53085b2b1a279b5d0bd394d89fafa33ca309c311e8edfedea08b54262375762e2ffb0f01865f8dca8a67ae684234d592dab1e256363d99c SHA512 18a07a6e16afa0cd7759529231bf5f9d98d3ac665240482871cc0791ddfc5de570623247fa35418f189491bf26b74e702c9eda160b9cfa7129a0bfaa208d6c6b
-EBUILD gegl-9999.ebuild 4336 BLAKE2B d7562c27de25191e057a343de2bab84fa7132d7ab62f63f4a1356b5a955ba00f00dba34ae0bd687d9f21053bd4444aa8ec3b9b8e05bb983c0f2dbaeb605dee1a SHA512 55d2b2d1a1c6ee8852285737d20a1faf1aedb7ba736572ee43bad3101ac3b5efe8d8e1ff91f4b2fa93a4de37815cba59745977d7c0a839584b1ad7d901485e5c
+EBUILD gegl-0.4.24.ebuild 4720 BLAKE2B 97078707051ed9d5b3430b47fbd3cae55fc2f9eb8487fd43211dd4d123955caab9bf9e01d498e1dcf9e6542f5070b4d102709ab83184cf8150dfa0a04150df73 SHA512 91e7d050fffa0aafa7e88887b2e066a8c7ea47ac53cdda09d8bdded941cf9af0f7d97898d8725cae657b5b9aa62cfa4ad33ba4942227f01a7f442482ab3f25c9
+EBUILD gegl-0.4.26-r1.ebuild 4922 BLAKE2B f97fa804b25824eec8b32f7fb358697632f9b3a0bd8c9baacec268e08191c9c85f2a687ae231e57eb5bc5705e1a308f065c29588c5e526226e65e52c93f8528d SHA512 a611cfa1df5fc10134f47922c68ed87e2a2d893cbefadfd36ca2136e3e9075a53214e2d85f28b05425a68dcaff849c36867ef2e2bc35292232d21b46ef9bee61
+EBUILD gegl-0.4.26.ebuild 4726 BLAKE2B 82cf61d3666802281ae89ded03daeb7cc6127f0befa7aa90fd7f2384b1c9632c8366070e3e34ef6ab3bf3cb3769d16db357d636d4f246b3d1a5f6ffb13c66dfd SHA512 ef63a5ba65046a4d818880030680a38c9b1458ad8a0f3d42900cacbf5ba42abde0a44ce1fac226a56385c05f2d44f1d63272a6f065c7fda6ce89d225aa649fce
+EBUILD gegl-0.4.28.ebuild 4922 BLAKE2B d8ea7a1ca2ed1370330ec03d1cb8650ad45a7b7172322c567ec50aec302b453f434aecfc30bfe6242096d92d9eeaa6a53223c79b2fbe894840be8f3582026d5a SHA512 0d195fb4b3dc1b9d496a7701d26c7f508c3177eaa5ce9d180777b89bb99e1dea79289ef8deacd9cbb3de62c98b7e83b3b21068adbca7a228e1dca83008cbebf4
+EBUILD gegl-9999.ebuild 4334 BLAKE2B d83101880fbaac028f3cb680251c7888f3113ed98a2be7bae7eb24020c3954c61aec3d9603d9befc036ecf9ac9e9ddeb65c85a847aa6b7ccc831df043cdcc80e SHA512 8840e9585942ca50a96a181269878e174853bcf57818d4429d6117baba441fbc95b11bef262d74d974ec225b985acfcb63206ca5c439065ae6933b27b529bc3e
 MISC metadata.xml 550 BLAKE2B 8afb3a5aa69ba6b3139f3183ed013cd0797edad0865b0aebcd2824a31549f4968e938017adb85506fea2e60c18ea1278fd3bce0ce1cf9be0efb74b1f0b020470 SHA512 8c5637454afcab249f671518153067a99cac9d60d8e9108688b4328a19ea653de21948a63c7e680585d208c0b3230fd2fb87c2d8a0a7266d31bc328342a47016
diff --git a/media-libs/gegl/gegl-0.4.24.ebuild b/media-libs/gegl/gegl-0.4.24.ebuild
index 973f6d47b148..dfd417839dda 100644
--- a/media-libs/gegl/gegl-0.4.24.ebuild
+++ b/media-libs/gegl/gegl-0.4.24.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 # vala and introspection support is broken, bug #468208
 VALA_USE_DEPEND=vapigen
 
diff --git a/media-libs/gegl/gegl-0.4.26-r1.ebuild b/media-libs/gegl/gegl-0.4.26-r1.ebuild
index ebb48c1879aa..a4238436f12a 100644
--- a/media-libs/gegl/gegl-0.4.26-r1.ebuild
+++ b/media-libs/gegl/gegl-0.4.26-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 # vala and introspection support is broken, bug #468208
 VALA_USE_DEPEND=vapigen
 
diff --git a/media-libs/gegl/gegl-0.4.26.ebuild b/media-libs/gegl/gegl-0.4.26.ebuild
index 33138479a21b..36c57d00d57e 100644
--- a/media-libs/gegl/gegl-0.4.26.ebuild
+++ b/media-libs/gegl/gegl-0.4.26.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 # vala and introspection support is broken, bug #468208
 VALA_USE_DEPEND=vapigen
 
diff --git a/media-libs/gegl/gegl-0.4.28.ebuild b/media-libs/gegl/gegl-0.4.28.ebuild
index b6103513bd3d..6efb79792de8 100644
--- a/media-libs/gegl/gegl-0.4.28.ebuild
+++ b/media-libs/gegl/gegl-0.4.28.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 # vala and introspection support is broken, bug #468208
 VALA_USE_DEPEND=vapigen
 
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index c8dd9cebd2d4..2dded5def551 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 VALA_USE_DEPEND=vapigen
 
 inherit meson gnome2-utils python-any-r1 vala
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index b4a12c9aba25..9d177123910b 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,4 +1,4 @@
 DIST gexiv2-0.12.1.tar.xz 372104 BLAKE2B e712bc8056e0e02d66ee831425776c26b65275db8f4cb4a526dbe9f00bddc473312f6c4c8e011906ca02ff256c00c7fe8d602acd64c787b05e13ad582ff8ebee SHA512 cbf83ea79eead9aab15ba760217fd6a1b55a5c60059f14f243327ad7d3c09d6a0528dbdb33a8ee235c76dac5aab0afa8b7d2ab4367fe9128a096dce5da19a68d
-EBUILD gexiv2-0.12.1.ebuild 1785 BLAKE2B 4067878033d384921908fca039da503cbfd4e2a1e25edd722b27d03d4944a59e40a8e52c8f13cb321d6ae400d000d8dcfe72822223aaa2d5fbdc337981ae6c9c SHA512 bf31e36da15c885c14e6def050e750c2ea042aaeda014742c8d97466b3e02c67672852513d6932c50fb822fb4ec80963ecfabd2102f12272248a59f2f646f76a
-EBUILD gexiv2-9999.ebuild 1630 BLAKE2B a5b80844189a30261272c1687ea8dd77fba10a0601d42883839b5798735bf901afe677e33542c83d3a1a6cd472e2891e0c6f79eab96f383ef5a353c54491faab SHA512 2f6f9ac560721c464ecc85f83f2379f58ce1a1d34eafa6465d2d622b61a7916e9ed486572ad0bd63b74430163bbf20cc79389211eb80b3ab1743d007f58820f6
+EBUILD gexiv2-0.12.1.ebuild 1785 BLAKE2B f9ee602000fffb2fb5a7da96a8387abe8c5fd20349886197a88b254e43364c45ea0f66c295cb65ce77358338fd805959681bb4c175b837b1deb95427ebcee9fe SHA512 9ca34e4290ad103f6cea1769cf24dfd8df0c74c92a7d50e27e7703d02c09b990a405577cb1237b451ddb4c82761fe6e1a1e2c90719cbf3d369d9dcb35a66de49
+EBUILD gexiv2-9999.ebuild 1626 BLAKE2B b653d799388cfd363d2e61a33b0c2a9060fbd284ab6bcdb7f391eff51dec41bc727c9fceb0b561d42d88c1d1bfbfaaf448c76cef558100ffb42f796710ea5828 SHA512 a52da59be73cd2ae891b406a029d6fa72bc714337dfc76758c4f59593c5180c5ed734cf128baa3653c921a71869284111a85fb530dd5ee389715fc3f6d5b83a0
 MISC metadata.xml 513 BLAKE2B 7820281c36922b5e68aacb3c3935f7193e2725515f196eaf72f6eba42327a8c8d10ceaed6422fb95cf15b0f1a0d96a168c7a677e42ae847fe050b26c39c39a0b SHA512 deb951010c3342738d8ad5b9e79baa790913f3b906799f9f72f59d4e978f0564fc52f14482bb632ffe817488d154bd8bafe98bc5eea07b7c2da1504867d671b0
diff --git a/media-libs/gexiv2/gexiv2-0.12.1.ebuild b/media-libs/gexiv2/gexiv2-0.12.1.ebuild
index b4a53c46f9b8..fbd0995eab93 100644
--- a/media-libs/gexiv2/gexiv2-0.12.1.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.12.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit meson python-r1 vala
 
diff --git a/media-libs/gexiv2/gexiv2-9999.ebuild b/media-libs/gexiv2/gexiv2-9999.ebuild
index e496ad32ab1f..4d9de41ebce9 100644
--- a/media-libs/gexiv2/gexiv2-9999.ebuild
+++ b/media-libs/gexiv2/gexiv2-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
 
 inherit meson python-r1 vala
 
diff --git a/media-libs/graphene/Manifest b/media-libs/graphene/Manifest
index d07f5c27f040..eecb3c0eae00 100644
--- a/media-libs/graphene/Manifest
+++ b/media-libs/graphene/Manifest
@@ -1,3 +1,3 @@
 DIST graphene-1.10.2.tar.xz 292372 BLAKE2B 94553a32dc57216402a9676e11525552c010d970caeb1256dde50ca842b4d673ad78d004d57e7c7a017b8c6e64ad75fc3b03603cba746027ab10befa76d32955 SHA512 a8a8ef1e4ccffee2313a18b9b8dda06c7ede6d49fdde8578694500634e3c90278fd30af7d88938d5ecb08c519cc3e09d21fe69d0f21cb766e056ceedbb3eafb0
-EBUILD graphene-1.10.2.ebuild 1701 BLAKE2B d794e007a37fcebfb5450991bc326c8f5fac6093f6fb7002147fda7d3965d17544810e93f48ce56b42ba28625e3dabc4dd57c3db041eb555b59faa0236ef7b1a SHA512 64c86a8ab7601bd6d422ec8ad28736e83c91666d1576cb7f7f18e44e46ad23dfcc9f8f37f55b3456227e89bff4ab34ce8ac7da4a82886bdbfde85bfffe937bb4
+EBUILD graphene-1.10.2.ebuild 1699 BLAKE2B dbfa70bea4f57e2d759cbe4bcbd43d381e485f6fffce1dc412c3d0bd9e51888138afceb49597067bf34aec9f244d941aea64c09c27d693e2367ba5ddd7a5808f SHA512 31368e60b6c0c4b44435e5972352de0748536be54a343b919b0fd4b615cae966ca106b667d9e39c95656866d340226df06cfc2d1e88206099d98059cc7d029f3
 MISC metadata.xml 333 BLAKE2B 3d34baf2b84e2ca8cc20638b381fdb4771e94f07df133f5d997b5d7bdf3704f8b8f77d2c79815f70246affa2e399d1118e03eae7c7cf8e419fec3dae89ef0405 SHA512 aef6b787ac7f14b56e4eacd746c91671b9a115cb40b312b415c7302d4339f5d3b3a887bd52a2b30ba31b3e0f027360a9fa55f6d3065cf7baedc4bd28dbbcd056
diff --git a/media-libs/graphene/graphene-1.10.2.ebuild b/media-libs/graphene/graphene-1.10.2.ebuild
index 32de0b68ad43..bb80f5eb2d54 100644
--- a/media-libs/graphene/graphene-1.10.2.ebuild
+++ b/media-libs/graphene/graphene-1.10.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 inherit xdg-utils meson multilib-minimal python-any-r1
 
 DESCRIPTION="A thin layer of types for graphic libraries"
diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index b4a33dcce1a9..a2dba77a77be 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -1,3 +1,3 @@
 DIST grilo-0.3.12.tar.xz 234340 BLAKE2B dd9f2558dee73080d87a98209816ca79a13fee4934a9e456190616e11565095e3c08e64f3ccec30e3bb7a102a9e23c25ba32a95f963676516a354a785bd6bdd6 SHA512 c0badc4b3f96efa04e6f3b5f32b2322855d9a660f748ce68012d266a6f5936f850bd63e559c782ae02ee24ba282c3b3882c6b8fae99019b913d74ff927a31017
-EBUILD grilo-0.3.12.ebuild 2180 BLAKE2B 27550bf4f8514ff6df87612a22681109f16e65fee25ec0c347b9f1cbd44002ef83bc9e30104158f9be5d2952ea1344b6235d9caacf7ecc9717d279c585aa7ccf SHA512 0f65d12581b16f1b7684b107224eebf880727bd03dbb5eeed3db68ebe551a04bca7579901afce3e8f3a7159f369713e71c0a08e7e76f39472a5e0df58b0e07fe
+EBUILD grilo-0.3.12.ebuild 2178 BLAKE2B 01fe8e9b93096c447fb3c707731c7e761a3a75c0a48300301d8961ec7fcdefbb1adfb848bb9ca71bb3757a3258a33868fcb9f3ec092b57f321821d949bc4b974 SHA512 358d1846d05b90fbbeecd46c61c5757e3bdaa1df20efb22dd0bff32b3962b964f3340fa3baf3d62735d1422923b8ac5d11a977041cb86b3e01d9c848059c9695
 MISC metadata.xml 728 BLAKE2B f552b3317894c70912c17e3e46367198f4451940b5029508f83ba3ce904faea24ed3876195f1b062145582dd268064e0c63636ddd5d6033b7032b392e10abba0 SHA512 bbd75a063a5697c257dd9084961d6519fb71409dcd1375d66ff25218deee87841c822edfa66d440cd5c6bfbad70942f01b30f2b7e1a3cc9727beac23ca717b5f
diff --git a/media-libs/grilo/grilo-0.3.12.ebuild b/media-libs/grilo/grilo-0.3.12.ebuild
index 02c6a9c0a785..a1d027b6490d 100644
--- a/media-libs/grilo/grilo-0.3.12.ebuild
+++ b/media-libs/grilo/grilo-0.3.12.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome.org meson python-any-r1 vala xdg
diff --git a/media-libs/gstreamer-editing-services/Manifest b/media-libs/gstreamer-editing-services/Manifest
index ed07ed1ab898..bcf941e4b3c4 100644
--- a/media-libs/gstreamer-editing-services/Manifest
+++ b/media-libs/gstreamer-editing-services/Manifest
@@ -1,3 +1,3 @@
 DIST gstreamer-editing-services-1.14.5.tar.xz 1069356 BLAKE2B 95ddff56b56b3ae59872a340258af0277d9b5c3619fe25861ce3f65238d3802bdda3c51cf84f0a206f7ccf095ab81ff3f178b7c0322dc7687741626c3b8da947 SHA512 9b3d0336e596004a51069900c61f293eaf213a83655799139373c77cf5637a3511ba4ec6a1c75f53d81643539e32f7d130fd0cd58090b948f81e8e081226b5c3
-EBUILD gstreamer-editing-services-1.14.5.ebuild 1527 BLAKE2B b1b08cad408533b2558d4b37c3aa381b1c354cd0b426e7ff259462e5265c21ab99a974dc1ef41f27639ceb8badb47677268b0f31e6d3b4e118b7440977dbcdc3 SHA512 773f9b42375e884a5b8519487665c187d3bba21a14945e9bea04b1348893aaa3f70a23fc14bb40dd13f0a1b1b5c3a5b9625ea3c654e029b4413a8f0dffddcb54
+EBUILD gstreamer-editing-services-1.14.5.ebuild 1523 BLAKE2B fe1402365b5b5756648a8bbc767ec2aef7e7d301697ee4c1dc1598f299bcc343d178aec0f757e2f2769d720908ca0139f11874dd221daffa74f435765547c6f3 SHA512 4f70b7f7eb13ddeb8a7a551b94c5e33b54ade8a00df5dad6619a63f6b55410f1745b1be21fa6d38f6028d397cb14c92a7a8f53d816cd8597798227b5b53952be
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.5.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.5.ebuild
index b45bd23fb029..24e441707e99 100644
--- a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.5.ebuild
+++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
 GNOME2_LA_PUNT="yes"
 
 inherit bash-completion-r1 gnome2 python-r1
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 7bbab08c57ed..a4e1d9e043f8 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -2,7 +2,7 @@ AUX hamlib-3.3-format-security.patch 738 BLAKE2B 896d6023f68979400ba8782956da86b
 DIST hamlib-3.3.tar.gz 2192119 BLAKE2B edefd8b8c75876c07fa498c98f7d6760985fdecc477bf6711e948071e45964bf7fdf6705b3172e56951366a7dfb0288e025eab66d3b6436d158649ae53ac39bd SHA512 4cf6c94d0238c8a13aed09413b3f4a027c8ded07f8840cdb2b9d38b39b6395a4a88a8105257015345f6de0658ab8c60292d11a9de3e16a493e153637af630a80
 DIST hamlib-4.0.tar.gz 2242857 BLAKE2B 458a5cadc36f8f434fefc73b6230b08c858a741a685805e8d8ab1e2bd74aef9667d6b3d006aa493516830a6fc8af19e77b4d92736198bb920797aecfac605f41 SHA512 6c097f503d1050dca4e5ab9091cd9885f8db8b0e4b2fb26af570f1871f2da713ac3fe10e3629d20ebfc2927768555ad277e68cc38821f4a905900b8d3a5ba8c9
 DIST hamlib-4.0~rc2.tar.gz 2188867 BLAKE2B 02df21910266e47c99e3cd72fc815ed75b9b5f50b29b9a94aa6fc5ddac73b1a09d16caa0d5e4be71bfe44e1940b853a0a8e1303f23fbacf003da18eed198531c SHA512 6d192bbb1c98e76fdfd1dd6bde1d0fd8b668243332827ae609e7bb4a93a3fed9fda0b12363638f5e9df65d65fd2305dfd493bd37a99aca2f2bd5b0861e948d5b
-EBUILD hamlib-3.3-r1.ebuild 2095 BLAKE2B 75d926706a9eaed1efbb4ffb0c26b3054e8819a15696b07be955fab735de6aeb61190d76a609a1200db0d808fe093fc06f94280d7e05ce88cfdc4f8597d28341 SHA512 373d355fb656b23964ad7ffb4f56b66090285e55f79c410af777d508c8f1f16628a11b7629f6a195f21f2c8a996056a0743730106b975ae3b66cb74f71cfcf38
-EBUILD hamlib-4.0.ebuild 2042 BLAKE2B f675e09692b84298d47ce723ae85fb172ce2e958e31b82e71c157d5576ee028084417e134bcba045b529110ff1738f38d98454ea0c3021dd57310190f1419e02 SHA512 e3443b10b36b4dd558887d39cc8f3e50f4e3e0a03d20db4c7d28206ec056cbf470de9f732fc634f69f8ed59d793ec2f1885faa29b0a94c98178d1d41c68de616
-EBUILD hamlib-4.0_rc2.ebuild 2062 BLAKE2B 89b7a4d0f6956c79ac5da98a6588a06a85c377633fe844c5c660374874a98523c677095730927b9faaf55587ff418cf6bc9246e15153d22447f28eed490fbb35 SHA512 f9bb0de8a699b6b672ce32e86b8045f3fee703b13fe3edb59f01db5c5d04accf97017f7e79652bf2deb71334c158a72d067c755431a7eebd618f73f46dfbd579
+EBUILD hamlib-3.3-r1.ebuild 2095 BLAKE2B fc8447042f8dfdaaf44a3a41bb6d0421fe16d6e7931d3f45bf2e583e1b086d4df69fc13eb2f936d736ba9099eaee3a3c1c83b6e61d91e05e1f5c85810edb65f9 SHA512 bdc9205557895c1b91ac3cdd740ac558f6e5b665f863e362c24a1cfa54770c631c8c469f9c70f466753a426aca4f1d873ac2c6a5b7244eaf6d9a5103814b99e7
+EBUILD hamlib-4.0.ebuild 2042 BLAKE2B 85eb4910782ccad90bdcd0361a7df1fbca5614cc9ac70a7a0fa4436f5f2b5662e63a4f16819a905f308137f860b5673af6bbfc9bcd26f54106915a6723319a97 SHA512 cd02f20205904e8e745c1a4face3c1ac8ecf6acfa7b654999dca8d3f48326a5ab579e7137c9efcab0aaf7ba8d8511b3380f73d9dc82ad3b1bd38bf342c8e9ef2
+EBUILD hamlib-4.0_rc2.ebuild 2062 BLAKE2B ae28931887b38c1d76b2887400912bf2ed36510d89515b3457cccea08ad31035ef927c46ca9ecd28823fbe498359f8d1490b1d6434b254db814c9cb90ecc0a21 SHA512 0e383c2449a97aa0d8e0e8b2fe10cae2da174fbd8fde7d268065ce87c203cbe6a8fdfd5a7c4be68a3f3c85eb4d776d686f1efd7f95c11b27b47af26e46d36797
 MISC metadata.xml 325 BLAKE2B c1966def562280393eeb5b575d4e136525dc3cf36ef4e6c00dbeff7e0069a4d10eb16706f4b4e929eda1f046d18a8e25fd0025c74695eba1f9c10d19a9f55598 SHA512 fb6d5d77da29969e9b61921ae59e5d5c71b74cebd331867a546a6b2c568650f89191a39a3a1a73c58e1244fa5d13a090b45b866c21b3a3dd71cff0a812c149e5
diff --git a/media-libs/hamlib/hamlib-3.3-r1.ebuild b/media-libs/hamlib/hamlib-3.3-r1.ebuild
index d7cbdeb49d37..556650e66628 100644
--- a/media-libs/hamlib/hamlib-3.3-r1.ebuild
+++ b/media-libs/hamlib/hamlib-3.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit autotools python-single-r1
 
diff --git a/media-libs/hamlib/hamlib-4.0.ebuild b/media-libs/hamlib/hamlib-4.0.ebuild
index d52c7828e6ad..5d4e7ef486ef 100644
--- a/media-libs/hamlib/hamlib-4.0.ebuild
+++ b/media-libs/hamlib/hamlib-4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit autotools python-single-r1
 
diff --git a/media-libs/hamlib/hamlib-4.0_rc2.ebuild b/media-libs/hamlib/hamlib-4.0_rc2.ebuild
index fc481e0478cf..a3b8c853065a 100644
--- a/media-libs/hamlib/hamlib-4.0_rc2.ebuild
+++ b/media-libs/hamlib/hamlib-4.0_rc2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 MY_P=${P/_rc2/~rc2}
 
 inherit autotools python-single-r1
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index d5b3b844f27c..ba4af3096209 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,8 +1,8 @@
 DIST harfbuzz-2.7.2.tar.gz 16605557 BLAKE2B 246ab64e29afcadc692b57bad84acdea1f9200a63f6f8b1519d12b8515ec65dc45e2edf3abdde473b71364427a689d92ce2ee25c514edf4b1e680dd423d774ee SHA512 2eeb198dab1ed1cc7d10c3890293ff40e9f37372413877a5bd44d66e88d8460a81f51cbe71c328b1300f542ca8de3269749d1d01d0c324c8b95a9c038fbe1521
 DIST harfbuzz-2.7.3.tar.gz 16696840 BLAKE2B 95eb0fc86caf51f512520ba599e9be08b4a9f6565a3e52280f9454043b524e7b04194e506b5122db066966125fa4583b7be856005b53726a0192d3f08fb5cdcb SHA512 1fa1cfd7b55446309413deb6c139ff9015a013b480da422482e75fa11b130b7dcfaeabfffc513a2027732d0b58fbd39dede2f3eb516214d5efd901a2d1e6af8f
 DIST harfbuzz-2.7.4.tar.gz 16703694 BLAKE2B 9932c039bb27ee53179e500c80ae8bd24d4cb77d4fcd01c10b8b5f0fd55de6af3c265196aa80653835f464c5431f89a870a7112eaf2c715f05e1e084011fa240 SHA512 5b412e0f6d1c9142a0ef2713826cb8d6ebf348c5b64054a0676d3ce084bcff1de375dadf90e87dbbf6d0ec8e4a99339cb64b514d5464efb7e27037551e494099
-EBUILD harfbuzz-2.7.2.ebuild 2663 BLAKE2B 2aa5402ddfe5e332a7727e7db32237aba787f7fa8c3e4585daeb8c83d106ba5afdd3841b46520e6495e1fcee5d5d0a5b04ae0266e40bfd285c713a8e89fc08be SHA512 f8bd13ee08a1737f601caa6a379f925166d0f6f3882bfb08fa5f6f572b19cf1974133f11b48d784c08c3b43321c9c5cf86bd6f41f93cc1102817a9bece56380d
-EBUILD harfbuzz-2.7.3.ebuild 2672 BLAKE2B a024b31d374e781e5994907bd809697f2c3cb23f4ffb7bbfee88eb0257524de95d3175858c571e088fd405f09434f79a61c7b7f2b78180dd8c4e57f6741552dd SHA512 ee205d223556a5b137446355de0df0fcd5ae27be13ab266fd40988940c3a03581885e333d7be2c862aee4c127a9708e1432f937a1eb6bc87b6ea39e0fd1caef9
-EBUILD harfbuzz-2.7.4.ebuild 2775 BLAKE2B 403450e6be075cc13943a30f20e4c5beafdd780df8d614c3772ee5b8a4c34e14eb2ce42f857fa0ab54ba5a6bc6d0eb5efab8ee89a11e92341983d593a3aff9d9 SHA512 f3b51d9cc6ddb8778031e40b43821c8ac1d08f05389afed70f8595e989befe1ed27f7c16934ef286a6b544198d526e7b65d1f8ae9315c95d1e6c12b506bceae6
-EBUILD harfbuzz-9999.ebuild 2775 BLAKE2B 403450e6be075cc13943a30f20e4c5beafdd780df8d614c3772ee5b8a4c34e14eb2ce42f857fa0ab54ba5a6bc6d0eb5efab8ee89a11e92341983d593a3aff9d9 SHA512 f3b51d9cc6ddb8778031e40b43821c8ac1d08f05389afed70f8595e989befe1ed27f7c16934ef286a6b544198d526e7b65d1f8ae9315c95d1e6c12b506bceae6
+EBUILD harfbuzz-2.7.2.ebuild 2661 BLAKE2B a6bd48d29506d99817b97a68464f7f662b72e6c0e8df0f72def1b5ca25cc145645cd96663487b4c3152fb6b99837167700677f4e2b8785f23d93cbaa80abb900 SHA512 733df9dbbe4036f88f66672da20c58345a42f602c097cb846a75c34626dae380d70cef4ed4f0e4a8909518c93ffb9dbd5ddad8a9f98d6c163e395b5f33860353
+EBUILD harfbuzz-2.7.3.ebuild 2670 BLAKE2B 7440f374a018e052194a2deeec2f810839769466de248dc1d9c66db2bf5321f3706e8e6ac186b9457fa1e3f189489746a4c707d8c0763076b17d255e90a0f193 SHA512 a62aa5bb0e35b5d68022c43985eaad257306900ba4399b4e65c9a4fd3f99b78d6220204eb2148cb936c84656a3edaf55513afebe74b996b8b7cda033e89e12af
+EBUILD harfbuzz-2.7.4.ebuild 2775 BLAKE2B 72290ee76d7d0f8faceba6babf63575ae74eafcabdcf394e8e106822783014662819b28a34bfb2e72331bf9340e71c0bd6ba65cef0b77da7f01b41786e1926c2 SHA512 6d7efb61f320fa807c04d7d36402258405f64d57e2275d0c2bc6559e9f9190d9a4b3eadba3f8c3d39bd6ee97b2f1f9164ad77de974a150912a72f75dc3e50d44
+EBUILD harfbuzz-9999.ebuild 2775 BLAKE2B 72290ee76d7d0f8faceba6babf63575ae74eafcabdcf394e8e106822783014662819b28a34bfb2e72331bf9340e71c0bd6ba65cef0b77da7f01b41786e1926c2 SHA512 6d7efb61f320fa807c04d7d36402258405f64d57e2275d0c2bc6559e9f9190d9a4b3eadba3f8c3d39bd6ee97b2f1f9164ad77de974a150912a72f75dc3e50d44
 MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd
diff --git a/media-libs/harfbuzz/harfbuzz-2.7.2.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.2.ebuild
index 5cfff46530c9..95ab9eb8acd3 100644
--- a/media-libs/harfbuzz/harfbuzz-2.7.2.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.7.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils
 
diff --git a/media-libs/harfbuzz/harfbuzz-2.7.3.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.3.ebuild
index 295706a33c0b..aa205f2fc508 100644
--- a/media-libs/harfbuzz/harfbuzz-2.7.3.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.7.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils
 
diff --git a/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
index ca0f97a63d11..4641ca787616 100644
--- a/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils
 
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index ca0f97a63d11..4641ca787616 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils
 
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
deleted file mode 100644
index b05b6b2211ec..000000000000
--- a/media-libs/jpeg/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX jpeg-7-maxmem_sysconf.patch 1313 BLAKE2B 7289891453e5b4ecb474ab7b77a107f7d2446ac34362f53327353e29719500cf8eaf420886114a04b052e0d38ef81a3b2cf7e2ee2ff00b7d30cb4cb948c40165 SHA512 42a3bccf20db20d1b0e9dee3b5a8b1733b81b5d3dcda83aae8e910d023af0fcbce920c010d11dc8b637935886eede05161393d8e594f48189f72a346f3f8fed8
-DIST jpegsrc.v9d.tar.gz 1070160 BLAKE2B a905a15c0eadc8ebd797fe009685a2c300dc39600ed7416d58adf1ed326a26ca45146387fe73a87a589f4bed95e652f5385b4df5e7544a4e348bda27356295c2 SHA512 c425cf413e679e4112b428592e6facc813cadf92e42a6b850c5d348b3dd47b0599e2f4a119d7ff543b762cdcadd42a77ed1429a08874e73f64a54fb869714357
-DIST libjpeg8_8d-1.debian.tar.gz 13676 BLAKE2B ac6fab3e52f91c9ece95ed809fc972afc92c55754a59358f7dacb056917b1878f6f9be85a20ccb34eb13489a9963a00659fe25c27e8b18b44961c6ba5f3214cd SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040
-EBUILD jpeg-9d.ebuild 1962 BLAKE2B d6ac1f20a5deb79b846d9c1eaf3b32094c28edbeaa285fd8542ba9623424a5d572d177f3cd9da369b7552c4c2554c4cd72cf1ce95fe0926eb88e3321476fc528 SHA512 76e8ef989401996128de2f837e7ce33bb69a2661d489ef4455af955ee2d6a3989ce811400207f0ecbd2ff9aac352d62e6b9f01d8c9c71b5c2c36262e8d213c02
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/jpeg/files/jpeg-7-maxmem_sysconf.patch b/media-libs/jpeg/files/jpeg-7-maxmem_sysconf.patch
deleted file mode 100644
index 9ea87d4fa399..000000000000
--- a/media-libs/jpeg/files/jpeg-7-maxmem_sysconf.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-# Make a reasonable guess about memory limits using sysconf().                                                      
-# includes 5% slop factor as suggested in documentation.
-
---- jpeg-7/jmemansi.c
-+++ jpeg-7/jmemansi.c
-@@ -12,6 +12,15 @@
-  * is shoved onto the user.
-  */
- 
-+#include <unistd.h>
-+
-+#ifdef __FreeBSD__
-+# include <sys/types.h>
-+# include <sys/sysctl.h>
-+# include <sys/vmmeter.h>
-+# include <vm/vm_param.h>
-+#endif
-+
- #define JPEG_INTERNALS
- #include "jinclude.h"
- #include "jpeglib.h"
-@@ -157,7 +166,26 @@
- GLOBAL(long)
- jpeg_mem_init (j_common_ptr cinfo)
- {
--  return DEFAULT_MAX_MEM;	/* default for max_memory_to_use */
-+#ifdef _SC_AVPHYS_PAGES
-+  long phys_size;
-+ 
-+  if ((phys_size = sysconf(_SC_AVPHYS_PAGES)) == -1)
-+    return DEFAULT_MAX_MEM; /* default for max_memory_to_use */
-+  if ((phys_size *= sysconf(_SC_PAGESIZE)) < 0)
-+    return DEFAULT_MAX_MEM;
-+  return (long) (phys_size * 0.95);
-+#elif defined(HAVE_SYSCTL) && defined(HW_PHYSMEM)
-+  /* This works on *bsd and darwin.  */
-+  unsigned int physmem;
-+  size_t len = sizeof physmem;
-+  static int mib[2] = { CTL_HW, HW_PHYSMEM };
-+
-+  if (sysctl (mib, ARRAY_SIZE (mib), &physmem, &len, NULL, 0) == 0
-+      && len == sizeof (physmem))
-+    return (long) (physmem * 0.95);
-+#endif
-+
-+  return DEFAULT_MAX_MEM;
- }
- 
- GLOBAL(void)
diff --git a/media-libs/jpeg/jpeg-9d.ebuild b/media-libs/jpeg/jpeg-9d.ebuild
deleted file mode 100644
index a9830591cae8..000000000000
--- a/media-libs/jpeg/jpeg-9d.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool toolchain-funcs multilib-minimal
-
-DESCRIPTION="Library to load, handle and manipulate images in the JPEG format"
-HOMEPAGE="http://jpegclub.org/ http://www.ijg.org/"
-SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
-	mirror://debian/pool/main/libj/lib${PN}8/lib${PN}8_8d-1.debian.tar.gz"
-
-LICENSE="IJG"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-DEPEND=""
-RDEPEND="!media-libs/libjpeg-turbo:0"
-
-DOCS=( change.log example.c README {coderules,filelist,install,jconfig,libjpeg,structure,usage,wizard}.txt )
-
-PATCHES=( "${FILESDIR}"/${PN}-7-maxmem_sysconf.patch )
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# Fix building against this library on eg. Solaris and DragonFly BSD, see:
-	# http://mail-index.netbsd.org/pkgsrc-bugs/2010/01/18/msg035644.html
-	local ldverscript=
-	[[ ${CHOST} == *-solaris* ]] && ldverscript="--disable-ld-version-script"
-
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		--enable-maxmem=64 \
-		${ldverscript}
-}
-
-multilib_src_compile() {
-	emake
-
-	if multilib_is_native_abi; then
-		# Build exifautotran and jpegexiforient
-		cd ../debian/extra
-		emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
-
-	einstalldocs
-
-	# Install exifautotran and jpegexiforient
-	newdoc ../debian/changelog changelog.debian
-	cd ../debian/extra
-	emake \
-		DESTDIR="${D}" prefix="${EPREFIX}"/usr \
-		INSTALL="install -m755" INSTALLDIR="install -d -m755" \
-		install
-	# Remove +x bits from man pages.
-	find "${ED}"/usr/share/man/ -type f -perm /1 -exec chmod a-x {} + || die
-}
diff --git a/media-libs/jpeg/metadata.xml b/media-libs/jpeg/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/media-libs/jpeg/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index 247d63ddc182..cc29df61a70a 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -1,4 +1,4 @@
 AUX lensfun-0.3.2-warnings.patch 1813 BLAKE2B d0ee40324b584eddbee19442f1c221b25043d06b90357feee37b93e9c77dc9475bb45bb23fcd884d90cea031f6b6b46fc9c50e6f22d5bb816d9e289bac8a1e3a SHA512 517d613ba3916dd031eb026748465ec71f2cdc4658b0ce3dede827386f9805916f9bb1c4adc9af350b61b7e68bba1ceee02f89989ff91e52ffcb1ee442599527
 DIST lensfun-0.3.2.tar.gz 784825 BLAKE2B c77cd6b2f1bda0313a980fbd3bbc7ca9ad5ed0b9777cce924f66da5de3974ccfc8939d054c7a7532508b6b0913e2d436a825a83916800b625ff2c552c96a0ae3 SHA512 9c6f546fa70e6dc692e66ef378447345be6d3383812934780d326d772d775c1918cbf3447cd91c067655044cf659025763bf47ba2d938a82a3c2de4d60127446
-EBUILD lensfun-0.3.2-r1.ebuild 1473 BLAKE2B e6fcc5819ad46d68a42e09e1b805c590c56c0db0bc06e00356a4fef4021b0d2f717287b1ca5e42d92f62270b7f1a84613efd654c219f8619c31b2e6430382492 SHA512 2d81acf0228ec01161668778337706bfb1662f7b8a686184bdecfb1e4554c9210f7d23ef88b053a912065315d4d8e7f1fe73f6f2143ddb22bc2dbdb8ea6f905f
+EBUILD lensfun-0.3.2-r1.ebuild 1471 BLAKE2B 8d1393eaf434cb159d3b2f0d817c9f7115c0097bc6afc3cd392be39583e24eeb6d4cd15f483629f3dd86d79772efd8640e2290826b9d2b860e744b0f38757f91 SHA512 cbda3e5fc148d73d443c524b16e24b28d253bb0558fba356ce608e13230f14eaba3af034f763ec70af101798a03725b2accbdd2e689eaa5eb7b36ac4fc61377b
 MISC metadata.xml 713 BLAKE2B e8cc55a88122f0d188e1bce8f72f9ae57f1799c50ccebb1f1253094de326b9858e0ecf38922873397693946848910435103aefe6ed61040080e514d6d0b0bf0d SHA512 0c04301dcb4cb729050574c28c29f7f27494f1368bea0b62667e8ef3ed322a3339bd74090aa2e970129ae6b8e4e3bf749a090dbcca878adec90de568146bd32c
diff --git a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
index ef48ba8d722a..fe03c97849c9 100644
--- a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
+++ b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 inherit python-single-r1 cmake
 
 DESCRIPTION="Library for rectifying and simulating photographic lens distortions"
diff --git a/media-libs/libbdplus/Manifest b/media-libs/libbdplus/Manifest
index 0b29c9bcb853..c20ddbf87ebb 100644
--- a/media-libs/libbdplus/Manifest
+++ b/media-libs/libbdplus/Manifest
@@ -1,5 +1,5 @@
 DIST libbdplus-0.1.2.tar.bz2 319828 BLAKE2B bdf8868dc511b22fd6926b4b29cfae513ca5c9f30433314c99bf31aefb5842eea1042e514383d1c1ff96ee6c62f3220a542973eb1017df8dd48aecd7f81237ac SHA512 e00e7bc9f52b9275646593b753ba646b052255be94a7241965f4dbe4734f8f6a072973ed4b9997957f939236b0633897c295749f79e232188430795be5b5087b
-EBUILD libbdplus-0.1.2-r1.ebuild 1055 BLAKE2B 7ab0d4a78535a37eb69577e0bca7af7302928fb37badcbc95d8ae2f3e3ffa632ff2492f3da201e0c586233db3daf06bf26802391dfd6c876b50f0e0cae8b1969 SHA512 18bc5be6402b1dae1324f0f2b7999cbdd502964f307d89add25e42d660f534bb01ee9c403f5d36ebf09f85ca653ef4509d82f2b7e3218ab01af9124f2e8b0b87
+EBUILD libbdplus-0.1.2-r1.ebuild 1051 BLAKE2B e0e6f77dbd8041bf1f40acdeccf7bb9d10898e48dc8c3a7b6f2336bf944c39f0742c7f6c0bbe6df796a72a74fdfa8adafeab8874e252dbdcca2a92e9d61aa7c5 SHA512 3975cb7ae80e1f8e82f7f80e57edc02f49ac4641dc11b58c9645dd6cc8350d8007b81a1a5cec47afc5d15ce35e8acb5ce7e23d87a3584cf2f7d54eb4f7c7ea03
 EBUILD libbdplus-0.1.2.ebuild 878 BLAKE2B 831c09aab8f391d25826ca803514f464f02c516e45bcb056b22f8abd09eb3d19f00295a88d1b911942a5698d23ac856e2c24abe5c88cfcc6d1052cd752005f06 SHA512 52a573e72e3f73be093a99582cdd4f5b1284f140502b9fffeea3d625483e89db0eb23cbcd9e17450dfd3c30c7d4f1aaac380faf8aeb099a72a25be5a5d5d514d
 EBUILD libbdplus-9999.ebuild 1055 BLAKE2B 7ab0d4a78535a37eb69577e0bca7af7302928fb37badcbc95d8ae2f3e3ffa632ff2492f3da201e0c586233db3daf06bf26802391dfd6c876b50f0e0cae8b1969 SHA512 18bc5be6402b1dae1324f0f2b7999cbdd502964f307d89add25e42d660f534bb01ee9c403f5d36ebf09f85ca653ef4509d82f2b7e3218ab01af9124f2e8b0b87
 MISC metadata.xml 346 BLAKE2B 7a42d692f3ccc8badbed9bc2d06f4b06891f0fc46d53501de443dbff04b71c6db74f78a310cd484945be3b2035ae001804443bff1a18dcd5b0ef24474453910e SHA512 c45e738ea1fa2ff40738465bcafc8b6c89e7d5dfd3c89250118bc3c531120ee14022c04fe0a2bd5cbe950dd66935be35254239fc61eb947b597328809735693f
diff --git a/media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild b/media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild
index 8bffc8107314..b956259b6818 100644
--- a/media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild
+++ b/media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libbdplus.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 fi
 
 DESCRIPTION="Blu-ray library for BD+ decryption"
diff --git a/media-libs/libdvdcss/Manifest b/media-libs/libdvdcss/Manifest
index 04c4b41d393e..b003c931fc1d 100644
--- a/media-libs/libdvdcss/Manifest
+++ b/media-libs/libdvdcss/Manifest
@@ -1,4 +1,4 @@
 DIST libdvdcss-1.4.2.tar.bz2 366824 BLAKE2B 106ec0f46eeb4969d0c878ef1e2ad05ac9c0b0ce0d2781c0d68d9d5e08f9c6154b43c4b2e0cd2db0d530eb0a94914161384e788b307af4c4fca3351d270cbe9a SHA512 e46ccded1951046ec481604c5b533c435be14cd0e734cd5315b61868836a20edf4cdc7c1466c2f4ed374de4382c5e758ace700e84aadcb29513001d696f1049c
-EBUILD libdvdcss-1.4.2-r1.ebuild 772 BLAKE2B ed9944139fced667c00cd6718fe2efcc61bb1c41d2ce0ecbaa0cd0f19afbf82b657731f64f105199b0e17eeeaebc465453deb62556d08709e94a34cb78628e81 SHA512 062a64e54bfeb707cee6eee099215c154bef292fbdde2cfb44fc6a97049a3b4d11d16676fe2c672088158d24d03649ea509c713bb41ab8cebd8ab3e221258f6c
+EBUILD libdvdcss-1.4.2-r1.ebuild 766 BLAKE2B a5b64a5f8742bef6e51c450a024521a830edc484663215a8754f6dfa7df1fb3f5a9982cbd7fc21c7dcf287c8282093b88ce501129049c33ba58f73482f426989 SHA512 4e8249b8283d5cf973858a5f6657ad397b706053d0419b5855d86ab33b82ffff38dafe221dc255e1c777ac645e734c93171e5b35844c21f44e8a61a0ebebf887
 EBUILD libdvdcss-1.4.2.ebuild 770 BLAKE2B e32f48709f4d5af4b13a95dcea63a9504363fd30442b701d95c102e040b77c9325b9009c0c8e5abc1f899b8957481b9cc1454ac610c2a1705c11f111c0da2fd9 SHA512 03140bd23c096faad202ed0623dd84793b1fd3534dfca80f01b8a93a2dfadc49da610674a1506a3ce637da3f51eace9e2e4735ca9febe88cbe0b8a6a80228ad2
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-libs/libdvdcss/libdvdcss-1.4.2-r1.ebuild b/media-libs/libdvdcss/libdvdcss-1.4.2-r1.ebuild
index 5da3b6069678..2a7cf74fadea 100644
--- a/media-libs/libdvdcss/libdvdcss-1.4.2-r1.ebuild
+++ b/media-libs/libdvdcss/libdvdcss-1.4.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index 10a9380aa4be..eb2b915a6c0a 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,6 +1,6 @@
 DIST libepoxy-1.5.4.tar.gz 337615 BLAKE2B 2793fde6da59079dfadc653c9f0712b0bd2ca1455a8cda7982bce61c35a3629641a30a76db059af635c1fa0076b4e6c56874b199b41d548afbbad8f6e43384e3 SHA512 c8b03f0a39df320fdd163a34c35f9ffbed51bc0174fd89a7dc4b3ab2439413087e1e1a2fe57418520074abd435051cbf03eb2a7bf8897da1712bbbc69cf27cc5
 DIST libepoxy-1.5.5.tar.gz 332057 BLAKE2B bf9a1e089c620e710caa7d4b7d5d0ec0cef186c7881b1a61aa22f58d8e023706087c766ad970ea8950752d87d2f32d12e2ded3137502f35991afb5b4fb3648cd SHA512 9056840d887f06c6422f61e65ea02511ed37b866a234d49bf78dc5f2f46e8dd9f029405387da14dced639e6a5740b5c56ab6d88ca23ea3270fc6db6a570b0c45
-EBUILD libepoxy-1.5.4.ebuild 1143 BLAKE2B 6fddc9a0360c70d5d37d5c6f36e179a764cffe5c97d45b8afed25bce52bf8027d202bb69d4ff495116b8e524df8c7373d112058b638efdfbce8bc22ed16f0d51 SHA512 c07b59155cb32f7c9c37d4e79ba07b22a5dc76bb1981c3189edc201e76601060364781294bb287d85365892046733dd303960811a03ca032a6ac850013254db6
-EBUILD libepoxy-1.5.5.ebuild 1165 BLAKE2B c33e2336ce342f17878a96688cea1348fd094793b9cc6ab6e99e05ff785f0953407f00952f66770ffb9b9f50d1582197906ab9d7e18c09a8f833dae3bca0b355 SHA512 23a397a61deb40eb80e5e7a3645e82d393f807e6d3306dd88a960a7932432a5310e7b1a0f7c7cdf3e4bc79ef194f3ef2320ea63e0457ff392226bc8f825eeef4
-EBUILD libepoxy-9999.ebuild 1165 BLAKE2B c33e2336ce342f17878a96688cea1348fd094793b9cc6ab6e99e05ff785f0953407f00952f66770ffb9b9f50d1582197906ab9d7e18c09a8f833dae3bca0b355 SHA512 23a397a61deb40eb80e5e7a3645e82d393f807e6d3306dd88a960a7932432a5310e7b1a0f7c7cdf3e4bc79ef194f3ef2320ea63e0457ff392226bc8f825eeef4
+EBUILD libepoxy-1.5.4.ebuild 1141 BLAKE2B 3ab8f35d56300ea3056e3d7f97b9cf5fe95a22a7059710f87800de978b11db4448d17b61e51f5e9e86ad750005d7d113a2dde5acfb02d82d98dcd4e163315f68 SHA512 d1467370eea40684490e64712f11451ce6bfd680cd23e13304e4214825670e2e9054952f31db9c094841e35ff1eb561146850be1747e48c4e414af6e62d1ee73
+EBUILD libepoxy-1.5.5.ebuild 1163 BLAKE2B 78abc721431b4c827905c43beb28d28977b4c934bd2725469b758ec2d5a7f56ad9bb7f1f5c769695a58ad0a7f57d9ecc2fefaca39be03f5e6aa8ec8061d39a67 SHA512 9f5bfce5549c057eb5688b593c16d410d8ee2708f597fedfb0d16aa42e6741a3a9d60c4f4386a51a7acb1c090965678198a2add521bcd6a7b8e336227893aaa3
+EBUILD libepoxy-9999.ebuild 1163 BLAKE2B 78abc721431b4c827905c43beb28d28977b4c934bd2725469b758ec2d5a7f56ad9bb7f1f5c769695a58ad0a7f57d9ecc2fefaca39be03f5e6aa8ec8061d39a67 SHA512 9f5bfce5549c057eb5688b593c16d410d8ee2708f597fedfb0d16aa42e6741a3a9d60c4f4386a51a7acb1c090965678198a2add521bcd6a7b8e336227893aaa3
 MISC metadata.xml 375 BLAKE2B 09993b726e54558d32b0dfb2a221bdd8928b85f55bdaaeb2faf30a0711ed58b05022a9fb669ec43806aff223860e47db53226a0f8f34d7b35edf0a842ab45923 SHA512 fec0ce8c99534083afc197c156a7fbaf2e83b2e22887ef134984ea7a4e6226f2714db399a118cd96f22b20012e7b7572156fc13aa72516e2557880c716140ad6
diff --git a/media-libs/libepoxy/libepoxy-1.5.4.ebuild b/media-libs/libepoxy/libepoxy-1.5.4.ebuild
index 88bf7a87cdff..51ad78cfbc58 100644
--- a/media-libs/libepoxy/libepoxy-1.5.4.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE='xml(+)'
 inherit meson multilib-minimal python-any-r1
 
diff --git a/media-libs/libepoxy/libepoxy-1.5.5.ebuild b/media-libs/libepoxy/libepoxy-1.5.5.ebuild
index 6ffc5543022d..9b903d1590db 100644
--- a/media-libs/libepoxy/libepoxy-1.5.5.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE='xml(+)'
 inherit meson multilib-minimal python-any-r1 virtualx
 
diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-9999.ebuild
index 6ffc5543022d..9b903d1590db 100644
--- a/media-libs/libepoxy/libepoxy-9999.ebuild
+++ b/media-libs/libepoxy/libepoxy-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE='xml(+)'
 inherit meson multilib-minimal python-any-r1 virtualx
 
diff --git a/media-libs/libfame/Manifest b/media-libs/libfame/Manifest
index adacd331c51e..46d0dffee889 100644
--- a/media-libs/libfame/Manifest
+++ b/media-libs/libfame/Manifest
@@ -3,5 +3,5 @@ AUX libfame-0.9.1-mmx-configure.ac.patch 1003 BLAKE2B a775cdac594a6b30b78cbaee88
 DIST libfame-0.9.1.tar.gz 296837 BLAKE2B 2c3b2b1c90baa2363ea17ab308070e130a15e2f58efcf00166e724dcf55175179012ffa9874dfce7c9179dec01e0c63ccb0b051d744a326636acf70e796f2483 SHA512 511e7be0bac81482edbe5357b982ad1f4adf2bc784a9f52a3f095269076cd1e42866d2ae24a31b17c38acefc03e2c9d868b17074931e5d320ab5eb52271c4345
 DIST libfame-patches-2.tar.bz2 5324 BLAKE2B 03768badf8a3b0cc5546fed200fa71850c1151223b6b0e2301b56f396e9a71ec495ab2bfbb1ab5bd2c3fbc6f4813928786edfae8876e15c4f742bb09162a85ca SHA512 e4f67b137c3397dd00f8a4d5835a180963c3109c0d239d8f0fe616983a5187f6eaad9f4097cc9eaceb5b9c42de9d9e7518a4174247665a8203a4f69b3383abc4
 EBUILD libfame-0.9.1-r2.ebuild 995 BLAKE2B 2d8cb993ad1778c6afcd18470a9e7deeab240370cf3ba0ba6611a57965aca656403977e74ff2c8437423c91586a42a59efda6f69cde2b2bee4823fd37f52172c SHA512 77373224e5cef3416b8350bfd294d9b5b6bb4a6b0d7dc848dd1a05c8369a5de247e076d6ecfdc3ab9d26442a22fd7efac5734dbc4fad2896850deec27bdbd849
-EBUILD libfame-0.9.1-r3.ebuild 1040 BLAKE2B a48ab48a7c0cbae8cf48b9c481222c2210bf108389c4cea9d5e71ef2d8ed6787993d49e869a98f5b2a2f6045b8b70064c0b0a31e5c2df1e122326e61abd82519 SHA512 387b6ad99913bd226d48e5b08e8696e1c607e1232c5d70e5ba0313f5f76eb5c29601333663f5e920b4a5c4838f4d6411af2a3eaaf99e7ebdd33bae22634e02e6
+EBUILD libfame-0.9.1-r3.ebuild 1039 BLAKE2B a8c711b38f9495e836b9302f408d29eab116796a20b3a14ee09d0fec9659e7c3e297cb196de4623984ba2593ca9c6c024d7b23b8c9080b85608a0e1af8d30714 SHA512 ca4e736838650ab4e40859cac79e2c784bdd3be5a8d5f04bd3d03999092cb71380f6456a6c6d72c3d17f59e53984a05cd0ad4b3b6c292fea0b700153d3680a80
 MISC metadata.xml 297 BLAKE2B 11f51d49c6584b02011081cb8eaaa00441c9bf623bbd068fc731d0352c568e891654b18ee0c50d6722c31cdd966351cf58ce18947beee1410138b29c1d1c9b08 SHA512 6fad09bf8ac2d08c4e255fc2ae8a95afd410a7dbaaa91fc7467a78ace5a9a9a9cef1ec25ddd676a3c696a5a2714bb3c3f5b180cbfb0fd8a254bab9a5e310212f
diff --git a/media-libs/libfame/libfame-0.9.1-r3.ebuild b/media-libs/libfame/libfame-0.9.1-r3.ebuild
index a2ead699e72b..443646e1d40c 100644
--- a/media-libs/libfame/libfame-0.9.1-r3.ebuild
+++ b/media-libs/libfame/libfame-0.9.1-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/fame/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
 IUSE="cpu_flags_x86_mmx"
 
 PATCHES=(
diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index 6532ea568711..8bac85d7adf1 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -1,3 +1,3 @@
 DIST libffado-2.4.4.tgz 1228417 BLAKE2B 70d3b17f7d7317acc63351faaefb27fa850664015134887f0508b4a76aabbf6e9573f87eb2dd9792ac5f4f4b06ac7c872afa33af6af0341e6cceeb43e7a79526 SHA512 065b7f9ce9bf58320c02353b63ed17b3610d0ee8a2de58de27159b2190e39c779094b01ae1123c087387e6077375e646b564b9e7717b192865b2f1f22a3acc80
-EBUILD libffado-2.4.4-r1.ebuild 2645 BLAKE2B 6db85ed1c00907c5f9ec1e4a407aa69a0b8b0a84c46d7ce7f02b3668c9196169b48cf690a4d05b1004fad6b7b09df17f86ca5ac5580534c055e9d8d44fb39a4f SHA512 06f363d3b2c4a3ba1aee334d6fa66099715d972877632766c8053cb8dc2bfae840a527ab828d5aae310ea03d84b9a040840e4bef0292fa7f9cc4ea81f5763423
+EBUILD libffado-2.4.4-r1.ebuild 2643 BLAKE2B e2392e18990b9f71b60d244c53f51aacb2bee2ef0e32f24fbe0c918add43b6677dbf329bd32f6c52b69bb4b45633845bfdf5a51a61f0252b729614373f5f2f07 SHA512 88cd7177fec1cf2b8df7852de6e42731351835b972bdbdf5e448f20307a089cbe66d39fe1b972c620366da2d889d566825d4ed75a4aea99688eb90f0f58dbf8c
 MISC metadata.xml 566 BLAKE2B 66bf590980ba18079dfc4127aad3de692e4544f93518fec98e8c337c129df35fac11ff1c8b2c5c3b606855da6020f7abf311b14a4b8b607b08ed1662ae5adc3a SHA512 f1d19db6ac852100cae4d73b8608a892bae5d4907b35601c4c751a35555111de450edf1f0373c2f81cd68e947c76e9c36c7e2b76a8c9d3aa64345fa9b9227b34
diff --git a/media-libs/libffado/libffado-2.4.4-r1.ebuild b/media-libs/libffado/libffado-2.4.4-r1.ebuild
index c7c5b1cf7dd4..3f65f3bf7f5f 100644
--- a/media-libs/libffado/libffado-2.4.4-r1.ebuild
+++ b/media-libs/libffado/libffado-2.4.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit desktop python-single-r1 scons-utils toolchain-funcs udev multilib-minimal
 
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index 10f5cbf72d4a..edea1955521a 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,4 +1,4 @@
 DIST libglvnd-1.3.2.tar.bz2 715212 BLAKE2B 4f8d32d630a94dbce3d87926a25941fb915f9b1bb8ba167ee7392e32e55b26c5bb80db4000dd11188449f662b810f0c986b6ecf7f4c5ebf05d7a895b0fdb3c82 SHA512 4fea59150a7dd2c710ded26270e74ae73af00cc127d7141fe70e31263fb492c5c43eabc8ab27d5a568d12394a95023c22f1b60968f4c403dcf6ad6202bec508c
-EBUILD libglvnd-1.3.2-r2.ebuild 1528 BLAKE2B 8dd8327d39f1879b4d254644ae9260dba2fd8038ae37bd65a5f520d102c77484daa7b1666320caab10f0de58cbc922ff87e48b70fc0e34deb62ae4521c22f013 SHA512 51316d6b757c339b5adf8155bc1f7a0d3cc68e5dcdd4789fcd632fc2b4e7268c717f70d1bae600080ae3e63f297d570f2a87306b80500fa8dd442602e042549a
-EBUILD libglvnd-9999.ebuild 1535 BLAKE2B 58ddbb76e270935587fd4baa48985b015c037c8f3cff87297cd6f784fc343494f05d376a72500aed41eb440618fd3939e31acea0002d1a94a251bfbd959996cf SHA512 933168d07eb2ce996b1c32d27ddf3bca35595f0b98fb9abc204fa31e0c378c5ddc493e26dae88eae13675143220fbf5eb2f2e524a67028c55f1ff5c2d6adc47e
+EBUILD libglvnd-1.3.2-r2.ebuild 1528 BLAKE2B 592e19b30551860fbfb735e2e4b6eed4d293ffb28b68c2653ecaf16722a396971203e6a3b52577cf524e599d9f037852d9434f4038bbc0e43ce40a0db5944de6 SHA512 460609a9aba15122b3a05cc5ab7fbfda83eaa731188f58d51dda5b51910a332964a286d840a12dc6c86e2c397a169d095bfc5b82282b21d34cbaa1972cf09e27
+EBUILD libglvnd-9999.ebuild 1535 BLAKE2B ba68151edcded5eedc994b1c0e140929de294515a37de46f991bec806c78a751fef009d05b4069cbf5738ae55d2159d2194fb5f522ea554b998cba9d667dac0f SHA512 a48b8cf5d458541ce8b75947742471fd6e3c679d34e9c5505b2570c4610bf6f421c18ce75c0663545e15329a3abd7394357c5a793e7275fedc059f30f1422747
 MISC metadata.xml 314 BLAKE2B 34c95a3e321c3059bca39c7beb5b7b15e8085b54affb267947fb3676018fa183040a157716e979c5e0381acdea6e738294b37841e75da308c3632fb3587dec33 SHA512 fa12f7fa880b0721baf2eb40b9fd8a68e51c143dd8ede7a199c5afcd5a208f84c51a80fc1f4bc68b266338bac8bf4137b2443d88567150f2c54b2f11913df89c
diff --git a/media-libs/libglvnd/libglvnd-1.3.2-r2.ebuild b/media-libs/libglvnd/libglvnd-1.3.2-r2.ebuild
index 75649abb043e..d7725a774182 100644
--- a/media-libs/libglvnd/libglvnd-1.3.2-r2.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.3.2-r2.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 VIRTUALX_REQUIRED=manual
 
 inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1 virtualx
diff --git a/media-libs/libglvnd/libglvnd-9999.ebuild b/media-libs/libglvnd/libglvnd-9999.ebuild
index 0eabebb4b67c..b11f59ab1c2c 100644
--- a/media-libs/libglvnd/libglvnd-9999.ebuild
+++ b/media-libs/libglvnd/libglvnd-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 VIRTUALX_REQUIRED=manual
 
 inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1 virtualx
diff --git a/media-libs/libiec61883/Manifest b/media-libs/libiec61883/Manifest
index c053f0ea6020..9284ed571645 100644
--- a/media-libs/libiec61883/Manifest
+++ b/media-libs/libiec61883/Manifest
@@ -1,5 +1,5 @@
 AUX libiec61883-1.2.0-examples.patch 1140 BLAKE2B ab448e0a4941fd87ac8d0cd2cb6f21e3fc784b956ff2d8a1b81cad50a91ac0e60469eb5341d7ff3d7bfb7093fe424a51b63246292b52a62dcd773370fd6a7445 SHA512 b022bd213e82ae0f6ac206512a6764784720ef4e5caf349e39e729ec2a7c6b84c70af9ef02753b76e431707fc36fe1cc076b87367ca3c89250bcc1a0660d4eb7
 DIST libiec61883-1.2.0.tar.xz 233640 BLAKE2B c1fdd4d6fbfd96eea9f1c22b20a1e71e4cafbe064091ef6211d097342f8751955f2d8a68cb3e5235d733f7ecd3725144abb329331bfa3497be1911bb8773d4a9 SHA512 817177081a229c6253340e5911369aab746bd657d5b3d6a1ef3cf639cceee667bdb677fb0536163468cc9e719c4e81c6beaf42c93e5a56eb52684964b6dd1e23
 EBUILD libiec61883-1.2.0-r1.ebuild 943 BLAKE2B 172fa1dc69fae176b893f8f489c756c5535000a572e7d2a580e1f3e65e326e05c43d9c9bd6cd3f0ac540605dca68ce4f341fe25a205d5fba72c087712555065a SHA512 8bde8dc265aa718ba5354bb9a5eaf7151298158bd052f946efe6a2ebc2171b314c911b238556616c04c54de61f8fa06e1895b564bcdaac720b5f13be5dd163ec
-EBUILD libiec61883-1.2.0-r2.ebuild 852 BLAKE2B f7d22bdfecf206cb51aa9949ccc8f5b7c3ef1d3081a4458f7858bcb56a6f3d9694d0d4db1f910383c3b884755e7505eb907db47abcd7f1accdc3388249ddf50e SHA512 597ad031760c27aa1d39139ba60bcd1b5f8515674e16d97d8c2c60ff45359f7895de49a56914a6c88025146390bd83183a665c43e331e4a74da0091f267028ff
+EBUILD libiec61883-1.2.0-r2.ebuild 851 BLAKE2B 60fe73e75f03c0a9af45fe4279f8a15ebb89871adac57813e1d875c3792d4a851f965664f57cafc7e06db63e1cec5d056992dbe71cd9d54bd819072ffbc601d5 SHA512 fa23be3f6f0a009af39d946f52068622e153a9aa7be4a220c08c8d107c6877c58583f91c2da67de91e06d4350eac278bf0b9ed836b2d56e65cc4dbc703ae2785
 MISC metadata.xml 531 BLAKE2B b3f4a2efce5fb0eb30e14c02ab34a58d4dd4e38b7b5a8b799816fa4ac50fec6e2656652629f351388519f6bf05275448f22fd10b4565884c12bdf054130639d1 SHA512 bbf4b45023f2a7f1ed7769fa4513cc13ec9697eeb677fde7ec882f5f787e00d0b291ef6be1c2d0ace4d35059782d85678c9ac38f8913ffd63f35a82ebfcab933
diff --git a/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild b/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild
index a987fe211306..6cd2901e5869 100644
--- a/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild
+++ b/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/libs/ieee1394/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc ~x86"
 IUSE="examples"
 
 RDEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libiptcdata/Manifest b/media-libs/libiptcdata/Manifest
index 9263b78d8f4a..9f75347c5ca5 100644
--- a/media-libs/libiptcdata/Manifest
+++ b/media-libs/libiptcdata/Manifest
@@ -1,3 +1,3 @@
 DIST libiptcdata-1.0.5.tar.gz 593779 BLAKE2B 7e5226a289fed5c2f4b662efaa693a8b38e95ac34bc1365af05d1af649be876d3e5b58fecea4818255879bd7518aa482cb623540601fb3c8065acd428439a29c SHA512 64ef44b1e639890004f31d5d42844ba25ed558f0a118f1dad9bc3f4dcad2457e51b825a13df849659b0e15afc78f528f330b03be94cdf156bd95b62dc419494a
-EBUILD libiptcdata-1.0.5.ebuild 1151 BLAKE2B 55b0e06d5f604be1975802a28bfdd5e007b0124d8aaaf42914b6fa0dfb2a841355517b8b8ab86c2f3836c6d0a6123b3aabda3049e6a75af9e6cd028f498ecf72 SHA512 8c1695fa6c23c611e639720229d462efd5cd8189e2ce592642e0748a0b98e217e4fb7e47ae13dd7bd77485b50b8d0b6cf0ded34360520a159fb865a1f16a5c41
+EBUILD libiptcdata-1.0.5.ebuild 1147 BLAKE2B 4ffa018e573cc36037329c9b92385e9ff48f13f5aa9ad096eabccc01a47e09c46a97a69edaf70718873d5c8d8eb8081b37287a657473e3b9dc5077a949d709ce SHA512 f1fc1cbe03b7f746af923c779c10a3516e4d8c963bae69344b406f8655e2959066416da4de2c7da6fb66ac21350b89c47fcc50619223eec037999f349e9de5e6
 MISC metadata.xml 1088 BLAKE2B 6871a600af857b89a4d372d514754a1b8c1989d0ca33ad418baf42a9f7baf088e79dea0220a054dfb9518b5edfc766dc5ee39d3c0336304cb61d7e22aa7e8e3e SHA512 bf7b79f193dd31cca18c658a163b1619fb32f92db3310da719725c611f15ae5711ac11285b53063a3e669644e12d80a69804fa04a0050df3ae998c5dcee7d2fa
diff --git a/media-libs/libiptcdata/libiptcdata-1.0.5.ebuild b/media-libs/libiptcdata/libiptcdata-1.0.5.ebuild
index be70680bc971..eae3fa541b66 100644
--- a/media-libs/libiptcdata/libiptcdata-1.0.5.ebuild
+++ b/media-libs/libiptcdata/libiptcdata-1.0.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_7,3_8} )
 
 inherit python-single-r1
 
diff --git a/media-libs/libmms/Manifest b/media-libs/libmms/Manifest
index 11174cba485d..4a950d5c1933 100644
--- a/media-libs/libmms/Manifest
+++ b/media-libs/libmms/Manifest
@@ -1,4 +1,4 @@
 DIST libmms-0.6.4.tar.gz 356217 BLAKE2B 2b0029cde3e985b1a0310e7d00acafb54a53606c656fee1b87a086a31ecc1e488aec31e86880959f23a077a20594a6c939efea3e08545a3d47f804ed762395a4 SHA512 9771c697515f5232eaeaff79e68fe15e34d8aa38aa5d3d68525216357223f314c544d71b5fe18d79a77682f41b1b5d9fb5e7c3c99d0cba5723d2e3de31faec96
-EBUILD libmms-0.6.4-r1.ebuild 689 BLAKE2B 250d851e73222c460ab8bdb7e2e3728b7f8b04a3bf33177de2944699dae457ebc28a4750635446e5508a1e4bbe8bae5cb5ef3585fce6e98806a243546ecc289d SHA512 37948ee11e75fb649b8992b94c29fa5bfe9895f9619b4c52756076a6ad4a30a5ffa18b1351c4f1c721b09881f6cb6852778e21c68ad66b3536b818990436e672
+EBUILD libmms-0.6.4-r1.ebuild 688 BLAKE2B d0a0323e50f833e32af4963a5c8fc4e812b0368c735397af78312c5335638579f315d79b51161e5463270172b422230091c518f09a2509eecf7bb2d086289dba SHA512 6c62b0f7369d4eb710a87781a97754d9fd4db5ec541dcf576a1b7fe16b9c9c77cc8925a6a0ea34d2731dca13f1c7070384b2c9e311bef76ab2c24fa8b2315f37
 EBUILD libmms-0.6.4.ebuild 636 BLAKE2B 10e4eebbdfa1b21b0b1883a76b95535e840c09bca39af8a0283ad86c604add9a815c7f48178f73c18e2f46a5a3f0fbb8a76cb03bd87b72bfd47a16a45d3ba88a SHA512 bf4fbba5e64f588fe5624a359ca654be47fd047368a94d793df63512823afe30f9161a02a9472e0c484320afb2b36b949421d8f0fc2389d37e65133a44fba1b5
 MISC metadata.xml 358 BLAKE2B f61ee71ee2acfcaf289a33d28efed96cae45933a0a0434f53e2fd2196722eb3c2f4d2f75a39f31bbbb630d11b67bca1f6d43c95349d3f97560f6260bbfa50082 SHA512 c9c5cc18c8b1ea6dcd96d280d74a811f19f7a93a866b95263454d46975f876791559799dd2e036b24f41e8c10d8130e2a4b200aa71f087f44044ebadd5d9aa95
diff --git a/media-libs/libmms/libmms-0.6.4-r1.ebuild b/media-libs/libmms/libmms-0.6.4-r1.ebuild
index d84708f7339c..cf67f02beb88 100644
--- a/media-libs/libmms/libmms-0.6.4-r1.ebuild
+++ b/media-libs/libmms/libmms-0.6.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/media-libs/libmodplug/Manifest b/media-libs/libmodplug/Manifest
index 664abb513942..8699d82182ba 100644
--- a/media-libs/libmodplug/Manifest
+++ b/media-libs/libmodplug/Manifest
@@ -1,6 +1,6 @@
 AUX libmodplug-0.8.4-timidity-patches.patch 557 BLAKE2B 4c26c285bb2f23057dae320ab3488e13dbbfb420f8185fd615732912e17f416537b4d210cf8cf48745a3b6dc2df8be49274904626e9db432f2f347dacfbe99a6 SHA512 4fa8bfe0665713b65b0b3f9be59589c98c7fbe5aa278ee95107fd1b91ba1a25fbd20a86bf91ab7eb7e160f522e04dc78838ada6298d4f5c1905b528c1fd7a57e
 AUX libmodplug-0.8.9.0-no-fast-math.patch 437 BLAKE2B 7b4f449d4906480b392b2ea93260c816a2418678a6f5209c6d00939830c977161c6d481a34830e0e0b39400adcf7af8665df63091580bd3db84841f7ee8158f1 SHA512 f07f8e3efdb4d15dc8916c5f62429f2d51a0342743a2bc881b44fcc8cb689fe973f9089815c2eb3ba469e622e9c4f86a7c4f5b6e5bd78d506aa7c69b80426653
 DIST libmodplug-0.8.9.0.tar.gz 576566 BLAKE2B 534ce23f37ae60593fcbf0b8984140badcf7d868a7559ea6aef282a4d14dc6ad05847dc128a0221772e1dc2abb8c870ff8d6d46da0c04232169f905468a3ba19 SHA512 880e10154fd367ee24ace53ca7e32a5c1fee7dfff1f934e6499944c12779427da63e2f55f8d6ce25db0a42a5b4424053bf64305b31dbfc4ef6a8909924d655fd
-EBUILD libmodplug-0.8.9.0-r1.ebuild 835 BLAKE2B fe4236775a86f5cf224948a9e6bd5a8a1a2920ac44ad3e893d63f11107ebbb228b86f4b2a9db2ef757f96b3f0a4aff74904bc369997b30a8bf50464081855ea1 SHA512 6b74b820caf4b777afb70c027d2b7d3ab8ad25d6e5bc6f52079f2292003293bd15d18198e2944115d0f4c910a55442e79937afd236124dca49e93979c85b637e
+EBUILD libmodplug-0.8.9.0-r1.ebuild 834 BLAKE2B 53227aada07bb24f80e2a0b11d99ad787f40c20f5076567b3b9114bac311dac2cb61ecc5751d847536a2793450d14cd89f51ac7522d34399b985cbd58375d151 SHA512 36358b5c545d22a58bef32b198fe4fa62f8421b05d40851903b7aea56af54202147b22dea77d720fb521c6958d3e53bea7b81dcecbaff771c82c30f28e242c98
 EBUILD libmodplug-0.8.9.0.ebuild 741 BLAKE2B 109d2ddb2adf9b398114dbc7e8fedf82584c089ff7513e3a8a559971727f731fb734974f42ef548a691edcfd2fc43490aa68073bbbeedd074ca14dc35d662db2 SHA512 b9cfbf0f1b9b2ad38795df9242a8e47cfd240529520561db0f884af7843a8796f4f14fea84d0bb9edbdc94285b3e189adada3962f0d39c4a67341425db784856
 MISC metadata.xml 457 BLAKE2B 2aa3262e69e5eb85c8ee24f912b126c38554bb324652b7a2b91620236a72b1717ce0ada193193d9655883f8ce48be622e85934a8acb69f35e78bc59616d051af SHA512 6b4cb6e098ed3d743e76d98da648ef475288ec82273b7fbdd73bd60cd14e58d98f0798244bbd4432e504402655557aa0ffb5a4104261c5916261e8040430e46d
diff --git a/media-libs/libmodplug/libmodplug-0.8.9.0-r1.ebuild b/media-libs/libmodplug/libmodplug-0.8.9.0-r1.ebuild
index ce0affd3f679..464179a35ebb 100644
--- a/media-libs/libmodplug/libmodplug-0.8.9.0-r1.ebuild
+++ b/media-libs/libmodplug/libmodplug-0.8.9.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/modplug-xmms/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest
index 717f00a4301a..6c49a0894984 100644
--- a/media-libs/libmypaint/Manifest
+++ b/media-libs/libmypaint/Manifest
@@ -1,3 +1,3 @@
 DIST libmypaint-1.6.1.tar.xz 519464 BLAKE2B 6302914ab7e0876012e5235573c5cb3a76cbca9b5f0707321b0fc0a8406f712b9164ccb02ecc8a63b13d1e640a04cba8063c568bcbe40fc8543fc4a2c1576e5b SHA512 e9413fd6a5336791ab3228a5ad9e7f06871d075c7ded236942f896a205ba44ea901a945fdc97b8be357453a1505331b59e824fe67500fbcda0cc4f11f79af608
-EBUILD libmypaint-1.6.1.ebuild 1401 BLAKE2B 88ba990f1ab4247f467281fd90fbc9d69eea188350fee4309d732d73b9b2800cf26aa8a8ba032b10929997382cebdcea4630c350d8a0a8b8b7d22ba7ea82da3a SHA512 9e929c8e44a4a33257aca246da83c67f5f30c052e8109f7c56d1cb33004a789a2552d3647da2b4c5052329bc6a646360031a8ea47cc509ebc75795b737cc4034
+EBUILD libmypaint-1.6.1.ebuild 1399 BLAKE2B f148cbef7f43874d9e12727dde9cfc952d8cf32dc9ea8b8c26640c0d6499286eed59a3421d2d54215a4e70491cb7542bbc1c9fffc0479ae2d1359ea319f34bbb SHA512 dda2f380ae6b35e254828a61fdaa0e533a354883b8e353461ddc0af62767ebd3c4e86aea926e976ead2669fc58b5a2b32b8e3d5e602eeae95589c47fbc21f203
 MISC metadata.xml 407 BLAKE2B 3c25822ad0cf7c7af7f8f322d35ac4394880dca10ab5f07c7131cd54b7f49398456d2198560130b9c43785f755fb728e2f76eb90ceaed1e00c972dd64bfdb8e5 SHA512 9710f70829c3dd64ff857b49020db0d0217b1feaff1e0b37a0c6e94672bb845d959a14c99b0e82471f272855ea0a00e69e8e74326ba6c00060f5f3b325ade1fa
diff --git a/media-libs/libmypaint/libmypaint-1.6.1.ebuild b/media-libs/libmypaint/libmypaint-1.6.1.ebuild
index 8d0f65876039..8067dd910028 100644
--- a/media-libs/libmypaint/libmypaint-1.6.1.ebuild
+++ b/media-libs/libmypaint/libmypaint-1.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit autotools python-any-r1 toolchain-funcs
 
diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
index 88457a6bcb20..fef00c162404 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -3,6 +3,6 @@ AUX libopenshot-0.2.5-gcc10.patch 2605 BLAKE2B 34967db6b59816738e7895f8c608603ea
 AUX libopenshot-0.2.5-no-hwaccel-testfix.patch 1691 BLAKE2B a587449964691bfd2940507f4a1d0b74342c0225bbe7b0a7620044603e0baffde73e7d71f6ca2ffa1ae7748e461ce661a86f11dd0b347a8c55eb07d19d7db75b SHA512 807c77c87a011e12e0a3c8696cbe83b4a6aea9c0770c5ac5194b4c3a6457e772795ca6ae309fdbbb458fefaaa03c7b930084e686e680b23e881f56a21493f85d
 DIST libopenshot-0.2.4_pre20190609.tar.gz 10268173 BLAKE2B 01e07c0a7c051b5804f24fab1bfb920862a165ef14d3fdd020430b9e3a47858842c8cab3408ba0d161cb15cc6e90531a3b5df9ad327a01f414ff2e7e392fc243 SHA512 bf8c06aba6a899cb1ca6fbe9ac89fc859083b03175338c04af8dce68698f4ac78eac0b5b594e2b02390cd5e64576445b1c95324b254a267506353bed97ca16d1
 DIST libopenshot-0.2.5.tar.gz 10295768 BLAKE2B 19205c4f02d8b863b48e920164302853c7a505893783161e6a146e7a9728cefa19d4e48bc82b862e920967f110988ac28f5f495912efabbbacc98f55ebb51856 SHA512 b7cdf72897e6edaa8cc00e17dbe30f5b22a6b5d69aab64ddafb184458b41ef0332db1f3e2c6f039492bf7adb521d9758834d0bf6c24e6421a55970d8cf8caba7
-EBUILD libopenshot-0.2.4_pre20190609.ebuild 2415 BLAKE2B c890e1777e9fa8f01412bd50dffd1ff455c786805cde1717420fdaa846b2451ec0396dc2203a75baf969329525b75c5179830f145176dc3385a1496fd79da2bc SHA512 676bbbdc2958a228a0907e260a2a421f753283893415f393ebd3ba66379cc4910e3fc0b64dd7f87534db7e76d2ff6eb8f78bb22725ab4e095c9c969065410fab
-EBUILD libopenshot-0.2.5-r1.ebuild 2361 BLAKE2B 480a89ff5f2b2190d4596e5ba5f1505ad9fe16c1febfe4a1f2f6b7a37291b2b3bff8a3223fe531735a3e8098431d7a2184a6763f07c72ba4bab06aaf6e737f4e SHA512 99ab2e14e80b9bd7a4ef4b939b4f2f9f326add36c4e915223a0572e4175219f92dcbf07fe949524456970d2f6439e05770b7503f51969702b867e0f0e9f48b48
+EBUILD libopenshot-0.2.4_pre20190609.ebuild 2411 BLAKE2B 37db8467408553053705be036b15cde984df57757f26e42272a680997806a21e3528f583c4f70ce1d58c5acbf762f3a81a10f86e381fa8d9584776b4475eba11 SHA512 a66cd503b35117daf5779ab2139683ff51e6d15dd667e933171cb6ae6a600fe4e9babb5f4f674f88d67ecf663709b0907b9713c6ea781cd54ac6b006a69d15d6
+EBUILD libopenshot-0.2.5-r1.ebuild 2359 BLAKE2B 76242572db063730fd06f42a2278870c685df5b7a932d6c20bbc57dd91fb76b097b1143c1b78025e714e074aeac38a4cb4bf1167d1e07f82bbeeb752460c713b SHA512 51e9d1621b9ab777164cb87882756d8715946a3be54ac2e31426b3ba687b9d46c7a9766a06c3b6c0cc463c0bfee119a5386eaf3853b420cea469307d1f0cbea9
 MISC metadata.xml 520 BLAKE2B d4eba07a3598f2fd073fb11a885ccb303a30624ea396fe43799348bc7284375d7223f0553cb01b582d5ceb7daa402878c89290eb27a7e6797d366c5bc1146e91 SHA512 19cdd8b9200c01945b48efbd52b78a45ee681244076bde7045d8d737d00fc7fe41cce6845459cccc2e4ff7b4be1e42eb3c6b14f43165435a9122ff266bbf0b15
diff --git a/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild b/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild
index 32de4448a664..eea5ca7a14f4 100644
--- a/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild
+++ b/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
 
 inherit cmake python-single-r1 toolchain-funcs
 
diff --git a/media-libs/libopenshot/libopenshot-0.2.5-r1.ebuild b/media-libs/libopenshot/libopenshot-0.2.5-r1.ebuild
index 1c5d1a9b83e7..fefc007eaa7e 100644
--- a/media-libs/libopenshot/libopenshot-0.2.5-r1.ebuild
+++ b/media-libs/libopenshot/libopenshot-0.2.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit cmake python-single-r1 toolchain-funcs
 
diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index 03a88f53c7f3..44b36d33125f 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -4,6 +4,6 @@ DIST libplacebo-v2.43.1.tar.gz 356913 BLAKE2B 1fbda35bcdaf96ebfb20a05bcec35fc031
 DIST libplacebo-v2.72.2.tar.gz 398314 BLAKE2B 59ce83d23c22fa1bc10d82b01b531ee82e3e40bf062adf7ea1d276a65c683c448797348a7a9ce234f92e0fd6c699903ae70f15df5d2e2779bec32db6b0b769e6 SHA512 0cb100350dbc81566a8363b0265bf89de8569b0313d1f1aa8ba621e39d7ee43a47ec9ab7827d01fdd2133c357983002412e67c2b2ba3616bd570f16e8e3ba135
 EBUILD libplacebo-2.43.0.ebuild 1565 BLAKE2B a698e4b9206214bec581b84ae7b9b6d9415869ff34845f94e673a60e006bc3649389a1fccf092e5eb05318ba5e906af7a688bfc20836acbb1efcd3cb6633acee SHA512 9b35fe6eab88288b78789e78c53a6baeacd684e52010845d0194e4349ee126eaa8701aad7e7714bad051d287b586263efe4846f5ded0f156fc04db5c68af3eee
 EBUILD libplacebo-2.43.1.ebuild 1580 BLAKE2B 1422e2a236e6f296a00108eb9fa1516289607f30f443c56b905157e112608c9bdae8a4a6451200a579c413e08c08eac986f91481eeaed14a0774dde0ca1df3ad SHA512 2cfef936484d384e9917f0330ee2af8ec439c2e7af9771e7e0ae5086a4cb7a8dad3fd6844d72b787d6dcd976b988c2be96965c64988aa11f593b26f01c3b82ba
-EBUILD libplacebo-2.72.2.ebuild 1889 BLAKE2B 6d0724bad61f28633b24a61782774d889ee13f33d0e0942b17651defadb19a9af77a0c8f430e746574bdd38d7b2f107ae9869ec1f3001b5f8fd76fdcda7f70ca SHA512 07d8dc86c3df956a34901bcf0e24a1f4455b1781d1357d636b8e18bfcadd37e3210a97e20f1ff7defbba767192d1bc5e03af735cf753ebbe97102a575a15c326
-EBUILD libplacebo-9999.ebuild 1924 BLAKE2B 5ed7fea860e50f3b0d568518ab853aaa6fe58576f9a2cd53efd5dd36c5d0968b0c927df2894ec8c5b9aabdee77a218d7f9578cfce5b07f601fcbc88da3699812 SHA512 d4d065dabde0e25e18f63afaee3086727667c27de2a510fee1420dcf36608da78864e74a3f4df58eddb72c9bc47b9f1b8e8ff54809a31657ff14d368f38eb8a3
+EBUILD libplacebo-2.72.2.ebuild 1887 BLAKE2B 33b04aca370df443ea0be685beac68a201595685edb9298bc8f48540b966ad891485f11e3622d96d28c09e93dbb949aae2588d4763e820d67941e0e327041b42 SHA512 2c9fafa906884c9408a36cbd10e12ada226704431c795a2afdc0e1a122e8b2b273770e5d7181efc38beb0bec45d5e19457180e44b18242d28df2c311f0938fa7
+EBUILD libplacebo-9999.ebuild 1922 BLAKE2B 62d626bcc7f770dba9c265ccadcebae2bd4151985fcb3536c5926ef480efc9d9c414b22276cb0467149921eef0acc7ee42457de39c54acc17b520bf55306769f SHA512 9a372a4099483519cac4d63a4a9146fe201660ab11002242cd03e2499c7f219d726f2fff940c4096c9e5b7d61af6d9aebd64a322461ca7389d82fd0413990147
 MISC metadata.xml 807 BLAKE2B f04df70a40523ad668bfa7dda7c841ce098f2105d2bc94ab6291bb194bf1fec18445b779952db33614d685ee0964c7ac6b7666b3d8cf89f8bd9391b1ccd2c553 SHA512 48d5e93ca7e964d80dc579789c6f626f9590d102b451c4f0fced538aed1301e0cb7f93fce4d03deaddb72dcad22489aa3846d8fa8ac443fcdbc4fcb90ef19040
diff --git a/media-libs/libplacebo/libplacebo-2.72.2.ebuild b/media-libs/libplacebo/libplacebo-2.72.2.ebuild
index 9303b586426d..6dfc04687ed1 100644
--- a/media-libs/libplacebo/libplacebo-2.72.2.ebuild
+++ b/media-libs/libplacebo/libplacebo-2.72.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
diff --git a/media-libs/libplacebo/libplacebo-9999.ebuild b/media-libs/libplacebo/libplacebo-9999.ebuild
index 15f1430100f8..9bebe61dc663 100644
--- a/media-libs/libplacebo/libplacebo-9999.ebuild
+++ b/media-libs/libplacebo/libplacebo-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
diff --git a/media-libs/libshout/Manifest b/media-libs/libshout/Manifest
index 65b443209fe2..1f219c415b02 100644
--- a/media-libs/libshout/Manifest
+++ b/media-libs/libshout/Manifest
@@ -2,5 +2,5 @@ AUX libshout-2.4.1-underlinking.patch 529 BLAKE2B 993ab69f011caa49b96f28ede17bbe
 DIST libshout-2.4.3.tar.gz 529563 BLAKE2B 30d982fcf52507e07af23113560cfc9e43ca4ce37c286854326ea09215dc30c3c0d57320dce46dd4faec43b3d473df2f7882ad759479fb023166cec3f24327c5 SHA512 fe36778c6640e620f27504cb21234940e18a65a33f9178bf7e77d4baf854a9affc82d85db8ed8c1c8e2d80399685d8be10106fff5be1ddf76e03e2ffeeed1d34
 DIST libshout-2.4.5.tar.gz 543991 BLAKE2B a3ceabd150413e9d1cee2118fe9576959bfa05d86e261b2574969a9a665aba3da4ac1c39db2b27d033fe587232a69a569d80362f856bba667277b5454dd170ca SHA512 290844185da16961f03434d3e341573dd6cb0139e5fa81902903021b641382d2629302d7c356bc591b35656754e07f4e44a8d9e782e092b17a051b9ae8f54341
 EBUILD libshout-2.4.3.ebuild 1312 BLAKE2B e409e9f703a351d6e0df5dcac4beb3ae9de6c4773257e0d2ef541ea5d3120822f7ddc7938d0f123e250c38669aa6596928c8329b15a620a67b2a422dd40a3358 SHA512 e2b159724aff657070e9fe692981e94cd73d00b7f8d57110364154575ddbf27a111953f04dbec4c2479b3db88f1806afbb5bd201fa1dd95e05547247a3945fca
-EBUILD libshout-2.4.5.ebuild 1239 BLAKE2B fa5f6d92546093610e66effe944268b5472b78ead66111a368bdc0aa3d3b1c73ee97d210e34c3ecc285b37730fd179c85eb54113fe888e486e93e7eb39ffd5b7 SHA512 6682d7d2c0015e971ad676c0b76a41b1a7a1c3a1f702cca7b0ec14f06a23336623d4da4f26dfe99a89cb10fd0616353e157dee5cb5dc3e021394476b6815ab78
+EBUILD libshout-2.4.5.ebuild 1236 BLAKE2B cfc49e52a5730f3a58b14c31931b12f1ed58981556facfed59f22f37567d204d1fedafed6bda7721f72993b5e6d2b6bfd5b8265195ef69dd16879cff3eb9df06 SHA512 f9a54c08a5c2b6497c6ca180e5b5fefc3b06975888f15a02fd5f2b3e99fb1331b2c371ea366be6166d257d5bdf618434705f44321ec508ff3a93bbafc323db50
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libshout/libshout-2.4.5.ebuild b/media-libs/libshout/libshout-2.4.5.ebuild
index 76d212702972..8fa273442a74 100644
--- a/media-libs/libshout/libshout-2.4.5.ebuild
+++ b/media-libs/libshout/libshout-2.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86"
 IUSE="libressl speex static-libs theora"
 
 RDEPEND="
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index 7abe9eed9385..daf097c110e1 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -1,6 +1,6 @@
 DIST libsndfile-1.0.30.tar.bz2 852320 BLAKE2B 00bd558a3d8645f4ad03fba38c31fcea25d30bea4b6f1a785b4b31b0da61bfa6a6f7df1bd7907c95c543cce8ee6766032d2e614eb285f2fc529146cb1d319517 SHA512 c4be4bc57df880da81570889a80256ba4567f2c7d6bdfb38f3803c55f616278160e962544bfac32e53b613b8fdf2a2644d8da9ee778747c32cb681a0fd5aab00
 DIST libsndfile-1.0.31.tar.bz2 875335 BLAKE2B 33e3c3d111427e829d8233aec52c227188834936839da9a04cf1ea5d2595d6a3127e7ce86d7686ca0336cca2017e6e2466845c27c7fc399efae34a0902316e41 SHA512 62202092e5cac6346fd3c0a977380e9bf888fc59d08c9c9707dc254a8ef6ed6356da2ab0430bb970c7b06ba5bb1dafa5d7b0fe13898834c1fe4acb16f409f0e1
-EBUILD libsndfile-1.0.30.ebuild 1806 BLAKE2B 6da01f634fe9fdbcd6909a5fb2b2fbc4db1d1d5e043bd9cbe49394cc0949b21fb180b276bc3487909c0f48e14d9364da946be1b0d2865fa93f9cee6a57343ebb SHA512 1dbf804a971370d8d4c160c5df5825587ad81053de5a01a1d5c86d74b5695952f06235c11dc8cd35df72ec5721db0c22800a4802f77029330e2fd07a75120062
+EBUILD libsndfile-1.0.30.ebuild 1804 BLAKE2B 94528a9c05d8390086590e8441541dfc2849ac42817f2ea51a6fa18ffaf8f08d2775be6ab03f955d6f9e63afffff07c367a0bd110522f850ae5aaeef332b2ad1 SHA512 024e0429d1ac534c3ceec5d6d9a8628a1e042a8a6ad75a987cb64f792b058a720d23e867b53954d04b8e019372332807a7d24417b9b562a510d6bd22abbcd8ad
 EBUILD libsndfile-1.0.31.ebuild 1788 BLAKE2B 2c16c7480477006e1a72e91f50e19d9c9b8fb5e6edecf4b351a8a48925f90749e1a55368a6e74b7c77a77f030e1a2dbd4431d9a8b24d17650f20378b875ab2b5 SHA512 423e5e7c5be3fcd74d4b5523394eb27bb9c2890300f330e5d8f8d05e54ec4e4a4cb706164880aaeb3a20f9408bc1d4a2f90207a3ce6334f43b59f39516841f64
 EBUILD libsndfile-9999.ebuild 1788 BLAKE2B 2c16c7480477006e1a72e91f50e19d9c9b8fb5e6edecf4b351a8a48925f90749e1a55368a6e74b7c77a77f030e1a2dbd4431d9a8b24d17650f20378b875ab2b5 SHA512 423e5e7c5be3fcd74d4b5523394eb27bb9c2890300f330e5d8f8d05e54ec4e4a4cb706164880aaeb3a20f9408bc1d4a2f90207a3ce6334f43b59f39516841f64
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libsndfile/libsndfile-1.0.30.ebuild b/media-libs/libsndfile/libsndfile-1.0.30.ebuild
index 8a1441d4e2fb..9dc9865c9e56 100644
--- a/media-libs/libsndfile/libsndfile-1.0.30.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.30.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
 
 if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
diff --git a/media-libs/libxmi/Manifest b/media-libs/libxmi/Manifest
index a81593948a98..700f403fc925 100644
--- a/media-libs/libxmi/Manifest
+++ b/media-libs/libxmi/Manifest
@@ -1,4 +1,4 @@
 DIST libxmi-1.3.tar.xz 258672 BLAKE2B 7eb50a9a7804bd37fdacd238e41241d54e9b0ee00aac9267e9d6a62a1a61338522c26df56021821fd7af74123550f99305a233dadb55a6a9514feb124fd70d32 SHA512 f54b0925e2b848f7cfb31bd0f9eed27df6fd6e704ffeeb58eb490d49e7ca76f46e03eee6ed89d6644f6a3bad05c7b0b986f9634d0cd23c49f31ee80f23ff8262
-EBUILD libxmi-1.3-r1.ebuild 704 BLAKE2B 86f014fdaf02b7d56e7a08b9ef52c61e548abf2866548df3f15c17fda3307d6b889c1918ebbe893ba78cd7cf3e804fad1e8bd30829899e690e950db74b1e379d SHA512 71695b9b679d686f46656b4fdc61088ae0d741c800b699fc0c4cb5d7b21a61a0c4476d72489438aba752861fe67d0d240b743c60b91bc7912d2f6aa5b1909902
+EBUILD libxmi-1.3-r1.ebuild 703 BLAKE2B de320e0eceb4e8e6048c068041a29d28f729ab1ef4930486ae7032dacb7b3b63e7956c2a155f589d9ffbbbaa3f0561484cecb7c43d46e070035916663039e027 SHA512 9b010f71ea7967ce494d984876729cd44286ef944df24a8b9c4739243b23d8d4ec1ffb7caf6cdb710b183d6b7d47a85062d86e350aac2310b8ab4e66449b909c
 EBUILD libxmi-1.3.ebuild 614 BLAKE2B 14b43337437614721d4ce91bf120dce2df33efef6c1fe2330a627e3a09d0e4e530959f8bda76382a94f310f77fb661994c3e0ab26d87af5389288ed6858f1293 SHA512 d95bc3984fcccf56c3135381203084d80eceafc72104aee623371ac5a82589245bd96e1d04e07417f86f1d000c64c115d7630d9be981859fa3700d3609baf0bf
 MISC metadata.xml 1174 BLAKE2B 9dae17714124bc3fbb5625b58a78353eb64aa9131e541943819b35ec6231fc1009d11bf90219fab08e34187eff0c0902d5e6a2a6ad64e586bc8e7cb464edef62 SHA512 0fc60c658a5e56b8d6d49c0251b2678c07d19e9a32ad59f08ae98120f28b412642030692f8c51bef994c14b4d01d9979f3286b22cd417c8a1b1211a27355b03a
diff --git a/media-libs/libxmi/libxmi-1.3-r1.ebuild b/media-libs/libxmi/libxmi-1.3-r1.ebuild
index 0f495eb460e0..c4fe4373feed 100644
--- a/media-libs/libxmi/libxmi-1.3-r1.ebuild
+++ b/media-libs/libxmi/libxmi-1.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 src_prepare() {
 	default
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index 8430bcf173b6..79524e6de0a3 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,5 +1,5 @@
 DIST lilv-0.24.10.tar.bz2 443795 BLAKE2B a316c0aae8f93a6104ad46e9e93cd3948b4596920a9bb7f1ab5bfe596428aa43e45413f79cd9e7c094ca3239e4811bd391015f17be5c059a54b0a050aff1e964 SHA512 1dfd4fef19537686b63a4e7df45e3b1a7c4a658acc21d5646daba4d3bd5676513857b3f437b89f1a06232516433ef155772d19625c33d49d13ada37a965982cf
 DIST lilv-0.24.12.tar.bz2 427404 BLAKE2B 47efe553c6fc249ed0cde47a47a01e0b3496ea4dfac88849b75d9720cb3a158fa1c95959ffc1a09e606f8ba3831e79382ba08ad100ee17cf19c7f1ffa186d6e2 SHA512 ea22db4e995792b62d60d793169c792549b8fb0255c2cf7a85780dd149811921e2fae5eaea0fb83465f01b14dfa66361af3be40bf7cb3733e98655b943f4faee
-EBUILD lilv-0.24.10-r1.ebuild 1794 BLAKE2B bedb0bd319674b705999cb548ffd1a17135b5fe85a40e4c953ada86466aef9a959e0bfd409fa5e05f387ae40ea1794973f20f78a6d39fccf5890f36456e546c2 SHA512 380cca73ca22954f3ed8f84d7c0e1ce35abaa063b6e463fdab792aaa90bccdb6b9862725303684cf3b425df83e143b11986efe140c158be628d42cad865f1983
-EBUILD lilv-0.24.12.ebuild 1809 BLAKE2B 8ec9d60fd8aa53bf92a1d5b85d7ef20f428f34d5da26153cc27a193e4e4bd806b9b712885d19371a3090f644a400e84ce22be8f31b4dd47aba5a91f13936b89c SHA512 405d1c211f28e2668486529ab5b85926b9ad142cb75e718fa1676341a0d5277ddb6a1bfa2e0fe0b47346b3601e222f27f7f7a343b9a47e096675b38f2edd269f
+EBUILD lilv-0.24.10-r1.ebuild 1792 BLAKE2B 7cb6e3a3c046d518152359e1561c27b7d48cf6b0c09e1b9fa5122d1d71776a18732b7e4b8751f5e2d82a3d50264d7f91a3e3a71bbc1c54ecde27501bc813b624 SHA512 7cb8e4da42e9c0a6edbe448c2b1727b6028e96dffa5dfaf64ecaab5a8c43ad5547e2c7a91de1d8c1fcfcc88eda77d3482917cddfac88801cd5ad31794ac0579b
+EBUILD lilv-0.24.12.ebuild 1807 BLAKE2B eb42f4b72bf742683f7b12cd20b62608be226c63f8aaa214e730df83b29937be76a29c23e0de18f4d9197cdeda017e4e5c38f171be9e9d40beb91c39091dea1f SHA512 d0ec5274e6b5b4e57f665a593e45501e980c6c867e53b932cb747ecb184a205271859af5ceeeddffdb090f292cf09b4dd326ef473453029a725ce592ffa0c72b
 MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/lilv-0.24.10-r1.ebuild b/media-libs/lilv/lilv-0.24.10-r1.ebuild
index 3763f8181396..d39fc0b06433 100644
--- a/media-libs/lilv/lilv-0.24.10-r1.ebuild
+++ b/media-libs/lilv/lilv-0.24.10-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-single-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
diff --git a/media-libs/lilv/lilv-0.24.12.ebuild b/media-libs/lilv/lilv-0.24.12.ebuild
index 5ff162080706..b133e70dbc24 100644
--- a/media-libs/lilv/lilv-0.24.12.ebuild
+++ b/media-libs/lilv/lilv-0.24.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-single-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
diff --git a/media-libs/lv2/Manifest b/media-libs/lv2/Manifest
index aa9ae04b01a1..3654a95c5102 100644
--- a/media-libs/lv2/Manifest
+++ b/media-libs/lv2/Manifest
@@ -1,5 +1,5 @@
 DIST lv2-1.18.0.tar.bz2 530172 BLAKE2B 2d9c7fe6e4de1d68762445061907873ff98871277fe0e423c34b0e9586cc8bfc7674787c020f3c01731204e80262a52902676f6cec8c8a6c18a97953cc626d3e SHA512 9e8dd9c1f30371260d21efc105b1d4d4ad03d9e332d4d3877d873f20b9527bcd0e917ff23fc6e0a9cc4337bda85882c742f225f7cf4fbc8a8a0964565c91f9d9
 DIST lv2-1.18.2.tar.bz2 538345 BLAKE2B 824c7bc2ce62de858308d856d0f89c6285c183764be3727eba5074f42543a1bb8a5e1cdd8a85bf0a4ba1103e1243c843013bd516d2d6e7ade09c46380bca3cee SHA512 d5bdcf94d3cf9a569e29964002a038ae73cd6ae7f09f7d973f8fd74858c8cf9d01bbed85ae8bf0a00efcb2b3611357a64571222a89972091941449c36d76b0ef
-EBUILD lv2-1.18.0.ebuild 1366 BLAKE2B 2913c6e04ab202c62205851d54436b6f1f9394430749d98435333a9bc778e196b03aee4b337736b6cd4858dd07855d8de7367ad5db0fadff51b395c6817dfa25 SHA512 466a8b7937b4e43533784f03b4f919813d953f84be15b52783e3aeedd4d4d74247c7d5b190b055a50ea899a4be31ba93e0ea41c8201a3d10e1249ed65123c1a5
-EBUILD lv2-1.18.2.ebuild 1372 BLAKE2B bc66c5a7fb9bdef84cdc7c87a48f68835cf1f6d151f9ea034d93a962e0de1b65aea72ad47b37b5f5398d54773b67c46ac7e40faf1d1d1450f491a8169bb1cbb5 SHA512 6eba725e4f93ab395c44edf0e9f6e47c37405bf05524a8df9b2dad9053370ee4466bb561945ff4f429ee949e2bca6cf366222d82120b78aa90b061e301680563
+EBUILD lv2-1.18.0.ebuild 1364 BLAKE2B 257076159121287c575f5366b5473df431f941366ccefa8057127c903a4b4b299a932f4046ff54c0f2eed92330a45831d04288a800a8454857f96758cfa2ecf8 SHA512 dbcaa0e94b0b8533ed5efc73c37139262ce46c5bec88427fbe4fe5b7155a5cbeb7a7f0561fb188b7c8a12c4d39f57190acf6c9122e767c4d6dcd5bfa6c84ac10
+EBUILD lv2-1.18.2.ebuild 1370 BLAKE2B bdc9ead907338c571718831c7f880fe84f015d3fb67c2f6bfcad1c8177a56f64bb1a2d6e0dbb7cded2c7ee7e8cfa0f14bf913672bda86979ba4226e76192c30b SHA512 be79588c88bb1f27c8095caf1f2560325dbd7c5a840128d0c43cb50562744c403185a13990b7c9b4e68aacd6e7561a75c26e9bd05819633c2f2d912dc08b2d83
 MISC metadata.xml 340 BLAKE2B e8469f758a451316b9d89c286f2d47c82b62d57ff9d43a6f2f93da8cf0abb5579fa8e568d8e6422e5d144a368310ccdec6e89ce2672f53b9db149bbf838afa68 SHA512 a31345dfd0bb1ac92461cd26ffcd20197775288be0ee4a2d660e90b8655f5288166c9613ba42ef3eef6dff6c97d268ffc85af3429eb093ffb29ad9581a5fa33d
diff --git a/media-libs/lv2/lv2-1.18.0.ebuild b/media-libs/lv2/lv2-1.18.0.ebuild
index bde6301c8816..8f6e3688728a 100644
--- a/media-libs/lv2/lv2-1.18.0.ebuild
+++ b/media-libs/lv2/lv2-1.18.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-single-r1 waf-utils multilib-build multilib-minimal
diff --git a/media-libs/lv2/lv2-1.18.2.ebuild b/media-libs/lv2/lv2-1.18.2.ebuild
index 27b679b1caf8..b18357182717 100644
--- a/media-libs/lv2/lv2-1.18.2.ebuild
+++ b/media-libs/lv2/lv2-1.18.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-single-r1 waf-utils multilib-build multilib-minimal
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index b65a1befdf2e..85a255302d89 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,10 @@
 DIST mesa-20.2.6.tar.xz 13886924 BLAKE2B 2bc5d680979b58a77105a8058da5dfea81afe05166a44d08cf243e5760b8c66e418fd78046a2c88243f56aa85a610d052f3aaf259938668cd0f4a184e9edca46 SHA512 347b275d88c0d14cacef570ed736cac07f2e607bc4c89a16b915ec01ac57dbbe698ddf9a0ad70f034e00318403351e3c728e74c72c653acf1fc99720887fa888
 DIST mesa-20.3.3.tar.xz 14222700 BLAKE2B 02996b9f784f4c4a4502f8d5a1ef9763799b36206cfbfb56aeeb84837a119457fcfdd2d2efc3bf87fe945bd4dd4747b77fe9af51b290311b86e850fa4d6ac8c6 SHA512 77735462f4ccbe865d0cf7e9db47c42f8bc2600b9a030dca11066d29e43f73c18ca0422e6356129fc14ac1b1018ed752ae4ee45bd31ae706fea58f573a14d346
+DIST mesa-20.3.4.tar.xz 14253372 BLAKE2B 210908f5b802b9fd0170a6f06310f39bab4aa0ca1c84914d702863f9df4d47f1720f0d3779ae804d2eef322a09f4b6cc40855efd7dc365cd84dd8f222b217998 SHA512 81c4d032213b4aef842f1594e0e89bc0045f7ca7ce5f267b62a0f8236eb12ab09c1f780d8b3776b3072f37cd0bd8829f8a1330a749ccf462471b262ef8097477
 DIST mesa-21.0.0-rc3.tar.xz 14488732 BLAKE2B f459fde39b7a1a62166b1d58df309e6295c489eef1324649478a6e21139317068b7cc5fb9ab6d54a31bbfc8c696df81ebc9531e14c40020380f342dc5948036d SHA512 b51495e8ef3a4a2f1b98ad3c4f5037c21b4b7df375138bcc02b24cb4b7ffd7b807d76ac0853d0ecc81c09ceca2a97e5c402352700f297ed7f4369f98d03a0810
-EBUILD mesa-20.2.6.ebuild 14764 BLAKE2B 187917aac61caae964d85c3e08eb5debf34eedbf1c6e4e79861d74aa6f502ec2f8dde0da3e14e5c5dfded7932b233367a040871d3f3ecc1bb97b4da74cbf133c SHA512 14684402b21bddab714c36a42ffa031d4458bd7f5dc81d249bda462ce52164f24018983e08a782b0366b6539aae4522dc7e0fa6319318f6e2c41d0b941cd1568
-EBUILD mesa-20.3.3.ebuild 14854 BLAKE2B 4b713819cabfcd0330abe0fd764019b63f28bb7bfbb4ca39742a45ca1994a1a4b242308e5b647ecf2bca14e1de4d9ade3509c8360cc87a9a5279049b5dcd2be4 SHA512 f1f50fc292884e7f0ff4ddbc0cb6d40a1c16a931302860d907afb5401e9cbb666d246cf21a52ef37eb871bd29cf974481d55f7bc124a74fa5163809fc92a625f
-EBUILD mesa-21.0.0_rc3.ebuild 14765 BLAKE2B 02a524a32414e9e2221ac2d4480f0c9eafd5b8eac1e30712f908945db7c5103935f52ad8cd8521ad6917bebaf5ba0c608f5d17a89205cb47e0f841748259fec6 SHA512 2c5c36b5919cb8865e2ff830e302acc065849e690d2545e3e3440862df715d0b662fc2ff02111eee672e64907b4e9d385fb2acd2e155f18349746cacbc7a2241
-EBUILD mesa-9999.ebuild 14765 BLAKE2B 02a524a32414e9e2221ac2d4480f0c9eafd5b8eac1e30712f908945db7c5103935f52ad8cd8521ad6917bebaf5ba0c608f5d17a89205cb47e0f841748259fec6 SHA512 2c5c36b5919cb8865e2ff830e302acc065849e690d2545e3e3440862df715d0b662fc2ff02111eee672e64907b4e9d385fb2acd2e155f18349746cacbc7a2241
+EBUILD mesa-20.2.6.ebuild 14762 BLAKE2B 10df82dc80592a5735ed4137a3db8e57acd8cb53a32649fd8b7854a845fd90cb6804e3e43bd52a1d7ce60a7446577a4e45c4ad4fbf16d08518007a2bb51e3ed7 SHA512 ab2f3fb312e255a93928795b94bf641060cad1bae388c8526cdd38eab0699f7be8f6779901d04aec1e14ac7482126b4bddd88337d6b618d056e39bb667072f38
+EBUILD mesa-20.3.3.ebuild 14852 BLAKE2B 3981ee9b591e5a84e59a0acf9b694c59b2932453153ae587892644803a06ce1dffd83fbf58ea1206fb06190a65c1dd06c9915aa4d0292aa9b58e28c4e42d2a76 SHA512 c613b37f8f40875f28b927ac382c3f3337cecee316c5e0f41c048b5b786a060eb03a394148f827fa4a82e580953a32d5116465b0bde09291644b22135a784b55
+EBUILD mesa-20.3.4.ebuild 14852 BLAKE2B 3981ee9b591e5a84e59a0acf9b694c59b2932453153ae587892644803a06ce1dffd83fbf58ea1206fb06190a65c1dd06c9915aa4d0292aa9b58e28c4e42d2a76 SHA512 c613b37f8f40875f28b927ac382c3f3337cecee316c5e0f41c048b5b786a060eb03a394148f827fa4a82e580953a32d5116465b0bde09291644b22135a784b55
+EBUILD mesa-21.0.0_rc3.ebuild 14763 BLAKE2B ce477c142ffc33ed0728a81c21ee19492172449fba48d6fb3d75d2c5bc6a001dc5475de75d462b8115f28e0a11b5726170fea49021444f76522d896df830b5cf SHA512 2c59cbd8e935b7762251d7cca0e641bffe591ffaf238d6ca3b961193c36d1c8a1bb696e31f69233aa3a5824b20b0be12a0bf3bf035a4993cf66bf77d6af0a314
+EBUILD mesa-9999.ebuild 14763 BLAKE2B ce477c142ffc33ed0728a81c21ee19492172449fba48d6fb3d75d2c5bc6a001dc5475de75d462b8115f28e0a11b5726170fea49021444f76522d896df830b5cf SHA512 2c59cbd8e935b7762251d7cca0e641bffe591ffaf238d6ca3b961193c36d1c8a1bb696e31f69233aa3a5824b20b0be12a0bf3bf035a4993cf66bf77d6af0a314
 MISC metadata.xml 1895 BLAKE2B abf62dda9b9eba657e310c68fdd86aaa49c550dc34ef624e8feb038e0412f0da786e1120dc16631399cb2c83961b88e78571347c3e6d464c2cf3a343bc0f1483 SHA512 7758641386100e07c1112afe04a8613de8ae1e35a8e940f0eefcfc7daa829789c42b903320339b04b44c2400f0857c180740407abd171e9773a9f51e3dd9468a
diff --git a/media-libs/mesa/mesa-20.2.6.ebuild b/media-libs/mesa/mesa-20.2.6.ebuild
index a9abb722e3fc..16ba0eb17bea 100644
--- a/media-libs/mesa/mesa-20.2.6.ebuild
+++ b/media-libs/mesa/mesa-20.2.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit llvm meson multilib-minimal python-any-r1 linux-info
 
diff --git a/media-libs/mesa/mesa-20.3.3.ebuild b/media-libs/mesa/mesa-20.3.3.ebuild
index 3a23ce15ad2c..551fcd5d326d 100644
--- a/media-libs/mesa/mesa-20.3.3.ebuild
+++ b/media-libs/mesa/mesa-20.3.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit llvm meson multilib-minimal python-any-r1 linux-info
 
diff --git a/media-libs/mesa/mesa-20.3.4.ebuild b/media-libs/mesa/mesa-20.3.4.ebuild
new file mode 100644
index 000000000000..551fcd5d326d
--- /dev/null
+++ b/media-libs/mesa/mesa-20.3.4.ebuild
@@ -0,0 +1,558 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit llvm meson multilib-minimal python-any-r1 linux-info
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm
+	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa xvmc zink +zstd"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_lima?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_panfrost? ( gallium )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_v3d? ( gallium )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+	xa? ( X )
+	xvmc? ( X )
+	zink? ( gallium vulkan )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
+RDEPEND="
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					>=virtual/opencl-3[${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	)
+	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="11"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:11[${MULTILIB_USEDEP}]
+		sys-devel/llvm:10[${MULTILIB_USEDEP}]
+		sys-devel/llvm:9[${MULTILIB_USEDEP}]
+	)
+	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	gallium? (
+		llvm? (
+			opencl? (
+				video_cards_r600? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${CLANG_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${CLANG_DEPSTR}
+						)
+					)
+				)
+			)
+			!opencl? (
+				video_cards_r600? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${LLVM_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${LLVM_DEPSTR}
+						)
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib*/libglapi.so.0.0.0
+	usr/lib*/libGLESv1_CM.so.1.1.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+	usr/lib/libGLX_mesa.so.0.0.0
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_i965 &&
+		   ! use video_cards_iris &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_v3d; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, radeonsi, or v3d"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use video_cards_i965 ||
+	   use video_cards_iris ||
+	   use video_cards_radeonsi; then
+		CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		linux-info_pkg_setup
+	fi
+
+	if use gallium && use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	emesonargs+=(-Dplatforms=${platforms#,})
+
+	if use X || use egl; then
+		emesonargs+=(-Dglvnd=true)
+	else
+		emesonargs+=(-Dglvnd=false)
+	fi
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_feature llvm)
+			$(meson_feature lm-sensors lmsensors)
+			$(meson_feature unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=disabled)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=disabled)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_feature xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=disabled)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=disabled)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_lima ||
+		   use video_cards_panfrost ||
+		   use video_cards_v3d ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable video_cards_lima lima
+		gallium_enable video_cards_panfrost panfrost
+		gallium_enable video_cards_v3d v3d
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable zink zink
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+		vulkan_enable video_cards_v3d broadcom
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=enabled
+		$(meson_feature dri3)
+		$(meson_feature egl)
+		$(meson_feature gbm)
+		$(meson_feature gles1)
+		$(meson_feature gles2)
+		$(meson_use selinux)
+		$(meson_feature zstd)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		$(meson_use vulkan vulkan-device-select-layer)
+		$(meson_use vulkan-overlay vulkan-overlay-layer)
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson_src_test -t 100
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-21.0.0_rc3.ebuild b/media-libs/mesa/mesa-21.0.0_rc3.ebuild
index 47d4972b3e94..c004f76fad6a 100644
--- a/media-libs/mesa/mesa-21.0.0_rc3.ebuild
+++ b/media-libs/mesa/mesa-21.0.0_rc3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit llvm meson multilib-minimal python-any-r1 linux-info
 
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 47d4972b3e94..c004f76fad6a 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit llvm meson multilib-minimal python-any-r1 linux-info
 
diff --git a/media-libs/munt-mt32emu/Manifest b/media-libs/munt-mt32emu/Manifest
index d223d67dab55..456472fb83ca 100644
--- a/media-libs/munt-mt32emu/Manifest
+++ b/media-libs/munt-mt32emu/Manifest
@@ -1,4 +1,7 @@
 AUX docs.patch 810 BLAKE2B 941da013c47dd7b51ceb18be748b21edaec86157afa43fbaeab2310229302b3fb7ca2cbf058fc104ce9d9135089084aa2b009706618c81e8c4cae48a601fafde SHA512 99a2707a7eb94579de27a8f0351641d22dd963257edc58ae5d01f8d79722827f25677e6d7ca0b4d24ffbf71281df5cac428a8c0ddde8f42925995f5451d326bf
+AUX munt-mt32emu-2.4.2-docs.patch 518 BLAKE2B 15ed5513d3ef11dbfdd9304a1295d82b3e54f223dcf448285392c9cdc24635c5823a8b5ad4b0954908627ba2ebd450e2f849a9cd725fd78b70e578d0a3d68c43 SHA512 2a1ba4731a13c2f54d5eccad6971b0544b75787df922d31ab2ae68471f078e0585d2c386f09461b89db38fa2bf57b2e402ad98c07f6d5773fbd93856d1c27d6d
+DIST libmt32emu_2_4_2.tar.gz 458962 BLAKE2B 43bd794fbb8e6483f4dd8384f375af3145f0297e974e7bc374764c40d90f0af971622004e052dff2e4235931d08e5ba3c154a45ad0f344c26811f92dc7a6d699 SHA512 6e567260bce4a7ba7f4696d08fde78a05402d8b3087d7720bf86cdbe8c6c392036ce4a5c0ec5951c547d2a98218145fa155d4730404e98ad2dcc573d3cca8da4
 DIST munt_2_3_0.tar.gz 418703 BLAKE2B d9c4290f11f4114b26aa45d6591c04a73d56981e7f618c1466db81fd35be3588b2853fb60b9cf65dd523ce8ea120a5a187bd805b58ba2f75719d460929c2e4e1 SHA512 87fe4891628ea33967270fe3c6c3840e40deb14bd7c8d61490d4c0057438af6bc0099c10e24e813ef1613ca9cc9fc1567a0340c7ea1f4254b209f7fc99c8c7a1
 EBUILD munt-mt32emu-2.3.0.ebuild 592 BLAKE2B 124ac1da68cbe70f86a61c9de2f1cc50fc9bb0ccdd0387b85e5dff56a344bf2a9ce551314d6046964ce05d1b7f846e90e40dcc02a6869e8ec15fab3d8530c502 SHA512 ff901148241e2ac1358146798ec08d7f0251a048c0970a88064dbe3e8abcd17a6704ba618662a4efacce9afb25640c46df8eb449e61bfc941f63ca3ae1b16d2e
+EBUILD munt-mt32emu-2.4.2.ebuild 588 BLAKE2B 92e1eba74b079a4e5f4d22d561a5db31bb42e959d81293c7b194c3968e79f16983430a207036b5e35e75128327398eddf12455d47506529e4ac144a347b888d9 SHA512 fa1d01b48107ae52a913d2da2f587c2161bea7c28d311dfee9ab10045532b4e84170c74204570cf0426987e3659f662c38e045fe2644ea2330b63fc4beab3f57
 MISC metadata.xml 620 BLAKE2B be9835ba92d5c8d4cf03c2a716886e422e2539ae773a8e281f4e804192caae29c185e8bac79a5b3a0ca9f7e639f9c5aa099c1ee8f496e1a508b096d4216bc1a9 SHA512 80cde499938128dc44148fdce298a26a49a8cd2660508cd5c6b0e5a9ed8c07eb9d067561d96f8fa94798edff7aa439d9d9269b9ee19a2f83759f574e08e192b3
diff --git a/media-libs/munt-mt32emu/files/munt-mt32emu-2.4.2-docs.patch b/media-libs/munt-mt32emu/files/munt-mt32emu-2.4.2-docs.patch
new file mode 100644
index 000000000000..df84d643762a
--- /dev/null
+++ b/media-libs/munt-mt32emu/files/munt-mt32emu-2.4.2-docs.patch
@@ -0,0 +1,14 @@
+diff --color -Naur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2021-01-17 13:16:00.000000000 +0000
++++ b/CMakeLists.txt	2021-01-30 22:56:28.027134357 +0000
+@@ -261,8 +261,8 @@
+ 
+ if(libmt32emu_PACKAGE_TYPE STREQUAL "Runtime" OR NOT libmt32emu_PACKAGE_TYPE STREQUAL "Devel")
+   install(FILES
+-    AUTHORS.txt COPYING.txt COPYING.LESSER.txt NEWS.txt README.md TODO.txt
+-    DESTINATION share/doc/munt/libmt32emu
++    AUTHORS.txt NEWS.txt README.md TODO.txt
++    DESTINATION share/doc/$ENV{PF}
+   )
+ endif()
+ 
diff --git a/media-libs/munt-mt32emu/munt-mt32emu-2.4.2.ebuild b/media-libs/munt-mt32emu/munt-mt32emu-2.4.2.ebuild
new file mode 100644
index 000000000000..93254801331a
--- /dev/null
+++ b/media-libs/munt-mt32emu/munt-mt32emu-2.4.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_P="libmt32emu_${PV//./_}"
+DESCRIPTION="Library for emulating the Roland MT-32, CM-32L, CM-64 and LAPC-I"
+HOMEPAGE="https://github.com/munt/munt"
+SRC_URI="https://github.com/munt/munt/archive/${MY_P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/munt-${MY_P}/mt32emu"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-docs.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/mutagen/Manifest b/media-libs/mutagen/Manifest
index 45832e704371..9135b89c052a 100644
--- a/media-libs/mutagen/Manifest
+++ b/media-libs/mutagen/Manifest
@@ -1,3 +1,3 @@
 DIST mutagen-1.45.1.tar.gz 1285455 BLAKE2B a1e29698d96b4c98f16e18dd8b3f902e41dcc4409d01da861a726a6a9fbd7f116e07b4e1872b8b3857f0eec080d18bac736de741635746f5c71416a3a8ef6e78 SHA512 c5244efa01b9de5ec22ceca39e55f34b933ca4a5bec0f2088fd3adca657f0230cbe85cd5e156db1d90fb44d9339bc94dc3bdcd3e49f1b0d46bc3d71ece6b45d8
-EBUILD mutagen-1.45.1.ebuild 1131 BLAKE2B 9524e21df5286697d1649c8b57590fa1817aea3c859fb1ed90e95903b03b983164fbf0152ae17669a866b0261d171c4861c048b7da3290b89e91840ce7db7a90 SHA512 bb07aa47ea85d76be1315a46be0a46e8aa0598881b1137d10714f2f0720d8dfc782d0f8b7ec8f55d06bc5972390fbc0878a1e0c49b3cdfe005944bd161337713
+EBUILD mutagen-1.45.1.ebuild 1129 BLAKE2B bcf3eeb51a0ffcb317e24ed18e52135de527d0f12f1361764e841d1ad96c60bf6fa332f5ed0e75553fd2c7026f63ada443fcc893d2fc58b46b634390ea22bf37 SHA512 8a4397ad2fdf912d22d50104232a76382c67625dfba985b48a6106fec620e69ae274832ada15d8c7f14dd8c8e1ed95cd8626d316b9220fafbf3dbcc8ebdb8d93
 MISC metadata.xml 380 BLAKE2B 9fd70ca6ca6e8d17b66ea703f65885b87714ed0560ffe7502d85da3ee8fdf1d62545c1166b64d99f2bd2bfa6105f8f8865bc28769069c1ae3da4b1c3c174fd69 SHA512 87ce1f85bd6aff7c159fd22a412eb9ea95ac4f58fb2cc70fd4c4f470bfe9f6366b906bc9cef833ae5c10b7a3601c15edab9e8418cf78d7d9e993191873f41d59
diff --git a/media-libs/mutagen/mutagen-1.45.1.ebuild b/media-libs/mutagen/mutagen-1.45.1.ebuild
index 73e064946280..2f34aa453892 100644
--- a/media-libs/mutagen/mutagen-1.45.1.ebuild
+++ b/media-libs/mutagen/mutagen-1.45.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 8a310655a635..8a8a26c54202 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -6,5 +6,5 @@ AUX opencolorio-1.1.0-yaml-cpp-0.6.patch 2315 BLAKE2B eaaa69e7bd76a1c40ad823eb1b
 AUX opencolorio-1.1.1-fix-self-assign-clang.patch 493 BLAKE2B fbe85fc4385556deacd173ab44f5a5cbe32c2cd5b4541f1aaf20037840d5d8c7a61d5c314176cde7d0f08c80b6436b0b937c9fef10c3841948b6881601073df5 SHA512 8132a8352a36994550dd089a4858e11459fcbe0495bd07b6bc599a4b8bb7191da8ca6ae061cd1c04f52f586ac993e3656e8c03c6665f7160fa50b4a117f0cb22
 AUX opencolorio-1.1.1-yaml-cpp-boost-check.patch 1891 BLAKE2B 01331aeef0cde9cf4420f13dc1a2ec2bddf46e519e736a6fb653792074b412ab5d6cca364e4e4619b7b868891eee0786bc0c75df748eb8ac724410e61aa6c52a SHA512 4ddb466a56a27db82f5b83dbb96e42f6b6cf0749168459dd32e922345d6011f09961592f7d5611253cbad5d78952d52f1cdabfed011b4c376faafc0becc7422b
 DIST opencolorio-1.1.1.tar.gz 13828483 BLAKE2B f5642f08db84f2b8da44d0dbf58313c78263496fc6f1f209b93fd303bbf9477033317b44eb8bb2b13a70afa19422f4fa312d52a3fa6598031a2aa50b33bbfccf SHA512 bed722f9ddce1887d28aacef2882debccd7c3f3c0c708d2723fea58a097de9f02721af9e85453e089ffda5406aef593ab6536c6886307823c132aa787e492e33
-EBUILD opencolorio-1.1.1.ebuild 2405 BLAKE2B 5b0eff3645458b7ef4962525ec5e1d5643cb82172cc84f6d5c4cbf53c32d9c0da8e0f8e573d715a2cd634cf704fea026d68283576b2d5c28da08b95fc2e02b81 SHA512 ab8aecdea51f007e59ba6cb4c4d81f236a00fe7899872710ba7eb505048c01d13bfef3a124a2ad646ce4a5d85f05bcfe7a36ba56f6817b66cb73c0bce88f06c8
+EBUILD opencolorio-1.1.1.ebuild 2403 BLAKE2B 422036f0f6322470c963bccc4ed64262def86450500ae29cd207833ac127da7c3b8d325ea66c0a2829c777d43de9ad886f60508c04defcd092ae79c4aaa5f592 SHA512 47d2f442d82e322b4465368fa512bc0867c9391bed6312958f0b4fafe79cb9ef11cb7a242953260aedb8362696858e4ba83359292c1822fab685fd0f808ccb8b
 MISC metadata.xml 459 BLAKE2B bc35128a9a20ab016e973d569c001276541d90d4a1872e6cf27877847d8b7e66c28439afcc220dc9bbf31aeae64a14e6f31b8a3683bc0fdee88d4b03781fc537 SHA512 2dda915dd0266e50dc8308eeef37e84287f9caa9d34c4027fe15793f788d1dc354e79e3f46514f15dfd89c40da40da0424af6fec22bce07b638add76ef61b5c9
diff --git a/media-libs/opencolorio/opencolorio-1.1.1.ebuild b/media-libs/opencolorio/opencolorio-1.1.1.ebuild
index 3808ce8a9b1c..15395d8dca9b 100644
--- a/media-libs/opencolorio/opencolorio-1.1.1.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit cmake flag-o-matic python-single-r1
 
diff --git a/media-libs/opencore-amr/Manifest b/media-libs/opencore-amr/Manifest
index 73f69e492cf5..1cd121102346 100644
--- a/media-libs/opencore-amr/Manifest
+++ b/media-libs/opencore-amr/Manifest
@@ -1,5 +1,5 @@
 DIST opencore-amr-0.1.3.tar.gz 881105 BLAKE2B e9e1d40b90aa819d1b4fce328ae8ff199c7656f3326199c005e8f0a47e4e3282ae02f93826e923c5128c4ec4cebc3f35b6f5ca9f3f49c7dd15d541fb77383d28 SHA512 f67e84604fe3fbb87d608343e595503e2057272fa0b3bf9158a176e88a96d272c35149483c3ee47ba2b064bd6b17cdb315888a5285aa82edc0401f17d2ae761b
 DIST opencore-amr-0.1.5.tar.gz 929581 BLAKE2B 4943a27f0df3d874720c87f48c523d9aa4cce849dd0a3c9183466416a0629aa02dac8f01646e469e8c45438bf3c57047eb11e69f3f1b261449a0989a36639e59 SHA512 c324db9dcac5a31bfac633153bc054bfe42d5ff98202c4adb3c75a3fae9792f07f60d48cd659acf106dacd307174a62b2aeee22a4af53caa20d2bfba46488faf
 EBUILD opencore-amr-0.1.3-r1.ebuild 526 BLAKE2B 3d06bda1b612ac43dd04ef723c46ce15a8237dbecc901b170b2446cfb4448a697ee5881818b1b6b21f628c4f088ba6f7e79f98cb9671df7b27102fc2aa4f7696 SHA512 33d1cd7e49e92b536bf9b0a1fdc35c2aaad733d2342af0a675b96ef25896a32231250343378b30be4e9ddda010f163f312eb722344b75635462be23117a3232f
-EBUILD opencore-amr-0.1.5-r1.ebuild 629 BLAKE2B cdf5fcf6ad8704a82a8836a4a850ab082897d7883b91634dcd8b307fbc6cf63bb3b0050140098483a51175acffdbbe9b68b2ee0e9bb472cb517ddac540342b43 SHA512 a1405cc9a180d457c1717689568e25a3f2774bb748b444c0e52c170523c6f59395ee5d1aef100faba9e9282187b9e5b38ca462ad8aa10a1905cc0f6b090a0c1a
+EBUILD opencore-amr-0.1.5-r1.ebuild 628 BLAKE2B dea01ef2f7f5ed940b2f8de00960e46dffa45a10527f4dd22eb51e6f1c2e2193dabca84e8549e25fc3e2e8b1f01733f46396c583efabcd4e2ea610afcdf6b3fa SHA512 c93f369e4f35f18aae0f68969f001039c9b41ad8efc573ab257144565bf97a7b3d9ff4f0861b2e86cd74799386a35804b92a78ff89dff568ebecf2f376a7fdc8
 MISC metadata.xml 335 BLAKE2B 62ac5499e6bf0ca4ebb5cef78982a734cbc068fad39764b545089233f2c611937c4d8cddfa7f042705c7f7849a44f1e971431667eae02e7622d45f5b5ccdfb14 SHA512 25f894f204476ffe7bf81e7e81b16f569b34ac57572cba903bf447a53699f0e4cf5448fa27689b4baf60753e7f605f47c4a7d60f19616446b0c1f871d9b866e3
diff --git a/media-libs/opencore-amr/opencore-amr-0.1.5-r1.ebuild b/media-libs/opencore-amr/opencore-amr-0.1.5-r1.ebuild
index 425e4b64b2cf..6a392d10cd7f 100644
--- a/media-libs/opencore-amr/opencore-amr-0.1.5-r1.ebuild
+++ b/media-libs/opencore-amr/opencore-amr-0.1.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~ppc-macos ~x64-macos"
 
 multilib_src_configure() {
 	ECONF_SOURCE=${S} econf --disable-static
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 3b8492226e88..c342a0a58ce5 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -15,7 +15,7 @@ DIST opencv-4.5.0_contrib.tar.gz 60115063 BLAKE2B 4068905c9f5f308f30f15ad383ae45
 DIST opencv-4.5.1.tar.gz 88245766 BLAKE2B 219403844b459fcce012b942920a7a8264fb85dbf01e694528383a74c667f293e4da6ab87d2a4abf8d062c70445f29d86ad07aa3fb23a0fecb491c9f53d05148 SHA512 d74ae3bc340639cbc8b5db41a1fec710acabf8ec828dd28ce3bacf7029d1afd23aeaf47a2273a42995de285daa8aef33a7f90d5c57ef096e2cb872e0845e92b0
 DIST opencv-4.5.1_contrib.tar.gz 60602431 BLAKE2B 629e820e74147f442f8264c610228892e88c1e84575fb4efa612c8568df40a2e533f90ed2727ba7416e2ff08d9a655400b326841bf090fec79cd31f39334966e SHA512 1ebb9fec53b74039ffa2dc9f00899ab83af615f01156c0454ea7c53161256b6c9fd4548387fbfd197182c2d03db4de8c7170e2877b4648ce92531f821e81fdd7
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
-EBUILD opencv-4.1.2-r3.ebuild 18316 BLAKE2B 8775108cacc4c8f89fec915f73a4ba2c3908cf69c3e9c6d59c14dde2239c597845c04b5875591bef753ef6076e0009eb0630b95b0024660ac8d5ea773749eef2 SHA512 ed1cc7ba12fff122c700c5d88a2055677db459d0547a1eb465313a0b1db4efa75663618607facc1d33c97c9dd02a517d09bd627140082374851c97a9bec1a38c
-EBUILD opencv-4.5.0.ebuild 20529 BLAKE2B 67363a3f10feeeacf0b24156257acb65004939c15b700381df5729f275450c3d440cda7779f9db1a5cab676308b2e26177391c08f74a71ef655fba5dbbf14cf0 SHA512 04cc308127b2c80996e651028ed8ddb015a44c3b05dfc3515b146292542e604e5267b2a6bb30e4a8f4d66ff59725baf80b9dde1142114d6a499a2937fea27c82
-EBUILD opencv-4.5.1.ebuild 20619 BLAKE2B 37816ee00830521386c22dde3976ae18b0a02f50e07173fe959930cccb8743532503eb05e76c2a059faa05380d1420465320b5fadc641bb7b3c94191352e7d04 SHA512 a7e85cc1d0720e893a16c477b82e8ef0856c7e07d1bf1c35d642e920c764a7bc4493e24e693c3ee195d5307a9b5208868116bbad0b9905c254b5a1dd0456af46
+EBUILD opencv-4.1.2-r3.ebuild 18312 BLAKE2B 39fb4c39c4635128d31dcd5954136316eddbeb442c7331818a12d8cbe1615df0f0c2413be84ae32eb4e24b07a87fcfc7664c490b3b70049ae26fdc63d77bb268 SHA512 7d33490fefc27f8a565e714f686635902a4dcb2b99072da88c58e1ebb9d39e76b328345e035d2171b5a21ceeed7e3fafe81911273a0b090aaa7a3a6020d1bea6
+EBUILD opencv-4.5.0.ebuild 20527 BLAKE2B c6ce61375151a3da02722d8fbf8556239bc894cfe0a72ce1f8bfd7eddec85599bfe3c170ed79e45a418747e1c0a0a000725ca48fc198c41278515027b91fe894 SHA512 02cc7342c1045fb8ec6e92a50d64dc616a471634d9fe09ea9914ac96cfb065614c81dfef5187dd8390d25feb62d99949fcbd196fa14fc878520ae0edc1472ee9
+EBUILD opencv-4.5.1.ebuild 20617 BLAKE2B 77d0a272fa41a6d9154971c68be0103e526a610bdb3dc7a849c573a4659aa0339f7eee19841676a832c1b453016f860d7da6c1a51554a42f7bd74c9e44bfbc42 SHA512 8bf9b7106766ecb826658aa40df6cb39afe324ac4e0bec80d85f46a15f14986ff6d24d463062b69f5f65d2d4bf17f43ec84266074c23a43682cf06da2e01a838
 MISC metadata.xml 3185 BLAKE2B 107d18573676738a6ca8bec19250a4fdc2f839fb183757c19d042effe46825326346cf9090c86bc4e382bfefd05c81735886ad15b91539b1fca7896deb22a8de SHA512 51cf777192755265ed3d5fb4e7a83ba3c5e36c6e40165b770cba1a6b91183bd9e59360cd0130a2e159534c6fed90d8270787c5d204a6066e84d7a1b93e3e4f14
diff --git a/media-libs/opencv/opencv-4.1.2-r3.ebuild b/media-libs/opencv/opencv-4.1.2-r3.ebuild
index 0f86abb64113..de4bb53e8daf 100644
--- a/media-libs/opencv/opencv-4.1.2-r3.ebuild
+++ b/media-libs/opencv/opencv-4.1.2-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
 
 inherit java-pkg-opt-2 java-ant-2 python-r1 toolchain-funcs cmake-multilib
 
diff --git a/media-libs/opencv/opencv-4.5.0.ebuild b/media-libs/opencv/opencv-4.5.0.ebuild
index c9bf0e907840..fa89f6dd8626 100644
--- a/media-libs/opencv/opencv-4.5.0.ebuild
+++ b/media-libs/opencv/opencv-4.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 CMAKE_ECLASS=cmake
 inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
 
diff --git a/media-libs/opencv/opencv-4.5.1.ebuild b/media-libs/opencv/opencv-4.5.1.ebuild
index 311c9925d594..3804ebcf9ae9 100644
--- a/media-libs/opencv/opencv-4.5.1.ebuild
+++ b/media-libs/opencv/opencv-4.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 CMAKE_ECLASS=cmake
 inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
 
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index e343403e224d..5a4970a352ac 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -2,8 +2,8 @@ DIST openimageio-2.2.10.0.tar.gz 29215970 BLAKE2B e35e1bf19dce23c9b1067ace21c287
 DIST openimageio-2.2.10.1.tar.gz 29215445 BLAKE2B ac45bcbd89f023aac7ae063ebbcf9d26375af2d370d18569cd0b4571640d446ceb639b871c107c6727aa92ad05ebea662bc8c34231bfd99a1c18215920ad3089 SHA512 6178a0c7acd870e22bffc8749282f0d1bd7475602bc63dd022b859a9ba3862b9925685a2765ea3604ba9c1ec4c0d8c3961a789862f82077ff261a7ae4e1d166a
 DIST openimageio-2.2.8.0.tar.gz 29201949 BLAKE2B b77e42dddfaa6a8dff174b89e43c7de158efcae0e851037a97f1f46127f5cda458bdc7b64172c1fe64236d5ace351c9a432c2e857467c7f83b59dc9f6670fbeb SHA512 7bb94832734b4354d961003ec7f85fa30e4a69d7f825c5668a0230d857f8c137dd522730ec5089db012f0d843fc67368c731458a3d6de9ae41dabfb4cc30592e
 DIST openimageio-2.2.9.0.tar.gz 29216767 BLAKE2B 92c17de4687d3d7390602a02dedc5afc1258018cef98e671977fb706c3fe1e80c30416fff89ff1b9936f0f1426eab0136e130efb4a41d7378d3f1eb77eab193a SHA512 d03500c5a9f4f1417c5629098254d1bbf032a17228898e5f087e4a5d0988f806537d3ab538366e64c51172568c3688389ab29b641fdaaf7208bf939cb859e06d
-EBUILD openimageio-2.2.10.0.ebuild 3688 BLAKE2B c48e5f1bee4467e12aa797f0221060c19f1c79c43d9bfa5e5f3f24f512241bf5651f786e7295e34239ad633b33aa4a3e452b5fe0caa179bb473e8c873cf2ef99 SHA512 40cb69969f923a3ee5d04c93720d5220b3ac1d6e3bc676f77d8ac56ca3d6c314693257d71325a68970eb45e61e9426958e85ce9600cd8b590197fe9f193e296b
-EBUILD openimageio-2.2.10.1.ebuild 3688 BLAKE2B c48e5f1bee4467e12aa797f0221060c19f1c79c43d9bfa5e5f3f24f512241bf5651f786e7295e34239ad633b33aa4a3e452b5fe0caa179bb473e8c873cf2ef99 SHA512 40cb69969f923a3ee5d04c93720d5220b3ac1d6e3bc676f77d8ac56ca3d6c314693257d71325a68970eb45e61e9426958e85ce9600cd8b590197fe9f193e296b
-EBUILD openimageio-2.2.8.0-r1.ebuild 3679 BLAKE2B 0d6b91115cefd79251cf73688fa76f0498074c5588604eaa02473730ea63bf69e54e498368847d7ef4cee2fc4325fc96ecdc0735a50de752e3ed48dd2a97022c SHA512 19406ec491d915c8f1385681ac1f06fe38dea58f075ef3de06f5e6ee0f3a65ecc834db3bfb2e8fe43db1d79df7fe14c185f28f4722d320876c6d6c1412e2a6b7
-EBUILD openimageio-2.2.9.0-r1.ebuild 3686 BLAKE2B 3c1186c26b4be04471860175f300491c06bccdec489ec41a2736b4808fecb1731c0ee4528498e412bebd503f8334ea4993ac50c824beb7bc6a243b14295292da SHA512 fb87b545fa4af284c30520a6abe95d44c956d968c4d636b0e7cfc7463cddc4f8a276cf008b2f887f83e2b0bbcf96fc159c7c6138e084ff50ff3c3756542427ad
+EBUILD openimageio-2.2.10.0.ebuild 3688 BLAKE2B d5a87f880c41031f38540db419869546471b0bed383a198c05df6af55c4b21b087f9756be98ac3095b6c0fa1b9ba9cd0658821ff0442c0f4894b6deaf4ccba43 SHA512 8161c32a21d0f5b1b288b02884ce80a2f1d95a4ebd7bd76cd7e087d4435df51b66653d57b7ee081b13425fbe3640c44e46eeadb901228c8d513a9e3c0fd62be0
+EBUILD openimageio-2.2.10.1.ebuild 3688 BLAKE2B d5a87f880c41031f38540db419869546471b0bed383a198c05df6af55c4b21b087f9756be98ac3095b6c0fa1b9ba9cd0658821ff0442c0f4894b6deaf4ccba43 SHA512 8161c32a21d0f5b1b288b02884ce80a2f1d95a4ebd7bd76cd7e087d4435df51b66653d57b7ee081b13425fbe3640c44e46eeadb901228c8d513a9e3c0fd62be0
+EBUILD openimageio-2.2.8.0-r1.ebuild 3679 BLAKE2B 90500e5e8bd4c94ac24506b2049a1f875961834f1822aec9cda7067b425a6f2f55df02be32c8e6694a5986c11edd4789aa04bf0622dd66f7e5193706e2d0682f SHA512 6fc5f91ef2eef33934dd7a151383fc2fc165ee97fb77133308641031309bfb96871b2ef5a8b5cbc9baa563b21c3de834378d651ded46cecdda4d11d72eaa53a8
+EBUILD openimageio-2.2.9.0-r1.ebuild 3686 BLAKE2B 95bcd6666bba47874bb02eec536c1dd6d22b821cba96106916276fb9dbaad5ed592d78363bd44bf39e146cc9c753b0dc7b7a333fd0cfc5572404d3e3861b6c39 SHA512 ee932fd014b3ecc44e0cc208613b3e9e2ce9df9bc4b0fbd516232ff52ea94239da42fc057a42caee8c6e546a19b12c49a64c6286b96ca6b3407781b11462825e
 MISC metadata.xml 922 BLAKE2B 4b63768455a06ac25a2845a1c4510ca33bd0eef4b2d4ddbb002fa2fc3c28fef6e1179d930281b8e3db91945e07e5df1b58677263cc500afa424778386ff5d095 SHA512 0ea0311d739c06c7d82b9e97deabcf9fd6330beebde039a9afbfeb742a7ff189bc498a7c77086bbc8c7be849037512bf98694537a8af98232b2eb3ee3a24ce9e
diff --git a/media-libs/openimageio/openimageio-2.2.10.0.ebuild b/media-libs/openimageio/openimageio-2.2.10.0.ebuild
index 8eb2ae36862a..ceb522b9b67a 100644
--- a/media-libs/openimageio/openimageio-2.2.10.0.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.10.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit cmake font python-single-r1
 
 DESCRIPTION="A library for reading and writing images"
diff --git a/media-libs/openimageio/openimageio-2.2.10.1.ebuild b/media-libs/openimageio/openimageio-2.2.10.1.ebuild
index 8eb2ae36862a..ceb522b9b67a 100644
--- a/media-libs/openimageio/openimageio-2.2.10.1.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.10.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit cmake font python-single-r1
 
 DESCRIPTION="A library for reading and writing images"
diff --git a/media-libs/openimageio/openimageio-2.2.8.0-r1.ebuild b/media-libs/openimageio/openimageio-2.2.8.0-r1.ebuild
index 78fe460252e6..0ceba2dd92ec 100644
--- a/media-libs/openimageio/openimageio-2.2.8.0-r1.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.8.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit cmake font python-single-r1
 
 DESCRIPTION="A library for reading and writing images"
diff --git a/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild b/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild
index 6f81fbe44494..11b549d06b27 100644
--- a/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit cmake font python-single-r1
 
 DESCRIPTION="A library for reading and writing images"
diff --git a/media-libs/partio/Manifest b/media-libs/partio/Manifest
index 5acbdbf40cae..9a62ae2aba58 100644
--- a/media-libs/partio/Manifest
+++ b/media-libs/partio/Manifest
@@ -2,8 +2,8 @@ AUX partio-1.1.0-Rename-partconv.patch 2459 BLAKE2B d811f5174dd2c5e158e7985e8fde
 DIST partio-1.1.0_p20170829.tar.gz 275959 BLAKE2B 441c2d0ab9dd91fa52a826d49f7448dc4d5d0a8d6b72bdb58793dd3c97d86739b25e582bdff41160599489a2835ad8e68676012cb70ef8edff062df3205ab209 SHA512 daedb23ae2b89d3f2ef36ef13afc624a663b3fab91c22f9a454439ff3bc194b78a87e37c9133f6948567ab3b183eff960bb51951b0427cff8c1c29099b6578d6
 DIST partio-1.10.1.tar.gz 333129 BLAKE2B 82d1dd36e9854e221af036d386ecdc558ac032ad7cd720403787ddc83ac236f05fd86e8c07ade07ca93b06a12ac2b834c96a6d43265e396934e44a815df003d3 SHA512 7d3c6449ebd1e8b8a29298a3119acfd1036970b287e9cd5f288a63c7e2b3bf451e9e1ba8fc72f203e225eb2b062d59cd7373817ccc6467de67427d02c0b12477
 DIST partio-1.5.4.tar.gz 291617 BLAKE2B 638fae984d392e1e6c95862ad9a8dd8b8a0d80b2c83dfd03e887af36e420d15fd67f0b2c71e5e8c335668b512660bf14f03a1329ac0d7a48431674a51043585d SHA512 967da5b648b19c45bd0c3c8ff56f891e2d54a07b2cd113f18d5d0b646cbfabd968e31ee48c0e167bf9a911d8d5af42d5291b355da305a2b9134fa78fc23e5636
-EBUILD partio-1.1.0_p20170829.ebuild 1150 BLAKE2B a231c54b7d256e40540c0afff5da3dbdee3efde48322fcda74301ca083e9b181f80c6230a19bcd6bfc3959e6a6d91a0eadc3fdb079e1aed7711a4068c00bfc70 SHA512 1b1d06b0fbdd883bcb4c7753817c8e9c752cf0eb62fd03539fa9379da17ea6696e7eb7955ed74da411b3e5fa4d777974ad81f00409984755dda3ac074f00e2d9
-EBUILD partio-1.10.1.ebuild 1006 BLAKE2B 48267d8ad4309d0cb2c6721ec2831e3ed1cff8522ac96100a33e2c1b19e2368314a64698082d540a520adee4b4c0048dab7a809540a58e0fe3ab83863bf08108 SHA512 0895dbc4efee1668ef9e6ee11a2805d0cd042dd51c32a7056feb168433581d24daa4b7d142f18186b9af937d6e263943b4eead2a739bf28ce1b80bb6b69b1085
-EBUILD partio-1.5.4.ebuild 1007 BLAKE2B 2d44a22f5f7f0ccf83072d81bc9ff2a05e767ad48ca196437ddbd55954030409da5f9e0c2af22021757ddd543ac06442919b75c0223b196f93dfa5c47b86c950 SHA512 35eb6faca53eb3ba6485e91bbba32baf42f0287b7ac08e45448eee579898f18a6d1f01c6ca4dfd02060193545f1f19a93bc8df13abe878ea3b46c48b9f305ae2
-EBUILD partio-9999.ebuild 1009 BLAKE2B 27d69d8550e950548db3f6c63382f1f35c6d686813bef5081cf3a6cedd042df191e9d3b84ace2fe6c7a07415411fd0b616df1ddb92294a30dfb10e919fee3e73 SHA512 c0bd8bb432d4408737e971a4689c5f413e028661da957527f7208b90fac6dd0ee2ec029e30404f585ddb9bc6e27b894578b4c60c838e852e4865a4a5bb57dd1e
+EBUILD partio-1.1.0_p20170829.ebuild 1148 BLAKE2B b0c55730e21d0676f6174448b1b52214ab704ddf5ff2057c4c10a104714009cd0129f821866929b79afcbc18bf0f2dd2ecdaa11f49a1fe65e00a1a947dc4a6ca SHA512 275f28c68464d6480c175971d4626f22f4c76e296f674704110a787a7bc96e7ef95e732acb4563adc99f9230af5c66a7d1cad989743f6aee81376243a968fd04
+EBUILD partio-1.10.1.ebuild 1004 BLAKE2B 8bf7a27dc1c97c5ab668482d3cd785541ee9b5de056909146b2564281491b7226b9ffac18b850a8313b69732be38405488b93360b556246da7068c8a61727bb0 SHA512 83aba22cea524a70fc83f32c074d1d5c7bf7b56c0321ae452c66843acd0c1145c3a0aa9970a4da2f8bf9761a54bcd6f3f850d6f48fc0d030faf4e92c218d16b1
+EBUILD partio-1.5.4.ebuild 1005 BLAKE2B 181022e1927fce74730a795e92299cd21491e8f65c6a9da11a84d3edb8b8d818314bb69011a2960f89cbeac69757ec05180c2015cea7919c126c1d4e3ad4c71d SHA512 69f26f13def6dd5fc1ae178c82bfabd4c05f4eb926eba32f09585a37ff05fed405c25146e7fd4c98aa121d70d8d2c810e707477f4c24330b636bb1bccb75682c
+EBUILD partio-9999.ebuild 1007 BLAKE2B 0ef6f815874a53c90a329598fa1fb74ffbe8df5d54594b4bca6c13de3836c50417f5185e2e6adf84c0ff5111fce8dbc850e5901e33cefb2eb274048dcf4bddc4 SHA512 42c9ce2cb8ac4ae9cf89a3bedcb2e7ff10c7adfe8c7c22cc39ed592f359a8d102ae736321fae802b18e29664c29e9201691ecd402f12e523a5e2b30ce32785d7
 MISC metadata.xml 444 BLAKE2B f9a6abe05db032e6425daecb9a5ccb29f5f0a1a2642f1184ccee43b7473efd5d1b014c656e7349b9326d7e7a7e15b3ae035a287ab129e69235c81b6dd0f9109c SHA512 78259bbbc1fce6259ea0c6ab0b6cb19aa570407ccb31a58183480c954a385941ecad95667318494d87fd3a3480e59faad55e029faf050d371a61592151d8544b
diff --git a/media-libs/partio/partio-1.1.0_p20170829.ebuild b/media-libs/partio/partio-1.1.0_p20170829.ebuild
index 35611da438ad..f6c43ab7b930 100644
--- a/media-libs/partio/partio-1.1.0_p20170829.ebuild
+++ b/media-libs/partio/partio-1.1.0_p20170829.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit cmake vcs-snapshot python-single-r1
 
diff --git a/media-libs/partio/partio-1.10.1.ebuild b/media-libs/partio/partio-1.10.1.ebuild
index 5c5e61ef9717..350c77be27d7 100644
--- a/media-libs/partio/partio-1.10.1.ebuild
+++ b/media-libs/partio/partio-1.10.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit cmake python-single-r1
 
 if [[ ${PV} == *9999 ]]; then
diff --git a/media-libs/partio/partio-1.5.4.ebuild b/media-libs/partio/partio-1.5.4.ebuild
index 8290291a0083..738c1e95f811 100644
--- a/media-libs/partio/partio-1.5.4.ebuild
+++ b/media-libs/partio/partio-1.5.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit cmake python-single-r1
 
 if [[ ${PV} == *9999 ]]; then
diff --git a/media-libs/partio/partio-9999.ebuild b/media-libs/partio/partio-9999.ebuild
index bfe67c28fe5f..e5a82c3417e2 100644
--- a/media-libs/partio/partio-9999.ebuild
+++ b/media-libs/partio/partio-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit cmake python-single-r1
 
 if [[ ${PV} == *9999 ]]; then
diff --git a/media-libs/portmidi/Manifest b/media-libs/portmidi/Manifest
index d0cde985bc92..3606497be2a4 100644
--- a/media-libs/portmidi/Manifest
+++ b/media-libs/portmidi/Manifest
@@ -1,5 +1,5 @@
 AUX portmidi-217-cmake.patch 13905 BLAKE2B faa559f25b1acec63f17a6b6dcbd228eff2cb50447ba72ea4108c86f36b8142fac54c90e5480d74278e0fa0b28bad68f4f1bfac192434840893dc9039243284f SHA512 b60da799041d6dc4a1bf82981d904cf9bbbaed021397cd2235dc25b18b7c830576ecce8fa0c6992249e03ab84579eff795ae33a8e0d091dcda8ee856491420d4
 AUX portmidi-217-r4-python.patch 1540 BLAKE2B a5fe8c48e8d312cead822fc8893f8a610bf5cf280dd2445da04ab42ed13a5a121174afa2e8874dcf3f7a7b89cd60894a819404438c6d5cb2b99a8e2ae6f3aba8 SHA512 d7ded737346f9756450ff3eaf35daf33da941a109d7db07598ea57593ef3272213b889a9ab33bed71bead4583cb080439813bf7fc4a6d1a6cbb84ed4cd25b51f
 DIST portmidi-src-217.zip 1030830 BLAKE2B ab197c7f9a5c2b4d2740d56841459fbac97d510e4d12e5d0cd7cecc0ba6035929b6596140d42c575a9513862a66127d19253dbee1d3a7b7b84b69c88fec7fcae SHA512 d08d4d57429d26d292b5fe6868b7c7a32f2f1d2428f6695cd403a697e2d91629bd4380242ab2720e8f21c895bb75cb56b709fb663a20e8e623120e50bfc5d90b
-EBUILD portmidi-217-r3.ebuild 3213 BLAKE2B fb850ebfcefa7a22d025e29cf9c3062d2c6751a3d5d0a633ea65677de6dbcc3e6528bdf4d26c126a76201234da3662cfb0a4ab8f6591afe86066b59984749c62 SHA512 49dd8f34050961e85314e5f2fcab131ea6ba755bd186eee1e27a98a9397b3a6fca055c8781647a02a0651babfb473e2f70dd3239593ac7bbc3970769f62f304f
+EBUILD portmidi-217-r3.ebuild 3211 BLAKE2B a1db7a1a0fd4c8c5a49f205ee4cd2c6b5689bbf65c1538817c2440663140ca57c6e462b324832392efaadf6d852bdd55b0c8930716bf09302cb2de9d1d828f82 SHA512 d65ec75185e97a7d040eaa6e1d99ec4a03155b9667d893d6b47cf9c2d2cb2bfd928aed484075b49d7f4740c28b3391ae16f212dd2a1cc9dbc05407579656c29e
 MISC metadata.xml 436 BLAKE2B abc47a4c2597048c3e2037006db7811d99cb1ce5c35d83dec30fc415f6d419344bf283d580c153309bb7934b6a12fae878cd480f6c12be76deb52bd5494e2c5c SHA512 a7f6997ff7647e20526181189d5d38ebd944648a508a90ab42ada4dfec84f5165a25b07f5738880a9dcbf424e2b74ac7c3224f6b8d47d9c8a7f3fa7c02c02cbc
diff --git a/media-libs/portmidi/portmidi-217-r3.ebuild b/media-libs/portmidi/portmidi-217-r3.ebuild
index d6cdce8febe9..403557873b8c 100644
--- a/media-libs/portmidi/portmidi-217-r3.ebuild
+++ b/media-libs/portmidi/portmidi-217-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 DISTUTILS_OPTIONAL=1
 # ninja: error: build.ninja:521: multiple rules generate pm_java/pmdefaults.jar [-w dupbuild=err]
 CMAKE_MAKEFILE_GENERATOR="emake"
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index c637b553f779..5fc6e737c219 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,6 +1,6 @@
 AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b37735573b1cf43f510870a43f8169a6ea1909d72c1b3d7c0fb295733c07f6e626d4b148ca2deb384d7aae4554c8da01482b930 SHA512 95cbd65997146c3ba018c81d49f90a7713f99f5bc86b6c30d6c83ca9bb139309df763d325b75c9b1d02ca60ed3bddd003eb08e64e3856867bc15d58c620341ed
 DIST shaderc-2020.4_pre20201106.tar.gz 220189 BLAKE2B 5add12ddc2013c797b96a65bf531ea7f2a05812fb6cccf0d7d2e5bbaab0d6da78086de7d3a4cce1be936aa683524a9306f97e9d825b2fac7ea660fe7e5ee6a3f SHA512 99433df499213eb5c625a54994278567863fa402cbdac78ca06b635c488284e59308a6ce79ecd07e55b256431206fe7e26171de39a2508feb32dd85bb7bbcfe2
 DIST shaderc-2020.5_pre20201216.tar.gz 220278 BLAKE2B 9565873bd1d85c2800b26ba821da8044aecf7ef7268b4843570b18bfbe07e0c9891b4f67b3ef58d7ac0813a2ca306ec2af8ef8bacb15047903d2d9bd1b723b6f SHA512 6b133b83f300c09408efa61f56b299b5ee3900fb739f2ada37e0ee3b8af4bf50423f0f9ca9a637d845bb02eeb61347456ddae9d616b5e46d2e481994ca3d35f3
-EBUILD shaderc-2020.4_pre20201106.ebuild 2163 BLAKE2B 76a7b14c663846b0c2e0e297c44d65d800704b62b68df334a014c9c791610a044337d647af1a6f0037a096b7c4d340559d627c1d6873944954bd359fbf9c3eac SHA512 bfeaeaef179232e4eaa3810f3b30d3ca6cea1d8747cb862649476e5185eb8da72d95a9742354519b9caa78d8c0a3e6445173168a5c9a0dd42577e2cbd9301160
-EBUILD shaderc-2020.5_pre20201216.ebuild 2157 BLAKE2B cc50f8666645cc5ed12b93c089f450870b290c77dbd52c83ccb95ba57d46688fb0514d8fa31dc2d0d028c07012567e4de209dc6c50259b76c7ffd93124c43b9f SHA512 40e75dcba1468f7e4bab30d22a746af68c42b7e77b7ea7fd8ea4306227a657f25da1d14ad502ac91a2631efe68c251d81aef2852884ac52b3d7647a23f450a99
+EBUILD shaderc-2020.4_pre20201106.ebuild 2159 BLAKE2B 5a1ae3c49778a45be4c9e468618890ae370d7024e302e43337afa5d93a3e90ba72647d256c5242f07a15ca50b63b2cb0fc14e1b1f4b8a2b911bcc825d60b5a48 SHA512 68339ba7418738a0eefb1577f54268c7ce12c2dfc14f4fb3b47fc98257dc428c355cc7e5c4e0736fe1437756ccbd4005b9195066ffec9632395f59b648604664
+EBUILD shaderc-2020.5_pre20201216.ebuild 2153 BLAKE2B f6b8eb754b715c2fa7b92051145ffd834857f4aa5c90380d5889dc96f9ee1d42c95b05651f521f3cb0770801bd3addfe82fe50856ae3deaba3a78f8d2facf0c4 SHA512 077512d094ce32ad15b35734df87f62b5017efec51bf88d363ccfdbd97bfc2619b77e7a0d24c4a0e8ba9e2841515be4119513ccd52791fee1b5d076f8934bfcd
 MISC metadata.xml 335 BLAKE2B 295aaacdd867834ddc93fd5f52a7d5c50b14a63936e4f97f5cba62d7ddc47fda07dc620203f6e27adf01d8df13b5d9c2b0f5621a0d21bb53f8b846b78023ddfa SHA512 f9b82e65002f90c0e253b712ac3a11c483a3d7bb1750d46f3d8bf4de577927421e6e1cb3c3403afb89a8168e02e9b3736cc21adf6994827a17a82b237a8973a5
diff --git a/media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild b/media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild
index ace84320112b..7e4884d24ced 100644
--- a/media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild
+++ b/media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_7,3_8} )
 
 CMAKE_ECLASS=cmake
 
diff --git a/media-libs/shaderc/shaderc-2020.5_pre20201216.ebuild b/media-libs/shaderc/shaderc-2020.5_pre20201216.ebuild
index 0fac5bb2b40c..92aad0f298bc 100644
--- a/media-libs/shaderc/shaderc-2020.5_pre20201216.ebuild
+++ b/media-libs/shaderc/shaderc-2020.5_pre20201216.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
 
 CMAKE_ECLASS=cmake
 
diff --git a/media-libs/sratom/Manifest b/media-libs/sratom/Manifest
index 3dae2e3f6103..f7707d2a35f4 100644
--- a/media-libs/sratom/Manifest
+++ b/media-libs/sratom/Manifest
@@ -1,5 +1,5 @@
 DIST sratom-0.6.6.tar.bz2 347297 BLAKE2B 0cb1949486deb5e8f823b17c98fb415dc44b0cefece647b6c5b3646438736ee9c7afa617bb00a68d61a31c80f6e643758f48602f647655aa4b185b2cc5fff893 SHA512 ccc209af68a39c1a669ba694d250b292df2f588aeea2a9d1dfe54a23e31f032fcce1d99ebf9dd7cff80ce5aedd204c74e3ccc04d6cd239921cd3e443db83ed55
 DIST sratom-0.6.8.tar.bz2 327027 BLAKE2B 8e11e03e6a66e9c96f90a0f31f4a65c660ed44304600caa2daad09b955a4829b266f7495b8ed85c62c34adfbc3e7f97790096bd721b51e1038986ac2e3926e60 SHA512 49ec4b230a72005ab7a7a3de0bfa630a27a16f9f811ca8e7f6da7fcf6b34526577217075d428a993f95b813dd2a82a9b6892eeb2e36b66b122ada778fbb3fb95
-EBUILD sratom-0.6.6.ebuild 1209 BLAKE2B be014a842a28db8afd3ac90a90ce18da79a6a6cd04a7b775a59977f63c4ccb72ab25ea084357ec90ec1f2928dc61a3c01694155f564f5c3bbfd50e15b98f47db SHA512 c5dce50fa212e1a3563d6de8939ab46e81cb3394e386578d70e1c15f6147e5ebc7b2e2c288040f8d7531d6dd169dded9242b050670dc7297252af7b6771f329b
-EBUILD sratom-0.6.8.ebuild 1227 BLAKE2B e5e0782b5fdd40b3ebed3b9063a1bfd2f6d87dcddc162e2620f28cc4caac11f516619e883dd93bfa6245b5f1dbee9e4652e1a399376b46bef19f891055d3d418 SHA512 8450e09b501a9c10d11ec02efc7687eadffff25e9b5bbceca8c7fd52591a50329adc4f05be551aae15904ca37a905566731b2d16e85fba4caecd1f7a25b57045
+EBUILD sratom-0.6.6.ebuild 1207 BLAKE2B 6401aff2bb8d49dc156287886a37da05065e49bc1cb13f3e23d61e8d867c2b43b7cf51e9cf760e9254c82a4e6846dc77f0834d5552ae0c2dcbc753e5fb8a109e SHA512 d209123d39be88b8b2de3cbe84d5d931943068db4b6d1416be7d36df7f431ee80f63f3c24e6433c43824227df8e39a631dc9e34d70c7821cb822d0761e75336d
+EBUILD sratom-0.6.8.ebuild 1225 BLAKE2B 908b9d1ad9e29894a3cd2969e76d924719d17f694b473e8df1d7d95901ab8e296e6569d86e99aeed4241871793f5d9eab1f53167e23ff69ea6846885c7f39fdc SHA512 311de6115c435aa9409149701c348267de89d4b26a9b25e21d879096f6732c57d2f72ee6dfbd053b2e8d9dc218378e050043022074547e3a20fbdb0adb41262b
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/sratom/sratom-0.6.6.ebuild b/media-libs/sratom/sratom-0.6.6.ebuild
index 13134b424ece..980aeb5e6538 100644
--- a/media-libs/sratom/sratom-0.6.6.ebuild
+++ b/media-libs/sratom/sratom-0.6.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils multilib-build multilib-minimal
 
diff --git a/media-libs/sratom/sratom-0.6.8.ebuild b/media-libs/sratom/sratom-0.6.8.ebuild
index b3294902ca69..485729cbfc34 100644
--- a/media-libs/sratom/sratom-0.6.8.ebuild
+++ b/media-libs/sratom/sratom-0.6.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils multilib-build multilib-minimal
 
diff --git a/media-libs/suil/Manifest b/media-libs/suil/Manifest
index 89f52afb84a8..efab9ce31849 100644
--- a/media-libs/suil/Manifest
+++ b/media-libs/suil/Manifest
@@ -1,5 +1,5 @@
 DIST suil-0.10.10.tar.bz2 339906 BLAKE2B 03d1ac744fa3fa487bbf44d6e006f6cfcc73dc4aa6eb79d1ac5d024dc9493e3e426ff6054705d1de514286b2d43f5a1448bfcf7e573fa95d61c41790ca06c405 SHA512 e442022096150b2f71d65bbd625e2e262cb3e3865c57f5a30f0472dac8ef90ad2fbbf67235823055019017e3751b46330f6e98b8e1745e5845eb02c4d2a4fc21
 DIST suil-0.10.8.tar.bz2 357003 BLAKE2B d5445a8a539d3aaca94141fe0a7bfce976db9602fcaa563d0e5661ce7d281ac48679110e5545d3a3aa4d3c488c5ce7a00f2f06bd67e56da26943885a71480648 SHA512 1d68996756ac593b2b2da6d9554e3257944cacbc8d70d90ded0f6ad5b5877778a08c779a12c7b4527d492f9c480613e030ab6933532f758e16221daa9d5c2dd4
-EBUILD suil-0.10.10.ebuild 1039 BLAKE2B 6b3daca525992b06a1aadc08d11d69af004c2fc6f558d67d156780afd60ca294421d4502e074b2daa59852b73f37bfa284c9ffacf752091495109bdca19459d0 SHA512 83e33aa22d5805fa6c51ed625cae1db27c304afae053cc42d7a49ee7e129cef1fca5128a2d182092eab145c9ef16a64ecbc919620521946eda7bfc5e5e72a981
-EBUILD suil-0.10.8.ebuild 1035 BLAKE2B 18df0a00bab2c43851ebb6459b109778360d69bda164a340f6a5c19193ac90ace15421ce680a0dc99d9b9c20070f6c28cae6d92fbec515b85917796e5e84413d SHA512 e6751b93b4b06c3fde428c53538460f2571218e588992b781117c83b1791bde6e79931be2ea3d7ad6ffa5afbe65e2ead6fb616c07fa96c61989ff02a875e01b9
+EBUILD suil-0.10.10.ebuild 1037 BLAKE2B 80c53727fdeb68f3d46a4f1b0edace5c18ae440d6a11c58d23c0270d45485af6cc2b66d409f907874f26bb04c884d9c6eb12b5d097440bc3a84dcd1e52fff691 SHA512 33fb1042f6a6b993ebc428b591aacdd075305f69f9527d4631a4a4016bc98931cb5aa95a38dbf42ef90117db3609d264729e166dbd4f07286a57bce93d041e55
+EBUILD suil-0.10.8.ebuild 1033 BLAKE2B 3e698fb6bd09a3fd76fd9c538bd03af87fc59ce7eaa2864b9db93c07304d29d6651dd6ad8bd692a284f4b3d25c70a5e01f692996a6500ff81096339f2562fa6b SHA512 28f367ea81c46dd7324277ccc9a42881ef43e56a1de0ab74cce01cd717328f65ee266d9550c2360fe21067535d470a95b0f0fb21754560a25d016f1818a86323
 MISC metadata.xml 491 BLAKE2B 8d423d4bd56c2fc586cac7dfeef9ba125799795a02f8f7303d1e657e83181ad68eae5e20cc75806fefbe1296f0eabc632fee3824b9b36e7ccef0a22e04fe4081 SHA512 c56784f3b84159aaa284b5b04ce4d2110d78acb536ea9dd60d5043199a061171dfd0272f4d810e7ac68025fb906cc021b36f099ea966bc87e0de8f57464a88c3
diff --git a/media-libs/suil/suil-0.10.10.ebuild b/media-libs/suil/suil-0.10.10.ebuild
index 4dd9b8aea8ea..4af965262246 100644
--- a/media-libs/suil/suil-0.10.10.ebuild
+++ b/media-libs/suil/suil-0.10.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit flag-o-matic python-any-r1 waf-utils
diff --git a/media-libs/suil/suil-0.10.8.ebuild b/media-libs/suil/suil-0.10.8.ebuild
index 981a8ea553f4..c4d76652838b 100644
--- a/media-libs/suil/suil-0.10.8.ebuild
+++ b/media-libs/suil/suil-0.10.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit flag-o-matic python-any-r1 waf-utils
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index b5d39263e389..ed2dda34c3af 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -6,6 +6,6 @@ AUX vigra-1.11.1-lib_suffix.patch 1032 BLAKE2B ce1b73b89c4d10c3b2ef3185a3c9a7ca7
 AUX vigra-1.11.1-python3.7.patch 1254 BLAKE2B 24e23db29992efa86154edb402e250c782160ba5208fd7b2dd1c1eb0526b51633014cd488b5f8abd808bb2fc54b20866111281447fc45683d70a9a8bd93f0854 SHA512 9cbaacf2b6e3bd892b930c48d2371fe96b9cfecc69c8d0c982972c412f1157a73648672f42e73df1cd5ce0753c69907faaca38e35bdd54952a753af7054e17fe
 AUX vigra-1.11.1-sphinx.ext.pngmath.patch 1411 BLAKE2B 6ffdd2f40ac982d693a6e71a89754d453202ba70e6ae65b3b45d64add3d2cc7a9710773e94b0604cb67dadb53ea27912ccce7fe844e6264f7c989bb96149cbcc SHA512 4e0ade84985ecc9c7c45afd949671b9cbc041db486c29732b17c1b62eadfdf6e299396a18686c03c3ed4e2b3ac6d830a8e224c56e3b8d20361c2f5e5fcc14650
 DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3
-EBUILD vigra-1.11.1-r3.ebuild 3537 BLAKE2B e7ada91c5f71a9585e7735478c691817f34096ae835d888020a4820e20fa3908d117e0639e93d2ba186aa0f636fb07a7ae4dd53e4cb86170458b6bbca7b068ce SHA512 2e69ca19f10526acb187da1524d12cdd498dcd30fda90955add22276d7d9fa2ec91dae57cdd6876b9bd95fcbc8d6caa420ceed27b181ce49a870f0eadae52dd4
-EBUILD vigra-9999.ebuild 3907 BLAKE2B a428dac82f37a2d526cbe757da1363dd9a968c2e970bf91fecd3f8d3ed1204f5344df2f3b29ce7a370e8801f9d5fa6480b75adb113bc0dd41c65f7fc49869ac4 SHA512 f539813b694eda28dd26b4fca29e6f1b0c3daf3b04eac13ac1c71406632ee0b9f1f066ce26f7a067b74cbb624a9396ba3c71196f6802c422dabe45dee25ca0c2
+EBUILD vigra-1.11.1-r3.ebuild 3535 BLAKE2B 0af86fbaeb60e40a3eaea93de6a22ac0310023aa16a10669ce87a7b21d6460f4b9cb1e49fedf88e5386a86777505134fdc9e787724f0fc5b2babb076d566feca SHA512 2c7dfdc5d3dfa1b4f2bb084f1ce91868b30cd4067ad41471b5de973ced7c2cb4d1119d0d4317b34a00c097598b194ecba46029036f1e3bd7e01dd97602cf8391
+EBUILD vigra-9999.ebuild 3905 BLAKE2B 36f5a5e95225129ed05d2f7f4fe057fcdffaef55f17983fb9998585ef9fa5d2b12c50852bdb6fd4974fcec1de60b8a11887f8fc36ef3e111809c9d679e8043e2 SHA512 77a9075fa4ad56a4f78bd0a44d352eac22c0ff02f167a08956cd65c1798b9c2e0eee82c50213d4e4bc3a651bf6ac398a6ae5db7ac90f4f6f8d988451ddac791b
 MISC metadata.xml 413 BLAKE2B 985f005fa338d566dddb20126e0a83cb8e9ec5aa4ac9ed2d5ec6a42743eeb92f521375b74f8caaa94500c42450d68d0a4bf5c036c9a2909e13c922f50896824a SHA512 e5c2a32f7495cfceffc8da8464131b918134b7255fbcde9a10175a24698f5a6aff17630436935c6cda7d8a3cd8b182c299845a24528f3a9c40dff1022dce4f71
diff --git a/media-libs/vigra/vigra-1.11.1-r3.ebuild b/media-libs/vigra/vigra-1.11.1-r3.ebuild
index f3b56a52e27c..714a95b192e1 100644
--- a/media-libs/vigra/vigra-1.11.1-r3.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="threads(+),xml"
 inherit cmake python-r1
 
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 9bb9d1c453b4..c445f2e401cf 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 PYTHON_REQ_USE="threads(+),xml"
 inherit cmake-utils python-r1
 
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index a5db46c85dbe..14f00374ab70 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,6 +1,6 @@
 DIST vulkan-layers-1.2.154.tar.gz 2312569 BLAKE2B 01415b6bb1a2b3e89569ac1a5010be12f752d1a6cb8885aa8ba2d062e5742313f75c8cb51c078b2020afcecffbbf8139a8a97220beae556191427bbcbc7a21e7 SHA512 44cdf3c72d6933969959ee959121de8e32a225bb941d9d7f3b2785bbae26d56cfdb0efb072c11649c316b5cef00b44f2f2415071c39faa0fe00a9e7c66098b7f
 DIST vulkan-layers-1.2.162.tar.gz 2398927 BLAKE2B febfcc88584cb7d69ac2f2bd95a73921d2dc92524b05f17e7d2a9f99336416260da60eefc560d93ad788d9a185d4dd865881f5bc8faf0dae388bacca59a21b7a SHA512 85eba0e1d07cafad212ef611fb1aef3113b6609361476cda7176a49110fe62d257b815f7c622d6ba959872785242e2231c7245242e7794ff5e60325d10f3061b
-EBUILD vulkan-layers-1.2.154.ebuild 1500 BLAKE2B efd2bf7ef134d238b3b2dd440c63861ca4e5d0d45e8b7184213c2319a3af8f81d6cc1354dadcf3617c9b280b13f5bc77a578defe2d58be5d295ee1b167652d8c SHA512 e1505189030e91984512769b2b5fd895508ee549395fdca1a3ae2891566e7bb5051d9eb37564483b4a1664f132a014031cf9aeaa177d5a895d23a24b82ec81fc
-EBUILD vulkan-layers-1.2.162.ebuild 1490 BLAKE2B 685b2b8b04cadd9ca4156de0777c283e0ea3a122473e502d1a65cc1d278ad2abb6c221b553a6a7ffdfb16064fcd1dd97a9bbce9b3ab0569923660d03c4d8c4df SHA512 77594334177fb4c33a364283e076aa3bc5f4725eef74bf88375694165139c03ebb14b43202da11837bf4a8413174d9f70165211ef4200273aa83d58ebccab209
-EBUILD vulkan-layers-9999.ebuild 1500 BLAKE2B e528f8534f6dca7e1215a68441f7f45669e11883ee89030e15f4cf9339ffa41bb845594e290c7b7dbdf1eb2394c0b1b75dbd6d4ac3f5187333699e5dc2684268 SHA512 16311564c45173b037ae66121b89933fbf3364cd3e527388c47e5234fc4fa7a2e1fc2736a68b23e7a248e190c6349a4037070bf687a324f17c21bf49a3882d81
+EBUILD vulkan-layers-1.2.154.ebuild 1498 BLAKE2B 915c22156cdcb9385f539484a18d1b9ce60b29e116642d6cb480c0e8ba07591ffb8ab14f34d7d4b7190328584cfe11efed0b8f0b51c9a4b09f57438581f40fa7 SHA512 75c07e0eb319bef4cdd7f718c733765f1e13ada5a76fc35c57c73766eeda24f7631ad517805fa4c116bd754c0e16802d4b78207759a24e19f7d63bbbbe45588e
+EBUILD vulkan-layers-1.2.162.ebuild 1488 BLAKE2B fa4699929b134307d7ca78e0c1ac939456886019d3e784d230ed77b19fd8a7dbcd7db02245c5e31d605d9617bc888c07cf7bb4e8a9e05342ad0c99d8a64043ca SHA512 51e92d38d7eedea207bd1329659c84b4541c3ab001efbb9448fda8fd3a4ffe0626bb0c17020b4d902d224b8fe074a2c11d44e0ee2b68e86c25e13858dbedcb5a
+EBUILD vulkan-layers-9999.ebuild 1498 BLAKE2B 1aae6c33c685e3992dad9456fc09a174c0e13a2cab4d9b34ff95636f52a539b7545ff450c0fa03b069eec903eae1e5732495608b936603b5f6797478c9335db8 SHA512 142d147fae940ec7215ddd610a80f417e1049e3eea565b15bb17336e23b061268b22497f1a5048a8a7a076d423950762aed5c65658d8aa04cf2f15f06ccbc50d
 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.154.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.154.ebuild
index 0243d2935d45..5e310af24185 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.154.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.154.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_PN=Vulkan-ValidationLayers
 CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.162.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.162.ebuild
index 9d84dce7be48..944323d60a27 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.162.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.162.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_PN=Vulkan-ValidationLayers
 CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 4d2f9616d6ca..71f1be1849f2 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_PN=Vulkan-ValidationLayers
 CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index eb3b20e50fb2..8839d3e1b1e6 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,7 +1,7 @@
 AUX vulkan-loader-1.2.162-Fix-pkgconfig.patch 1421 BLAKE2B 6271cbf4b9b91976a2e0e821f0f62a75c556d6fc54482add5c3be7d139013d9971e22ee462e0fed251e4d78a41f94ee3127702aa1052a1a5ff04e9ba036f9d64 SHA512 63309d605f269d7c48c86aff823cf1a17a1ab1e6778ee6fa838eecbc3e439fbd730610753fc64eba19c43ef441ab68dc378f778ef8ff84349fe925ff3be6a321
 DIST vulkan-loader-1.2.154.tar.gz 1417349 BLAKE2B b134932b31325884639e94ef74f7b97c9111554ef904777df9b4e398d927e89bdf2394593ce8e4483e9fda1cd1f299df0841471ac11263580b04bc97786ac973 SHA512 003f16bff7eb24791e458b757d0fee5db9ab68d6e7b56eae623af0c4702c534cc19099c79d2ec2493cd3c30c796f1dff060bc3aaa4057b9215749de65566c157
 DIST vulkan-loader-1.2.162.tar.gz 1421710 BLAKE2B 94b739821c5a12a94a52d8f0a9d79c13055ef3b45b907d53b82325b7be13db52b77d01397534e939bed5629d7a405ff8a09f8da374274a066986b4126fae9863 SHA512 89a99f282b73ec59dde30e4c8c09056b40416185a14ff9b7f7bd496754840e5ac764e7624f1f9a0f11792e786b00f19c3c9e55ccbb22a3c501d8ea9e815d84f9
-EBUILD vulkan-loader-1.2.154.ebuild 1732 BLAKE2B 08279f7f9363058f4b4c7a7c9bf88b5d34b5be88490792df68fcb53699cbb6914b58300705704ebd711a87b955c2f1305c02a44641653b14d88067c17d5a6cab SHA512 bf7da02911bee62cf54d701c5f3785c40bbf0fe038721ae1d17a022fa3e74d71d0b8f6da16c1a48ed3a4f2c3fdab240d46925ce0f4b07b18d7ededc338f970f5
-EBUILD vulkan-loader-1.2.162-r1.ebuild 1791 BLAKE2B b5121202259866dca31347915bd665a49d516bec03e81eeb32c6461b6bfb51d1d1f368ce3399256c9d1f34f1bbe37d89ec0e730953c955305f77a51109dfcaff SHA512 e52c8cf91fa119baa7efceb81f692f9d4b44840143bc47f5d1dad0fef66b4245a221c18ea06371521f4e7af6f71a691e81f0dc3498034a6bb0ecd700eb55a54d
-EBUILD vulkan-loader-9999.ebuild 1731 BLAKE2B adc4fccce6f98f7b17f29b9dcededd21fd5487ffe0f427a068173f92a61f918c24ec508c6f7e7ff2851f6bc9bd585207addfca3bf82d2ee35d81c18dcb4baaac SHA512 5acd4e2f9c5f3c4ffcd1f0219814810b9a3fa4387063606eeecd1e0d0b7e3454bb8a3b66a8bb7efab518dde966c8cc33e7477408871bc2d715d1327d93f63b49
+EBUILD vulkan-loader-1.2.154.ebuild 1730 BLAKE2B 21d41b6e01f498c6d1b2da28fc037513bdbf8b9c377c0dd47c8ae1220a119584c47f8d88c14a0277034a10c64a4a5d2f43a2d448e9e7ad8993bff4c68598af31 SHA512 a3e4e650d272f24405960540ad651c8b3b5d064f1d45891e137cadb4883bd3670ceae1f82a543d19bf6f1d714838220d972f9fe03d1aefc9419b28ad54e30f65
+EBUILD vulkan-loader-1.2.162-r1.ebuild 1789 BLAKE2B cd3f7c6cd562969195ade408960131de13c5ea3e506bb0cf8ca6ef6c8aef4d10ef00f5f614ce9e0436d64b064774420760d59c4afcf3c0d86f1634d2cc9f72a0 SHA512 99e814d3df672fc449368ab657680fb3c2ab887a729ab66031b4e6ec940cfb6fa3ad26687bad0761bc0cd4027dff5dd040d0ee1a2d6949de88f80f7a4068a906
+EBUILD vulkan-loader-9999.ebuild 1729 BLAKE2B e7bf2f7b33ba980cba5bc56e7fe30ad84e80801fe8171222944832f3c2af5afd6736fdc0baed62b77162d75fcbef03a69125febf93adba4af9ac3ea36317b8b2 SHA512 14a7d4da4c473d59203ebe1f8625a62a7aa8a8bf9dd3b55f89b22871fa0e9967c33ca449d768a81412d473cee5be4475c74d15058b989d6c06b15ba22246d061
 MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild
index 7a0fa12561ed..3179d49681eb 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_PN=Vulkan-Loader
 CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 inherit flag-o-matic cmake-multilib python-any-r1 toolchain-funcs
 
 if [[ ${PV} == *9999* ]]; then
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild
index e12bf3b94aa4..acb20e20edf6 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_PN=Vulkan-Loader
 CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit flag-o-matic cmake-multilib python-any-r1 toolchain-funcs
 
 if [[ ${PV} == *9999* ]]; then
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index 05922ef1a74f..c4eb156e64f8 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_PN=Vulkan-Loader
 CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit flag-o-matic cmake-multilib python-any-r1 toolchain-funcs
 
 if [[ ${PV} == *9999* ]]; then
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index ea133631c31e..fb93110e8923 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,5 +1,7 @@
 AUX waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch 3008 BLAKE2B a81a85ffc11351034454b9f903827a012b0168ed113211e8a1cbab890edebff1baabd1b38a4721f1d4f92d5fb07a17c07e1806139b911be6a35be8ec27333c3e SHA512 ae9f1a6450da0f9a6332762740daf1bcba5740daab4c4fcc952fcebffe36a2d134a72a1a73f58d440a7e520d1065dd6a50ffad3910afb1c74890e7fa692d6d2e
 DIST waffle-1.6.1.tar.xz 227152 BLAKE2B 360782636809fa3716589e5c3f2d365ce2a916f3da4dde7ec271ce7e142f94160388f9ae12f1ef0ea79890f45eba9d6ef536e12861ee44cbd88282e3c4f01f52 SHA512 1d5839d517d1067efea163ffd76c05f32f30c3ef0f42dfa1b3a9830d4377829cce368d28889ec5a3be639a5e81db2fb4833d98eafc5ffa5e27578ff11977258f
+DIST waffle-v1.6.2.tar.bz2 259740 BLAKE2B 62708dcda7800d2728ea708f88af5e9c3ff5bbeeef653d064c457ebf86620f67d8dfcd934425810ffb66a452814337e3ed13b6f3e8a4d420363a0b66ceeaf2cf SHA512 2b1e153277366731cb5cb3790c6ae1b884efa8e5e0d5a9499a218f1a902370a066e3253f9922297314943aa751596f70a33faff10c2e480ccc1ceace93ccecbf
 EBUILD waffle-1.6.1-r1.ebuild 1718 BLAKE2B 1e0ee700d4537d3da90f166724b59445e91a2870fafff71c7604fd91c6014001625ae420113583a8635a5ae48ddcd97d480080d938fa8df9287bdd44af9c4a20 SHA512 86a5d9bb19290a5f062c57402de0442d32288876ff21cc2fd6bf1c7a3edaac5660deaa3b2619772e63dcdc2d6fc349dd0f2473e07ace1b775729f43630270489
-EBUILD waffle-9999.ebuild 1622 BLAKE2B 0d2e8656bf04480486f7d9af9832ca92cc53d50dfe415d8470c4ef53702b1ea651fbdef5a28ef39e7850bf2eb8cc691ec4237e31e97df4b3de851cdaf8a0c27b SHA512 386dac3e7c795344683124f747ba3dd10d15f43683a46e71ea6698dcab3d2d6cc4c3f41537d663184d6cd29204df074357aa702789ec3cc6de074190793ebb0c
+EBUILD waffle-1.6.2.ebuild 1826 BLAKE2B ae87f2a7389a4404ce840875ba60e191b918f0717b6f64e0041a92b84a943bf4b8a136593e00da98cf23c5543eee1a3039f2077fae84261dec08f48d688cfbd6 SHA512 c59f5ee9199adbeb822993d3f269b3842111d986b555d08c641c234d12e5fc647c76797ef250d804d5f4029237a115af61c920fe687bf40d2a51263032905b67
+EBUILD waffle-9999.ebuild 1727 BLAKE2B cf94f90fe201fe745c838f8aa64a8b4a2079227ad0b847c7a3edcc994114d4b396ce36f2420bef00d4204cc86b71e8c5f40c18846b4e965762b92153f02e4282 SHA512 24d84572ed2c4d93bd17f12de0fc5c2fd59d47de67741f5be37c405a45b020403846c346c6cf8d6f54b27736140cc6e70dfc0059df76e028f46c3f8c99050044
 MISC metadata.xml 416 BLAKE2B 961afc9a4ed531bd3816c8e7b1c37a9f6be25b912d94b6f79811da67cecd8476964934b9ff943fc98be6177feee1c2eacd3295777a1d873ec1cf3cd58cf20e82 SHA512 850db93f3892afdb36d471b55e911c9cdfc114bcd69b4ce9e59246eb688b145ab5916d9529ded4b913f0cfb6da5fd2d64b7854c9501abec9fd9d860e1953100d
diff --git a/media-libs/waffle/waffle-1.6.2.ebuild b/media-libs/waffle/waffle-1.6.2.ebuild
new file mode 100644
index 000000000000..a1d9e8bbbf26
--- /dev/null
+++ b/media-libs/waffle/waffle-1.6.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}"
+	GIT_ECLASS="git-r3"
+else
+	SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+	KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
+	S="${WORKDIR}"/${PN}-v${PV}
+fi
+inherit meson multilib-minimal ${GIT_ECLASS}
+
+DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
+HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="doc +egl +gbm wayland X"
+RESTRICT="test" # gl_basic tests don't work when run from portage
+
+RDEPEND="
+	>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
+	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
+"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xml-dtd:4.2
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/wflinfo$(get_exeext)
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature X glx)
+		$(meson_feature wayland)
+		$(meson_feature X x11_egl)
+		$(meson_feature gbm)
+		$(meson_feature egl surfaceless_egl)
+		-Dbuild-manpages=$(multilib_is_native_abi && echo true || echo false)
+		-Dbuild-tests=false
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+
+	! use doc && rm -rf \
+		"${D}"/usr/share/doc/waffle1 \
+		"${D}"/usr/share/man/man{3,7}
+}
diff --git a/media-libs/waffle/waffle-9999.ebuild b/media-libs/waffle/waffle-9999.ebuild
index 1786f943ad96..43899a8515c6 100644
--- a/media-libs/waffle/waffle-9999.ebuild
+++ b/media-libs/waffle/waffle-9999.ebuild
@@ -7,8 +7,9 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}"
 	GIT_ECLASS="git-r3"
 else
-	SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/raw/website/files/release/${P}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+	KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
+	S="${WORKDIR}"/${PN}-v${PV}
 fi
 inherit meson multilib-minimal ${GIT_ECLASS}
 
@@ -47,7 +48,7 @@ multilib_src_configure() {
 		$(meson_feature X x11_egl)
 		$(meson_feature gbm)
 		$(meson_feature egl surfaceless_egl)
-		-Dbuild-manpages=true
+		-Dbuild-manpages=$(multilib_is_native_abi && echo true || echo false)
 		-Dbuild-tests=false
 	)
 	meson_src_configure
@@ -60,5 +61,7 @@ multilib_src_compile() {
 multilib_src_install() {
 	meson_src_install
 
-	! use doc && rm -rf "${D}"/usr/share/doc/waffle1
+	! use doc && rm -rf \
+		"${D}"/usr/share/doc/waffle1 \
+		"${D}"/usr/share/man/man{3,7}
 }
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-31 18:57:01 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-31 18:57:01 +0000
commit	69051588e2f955485fe5d45d45e616bc60a2de57 (patch)
tree	ef8699cca7ce3773b1de747b167ceeacdc60cb92 /media-libs
parent	d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 (diff)