gentoo auto-resync : 17:05:2023 - 10:09:17

15 files changed, 3 insertions, 329 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index e2a8f63c52ff..357defff9c5c 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libmp4v2/Manifest b/media-libs/libmp4v2/Manifest
index 78728ab5f08f..ef2a06cf1341 100644
--- a/media-libs/libmp4v2/Manifest
+++ b/media-libs/libmp4v2/Manifest
@@ -1,15 +1,4 @@
-AUX libmp4v2-2.0.0-CVE-2018-14054.patch 1772 BLAKE2B 8e6dfca134866d14689dc2470dadba0c1bfd90559682fd9bed22663b75ad3193f56c556e5c6d8d624ea93a2fd217dbf30113668f8f591257b57d2c2a04321e82 SHA512 3a18c5266efcd20c808d7d0d26c45bcbe4aaf3005eff5b7fe6c4fd918de476c2fea4433eeca928016611b472192a9bd0c03a41e086c47afc1b30e60c0de769a4
-AUX libmp4v2-2.0.0-CVE-2018-14325.patch 2849 BLAKE2B 8ea91b19d07037e6b5d9a7ce01d299f990e955f2163e990b3f64406248f471332d9df3a7320f3e3dae6ba2cffbc0a5359a5ae9e78973c8ec4fee42cd6727994c SHA512 f8a95ba51e4845074b606d2f10baf4e776927735480e4b3b776453be1a5adc28c43a41f1d26f7767881b8e4b9d37be22f858c496c83c90d4dc97eba15a43ff49
-AUX libmp4v2-2.0.0-CVE-2018-14379.patch 1373 BLAKE2B 436923f9ef86d2a05d244a3630d8fab5e1db98016a1c3d90f5bbbbd12f50c04c287823292f80edaac3ddeb98dd9560827fbca5ed2092ba8912724990d47b2eb7 SHA512 fe1b4c6735de7849e2b5dbfaf605c816d7d39247fa2bb470bd454d73a558b4a6e75b361458bdcb810cdf0ec4dc4362b766009a1272d003986e2d03271c627998
-AUX libmp4v2-2.0.0-CVE-2018-14403.patch 949 BLAKE2B 434fe9accaf6dafe9461f97b10c6278cef3af7d5cff7ee975424cff92557485880b4db83de32e3f80dcdaf362b7213ca89abd1e3427b85743ebf93c500e6ab69 SHA512 7ad5278ed37ee10ba04c88bcf9a10445c037bbf3cfea30720e7e8ddf1efd2e681796f223b8f749bee9bdde4d0c0448dee4f057f672305020e412568ef20775f3
-AUX libmp4v2-2.0.0-clang.patch 1157 BLAKE2B cf4763c29017840322d0d31fd859057b2c5151ecb226bcab1d7fab972b4594659dfd9aaed0f7b828d687bf9e05f569cd4d42daf5ce21e6bdb44c0204f1af2028 SHA512 5015dfbd2126d180c7f1b57aecbde592b33fc56d45dc7a4178b0ec88b0ed2dcec23a3a09707bc52dbb6fbeebec1fd272d7625b77e986c7f880994cf6441125fb
-AUX libmp4v2-2.0.0-gcc7.patch 747 BLAKE2B 5bed55f8c9e9593261d9738871de162fdfaec6239078e3ffc0fc85352e60687ba93e37f63edd8fbaf576ffa5966aef07fd58171366ec60ac5969a80eb92f6016 SHA512 18433209711b88cf4a09dcf6ad26d7d717d6593d9b006258e80aac85fee01da17bbf7e67e60c75c82e18652eaddcdb2d945dec52f2f75aa0f236bd5328aab760
-AUX libmp4v2-2.0.0-mp4tags-corruption.patch 642 BLAKE2B 86a1b614dfc2e4dbcee97ebe9b029feac2078eb3d6c25793f291f625ad1e0dc1df85d028813fe96e980e2d8fef4a5eb821da8622f3ce3f8b28835dd020812d7f SHA512 565959560941ec0503b17a1e6a9cae85a03d6f97e4f4ea66cf457c941de96148606f23471525bf786bd95f78097b3376020a40d53fc7a4675c1db9819e7e8593
 AUX libmp4v2-2.0.0-unsigned-int-cast.patch 2922 BLAKE2B 660ee262d6a21540b9646aa87f911373042c1f1f879b18a913d07fd267fa2275556f8a0e18e86c28ce4a737f136d53c2dbd21602635b12b490535f3e8d8e0ef7 SHA512 89cb78624096e4182056c4e9099cc13cb6251330d741ccaabe557eeb21c2df77d71367da21c16d2c33b1a7dde49429f57c7673d49be0e9a459af491a00305f37
