browser, live, mixin.mk, arm-rpi4: Drop old targets use/firefox/{i18n,h264}

conf.d/live.mk

@@ -118,7 +118,7 @@ distro/live-gimp: distro/live-icewm use/live/ru
 distro/live-privacy: distro/.base +efi +systemd +vmguest \
 	use/live/base use/live/privacy use/live/ru \
 	use/x11/xorg use/x11/lightdm/gtk use/x11/mate use/x11-autologin \
-	use/browser/firefox/esr use/browser/firefox/i18n use/sound \
+	use/browser/firefox/esr use/browser/firefox use/sound \
 	use/fonts/otf/adobe use/fonts/otf/mozilla \
 	use/fonts/ttf/google use/fonts/ttf/redhat
 	@$(call set,KFLAVOURS,un-def)

conf.d/mixin.mk

@@ -11,7 +11,7 @@ mixin/desktop-installer: +net-eth +vmguest \
 mixin/e2k-base: use/tty/S0 use/net-eth/dhcp; @:
 
 mixin/e2k-desktop: use/e2k/x11 use/l10n/default/ru_RU \
-	use/browser/firefox/esr use/browser/firefox/i18n \
+	use/browser/firefox/esr use/browser/firefox \
 	use/fonts/otf/adobe use/fonts/otf/mozilla
 	@$(call add,THE_PACKAGES,xinit xterm mc)
 	@$(call add,THE_PACKAGES,fonts-bitmap-terminus)
@@ -39,7 +39,7 @@ mixin/e2k-mate: use/e2k/x11 use/x11/xorg use/fonts/install2 \
 
 ### regular.mk
 mixin/regular-x11: use/luks use/volumes/regular \
-	use/browser/firefox/i18n use/browser/firefox/h264 \
+	use/browser/firefox \
 	use/branding use/ntp/chrony use/services/lvm2-disable
 	@$(call add,THE_LISTS,$(call tags,(base || desktop) && regular))
 	@$(call add,THE_PACKAGES,disable-usb-autosuspend)

features.in/arm-rpi4/config.mk

@@ -19,7 +19,7 @@ endif
 	@$(call add,DEFAULT_SERVICES_DISABLE,systemd-networkd-wait-online)
 
 use/arm-rpi4/x11: use/arm-rpi4 \
-	use/browser/firefox/i18n use/browser/firefox/esr
+	use/browser/firefox use/browser/firefox/esr
 	@$(call add,THE_PACKAGES,celluloid celluloid-csd-disabled)
 
 use/arm-rpi4/kernel: use/arm-rpi4

features.in/browser/config.mk

@@ -36,19 +36,9 @@ use/browser/firefox: use/browser
 use/browser/firefox/esr:
 	@$(call set,FX_FLAVOUR,-esr)
 
-use/browser/firefox/h264: use/browser/firefox
-	@$(call add,THE_BROWSER,gst-libav)
-	@$(call add,THE_BROWSER,gst-plugins-base1.0 gst-plugins-good1.0)
-
 use/browser/firefox/live: use/browser/firefox
 	@$(call add,THE_BROWSER,livecd-firefox)
 
-# scarey, and will have to be done otherwise when l10n feature is there
-use/browser/firefox/i18n: use/browser/firefox
-	@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-kk)
-	@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-ru)
-	@$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-uk)
-
 use/browser/seamonkey/i18n: use/browser/seamonkey
 	@$(call add,THE_BROWSER,seamonkey-ru)