gentoo resync : 30.05.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-05-30 11:44:06 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-05-30 11:44:06 +0100
commit: f516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree: 8bfecb640b7b6403d7a3d662d923eed630033da7 /media-plugins
parent: 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)
31 files changed, 1120 insertions, 435 deletions
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index dd39b54cb221..560dc4fd2af1 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index 9f043b3322fd..1dbef847d01c 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,6 +1,6 @@
 DIST audacious-plugins-3.10.1.tar.bz2 1715477 BLAKE2B fda3940e6c06aadd93a3e1538be747083fcc969cf3118cf3e942787906b9ee0a13bd3c30d15ba19cb713559cdf8f7b71d7b961173b1619f0aafbdea5deb75ac3 SHA512 454e9ce4061e92a0ecda40f562d4cc7453fc0019fd76b25dbe9e319319fa37c22f9785cb29563e8074de8a88e6130106aca1e431790297e1b4636dc974fde565
 DIST audacious-plugins-4.0.3.tar.bz2 1759123 BLAKE2B 7a389a1d8f1bc17ce53e4e8c2560291c00b305ca0988f7ee27ce8a15d4be200d380a3525d43d1c04f6de9d7653f73c91721ba985801dc49dfa64b56309145f9b SHA512 6aaf9ca1d70e211e779baa65de844118f2e3c5ecef2ce6342429748e64437ddc67286ea286fbd7b0282304747dab31972f73ccb0aa312968c19d832ac0e0a6fc
-EBUILD audacious-plugins-3.10.1-r2.ebuild 4268 BLAKE2B 89595f04ce408acdbd1ac1603a29727d74e9400db3f41b1715de1935a21f7cb237f3172c674ca3c57fabd855f57b6c539498a87d1c2e2ea29c7d0baff5104d51 SHA512 e9e0a904d12bf6db1042cccfb2fb28a8f96c492df2722e9b9e61c1578b48b7ec7ff9bb472a55f980e06c952122853aad828a860439831dd5efa8b4ba3d7394f7
-EBUILD audacious-plugins-4.0.3.ebuild 4174 BLAKE2B 650562a5f819a58da73f6a291e05ce27f04668d5f9aefb71d63cdeb0cdd583bddf2be27f272849f6d5c907564e89bd9ce8bbd1cd436712b2a7da6c8797f9f3cc SHA512 ff9cc660ed95229aac78010683de5da5ac4aeaaae756561b3b42e551c47bad34bbf1a6d4602ec7234f423194a0404ee05ea003dc233cb94dd5a76b8023bde452
+EBUILD audacious-plugins-3.10.1-r3.ebuild 3849 BLAKE2B c829fdcb6a41aad4cf807ccf0719a1877789a06e1811fa64a574dad26838723cbafacf6645235417e2b68cecfeb2bb66b4a3d061816fcab8e554a8bc34a9c5c9 SHA512 7b5710f309e15c2e465531edf626238faa607369f2a46fb0b4defe3523286f04ae897c6016c0c4ff1f540e8701e7ee9ca15921840b32c8ae001257793b3dfd0d
+EBUILD audacious-plugins-4.0.3.ebuild 4145 BLAKE2B e05a4040a1c2f61f111ce4f4f3ef1e60c3e4594a292bc989dfc467fb8aefd2b30cfaca1576ef7ec582d1c851b89b75381e5a52a991809c75923629c5b3cd762c SHA512 5f6dae8d50a5a3641d27fa8edfe47b9fd5f56e05d984522a913c2211bc2885f45cc92a81ada71611220072166ec62122009804b086b6aeecfa898d68c2bc39de
 EBUILD audacious-plugins-9999.ebuild 4444 BLAKE2B 7d6b475ded94f7fcfe9ae74efb3a8558cd599686c14c02ed0498e2b8945e791392cc269bdeb28f437f4ec7671a396fae37e2d6680e7ba4fae4df438ab4a0626e SHA512 21c95c887368cf14dd32a2fe6405d02f66ab17e53163b6d9660e61adf99f31330f4e5a40e9be1abc14b2b88e14064e7472cca80c08b768a194edd5c16a878e88
-MISC metadata.xml 1383 BLAKE2B cbd59fa551c1841640a017477023c49554180f8cb4aa2d4700973da93f7fa3208ea44127c56c7cece22e0542f2ee9f900876e962d4a375d1ddff159bfa59a651 SHA512 4338dbb924441a1f49dd4a37c22089772ca7638966127427d49fe128084ab3790b313edde2f07b73e2a8a48f6fb54369b45e0769273796eeda258a19a3da308c
+MISC metadata.xml 1317 BLAKE2B 49a347b9594d7f9c5fe658313e06205b419899f13af88a3d7ca8b03ffbf6359da8ea4c4645781c248f8f72c889e2e21d125e9469bad22da66df464b3002d2bbc SHA512 8b510eca153c546d9ed25466652b5318b220f9fb6ca3c07c61ecdc5595366bece42d6aeb938d3c522f775d6dd4ad54d60749b43d84dad1441d782628aa70dc3f
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.10.1-r2.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.10.1-r3.ebuild
index d0436f7ae10f..90d1e42911e3 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.10.1-r2.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.10.1-r3.ebuild
@@ -17,11 +17,9 @@ HOMEPAGE="https://audacious-media-player.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth http gme jack lame libav libnotify libsamplerate
-	lirc mms modplug mp3 nls opengl pulseaudio qt5 qtmedia scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
-REQUIRED_USE="
-	|| ( alsa jack pulseaudio qtmedia sdl )
-	ampache? ( qt5 http ) qtmedia? ( qt5 )"
+IUSE="aac +alsa bs2b cdda cue ffmpeg flac fluidsynth http gme jack lame libnotify libsamplerate
+	lirc mms modplug mp3 nls opengl pulseaudio scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
+REQUIRED_USE="|| ( alsa jack pulseaudio sdl )"
 
 # The following plugins REQUIRE a GUI build of audacious, because non-GUI
 # builds do NOT install the libaudgui library & headers.
@@ -50,10 +48,12 @@ DEPEND="
 	dev-libs/dbus-glib
 	dev-libs/glib
 	dev-libs/libxml2:2
