gentoo auto-resync : 01:08:2022 - 15:15:48

14 files changed, 174 insertions, 45 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index f1748cc74e62..5d43bfebbafa 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/liblscp/Manifest b/media-libs/liblscp/Manifest
index c80d4d4176b4..f523478a5f38 100644
--- a/media-libs/liblscp/Manifest
+++ b/media-libs/liblscp/Manifest
@@ -2,6 +2,6 @@ AUX liblscp-0.9.6-conditional.patch 350 BLAKE2B 5354ef415e5905d3dd03879372f6a434
 DIST liblscp-0.9.4.tar.gz 697219 BLAKE2B f1824c75237e478888ffcd95c15b72e4746cbc8997924f70cced966baddb68877526cbbcd56ff419fa1eb5f1ca6a1537ce5db368ba41cac39e51813921720e9b SHA512 6aa9b15d538925edf3327ca05023bac8285611902703fec20572416dde5cd7300ed429a7db464d92b9f6c1d524b89066888f8cbd0d56283ff3c78074605f396a
 DIST liblscp-0.9.6.tar.gz 100811 BLAKE2B a86a5e9e6d52dfd2449274e1c800e40887094dcea3e39d257670dded8b3805f2cdf575b41f640b0df95cd008656d3e7c8ca93d5bc5360c8727b80d6d2695ed83 SHA512 51c3b0b3dfe3947ac5d7cfec18fec597a4282aacc489cdda5a30d5853c3a43778e207ddf2f211c28ba04386fd6f30a09eed62dc2a33177e5aeccd7f77b4ef520
 EBUILD liblscp-0.9.4.ebuild 637 BLAKE2B 8f259597f3b0360dba84efbae838531fdf0524f7a962717ba691f4cc324a2a24d07163afd1efa0641db6fcc3a8bbb754bbef6c83580d703c52e1dd91139a39ae SHA512 659b7dfa673a2b07220b56e58ab84f9fa008a9727dae2bacdf5644e5453c49708cbc3491851f88d86977a90d7df74c9ad4b8f52158c7c1ae3e8e8b93bce7d374
-EBUILD liblscp-0.9.6.ebuild 750 BLAKE2B 4ec1fd94a04806df5a2c8ec18f12a21cb53159a933be39253bbf2ad3d2e505e8cc71d8bfcb8bfeb751da7fc60c18437d63c74c05e4a723f94106f1d4717bb4c7 SHA512 fdcb708593aec437922f534f90a1bee1040d68c5659d56645052f933f7dec512767d70b359f535db3d7fec4dd6677dda306e0c205be565b25a48d470290e687f
+EBUILD liblscp-0.9.6.ebuild 749 BLAKE2B 8c21ef8adab8b13b6f6fc134d5dd9abd14e5a67be8d01729761a849a48304db9f4a78896b77e2849b68bec783ac4c2ab6755a68a48e7fc23c8f7d75fc0536c86 SHA512 bccc5ddd3f2807d8ea3c94ee074bb3789128f7376deda30e4e51cd39c548d777c223072e6e25f312d2274c4bbf2fe5655f4ba2c6c5cdc9d61263f1bf4f4597a5
 EBUILD liblscp-9999.ebuild 750 BLAKE2B 4ec1fd94a04806df5a2c8ec18f12a21cb53159a933be39253bbf2ad3d2e505e8cc71d8bfcb8bfeb751da7fc60c18437d63c74c05e4a723f94106f1d4717bb4c7 SHA512 fdcb708593aec437922f534f90a1bee1040d68c5659d56645052f933f7dec512767d70b359f535db3d7fec4dd6677dda306e0c205be565b25a48d470290e687f
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-libs/liblscp/liblscp-0.9.6.ebuild b/media-libs/liblscp/liblscp-0.9.6.ebuild
index 5d0c3733b0ff..cf2d9a96da83 100644
--- a/media-libs/liblscp/liblscp-0.9.6.ebuild
+++ b/media-libs/liblscp/liblscp-0.9.6.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="https://www.rncbc.org/archive/${P}.tar.gz
 		https://download.linuxsampler.org/packages/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~x86"