-DIST mp4v2-2.0.0.tar.bz2 495672 BLAKE2B 966c90b443bd6f7a81c96fd12f95b00c3ec89cd476aa0fff3e0450b315d54543578ef953c5e3f28d52ca800a0768c601dddc8e99a32ff512767cd65c12832bd5 SHA512 15eb882f33d72d4209053b54c883b67715f539c33096705a0e7bc79015b93f6f3ac80ae29c65a0ffe9eab1bf0dedf07198bdee23fa6eafcd6ccb34f984484be0
-DIST mp4v2-2.1.2.tar.bz2 594365 BLAKE2B ca7438ab34d826926bb39a9f1c09f24a65c2ea7aae45cb736ec4b285ef975f575c1c28ee88d47e623c8085e2800a52ac89d18bd7c42232c72d7d6ae89d78c850 SHA512 7996edbbaf4125cb406ea5dad82dd04e50bc04d6d3f7c32ba5f3be35872b5dc7048038a6e59c668578e8ee1898d56a3c77bcafc5cd42cff9cb6232ee20cdb406
 DIST mp4v2-2.1.3.tar.bz2 594549 BLAKE2B ee8e5792b5b92098e2990bd76a8be7aa6cffc60cb28059702a07eb5cc73dcc9def59dec290f40cbf246069b491d1911714fb00f8d48b77e421e8993fac37f76c SHA512 89bca9c76cf468a932a09d66bc5409266acde51184bf1262c5bc9a524ee5c9a3e073fd0d37450580284e12d9d46d1fd5db0c4ce647c365cc5106fb39ee3d59f6
-EBUILD libmp4v2-2.0.0-r2.ebuild 1315 BLAKE2B 17163eb97e6847b1c32b0065504a3108d4d389e5eb75c1f1823fd786583456c82d868b209f76f04b53306d3e17220e95d3b7bc247ea8fb635a787cded49dc1d2 SHA512 ef0f22022e9ee1371a566e3cd8435a14ae15ff25f654c34c9513e454bff12520a2878af8dee677deb0590c083a257f49ae31546047ba7a636df00d9bf0147934
-EBUILD libmp4v2-2.1.2.ebuild 802 BLAKE2B 550e959ec48a2ed79f73ace3c37570d994cbaf33d7638996270f3b8d370ab3ea44318aa309c4dd73ad10e560c6d76cc91b4061c58e297612afe0104e2acc77b3 SHA512 5eaecd3f6fda0e7792277214dd030a47823ca90273e92363a277193c642bffd464ff349e77c5128f3468c9d239db110813dbf004e09118d437ad7ec61e610654
 EBUILD libmp4v2-2.1.3.ebuild 796 BLAKE2B ef15542d87e8886fda5aaeabfd1cfc0c6c1615a6d710f621d6d513e9f2ecccd8a6b5f2949d22755f788c4941e1b956a787016cf628cbc9e2d59823994dd7d6aa SHA512 29e65c1c2d29e2e7d9a628afba396d92652429a5730bcdeb3bce85b3431af449e9b06b0e20c844105b0163121373dd982429bee566bda634f947d16962e6898e
 MISC metadata.xml 407 BLAKE2B bce0be3a2817259413395a925b55e59d503f988bc2d54b9fd3ff632de284205bb515944e3b1ec95da6a7df2f45f32b1a78706e902f5ea4ff6cebe085db483782 SHA512 999f244426cf480a967cb030e4e3e5c63e39c4fc7eb73e3c0e091b492b65f6aef2b66856ee9040a5d9d44efe72a136fea848479875a39eac37bc62dfaa294777