-	~media-sound/audacious-${PV}[qt5=]
+	~media-sound/audacious-${PV}[-qt5(-)]
+	x11-libs/gtk+:2
+	x11-libs/libXcomposite
+	x11-libs/libXrender
 	aac? ( >=media-libs/faad2-2.7 )
 	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	ampache? ( =media-libs/ampache_browser-1* )
 	bs2b? ( media-libs/libbs2b )
 	cdda? (
 		dev-libs/libcdio:=
@@ -80,18 +80,6 @@ DEPEND="
 	modplug? ( media-libs/libmodplug )
 	mp3? ( >=media-sound/mpg123-1.12.1 )
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	!qt5? (
-		x11-libs/gtk+:2
-		x11-libs/libXcomposite
-		x11-libs/libXrender
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	qtmedia? ( dev-qt/qtmultimedia:5 )
 	scrobbler? ( net-misc/curl )
 	sdl? ( media-libs/libsdl2[sound] )
 	sid? ( >=media-libs/libsidplayfp-1.0.0 )
@@ -122,13 +110,18 @@ src_configure() {
 	local myeconfargs=(
 		--enable-mpris2
 		--enable-songchange
+		--enable-aosd
+		--enable-gtk
+		--enable-hotkey
 		--disable-adplug # not packaged
-		--disable-oss4
+		--disable-ampache # needs Qt5
 		--disable-coreaudio
+		--disable-oss4
+		--disable-qt
+		--disable-qtaudio
 		--disable-sndio
 		$(use_enable aac)
 		$(use_enable alsa)
-		$(use_enable ampache)
 		$(use_enable bs2b)
 		$(use_enable cdda cdaudio)
 		$(use_enable cue)
@@ -147,11 +140,6 @@ src_configure() {
 		$(use_enable mp3 mpg123)
 		$(use_enable nls)
 		$(use_enable pulseaudio pulse)
-		$(use_enable !qt5 aosd)
-		$(use_enable !qt5 gtk)
-		$(use_enable !qt5 hotkey)
-		$(use_enable qt5 qt)
-		$(use_enable qtmedia qtaudio)
 		$(use_enable scrobbler scrobbler2)
 		$(use_enable sdl sdlout)
 		$(use_enable sid)
@@ -160,9 +148,8 @@ src_configure() {
 		$(use_enable speedpitch)
 		$(use_enable vorbis)
 		$(use_enable wavpack)
-		$(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg))
+		$(use_with ffmpeg ffmpeg ffmpeg)
 	)
-	use qt5 && myeconfargs+=( $(usex opengl --enable-qtglspectrum --disable-qtglspectrum) )
 
 	econf "${myeconfargs[@]}"
 }
diff --git a/media-plugins/audacious-plugins/audacious-plugins-4.0.3.ebuild b/media-plugins/audacious-plugins/audacious-plugins-4.0.3.ebuild
index a911f9f7c86c..5dc53ffed93c 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-4.0.3.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-4.0.3.ebuild
@@ -10,17 +10,16 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git"
 else
 	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DESCRIPTION="Lightweight and versatile audio player"
 HOMEPAGE="https://audacious-media-player.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack
-	lame libav libnotify libsamplerate lirc mms modplug mp3 nls opengl
-	pulseaudio qtmedia scrobbler sdl sid sndfile soxr speedpitch streamtuner
-	vorbis wavpack"
+IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack lame
+	libnotify libsamplerate lirc mms modplug mp3 nls opengl pulseaudio qtmedia
+	scrobbler sdl sid sndfile soxr speedpitch streamtuner vorbis wavpack"
 REQUIRED_USE="
 	|| ( alsa jack pulseaudio qtmedia sdl )
 	ampache? ( http ) streamtuner? ( http )"
@@ -159,7 +158,7 @@ src_configure() {
 		$(use_enable streamtuner)
 		$(use_enable vorbis)
 		$(use_enable wavpack)
-		$(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg))
+		$(use_with ffmpeg ffmpeg ffmpeg)
 	)
 
 	econf "${myeconfargs[@]}"
diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml
index 7fee56dc3a5c..02bd0208b848 100644
--- a/media-plugins/audacious-plugins/metadata.xml
+++ b/media-plugins/audacious-plugins/metadata.xml
@@ -17,7 +17,6 @@
 		<flag name="gme">Support various gaming console music formats</flag>
 		<flag name="gtk">Build with GTK interface instead of Qt5</flag>
 		<flag name="http">Support HTTP streams through neon</flag>
-		<flag name="qt5">Build with Qt5 interface instead of GTK</flag>
 		<flag name="qtmedia">Enable playback via <pkg>dev-qt/qtmultimedia</pkg></flag>
 		<flag name="scrobbler">Build with scrobbler/LastFM submission support</flag>
 		<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
diff --git a/media-plugins/gst-plugins-lv2/Manifest b/media-plugins/gst-plugins-lv2/Manifest
index 48c990038ce6..81e9c1bb5b3d 100644
--- a/media-plugins/gst-plugins-lv2/Manifest
+++ b/media-plugins/gst-plugins-lv2/Manifest
@@ -1,5 +1,6 @@
+AUX patch-1.16.2-gcc10.patch 25387 BLAKE2B c8dfc47869907912af37258b63e790cb630ac0898ca3710faee6a6d08f2a1f6e0507823cf7b9a3ef017f26304962b94424afdce74f3af137170055fa72e42a68 SHA512 083f5b6436cacf33bca72ede6075d10d77682426cc8161f9a643f721f62dfe791951948290fc32b419e0127b524e9f2b7112a30d6ba0b2f46fef62566d18b18f
 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
 EBUILD gst-plugins-lv2-1.14.5.ebuild 363 BLAKE2B d01960509cb629f29b87e578b11b7bd1f6f23e89134f30494cfe4d900d10c4fd38ddf37d83e0ffc50e3691d3c1933a8fc109622da6912dc4970ca50d396ef749 SHA512 780c562eafdb72c3b32ced3f9f03834dd584f0a36d43a0d1287183596d7d721b51cfe7769371b063740dc3d34029a2ee75895ee15516c8acac2026b0677ecf4a
-EBUILD gst-plugins-lv2-1.16.2.ebuild 365 BLAKE2B b5bd3e522364d225095cfa339572ac8403932d5d39c7eabc8dd4cd70f88b82059f4f12a05f14126418240d52c914c1b31e4e95a3ada0c1769476d09481c23642 SHA512 3431a8d9fb7d808ffa74d900bfd0be26690422615ea1570e538f3be20ad31d04a3cb8b64bc39bae7cfee23df4faf9de7f5aeb0622311ba87cd086dae7857a8c0
+EBUILD gst-plugins-lv2-1.16.2-r1.ebuild 418 BLAKE2B 9f4660e65c2aba2c6131608371dfd76d3d6753ed589a4dbd80ec1c78a009d71d7c84fa08a2f0092ea1b14139cd5be1dc1303728343074640390a4704475862ad SHA512 f5fc3f2f8960861738980db5f50bcc82a0a3cb7575bfd3809e2ee865af5cf88a5e2dbb0e7cf2109429caa9025afbcee3b4f8010773c7fd04b7343387899c4be7
 MISC metadata.xml 373 BLAKE2B 6e4682246da86a7f498c11bb63a8c8acd13d6b62c527db46a4030ae641d8f86d8e6fdfb67af1e53043fd3ea0c54086d67944c99a08f693a15e59d887fd99c977 SHA512 e0a9334a77c4ab15b765c27ace9033ea1aac985a2050e5048dccc4af340ed4fab99b79c6b40a2b668b2559d5bcdcd2076091f7376af3b973df8eb3236ce43956
diff --git a/media-plugins/gst-plugins-lv2/files/patch-1.16.2-gcc10.patch b/media-plugins/gst-plugins-lv2/files/patch-1.16.2-gcc10.patch
new file mode 100644
index 000000000000..cdfa976d0560
--- /dev/null
+++ b/media-plugins/gst-plugins-lv2/files/patch-1.16.2-gcc10.patch
@@ -0,0 +1,606 @@
+Bug: https://bugs.gentoo.org/716008
+
+--- a/ext/lv2/gstlv2.c
++++ b/ext/lv2/gstlv2.c
+@@ -69,6 +69,38 @@
+ #error "Unsupported OS"
+ #endif
+ 
++LilvWorld *gst_lv2_world_node = NULL;
++LilvNode *gst_lv2_audio_node = NULL;
++LilvNode *gst_lv2_control_node = NULL;
++LilvNode *gst_lv2_cv_node = NULL;
++LilvNode *gst_lv2_event_node = NULL;
++LilvNode *gst_lv2_input_node = NULL;
++LilvNode *gst_lv2_output_node = NULL;
++LilvNode *gst_lv2_preset_node = NULL;
++LilvNode *gst_lv2_state_iface_node = NULL;
++LilvNode *gst_lv2_state_uri_node = NULL;
++
++LilvNode *gst_lv2_integer_prop_node = NULL;
++LilvNode *gst_lv2_toggled_prop_node = NULL;
++LilvNode *gst_lv2_designation_pred_node = NULL;
++LilvNode *gst_lv2_in_place_broken_pred_node = NULL;
++LilvNode *gst_lv2_optional_pred_node = NULL;
++LilvNode *gst_lv2_group_pred_node = NULL;
++LilvNode *gst_lv2_supports_event_pred_node = NULL;
++LilvNode *gst_lv2_label_pred_node = NULL;
++
++LilvNode *gst_lv2_center_role_node = NULL;
++LilvNode *gst_lv2_left_role_node = NULL;
++LilvNode *gst_lv2_right_role_node = NULL;
++LilvNode *gst_lv2_rear_center_role_node = NULL;
++LilvNode *gst_lv2_rear_left_role_node = NULL;
++LilvNode *gst_lv2_rear_right_role_node = NULL;
++LilvNode *gst_lv2_lfe_role_node = NULL;
++LilvNode *gst_lv2_center_left_role_node = NULL;
++LilvNode *gst_lv2_center_right_role_node = NULL;
++LilvNode *gst_lv2_side_left_role_node = NULL;
++LilvNode *gst_lv2_side_right_role_node = NULL;
++
+ GstStructure *lv2_meta_all = NULL;
+ 
+ static void
+@@ -98,9 +130,11 @@
+   for (i = 0; i < lilv_plugin_get_num_ports (lv2plugin); i++) {
+     const LilvPort *port = lilv_plugin_get_port_by_index (lv2plugin, i);
+ 
+-    if (lilv_port_is_a (lv2plugin, port, audio_class)) {
+-      const gboolean is_input = lilv_port_is_a (lv2plugin, port, input_class);
+-      LilvNodes *lv2group = lilv_port_get (lv2plugin, port, group_pred);
++    if (lilv_port_is_a (lv2plugin, port, gst_lv2_audio_node)) {
++      const gboolean is_input =
++          lilv_port_is_a (lv2plugin, port, gst_lv2_input_node);
++      LilvNodes *lv2group =
++          lilv_port_get (lv2plugin, port, gst_lv2_group_pred_node);
+ 
+       if (lv2group) {
+         const gchar *uri = lilv_node_as_uri (lv2group);
+@@ -116,8 +150,8 @@
+         (*audio_in)++;
+       else
+         (*audio_out)++;
+-    } else if (lilv_port_is_a (lv2plugin, port, control_class) ||
+-        lilv_port_is_a (lv2plugin, port, cv_class)) {
++    } else if (lilv_port_is_a (lv2plugin, port, gst_lv2_control_node) ||
++        lilv_port_is_a (lv2plugin, port, gst_lv2_cv_node)) {
+       (*control)++;
+     }
+   }
+@@ -130,7 +164,7 @@
+ {
+   guint audio_in, audio_out, control;
+   LilvIter *i;
+-  const LilvPlugins *plugins = lilv_world_get_all_plugins (world);
++  const LilvPlugins *plugins = lilv_world_get_all_plugins (gst_lv2_world_node);
+ 
+   for (i = lilv_plugins_begin (plugins); !lilv_plugins_is_end (plugins, i);
+       i = lilv_plugins_next (plugins, i)) {
+@@ -187,8 +221,9 @@
+     }
+ 
+     /* check supported extensions */
+-    can_do_presets = lilv_plugin_has_extension_data (lv2plugin, state_iface)
+-        || lilv_plugin_has_feature (lv2plugin, state_uri)
++    can_do_presets =
++        lilv_plugin_has_extension_data (lv2plugin, gst_lv2_state_iface_node)
++        || lilv_plugin_has_feature (lv2plugin, gst_lv2_state_uri_node)
+         || (control > 0);
+     GST_INFO ("plugin %s can%s do presets", type_name,
+         (can_do_presets ? "" : "'t"));
+@@ -224,8 +259,8 @@
+   GST_DEBUG_CATEGORY_INIT (lv2_debug, "lv2",
+       GST_DEBUG_FG_GREEN | GST_DEBUG_BG_BLACK | GST_DEBUG_BOLD, "LV2");
+ 
+-  world = lilv_world_new ();
+-  lilv_world_load_all (world);
++  gst_lv2_world_node = lilv_world_new ();
++  lilv_world_load_all (gst_lv2_world_node);
+   gst_lv2_host_init ();
+ 
+ /* have been added after lilv-0.22.0, which is the last release */
+@@ -236,37 +271,57 @@
+ #define LILV_URI_CV_PORT      "http://lv2plug.in/ns/lv2core#CVPort"
+ #endif
+ 
+-  atom_class = lilv_new_uri (world, LILV_URI_ATOM_PORT);
+-  audio_class = lilv_new_uri (world, LILV_URI_AUDIO_PORT);
+-  control_class = lilv_new_uri (world, LILV_URI_CONTROL_PORT);
+-  cv_class = lilv_new_uri (world, LILV_URI_CV_PORT);
+-  event_class = lilv_new_uri (world, LILV_URI_EVENT_PORT);
+-  input_class = lilv_new_uri (world, LILV_URI_INPUT_PORT);
+-  output_class = lilv_new_uri (world, LILV_URI_OUTPUT_PORT);
+-  preset_class = lilv_new_uri (world, LV2_PRESETS__Preset);
+-  state_iface = lilv_new_uri (world, LV2_STATE__interface);
+-  state_uri = lilv_new_uri (world, LV2_STATE_URI);
+-
+-  integer_prop = lilv_new_uri (world, LV2_CORE__integer);
+-  toggled_prop = lilv_new_uri (world, LV2_CORE__toggled);
+-  designation_pred = lilv_new_uri (world, LV2_CORE__designation);
+-  in_place_broken_pred = lilv_new_uri (world, LV2_CORE__inPlaceBroken);
+-  optional_pred = lilv_new_uri (world, LV2_CORE__optionalFeature);
+-  group_pred = lilv_new_uri (world, LV2_PORT_GROUPS__group);
+-  supports_event_pred = lilv_new_uri (world, LV2_EVENT__supportsEvent);
+-  label_pred = lilv_new_uri (world, LILV_NS_RDFS "label");
+-
+-  center_role = lilv_new_uri (world, LV2_PORT_GROUPS__center);
+-  left_role = lilv_new_uri (world, LV2_PORT_GROUPS__left);
+-  right_role = lilv_new_uri (world, LV2_PORT_GROUPS__right);
+-  rear_center_role = lilv_new_uri (world, LV2_PORT_GROUPS__rearCenter);
+-  rear_left_role = lilv_new_uri (world, LV2_PORT_GROUPS__rearLeft);
+-  rear_right_role = lilv_new_uri (world, LV2_PORT_GROUPS__rearLeft);
+-  lfe_role = lilv_new_uri (world, LV2_PORT_GROUPS__lowFrequencyEffects);
+-  center_left_role = lilv_new_uri (world, LV2_PORT_GROUPS__centerLeft);
+-  center_right_role = lilv_new_uri (world, LV2_PORT_GROUPS__centerRight);
+-  side_left_role = lilv_new_uri (world, LV2_PORT_GROUPS__sideLeft);
+-  side_right_role = lilv_new_uri (world, LV2_PORT_GROUPS__sideRight);
++  gst_lv2_audio_node = lilv_new_uri (gst_lv2_world_node, LILV_URI_AUDIO_PORT);
++  gst_lv2_control_node =
++      lilv_new_uri (gst_lv2_world_node, LILV_URI_CONTROL_PORT);
++  gst_lv2_cv_node = lilv_new_uri (gst_lv2_world_node, LILV_URI_CV_PORT);
++  gst_lv2_event_node = lilv_new_uri (gst_lv2_world_node, LILV_URI_EVENT_PORT);
++  gst_lv2_input_node = lilv_new_uri (gst_lv2_world_node, LILV_URI_INPUT_PORT);
++  gst_lv2_output_node = lilv_new_uri (gst_lv2_world_node, LILV_URI_OUTPUT_PORT);
++  gst_lv2_preset_node = lilv_new_uri (gst_lv2_world_node, LV2_PRESETS__Preset);
++  gst_lv2_state_iface_node =
++      lilv_new_uri (gst_lv2_world_node, LV2_STATE__interface);
++  gst_lv2_state_uri_node = lilv_new_uri (gst_lv2_world_node, LV2_STATE_URI);
++
++  gst_lv2_integer_prop_node =
++      lilv_new_uri (gst_lv2_world_node, LV2_CORE__integer);
++  gst_lv2_toggled_prop_node =
++      lilv_new_uri (gst_lv2_world_node, LV2_CORE__toggled);
++  gst_lv2_designation_pred_node =
++      lilv_new_uri (gst_lv2_world_node, LV2_CORE__designation);
++  gst_lv2_in_place_broken_pred_node =
++      lilv_new_uri (gst_lv2_world_node, LV2_CORE__inPlaceBroken);
++  gst_lv2_optional_pred_node =
++      lilv_new_uri (gst_lv2_world_node, LV2_CORE__optionalFeature);
++  gst_lv2_group_pred_node =
++      lilv_new_uri (gst_lv2_world_node, LV2_PORT_GROUPS__group);
++  gst_lv2_supports_event_pred_node =
++      lilv_new_uri (gst_lv2_world_node, LV2_EVENT__supportsEvent);
++  gst_lv2_label_pred_node =
++      lilv_new_uri (gst_lv2_world_node, LILV_NS_RDFS "label");
++
++  gst_lv2_center_role_node =
++      lilv_new_uri (gst_lv2_world_node, LV2_PORT_GROUPS__center);
++  gst_lv2_left_role_node =
++      lilv_new_uri (gst_lv2_world_node, LV2_PORT_GROUPS__left);
++  gst_lv2_right_role_node =
++      lilv_new_uri (gst_lv2_world_node, LV2_PORT_GROUPS__right);
++  gst_lv2_rear_center_role_node =
++      lilv_new_uri (gst_lv2_world_node, LV2_PORT_GROUPS__rearCenter);
++  gst_lv2_rear_left_role_node =
++      lilv_new_uri (gst_lv2_world_node, LV2_PORT_GROUPS__rearLeft);
++  gst_lv2_rear_right_role_node =
++      lilv_new_uri (gst_lv2_world_node, LV2_PORT_GROUPS__rearRight);
++  gst_lv2_lfe_role_node =
++      lilv_new_uri (gst_lv2_world_node, LV2_PORT_GROUPS__lowFrequencyEffects);
++  gst_lv2_center_left_role_node =
++      lilv_new_uri (gst_lv2_world_node, LV2_PORT_GROUPS__centerLeft);
++  gst_lv2_center_right_role_node =
++      lilv_new_uri (gst_lv2_world_node, LV2_PORT_GROUPS__centerRight);
++  gst_lv2_side_left_role_node =
++      lilv_new_uri (gst_lv2_world_node, LV2_PORT_GROUPS__sideLeft);
++  gst_lv2_side_right_role_node =
++      lilv_new_uri (gst_lv2_world_node, LV2_PORT_GROUPS__sideRight);
+ 
+   gst_plugin_add_dependency_simple (plugin,
+       "LV2_PATH:" GST_LV2_ENVVARS, GST_LV2_DEFAULT_PATH, NULL,
+@@ -323,39 +378,38 @@
+ #endif
+      static void plugin_cleanup (GstPlugin * plugin)
+ {
+-  lilv_node_free (atom_class);
+-  lilv_node_free (audio_class);
+-  lilv_node_free (control_class);
+-  lilv_node_free (cv_class);
+-  lilv_node_free (event_class);
+-  lilv_node_free (input_class);
+-  lilv_node_free (output_class);
+-  lilv_node_free (preset_class);
+-  lilv_node_free (state_iface);
+-  lilv_node_free (state_uri);
+-
+-  lilv_node_free (integer_prop);
+-  lilv_node_free (toggled_prop);
+-  lilv_node_free (designation_pred);
+-  lilv_node_free (in_place_broken_pred);
+-  lilv_node_free (optional_pred);
+-  lilv_node_free (group_pred);
+-  lilv_node_free (supports_event_pred);
+-  lilv_node_free (label_pred);
+-
+-  lilv_node_free (center_role);
+-  lilv_node_free (left_role);
+-  lilv_node_free (right_role);
+-  lilv_node_free (rear_center_role);
+-  lilv_node_free (rear_left_role);
+-  lilv_node_free (rear_right_role);
+-  lilv_node_free (lfe_role);
+-  lilv_node_free (center_left_role);
+-  lilv_node_free (center_right_role);
+-  lilv_node_free (side_left_role);
+-  lilv_node_free (side_right_role);
++  lilv_node_free (gst_lv2_audio_node);
++  lilv_node_free (gst_lv2_control_node);
++  lilv_node_free (gst_lv2_cv_node);
++  lilv_node_free (gst_lv2_event_node);
++  lilv_node_free (gst_lv2_input_node);
++  lilv_node_free (gst_lv2_output_node);
++  lilv_node_free (gst_lv2_preset_node);
++  lilv_node_free (gst_lv2_state_iface_node);
++  lilv_node_free (gst_lv2_state_uri_node);
++
++  lilv_node_free (gst_lv2_integer_prop_node);
++  lilv_node_free (gst_lv2_toggled_prop_node);
++  lilv_node_free (gst_lv2_designation_pred_node);
++  lilv_node_free (gst_lv2_in_place_broken_pred_node);
++  lilv_node_free (gst_lv2_optional_pred_node);
++  lilv_node_free (gst_lv2_group_pred_node);
++  lilv_node_free (gst_lv2_supports_event_pred_node);
++  lilv_node_free (gst_lv2_label_pred_node);
++
++  lilv_node_free (gst_lv2_center_role_node);
++  lilv_node_free (gst_lv2_left_role_node);
++  lilv_node_free (gst_lv2_right_role_node);
++  lilv_node_free (gst_lv2_rear_center_role_node);
++  lilv_node_free (gst_lv2_rear_left_role_node);
++  lilv_node_free (gst_lv2_rear_right_role_node);
++  lilv_node_free (gst_lv2_lfe_role_node);
++  lilv_node_free (gst_lv2_center_left_role_node);
++  lilv_node_free (gst_lv2_center_right_role_node);
++  lilv_node_free (gst_lv2_side_left_role_node);
++  lilv_node_free (gst_lv2_side_right_role_node);
+ 
+-  lilv_world_free (world);
++  lilv_world_free (gst_lv2_world_node);
+ }
+ 
+ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+--- a/ext/lv2/gstlv2filter.c
++++ b/ext/lv2/gstlv2filter.c
+@@ -183,37 +183,37 @@
+ gst_lv2_filter_role_to_position (LilvNode * role)
+ {
+   /* Front.  Mono and left/right are mututally exclusive */
+-  if (lilv_node_equals (role, center_role)) {
++  if (lilv_node_equals (role, gst_lv2_center_role_node)) {
+ 
+     return GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER;
+-  } else if (lilv_node_equals (role, left_role)) {
++  } else if (lilv_node_equals (role, gst_lv2_left_role_node)) {
+     return GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT;
+-  } else if (lilv_node_equals (role, right_role)) {
++  } else if (lilv_node_equals (role, gst_lv2_right_role_node)) {
+     return GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT;
+ 
+     /* Rear. Left/right and center are mututally exclusive */
+-  } else if (lilv_node_equals (role, rear_center_role)) {
++  } else if (lilv_node_equals (role, gst_lv2_rear_center_role_node)) {
+     return GST_AUDIO_CHANNEL_POSITION_REAR_CENTER;
+-  } else if (lilv_node_equals (role, rear_left_role)) {
++  } else if (lilv_node_equals (role, gst_lv2_rear_left_role_node)) {
+     return GST_AUDIO_CHANNEL_POSITION_REAR_LEFT;
+-  } else if (lilv_node_equals (role, rear_right_role)) {
++  } else if (lilv_node_equals (role, gst_lv2_rear_right_role_node)) {
+     return GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT;
+ 
+     /* Subwoofer/low-frequency-effects */
+-  } else if (lilv_node_equals (role, lfe_role)) {
++  } else if (lilv_node_equals (role, gst_lv2_lfe_role_node)) {
+     return GST_AUDIO_CHANNEL_POSITION_LFE1;
+ 
+     /* Center front speakers. Center and left/right_of_center
+      * are mutually exclusive */
+-  } else if (lilv_node_equals (role, center_left_role)) {
++  } else if (lilv_node_equals (role, gst_lv2_center_left_role_node)) {
+     return GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER;
+-  } else if (lilv_node_equals (role, center_right_role)) {
++  } else if (lilv_node_equals (role, gst_lv2_center_right_role_node)) {
+     return GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER;
+ 
+     /* sides */
+-  } else if (lilv_node_equals (role, side_left_role)) {
++  } else if (lilv_node_equals (role, gst_lv2_side_left_role_node)) {
+     return GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT;
+-  } else if (lilv_node_equals (role, side_right_role)) {
++  } else if (lilv_node_equals (role, gst_lv2_side_right_role_node)) {
+     return GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT;
+   }
+ 
+@@ -531,7 +531,8 @@
+ {
+   gst_lv2_init (&self->lv2, &klass->lv2);
+ 
+-  if (!lilv_plugin_has_feature (klass->lv2.plugin, in_place_broken_pred))
++  if (!lilv_plugin_has_feature (klass->lv2.plugin,
++          gst_lv2_in_place_broken_pred_node))
+     gst_base_transform_set_in_place (GST_BASE_TRANSFORM (self), TRUE);
+ }
+ 
+--- a/ext/lv2/gstlv2.h
++++ b/ext/lv2/gstlv2.h
+@@ -28,40 +28,39 @@
+ 
+ #include "gstlv2utils.h"
+ 
+-LilvWorld *world;
+-LilvNode *atom_class;
+-LilvNode *audio_class;
+-LilvNode *control_class;
+-LilvNode *cv_class;
+-LilvNode *event_class;
+-LilvNode *input_class;
+-LilvNode *output_class;
+-LilvNode *preset_class;
+-LilvNode *state_iface;
+-LilvNode *state_uri;
+-
+-LilvNode *integer_prop;
+-LilvNode *toggled_prop;
+-LilvNode *designation_pred;
+-LilvNode *in_place_broken_pred;
+-LilvNode *optional_pred;
+-LilvNode *group_pred;
+-LilvNode *supports_event_pred;
+-LilvNode *label_pred;
+-
+-LilvNode *center_role;
+-LilvNode *left_role;
+-LilvNode *right_role;
+-LilvNode *rear_center_role;
+-LilvNode *rear_left_role;
+-LilvNode *rear_right_role;
+-LilvNode *lfe_role;
+-LilvNode *center_left_role;
+-LilvNode *center_right_role;
+-LilvNode *side_left_role;
+-LilvNode *side_right_role;
++G_GNUC_INTERNAL extern LilvWorld *gst_lv2_world_node;
++G_GNUC_INTERNAL extern LilvNode *gst_lv2_audio_node;
++G_GNUC_INTERNAL extern LilvNode *gst_lv2_control_node;
++G_GNUC_INTERNAL extern LilvNode *gst_lv2_cv_node;
++G_GNUC_INTERNAL extern LilvNode *gst_lv2_event_node;
++G_GNUC_INTERNAL extern LilvNode *gst_lv2_input_node;
++G_GNUC_INTERNAL extern LilvNode *gst_lv2_output_node;
++G_GNUC_INTERNAL extern LilvNode *gst_lv2_preset_node;
++G_GNUC_INTERNAL extern LilvNode *gst_lv2_state_iface_node;
++G_GNUC_INTERNAL extern LilvNode *gst_lv2_state_uri_node;
++
++G_GNUC_INTERNAL extern LilvNode *gst_lv2_integer_prop_node;
++G_GNUC_INTERNAL extern LilvNode *gst_lv2_toggled_prop_node;
++G_GNUC_INTERNAL extern LilvNode *gst_lv2_designation_pred_node;
++G_GNUC_INTERNAL extern LilvNode *gst_lv2_in_place_broken_pred_node;
++G_GNUC_INTERNAL extern LilvNode *gst_lv2_optional_pred_node;
++G_GNUC_INTERNAL extern LilvNode *gst_lv2_group_pred_node;
++G_GNUC_INTERNAL extern LilvNode *gst_lv2_supports_event_pred_node;
++G_GNUC_INTERNAL extern LilvNode *gst_lv2_label_pred_node;
++
++G_GNUC_INTERNAL extern LilvNode *gst_lv2_center_role_node;
++G_GNUC_INTERNAL extern LilvNode *gst_lv2_left_role_node;
++G_GNUC_INTERNAL extern LilvNode *gst_lv2_right_role_node;
++G_GNUC_INTERNAL extern LilvNode *gst_lv2_rear_center_role_node;
++G_GNUC_INTERNAL extern LilvNode *gst_lv2_rear_left_role_node;
++G_GNUC_INTERNAL extern LilvNode *gst_lv2_rear_right_role_node;
++G_GNUC_INTERNAL extern LilvNode *gst_lv2_lfe_role_node;
++G_GNUC_INTERNAL extern LilvNode *gst_lv2_center_left_role_node;
++G_GNUC_INTERNAL extern LilvNode *gst_lv2_center_right_role_node;
++G_GNUC_INTERNAL extern LilvNode *gst_lv2_side_left_role_node;
++G_GNUC_INTERNAL extern LilvNode *gst_lv2_side_right_role_node;
+ 
+-GstStructure *lv2_meta_all;
++G_GNUC_INTERNAL extern GstStructure *lv2_meta_all;
+ 
+ void gst_lv2_filter_register_element (GstPlugin *plugin,
+                                       GstStructure * lv2_meta);
+--- a/ext/lv2/gstlv2utils.c
++++ b/ext/lv2/gstlv2utils.c
+@@ -173,7 +173,9 @@
+   if (!lv2->presets) {
+     LilvNodes *presets;
+ 
+-    if ((presets = lilv_plugin_get_related (lv2->klass->plugin, preset_class))) {
++    if ((presets =
++            lilv_plugin_get_related (lv2->klass->plugin,
++                gst_lv2_preset_node))) {
+       LilvIter *j;
+ 
+       lv2->presets = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
+@@ -184,8 +186,10 @@
+         const LilvNode *preset = lilv_nodes_get (presets, j);
+         LilvNodes *titles;
+ 
+-        lilv_world_load_resource (world, preset);
+-        titles = lilv_world_find_nodes (world, preset, label_pred, NULL);
++        lilv_world_load_resource (gst_lv2_world_node, preset);
++        titles =
++            lilv_world_find_nodes (gst_lv2_world_node, preset,
++            gst_lv2_label_pred_node, NULL);
+         if (titles) {
+           const LilvNode *title = lilv_nodes_get_first (titles);
+           g_hash_table_insert (lv2->presets,
+@@ -249,7 +253,8 @@
+ gst_lv2_load_preset (GstLV2 * lv2, GstObject * obj, const gchar * name)
+ {
+   LilvNode *preset = g_hash_table_lookup (lv2->presets, name);
+-  LilvState *state = lilv_state_new_from_world (world, &lv2_map, preset);
++  LilvState *state =
++      lilv_state_new_from_world (gst_lv2_world_node, &lv2_map, preset);
+   gpointer user_data[] = { lv2->klass, obj };
+ 
+   GST_INFO_OBJECT (obj, "loading preset <%s>", lilv_node_as_string (preset));
+@@ -291,7 +296,7 @@
+   gpointer user_data[] = { lv2->klass, obj };
+   LilvState *state;
+   LilvNode *bundle_dir;
+-  const LilvNode *state_uri;
++  const LilvNode *gst_lv2_state_uri_node;
+   LilvInstance *instance = lv2->instance;
+   gboolean res;
+ #ifndef HAVE_LILV_0_22
+@@ -319,27 +324,27 @@
+ 
+   lilv_state_set_label (state, name);
+ 
+-  res = lilv_state_save (world, &lv2_map, &lv2_unmap, state, /*uri */ NULL, dir,
+-      filename) != 0;
++  res = lilv_state_save (gst_lv2_world_node, &lv2_map, &lv2_unmap, state,       /*uri */
++      NULL, dir, filename) != 0;
+ 
+-  /* reload bundle into the world */
+-  bundle_dir = lilv_new_file_uri (world, NULL, dir);
+-  lilv_world_unload_bundle (world, bundle_dir);
+-  lilv_world_load_bundle (world, bundle_dir);
++  /* reload bundle into the gst_lv2_world_node */
++  bundle_dir = lilv_new_file_uri (gst_lv2_world_node, NULL, dir);
++  lilv_world_unload_bundle (gst_lv2_world_node, bundle_dir);
++  lilv_world_load_bundle (gst_lv2_world_node, bundle_dir);
+   lilv_node_free (bundle_dir);
+ 
+ #ifdef HAVE_LILV_0_22
+-  state_uri = lilv_state_get_uri (state);
++  gst_lv2_state_uri_node = lilv_state_get_uri (state);
+ #else
+   filepath = g_build_filename (dir, filename, NULL);
+-  state_uri = lilv_new_uri (world, filepath);
++  gst_lv2_state_uri_node = lilv_new_uri (gst_lv2_world_node, filepath);
+   g_free (filepath);
+ #endif
+-  lilv_world_load_resource (world, state_uri);
++  lilv_world_load_resource (gst_lv2_world_node, gst_lv2_state_uri_node);
+   g_hash_table_insert (lv2->presets, g_strdup (name),
+-      lilv_node_duplicate (state_uri));
++      lilv_node_duplicate (gst_lv2_state_uri_node));
+ #ifndef HAVE_LILV_0_22
+-  lilv_node_free ((LilvNode *) state_uri);
++  lilv_node_free ((LilvNode *) gst_lv2_state_uri_node);
+ #endif
+ 
+   lilv_state_free (state);
+@@ -370,10 +375,11 @@
+ {
+ #ifdef HAVE_LILV_0_22
+   LilvNode *preset = g_hash_table_lookup (lv2->presets, name);
+-  LilvState *state = lilv_state_new_from_world (world, &lv2_map, preset);
++  LilvState *state =
++      lilv_state_new_from_world (gst_lv2_world_node, &lv2_map, preset);
+ 
+-  lilv_world_unload_resource (world, lilv_state_get_uri (state));
+-  lilv_state_delete (world, state);
++  lilv_world_unload_resource (gst_lv2_world_node, lilv_state_get_uri (state));
++  lilv_state_delete (gst_lv2_world_node, state);
+   lilv_state_free (state);
+ #endif
+   g_hash_table_remove (lv2->presets, name);
+@@ -620,13 +626,13 @@
+       lilv_node_as_string (lilv_plugin_get_uri (lv2plugin)), name, nick);
+ 
+   perms = G_PARAM_READABLE;
+-  if (lilv_port_is_a (lv2plugin, port, input_class))
++  if (lilv_port_is_a (lv2plugin, port, gst_lv2_input_node))
+     perms |= G_PARAM_WRITABLE | G_PARAM_CONSTRUCT;
+-  if (lilv_port_is_a (lv2plugin, port, control_class) ||
+-      lilv_port_is_a (lv2plugin, port, cv_class))
++  if (lilv_port_is_a (lv2plugin, port, gst_lv2_control_node) ||
++      lilv_port_is_a (lv2plugin, port, gst_lv2_cv_node))
+     perms |= GST_PARAM_CONTROLLABLE;
+ 
+-  if (lilv_port_has_property (lv2plugin, port, toggled_prop)) {
++  if (lilv_port_has_property (lv2plugin, port, gst_lv2_toggled_prop_node)) {
+     ret = g_param_spec_boolean (name, nick, nick, FALSE, perms);
+     goto done;
+   }
+@@ -722,7 +728,8 @@
+ 
+   if (enum_type != G_TYPE_INVALID) {
+     ret = g_param_spec_enum (name, nick, nick, enum_type, def, perms);
+-  } else if (lilv_port_has_property (lv2plugin, port, integer_prop))
++  } else if (lilv_port_has_property (lv2plugin, port,
++          gst_lv2_integer_prop_node))
+     ret = g_param_spec_int (name, nick, nick, lower, upper, def, perms);
+   else
+     ret = g_param_spec_float (name, nick, nick, lower, upper, def, perms);
+@@ -814,14 +821,14 @@
+   GstStructure *lv2_meta = g_value_get_boxed (value);
+   const LilvPlugin *lv2plugin;
+   guint j, in_pad_index = 0, out_pad_index = 0;
+-  const LilvPlugins *plugins = lilv_world_get_all_plugins (world);
++  const LilvPlugins *plugins = lilv_world_get_all_plugins (gst_lv2_world_node);
+   LilvNode *plugin_uri;
+   const gchar *element_uri;
+ 
+   GST_DEBUG ("LV2 initializing class");
+ 
+   element_uri = gst_structure_get_string (lv2_meta, "element-uri");
+-  plugin_uri = lilv_new_uri (world, element_uri);
++  plugin_uri = lilv_new_uri (gst_lv2_world_node, element_uri);
+   g_assert (plugin_uri);
+   lv2plugin = lilv_plugins_get_by_uri (plugins, plugin_uri);
+   g_assert (lv2plugin);
+@@ -838,11 +845,13 @@
+   /* find ports and groups */
+   for (j = 0; j < lilv_plugin_get_num_ports (lv2plugin); j++) {
+     const LilvPort *port = lilv_plugin_get_port_by_index (lv2plugin, j);
+-    const gboolean is_input = lilv_port_is_a (lv2plugin, port, input_class);
++    const gboolean is_input =
++        lilv_port_is_a (lv2plugin, port, gst_lv2_input_node);
+     const gboolean is_optional = lilv_port_has_property (lv2plugin, port,
+-        optional_pred);
++        gst_lv2_optional_pred_node);
+     GstLV2Port desc = { j, GST_LV2_PORT_AUDIO, -1, };
+-    LilvNodes *lv2group = lilv_port_get (lv2plugin, port, group_pred);
++    LilvNodes *lv2group =
++        lilv_port_get (lv2plugin, port, gst_lv2_group_pred_node);
+     /* FIXME Handle channels positionning
+      * GstAudioChannelPosition position = GST_AUDIO_CHANNEL_POSITION_INVALID; */
+ 
+@@ -860,7 +869,7 @@
+ 
+       /* FIXME Handle channels positionning
+          position = GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT;
+-         sub_values = lilv_port_get_value (lv2plugin, port, designation_pred);
++         sub_values = lilv_port_get_value (lv2plugin, port, gst_lv2_designation_pred_node);
+          if (lilv_nodes_size (sub_values) > 0) {
+          LilvNode *role = lilv_nodes_get_at (sub_values, 0);
+          position = gst_lv2_filter_role_to_position (role);
+@@ -875,7 +884,7 @@
+     } else {
+       /* port is not part of a group, or it is part of a group but that group
+        * is illegal so we just ignore it */
+-      if (lilv_port_is_a (lv2plugin, port, audio_class)) {
++      if (lilv_port_is_a (lv2plugin, port, gst_lv2_audio_node)) {
+         if (is_input) {
+           desc.pad = in_pad_index++;
+           g_array_append_val (lv2_class->in_group.ports, desc);
+@@ -883,7 +892,7 @@
+           desc.pad = out_pad_index++;
+           g_array_append_val (lv2_class->out_group.ports, desc);
+         }
+-      } else if (lilv_port_is_a (lv2plugin, port, control_class)) {
++      } else if (lilv_port_is_a (lv2plugin, port, gst_lv2_control_node)) {
+         desc.type = GST_LV2_PORT_CONTROL;
+         if (is_input) {
+           lv2_class->num_control_in++;
+@@ -892,7 +901,7 @@
+           lv2_class->num_control_out++;
+           g_array_append_val (lv2_class->control_out_ports, desc);
+         }
+-      } else if (lilv_port_is_a (lv2plugin, port, cv_class)) {
++      } else if (lilv_port_is_a (lv2plugin, port, gst_lv2_cv_node)) {
+         desc.type = GST_LV2_PORT_CV;
+         if (is_input) {
+           lv2_class->num_cv_in++;
+@@ -901,9 +910,9 @@
+           lv2_class->num_cv_out++;
+           g_array_append_val (lv2_class->control_out_ports, desc);
+         }
+-      } else if (lilv_port_is_a (lv2plugin, port, event_class)) {
++      } else if (lilv_port_is_a (lv2plugin, port, gst_lv2_event_node)) {
+         LilvNodes *supported = lilv_port_get_value (lv2plugin, port,
+-            supports_event_pred);
++            gst_lv2_supports_event_pred_node);
+ 
+         GST_INFO ("%s: unhandled event port %d: %s, optional=%d, input=%d",
+             element_uri, j,
diff --git a/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.16.2.ebuild b/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.16.2-r1.ebuild
index 433610f3ec3f..1e32320eb484 100644
--- a/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.16.2-r1.ebuild
@@ -15,3 +15,7 @@ RDEPEND="
 	>=media-libs/lilv-0.24.2-r2[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/patch-1.16.2-gcc10.patch"
+)
diff --git a/media-plugins/gst-plugins-srt/Manifest b/media-plugins/gst-plugins-srt/Manifest
index fcac58fd7b4b..22df99e7b1b7 100644
--- a/media-plugins/gst-plugins-srt/Manifest
+++ b/media-plugins/gst-plugins-srt/Manifest
@@ -1,3 +1,4 @@
+AUX gst-plugins-srt-1.16.2-make43.patch 7494 BLAKE2B f3207f46b7bb4a56acb70ca5a337eb326e47b9b16fce36938ccfea0b1dbea09213190899843bda338063cfe38589b9badc2676826bcb463cb1c1d90f5dbc19f9 SHA512 ccfd579039d2696e268f7b6fa17930383a765ad472f1e6b5ccc90ee26cbaf9006b584aad3009d8a7882ebbf1533533ae001b4335c781decb0ac93591056c8c30
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
-EBUILD gst-plugins-srt-1.16.2.ebuild 332 BLAKE2B 16af4043a62ea71da9b96f18284e1c8a8e7355fca822b04c745444359bc9a3a6f9d180b7ca2a085412e162a3537940f6d5df0c980373458b4515356d9c3cd46b SHA512 2aef69f692552c0d0a3afe9d18f4bec8e6e6d90aab234e9a55b0c66c82fbfd550c79f99dd30875218a29d79495da1fa2967b39d0c92645e5d4d7abc8063c3090
+EBUILD gst-plugins-srt-1.16.2.ebuild 431 BLAKE2B c16ea84e7a31f9de63f771d7f1d022f201b6d79923408706211f78620b6da38e12d248d8f6b248aef479a9b8d0f877189ae510c25da036b5e8f85e856ddfecd8 SHA512 74eab94532cd66e83ca4aadd5e25c0d35b236d3ee5adb52d3f24fbb2810f51323f4525c5b6ec34504e8fca2c292cf02466c5f084d1d53b5c1c871c8902059952
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-srt/files/gst-plugins-srt-1.16.2-make43.patch b/media-plugins/gst-plugins-srt/files/gst-plugins-srt-1.16.2-make43.patch
new file mode 100644
index 000000000000..f5caac7872d1
--- /dev/null
+++ b/media-plugins/gst-plugins-srt/files/gst-plugins-srt-1.16.2-make43.patch
@@ -0,0 +1,200 @@
+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-plugins/gst-plugins-srt/gst-plugins-srt-1.16.2.ebuild b/media-plugins/gst-plugins-srt/gst-plugins-srt-1.16.2.ebuild
index 587b12a453c1..b29f5aa8a09e 100644
--- a/media-plugins/gst-plugins-srt/gst-plugins-srt-1.16.2.ebuild
+++ b/media-plugins/gst-plugins-srt/gst-plugins-srt-1.16.2.ebuild
@@ -14,3 +14,7 @@ RDEPEND="
 	net-libs/srt[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.16.2-make43.patch # remove when bumping and switching to Meson
+)
diff --git a/media-plugins/imlib2_loaders/Manifest b/media-plugins/imlib2_loaders/Manifest
index c598d8084d9f..ff036aff0cf8 100644
--- a/media-plugins/imlib2_loaders/Manifest
+++ b/media-plugins/imlib2_loaders/Manifest
@@ -1,3 +1,3 @@
 DIST imlib2_loaders-1.6.1.tar.gz 375642 BLAKE2B 20f4213e3d84c333faff82910f4f402524e50f567cddcce225678c0706d04c5a9520d8a54956f50be4d42fd231f317573ec091864f1d526336aacc8f7e0ae399 SHA512 1017b3587b2815d8347e9aef3f11649bdaadd48be10fe89d6e6eb8cb1d022723d414869cf12a2bff3eaa2f14c12ffd424767993e07990f8fa3ce5062ab0844fa
 EBUILD imlib2_loaders-1.6.1.ebuild 853 BLAKE2B d12d69f26e0849c721bcd518c5d48e159fabd803a31cd060fa99558b5a15918b436db25ab73669616b0165dfc34e98204930543ae55e2ca826efd5b057b12db6 SHA512 3277b69a70c8744d311f24016d78984440ba0eaa8a9c0277f0c7e6e5a4265dd9471ee9da1b5f9cca6c53ccd164d249d5335c83d9c785e4b95e7de7490c479b68
-MISC metadata.xml 828 BLAKE2B bb417b5233966162b782c8b9371fbc5b5d6fb3e36cb9d2ce3f3481b82dae184b1f754ad44d9b6275c24d4ff27f48278690eea38174f2ed2dde287fb5778c49fd SHA512 349cb0bbc1ac72e5de17a40b9e913c9fc2288692797255bbb1d48d5017daab8721c646aec489aca777d26a6f1fc5f641a2b30d1aaa2b6f6724678373d98f3e21
+MISC metadata.xml 740 BLAKE2B f8a81519b6f15ec696052ac0b6c49d9d88704d5838c95012f871192647b55c1b8b5feb45c50dc2783d114f30617352a8eb21fbceb9076fc35bd44dd7f07e613e SHA512 e8a40301b4e6d747b27eca86effe9fb5067b3e23f063ebcaeeab2cc61caa8b826b1e4741ca1438fb14f7716a2171792b28a57958e55663c84deea6be4c05b66a
diff --git a/media-plugins/imlib2_loaders/metadata.xml b/media-plugins/imlib2_loaders/metadata.xml
index d387cac879dd..b55a612ff94f 100644
--- a/media-plugins/imlib2_loaders/metadata.xml
+++ b/media-plugins/imlib2_loaders/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>juippis@gentoo.org</email>
-    <name>Joonas Niilola</name>
-  </maintainer>
+  <!--maintainer-needed-->
   <use>
     <flag name="eet">Enable Eet image loader</flag>
     <flag name="xcf">Enable XCF image loader</flag>
diff --git a/media-plugins/kodi-inputstream-adaptive/Manifest b/media-plugins/kodi-inputstream-adaptive/Manifest
index 13d4509732ef..4af20e1f90c9 100644
--- a/media-plugins/kodi-inputstream-adaptive/Manifest
+++ b/media-plugins/kodi-inputstream-adaptive/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-inputstream-adaptive-2.4.4.tar.gz 727535 BLAKE2B fac4034f3333e01951ad592e16cb4f7978cbfb96bf7b7492d8d80c663e7a95a14647a5d68bd32a97c7a4550428359561bbb4a880544f9b76ebdb17fe829d706b SHA512 5ddc8ee08144f43369d807b1a8a2b1fc2fa70a3a0063be09a47d1df021442f0a7fb46acf2399e458bb807429f38abe9bdea5b4994ab58f93f07214b330e150f2
+DIST kodi-inputstream-adaptive-2.4.5.tar.gz 731621 BLAKE2B 8f644efcce0268833fc0688ea291558e9eaf3b0732656e865299f39cfb5cf3c51cd5dc460139fd457c83bdcaa065be916794886fbc75225d2a8eef87249147b2 SHA512 b38e175fb21dcc155aa5b5cda4ffdbd26336a763c9ecf8857058352a3a8f6d9a617a4999f6aed1bee4edd97d18e7a1f4e4a2318cdf871982415e7dd2b519f498
 EBUILD kodi-inputstream-adaptive-2.4.4.ebuild 765 BLAKE2B 71c04c5948acfc0f891ca14c69aa7e1d13d5ca99bcd9485c159362b2b193d9f552c95c198b8673d79fd1797503ec709b9775f2727efd1997af9a87dce318686a SHA512 d4d91d410b73613bd19095dff69d36dd127b45bf7a2977f90fa634525a2b95e5d88b42610995685c99311bbcc27f37cb064984aa7103e5aa4ee99e5f618fdf39
+EBUILD kodi-inputstream-adaptive-2.4.5.ebuild 765 BLAKE2B 71c04c5948acfc0f891ca14c69aa7e1d13d5ca99bcd9485c159362b2b193d9f552c95c198b8673d79fd1797503ec709b9775f2727efd1997af9a87dce318686a SHA512 d4d91d410b73613bd19095dff69d36dd127b45bf7a2977f90fa634525a2b95e5d88b42610995685c99311bbcc27f37cb064984aa7103e5aa4ee99e5f618fdf39
 EBUILD kodi-inputstream-adaptive-9999.ebuild 836 BLAKE2B edf07ed61ef0e7ebb3e0a5d9210ce390cfa78a4e14beeb69164b7e921ef3fbb2407f564bfe5c3df12b13cd1b9a1bdbbe573ed8d212cc23f16a10b02ae6e78559 SHA512 8390ae7d060df1c33655e53a90309194911575fbabbc04a168151a0ea06cf1e70f43283103574893690f06c8a5843f6f8104f2338c634f2f416cab5cc9f21996
 MISC metadata.xml 459 BLAKE2B eeb0ec3e241775f1953b2846edd160fcbe72d5990a256f5374e9aae5e45eef5f4c50225c72d371c0ca3d11a3b81eabd87a5de35952aa5f7676b4d7b79854ba71 SHA512 748df555db70e268d7f67b408428d949ecc04c49fcd143d984b47597c3c4ee86fd8066bf294598df926889525213f34182a790d442aced5fc2f39346f13e4d5c
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.4.5.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.4.5.ebuild
new file mode 100644
index 000000000000..6187d9c2869c
--- /dev/null
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.4.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi's Adaptive inputstream addon"
+HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/peak3d/inputstream.adaptive.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/inputstream.adaptive-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-libs/expat
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	=dev-libs/libplatform-2*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-argustv/Manifest b/media-plugins/kodi-pvr-argustv/Manifest
index 2f0a05a6161c..b08c9eeb23f5 100644
--- a/media-plugins/kodi-pvr-argustv/Manifest
+++ b/media-plugins/kodi-pvr-argustv/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-pvr-argustv-3.5.4.tar.gz 149660 BLAKE2B 0afd36f8e7c153bb5d00235664ab40e7fa165d658b0491a271f9cc04c7ccf2f3bf9666c949b43c03b86ab8d6479863c7df9e05d75b8e18676526bb1d30f8b62e SHA512 37ae3fa9d3e0f49ce87429de56f16e875bcbb289f94e019822c9e8661f54cd62d11d6cebe195f29871d7c24241d859e88fde988fc6ed6dd2a3f64cd7e8efe1d3
+DIST kodi-pvr-argustv-3.5.6.tar.gz 150434 BLAKE2B 9cd59c57816ae30912d6410c3a1373fbfe0242a7b60ffd55576c898eac26715e61fbf4bb239e121549b92249b52bc484b1c961eaa3460b36bca0ffa8aa540f76 SHA512 788643e236f0d4e053cb6580ad033dc5f00ed4749138b93631609a203adbcc80d55655cd02634a9f762383fe549f769bd79ad3bbd5023fa74d0748c5a3c9fb71
 EBUILD kodi-pvr-argustv-3.5.4.ebuild 703 BLAKE2B 88426f2bd633dba02be419e2067a5860fba8ac022d16961ed2216eb34a1e7a8feae2520da95a1fa0bcd118c951a0ddbf36dcfccb016404eebba946849a4eb418 SHA512 b12ce181413e81ed518c09d8820985b1dd54a5aa64e64413f993a426c6bda743f52c6203e8769b198d446ed5f8a2248acdecbf95d8f9891cc2afdb9b17e8e4f0
+EBUILD kodi-pvr-argustv-3.5.6.ebuild 703 BLAKE2B 5c02b33738a4a47af00343f3379c89b816f7b033653b554971e7287a0fc4264ba17e4678ed57de5d33bd6f226fcb6450fbcd7278986d67be6fa8618ddfa4ef29 SHA512 2dfb679668f2cb382cee0754b1118290a4e49b03df71c4b5a736d4e65b8727665602b767805362eb4ee8ad7cc1b31a0b07bc461582d1a190fe69224f357a1c21
 EBUILD kodi-pvr-argustv-9999.ebuild 699 BLAKE2B f8321f9979555e96b14853e7eeda3d9a36641986e1f5a1c28ef5acc5d0e2fc6a8fa01c6fbe4f4b5c3aaebade6ed6365ca396ceca878ad01e1fb6c0175e1dead3 SHA512 47e0b3418ecba071de0887fa0c93fd308594321ce2fccf5e57b99f0f656981f3d0a58b4a7e02866bfb98796f1e5d6af4b6e1e1ca386147c6b7b1201153f82f78
 MISC metadata.xml 431 BLAKE2B 7cf6fe3e6a6c6cec6b72acbe12ed6b95b8204c33f9f8473f6ed48831e189063b9b5584b579365bd5551cf9ba109bcf85b6ee1dc77eeb18871f049fa5490215f3 SHA512 ee08e760ff80ed37cbc40ea35ef0daebd9b8b7dd7a532123787a022fea25c9441912103dfb154491b81aab1f79675408c4fe4022c4937b03433df826bdfa90bb
diff --git a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-3.5.6.ebuild b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-3.5.6.ebuild
new file mode 100644
index 000000000000..ec4c2ba7a901
--- /dev/null
+++ b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-3.5.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi's ARGUS TV client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.argustv"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.argustv.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.argustv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.argustv-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	dev-libs/jsoncpp
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-filmon/Manifest b/media-plugins/kodi-pvr-filmon/Manifest
index aa5e5b6b7355..6aa6a45922ca 100644
--- a/media-plugins/kodi-pvr-filmon/Manifest
+++ b/media-plugins/kodi-pvr-filmon/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-pvr-filmon-2.4.4.tar.gz 104862 BLAKE2B 8333be55812ec5cb18535aa696c07e16cc02712522b540bef346bd030fdbd572daae47d81bed78be243014fb920911309d5f924079d323104c60090d0ca2c72b SHA512 f6d7c90842ca59ebb3b254860b47d7c1b7e6e5bd70f06744341eaf30a4bc2847027818a2bb097e56398354315753cfea7878cf2b82c3fc69b0aeed106b8d8e80
+DIST kodi-pvr-filmon-2.4.6.tar.gz 105423 BLAKE2B 75c64e863da1609ed7f8176635c90062de9008d1f814fd4cfbb7110d6e46fc1a9bb79dbddfce2e3edbb341048c11f80a126666701209afc5152ccd2035d7b4d1 SHA512 832840319bfb8d9d89883ecc58a4cbc1e32807bed5296dd1bcf033199109b47c5a48be4609e6879ba49a69da61958b2dec033729bb9536a0d26990102472f400
 EBUILD kodi-pvr-filmon-2.4.4.ebuild 697 BLAKE2B 40d100012cb3c7583684aebf7741c4629291a227af15627c4d9dac9a2b47ae2bbbf322ab34b70f03dab4c026ebb70e7bbcf6688468d81df840e151dcb9700760 SHA512 162b3053e55f4ca20f5586592b96538a4640dc32c5ed682262899880699b2097b013533eda33c3cf74d35b7a8aa6ce595188c16dea1054811e0cd8cfd2c0614e
+EBUILD kodi-pvr-filmon-2.4.6.ebuild 697 BLAKE2B e191080842e83d16027afe50f4fb0879683684e06f9f63057ead9c22fa4db97f057ca84e592e9f25a68312dbf8ecead1f52f60290d5e4c5e798d31aa31451c5f SHA512 259df98dadf703e067d10534ac68eb0fe0c382b986435f19ee677d6f6dcebbb6735cf4a10f79eace7cc6494ee92746aa190523ca03ad9f7515eb48189e661442
 EBUILD kodi-pvr-filmon-9999.ebuild 693 BLAKE2B 853a387f263ccee8c7ee57d917a86cc2474340aff997f51ab6e98ae2bebcbf8e0917d968a36fb264679c53b88e80bb80719fecfa7666c1cee47d31677c618abd SHA512 a078ba6b6776ef0dd88847b91d216882ab3c555daf3ffe057c09fe61696e90c78ed918e752977afbbb962c2fa380b02a199708ce3faa404b0594cc337322666b
 MISC metadata.xml 429 BLAKE2B 5432fd7942694c454c239f39e4835bb6430f8e5dbc14b4bb11d32f6aa618822be12b1fa6a6b39422f4fb5c0d7a1b8203ce7fc3f2090a7d2a7253ee65fca11439 SHA512 dea6258c8509740209e941e13d258d165e72fee1902dba1d5364ce3c453e53de4698df34cff64f591f192336a46e69278ae7409c187788df6ef1a0bb4cf10ee4
diff --git a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-2.4.6.ebuild b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-2.4.6.ebuild
new file mode 100644
index 000000000000..241eb1f9aea9
--- /dev/null
+++ b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-2.4.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi's Filmon client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.filmon"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.filmon.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.filmon/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.filmon-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	dev-libs/jsoncpp
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-mythtv/Manifest b/media-plugins/kodi-pvr-mythtv/Manifest
index 902ae6abce7a..058fb281d79f 100644
--- a/media-plugins/kodi-pvr-mythtv/Manifest
+++ b/media-plugins/kodi-pvr-mythtv/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-pvr-mythtv-5.10.15.tar.gz 702682 BLAKE2B 54ba8e4883dbdae88071b1b69a4d489d384c95911bf1113e944b9a4528f8349ff044a1440afd05b3657c8131c4738264f366a7a63bf8606ce6f796c143743f37 SHA512 bf7e4d6fc1436fc01596a4587b4334e495b72e4fdc9638393c94bd289c9f58065ad5d61c87ce109d727a0d656873100da050b8d395e28aac5efe567da70839e8
+DIST kodi-pvr-mythtv-5.10.16.tar.gz 702675 BLAKE2B cc2f229e53b9c91b1a09e954dda88f4b199510de4a47844795e0b2d41aa9cf3201b85d39dd43716ce189d9385784a85dcfd4639d6dc07d5ad74d5673fa5102e3 SHA512 d089cc365dd42268510996a1ca306dee94c4d3dd72eaf5c90815f29dd1d5bf0be7e0177db1929a33beebe9fefa927b52a83a2ce1c8c8aecdec91fbdf7c5efb79
 EBUILD kodi-pvr-mythtv-5.10.15.ebuild 674 BLAKE2B 8cbe86d07d447b078076dcb69cd4dcdf1338c01c7924277446ff07253d4ab10496fce89acebb55b0f9377261f22ecace20f82ab7a3be79bbd08d9c87072184f6 SHA512 6b6929052c87b85c8950ae075ce8077436a2a6715719ece104d43f4ef890a1433eaa4167d8ffbf10ad39b3c1cc31befb56a0fba162bc3e5c0c63cb926b98b5df
+EBUILD kodi-pvr-mythtv-5.10.16.ebuild 674 BLAKE2B 8cbe86d07d447b078076dcb69cd4dcdf1338c01c7924277446ff07253d4ab10496fce89acebb55b0f9377261f22ecace20f82ab7a3be79bbd08d9c87072184f6 SHA512 6b6929052c87b85c8950ae075ce8077436a2a6715719ece104d43f4ef890a1433eaa4167d8ffbf10ad39b3c1cc31befb56a0fba162bc3e5c0c63cb926b98b5df
 EBUILD kodi-pvr-mythtv-9999.ebuild 676 BLAKE2B 4618553eb130421f305ee9c1dc9eba6fc92cc18467d6c3d7b533da90cec11856e9b66ac9aaac8c0d184fb34da5361f7b3de71a2f1c5fd16064156d2eb1e49bb3 SHA512 63843305fad41dfe295ab44efbb8780cf0a650b421e034392ecf1dad7e07747d47d40cf6516e99b3a60a7eccab0fd423dd84160bff560d6df422917f155986ae
 MISC metadata.xml 419 BLAKE2B 71f7f4424dbf1c992fab169ce530ce61ff39399842089905618bfc800011ed7960c92428cb9e6e89b084872fa61d08da8df0c4179c483ec6dc2ab745d684f15e SHA512 5b6c21c0e780ed90e92fb080f0a15cf62fee13e8b8597081f7b5480eb21f3f013495aafb389a302a227e6e22b757cc6b83d3dd56d7cd74ed16587edb09ef871e
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.16.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.16.ebuild
new file mode 100644
index 000000000000..2211824cdbf2
--- /dev/null
+++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.16.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="MythTV PVR for Kodi"
+HOMEPAGE="https://github.com/janbar/pvr.mythtv"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/janbar/pvr.mythtv.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/janbar/pvr.mythtv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.mythtv-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	sys-libs/zlib
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-nextpvr/Manifest b/media-plugins/kodi-pvr-nextpvr/Manifest
index 5bd202fe8286..73705824bb71 100644
--- a/media-plugins/kodi-pvr-nextpvr/Manifest
+++ b/media-plugins/kodi-pvr-nextpvr/Manifest
@@ -1,8 +1,10 @@
 DIST kodi-pvr-nextpvr-3.3.17.tar.gz 129989 BLAKE2B 07a67e38f70e2364ec2ca5f0829a99dac72e0424fa2e2da5f7f0c3f8a6dcbb0fc651d8cafbc4cdbb651c05894741db442e731faa0fbe0a37d72f3716523c2b3a SHA512 1781d76bc5b521752f6d57b6f2f3e3c40e3c1954bfb3168ed3625252392cf99d3f995d755f8db7826c72c535b6e89a540da6004e60e7b5e7875069222dd12bdf
 DIST kodi-pvr-nextpvr-3.3.18.tar.gz 129996 BLAKE2B afc8a582793cd2f618f39f6f48dac37c4d2007b66d5daad5af0fbb0a213c26e9fa1a58ee2b0ab77e8a7cbb005da28af17df22f65df2e093d2250c7f0a04f9609 SHA512 907f355c306534d7d7886be6fd0a62b88fcfbd7672710a31cff3ab9f0329f15ee9b880d58d59ebc98e781409ca8cf8512906ec8827f8a149a1bfd4d72d0b310f
 DIST kodi-pvr-nextpvr-3.3.19.tar.gz 130174 BLAKE2B f29766ad2fff67df72c67eba05b0de775c67752b7f4d4b31ba62a7acbfd66723f52fd802dca39dc05b83900dabaad5e04ab3baa64dad51670e7f82f9fa86be2e SHA512 d78201980ad4d76441d6d3c9acb5c23775c56c62dce9b7e116576e17e7fa14c11a2ade5b9fe1dba3d12d1b509d441fdfead05ac66796e2362e310b8d85a37f7a
+DIST kodi-pvr-nextpvr-3.3.20.tar.gz 130242 BLAKE2B 52ed3235b08574d521e7400e441b9ab2a0962d839c28ac317e2318895024d26bf3ed4b1bacdb8e6b58bb3430921cad7958711ce64bc766f2fee743d8cba424ea SHA512 8c7d21ede01839ba251b4367db90f5f028ca2ec0d6eafeb124881eb9a6078b28917292fbeb0ea452c782d1b943b8b8d24997f67faf83b516bdfaf451fcbd5bb0
 EBUILD kodi-pvr-nextpvr-3.3.17.ebuild 702 BLAKE2B 797a4cb29b87021004a4c4bdaf8fccaea26676981e8868f95fbdc73720c4bfebbd879c8dd53fabb8c59a1321bc87af2c2dba10d4c1143e89c3f51b277132c4de SHA512 d7172c5b1643404e6822cbc6ea8473a312b708a28d3a9ee8c3d1d50ec4555858f359b5c76ff796e243558514b51fb5eac7c396d7f703fe59ed903be0a1d4b4bc
 EBUILD kodi-pvr-nextpvr-3.3.18.ebuild 702 BLAKE2B 0d5e16d25d33552da861e3b139fb4dedc19bcc17eab75a580b958987f4e4be2c504e9747be31190203d5be82dc83f40799490f8296106fc8e5c9cf61c6da9020 SHA512 4794cfaf2c21a3edf9c2ac78fea61d9b80994bbfbb06cbb79abd3844caac7067ad1e305d87a596ab09cfca128f98d1efd68dd527786e7126fd7cadac8b75dc8a
 EBUILD kodi-pvr-nextpvr-3.3.19.ebuild 702 BLAKE2B 0d5e16d25d33552da861e3b139fb4dedc19bcc17eab75a580b958987f4e4be2c504e9747be31190203d5be82dc83f40799490f8296106fc8e5c9cf61c6da9020 SHA512 4794cfaf2c21a3edf9c2ac78fea61d9b80994bbfbb06cbb79abd3844caac7067ad1e305d87a596ab09cfca128f98d1efd68dd527786e7126fd7cadac8b75dc8a
+EBUILD kodi-pvr-nextpvr-3.3.20.ebuild 702 BLAKE2B 0d5e16d25d33552da861e3b139fb4dedc19bcc17eab75a580b958987f4e4be2c504e9747be31190203d5be82dc83f40799490f8296106fc8e5c9cf61c6da9020 SHA512 4794cfaf2c21a3edf9c2ac78fea61d9b80994bbfbb06cbb79abd3844caac7067ad1e305d87a596ab09cfca128f98d1efd68dd527786e7126fd7cadac8b75dc8a
 EBUILD kodi-pvr-nextpvr-9999.ebuild 698 BLAKE2B da655781d2653e000dc890c425a03f9e7d9ae0d0b9a2f870867899aba9e437317b7f7530963dfacf78b5cf04a33ff958c18ea30e63d5868e0b04d62a7e096355 SHA512 33cbafaa428db2d63c8571a8e88d75d2ab146acb5681999ccea8e8c4b1ca275757ef8d38d3c6c72ebe9c27e64020111f3d0cfb82d7631a7647c613d6763a8db4
 MISC metadata.xml 430 BLAKE2B 60ef7af47e0cd7d264fd19275a356b83cd9fd4e5ed4e237658c47152315d4abcf807377bd8c94d88ec3088530a5fd9ab2d9482336328eeb9ff380963364644a9 SHA512 b0bd41b39d6e1379e1b3c36124432716cb222205ed587246523a8a48c42e2d9922b1b24c87ef601bf5f7452cfb874710c1ec7b558b9224c95c921b80967e02e3
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.20.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.20.ebuild
new file mode 100644
index 000000000000..4d0ea1ef9733
--- /dev/null
+++ b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.20.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi's NextPVR client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	dev-libs/tinyxml
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-pctv/Manifest b/media-plugins/kodi-pvr-pctv/Manifest
index 14431f5c1a8f..aed2733c743a 100644
--- a/media-plugins/kodi-pvr-pctv/Manifest
+++ b/media-plugins/kodi-pvr-pctv/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-pvr-pctv-2.4.5.tar.gz 67169 BLAKE2B 99861fadf9fba102fb45b9d095cf8ccaa58ca53b5182f714f8666dddecc43f98ce57583b3e7b3d156aaece9f63acc7fb653d2b3763104c280d9ef30dfff6d664 SHA512 288446a04b9dca623ab12759500123d3bc548b131a3cf6757431e99571611834408da2918085d52c29380e5d5f856a6c4dede7a9793ac427123291346a28ed62
+DIST kodi-pvr-pctv-2.4.7.tar.gz 68065 BLAKE2B 0ee70bb53be42bb9b3d82c0e429f53fb1fcc847db5072ff9507fae02a9cad9ca6757ccd801560ae2d7eed2ff39588755b8b2e1f81e144253b22fd704f77cfe0d SHA512 a7c6e81d31635aa15d9cb9a5e9636bff4ed510f73495013aecf2eb1e6898c902e481f3dc13c91838407c970f8698bf40e47ca4e32ab4d067eb0566275e6bebea
 EBUILD kodi-pvr-pctv-2.4.5.ebuild 687 BLAKE2B f794a38cd128e6693c201becfc7c50743c47b28bac56724800490c8a707f72c39975ab26a16198d26a71a41c7a3e1860a9d3d95ebab1c28b255aa1e807d59e91 SHA512 2d853652a23ba3be606befad46257b9173c63b5ab1852f5df5fd4545eb41653ebb38fd48726c4e55bc4cdf01b98d8dbddc76b796bd3d775cddeb5b59a0c88ca6
+EBUILD kodi-pvr-pctv-2.4.7.ebuild 687 BLAKE2B a2f89391ffa6e13192f02050d9fa8366c417f95d87d93dfb75923614c3dbbc3b6330c3800871b74caa878f05e9d8e1380aaed9256c9213948cf65a0cbbdfc270 SHA512 2a8c3ac08218c6a889ad75414440cdeb31e3dbf902e90f33aa7d39f677afd2c171fee6fbc50dd897db243119df218aa76b4fc07a56b6334bd6bb26046713c4c7
 EBUILD kodi-pvr-pctv-9999.ebuild 683 BLAKE2B b9829a385f898b123fe48d16177335ac3b6bdc095c494c0f24622b9275d82c2b86287cbeed7b891614e588a56223a7b23e24923ca3e5997b7e2b2f6a7b12122d SHA512 693dcea039b1966b9c2032be90ce5b3e856448beaf1d623f29f858ae03448eb350b34c227c92e2cbf0ab8ee67d6925ac6519bb4a3b120dbb543abbe8a4773dd3
 MISC metadata.xml 424 BLAKE2B 0637f01f1175e2d607d0e590535ef8d262173f71d42c265b5225d396bfe9783d03b6a231de1f75a9f548487769db28f9b9988ed27aadb5838ad5b37734405959 SHA512 91f472cc7c5eb36bfd24c3565a0679af173643011140133c98f6782fc6a14aef3ac30f30e86429bbe0b361c696998fca96ea968f97963eb08a64d14655f1b344
diff --git a/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-2.4.7.ebuild b/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-2.4.7.ebuild
new file mode 100644
index 000000000000..fd990df230e6
--- /dev/null
+++ b/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-2.4.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi's PCTV client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.pctv"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.pctv.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.pctv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.pctv-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	dev-libs/jsoncpp
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-wmc/Manifest b/media-plugins/kodi-pvr-wmc/Manifest
index 32241d451c7a..97719fbb0fb6 100644
--- a/media-plugins/kodi-pvr-wmc/Manifest
+++ b/media-plugins/kodi-pvr-wmc/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-pvr-wmc-2.4.4.tar.gz 178508 BLAKE2B e1d80860ade2a639dd65a9dd541657ee29032facf95c427fd38038f5df28f5cc93622f00809228ae7968786b0d5499606c38eb79adc7ed9200b4e94e2de26206 SHA512 9932d3c44dd91ff371ef34cd9fbbbe1485629116b102c31dc7292e32f82869727423195ae9c78969d96e3a03dd22d481cc0708212921acba0524759a4acaad8d
 DIST kodi-pvr-wmc-2.4.5.tar.gz 179019 BLAKE2B ba116c687bcfbde69600a9fe9ebb22dec334768f6210b568be4d5b4b75c964d9d50764ad841f000af4c7656ad5e5b77721f9a806f3d63de5ec742d74d2dd3bb2 SHA512 d3c7abdd99190bfe5dda191d2811db8879ad916d6083042f9c84f30c8a0ad2a2694141df33ad1c7624387e4488c7aa2853c0fd84dce4f3c75b1897c256ca6154
+DIST kodi-pvr-wmc-2.4.6.tar.gz 179322 BLAKE2B b82761c76fd1d49400f5aa38ebe32adf6984b94c6d6feebeca2e0c6b31fbc413960af7a09955bfc0a5a50d454a4cc52a36098b74313a4ce673b08802ac109525 SHA512 2912d57f1d9d03d7f40c041c76737a620205e5fc81c6fc72c34c2f4d12e0fd18ccf185d78501dcd0b633aef3d5d2ce91d4201b60b92e0f6ac59d36df5eb19d15
 EBUILD kodi-pvr-wmc-2.4.4.ebuild 680 BLAKE2B 7e2ceda9bcb53bc2c284d9876226abf5f87455e3e69eb1fb8cd3dc151f2a09b7312adae0ea0272ae2945d3df85bb3bb2464f7cf3b80483836ff6419037928aab SHA512 50105fb1457f40160a5f08546baccc73042e842738ea81b96904a68a5d60e9a87ad056d4db292ff391ca7c6ad2326682fb3ca6a84186d96beaf86d0526c85dce
 EBUILD kodi-pvr-wmc-2.4.5.ebuild 674 BLAKE2B 738b8ce98a53a1380a9a502b2e422f36091ab8d4184cc1a20272c538d00e24a288e7866de312cfd119411eeb21b4d715ea600f36926db0de2af460b5bfc9fcd9 SHA512 67baca8507a923b2c7e81b601a12b6878e9d145d3c525c7e6c37dbaf75b7814459a0354ef6b90a773f3327a88e06a3b17888ea4c166dbaa162a64f1153798290
+EBUILD kodi-pvr-wmc-2.4.6.ebuild 674 BLAKE2B 738b8ce98a53a1380a9a502b2e422f36091ab8d4184cc1a20272c538d00e24a288e7866de312cfd119411eeb21b4d715ea600f36926db0de2af460b5bfc9fcd9 SHA512 67baca8507a923b2c7e81b601a12b6878e9d145d3c525c7e6c37dbaf75b7814459a0354ef6b90a773f3327a88e06a3b17888ea4c166dbaa162a64f1153798290
 EBUILD kodi-pvr-wmc-9999.ebuild 670 BLAKE2B e632de6bf907313ecd9140efad25833c6b0a8a3218282cd7fdb70d684661dc80a7158b71a23ef21b35b9eaf80af91a40011631f82d81e2ad8c2a39f8214a7c39 SHA512 926542c4e016c1f4156ad7035d97d53094d54fb60c952bf31921f5bd4876aaa4f7e5a07c05bd1c5b76f2f48d66ee27148db7c8ae614090a63646ac0bafb86611
 MISC metadata.xml 439 BLAKE2B e9d6404796d298720abff6d7afd2db18b95007cb65ee3ff471b83ee7e7e864eb648a37e3d9d8405842c6b8fe3c409096abad8c8b6c3b1eb2e7df15d4865bfcae SHA512 d85d185c415264b312fc1cccf1155b4f49d1091795989e617c68a4a910f0c85e19b8e34764b4a4a31bc825c927f5a939a7bd7b2f4d1412263aff6d0e50b3fdf6
diff --git a/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-2.4.6.ebuild b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-2.4.6.ebuild
new file mode 100644
index 000000000000..76afe485b98e
--- /dev/null
+++ b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-2.4.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's Windows Media Center client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.wmc"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.wmc.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.wmc/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.wmc-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index 78430fd3b32a..c094e9829fdc 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -2,12 +2,6 @@ AUX config.gentoo-r1 499 BLAKE2B 8a4f1261f09e613c2bd666b070c4f5848a5b30ed48cf566
 AUX config.gentoo-so-r2 524 BLAKE2B b540de1163b9eb6014bd421c62d582bb6b4341866e6fb8212bc0c38c7fc3c9bf4f5cf6e1bd95a9e30879384dfad3232361985b10a093b900b52bb6ca01216577 SHA512 03d6a8712c0c2c4b7b7ebcdcada9ab6ece6fd19ffafc61c864821d19671001efb7c91b77fcf35ed38275c46d305ade3a7a655922fdec3ab6e7e00785242ee5fd
 AUX config.gentoo-so-r3 539 BLAKE2B e80c461f69a991641100d3966d1d100dc7fe8c15e3edc358bcd8ebd17a3f8c4d00a5557c9983f51a251a4602dcc378138df736f13665f5d5140081e047df0f5b SHA512 3f7d4a860b45ff6769fe1f29e694dfb897ab5b7c50f3d0d896425d300be6277df850cdb67cf311a0671ba747339b32f65d44a95b020940b3d1ac5764d873f20f
 AUX live-recursive3.patch 557 BLAKE2B f18a8152345006272b2b7385053ffd012e6dabc5754ae7712def7e90c55040c9e1c80dafc0d30555751e183c2b9d92de4410d8cb95d8707414cb17f641acbb6f SHA512 98992859d1f8149e337adbf42c13276e6bf40d5497399ab4f82351cd5caf78ecd60e28df24d36b34cfd02e83365cb37ae1b264afcb52334f304695b400bce622
-DIST live.2017.10.28.tar.gz 629858 BLAKE2B a1d862ae1356b46fcd4e5ef7e27c47d3fb3abac35add6feb7955f60ddbd93e9242a84102393de67dda0d39c09632a0cc9a5f54d30c9f91d005696d3a566258bd SHA512 eea5bdb8d89e76c8b6aeb6ec04b77af3048cb41f228d230ba4da6045e9bc691a456023d44d8650fe690b08143567ed5af5b633f5b6522debff79344a813dc7d0
-DIST live.2018.01.29.tar.gz 630144 BLAKE2B dd58865636a44ccabd0e3b02e1679393f17fb09d82455188d49d4fcb321b21e136a168c0f4c407c1dba3afcb5b541192cd2c5181d7a7710d39d4727526fc39cf SHA512 dfdfcac67acd28f651807de423c6aed00190cfc38ecd361b76d37d8cc27ee2fa91a42a5b8835045680fd7f65c847e41747b948c2c71e6530a3c7e89421c60227
-DIST live.2018.07.07.tar.gz 630625 BLAKE2B 8545d4d8ed60328ccc782b6c2a8c4a0dc9ce3c1245fbc78fed4d3eb6f42de39c3c341456dc00cdc416fdcb2e518f5fe387273f5b4d2c3e2d32bfa22a21df2a90 SHA512 e7d4ddf51e9666c6ebe9a46976035b68fea94be54825535ffb04006cd242b9d3ad08250305206442bed3500d1e8d628ccf44302c485f63a9e244b3f8b1e27fe4
 DIST live.2020.03.06.tar.gz 7231080 BLAKE2B 95a1d3cc394eba473296973a1e44160dd1ca8e2efbc322a2e0bfbdb183244cda28b219ea14a51c8d146807d829b566a9c3782b291d5abfbd306a92e030e108e4 SHA512 7da439fbdeab0da6687dee56d9a27bf7b8f8a9c84b420d72f2e2a7ff7a73d18756d1fdb920f29b36917d93efcecc9230877637322d5041eeba114882b4bf7a06
-EBUILD live-2017.10.28.ebuild 3973 BLAKE2B 3d0511be782f8265f4976bfa99c2fa8c603702e8ceea1b911e476bd16c33c6ce4ab270b0453d0669632a48a3374e5512b4e75ede9f8356b6551816b69d3fe367 SHA512 87d5e831968a2c974b5d707e5e30ef017eabbb9f3c7f892e84d0b7cde6a4d8e1d1e3eb1e5786ab27ef97e60f9b84f913544143f4b3b40afdd914d0476bcf06d5
-EBUILD live-2018.01.29.ebuild 3982 BLAKE2B e28c5b60c2be54e78cb80804b1e471ab32d32413f6bcd98a9e817cd83cccb087e3701db1500f805b3a3397dc0d29dda91ce38b6908511982957c303eb1f1ff8b SHA512 c6368ae4fe5fce9eb239782f163ac98d7d1124dc3620ef58629ea1877fc64603b1b4e752480973c43a19af25e4db8ae7eafbad5ced1203d5e501236a37d871a2
-EBUILD live-2018.07.07.ebuild 3982 BLAKE2B e28c5b60c2be54e78cb80804b1e471ab32d32413f6bcd98a9e817cd83cccb087e3701db1500f805b3a3397dc0d29dda91ce38b6908511982957c303eb1f1ff8b SHA512 c6368ae4fe5fce9eb239782f163ac98d7d1124dc3620ef58629ea1877fc64603b1b4e752480973c43a19af25e4db8ae7eafbad5ced1203d5e501236a37d871a2
 EBUILD live-2020.03.06.ebuild 3052 BLAKE2B fefa656dca0f1ebde2bb5ecccee03c0e5ca2abb1efed3a0921bfefd975cc4cb5eb59197fef1fa8086a03614e024465d64567f0a39909a4c83d6d3c76449c688e SHA512 0d306cb3123b1ee15828c3ae77f782c74a1b408989a80d5a7b16dfe869cff67d8cb3dc4a7ded87aa86d56d173c34ff3474732bb3e4dbc2ac24c127e8c828581e
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-plugins/live/live-2017.10.28.ebuild b/media-plugins/live/live-2017.10.28.ebuild
deleted file mode 100644
index 80f3e6db5e2b..000000000000
--- a/media-plugins/live/live-2017.10.28.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic eutils toolchain-funcs multilib multilib-minimal
-
-DESCRIPTION="Libraries for standards-based RTP/RTCP/RTSP multimedia streaming"
-HOMEPAGE="http://www.live555.com/"
-SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
-	mirror://gentoo/${P/-/.}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="examples static-libs"
-DOCS=( "live-shared/README" )
-
-# Alexis Ballier <aballier@gentoo.org>
-# Be careful, bump this everytime you bump the package and the ABI has changed.
-# If you don't know, ask someone.
-LIVE_ABI_VERSION=7
-SLOT="0/${LIVE_ABI_VERSION}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}"
-	mv "${WORKDIR}/live" "${S}/" || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-recursive3.patch"
-
-	if use static-libs ; then
-		cp -pPR live live-shared
-		mv live live-static
-	else
-		mv live live-shared
-	fi
-
-	use static-libs && cp "${FILESDIR}/config.gentoo-r1" live-static/config.gentoo
-	cp "${FILESDIR}/config.gentoo-so-r2" live-shared/config.gentoo-so-r1
-
-	case ${CHOST} in
-		*-solaris*)
-			use static-libs && { sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
-				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
-				live-static/config.gentoo \
-				|| die ; }
-			sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
-				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
-				live-shared/config.gentoo-so-r1 \
-				|| die
-		;;
-		*-darwin*)
-			use static-libs && { sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
-				-e '/^LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK_OPTS /s/-Bstatic//' \
-				live-static/config.gentoo \
-				|| die static ; }
-			sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
-				-e '/^LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK /s/=.*$/= $(CXX) -o /' \
-				-e '/^LIBRARY_LINK_OPTS /s:-shared.*$:-undefined suppress -flat_namespace -dynamiclib -install_name '"${EPREFIX}/usr/$(get_libdir)/"'$@:' \
-				-e '/^LIB_SUFFIX /s/so/dylib/' \
-				live-shared/config.gentoo-so-r1 \
-				|| die shared
-		;;
-	esac
-	multilib_copy_sources
-}
-
-src_configure() { :; }
-
-multilib_src_compile() {
-	tc-export CC CXX LD
-
-	if use static-libs ; then
-		cd "${BUILD_DIR}/live-static"
-
-		einfo "Beginning static library build"
-		./genMakefiles gentoo
-		emake -j1 LINK_OPTS="-L. $(raw-ldflags)"
-	fi
-
-	cd "${BUILD_DIR}/live-shared"
-	einfo "Beginning shared library build"
-	./genMakefiles gentoo-so-r1
-	local suffix=$(get_libname ${LIVE_ABI_VERSION})
-	emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}"
-
-	for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do
-		pushd "${BUILD_DIR}/live-shared/${i}" > /dev/null
-		ln -s lib${i}.${suffix#.} lib${i}$(get_libname) || die
-		popd > /dev/null
-	done
-
-	if multilib_is_native_abi; then
-		einfo "Beginning programs build"
-		for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do
-			cd "${BUILD_DIR}/live-shared/${i}"
-			emake LINK_OPTS="-L. ${LDFLAGS}"
-		done
-	fi
-}
-
-multilib_src_install() {
-	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
-		use static-libs && dolib.a live-static/${library}/lib${library}.a
-		dolib.so live-shared/${library}/lib${library}$(get_libname ${LIVE_ABI_VERSION})
-		dosym lib${library}$(get_libname ${LIVE_ABI_VERSION}) /usr/$(get_libdir)/lib${library}$(get_libname)
-
-		insinto /usr/include/${library}
-		doins live-shared/${library}/include/*h
-	done
-
-	if multilib_is_native_abi; then
-		# Should we really install these?
-		use examples && find live-shared/testProgs -type f -perm 755 -print0 | \
-			xargs -0 dobin
-
-		dobin live-shared/mediaServer/live555MediaServer
-		dobin live-shared/proxyServer/live555ProxyServer
-	fi
-}
diff --git a/media-plugins/live/live-2018.01.29.ebuild b/media-plugins/live/live-2018.01.29.ebuild
deleted file mode 100644
index d833ddf75eb2..000000000000
--- a/media-plugins/live/live-2018.01.29.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic eutils toolchain-funcs multilib multilib-minimal
-
-DESCRIPTION="Libraries for standards-based RTP/RTCP/RTSP multimedia streaming"
-HOMEPAGE="http://www.live555.com/"
-SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
-	mirror://gentoo/${P/-/.}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="examples static-libs"
-DOCS=( "live-shared/README" )
-
-# Alexis Ballier <aballier@gentoo.org>
-# Be careful, bump this everytime you bump the package and the ABI has changed.
-# If you don't know, ask someone.
-LIVE_ABI_VERSION=7
-SLOT="0/${LIVE_ABI_VERSION}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}"
-	mv "${WORKDIR}/live" "${S}/" || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-recursive3.patch"
-
-	if use static-libs ; then
-		cp -pPR live live-shared
-		mv live live-static
-	else
-		mv live live-shared
-	fi
-
-	use static-libs && cp "${FILESDIR}/config.gentoo-r1" live-static/config.gentoo
-	cp "${FILESDIR}/config.gentoo-so-r2" live-shared/config.gentoo-so-r1
-
-	case ${CHOST} in
-		*-solaris*)
-			use static-libs && { sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
-				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
-				live-static/config.gentoo \
-				|| die ; }
-			sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
-				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
-				live-shared/config.gentoo-so-r1 \
-				|| die
-		;;
-		*-darwin*)
-			use static-libs && { sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
-				-e '/^LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK_OPTS /s/-Bstatic//' \
-				live-static/config.gentoo \
-				|| die static ; }
-			sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
-				-e '/^LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK /s/=.*$/= $(CXX) -o /' \
-				-e '/^LIBRARY_LINK_OPTS /s:-shared.*$:-undefined suppress -flat_namespace -dynamiclib -install_name '"${EPREFIX}/usr/$(get_libdir)/"'$@:' \
-				-e '/^LIB_SUFFIX /s/so/dylib/' \
-				live-shared/config.gentoo-so-r1 \
-				|| die shared
-		;;
-	esac
-	multilib_copy_sources
-}
-
-src_configure() { :; }
-
-multilib_src_compile() {
-	tc-export CC CXX LD
-
-	if use static-libs ; then
-		cd "${BUILD_DIR}/live-static"
-
-		einfo "Beginning static library build"
-		./genMakefiles gentoo
-		emake -j1 LINK_OPTS="-L. $(raw-ldflags)"
-	fi
-
-	cd "${BUILD_DIR}/live-shared"
-	einfo "Beginning shared library build"
-	./genMakefiles gentoo-so-r1
-	local suffix=$(get_libname ${LIVE_ABI_VERSION})
-	emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}"
-
-	for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do
-		pushd "${BUILD_DIR}/live-shared/${i}" > /dev/null
-		ln -s lib${i}.${suffix#.} lib${i}$(get_libname) || die
-		popd > /dev/null
-	done
-
-	if multilib_is_native_abi; then
-		einfo "Beginning programs build"
-		for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do
-			cd "${BUILD_DIR}/live-shared/${i}"
-			emake LINK_OPTS="-L. ${LDFLAGS}"
-		done
-	fi
-}
-
-multilib_src_install() {
-	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
-		use static-libs && dolib.a live-static/${library}/lib${library}.a
-		dolib.so live-shared/${library}/lib${library}$(get_libname ${LIVE_ABI_VERSION})
-		dosym lib${library}$(get_libname ${LIVE_ABI_VERSION}) /usr/$(get_libdir)/lib${library}$(get_libname)
-
-		insinto /usr/include/${library}
-		doins live-shared/${library}/include/*h
-	done
-
-	if multilib_is_native_abi; then
-		# Should we really install these?
-		use examples && find live-shared/testProgs -type f -perm 755 -print0 | \
-			xargs -0 dobin
-
-		dobin live-shared/mediaServer/live555MediaServer
-		dobin live-shared/proxyServer/live555ProxyServer
-	fi
-}
diff --git a/media-plugins/live/live-2018.07.07.ebuild b/media-plugins/live/live-2018.07.07.ebuild
deleted file mode 100644
index d833ddf75eb2..000000000000
--- a/media-plugins/live/live-2018.07.07.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic eutils toolchain-funcs multilib multilib-minimal
-
-DESCRIPTION="Libraries for standards-based RTP/RTCP/RTSP multimedia streaming"
-HOMEPAGE="http://www.live555.com/"
-SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
-	mirror://gentoo/${P/-/.}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="examples static-libs"
-DOCS=( "live-shared/README" )
-
-# Alexis Ballier <aballier@gentoo.org>
-# Be careful, bump this everytime you bump the package and the ABI has changed.
-# If you don't know, ask someone.
-LIVE_ABI_VERSION=7
-SLOT="0/${LIVE_ABI_VERSION}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}"
-	mv "${WORKDIR}/live" "${S}/" || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-recursive3.patch"
-
-	if use static-libs ; then
-		cp -pPR live live-shared
-		mv live live-static
-	else
-		mv live live-shared
-	fi
-
-	use static-libs && cp "${FILESDIR}/config.gentoo-r1" live-static/config.gentoo
-	cp "${FILESDIR}/config.gentoo-so-r2" live-shared/config.gentoo-so-r1
-
-	case ${CHOST} in
-		*-solaris*)
-			use static-libs && { sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
-				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
-				live-static/config.gentoo \
-				|| die ; }
-			sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
-				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
-				live-shared/config.gentoo-so-r1 \
-				|| die
-		;;
-		*-darwin*)
-			use static-libs && { sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
-				-e '/^LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK_OPTS /s/-Bstatic//' \
-				live-static/config.gentoo \
-				|| die static ; }
-			sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
-				-e '/^LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK /s/=.*$/= $(CXX) -o /' \
-				-e '/^LIBRARY_LINK_OPTS /s:-shared.*$:-undefined suppress -flat_namespace -dynamiclib -install_name '"${EPREFIX}/usr/$(get_libdir)/"'$@:' \
-				-e '/^LIB_SUFFIX /s/so/dylib/' \
-				live-shared/config.gentoo-so-r1 \
-				|| die shared
-		;;
-	esac
-	multilib_copy_sources
-}
-
-src_configure() { :; }
-
-multilib_src_compile() {
-	tc-export CC CXX LD
-
-	if use static-libs ; then
-		cd "${BUILD_DIR}/live-static"
-
-		einfo "Beginning static library build"
-		./genMakefiles gentoo
-		emake -j1 LINK_OPTS="-L. $(raw-ldflags)"
-	fi
-
-	cd "${BUILD_DIR}/live-shared"
-	einfo "Beginning shared library build"
-	./genMakefiles gentoo-so-r1
-	local suffix=$(get_libname ${LIVE_ABI_VERSION})
-	emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}"
-
-	for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do
-		pushd "${BUILD_DIR}/live-shared/${i}" > /dev/null
-		ln -s lib${i}.${suffix#.} lib${i}$(get_libname) || die
-		popd > /dev/null
-	done
-
-	if multilib_is_native_abi; then
-		einfo "Beginning programs build"
-		for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do
-			cd "${BUILD_DIR}/live-shared/${i}"
-			emake LINK_OPTS="-L. ${LDFLAGS}"
-		done
-	fi
-}
-
-multilib_src_install() {
-	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
-		use static-libs && dolib.a live-static/${library}/lib${library}.a
-		dolib.so live-shared/${library}/lib${library}$(get_libname ${LIVE_ABI_VERSION})
-		dosym lib${library}$(get_libname ${LIVE_ABI_VERSION}) /usr/$(get_libdir)/lib${library}$(get_libname)
-
-		insinto /usr/include/${library}
-		doins live-shared/${library}/include/*h
-	done
-
-	if multilib_is_native_abi; then
-		# Should we really install these?
-		use examples && find live-shared/testProgs -type f -perm 755 -print0 | \
-			xargs -0 dobin
-
-		dobin live-shared/mediaServer/live555MediaServer
-		dobin live-shared/proxyServer/live555ProxyServer
-	fi
-}
author	V3n3RiX <venerix@redcorelinux.org>	2020-05-30 11:44:06 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-05-30 11:44:06 +0100
commit	f516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree	8bfecb640b7b6403d7a3d662d923eed630033da7 /media-plugins
parent	1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)