+	KEYWORDS="amd64 ~ppc ~x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index 3cd8e386b423..edbc2efd623b 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,7 +1,7 @@
 AUX libmtp-1.1.19-fix-docdir.patch 462 BLAKE2B 5c23a2b98a138fb6bc51d49c07d556cff17357ce604cc7e11bf652e180d560cfc1befb2957629a5bb9e46876721fa62d186dd7e0a4dc0e95b74f41a3d5620f9c SHA512 50e15c26fe110d551c350ec11e9fc2309f8dfb26039e824e7d59aa1e5b5250e012397ed30278578524eb579132b0206fae8d5c40f387dd71b93ac7fc261ac2e7
 DIST libmtp-1.1.19.tar.gz 855810 BLAKE2B 0c570284e06b4f0aacc3edf5d19a0fe3f9ac6598319e8c803db0c69b35541ce7b1ab7cfd211ca701c7c6a9df300b689ccb7341d9d24f053c14411d5e91298849 SHA512 3cd3b0ea5aecb25abf4267e301d5e82ad9f6253bfa5a3bc4c70645d3007c69b014d6407c6703665d987cce3a42bd2219abbf1972e5964b39e9e1329bf9091044
 DIST libmtp-1.1.20.tar.gz 860941 BLAKE2B f30dddf6fb2b4c17e7792412787f65d369f811741e64a77b781a50e70161f0047e53c7e9d9e70621f98482d6fd430c71bd46188df894ef76109c9cb3d9c02f19 SHA512 d0892909eb9b001b727690b991c7effd8c4b78054ba07d06e060979ff2fd78d0d6303d46906d3bc86e4edba6f8a8d3c970eb875372f572ed84019bc717f74018
-EBUILD libmtp-1.1.19-r2.ebuild 1710 BLAKE2B 94dc2b986f7d2e8c33a40c5b82846508758dfacde64ab2411e3e58d3aac27b1495442fb1813c4c86d900bf012ea67c08c65f0dc8ea9642cf957b3dd9b79b2733 SHA512 230e50ebb1c614f78c04010a424d3bbef1dbc382685e144337312bf38f5a2de6a5b56c0ed8d2aa763cb1479b0a1cb2556252b6d970c9189072acdae750c84786
+EBUILD libmtp-1.1.19-r2.ebuild 1706 BLAKE2B 0fa26cf22568d2b66249ba3a6452fbafaa813f5c9990d0b26e7b3ffaec5f154d2a7ea46b062bc007909101369933f5417f7048c550712161e5f7aa66cf9ac8db SHA512 437eefb3c22e99cb6e81b89a1f68016399515c1383e7a8b9bb657210cf5f9dd8f0975c129c40480713d47f3937f9a8e986902b471064a1b28733b6a2846cb81f
 EBUILD libmtp-1.1.19.ebuild 1671 BLAKE2B 10bfcb9527fb3590bf8ad6daad17804abe282dfdd8662024029663fddf3101664b7083d282a5e8ee4eb42bb6f3a2e2ca3d018f8a6d7257447500f1d123754d4d SHA512 13aa3c4a74af67858b0a57f5f754dbc1654a9d83e63a29aecf72e1f887106722ae126fd8a9adc434659e966d9dfb5f9d182c0640e921edf17230a2c464b77976
 EBUILD libmtp-1.1.20.ebuild 1917 BLAKE2B bf554526e729ba781513545d5aaf2de97a5fdf66bc8fdfbc7805998de09d4bd6913c3f74439a179a92f73b773f1ce9d13b8c37138fc73d304b9e48cf4839c510 SHA512 c5491c946f3cfb5cfba7eea99ef4d9b007af034163fb91812075d9ed2e9581d7e78dd4357ba3fcec9c83e4e8384b252823948541b0d2c055c9b02043ae738fa5
 EBUILD libmtp-9999.ebuild 1859 BLAKE2B d6c4d0516b3028951494178b3823090a56e03b1777871134a3b6152709ebf6c00e0e6caee12d38a00453245402ce5499ee7b568880195f6cf45256bd76255e3c SHA512 f102aba2ae7d1b10997dd3dc2676f1463b5dd14890fe74796c4490524acd6d706a2cb3709f876c2ffb3e035a9599a027ca2b76519c61663185bef663f00a6f0f