diff --git a/media-libs/libmp4v2/files/libmp4v2-2.0.0-CVE-2018-14054.patch b/media-libs/libmp4v2/files/libmp4v2-2.0.0-CVE-2018-14054.patch
deleted file mode 100644
index 3ff3e731b93c..000000000000
--- a/media-libs/libmp4v2/files/libmp4v2-2.0.0-CVE-2018-14054.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Upstream: https://github.com/sergiomb2/libmp4v2/commit/3410bc66fb91f46325ab1d008b6a421dd8240949
-Gentoo Bug: https://bugs.gentoo.org/661582
-
-From 3410bc66fb91f46325ab1d008b6a421dd8240949 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
-Date: Sat, 2 Nov 2019 04:21:17 +0000
-Subject: [PATCH] Null out pointer after free to prevent double free
-
-If an exception occurs (because of a crafted MP4) before the value is reassigned, then a double free can occur.  By setting the pointer to NULL after the first free, we prevent the double free in this case.
-Addresses: https://nvd.nist.gov/vuln/detail/CVE-2018-14054
-
-copied form https://github.com/TechSmith/mp4v2/commit/f09cceeee5bd7f783fd31f10e8b3c440ccf4c743
-From: Dave O'Rourke
-Date: Wed, 20 Mar 2019 08:57:29 -0400
----
- src/mp4property.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/mp4property.cpp b/src/mp4property.cpp
-index 9a5b1e3..1b8e1d2 100644
---- a/src/mp4property.cpp
-+++ b/src/mp4property.cpp
-@@ -391,8 +391,10 @@ void MP4StringProperty::Read( MP4File& file, uint32_t index )
-         char*& value = m_values[i];
- 
-         // Generally a default atom setting, e.g. see atom_avc1.cpp, "JVT/AVC Coding"; we'll leak this string if
--        // we don't free.  Note that MP4Free checks for null.
--        MP4Free(value); 
-+        // we don't free.  Note that this code checks for null before calling free and sets the pointer to null
-+        // after freeing it, to prevent a double free in case an exception occurs before the value is reassigned.
-+        MP4Free( value );
-+        value = NULL;
- 
-         if( m_useCountedFormat ) {
-             value = file.ReadCountedString( (m_useUnicode ? 2 : 1), m_useExpandedCount, m_fixedLength );
diff --git a/media-libs/libmp4v2/files/libmp4v2-2.0.0-CVE-2018-14325.patch b/media-libs/libmp4v2/files/libmp4v2-2.0.0-CVE-2018-14325.patch
deleted file mode 100644
index eb23926bb49d..000000000000
--- a/media-libs/libmp4v2/files/libmp4v2-2.0.0-CVE-2018-14325.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Upstream: https://github.com/sergiomb2/libmp4v2/commit/9084868fd9f86bee118001c23171e832f15009f4
-Gentoo Bug: https://bugs.gentoo.org/661582
-
-
-From 9084868fd9f86bee118001c23171e832f15009f4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
-Date: Fri, 8 Nov 2019 02:01:32 +0000
-Subject: [PATCH] Fix v3 Integer underflow/overflow in MP4v2 2.0.0
-
-Reference: https://www.openwall.com/lists/oss-security/2018/07/16/1
-
-For the overflow, we could check the result of the integer multiplication:
-
-fix vulnerability where an atom list size is enormous
-and calculating the number of bytes needed to hold the list overflows
-https://github.com/TechSmith/mp4v2/pull/27/commits/70d823ccd8e2d7d0ed9e62fb7e8983d21e6acbeb
-
-Addresses https://nvd.nist.gov/vuln/detail/CVE-2018-14326 and https://nvd.nist.gov/vuln/detail/CVE-2018-14446
-
-For the underflow, we could check if `dataSize >= hdrSize` satisfies:
-Throw exception when invalid atom size would cause integer underflow
-The calculation `hdrSize - dataSize` can underflow the 64-bit unsigned int dataSize type, which can lead to incorrect results.  We throw an exception to stop the code from going any further.
-
-Addresses https://nvd.nist.gov/vuln/detail/CVE-2018-14325
-Based on https://github.com/TechSmith/mp4v2/commit/e475013c6ef78093055a02b0d035eda0f9f01451
----
- src/mp4array.h  | 2 ++
- src/mp4atom.cpp | 6 ++++++
- 2 files changed, 8 insertions(+)
-
-diff --git a/src/mp4array.h b/src/mp4array.h
-index c49d59b..69d470a 100644
---- a/src/mp4array.h
-+++ b/src/mp4array.h
-@@ -102,6 +102,8 @@ class MP4Array {
-         void Resize(MP4ArrayIndex newSize) { \
-             m_numElements = newSize; \
-             m_maxNumElements = newSize; \
-+            if ( (uint64_t) m_maxNumElements * sizeof(type) > 0xFFFFFFFF ) \
-+               throw new PlatformException("requested array size exceeds 4GB", ERANGE, __FILE__, __LINE__, __FUNCTION__); /* prevent overflow */ \
-             m_elements = (type*)MP4Realloc(m_elements, \
-                 m_maxNumElements * sizeof(type)); \
-         } \
-diff --git a/src/mp4atom.cpp b/src/mp4atom.cpp
-index 7a0a53f..f5d5dc0 100644
---- a/src/mp4atom.cpp
-+++ b/src/mp4atom.cpp
-@@ -143,6 +143,12 @@ MP4Atom* MP4Atom::ReadAtom(MP4File& file, MP4Atom* pParentAtom)
-         dataSize = file.GetSize() - pos;
-     }
- 
-+    if(dataSize < hdrSize) {
-+        ostringstream oss;
-+        oss << "Invalid atom size in '" << type << "' atom, dataSize = " << dataSize << " cannot be less than hdrSize = " << static_cast<unsigned>( hdrSize );
-+        log.errorf( "%s: \"%s\": %s", __FUNCTION__, file.GetFilename().c_str(), oss.str().c_str() );
-+        throw new Exception( oss.str().c_str(), __FILE__, __LINE__, __FUNCTION__ );
-+    }
-     dataSize -= hdrSize;
- 
-     log.verbose1f("\"%s\": type = \"%s\" data-size = %" PRIu64 " (0x%" PRIx64 ") hdr %u",
diff --git a/media-libs/libmp4v2/files/libmp4v2-2.0.0-CVE-2018-14379.patch b/media-libs/libmp4v2/files/libmp4v2-2.0.0-CVE-2018-14379.patch
deleted file mode 100644
index 487dc709af39..000000000000
--- a/media-libs/libmp4v2/files/libmp4v2-2.0.0-CVE-2018-14379.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream: https://github.com/sergiomb2/libmp4v2/commit/bb920de948c85e3db4a52292ac7250a50e3bfc86
-Gentoo Bug: https://bugs.gentoo.org/661582
-
-From bb920de948c85e3db4a52292ac7250a50e3bfc86 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
-Date: Sat, 2 Nov 2019 04:19:27 +0000
-Subject: [PATCH] Fix v2 Type confusion in MP4v2 2.0.0
-
-The bug is caused by the wrong assumption that the child of an `ilst`
-can never be an `ilst`. So we could fix it by simply adding an ASSERT.
-
-Reference: https://www.openwall.com/lists/oss-security/2018/07/17/1
-Addresses: https://nvd.nist.gov/vuln/detail/CVE-2018-14379
----
- src/mp4atom.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/mp4atom.cpp b/src/mp4atom.cpp
-index 520cbc8..7a0a53f 100644
---- a/src/mp4atom.cpp
-+++ b/src/mp4atom.cpp
-@@ -778,8 +778,10 @@ MP4Atom::factory( MP4File &file, MP4Atom* parent, const char* type )
-         const char* const ptype = parent->GetType();
- 
-         if( descendsFrom( parent, "ilst" )) {
--            if( ATOMID( ptype ) == ATOMID( "ilst" ))
-+            if( ATOMID( ptype ) == ATOMID( "ilst" )) {
-+                ASSERT(ATOMID( type ) != ATOMID( "ilst" ));
-                 return new MP4ItemAtom( file, type );
-+            }
- 
-             if( ATOMID( type ) == ATOMID( "data" ))
-                 return new MP4DataAtom(file);
diff --git a/media-libs/libmp4v2/files/libmp4v2-2.0.0-CVE-2018-14403.patch b/media-libs/libmp4v2/files/libmp4v2-2.0.0-CVE-2018-14403.patch
deleted file mode 100644
index e7bea4e1dee1..000000000000
--- a/media-libs/libmp4v2/files/libmp4v2-2.0.0-CVE-2018-14403.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Upstream: https://github.com/sergiomb2/libmp4v2/commit/a94a3372c6ef66a2276cc6cd92f7ec07a9c8bb6b
-Gentoo Bug: https://bugs.gentoo.org/661582
-
-From a94a3372c6ef66a2276cc6cd92f7ec07a9c8bb6b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
-Date: Wed, 17 Oct 2018 16:13:06 +0100
-Subject: [PATCH] Fix Out-of-bounds memory access in MP4v2 2.0.0
-
-The bug can be fixed by more checks when doing type comparison.
-Reference: https://www.openwall.com/lists/oss-security/2018/07/18/3
-
-Addresses https://nvd.nist.gov/vuln/detail/CVE-2018-14403
----
- src/mp4util.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/mp4util.cpp b/src/mp4util.cpp
-index 47bd74e..696dab4 100644
---- a/src/mp4util.cpp
-+++ b/src/mp4util.cpp
-@@ -46,6 +46,7 @@ bool MP4NameFirstMatches(const char* s1, const char* s2)
-         s1++;
-         s2++;
-     }
-+    if(*s2 != '[' && *s2 != '.' && *s2 != '\0') return false;
-     return true;
- }
- 
diff --git a/media-libs/libmp4v2/files/libmp4v2-2.0.0-clang.patch b/media-libs/libmp4v2/files/libmp4v2-2.0.0-clang.patch
deleted file mode 100644
index 34aa81cc5e0e..000000000000
--- a/media-libs/libmp4v2/files/libmp4v2-2.0.0-clang.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From edc4f0ad8f37bb8aeae4e3ea34766dc6cdbb2f15 Mon Sep 17 00:00:00 2001
-From: David Carlos Manuelda <StormByte@gmail.com>
-Date: Tue, 7 Aug 2018 05:42:28 +0200
-Subject: [PATCH] Fix clang compilation
-
----
- src/mp4.cpp   | 2 +-
- src/mp4util.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/mp4.cpp b/src/mp4.cpp
-index 1016f79..d576103 100644
---- a/src/mp4.cpp
-+++ b/src/mp4.cpp
-@@ -896,7 +896,7 @@ MP4FileHandle MP4ReadProvider( const char* fileName, const MP4FileProvider* file
-         }
- 
-         catch (...) {
--            return MP4_INVALID_TRACK_ID;
-+            return (mp4v2_ismacrypParams *)MP4_INVALID_TRACK_ID;
-         }
-     }
- 
-diff --git a/src/mp4util.h b/src/mp4util.h
-index 1fbbd81..b33bb44 100644
---- a/src/mp4util.h
-+++ b/src/mp4util.h
-@@ -33,7 +33,7 @@ namespace mp4v2 { namespace impl {
- #ifndef ASSERT
- #   define ASSERT(expr) \
-         if (!(expr)) { \
--            throw new Exception("assert failure: "LIBMPV42_STRINGIFY((expr)), __FILE__, __LINE__, __FUNCTION__ ); \
-+            throw new Exception("assert failure: " LIBMPV42_STRINGIFY((expr)), __FILE__, __LINE__, __FUNCTION__ ); \
-         }
- #endif
- 
\ No newline at end of file
diff --git a/media-libs/libmp4v2/files/libmp4v2-2.0.0-gcc7.patch b/media-libs/libmp4v2/files/libmp4v2-2.0.0-gcc7.patch
deleted file mode 100644
index 156f0fcbaa0d..000000000000
--- a/media-libs/libmp4v2/files/libmp4v2-2.0.0-gcc7.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=600892
-
-Description: Fix pointer comparison (FTBFS on GCC 7)
-Author: Philip Chung <philipchung1995@yahoo.com>
-Bug-Debian: https://bugs.debian.org/853560
-Last-Update: 2017-09-04
-
---- a/src/rtphint.cpp
-+++ b/src/rtphint.cpp
-@@ -339,7 +339,7 @@ void MP4RtpHintTrack::GetPayload(
-                 pSlash = strchr(pSlash, '/');
-                 if (pSlash != NULL) {
-                     pSlash++;
--                    if (pSlash != '\0') {
-+                    if (*pSlash != '\0') {
-                         length = (uint32_t)strlen(pRtpMap) - (pSlash - pRtpMap);
-                         *ppEncodingParams = (char *)MP4Calloc(length + 1);
-                         strncpy(*ppEncodingParams, pSlash, length);
diff --git a/media-libs/libmp4v2/files/libmp4v2-2.0.0-mp4tags-corruption.patch b/media-libs/libmp4v2/files/libmp4v2-2.0.0-mp4tags-corruption.patch
deleted file mode 100644
index 182d41bb8123..000000000000
--- a/media-libs/libmp4v2/files/libmp4v2-2.0.0-mp4tags-corruption.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: "Matteo F. Vescovi" <mfv@debian.org>
-Date: Thu, 5 Nov 2015 15:26:00 +0100
-Subject: Fix_mp4tags_corruption
-
----
- util/mp4tags.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/util/mp4tags.cpp b/util/mp4tags.cpp
-index 1b9e866..80e89d4 100644
---- a/util/mp4tags.cpp
-+++ b/util/mp4tags.cpp
-@@ -539,6 +539,7 @@ extern "C" int
-                         else {
-                             fprintf( stderr, "Art file %s not found\n", tags[i] );
-                         }
-+                        break;
-                     }
-                     case OPT_ALBUM_ARTIST:
-                         MP4TagsSetAlbumArtist( mdata, tags[i] );
diff --git a/media-libs/libmp4v2/libmp4v2-2.0.0-r2.ebuild b/media-libs/libmp4v2/libmp4v2-2.0.0-r2.ebuild
deleted file mode 100644
index a4c1965e9c1b..000000000000
--- a/media-libs/libmp4v2/libmp4v2-2.0.0-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P=${P/lib}
-
-inherit libtool
-
-DESCRIPTION="Functions for accessing ISO-IEC:14496-1:2001 MPEG-4 standard"
-HOMEPAGE="https://code.google.com/p/mp4v2/"
-SRC_URI="https://mp4v2.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="static-libs utils"
-# Tests need DejaGnu but are non-existent (just an empty framework)
-RESTRICT="test"
-
-BDEPEND="utils? ( sys-apps/help2man )"
-
-DOCS=( doc/{Authors,BuildSource,Documentation,ReleaseNotes,ToolGuide}.txt README )
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc7.patch"
-	"${FILESDIR}/${P}-mp4tags-corruption.patch"
-	"${FILESDIR}/${P}-clang.patch"
-	"${FILESDIR}/${P}-CVE-2018-14054.patch"
-	"${FILESDIR}/${P}-CVE-2018-14325.patch"
-	"${FILESDIR}/${P}-CVE-2018-14379.patch"
-	"${FILESDIR}/${P}-CVE-2018-14403.patch"
-	"${FILESDIR}/${P}-unsigned-int-cast.patch"
-)
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-gch \
-		$(use_enable utils util) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libmp4v2/libmp4v2-2.1.2.ebuild b/media-libs/libmp4v2/libmp4v2-2.1.2.ebuild
deleted file mode 100644
index 2b7c38415a27..000000000000
--- a/media-libs/libmp4v2/libmp4v2-2.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P=${P/lib}
-
-inherit cmake
-
-DESCRIPTION="Functions for accessing ISO-IEC:14496-1:2001 MPEG-4 standard"
-HOMEPAGE="https://mp4v2.org/"
-SRC_URI="https://github.com/enzo1982/mp4v2/releases/download/v${PV}/${MY_P}.tar.bz2"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="utils"
-# Tests need DejaGnu but are non-existent (just an empty framework)
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.0-unsigned-int-cast.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_UTILS=$(usex utils)
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index f4a428b9d76f..eae4c6147980 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -14,5 +14,5 @@ DIST opencv-4.7.0.tar.gz 91027497 BLAKE2B c76ae37a79e48f818b83383f35b4fe518d959e
 DIST opencv-4.7.0_contrib.tar.gz 59421940 BLAKE2B d427743c45d7430f3a6dd5712ad46bb7c2b9e88a48a3e924fb32c6a10cdb1f4205941453cc3e1340f02cd53ba5a13061f0da9a7e413072a6bd4a6529507b0939 SHA512 f0d878180655de4255cb72cf358a5949dfcf53a386e74f9a743902ac1bae12b2e812a1fc4ecc56a6afdc6adbffec867883a3245ce0b527614cc76e3710e23230
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
 EBUILD opencv-4.6.0-r4.ebuild 21277 BLAKE2B 458906fe516524a8d997e6645d16ca3621774795271cb06aa2bb414a5937139db84beffb1dfa39d96215f45aa56c93461463a62f5f771cfc16396b3d926e049b SHA512 2d2b557fe6b260cd4c3ffbd4159cac68dafb9fc22138ff2f119350723a44f3376ee39f20d8c8b2d61952d88d9a60b470d36477552f0a1eb9b12eccd690547e6e
-EBUILD opencv-4.7.0.ebuild 21245 BLAKE2B ea8c4a80f6c423a1c0ede4f53a8d683f59a70e9fb2276c3aa29f26179cb6a849f50defabdabfc7d2941936d96c3a3f394c095a855c7d97f8315ff6c3bda5d7ce SHA512 881d7cd165c06b4395733f32f64000c039f08de1e6c89bffabaf650bab67f2e30b9fe9e038aa17d1495ec3b4cd86b6d4caccc8c67352620620e3d9bde55ed0e3
+EBUILD opencv-4.7.0.ebuild 21244 BLAKE2B 2f1e489cf07e35cc4016b0e4380697eff4b89064c8ecc7a77cfea0c37b52cff1b357b019fd9954fee04ae39b6f7669f311a9057277542bd69e54d0e3b82e0557 SHA512 21abe29096d1e4846f20547d959ea647e4a34c89565bbc5fc2190b5fe592a7d54eaede9c4565476141541edea6b3e2966f9df245732bdaf169cd3c3e1fe07da9
 MISC metadata.xml 3147 BLAKE2B 37bb20a0fd752e1e3d4fae7f1b549be49648cb45cc3c6537a9bdb01b609cbab68a443bc17ded790bedd3afa800d1ce16c4220ebdd42a0d9dd73dacf415d29b5f SHA512 e9cf8dc6a63be3708ee595149122ffb2ef9722402716ac4a100c971a39c17e82e3d32253c03f56dd4814202a0727b29d8fb0879605a71c15e0a3f8e01e152069
diff --git a/media-libs/opencv/opencv-4.7.0.ebuild b/media-libs/opencv/opencv-4.7.0.ebuild
index 02e55d7aaac2..0ec33d67b52a 100644
--- a/media-libs/opencv/opencv-4.7.0.ebuild
+++ b/media-libs/opencv/opencv-4.7.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
 
 # The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
diff --git a/media-libs/speex/Manifest b/media-libs/speex/Manifest
index 408a0169c32a..c54ce38b3246 100644
--- a/media-libs/speex/Manifest
+++ b/media-libs/speex/Manifest
@@ -2,6 +2,6 @@ AUX speex-1.2.0-configure.patch 920 BLAKE2B 57b43aee0c57d6f0bf29202573d8f5caa65d
 AUX speex-1.2.1-valgrind.patch 1619 BLAKE2B 913c8b175637922364717084f892a6a7c7853f6b29cad146244e18f86de1a13d74b7aa1ffbf116de6d56547a2e625d1b70e19f5a7d5eb869197e8a14fb9e46ae SHA512 829a3e84e9f70e12fdd2d05d476cb622691203c945fbe6cce7bd6999a82c61449db21b455bb89deae60021a28dd2f64791159b2deaf1251b9cfb50a7f1b547b4
 AUX speex-1.2.1-vla-detection.patch 725 BLAKE2B ca4ba1fa56bf6bcd49c6b65d30e8d15331eeb4fbd8811b07a90659ff060e379e5446d0f8fe40769a4e19d7b4950ca510a865b7e26f9a2a2c3dc8d7d327c2219a SHA512 c759fcb9c18b498c69147c6e22aaec85bc508abf6c6a988536325f3dbfc9a15783b1e3d49f25d915f7b8d935c6a4aab28b0cef021c78b5fd0d7e053974eb544c
 DIST speex-1.2.1.tar.gz 1043278 BLAKE2B 60afa7eb9ff87ebb1b69e2716b7fa6727b49f6c06ed6eb6fe81236c65dc4128769618dd1f4df31af56a00e9b766c4050c1b3e415c8f972d64d1fb9e7a537a650 SHA512 52e00300df82e1c7fb527b245af02b99a1f37faef74d004b7cd981052f1aa22a412cb18f5c7a5618df4c958f727c97eb7385beec99d68548d5b02e76192d4e0a
-EBUILD speex-1.2.1-r1.ebuild 1903 BLAKE2B 2a94ed3c6bbf759491b3fa709af9c81686a02b0f7b8624bc0f17a4e03e18e7cef619791e3b231830f09293a70f52a3338042cea8d856ea06a85ce564d3900f34 SHA512 2f9ea5bbee7a39efae38a05fb53d4f52a0170b607fd6f8f93e863b9ebc05a12f915fc1c8b4d814468e496b3446b4a37d7c73d5defd3adfd7a240604835bcedbb
+EBUILD speex-1.2.1-r2.ebuild 1903 BLAKE2B 2a94ed3c6bbf759491b3fa709af9c81686a02b0f7b8624bc0f17a4e03e18e7cef619791e3b231830f09293a70f52a3338042cea8d856ea06a85ce564d3900f34 SHA512 2f9ea5bbee7a39efae38a05fb53d4f52a0170b607fd6f8f93e863b9ebc05a12f915fc1c8b4d814468e496b3446b4a37d7c73d5defd3adfd7a240604835bcedbb
 EBUILD speex-1.2.1.ebuild 1795 BLAKE2B d50ddb110044b2ce9b11773c9c99594c218070cd47078838196d225aa31b4f1d817c245a6026802ba1e727976eeb3a3d83e13b7a6b5e64b9cc214c72eeb031f8 SHA512 d920ef5d9ba74ca94b0812c1ec8ebe8f25053cf3329ec555a01013d6c3cce1356e3fc98f05f99065374f6cd5b10752da7da193a9358a6d0442a943d15ecc4621
 MISC metadata.xml 548 BLAKE2B 20ca971e89b8e1b610855fd5c4b05bafbc4b4cfd8e36e7a28f77b5555f01ee6e3f0b971b57accd8faa00c2ff60c9af12648a55b29878917354e5e9fbc6de9b5f SHA512 ef4cb05574ab0bb73081c67a50c866b6cc6b8f20a6de5cb6511eb3881804980dd57eb71a6e0fe5607c4898e593c762e63e91304afde8b3118bfd8bb69943b2a1
diff --git a/media-libs/speex/speex-1.2.1-r1.ebuild b/media-libs/speex/speex-1.2.1-r2.ebuild
index f84f46069fda..f84f46069fda 100644
--- a/media-libs/speex/speex-1.2.1-r1.ebuild
+++ b/media-libs/speex/speex-1.2.1-r2.ebuild