gentoo resync : 03.03.2021

7 files changed, 3 insertions, 617 deletions

diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index 44d619d6deb9..1c0799371155 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -1,9 +1,3 @@
-AUX gst-plugins-bad-1.14.5-make43.patch 7736 BLAKE2B b0b1b85e7bce7b267c382bd853b8edbe4b8b3e1e2aed52cba06aa5dbe954c050f21b8d1a47410b18071bb94b1a5c5121b7256557de42f2acd4196c9f8c25efbc SHA512 dff8b0e71ca151c81505e2a27f16ca998a56b2752457ad870d0bfdf610ad463575d29925141890922f588be9fbb3e8bdda7020d87732e30c9101782d6d5fa472
-AUX gst-plugins-bad-1.16.2-make43.patch 7494 BLAKE2B f3207f46b7bb4a56acb70ca5a337eb326e47b9b16fce36938ccfea0b1dbea09213190899843bda338063cfe38589b9badc2676826bcb463cb1c1d90f5dbc19f9 SHA512 ccfd579039d2696e268f7b6fa17930383a765ad472f1e6b5ccc90ee26cbaf9006b584aad3009d8a7882ebbf1533533ae001b4335c781decb0ac93591056c8c30
-DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04
-EBUILD gst-plugins-bad-1.14.5.ebuild 2681 BLAKE2B bc85aecf70149241ab47bf8fe6dc2f4a172feac1a445d713f7dd8a948efd0e2ab1c216c972e744c16f058aaa70b5c6641b49ccc8a2e598462dfeec57a31be9b5 SHA512 b4cbdeea64bbb9f86eace388008b5102a32e1101629a5dac7cd049dbb2c6adf021b91becc4ae6abed9ca6e58b7d66e3f11c94ff4780cc8e836034da552f3b9c0
-EBUILD gst-plugins-bad-1.16.2.ebuild 2303 BLAKE2B d2a38f50c1ee5806ffb1be74b1ce92e532521624457b69284b334ba728cb3b4c97180e07bb69620f413a635cd52c78d8ae7fd9a3fa028eb7b68a25396e032b67 SHA512 c5e7d28c33f5b146aaa979999c4c2b2e4b827977d0f342f7bc5b4a7350c459020efdbbcdaf2791aa4303b1ed67a500db639f1c08a4eb423615639a3c6633293c
-EBUILD gst-plugins-bad-1.16.3.ebuild 2206 BLAKE2B bcc5873674924143be5cce2d9e50dabea919f53a7ea2bb518d1f218cd3cb0500886fd62dad170e65c48c75d598038e50d35eeb8c73dcd1ceef2a3a4a57a2f338 SHA512 b9c8f1863c3a3e71f35013689cb0ec5bacda0ed1b66207eab8428e1d4a447551a402c4652d6a77bf2c7bf0fea259a6f1aa3b23adb839992bb9d51eb66e71b0ed
-MISC metadata.xml 439 BLAKE2B 5a4a36ccf4bd485eaf1fa66650eec8fa592d4c5bbf9fa478f1645e1b39649b7115694bf55dee7aeb4a5c53b2ba3c4614591cdf4e7d745938397c304108e0aa7c SHA512 9bd27a1a513fc2d697f7d0f2ceb7fa0701c446fe21b597256afd4c2c1f44145e875323ed1ef6202bf7b85472ab4aab43a4b6db5795bb1d28ff53a2a7e484055e
+EBUILD gst-plugins-bad-1.16.3.ebuild 2204 BLAKE2B 4997f2c2c124f632229b3dbe185f553b53be5419d00479d4b9c712bade33bc4558800c9e64648e603cb007f2fc6bf9c67f25cc8215e66e65e32e579c373c2eed SHA512 a508b1e0d2521cbc35ddeeef9fee6a46d89d9c9670a8037875573cd34492acd2a222bd95d09e78dfd4996c977e81ec71ba382f6c68578d7e6dbb15d95653255a
+MISC metadata.xml 345 BLAKE2B 2350705c0853758df34ef4e9217585b367adfa6f7a166e884c3e40a10cb2917b6c10dcc4438f41cd404337f70a9438114cfe7f301848637dddff626d8c25449e SHA512 26921a7928b3d70098a9f9d36c3f211a6e96df6ca42473ba98e083a52b2f9ab00a71336c0298751b9b46198f2277dada4db8097c0a4b09850e5ecd1a15db5436
diff --git a/media-libs/gst-plugins-bad/files/gst-plugins-bad-1.14.5-make43.patch b/media-libs/gst-plugins-bad/files/gst-plugins-bad-1.14.5-make43.patch
deleted file mode 100644
index 37d72b9f7e84..000000000000
--- a/media-libs/gst-plugins-bad/files/gst-plugins-bad-1.14.5-make43.patch
+++ /dev/null
@@ -1,227 +0,0 @@
---- a/common/glib-gen.mak
-+++ b/common/glib-gen.mak
-@@ -1,11 +1,13 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_enum_prefix=gst_color_balance
- 
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- 
- # these are all the rules generating the relevant files
- %-marshal.h: %-marshal.list
---- a/common/gst-glib-gen.mak
-+++ b/common/gst-glib-gen.mak
-@@ -1,14 +1,16 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- 
- # these are all the rules generating the relevant files
- $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
---- a/ext/srt/Makefile.in
-+++ b/ext/srt/Makefile.in
-@@ -17,12 +17,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- VPATH = @srcdir@
-@@ -795,7 +797,7 @@
- 	gstsrtserversink.h \
- 	$(NULL)
- 
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- all: all-am
- 
- .SUFFIXES:
---- a/ext/srtp/Makefile.in
-+++ b/ext/srtp/Makefile.in
-@@ -17,12 +17,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- VPATH = @srcdir@
- am__is_gnu_make = { \
-@@ -775,7 +777,7 @@
- BUILT_SOURCES = gstsrtp-enumtypes.c gstsrtp-enumtypes.h
- nodist_libgstsrtp_la_SOURCES = $(BUILT_SOURCES)
- CLEANFILES = $(BUILT_SOURCES)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
---- a/ext/webrtc/Makefile.in
-+++ b/ext/webrtc/Makefile.in
-@@ -17,12 +17,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- VPATH = @srcdir@
-@@ -797,7 +799,7 @@
- 
- libgstwebrtc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
- libgstwebrtc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- all: all-am
- 
- .SUFFIXES:
---- a/gst-libs/gst/interfaces/Makefile.in
-+++ b/gst-libs/gst/interfaces/Makefile.in
-@@ -17,12 +17,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- VPATH = @srcdir@
-@@ -773,7 +775,7 @@
- glib_gen_prefix = gst_photography
- glib_gen_basename = photography
- glib_gen_decl_banner = GST_PHOTOGRAPHY_API
--glib_gen_decl_include = \#include <gst/interfaces/photography-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/interfaces/photography-prelude.h>
- built_sources = \
- 	photography-enumtypes.c
- 
-@@ -805,7 +807,7 @@
- 	$(built_headers)
- 
- CLEANFILES = $(BUILT_SOURCES)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
---- a/gst-libs/gst/mpegts/Makefile.in
-+++ b/gst-libs/gst/mpegts/Makefile.in
-@@ -17,12 +17,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- 
-@@ -821,7 +823,7 @@
- glib_gen_prefix = gst_mpegts
- glib_gen_basename = gstmpegts
- glib_gen_decl_banner = GST_MPEGTS_API
--glib_gen_decl_include = \#include <gst/mpegts/mpegts-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/mpegts/mpegts-prelude.h>
- BUILT_SOURCES = gstmpegts-enumtypes.c gstmpegts-enumtypes.h
- nodist_libgstmpegts_@GST_API_VERSION@_la_SOURCES = gstmpegts-enumtypes.c
- CLEANFILES = $(BUILT_SOURCES) $(am__append_1)
-@@ -841,7 +843,7 @@
- @HAVE_INTROSPECTION_TRUE@gir_DATA = $(BUILT_GIRSOURCES)
- @HAVE_INTROSPECTION_TRUE@typelibsdir = $(libdir)/girepository-1.0/
- @HAVE_INTROSPECTION_TRUE@typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
---- a/gst-libs/gst/webrtc/Makefile.in
-+++ b/gst-libs/gst/webrtc/Makefile.in
-@@ -17,12 +17,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- 
-@@ -761,7 +763,7 @@
- glib_gen_prefix = gst_webrtc
- glib_gen_basename = webrtc
- glib_gen_decl_banner = GST_WEBRTC_API
--glib_gen_decl_include = \#include <gst/webrtc/webrtc_fwd.h>
-+glib_gen_decl_include = $(H)include <gst/webrtc/webrtc_fwd.h>
- built_sources = webrtc-enumtypes.c
- built_headers = webrtc-enumtypes.h
- BUILT_SOURCES = $(built_sources) $(built_headers)
-@@ -806,7 +808,7 @@
- 	$(GST_ALL_LDFLAGS) \
- 	$(GST_LT_LDFLAGS)
- 
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstWebRTC-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, $(libgstwebrtc_@GST_API_VERSION@include_HEADERS))
- @HAVE_INTROSPECTION_TRUE@gir_sources = $(patsubst %,$(srcdir)/%, $(libgstwebrtc_@GST_API_VERSION@_la_SOURCES)) $(BUILT_SOURCES)
diff --git a/media-libs/gst-plugins-bad/files/gst-plugins-bad-1.16.2-make43.patch b/media-libs/gst-plugins-bad/files/gst-plugins-bad-1.16.2-make43.patch
deleted file mode 100644
index f5caac7872d1..000000000000
--- a/media-libs/gst-plugins-bad/files/gst-plugins-bad-1.16.2-make43.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-diff --git a/common/glib-gen.mak b/common/glib-gen.mak
-index ef93a5f..cc02239 100644
---- a/common/glib-gen.mak
-+++ b/common/glib-gen.mak
-@@ -1,11 +1,13 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_enum_prefix=gst_color_balance
- 
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
- 
- # these are all the rules generating the relevant files
- %-marshal.h: %-marshal.list
-diff --git a/common/gst-glib-gen.mak b/common/gst-glib-gen.mak
-index 76b2233..5f2b1ed 100644
---- a/common/gst-glib-gen.mak
-+++ b/common/gst-glib-gen.mak
-@@ -1,6 +1,8 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
-@@ -8,7 +10,7 @@
- #glib_gen_decl_banner=GST_EXPORT
- #glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
- 
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
- 
- # these are all the rules generating the relevant files
- $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
-diff --git a/ext/srt/Makefile.in b/ext/srt/Makefile.in
-index 09109c3..e5f2a9d 100644
---- a/ext/srt/Makefile.in
-+++ b/ext/srt/Makefile.in
-@@ -17,6 +17,8 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
-@@ -794,7 +796,7 @@ noinst_HEADERS = \
- 	gstsrtsrc.h \
- 	$(NULL)
- 
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
-diff --git a/ext/srtp/Makefile.in b/ext/srtp/Makefile.in
-index 758db8e..017c075 100644
---- a/ext/srtp/Makefile.in
-+++ b/ext/srtp/Makefile.in
-@@ -17,6 +17,8 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
-@@ -775,7 +777,7 @@ glib_gen_basename = gstsrtp
- BUILT_SOURCES = gstsrtp-enumtypes.c gstsrtp-enumtypes.h
- nodist_libgstsrtp_la_SOURCES = $(BUILT_SOURCES)
- CLEANFILES = $(BUILT_SOURCES)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
-diff --git a/ext/webrtc/Makefile.in b/ext/webrtc/Makefile.in
-index da8fd9a..ec3588f 100644
---- a/ext/webrtc/Makefile.in
-+++ b/ext/webrtc/Makefile.in
-@@ -17,6 +17,8 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
-@@ -805,7 +807,7 @@ libgstwebrtc_la_LIBADD = \
- 
- libgstwebrtc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
- libgstwebrtc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
- all: all-am
- 
- .SUFFIXES:
-diff --git a/gst-libs/gst/interfaces/Makefile.in b/gst-libs/gst/interfaces/Makefile.in
-index ca1bde5..9d54c2e 100644
---- a/gst-libs/gst/interfaces/Makefile.in
-+++ b/gst-libs/gst/interfaces/Makefile.in
-@@ -17,6 +17,8 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
-@@ -773,7 +775,7 @@ glib_enum_define = GST_PHOTOGRAPHY
- glib_gen_prefix = gst_photography
- glib_gen_basename = photography
- glib_gen_decl_banner = GST_PHOTOGRAPHY_API
--glib_gen_decl_include = \#include <gst/interfaces/photography-prelude.h>
-+glib_gen_decl_include = ${H}include <gst/interfaces/photography-prelude.h>
- built_sources = \
- 	photography-enumtypes.c
- 
-@@ -806,7 +808,7 @@ BUILT_SOURCES = \
- 	$(built_headers)
- 
- CLEANFILES = $(BUILT_SOURCES)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
-diff --git a/gst-libs/gst/mpegts/Makefile.in b/gst-libs/gst/mpegts/Makefile.in
-index 7a145cb..91a81cc 100644
---- a/gst-libs/gst/mpegts/Makefile.in
-+++ b/gst-libs/gst/mpegts/Makefile.in
-@@ -17,6 +17,8 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
-@@ -822,7 +824,7 @@ glib_enum_define = GST_MPEGTS
- glib_gen_prefix = gst_mpegts
- glib_gen_basename = gstmpegts
- glib_gen_decl_banner = GST_MPEGTS_API
--glib_gen_decl_include = \#include <gst/mpegts/mpegts-prelude.h>
-+glib_gen_decl_include = ${H}include <gst/mpegts/mpegts-prelude.h>
- BUILT_SOURCES = gstmpegts-enumtypes.c gstmpegts-enumtypes.h
- nodist_libgstmpegts_@GST_API_VERSION@_la_SOURCES = gstmpegts-enumtypes.c
- CLEANFILES = $(BUILT_SOURCES) $(am__append_1)
-@@ -842,7 +844,7 @@ CLEANFILES = $(BUILT_SOURCES) $(am__append_1)
- @HAVE_INTROSPECTION_TRUE@gir_DATA = $(BUILT_GIRSOURCES)
- @HAVE_INTROSPECTION_TRUE@typelibsdir = $(libdir)/girepository-1.0/
- @HAVE_INTROSPECTION_TRUE@typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
-diff --git a/gst-libs/gst/webrtc/Makefile.in b/gst-libs/gst/webrtc/Makefile.in
-index 04146bc..1d0db28 100644
---- a/gst-libs/gst/webrtc/Makefile.in
-+++ b/gst-libs/gst/webrtc/Makefile.in
-@@ -17,6 +17,8 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
-@@ -761,7 +763,7 @@ glib_enum_define = GST_WEBRTC
- glib_gen_prefix = gst_webrtc
- glib_gen_basename = webrtc
- glib_gen_decl_banner = GST_WEBRTC_API
--glib_gen_decl_include = \#include <gst/webrtc/webrtc_fwd.h>
-+glib_gen_decl_include = ${H}include <gst/webrtc/webrtc_fwd.h>
- built_sources = webrtc-enumtypes.c
- built_headers = webrtc-enumtypes.h
- BUILT_SOURCES = $(built_sources) $(built_headers)
-@@ -807,7 +809,7 @@ libgstwebrtc_@GST_API_VERSION@_la_LDFLAGS = \
- 	$(GST_ALL_LDFLAGS) \
- 	$(GST_LT_LDFLAGS)
- 
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstWebRTC-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, $(libgstwebrtc_@GST_API_VERSION@include_HEADERS))
- @HAVE_INTROSPECTION_TRUE@gir_sources = $(patsubst %,$(srcdir)/%, $(libgstwebrtc_@GST_API_VERSION@_la_SOURCES)) $(BUILT_SOURCES)
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild
deleted file mode 100644
index ceb2433d5d84..000000000000
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE="gst-plugins-bad"
-
-inherit flag-o-matic gstreamer virtualx
-
-DESCRIPTION="Less plugins for GStreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-
-# TODO: egl and gtk IUSE only for transition
-IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant
-
-# X11 is automagic for now, upstream #709530 - only used by librfb USE=vnc plugin
-# We mirror opengl/gles2 from -base to ensure no automagic openglmixers plugin (with "opengl?" it'd still get built with USE=-opengl here)
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},egl?,introspection?,gles2=,opengl=]
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
-
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	vnc? ( X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) )
-	wayland? (
-		>=dev-libs/wayland-1.4.0[${MULTILIB_USEDEP}]
-		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.4
-	)
-
-	gtk? ( >=media-plugins/gst-plugins-gtk-${PV}:${SLOT}[${MULTILIB_USEDEP}] )
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.12
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.14.5-make43.patch # remove when bumping and switching to Meson
-)
-
-src_prepare() {
-	default
-	addpredict /dev # Prevent sandbox violations bug #570624
-}
-
-multilib_src_configure() {
-	local myconf=()
-	if use opengl || use gles2; then
-		myconf+=( --enable-gl )
-	else
-		myconf+=( --disable-gl )
-	fi
-
-	# Always enable shm (shm_open) and ipcpipeline (sys/socket.h); no extra deps
-	gstreamer_multilib_src_configure \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable bzip2 bz2) \
-		$(use_enable orc) \
-		$(use_enable vcd) \
-		$(use_enable vnc librfb) \
-		$(use_enable wayland) \
-		--disable-examples \
-		--disable-debug \
-		--without-player-tests \
-		--enable-shm \
-		--enable-ipcpipeline \
-		"${myconf[@]}"
-
-	if multilib_is_native_abi; then
-		local x
-		for x in libs plugins; do
-			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	unset DISPLAY
-	# Tests are slower than upstream expects
-	virtx emake check CK_DEFAULT_TIMEOUT=300
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.2.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.2.ebuild
deleted file mode 100644
index 4e59e10b3ade..000000000000
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE="gst-plugins-bad"
-
-inherit flag-o-matic gstreamer virtualx
-
-DESCRIPTION="Less plugins for GStreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-
-IUSE="X bzip2 +introspection +orc vnc wayland"
-
-# X11 is automagic for now, upstream #709530 - only used by librfb USE=vnc plugin
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
-
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	vnc? ( X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) )
-	wayland? (
-		>=dev-libs/wayland-1.11.0[${MULTILIB_USEDEP}]
-		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.15
-	)
-
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.12
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.16.2-make43.patch # remove when bumping and switching to Meson
-)
-
-src_prepare() {
-	default
-	addpredict /dev # Prevent sandbox violations bug #570624
-}
-
-multilib_src_configure() {
-	# Always enable shm (shm_open) and ipcpipeline (sys/socket.h); no extra deps
-	gstreamer_multilib_src_configure \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable bzip2 bz2) \
-		$(use_enable orc) \
-		$(use_enable vnc librfb) \
-		$(use_enable wayland) \
-		--disable-examples \
-		--disable-debug \
-		--without-player-tests \
-		--enable-shm \
-		--enable-ipcpipeline \
-		--disable-gl # eclass probably does this too, but be explicit as it used to be handled in ebuild here; all parts now in gst-plugins-base instead
-
-	if multilib_is_native_abi; then
-		local x
-		for x in libs plugins; do
-			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	unset DISPLAY
-	# Tests are slower than upstream expects
-	virtx emake check CK_DEFAULT_TIMEOUT=300
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.3.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.3.ebuild
index faecf4215dad..db635b8782a6 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.3.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 IUSE="X bzip2 +introspection +orc vnc wayland"
 
diff --git a/media-libs/gst-plugins-bad/metadata.xml b/media-libs/gst-plugins-bad/metadata.xml
index c51baf610a15..ad9bf185482b 100644
--- a/media-libs/gst-plugins-bad/metadata.xml
+++ b/media-libs/gst-plugins-bad/metadata.xml
@@ -7,7 +7,5 @@
 	</maintainer>
 	<use>
 		<flag name="bzip2">Enable bzip2 encoder/decoder plugin</flag>
-		<flag name="egl">Enable EGL support</flag>
-		<flag name="gles2">Enable GLES2 support</flag>
 	</use>
 </pkgmetadata>