diff --git a/media-libs/libmtp/libmtp-1.1.19-r2.ebuild b/media-libs/libmtp/libmtp-1.1.19-r2.ebuild
index fd347a6888d2..3daa860ef5ef 100644
--- a/media-libs/libmtp/libmtp-1.1.19-r2.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.19-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"
diff --git a/media-libs/libnjb/Manifest b/media-libs/libnjb/Manifest
index b675ac33c2ae..6ff274257726 100644
--- a/media-libs/libnjb/Manifest
+++ b/media-libs/libnjb/Manifest
@@ -2,6 +2,6 @@ AUX libnjb-2.2.7-exclude-samples.patch 288 BLAKE2B 8d9646562a8b7a07460577a563ae5
 AUX libnjb-2.2.7-fix-docdir.patch 462 BLAKE2B afc0ea3f8d8a776ed37f93fb2430f931cd154f1f88ed1a28fe8c5ebbd9b5501bf63de0999ed01fe79c72133f5e76c4e0cf7d4876e40fdf7f93ef1a5bac964c8c SHA512 f85f5ab0a628850cc2db04ef4beae79448bcd144002dca5552999c9487cb65ece8ca4bbcea9135b892cb813e8bfa28dd94c09e7d08ba562807f329217bef58d5
 AUX libnjb.rules 1773 BLAKE2B 3fdc3a8ceaec9b065e5ea174738642311b57f4cf41f2759375160ef0cdd6044434427f82dae8dc4cad167bfd4578b51bb019a3e4924883f8a6f9efc06a7fe6be SHA512 21d9aa5b0d0c170c3f8071a81981590714f6bbf203d5b6f973aea6a2365f69cde5008969748a2136b9791db327fc476d33fe8937cc7c7d26168ac1803738419a
 DIST libnjb-2.2.7.tar.gz 497862 BLAKE2B e6b7ba77d99f2f4e777ebdca6793d6a348073d9696b9b38b51bc7e29ddacff9a5d19116ca538416ef068496a8827700ed4f740e8ce0c0c1402751c97eb45ed58 SHA512 d217beb772024ec122739327dae9f1e991ace4c3dfe79a4960d1d7421c3d663f924304331025a1790ea7b697ac84d8926f3ab507c6d919e781e90ca82ef6fd06
-EBUILD libnjb-2.2.7-r2.ebuild 943 BLAKE2B f8e71417fe6652e74a0c35c9600e7c8dbad2cee72bcdb682c27aaf6dfedf7e26d0ba2a7d6575ea82237df4bf69cf17a6f3e89600678d9f2c0cdf3b678e4752b7 SHA512 cdcb47e9d15f08e193c3c432ee58bdf200a9544ae3c7636d9d321d3c23bc534c4f58b824ef2348d8990ef8ea9a8ebe32ea537a830481ef1372836746725d976f
+EBUILD libnjb-2.2.7-r2.ebuild 940 BLAKE2B 4d1b703dffdbb26991b00483cd7427f8ca9a06f7ee5551ad4497c92e8034ad6a842a2ca1c2e81d16dd750fe5078c811f6856b5c533179c6a7069226e310b5159 SHA512 a5192c07434007d40d30418793cbdb7f0e692b601bd9851b4e021cb5d620f301317e0fcc2cecda8061b6717cfced901959de324f3639498606bd914c4aa58bd7
 EBUILD libnjb-2.2.7.ebuild 901 BLAKE2B 6a80b5cbd83f412b2d266ced3351089b015b2b5236ced0ed8fffc159ffa55fe3c01490058f86d771fc8e486f24ceb23a246bf743ba733d2147be8cd5de3b7711 SHA512 8c9d7564228c4910c37caabb1803cff80603f7ca932f8bd0781a55a60e7eb25c47bd6e0195d18ad8445c1e79881042122bacdc00347188ec855bfce01e6392fc
 MISC metadata.xml 330 BLAKE2B 39ec86a9bd0ff38039476fcd261ba7c73f76e5fc753eef58396595adca1c3222ee7f0d84b2d13834448334b89641ad4b0d3d18d73052272e3d733138e3bfc019 SHA512 d01d952928c34e77ebc9b00e3248fce151c2d0bdef18a9e60512fbdeb76d473a57fd26ae3891bad2fe747e7d016a4cd84ce3029db6ad2918fe14f63dc7555dbb
diff --git a/media-libs/libnjb/libnjb-2.2.7-r2.ebuild b/media-libs/libnjb/libnjb-2.2.7-r2.ebuild
index 5673ca924821..56d8228e195f 100644
--- a/media-libs/libnjb/libnjb-2.2.7-r2.ebuild
+++ b/media-libs/libnjb/libnjb-2.2.7-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 ~x86"
 IUSE="doc static-libs"
 
 RDEPEND="virtual/libusb:0"
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index 7c00b2e35c6f..536a429887a7 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -1,5 +1,9 @@
 AUX openh264-2.1.0-pkgconfig-pathfix.patch 1949 BLAKE2B a3894b7cb65fcdb444d389ccf6644e404bb8375a910bd51bbe5e1b6b773e4d6890a17d2f1a09400d6d0cadc41be9321d86a09b93f861812f2d72a6c1c5e39fde SHA512 00c59bd1d6fe6355ce81ead4ba898f1f602e9f9c93e382c2ead3c353d5fd1f2bf3c46a30f3b248896c9a74d347a24e200644387ce3c70e886d941c115bb42088
+AUX openh264-2.3.0-pkgconfig-pathfix.patch 2023 BLAKE2B 9d380302efe14b45959123f69591aed9f552a954dd9f2f079ba1dc95edfc59869db9ece0ea65d52e58201829e0e4bb791f0380b36b35d288b40769c1c144005e SHA512 24fb7e1bf54d5c1512dab9f5b6cbd61863022d99a1a5d07d5a69037ad3b3857f2ac01fdfae4a1477f1b200c8a4b107247fb9f46af1219e71220e55167f1620ec
+DIST gmp-api-Firefox39-3a01c086d1b0394238ff1b5ad22e76022830625a.tar.gz 10464 BLAKE2B db6990a55b4128c267ee5ffa4e38edd2551c862e549776b4092d5683818001366665830c6304642cdd9c2c0afe06035edebafde769693082ae7a5236cdc463e8 SHA512 a6383834391d98754177b54df31d006144b5cad952df60115fd12fb6f0c87e571a10f9ce7276b817e4137efd97ffa7bca5092e289b0eb7cde2a3ad923319e874
 DIST gmp-api-Firefox39-e3935759360861812d33cbd3b713e25f1de1ecb5.tar.gz 10440 BLAKE2B 92379258f2664778baee50b99573dbeae50e723a3f7605c62a4ca3aedd9129fbd1991d7b3ead1b8a3689e71f783ded0b15dca5e6d910345c95a6f28898bbdda3 SHA512 85e4b58cc66072fad2b6dbaa65a955a8931f73eb3664f05ddca65157ac5c2547225910c36b4507d88179a95cfb35a5aff6edadd3c0fa5418529c80ae6d736f44
 DIST openh264-2.2.0.tar.gz 60275282 BLAKE2B 69e44396de229c65cf7a87d6f9ce8e2ef67fbdad6740f6aa64825b71fc00af945dca3e4726b9f0b4f4b83e363f3f7aadadabbab291c612b0fb61b42478a8cacf SHA512 637e2bfa45ad586c10fc8990cad4d824ada07e277fd965c3a6cdd19bc7836b2d7082574037a3ff2ee631207dd8cb0ec4f68abafdc19646b433de561c47ce8d38
+DIST openh264-2.3.0.tar.gz 60290792 BLAKE2B 08aa571471188c72bb0f098fa1cfaf9ba46ee4311f50518de868a2d7bbd61d9d4547cf5d33b3140d56c09a1ea7ea411bfaa96ed960e159876e6cc803f081b5d3 SHA512 5f0ccbb3c0026a010d9830e973312486f9d5ea8152afa3653ab6b3c43906a1169cebea70532134c1624846cc03b586e85b12cfd0621af505bd532a7dd833defd
 EBUILD openh264-2.2.0.ebuild 3615 BLAKE2B 4558f97d1cecd36a9417a0ee9205b3f39fa72c1716d0f0fa80e1f1150fd0a3c01f49da973f01878e9ffcf16756835fa825685ce6951d1e3d52330b96c63b4a37 SHA512 7b58faf74d181c2637ad9647fc0d53ee209839316b772b8f0e6ce96228419ad9fcf41fc9d01b1ba0fa59e595683d843ad3766dc9995bdc7fd11aec97f9c9d914
+EBUILD openh264-2.3.0.ebuild 3625 BLAKE2B 013276c1c0d079587e57cb1b2cfaa9734508edf4bd332d70d70d652a66dfa008af7669c1c9034e53dc1eeba6a72e0acacb8c47a19ba33ceef76494f15f037182 SHA512 c36ebf8476265e62fec0460cbf418379c4d12167295b7ad3d408712aecff2584c82931d6b4938c6128c2f00491b441b3bcdb29e654809e7e1ae5e167a37040db
 MISC metadata.xml 569 BLAKE2B 14a021fba978f0156bab46178d05a6b9f8f67fdeba784d587759207fe60ea1d74a383eec3fc40662c39d33fcecb71d8cafe7eb6354383c253e0a3f7f1e94feae SHA512 ceb77117c6a50f16640b329368c86db26127b8e501475dbaca4c53ba41315b0fc7161f6d9268cb86d1f6dbf2cf867e2bb0e6b5f45240ab3227b99b734c344efd
diff --git a/media-libs/openh264/files/openh264-2.3.0-pkgconfig-pathfix.patch b/media-libs/openh264/files/openh264-2.3.0-pkgconfig-pathfix.patch
new file mode 100644
index 000000000000..b36aad74e7b4
--- /dev/null
+++ b/media-libs/openh264/files/openh264-2.3.0-pkgconfig-pathfix.patch
@@ -0,0 +1,41 @@
+diff -Naur a/Makefile b/Makefile
+--- a/Makefile	2022-06-10 04:51:46.000000000 +0300
++++ b/Makefile	2022-08-01 10:28:52.698923925 +0300
+@@ -27,6 +27,7 @@
+ DESTDIR=
+ LIBDIR_NAME=lib
+ SHAREDLIB_DIR=$(PREFIX)/lib
++INCLUDES_DIR=$(PREFIX)/include
+ PROJECT_NAME=openh264
+ MODULE_NAME=gmpopenh264
+ GMP_API_BRANCH=Firefox39
+@@ -286,14 +287,14 @@
+ endif
+ 
+ $(PROJECT_NAME).pc: $(PROJECT_NAME).pc.in
+-	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@libdir@;$(PREFIX)/lib;' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $< > $@
++	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@libdir@;$(SHAREDLIB_DIR);' -e 's;@includesdir@;$(INCLUDES_DIR);' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $< > $@
+ 
+ $(PROJECT_NAME)-static.pc: $(PROJECT_NAME).pc.in
+-	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@libdir@;$(PREFIX)/lib;' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $< > $@
++	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@libdir@;$(SHAREDLIB_DIR);' -e 's;@includesdir@;$(INCLUDES_DIR);' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $< > $@
+ 
+ install-headers:
+-	mkdir -p $(DESTDIR)$(PREFIX)/include/wels
+-	install -m 644 $(SRC_PATH)/codec/api/wels/codec*.h $(DESTDIR)$(PREFIX)/include/wels
++	mkdir -p $(DESTDIR)$(INCLUDES_DIR)/wels
++	install -m 644 $(SRC_PATH)/codec/api/wels/codec*.h $(DESTDIR)$(INCLUDES_DIR)/wels
+ 
+ install-static-lib: $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) install-headers
+ 	mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)
+diff -Naur a/openh264.pc.in b/openh264.pc.in
+--- a/openh264.pc.in	2022-06-10 04:51:46.000000000 +0300
++++ b/openh264.pc.in	2022-08-01 10:38:28.231850059 +0300
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ libdir=@libdir@
+-includedir=${prefix}/include
++includedir=@includesdir@
+ 
+ Name: OpenH264
+ Description: OpenH264 is a codec library which supports H.264 encoding and decoding. It is suitable for use in real time applications such as WebRTC.
diff --git a/media-libs/openh264/openh264-2.3.0.ebuild b/media-libs/openh264/openh264-2.3.0.ebuild
new file mode 100644
index 000000000000..518d3060fe18
--- /dev/null
+++ b/media-libs/openh264/openh264-2.3.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs multilib-minimal
+
+MOZVER=39
+MY_GMP_COMMIT="3a01c086d1b0394238ff1b5ad22e76022830625a"
+
+DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages"
+HOMEPAGE="https://www.openh264.org/ https://github.com/cisco/openh264"
+SRC_URI="https://github.com/cisco/openh264/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/mozilla/gmp-api/archive/${MY_GMP_COMMIT}.tar.gz -> gmp-api-Firefox${MOZVER}-${MY_GMP_COMMIT}.tar.gz"
+LICENSE="BSD"
+
+# openh264 soname version.
+# (2.2.0 needed a minor bump due to undocumented but breaking ABI changes, just to be sure.
+#  https://github.com/cisco/openh264/issues/3459 )
+SLOT="0/6.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="cpu_flags_arm_neon cpu_flags_x86_avx2 +plugin utils"
+
+RESTRICT="bindist test"
+
+BDEPEND="
+	abi_x86_32? ( dev-lang/nasm )
+	abi_x86_64? ( dev-lang/nasm )"
+
+DOCS=( LICENSE CONTRIBUTORS README.md )
+
+PATCHES=( "${FILESDIR}"/openh264-2.3.0-pkgconfig-pathfix.patch )
+
+src_prepare() {
+	default
+
+	sed -i -e 's/ | generate-version//g' Makefile || die
+	sed -e 's|$FULL_VERSION|""|g' codec/common/inc/version_gen.h.template > \
+		codec/common/inc/version_gen.h
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	ln -s "${WORKDIR}"/gmp-api-${MY_GMP_COMMIT} gmp-api || die
+}
+
+emakecmd() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+	emake V=Yes CFLAGS_M32="" CFLAGS_M64="" CFLAGS_OPT="" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR_NAME="$(get_libdir)" \
+		SHAREDLIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
+		INCLUDES_DIR="${EPREFIX}/usr/include/${PN}" \
+		HAVE_AVX2=$(usex cpu_flags_x86_avx2 Yes No) \
+		ARCH="$(tc-arch)" \
+		$@
+}
+
+multilib_src_compile() {
+	local myopts="ENABLE64BIT=No"
+	case "${ABI}" in
+		s390x|alpha|*64) myopts="ENABLE64BIT=Yes";;
+	esac
+
+	if use arm; then
+		myopts+=" USE_ASM=$(usex cpu_flags_arm_neon Yes No)"
+	fi
+
+	emakecmd ${myopts}
+	use plugin && emakecmd ${myopts} plugin
+}
+
+multilib_src_install() {
+	emakecmd DESTDIR="${D}" install-shared
+
+	if use utils; then
+		newbin h264enc openh264enc
+		newbin h264dec openh264dec
+	fi
+
+	if use plugin; then
+		local plugpath="${ROOT}/usr/$(get_libdir)/nsbrowser/plugins/gmp-gmp${PN}/system-installed"
+		insinto "${plugpath}"
+		doins libgmpopenh264.so* gmpopenh264.info
+		echo "MOZ_GMP_PATH=\"${plugpath}\"" >"${T}"/98-moz-gmp-${PN}
+		doenvd "${T}"/98-moz-gmp-${PN}
+
+		cat <<PREFEOF >"${T}"/${P}.js
+pref("media.gmp-gmp${PN}.autoupdate", false);
+pref("media.gmp-gmp${PN}.version", "system-installed");
+PREFEOF
+
+		insinto /usr/$(get_libdir)/firefox/defaults/pref
+		newins "${T}"/${P}.js ${PN}-${PV/_p*/}.js
+
+		insinto /usr/$(get_libdir)/seamonkey/defaults/pref
+		newins "${T}"/${P}.js ${PN}-${PV/_p*/}.js
+	fi
+}
+
+pkg_postinst() {
+	if use plugin; then
+		if [[ -z ${REPLACING_VERSIONS} ]]; then
+			elog "Please restart your login session, in order for the session's environment"
+			elog "to include the new MOZ_GMP_PATH variable."
+			elog ""
+		fi
+		elog "This package attempts to override the Mozilla GMPInstaller auto-update process,"
+		elog "however even if it is not successful in doing so the profile-installed plugin"
+		elog "will not be used unless this package is removed.  This package will take precedence"
+		elog "over any gmp-gmpopenh264 that may be installed in a user's profile."
+		elog ""
+	fi
+
+	if use utils; then
+		elog "Utilities h264enc and h264dec are installed as openh264enc and openh264dec"
+		elog "to avoid file collisions with media-video/h264enc"
+		elog ""
+	fi
+}
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 1a3cce49567a..5b4aa9796d97 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -9,5 +9,5 @@ EBUILD openimageio-2.3.12.0-r3.ebuild 4640 BLAKE2B 7eeca5be1bd3c8e1fc81bf0fd1116
 EBUILD openimageio-2.3.13.0.ebuild 4654 BLAKE2B e9fad8d19fcabccb3cb318696fa65a9f4018559f323c31636bca4a82624a29ec08d709a3fd6e9f9b70329651f193649e66fc3bbf8f7c9450d784802aaea4c78f SHA512 76a527fa0e3c7b2978541129eb39b9c04f3a63e8b6cca448c34d277c29bb1146e309e1f30c6f70c0c8ca4ce477a33266beab8f9f6aeef7d6276daa7b7f255172
 EBUILD openimageio-2.3.15.0.ebuild 4652 BLAKE2B cbf5df67b5fc6461693c77758d5a2ded83a30973266f2bc5aa950f1c889a03510a6466ed4b9e67be01a8c46f52a7bd0867644613434bdaceaff8d8e76ff00080 SHA512 9ed6872bd72942c69981c30bce64019f7da0bcbad2aa7472426b93373837d0172d7f73cbcdf0fa0adcb38171eee470913f426a79c3740a3e06eb4bc62866428d
 EBUILD openimageio-2.3.16.0.ebuild 4654 BLAKE2B cebafc4a779e0e2d1ee40acfb3ada29440398f517183642fe720f1b4df169a6adcbb54aab92ea21658cc269cfb8f67647a6e37854abf2781d411e10c7bbe61d1 SHA512 0b7b997693bd9a2369cd9f2caec0f8ca4bfe76fd9a1f51f70ce059aa16a08ec0296c05bf175d5a27ca5e71f5748652cd2a98db0fbaab6a085fe8158f60e0b3d7
-EBUILD openimageio-2.3.17.0.ebuild 4654 BLAKE2B cebafc4a779e0e2d1ee40acfb3ada29440398f517183642fe720f1b4df169a6adcbb54aab92ea21658cc269cfb8f67647a6e37854abf2781d411e10c7bbe61d1 SHA512 0b7b997693bd9a2369cd9f2caec0f8ca4bfe76fd9a1f51f70ce059aa16a08ec0296c05bf175d5a27ca5e71f5748652cd2a98db0fbaab6a085fe8158f60e0b3d7
+EBUILD openimageio-2.3.17.0.ebuild 4653 BLAKE2B 91c85aac3055532fd783fa23bd852588ad633992f14ab1b7e272b189957597d8a9153f77f0b963b7b501550d3b9c300a2543e97e6b13c91e588fa298efcae1c5 SHA512 d1406fd437c95eae4638629327d3a040bbb5e1d527a4df87ead207b7ec452a13d55370ea2b7bed38b21928650c235258deaedde73a7f2b9e8187412cc0c7f2d4
 MISC metadata.xml 724 BLAKE2B 057b0c63428b1860a3b11442b9687b136a749935e3d0bb2e27eca00245d1d9e6f3e40aa796b723664b9b320d8c958a345812199ed04f8d1a476364a80c76e355 SHA512 5243cd4cac10b569e1488226b61c98012af13f50e32c023176e6a2ba29f7804e164b4774957b35f212bad62f496bb466b242d6bc1be44ca3ea0909371b9d5415
diff --git a/media-libs/openimageio/openimageio-2.3.17.0.ebuild b/media-libs/openimageio/openimageio-2.3.17.0.ebuild
index 347165ba2e87..e46f39f59107 100644
--- a/media-libs/openimageio/openimageio-2.3.17.0.ebuild
+++ b/media-libs/openimageio/openimageio-2.3.17.0.ebuild
@@ -23,7 +23,7 @@ LICENSE="BSD"
 # TODO: drop .1 on next SONAME change (2.3 -> 2.4?) as we needed to nudge it
 # for changing to openexr 3 which broke ABI.
 SLOT="0/$(ver_cut 1-2).1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 X86_CPU_FEATURES=(
 	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
diff --git a/media-libs/sbc/Manifest b/media-libs/sbc/Manifest
index 689cfb619b6f..419d6c975b55 100644
--- a/media-libs/sbc/Manifest
+++ b/media-libs/sbc/Manifest
@@ -1,6 +1,4 @@
 AUX sbc-1.5-ifdef-builtin.patch 871 BLAKE2B a63b5d5ce0e00723d8492a83e403d926eb16091b8eaf9c426cc24444a041949a6747fe134020261131f0681448111d2558b85391308157c828a96ea1b046c7d1 SHA512 bc1116ff941c88418e79bb35e1f08828d637e4d2d3192c1e808b1d5adc02e1942f968f49805365cb7a34817f119e24d8d9c3baf2133c77b91ba79a3e4446d249
-DIST sbc-1.5.tar.xz 264472 BLAKE2B 421a4cb5ab0e282255f8bdb810384e0a4d6d66835869489c22d51d2a0cabd7ef834bef3756ff887b9d9166dcfe88f4d661c26cb804e2868fb6106cc4886f9dcc SHA512 0243586188acede595317f2afbfdb41be5850d2a6133c374edbe5cbcf59a2a0fd4570d0b8f2d13ce9637ce48b2f1910c3e4ab1c0354dbf273ee67b09db8c4915
 DIST sbc-2.0.tar.xz 270888 BLAKE2B d6dd20499871a4c217833c98a2f134ed828438ec4e5aa2073c8b9fc96da5c9ffc2d32e7a56697186731ac540ab58ff0c52559aff575feb8f2da30172badd4921 SHA512 600e86aa492ca1af512ec8e568a08fe526cf2f6eb7306bb0fbdd9a844d03a2a5dedb5f986725aa2c66fe3fe43a7ba45d111e9666eb8912ff3e3a36b948adbc61
-EBUILD sbc-1.5.ebuild 887 BLAKE2B ca83eaca32006094585e5bbc89ee72a74721c027b5445233bee854fa46068816a9532c0956f41e967e0becbc27868e185c2c7761370740583fa3b16b1171dd51 SHA512 55ec0c9ab32d0171d4ca510b28147a79dfb5c192398f346d76bdc948777d4c685adbd5d6de180bc5e1b0d4f0411d442190c4772bdf1e15a5f02a4ae255e5ed00
 EBUILD sbc-2.0.ebuild 892 BLAKE2B bbad379780d3858cdc3dfe52c384b7362e5aca22f65523d1c4d03ea10fe37f8a38cc24ce4aeef8393ed617ad911fd50c98aeed7bea98f01175717cf3d99a4fb1 SHA512 1eca365d6c72808eb06c6972c1d7982375b99899048b2957805a75237b3e42a7d40f53e655b65f5afd42a31f65dad3e438fd32d84a4109a7f9e1b28db5bed31e
 MISC metadata.xml 357 BLAKE2B 17cc13819b617829b6bc8f8cad8a1ab04dffe094121b3d30849afee817c5c1c65ff9520c314a8a30a82316e0ef2f7dfecf99316d4f12f87f9a1032bf9b7bd84d SHA512 8eee906c78aa8619015de225ade4753afcd086a9ac9fd282c3db1b1a62744af84ec0effd13a45a727e1e2c03fbbbabd37d0aabfb6efaab6bfe491c46fdbe1346
diff --git a/media-libs/sbc/sbc-1.5.ebuild b/media-libs/sbc/sbc-1.5.ebuild
deleted file mode 100644
index 3b3911f194e9..000000000000
--- a/media-libs/sbc/sbc-1.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="Audio codec to connect bluetooth HQ audio devices as headphones or loudspeakers"
-HOMEPAGE="https://git.kernel.org/?p=bluetooth/sbc.git"
-SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="static-libs"
-
-# --enable-tester is building src/sbctester but the tarball is missing required
-# .wav file to execute it
-RESTRICT="test"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}-ifdef-builtin.patch" )
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		--disable-tester
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}